View | Details | Raw Unified | Return to bug 208334 | Differences between
and this patch

Collapse All | Expand All

(-)Makefile (-13 / +11 lines)
Lines 2-9 Link Here
2
# $FreeBSD$
2
# $FreeBSD$
3
3
4
PORTNAME=	handbrake
4
PORTNAME=	handbrake
5
PORTVERSION=	0.10.2
5
PORTVERSION=	0.10.5
6
PORTREVISION=	2
7
CATEGORIES=	multimedia
6
CATEGORIES=	multimedia
8
MASTER_SITES=	http://download.handbrake.fr/releases/${PORTVERSION}/ \
7
MASTER_SITES=	http://download.handbrake.fr/releases/${PORTVERSION}/ \
9
		http://download.handbrake.fr/handbrake/contrib/:contrib \
8
		http://download.handbrake.fr/handbrake/contrib/:contrib \
Lines 12-18 Link Here
12
		a52dec-0.7.4.tar.gz:contrib \
11
		a52dec-0.7.4.tar.gz:contrib \
13
		faac-1.28.tar.gz:contrib \
12
		faac-1.28.tar.gz:contrib \
14
		faad2-2.7.tar.gz:contrib \
13
		faad2-2.7.tar.gz:contrib \
15
		fdk-aac-v0.1.1-6-gbae4553.tar.bz2:contrib \
16
		libav-v10.1.tar.bz2:contrib \
14
		libav-v10.1.tar.bz2:contrib \
17
		libbluray-0.5.0.tar.bz2:contrib \
15
		libbluray-0.5.0.tar.bz2:contrib \
18
		libdca-r81-strapped.tar.gz:contrib \
16
		libdca-r81-strapped.tar.gz:contrib \
Lines 20-26 Link Here
20
		libdvdread-5.0.0-6-gcb1ae87.tar.gz:contrib \
18
		libdvdread-5.0.0-6-gcb1ae87.tar.gz:contrib \
21
		libvpx-v1.3.0.tar.bz2:contrib \
19
		libvpx-v1.3.0.tar.bz2:contrib \
22
		x264-r2479-dd79a61.tar.gz:contrib \
20
		x264-r2479-dd79a61.tar.gz:contrib \
23
		x265-9329-0d30d2641875-1.5.tar.bz2:contrib
21
		x265_1.9.tar.gz:contrib
24
DIST_SUBDIR=	${PORTNAME}
22
DIST_SUBDIR=	${PORTNAME}
25
23
26
MAINTAINER=	ports@FreeBSD.org
24
MAINTAINER=	ports@FreeBSD.org
Lines 27-32 Link Here
27
COMMENT=	Versatile DVD ripper and video transcoder
25
COMMENT=	Versatile DVD ripper and video transcoder
28
26
29
LICENSE=	GPLv2
27
LICENSE=	GPLv2
28
LICENSE_FILE=	${WRKSRC}/COPYING
30
29
31
BUILD_DEPENDS=	yasm:${PORTSDIR}/devel/yasm \
30
BUILD_DEPENDS=	yasm:${PORTSDIR}/devel/yasm \
32
		cmake:${PORTSDIR}/devel/cmake
31
		cmake:${PORTSDIR}/devel/cmake
Lines 46-52 Link Here
46
CONFLICTS_BUILD=	x265
45
CONFLICTS_BUILD=	x265
47
46
48
.if !defined(PACKAGE_BUILDING)
47
.if !defined(PACKAGE_BUILDING)
49
# DVDCSS version hardcoded in contrib/libdvdread/libdvdread/src/dvd_input.c (dlopen'ed)
48
# DVDCSS version hardcoded in contrib/libdvdread/libdvdread-5.0.0-6-gcb1ae87/src/dvd_input.c (dlopen'ed)
50
LIB_DEPENDS+=	libdvdcss.so.2:${PORTSDIR}/multimedia/libdvdcss
49
LIB_DEPENDS+=	libdvdcss.so.2:${PORTSDIR}/multimedia/libdvdcss
51
.endif
50
.endif
52
51
Lines 64-69 Link Here
64
ALL_TARGET=	#
63
ALL_TARGET=	#
65
MAKE_JOBS_UNSAFE=	yes
64
MAKE_JOBS_UNSAFE=	yes
66
65
66
CPPFLAGS+=	-I${LOCALBASE}/include
67
LIBS+=		-L${LOCALBASE}/lib
68
67
NOPRECIOUSMAKEVARS=	yes			# for ffmpeg and x264
69
NOPRECIOUSMAKEVARS=	yes			# for ffmpeg and x264
68
70
69
OPTIONS_DEFINE=	X11
71
OPTIONS_DEFINE=	X11
Lines 85-92 Link Here
85
87
86
.if ${PORT_OPTIONS:MX11}
88
.if ${PORT_OPTIONS:MX11}
87
CONFIGURE_ARGS+=	--disable-gtk-update-checks --disable-gst
89
CONFIGURE_ARGS+=	--disable-gtk-update-checks --disable-gst
88
CPPFLAGS+=	-I${LOCALBASE}/include
89
LIBS+=		-L${LOCALBASE}/lib
90
LIB_DEPENDS+=	libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \
90
LIB_DEPENDS+=	libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \
91
		libnotify.so:${PORTSDIR}/devel/libnotify
