4 files changed, 7 insertions, 55 deletions
diff --git a/multimedia/xine-lib/patches/patch-ag b/multimedia/xine-lib/patches/patch-ag
index 8388ae4b104..edc9d3757c4 100644
--- a/multimedia/xine-lib/patches/patch-ag
+++ b/multimedia/xine-lib/patches/patch-ag
@@ -1,8 +1,8 @@
-$NetBSD: patch-ag,v 1.18 2008/01/11 16:05:27 drochner Exp $
+$NetBSD: patch-ag,v 1.19 2009/01/20 18:30:49 drochner Exp $
 
---- configure.ac.orig	2008-01-04 19:02:22.000000000 +0100
+--- configure.ac.orig	2009-01-12 00:58:58.000000000 +0100
 +++ configure.ac
-@@ -98,7 +98,7 @@ dnl ------------------------------------
+@@ -109,7 +109,7 @@ dnl ------------------------------------
  AC_CANONICAL_HOST
  AC_CANONICAL_BUILD
  
@@ -56,7 +56,7 @@ $NetBSD: patch-ag,v 1.18 2008/01/11 16:05:27 drochner Exp $
     fi
  else
    ac_have_xinerama=no
-@@ -1422,8 +1424,21 @@ AC_ARG_ENABLE([oss],
+@@ -1427,8 +1429,21 @@ AC_ARG_ENABLE([oss],
  	AS_HELP_STRING([--disable-oss], [Do not build OSS audio output support]))
  
  if test "x$enable_oss" != "xno"; then
@@ -78,7 +78,7 @@ $NetBSD: patch-ag,v 1.18 2008/01/11 16:05:27 drochner Exp $
       #ifdef HAVE_SYS_SOUNDCARD_H
       # include <sys/soundcard.h>
       #endif
-@@ -1439,6 +1454,7 @@ if test "x$enable_oss" != "xno"; then
+@@ -1446,6 +1461,7 @@ if test "x$enable_oss" != "xno"; then
  fi
  
  AM_CONDITIONAL(HAVE_OSS, test "x$have_ossaudio" = "xyes")
@@ -86,7 +86,7 @@ $NetBSD: patch-ag,v 1.18 2008/01/11 16:05:27 drochner Exp $
  
  
  dnl ---------------------------------------------
-@@ -1548,9 +1564,10 @@ AC_ARG_ENABLE([gnomevfs],
+@@ -1555,9 +1571,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.18 2008/01/11 16:05:27 drochner Exp $
    AC_SUBST(GNOME_VFS_CFLAGS)
    AC_SUBST(GNOME_VFS_LIBS)
    if test "x$no_gnome_vfs" != "xyes"; then
-@@ -1885,7 +1902,7 @@ int has_timeout=sizeof(test.timeout);]])
+@@ -1892,7 +1909,7 @@ int has_timeout=sizeof(test.timeout);]])
       	    AC_DEFINE([HAVE_WIN32_CDROM], [1], 
                        [Define 1 if you have MinGW CD-ROM support])
  	 ;;
@@ -109,12 +109,3 @@ $NetBSD: patch-ag,v 1.18 2008/01/11 16:05:27 drochner Exp $
       	    AC_DEFINE([HAVE_FREEBSD_CDROM], [1], 
                        [Define 1 if you have FreeBSD CD-ROM support])
  	 ;;
-@@ -2591,7 +2608,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-av b/multimedia/xine-lib/patches/patch-av
deleted file mode 100644
index 874f01da1bf..00000000000
--- a/multimedia/xine-lib/patches/patch-av
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-av,v 1.8 2008/06/21 15:45:16 drochner Exp $
-
---- src/libspudvb/Makefile.in.orig	2008-06-15 01:15:55.000000000 +0200
-+++ src/libspudvb/Makefile.in
-@@ -242,7 +242,7 @@ MSGFMT = @MSGFMT@
- MSGMERGE = @MSGMERGE@
- NET_LIBS = @NET_LIBS@
- NMEDIT = @NMEDIT@
--NOUNDEF = @NOUNDEF@
-+#NOUNDEF = @NOUNDEF@
- OBJC = @OBJC@
- OBJCDEPMODE = @OBJCDEPMODE@
- OBJCFLAGS = @OBJCFLAGS@
diff --git a/multimedia/xine-lib/patches/patch-ax b/multimedia/xine-lib/patches/patch-ax
deleted file mode 100644
index 84cbd865a59..00000000000
--- a/multimedia/xine-lib/patches/patch-ax
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ax,v 1.7 2008/04/15 19:25:28 drochner Exp $
-
---- src/libxineadec/Makefile.in.orig	2008-04-15 19:30:36.000000000 +0200
-+++ src/libxineadec/Makefile.in
-@@ -482,7 +482,7 @@ xineplug_decode_lpcm_la_SOURCES = xine_l
- xineplug_decode_lpcm_la_CFLAGS = $(VISIBILITY_FLAG)
- xineplug_decode_lpcm_la_LIBADD = $(XINE_LIB)
- xineplug_decode_vorbis_la_SOURCES = xine_vorbis_decoder.c
--xineplug_decode_vorbis_la_LIBADD = $(XINE_LIB) $(VORBIS_LIBS) $(OGG_LIBS)
-+xineplug_decode_vorbis_la_LIBADD = $(XINE_LIB) $(VORBIS_LIBS) $(OGG_LIBS) $(LTLIBINTL)
- xineplug_decode_vorbis_la_CFLAGS = $(VISIBILITY_FLAG) $(VORBIS_CFLAGS)
- xineplug_decode_speex_la_SOURCES = xine_speex_decoder.c
- xineplug_decode_speex_la_LIBADD = $(XINE_LIB) $(SPEEX_LIBS)
diff --git a/multimedia/xine-lib/patches/patch-fc b/multimedia/xine-lib/patches/patch-fc
deleted file mode 100644
index 2890893e565..00000000000
--- a/multimedia/xine-lib/patches/patch-fc
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-fc,v 1.1 2008/08/27 17:16:44 drochner Exp $
-
---- src/xine-engine/buffer.h.orig	2008-07-16 23:01:56.000000000 +0200
-+++ src/xine-engine/buffer.h
-@@ -676,7 +676,7 @@ void _x_bmiheader_le2me( xine_bmiheader 
- /* convert xine_waveformatex struct from little endian */
- void _x_waveformatex_le2me( xine_waveformatex *wavex ) XINE_PROTECTED;
- 
--static inline _x_is_fourcc(void *ptr, void *tag) {
-+static __inline int _x_is_fourcc(void *ptr, void *tag) {
-   return memcmp(ptr, tag, 4) == 0;
- }
-