Attachment 92088 Details for Bug 129668 – file.diff

[patch] file.diff

file.diff (text/plain), 34.03 KB, created by jonathan on 2008-12-16 00:40:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: jonathan

Created: 2008-12-16 00:40:01 UTC

Size: 34.03 KB

patch

obsolete

>diff -ruN /usr/ports/multimedia/handbrake/Makefile ./Makefile
>--- /usr/ports/multimedia/handbrake/Makefile	2008-07-17 17:06:10.000000000 -0400
>+++ ./Makefile	2008-12-15 19:01:03.720282172 -0500
>@@ -1,59 +1,47 @@
> # New ports collection makefile for: handbrake
>-# Date created:        19 November 2004
>-# Whom:                Andrew Thompson <andy@fud.org.nz>
>+# Date created:		19 November 2004
>+# Whom:				Andrew Thompson <andy@fud.org.nz>
> #
> # $FreeBSD: ports/multimedia/handbrake/Makefile,v 1.24 2008/07/17 21:06:10 erwin Exp $
> #
> 
>-PORTNAME=	handbrake
>-PORTVERSION=	0.9.2
>-CATEGORIES=	multimedia
>-MASTER_SITES=	http://download.handbrake.fr/handbrake/releases/:main \
>-		http://download.m0k.org/handbrake/releases/:main \
>-		http://download.handbrake.fr/handbrake/contrib/:contrib \
>-		http://download.m0k.org/handbrake/contrib/:contrib
>-DISTFILES=	HandBrake-${PORTVERSION}.tar.gz:main \
>-		faac-1.24.tar.gz:contrib \
>-		lame-3.96.1.tar.gz:contrib \
>-		libdca-r81-strapped.tar.gz:contrib \
>-		libdvdcss-1.2.9.tar.gz:contrib \
>-		libdvdread-0.9.7.tar.gz:contrib \
>-		libmkv-0.6.1.3.tar.gz:contrib \
>-		libogg-1.1.2.tar.gz:contrib \
>-		libvorbis-aotuv_b5.tar.gz:contrib \
>-		mpeg2dec-0.4.1.tar.gz:contrib \
>-		mpeg4ip-1.3.tar.gz:contrib \
>-		xvidcore-1.1.2.tar.gz:contrib \
>-		ffmpeg-9816.tar.gz:contrib \
>-		x264-r736.tar.gz:contrib \
>-		a52dec-0.7.4.tar.gz:contrib \
>-		libsamplerate-0.1.2.tar.gz:contrib
>+PORTNAME=		handbrake
>+PORTVERSION=	0.9.3
>+CATEGORIES=		multimedia
>+MASTER_SITES=	http://download.m0k.org/handbrake/releases/:main \
>+				http://download.m0k.org/handbrake/contrib/:contrib
>+DISTFILES=		HandBrake-${PORTVERSION}.tar.gz:main \
>+				a52dec-0.7.4.tar.gz:contrib \
>+				faad2-2.6.1.tar.gz:contrib \
>+				ffmpeg-r15462.tar.gz:contrib \
>+				libdca-r81-strapped.tar.gz:contrib \
>+				libdvdread-0.9.7.tar.gz:contrib \
>+				faac-1.26.tar.gz:contrib \
>+				lame-3.98.tar.gz:contrib \
>+				libmp4v2-r45.tar.gz:contrib \
>+				libmkv-0.6.3.tar.gz:contrib \
>+				mpeg2dec-0.5.1.tar.gz:contrib \
>+				libogg-1.1.3.tar.gz:contrib \
>+				libsamplerate-0.1.4.tar.gz:contrib \
>+				libvorbis-aotuv_b5.tar.gz:contrib \
>+				libtheora-1.0.tar.gz:contrib \
>+				x264-r1028-83baa7f.tar.gz:contrib \
>+				xvidcore-1.1.3.tar.gz:contrib
> DIST_SUBDIR=	handbrake
> 
>-MAINTAINER=	jonathan@kc8onw.net
>+MAINTAINER=		jonathan@kc8onw.net
> COMMENT=	A DVD to MPEG-4 ripper and encoder
> 
> BUILD_DEPENDS=	jam:${PORTSDIR}/devel/jam \
> 		pkg-config:${PORTSDIR}/devel/pkg-config
> LIB_DEPENDS=	freetype.9:${PORTSDIR}/print/freetype2
> 
>-NO_CDROM=	CSS code may violate the DMCA
>-
> USE_GMAKE=	yes
>-HAS_CONFIGURE=	yes
>+
> USE_AUTOTOOLS=	libtool:15
>-LIBTOOLFILES=	${WRKSRC}/contrib/a52dec/configure \
>-		${WRKSRC}/contrib/libdvdcss/configure \
>-		${WRKSRC}/contrib/libdvdread/configure \
>-		${WRKSRC}/contrib/faac/configure \
>-		${WRKSRC}/contrib/lame/configure \
>-		${WRKSRC}/contrib/mpeg4ip/configure \
>-		${WRKSRC}/contrib/mpeg2dec/configure \
>-		${WRKSRC}/contrib/libogg/configure \
>-		${WRKSRC}/contrib/libsamplerate/configure \
>-		${WRKSRC}/contrib/libvorbis/configure
>+LIBTOOLFILES=	${WRKSRC}/configure
> 
>-WRKSRC=		${WRKDIR}/HandBrake
>+WRKSRC=		${WRKDIR}/HandBrake-0.9.3
> PLIST_FILES=	bin/handbrake
> 
> JAM?=		${LOCALBASE}/bin/jam
>@@ -61,10 +49,6 @@
> 
> .include <bsd.port.pre.mk>
> 
>-.if ${ARCH} == "amd64"
>-BROKEN=		Needs testing
>-.endif
>-
> # nasm/yasm needed by x264
> .if ${ARCH}=="i386"
> BUILD_DEPENDS+=	nasm:${PORTSDIR}/devel/nasm
>@@ -72,52 +56,62 @@
> BUILD_DEPENDS+=	yasm>=0.6.0:${PORTSDIR}/devel/yasm
> .endif
> 
>-CONFIGURE_ENV+=	PKG_CONFIG_PATH=${WRKSRC}/contrib/lib/pkgconfig
>+CONFIGURE_ENV+= PKG_CONFIG_PATH=${WRKSRC}/contrib/lib/pkgconfig
> MAKE_ENV+=	ARCH=${ARCH} MAKE=${GMAKE}
> 
> post-extract:
> 	@${APPLY} "${MV} %1 ${WRKSRC}/contrib/" \
> 		${WRKDIR}/a52dec \
>-		${WRKDIR}/faac \
>+		${WRKDIR}/faad2 \
> 		${WRKDIR}/ffmpeg \
>-		${WRKDIR}/lame \
> 		${WRKDIR}/libdca \
>-		${WRKDIR}/libdvdcss \
> 		${WRKDIR}/libdvdread \
>+		${WRKDIR}/faac \
>+		${WRKDIR}/lame \
>+		${WRKDIR}/libmp4v2 \
> 		${WRKDIR}/libmkv \
>+		${WRKDIR}/mpeg2dec \
> 		${WRKDIR}/libogg \
> 		${WRKDIR}/libsamplerate \
> 		${WRKDIR}/libvorbis \
>-		${WRKDIR}/mpeg2dec \
>-		${WRKDIR}/mpeg4ip \
>+		${WRKDIR}/libtheora \
> 		${WRKDIR}/x264 \
> 		${WRKDIR}/xvidcore
> 
> post-patch:
>-	@${REINPLACE_CMD} -e 's|-pthread|${PTHREAD_LIBS}|g' \
>+	@${REINPLACE_CMD} -e 's|machine/soundcard.h|sys/soundcard.h|g' \
>+		${WRKSRC}/contrib/a52dec/libao/audio_out_oss.c
>+	# Remove the ports extraction code as it has already been done in post-extract:
>+	# Fix a hardcoded "make" so gmake is used properly
>+	# Remove a hardcoded "bash"
>+	@${REINPLACE_CMD} -E \
>+		-e 's|rm -rf [a-z0-9.-]* &&||g' \
>+		-e 's|\(gzip.*-) &&||g' \
>+		-e 's|\(gzip.*- ) &&||g' \
>+		-e 's| make | $$(MAKE) |g' \
>+		-e 's|bash ||g' \
>+		${WRKSRC}/contrib/Jamfile
>+
>+	# Following multimedia/x264 replace X86 with i386 and X86_64 with amd64
>+	# This appears to be an issue only when building within the ports system
>+	@${REINPLACE_CMD} -E \
>+		-e 's|,X86)|,i386)|g'  \
>+		-e 's|,X86_64)|,amd64)|g' \
>+		${WRKSRC}/contrib/x264/Makefile
>+	# The following patch fixes CPU count detection
>+	@${REINPLACE_CMD} -E \
>+		-e 's|/usr/sbin/sysctl|/sbin/sysctl|g'	\
>+		${WRKSRC}/libhb/ports.c
>+	# Set release version so we don't depend on subversion
>+	@${REINPLACE_CMD} -E \
>+		-e 's|`svnversion`|0.9.3_freebsd-ports|g'  \
> 		${WRKSRC}/configure
>-	@${REINPLACE_CMD} -e 's|%%CC%%|${CC}|g ; \
>-		s|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|g ; \
>-		s|%%CONTRIB%%|${WRKSRC}/contrib|g ; \
>-		s|./bootstrap|${SETENV} CC="${CC}" CXX="${CXX}" CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" ${CONFIGURE_ENV} ./bootstrap|g ; \
>-		s|./configure|${SETENV} CC="${CC}" CXX="${CXX}" CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" ${CONFIGURE_ENV} ./configure|g' \
>-			${WRKSRC}/contrib/Jamfile
>-	@${REINPLACE_CMD} -e 's|-O3||g ; s|-O20||g ; s|-O4 -ffast-math||g ; \
>-		s| -mtune=.*"|"|g ; s| -mcpu=.*"|"|g ; \
>-		s|-fomit-frame-pointer||g ; s|-pthread|${PTHREAD_LIBS}|g ; \
>-		s|-lpthread|${PTHREAD_LIBS}|g ; \
>-		s|=`echo \".*$$CFLAGS\".*sed.*`|=`echo \"$$OPT_CFLAGS $$CFLAGS\"`|g' \
>-			${WRKSRC}/contrib/*/configure
>-	@${REINPLACE_CMD} -e 's|>&/|>/|g' \
>-		${WRKSRC}/contrib/mpeg4ip/configure
>-	@${REINPLACE_CMD} -e 's|\\$$(PREFIX)|${WRKSRC}/contrib|g ; \
>-		s|$$(PREFIX)|${WRKSRC}/contrib|g ; \
>-		s|$$PREFIX|${WRKSRC}/contrib|g' \
>-			${WRKSRC}/contrib/ffmpeg/configure
>+	@${REINPLACE_CMD} -E \
>+		-e 's|\$$$HB_VERSION$|0.9.3_freebsd-ports|g'	\
>+		${WRKSRC}/Makefile
> 
>-# jam -dx, it will giving a verbose of build.
> do-build:
>-	@(cd ${WRKSRC} ; ${SETENV} ${MAKE_ENV} ${JAM} -dx)
>+	@(cd ${WRKSRC} ; ${SETENV} ${MAKE_ENV} ${JAM} -q)
> 
> do-install:
> 	${INSTALL_PROGRAM} ${WRKSRC}/HandBrakeCLI ${PREFIX}/bin/handbrake
>diff -ruN /usr/ports/multimedia/handbrake/distinfo ./distinfo
>--- /usr/ports/multimedia/handbrake/distinfo	2008-07-17 17:06:10.000000000 -0400
>+++ ./distinfo	2008-11-29 04:06:50.912325000 -0500
>@@ -1,48 +1,54 @@
>-MD5 (handbrake/HandBrake-0.9.2.tar.gz) = d21e0a097699e98f308d8c24dfa1594a
>-SHA256 (handbrake/HandBrake-0.9.2.tar.gz) = d5752e29e67d790be6e4ae2578054e5bc303cac8beade46d1851c0ee7e8860a6
>-SIZE (handbrake/HandBrake-0.9.2.tar.gz) = 1692074
>-MD5 (handbrake/faac-1.24.tar.gz) = 81dc3efd98f1f2da0ac8bfa315284e95
>-SHA256 (handbrake/faac-1.24.tar.gz) = 8eda7b69669f9d57c114d740555eb8bab29e4add90fade1aed41dd2ac1d19df6
>-SIZE (handbrake/faac-1.24.tar.gz) = 627837
>-MD5 (handbrake/lame-3.96.1.tar.gz) = 9a38f646c2b32c4ef50b4f19b0bafcae
>-SHA256 (handbrake/lame-3.96.1.tar.gz) = 93091a5b9342d587a2e97571559ac4cdfbe4a67ec046d7f079d2a0849454e45d
>-SIZE (handbrake/lame-3.96.1.tar.gz) = 1262685
>+MD5 (handbrake/HandBrake-0.9.3.tar.gz) = ee79c94b5acd68f28351ba2704b4d55d
>+SHA256 (handbrake/HandBrake-0.9.3.tar.gz) = 2a776ded48285648aedaa73dd90997a0648473a2d9932203b931e7ef54393d30
>+SIZE (handbrake/HandBrake-0.9.3.tar.gz) = 2067663
>+MD5 (handbrake/faad2-2.6.1.tar.gz) = 5f0f3c24c7ab3971acb03995afedb4a5
>+SHA256 (handbrake/faad2-2.6.1.tar.gz) = f86eb8d089150c92547721136cae7d228924a085a59fbf7b5af3da625acdb25c
>+SIZE (handbrake/faad2-2.6.1.tar.gz) = 849708
>+MD5 (handbrake/faac-1.26.tar.gz) = 1d7c019bd2dbb4f3101b8937ebc59cf6
>+SHA256 (handbrake/faac-1.26.tar.gz) = 4b48e2e22267e9260365c7bee4513bf13d262b8b13cf7f9504e9fa612b6aa951
>+SIZE (handbrake/faac-1.26.tar.gz) = 400915
>+MD5 (handbrake/lame-3.98.tar.gz) = 7036b52e792538fd665595d56b9e49a0
>+SHA256 (handbrake/lame-3.98.tar.gz) = 40235e84dfe4760ad3f352590a64b7bda1502a386c97d06229df356426e37686
>+SIZE (handbrake/lame-3.98.tar.gz) = 1411318
> MD5 (handbrake/libdca-r81-strapped.tar.gz) = 448bab6df6e4f738e4afaa6ebc085d65
> SHA256 (handbrake/libdca-r81-strapped.tar.gz) = ab2519af6c2f12411a2bd674b83615af9b0d5fb09f28ad5dab714ea1bfab9df1
> SIZE (handbrake/libdca-r81-strapped.tar.gz) = 523282
>-MD5 (handbrake/libdvdcss-1.2.9.tar.gz) = 3d15875225e8738e9a8300bede32fbab
>-SHA256 (handbrake/libdvdcss-1.2.9.tar.gz) = f967f061a41c9e9fe21cca1ef1fc0e7c377145fa23c39d9df8d16a3af5b623bc
>-SIZE (handbrake/libdvdcss-1.2.9.tar.gz) = 390930
> MD5 (handbrake/libdvdread-0.9.7.tar.gz) = a89a8532d5f850014f375bd3f5972082
> SHA256 (handbrake/libdvdread-0.9.7.tar.gz) = 18cf0ee3887264f09f2e23672923aec821ae9b806415ae0d78d0e310c1304c1f
> SIZE (handbrake/libdvdread-0.9.7.tar.gz) = 388570
>-MD5 (handbrake/libmkv-0.6.1.3.tar.gz) = b0a81a416bffe19d54236f241632933c
>-SHA256 (handbrake/libmkv-0.6.1.3.tar.gz) = b116504390d3ec178ecb3cd6fb12e062b62b0909a7f1adcbaba00ed64fe63347
>-SIZE (handbrake/libmkv-0.6.1.3.tar.gz) = 329899
>-MD5 (handbrake/libogg-1.1.2.tar.gz) = 4018e57063a9e5ce35145d73bea4b18b
>-SHA256 (handbrake/libogg-1.1.2.tar.gz) = 0572ac9027caadb6ee4c2e3c87f98b045a66216ff2006041b12fceb5fb2f0332
>-SIZE (handbrake/libogg-1.1.2.tar.gz) = 423463
>+MD5 (handbrake/libmkv-0.6.3.tar.gz) = 852f72926c40fb191c1656edc0001753
>+SHA256 (handbrake/libmkv-0.6.3.tar.gz) = 3ad2aee66e26987b3cad63620d84661bd149a8a70e0350f0d762f153f58c68b7
>+SIZE (handbrake/libmkv-0.6.3.tar.gz) = 341121
>+MD5 (handbrake/libogg-1.1.3.tar.gz) = e3b881ea94a6d29749a19b024d2974ef
>+SHA256 (handbrake/libogg-1.1.3.tar.gz) = 645676dd006c8424fde52df2edd0f52d6402b12c563b50c46e9540083241d50c
>+SIZE (handbrake/libogg-1.1.3.tar.gz) = 401303
> MD5 (handbrake/libvorbis-aotuv_b5.tar.gz) = e282d60273dcc8cc6602f65b434f3591
> SHA256 (handbrake/libvorbis-aotuv_b5.tar.gz) = 1e3c5b974e3d16a924eb0af12516a2b0b14aae24d46d32395cd997d833e84509
> SIZE (handbrake/libvorbis-aotuv_b5.tar.gz) = 1345888
>-MD5 (handbrake/mpeg2dec-0.4.1.tar.gz) = 1b446bb8e627b21820b065fd7071214b
>-SHA256 (handbrake/mpeg2dec-0.4.1.tar.gz) = 8029b7d96dbcee9dc2d140fd872a2cded3eadb8cb6679dc75edc717c18445c44
>-SIZE (handbrake/mpeg2dec-0.4.1.tar.gz) = 498874
>+MD5 (handbrake/mpeg2dec-0.5.1.tar.gz) = a6173dc90cfe7f0414624c3c8bbad727
>+SHA256 (handbrake/mpeg2dec-0.5.1.tar.gz) = 161539061aa89864968a5150ed6c6a028a830c4868f7dd7c500732baef47fb71
>+SIZE (handbrake/mpeg2dec-0.5.1.tar.gz) = 522405
> MD5 (handbrake/mpeg4ip-1.3.tar.gz) = fdc1b857485842f8daa2b17d77a45e69
> SHA256 (handbrake/mpeg4ip-1.3.tar.gz) = 052b2fc6a880a3c7834a9a60b9520f6e8e7846534e4c99fb15e6675a75eff2a3
> SIZE (handbrake/mpeg4ip-1.3.tar.gz) = 4719855
>-MD5 (handbrake/xvidcore-1.1.2.tar.gz) = 671480af5816332c86f7ca74a2c90258
>-SHA256 (handbrake/xvidcore-1.1.2.tar.gz) = b7ee6b752e5a4682605ba11bd52b80f02f72f7b1b23721d721e0a1c83f493aa6
>-SIZE (handbrake/xvidcore-1.1.2.tar.gz) = 740185
>-MD5 (handbrake/ffmpeg-9816.tar.gz) = cfc6b97f830eddccbbb82b97ee6e3b78
>-SHA256 (handbrake/ffmpeg-9816.tar.gz) = 23a38e102fa3d2df67e17e21a52d068665580d4fa5bb1d0e6ca4abb5a23894f2
>-SIZE (handbrake/ffmpeg-9816.tar.gz) = 2706937
>-MD5 (handbrake/x264-r736.tar.gz) = ea5dc8c2bfe33dc136687366237556db
>-SHA256 (handbrake/x264-r736.tar.gz) = fb020efbf89e8baf3b1ec93ee05c8cace4557a9658dffb99ef7d3e37521bbf3b
>-SIZE (handbrake/x264-r736.tar.gz) = 794658
>+MD5 (handbrake/xvidcore-1.1.3.tar.gz) = 1416161e20d4b2ca2b8d608fc5cfcac6
>+SHA256 (handbrake/xvidcore-1.1.3.tar.gz) = 1a4a7748e93d3a1a4033fc843d6170f803520c5844047ae75df0269a093bedb6
>+SIZE (handbrake/xvidcore-1.1.3.tar.gz) = 739835
>+MD5 (handbrake/ffmpeg-r15462.tar.gz) = 0330982d8b3ef9d24d0169fda164a182
>+SHA256 (handbrake/ffmpeg-r15462.tar.gz) = 28d2ef1414fa49f5d10d90234b9a06855561f8231a816ef4c060a1aea069eefc
>+SIZE (handbrake/ffmpeg-r15462.tar.gz) = 3154052
>+MD5 (handbrake/x264-r1028-83baa7f.tar.gz) = ccf66883c5e33c30675c3bfad5c31875
>+SHA256 (handbrake/x264-r1028-83baa7f.tar.gz) = ed36cb12f7d98b56d1ce19be22bf9c40c9aa9e46bb718e4505864294af023f83
>+SIZE (handbrake/x264-r1028-83baa7f.tar.gz) = 2325933
> MD5 (handbrake/a52dec-0.7.4.tar.gz) = ce5a978bb359f642dcbd24c6e14a45a7
> SHA256 (handbrake/a52dec-0.7.4.tar.gz) = 54981ab08fc09a675b9924372cf0cca5aa5363b918c4c19065c2d40e2858be47
> SIZE (handbrake/a52dec-0.7.4.tar.gz) = 242978
>-MD5 (handbrake/libsamplerate-0.1.2.tar.gz) = d53fbef1b1674bfee9d4fee5c2d0b627
>-SHA256 (handbrake/libsamplerate-0.1.2.tar.gz) = c2bcb7de8cb15ea6cf68a211db5920fd22beb69071b80823714ecfde7eb398fa
>-SIZE (handbrake/libsamplerate-0.1.2.tar.gz) = 711602
>+MD5 (handbrake/libsamplerate-0.1.4.tar.gz) = 69ec6c05f487458f688dda8f3e722e5d
>+SHA256 (handbrake/libsamplerate-0.1.4.tar.gz) = 4b4af3ecaee05c8875a9b113c6a2f816f06f283fb882914e57b21c0b08b67b75
>+SIZE (handbrake/libsamplerate-0.1.4.tar.gz) = 4259244
>+MD5 (handbrake/libtheora-1.0.tar.gz) = d6d8ac6c75a3d0e5995f328c2d721df0
>+SHA256 (handbrake/libtheora-1.0.tar.gz) = 34f82b0b187ae4d8161693f396d1a4457b1bade0ee15c54a46630a2f4bfc33fc
>+SIZE (handbrake/libtheora-1.0.tar.gz) = 1946620
>+MD5 (handbrake/libmp4v2-r45.tar.gz) = b568ba3440c91155f21121c7f378fc14
>+SHA256 (handbrake/libmp4v2-r45.tar.gz) = 137cbc22c368c85fcbee8460605d93350044bc4c1a6f781e8d84357ce5f6afe1
>+SIZE (handbrake/libmp4v2-r45.tar.gz) = 461723
>diff -ruN /usr/ports/multimedia/handbrake/files/patch-configure ./files/patch-configure
>--- /usr/ports/multimedia/handbrake/files/patch-configure	2007-12-13 11:50:15.000000000 -0500
>+++ ./files/patch-configure	1969-12-31 19:00:00.000000000 -0500
>@@ -1,16 +0,0 @@
>---- configure.orig	2007-12-07 17:24:34.000000000 -0600
>-+++ configure	2007-12-07 17:25:50.000000000 -0600
>-@@ -1,9 +1,9 @@
>- #! /bin/sh
>- 
>--CC="gcc"
>--CXX="g++"
>--CCFLAGS="$CCFLAGS -Wall -g"
>--OPTIM="$OPTIM -O3 -funroll-loops"
>-+CC="${CC-gcc}"
>-+CXX="${CXX-g++}"
>-+CCFLAGS="${CFLAGS--Wall -g}"
>-+OPTIM=""
>- LINKLIBS="-lz"
>- 
>- # System-specific flags
>diff -ruN /usr/ports/multimedia/handbrake/files/patch-contrib-Jamfile ./files/patch-contrib-Jamfile
>--- /usr/ports/multimedia/handbrake/files/patch-contrib-Jamfile	2008-07-17 17:06:11.000000000 -0400
>+++ ./files/patch-contrib-Jamfile	2008-11-28 10:46:50.234631000 -0500
>@@ -1,5 +1,5 @@
>---- contrib/Jamfile.orig	2008-05-21 05:18:06.844254734 +0300
>-+++ contrib/Jamfile	2008-05-21 06:00:18.032459924 +0300
>+--- contrib/Jamfile.orig        2008-11-28 10:27:18.908822069 -0500
>++++ contrib/Jamfile     2008-11-28 10:27:21.787542159 -0500
> @@ -34,9 +34,10 @@
>  }
>  actions Wget
>@@ -14,238 +14,21 @@
>  }
>  
>  # liba52
>-@@ -48,10 +49,9 @@
>- actions LibA52
>- {
>- 
>--    cd `dirname $(>)` && CONTRIB=`pwd` &&
>--    rm -rf a52dec && (gzip -dc a52dec.tar.gz | tar xf -) && 
>--    cd a52dec && $(PATCH) -p1 < ../patch-a52dec.patch &&
>--    ./configure --prefix=$CONTRIB --cache-file=$CONTRIB/config.cache && $(MAKE) && $(MAKE) install &&
>-+    CONTRIB=%%CONTRIB%% &&
>-+    cd $CONTRIB/a52dec && patch -p1 < ../patch-a52dec.patch &&
>-+    ./configure --prefix=$CONTRIB && $(MAKE) && $(MAKE) install &&
>-     $(STRIP) $CONTRIB/lib/liba52.a
>- }
>- Wget   $(SUBDIR)/a52dec.tar.gz : $(SUBDIR)/version_a52dec.txt ;
>-@@ -75,10 +75,9 @@
>- }
>- actions LibAvCodec
>- {
>--    cd `dirname $(>)` && CONTRIB=`pwd` &&
>--    rm -rf ffmpeg && (gzip -dc ffmpeg.tar.gz | tar xf -) &&
>--    cd ffmpeg && $(FFMPEG_PATCH) &&
>--    ./configure --prefix=$CONTRIB --enable-gpl --enable-pthreads --enable-swscaler --disable-audio-beos --disable-shared --enable-static \
>-+    CONTRIB=%%CONTRIB%% &&
>-+    cd $CONTRIB/ffmpeg && $(FFMPEG_PATCH) &&
>-+    ./configure --prefix="$CONTRIB" --cc="%%CC%%" --extra-libs="%%PTHREAD_LIBS%%" --enable-gpl --enable-pthreads --enable-swscaler --disable-audio-beos --disable-shared --enable-static --disable-opts \
>-         --disable-decoders --enable-decoder=mp2 --disable-parsers --enable-parser=mpegaudio \
>-         --disable-encoders --enable-encoder=mpeg4 --enable-encoder=ac3 --enable-encoder=snow \
>-         --disable-muxers --enable-muxer=ipod --disable-demuxers --disable-protocols --disable-bsfs &&
>-@@ -113,10 +112,9 @@
>-     }
>-     actions LibDvdCss
>-     {
>--        cd `dirname $(>)` && CONTRIB=`pwd` &&
>--        rm -rf libdvdcss && (gzip -dc libdvdcss.tar.gz | tar xf - ) && 
>--        cd libdvdcss &&
>--        ./configure --prefix=$CONTRIB --cache-file=$CONTRIB/config.cache && $(MAKE) && $(MAKE) install &&
>-+        CONTRIB=%%CONTRIB%% &&
>-+        cd $CONTRIB/libdvdcss &&
>-+        ./configure --prefix=$CONTRIB && $(MAKE) && $(MAKE) install &&
>-         $(STRIP) $CONTRIB/lib/libdvdcss.a
>-     }
>-     Wget      $(SUBDIR)/libdvdcss.tar.gz : $(SUBDIR)/version_libdvdcss.txt ;
>-@@ -131,10 +129,9 @@
>- }
>- actions LibDCA
>- {
>--    cd `dirname $(>)` && CONTRIB=`pwd` &&
>--    rm -rf libdca && (gzip -dc libdca.tar.gz | tar xf - ) && 
>--    cd libdca && $(PATCH) -p1 < ../patch-libdca.patch &&
>--    ./configure --prefix=$CONTRIB --cache-file=$CONTRIB/config.cache && $(MAKE) && $(MAKE) install &&
>-+    CONTRIB=%%CONTRIB%% &&
>-+    cd $CONTRIB/libdca && patch -p1 < ../patch-libdca.patch &&
>-+    ./configure --prefix=$CONTRIB && $(MAKE) && $(MAKE) install &&
>-     $(STRIP) $CONTRIB/lib/libdca.a
>- }
>- Wget   $(SUBDIR)/libdca.tar.gz : $(SUBDIR)/version_libdca.txt ;
>-@@ -150,10 +147,9 @@
>- {
>-     actions LibDvdRead
>-     {
>--        cd `dirname $(>)` && CONTRIB=`pwd` &&
>--        rm -rf libdvdread && (gzip -dc libdvdread.tar.gz | tar xf - ) && 
>--        cd libdvdread &&
>--        ./configure --prefix=$CONTRIB --cache-file=$CONTRIB/config.cache --disable-shared --with-libdvdcss=$CONTRIB &&
>-+        CONTRIB=%%CONTRIB%% &&
>-+        cd $CONTRIB/libdvdread &&
>-+        ./configure --prefix=$CONTRIB --disable-shared --with-libdvdcss=$CONTRIB &&
>-         $(MAKE) && $(MAKE) install &&
>-         $(STRIP) $CONTRIB/lib/libdvdread.a
>+@@ -99,6 +100,16 @@
>+        FFMPEG_EXTRA_OPTIONS = "--disable-vis --disable-demuxer=mpc8 --disable-vhook --disable-network" ;
>      }
>-@@ -163,10 +159,9 @@
>-     # configure line.
>-     actions LibDvdRead
>-     {
>--        cd `dirname $(>)` && CONTRIB=`pwd` &&
>--        rm -rf libdvdread && (gzip -dc libdvdread.tar.gz | tar xf - ) && 
>--        cd libdvdread &&
>--        ./configure --prefix=$CONTRIB --cache-file=$CONTRIB/config.cache --disable-shared &&
>-+        CONTRIB=%%CONTRIB%% &&
>-+        cd $CONTRIB/libdvdread &&
>-+        ./configure --prefix=$CONTRIB --disable-shared &&
>-         $(MAKE) && $(MAKE) install &&
>-         $(STRIP) $CONTRIB/lib/libdvdread.a
>-     }
>-@@ -182,9 +177,9 @@
>- }
>- actions LibFaac
>- {
>--    cd `dirname $(>)` && CONTRIB=`pwd` &&
>--    rm -rf faac && (gzip -dc faac.tar.gz | tar xf - ) && cd faac &&
>--    ./configure --prefix=$CONTRIB --cache-file=$CONTRIB/config.cache --disable-shared --enable-static &&
>-+    CONTRIB=%%CONTRIB%% &&
>-+    cd $CONTRIB/faac &&
>-+    ./configure --prefix=$CONTRIB --disable-shared --enable-static &&
>-     $(MAKE) && $(MAKE) install &&
>-     $(STRIP) $CONTRIB/lib/libfaac.a
>- }
>-@@ -199,9 +194,9 @@
>- }
>- actions LibMp3Lame
>- {
>--    cd `dirname $(>)` && CONTRIB=`pwd` &&
>--    rm -rf lame && (gzip -dc lame.tar.gz | tar xf - ) && cd lame &&
>--    ./configure --prefix=$CONTRIB --cache-file=$CONTRIB/config.cache --disable-shared &&
>-+    CONTRIB=%%CONTRIB%% &&
>-+    cd $CONTRIB/lame &&
>-+    ./configure --prefix=$CONTRIB --disable-shared &&
>-     $(MAKE) && $(MAKE) install &&
>-     $(STRIP) $CONTRIB/lib/libmp3lame.a
>- }
>-@@ -224,10 +219,10 @@
>- }
>- actions LibMp4v2
>- {
>--    cd `dirname $(>)` && CONTRIB=`pwd` &&
>--    rm -rf mpeg4ip && (gzip -dc mpeg4ip.tar.gz | tar xf - ) &&
>--    cd mpeg4ip && $(LIBMP4V2_PATCH)
>--    ./bootstrap --cache-file=$CONTRIB/config.cache --disable-mp3lame --disable-faac --disable-x264 --disable-server --disable-player &&
>-+    CONTRIB=%%CONTRIB%% &&
>-+    cd $CONTRIB/mpeg4ip &&
>-+    $(LIBMP4V2_PATCH)
>-+    ./bootstrap --disable-mp3lame --disable-faac --disable-x264 --disable-server --disable-player &&
>-     $(MAKE) -C lib/mp4v2 libmp4v2.la && cp lib/mp4v2/.libs/libmp4v2.a $CONTRIB/lib &&
>-     cp mpeg4ip_config.h include/mpeg4ip.h include/mpeg4ip_version.h \
>-         include/mpeg4ip_win32.h lib/mp4v2/*.h $CONTRIB/include &&
>-@@ -243,10 +238,9 @@
>- }
>- actions LibMkv
>- {
>--    cd `dirname $(>)` && CONTRIB=`pwd` &&
>--    rm -rf libmkv && (gzip -dc libmkv.tar.gz | tar xf - ) && 
>--    cd libmkv &&
>--    ./configure --disable-shared --enable-static --prefix=$CONTRIB --cache-file=$CONTRIB/config.cache &&
>-+    CONTRIB=%%CONTRIB%% &&
>-+    cd $CONTRIB/libmkv &&
>-+    ./configure --disable-shared --enable-static --prefix=$CONTRIB &&
>-     $(MAKE) && $(MAKE) install &&
>-     $(STRIP) $CONTRIB/lib/libmkv.a
>- }
>-@@ -261,10 +255,9 @@
>- }
>- actions LibMpeg2
>- {
>--    cd `dirname $(>)` && CONTRIB=`pwd` &&
>--    rm -rf mpeg2dec && (gzip -dc mpeg2dec.tar.gz | tar xf - ) && 
>--    cd mpeg2dec && $(PATCH) -p1 < ../patch-libmpeg2.patch &&
>--    ./configure --prefix=$CONTRIB --cache-file=$CONTRIB/config.cache --disable-shared --disable-sdl &&
>-+    CONTRIB=%%CONTRIB%% &&
>-+    cd $CONTRIB/mpeg2dec && patch -p1 < ../patch-libmpeg2.patch &&
>-+    ./configure --prefix=$CONTRIB --disable-shared --disable-sdl &&
>-     $(MAKE) && $(MAKE) install &&
>-     $(STRIP) $CONTRIB/lib/libmpeg2.a
>- }
>-@@ -279,10 +272,9 @@
>- }
>- actions LibOgg
>- {
>--    cd `dirname $(>)` && CONTRIB=`pwd` &&
>--    rm -rf libogg && (gzip -dc libogg.tar.gz | tar xf - ) && 
>--    cd libogg &&
>--    ./configure --prefix=$CONTRIB --cache-file=$CONTRIB/config.cache --disable-shared &&
>-+    CONTRIB=%%CONTRIB%% &&
>-+    cd $CONTRIB/libogg &&
>-+    ./configure --prefix=$CONTRIB --disable-shared &&
>-     $(MAKE) && $(MAKE) install &&
>-     $(STRIP) $CONTRIB/lib/libogg.a
>- }
>-@@ -297,10 +289,9 @@
>- }
>- actions LibSampleRate
>- {
>--    cd `dirname $(>)` && CONTRIB=`pwd` &&
>--    rm -rf libsamplerate && (gzip -dc libsamplerate.tar.gz | tar xf - ) && 
>--    cd libsamplerate &&
>--    ./configure --prefix=$CONTRIB --cache-file=$CONTRIB/config.cache --disable-shared &&
>-+    CONTRIB=%%CONTRIB%% &&
>-+    cd $CONTRIB/libsamplerate &&
>-+    ./configure --prefix=$CONTRIB --disable-shared &&
>-     $(MAKE) && $(MAKE) install &&
>-     $(STRIP) $CONTRIB/lib/libsamplerate.a
>- }
>-@@ -315,10 +306,9 @@
>- }
>- actions LibVorbis
>- {
>--    cd `dirname $(>)` && CONTRIB=`pwd` &&
>--    rm -rf libvorbis && (gzip -dc libvorbis.tar.gz | tar xf - ) &&
>--    cd libvorbis &&
>--    ./configure --prefix=$CONTRIB --with-ogg=$CONTRIB --cache-file=$CONTRIB/config.cache --disable-shared &&
>-+    CONTRIB=%%CONTRIB%% &&
>-+    cd $CONTRIB/libvorbis &&
>-+    ./configure --prefix=$CONTRIB --with-ogg=$CONTRIB --disable-shared &&
>-     $(MAKE) && $(MAKE) install &&
>-     $(STRIP) $CONTRIB/lib/libvorbis.a
>- }
>-@@ -356,10 +346,9 @@
>- }
>- actions LibX264
>- {
>--    cd `dirname $(>)` && CONTRIB=`pwd` &&
>--    rm -rf x264 && (gzip -dc x264.tar.gz | tar xf - ) && 
>--    cd x264 && $(LIBX264_PATCH)
>--    bash ./configure --prefix=$CONTRIB --enable-pthread &&
>-+    CONTRIB=%%CONTRIB%% &&
>-+    cd $CONTRIB/x264 && $(LIBX264_PATCH)
>-+    ./configure --prefix=$CONTRIB --enable-pthread && $(MAKE) &&
>-     $(MAKE) libx264.a && cp libx264.a $CONTRIB/lib/ && cp x264.h $CONTRIB/include/ && $(STRIP) $CONTRIB/lib/libx264.a
>- }
>- Wget    $(SUBDIR)/x264.tar.gz   : $(SUBDIR)/version_x264.txt ;
>-@@ -383,10 +372,9 @@
>+ 
>++    if $(OS) = FREEBSD
>++    {
>++       #
>++       # Not all of ffmpeg works on FreeBSD - disable the bits that
>++       # don't. When we get new versions of FFMPEG we can try enabling
>++       # them again.
>++       #
>++       FFMPEG_EXTRA_OPTIONS = "--disable-devices" ;
>++    }
>++
>+     Depends $(<) : $(>) ;
>+     Depends lib  : $(<) ;
>  }
>- actions LibXvidCore
>- {
>--    cd `dirname $(>)` && CONTRIB=`pwd` &&
>--    rm -rf xvidcore && (gzip -dc xvidcore.tar.gz | tar xf - ) &&
>--    cd xvidcore && $(LIBXVIDCORE_PATCH)
>--    cd build/generic/ && ./configure --prefix=$CONTRIB --cache-file=$CONTRIB/config.cache && $(MAKE) libxvidcore.a &&
>-+    CONTRIB=%%CONTRIB%% &&
>-+    cd $CONTRIB/xvidcore && $(LIBXVIDCORE_PATCH)
>-+    cd build/generic/ && ./configure --prefix=$CONTRIB && $(MAKE) libxvidcore.a &&
>-     cp ./=build/libxvidcore.a $CONTRIB/lib/ &&
>-     cp ../../src/xvid.h $CONTRIB/include/ &&
>-     $(STRIP) $CONTRIB/lib/libxvidcore.a
>-@@ -404,9 +392,8 @@
>-     }
>-     actions Zlib
>-     {
>--        cd `dirname $(>)` && CONTRIB=`pwd` &&
>--        rm -rf zlib && (gzip -dc zlib.tar.gz | tar xf - ) &&
>--        cd zlib && ./configure --prefix=$CONTRIB &&
>-+        CONTRIB=%%CONTRIB%% &&
>-+        cd $CONTRIB/zlib && ./configure --prefix=$CONTRIB &&
>-         $(MAKE) && $(MAKE) install && touch $CONTRIB/.contrib &&
>-         $(STRIP) $CONTRIB/lib/libz.a
>-     }
>+
>diff -ruN /usr/ports/multimedia/handbrake/files/patch-contrib-a52dec-configure ./files/patch-contrib-a52dec-configure
>--- /usr/ports/multimedia/handbrake/files/patch-contrib-a52dec-configure	2008-02-19 20:19:09.000000000 -0500
>+++ ./files/patch-contrib-a52dec-configure	1969-12-31 19:00:00.000000000 -0500
>@@ -1,11 +0,0 @@
>---- contrib/a52dec/configure.orig	2008-02-19 19:53:29.000000000 +0800
>-+++ contrib/a52dec/configure	2008-02-19 19:54:14.000000000 +0800
>-@@ -9640,7 +9640,7 @@
>- 
>- 
>- 
>--LIBA52_CFLAGS="$LIBA52_CFLAGS -prefer-non-pic"
>-+LIBA52_CFLAGS="$LIBA52_CFLAGS"
>- 
>- # Check whether --enable-double or --disable-double was given.
>- if test "${enable_double+set}" = set; then
>diff -ruN /usr/ports/multimedia/handbrake/files/patch-contrib-a52dec-libao-audio_out_oss.c ./files/patch-contrib-a52dec-libao-audio_out_oss.c
>--- /usr/ports/multimedia/handbrake/files/patch-contrib-a52dec-libao-audio_out_oss.c	2007-12-13 11:50:15.000000000 -0500
>+++ ./files/patch-contrib-a52dec-libao-audio_out_oss.c	1969-12-31 19:00:00.000000000 -0500
>@@ -1,11 +0,0 @@
>---- ../../work/HandBrake/contrib/a52dec/libao/audio_out_oss.c	2002-04-28 12:23:02.000000000 +0200
>-+++ contrib/a52dec/libao/audio_out_oss.c	2007-12-06 03:06:05.000000000 +0100
>-@@ -35,7 +35,7 @@
>- #if defined(__OpenBSD__)
>- #include <soundcard.h>
>- #elif defined(__FreeBSD__)
>--#include <machine/soundcard.h>
>-+#include <sys/soundcard.h>
>- #ifndef AFMT_S16_NE
>- #include <machine/endian.h>
>- #if BYTE_ORDER == LITTLE_ENDIAN
>diff -ruN /usr/ports/multimedia/handbrake/files/patch-contrib-libavformat-udp.c ./files/patch-contrib-libavformat-udp.c
>--- /usr/ports/multimedia/handbrake/files/patch-contrib-libavformat-udp.c	1969-12-31 19:00:00.000000000 -0500
>+++ ./files/patch-contrib-libavformat-udp.c	2008-11-28 11:18:38.083560000 -0500
>@@ -0,0 +1,10 @@
>+--- contrib/ffmpeg/libavformat/udp.c.orig	2008-11-28 11:10:53.217812028 -0500
>++++ contrib/ffmpeg/libavformat/udp.c	2008-11-28 11:11:20.566271071 -0500
>+@@ -29,6 +29,7 @@
>+ #include <unistd.h>
>+ #include "network.h"
>+ #include "os_support.h"
>++#define IPPROTO_IPV6            41              /* IP6 header */
>+ 
>+ #ifndef IPV6_ADD_MEMBERSHIP
>+ #define IPV6_ADD_MEMBERSHIP IPV6_JOIN_GROUP
>diff -ruN /usr/ports/multimedia/handbrake/files/patch-contrib-libsamplerate-configure ./files/patch-contrib-libsamplerate-configure
>--- /usr/ports/multimedia/handbrake/files/patch-contrib-libsamplerate-configure	2007-12-13 11:50:15.000000000 -0500
>+++ ./files/patch-contrib-libsamplerate-configure	1969-12-31 19:00:00.000000000 -0500
>@@ -1,20 +0,0 @@
>---- ../../work/HandBrake/contrib/libsamplerate/configure	2004-09-12 04:57:51.000000000 +0200
>-+++ contrib/libsamplerate/configure	2007-12-06 03:14:12.000000000 +0100
>-@@ -22293,7 +22293,7 @@
>- # Now use the information from the checking stage.
>- 
>- # Need to make examples directory before tests directory.
>--subdirs="src doc examples tests"
>-+subdirs="src doc examples"
>- 
>- 
>- cat >>confdefs.h <<\_ACEOF
>-@@ -22321,7 +22321,7 @@
>- 
>- 
>- 
>--                                                                                                    ac_config_files="$ac_config_files Makefile src/Version_script Win32/Makefile Win32/Makefile.mingw src/Makefile examples/Makefile tests/Makefile doc/Makefile libsamplerate.spec samplerate.pc"
>-+                                                                                                    ac_config_files="$ac_config_files Makefile src/Version_script Win32/Makefile Win32/Makefile.mingw src/Makefile examples/Makefile doc/Makefile libsamplerate.spec samplerate.pc"
>- 
>- cat >confcache <<\_ACEOF
>- # This file is a shell script that caches the results of configure
>diff -ruN /usr/ports/multimedia/handbrake/files/patch-contrib-mpeg2dec-configure ./files/patch-contrib-mpeg2dec-configure
>--- /usr/ports/multimedia/handbrake/files/patch-contrib-mpeg2dec-configure	2008-02-19 20:19:09.000000000 -0500
>+++ ./files/patch-contrib-mpeg2dec-configure	1969-12-31 19:00:00.000000000 -0500
>@@ -1,11 +0,0 @@
>---- contrib/mpeg2dec/configure.orig	2008-02-19 19:54:39.000000000 +0800
>-+++ contrib/mpeg2dec/configure	2008-02-19 19:55:08.000000000 +0800
>-@@ -23981,7 +23981,7 @@
>-     cd ..; rm -fr ac_test_libtool; echo "$as_me:$LINENO: result: $ac_cv_libtool_non_pic" >&5
>- echo "${ECHO_T}$ac_cv_libtool_non_pic" >&6
>-     if test x"$ac_cv_libtool_non_pic" = x"yes"; then
>--	LIBMPEG2_CFLAGS="$LIBMPEG2_CFLAGS -prefer-non-pic"
>-+	LIBMPEG2_CFLAGS="$LIBMPEG2_CFLAGS"
>-     else
>- 	:
>-     fi
>diff -ruN /usr/ports/multimedia/handbrake/files/patch-contrib-x264-Makefile ./files/patch-contrib-x264-Makefile
>--- /usr/ports/multimedia/handbrake/files/patch-contrib-x264-Makefile	2007-12-13 11:50:15.000000000 -0500
>+++ ./files/patch-contrib-x264-Makefile	1969-12-31 19:00:00.000000000 -0500
>@@ -1,20 +0,0 @@
>---- ../HandBrake_old/contrib/x264/Makefile	2007-07-15 22:45:03.000000000 +0200
>-+++ contrib/x264/Makefile	2007-12-06 01:17:21.000000000 +0100
>-@@ -18,7 +18,7 @@
>- endif
>- 
>- # MMX/SSE optims
>--ifeq ($(ARCH),X86)
>-+ifeq ($(ARCH),i386)
>- ifneq ($(AS),)
>- SRCS   += common/i386/mc-c.c common/i386/predict-c.c
>- ASMSRC  = common/i386/dct-a.asm common/i386/cpu-a.asm \
>-@@ -32,7 +32,7 @@
>- endif
>- 
>- # MMX/SSE optims
>--ifeq ($(ARCH),X86_64)
>-+ifeq ($(ARCH),amd64)
>- ifneq ($(AS),)
>- SRCS   += common/i386/mc-c.c common/i386/predict-c.c
>- ASMSRC  = common/amd64/dct-a.asm common/amd64/cpu-a.asm \
>diff -ruN /usr/ports/multimedia/handbrake/files/patch-contrib-x264-configure ./files/patch-contrib-x264-configure
>--- /usr/ports/multimedia/handbrake/files/patch-contrib-x264-configure	2007-12-13 11:50:15.000000000 -0500
>+++ ./files/patch-contrib-x264-configure	1969-12-31 19:00:00.000000000 -0500
>@@ -1,11 +0,0 @@
>---- ../HandBrake_old/contrib/x264/configure	2007-07-15 22:45:03.000000000 +0200
>-+++ contrib/x264/configure	2007-12-06 01:16:03.000000000 +0100
>-@@ -160,7 +160,7 @@
>-     fi
>-     as_check || AS="nasm"
>-     ;;
>--  x86_64)
>-+  x86_64 | amd64)
>-     ARCH="X86_64"
>-     AS="yasm"
>-     ASFLAGS="-f elf -m amd64"
>diff -ruN /usr/ports/multimedia/handbrake/files/patch-libhb-fifo.c ./files/patch-libhb-fifo.c
>--- /usr/ports/multimedia/handbrake/files/patch-libhb-fifo.c	2008-07-17 17:06:11.000000000 -0400
>+++ ./files/patch-libhb-fifo.c	2008-11-29 03:53:59.155293000 -0500
>@@ -1,13 +1,13 @@
>---- ../../work_old/HandBrake/libhb/fifo.c	2008-02-19 19:28:17.000000000 +0100
>-+++ libhb/fifo.c	2008-06-17 23:02:48.000000000 +0200
>-@@ -6,7 +6,9 @@
>+--- HandBrake_old/libhb/fifo.c	2007-10-08 22:57:08.000000000 +0200
>++++ libhb/fifo.c	2007-12-04 05:55:37.000000000 +0100
>+@@ -6,9 +6,7 @@
>  
>  #include "hb.h"
>  
> -#ifndef SYS_DARWIN
>-+#if defined( SYS_FREEBSD )
>+-#include <malloc.h>
>+-#endif
> +#include <stdlib.h>
>-+#elif !defined( SYS_DARWIN )
>- #include <malloc.h>
>- #endif
>  
>+ /* Fifo */
>+ struct hb_fifo_s
>diff -ruN /usr/ports/multimedia/handbrake/files/patch-libhb-ports.c ./files/patch-libhb-ports.c
>--- /usr/ports/multimedia/handbrake/files/patch-libhb-ports.c	2008-07-17 17:06:11.000000000 -0400
>+++ ./files/patch-libhb-ports.c	1969-12-31 19:00:00.000000000 -0500
>@@ -1,43 +0,0 @@
>---- ../../work/HandBrake/libhb/ports.c	2008-02-19 19:28:17.000000000 +0100
>-+++ libhb/ports.c	2008-06-17 13:20:42.000000000 +0200
>-@@ -30,6 +30,11 @@
>- #include <netinet/in.h>
>- //#endif
>- 
>-+#if defined( SYS_FREEBSD )
>-+#include <sys/types.h>
>-+#include <sys/sysctl.h>
>-+#endif
>-+
>- #include "hb.h"
>- 
>- /************************************************************************
>-@@ -107,7 +112,7 @@
>-         cpu_count = info.cpu_count;
>-     }
>- 
>--#elif defined( SYS_DARWIN ) || defined( SYS_FREEBSD )
>-+#elif defined( SYS_DARWIN )
>-     FILE * info;
>-     char   buffer[16];
>- 
>-@@ -124,6 +129,19 @@
>-         fclose( info );
>-     }
>- 
>-+#elif defined( SYS_FREEBSD )
>-+    {
>-+        int mib[2];
>-+        size_t len;
>-+
>-+        mib[0] = CTL_HW;
>-+        mib[1] = HW_NCPU;
>-+        len = sizeof(cpu_count);
>-+
>-+        if(sysctl(mib, 2, &cpu_count, &len, NULL, 0) != 0)
>-+          cpu_count = 1;
>-+    }
>-+
>- #elif defined( SYS_LINUX )
>-     {
>-         FILE * info;
>diff -ruN /usr/ports/multimedia/handbrake/pkg-descr ./pkg-descr
>--- /usr/ports/multimedia/handbrake/pkg-descr	2008-07-17 17:06:10.000000000 -0400
>+++ ./pkg-descr	2008-12-15 18:46:34.999813632 -0500
>@@ -1,30 +1,19 @@
>-HandBrake is an open-source, GPL-licensed, multiplatform, multithreaded
>-DVD to MPEG-4 converter, available for MacOS X, Linux, Windows and
>-FreeBSD.
>+HandBrake is an open-source, GPL-licensed, multiplatform, multithreaded video
>+transcoder, available for MacOS X, Linux and Windows (...and FreeBSD).
> 
> Supported sources:
> 
>     * Any DVD-like source: VIDEO_TS folder, DVD image or real DVD
>-      (encrypted or unencrypted, but protection methods other than CSS
>-      are not supported and must be handled externally with third-party
>-      software), and some .VOB and .TS files
>-    * PAL or NTSC
>-    * AC-3, DTS, LPCM or MPEG audio tracks
>+    (unencrypted--protection methods including CSS are not supported internally
>+    and must be handled externally with third-party software and libraries), and
>+    some .VOB and .TS files 
>+    * Most any multimedia file it can get libavformat to
>+    read and libavcodec to decode.
> 
> Outputs:
> 
>-    * File format: MP4, MKV, AVI or OGM
>-    * Video: MPEG-4 or H.264 (1 or 2 passes or constant quantizer/rate
>-      encoding)
>-    * Audio: AAC, MP3, Vorbis or AC-3 pass-through (supports encoding
>-      of several audio tracks)
>-
>-Misc features:
>-
>-    * Chapter selection
>-    * Basic subtitle support (burned into the picture)
>-    * Integrated bitrate calculator
>-    * Picture deinterlacing, cropping and scaling
>-    * Grayscale encoding
>-
>-WWW: http://handbrake.fr/
>+    * File format: MP4, MKV, AVI or OGM 
>+    * Video: MPEG-4, H.264, or Theora (1 or 2 passes or constant quantizer/rate
>+      encoding) 
>+    * Audio: AAC, MP3, Vorbis or AC-3 pass-through (supports encoding of several
>+      audio tracks)

Actions: View | Diff

Attachments on bug 129668: 92088 | 92089