update to 1.1.7

changes:
-bugfixes, among others for VCD playback
-adds support for libdca (formerly libdts)
-handle disappearing audio devices (possibly ALSA specific)

8 files changed, 62 insertions, 383 deletions

diff --git a/multimedia/xine-lib/patches/patch-ac b/multimedia/xine-lib/patches/patch-ac
deleted file mode 100644
index 225d40557af..00000000000
--- a/multimedia/xine-lib/patches/patch-ac
+++ /dev/null
@@ -1,118 +0,0 @@
-$NetBSD: patch-ac,v 1.3 2006/12/08 09:24:26 abs Exp $
-
---- src/audio_out/audio_sun_out.c.orig	2006-07-16 17:18:09.000000000 +0100
-+++ src/audio_out/audio_sun_out.c
-@@ -41,6 +41,11 @@
- #ifdef	__svr4__
- #include <stropts.h>
- #endif
-+#include <sys/param.h>
-+
-+#if (defined(BSD) && BSD >= 199306)
-+typedef unsigned uint_t;
-+#endif
- 
- #include "xine_internal.h"
- #include "xineutils.h"
-@@ -89,7 +94,9 @@ typedef struct sun_driver_s {
-   uint32_t       num_channels;
-   int		 bytes_per_frame;
- 
-+#ifndef __NetBSD__
-   uint32_t       frames_in_buffer;     /* number of frames writen to audio hardware   */
-+#endif
- 
-   enum {
-       RTSC_UNKNOWN = 0,
-@@ -114,12 +121,14 @@ typedef struct sun_driver_s {
-   unsigned	 buf_len;
- #endif
- 
-+#ifndef __NetBSD__
- #if	SW_SAMPLE_COUNT
-   struct timeval tv0;
-   uint_t	 sample0;
- #endif
- 
-   uint_t	 last_samplecnt;
-+#endif
- } sun_driver_t;
- 
- 
-@@ -129,6 +138,7 @@ typedef struct sun_driver_s {
-  */
- static int realtime_samplecounter_available(xine_t *xine, char *dev)
- {
-+#ifndef __NetBSD__
-   int fd = -1;
-   audio_info_t info;
-   int rtsc_ok = RTSC_DISABLED;
-@@ -247,6 +257,9 @@ error:
-   }
- 
-   return rtsc_ok;
-+#else
-+  return RTSC_ENABLED;
-+#endif
- }
- 
- 
-@@ -430,7 +443,9 @@ static int ao_sun_open(ao_driver_t *this
-   
-   this->mode			= mode;
-   this->input_sample_rate	= rate;
-+#ifndef __NetBSD__
-   this->frames_in_buffer	= 0;
-+#endif
- 
-   /*
-    * open audio device
-@@ -462,6 +477,9 @@ static int ao_sun_open(ao_driver_t *this
-       info.play.sample_rate = this->input_sample_rate;
-       info.play.eof = 0;
-       info.play.samples = 0;
-+#ifdef __NetBSD__
-+      info.blocksize = 1024;
-+#endif
- 
-       this->convert_u8_s8 = 0;
- 
-@@ -523,7 +541,9 @@ static int ao_sun_open(ao_driver_t *this
-       return 0;
-   }
- 
-+#ifndef __NetBSD__
-   this->last_samplecnt = 0;
-+#endif
- 
-   this->output_sample_rate = info.play.sample_rate;
-   this->num_channels = info.play.channels;
-@@ -564,6 +584,7 @@ static int ao_sun_delay(ao_driver_t *thi
-   sun_driver_t *this = (sun_driver_t *) this_gen;
-   audio_info_t info;
- 
-+#ifndef __NetBSD__
-   if (ioctl(this->audio_fd, AUDIO_GETINFO, &info) == 0 &&
-       (this->frames_in_buffer == 0 || info.play.samples > 0)) {
- 
-@@ -610,6 +631,10 @@ static int ao_sun_delay(ao_driver_t *thi
-     }
- #endif
-   }
-+#else
-+  if (ioctl(this->audio_fd, AUDIO_GETINFO, &info) == 0)
-+    return info.play.seek / this->bytes_per_frame;
-+#endif
-   return NOT_REAL_TIME;
- }
- 
-@@ -718,7 +743,9 @@ static int ao_sun_write(ao_driver_t *thi
-   if (num_written > 0) {
-     int buffered_samples;
- 
-+#ifndef __NetBSD__
-     this->frames_in_buffer += num_written / this->bytes_per_frame;
-+#endif
- 
-     /* 
-      * Avoid storing too much data in the sound driver's buffers.
diff --git a/multimedia/xine-lib/patches/patch-ae b/multimedia/xine-lib/patches/patch-ae
index a01602b14e0..48a0fdb94d5 100644
--- a/multimedia/xine-lib/patches/patch-ae
+++ b/multimedia/xine-lib/patches/patch-ae
@@ -1,15 +1,15 @@
-$NetBSD: patch-ae,v 1.3 2006/12/08 09:24:26 abs Exp $
+$NetBSD: patch-ae,v 1.4 2007/06/15 18:20:06 drochner Exp $
 
---- src/input/input_vcd.c.orig	2006-07-10 23:08:16.000000000 +0100
+--- src/input/input_vcd.c.orig	2007-04-05 00:18:00.000000000 +0200
 +++ src/input/input_vcd.c
-@@ -33,6 +33,7 @@
+@@ -32,6 +32,7 @@
  #include <errno.h>
  #include <fcntl.h>
  #include <sys/ioctl.h>
 +#include <sys/param.h>
  #include <string.h>
+ #include <netinet/in.h>
  #ifdef HAVE_LINUX_CDROM_H
- # include <linux/cdrom.h>
 @@ -95,7 +96,7 @@ typedef struct {
  #if defined (__linux__) || defined(__sun)
    struct cdrom_tochdr    tochdr;
diff --git a/multimedia/xine-lib/patches/patch-ag b/multimedia/xine-lib/patches/patch-ag
index 6956457c1b9..1a342c467d5 100644
--- a/multimedia/xine-lib/patches/patch-ag
+++ b/multimedia/xine-lib/patches/patch-ag
@@ -1,17 +1,17 @@
-$NetBSD: patch-ag,v 1.15 2007/02/07 20:04:00 drochner Exp $
+$NetBSD: patch-ag,v 1.16 2007/06/15 18:20:06 drochner Exp $
 
---- configure.ac.orig	2007-01-28 18:17:56.000000000 +0100
+--- configure.ac.orig	2007-04-08 18:31:32.000000000 +0200
 +++ configure.ac
-@@ -220,7 +220,7 @@ AC_ARG_WITH(pthread-prefix, 
-   [pthread_prefix="no"])
+@@ -98,7 +98,7 @@ dnl ------------------------------------
+ AC_CANONICAL_HOST
+ AC_CANONICAL_BUILD
  
- case "$host" in
--  *-*-freebsd*)
-+  *-*-freebsd* | *-*-dragonfly*)
-     if test "x$pthread_prefix" = "xno"; then
-       pthread_prefix="/usr/local"
-     fi
-@@ -584,6 +584,9 @@ AC_CHECK_LIB(socket, socket, NET_LIBS="-
+-test "$host" == "$build" && check_athlon=yes
++test "$host" = "$build" && check_athlon=yes
+ 
+ AC_CONFIG_HEADERS([config.h])
+ 
+@@ -549,6 +549,9 @@ AC_CHECK_LIB(socket, socket, NET_LIBS="-
  AC_CHECK_LIB(nsl, gethostbyname, NET_LIBS="-lnsl $NET_LIBS",)
  AC_SUBST(NET_LIBS)
  
@@ -21,7 +21,7 @@ $NetBSD: patch-ag,v 1.15 2007/02/07 20:04:00 drochner Exp $
  
  dnl ---------------------------------------------
  dnl socklen_t
-@@ -774,7 +777,7 @@ XXMC_LIBS="-L$xxmc_path -l$xxmc_stub"
+@@ -739,7 +742,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
@@ -30,7 +30,7 @@ $NetBSD: patch-ag,v 1.15 2007/02/07 20:04:00 drochner Exp $
  	AC_CHECK_LIB($xxmc_stub, XvMCPutSlice,
               	     ac_have_xxmc="yes",
  	             [ac_have_xxmc="no"
-@@ -804,7 +807,7 @@ if test "x$ac_have_xxmc" = "xyes"; then
+@@ -769,7 +772,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.15 2007/02/07 20:04:00 drochner Exp $
  	  AC_CHECK_LIB($xxmc_stub, XvMCCreateContext,
                 ac_have_xxmc="yes",
  	       [ac_have_xxmc="no"
-@@ -858,7 +861,7 @@ saved_libs="$LIBS"
+@@ -823,7 +826,7 @@ saved_libs="$LIBS"
  XVMC_LIBS="-L$xvmc_path -l$xvmc_stub"
  AC_MSG_CHECKING(whether to enable the xvmc plugin)
  AC_MSG_RESULT()
@@ -48,7 +48,7 @@ $NetBSD: patch-ag,v 1.15 2007/02/07 20:04:00 drochner Exp $
  	AC_CHECK_LIB($xvmc_stub, XvMCCreateContext,
               ac_have_xvmc="yes",
  	     [ac_have_xvmc="no"
-@@ -909,7 +912,6 @@ if test "x$enable_xinerama" != "xno"; th
+@@ -914,7 +917,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,37 +56,37 @@ $NetBSD: patch-ag,v 1.15 2007/02/07 20:04:00 drochner Exp $
     fi
  else
    ac_have_xinerama=no
-@@ -1422,10 +1424,21 @@ AC_ARG_ENABLE([oss],
-   [with_oss=$enableval], [with_oss=yes])
+@@ -1416,8 +1418,21 @@ AC_ARG_ENABLE([oss],
+ 	AS_HELP_STRING([--disable-oss], [Do not build OSS audio output support]))
  
- if test "x$with_oss" = "xyes"; then
+ if test "x$enable_oss" != "xno"; then
++ 
++   case "$host" in
++     *-*-netbsd*|*-*-openbsd*)
++       OSS_LIBS="-lossaudio"
++       ;;
++     *)
++       OSS_LIBS=""
++       ;;
++   esac
 +
-+  case "$host" in
-+    *-*-netbsd*|*-*-openbsd*)
-+      OSS_LIBS="-lossaudio"
-+      ;;
-+    *)
-+      OSS_LIBS=""
-+      ;;
-+  esac
-+
-   AC_MSG_CHECKING(for OSS audio support)
-   have_ossaudio=no
-   AC_TRY_COMPILE([
- 	    #ifdef __NetBSD__
-+	    #include <sys/ioctl.h>
- 	    #include <soundcard.h>
- 	    #else
- 	    #include <sys/soundcard.h>
-@@ -1440,6 +1453,7 @@ else
-   have_ossaudio=no
+    AC_CHECK_HEADERS([sys/soundcard.h machine/soundcard.h soundcard.h], [break])
+    AC_CHECK_DECL([SNDCTL_DSP_SETFRAGMENT], [have_ossaudio=yes], [], [
++     #ifdef __NetBSD__
++     #include <sys/ioctl.h>
++     #endif
+      #ifdef HAVE_SYS_SOUNDCARD_H
+      # include <sys/soundcard.h>
+      #endif
+@@ -1433,6 +1448,7 @@ if test "x$enable_oss" != "xno"; then
  fi
+ 
  AM_CONDITIONAL(HAVE_OSS, test "x$have_ossaudio" = "xyes")
 +AC_SUBST(OSS_LIBS)
  
  
  dnl ---------------------------------------------
-@@ -1565,9 +1579,10 @@ AC_ARG_ENABLE([gnomevfs],
+@@ -1542,9 +1558,10 @@ AC_ARG_ENABLE([gnomevfs],
    [with_gnome_vfs=$enableval], [with_gnome_vfs=yes])
  
  if test "x$with_gnome_vfs" = "xyes"; then
@@ -100,7 +100,7 @@ $NetBSD: patch-ag,v 1.15 2007/02/07 20:04:00 drochner Exp $
    AC_SUBST(GNOME_VFS_CFLAGS)
    AC_SUBST(GNOME_VFS_LIBS)
    if test "x$no_gnome_vfs" != "xyes"; then
-@@ -1913,7 +1928,7 @@ int has_timeout=sizeof(test.timeout);],
+@@ -1879,7 +1896,7 @@ int has_timeout=sizeof(test.timeout);]])
       	    AC_DEFINE([HAVE_WIN32_CDROM], [1], 
                        [Define 1 if you have MinGW CD-ROM support])
  	 ;;
@@ -109,3 +109,12 @@ $NetBSD: patch-ag,v 1.15 2007/02/07 20:04:00 drochner Exp $
       	    AC_DEFINE([HAVE_FREEBSD_CDROM], [1], 
                        [Define 1 if you have FreeBSD CD-ROM support])
  	 ;;
+@@ -2574,7 +2591,7 @@ case $host in
+      dnl FreeBSD (et al.) does not complete linking for shared objects when pthreads
+      dnl are requested, as different implementations are present; to avoid problems
+      dnl use -Wl,-z,defs only for those platform not behaving this way.
+-     *-freebsd*) ;;
++     *-freebsd* | *-netbsd*) ;;
+      *)
+ 	AC_TRY_LDFLAGS([-Wl,-z,defs], [NOUNDEF="-Wl,-z,defs"])
+ 	;;
diff --git a/multimedia/xine-lib/patches/patch-an b/multimedia/xine-lib/patches/patch-an
deleted file mode 100644
index 411bf51a279..00000000000
--- a/multimedia/xine-lib/patches/patch-an
+++ /dev/null
@@ -1,170 +0,0 @@
-$NetBSD: patch-an,v 1.8 2007/02/01 07:33:34 wiz Exp $
-
---- src/input/input_cdda.c.orig	2006-08-11 21:40:02.000000000 +0000
-+++ src/input/input_cdda.c
-@@ -86,6 +86,7 @@
- #define CD_FRAMES_PER_SECOND    75
- #define CD_RAW_FRAME_SIZE       2352
- #define CD_LEADOUT_TRACK        0xAA
-+#define CD_BLOCK_OFFSET         150
- 
- typedef struct _cdrom_toc_entry {
-   int   track_mode;
-@@ -613,14 +614,20 @@ static int read_cdrom_frames(cdda_input_
-   return 0;
- }
- 
--#elif defined(__FreeBSD__)
-+#elif defined(__FreeBSD__) || defined(__NetBSD__)
- 
- #include <sys/cdio.h>
-+#include <sys/scsiio.h>
- 
- static int read_cdrom_toc(int fd, cdrom_toc *toc) {
- 
-   struct ioc_toc_header tochdr;
-+#if defined(__FreeBSD__)
-   struct ioc_read_toc_single_entry tocentry;
-+#elif defined(__NetBSD__)
-+  struct ioc_read_toc_entry tocentry;
-+  struct cd_toc_entry data;
-+#endif
-   int i;
- 
-   /* fetch the table of contents */
-@@ -646,13 +653,26 @@ static int read_cdrom_toc(int fd, cdrom_
- 
-     memset(&tocentry, 0, sizeof(tocentry));
- 
-+#if defined(__FreeBSD__)
-     tocentry.track = i;
-     tocentry.address_format = CD_MSF_FORMAT;
-     if (ioctl(fd, CDIOREADTOCENTRY, &tocentry) == -1) {
-       perror("CDIOREADTOCENTRY");
-       return -1;
-     }
-+#elif defined(__NetBSD__)
-+    memset(&data, 0, sizeof(data));
-+    tocentry.data_len = sizeof(data);
-+    tocentry.data = &data;
-+    tocentry.starting_track = i;
-+    tocentry.address_format = CD_MSF_FORMAT;
-+    if (ioctl(fd, CDIOREADTOCENTRYS, &tocentry) == -1) {
-+      perror("CDIOREADTOCENTRYS");
-+      return -1;
-+    }
-+#endif
- 
-+#if defined(__FreeBSD__)
-     toc->toc_entries[i-1].track_mode = (tocentry.entry.control & 0x04) ? 1 : 0;
-     toc->toc_entries[i-1].first_frame_minute = tocentry.entry.addr.msf.minute;
-     toc->toc_entries[i-1].first_frame_second = tocentry.entry.addr.msf.second;
-@@ -661,18 +681,41 @@ static int read_cdrom_toc(int fd, cdrom_
-       (tocentry.entry.addr.msf.minute * CD_SECONDS_PER_MINUTE * CD_FRAMES_PER_SECOND) +
-       (tocentry.entry.addr.msf.second * CD_FRAMES_PER_SECOND) +
-        tocentry.entry.addr.msf.frame;
-+#elif defined(__NetBSD__)
-+    toc->toc_entries[i-1].track_mode = (tocentry.data->control & 0x04) ? 1 : 0;
-+    toc->toc_entries[i-1].first_frame_minute = tocentry.data->addr.msf.minute;
-+    toc->toc_entries[i-1].first_frame_second = tocentry.data->addr.msf.second;
-+    toc->toc_entries[i-1].first_frame_frame = tocentry.data->addr.msf.frame;
-+    toc->toc_entries[i-1].first_frame =
-+      (tocentry.data->addr.msf.minute * CD_SECONDS_PER_MINUTE * CD_FRAMES_PER_SECOND) +
-+      (tocentry.data->addr.msf.second * CD_FRAMES_PER_SECOND) +
-+       tocentry.data->addr.msf.frame - CD_BLOCK_OFFSET;
-+#endif
-   }
- 
-   /* fetch the leadout as well */
-   memset(&tocentry, 0, sizeof(tocentry));
- 
-+#if defined(__FreeBSD__)
-   tocentry.track = CD_LEADOUT_TRACK;
-   tocentry.address_format = CD_MSF_FORMAT;
-   if (ioctl(fd, CDIOREADTOCENTRY, &tocentry) == -1) {
-     perror("CDIOREADTOCENTRY");
-     return -1;
-   }
-+#elif defined(__NetBSD__)
-+  memset(&data, 0, sizeof(data));
-+  tocentry.data_len = sizeof(data);
-+  tocentry.data = &data;
-+  tocentry.starting_track = CD_LEADOUT_TRACK;
-+  tocentry.address_format = CD_MSF_FORMAT;
-+  if (ioctl(fd, CDIOREADTOCENTRYS, &tocentry) == -1) {
-+    perror("CDIOREADTOCENTRYS");
-+    return -1;
-+  }
-+#endif
- 
-+#if defined(__FreeBSD__)
-   toc->leadout_track.track_mode = (tocentry.entry.control & 0x04) ? 1 : 0;
-   toc->leadout_track.first_frame_minute = tocentry.entry.addr.msf.minute;
-   toc->leadout_track.first_frame_second = tocentry.entry.addr.msf.second;
-@@ -681,6 +724,16 @@ static int read_cdrom_toc(int fd, cdrom_
-     (tocentry.entry.addr.msf.minute * CD_SECONDS_PER_MINUTE * CD_FRAMES_PER_SECOND) +
-     (tocentry.entry.addr.msf.second * CD_FRAMES_PER_SECOND) +
-      tocentry.entry.addr.msf.frame;
-+#elif defined(__NetBSD__)
-+  toc->leadout_track.track_mode = (tocentry.data->control & 0x04) ? 1 : 0;
-+  toc->leadout_track.first_frame_minute = tocentry.data->addr.msf.minute;
-+  toc->leadout_track.first_frame_second = tocentry.data->addr.msf.second;
-+  toc->leadout_track.first_frame_frame = tocentry.data->addr.msf.frame;
-+  toc->leadout_track.first_frame =
-+    (tocentry.data->addr.msf.minute * CD_SECONDS_PER_MINUTE * CD_FRAMES_PER_SECOND) +
-+    (tocentry.data->addr.msf.second * CD_FRAMES_PER_SECOND) +
-+     tocentry.data->addr.msf.frame - CD_BLOCK_OFFSET;
-+#endif
- 
-   return 0;
- }
-@@ -689,12 +742,12 @@ static int read_cdrom_frames(cdda_input_
-   unsigned char *data) {
- 
-   int fd = this_gen->fd;
--#if  __FreeBSD_version < 501106
--  struct ioc_read_audio cdda;
--#endif
- 
-   while( num_frames ) {
-+#if defined(__FreeBSD__)
- #if  __FreeBSD_version < 501106
-+    struct ioc_read_audio cdda;
-+
-     cdda.address_format = CD_MSF_FORMAT;
-     cdda.address.msf.minute = frame / CD_SECONDS_PER_MINUTE / CD_FRAMES_PER_SECOND;
-     cdda.address.msf.second = (frame / CD_FRAMES_PER_SECOND) % CD_SECONDS_PER_MINUTE;
-@@ -712,6 +765,33 @@ static int read_cdrom_frames(cdda_input_
-       perror("CDIOCREADAUDIO");
-       return -1;
-     }
-+#elif defined(__NetBSD__)
-+    scsireq_t req;
-+    int nblocks = 1;
-+
-+    memset(&req, 0, sizeof(req));
-+    req.cmd[0] = 0xbe;
-+    req.cmd[1] = 0;
-+    req.cmd[2] = (frame >> 24) & 0xff;
-+    req.cmd[3] = (frame >> 16) & 0xff;
-+    req.cmd[4] = (frame >> 8) & 0xff;
-+    req.cmd[5] = (frame >> 0) & 0xff;
-+    req.cmd[6] = (nblocks >> 16) & 0xff;
-+    req.cmd[7] = (nblocks >> 8) & 0xff;
-+    req.cmd[8] = (nblocks >> 0) & 0xff;
-+    req.cmd[9] = 0x78;
-+    req.cmdlen = 10;
-+
-+    req.datalen = nblocks * CD_RAW_FRAME_SIZE;
-+    req.databuf = data;
-+    req.timeout = 10000;
-+    req.flags = SCCMD_READ;
-+
-+    if(ioctl(fd, SCIOCCOMMAND, &req) < 0) {
-+      perror("SCIOCCOMMAND");
-+      return -1;
-+    }
-+#endif
-     
-     data += CD_RAW_FRAME_SIZE;
-     frame++;
diff --git a/multimedia/xine-lib/patches/patch-ao b/multimedia/xine-lib/patches/patch-ao
index 4b9883b8c9e..06d68025365 100644
--- a/multimedia/xine-lib/patches/patch-ao
+++ b/multimedia/xine-lib/patches/patch-ao
@@ -1,8 +1,8 @@
-$NetBSD: patch-ao,v 1.12 2007/02/07 20:04:00 drochner Exp $
+$NetBSD: patch-ao,v 1.13 2007/06/15 18:20:07 drochner Exp $
 
---- src/libw32dll/wine/Makefile.in.orig	2007-01-28 23:57:46.000000000 +0100
+--- src/libw32dll/wine/Makefile.in.orig	2007-04-10 00:25:41.000000000 +0200
 +++ src/libw32dll/wine/Makefile.in
-@@ -60,7 +60,7 @@ mkinstalldirs = $(install_sh) -d
+@@ -62,7 +62,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.12 2007/02/07 20:04:00 drochner 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
-@@ -431,6 +431,7 @@ WAND_LIBS = @WAND_LIBS@
+@@ -442,6 +442,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@
- XGETTEXT = @XGETTEXT@
+ XCBSHM_CFLAGS = @XCBSHM_CFLAGS@
diff --git a/multimedia/xine-lib/patches/patch-ap b/multimedia/xine-lib/patches/patch-ap
index 29a09d38407..201f9a826b8 100644
--- a/multimedia/xine-lib/patches/patch-ap
+++ b/multimedia/xine-lib/patches/patch-ap
@@ -1,8 +1,8 @@
-$NetBSD: patch-ap,v 1.4 2007/02/07 20:04:00 drochner Exp $
+$NetBSD: patch-ap,v 1.5 2007/06/15 18:20:07 drochner Exp $
 
---- src/dxr3/Makefile.am.orig	2006-12-30 20:54:32.000000000 +0100
+--- src/dxr3/Makefile.am.orig	2007-04-08 17:40:59.000000000 +0200
 +++ src/dxr3/Makefile.am
-@@ -18,6 +18,9 @@ endif
+@@ -16,6 +16,9 @@ endif
  if HAVE_LIBRTE
  link_rte = -lrte
  endif
@@ -10,9 +10,9 @@ $NetBSD: patch-ap,v 1.4 2007/02/07 20:04:00 drochner Exp $
 +link_xinerama = -lXinerama
 +endif
  
- lib_LTLIBRARIES = $(dxr3_modules) 
+ xineplug_LTLIBRARIES = $(dxr3_modules) 
  
-@@ -44,7 +47,7 @@ xineplug_vo_out_dxr3_la_SOURCES = \
+@@ -42,7 +45,7 @@ xineplug_vo_out_dxr3_la_SOURCES = \
  	dxr3_scr.c \
  	video_out_dxr3.c 
  
diff --git a/multimedia/xine-lib/patches/patch-av b/multimedia/xine-lib/patches/patch-av
deleted file mode 100644
index 640a2d7b329..00000000000
--- a/multimedia/xine-lib/patches/patch-av
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD: patch-av,v 1.3 2006/12/08 09:24:26 abs Exp $
-
---- src/libreal/xine_decoder.c.orig	2006-07-10 23:08:30.000000000 +0100
-+++ src/libreal/xine_decoder.c
-@@ -102,6 +102,15 @@ typedef struct {
- } rv_init_t;
- 
- 
-+#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
-+void *__ctype_b=NULL;
-+void ___brk_addr(void) {exit(0);}
-+char **__environ={NULL};
-+#undef stderr
-+FILE *stderr=NULL;
-+#endif
-+
-+
- void *__builtin_vec_new(uint32_t size);
- void __builtin_vec_delete(void *mem);
- void __pure_virtual(void);
-@@ -654,8 +663,7 @@ static void *init_class (xine_t *xine, v
-  * exported plugin catalog entry
-  */
- 
--static uint32_t supported_types[] = { BUF_VIDEO_RV20,
--                                      BUF_VIDEO_RV30,
-+static uint32_t supported_types[] = { BUF_VIDEO_RV30,
-                                       BUF_VIDEO_RV40,
-                                       0 };
- 
diff --git a/multimedia/xine-lib/patches/patch-ax b/multimedia/xine-lib/patches/patch-ax
deleted file mode 100644
index 59be6771f88..00000000000
--- a/multimedia/xine-lib/patches/patch-ax
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ax,v 1.3 2007/03/09 15:14:16 drochner Exp $
-
---- src/libw32dll/dmo/DMO_VideoDecoder.c.orig	2007-03-09 15:19:08.000000000 +0100
-+++ src/libw32dll/dmo/DMO_VideoDecoder.c
-@@ -118,6 +118,7 @@ DMO_VideoDecoder * DMO_VideoDecoder_Open
-      
-         this->iv.m_bh = (BITMAPINFOHEADER*)malloc(bihs);
-         memcpy(this->iv.m_bh, format, bihs);
-+	this->iv.m_bh->biSize = bihs;
- 
-         this->iv.m_State = STOP;
-         //this->iv.m_pFrame = 0;