91
		libnotify.so:${PORTSDIR}/devel/libnotify
92
USES+=		gettext
92
USES+=		gettext
Lines 101-106 Link Here
101
		false
101
		false
102
.else
102
.else
103
CONFIGURE_ARGS+=	--disable-gtk
103
CONFIGURE_ARGS+=	--disable-gtk
104
LDFLAGS+=	${LIBS}		# Ugly hack to make contrib/ffmpeg/libav-v10.1 recognise libmp3lame
104
.endif
105
.endif
105
106
106
# Enforce linking to the system c++ standard lib
107
# Enforce linking to the system c++ standard lib
Lines 119-135 Link Here
119
	${MV} ${WRKDIR}/${d} ${BUILD_WRKSRC}/contrib/${d}
120
	${MV} ${WRKDIR}/${d} ${BUILD_WRKSRC}/contrib/${d}
120
.endfor
121
.endfor
121
# Others had to be processed one by one due to irregular (versioned) names
122
# Others had to be processed one by one due to irregular (versioned) names
122
	cd ${BUILD_WRKSRC}/contrib && ${MKDIR} faac faad2 fdkaac ffmpeg libbluray libdvdnav \
123
	cd ${BUILD_WRKSRC}/contrib && ${MKDIR} faac faad2 ffmpeg libbluray libdvdnav \
123
	    libdvdread libvpx x265
124
	    libdvdread libvpx x265
124
	${MV} ${WRKDIR}/faac-1.28 ${BUILD_WRKSRC}/contrib/faac
125
	${MV} ${WRKDIR}/faac-1.28 ${BUILD_WRKSRC}/contrib/faac
125
	${MV} ${WRKDIR}/faad2-2.7 ${BUILD_WRKSRC}/contrib/faad2
126
	${MV} ${WRKDIR}/faad2-2.7 ${BUILD_WRKSRC}/contrib/faad2
126
	${MV} ${WRKDIR}/fdk-aac-v0.1.1-6-gbae4553 ${BUILD_WRKSRC}/contrib/fdkaac
127
	${MV} ${WRKDIR}/libav-v10.1 ${BUILD_WRKSRC}/contrib/ffmpeg/libav-v10.1
127
	${MV} ${WRKDIR}/libav-v10.1 ${BUILD_WRKSRC}/contrib/ffmpeg/libav-v10.1
128
	${MV} ${WRKDIR}/libbluray-0.5.0 ${BUILD_WRKSRC}/contrib/libbluray
128
	${MV} ${WRKDIR}/libbluray-0.5.0 ${BUILD_WRKSRC}/contrib/libbluray
129
	${MV} ${WRKDIR}/libdvdnav-5.0.1-0-gaa3659d ${BUILD_WRKSRC}/contrib/libdvdnav
129
	${MV} ${WRKDIR}/libdvdnav-5.0.1-0-gaa3659d ${BUILD_WRKSRC}/contrib/libdvdnav
130
	${MV} ${WRKDIR}/libdvdread-5.0.0-6-gcb1ae87 ${BUILD_WRKSRC}/contrib/libdvdread
130
	${MV} ${WRKDIR}/libdvdread-5.0.0-6-gcb1ae87 ${BUILD_WRKSRC}/contrib/libdvdread
131
	${MV} ${WRKDIR}/libvpx-v1.3.0 ${BUILD_WRKSRC}/contrib/libvpx
131
	${MV} ${WRKDIR}/libvpx-v1.3.0 ${BUILD_WRKSRC}/contrib/libvpx
132
	${MV} ${WRKDIR}/x265-9329-0d30d2641875-1.5 ${BUILD_WRKSRC}/contrib/x265
132
	${MV} ${WRKDIR}/x265_1.9 ${BUILD_WRKSRC}/contrib/x265
133
# Avoid conflict with `print/harfbuzz' (also installs "hb.h")
133
# Avoid conflict with `print/harfbuzz' (also installs "hb.h")
134
	${MV} ${WRKSRC}/libhb/hb.h ${WRKSRC}/libhb/hb-of-handbrake.h
