diff options
-rw-r--r-- | multimedia/xine-lib/Makefile | 15 | ||||
-rw-r--r-- | multimedia/xine-lib/Makefile.common | 4 | ||||
-rw-r--r-- | multimedia/xine-lib/PLIST.common | 62 | ||||
-rw-r--r-- | multimedia/xine-lib/PLIST.common_end | 7 | ||||
-rw-r--r-- | multimedia/xine-lib/buildlink3.mk | 13 | ||||
-rw-r--r-- | multimedia/xine-lib/distinfo | 20 | ||||
-rw-r--r-- | multimedia/xine-lib/patches/patch-ag | 55 | ||||
-rw-r--r-- | multimedia/xine-lib/patches/patch-ao | 14 | ||||
-rw-r--r-- | multimedia/xine-lib/patches/patch-ap | 8 | ||||
-rw-r--r-- | multimedia/xine-lib/patches/patch-da | 14 | ||||
-rw-r--r-- | multimedia/xine-lib/patches/patch-ea | 30 | ||||
-rw-r--r-- | multimedia/xine-lib/patches/patch-ec | 17 | ||||
-rw-r--r-- | multimedia/xine-lib/patches/patch-ed | 15 | ||||
-rw-r--r-- | multimedia/xine-lib/patches/patch-ee | 22 |
14 files changed, 120 insertions, 176 deletions
diff --git a/multimedia/xine-lib/Makefile b/multimedia/xine-lib/Makefile index 7d5ae31f514..bbf60d486cd 100644 --- a/multimedia/xine-lib/Makefile +++ b/multimedia/xine-lib/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.48 2007/02/01 07:33:33 wiz Exp $ +# $NetBSD: Makefile,v 1.49 2007/02/07 20:04:00 drochner Exp $ .include "Makefile.common" -PKGREVISION= 5 COMMENT= Multimedia player library @@ -25,14 +24,16 @@ SUBST_MESSAGE.w32path= Fixing win32 dll path. # Needed to fix build problems under, at least, NetBSD/amd64. BUILDLINK_API_DEPENDS.libcdio+= libcdio>=0.75 -.include "../../audio/flac/buildlink3.mk" +# flac is supported internally; don't know what the plugin is good for +#.include "../../audio/flac/buildlink3.mk" .include "../../audio/libvorbis/buildlink3.mk" .include "../../audio/speex/buildlink3.mk" .include "../../devel/gettext-lib/buildlink3.mk" -.include "../../devel/SDL/buildlink3.mk" -.include "../../graphics/ImageMagick/buildlink3.mk" -.include "../../graphics/Mesa/buildlink3.mk" -.include "../../graphics/aalib/buildlink3.mk" +# these could be options or (better) extra plugin packages +#.include "../../devel/SDL/buildlink3.mk" +#.include "../../graphics/ImageMagick/buildlink3.mk" +#.include "../../graphics/Mesa/buildlink3.mk" +#.include "../../graphics/aalib/buildlink3.mk" .include "../../graphics/mng/buildlink3.mk" .include "../../graphics/png/buildlink3.mk" .include "../../misc/libcdio/buildlink3.mk" diff --git a/multimedia/xine-lib/Makefile.common b/multimedia/xine-lib/Makefile.common index 86edf42cc75..2a214638b59 100644 --- a/multimedia/xine-lib/Makefile.common +++ b/multimedia/xine-lib/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.38 2007/01/29 10:32:50 joerg Exp $ +# $NetBSD: Makefile.common,v 1.39 2007/02/07 20:04:00 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.3 +XINE_LIB_VER= 1.1.4 PLIST_SUBST+= XINE_LIB_VER=${XINE_LIB_VER:Q} DISTINFO_FILE= ${.CURDIR}/../../multimedia/xine-lib/distinfo diff --git a/multimedia/xine-lib/PLIST.common b/multimedia/xine-lib/PLIST.common index 81f69925969..55e8b2cf268 100644 --- a/multimedia/xine-lib/PLIST.common +++ b/multimedia/xine-lib/PLIST.common @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST.common,v 1.17 2007/01/10 16:33:45 joerg Exp $ +@comment $NetBSD: PLIST.common,v 1.18 2007/02/07 20:04:00 drochner Exp $ bin/xine-config include/xine.h include/xine/alphablend.h @@ -72,8 +72,8 @@ lib/xine/plugins/${XINE_LIB_VER}/xineplug_decode_ff.a lib/xine/plugins/${XINE_LIB_VER}/xineplug_decode_ff.so lib/xine/plugins/${XINE_LIB_VER}/xineplug_decode_gsm610.a lib/xine/plugins/${XINE_LIB_VER}/xineplug_decode_gsm610.so -lib/xine/plugins/${XINE_LIB_VER}/xineplug_decode_image.a -lib/xine/plugins/${XINE_LIB_VER}/xineplug_decode_image.so +@comment lib/xine/plugins/${XINE_LIB_VER}/xineplug_decode_image.a +@comment lib/xine/plugins/${XINE_LIB_VER}/xineplug_decode_image.so lib/xine/plugins/${XINE_LIB_VER}/xineplug_decode_lpcm.a lib/xine/plugins/${XINE_LIB_VER}/xineplug_decode_lpcm.so lib/xine/plugins/${XINE_LIB_VER}/xineplug_decode_mad.a @@ -120,8 +120,8 @@ lib/xine/plugins/${XINE_LIB_VER}/xineplug_dmx_games.a lib/xine/plugins/${XINE_LIB_VER}/xineplug_dmx_games.so lib/xine/plugins/${XINE_LIB_VER}/xineplug_dmx_iff.a lib/xine/plugins/${XINE_LIB_VER}/xineplug_dmx_iff.so -lib/xine/plugins/${XINE_LIB_VER}/xineplug_dmx_image.a -lib/xine/plugins/${XINE_LIB_VER}/xineplug_dmx_image.so +@comment lib/xine/plugins/${XINE_LIB_VER}/xineplug_dmx_image.a +@comment lib/xine/plugins/${XINE_LIB_VER}/xineplug_dmx_image.so lib/xine/plugins/${XINE_LIB_VER}/xineplug_dmx_matroska.a lib/xine/plugins/${XINE_LIB_VER}/xineplug_dmx_matroska.so lib/xine/plugins/${XINE_LIB_VER}/xineplug_dmx_mng.a @@ -156,8 +156,6 @@ lib/xine/plugins/${XINE_LIB_VER}/xineplug_dmx_yuv4mpeg2.a lib/xine/plugins/${XINE_LIB_VER}/xineplug_dmx_yuv4mpeg2.so lib/xine/plugins/${XINE_LIB_VER}/xineplug_dmx_yuv_frames.a lib/xine/plugins/${XINE_LIB_VER}/xineplug_dmx_yuv_frames.so -lib/xine/plugins/${XINE_LIB_VER}/xineplug_flac.a -lib/xine/plugins/${XINE_LIB_VER}/xineplug_flac.so lib/xine/plugins/${XINE_LIB_VER}/xineplug_inp_cdda.a lib/xine/plugins/${XINE_LIB_VER}/xineplug_inp_cdda.so lib/xine/plugins/${XINE_LIB_VER}/xineplug_inp_dvb.a @@ -184,14 +182,14 @@ lib/xine/plugins/${XINE_LIB_VER}/xineplug_inp_vcd.a lib/xine/plugins/${XINE_LIB_VER}/xineplug_inp_vcd.so lib/xine/plugins/${XINE_LIB_VER}/xineplug_inp_vcdo.a lib/xine/plugins/${XINE_LIB_VER}/xineplug_inp_vcdo.so -lib/xine/plugins/${XINE_LIB_VER}/xineplug_vo_out_aa.a -lib/xine/plugins/${XINE_LIB_VER}/xineplug_vo_out_aa.so +@comment lib/xine/plugins/${XINE_LIB_VER}/xineplug_vo_out_aa.a +@comment lib/xine/plugins/${XINE_LIB_VER}/xineplug_vo_out_aa.so lib/xine/plugins/${XINE_LIB_VER}/xineplug_vo_out_none.a lib/xine/plugins/${XINE_LIB_VER}/xineplug_vo_out_none.so -lib/xine/plugins/${XINE_LIB_VER}/xineplug_vo_out_opengl.a -lib/xine/plugins/${XINE_LIB_VER}/xineplug_vo_out_opengl.so -lib/xine/plugins/${XINE_LIB_VER}/xineplug_vo_out_sdl.a -lib/xine/plugins/${XINE_LIB_VER}/xineplug_vo_out_sdl.so +@comment lib/xine/plugins/${XINE_LIB_VER}/xineplug_vo_out_opengl.a +@comment lib/xine/plugins/${XINE_LIB_VER}/xineplug_vo_out_opengl.so +@comment lib/xine/plugins/${XINE_LIB_VER}/xineplug_vo_out_sdl.a +@comment lib/xine/plugins/${XINE_LIB_VER}/xineplug_vo_out_sdl.so lib/xine/plugins/${XINE_LIB_VER}/xineplug_vo_out_xshm.a lib/xine/plugins/${XINE_LIB_VER}/xineplug_vo_out_xshm.so ${HAVE_XV}lib/xine/plugins/${XINE_LIB_VER}/xineplug_vo_out_xv.a @@ -199,25 +197,25 @@ ${HAVE_XV}lib/xine/plugins/${XINE_LIB_VER}/xineplug_vo_out_xv.so man/man1/xine-config.1 man/man5/xine.5 share/aclocal/xine.m4 -share/doc/xine/README -share/doc/xine/README.MINGWCROSS -share/doc/xine/README.WIN32 -share/doc/xine/README.dvb -share/doc/xine/README.dxr3 -share/doc/xine/README.freebsd -share/doc/xine/README.irix -share/doc/xine/README.network_dvd -share/doc/xine/README.opengl -share/doc/xine/README.solaris -share/doc/xine/README.syncfb -share/doc/xine/README_xxmc.html -share/doc/xine/faq/faq.html -share/doc/xine/faq/faq.txt -share/doc/xine/hackersguide/architecture.png -share/doc/xine/hackersguide/hackersguide.html -share/doc/xine/hackersguide/library.png -share/doc/xine/hackersguide/overlays.png -share/doc/xine/hackersguide/post_frame.png +share/doc/xine-lib/README +share/doc/xine-lib/README.MINGWCROSS +share/doc/xine-lib/README.WIN32 +share/doc/xine-lib/README.dvb +share/doc/xine-lib/README.dxr3 +share/doc/xine-lib/README.freebsd +share/doc/xine-lib/README.irix +share/doc/xine-lib/README.network_dvd +share/doc/xine-lib/README.opengl +share/doc/xine-lib/README.solaris +share/doc/xine-lib/README.syncfb +share/doc/xine-lib/README_xxmc.html +share/doc/xine-lib/faq.html +share/doc/xine-lib/faq.txt +share/doc/xine-lib/hackersguide/architecture.png +share/doc/xine-lib/hackersguide/hackersguide.html +share/doc/xine-lib/hackersguide/library.png +share/doc/xine-lib/hackersguide/overlays.png +share/doc/xine-lib/hackersguide/post_frame.png share/locale/cs/LC_MESSAGES/libxine1.mo share/locale/de/LC_MESSAGES/libxine1.mo share/locale/es/LC_MESSAGES/libxine1.mo diff --git a/multimedia/xine-lib/PLIST.common_end b/multimedia/xine-lib/PLIST.common_end index a0559f94b1c..9e9396596c0 100644 --- a/multimedia/xine-lib/PLIST.common_end +++ b/multimedia/xine-lib/PLIST.common_end @@ -1,10 +1,9 @@ -@comment $NetBSD: PLIST.common_end,v 1.7 2006/08/06 10:36:50 wiz Exp $ +@comment $NetBSD: PLIST.common_end,v 1.8 2007/02/07 20:04:00 drochner Exp $ @dirrm share/xine/libxine1/fonts @dirrm share/xine/libxine1 @dirrm share/xine -@dirrm share/doc/xine/hackersguide -@dirrm share/doc/xine/faq -@dirrm share/doc/xine +@dirrm share/doc/xine-lib/hackersguide +@dirrm share/doc/xine-lib @exec ${MKDIR} %D/lib/xine/plugins/${XINE_LIB_VER}/vidix @dirrm lib/xine/plugins/${XINE_LIB_VER}/vidix @dirrm lib/xine/plugins/${XINE_LIB_VER}/post diff --git a/multimedia/xine-lib/buildlink3.mk b/multimedia/xine-lib/buildlink3.mk index 5d25f0ef431..5a22263fcd1 100644 --- a/multimedia/xine-lib/buildlink3.mk +++ b/multimedia/xine-lib/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.20 2007/01/07 12:25:55 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.21 2007/02/07 20:04:00 drochner Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ XINE_LIB_BUILDLINK3_MK:= ${XINE_LIB_BUILDLINK3_MK}+ @@ -18,15 +18,4 @@ BUILDLINK_ABI_DEPENDS.xine-lib?= xine-lib>=1.1.3nb1 BUILDLINK_PKGSRCDIR.xine-lib?= ../../multimedia/xine-lib .endif # XINE_LIB_BUILDLINK3_MK -.include "../../audio/flac/buildlink3.mk" -.include "../../audio/libvorbis/buildlink3.mk" -.include "../../converters/libiconv/buildlink3.mk" -.include "../../devel/SDL/buildlink3.mk" -.include "../../devel/gettext-lib/buildlink3.mk" -.include "../../graphics/Mesa/buildlink3.mk" -.include "../../graphics/aalib/buildlink3.mk" -.include "../../graphics/freetype2/buildlink3.mk" -.include "../../graphics/mng/buildlink3.mk" -.include "../../graphics/png/buildlink3.mk" - BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/multimedia/xine-lib/distinfo b/multimedia/xine-lib/distinfo index 5e5ec509245..64932f0e413 100644 --- a/multimedia/xine-lib/distinfo +++ b/multimedia/xine-lib/distinfo @@ -1,22 +1,22 @@ -$NetBSD: distinfo,v 1.43 2007/02/01 07:33:33 wiz Exp $ +$NetBSD: distinfo,v 1.44 2007/02/07 20:04:00 drochner Exp $ -SHA1 (xine-lib-1.1.3.tar.gz) = c0886910ddb1afa1a72572decf12c0251bba40bf -RMD160 (xine-lib-1.1.3.tar.gz) = 8e28638385ea48e7d4d4d702573ca92c4eca77c8 -Size (xine-lib-1.1.3.tar.gz) = 8508884 bytes +SHA1 (xine-lib-1.1.4.tar.gz) = d3e5b14a6cb1b9624334b215a84f3d18aa833a84 +RMD160 (xine-lib-1.1.4.tar.gz) = 81871160e302281b74b1730a8e3ef4bf76fd0721 +Size (xine-lib-1.1.4.tar.gz) = 8603909 bytes SHA1 (patch-aa) = e09d34a121080b03bc67b2d8a3ca27463b771acc SHA1 (patch-ab) = ef13b60c2bea54f354acf1b2d70c04594dac36c9 SHA1 (patch-ac) = e3c1a5eeb7c70e3a69035ccd667fc2115eec4969 SHA1 (patch-ad) = 94aaac03f74c72a1ca753d1320aac07d1bb8a846 SHA1 (patch-ae) = faabcf1d34deee5d47ded9b210b37929f2635e2e -SHA1 (patch-ag) = 3dcd17f807d21b19caed7b9d72b7437332b34fad +SHA1 (patch-ag) = 592cbbcc27a9f07706808ca40573d2f184395ae1 SHA1 (patch-ah) = ba408237d4a717cc91b5d06ede425048914a9a1f SHA1 (patch-ai) = f0b33c1a36082445a86bcf71e07a6210aa21b7dc SHA1 (patch-aj) = 4215c3bc37cf636e563a509f9a391081ed8e773b SHA1 (patch-ak) = 744f59d1b9e40983f25bb532db1a5d4e92be6fbe SHA1 (patch-al) = 9e3ad86a7d7f32e58de157fa37141138af10838e SHA1 (patch-an) = 14de05f8fcd857403078234190f2799ec0115b98 -SHA1 (patch-ao) = eabc0d33210aeb1c8469e761471e5bb8336c89b7 -SHA1 (patch-ap) = c84a3ca97a4615a1b389f49847c0eefe0ee0478f +SHA1 (patch-ao) = 5643dbdf62225682bed242c0e3506b55945419b3 +SHA1 (patch-ap) = 151e3a8cc6503cf1dc9b78d8be6e362bbded0560 SHA1 (patch-as) = a0a93a256589e87a66eef31494441aa1b200f834 SHA1 (patch-av) = ff076273416fa701da325aa5060503ecb16a9ed1 SHA1 (patch-aw) = 78ab44197a6b9f85e4b272d522ce254de4d557dc @@ -25,10 +25,8 @@ SHA1 (patch-be) = 04eb23f58cb96dab4b7c7120092364915ebaf330 SHA1 (patch-bg) = 83f97ad77c8295fcaf78a7ea7fe9c4f87efd80d0 SHA1 (patch-cb) = 08d9920022988d2764d941cfa8b1aa5602a0ec81 SHA1 (patch-cd) = a080c745d08ded46db7c1173fe55350c1eb9ff33 -SHA1 (patch-da) = d488fb2a1e454a4338bf599674035f9db09d8682 +SHA1 (patch-da) = f79701d7c036e78d760c12119d88fe3f0dd1762d SHA1 (patch-db) = 3ad4ca6f43a379b251211477972cd6d34b1f821a SHA1 (patch-dc) = 11c4212029e67f22796e57706b42400a0dbcac3a -SHA1 (patch-ea) = c691eed110cfbd60e0b6349d612d765ae6560e92 SHA1 (patch-eb) = b65e2c7c30fc04115d55da1ce1f6f65216ac1d23 -SHA1 (patch-ec) = edd039d574260dc96f78e0fc7e4324f3a74cc993 -SHA1 (patch-ed) = 2a33b25b58ff3746df3b8a55f24a78351b82055e +SHA1 (patch-ee) = 49efc9d722f2141e88106d87414586ab80e4f5a9 diff --git a/multimedia/xine-lib/patches/patch-ag b/multimedia/xine-lib/patches/patch-ag index 122c2500a00..6956457c1b9 100644 --- a/multimedia/xine-lib/patches/patch-ag +++ b/multimedia/xine-lib/patches/patch-ag @@ -1,17 +1,17 @@ -$NetBSD: patch-ag,v 1.14 2006/12/08 09:24:26 abs Exp $ +$NetBSD: patch-ag,v 1.15 2007/02/07 20:04:00 drochner Exp $ ---- configure.ac.orig 2006-11-05 15:16:56.000000000 +0000 +--- configure.ac.orig 2007-01-28 18:17:56.000000000 +0100 +++ configure.ac -@@ -221,7 +221,7 @@ AC_ARG_WITH(pthread-prefix, +@@ -220,7 +220,7 @@ AC_ARG_WITH(pthread-prefix, [pthread_prefix="no"]) case "$host" in - *-*-freebsd*) + *-*-freebsd* | *-*-dragonfly*) - if test x"$pthread_prefix" = "xno"; then + if test "x$pthread_prefix" = "xno"; then pthread_prefix="/usr/local" fi -@@ -508,6 +508,9 @@ AC_CHECK_LIB(socket, socket, NET_LIBS="- +@@ -584,6 +584,9 @@ AC_CHECK_LIB(socket, socket, NET_LIBS="- AC_CHECK_LIB(nsl, gethostbyname, NET_LIBS="-lnsl $NET_LIBS",) AC_SUBST(NET_LIBS) @@ -21,34 +21,34 @@ $NetBSD: patch-ag,v 1.14 2006/12/08 09:24:26 abs Exp $ dnl --------------------------------------------- dnl socklen_t -@@ -698,7 +701,7 @@ XXMC_LIBS="-L$xxmc_path -l$xxmc_stub" +@@ -774,7 +777,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 --if test x$xxmc_stub == "xXvMCW" && test x$ac_have_xv == "xyes"; then -+if test x$xxmc_stub = "xXvMCW" && test x$ac_have_xv = "xyes"; then +-if test "x$xxmc_stub" == "xXvMCW" && test "x$ac_have_xv" == "xyes"; then ++if test "x$xxmc_stub" = "xXvMCW" && test "x$ac_have_xv" = "xyes"; then AC_CHECK_LIB($xxmc_stub, XvMCPutSlice, ac_have_xxmc="yes", [ac_have_xxmc="no" -@@ -728,7 +731,7 @@ if test x$ac_have_xxmc = "xyes"; then +@@ -804,7 +807,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 -- if test x$xxmc_stub == "xXvMCW"; then -+ if test x$xxmc_stub = "xXvMCW"; then + if test "x$ac_have_xxmc" = "xno"; then +- if test "x$xxmc_stub" == "xXvMCW"; then ++ if test "x$xxmc_stub" = "xXvMCW"; then AC_CHECK_LIB($xxmc_stub, XvMCCreateContext, ac_have_xxmc="yes", [ac_have_xxmc="no" -@@ -782,7 +785,7 @@ saved_libs="$LIBS" +@@ -858,7 +861,7 @@ saved_libs="$LIBS" XVMC_LIBS="-L$xvmc_path -l$xvmc_stub" AC_MSG_CHECKING(whether to enable the xvmc plugin) AC_MSG_RESULT() --if test x$xvmc_stub == "xXvMCW"; then -+if test x$xvmc_stub = "xXvMCW"; then +-if test "x$xvmc_stub" == "xXvMCW"; then ++if test "x$xvmc_stub" = "xXvMCW"; then AC_CHECK_LIB($xvmc_stub, XvMCCreateContext, ac_have_xvmc="yes", [ac_have_xvmc="no" -@@ -833,7 +836,6 @@ if test "x$enable_xinerama" != "xno"; th +@@ -909,7 +912,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.14 2006/12/08 09:24:26 abs Exp $ fi else ac_have_xinerama=no -@@ -1325,10 +1327,21 @@ AC_ARG_ENABLE([oss], +@@ -1422,10 +1424,21 @@ AC_ARG_ENABLE([oss], [with_oss=$enableval], [with_oss=yes]) if test "x$with_oss" = "xyes"; then @@ -78,30 +78,29 @@ $NetBSD: patch-ag,v 1.14 2006/12/08 09:24:26 abs Exp $ #include <soundcard.h> #else #include <sys/soundcard.h> -@@ -1343,7 +1356,7 @@ else +@@ -1440,6 +1453,7 @@ else have_ossaudio=no fi - AM_CONDITIONAL(HAVE_OSS, test x"$have_ossaudio" = "xyes") -- + AM_CONDITIONAL(HAVE_OSS, test "x$have_ossaudio" = "xyes") +AC_SUBST(OSS_LIBS) + dnl --------------------------------------------- - dnl Alsa support -@@ -1468,9 +1481,10 @@ AC_ARG_ENABLE([gnomevfs], +@@ -1565,9 +1579,10 @@ AC_ARG_ENABLE([gnomevfs], [with_gnome_vfs=$enableval], [with_gnome_vfs=yes]) if test "x$with_gnome_vfs" = "xyes"; then - PKG_CHECK_MODULES(GNOME_VFS, gnome-vfs-2.0, - no_gnome_vfs=no, - no_gnome_vfs=yes) -+ dnl PKG_CHECK_MODULES(GNOME_VFS, gnome-vfs-2.0, -+ dnl no_gnome_vfs=no, -+ dnl no_gnome_vfs=yes) -+ no_gnome_vfs=yes ++dnl PKG_CHECK_MODULES(GNOME_VFS, gnome-vfs-2.0, ++dnl no_gnome_vfs=no, ++dnl no_gnome_vfs=yes) ++no_gnome_vfs=yes AC_SUBST(GNOME_VFS_CFLAGS) AC_SUBST(GNOME_VFS_LIBS) - if test x"$no_gnome_vfs" != "xyes"; then -@@ -1816,7 +1830,7 @@ int has_timeout=sizeof(test.timeout);], + if test "x$no_gnome_vfs" != "xyes"; then +@@ -1913,7 +1928,7 @@ int has_timeout=sizeof(test.timeout);], AC_DEFINE([HAVE_WIN32_CDROM], [1], [Define 1 if you have MinGW CD-ROM support]) ;; diff --git a/multimedia/xine-lib/patches/patch-ao b/multimedia/xine-lib/patches/patch-ao index 846a053ea3f..4b9883b8c9e 100644 --- a/multimedia/xine-lib/patches/patch-ao +++ b/multimedia/xine-lib/patches/patch-ao @@ -1,8 +1,8 @@ -$NetBSD: patch-ao,v 1.11 2006/12/08 09:24:26 abs Exp $ +$NetBSD: patch-ao,v 1.12 2007/02/07 20:04:00 drochner Exp $ ---- src/libw32dll/wine/Makefile.in.orig 2006-12-03 19:41:07.000000000 +0000 +--- src/libw32dll/wine/Makefile.in.orig 2007-01-28 23:57:46.000000000 +0100 +++ src/libw32dll/wine/Makefile.in -@@ -62,7 +62,7 @@ mkinstalldirs = $(install_sh) -d +@@ -60,7 +60,7 @@ mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = LTLIBRARIES = $(noinst_LTLIBRARIES) @@ -11,11 +11,11 @@ $NetBSD: patch-ao,v 1.11 2006/12/08 09:24:26 abs Exp $ 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 -@@ -422,6 +422,7 @@ W32_NO_OPTIMIZE = @W32_NO_OPTIMIZE@ - WAND_CFLAGS = @WAND_CFLAGS@ - WAND_LIBS = @WAND_LIBS@ +@@ -431,6 +431,7 @@ WAND_LIBS = @WAND_LIBS@ + WAVPACK_CFLAGS = @WAVPACK_CFLAGS@ + WAVPACK_LIBS = @WAVPACK_LIBS@ WIN32_CPPFLAGS = @WIN32_CPPFLAGS@ +WINE_LIBS = @WINE_LIBS@ WIN32_FALSE = @WIN32_FALSE@ WIN32_TRUE = @WIN32_TRUE@ - X11_CFLAGS = @X11_CFLAGS@ + XGETTEXT = @XGETTEXT@ diff --git a/multimedia/xine-lib/patches/patch-ap b/multimedia/xine-lib/patches/patch-ap index 4ef2192eec7..29a09d38407 100644 --- a/multimedia/xine-lib/patches/patch-ap +++ b/multimedia/xine-lib/patches/patch-ap @@ -1,6 +1,6 @@ -$NetBSD: patch-ap,v 1.3 2006/12/08 09:24:26 abs Exp $ +$NetBSD: patch-ap,v 1.4 2007/02/07 20:04:00 drochner Exp $ ---- src/dxr3/Makefile.am.orig 2006-07-10 23:08:13.000000000 +0100 +--- src/dxr3/Makefile.am.orig 2006-12-30 20:54:32.000000000 +0100 +++ src/dxr3/Makefile.am @@ -18,6 +18,9 @@ endif if HAVE_LIBRTE @@ -16,8 +16,8 @@ $NetBSD: patch-ap,v 1.3 2006/12/08 09:24:26 abs Exp $ dxr3_scr.c \ video_out_dxr3.c --xineplug_vo_out_dxr3_la_LIBADD = $(link_fame) $(link_rte) $(link_x_libs) $(XINE_LIB) -+xineplug_vo_out_dxr3_la_LIBADD = $(link_fame) $(link_rte) $(link_xinerama) $(link_x_libs) $(XINE_LIB) +-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_CFLAGS = $(VISIBILITY_FLAG) $(AM_CFLAGS) xineplug_vo_out_dxr3_la_LDFLAGS = -avoid-version -module diff --git a/multimedia/xine-lib/patches/patch-da b/multimedia/xine-lib/patches/patch-da index c414923103c..b73ce23ac91 100644 --- a/multimedia/xine-lib/patches/patch-da +++ b/multimedia/xine-lib/patches/patch-da @@ -1,11 +1,11 @@ -$NetBSD: patch-da,v 1.2 2006/12/08 09:24:26 abs Exp $ +$NetBSD: patch-da,v 1.3 2007/02/07 20:04:00 drochner Exp $ Move some inlined functions to a place before they are used, otherwise GCC barfs when -fno-unit-a-time is active. ---- src/libffmpeg/libavcodec/h263.c.orig 2006-08-02 08:02:39.000000000 +0100 +--- src/libffmpeg/libavcodec/h263.c.orig 2007-01-28 19:38:33.000000000 +0100 +++ src/libffmpeg/libavcodec/h263.c -@@ -3432,6 +3432,53 @@ static inline int get_amv(MpegEncContext +@@ -3459,6 +3459,53 @@ static inline int get_amv(MpegEncContext } /** @@ -59,7 +59,7 @@ otherwise GCC barfs when -fno-unit-a-time is active. * decodes first partition. * @return number of MBs decoded or <0 if an error occured */ -@@ -3737,124 +3784,380 @@ int ff_mpeg4_decode_partitions(MpegEncCo +@@ -3764,124 +3811,380 @@ int ff_mpeg4_decode_partitions(MpegEncCo } /** @@ -314,7 +314,7 @@ otherwise GCC barfs when -fno-unit-a-time is active. + +#if 0 + if(s->error_resilience >= FF_ER_COMPLIANT){ -+ const int abs_level= ABS(level); ++ const int abs_level= FFABS(level); + if(abs_level<=MAX_LEVEL && run<=MAX_RUN){ + const int run1= run - rl->max_run[last][abs_level] - 1; + if(abs_level <= rl->max_level[last][run]){ @@ -536,7 +536,7 @@ otherwise GCC barfs when -fno-unit-a-time is active. }while(cbpc == 20); if(cbpc & 4){ -@@ -4726,309 +5029,6 @@ not_coded: +@@ -4747,309 +5050,6 @@ not_coded: return 0; } @@ -743,7 +743,7 @@ otherwise GCC barfs when -fno-unit-a-time is active. - -#if 0 - if(s->error_resilience >= FF_ER_COMPLIANT){ -- const int abs_level= ABS(level); +- const int abs_level= FFABS(level); - if(abs_level<=MAX_LEVEL && run<=MAX_RUN){ - const int run1= run - rl->max_run[last][abs_level] - 1; - if(abs_level <= rl->max_level[last][run]){ diff --git a/multimedia/xine-lib/patches/patch-ea b/multimedia/xine-lib/patches/patch-ea deleted file mode 100644 index f93e5c19870..00000000000 --- a/multimedia/xine-lib/patches/patch-ea +++ /dev/null @@ -1,30 +0,0 @@ -$NetBSD: patch-ea,v 1.1 2007/01/07 17:36:26 drochner Exp $ - ---- src/video_out/video_out_xv.c.orig 2006-10-28 20:51:08.000000000 +0200 -+++ src/video_out/video_out_xv.c -@@ -187,7 +187,7 @@ static void xv_frame_dispose (vo_frame_t - - if (frame->image) { - -- if (this->use_shm) { -+ if (frame->shminfo.shmaddr) { - LOCK_DISPLAY(this); - XShmDetach (this->display, &frame->shminfo); - XFree (frame->image); -@@ -382,6 +382,7 @@ static XvImage *create_ximage (xv_driver - - image = XvCreateImage (this->display, this->xv_port, - xv_format, data, width, height); -+ shminfo->shmaddr = 0; - } - return image; - } -@@ -391,7 +392,7 @@ static void dispose_ximage (xv_driver_t - XShmSegmentInfo *shminfo, - XvImage *myimage) { - -- if (this->use_shm) { -+ if (shminfo->shmaddr) { - - XShmDetach (this->display, shminfo); - XFree (myimage); diff --git a/multimedia/xine-lib/patches/patch-ec b/multimedia/xine-lib/patches/patch-ec deleted file mode 100644 index ec488b1c049..00000000000 --- a/multimedia/xine-lib/patches/patch-ec +++ /dev/null @@ -1,17 +0,0 @@ -$NetBSD: patch-ec,v 1.1 2007/01/09 14:46:31 drochner Exp $ - ---- src/input/libdvdnav/dvd_reader.c.orig 2007-01-09 00:09:32.000000000 +0100 -+++ src/input/libdvdnav/dvd_reader.c -@@ -603,10 +603,12 @@ static int findDirFile( const char *path - sprintf( filename, "%s%s%s", path, - ( ( path[ strlen( path ) - 1 ] == '/' ) ? "" : "/" ), - ent->d_name ); -+ closedir( dir ); - return 0; - } - } - -+ closedir( dir ); - return -1; - } - diff --git a/multimedia/xine-lib/patches/patch-ed b/multimedia/xine-lib/patches/patch-ed deleted file mode 100644 index 78e98231108..00000000000 --- a/multimedia/xine-lib/patches/patch-ed +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-ed,v 1.2 2007/01/10 17:18:37 drochner Exp $ - ---- src/input/libreal/asmrp.c.orig 2006-11-29 20:43:01.000000000 +0100 -+++ src/input/libreal/asmrp.c -@@ -418,8 +418,8 @@ static int asmrp_operand (asmrp_t *p) { - i = asmrp_find_id (p, p->str); - if (i<0) { - lprintf ("error: unknown identifier %s\n", p->str); -- } -- ret = p->sym_tab[i].v; -+ } else -+ ret = p->sym_tab[i].v; - - asmrp_get_sym (p); - break; diff --git a/multimedia/xine-lib/patches/patch-ee b/multimedia/xine-lib/patches/patch-ee new file mode 100644 index 00000000000..a603e120775 --- /dev/null +++ b/multimedia/xine-lib/patches/patch-ee @@ -0,0 +1,22 @@ +$NetBSD: patch-ee,v 1.3 2007/02/07 20:04:00 drochner Exp $ + +--- src/xine-engine/xine.c.orig 2007-02-07 19:58:49.000000000 +0100 ++++ src/xine-engine/xine.c +@@ -1544,6 +1544,9 @@ void xine_init (xine_t *this) { + /* probe for optimized memcpy or config setting */ + xine_probe_fast_memcpy (this); + ++ /* plugin loading might call log functions */ ++ pthread_mutex_init(&this->log_lock, NULL); ++ + /* + * plugins + */ +@@ -1622,7 +1625,6 @@ void xine_init (xine_t *this) { + * locks + */ + pthread_mutex_init (&this->streams_lock, NULL); +- pthread_mutex_init (&this->log_lock, NULL); + + /* + * start metronom clock |