From 214609f4d66745358d460b5e8cb11864e09cc1bd Mon Sep 17 00:00:00 2001 From: sbd Date: Sun, 25 Dec 2011 03:24:09 +0000 Subject: Because automake is now being called automake source files (not output file) must be patched. --- multimedia/xine-lib/distinfo | 10 +++++----- multimedia/xine-lib/patches/patch-Makefile.am | 12 ++++++++++++ multimedia/xine-lib/patches/patch-ao | 21 --------------------- multimedia/xine-lib/patches/patch-be | 21 --------------------- multimedia/xine-lib/patches/patch-bg | 14 -------------- multimedia/xine-lib/patches/patch-ga | 15 --------------- .../xine-lib/patches/patch-include_Makefile.am | 14 ++++++++++++++ .../patches/patch-src_audio__out_Makefile.am | 13 +++++++++++++ .../patches/patch-src_libw32dll_wine_Makefile.am | 13 +++++++++++++ 9 files changed, 57 insertions(+), 76 deletions(-) create mode 100644 multimedia/xine-lib/patches/patch-Makefile.am delete mode 100644 multimedia/xine-lib/patches/patch-ao delete mode 100644 multimedia/xine-lib/patches/patch-be delete mode 100644 multimedia/xine-lib/patches/patch-bg delete mode 100644 multimedia/xine-lib/patches/patch-ga create mode 100644 multimedia/xine-lib/patches/patch-include_Makefile.am create mode 100644 multimedia/xine-lib/patches/patch-src_audio__out_Makefile.am create mode 100644 multimedia/xine-lib/patches/patch-src_libw32dll_wine_Makefile.am (limited to 'multimedia/xine-lib') diff --git a/multimedia/xine-lib/distinfo b/multimedia/xine-lib/distinfo index e08b5d1159e..18d10959520 100644 --- a/multimedia/xine-lib/distinfo +++ b/multimedia/xine-lib/distinfo @@ -1,24 +1,22 @@ -$NetBSD: distinfo,v 1.77 2011/12/24 03:02:25 sbd Exp $ +$NetBSD: distinfo,v 1.78 2011/12/25 03:24:09 sbd Exp $ SHA1 (xine-lib-1.1.20.tar.bz2) = 60ce1cea9bf7a6b7d8c60141593a8ed0c54f9445 RMD160 (xine-lib-1.1.20.tar.bz2) = c531b74142ad92b7fe2956c69fd1398e7c8cb1fb Size (xine-lib-1.1.20.tar.bz2) = 7585795 bytes +SHA1 (patch-Makefile.am) = 3cfff7a6941015921c166f9a67159a5bb3ca0204 SHA1 (patch-ad) = 94aaac03f74c72a1ca753d1320aac07d1bb8a846 SHA1 (patch-ag) = 96a2bab961ca90d7e3c1d67b6aa09388f9478d35 SHA1 (patch-aj) = 4215c3bc37cf636e563a509f9a391081ed8e773b SHA1 (patch-ak) = 987700e6526b5112ac66bd6a8f9ee41f338c3508 -SHA1 (patch-ao) = 2682548a181803bc2d79f79d76828b6b3ba0e4fa SHA1 (patch-ap) = 4bc0c3923b50049f166f3bec703705ae33c166e9 SHA1 (patch-as) = a0a93a256589e87a66eef31494441aa1b200f834 -SHA1 (patch-be) = 6d03de71811bd03295621d04d3166625f4f4f079 -SHA1 (patch-bg) = f072486eb8441b8bed2c825380aa04d99bc70cc1 SHA1 (patch-cb) = db4ff27418e05e97bf30b554beecc24d6e578d15 SHA1 (patch-cd) = a080c745d08ded46db7c1173fe55350c1eb9ff33 SHA1 (patch-da) = f79701d7c036e78d760c12119d88fe3f0dd1762d SHA1 (patch-db) = 3ad4ca6f43a379b251211477972cd6d34b1f821a SHA1 (patch-dc) = 11c4212029e67f22796e57706b42400a0dbcac3a SHA1 (patch-fa) = 9312a3bab4ae8482a208948277f1d11fb7eaaf8c -SHA1 (patch-ga) = c4770b6be12bbc4dd72f8299f3b0bbf92546cc68 +SHA1 (patch-include_Makefile.am) = 9fa5a83a340358b1d3651ce2cc18f61772e9d128 SHA1 (patch-input_dvb.c) = 37aa191dca0df058dc09477624ff76dbc3a2f9b9 SHA1 (patch-src-audio_out-audio_file_out.c) = 2b09abc82bc0b023ed9feaa5d77dd14db73f30df SHA1 (patch-src-demuxers-demux_qt.c) = 2942911c09c0580c6017474af2a14f5b1f193c1d @@ -39,3 +37,5 @@ SHA1 (patch-src-post-planar-noise.c) = b3baf82e150ca9a27e73753398c18839066748f1 SHA1 (patch-src-post-planar-pp.c) = 147dc05a09ff851af99c488112c6a77926ae5afb SHA1 (patch-src-post-planar-unsharp.c) = 964ec33c8c3cfcc8783b5fae1093c8fba76ff2a9 SHA1 (patch-src-xine-engine-post.h) = 9a768aa3558bcde6f382f6945758a969f669338c +SHA1 (patch-src_audio__out_Makefile.am) = a4b5b55eb2b5e7a8d85fb58100f71fb89bd9d79c +SHA1 (patch-src_libw32dll_wine_Makefile.am) = 6be7574a5e0d120f1598b6cc34c39f1bf98a2a69 diff --git a/multimedia/xine-lib/patches/patch-Makefile.am b/multimedia/xine-lib/patches/patch-Makefile.am new file mode 100644 index 00000000000..f2e9cfce330 --- /dev/null +++ b/multimedia/xine-lib/patches/patch-Makefile.am @@ -0,0 +1,12 @@ +$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,/' $@ diff --git a/multimedia/xine-lib/patches/patch-ao b/multimedia/xine-lib/patches/patch-ao deleted file mode 100644 index 199bcab6f55..00000000000 --- a/multimedia/xine-lib/patches/patch-ao +++ /dev/null @@ -1,21 +0,0 @@ -$NetBSD: patch-ao,v 1.16 2009/12/09 10:13:03 drochner Exp $ - ---- src/libw32dll/wine/Makefile.in.orig 2009-12-01 02:53:38.000000000 +0100 -+++ src/libw32dll/wine/Makefile.in -@@ -64,7 +64,7 @@ CONFIG_HEADER = $(top_builddir)/include/ - CONFIG_CLEAN_FILES = - CONFIG_CLEAN_VPATH_FILES = - LTLIBRARIES = $(noinst_LTLIBRARIES) --libwine_la_LIBADD = -+libwine_la_LIBADD = ${WINE_LIBS} - am_libwine_la_OBJECTS = afl.lo driver.lo elfdll.lo ext.lo \ - ldt_keeper.lo module.lo pe_image.lo pe_resource.lo resource.lo \ - registry.lo vfl.lo win32.lo stubs.lo wrapper.lo -@@ -315,6 +315,7 @@ WAND_LIBS = @WAND_LIBS@ - WAVPACK_CFLAGS = @WAVPACK_CFLAGS@ - WAVPACK_LIBS = @WAVPACK_LIBS@ - WIN32_CPPFLAGS = @WIN32_CPPFLAGS@ -+WINE_LIBS = @WINE_LIBS@ - XCBSHM_CFLAGS = @XCBSHM_CFLAGS@ - XCBSHM_LIBS = @XCBSHM_LIBS@ - XCBXV_CFLAGS = @XCBXV_CFLAGS@ diff --git a/multimedia/xine-lib/patches/patch-be b/multimedia/xine-lib/patches/patch-be deleted file mode 100644 index 4de10248e0b..00000000000 --- a/multimedia/xine-lib/patches/patch-be +++ /dev/null @@ -1,21 +0,0 @@ -$NetBSD: patch-be,v 1.10 2011/11/16 19:45:37 drochner Exp $ - ---- src/audio_out/Makefile.in.orig 2011-11-13 01:37:24.000000000 +0000 -+++ src/audio_out/Makefile.in -@@ -458,6 +458,7 @@ OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ - OPENGL_CFLAGS = @OPENGL_CFLAGS@ - OPENGL_LIBS = @OPENGL_LIBS@ -+OSS_LIBS = @OSS_LIBS@ - OTOOL = @OTOOL@ - OTOOL64 = @OTOOL64@ - PACKAGE = @PACKAGE@ -@@ -662,7 +663,7 @@ xineplug_ao_out_file_la_SOURCES = audio_ - xineplug_ao_out_file_la_LIBADD = $(XINE_LIB) $(LTLIBINTL) - 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 - xineplug_ao_out_alsa_la_LIBADD = $(XINE_LIB) $(ALSA_LIBS) $(PTHREAD_LIBS) $(LTLIBINTL) diff --git a/multimedia/xine-lib/patches/patch-bg b/multimedia/xine-lib/patches/patch-bg deleted file mode 100644 index 763fedf3393..00000000000 --- a/multimedia/xine-lib/patches/patch-bg +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-bg,v 1.5 2009/12/09 10:13:03 drochner Exp $ - ---- include/Makefile.in.orig 2009-12-01 02:53:28.000000000 +0100 -+++ include/Makefile.in -@@ -696,7 +696,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 - @GENERATED_INTTYPES_H_TRUE@ $(INSTALL) inttypes.h $(DESTDIR)$(includedir) - - # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/multimedia/xine-lib/patches/patch-ga b/multimedia/xine-lib/patches/patch-ga deleted file mode 100644 index 345e7185a02..00000000000 --- a/multimedia/xine-lib/patches/patch-ga +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-ga,v 1.6 2009/12/09 10:13:03 drochner Exp $ - ---- Makefile.in.orig 2009-12-01 02:53:42.000000000 +0100 -+++ Makefile.in -@@ -1049,8 +1049,8 @@ 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,/' $@ - - # Tell versions [3.59,3.63) of GNU make to not export all variables. - # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/multimedia/xine-lib/patches/patch-include_Makefile.am b/multimedia/xine-lib/patches/patch-include_Makefile.am new file mode 100644 index 00000000000..c5ef219a56f --- /dev/null +++ b/multimedia/xine-lib/patches/patch-include_Makefile.am @@ -0,0 +1,14 @@ +$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 diff --git a/multimedia/xine-lib/patches/patch-src_audio__out_Makefile.am b/multimedia/xine-lib/patches/patch-src_audio__out_Makefile.am new file mode 100644 index 00000000000..387a9c773d8 --- /dev/null +++ b/multimedia/xine-lib/patches/patch-src_audio__out_Makefile.am @@ -0,0 +1,13 @@ +$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 diff --git a/multimedia/xine-lib/patches/patch-src_libw32dll_wine_Makefile.am b/multimedia/xine-lib/patches/patch-src_libw32dll_wine_Makefile.am new file mode 100644 index 00000000000..fdcf58cc8a5 --- /dev/null +++ b/multimedia/xine-lib/patches/patch-src_libw32dll_wine_Makefile.am @@ -0,0 +1,13 @@ +$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 \ -- cgit v1.2.3