Attachment 48593 Details for Bug 74353 – file.diff

[patch] file.diff

file.diff (text/plain), 2.36 KB, created by Andrew Thompson on 2004-11-25 02:50:17 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Andrew Thompson

Created: 2004-11-25 02:50:17 UTC

Size: 2.36 KB

patch

obsolete

>diff -urN multimedia/handbrake.orig/Makefile multimedia/handbrake/Makefile
>--- multimedia/handbrake.orig/Makefile	Fri Nov 26 06:03:11 2004
>+++ multimedia/handbrake/Makefile	Fri Nov 26 06:38:47 2004
>@@ -55,13 +55,13 @@
> 			--enable-pthreads \
> 			--enable-faac \
> 			--enable-mp3lame \
>-			--enable-faad \
> 			--enable-a52 \
> 			--enable-xvid
> 
> .include <bsd.port.pre.mk>
> 
> .if ${OSVERSION} < 500000
>+USE_GETOPT_LONG=	yes
> WITH_DVD_DEVICE?=	acd0c
> .else
> WITH_DVD_DEVICE?=	acd0
>@@ -78,6 +78,10 @@
> 	${INSTALL_PROGRAM} ${WRKSRC}/gtk2HB ${PREFIX}/bin/handbrake
> 
> post-patch:
>+.if ${OSVERSION} < 500000
>+	cd ${BUILD_WRKSRC} && \
>+		${PATCH} -p0 < ${PATCHDIR}/freebsd4-Jamfile
>+.endif
> 	@${REINPLACE_CMD} -e 's:%%PREFIX%%:${LOCALBASE}:g' \
> 		-e 's:%%LIBAVCODEC%%:${FFMPEG_SRC_DIR}/libavcodec:g' \
> 		-e 's:%%PTHREAD_LIBS%%:${PTHREAD_LIBS}:g' \
>@@ -96,6 +100,7 @@
> 		${FFMPEG_SRC_DIR}/libavcodec/xvidff.c
> .endif
> 	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|' \
>+		-e 's|-Wall||' \
> 		${FFMPEG_SRC_DIR}/configure
> 	cd ${FFMPEG_SRC_DIR} && \
> 		${PATCH} -p0 < ${PATCHDIR}/ffmpeg-patch
>diff -urN multimedia/handbrake.orig/files/freebsd4-Jamfile multimedia/handbrake/files/freebsd4-Jamfile
>--- multimedia/handbrake.orig/files/freebsd4-Jamfile	Thu Jan  1 12:00:00 1970
>+++ multimedia/handbrake/files/freebsd4-Jamfile	Fri Nov 26 06:10:57 2004
>@@ -0,0 +1,21 @@
>+--- /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) ;
>+ }

Actions: View | Diff

Attachments on bug 74353: 48593