Sun Dec 25 03:24:10 2011 UTC ()
Because automake is now being called automake source files (not output file)
must be patched.


(sbd)
diff -r1.77 -r1.78 pkgsrc/multimedia/xine-lib/distinfo
diff -r0 -r1.1 pkgsrc/multimedia/xine-lib/patches/patch-Makefile.am
diff -r0 -r1.1 pkgsrc/multimedia/xine-lib/patches/patch-include_Makefile.am
diff -r0 -r1.1 pkgsrc/multimedia/xine-lib/patches/patch-src_audio__out_Makefile.am
diff -r0 -r1.1 pkgsrc/multimedia/xine-lib/patches/patch-src_libw32dll_wine_Makefile.am
diff -r1.16 -r0 pkgsrc/multimedia/xine-lib/patches/patch-ao
diff -r1.10 -r0 pkgsrc/multimedia/xine-lib/patches/patch-be
diff -r1.5 -r0 pkgsrc/multimedia/xine-lib/patches/patch-bg
diff -r1.6 -r0 pkgsrc/multimedia/xine-lib/patches/patch-ga
cvs diff -r1.77 -r1.78 pkgsrc/multimedia/xine-lib/distinfo (expand / switch to unified diff)

--- pkgsrc/multimedia/xine-lib/distinfo 2011/12/24 03:02:25 1.77
+++ pkgsrc/multimedia/xine-lib/distinfo 2011/12/25 03:24:09 1.78
@@ -1,41 +1,41 @@ @@ -1,41 +1,41 @@
1$NetBSD: distinfo,v 1.77 2011/12/24 03:02:25 sbd Exp $ 1$NetBSD: distinfo,v 1.78 2011/12/25 03:24:09 sbd Exp $
2 2
3SHA1 (xine-lib-1.1.20.tar.bz2) = 60ce1cea9bf7a6b7d8c60141593a8ed0c54f9445 3SHA1 (xine-lib-1.1.20.tar.bz2) = 60ce1cea9bf7a6b7d8c60141593a8ed0c54f9445
4RMD160 (xine-lib-1.1.20.tar.bz2) = c531b74142ad92b7fe2956c69fd1398e7c8cb1fb 4RMD160 (xine-lib-1.1.20.tar.bz2) = c531b74142ad92b7fe2956c69fd1398e7c8cb1fb
5Size (xine-lib-1.1.20.tar.bz2) = 7585795 bytes 5Size (xine-lib-1.1.20.tar.bz2) = 7585795 bytes
 6SHA1 (patch-Makefile.am) = 3cfff7a6941015921c166f9a67159a5bb3ca0204
