Mon Jun 30 13:41:00 2014 UTC ()
Fix build and install on Darwin 32-bit.


(jperkin)
diff -r1.128 -r1.129 pkgsrc/multimedia/xine-lib/Makefile
diff -r1.8 -r1.9 pkgsrc/multimedia/xine-lib/PLIST.i386
diff -r1.96 -r1.97 pkgsrc/multimedia/xine-lib/distinfo
diff -r1.2 -r1.3 pkgsrc/multimedia/xine-lib/patches/patch-src-post-deinterlace-plugins-greedy2frame.c
cvs diff -r1.128 -r1.129 pkgsrc/multimedia/xine-lib/Makefile (expand / switch to unified diff)

--- pkgsrc/multimedia/xine-lib/Makefile 2014/06/27 12:17:22 1.128
+++ pkgsrc/multimedia/xine-lib/Makefile 2014/06/30 13:41:00 1.129
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.128 2014/06/27 12:17:22 jperkin Exp $ 1# $NetBSD: Makefile,v 1.129 2014/06/30 13:41:00 jperkin Exp $
2 2
3.include "Makefile.common" 3.include "Makefile.common"
4 4
5COMMENT= Multimedia player library 5COMMENT= Multimedia player library
6PKGREVISION= 3 6PKGREVISION= 3
7 7
8CONFLICTS+= xine-xcb-[0-9]* 8CONFLICTS+= xine-xcb-[0-9]*
9 9
10CONFIGURE_ARGS+= --disable-v4l 10CONFIGURE_ARGS+= --disable-v4l
11CONFIGURE_ARGS+= --disable-v4l2 11CONFIGURE_ARGS+= --disable-v4l2
12CONFIGURE_ARGS+= --disable-real-codecs 12CONFIGURE_ARGS+= --disable-real-codecs
13CONFIGURE_ARGS+= --disable-aalib 13CONFIGURE_ARGS+= --disable-aalib
14CONFIGURE_ARGS+= --disable-mlib 14CONFIGURE_ARGS+= --disable-mlib
@@ -23,26 +23,31 @@ SUBST_SED.oss= -e "s,/dev/dsp,${DEVOSSA @@ -23,26 +23,31 @@ SUBST_SED.oss= -e "s,/dev/dsp,${DEVOSSA
23SUBST_SED.oss+= -e "s,\"dsp\",\"audio\",g" 23SUBST_SED.oss+= -e "s,\"dsp\",\"audio\",g"
24.endif 24.endif
25SUBST_MESSAGE.oss= Fixing hardcoded audio device. 25SUBST_MESSAGE.oss= Fixing hardcoded audio device.
26 26
27SUBST_CLASSES+= w32path 27SUBST_CLASSES+= w32path
28SUBST_STAGE.w32path= post-patch 28SUBST_STAGE.w32path= post-patch
29SUBST_FILES.w32path= src/libw32dll/common.c 29SUBST_FILES.w32path= src/libw32dll/common.c
30SUBST_SED.w32path= -e "s,@W32PATH@,${PREFIX}/lib/win32," 30SUBST_SED.w32path= -e "s,@W32PATH@,${PREFIX}/lib/win32,"
31SUBST_MESSAGE.w32path= Fixing win32 dll path. 31SUBST_MESSAGE.w32path= Fixing win32 dll path.
32 32
33# Needed to fix build problems under, at least, NetBSD/amd64. 33# Needed to fix build problems under, at least, NetBSD/amd64.
34BUILDLINK_API_DEPENDS.libcdio+= libcdio>=0.75 34BUILDLINK_API_DEPENDS.libcdio+= libcdio>=0.75
35 35
 36PLIST_VARS+= qtw32
 37.if empty(MACHINE_PLATFORM:MDarwin-*-i386)
 38PLIST.qtw32= yes
 39.endif
 40
36.if ${OPSYS} == "SunOS" 41.if ${OPSYS} == "SunOS"
37PLIST_VARS+= oss 42PLIST_VARS+= oss
38.if ${OS_VERSION} == "5.11" 43.if ${OS_VERSION} == "5.11"
39PLIST.oss= yes 44PLIST.oss= yes
40.endif 45.endif
41.endif 46.endif
42 47
43CPPFLAGS.SunOS+= -D__u32=uint32_t -DHAVE_SYSI86 -DHAVE_MMX_FALSE 48CPPFLAGS.SunOS+= -D__u32=uint32_t -DHAVE_SYSI86 -DHAVE_MMX_FALSE
44LDFLAGS.SunOS+= -lresolv 49LDFLAGS.SunOS+= -lresolv
45 50
46# flac is supported internally; don't know what the plugin is good for 51# flac is supported internally; don't know what the plugin is good for
47# but until autodetection is turned off, force external flac for now. 52# but until autodetection is turned off, force external flac for now.
48.include "../../audio/flac/buildlink3.mk" 53.include "../../audio/flac/buildlink3.mk"
cvs diff -r1.8 -r1.9 pkgsrc/multimedia/xine-lib/Attic/PLIST.i386 (expand / switch to unified diff)

--- pkgsrc/multimedia/xine-lib/Attic/PLIST.i386 2008/04/24 12:32:22 1.8
+++ pkgsrc/multimedia/xine-lib/Attic/PLIST.i386 2014/06/30 13:41:00 1.9
@@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
1@comment $NetBSD: PLIST.i386,v 1.8 2008/04/24 12:32:22 wiz Exp $ 1@comment $NetBSD: PLIST.i386,v 1.9 2014/06/30 13:41:00 jperkin Exp $
2lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_decode_qt.a 2${PLIST.qtw32}lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_decode_qt.a
3lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_decode_qt.so 3${PLIST.qtw32}lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_decode_qt.so
4lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_decode_w32dll.a 4${PLIST.qtw32}lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_decode_w32dll.a
5lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_decode_w32dll.so 5${PLIST.qtw32}lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_decode_w32dll.so
cvs diff -r1.96 -r1.97 pkgsrc/multimedia/xine-lib/distinfo (expand / switch to unified diff)

--- pkgsrc/multimedia/xine-lib/distinfo 2014/06/27 12:17:22 1.96
+++ pkgsrc/multimedia/xine-lib/distinfo 2014/06/30 13:41:00 1.97
@@ -1,33 +1,33 @@ @@ -1,33 +1,33 @@
1$NetBSD: distinfo,v 1.96 2014/06/27 12:17:22 jperkin Exp $ 1$NetBSD: distinfo,v 1.97 2014/06/30 13:41:00 jperkin Exp $
2 2
3SHA1 (xine-lib-1.2.5.tar.xz) = c7ef38fa8ee301e44ba28d6549220546d02d053d 3SHA1 (xine-lib-1.2.5.tar.xz) = c7ef38fa8ee301e44ba28d6549220546d02d053d
4RMD160 (xine-lib-1.2.5.tar.xz) = bb9c3a06666f454e8dfda85471eb6605e2dcb685 4RMD160 (xine-lib-1.2.5.tar.xz) = bb9c3a06666f454e8dfda85471eb6605e2dcb685
5Size (xine-lib-1.2.5.tar.xz) = 5007012 bytes 5Size (xine-lib-1.2.5.tar.xz) = 5007012 bytes
6SHA1 (patch-ag) = a0edf812dd3fa4baf273950430fa47b7579ae53e 6SHA1 (patch-ag) = a0edf812dd3fa4baf273950430fa47b7579ae53e
7SHA1 (patch-aj) = df1759c9aaedc00fe55ea03aa5a0800efd68b02d 7SHA1 (patch-aj) = df1759c9aaedc00fe55ea03aa5a0800efd68b02d
8SHA1 (patch-at) = 9d83524bef9dacdb889b7d828053a3fef16a1689 8SHA1 (patch-at) = 9d83524bef9dacdb889b7d828053a3fef16a1689
9SHA1 (patch-cb) = 708ee946dd1708a40baef5ac193a46dc22bff8b5 9SHA1 (patch-cb) = 708ee946dd1708a40baef5ac193a46dc22bff8b5
10SHA1 (patch-cd) = 7cdb3c7b09ccb2ae1dd9245f0ab0b88ad753d7f1 10SHA1 (patch-cd) = 7cdb3c7b09ccb2ae1dd9245f0ab0b88ad753d7f1
11SHA1 (patch-fa) = 9312a3bab4ae8482a208948277f1d11fb7eaaf8c 11SHA1 (patch-fa) = 9312a3bab4ae8482a208948277f1d11fb7eaaf8c
12SHA1 (patch-include_xine_post.h) = 30629bff9486bf6b7ca889189cfad406eb242674 12SHA1 (patch-include_xine_post.h) = 30629bff9486bf6b7ca889189cfad406eb242674
13SHA1 (patch-input_dvb.c) = c18aa1743f677f73b2a743d485952c171a346179 13SHA1 (patch-input_dvb.c) = c18aa1743f677f73b2a743d485952c171a346179
14SHA1 (patch-na) = a02ae3bd178d34fdc1d584dcde992b8c328a3ea3 14SHA1 (patch-na) = a02ae3bd178d34fdc1d584dcde992b8c328a3ea3
15SHA1 (patch-src-demuxers-demux_qt.c) = 19d9999cd2ff3e42cb3c56121e35cf795abcbd4b 15SHA1 (patch-src-demuxers-demux_qt.c) = 19d9999cd2ff3e42cb3c56121e35cf795abcbd4b
16SHA1 (patch-src-post-audio-stretch.c) = 6f950bcd47fdf68b691744dc105f59f821748ce1 16SHA1 (patch-src-post-audio-stretch.c) = 6f950bcd47fdf68b691744dc105f59f821748ce1
17SHA1 (patch-src-post-audio-upmix.c) = 70ca6babfa9a7add0ac70a6024fcff429e1bc49d 17SHA1 (patch-src-post-audio-upmix.c) = 70ca6babfa9a7add0ac70a6024fcff429e1bc49d
18SHA1 (patch-src-post-audio-upmix_mono.c) = 2c70ded10118cbeed5be3c948886f7311ddb7bbd 18SHA1 (patch-src-post-audio-upmix_mono.c) = 2c70ded10118cbeed5be3c948886f7311ddb7bbd
19SHA1 (patch-src-post-audio-volnorm.c) = b110542ae4c21762cf369a4cf2b6c66343c3b761 19SHA1 (patch-src-post-audio-volnorm.c) = b110542ae4c21762cf369a4cf2b6c66343c3b761
20SHA1 (patch-src-post-deinterlace-plugins-greedy2frame.c) = 884561ed21c8a3d636339ff4d42cbc6fb389669a 20SHA1 (patch-src-post-deinterlace-plugins-greedy2frame.c) = bc9d23257043d239ded2d7a28de74ac8a23c6148
21SHA1 (patch-src-post-deinterlace-xine_plugin.c) = 536365d479b5cd0354365a53db4f19f8404788ac 21SHA1 (patch-src-post-deinterlace-xine_plugin.c) = 536365d479b5cd0354365a53db4f19f8404788ac
22SHA1 (patch-src-post-goom-mmx.h) = dfcb3269de02849ee3875c89438338edcdd7faa6 22SHA1 (patch-src-post-goom-mmx.h) = dfcb3269de02849ee3875c89438338edcdd7faa6
23SHA1 (patch-src-post-mosaico-mosaico.c) = 04f21603055b1e8e7490ba5d6e006ca5a9b683a3 23SHA1 (patch-src-post-mosaico-mosaico.c) = 04f21603055b1e8e7490ba5d6e006ca5a9b683a3
24SHA1 (patch-src-post-mosaico-switch.c) = ff46e13acfbcaf0167943b536b12cb95ec7591d4 24SHA1 (patch-src-post-mosaico-switch.c) = ff46e13acfbcaf0167943b536b12cb95ec7591d4
25SHA1 (patch-src-post-planar-boxblur.c) = 191ce5819fce39a247adaefe07e3302870c3d1c3 25SHA1 (patch-src-post-planar-boxblur.c) = 191ce5819fce39a247adaefe07e3302870c3d1c3
26SHA1 (patch-src-post-planar-denoise3d.c) = e140ff0b7867fd850099ff073f67201b4649dcad 26SHA1 (patch-src-post-planar-denoise3d.c) = e140ff0b7867fd850099ff073f67201b4649dcad
27SHA1 (patch-src-post-planar-eq.c) = 2c81fdb839456affa6882577479cea7934121619 27SHA1 (patch-src-post-planar-eq.c) = 2c81fdb839456affa6882577479cea7934121619
28SHA1 (patch-src-post-planar-eq2.c) = d55acfe532088394c18f6a4be97f98d5c7fd3267 28SHA1 (patch-src-post-planar-eq2.c) = d55acfe532088394c18f6a4be97f98d5c7fd3267
29SHA1 (patch-src-post-planar-expand.c) = 9d9ec1f5619f9a3d832bcace54d23011371f2067 29SHA1 (patch-src-post-planar-expand.c) = 9d9ec1f5619f9a3d832bcace54d23011371f2067
30SHA1 (patch-src-post-planar-noise.c) = 2deabf5d80e2c45959a4f89bbf2528f7e1c9e1f5 30SHA1 (patch-src-post-planar-noise.c) = 2deabf5d80e2c45959a4f89bbf2528f7e1c9e1f5
31SHA1 (patch-src-post-planar-pp.c) = f5bea421785132c5f1422ae9f0d468974fb0ae5d 31SHA1 (patch-src-post-planar-pp.c) = f5bea421785132c5f1422ae9f0d468974fb0ae5d
32SHA1 (patch-src-post-planar-unsharp.c) = 9f29c624f96a91760df960343096247d8c09c58d 32SHA1 (patch-src-post-planar-unsharp.c) = 9f29c624f96a91760df960343096247d8c09c58d
33SHA1 (patch-src_audio__out_Makefile.am) = 6c5ef1716e5874de0b43b794e2e4b86da922f029 33SHA1 (patch-src_audio__out_Makefile.am) = 6c5ef1716e5874de0b43b794e2e4b86da922f029
cvs diff -r1.2 -r1.3 pkgsrc/multimedia/xine-lib/patches/Attic/patch-src-post-deinterlace-plugins-greedy2frame.c (expand / switch to unified diff)

--- pkgsrc/multimedia/xine-lib/patches/Attic/patch-src-post-deinterlace-plugins-greedy2frame.c 2014/05/18 15:38:18 1.2
+++ pkgsrc/multimedia/xine-lib/patches/Attic/patch-src-post-deinterlace-plugins-greedy2frame.c 2014/06/30 13:41:00 1.3
@@ -1,23 +1,23 @@ @@ -1,23 +1,23 @@
1$NetBSD: patch-src-post-deinterlace-plugins-greedy2frame.c,v 1.2 2014/05/18 15:38:18 wiz Exp $ 1$NetBSD: patch-src-post-deinterlace-plugins-greedy2frame.c,v 1.3 2014/06/30 13:41:00 jperkin Exp $
2 2
3https://bugs.xine-project.org/show_bug.cgi?id=528 3https://bugs.xine-project.org/show_bug.cgi?id=528
4 4
5--- src/post/deinterlace/plugins/greedy2frame.c.orig 2012-05-26 21:49:59.000000000 +0100 5--- src/post/deinterlace/plugins/greedy2frame.c.orig 2012-05-26 21:49:59.000000000 +0100
6+++ src/post/deinterlace/plugins/greedy2frame.c 2012-08-15 08:08:27.000000000 +0100 6+++ src/post/deinterlace/plugins/greedy2frame.c 2012-08-15 08:08:27.000000000 +0100
7@@ -59,6 +59,8 @@ 7@@ -59,6 +59,8 @@
8 int bottom_field, int second_field, int width, int height ) 8 int bottom_field, int second_field, int width, int height )
9  9
10 { 10 {
11+#if defined(ARCH_X86) || defined(ARCH_X86_64) 11+#if (!defined(__APPLE__) && defined(ARCH_X86)) || defined(ARCH_X86_64)
12+ 12+
13 if (xine_mm_accel() & MM_ACCEL_X86_SSE2) { 13 if (xine_mm_accel() & MM_ACCEL_X86_SSE2) {
14 if (((uintptr_t)output & 15) || (outstride & 15) || 14 if (((uintptr_t)output & 15) || (outstride & 15) ||
15 width & 7 || 15 width & 7 ||
16@@ -82,6 +84,7 @@ 16@@ -82,6 +84,7 @@
17 bottom_field, second_field, width, height ); 17 bottom_field, second_field, width, height );
18 /* could fall back to 3dnow/mmx here too */ 18 /* could fall back to 3dnow/mmx here too */
19 } 19 }
20+#endif /*ARCH_X86 */ 20+#endif /*ARCH_X86 */
21 } 21 }
22  22
23  23