diff options
| author | tron <tron> | 2010-05-24 22:10:01 +0000 |
|---|---|---|
| committer | tron <tron> | 2010-05-24 22:10:01 +0000 |
| commit | d64ed6cbe5673f0dab33ccebccf088aae276ba3b (patch) | |
| tree | 82f21088ef2d169d794fcc2188685ceb6be97957 /multimedia/ffmpeg | |
| parent | bf60d7e693e4e5a5577c605f11705efd35b29037 (diff) | |
| download | pkgsrc-d64ed6cbe5673f0dab33ccebccf088aae276ba3b.tar.gz | |
Disable assembler optimizations (e.g. MMX support) to make this build
under Mac OS X Intel.
Diffstat (limited to 'multimedia/ffmpeg')
| -rw-r--r-- | multimedia/ffmpeg/Makefile.common | 4 | ||||
| -rw-r--r-- | multimedia/ffmpeg/distinfo | 4 | ||||
| -rw-r--r-- | multimedia/ffmpeg/patches/patch-ae | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/multimedia/ffmpeg/Makefile.common b/multimedia/ffmpeg/Makefile.common index 03f41bafb12..86f4fea7699 100644 --- a/multimedia/ffmpeg/Makefile.common +++ b/multimedia/ffmpeg/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.5 2010/03/14 23:07:30 tron Exp $ +# $NetBSD: Makefile.common,v 1.6 2010/05/24 22:10:01 tron Exp $ # used by multimedia/ffplay/Makefile DISTNAME= ffmpeg-${DISTVERSION:S/-//g} @@ -58,7 +58,7 @@ CONFIGURE_ARGS+= --mandir=${PREFIX}/${PKGMANDIR} \ --enable-pthreads \ --enable-gpl -.if ${OPSYS} == "SunOS" +.if ${OPSYS} == "Darwin" || ${OPSYS} == "SunOS" CONFIGURE_ARGS+= --disable-amd3dnow --disable-amd3dnowext CONFIGURE_ARGS+= --disable-mmx --disable-mmx2 CONFIGURE_ARGS+= --disable-sse --disable-ssse3 diff --git a/multimedia/ffmpeg/distinfo b/multimedia/ffmpeg/distinfo index f2d5ec9f1eb..d2e3949ef86 100644 --- a/multimedia/ffmpeg/distinfo +++ b/multimedia/ffmpeg/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.35 2010/05/04 18:33:43 drochner Exp $ +$NetBSD: distinfo,v 1.36 2010/05/24 22:10:01 tron Exp $ SHA1 (ffmpeg-20090611.tar.bz2) = 04e67497f70c64b7a26534d4b67e3a46cdb4b219 RMD160 (ffmpeg-20090611.tar.bz2) = 447a72cd1a416f926100c61299d9012535909d9a @@ -7,7 +7,7 @@ SHA1 (patch-aa) = e40f61850fe5c85bdd4b659802601dfacfe73ad1 SHA1 (patch-ab) = 1c1da33f47be51f75635a9667b0d7d8052945ba7 SHA1 (patch-ac) = 05820de2ae81b4607ba782b0233fd1e087045b97 SHA1 (patch-ad) = ebee8a9e3d5caa533459e1547690ee6c2f095018 -SHA1 (patch-ae) = a3d81de5fd49bee35f0bc3c78808f2b65a94288c +SHA1 (patch-ae) = ae9d686450fb6fa1161bb2844282bf530148e368 SHA1 (patch-af) = 2507866ddc72c7e8ff10b489c86cb679e8e2fd49 SHA1 (patch-bktr) = fb57a4f5dc0d372eb3f40dac5b05ea7d1da45d7b SHA1 (patch-configure) = 2676c15b2fccdf4cde817f6f143885b3faea2467 diff --git a/multimedia/ffmpeg/patches/patch-ae b/multimedia/ffmpeg/patches/patch-ae index ff0d7ff9e19..f80667736bc 100644 --- a/multimedia/ffmpeg/patches/patch-ae +++ b/multimedia/ffmpeg/patches/patch-ae @@ -1,7 +1,7 @@ -$NetBSD: patch-ae,v 1.10 2010/03/14 23:07:30 tron Exp $ +$NetBSD: patch-ae,v 1.11 2010/05/24 22:10:02 tron Exp $ Really turn AMD 3DNow (and MMX, etc.) because the shared library -will otherwise not work on Intel CPUs. +will otherwise not build (Mac OS X) or work (Solaris) on Intel CPUs. --- libswscale/rgb2rgb.c.orig Thu Mar 19 04:45:29 2009 +++ libswscale/rgb2rgb.c Sun Mar 14 23:55:39 2010 @@ -19,7 +19,7 @@ will otherwise not work on Intel CPUs. #include "rgb2rgb_template.c" -#if ARCH_X86 && CONFIG_GPL -+#if ARCH_X86 && CONFIG_GPL && !defined(sun) ++#if ARCH_X86 && CONFIG_GPL && !defined(sun) && !defined(__APPLE__) //MMX versions #undef RENAME |