diff options
| -rw-r--r-- | multimedia/xine-lib/distinfo | 4 | ||||
| -rw-r--r-- | multimedia/xine-lib/patches/patch-ag | 56 |
2 files changed, 26 insertions, 34 deletions
diff --git a/multimedia/xine-lib/distinfo b/multimedia/xine-lib/distinfo index 33822c0bb7b..eaf87a8fdf1 100644 --- a/multimedia/xine-lib/distinfo +++ b/multimedia/xine-lib/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.36 2006/08/14 12:15:38 joerg Exp $ +$NetBSD: distinfo,v 1.37 2006/09/29 21:20:04 dmcmahill Exp $ SHA1 (xine-lib-1.1.2.tar.bz2) = 07e454e2287e34414b598faf78ae6d8ab8ffbb69 RMD160 (xine-lib-1.1.2.tar.bz2) = 21322d6d7e085237926741495d70f5ce7764910b @@ -8,7 +8,7 @@ SHA1 (patch-ab) = c83f1826eabbc53e868ea4a532efda7f7ac8a4b7 SHA1 (patch-ac) = 7959d6d3599c9debe79b1b4a5749b6af714588a0 SHA1 (patch-ad) = 94aaac03f74c72a1ca753d1320aac07d1bb8a846 SHA1 (patch-ae) = 401dccaa31f391746f35a574d4abc71154d001ae -SHA1 (patch-ag) = 27d3b41552725c8787374ec3368ce2c338e31bb9 +SHA1 (patch-ag) = 64cee767f92802013813d1c545e5a44d43c7a8cd SHA1 (patch-ah) = a6e62210766a9f9f518413940eac5e857e1aabc4 SHA1 (patch-ai) = f51423976056637f92366d9ccee6b97837ffc934 SHA1 (patch-aj) = 4215c3bc37cf636e563a509f9a391081ed8e773b diff --git a/multimedia/xine-lib/patches/patch-ag b/multimedia/xine-lib/patches/patch-ag index bf0f4f1207e..68eae609c70 100644 --- a/multimedia/xine-lib/patches/patch-ag +++ b/multimedia/xine-lib/patches/patch-ag @@ -1,18 +1,15 @@ -$NetBSD: patch-ag,v 1.12 2006/08/06 10:36:50 wiz Exp $ +$NetBSD: patch-ag,v 1.13 2006/09/29 21:20:04 dmcmahill Exp $ ---- configure.ac.orig 2005-10-08 16:08:37.000000000 +0200 -+++ configure.ac -@@ -196,7 +196,7 @@ AC_ARG_WITH(pthread-prefix, - [pthread_prefix="no"]) +--- configure.ac.orig 2006-07-09 10:36:29.000000000 -0400 ++++ configure.ac 2006-09-29 12:47:48.000000000 -0400 +@@ -197,5 +197,5 @@ case "$host" in - *-*-freebsd*) + *-*-freebsd* | *-*-dragonfly*) if test x"$pthread_prefix" = "xno"; then pthread_prefix="/usr/local" - fi -@@ -462,6 +462,9 @@ AC_CHECK_LIB(socket, socket, NET_LIBS="- - AC_CHECK_LIB(nsl, gethostbyname, NET_LIBS="-lnsl $NET_LIBS",) +@@ -463,4 +463,7 @@ AC_SUBST(NET_LIBS) +WINE_LIBS="" @@ -20,36 +17,35 @@ $NetBSD: patch-ag,v 1.12 2006/08/06 10:36:50 wiz Exp $ +AC_SUBST(WINE_LIBS) dnl --------------------------------------------- - dnl socklen_t -@@ -653,7 +656,7 @@ XXMC_LIB="-L$xxmc_path -l$xxmc_stub" - AC_MSG_CHECKING(whether to enable the xxmc plugin with vld extensions) +@@ -567,5 +570,5 @@ + [with_v4l=${enableval}], [with_v4l=yes]) + +-if test "x$with_v4l" == "xyes"; then ++if test "x$with_v4l" = "xyes"; then + AC_CHECK_HEADER(linux/videodev.h, have_v4l=yes,) + else +@@ -654,5 +657,5 @@ 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 AC_CHECK_LIB($xxmc_stub, XvMCPutSlice, ac_have_xxmc="yes", - [ac_have_xxmc="no" -@@ -683,7 +686,7 @@ if test x$ac_have_xxmc = "xyes"; then - fi +@@ -684,5 +687,5 @@ 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 AC_CHECK_LIB($xxmc_stub, XvMCCreateContext, ac_have_xxmc="yes", - [ac_have_xxmc="no" -@@ -737,7 +740,7 @@ saved_libs="$LIBS" - XVMC_LIB="-L$xvmc_path -l$xvmc_stub" +@@ -738,5 +741,5 @@ 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 AC_CHECK_LIB($xvmc_stub, XvMCCreateContext, ac_have_xvmc="yes", - [ac_have_xvmc="no" -@@ -782,8 +785,7 @@ AC_ARG_ENABLE([xinerama], - +@@ -783,6 +786,5 @@ if test "x$with_xinerama" = "xyes"; then AC_CHECK_LIB(Xinerama, XineramaQueryExtension, - [X_LIBS="$X_LIBS -lXinerama" @@ -57,9 +53,7 @@ $NetBSD: patch-ag,v 1.12 2006/08/06 10:36:50 wiz Exp $ + [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]) - else -@@ -1293,6 +1295,16 @@ AC_ARG_ENABLE([oss], - [with_oss=$enableval], [with_oss=yes]) +@@ -1294,8 +1296,19 @@ if test "x$with_oss" = "xyes"; then + @@ -75,17 +69,18 @@ $NetBSD: patch-ag,v 1.12 2006/08/06 10:36:50 wiz Exp $ AC_MSG_CHECKING(for OSS audio support) have_ossaudio=no AC_TRY_COMPILE([ -@@ -1311,7 +1323,7 @@ else - have_ossaudio=no + #ifdef __NetBSD__ ++ #include <sys/ioctl.h> + #include <soundcard.h> + #else +@@ -1312,5 +1325,5 @@ fi AM_CONDITIONAL(HAVE_OSS, test x"$have_ossaudio" = "xyes") - +AC_SUBST(OSS_LIBS) dnl --------------------------------------------- - dnl Alsa support -@@ -1392,9 +1404,10 @@ AC_ARG_ENABLE([gnomevfs], - [with_gnome_vfs=$enableval], [with_gnome_vfs=yes]) +@@ -1393,7 +1406,8 @@ if test "x$with_gnome_vfs" = "xyes"; then - PKG_CHECK_MODULES(GNOME_VFS, gnome-vfs-2.0, @@ -97,13 +92,10 @@ $NetBSD: patch-ag,v 1.12 2006/08/06 10:36:50 wiz Exp $ + 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], +@@ -1743,5 +1757,5 @@ [Define 1 if you have MinGW CD-ROM support]) ;; - freebsd4.*) + freebsd4.* | dragonfly*) AC_DEFINE([HAVE_FREEBSD_CDROM], [1], [Define 1 if you have FreeBSD CD-ROM support]) - ;; |