Fix build of packages providing plugins (such as xine-arts) on systems using

X11 from pkgsrc.

For some reason, X11 is not found by the configure script in such systems
(which is the correct behavior, as USE_X11 is undefined).  This results in
a configuration failure because the script defines the HAVE_XV conditional
in an incorrect place (inside a shell conditional).

Problem reported by Owen Becker <owen at safeasmilk.net> in tech-pkg@.

3 files changed, 35 insertions, 13 deletions

diff --git a/multimedia/xine-lib/distinfo b/multimedia/xine-lib/distinfo
index fd42d0f23cb..3ccc51aa9f4 100644
--- a/multimedia/xine-lib/distinfo
+++ b/multimedia/xine-lib/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.14 2005/02/24 11:24:05 agc Exp $
+$NetBSD: distinfo,v 1.15 2005/03/28 08:12:48 jmmv Exp $
 
 SHA1 (xine-lib-1.0.tar.gz) = dd02fb31c68ae68e2283d02e16bb8e80fcced9fd
 RMD160 (xine-lib-1.0.tar.gz) = ad84871d50d51552ba8913c0744e4a2b2b21f124
@@ -8,7 +8,7 @@ SHA1 (patch-ab) = a5205d23d02dff84b0e8a9f850f3833cacc28c5a
 SHA1 (patch-ac) = 7959d6d3599c9debe79b1b4a5749b6af714588a0
 SHA1 (patch-ad) = 94aaac03f74c72a1ca753d1320aac07d1bb8a846
 SHA1 (patch-ae) = cf7486ed50a782fcfb17ad0985e76a7ae09a2938
-SHA1 (patch-ag) = 1a439f8025c07d183f054fea77a70ef86ff59217
+SHA1 (patch-ag) = 7be1e3d83e3757cf955523245be2deb4cea12998
 SHA1 (patch-ah) = 3f9b23c4a7994259056b73209a9e194db759f06d
 SHA1 (patch-ai) = f71e3cb57bf30cbf9653a469c040b6e3f717ba97
 SHA1 (patch-am) = 10f6433a8549bdce60ace5dcbd51df85eaa7ea16
@@ -23,3 +23,4 @@ SHA1 (patch-ba) = a527975fe9675358090bddc1361b707aa122f89b
 SHA1 (patch-bb) = 40978e50dcb060a2b8314b310a68684e62e90bc2
 SHA1 (patch-bd) = 5352293022da25b08598d42655af2524ff99b28a
 SHA1 (patch-be) = de3f7fe1f595ef5696379b183b661197745971a2
+SHA1 (patch-bf) = ea84b3c64dbec8f0559127f9fa28e4afa3e5dc14
diff --git a/multimedia/xine-lib/patches/patch-ag b/multimedia/xine-lib/patches/patch-ag
index a77caed5f2c..904b1aa64c0 100644
--- a/multimedia/xine-lib/patches/patch-ag
+++ b/multimedia/xine-lib/patches/patch-ag
@@ -1,8 +1,8 @@
-$NetBSD: patch-ag,v 1.6 2004/12/23 03:05:53 xtraeme Exp $
+$NetBSD: patch-ag,v 1.7 2005/03/28 08:12:48 jmmv Exp $
 
