diff options
author | drochner <drochner> | 2007-11-22 20:20:21 +0000 |
---|---|---|
committer | drochner <drochner> | 2007-11-22 20:20:21 +0000 |
commit | 87b5e3171a3d57b7151530e147b09f9f660670de (patch) | |
tree | 815d4739889438cdf5182b9a40b7de1312a9a00c /multimedia | |
parent | d333ab7d69788238e35dc0a58a51ecb0cbb5077b (diff) | |
download | pkgsrc-87b5e3171a3d57b7151530e147b09f9f660670de.tar.gz |
update to 1.1.8
This has improved DVB subtitles support, implements simple subtitle scaling
and bold & italics for text subtitles, and allows control of XxMC bob
deinterlacing. It also has fixes for an audio resampling problem (which
manifested as regular clicking), a problem which would cause the goom
plugin to stop working, and URL escape handling (use of %) in DVD and
Video CD MRLs. Some memory leaks are also fixed, and there are some
build fixes for Solaris users.
Diffstat (limited to 'multimedia')
-rw-r--r-- | multimedia/xine-lib/Makefile.common | 4 | ||||
-rw-r--r-- | multimedia/xine-lib/distinfo | 31 | ||||
-rw-r--r-- | multimedia/xine-lib/patches/patch-af | 26 | ||||
-rw-r--r-- | multimedia/xine-lib/patches/patch-ag | 26 | ||||
-rw-r--r-- | multimedia/xine-lib/patches/patch-am | 65 | ||||
-rw-r--r-- | multimedia/xine-lib/patches/patch-ao | 6 | ||||
-rw-r--r-- | multimedia/xine-lib/patches/patch-ap | 8 | ||||
-rw-r--r-- | multimedia/xine-lib/patches/patch-ar | 19 | ||||
-rw-r--r-- | multimedia/xine-lib/patches/patch-at | 13 | ||||
-rw-r--r-- | multimedia/xine-lib/patches/patch-au | 13 | ||||
-rw-r--r-- | multimedia/xine-lib/patches/patch-av | 13 | ||||
-rw-r--r-- | multimedia/xine-lib/patches/patch-ax | 17 | ||||
-rw-r--r-- | multimedia/xine-lib/patches/patch-ay | 13 | ||||
-rw-r--r-- | multimedia/xine-lib/patches/patch-az | 13 | ||||
-rw-r--r-- | multimedia/xine-lib/patches/patch-ba | 13 | ||||
-rw-r--r-- | multimedia/xine-lib/patches/patch-bb | 13 | ||||
-rw-r--r-- | multimedia/xine-lib/patches/patch-bc | 15 | ||||
-rw-r--r-- | multimedia/xine-lib/patches/patch-be | 12 | ||||
-rw-r--r-- | multimedia/xine-lib/patches/patch-bg | 11 |
19 files changed, 44 insertions, 287 deletions
diff --git a/multimedia/xine-lib/Makefile.common b/multimedia/xine-lib/Makefile.common index 6d175c380ea..d9470e4edb7 100644 --- a/multimedia/xine-lib/Makefile.common +++ b/multimedia/xine-lib/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.41 2007/06/15 18:20:05 drochner Exp $ +# $NetBSD: Makefile.common,v 1.42 2007/11/22 20:20:21 drochner Exp $ # DISTNAME= xine-lib-${XINE_LIB_VER} @@ -10,7 +10,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=xine/} MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://xinehq.de/ -XINE_LIB_VER= 1.1.7 +XINE_LIB_VER= 1.1.8 PLIST_SUBST+= XINE_LIB_VER=${XINE_LIB_VER:Q} DISTINFO_FILE= ${.CURDIR}/../../multimedia/xine-lib/distinfo diff --git a/multimedia/xine-lib/distinfo b/multimedia/xine-lib/distinfo index 5ab0b8bb79c..e9a570e653f 100644 --- a/multimedia/xine-lib/distinfo +++ b/multimedia/xine-lib/distinfo @@ -1,38 +1,27 @@ -$NetBSD: distinfo,v 1.47 2007/06/18 21:16:10 joerg Exp $ +$NetBSD: distinfo,v 1.48 2007/11/22 20:20:21 drochner Exp $ -SHA1 (xine-lib-1.1.7.tar.gz) = 219d0ac7f43e37faf2d597d2c424f7fd51d2237b -RMD160 (xine-lib-1.1.7.tar.gz) = 519426526ecc7e8c5f4871e2fdf7770fc57e31b7 -Size (xine-lib-1.1.7.tar.gz) = 8868650 bytes +SHA1 (xine-lib-1.1.8.tar.gz) = 869905908a831a959ae3c6962d6d3204dc53d39b +RMD160 (xine-lib-1.1.8.tar.gz) = b4207e0d0373b68d8d3c3fb66a467953c0024732 +Size (xine-lib-1.1.8.tar.gz) = 8872132 bytes SHA1 (patch-aa) = e09d34a121080b03bc67b2d8a3ca27463b771acc SHA1 (patch-ab) = ef13b60c2bea54f354acf1b2d70c04594dac36c9 SHA1 (patch-ad) = 94aaac03f74c72a1ca753d1320aac07d1bb8a846 SHA1 (patch-ae) = 78060d0d1a721642776a909ab3dfef6bd4441a33 -SHA1 (patch-af) = 68ed767a7c320c37157368b07d843e9f5048267c -SHA1 (patch-ag) = 56ea1513f33f4d26581707303a001f62a6eb4abe +SHA1 (patch-ag) = 8638939d400eb11fc01fd832b205366b906fc9ee SHA1 (patch-ah) = ba408237d4a717cc91b5d06ede425048914a9a1f SHA1 (patch-ai) = f0b33c1a36082445a86bcf71e07a6210aa21b7dc SHA1 (patch-aj) = 4215c3bc37cf636e563a509f9a391081ed8e773b SHA1 (patch-ak) = 744f59d1b9e40983f25bb532db1a5d4e92be6fbe SHA1 (patch-al) = 9e3ad86a7d7f32e58de157fa37141138af10838e -SHA1 (patch-am) = 67392b0db6de3ec97bc5fc5e46e08ee2e67ec97c -SHA1 (patch-ao) = 3ccc00285e425ec3753838ce6f1450d598d89425 -SHA1 (patch-ap) = 075b0691fc2b760dd1069957b7f8f00361f9ae39 +SHA1 (patch-ao) = c4524c88bb4ce61b13e354d22aa0f7445ff0aa37 +SHA1 (patch-ap) = 756db263fc805a75a0d6be5bdb10344a6fd9c2e9 SHA1 (patch-aq) = f6efa28ab1b9a24b79c18c181a5d309db53172e4 -SHA1 (patch-ar) = f06014618890efec9274a4c21d2fff2998723a39 SHA1 (patch-as) = a0a93a256589e87a66eef31494441aa1b200f834 -SHA1 (patch-at) = c9be143d87ec1f9d37fc4a1d0670df00c0e79e27 -SHA1 (patch-au) = 59a9eac67a8aaabd9b105180a5c6e23fe8427fd8 -SHA1 (patch-av) = 58a0489cd0099f84fdaeb89bf35f7dcfc3bd040a +SHA1 (patch-av) = 40e9a44a506a0006b6761e8367c65239bd4856ee SHA1 (patch-aw) = 78ab44197a6b9f85e4b272d522ce254de4d557dc -SHA1 (patch-ax) = 09328458d39266f1f9d87f366626c973a05ffc5d -SHA1 (patch-ay) = d4919b3816ddd74413f3e5f5b7a99dc5209562d7 -SHA1 (patch-az) = c314f6a6b95a69c749bf9962ebfdd0a3d35aaeb8 -SHA1 (patch-ba) = a57a963fa918a2f7b44c226af36b9a08bce9dcc6 -SHA1 (patch-bb) = ded7a74e46dc86c3b38b7fe912ff9142742c4ac7 -SHA1 (patch-bc) = 12fa12764dee855e8c4f7f5c64f5a389f7584ee3 SHA1 (patch-bd) = 2f0f39512d185377cca1ebaf4e891d518a1c14d0 -SHA1 (patch-be) = 04eb23f58cb96dab4b7c7120092364915ebaf330 -SHA1 (patch-bg) = 83f97ad77c8295fcaf78a7ea7fe9c4f87efd80d0 +SHA1 (patch-be) = e1a0856361c26d924ce12794e9f7eb0174857100 +SHA1 (patch-bg) = 10eb076d087a40ac5f7920794ff7b34f2aa0495b SHA1 (patch-cb) = 08d9920022988d2764d941cfa8b1aa5602a0ec81 SHA1 (patch-cd) = a080c745d08ded46db7c1173fe55350c1eb9ff33 SHA1 (patch-da) = f79701d7c036e78d760c12119d88fe3f0dd1762d diff --git a/multimedia/xine-lib/patches/patch-af b/multimedia/xine-lib/patches/patch-af deleted file mode 100644 index 57813af28fa..00000000000 --- a/multimedia/xine-lib/patches/patch-af +++ /dev/null @@ -1,26 +0,0 @@ -$NetBSD: patch-af,v 1.5 2007/06/18 21:16:10 joerg Exp $ - ---- src/video_out/Makefile.in.orig 2007-06-17 19:17:10.000000000 +0000 -+++ src/video_out/Makefile.in -@@ -870,10 +870,10 @@ xineplug_vo_out_xcbxv_la_CFLAGS = $(VISI - xineplug_vo_out_xshm_la_SOURCES = yuv2rgb.c yuv2rgb_mmx.c yuv2rgb_mlib.c \ - video_out_xshm.c $(X11OSD) - --xineplug_vo_out_xshm_la_LIBADD = $(MLIB_LIBS) $(X_LIBS) $(XINE_LIB) $(PTHREAD_LIBS) -+xineplug_vo_out_xshm_la_LIBADD = $(MLIB_LIBS) $(X_LIBS) $(XINE_LIB) $(PTHREAD_LIBS) $(LIBINTL) - xineplug_vo_out_xshm_la_CFLAGS = $(VISIBILITY_FLAG) $(X_CFLAGS) $(MLIB_CFLAGS) -fno-strict-aliasing - xineplug_vo_out_xv_la_SOURCES = $(X11OSD) deinterlace.c video_out_xv.c --xineplug_vo_out_xv_la_LIBADD = $(XV_LIBS) $(X_LIBS) $(XINE_LIB) $(PTHREAD_LIBS) -+xineplug_vo_out_xv_la_LIBADD = $(XV_LIBS) $(X_LIBS) $(XINE_LIB) $(PTHREAD_LIBS) $(LIBINTL) - xineplug_vo_out_xv_la_CFLAGS = $(VISIBILITY_FLAG) $(X_CFLAGS) $(XV_CFLAGS) -fno-strict-aliasing - xineplug_vo_out_xvmc_la_SOURCES = deinterlace.c video_out_xvmc.c - xineplug_vo_out_xvmc_la_LIBADD = $(XVMC_LIBS) $(XV_LIBS) $(X_LIBS) $(XINE_LIB) $(PTHREAD_LIBS) -@@ -934,7 +934,7 @@ xineplug_vo_out_directx_la_CPPFLAGS = $( - xineplug_vo_out_directx_la_LIBADD = $(DIRECTX_VIDEO_LIBS) $(XINE_LIB) $(PTHREAD_LIBS) - xineplug_vo_out_directx_la_CFLAGS = $(VISIBILITY_FLAG) - xineplug_vo_out_none_la_SOURCES = video_out_none.c --xineplug_vo_out_none_la_LIBADD = $(XINE_LIB) $(PTHREAD_LIBS) -+xineplug_vo_out_none_la_LIBADD = $(XINE_LIB) $(PTHREAD_LIBS) $(LIBINTL) - xineplug_vo_out_none_la_CFLAGS = $(VISIBILITY_FLAG) - xineplug_vo_out_macosx_la_SOURCES = video_out_macosx.m - xineplug_vo_out_macosx_la_CPPFLAGS = $(AM_CPPFLAGS) $(X_CFLAGS) $(MLIB_CFLAGS) diff --git a/multimedia/xine-lib/patches/patch-ag b/multimedia/xine-lib/patches/patch-ag index 1a342c467d5..0ecdd83e0d5 100644 --- a/multimedia/xine-lib/patches/patch-ag +++ b/multimedia/xine-lib/patches/patch-ag @@ -1,6 +1,6 @@ -$NetBSD: patch-ag,v 1.16 2007/06/15 18:20:06 drochner Exp $ +$NetBSD: patch-ag,v 1.17 2007/11/22 20:20:21 drochner Exp $ ---- configure.ac.orig 2007-04-08 18:31:32.000000000 +0200 +--- configure.ac.orig 2007-08-25 15:27:01.000000000 +0200 +++ configure.ac @@ -98,7 +98,7 @@ dnl ------------------------------------ AC_CANONICAL_HOST @@ -9,9 +9,9 @@ $NetBSD: patch-ag,v 1.16 2007/06/15 18:20:06 drochner Exp $ -test "$host" == "$build" && check_athlon=yes +test "$host" = "$build" && check_athlon=yes - AC_CONFIG_HEADERS([config.h]) + AC_CONFIG_HEADERS([include/configure.h]) -@@ -549,6 +549,9 @@ AC_CHECK_LIB(socket, socket, NET_LIBS="- +@@ -555,6 +555,9 @@ AC_CHECK_LIB(socket, socket, NET_LIBS="- AC_CHECK_LIB(nsl, gethostbyname, NET_LIBS="-lnsl $NET_LIBS",) AC_SUBST(NET_LIBS) @@ -21,7 +21,7 @@ $NetBSD: patch-ag,v 1.16 2007/06/15 18:20:06 drochner Exp $ dnl --------------------------------------------- dnl socklen_t -@@ -739,7 +742,7 @@ XXMC_LIBS="-L$xxmc_path -l$xxmc_stub" +@@ -745,7 +748,7 @@ XXMC_LIBS="-L$xxmc_path -l$xxmc_stub" AC_MSG_CHECKING(whether to enable the xxmc plugin with vld extensions) AC_MSG_RESULT() dnl Check if vld "extended" XvMC is available @@ -30,7 +30,7 @@ $NetBSD: patch-ag,v 1.16 2007/06/15 18:20:06 drochner Exp $ AC_CHECK_LIB($xxmc_stub, XvMCPutSlice, ac_have_xxmc="yes", [ac_have_xxmc="no" -@@ -769,7 +772,7 @@ if test "x$ac_have_xxmc" = "xyes"; then +@@ -775,7 +778,7 @@ if test "x$ac_have_xxmc" = "xyes"; then fi dnl Try fallback to standard XvMC if vld failed if test "x$ac_have_xxmc" = "xno"; then @@ -39,7 +39,7 @@ $NetBSD: patch-ag,v 1.16 2007/06/15 18:20:06 drochner Exp $ AC_CHECK_LIB($xxmc_stub, XvMCCreateContext, ac_have_xxmc="yes", [ac_have_xxmc="no" -@@ -823,7 +826,7 @@ saved_libs="$LIBS" +@@ -829,7 +832,7 @@ saved_libs="$LIBS" XVMC_LIBS="-L$xvmc_path -l$xvmc_stub" AC_MSG_CHECKING(whether to enable the xvmc plugin) AC_MSG_RESULT() @@ -48,7 +48,7 @@ $NetBSD: patch-ag,v 1.16 2007/06/15 18:20:06 drochner Exp $ AC_CHECK_LIB($xvmc_stub, XvMCCreateContext, ac_have_xvmc="yes", [ac_have_xvmc="no" -@@ -914,7 +917,6 @@ if test "x$enable_xinerama" != "xno"; th +@@ -920,7 +923,6 @@ if test "x$enable_xinerama" != "xno"; th ]) if test "x$ac_have_xinerama" = "xyes"; then AC_DEFINE(HAVE_XINERAMA,1,[Define this if you have libXinerama installed]) @@ -56,7 +56,7 @@ $NetBSD: patch-ag,v 1.16 2007/06/15 18:20:06 drochner Exp $ fi else ac_have_xinerama=no -@@ -1416,8 +1418,21 @@ AC_ARG_ENABLE([oss], +@@ -1422,8 +1424,21 @@ AC_ARG_ENABLE([oss], AS_HELP_STRING([--disable-oss], [Do not build OSS audio output support])) if test "x$enable_oss" != "xno"; then @@ -78,7 +78,7 @@ $NetBSD: patch-ag,v 1.16 2007/06/15 18:20:06 drochner Exp $ #ifdef HAVE_SYS_SOUNDCARD_H # include <sys/soundcard.h> #endif -@@ -1433,6 +1448,7 @@ if test "x$enable_oss" != "xno"; then +@@ -1439,6 +1454,7 @@ if test "x$enable_oss" != "xno"; then fi AM_CONDITIONAL(HAVE_OSS, test "x$have_ossaudio" = "xyes") @@ -86,7 +86,7 @@ $NetBSD: patch-ag,v 1.16 2007/06/15 18:20:06 drochner Exp $ dnl --------------------------------------------- -@@ -1542,9 +1558,10 @@ AC_ARG_ENABLE([gnomevfs], +@@ -1548,9 +1564,10 @@ AC_ARG_ENABLE([gnomevfs], [with_gnome_vfs=$enableval], [with_gnome_vfs=yes]) if test "x$with_gnome_vfs" = "xyes"; then @@ -100,7 +100,7 @@ $NetBSD: patch-ag,v 1.16 2007/06/15 18:20:06 drochner Exp $ AC_SUBST(GNOME_VFS_CFLAGS) AC_SUBST(GNOME_VFS_LIBS) if test "x$no_gnome_vfs" != "xyes"; then -@@ -1879,7 +1896,7 @@ int has_timeout=sizeof(test.timeout);]]) +@@ -1885,7 +1902,7 @@ int has_timeout=sizeof(test.timeout);]]) AC_DEFINE([HAVE_WIN32_CDROM], [1], [Define 1 if you have MinGW CD-ROM support]) ;; @@ -109,7 +109,7 @@ $NetBSD: patch-ag,v 1.16 2007/06/15 18:20:06 drochner Exp $ AC_DEFINE([HAVE_FREEBSD_CDROM], [1], [Define 1 if you have FreeBSD CD-ROM support]) ;; -@@ -2574,7 +2591,7 @@ case $host in +@@ -2581,7 +2598,7 @@ case $host in dnl FreeBSD (et al.) does not complete linking for shared objects when pthreads dnl are requested, as different implementations are present; to avoid problems dnl use -Wl,-z,defs only for those platform not behaving this way. diff --git a/multimedia/xine-lib/patches/patch-am b/multimedia/xine-lib/patches/patch-am deleted file mode 100644 index 117ab7e02bd..00000000000 --- a/multimedia/xine-lib/patches/patch-am +++ /dev/null @@ -1,65 +0,0 @@ -$NetBSD: patch-am,v 1.5 2007/06/18 21:16:11 joerg Exp $ - ---- src/demuxers/Makefile.in.orig 2007-06-17 19:36:35.000000000 +0000 -+++ src/demuxers/Makefile.in -@@ -728,25 +728,25 @@ xineplug_LTLIBRARIES = $(ogg_module) $(a - xineplug_dmx_flv.la - - xineplug_dmx_ogg_la_SOURCES = demux_ogg.c --xineplug_dmx_ogg_la_LIBADD = $(VORBIS_LIBS) $(SPEEX_LIBS) $(THEORA_LIBS) $(OGG_LIBS) $(XINE_LIB) -+xineplug_dmx_ogg_la_LIBADD = $(VORBIS_LIBS) $(SPEEX_LIBS) $(THEORA_LIBS) $(OGG_LIBS) $(XINE_LIB) $(LIBINTL) - xineplug_dmx_ogg_la_CFLAGS = $(AM_CFLAGS) $(VORBIS_CFLAGS) $(SPEEX_CFLAGS) $(THEORA_CFLAGS) $(OGG_CFLAGS) - xineplug_dmx_avi_la_SOURCES = demux_avi.c --xineplug_dmx_avi_la_LIBADD = $(XINE_LIB) -+xineplug_dmx_avi_la_LIBADD = $(XINE_LIB) $(LIBINTL) - xineplug_dmx_mpeg_block_la_SOURCES = demux_mpeg_block.c --xineplug_dmx_mpeg_block_la_LIBADD = $(XINE_LIB) -+xineplug_dmx_mpeg_block_la_LIBADD = $(XINE_LIB) $(LIBINTL) - xineplug_dmx_mpeg_la_SOURCES = demux_mpeg.c - xineplug_dmx_mpeg_la_LIBADD = $(XINE_LIB) - xineplug_dmx_mpeg_elem_la_SOURCES = demux_elem.c - xineplug_dmx_mpeg_elem_la_LIBADD = $(XINE_LIB) - xineplug_dmx_mpeg_pes_la_SOURCES = demux_mpeg_pes.c --xineplug_dmx_mpeg_pes_la_LIBADD = $(XINE_LIB) -+xineplug_dmx_mpeg_pes_la_LIBADD = $(XINE_LIB) $(LIBINTL) - xineplug_dmx_mpeg_ts_la_SOURCES = demux_ts.c - xineplug_dmx_mpeg_ts_la_LIBADD = $(XINE_LIB) - xineplug_dmx_qt_la_SOURCES = demux_qt.c - xineplug_dmx_qt_la_LIBADD = $(XINE_LIB) $(ZLIB_LIBS) - xineplug_dmx_qt_la_CPPFLAGS = $(ZLIB_CPPFLAGS) - xineplug_dmx_asf_la_SOURCES = demux_asf.c asfheader.c --xineplug_dmx_asf_la_LIBADD = $(XINE_LIB) -+xineplug_dmx_asf_la_LIBADD = $(XINE_LIB) $(LIBINTL) - xineplug_dmx_asf_la_CFLAGS = $(AM_CFLAGS) -fno-strict-aliasing - xineplug_dmx_fli_la_SOURCES = demux_fli.c - xineplug_dmx_fli_la_LIBADD = $(XINE_LIB) -@@ -767,7 +767,7 @@ xineplug_dmx_games_la_SOURCES = group_ga - demux_film.c demux_smjpeg.c demux_4xm.c \ - demux_vmd.c - --xineplug_dmx_games_la_LIBADD = $(XINE_LIB) -+xineplug_dmx_games_la_LIBADD = $(XINE_LIB) $(LIBINTL) - xineplug_dmx_games_la_LDFLAGS = -avoid-version -module - xineplug_dmx_audio_la_SOURCES = group_audio.c demux_aud.c demux_aiff.c \ - demux_cdda.c demux_mpgaudio.c demux_nsf.c \ -@@ -777,7 +777,7 @@ xineplug_dmx_audio_la_SOURCES = group_au - demux_mpc.c demux_dts.c demux_shn.c \ - demux_tta.c - --xineplug_dmx_audio_la_LIBADD = $(XINE_LIB) $(LIBMODPLUG_LIBS) -+xineplug_dmx_audio_la_LIBADD = $(XINE_LIB) $(LIBMODPLUG_LIBS) $(LIBINTL) - xineplug_dmx_audio_la_CFLAGS = $(AM_CFLAGS) $(LIBMODPLUG_CFLAGS) - xineplug_dmx_yuv_frames_la_SOURCES = demux_yuv_frames.c - xineplug_dmx_yuv_frames_la_LIBADD = $(XINE_LIB) -@@ -792,9 +792,9 @@ xineplug_dmx_matroska_la_LIBADD = $(XINE - xineplug_dmx_matroska_la_CPPFLAGS = $(ZLIB_CPPFLAGS) - xineplug_dmx_matroska_la_CFLAGS = $(AM_CFLAGS) -fno-strict-aliasing - xineplug_dmx_iff_la_SOURCES = demux_iff.c --xineplug_dmx_iff_la_LIBADD = $(XINE_LIB) -+xineplug_dmx_iff_la_LIBADD = $(XINE_LIB) $(LIBINTL) - xineplug_dmx_flv_la_SOURCES = demux_flv.c --xineplug_dmx_flv_la_LIBADD = $(XINE_LIB) -+xineplug_dmx_flv_la_LIBADD = $(XINE_LIB) $(LIBINTL) - xineinclude_HEADERS = demux.h - noinst_HEADERS = asfheader.h qtpalette.h group_games.h group_audio.h id3.h ebml.h matroska.h iff.h flacutils.h - all: all-am diff --git a/multimedia/xine-lib/patches/patch-ao b/multimedia/xine-lib/patches/patch-ao index 06d68025365..b9412cef312 100644 --- a/multimedia/xine-lib/patches/patch-ao +++ b/multimedia/xine-lib/patches/patch-ao @@ -1,9 +1,9 @@ -$NetBSD: patch-ao,v 1.13 2007/06/15 18:20:07 drochner Exp $ +$NetBSD: patch-ao,v 1.14 2007/11/22 20:20:21 drochner Exp $ ---- src/libw32dll/wine/Makefile.in.orig 2007-04-10 00:25:41.000000000 +0200 +--- src/libw32dll/wine/Makefile.in.orig 2007-08-27 20:28:09.000000000 +0200 +++ src/libw32dll/wine/Makefile.in @@ -62,7 +62,7 @@ mkinstalldirs = $(install_sh) -d - CONFIG_HEADER = $(top_builddir)/config.h + CONFIG_HEADER = $(top_builddir)/include/configure.h CONFIG_CLEAN_FILES = LTLIBRARIES = $(noinst_LTLIBRARIES) -libwine_la_LIBADD = diff --git a/multimedia/xine-lib/patches/patch-ap b/multimedia/xine-lib/patches/patch-ap index 201f9a826b8..c0b32dcdacd 100644 --- a/multimedia/xine-lib/patches/patch-ap +++ b/multimedia/xine-lib/patches/patch-ap @@ -1,6 +1,6 @@ -$NetBSD: patch-ap,v 1.5 2007/06/15 18:20:07 drochner Exp $ +$NetBSD: patch-ap,v 1.6 2007/11/22 20:20:22 drochner Exp $ ---- src/dxr3/Makefile.am.orig 2007-04-08 17:40:59.000000000 +0200 +--- src/dxr3/Makefile.am.orig 2007-08-19 01:36:45.000000000 +0200 +++ src/dxr3/Makefile.am @@ -16,6 +16,9 @@ endif if HAVE_LIBRTE @@ -16,8 +16,8 @@ $NetBSD: patch-ap,v 1.5 2007/06/15 18:20:07 drochner Exp $ dxr3_scr.c \ video_out_dxr3.c --xineplug_vo_out_dxr3_la_LIBADD = $(link_fame) $(link_rte) $(link_x_libs) $(XINE_LIB) $(DYNAMIC_LD_LIBS) -lm -+xineplug_vo_out_dxr3_la_LIBADD = $(link_fame) $(link_rte) $(link_xinerama) $(link_x_libs) $(XINE_LIB) $(DYNAMIC_LD_LIBS) -lm +-xineplug_vo_out_dxr3_la_LIBADD = $(link_fame) $(link_rte) $(link_x_libs) $(XINE_LIB) $(LTLIBINTL) $(DYNAMIC_LD_LIBS) -lm ++xineplug_vo_out_dxr3_la_LIBADD = $(link_fame) $(link_rte) $(link_xinerama) $(link_x_libs) $(XINE_LIB) $(LTLIBINTL) $(DYNAMIC_LD_LIBS) -lm xineplug_vo_out_dxr3_la_CFLAGS = $(VISIBILITY_FLAG) $(AM_CFLAGS) xineplug_vo_out_dxr3_la_LDFLAGS = -avoid-version -module diff --git a/multimedia/xine-lib/patches/patch-ar b/multimedia/xine-lib/patches/patch-ar deleted file mode 100644 index f068df90135..00000000000 --- a/multimedia/xine-lib/patches/patch-ar +++ /dev/null @@ -1,19 +0,0 @@ -$NetBSD: patch-ar,v 1.4 2007/06/18 21:16:11 joerg Exp $ - ---- src/libffmpeg/Makefile.in.orig 2007-06-17 20:17:46.000000000 +0000 -+++ src/libffmpeg/Makefile.in -@@ -604,12 +604,12 @@ xineplug_LTLIBRARIES = xineplug_decode_f - xineplug_decode_ff_la_CFLAGS = $(VISIBILITY_FLAG) $(AM_CFLAGS) - xineplug_decode_ff_la_LDFLAGS = $(xineplug_ldflags) $(IMPURE_TEXT_LDFLAGS) - xineplug_decode_ff_la_LIBADD = $(MLIB_LIBS) $(XINE_LIB) -lm $(ZLIB_LIBS) \ -- $(link_ffmpeg) $(PTHREAD_LIBS) -+ $(link_ffmpeg) $(PTHREAD_LIBS) $(LIBINTL) - - xineplug_decode_dvaudio_la_CFLAGS = $(VISIBILITY_FLAG) $(AM_CFLAGS) - xineplug_decode_dvaudio_la_LDFLAGS = $(xineplug_ldflags) - xineplug_decode_dvaudio_la_SOURCES = ff_dvaudio_decoder.c --xineplug_decode_dvaudio_la_LIBADD = $(XINE_LIB) -+xineplug_decode_dvaudio_la_LIBADD = $(XINE_LIB) $(LIBINTL) - all: all-recursive - - .SUFFIXES: diff --git a/multimedia/xine-lib/patches/patch-at b/multimedia/xine-lib/patches/patch-at deleted file mode 100644 index 4ab0aedd895..00000000000 --- a/multimedia/xine-lib/patches/patch-at +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-at,v 1.5 2007/06/18 21:16:11 joerg Exp $ - ---- src/liba52/Makefile.in.orig 2007-06-17 20:23:04.000000000 +0000 -+++ src/liba52/Makefile.in -@@ -570,7 +570,7 @@ xineplug_decode_a52_la_SOURCES = \ - @EXTERNAL_A52DEC_FALSE@xineplug_decode_a52_la_LIBADD = $(XINE_LIB) -lm - @EXTERNAL_A52DEC_TRUE@xineplug_decode_a52_la_LIBADD = $(XINE_LIB) -la52 -lm - xineplug_decode_a52_la_CFLAGS = $(VISIBILITY_FLAG) --xineplug_decode_a52_la_LDFLAGS = $(xineplug_ldflags) -+xineplug_decode_a52_la_LDFLAGS = $(xineplug_ldflags) $(LIBINTL) - noinst_HEADERS = \ - a52.h \ - a52_internal.h \ diff --git a/multimedia/xine-lib/patches/patch-au b/multimedia/xine-lib/patches/patch-au deleted file mode 100644 index de1224bbc31..00000000000 --- a/multimedia/xine-lib/patches/patch-au +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-au,v 1.6 2007/06/18 21:16:11 joerg Exp $ - ---- src/libspucmml/Makefile.in.orig 2007-06-17 20:25:09.000000000 +0000 -+++ src/libspucmml/Makefile.in -@@ -542,7 +542,7 @@ xinepostdir = $(XINE_PLUGINDIR)/post - vidixdir = $(XINE_PLUGINDIR)/vidix - xineplug_LTLIBRARIES = xineplug_decode_spucmml.la - xineplug_decode_spucmml_la_SOURCES = xine_cmml_decoder.c --xineplug_decode_spucmml_la_LIBADD = $(XINE_LIB) -+xineplug_decode_spucmml_la_LIBADD = $(XINE_LIB) $(LIBINTL) - xineplug_decode_spucmml_la_CFLAGS = $(VISIBILITY_FLAG) - xineplug_decode_spucmml_la_LDFLAGS = $(xineplug_ldflags) - all: all-am diff --git a/multimedia/xine-lib/patches/patch-av b/multimedia/xine-lib/patches/patch-av index 33bc293e8db..d81d69d6598 100644 --- a/multimedia/xine-lib/patches/patch-av +++ b/multimedia/xine-lib/patches/patch-av @@ -1,6 +1,6 @@ -$NetBSD: patch-av,v 1.5 2007/06/18 21:16:12 joerg Exp $ +$NetBSD: patch-av,v 1.6 2007/11/22 20:20:22 drochner Exp $ ---- src/libspudvb/Makefile.in.orig 2007-06-06 13:40:49.000000000 +0000 +--- src/libspudvb/Makefile.in.orig 2007-08-27 20:28:07.000000000 +0200 +++ src/libspudvb/Makefile.in @@ -389,7 +389,7 @@ MSGMERGE = @MSGMERGE@ MUSEPACK_FALSE = @MUSEPACK_FALSE@ @@ -11,12 +11,3 @@ $NetBSD: patch-av,v 1.5 2007/06/18 21:16:12 joerg Exp $ OBJC = @OBJC@ OBJCDEPMODE = @OBJCDEPMODE@ OBJCFLAGS = @OBJCFLAGS@ -@@ -544,7 +544,7 @@ xinepostdir = $(XINE_PLUGINDIR)/post - vidixdir = $(XINE_PLUGINDIR)/vidix - xineplug_LTLIBRARIES = xineplug_decode_spudvb.la - xineplug_decode_spudvb_la_SOURCES = xine_spudvb_decoder.c --xineplug_decode_spudvb_la_LIBADD = $(XINE_LIB) $(PTHREAD_LIBS) -+xineplug_decode_spudvb_la_LIBADD = $(XINE_LIB) $(PTHREAD_LIBS) $(LIBINTL) - xineplug_decode_spudvb_la_CFLAGS = $(VISIBILITY_FLAG) - xineplug_decode_spudvb_la_LDFLAGS = $(xineplug_ldflags) - all: all-am diff --git a/multimedia/xine-lib/patches/patch-ax b/multimedia/xine-lib/patches/patch-ax deleted file mode 100644 index d093e354334..00000000000 --- a/multimedia/xine-lib/patches/patch-ax +++ /dev/null @@ -1,17 +0,0 @@ -$NetBSD: patch-ax,v 1.5 2007/06/18 21:16:12 joerg Exp $ - ---- src/libsputext/Makefile.in.orig 2007-06-18 19:18:40.000000000 +0000 -+++ src/libsputext/Makefile.in -@@ -550,10 +550,10 @@ vidixdir = $(XINE_PLUGINDIR)/vidix - AM_LDFLAGS = $(xineplug_ldflags) - xineplug_LTLIBRARIES = xineplug_decode_sputext.la xineplug_dmx_sputext.la - xineplug_dmx_sputext_la_SOURCES = demux_sputext.c --xineplug_dmx_sputext_la_LIBADD = $(XINE_LIB) -+xineplug_dmx_sputext_la_LIBADD = $(XINE_LIB) $(LIBINTL) - xineplug_dmx_sputext_la_CFLAGS = $(VISIBILITY_FLAG) - xineplug_decode_sputext_la_SOURCES = xine_sputext_decoder.c --xineplug_decode_sputext_la_LIBADD = $(XINE_LIB) -+xineplug_decode_sputext_la_LIBADD = $(XINE_LIB) $(LIBINTL) - xineplug_decode_sputext_la_CFLAGS = $(VISIBILITY_FLAG) - all: all-am - diff --git a/multimedia/xine-lib/patches/patch-ay b/multimedia/xine-lib/patches/patch-ay deleted file mode 100644 index 06c3df9088e..00000000000 --- a/multimedia/xine-lib/patches/patch-ay +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ay,v 1.3 2007/06/18 21:16:12 joerg Exp $ - ---- src/libdts/Makefile.in.orig 2007-06-18 19:26:19.000000000 +0000 -+++ src/libdts/Makefile.in -@@ -562,7 +562,7 @@ xineplug_LTLIBRARIES = $(dts_module) - xineplug_decode_dts_la_SOURCES = xine_dts_decoder.c $(internal_sources) - xineplug_decode_dts_la_CFLAGS = $(LIBDTS_CFLAGS) $(VISIBILITY_FLAG) $(fnsa) - xineplug_decode_dts_la_LDFLAGS = $(xineplug_ldflags) --@EXTERNAL_LIBDTS_FALSE@xineplug_decode_dts_la_LIBADD = $(XINE_LIB) -lm -+@EXTERNAL_LIBDTS_FALSE@xineplug_decode_dts_la_LIBADD = $(XINE_LIB) -lm $(LIBINTL) - @EXTERNAL_LIBDTS_TRUE@xineplug_decode_dts_la_LIBADD = $(XINE_LIB) $(LIBDTS_LIBS) -lm - noinst_HEADERS = bitstream.h internal-dts.h dts_internal.h tables.h tables_adpcm.h \ - tables_fir.h tables_huffman.h tables_quantization.h tables_vq.h diff --git a/multimedia/xine-lib/patches/patch-az b/multimedia/xine-lib/patches/patch-az deleted file mode 100644 index 2fbd9284992..00000000000 --- a/multimedia/xine-lib/patches/patch-az +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-az,v 1.4 2007/06/18 21:16:12 joerg Exp $ - ---- src/libxinevdec/Makefile.in.orig 2007-06-18 19:36:37.000000000 +0000 -+++ src/libxinevdec/Makefile.in -@@ -594,7 +594,7 @@ xineplug_LTLIBRARIES = $(image_module) \ - xineplug_decode_yuv.la - - xineplug_decode_bitplane_la_SOURCES = bitplane.c --xineplug_decode_bitplane_la_LIBADD = $(XINE_LIB) -+xineplug_decode_bitplane_la_LIBADD = $(XINE_LIB) $(LIBINTL) - xineplug_decode_rgb_la_SOURCES = rgb.c - xineplug_decode_rgb_la_LIBADD = $(XINE_LIB) - xineplug_decode_yuv_la_SOURCES = yuv.c diff --git a/multimedia/xine-lib/patches/patch-ba b/multimedia/xine-lib/patches/patch-ba deleted file mode 100644 index 6769cb26d81..00000000000 --- a/multimedia/xine-lib/patches/patch-ba +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ba,v 1.5 2007/06/18 21:16:12 joerg Exp $ - ---- src/libreal/Makefile.in.orig 2007-06-18 19:43:07.000000000 +0000 -+++ src/libreal/Makefile.in -@@ -550,7 +550,7 @@ xinepostdir = $(XINE_PLUGINDIR)/post - vidixdir = $(XINE_PLUGINDIR)/vidix - @ENABLE_REAL_TRUE@xineplug_LTLIBRARIES = xineplug_decode_real.la - xineplug_decode_real_la_SOURCES = xine_real_video_decoder.c real_common.c xine_real_audio_decoder.c --xineplug_decode_real_la_LIBADD = $(XINE_LIB) $(DYNAMIC_LD_LIBS) -+xineplug_decode_real_la_LIBADD = $(XINE_LIB) $(DYNAMIC_LD_LIBS) $(LIBINTL) - xineplug_decode_real_la_CFLAGS = $(VISIBILITY_FLAG) - xineplug_decode_real_la_LDFLAGS = $(xineplug_ldflags) - noinst_HEADERS = real_common.h diff --git a/multimedia/xine-lib/patches/patch-bb b/multimedia/xine-lib/patches/patch-bb deleted file mode 100644 index 89971b9ef06..00000000000 --- a/multimedia/xine-lib/patches/patch-bb +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-bb,v 1.5 2007/06/18 21:16:12 joerg Exp $ - ---- src/libfaad/Makefile.in.orig 2007-06-18 19:48:11.000000000 +0000 -+++ src/libfaad/Makefile.in -@@ -633,7 +633,7 @@ xineplug_decode_faad_la_SOURCES = \ - xine_faad_decoder.c - - xineplug_decode_faad_la_LDFLAGS = $(xineplug_ldflags) --xineplug_decode_faad_la_LIBADD = -lm $(XINE_LIB) -+xineplug_decode_faad_la_LIBADD = -lm $(XINE_LIB) $(LIBINTL) - noinst_HEADERS = \ - analysis.h \ - bits.h \ diff --git a/multimedia/xine-lib/patches/patch-bc b/multimedia/xine-lib/patches/patch-bc deleted file mode 100644 index 7e73c4f8d31..00000000000 --- a/multimedia/xine-lib/patches/patch-bc +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-bc,v 1.5 2007/06/18 21:16:12 joerg Exp $ - ---- src/libmusepack/Makefile.in.orig 2007-06-18 19:50:33.000000000 +0000 -+++ src/libmusepack/Makefile.in -@@ -569,8 +569,8 @@ EXTRA_DIST = diff_against_svn.patch - @EXTERNAL_MPCDEC_FALSE@ mpc_reader.c requant.c streaminfo.c synth_filter.c - - @EXTERNAL_MPCDEC_TRUE@internal_sources = --@EXTERNAL_MPCDEC_FALSE@xineplug_decode_mpc_la_LIBADD = $(XINE_LIB) --@EXTERNAL_MPCDEC_TRUE@xineplug_decode_mpc_la_LIBADD = $(XINE_LIB) -lmpcdec -+@EXTERNAL_MPCDEC_FALSE@xineplug_decode_mpc_la_LIBADD = $(XINE_LIB) $(LIBINTL) -+@EXTERNAL_MPCDEC_TRUE@xineplug_decode_mpc_la_LIBADD = $(XINE_LIB) $(LIBINTL) -lmpcdec - xineplug_decode_mpc_la_SOURCES = $(internal_sources) xine_musepack_decoder.c - xineplug_decode_mpc_la_CFLAGS = $(VISIBILITY_FLAG) - xineplug_decode_mpc_la_LDFLAGS = $(xineplug_ldflags) diff --git a/multimedia/xine-lib/patches/patch-be b/multimedia/xine-lib/patches/patch-be index a4fe75a3718..af68589eeb6 100644 --- a/multimedia/xine-lib/patches/patch-be +++ b/multimedia/xine-lib/patches/patch-be @@ -1,8 +1,8 @@ -$NetBSD: patch-be,v 1.7 2006/12/08 09:24:26 abs Exp $ +$NetBSD: patch-be,v 1.8 2007/11/22 20:20:24 drochner Exp $ ---- src/audio_out/Makefile.in.orig 2006-12-03 19:40:26.000000000 +0000 +--- src/audio_out/Makefile.in.orig 2007-08-27 20:27:55.000000000 +0200 +++ src/audio_out/Makefile.in -@@ -483,6 +483,7 @@ OBJDUMP = @OBJDUMP@ +@@ -509,6 +509,7 @@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ OPENGL_CFLAGS = @OPENGL_CFLAGS@ OPENGL_LIBS = @OPENGL_LIBS@ @@ -10,12 +10,12 @@ $NetBSD: patch-be,v 1.7 2006/12/08 09:24:26 abs Exp $ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ -@@ -673,7 +674,7 @@ xineplug_ao_out_file_la_LIBADD = $(XINE_ +@@ -699,7 +700,7 @@ xineplug_ao_out_file_la_LIBADD = $(XINE_ xineplug_ao_out_file_la_CFLAGS = $(VISIBILITY_FLAG) xineplug_ao_out_file_la_LDFLAGS = -avoid-version -module xineplug_ao_out_oss_la_SOURCES = audio_oss_out.c --xineplug_ao_out_oss_la_LIBADD = $(XINE_LIB) -+xineplug_ao_out_oss_la_LIBADD = $(XINE_LIB) $(OSS_LIBS) +-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_oss_la_LDFLAGS = -avoid-version -module xineplug_ao_out_alsa_la_SOURCES = audio_alsa_out.c diff --git a/multimedia/xine-lib/patches/patch-bg b/multimedia/xine-lib/patches/patch-bg index e40f1e70f50..6d024550c42 100644 --- a/multimedia/xine-lib/patches/patch-bg +++ b/multimedia/xine-lib/patches/patch-bg @@ -1,12 +1,9 @@ -$NetBSD: patch-bg,v 1.3 2006/12/08 09:24:26 abs Exp $ +$NetBSD: patch-bg,v 1.4 2007/11/22 20:20:24 drochner Exp $ -All files in $(DESTDIR) may be marked read-only, so better use the -INSTALL_HEADER tools to overwrite them correctly. - ---- include/Makefile.in.orig 2006-12-03 19:40:23.000000000 +0000 +--- include/Makefile.in.orig 2007-08-27 20:27:54.000000000 +0200 +++ include/Makefile.in -@@ -736,7 +736,8 @@ maintainer-clean-generic: - -rm -f Makefile.in +@@ -778,7 +778,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 |