134
	${MV} ${WRKSRC}/libhb/hb.h ${WRKSRC}/libhb/hb-of-handbrake.h
135
# Mark all bundled dependencies as extracted
135
# Mark all bundled dependencies as extracted
Lines 136-142 Link Here
136
	${TOUCH} ${BUILD_WRKSRC}/contrib/a52dec/.stamp.extract
136
	${TOUCH} ${BUILD_WRKSRC}/contrib/a52dec/.stamp.extract
137
	${TOUCH} ${BUILD_WRKSRC}/contrib/faac/.stamp.extract
137
	${TOUCH} ${BUILD_WRKSRC}/contrib/faac/.stamp.extract
138
	${TOUCH} ${BUILD_WRKSRC}/contrib/faad2/.stamp.extract
138
	${TOUCH} ${BUILD_WRKSRC}/contrib/faad2/.stamp.extract
139
	${TOUCH} ${BUILD_WRKSRC}/contrib/fdkaac/.stamp.extract
140
	${TOUCH} ${BUILD_WRKSRC}/contrib/ffmpeg/.stamp.extract
139
	${TOUCH} ${BUILD_WRKSRC}/contrib/ffmpeg/.stamp.extract
141
	${TOUCH} ${BUILD_WRKSRC}/contrib/libbluray/.stamp.extract
140
	${TOUCH} ${BUILD_WRKSRC}/contrib/libbluray/.stamp.extract
142
	${TOUCH} ${BUILD_WRKSRC}/contrib/libdca/.stamp.extract
141
	${TOUCH} ${BUILD_WRKSRC}/contrib/libdca/.stamp.extract
Lines 159-165 Link Here
159
		-e '/GHB_PACKAGES=/s/gthread-2.0/& gmodule-2.0/' \
158
		-e '/GHB_PACKAGES=/s/gthread-2.0/& gmodule-2.0/' \
160
		-e 's/-lhb/& ${ICONV_LIB}/' \
159
		-e 's/-lhb/& ${ICONV_LIB}/' \
161
		-e 's/-lhandbrake/& ${ICONV_LIB}/' \
160
		-e 's/-lhandbrake/& ${ICONV_LIB}/' \
162
		-e 's:-lxml2:& ../../contrib/lib/libx265.a ../../contrib/lib/libfdk-aac.a:g' \
161
		-e 's:-lxml2:& ../../contrib/lib/libx265.a:g' \
163
		${WRKSRC}/gtk/configure.ac
162
		${WRKSRC}/gtk/configure.ac
164
	@${REINPLACE_CMD} -e 's|<malloc|<stdlib|' ${WRKSRC}/libhb/fifo.c
163
	@${REINPLACE_CMD} -e 's|<malloc|<stdlib|' ${WRKSRC}/libhb/fifo.c
165
	@${FIND} ${WRKSRC} -type f -name '*.[ch]' -print0 | ${XARGS} -0 \
164
	@${FIND} ${WRKSRC} -type f -name '*.[ch]' -print0 | ${XARGS} -0 \
Lines 171-177 Link Here
171
		${WRKSRC}/libhb/module.defs ${WRKSRC}/test/module.defs
170
		${WRKSRC}/libhb/module.defs ${WRKSRC}/test/module.defs
172
	@${TR} -d '\r' < ${WRKSRC}/contrib/ffmpeg/A06-frame-threading-state.patch > ${WRKDIR}/A06-frame-threading-state.patch
171
	@${TR} -d '\r' < ${WRKSRC}/contrib/ffmpeg/A06-frame-threading-state.patch > ${WRKDIR}/A06-frame-threading-state.patch
173
	@${MV} ${WRKDIR}/A06-frame-threading-state.patch ${WRKSRC}/contrib/ffmpeg/
172
	@${MV} ${WRKDIR}/A06-frame-threading-state.patch ${WRKSRC}/contrib/ffmpeg/
174
	@${REINPLACE_CMD} -e 's:/lib/cpp:${CPP}:g' ${BUILD_WRKSRC}/contrib/fdkaac/fdk-aac-v0.1.1-6-gbae4553/configure
175
	@${REINPLACE_CMD} -E \
173
	@${REINPLACE_CMD} -E \
176
		-e 's|%%REP_CC%%|${CC}|g' \
174
		-e 's|%%REP_CC%%|${CC}|g' \
177
		-e 's|%%REP_CXX%%|${CXX}|g' \
175
		-e 's|%%REP_CXX%%|${CXX}|g' \