6SHA1 (patch-ad) = 94aaac03f74c72a1ca753d1320aac07d1bb8a846 7SHA1 (patch-ad) = 94aaac03f74c72a1ca753d1320aac07d1bb8a846
7SHA1 (patch-ag) = 96a2bab961ca90d7e3c1d67b6aa09388f9478d35 8SHA1 (patch-ag) = 96a2bab961ca90d7e3c1d67b6aa09388f9478d35
8SHA1 (patch-aj) = 4215c3bc37cf636e563a509f9a391081ed8e773b 9SHA1 (patch-aj) = 4215c3bc37cf636e563a509f9a391081ed8e773b
9SHA1 (patch-ak) = 987700e6526b5112ac66bd6a8f9ee41f338c3508 10SHA1 (patch-ak) = 987700e6526b5112ac66bd6a8f9ee41f338c3508
10SHA1 (patch-ao) = 2682548a181803bc2d79f79d76828b6b3ba0e4fa 
11SHA1 (patch-ap) = 4bc0c3923b50049f166f3bec703705ae33c166e9 11SHA1 (patch-ap) = 4bc0c3923b50049f166f3bec703705ae33c166e9
12SHA1 (patch-as) = a0a93a256589e87a66eef31494441aa1b200f834 12SHA1 (patch-as) = a0a93a256589e87a66eef31494441aa1b200f834
13SHA1 (patch-be) = 6d03de71811bd03295621d04d3166625f4f4f079 
14SHA1 (patch-bg) = f072486eb8441b8bed2c825380aa04d99bc70cc1 
15SHA1 (patch-cb) = db4ff27418e05e97bf30b554beecc24d6e578d15 13SHA1 (patch-cb) = db4ff27418e05e97bf30b554beecc24d6e578d15
16SHA1 (patch-cd) = a080c745d08ded46db7c1173fe55350c1eb9ff33 14SHA1 (patch-cd) = a080c745d08ded46db7c1173fe55350c1eb9ff33
17SHA1 (patch-da) = f79701d7c036e78d760c12119d88fe3f0dd1762d 15SHA1 (patch-da) = f79701d7c036e78d760c12119d88fe3f0dd1762d
18SHA1 (patch-db) = 3ad4ca6f43a379b251211477972cd6d34b1f821a 16SHA1 (patch-db) = 3ad4ca6f43a379b251211477972cd6d34b1f821a
19SHA1 (patch-dc) = 11c4212029e67f22796e57706b42400a0dbcac3a 17SHA1 (patch-dc) = 11c4212029e67f22796e57706b42400a0dbcac3a
20SHA1 (patch-fa) = 9312a3bab4ae8482a208948277f1d11fb7eaaf8c 18SHA1 (patch-fa) = 9312a3bab4ae8482a208948277f1d11fb7eaaf8c
21SHA1 (patch-ga) = c4770b6be12bbc4dd72f8299f3b0bbf92546cc68 19SHA1 (patch-include_Makefile.am) = 9fa5a83a340358b1d3651ce2cc18f61772e9d128
22SHA1 (patch-input_dvb.c) = 37aa191dca0df058dc09477624ff76dbc3a2f9b9 20SHA1 (patch-input_dvb.c) = 37aa191dca0df058dc09477624ff76dbc3a2f9b9
23SHA1 (patch-src-audio_out-audio_file_out.c) = 2b09abc82bc0b023ed9feaa5d77dd14db73f30df 21SHA1 (patch-src-audio_out-audio_file_out.c) = 2b09abc82bc0b023ed9feaa5d77dd14db73f30df
24SHA1 (patch-src-demuxers-demux_qt.c) = 2942911c09c0580c6017474af2a14f5b1f193c1d 22SHA1 (patch-src-demuxers-demux_qt.c) = 2942911c09c0580c6017474af2a14f5b1f193c1d
25SHA1 (patch-src-post-audio-stretch.c) = bc083541c410e8b8c2b5c23bc7b2b0ae312272a5 23SHA1 (patch-src-post-audio-stretch.c) = bc083541c410e8b8c2b5c23bc7b2b0ae312272a5
26SHA1 (patch-src-post-audio-upmix.c) = ab01e157b42b8dd99622a17b5a8ecdb464ee694e 24SHA1 (patch-src-post-audio-upmix.c) = ab01e157b42b8dd99622a17b5a8ecdb464ee694e
27SHA1 (patch-src-post-audio-upmix_mono.c) = 182a73985d6158c5ab2409bc372b302d3385320e 25SHA1 (patch-src-post-audio-upmix_mono.c) = 182a73985d6158c5ab2409bc372b302d3385320e
28SHA1 (patch-src-post-audio-volnorm.c) = 49d9bd437d240ddf2a14275d518469313cb29a0c 26SHA1 (patch-src-post-audio-volnorm.c) = 49d9bd437d240ddf2a14275d518469313cb29a0c
29SHA1 (patch-src-post-deinterlace-xine_plugin.c) = 132554aa9bdc43fbe9e7dc42fee5916cb60be806 27SHA1 (patch-src-post-deinterlace-xine_plugin.c) = 132554aa9bdc43fbe9e7dc42fee5916cb60be806
30SHA1 (patch-src-post-goom-mmx.h) = 09b82b9e1fae57afb385daa1cd3bb265fd680a1d 28SHA1 (patch-src-post-goom-mmx.h) = 09b82b9e1fae57afb385daa1cd3bb265fd680a1d
31SHA1 (patch-src-post-mosaico-mosaico.c) = f26e6ccc60c78a499d2bd0fd8f3d4c2f4efffde8 29SHA1 (patch-src-post-mosaico-mosaico.c) = f26e6ccc60c78a499d2bd0fd8f3d4c2f4efffde8
32SHA1 (patch-src-post-mosaico-switch.c) = 11dd1ec387c298693fc82feba1f16a316648e580 30SHA1 (patch-src-post-mosaico-switch.c) = 11dd1ec387c298693fc82feba1f16a316648e580
33SHA1 (patch-src-post-planar-boxblur.c) = 1bcaec011aaf581394ad42c9ff324ec0a3d28ecb 31SHA1 (patch-src-post-planar-boxblur.c) = 1bcaec011aaf581394ad42c9ff324ec0a3d28ecb
34SHA1 (patch-src-post-planar-denoise3d.c) = 05059a1864278f749a5796661075db522c2e202c 32SHA1 (patch-src-post-planar-denoise3d.c) = 05059a1864278f749a5796661075db522c2e202c
35SHA1 (patch-src-post-planar-eq.c) = 85f6f72bc5fbc52f0ae48751b20fb100d5d6f27b 33SHA1 (patch-src-post-planar-eq.c) = 85f6f72bc5fbc52f0ae48751b20fb100d5d6f27b
36SHA1 (patch-src-post-planar-eq2.c) = 7d2bab3cfc0d7d03c84e48985c2c55ebf1582126 34SHA1 (patch-src-post-planar-eq2.c) = 7d2bab3cfc0d7d03c84e48985c2c55ebf1582126
37SHA1 (patch-src-post-planar-expand.c) = 7c532feeae4078f40d6f9a28dfa207e5cbee60a1 35SHA1 (patch-src-post-planar-expand.c) = 7c532feeae4078f40d6f9a28dfa207e5cbee60a1
38SHA1 (patch-src-post-planar-noise.c) = b3baf82e150ca9a27e73753398c18839066748f1 36SHA1 (patch-src-post-planar-noise.c) = b3baf82e150ca9a27e73753398c18839066748f1
39SHA1 (patch-src-post-planar-pp.c) = 147dc05a09ff851af99c488112c6a77926ae5afb 37SHA1 (patch-src-post-planar-pp.c) = 147dc05a09ff851af99c488112c6a77926ae5afb
40SHA1 (patch-src-post-planar-unsharp.c) = 964ec33c8c3cfcc8783b5fae1093c8fba76ff2a9 38SHA1 (patch-src-post-planar-unsharp.c) = 964ec33c8c3cfcc8783b5fae1093c8fba76ff2a9
41SHA1 (patch-src-xine-engine-post.h) = 9a768aa3558bcde6f382f6945758a969f669338c 39SHA1 (patch-src-xine-engine-post.h) = 9a768aa3558bcde6f382f6945758a969f669338c
 40SHA1 (patch-src_audio__out_Makefile.am) = a4b5b55eb2b5e7a8d85fb58100f71fb89bd9d79c
 41SHA1 (patch-src_libw32dll_wine_Makefile.am) = 6be7574a5e0d120f1598b6cc34c39f1bf98a2a69
