Thu Sep 20 15:33:41 2012 UTC ()
Disable MMX section on Solaris which has compiler issues, and ensure
libxine-interface.la is not empty by using the dummy object.

Fixes package on Solaris.


(jperkin)
diff -r1.86 -r1.87 pkgsrc/multimedia/xine-lib/distinfo
diff -r1.25 -r1.26 pkgsrc/multimedia/xine-lib/patches/patch-ag
diff -r0 -r1.1 pkgsrc/multimedia/xine-lib/patches/patch-src_post_goom_convolve_fx.c
diff -r0 -r1.1 pkgsrc/multimedia/xine-lib/patches/patch-src_xine-engine_Makefile.am
cvs diff -r1.86 -r1.87 pkgsrc/multimedia/xine-lib/distinfo (expand / switch to unified diff)

--- pkgsrc/multimedia/xine-lib/distinfo 2012/09/20 15:27:29 1.86
+++ pkgsrc/multimedia/xine-lib/distinfo 2012/09/20 15:33:40 1.87
@@ -1,21 +1,21 @@ @@ -1,21 +1,21 @@
1$NetBSD: distinfo,v 1.86 2012/09/20 15:27:29 jperkin Exp $ 1$NetBSD: distinfo,v 1.87 2012/09/20 15:33:40 jperkin Exp $
2 2
3SHA1 (xine-lib-1.2.2.tar.xz) = a349cbb0b72256bb262377796a022dcf63829b4c 3SHA1 (xine-lib-1.2.2.tar.xz) = a349cbb0b72256bb262377796a022dcf63829b4c
4RMD160 (xine-lib-1.2.2.tar.xz) = 3f11df3fa8a8946bdcc9cdecd6952dc76b834d14 4RMD160 (xine-lib-1.2.2.tar.xz) = 3f11df3fa8a8946bdcc9cdecd6952dc76b834d14
5Size (xine-lib-1.2.2.tar.xz) = 4857248 bytes 5Size (xine-lib-1.2.2.tar.xz) = 4857248 bytes
6SHA1 (patch-Makefile.am) = ab2bdb97834ea3ebf161e2c716f0dcb6eb147c1e 6SHA1 (patch-Makefile.am) = ab2bdb97834ea3ebf161e2c716f0dcb6eb147c1e
7SHA1 (patch-ad) = 94aaac03f74c72a1ca753d1320aac07d1bb8a846 7SHA1 (patch-ad) = 94aaac03f74c72a1ca753d1320aac07d1bb8a846
8SHA1 (patch-ag) = 0bdd5910ad7c446bdec5abac3292bcab7a4147ee 8SHA1 (patch-ag) = 00009002714ed26fa646eed326e2b0a5e2265572
9SHA1 (patch-aj) = 4215c3bc37cf636e563a509f9a391081ed8e773b 9SHA1 (patch-aj) = 4215c3bc37cf636e563a509f9a391081ed8e773b
10SHA1 (patch-ak) = 987700e6526b5112ac66bd6a8f9ee41f338c3508 10SHA1 (patch-ak) = 987700e6526b5112ac66bd6a8f9ee41f338c3508
11SHA1 (patch-ap) = d48fa83879895d4b1f56bfbcbe31087dd57d8a82 11SHA1 (patch-ap) = d48fa83879895d4b1f56bfbcbe31087dd57d8a82
12SHA1 (patch-as) = a0a93a256589e87a66eef31494441aa1b200f834 12SHA1 (patch-as) = a0a93a256589e87a66eef31494441aa1b200f834
13SHA1 (patch-at) = 15a810379ccb345aeeb374b0148096684f5f179b 13SHA1 (patch-at) = 15a810379ccb345aeeb374b0148096684f5f179b
14SHA1 (patch-av) = 12b8957279b977db3bba2c1adae40217a1661072 14SHA1 (patch-av) = 12b8957279b977db3bba2c1adae40217a1661072
15SHA1 (patch-cb) = db4ff27418e05e97bf30b554beecc24d6e578d15 15SHA1 (patch-cb) = db4ff27418e05e97bf30b554beecc24d6e578d15
16SHA1 (patch-cd) = 192530e79568ea165b1fc675c7e794133a06c734 16SHA1 (patch-cd) = 192530e79568ea165b1fc675c7e794133a06c734
17SHA1 (patch-fa) = 9312a3bab4ae8482a208948277f1d11fb7eaaf8c 17SHA1 (patch-fa) = 9312a3bab4ae8482a208948277f1d11fb7eaaf8c
18SHA1 (patch-input_dvb.c) = 712291f38e5eec79daecb524e990e67af0d2c427 18SHA1 (patch-input_dvb.c) = 712291f38e5eec79daecb524e990e67af0d2c427
19SHA1 (patch-na) = b1158183f6caa772c1f3e08cb9abedc28326523f 19SHA1 (patch-na) = b1158183f6caa772c1f3e08cb9abedc28326523f
20SHA1 (patch-src-demuxers-demux_qt.c) = 2942911c09c0580c6017474af2a14f5b1f193c1d 20SHA1 (patch-src-demuxers-demux_qt.c) = 2942911c09c0580c6017474af2a14f5b1f193c1d
21SHA1 (patch-src-post-audio-stretch.c) = bc083541c410e8b8c2b5c23bc7b2b0ae312272a5 21SHA1 (patch-src-post-audio-stretch.c) = bc083541c410e8b8c2b5c23bc7b2b0ae312272a5
@@ -31,13 +31,15 @@ SHA1 (patch-src-post-mosaico-mosaico.c)  @@ -31,13 +31,15 @@ SHA1 (patch-src-post-mosaico-mosaico.c)
31SHA1 (patch-src-post-mosaico-switch.c) = 11dd1ec387c298693fc82feba1f16a316648e580 31SHA1 (patch-src-post-mosaico-switch.c) = 11dd1ec387c298693fc82feba1f16a316648e580
32SHA1 (patch-src-post-planar-boxblur.c) = 1bcaec011aaf581394ad42c9ff324ec0a3d28ecb 32SHA1 (patch-src-post-planar-boxblur.c) = 1bcaec011aaf581394ad42c9ff324ec0a3d28ecb
33SHA1 (patch-src-post-planar-denoise3d.c) = 05059a1864278f749a5796661075db522c2e202c 33SHA1 (patch-src-post-planar-denoise3d.c) = 05059a1864278f749a5796661075db522c2e202c
34SHA1 (patch-src-post-planar-eq.c) = 85f6f72bc5fbc52f0ae48751b20fb100d5d6f27b 34SHA1 (patch-src-post-planar-eq.c) = 85f6f72bc5fbc52f0ae48751b20fb100d5d6f27b
35SHA1 (patch-src-post-planar-eq2.c) = 7d2bab3cfc0d7d03c84e48985c2c55ebf1582126 35SHA1 (patch-src-post-planar-eq2.c) = 7d2bab3cfc0d7d03c84e48985c2c55ebf1582126
36SHA1 (patch-src-post-planar-expand.c) = 7c532feeae4078f40d6f9a28dfa207e5cbee60a1 36SHA1 (patch-src-post-planar-expand.c) = 7c532feeae4078f40d6f9a28dfa207e5cbee60a1
37SHA1 (patch-src-post-planar-noise.c) = b3baf82e150ca9a27e73753398c18839066748f1 37SHA1 (patch-src-post-planar-noise.c) = b3baf82e150ca9a27e73753398c18839066748f1
38SHA1 (patch-src-post-planar-pp.c) = 147dc05a09ff851af99c488112c6a77926ae5afb 38SHA1 (patch-src-post-planar-pp.c) = 147dc05a09ff851af99c488112c6a77926ae5afb
39SHA1 (patch-src-post-planar-unsharp.c) = 964ec33c8c3cfcc8783b5fae1093c8fba76ff2a9 39SHA1 (patch-src-post-planar-unsharp.c) = 964ec33c8c3cfcc8783b5fae1093c8fba76ff2a9
40SHA1 (patch-src-xine-engine-post.h) = 3b96d1279bbec48b2f3df50a576bfa8ec25f796f 40SHA1 (patch-src-xine-engine-post.h) = 3b96d1279bbec48b2f3df50a576bfa8ec25f796f
41SHA1 (patch-src_audio__out_Makefile.am) = 5f8ba2ce81a63cb195407c3ce6649007ce15408f 41SHA1 (patch-src_audio__out_Makefile.am) = 5f8ba2ce81a63cb195407c3ce6649007ce15408f
42SHA1 (patch-src_libw32dll_wine_Makefile.am) = 17c717c84531780dc06c3cd5db8f879a560aeb3a 42SHA1 (patch-src_libw32dll_wine_Makefile.am) = 17c717c84531780dc06c3cd5db8f879a560aeb3a
43SHA1 (patch-src_libw32dll_wine_registry.c) = f34685be27dc9ec098f80e78cd24f3e92f12367a 43SHA1 (patch-src_libw32dll_wine_registry.c) = f34685be27dc9ec098f80e78cd24f3e92f12367a
 44SHA1 (patch-src_post_goom_convolve_fx.c) = 61ab87d03780f057ba6e8e7f2097e57bac9bfa49
 45SHA1 (patch-src_xine-engine_Makefile.am) = 24efec8a881ca068b18e6370e9b02a6f6bc5c3d9