(-)distinfo (-6 / +4 lines)
Lines 1-5 Link Here
1
SHA256 (handbrake/HandBrake-0.10.2.tar.bz2) = 4cc3828393b26a982dbe00febd700c5090d3443c1d45492e0b373e02da73c699
1
SHA256 (handbrake/HandBrake-0.10.5.tar.bz2) = fb9230dd121b456f6829d1d25ac8bbf76e503b51c4efc70f0a7fd2bb8607e2f0
2
SIZE (handbrake/HandBrake-0.10.2.tar.bz2) = 10442635
2
SIZE (handbrake/HandBrake-0.10.5.tar.bz2) = 10452839
3
SHA256 (handbrake/a52dec-0.7.4.tar.gz) = 54981ab08fc09a675b9924372cf0cca5aa5363b918c4c19065c2d40e2858be47
3
SHA256 (handbrake/a52dec-0.7.4.tar.gz) = 54981ab08fc09a675b9924372cf0cca5aa5363b918c4c19065c2d40e2858be47
4
SIZE (handbrake/a52dec-0.7.4.tar.gz) = 242978
4
SIZE (handbrake/a52dec-0.7.4.tar.gz) = 242978
5
SHA256 (handbrake/faac-1.28.tar.gz) = c5141199f4cfb17d749c36ba8cfe4b25f838da67c22f0fec40228b6b9c3d19df
5
SHA256 (handbrake/faac-1.28.tar.gz) = c5141199f4cfb17d749c36ba8cfe4b25f838da67c22f0fec40228b6b9c3d19df
Lines 6-13 Link Here
6
SIZE (handbrake/faac-1.28.tar.gz) = 678891
6
SIZE (handbrake/faac-1.28.tar.gz) = 678891
7
SHA256 (handbrake/faad2-2.7.tar.gz) = ee26ed1e177c0cd8fa8458a481b14a0b24ca0b51468c8b4c8b676fd3ceccd330
7
SHA256 (handbrake/faad2-2.7.tar.gz) = ee26ed1e177c0cd8fa8458a481b14a0b24ca0b51468c8b4c8b676fd3ceccd330
8
SIZE (handbrake/faad2-2.7.tar.gz) = 1137407
8
SIZE (handbrake/faad2-2.7.tar.gz) = 1137407
9
SHA256 (handbrake/fdk-aac-v0.1.1-6-gbae4553.tar.bz2) = f08584d59a02db5facf548ae860c64d2870db63477f605af763c161a1508dcbc
10
SIZE (handbrake/fdk-aac-v0.1.1-6-gbae4553.tar.bz2) = 1843256
11
SHA256 (handbrake/libav-v10.1.tar.bz2) = bc3807426d4e73fe8c245730b0df4ba95766cf7e17e47c738ee302f73d066ac9
9
SHA256 (handbrake/libav-v10.1.tar.bz2) = bc3807426d4e73fe8c245730b0df4ba95766cf7e17e47c738ee302f73d066ac9
12
SIZE (handbrake/libav-v10.1.tar.bz2) = 5325944
10
SIZE (handbrake/libav-v10.1.tar.bz2) = 5325944
13
SHA256 (handbrake/libbluray-0.5.0.tar.bz2) = d414b548ff97c081e1a2f337c0904f44e65d91a00d2efa4a46a1ecd3de285b4d
11
SHA256 (handbrake/libbluray-0.5.0.tar.bz2) = d414b548ff97c081e1a2f337c0904f44e65d91a00d2efa4a46a1ecd3de285b4d
Lines 22-26 Link Here
22
SIZE (handbrake/libvpx-v1.3.0.tar.bz2) = 2084229
20
SIZE (handbrake/libvpx-v1.3.0.tar.bz2) = 2084229
23
SHA256 (handbrake/x264-r2479-dd79a61.tar.gz) = 7307a83085f4110f8ae690748f00b5acb4882ec34b83ef260fec264c018c49e9
21
SHA256 (handbrake/x264-r2479-dd79a61.tar.gz) = 7307a83085f4110f8ae690748f00b5acb4882ec34b83ef260fec264c018c49e9
24
SIZE (handbrake/x264-r2479-dd79a61.tar.gz) = 785781
22
SIZE (handbrake/x264-r2479-dd79a61.tar.gz) = 785781
25
SHA256 (handbrake/x265-9329-0d30d2641875-1.5.tar.bz2) = ff9ef4c9aae3b20497b4d1630bd89c1079a7904ac01227ba35366b9c5f9586d4
23
SHA256 (handbrake/x265_1.9.tar.gz) = 3e4654133ed957a98708fdb4cb9a154d9e80922b84e26e43fc462a101c5b15c8
26
SIZE (handbrake/x265-9329-0d30d2641875-1.5.tar.bz2) = 588124
24
SIZE (handbrake/x265_1.9.tar.gz) = 956101

Return to bug 208334