Attachment #200421 for bug #234322

View | Details | Raw Unified | Return to bug 234322
Collapse All | Expand All




# $FreeBSD$

PORTNAME=	handbrake
DISTVERSION=	1.2.0
PORTREVISION=	1
CATEGORIES=	multimedia
DIST_SUBDIR=	${PORTNAME}


ONLY_FOR_ARCHS_REASON=	invokes x86 assembler

BUILD_DEPENDS=	bash:shells/bash \
		nasm:devel/nasm \
		cmake:devel/cmake
LIB_DEPENDS=	libdbus-1.so:devel/dbus \
		libharfbuzz.so:print/harfbuzz \

		libfribidi.so:converters/fribidi \
		libxml2.so:textproc/libxml2 \
		libass.so:multimedia/libass \
		libspeex.so:audio/speex \
		libogg.so:audio/libogg \
		libvorbis.so:audio/libvorbis \
		libvorbisenc.so:audio/libvorbis \

		libjansson.so:devel/jansson

CONTRIB_FILES=	fdk-aac-0.1.5.tar.gz \
		ffmpeg-4.1.tar.bz2 \
		libbluray-1.0.2.tar.bz2 \
		libdvdnav-6.0.0.tar.bz2 \
		libdvdread-6.0.0.tar.bz2 \
		libvpx-1.7.0.tar.gz \
		x265_2.9.tar.gz
MASTER_SITES+=	https://download.handbrake.fr/contrib/:contrib
DISTFILES+=	${CONTRIB_FILES:S/$/:contrib/}


GH_ACCOUNT=	HandBrake
GH_PROJECT=	HandBrake

USE_GCC=	yes

CONFIGURE_ARGS=	--force --enable-x265
CONFIGURE_TARGET=	build


# Enforce linking to bundled libraries instead of system libraries
LDFLAGS+=	-L${BUILD_WRKSRC}/contrib/lib

