[pkgsrc/trunk]: pkgsrc/multimedia/ffmpeg Disable assembler optimizations (e.g...

[tron <tron%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/47cbafee19a3
branches:  trunk
changeset: 575874:47cbafee19a3
user:      tron <tron%pkgsrc.org@localhost>
date:      Mon May 24 22:10:01 2010 +0000

description:
Disable assembler optimizations (e.g. MMX support) to make this build
under Mac OS X Intel.

diffstat:

 multimedia/ffmpeg/Makefile.common  |  4 ++--
 multimedia/ffmpeg/distinfo         |  4 ++--
 multimedia/ffmpeg/patches/patch-ae |  6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diffs (58 lines):

diff -r 4f1271c252c6 -r 47cbafee19a3 multimedia/ffmpeg/Makefile.common
--- a/multimedia/ffmpeg/Makefile.common Mon May 24 21:47:53 2010 +0000
+++ b/multimedia/ffmpeg/Makefile.common Mon May 24 22:10:01 2010 +0000
@@ -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 @@
                        --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 -r 4f1271c252c6 -r 47cbafee19a3 multimedia/ffmpeg/distinfo
--- a/multimedia/ffmpeg/distinfo        Mon May 24 21:47:53 2010 +0000
+++ b/multimedia/ffmpeg/distinfo        Mon May 24 22:10:01 2010 +0000
@@ -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-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 -r 4f1271c252c6 -r 47cbafee19a3 multimedia/ffmpeg/patches/patch-ae
--- a/multimedia/ffmpeg/patches/patch-ae        Mon May 24 21:47:53 2010 +0000
+++ b/multimedia/ffmpeg/patches/patch-ae        Mon May 24 22:10:01 2010 +0000
@@ -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 @@
  #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