Attachment #48593 for bug #74353

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

Lines 55-67 Link Here

(-)multimedia/handbrake/Makefile (-1 / +6 lines)
55	--enable-pthreads \	55	--enable-pthreads \
56	--enable-faac \	56	--enable-faac \
57	--enable-mp3lame \	57	--enable-mp3lame \
58	--enable-faad \
59	--enable-a52 \	58	--enable-a52 \
60	--enable-xvid	59	--enable-xvid
61		60
62	.include <bsd.port.pre.mk>	61	.include <bsd.port.pre.mk>
63		62
64	.if ${OSVERSION} < 500000	63	.if ${OSVERSION} < 500000
		64	USE_GETOPT_LONG= yes
65	WITH_DVD_DEVICE?= acd0c	65	WITH_DVD_DEVICE?= acd0c
66	.else	66	.else
67	WITH_DVD_DEVICE?= acd0	67	WITH_DVD_DEVICE?= acd0
Lines 78-83 Link Here
78	${INSTALL_PROGRAM} ${WRKSRC}/gtk2HB ${PREFIX}/bin/handbrake	78	${INSTALL_PROGRAM} ${WRKSRC}/gtk2HB ${PREFIX}/bin/handbrake
79		79
80	post-patch:	80	post-patch:
		81	.if ${OSVERSION} < 500000
		82	cd ${BUILD_WRKSRC} && \
		83	${PATCH} -p0 < ${PATCHDIR}/freebsd4-Jamfile
		84	.endif
81	@${REINPLACE_CMD} -e 's:%%PREFIX%%:${LOCALBASE}:g' \	85	@${REINPLACE_CMD} -e 's:%%PREFIX%%:${LOCALBASE}:g' \
82	-e 's:%%LIBAVCODEC%%:${FFMPEG_SRC_DIR}/libavcodec:g' \	86	-e 's:%%LIBAVCODEC%%:${FFMPEG_SRC_DIR}/libavcodec:g' \
83	-e 's:%%PTHREAD_LIBS%%:${PTHREAD_LIBS}:g' \	87	-e 's:%%PTHREAD_LIBS%%:${PTHREAD_LIBS}:g' \
Lines 96-101 Link Here
96	${FFMPEG_SRC_DIR}/libavcodec/xvidff.c	100	${FFMPEG_SRC_DIR}/libavcodec/xvidff.c
97	.endif	101	.endif
98	@${REINPLACE_CMD} -e 's\|-lpthread\|${PTHREAD_LIBS}\|' \	102	@${REINPLACE_CMD} -e 's\|-lpthread\|${PTHREAD_LIBS}\|' \
		103	-e 's\|-Wall\|\|' \
99	${FFMPEG_SRC_DIR}/configure	104	${FFMPEG_SRC_DIR}/configure
100	cd ${FFMPEG_SRC_DIR} && \	105	cd ${FFMPEG_SRC_DIR} && \
101	${PATCH} -p0 < ${PATCHDIR}/ffmpeg-patch	106	${PATCH} -p0 < ${PATCHDIR}/ffmpeg-patch




--- /Jamfile	Fri Nov 26 06:03:40 2004
+++ Jamfile	Fri Nov 26 06:07:26 2004
@@ -58,13 +58,14 @@
 {
     HB_LIBS = libhb.a libx264.a ;
     SystemLibraries $(TEST_BIN) : %%LIBAVCODEC%%/libavcodec.a
-    		-L%%PREFIX%%/lib %%PTHREAD_LIBS%% -la52
-    		-ldvdcss -ldvdread -lfaac -lmp3lame -lmp4v2 -lmpeg2 -logg
-		-lsamplerate -lvorbis -lvorbisenc -lxvidcore ;
+    		-L%%PREFIX%%/lib %%PTHREAD_LIBS%% -la52 -lcipher
+    		-ldvdcss -ldvdread -lgnugetopt -lfaac -lmp3lame -lmp4v2
+		-lmpeg2 -logg -lsamplerate -lvorbis -lvorbisenc -lxvidcore ;
     SystemLibraries $(GTK2_BIN) : %%LIBAVCODEC%%/libavcodec.a
     		-L%%PREFIX%%/lib %%PTHREAD_LIBS%% `pkg-config gtk+-2.0 --libs`
-    		-la52 -ldvdcss -ldvdread -lfaac -lmp3lame -lmp4v2
+    		-la52 -lcipher -ldvdcss -ldvdread -lfaac -lmp3lame -lmp4v2
 		-lmpeg2 -logg -lsamplerate -lvorbis -lvorbisenc -lxvidcore ;
+    ObjectCcFlags   $(TEST_SRC) : -I%%PREFIX%%/include ;
     ObjectCcFlags   $(GTK2_SRC) : `pkg-config gtk+-2.0 --cflags` ;
     Main            $(GTK2_BIN) : $(GTK2_SRC) ;
 }

Return to bug 74353

Line 0 Link Here

(-)multimedia/handbrake/files/freebsd4-Jamfile (+21 lines)
	1	--- /Jamfile Fri Nov 26 06:03:40 2004
	2	+++ Jamfile Fri Nov 26 06:07:26 2004
	3	@@ -58,13 +58,14 @@
	4	{
	5	HB_LIBS = libhb.a libx264.a ;
	6	SystemLibraries $(TEST_BIN) : %%LIBAVCODEC%%/libavcodec.a
	7	- -L%%PREFIX%%/lib %%PTHREAD_LIBS%% -la52
	8	- -ldvdcss -ldvdread -lfaac -lmp3lame -lmp4v2 -lmpeg2 -logg
	9	- -lsamplerate -lvorbis -lvorbisenc -lxvidcore ;
	10	+ -L%%PREFIX%%/lib %%PTHREAD_LIBS%% -la52 -lcipher
	11	+ -ldvdcss -ldvdread -lgnugetopt -lfaac -lmp3lame -lmp4v2
	12	+ -lmpeg2 -logg -lsamplerate -lvorbis -lvorbisenc -lxvidcore ;
	13	SystemLibraries $(GTK2_BIN) : %%LIBAVCODEC%%/libavcodec.a
	14	-L%%PREFIX%%/lib %%PTHREAD_LIBS%% `pkg-config gtk+-2.0 --libs`
	15	- -la52 -ldvdcss -ldvdread -lfaac -lmp3lame -lmp4v2
	16	+ -la52 -lcipher -ldvdcss -ldvdread -lfaac -lmp3lame -lmp4v2
	17	-lmpeg2 -logg -lsamplerate -lvorbis -lvorbisenc -lxvidcore ;
	18	+ ObjectCcFlags $(TEST_SRC) : -I%%PREFIX%%/include ;
	19	ObjectCcFlags $(GTK2_SRC) : `pkg-config gtk+-2.0 --cflags` ;
	20	Main $(GTK2_BIN) : $(GTK2_SRC) ;
	21	}