# Enforce linking to the system c++ standard lib
LDFLAGS+=	-l${COMPILER_FEATURES:Mlib*c++:S/lib//}

OPTIONS_DEFINE=		FDK_AAC X11
OPTIONS_DEFAULT=	X11


LICENSE_FILE_FDK_AAC=		${WRKDIR}/${DISTFILES:Mfdk*:R:R}/NOTICE
LICENSE_PERMS_FDK_AAC=		dist-mirror pkg-mirror auto-accept

# Recent GNU binutils are required to handle inline SSSE3 asm (in x264), and
# to support --exclude-libs option for ld(1) when building GUI program
X11_CONFIGURE_ENV=	COMPILER_PATH=${LOCALBASE}/bin
X11_MAKE_ENV=	COMPILER_PATH=${LOCALBASE}/bin
X11_CONFIGURE_ON=	--disable-gtk-update-checks
X11_CONFIGURE_OFF=	--disable-gtk
X11_BUILD_DEPENDS=	${LOCALBASE}/bin/ld:devel/binutils
X11_LIB_DEPENDS=	libvpx.so:multimedia/libvpx \
			libnotify.so:devel/libnotify
X11_USES=	gettext desktop-file-utils

.for f in ${CONTRIB_FILES}
	${CP} ${DISTDIR}/${DIST_SUBDIR}/${f} ${WRKSRC}/download
.endfor
# Install version information.
	${CP} ${FILESDIR}/version.txt ${WRKSRC}
# Following patches reduces warnings with clang.
	${CP} ${FILESDIR}/P00-freebsd-libavutil-x86-asm-h.patch ${WRKSRC}/contrib/ffmpeg
	${CP} ${FILESDIR}/P01-freebsd-ifo_types.h.patch ${WRKSRC}/contrib/libdvdread

post-patch:
	@${REINPLACE_CMD} 's@python2 @${PYTHON_CMD} @' \
		${WRKSRC}/gtk/src/Makefile.am

post-install-X11-on:
	${LN} -sf ghb ${STAGEDIR}${PREFIX}/bin/HandBrake


Lines 1-8 Link Here

(-)multimedia/handbrake/distinfo (-7 / +7 lines)
1	TIMESTAMP = 1536199029	1	TIMESTAMP = 1545096793
2	SHA256 (handbrake/fdk-aac-0.1.5.tar.gz) = 2164592a67b467e5b20fdcdaf5bd4c50685199067391c6fcad4fa5521c9b4dd7	2	SHA256 (handbrake/fdk-aac-0.1.5.tar.gz) = 2164592a67b467e5b20fdcdaf5bd4c50685199067391c6fcad4fa5521c9b4dd7
3	SIZE (handbrake/fdk-aac-0.1.5.tar.gz) = 2091081	3	SIZE (handbrake/fdk-aac-0.1.5.tar.gz) = 2091081
4	SHA256 (handbrake/libav-12.3.tar.gz) = 115b659022dd387f662e26fbc5bc0cc14ec18daa100003ffd34f4da0479b272e	4	SHA256 (handbrake/ffmpeg-4.1.tar.bz2) = b684fb43244a5c4caae652af9022ed5d85ce15210835bce054a33fb26033a1a5
5	SIZE (handbrake/libav-12.3.tar.gz) = 7582844	5	SIZE (handbrake/ffmpeg-4.1.tar.bz2) = 10687291
6	SHA256 (handbrake/libbluray-1.0.2.tar.bz2) = 6d9e7c4e416f664c330d9fa5a05ad79a3fb39b95adfc3fd6910cbed503b7aeff	6	SHA256 (handbrake/libbluray-1.0.2.tar.bz2) = 6d9e7c4e416f664c330d9fa5a05ad79a3fb39b95adfc3fd6910cbed503b7aeff
7	SIZE (handbrake/libbluray-1.0.2.tar.bz2) = 733058	7	SIZE (handbrake/libbluray-1.0.2.tar.bz2) = 733058
8	SHA256 (handbrake/libdvdnav-6.0.0.tar.bz2) = f0a2711b08a021759792f8eb14bb82ff8a3c929bf88c33b64ffcddaa27935618	8	SHA256 (handbrake/libdvdnav-6.0.0.tar.bz2) = f0a2711b08a021759792f8eb14bb82ff8a3c929bf88c33b64ffcddaa27935618
Lines 11-17 Link Here
11	SIZE (handbrake/libdvdread-6.0.0.tar.bz2) = 394627	11	SIZE (handbrake/libdvdread-6.0.0.tar.bz2) = 394627
12	SHA256 (handbrake/libvpx-1.7.0.tar.gz) = 1fec931eb5c94279ad219a5b6e0202358e94a93a90cfb1603578c326abfc1238	12	SHA256 (handbrake/libvpx-1.7.0.tar.gz) = 1fec931eb5c94279ad219a5b6e0202358e94a93a90cfb1603578c326abfc1238
13	SIZE (handbrake/libvpx-1.7.0.tar.gz) = 2679797	13	SIZE (handbrake/libvpx-1.7.0.tar.gz) = 2679797
14	SHA256 (handbrake/x265_2.6.tar.gz) = 1bf0036415996af841884802161065b9e6be74f5f6808ac04831363e2549cdbf	14	SHA256 (handbrake/x265_2.9.tar.gz) = ebae687c84a39f54b995417c52a2fdde65a4e2e7ebac5730d251471304b91024
15	SIZE (handbrake/x265_2.6.tar.gz) = 1271976	15	SIZE (handbrake/x265_2.9.tar.gz) = 1385848
16	SHA256 (handbrake/HandBrake-HandBrake-1.1.2_GH0.tar.gz) = fa66152d295dcd07c7c631fe5b3ccad8e4fef5fb0e367c8682fdc0a141ce62c3	16	SHA256 (handbrake/HandBrake-HandBrake-1.2.0_GH0.tar.gz) = fcf69f7642a278cd17b9a3fb9f299800962b2fa559e02e0cd798aa5e5e83b82c
17	SIZE (handbrake/HandBrake-HandBrake-1.1.2_GH0.tar.gz) = 15880248	17	SIZE (handbrake/HandBrake-HandBrake-1.2.0_GH0.tar.gz) = 18489017

Line 0 Link Here

(-)multimedia/handbrake/files/P00-freebsd-libavutil-x86-asm-h.patch (+11 lines)
	1	--- a/libavutil/x86/asm.h.orig 2018-04-14 08:34:28.000000000 +0900
	2	+++ b/libavutil/x86/asm.h 2018-06-23 22:34:29.258291000 +0900
	3	@@ -72,7 +72,7 @@
	4	typedef int x86_reg;
	5	#endif
	6
	7	-#define HAVE_7REGS (ARCH_X86_64 \|\| (HAVE_EBX_AVAILABLE && HAVE_EBP_AVAILABLE))
	8	+#define HAVE_7REGS (ARCH_X86_64 \|\| (HAVE_EBX_AVAILABLE && HAVE_EBP_AVAILABLE && !defined(__clang__)))
	9	#define HAVE_6REGS (ARCH_X86_64 \|\| (HAVE_EBX_AVAILABLE \|\| HAVE_EBP_AVAILABLE))
	10
	11	#if ARCH_X86_64 && defined(PIC)

Line 0 Link Here

(-)multimedia/handbrake/files/P01-freebsd-ifo_types.h.patch (+11 lines)
	1	--- a/src/dvdread/ifo_types.h.orig 2015-06-27 19:35:59.043370000 +0200
	2	+++ b/src/dvdread/ifo_types.h 2015-06-27 19:37:10.885577000 +0200
	3	@@ -32,7 +32,7 @@
	4
	5	#if defined(__GNUC__)
	6	#if __GNUC__ > 2 \|\| (__GNUC__ == 2 && __GNUC_MINOR__ >= 95)
	7	-#if __GNUC__ > 3 \|\| (__GNUC__ == 3 && __GNUC_MINOR__ >= 4)
	8	+#if (__GNUC__ > 3 \|\| (__GNUC__ == 3 && __GNUC_MINOR__ >= 4)) && !defined(__clang__)
	9	#define ATTRIBUTE_PACKED __attribute__ ((packed,gcc_struct))
	10	#else
	11	#define ATTRIBUTE_PACKED __attribute__ ((packed))

Lines 1-4 Link Here

(-)multimedia/handbrake/files/patch-contrib_x265__10bit_module.defs (-2 / +2 lines)
1	--- contrib/x265_10bit/module.defs.orig 2017-12-24 00:33:48 UTC	1	--- contrib/x265_10bit/module.defs.orig 2018-06-17 04:23:34 UTC
2	+++ contrib/x265_10bit/module.defs	2	+++ contrib/x265_10bit/module.defs
3	@@ -19,6 +19,10 @@ X265_10.CONFIGURE.static =	3	@@ -19,6 +19,10 @@ X265_10.CONFIGURE.static =
4	X265_10.CONFIGURE.shared = -DENABLE_SHARED=OFF	4	X265_10.CONFIGURE.shared = -DENABLE_SHARED=OFF
Lines 10-13 Link Here
10	+	10	+
11	ifneq (none,$(X265_10.GCC.g))	11	ifneq (none,$(X265_10.GCC.g))
12	X265_10.CONFIGURE.extra += -DCMAKE_BUILD_TYPE=Debug	12	X265_10.CONFIGURE.extra += -DCMAKE_BUILD_TYPE=Debug
13	endif	13	else

Lines 1-4 Link Here

(-)multimedia/handbrake/files/patch-contrib_x265__12bit_module.defs (-2 / +2 lines)
1	--- contrib/x265_12bit/module.defs.orig 2017-12-24 00:33:48 UTC	1	--- contrib/x265_12bit/module.defs.orig 2018-06-17 04:23:34 UTC
2	+++ contrib/x265_12bit/module.defs	2	+++ contrib/x265_12bit/module.defs
3	@@ -19,6 +19,10 @@ X265_12.CONFIGURE.static =	3	@@ -19,6 +19,10 @@ X265_12.CONFIGURE.static =
4	X265_12.CONFIGURE.shared = -DENABLE_SHARED=OFF	4	X265_12.CONFIGURE.shared = -DENABLE_SHARED=OFF
Lines 10-13 Link Here
10	+	10	+
11	ifneq (none,$(X265_12.GCC.g))	11	ifneq (none,$(X265_12.GCC.g))
12	X265_12.CONFIGURE.extra += -DCMAKE_BUILD_TYPE=Debug	12	X265_12.CONFIGURE.extra += -DCMAKE_BUILD_TYPE=Debug
13	endif	13	else

Lines 1-11 Link Here

(-)multimedia/handbrake/files/patch-libhb_module.defs (-11 lines)
1	--- libhb/module.defs.orig 2018-01-13 05:30:25 UTC
2	+++ libhb/module.defs
3	@@ -49,7 +49,7 @@ LIBHB.GCC.D += __LIBHB__ USE_PTHREAD
4	LIBHB.GCC.I += $(LIBHB.build/) $(CONTRIB.build/)include
5
6	ifeq ($(BUILD.system),freebsd)
7	- LIBHB.GCC.I += /usr/local/include/libxml2
8	+ LIBHB.GCC.I += $(LOCALBASE)/include/libxml2
9	else ifneq (,$(filter $(BUILD.system),darwin cygwin mingw))
10	LIBHB.GCC.I += $(CONTRIB.build/)include/libxml2
11	else

Lines 1-6 Link Here

(-)multimedia/handbrake/files/patch-libhb_nlmeans.c (-2 / +2 lines)
1	--- libhb/nlmeans.c.orig 2017-10-05 21:17:34 UTC	1	--- libhb/nlmeans.c.orig 2018-06-17 04:23:34 UTC
2	+++ libhb/nlmeans.c	2	+++ libhb/nlmeans.c
3	@@ -787,7 +787,7 @@ static int nlmeans_init(hb_filter_object	3	@@ -898,7 +898,7 @@ static int nlmeans_init(hb_filter_object_t *filter,
4	NLMeansFunctions *functions = &pv->functions;	4	NLMeansFunctions *functions = &pv->functions;
5		5
6	functions->build_integral = build_integral_scalar;	6	functions->build_integral = build_integral_scalar;

Lines 1-11 Link Here

(-)multimedia/handbrake/files/patch-make_configure.py (-11 lines)
1	--- make/configure.py.orig 2018-01-13 05:30:25 UTC
2	+++ make/configure.py
3	@@ -1515,7 +1515,7 @@ try:
4	class Tools:
5	ar = ToolProbe( 'AR.exe', 'ar' )
6	cp = ToolProbe( 'CP.exe', 'cp' )
7	- gcc = ToolProbe( 'GCC.gcc', 'gcc', IfHost( 'gcc-4', '--cygwin*' ))
8	+ gcc = ToolProbe( 'GCC.gcc', 'gcc', IfHost( os.environ['CC'], '--freebsd' ), IfHost( 'gcc-4', '--cygwin' ))
9
10	if host.match( '--darwin*' ):
11	gmake = ToolProbe( 'GMAKE.exe', 'make', 'gmake' )




--- version.txt.orig	2017-04-11 00:36:21 UTC
+++ version.txt
@@ -0,0 +1,9 @@
+URL=https://github.com/HandBrake/HandBrake.git
+HASH=df6c26fa261423237ee2bec0bf784c32cbfda3fa
+SHORTHASH=df6c26fa2
+TAG=1.1.2
+TAG_HASH=df6c26fa261423237ee2bec0bf784c32cbfda3fa
+REV=0
+BRANCH=
+REMOTE=https://github.com/HandBrake/HandBrake.git
+DATE=2018-09-04 15:35:01 -0400

Line 0 Link Here

(-)multimedia/handbrake/files/version.txt (+9 lines)
	1	URL=https://github.com/HandBrake/HandBrake.git
	2	HASH=23bc08b55d58308862e940c97f2d1aeb0f07544b
	3	SHORTHASH=23bc08b55
	4	TAG=1.2.0
	5	TAG_HASH=23bc08b55d58308862e940c97f2d1aeb0f07544b
	6	REV=0
	7	BRANCH=heads/1.2.0
	8	REMOTE=https://github.com/HandBrake/HandBrake.git
	9	DATE=2018-12-16 17:16:51 +0000

Return to bug 234322

Lines 2-9 Link Here

(-)multimedia/handbrake/Makefile (-17 / +10 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= handbrake	4	PORTNAME= handbrake
5	DISTVERSION= 1.1.2	5	DISTVERSION= 1.2.0
6	PORTREVISION= 1
7	CATEGORIES= multimedia	6	CATEGORIES= multimedia
8	DIST_SUBDIR= ${PORTNAME}	7	DIST_SUBDIR= ${PORTNAME}
9		8
Lines 17-23 Link Here
17	ONLY_FOR_ARCHS_REASON= invokes x86 assembler	16	ONLY_FOR_ARCHS_REASON= invokes x86 assembler
18		17
19	BUILD_DEPENDS= bash:shells/bash \	18	BUILD_DEPENDS= bash:shells/bash \
20	yasm:devel/yasm \	19	nasm:devel/nasm \
21	cmake:devel/cmake	20	cmake:devel/cmake
22	LIB_DEPENDS= libdbus-1.so:devel/dbus \	21	LIB_DEPENDS= libdbus-1.so:devel/dbus \
23	libharfbuzz.so:print/harfbuzz \	22	libharfbuzz.so:print/harfbuzz \
Lines 26-31 Link Here
26	libfribidi.so:converters/fribidi \	25	libfribidi.so:converters/fribidi \
27	libxml2.so:textproc/libxml2 \	26	libxml2.so:textproc/libxml2 \
28	libass.so:multimedia/libass \	27	libass.so:multimedia/libass \
		28	libspeex.so:audio/speex \
29	libogg.so:audio/libogg \	29	libogg.so:audio/libogg \
30	libvorbis.so:audio/libvorbis \	30	libvorbis.so:audio/libvorbis \
31	libvorbisenc.so:audio/libvorbis \	31	libvorbisenc.so:audio/libvorbis \
Lines 38-49 Link Here
38	libjansson.so:devel/jansson	38	libjansson.so:devel/jansson
39		39
40	CONTRIB_FILES= fdk-aac-0.1.5.tar.gz \	40	CONTRIB_FILES= fdk-aac-0.1.5.tar.gz \
41	libav-12.3.tar.gz \	41	ffmpeg-4.1.tar.bz2 \
42	libbluray-1.0.2.tar.bz2 \	42	libbluray-1.0.2.tar.bz2 \
43	libdvdnav-6.0.0.tar.bz2 \	43	libdvdnav-6.0.0.tar.bz2 \
44	libdvdread-6.0.0.tar.bz2 \	44	libdvdread-6.0.0.tar.bz2 \
45	libvpx-1.7.0.tar.gz \	45	libvpx-1.7.0.tar.gz \
46	x265_2.6.tar.gz	46	x265_2.9.tar.gz
47	MASTER_SITES+= https://download.handbrake.fr/contrib/:contrib	47	MASTER_SITES+= https://download.handbrake.fr/contrib/:contrib
48	DISTFILES+= ${CONTRIB_FILES:S/$/:contrib/}	48	DISTFILES+= ${CONTRIB_FILES:S/$/:contrib/}
49		49
Lines 61-68 Link Here
61	GH_ACCOUNT= HandBrake	61	GH_ACCOUNT= HandBrake
62	GH_PROJECT= HandBrake	62	GH_PROJECT= HandBrake
63		63
64	USE_GCC= yes
65
66	CONFIGURE_ARGS= --force --enable-x265	64	CONFIGURE_ARGS= --force --enable-x265
67	CONFIGURE_TARGET= build	65	CONFIGURE_TARGET= build
68		66
Lines 77-85 Link Here
77	# Enforce linking to bundled libraries instead of system libraries	75	# Enforce linking to bundled libraries instead of system libraries
78	LDFLAGS+= -L${BUILD_WRKSRC}/contrib/lib	76	LDFLAGS+= -L${BUILD_WRKSRC}/contrib/lib
79		77
80	# Enforce linking to the system c++ standard lib
81	LDFLAGS+= -l${COMPILER_FEATURES:Mlib*c++:S/lib//}
82
83	OPTIONS_DEFINE= FDK_AAC X11	78	OPTIONS_DEFINE= FDK_AAC X11
84	OPTIONS_DEFAULT= X11	79	OPTIONS_DEFAULT= X11
85		80
Lines 94-106 Link Here
94	LICENSE_FILE_FDK_AAC= ${WRKDIR}/${DISTFILES:Mfdk*:R:R}/NOTICE	89	LICENSE_FILE_FDK_AAC= ${WRKDIR}/${DISTFILES:Mfdk*:R:R}/NOTICE
95	LICENSE_PERMS_FDK_AAC= dist-mirror pkg-mirror auto-accept	90	LICENSE_PERMS_FDK_AAC= dist-mirror pkg-mirror auto-accept
96		91
97	# Recent GNU binutils are required to handle inline SSSE3 asm (in x264), and
98	# to support --exclude-libs option for ld(1) when building GUI program
99	X11_CONFIGURE_ENV= COMPILER_PATH=${LOCALBASE}/bin	92	X11_CONFIGURE_ENV= COMPILER_PATH=${LOCALBASE}/bin
100	X11_MAKE_ENV= COMPILER_PATH=${LOCALBASE}/bin	93	X11_MAKE_ENV= COMPILER_PATH=${LOCALBASE}/bin
101	X11_CONFIGURE_ON= --disable-gtk-update-checks	94	X11_CONFIGURE_ON= --disable-gtk-update-checks
102	X11_CONFIGURE_OFF= --disable-gtk	95	X11_CONFIGURE_OFF= --disable-gtk
103	X11_BUILD_DEPENDS= ${LOCALBASE}/bin/ld:devel/binutils
104	X11_LIB_DEPENDS= libvpx.so:multimedia/libvpx \	96	X11_LIB_DEPENDS= libvpx.so:multimedia/libvpx \
105	libnotify.so:devel/libnotify	97	libnotify.so:devel/libnotify
106	X11_USES= gettext desktop-file-utils	98	X11_USES= gettext desktop-file-utils
Lines 114-124 Link Here
114	.for f in ${CONTRIB_FILES}	106	.for f in ${CONTRIB_FILES}
115	${CP} ${DISTDIR}/${DIST_SUBDIR}/${f} ${WRKSRC}/download	107	${CP} ${DISTDIR}/${DIST_SUBDIR}/${f} ${WRKSRC}/download
116	.endfor	108	.endfor
		109	# Install version information.
		110	${CP} ${FILESDIR}/version.txt ${WRKSRC}
		111	# Following patches reduces warnings with clang.
		112	${CP} ${FILESDIR}/P00-freebsd-libavutil-x86-asm-h.patch ${WRKSRC}/contrib/ffmpeg
		113	${CP} ${FILESDIR}/P01-freebsd-ifo_types.h.patch ${WRKSRC}/contrib/libdvdread
117		114
118	post-patch:
119	@${REINPLACE_CMD} 's@python2 @${PYTHON_CMD} @' \
120	${WRKSRC}/gtk/src/Makefile.am
121
122	post-install-X11-on:	115	post-install-X11-on:
123	${LN} -sf ghb ${STAGEDIR}${PREFIX}/bin/HandBrake	116	${LN} -sf ghb ${STAGEDIR}${PREFIX}/bin/HandBrake
124		117

Lines 1-12 Link Here

(-)multimedia/handbrake/files/patch-version.txt (-12 lines)
1	--- version.txt.orig 2017-04-11 00:36:21 UTC
2	+++ version.txt
3	@@ -0,0 +1,9 @@
4	+URL=https://github.com/HandBrake/HandBrake.git
5	+HASH=df6c26fa261423237ee2bec0bf784c32cbfda3fa
6	+SHORTHASH=df6c26fa2
7	+TAG=1.1.2
8	+TAG_HASH=df6c26fa261423237ee2bec0bf784c32cbfda3fa
9	+REV=0
10	+BRANCH=
11	+REMOTE=https://github.com/HandBrake/HandBrake.git
12	+DATE=2018-09-04 15:35:01 -0400