diff options
Diffstat (limited to 'multimedia/xine-lib')
25 files changed, 121 insertions, 455 deletions
diff --git a/multimedia/xine-lib/Makefile b/multimedia/xine-lib/Makefile index c0881988e35..caf839f8211 100644 --- a/multimedia/xine-lib/Makefile +++ b/multimedia/xine-lib/Makefile @@ -1,15 +1,12 @@ -# $NetBSD: Makefile,v 1.39 2006/07/24 20:42:07 drochner Exp $ +# $NetBSD: Makefile,v 1.40 2006/08/06 10:36:50 wiz Exp $ .include "Makefile.common" -PKGREVISION= 11 - COMMENT= Multimedia player library BUILDLINK_API_DEPENDS.vcdimager+= vcdimager>=0.7.20nb1 -SUBST_CLASSES+= oss w32path - +SUBST_CLASSES+= oss SUBST_STAGE.oss= post-patch SUBST_FILES.oss= src/audio_out/audio_oss_out.c SUBST_SED.oss= -e "s,/dev/dsp,${DEVOSSAUDIO},g" @@ -18,8 +15,9 @@ SUBST_SED.oss+= -e "s,\"dsp\",\"audio\",g" .endif SUBST_MESSAGE.oss= Fixing hardcoded audio device. +SUBST_CLASSES+= w32path SUBST_STAGE.w32path= post-patch -SUBST_FILES.w32path= src/libw32dll/wine/module.c +SUBST_FILES.w32path= src/libw32dll/common.c SUBST_SED.w32path= -e "s,@W32PATH@,${PREFIX}/lib/win32," SUBST_MESSAGE.w32path= Fixing win32 dll path. @@ -31,6 +29,7 @@ BUILDLINK_API_DEPENDS.libcdio+= libcdio>=0.75 .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" .include "../../graphics/mng/buildlink3.mk" diff --git a/multimedia/xine-lib/Makefile.common b/multimedia/xine-lib/Makefile.common index 7ef18cc1032..3220d6f8a80 100644 --- a/multimedia/xine-lib/Makefile.common +++ b/multimedia/xine-lib/Makefile.common @@ -1,16 +1,17 @@ -# $NetBSD: Makefile.common,v 1.34 2006/07/21 14:27:56 jlam Exp $ +# $NetBSD: Makefile.common,v 1.35 2006/08/06 10:36:50 wiz Exp $ # -DISTNAME= xine-lib-${XINE_LIB_VER}a -XINE_PKGNAME= xine-lib-${XINE_LIB_VER}a +DISTNAME= xine-lib-${XINE_LIB_VER} +XINE_PKGNAME= xine-lib-${XINE_LIB_VER} PKGNAME?= ${XINE_PKGNAME} CATEGORIES?= multimedia MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=xine/} +EXTRACT_SUFX= .tar.bz2 MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://xinehq.de/ -XINE_LIB_VER= 1.0.3 +XINE_LIB_VER= 1.1.2 PLIST_SUBST+= XINE_LIB_VER=${XINE_LIB_VER:Q} DISTINFO_FILE= ${.CURDIR}/../../multimedia/xine-lib/distinfo @@ -22,7 +23,7 @@ USE_LIBTOOL= YES LIBTOOL_OVERRIDE= libtool libtool-nofpic PKGCONFIG_OVERRIDE= misc/libxine.pc.in USE_TOOLS+= autoconf gmake msgfmt pkg-config -WRKSRC= ${WRKDIR}/xine-lib-1.0.3 +WRKSRC= ${WRKDIR}/xine-lib-1.1.2 CONFIGURE_ARGS+= --with-w32-path='${PREFIX}/lib/win32' CONFIGURE_ARGS+= --without-external-ffmpeg --disable-ffmpegtest diff --git a/multimedia/xine-lib/PLIST.common b/multimedia/xine-lib/PLIST.common index 23cb45ad54c..690142e47c8 100644 --- a/multimedia/xine-lib/PLIST.common +++ b/multimedia/xine-lib/PLIST.common @@ -1,6 +1,8 @@ -@comment $NetBSD: PLIST.common,v 1.15 2006/04/17 07:07:30 jlam Exp $ +@comment $NetBSD: PLIST.common,v 1.16 2006/08/06 10:36:50 wiz Exp $ bin/xine-config include/xine.h +include/xine/alphablend.h +include/xine/array.h include/xine/attributes.h include/xine/audio_decoder.h include/xine/audio_out.h @@ -12,14 +14,18 @@ include/xine/demux.h include/xine/info_helper.h include/xine/input_plugin.h include/xine/io_helper.h +include/xine/list.h include/xine/metronom.h include/xine/os_types.h include/xine/osd.h include/xine/plugin_catalog.h +include/xine/pool.h include/xine/post.h include/xine/refcounter.h include/xine/resample.h +include/xine/ring_buffer.h include/xine/scratch.h +include/xine/sorted_array.h include/xine/spu_decoder.h include/xine/video_decoder.h include/xine/video_out.h diff --git a/multimedia/xine-lib/PLIST.common_end b/multimedia/xine-lib/PLIST.common_end index 7cad57bf0ba..a0559f94b1c 100644 --- a/multimedia/xine-lib/PLIST.common_end +++ b/multimedia/xine-lib/PLIST.common_end @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST.common_end,v 1.6 2006/01/13 08:42:30 martti Exp $ +@comment $NetBSD: PLIST.common_end,v 1.7 2006/08/06 10:36:50 wiz Exp $ @dirrm share/xine/libxine1/fonts @dirrm share/xine/libxine1 @dirrm share/xine @@ -8,7 +8,7 @@ @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 -@dirrm lib/xine/plugins/1.0.3 +@dirrm lib/xine/plugins/${XINE_LIB_VER} @dirrm lib/xine/plugins @dirrm lib/xine @dirrm include/xine diff --git a/multimedia/xine-lib/distinfo b/multimedia/xine-lib/distinfo index 53244d075f1..2a2d0fff266 100644 --- a/multimedia/xine-lib/distinfo +++ b/multimedia/xine-lib/distinfo @@ -1,42 +1,29 @@ -$NetBSD: distinfo,v 1.34 2006/07/24 20:42:07 drochner Exp $ +$NetBSD: distinfo,v 1.35 2006/08/06 10:36:50 wiz Exp $ -SHA1 (xine-lib-1.0.3a.tar.gz) = 2efe9bc3d85659731e8c679d2c60901a6101f17b -RMD160 (xine-lib-1.0.3a.tar.gz) = 335abfaa46c4592a22246f75c3a455cd87b7cdc4 -Size (xine-lib-1.0.3a.tar.gz) = 7295526 bytes +SHA1 (xine-lib-1.1.2.tar.bz2) = 07e454e2287e34414b598faf78ae6d8ab8ffbb69 +RMD160 (xine-lib-1.1.2.tar.bz2) = 21322d6d7e085237926741495d70f5ce7764910b +Size (xine-lib-1.1.2.tar.bz2) = 6457108 bytes SHA1 (patch-aa) = 8218d6415878fb99ebf533eb9d60c9ffebbed274 SHA1 (patch-ab) = c83f1826eabbc53e868ea4a532efda7f7ac8a4b7 SHA1 (patch-ac) = 7959d6d3599c9debe79b1b4a5749b6af714588a0 SHA1 (patch-ad) = 94aaac03f74c72a1ca753d1320aac07d1bb8a846 SHA1 (patch-ae) = 401dccaa31f391746f35a574d4abc71154d001ae -SHA1 (patch-af) = f190e1595e1644b844bdc3d9e19975c03e73bb55 -SHA1 (patch-ag) = 5ad6e5e40d1fb8eeb3bf06e406ab4c67e69df3b1 +SHA1 (patch-ag) = 27d3b41552725c8787374ec3368ce2c338e31bb9 SHA1 (patch-ah) = a6e62210766a9f9f518413940eac5e857e1aabc4 SHA1 (patch-ai) = f51423976056637f92366d9ccee6b97837ffc934 SHA1 (patch-aj) = 4215c3bc37cf636e563a509f9a391081ed8e773b -SHA1 (patch-ak) = 34b41bf29efeb1d0fa29b22d419d7665e33d2cb2 +SHA1 (patch-ak) = 744f59d1b9e40983f25bb532db1a5d4e92be6fbe SHA1 (patch-al) = 9e3ad86a7d7f32e58de157fa37141138af10838e -SHA1 (patch-am) = 10f6433a8549bdce60ace5dcbd51df85eaa7ea16 -SHA1 (patch-an) = 35d19acaefc126825bf8391ba4ef46b680a71dfb -SHA1 (patch-ao) = c5bbffceb34516951d2f19558bb6e082376ab195 +SHA1 (patch-an) = ba1ba429c13d3695cca5df4f00dd380aa98f03fa +SHA1 (patch-ao) = 1bc8c9f9a0a2c711381892dcc0dafef1fb16054a SHA1 (patch-ap) = aaf63024c1049c1f2175d9974367a6b84ac3028f -SHA1 (patch-aq) = 6f486b79dcb14155f613df44b10ef8223b44167e -SHA1 (patch-ar) = c0053ebca44544c42e39aab775e8441b6e9faa30 SHA1 (patch-as) = a0a93a256589e87a66eef31494441aa1b200f834 -SHA1 (patch-at) = 77bfc49591b50f3591b12c5f37a2a55d8ff8df66 -SHA1 (patch-au) = d125fe1852d57caf5e93ed66b5b65061ae03c9e5 SHA1 (patch-av) = 635ec9b332cacc02882822d8f78871f1d9377d27 SHA1 (patch-aw) = 78ab44197a6b9f85e4b272d522ce254de4d557dc -SHA1 (patch-ax) = 18101c0a19f510455496fc75a10eebf3b28acde9 -SHA1 (patch-ay) = 9e2a551de0cf00b4801809b9893734e0d63878ce SHA1 (patch-az) = e2d392fb295d51d90dc5fa6b672bcac9dcd5a04f -SHA1 (patch-ba) = c4a5fbe9d88d21a90fe01359ace7831f2a865c86 -SHA1 (patch-bb) = 40978e50dcb060a2b8314b310a68684e62e90bc2 -SHA1 (patch-bc) = 21e923dadcd9d0872574a60ca16487f17774044c +SHA1 (patch-bb) = 23b387a4bd1877081eeddb5a2ecdd2b697eb224f SHA1 (patch-bd) = 5352293022da25b08598d42655af2524ff99b28a -SHA1 (patch-be) = 78dc9f32b5861fbe6195c26d56aefea6684610e9 +SHA1 (patch-be) = d076593d15c58762e84f53964fb90c61873e7a45 SHA1 (patch-bg) = aa1a8960d597113825993be59db45644a620e99d -SHA1 (patch-bh) = ad36e3953ef1b91751ec6668af3135b449dade72 -SHA1 (patch-bi) = 7433089dc41b6f1633b23edb56881d27d68e6ff8 -SHA1 (patch-cb) = 654779bd2f41f3fae1ff074f260b3a5f5e8ecda2 +SHA1 (patch-cb) = 08d9920022988d2764d941cfa8b1aa5602a0ec81 SHA1 (patch-cd) = a080c745d08ded46db7c1173fe55350c1eb9ff33 -SHA1 (patch-ce) = 2e3abf3d88977d88c7fc8ffd3d2ead57969620d6 diff --git a/multimedia/xine-lib/patches/patch-af b/multimedia/xine-lib/patches/patch-af deleted file mode 100644 index e79376c1a0a..00000000000 --- a/multimedia/xine-lib/patches/patch-af +++ /dev/null @@ -1,17 +0,0 @@ -$NetBSD: patch-af,v 1.3 2005/05/26 22:47:22 reed Exp $ - ---- src/video_out/video_out_sdl.c.orig Sat May 7 11:04:14 2005 -+++ src/video_out/video_out_sdl.c Sat May 7 11:04:27 2005 -@@ -47,11 +47,7 @@ - #include <string.h> - #include <inttypes.h> - #include <math.h> --#if defined (__FreeBSD__) --# include <SDL11/SDL.h> --#else --# include <SDL.h> --#endif -+#include <SDL.h> - - #define LOG_MODULE "video_out_sdl" - #define LOG_VERBOSE diff --git a/multimedia/xine-lib/patches/patch-ag b/multimedia/xine-lib/patches/patch-ag index 508e8e1abdb..bf0f4f1207e 100644 --- a/multimedia/xine-lib/patches/patch-ag +++ b/multimedia/xine-lib/patches/patch-ag @@ -1,8 +1,8 @@ -$NetBSD: patch-ag,v 1.11 2005/11/01 05:39:53 reed Exp $ +$NetBSD: patch-ag,v 1.12 2006/08/06 10:36:50 wiz Exp $ --- configure.ac.orig 2005-10-08 16:08:37.000000000 +0200 +++ configure.ac -@@ -200,7 +200,7 @@ AC_ARG_WITH(pthread-prefix, +@@ -196,7 +196,7 @@ AC_ARG_WITH(pthread-prefix, [pthread_prefix="no"]) case "$host" in @@ -11,7 +11,7 @@ $NetBSD: patch-ag,v 1.11 2005/11/01 05:39:53 reed Exp $ if test x"$pthread_prefix" = "xno"; then pthread_prefix="/usr/local" fi -@@ -437,6 +437,9 @@ AC_CHECK_LIB(socket, socket, NET_LIBS="- +@@ -462,6 +462,9 @@ AC_CHECK_LIB(socket, socket, NET_LIBS="- AC_CHECK_LIB(nsl, gethostbyname, NET_LIBS="-lnsl $NET_LIBS",) AC_SUBST(NET_LIBS) @@ -21,16 +21,16 @@ $NetBSD: patch-ag,v 1.11 2005/11/01 05:39:53 reed Exp $ dnl --------------------------------------------- dnl socklen_t -@@ -630,7 +633,7 @@ XXMC_LIB="-L$xxmc_path -l$xxmc_stub" +@@ -653,7 +656,7 @@ XXMC_LIB="-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"; then -+if test x$xxmc_stub = "xXvMCW"; 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" -@@ -660,7 +663,7 @@ if test x$ac_have_xxmc = "xyes"; then +@@ -683,7 +686,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.11 2005/11/01 05:39:53 reed Exp $ AC_CHECK_LIB($xxmc_stub, XvMCCreateContext, ac_have_xxmc="yes", [ac_have_xxmc="no" -@@ -714,7 +717,7 @@ saved_libs="$LIBS" +@@ -737,7 +740,7 @@ saved_libs="$LIBS" XVMC_LIB="-L$xvmc_path -l$xvmc_stub" AC_MSG_CHECKING(whether to enable the xvmc plugin) AC_MSG_RESULT() @@ -48,60 +48,57 @@ $NetBSD: patch-ag,v 1.11 2005/11/01 05:39:53 reed Exp $ AC_CHECK_LIB($xvmc_stub, XvMCCreateContext, ac_have_xvmc="yes", [ac_have_xvmc="no" -@@ -754,8 +757,7 @@ dnl Checks for Xinerama extension - dnl --------------------------------------------- +@@ -782,8 +785,7 @@ AC_ARG_ENABLE([xinerama], - AC_CHECK_LIB(Xinerama, XineramaQueryExtension, + if test "x$with_xinerama" = "xyes"; then + AC_CHECK_LIB(Xinerama, XineramaQueryExtension, - [X_LIBS="$X_LIBS -lXinerama" - AC_DEFINE(HAVE_XINERAMA,1,[Define this if you have libXinerama installed]) + [AC_DEFINE(HAVE_XINERAMA,1,[Define this if you have libXinerama installed]) ac_have_xinerama="yes"],, [$X_LIBS $X_PRE_LIBS -lXext $X_EXTRA_LIBS]) - dnl AM_CONDITIONAL(HAVE_XINERAMA, test x$ac_have_xinerama = "xyes") -@@ -1194,9 +1196,19 @@ dnl ------------------------------------ - dnl OSS style audio interface - dnl --------------------------------------------- + else +@@ -1293,6 +1295,16 @@ AC_ARG_ENABLE([oss], + [with_oss=$enableval], [with_oss=yes]) -+case "$host" in -+ *-*-netbsd*|*-*-openbsd*) -+ OSS_LIBS="-lossaudio" -+ ;; -+ *) -+ OSS_LIBS="" -+ ;; -+esac + if test "x$with_oss" = "xyes"; then ++ ++ case "$host" in ++ *-*-netbsd*|*-*-openbsd*) ++ OSS_LIBS="-lossaudio" ++ ;; ++ *) ++ OSS_LIBS="" ++ ;; ++ esac + - AC_MSG_CHECKING(for OSS audio support) - have_ossaudio=no - AC_TRY_COMPILE([ -+ #include <sys/ioctl.h> - #ifdef __NetBSD__ - #include <soundcard.h> - #else -@@ -1209,7 +1221,7 @@ AC_TRY_COMPILE([ - ]) - AC_MSG_RESULT($have_ossaudio) + AC_MSG_CHECKING(for OSS audio support) + have_ossaudio=no + AC_TRY_COMPILE([ +@@ -1311,7 +1323,7 @@ else + have_ossaudio=no + fi AM_CONDITIONAL(HAVE_OSS, test x"$have_ossaudio" = "xyes") - +AC_SUBST(OSS_LIBS) dnl --------------------------------------------- dnl Alsa support -@@ -1250,9 +1262,10 @@ dnl ------------------------------------ - dnl gnome-vfs support - dnl --------------------------------------------- +@@ -1392,9 +1404,10 @@ AC_ARG_ENABLE([gnomevfs], + [with_gnome_vfs=$enableval], [with_gnome_vfs=yes]) --PKG_CHECK_MODULES(GNOME_VFS, gnome-vfs-2.0, + 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 - AC_SUBST(GNOME_VFS_CFLAGS) - AC_SUBST(GNOME_VFS_LIBS) - if test x"$no_gnome_vfs" != "xyes"; then -@@ -1568,7 +1581,7 @@ int has_timeout=sizeof(test.timeout);], ++ 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 +@@ -1742,7 +1755,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-ak b/multimedia/xine-lib/patches/patch-ak index 4054dd03f47..3a9f4c434b2 100644 --- a/multimedia/xine-lib/patches/patch-ak +++ b/multimedia/xine-lib/patches/patch-ak @@ -1,18 +1,15 @@ -$NetBSD: patch-ak,v 1.7 2005/09/15 01:15:47 dmcmahill Exp $ +$NetBSD: patch-ak,v 1.8 2006/08/06 10:36:50 wiz Exp $ --- src/video_out/video_out_opengl.c.orig 2005-07-17 17:50:07.000000000 -0400 +++ src/video_out/video_out_opengl.c -@@ -710,9 +710,11 @@ static void *getdladdr (const GLubyte *_ - return res; +@@ -710,9 +710,7 @@ static void *getdladdr (const GLubyte *_ #elif defined (__sun) || defined (__sgi) -- static void *handle = dlopen (NULL, RTLD_LAZY); -+ { -+ static void *handle; + static void *handle = NULL; +- if (!handle) { +- handle = dlopen (NULL, RTLD_LAZY); +- } + handle = dlopen (NULL, RTLD_LAZY); return dlsym (handle, funcName); -- -+ } + #else /* all other Un*xes */ - return dlsym (0, funcName); - diff --git a/multimedia/xine-lib/patches/patch-am b/multimedia/xine-lib/patches/patch-am deleted file mode 100644 index c87336b0ba2..00000000000 --- a/multimedia/xine-lib/patches/patch-am +++ /dev/null @@ -1,25 +0,0 @@ -$NetBSD: patch-am,v 1.3 2004/06/21 15:55:55 drochner Exp $ - ---- src/libw32dll/wine/ldt_keeper.c.orig 2004-06-13 01:19:56.000000000 +0200 -+++ src/libw32dll/wine/ldt_keeper.c -@@ -155,18 +155,9 @@ void Setup_FS_Segment(void) - - void Check_FS_Segment(void) - { -- int fs; -- __asm__ __volatile__( -- "movw %%fs,%%ax; mov %%eax,%0" : "=r" (fs) :: "%eax" -+ __asm__ __volatile__( -+ "movl %0,%%eax; movw %%ax, %%fs" : : "r" (teb_sel) : "%eax" - ); -- fs = fs & 0xffff; -- -- if( fs != teb_sel ) { -- printf("ldt_keeper: FS segment is not set or has being lost!\n"); -- printf(" Please report this error to xine-devel@lists.sourceforge.net\n"); -- printf(" Aborting....\n"); -- abort(); -- } - } - - #if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__) diff --git a/multimedia/xine-lib/patches/patch-an b/multimedia/xine-lib/patches/patch-an index b227e51f4db..23c46aa8d59 100644 --- a/multimedia/xine-lib/patches/patch-an +++ b/multimedia/xine-lib/patches/patch-an @@ -1,16 +1,7 @@ -$NetBSD: patch-an,v 1.6 2006/07/24 20:42:07 drochner Exp $ +$NetBSD: patch-an,v 1.7 2006/08/06 10:36:50 wiz Exp $ --- src/input/input_cdda.c.orig 2005-10-08 15:57:42.000000000 +0200 +++ src/input/input_cdda.c -@@ -32,7 +32,7 @@ - #include <unistd.h> - - #include <sys/types.h> --#ifdef SYS_PARAM_H -+#ifdef HAVE_SYS_PARAM_H - #include <sys/param.h> - #endif - #ifdef HAVE_DIRENT_H @@ -613,14 +613,20 @@ static int read_cdrom_frames(cdda_input_ return 0; } diff --git a/multimedia/xine-lib/patches/patch-ao b/multimedia/xine-lib/patches/patch-ao index 49e4524ee15..946edb97f3d 100644 --- a/multimedia/xine-lib/patches/patch-ao +++ b/multimedia/xine-lib/patches/patch-ao @@ -1,21 +1,21 @@ -$NetBSD: patch-ao,v 1.9 2005/10/13 10:48:01 jmmv Exp $ +$NetBSD: patch-ao,v 1.10 2006/08/06 10:36:50 wiz Exp $ --- src/libw32dll/wine/Makefile.in.orig 2005-10-09 13:28:12.000000000 +0200 +++ src/libw32dll/wine/Makefile.in -@@ -238,6 +238,7 @@ VORBIS_LIBS = @VORBIS_LIBS@ - W32DLL_DEP = @W32DLL_DEP@ - W32_NO_OPTIMIZE = @W32_NO_OPTIMIZE@ - WIN32_CPPFLAGS = @WIN32_CPPFLAGS@ -+WINE_LIBS = @WINE_LIBS@ - XINE_ACFLAGS = @XINE_ACFLAGS@ - XINE_BIN_AGE = @XINE_BIN_AGE@ - XINE_BUILD_CC = @XINE_BUILD_CC@ -@@ -355,7 +356,7 @@ CONFIG_CLEAN_FILES = +@@ -65,7 +65,7 @@ mkinstalldirs = $(install_sh) -d + CONFIG_HEADER = $(top_builddir)/config.h + CONFIG_CLEAN_FILES = LTLIBRARIES = $(noinst_LTLIBRARIES) - - libwine_la_LDFLAGS = -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 + 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 +@@ -436,6 +436,7 @@ WAND_CPPFLAGS = @WAND_CPPFLAGS@ + WAND_LDFLAGS = @WAND_LDFLAGS@ + WAND_LIBS = @WAND_LIBS@ + WIN32_CPPFLAGS = @WIN32_CPPFLAGS@ ++WINE_LIBS = @WINE_LIBS@ + WIN32_FALSE = @WIN32_FALSE@ + WIN32_TRUE = @WIN32_TRUE@ + XGETTEXT = @XGETTEXT@ diff --git a/multimedia/xine-lib/patches/patch-aq b/multimedia/xine-lib/patches/patch-aq deleted file mode 100644 index 4522dd8506b..00000000000 --- a/multimedia/xine-lib/patches/patch-aq +++ /dev/null @@ -1,83 +0,0 @@ -$NetBSD: patch-aq,v 1.6 2006/01/25 20:06:33 tron Exp $ - ---- src/libffmpeg/libavcodec/utils.c.orig 2004-05-30 20:24:23.000000000 +0100 -+++ src/libffmpeg/libavcodec/utils.c 2006-01-25 19:55:16.000000000 +0000 -@@ -200,27 +200,11 @@ - buf->last_pic_num= *picture_number; - }else{ - int h_chroma_shift, v_chroma_shift; -- int s_align, pixel_size; -- -+ int s_align, pixel_size, size[3]; -+ AVPicture picture; -+ - avcodec_get_chroma_sub_sample(s->pix_fmt, &h_chroma_shift, &v_chroma_shift); - -- switch(s->pix_fmt){ -- case PIX_FMT_RGB555: -- case PIX_FMT_RGB565: -- case PIX_FMT_YUV422: -- pixel_size=2; -- break; -- case PIX_FMT_RGB24: -- case PIX_FMT_BGR24: -- pixel_size=3; -- break; -- case PIX_FMT_RGBA32: -- pixel_size=4; -- break; -- default: -- pixel_size=1; -- } -- - avcodec_align_dimensions(s, &w, &h); - #if defined(ARCH_POWERPC) || defined(HAVE_MMI) //FIXME some cleaner check - s_align= 16; -@@ -232,21 +216,39 @@ - w+= EDGE_WIDTH*2; - h+= EDGE_WIDTH*2; - } -- -+ avpicture_fill(&picture, NULL, s->pix_fmt, w, h); -+ pixel_size= picture.linesize[0]*8 / w; -+//av_log(NULL, AV_LOG_ERROR, "%d %d %d %d\n", (int)picture.data[1], w, h, s->pix_fmt); -+ assert(pixel_size>=1); -+ //FIXME next ensures that linesize= 2^x uvlinesize, thats needed because some MC code assumes it -+ if(pixel_size == 3*8) -+ w= ALIGN(w, s_align<<h_chroma_shift); -+ else -+ w= ALIGN(pixel_size*w, s_align<<(h_chroma_shift+3)) / pixel_size; -+ size[1] = avpicture_fill(&picture, NULL, s->pix_fmt, w, h); -+ size[0] = picture.linesize[0] * h; -+ size[1] -= size[0]; -+ if(picture.data[2]) -+ size[1]= size[2]= size[1]/2; -+ else -+ size[2]= 0; -+ - buf->last_pic_num= -256*256*256*64; -+ memset(buf->base, 0, sizeof(buf->base)); -+ memset(buf->data, 0, sizeof(buf->data)); - -- for(i=0; i<3; i++){ -+ for(i=0; i<3 && size[i]; i++){ - const int h_shift= i==0 ? 0 : h_chroma_shift; - const int v_shift= i==0 ? 0 : v_chroma_shift; - -- //FIXME next ensures that linesize= 2^x uvlinesize, thats needed because some MC code assumes it -- buf->linesize[i]= ALIGN(pixel_size*w>>h_shift, s_align<<(h_chroma_shift-h_shift)); -+ buf->linesize[i]= picture.linesize[i]; - -- buf->base[i]= av_mallocz((buf->linesize[i]*h>>v_shift)+16); //FIXME 16 -+ buf->base[i]= av_malloc(size[i]+16); //FIXME 16 - if(buf->base[i]==NULL) return -1; -- memset(buf->base[i], 128, buf->linesize[i]*h>>v_shift); -- -- if(s->flags&CODEC_FLAG_EMU_EDGE) -+ memset(buf->base[i], 128, size[i]); -+ -+ // no edge if EDEG EMU or not planar YUV, we check for PAL8 redundantly to protect against a exploitable bug regression ... -+ if((s->flags&CODEC_FLAG_EMU_EDGE) || (s->pix_fmt == PIX_FMT_PAL8) || !size[2]) - buf->data[i] = buf->base[i]; - else - buf->data[i] = buf->base[i] + ALIGN((buf->linesize[i]*EDGE_WIDTH>>v_shift) + (EDGE_WIDTH>>h_shift), s_align); diff --git a/multimedia/xine-lib/patches/patch-ar b/multimedia/xine-lib/patches/patch-ar deleted file mode 100644 index 2a06db104e9..00000000000 --- a/multimedia/xine-lib/patches/patch-ar +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ar,v 1.2 2004/03/11 17:26:02 jmmv Exp $ - ---- src/video_out/video_out_aa.c.orig 2003-12-14 23:13:25.000000000 +0100 -+++ src/video_out/video_out_aa.c -@@ -113,6 +113,8 @@ static vo_frame_t *aa_alloc_frame(vo_dri - if (!frame) - return NULL; - -+ pthread_mutex_init (&frame->vo_frame.mutex, NULL); -+ - frame->vo_frame.proc_slice = NULL; - frame->vo_frame.proc_frame = NULL; - frame->vo_frame.field = aa_frame_field; diff --git a/multimedia/xine-lib/patches/patch-at b/multimedia/xine-lib/patches/patch-at deleted file mode 100644 index 2ff68495b28..00000000000 --- a/multimedia/xine-lib/patches/patch-at +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-at,v 1.3 2006/05/18 18:45:37 tron Exp $ - ---- src/xine-utils/list.c.orig 2004-12-20 21:38:24.000000000 +0000 -+++ src/xine-utils/list.c 2006-05-18 12:04:23.000000000 +0100 -@@ -229,6 +229,8 @@ - xine_node_t *node_cur; - - node_cur = l->cur; -+ if (node_cur == NULL) -+ return; - - if(node_cur->prev) { - node_cur->prev->next = node_cur->next; diff --git a/multimedia/xine-lib/patches/patch-au b/multimedia/xine-lib/patches/patch-au deleted file mode 100644 index 5b2dbda54fa..00000000000 --- a/multimedia/xine-lib/patches/patch-au +++ /dev/null @@ -1,45 +0,0 @@ -$NetBSD: patch-au,v 1.4 2006/06/26 17:13:36 wiz Exp $ - -gcc4 fix from ffmpeg subversion repository revision 3945 - ---- src/libffmpeg/libavcodec/i386/dsputil_mmx.c.orig 2006-06-26 11:55:29.000000000 +0000 -+++ src/libffmpeg/libavcodec/i386/dsputil_mmx.c -@@ -651,26 +651,22 @@ static void h263_h_loop_filter_mmx(uint8 - "punpcklwd %%mm0, %%mm1 \n\t" - "punpckhwd %%mm4, %%mm3 \n\t" - "punpckhwd %%mm0, %%mm6 \n\t" -- "movd %%mm5, %0 \n\t" -+ "movd %%mm5, (%0) \n\t" - "punpckhdq %%mm5, %%mm5 \n\t" -- "movd %%mm5, %1 \n\t" -- "movd %%mm3, %2 \n\t" -+ "movd %%mm5, (%0,%2) \n\t" -+ "movd %%mm3, (%0,%2,2) \n\t" - "punpckhdq %%mm3, %%mm3 \n\t" -- "movd %%mm3, %3 \n\t" -- "movd %%mm1, %4 \n\t" -+ "movd %%mm3, (%0,%3) \n\t" -+ "movd %%mm1, (%1) \n\t" - "punpckhdq %%mm1, %%mm1 \n\t" -- "movd %%mm1, %5 \n\t" -- "movd %%mm6, %6 \n\t" -+ "movd %%mm1, (%1,%2) \n\t" -+ "movd %%mm6, (%1,%2,2) \n\t" - "punpckhdq %%mm6, %%mm6 \n\t" -- "movd %%mm6, %7 \n\t" -- : "=m" (*(uint32_t*)(src + 0*stride)), -- "=m" (*(uint32_t*)(src + 1*stride)), -- "=m" (*(uint32_t*)(src + 2*stride)), -- "=m" (*(uint32_t*)(src + 3*stride)), -- "=m" (*(uint32_t*)(src + 4*stride)), -- "=m" (*(uint32_t*)(src + 5*stride)), -- "=m" (*(uint32_t*)(src + 6*stride)), -- "=m" (*(uint32_t*)(src + 7*stride)) -+ "movd %%mm6, (%1,%3) \n\t" -+ :: "r" (src), -+ "r" (src + 4*stride), -+ "r" ((long) stride ), -+ "r" ((long)(3*stride)) - ); - } - diff --git a/multimedia/xine-lib/patches/patch-ax b/multimedia/xine-lib/patches/patch-ax deleted file mode 100644 index 7a3286ae8ef..00000000000 --- a/multimedia/xine-lib/patches/patch-ax +++ /dev/null @@ -1,18 +0,0 @@ -$NetBSD: patch-ax,v 1.1 2006/06/26 17:13:36 wiz Exp $ - ---- src/libffmpeg/libavcodec/avcodec.h.orig 2004-05-30 19:24:19.000000000 +0000 -+++ src/libffmpeg/libavcodec/avcodec.h -@@ -1639,6 +1639,13 @@ typedef struct AVOption { - #define FF_OPT_MAX_DEPTH 10 - } AVOption; - -+#ifdef HAVE_MMX -+extern const struct AVOption avoptions_common[3 + 5]; -+#else -+extern const struct AVOption avoptions_common[3]; -+#endif -+extern const struct AVOption avoptions_workaround_bug[11]; -+ - /** - * Parse option(s) and sets fields in passed structure - * @param strct structure where the parsed results will be written diff --git a/multimedia/xine-lib/patches/patch-ay b/multimedia/xine-lib/patches/patch-ay deleted file mode 100644 index ca083224d8a..00000000000 --- a/multimedia/xine-lib/patches/patch-ay +++ /dev/null @@ -1,19 +0,0 @@ -$NetBSD: patch-ay,v 1.1 2006/06/26 17:13:36 wiz Exp $ - ---- src/libffmpeg/libavcodec/common.h.orig 2005-10-09 14:51:00.000000000 +0000 -+++ src/libffmpeg/libavcodec/common.h -@@ -66,14 +66,6 @@ - #define AVOPTION_SUB(ptr) { .name = NULL, .help = (const char*)ptr } - #define AVOPTION_END() AVOPTION_SUB(NULL) - --struct AVOption; --#ifdef HAVE_MMX --extern const struct AVOption avoptions_common[3 + 5]; --#else --extern const struct AVOption avoptions_common[3]; --#endif --extern const struct AVOption avoptions_workaround_bug[11]; -- - #endif /* HAVE_AV_CONFIG_H */ - - /* Suppress restrict if it was not defined in config.h. */ diff --git a/multimedia/xine-lib/patches/patch-ba b/multimedia/xine-lib/patches/patch-ba deleted file mode 100644 index 22c8777247e..00000000000 --- a/multimedia/xine-lib/patches/patch-ba +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ba,v 1.3 2005/07/29 16:09:11 drochner Exp $ - ---- src/input/vcd/xineplug_inp_vcd.c.orig 2005-07-17 23:50:00.000000000 +0200 -+++ src/input/vcd/xineplug_inp_vcd.c -@@ -999,7 +999,7 @@ vcd_class_get_description (input_class_t - static const char * - vcd_class_get_identifier (input_class_t *this_gen) { - dbg_print((INPUT_DBG_CALL|INPUT_DBG_EXT), "called\n"); -- return SHORT_PLUGIN_NAME; -+ return strdup(SHORT_PLUGIN_NAME); - } - - /* HACK until we put modify and put in vcdplayer. */ diff --git a/multimedia/xine-lib/patches/patch-bb b/multimedia/xine-lib/patches/patch-bb index 99cd7de99c1..d7ce6d19239 100644 --- a/multimedia/xine-lib/patches/patch-bb +++ b/multimedia/xine-lib/patches/patch-bb @@ -1,10 +1,10 @@ -$NetBSD: patch-bb,v 1.2 2004/12/21 18:56:44 drochner Exp $ +$NetBSD: patch-bb,v 1.3 2006/08/06 10:36:50 wiz Exp $ --- m4/ffmpeg.m4.orig 2004-12-16 00:57:33.000000000 +0100 +++ m4/ffmpeg.m4 -@@ -50,14 +50,6 @@ if test x"$external_ffmpeg" != "xno"; th +@@ -56,14 +56,6 @@ if test x"$external_ffmpeg" != "xno"; th CPPFLAGS="${FFMPEG_CPPFLAGS} ${ac_save_CPPFLAGS}" - LDFLAGS="${FFMPEG_LIBS} ${ac_save_LDFLAGS}" + LDFLAGS="${FFMPEG_LDFLAGS} ${ac_save_LDFLAGS}" - dnl drop the cache - for i in "ac_cv_header_avcodec_h" "ac_cv_header_postprocess_h" \ diff --git a/multimedia/xine-lib/patches/patch-bc b/multimedia/xine-lib/patches/patch-bc deleted file mode 100644 index e7a0cf90a04..00000000000 --- a/multimedia/xine-lib/patches/patch-bc +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-bc,v 1.3 2006/07/04 16:42:38 tron Exp $ - ---- misc/fonts/Makefile.in.orig 2005-10-09 11:27:59.000000000 +0000 -+++ misc/fonts/Makefile.in -@@ -25,6 +25,7 @@ bindir = @bindir@ - sbindir = @sbindir@ - libexecdir = @libexecdir@ - sysconfdir = @sysconfdir@ -+datarootdir = @datarootdir@ - sharedstatedir = @sharedstatedir@ - localstatedir = @localstatedir@ - libdir = @libdir@ diff --git a/multimedia/xine-lib/patches/patch-be b/multimedia/xine-lib/patches/patch-be index 1f1409861b8..31009cb9c5f 100644 --- a/multimedia/xine-lib/patches/patch-be +++ b/multimedia/xine-lib/patches/patch-be @@ -1,21 +1,21 @@ -$NetBSD: patch-be,v 1.5 2005/10/13 10:48:01 jmmv Exp $ +$NetBSD: patch-be,v 1.6 2006/08/06 10:36:50 wiz Exp $ --- src/audio_out/Makefile.in.orig 2005-10-09 13:28:00.000000000 +0200 +++ src/audio_out/Makefile.in -@@ -197,6 +197,7 @@ OGG_CFLAGS = @OGG_CFLAGS@ +@@ -473,6 +473,7 @@ OGG_CFLAGS = @OGG_CFLAGS@ OGG_LIBS = @OGG_LIBS@ OPENGL_CFLAGS = @OPENGL_CFLAGS@ OPENGL_LIBS = @OPENGL_LIBS@ +OSS_LIBS = @OSS_LIBS@ PACKAGE = @PACKAGE@ - PASS1_CFLAGS = @PASS1_CFLAGS@ - PASS2_CFLAGS = @PASS2_CFLAGS@ -@@ -337,7 +338,7 @@ xineplug_ao_out_file_la_LIBADD = $(XINE_ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ +@@ -665,7 +666,7 @@ xineplug_ao_out_file_la_SOURCES = audio_ + xineplug_ao_out_file_la_LIBADD = $(XINE_LIB) xineplug_ao_out_file_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@ - 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_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@ - xineplug_ao_out_alsa_la_SOURCES = audio_alsa_out.c + xineplug_ao_out_alsa_la_LIBADD = $(ALSA_LIBS) $(XINE_LIB) diff --git a/multimedia/xine-lib/patches/patch-bh b/multimedia/xine-lib/patches/patch-bh deleted file mode 100644 index ed658f22dc6..00000000000 --- a/multimedia/xine-lib/patches/patch-bh +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-bh,v 1.1 2005/09/20 12:11:37 dmcmahill Exp $ - ---- src/video_out/Makefile.am.orig 2005-04-25 10:43:15.000000000 -0400 -+++ src/video_out/Makefile.am -@@ -124,7 +124,7 @@ xineplug_vo_out_pgx64_la_SOURCES = alpha - xineplug_vo_out_pgx64_la_LIBADD = $(X_LIBS) $(SUNDGA_LIBS) - xineplug_vo_out_pgx64_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@ - --xineplug_vo_out_pgx32_la_SOURCES = video_out_pgx32.c -+xineplug_vo_out_pgx32_la_SOURCES = alphablend.c video_out_pgx32.c - xineplug_vo_out_pgx32_la_LIBADD = $(X_LIBS) $(SUNDGA_LIBS) - xineplug_vo_out_pgx32_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@ - diff --git a/multimedia/xine-lib/patches/patch-bi b/multimedia/xine-lib/patches/patch-bi deleted file mode 100644 index 6a2323d9040..00000000000 --- a/multimedia/xine-lib/patches/patch-bi +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-bi,v 1.2 2005/10/13 10:48:01 jmmv Exp $ - ---- src/video_out/Makefile.in.orig 2005-10-09 13:28:16.000000000 +0200 -+++ src/video_out/Makefile.in -@@ -370,7 +370,7 @@ xineplug_vo_out_pgx64_la_SOURCES = alpha - xineplug_vo_out_pgx64_la_LIBADD = $(X_LIBS) $(SUNDGA_LIBS) - xineplug_vo_out_pgx64_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@ - --xineplug_vo_out_pgx32_la_SOURCES = video_out_pgx32.c -+xineplug_vo_out_pgx32_la_SOURCES = alphablend.c video_out_pgx32.c - xineplug_vo_out_pgx32_la_LIBADD = $(X_LIBS) $(SUNDGA_LIBS) - xineplug_vo_out_pgx32_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@ - -@@ -479,7 +479,7 @@ am_xineplug_vo_out_opengl_la_OBJECTS = y - xineplug_vo_out_opengl_la_OBJECTS = \ - $(am_xineplug_vo_out_opengl_la_OBJECTS) - xineplug_vo_out_pgx32_la_DEPENDENCIES = --am_xineplug_vo_out_pgx32_la_OBJECTS = video_out_pgx32.lo -+am_xineplug_vo_out_pgx32_la_OBJECTS = alphablend.lo video_out_pgx32.lo - xineplug_vo_out_pgx32_la_OBJECTS = \ - $(am_xineplug_vo_out_pgx32_la_OBJECTS) - xineplug_vo_out_pgx64_la_DEPENDENCIES = diff --git a/multimedia/xine-lib/patches/patch-cb b/multimedia/xine-lib/patches/patch-cb index b5ef2e1f58b..ad7af6bd923 100644 --- a/multimedia/xine-lib/patches/patch-cb +++ b/multimedia/xine-lib/patches/patch-cb @@ -1,13 +1,16 @@ -$NetBSD: patch-cb,v 1.1 2005/05/02 11:29:35 drochner Exp $ +$NetBSD: patch-cb,v 1.2 2006/08/06 10:36:50 wiz Exp $ ---- src/libw32dll/wine/module.c.orig 2005-04-30 23:33:18.000000000 +0200 -+++ src/libw32dll/wine/module.c -@@ -362,7 +362,7 @@ static WIN_BOOL MODULE_FreeLibrary( WINE - HMODULE WINAPI LoadLibraryExA(LPCSTR libname, HANDLE hfile, DWORD flags) - { - WINE_MODREF *wm = 0; -- char* listpath[] = { "", "", "/usr/lib/win32", "/usr/local/lib/win32", 0 }; -+ char* listpath[] = { "", "", "@W32PATH@", 0 }; - char path[512]; - char checked[2000]; - int i = -1; +--- src/libw32dll/common.c.orig 2006-06-12 00:09:47.000000000 +0900 ++++ src/libw32dll/common.c +@@ -6,10 +6,7 @@ static char *get_win32_codecs_path(confi + DIR *dir; + char *path, *cfgpath; + char *listpath[] = { "", +- "/usr/lib/codecs", +- "/usr/local/lib/codecs", +- "/usr/lib/win32", +- "/usr/local/lib/win32", ++ "@W32PATH@", + NULL }; + int i = 0; + diff --git a/multimedia/xine-lib/patches/patch-ce b/multimedia/xine-lib/patches/patch-ce deleted file mode 100644 index 90526b57127..00000000000 --- a/multimedia/xine-lib/patches/patch-ce +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-ce,v 1.1 2005/10/13 10:48:01 jmmv Exp $ - ---- aclocal.m4.orig 2005-10-09 13:27:36.000000000 +0200 -+++ aclocal.m4 -@@ -7841,7 +7841,7 @@ if test x"$external_ffmpeg" != "xno"; th - "ac_cv_lib_avcodec_pp_get_context" \ - "ac_cv_lib_postproc_pp_get_context" \ - "ac_cv_lib_avcodec_register_avcodec"; do -- $as_unset $i || test "${$i+set}" != set || { $i=; export $i; } -+ $as_unset $i || test \"\${$i+set}\" != set || { eval $i=; export $i; } - done - - dnl look for headers -@@ -7889,7 +7889,7 @@ configure option --with-external-ffmpeg. - else - dnl check specified flags - CPPFLAGS="${FFMPEG_CPPFLAGS} ${ac_save_CPPFLAGS}" -- LDFLAGS="${FFMPEG_LIBS} ${FFMPEG_POSTPROC_LIBS } ${ac_save_LDFLAGS}" -+ LDFLAGS="${FFMPEG_LIBS} ${FFMPEG_POSTPROC_LIBS} ${ac_save_LDFLAGS}" - AC_LINK_IFELSE([#include <avcodec.h> - #include <postprocess.h> - |