File Added: pkgsrc/multimedia/xine-lib/patches/Attic/patch-Makefile.am
$NetBSD: patch-Makefile.am,v 1.1 2011/12/25 03:24:09 sbd Exp $

--- Makefile.am.orig	2010-03-22 20:08:04.000000000 +0000
+++ Makefile.am
@@ -111,5 +111,5 @@ maintainer-clean-generic:
 maintainer-clean-generic-hook:
 	rm -f config.status
 
-$(top_srcdir)/configure:  $(am__configure_deps)
-	cd $(srcdir) && $(AUTOCONF) && $(SED) -i -e '/gnu_ld/,/;;/ s/--rpath \$${wl}/--rpath,/' $@
+#$(top_srcdir)/configure:  $(am__configure_deps)
+#	cd $(srcdir) && $(AUTOCONF) && $(SED) -i -e '/gnu_ld/,/;;/ s/--rpath \$${wl}/--rpath,/' $@
File Added: pkgsrc/multimedia/xine-lib/patches/Attic/patch-include_Makefile.am
$NetBSD: patch-include_Makefile.am,v 1.1 2011/12/25 03:24:10 sbd Exp $

--- include/Makefile.am.orig	2010-03-09 22:17:04.000000000 +0000
+++ include/Makefile.am
@@ -26,7 +26,8 @@ maintainer-clean-generic:
 	-rm -f Makefile.in configure.h.in
 
 install-data-local: install-includeHEADERS
-	sed -e '/^\/\*_x_/d' xine.h > $(DESTDIR)$(includedir)/xine.h
+	sed -e '/^\/\*_x_/d' xine.h > installed-xine.h
+	$(INSTALL_HEADER) installed-xine.h $(DESTDIR)$(includedir)/xine.h
 if GENERATED_INTTYPES_H
 	$(INSTALL) inttypes.h $(DESTDIR)$(includedir)
 endif
File Added: pkgsrc/multimedia/xine-lib/patches/Attic/patch-src_audio__out_Makefile.am
$NetBSD: patch-src_audio__out_Makefile.am,v 1.1 2011/12/25 03:24:10 sbd Exp $

--- src/audio_out/Makefile.am.orig	2011-12-25 03:03:07.490662740 +0000
+++ src/audio_out/Makefile.am
@@ -84,7 +84,7 @@ xineplug_ao_out_file_la_LIBADD = $(XINE_
 xineplug_ao_out_file_la_CFLAGS = $(VISIBILITY_FLAG)
 
 xineplug_ao_out_oss_la_SOURCES = audio_oss_out.c
-xineplug_ao_out_oss_la_LIBADD = $(XINE_LIB) $(LTLIBINTL)
+xineplug_ao_out_oss_la_LIBADD = $(XINE_LIB) $(LTLIBINTL) $(OSS_LIBS)
 xineplug_ao_out_oss_la_CFLAGS = $(VISIBILITY_FLAG)
 
 xineplug_ao_out_alsa_la_SOURCES = audio_alsa_out.c
File Added: pkgsrc/multimedia/xine-lib/patches/Attic/patch-src_libw32dll_wine_Makefile.am
$NetBSD: patch-src_libw32dll_wine_Makefile.am,v 1.1 2011/12/25 03:24:10 sbd Exp $

--- src/libw32dll/wine/Makefile.am.orig	2011-12-25 02:59:19.234745775 +0000
+++ src/libw32dll/wine/Makefile.am
@@ -21,6 +21,8 @@ if HAVE_W32DLL
 wine_lib = libwine.la
 endif
 
+libwine_la_LIBADD = ${WINE_LIBS}
+
 libwine_la_SOURCES = \
 	afl.c \
 	driver.c \
File Deleted: pkgsrc/multimedia/xine-lib/patches/Attic/patch-ao
File Deleted: pkgsrc/multimedia/xine-lib/patches/Attic/patch-be
File Deleted: pkgsrc/multimedia/xine-lib/patches/Attic/patch-bg
File Deleted: pkgsrc/multimedia/xine-lib/patches/Attic/patch-ga