Fix build and install on Darwin 32-bit.

4 files changed, 15 insertions, 10 deletions

diff --git a/multimedia/xine-lib/Makefile b/multimedia/xine-lib/Makefile
index 9729a21369b..40035d18c93 100644
--- a/multimedia/xine-lib/Makefile
+++ b/multimedia/xine-lib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.128 2014/06/27 12:17:22 jperkin Exp $
+# $NetBSD: Makefile,v 1.129 2014/06/30 13:41:00 jperkin Exp $
 
 .include "Makefile.common"
 
@@ -33,6 +33,11 @@ SUBST_MESSAGE.w32path=	Fixing win32 dll path.
 # Needed to fix build problems under, at least, NetBSD/amd64.
 BUILDLINK_API_DEPENDS.libcdio+=	libcdio>=0.75
 
+PLIST_VARS+=	qtw32
+.if empty(MACHINE_PLATFORM:MDarwin-*-i386)
+PLIST.qtw32=	yes
+.endif
+
 .if ${OPSYS} == "SunOS"
 PLIST_VARS+=	oss
 .if ${OS_VERSION} == "5.11"
diff --git a/multimedia/xine-lib/PLIST.i386 b/multimedia/xine-lib/PLIST.i386
index 5a9ddad6a4d..6468d226f0b 100644
--- a/multimedia/xine-lib/PLIST.i386
+++ b/multimedia/xine-lib/PLIST.i386
@@ -1,5 +1,5 @@
-@comment $NetBSD: PLIST.i386,v 1.8 2008/04/24 12:32:22 wiz Exp $
-lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_decode_qt.a
-lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_decode_qt.so
-lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_decode_w32dll.a
-lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_decode_w32dll.so
+@comment $NetBSD: PLIST.i386,v 1.9 2014/06/30 13:41:00 jperkin Exp $
+${PLIST.qtw32}lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_decode_qt.a
+${PLIST.qtw32}lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_decode_qt.so
+${PLIST.qtw32}lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_decode_w32dll.a
+${PLIST.qtw32}lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_decode_w32dll.so
diff --git a/multimedia/xine-lib/distinfo b/multimedia/xine-lib/distinfo
index cd2f928d111..97d25afdfb9 100644
--- a/multimedia/xine-lib/distinfo
+++ b/multimedia/xine-lib/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.96 2014/06/27 12:17:22 jperkin Exp $
+$NetBSD: distinfo,v 1.97 2014/06/30 13:41:00 jperkin Exp $
 
 SHA1 (xine-lib-1.2.5.tar.xz) = c7ef38fa8ee301e44ba28d6549220546d02d053d
 RMD160 (xine-lib-1.2.5.tar.xz) = bb9c3a06666f454e8dfda85471eb6605e2dcb685
@@ -17,7 +17,7 @@ SHA1 (patch-src-post-audio-stretch.c) = 6f950bcd47fdf68b691744dc105f59f821748ce1
 SHA1 (patch-src-post-audio-upmix.c) = 70ca6babfa9a7add0ac70a6024fcff429e1bc49d
 SHA1 (patch-src-post-audio-upmix_mono.c) = 2c70ded10118cbeed5be3c948886f7311ddb7bbd
 SHA1 (patch-src-post-audio-volnorm.c) = b110542ae4c21762cf369a4cf2b6c66343c3b761
-SHA1 (patch-src-post-deinterlace-plugins-greedy2frame.c) = 884561ed21c8a3d636339ff4d42cbc6fb389669a
+SHA1 (patch-src-post-deinterlace-plugins-greedy2frame.c) = bc9d23257043d239ded2d7a28de74ac8a23c6148
 SHA1 (patch-src-post-deinterlace-xine_plugin.c) = 536365d479b5cd0354365a53db4f19f8404788ac
 SHA1 (patch-src-post-goom-mmx.h) = dfcb3269de02849ee3875c89438338edcdd7faa6
 SHA1 (patch-src-post-mosaico-mosaico.c) = 04f21603055b1e8e7490ba5d6e006ca5a9b683a3
diff --git a/multimedia/xine-lib/patches/patch-src-post-deinterlace-plugins-greedy2frame.c b/multimedia/xine-lib/patches/patch-src-post-deinterlace-plugins-greedy2frame.c
index 07ab9c3536e..eed464294af 100644
--- a/multimedia/xine-lib/patches/patch-src-post-deinterlace-plugins-greedy2frame.c
+++ b/multimedia/xine-lib/patches/patch-src-post-deinterlace-plugins-greedy2frame.c
@@ -1,4 +1,4 @@
-$NetBSD: patch-src-post-deinterlace-plugins-greedy2frame.c,v 1.2 2014/05/18 15:38:18 wiz Exp $
+$NetBSD: patch-src-post-deinterlace-plugins-greedy2frame.c,v 1.3 2014/06/30 13:41:00 jperkin Exp $
 
 https://bugs.xine-project.org/show_bug.cgi?id=528
 
@@ -8,7 +8,7 @@ https://bugs.xine-project.org/show_bug.cgi?id=528
                                      int bottom_field, int second_field, int width, int height )
  
  {
-+#if defined(ARCH_X86) || defined(ARCH_X86_64)
++#if (!defined(__APPLE__) && defined(ARCH_X86)) || defined(ARCH_X86_64)
 +
      if (xine_mm_accel() & MM_ACCEL_X86_SSE2) {
          if (((uintptr_t)output & 15) || (outstride & 15) ||