Take 2 on trying to make this work on OSX.

3 files changed, 27 insertions, 21 deletions

diff --git a/multimedia/mplayer-share/distinfo b/multimedia/mplayer-share/distinfo
index b7e63646a30..08d85ff6e76 100644
--- a/multimedia/mplayer-share/distinfo
+++ b/multimedia/mplayer-share/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.63 2009/10/18 22:22:10 ahoka Exp $
+$NetBSD: distinfo,v 1.64 2009/10/19 00:13:07 ahoka Exp $
 
 SHA1 (mplayer/mplayer-20091017.tar.bz2) = 8ee97842812b9867f192f521b96bb1b6e1742a23
 RMD160 (mplayer/mplayer-20091017.tar.bz2) = 015d3847b05f4d674d4740e55f117ce6085d5cc3
@@ -6,8 +6,8 @@ Size (mplayer/mplayer-20091017.tar.bz2) = 8525942 bytes
 SHA1 (patch-aa) = 24007024e4b6bfa212817681e8d07cc079aee13b
 SHA1 (patch-ac) = 13ea17bcdde5ebc7e04eeb5eb833dca0cd623ba2
 SHA1 (patch-ad) = 0a43a47538f0f18f8b6aa230367821b8bb51e932
-SHA1 (patch-ae) = 448ae3c17fd96248b7360958c9640f74ed4891a5
-SHA1 (patch-ag) = e3aea6e1144e97d1dc9f240275568108df25ab00
+SHA1 (patch-ae) = 5a1f1d9f6480fb67a2a12d9088990ed546e1b1e4
+SHA1 (patch-ag) = bef25568c913dcb8535afa51976ce7c94a6af5a2
 SHA1 (patch-ah) = 7aeb9f04d622fcad8c40dc9edbb0a58277fc622b
 SHA1 (patch-an) = 3e72fb86abe7ab572f12a4fef002edb623ab6fae
 SHA1 (patch-ao) = 8588d0215e973045b7f1abd7fbc9813409876b99
diff --git a/multimedia/mplayer-share/patches/patch-ae b/multimedia/mplayer-share/patches/patch-ae
index 3ab90656716..8e72bc771f1 100644
--- a/multimedia/mplayer-share/patches/patch-ae
+++ b/multimedia/mplayer-share/patches/patch-ae
@@ -1,13 +1,16 @@
-$NetBSD: patch-ae,v 1.9 2009/10/18 22:22:10 ahoka Exp $
+$NetBSD: patch-ae,v 1.10 2009/10/19 00:13:07 ahoka Exp $
 
 --- libvo/aclib.c.orig	2009-04-08 22:21:21.000000000 +0200
 +++ libvo/aclib.c
-@@ -40,7 +40,7 @@
- //#define COMPILE_C
- //#endif
+@@ -28,6 +28,11 @@
+ #include "fastmemcpy.h"
+ #undef memcpy
  
--#if ARCH_X86
-+#if defined(ARCH_X86) && !defined(__APPLE__)
- 
- #if (HAVE_MMX && !HAVE_AMD3DNOW && !HAVE_MMX2) || CONFIG_RUNTIME_CPUDETECT
- #define COMPILE_MMX
++#if ARCH_X86 && defined(__APPLE__)
++#undef ARCH_X86
++#define ARCH_X86 0
++#endif
++
+ #define BLOCK_SIZE 4096
+ #define CONFUSION_FACTOR 0
+ //Feel free to fine-tune the above 2, it might be possible to get some speedup with them :)
diff --git a/multimedia/mplayer-share/patches/patch-ag b/multimedia/mplayer-share/patches/patch-ag
index 6704762c48e..cd4392f751b 100644
--- a/multimedia/mplayer-share/patches/patch-ag
+++ b/multimedia/mplayer-share/patches/patch-ag
@@ -1,13 +1,16 @@
-$NetBSD: patch-ag,v 1.5 2009/10/18 22:22:10 ahoka Exp $
+$NetBSD: patch-ag,v 1.6 2009/10/19 00:13:07 ahoka Exp $
 
 --- libvo/osd.c.orig	2009-04-08 22:21:21.000000000 +0200
 +++ libvo/osd.c
-@@ -41,7 +41,7 @@ static const unsigned long long mask24hl
- #define COMPILE_C
- #endif
+@@ -29,6 +29,11 @@
+ #include <inttypes.h>
+ #include "cpudetect.h"
  
--#if ARCH_X86
-+#if defined(ARCH_X86) && !defined(__APPLE__)
- 
- #if (HAVE_MMX && !HAVE_AMD3DNOW && !HAVE_MMX2) || CONFIG_RUNTIME_CPUDETECT
- #define COMPILE_MMX
++#if ARCH_X86 && defined(__APPLE__)
++#undef ARCH_X86
++#define ARCH_X86 0
++#endif
++
+ #if ARCH_X86
+ static const uint64_t bFF __attribute__((aligned(8))) = 0xFFFFFFFFFFFFFFFFULL;
+ static const unsigned long long mask24lh  __attribute__((aligned(8))) = 0xFFFF000000000000ULL;