cvs diff -r1.25 -r1.26 pkgsrc/multimedia/xine-lib/patches/patch-ag (expand / switch to unified diff)

--- pkgsrc/multimedia/xine-lib/patches/patch-ag 2012/04/01 18:42:02 1.25
+++ pkgsrc/multimedia/xine-lib/patches/patch-ag 2012/09/20 15:33:40 1.26
@@ -1,34 +1,43 @@ @@ -1,34 +1,43 @@
1$NetBSD: patch-ag,v 1.25 2012/04/01 18:42:02 hans Exp $ 1$NetBSD: patch-ag,v 1.26 2012/09/20 15:33:40 jperkin Exp $
2 2
3--- configure.ac.orig 2012-02-04 00:41:43.000000000 +0000 3--- configure.ac.orig 2012-06-09 17:30:18.000000000 +0000
4+++ configure.ac 4+++ configure.ac 2012-09-20 14:41:33.687892237 +0000
5@@ -272,6 +272,10 @@ AC_CHECK_LIB([nsl], [gethostbyname],  5@@ -9,7 +9,7 @@
 6
 7 dnl Initialize autoconf, autoheader, and automake
 8 AC_INIT([xine-lib], XINE_VERSION_SPEC, [xine-bugs@lists.sourceforge.net])
 9-AM_INIT_AUTOMAKE
 10+AM_INIT_AUTOMAKE([subdir-objects])
 11 AC_CONFIG_SRCDIR([src/xine-engine/xine.c])
 12 AC_CONFIG_MACRO_DIR([m4])
 13 AC_CONFIG_LIBOBJ_DIR([lib])
 14@@ -272,6 +272,10 @@
6 AC_CHECK_LIB([resolv], [hstrerror], [NET_LIBS="-lresolv $NET_LIBS"]) 15 AC_CHECK_LIB([resolv], [hstrerror], [NET_LIBS="-lresolv $NET_LIBS"])
7 AC_SUBST(NET_LIBS) 16 AC_SUBST(NET_LIBS)
8  17
9+WINE_LIBS="" 18+WINE_LIBS=""
10+AC_CHECK_LIB(i386, i386_set_ldt, WINE_LIBS="-li386 $WINE_LIBS",) 19+AC_CHECK_LIB(i386, i386_set_ldt, WINE_LIBS="-li386 $WINE_LIBS",)
11+AC_SUBST(WINE_LIBS) 20+AC_SUBST(WINE_LIBS)
12+ 21+
13 AC_CHECK_LIB([rt], [clock_getres], 22 AC_CHECK_LIB([rt], [clock_getres],
14 [RT_LIBS="-lrt" 23 [RT_LIBS="-lrt"
15 AC_DEFINE(HAVE_POSIX_TIMERS, 1, [Define this if you have POSIX timers.])],  24 AC_DEFINE(HAVE_POSIX_TIMERS, 1, [Define this if you have POSIX timers.])],
16@@ -361,6 +365,10 @@ case "$host_os" in 25@@ -361,6 +365,10 @@
17 esac 26 esac
18 AC_CHECK_HEADERS([sys/dvdio.h sys/cdio.h sys/scsiio.h]) 27 AC_CHECK_HEADERS([sys/dvdio.h sys/cdio.h sys/scsiio.h])
19  28
20+dnl ---------------------------------------------- 29+dnl ----------------------------------------------
21+dnl Check for NetBSD DTV headers 30+dnl Check for NetBSD DTV headers
22+dnl ---------------------------------------------- 31+dnl ----------------------------------------------
23+AC_CHECK_HEADERS([dev/dtv/dtvio.h]) 32+AC_CHECK_HEADERS([dev/dtv/dtvio.h])
24  33
25 dnl ---------------- 34 dnl ----------------
26 dnl checks for types 35 dnl checks for types
27@@ -908,6 +916,7 @@ AC_CHECK_FUNCS([strncasecmp _strnicmp],  36@@ -905,6 +913,7 @@
28  37
29 AC_FUNC_FSEEKO 38 AC_FUNC_FSEEKO
30  39
31+AC_LIBOBJ(dummy) 40+AC_LIBOBJ(dummy)
32 AC_REPLACE_FUNCS([asprintf basename gettimeofday setenv strcasestr strndup strpbrk strsep strtok_r timegm unsetenv memmem]) 41 AC_REPLACE_FUNCS([asprintf basename gettimeofday setenv strcasestr strndup strpbrk strsep strtok_r timegm unsetenv memmem])
33  42
34 AC_LIBSOURCE([hstrerror.c]) 43 AC_LIBSOURCE([hstrerror.c])
File Added: pkgsrc/multimedia/xine-lib/patches/Attic/patch-src_post_goom_convolve_fx.c
$NetBSD: patch-src_post_goom_convolve_fx.c,v 1.1 2012/09/20 15:33:40 jperkin Exp $

Solaris cannot handle this MMX section, failing with:

 error: can't find a register in class GENERAL_REGS while reloading 'asm'.

--- src/post/goom/convolve_fx.c.orig	2012-09-20 15:19:11.848384461 +0000
+++ src/post/goom/convolve_fx.c	2012-09-20 15:19:24.654150136 +0000
@@ -151,7 +151,7 @@
     ytex = yprime + yi + CONV_MOTIF_W * 0x10000 / 2;
     yprime += c;
 
-#if defined(HAVE_MMX) && ! defined(ARCH_X86_64)
+#if defined(HAVE_MMX) && ! defined(ARCH_X86_64) && !defined(__sun)
 /* This code uses 32-bit registers eax,ecx,esi */
     __asm__ __volatile__
       ("\n\t pxor  %%mm7,  %%mm7"  /* mm7 = 0   */
File Added: pkgsrc/multimedia/xine-lib/patches/Attic/patch-src_xine-engine_Makefile.am
$NetBSD: patch-src_xine-engine_Makefile.am,v 1.1 2012/09/20 15:33:40 jperkin Exp $

Ensure we link something.

--- src/xine-engine/Makefile.am.orig	2012-09-20 14:30:26.827382120 +0000
+++ src/xine-engine/Makefile.am	2012-09-20 14:31:37.419849112 +0000
@@ -50,6 +50,7 @@
 	-version-info $(XINE_LT_CURRENT):$(XINE_LT_REVISION):$(XINE_LT_AGE)
 
 libxine_interface_la_SOURCES =
+libxine_interface_la_LIBADD = @LTLIBOBJS@
 
 libxine_interface_la_LDFLAGS = $(AM_LDFLAGS) $(def_ldflags) \
 	-version-info $(XINE_LT_CURRENT):$(XINE_LT_REVISION):$(XINE_LT_AGE)