---- configure.ac.orig	2004-12-14 23:06:47.000000000 +0100
-+++ configure.ac	2004-12-23 02:02:47.000000000 +0100
-@@ -395,6 +395,9 @@
+--- configure.ac.orig	2004-12-25 18:40:24.000000000 +0100
++++ configure.ac
+@@ -400,6 +400,9 @@ AC_CHECK_LIB(socket, socket, NET_LIBS="-
  AC_CHECK_LIB(nsl, gethostbyname, NET_LIBS="-lnsl $NET_LIBS",)
  AC_SUBST(NET_LIBS)
  
@@ -12,7 +12,15 @@ $NetBSD: patch-ag,v 1.6 2004/12/23 03:05:53 xtraeme Exp $
  
  dnl ---------------------------------------------
  dnl socklen_t
-@@ -571,7 +574,7 @@
+@@ -514,6 +517,7 @@ if test x"$no_x" != "xyes"; then
+   AC_FIND_LIBXV
+ 
+ fi
++AM_CONDITIONAL(HAVE_XV, test x$ac_have_xv = "xyes")
+ 
+ 
+ host_or_hostalias="$host"
+@@ -576,7 +580,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
@@ -21,7 +29,7 @@ $NetBSD: patch-ag,v 1.6 2004/12/23 03:05:53 xtraeme Exp $
  	AC_CHECK_LIB($xxmc_stub, XvMCPutSlice,
               	     ac_have_xxmc="yes",
  	             [ac_have_xxmc="no"
-@@ -600,7 +603,7 @@
+@@ -605,7 +609,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
@@ -30,7 +38,7 @@ $NetBSD: patch-ag,v 1.6 2004/12/23 03:05:53 xtraeme Exp $
  	  AC_CHECK_LIB($xxmc_stub, XvMCCreateContext,
                 ac_have_xxmc="yes",
  	       [ac_have_xxmc="no"
-@@ -654,7 +657,7 @@
+@@ -659,7 +663,7 @@ saved_libs="$LIBS"
  XVMC_LIB="-L$xvmc_path -l$xvmc_stub"
  AC_MSG_CHECKING(whether to enable the xvmc plugin)
  AC_MSG_RESULT()
@@ -39,7 +47,7 @@ $NetBSD: patch-ag,v 1.6 2004/12/23 03:05:53 xtraeme Exp $
  	AC_CHECK_LIB($xvmc_stub, XvMCCreateContext,
               ac_have_xvmc="yes",
  	     [ac_have_xvmc="no"
-@@ -694,8 +697,7 @@
+@@ -699,8 +703,7 @@ dnl Checks for Xinerama extension
  dnl ---------------------------------------------
  
  AC_CHECK_LIB(Xinerama, XineramaQueryExtension, 
@@ -49,7 +57,7 @@ $NetBSD: patch-ag,v 1.6 2004/12/23 03:05:53 xtraeme Exp $
                ac_have_xinerama="yes"],,
               [$X_LIBS $X_PRE_LIBS -lXext $X_EXTRA_LIBS])
  dnl AM_CONDITIONAL(HAVE_XINERAMA, test x$ac_have_xinerama = "xyes")
-@@ -1068,9 +1070,19 @@
+@@ -1073,9 +1076,19 @@ dnl ------------------------------------
  dnl OSS style audio interface
  dnl ---------------------------------------------
  
@@ -69,7 +77,7 @@ $NetBSD: patch-ag,v 1.6 2004/12/23 03:05:53 xtraeme Exp $
  	    #ifdef __NetBSD__
  	    #include <soundcard.h>
  	    #else
-@@ -1083,7 +1095,7 @@
+@@ -1088,7 +1101,7 @@ AC_TRY_COMPILE([
  	])
  AC_MSG_RESULT($have_ossaudio)
  AM_CONDITIONAL(HAVE_OSS, test x"$have_ossaudio" = "xyes")
@@ -78,7 +86,7 @@ $NetBSD: patch-ag,v 1.6 2004/12/23 03:05:53 xtraeme Exp $
  
  dnl ---------------------------------------------
  dnl Alsa support
-@@ -1124,9 +1136,10 @@
+@@ -1129,9 +1142,10 @@ dnl ------------------------------------
  dnl gnome-vfs support
  dnl ---------------------------------------------
  
diff --git a/multimedia/xine-lib/patches/patch-bf b/multimedia/xine-lib/patches/patch-bf
new file mode 100644
index 00000000000..a31541f19ec
--- /dev/null
+++ b/multimedia/xine-lib/patches/patch-bf
@@ -0,0 +1,13 @@
+$NetBSD: patch-bf,v 1.1 2005/03/28 08:12:48 jmmv Exp $
+
+--- m4/xv.m4.orig	2004-12-13 22:35:21.000000000 +0100
++++ m4/xv.m4
+@@ -43,8 +43,6 @@ AC_DEFUN([AC_TEST_LIBXV],
+      ,
+   [$X_LIBS $X_PRE_LIBS -lXext $X_EXTRA_LIBS])
+ 
+-  AM_CONDITIONAL(HAVE_XV, test x$ac_have_xv = "xyes")
+-
+   dnl -----------------------------------------------
+   dnl xine_check use Xv functions API.
+   dnl -----------------------------------------------