ports/123849: [PATCH] update for multimedia/handbrake
Jona Joachim
jaj at hcl-club.lu
Tue Jun 17 21:40:04 UTC 2008
The following reply was made to PR ports/123849; it has been noted by GNATS.
From: Jona Joachim <jaj at hcl-club.lu>
To: bug-followup at FreeBSD.org
Cc: edwin at FreeBSD.org, jonathan at kc8onw.net
Subject: Re: ports/123849: [PATCH] update for multimedia/handbrake
Date: Tue, 17 Jun 2008 23:31:53 +0200
--9amGYk9869ThD9tj
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
The following patch is based on the submitter's diff and does:
- Update multimedia/handbrake to 0.9.2 (current release).
- Make some patches upstream-friendlier.
- Remove some private mirrors (which we shouldn't have in the port according to
the devs).
- Mark broken on amd64. Some people reported trouble (even though it should
build fine). Neither submitter nor me can test on this platform.
- Pass maintainership to the submitter.
Best regards,
Jona (current maintainer)
--9amGYk9869ThD9tj
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment; filename="handbrake.diff"
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/multimedia/handbrake/Makefile,v
retrieving revision 1.23
diff -u -r1.23 Makefile
--- Makefile 20 Feb 2008 01:19:09 -0000 1.23
+++ Makefile 17 Jun 2008 21:25:48 -0000
@@ -6,14 +6,11 @@
#
PORTNAME= handbrake
-PORTVERSION= 0.9.1
+PORTVERSION= 0.9.2
CATEGORIES= multimedia
-MASTER_SITES= http://saintdevelopment.com/mirror/handbrake/:main \
- http://junk.phantomgorilla.com/hb/:main \
- http://daigertech.com/handbrake/:main \
- http://www.mirrors.ausmac.net/ftp/Audio-SW/HandBrake/testing/:main \
- http://asshatandi.com/:main \
- http://download.m0k.org/handbrake/testing/:main \
+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 \
@@ -21,19 +18,19 @@
libdca-r81-strapped.tar.gz:contrib \
libdvdcss-1.2.9.tar.gz:contrib \
libdvdread-0.9.7.tar.gz:contrib \
- libmkv-0.6.1.2.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-r665.tar.gz:contrib \
+ x264-r736.tar.gz:contrib \
a52dec-0.7.4.tar.gz:contrib \
libsamplerate-0.1.2.tar.gz:contrib
DIST_SUBDIR= handbrake
-MAINTAINER= jaj at hcl-club.lu
+MAINTAINER= jonathan at kc8onw.net
COMMENT= A DVD to MPEG-4 ripper and encoder
BUILD_DEPENDS= jam:${PORTSDIR}/devel/jam \
@@ -64,8 +61,8 @@
.include <bsd.port.pre.mk>
-.if ${ARCH} == "amd64" && ${OSVERSION} < 700000
-BROKEN= Does not compile
+.if ${ARCH} == "amd64"
+BROKEN= Needs testing
.endif
# nasm/yasm needed by x264
Index: distinfo
===================================================================
RCS file: /home/ncvs/ports/multimedia/handbrake/distinfo,v
retrieving revision 1.4
diff -u -r1.4 distinfo
--- distinfo 13 Dec 2007 16:50:15 -0000 1.4
+++ distinfo 17 Jun 2008 21:25:48 -0000
@@ -1,6 +1,6 @@
-MD5 (handbrake/HandBrake-0.9.1.tar.gz) = 0eefe9189d59a0bfd9aeee41fd3d01a2
-SHA256 (handbrake/HandBrake-0.9.1.tar.gz) = ae29b03dfd9724d7856f8b44a5a52bc60ad0af2846efe7db302d90dccc57d54b
-SIZE (handbrake/HandBrake-0.9.1.tar.gz) = 1160277
+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
@@ -16,9 +16,9 @@
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.2.tar.gz) = be5d3a31477efb54766c8d9da89e1865
-SHA256 (handbrake/libmkv-0.6.1.2.tar.gz) = 5d14627e98e0e8e3ff94ad11cb37dd5a35e909c5ba6444ef9e8b53b937ff3f3b
-SIZE (handbrake/libmkv-0.6.1.2.tar.gz) = 334575
+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
@@ -37,9 +37,9 @@
MD5 (handbrake/ffmpeg-9816.tar.gz) = cfc6b97f830eddccbbb82b97ee6e3b78
SHA256 (handbrake/ffmpeg-9816.tar.gz) = 23a38e102fa3d2df67e17e21a52d068665580d4fa5bb1d0e6ca4abb5a23894f2
SIZE (handbrake/ffmpeg-9816.tar.gz) = 2706937
-MD5 (handbrake/x264-r665.tar.gz) = a0fbe36eb7b03e61a96dd146e9c1ebbc
-SHA256 (handbrake/x264-r665.tar.gz) = b61d2122ff559867d173413b1f3eba649d614a5a2e3be90642375d79bd79d30e
-SIZE (handbrake/x264-r665.tar.gz) = 751198
+MD5 (handbrake/x264-r736.tar.gz) = ea5dc8c2bfe33dc136687366237556db
+SHA256 (handbrake/x264-r736.tar.gz) = fb020efbf89e8baf3b1ec93ee05c8cace4557a9658dffb99ef7d3e37521bbf3b
+SIZE (handbrake/x264-r736.tar.gz) = 794658
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
Index: pkg-descr
===================================================================
RCS file: /home/ncvs/ports/multimedia/handbrake/pkg-descr,v
retrieving revision 1.3
diff -u -r1.3 pkg-descr
--- pkg-descr 13 Dec 2007 16:50:15 -0000 1.3
+++ pkg-descr 17 Jun 2008 21:25:48 -0000
@@ -27,4 +27,4 @@
* Picture deinterlacing, cropping and scaling
* Grayscale encoding
-WWW: http://handbrake.m0k.org/
+WWW: http://handbrake.fr/
Index: files/patch-contrib-Jamfile
===================================================================
RCS file: /home/ncvs/ports/multimedia/handbrake/files/patch-contrib-Jamfile,v
retrieving revision 1.1
diff -u -r1.1 patch-contrib-Jamfile
--- files/patch-contrib-Jamfile 13 Dec 2007 16:50:15 -0000 1.1
+++ files/patch-contrib-Jamfile 17 Jun 2008 21:25:48 -0000
@@ -1,6 +1,6 @@
---- contrib/Jamfile.orig 2007-10-08 15:57:23.000000000 -0500
-+++ contrib/Jamfile 2007-12-07 17:58:44.000000000 -0600
-@@ -23,9 +23,10 @@
+--- contrib/Jamfile.orig 2008-05-21 05:18:06.844254734 +0300
++++ contrib/Jamfile 2008-05-21 06:00:18.032459924 +0300
+@@ -34,9 +34,10 @@
}
actions Wget
{
@@ -14,26 +14,26 @@
}
# liba52
-@@ -36,10 +37,9 @@
- }
+@@ -48,10 +49,9 @@
actions LibA52
{
--
+
- cd `dirname $(>)` && CONTRIB=`pwd` &&
-- rm -rf a52dec && tar xzf a52dec.tar.gz && cd a52dec && patch -p1 < ../patch-a52dec.patch &&
-- ./configure --prefix=$CONTRIB --cache-file=$CONTRIB/config.cache && make && make install &&
+- 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 -S $CONTRIB/lib/liba52.a
+ $(STRIP) $CONTRIB/lib/liba52.a
}
Wget $(SUBDIR)/a52dec.tar.gz : $(SUBDIR)/version_a52dec.txt ;
-@@ -58,14 +58,13 @@
+@@ -75,10 +75,9 @@
}
actions LibAvCodec
{
- cd `dirname $(>)` && CONTRIB=`pwd` &&
-- rm -rf ffmpeg && tar xzf ffmpeg.tar.gz &&
+- 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%% &&
@@ -42,244 +42,210 @@
--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 &&
-- make && make install &&
-+ $(MAKE) && $(MAKE) install &&
- strip -S $CONTRIB/lib/libavcodec.a
- }
- Wget $(SUBDIR)/ffmpeg.tar.gz : $(SUBDIR)/version_ffmpeg.txt ;
-@@ -96,9 +95,9 @@
+@@ -113,10 +112,9 @@
}
actions LibDvdCss
{
- cd `dirname $(>)` && CONTRIB=`pwd` &&
-- rm -rf libdvdcss && tar xzf libdvdcss.tar.gz && cd libdvdcss &&
-- ./configure --prefix=$CONTRIB --cache-file=$CONTRIB/config.cache && make && make install &&
+- 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 -S $CONTRIB/lib/libdvdcss.a
+ $(STRIP) $CONTRIB/lib/libdvdcss.a
}
Wget $(SUBDIR)/libdvdcss.tar.gz : $(SUBDIR)/version_libdvdcss.txt ;
-@@ -113,9 +112,9 @@
+@@ -131,10 +129,9 @@
}
actions LibDCA
{
- cd `dirname $(>)` && CONTRIB=`pwd` &&
-- rm -rf libdca && tar xzf libdca.tar.gz && cd libdca && patch -p1 < ../patch-libdca.patch &&
-- ./configure --prefix=$CONTRIB --cache-file=$CONTRIB/config.cache && make && make install &&
+- 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 -S $CONTRIB/lib/libdca.a
+ $(STRIP) $CONTRIB/lib/libdca.a
}
Wget $(SUBDIR)/libdca.tar.gz : $(SUBDIR)/version_libdca.txt ;
-@@ -131,10 +130,10 @@
+@@ -150,10 +147,9 @@
{
actions LibDvdRead
{
- cd `dirname $(>)` && CONTRIB=`pwd` &&
-- rm -rf libdvdread && tar xzf libdvdread.tar.gz && cd libdvdread &&
+- 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 &&
-- make && make install &&
+ CONTRIB=%%CONTRIB%% &&
+ cd $CONTRIB/libdvdread &&
+ ./configure --prefix=$CONTRIB --disable-shared --with-libdvdcss=$CONTRIB &&
-+ $(MAKE) && $(MAKE) install &&
- strip -S $CONTRIB/lib/libdvdread.a
+ $(MAKE) && $(MAKE) install &&
+ $(STRIP) $CONTRIB/lib/libdvdread.a
}
- }
-@@ -143,10 +142,10 @@
+@@ -163,10 +159,9 @@
# configure line.
actions LibDvdRead
{
- cd `dirname $(>)` && CONTRIB=`pwd` &&
-- rm -rf libdvdread && tar xzf libdvdread.tar.gz && cd libdvdread &&
+- rm -rf libdvdread && (gzip -dc libdvdread.tar.gz | tar xf - ) &&
+- cd libdvdread &&
- ./configure --prefix=$CONTRIB --cache-file=$CONTRIB/config.cache --disable-shared &&
-- make && make install &&
+ CONTRIB=%%CONTRIB%% &&
+ cd $CONTRIB/libdvdread &&
+ ./configure --prefix=$CONTRIB --disable-shared &&
-+ $(MAKE) && $(MAKE) install &&
- strip -S $CONTRIB/lib/libdvdread.a
+ $(MAKE) && $(MAKE) install &&
+ $(STRIP) $CONTRIB/lib/libdvdread.a
}
- }
-@@ -161,10 +160,10 @@
+@@ -182,9 +177,9 @@
}
actions LibFaac
{
- cd `dirname $(>)` && CONTRIB=`pwd` &&
-- rm -rf faac && tar xzf faac.tar.gz && cd faac &&
+- rm -rf faac && (gzip -dc faac.tar.gz | tar xf - ) && cd faac &&
- ./configure --prefix=$CONTRIB --cache-file=$CONTRIB/config.cache --disable-shared --enable-static &&
-- make && make install &&
+ CONTRIB=%%CONTRIB%% &&
+ cd $CONTRIB/faac &&
+ ./configure --prefix=$CONTRIB --disable-shared --enable-static &&
-+ $(MAKE) && $(MAKE) install &&
- strip -S $CONTRIB/lib/libfaac.a
+ $(MAKE) && $(MAKE) install &&
+ $(STRIP) $CONTRIB/lib/libfaac.a
}
- Wget $(SUBDIR)/faac.tar.gz : $(SUBDIR)/version_faac.txt ;
-@@ -178,10 +177,10 @@
+@@ -199,9 +194,9 @@
}
actions LibMp3Lame
{
- cd `dirname $(>)` && CONTRIB=`pwd` &&
-- rm -rf lame && tar xzf lame.tar.gz && cd lame &&
+- rm -rf lame && (gzip -dc lame.tar.gz | tar xf - ) && cd lame &&
- ./configure --prefix=$CONTRIB --cache-file=$CONTRIB/config.cache --disable-shared &&
-- make && make install &&
+ CONTRIB=%%CONTRIB%% &&
+ cd $CONTRIB/lame &&
+ ./configure --prefix=$CONTRIB --disable-shared &&
-+ $(MAKE) && $(MAKE) install &&
- strip -S $CONTRIB/lib/libmp3lame.a
+ $(MAKE) && $(MAKE) install &&
+ $(STRIP) $CONTRIB/lib/libmp3lame.a
}
- Wget $(SUBDIR)/lame.tar.gz : $(SUBDIR)/version_lame.txt ;
-@@ -197,11 +196,11 @@
- {
- actions LibMp4v2
- {
-- cd `dirname $(>)` && CONTRIB=`pwd` &&
-- rm -rf mpeg4ip && tar xzf mpeg4ip.tar.gz && cd mpeg4ip &&
-+ CONTRIB=%%CONTRIB%% &&
-+ cd $CONTRIB/mpeg4ip &&
- patch -p1 < ../patch-mpeg4ip.patch && patch -p0 < ../patch-mpeg4ip-pascal-str.patch &&
-- ./bootstrap --cache-file=$CONTRIB/config.cache --disable-mp3lame --disable-faac --disable-x264 --disable-server --disable-player &&
-- make -C lib/mp4v2 libmp4v2.la && cp lib/mp4v2/.libs/libmp4v2.a $CONTRIB/lib &&
-+ ./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 &&
- strip -S $CONTRIB/lib/libmp4v2.a
-@@ -211,11 +210,11 @@
+@@ -224,10 +219,10 @@
+ }
+ actions LibMp4v2
{
- actions LibMp4v2
- {
-- cd `dirname $(>)` && CONTRIB=`pwd` &&
-- rm -rf mpeg4ip && tar xzf mpeg4ip.tar.gz && cd mpeg4ip &&
-+ CONTRIB=%%CONTRIB%% &&
-+ cd $CONTRIB/mpeg4ip &&
- patch -p1 < ../patch-mpeg4ip.patch && patch -p1 < ../patch_mpeg4ip_cygwin.patch && patch -p0 < ../patch-mpeg4ip-pascal-str.patch &&
-- ./bootstrap --cache-file=$CONTRIB/config.cache --disable-mp3lame --disable-faac --disable-x264 --disable-server --disable-player &&
-- make -C lib/mp4v2 libmp4v2.la && cp lib/mp4v2/.libs/libmp4v2.a $CONTRIB/lib &&
-+ ./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 &&
- strip -S $CONTRIB/lib/libmp4v2.a
-@@ -231,10 +230,10 @@
+- 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 && tar xzf libmkv.tar.gz && cd libmkv &&
+- rm -rf libmkv && (gzip -dc libmkv.tar.gz | tar xf - ) &&
+- cd libmkv &&
- ./configure --disable-shared --enable-static --prefix=$CONTRIB --cache-file=$CONTRIB/config.cache &&
-- make && make install &&
+ CONTRIB=%%CONTRIB%% &&
+ cd $CONTRIB/libmkv &&
+ ./configure --disable-shared --enable-static --prefix=$CONTRIB &&
-+ $(MAKE) && $(MAKE) install &&
- strip -S $CONTRIB/lib/libmkv.a
+ $(MAKE) && $(MAKE) install &&
+ $(STRIP) $CONTRIB/lib/libmkv.a
}
- Wget $(SUBDIR)/libmkv.tar.gz : $(SUBDIR)/version_libmkv.txt ;
-@@ -248,10 +247,10 @@
+@@ -261,10 +255,9 @@
}
actions LibMpeg2
{
- cd `dirname $(>)` && CONTRIB=`pwd` &&
-- rm -rf mpeg2dec && tar xzf mpeg2dec.tar.gz && cd mpeg2dec && patch -p1 < ../patch-libmpeg2.patch &&
+- 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 &&
-- make && make install &&
+ CONTRIB=%%CONTRIB%% &&
+ cd $CONTRIB/mpeg2dec && patch -p1 < ../patch-libmpeg2.patch &&
+ ./configure --prefix=$CONTRIB --disable-shared --disable-sdl &&
-+ $(MAKE) && $(MAKE) install &&
- strip -S $CONTRIB/lib/libmpeg2.a
+ $(MAKE) && $(MAKE) install &&
+ $(STRIP) $CONTRIB/lib/libmpeg2.a
}
- Wget $(SUBDIR)/mpeg2dec.tar.gz : $(SUBDIR)/version_mpeg2dec.txt ;
-@@ -265,10 +264,10 @@
+@@ -279,10 +272,9 @@
}
actions LibOgg
{
- cd `dirname $(>)` && CONTRIB=`pwd` &&
-- rm -rf libogg && tar xzf libogg.tar.gz && cd libogg &&
+- rm -rf libogg && (gzip -dc libogg.tar.gz | tar xf - ) &&
+- cd libogg &&
- ./configure --prefix=$CONTRIB --cache-file=$CONTRIB/config.cache --disable-shared &&
-- make && make install &&
+ CONTRIB=%%CONTRIB%% &&
+ cd $CONTRIB/libogg &&
+ ./configure --prefix=$CONTRIB --disable-shared &&
-+ $(MAKE) && $(MAKE) install &&
- strip -S $CONTRIB/lib/libogg.a
+ $(MAKE) && $(MAKE) install &&
+ $(STRIP) $CONTRIB/lib/libogg.a
}
- Wget $(SUBDIR)/libogg.tar.gz : $(SUBDIR)/version_libogg.txt ;
-@@ -282,10 +281,10 @@
+@@ -297,10 +289,9 @@
}
actions LibSampleRate
{
- cd `dirname $(>)` && CONTRIB=`pwd` &&
-- rm -rf libsamplerate && tar xzf libsamplerate.tar.gz && cd libsamplerate &&
+- rm -rf libsamplerate && (gzip -dc libsamplerate.tar.gz | tar xf - ) &&
+- cd libsamplerate &&
- ./configure --prefix=$CONTRIB --cache-file=$CONTRIB/config.cache --disable-shared &&
-- make && make install &&
+ CONTRIB=%%CONTRIB%% &&
+ cd $CONTRIB/libsamplerate &&
+ ./configure --prefix=$CONTRIB --disable-shared &&
-+ $(MAKE) && $(MAKE) install &&
- strip -S $CONTRIB/lib/libsamplerate.a
+ $(MAKE) && $(MAKE) install &&
+ $(STRIP) $CONTRIB/lib/libsamplerate.a
}
- Wget $(SUBDIR)/libsamplerate.tar.gz : $(SUBDIR)/version_libsamplerate.txt ;
-@@ -299,10 +298,10 @@
+@@ -315,10 +306,9 @@
}
actions LibVorbis
{
- cd `dirname $(>)` && CONTRIB=`pwd` &&
-- rm -rf libvorbis && tar xzf libvorbis.tar.gz && cd libvorbis &&
+- 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 &&
-- make && make install &&
+ CONTRIB=%%CONTRIB%% &&
+ cd $CONTRIB/libvorbis &&
+ ./configure --prefix=$CONTRIB --with-ogg=$CONTRIB --disable-shared &&
-+ $(MAKE) && $(MAKE) install &&
- strip -S $CONTRIB/lib/libvorbis.a
+ $(MAKE) && $(MAKE) install &&
+ $(STRIP) $CONTRIB/lib/libvorbis.a
}
- Wget $(SUBDIR)/libvorbis.tar.gz : $(SUBDIR)/version_libvorbis.txt ;
-@@ -338,10 +337,10 @@
+@@ -356,10 +346,9 @@
}
actions LibX264
{
- cd `dirname $(>)` && CONTRIB=`pwd` &&
-- rm -rf x264 && tar xzf x264.tar.gz && cd x264 && $(LIBX264_PATCH)
-- ./configure --prefix=$CONTRIB --enable-pthread && make &&
-- make install &&
+- 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) install &&
- strip -S $CONTRIB/lib/libx264.a
+ $(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 ;
-@@ -364,10 +363,9 @@
+@@ -383,10 +372,9 @@
}
actions LibXvidCore
{
- cd `dirname $(>)` && CONTRIB=`pwd` &&
-- rm -rf xvidcore && tar xzf xvidcore.tar.gz &&
+- 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 &&
+- 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 -S $CONTRIB/lib/libxvidcore.a
-@@ -385,10 +383,9 @@
+ $(STRIP) $CONTRIB/lib/libxvidcore.a
+@@ -404,9 +392,8 @@
}
actions Zlib
{
- cd `dirname $(>)` && CONTRIB=`pwd` &&
-- rm -rf zlib && tar xzf zlib.tar.gz &&
-- cd zlib && ./configure --prefix=$CONTRIB --cache-file=$CONTRIB/config.cache &&
-- make && make install && touch $CONTRIB/.contrib &&
+- 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 -S $CONTRIB/lib/libz.a
+ $(MAKE) && $(MAKE) install && touch $CONTRIB/.contrib &&
+ $(STRIP) $CONTRIB/lib/libz.a
}
- Wget $(SUBDIR)/zlib.tar.gz : $(SUBDIR)/version_zlib.txt ;
Index: files/patch-libhb-fifo.c
===================================================================
RCS file: /home/ncvs/ports/multimedia/handbrake/files/patch-libhb-fifo.c,v
retrieving revision 1.1
diff -u -r1.1 patch-libhb-fifo.c
--- files/patch-libhb-fifo.c 13 Dec 2007 16:50:15 -0000 1.1
+++ files/patch-libhb-fifo.c 17 Jun 2008 21:25:48 -0000
@@ -1,13 +1,13 @@
---- 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 @@
+--- ../../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 @@
#include "hb.h"
-#ifndef SYS_DARWIN
--#include <malloc.h>
--#endif
++#if defined( SYS_FREEBSD )
+#include <stdlib.h>
++#elif !defined( SYS_DARWIN )
+ #include <malloc.h>
+ #endif
- /* Fifo */
- struct hb_fifo_s
Index: files/patch-libhb-ports.c
===================================================================
RCS file: /home/ncvs/ports/multimedia/handbrake/files/patch-libhb-ports.c,v
retrieving revision 1.1
diff -u -r1.1 patch-libhb-ports.c
--- files/patch-libhb-ports.c 13 Dec 2007 16:50:15 -0000 1.1
+++ files/patch-libhb-ports.c 17 Jun 2008 21:25:48 -0000
@@ -1,10 +1,10 @@
---- HandBrake_old/libhb/ports.c 2007-10-08 22:57:08.000000000 +0200
-+++ libhb/ports.c 2007-12-04 07:48:47.000000000 +0100
-@@ -28,6 +28,11 @@
+--- ../../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(__FreeBSD__)
++#if defined( SYS_FREEBSD )
+#include <sys/types.h>
+#include <sys/sysctl.h>
+#endif
@@ -12,26 +12,21 @@
#include "hb.h"
/************************************************************************
-@@ -105,21 +110,17 @@
+@@ -107,7 +112,7 @@
cpu_count = info.cpu_count;
}
-#elif defined( SYS_DARWIN ) || defined( SYS_FREEBSD )
-- FILE * info;
-- char buffer[16];
--
-- if( ( info = popen( "/usr/sbin/sysctl hw.ncpu", "r" ) ) )
-+#elif defined(__FreeBSD__)
- {
-- memset( buffer, 0, 16 );
-- if( fgets( buffer, 15, info ) )
-- {
-- if( sscanf( buffer, "hw.ncpu: %d", &cpu_count ) != 1 )
-- {
-- cpu_count = 1;
-- }
-- }
-- fclose( info );
++#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;
+
@@ -41,6 +36,8 @@
+
+ if(sysctl(mib, 2, &cpu_count, &len, NULL, 0) != 0)
+ cpu_count = 1;
- }
-
++ }
++
#elif defined( SYS_LINUX )
+ {
+ FILE * info;
--9amGYk9869ThD9tj--
More information about the freebsd-ports-bugs
mailing list