diff options
Diffstat (limited to 'multimedia/ffmpeg-devel')
| -rw-r--r-- | multimedia/ffmpeg-devel/Makefile | 9 | ||||
| -rw-r--r-- | multimedia/ffmpeg-devel/distinfo | 6 | ||||
| -rw-r--r-- | multimedia/ffmpeg-devel/files/amd64-patch | 55 | ||||
| -rw-r--r-- | multimedia/ffmpeg-devel/files/patch-configure | 27 | ||||
| -rw-r--r-- | multimedia/ffmpeg-devel/pkg-plist | 4 |
5 files changed, 88 insertions, 13 deletions
diff --git a/multimedia/ffmpeg-devel/Makefile b/multimedia/ffmpeg-devel/Makefile index 6c5fa11608cd..33eaa931e706 100644 --- a/multimedia/ffmpeg-devel/Makefile +++ b/multimedia/ffmpeg-devel/Makefile @@ -6,8 +6,7 @@ # PORTNAME= ffmpeg -DISTVERSION= 2007-03-31 -PORTREVISION= 1 +DISTVERSION= 2007-04-18 CATEGORIES= multimedia audio ipv6 net MASTER_SITES= ${MASTER_SITE_LOCAL} MASTER_SITE_SUBDIR= ahze @@ -51,6 +50,10 @@ PORTDOCS= * .include <bsd.port.pre.mk> +.if ${ARCH}=="amd64" +EXTRA_PATCHES= ${PATCHDIR}/amd64-patch +.endif + ## sse hardware vector support .if (defined(MACHINE_CPU) && ${MACHINE_CPU:Msse} == "sse") WITH_BUILTIN_VECTOR= yes @@ -121,7 +124,7 @@ LIB_DEPENDS+= mp3lame.0:${PORTSDIR}/audio/lame CONFIGURE_ARGS+= --enable-libmp3lame .endif ## ogg -.ifdef(WITH_OGG) || exists(${LOCALBASE}/lib/libogg.so) +.ifndef(WITHOUT_OGG) || exists(${LOCALBASE}/lib/libogg.so) LIB_DEPENDS+= ogg.5:${PORTSDIR}/audio/libogg CONFIGURE_ARGS+= --enable-libogg diff --git a/multimedia/ffmpeg-devel/distinfo b/multimedia/ffmpeg-devel/distinfo index c753d3aa4d50..befb9336b203 100644 --- a/multimedia/ffmpeg-devel/distinfo +++ b/multimedia/ffmpeg-devel/distinfo @@ -1,3 +1,3 @@ -MD5 (ffmpeg-2007-03-31.tar.bz2) = fbfa641b1d5ac22976e8d76cc8435fb0 -SHA256 (ffmpeg-2007-03-31.tar.bz2) = e548cf6c87618853f2f74f8c09a0d9389c60fd96657773d02f0c6a8faf8c248c -SIZE (ffmpeg-2007-03-31.tar.bz2) = 2188500 +MD5 (ffmpeg-2007-04-18.tar.bz2) = d77435c856716d340103c553b2628bfa +SHA256 (ffmpeg-2007-04-18.tar.bz2) = 19a47e1ddb2f2c53435592f3f6bb8eae5debbb7eec4e2820e094a131aadb1674 +SIZE (ffmpeg-2007-04-18.tar.bz2) = 2193991 diff --git a/multimedia/ffmpeg-devel/files/amd64-patch b/multimedia/ffmpeg-devel/files/amd64-patch new file mode 100644 index 000000000000..db2116a39116 --- /dev/null +++ b/multimedia/ffmpeg-devel/files/amd64-patch @@ -0,0 +1,55 @@ +$OpenBSD: patch-libavcodec_mpegvideo_c,v 1.1 2007/01/23 09:34:45 robert Exp $ +--- libavcodec/mpegvideo.c.orig Sat Dec 23 05:05:36 2006 ++++ libavcodec/mpegvideo.c Tue Jan 2 18:22:01 2007 +@@ -4837,7 +4837,7 @@ static int pre_estimate_motion_thread(AV + static int estimate_motion_thread(AVCodecContext *c, void *arg){ + MpegEncContext *s= arg; + +- ff_check_alignment(); ++ /*ff_check_alignment();*/ + + s->me.dia_size= s->avctx->dia_size; + s->first_slice_line=1; +@@ -4865,7 +4865,7 @@ static int mb_var_thread(AVCodecContext + MpegEncContext *s= arg; + int mb_x, mb_y; + +- ff_check_alignment(); ++ /*ff_check_alignment();*/ + + for(mb_y=s->start_mb_y; mb_y < s->end_mb_y; mb_y++) { + for(mb_x=0; mb_x < s->mb_width; mb_x++) { +@@ -4914,7 +4914,7 @@ static int encode_thread(AVCodecContext + PutBitContext pb[2], pb2[2], tex_pb[2]; + //printf("%d->%d\n", s->resync_mb_y, s->end_mb_y); + +- ff_check_alignment(); ++ /*ff_check_alignment();*/ + + for(i=0; i<2; i++){ + init_put_bits(&pb [i], bit_buf [i], MAX_MB_BYTES); +--- libavcodec/dsputil.c.orig Wed Apr 18 09:42:55 2007 ++++ libavcodec/dsputil.c Wed Apr 18 10:16:01 2007 +@@ -3814,6 +3814,7 @@ + for(i=0; i<64; i++) inv_zigzag_direct16[ff_zigzag_direct[i]]= i+1; + } + ++/* + int ff_check_alignment(void){ + static int did_fail=0; + DECLARE_ALIGNED_16(int, aligned); +@@ -3832,12 +3833,12 @@ + } + return 0; + } +- ++*/ + void dsputil_init(DSPContext* c, AVCodecContext *avctx) + { + int i; + +- ff_check_alignment(); ++ /*ff_check_alignment();*/ + + #ifdef CONFIG_ENCODERS + if(avctx->dct_algo==FF_DCT_FASTINT) { diff --git a/multimedia/ffmpeg-devel/files/patch-configure b/multimedia/ffmpeg-devel/files/patch-configure index 6987610be7e8..71ad1a17e9ae 100644 --- a/multimedia/ffmpeg-devel/files/patch-configure +++ b/multimedia/ffmpeg-devel/files/patch-configure @@ -1,6 +1,23 @@ ---- configure.orig Sat Mar 31 00:25:05 2007 -+++ configure Sun Apr 1 18:59:07 2007 -@@ -1966,15 +1966,15 @@ +--- configure.orig Sun Apr 15 12:34:50 2007 ++++ configure Wed Apr 18 10:31:48 2007 +@@ -982,14 +982,8 @@ + arch="x86_32" + ;; + x86_64|amd64) +- arch="x86_32" +- canon_arch="`$cc -dumpmachine | sed -e 's,\([^-]*\)-.*,\1,'`" +- if [ x"$canon_arch" = x"x86_64" -o x"$canon_arch" = x"amd64" ]; then +- if [ -z "`echo $CFLAGS | grep -- -m32`" ]; then +- arch="x86_64" +- enable fast_64bit +- fi +- fi ++ arch="x86_64" ++ enable fast_64bit + ;; + # armv4l is a subset of armv[567]*l + arm|armv[4567]*l) +@@ -1965,15 +1959,15 @@ if enabled shared; then echo "BUILD_SHARED=yes" >> config.mak echo "PIC=-fPIC -DPIC" >> config.mak @@ -21,7 +38,7 @@ echo "SWSVERSION=$sws_version" >> config.mak echo "SLIBNAME=${SLIBNAME}" >> config.mak echo "SLIBNAME_WITH_VERSION=${SLIBNAME_WITH_VERSION}" >> config.mak -@@ -2103,8 +2103,8 @@ +@@ -2096,8 +2090,8 @@ Version: $version Requires: $requires Conflicts: @@ -32,7 +49,7 @@ EOF } -@@ -2127,7 +2127,8 @@ +@@ -2120,7 +2114,8 @@ Requires: $requires Conflicts: Libs: \${libdir}/${LIBPREF}${shortname}${LIBSUF} $libs diff --git a/multimedia/ffmpeg-devel/pkg-plist b/multimedia/ffmpeg-devel/pkg-plist index 8c4e440ad397..926cde5ca718 100644 --- a/multimedia/ffmpeg-devel/pkg-plist +++ b/multimedia/ffmpeg-devel/pkg-plist @@ -27,11 +27,11 @@ include/postproc/postprocess.h lib/libavcodec.a lib/libavcodec.so lib/libavcodec.so.%%SHLIB_VER%% -lib/libavcodec.so.51.40.2 +lib/libavcodec.so.51.40.3 lib/libavformat.a lib/libavformat.so lib/libavformat.so.%%SHLIB_VER%% -lib/libavformat.so.51.11.0 +lib/libavformat.so.51.12.1 lib/libavutil.a lib/libavutil.so lib/libavutil.so.%%SHLIB_VER%% |