Some fixes for this package:

* Build the oss audio plugin, fix hardcoded audio device.
* When Mesa is used the opengl plugin is not built, check this via
  USE_BUILTIN.{MesaLib,glu}.
* Fix some tests in configure.ac.
* Add PLIST.common_end to remove directories, otherwise the dirs are not
  removed correctly.

More changes to come in the future for configure.ac...

Bump PKGREVISION.

3 files changed, 118 insertions, 6 deletions

diff --git a/multimedia/xine-lib/patches/patch-ag b/multimedia/xine-lib/patches/patch-ag
index 7673f939ed5..a77caed5f2c 100644
--- a/multimedia/xine-lib/patches/patch-ag
+++ b/multimedia/xine-lib/patches/patch-ag
@@ -1,8 +1,8 @@
-$NetBSD: patch-ag,v 1.5 2004/10/27 20:31:33 drochner Exp $
+$NetBSD: patch-ag,v 1.6 2004/12/23 03:05:53 xtraeme Exp $
 
---- configure.ac.orig	2004-09-16 17:10:45.000000000 +0200
-+++ configure.ac
-@@ -385,6 +385,9 @@ AC_CHECK_LIB(socket, socket, NET_LIBS="-
+--- 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 @@
  AC_CHECK_LIB(nsl, gethostbyname, NET_LIBS="-lnsl $NET_LIBS",)
  AC_SUBST(NET_LIBS)
  
@@ -12,7 +12,34 @@ $NetBSD: patch-ag,v 1.5 2004/10/27 20:31:33 drochner Exp $
  
  dnl ---------------------------------------------
  dnl socklen_t
-@@ -610,8 +613,7 @@ dnl Checks for Xinerama extension
+@@ -571,7 +574,7 @@
+ 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
+ 	AC_CHECK_LIB($xxmc_stub, XvMCPutSlice,
+              	     ac_have_xxmc="yes",
+ 	             [ac_have_xxmc="no"
+@@ -600,7 +603,7 @@
+ 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
+ 	  AC_CHECK_LIB($xxmc_stub, XvMCCreateContext,
+                ac_have_xxmc="yes",
+ 	       [ac_have_xxmc="no"
+@@ -654,7 +657,7 @@
+ XVMC_LIB="-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
+ 	AC_CHECK_LIB($xvmc_stub, XvMCCreateContext,
+              ac_have_xvmc="yes",
+ 	     [ac_have_xvmc="no"
+@@ -694,8 +697,7 @@
  dnl ---------------------------------------------
  
  AC_CHECK_LIB(Xinerama, XineramaQueryExtension, 
@@ -22,7 +49,36 @@ $NetBSD: patch-ag,v 1.5 2004/10/27 20:31:33 drochner 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")
-@@ -1015,9 +1017,10 @@ dnl ------------------------------------
+@@ -1068,9 +1070,19 @@
+ dnl OSS style audio interface
+ dnl ---------------------------------------------
+ 
++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
+@@ -1083,7 +1095,7 @@
+ 	])
+ AC_MSG_RESULT($have_ossaudio)
+ AM_CONDITIONAL(HAVE_OSS, test x"$have_ossaudio" = "xyes")
+-
++AC_SUBST(OSS_LIBS)
+ 
+ dnl ---------------------------------------------
+ dnl Alsa support
+@@ -1124,9 +1136,10 @@
  dnl gnome-vfs support
  dnl ---------------------------------------------
  
diff --git a/multimedia/xine-lib/patches/patch-bd b/multimedia/xine-lib/patches/patch-bd
new file mode 100644
index 00000000000..84fbbe5a3f1
--- /dev/null
+++ b/multimedia/xine-lib/patches/patch-bd
@@ -0,0 +1,35 @@
+$NetBSD: patch-bd,v 1.1 2004/12/23 03:05:53 xtraeme Exp $
+
+--- src/audio_out/audio_oss_out.c.orig	2004-12-23 01:13:26.000000000 +0100
++++ src/audio_out/audio_oss_out.c	2004-12-23 01:15:23.000000000 +0100
+@@ -419,6 +419,7 @@
+     }
+     this->last_getoptr = info.bytes;
+     break;
++#ifndef __NetBSD__
+   case OSS_SYNC_GETODELAY:
+     if (ioctl (this->audio_fd, SNDCTL_DSP_GETODELAY, &bytes_left)) {
+       perror ("audio_oss_out: DSP_GETODELAY ioctl():");
+@@ -429,6 +430,7 @@
+     lprintf ("%d bytes left\n", bytes_left);
+ 
+     break;
++#endif
+   }
+ 
+   return bytes_left / this->bytes_per_frame;
+@@ -833,10 +835,13 @@
+      * check if SNDCTL_DSP_GETODELAY works. if so, using it is preferred.
+      */
+ 
++#ifndef __NetBSD__
+     if (ioctl(audio_fd, SNDCTL_DSP_GETODELAY, &info) != -1) {
+       xprintf(class->xine, XINE_VERBOSITY_DEBUG, "audio_oss_out: using SNDCTL_DSP_GETODELAY\n");
+       this->sync_method = OSS_SYNC_GETODELAY;
+-    } else if (ioctl(audio_fd, SNDCTL_DSP_GETOPTR, &info) != -1) {
++    }
++#endif
++    if (ioctl(audio_fd, SNDCTL_DSP_GETOPTR, &info) != -1) {
+       xprintf(class->xine, XINE_VERBOSITY_DEBUG, "audio_oss_out: using SNDCTL_DSP_GETOPTR\n");
+       this->sync_method = OSS_SYNC_GETOPTR;
+     } else {
diff --git a/multimedia/xine-lib/patches/patch-be b/multimedia/xine-lib/patches/patch-be
new file mode 100644
index 00000000000..513846f58f5
--- /dev/null
+++ b/multimedia/xine-lib/patches/patch-be
@@ -0,0 +1,21 @@
+$NetBSD: patch-be,v 1.1 2004/12/23 03:05:53 xtraeme Exp $
+
+--- src/audio_out/Makefile.in.orig	2004-12-15 14:02:27.000000000 +0100
++++ src/audio_out/Makefile.in	2004-12-23 02:16:38.000000000 +0100
+@@ -310,6 +310,7 @@
+ OGG_LIBS = @OGG_LIBS@
+ OPENGL_CFLAGS = @OPENGL_CFLAGS@
+ OPENGL_LIBS = @OPENGL_LIBS@
++OSS_LIBS = @OSS_LIBS@
+ PACKAGE = @PACKAGE@
+ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+ PACKAGE_NAME = @PACKAGE_NAME@
+@@ -508,7 +509,7 @@
+ 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