Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 25 Nov 2004 15:50:11 +1300
From:      Andrew Thompson <andy@fud.org.nz>
To:        FreeBSD-gnats-submit@FreeBSD.org
Subject:   ports/74353: [maintainer-update] Fix multimedia/handbrake build on 4.x
Message-ID:  <20041125025011.GE8496@thingy.tbd.co.nz>
Resent-Message-ID: <200411250250.iAP2oHL3083317@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         74353
>Category:       ports
>Synopsis:       [maintainer-update] Fix multimedia/handbrake build on 4.x
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Nov 25 02:50:17 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator:     Andrew Thompson
>Release:        FreeBSD 5.3-BETA6 i386
>Organization:
>Environment:
System: FreeBSD hudson.fire.org.nz 5.3-BETA6 FreeBSD 5.3-BETA6 #0: Sat Oct 16 09:21:06 NZDT 2004 root@hudson.fire.org.nz:/usr/obj/usr/src/sys/HUDSON i386

>Description:
	A few fixups:
	
	* add -lcipher and -lgnugetopt to 4.x to fix build
	* remove --enable-faad from ffmpeg, its a decoder, not needed and 
	  also not in lib_deps
	* remove -Wall from ffmpeg, users dont need to see the oodles of warnings
	 
>How-To-Repeat:
>Fix:

Apply diff



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) ;
+ }
>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20041125025011.GE8496>