Update to 1.2.6:

xine-lib (1.2.6) 2014-07-06
  * Add libmmal video output plugin for Raspberry Pi.
  * Add libmmal HW video decoder plugin for Raspberry Pi.
  * Add overlay colormatrix support.
  * Add "sqare monitor pixels" config option.
  * Add VAAPI colormatrix and fullrange video support.
  * Add "radeonhd" XV colormatrix support.
  * Add Opus audio support.
  * Update german translation.
  * Optimize OpenGL2 video out.
  * Optimize raw RGB video decoder.
  * Fix multithread ffmpeg video decoding.
  * Fix/optimize DVB subtitles.
  * Fix external text subtitles.
  * BSD build fixes.
  * Clang build fixes.
  * Build optimization fixes (aliasing).
  * AVformat demux build fix.
  * More safety on memory allocation failure.
  * Fix detection of and compilation with libcaca 0.99 beta 19.

17 files changed, 14 insertions, 312 deletions

diff --git a/multimedia/xine-lib/Makefile b/multimedia/xine-lib/Makefile
index 4613cfa0e1e..0a5539e604b 100644
--- a/multimedia/xine-lib/Makefile
+++ b/multimedia/xine-lib/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.134 2014/12/18 23:26:06 wiz Exp $
+# $NetBSD: Makefile,v 1.135 2014/12/30 13:34:59 wiz Exp $
 
 .include "Makefile.common"
 
 COMMENT=		Multimedia player library
-PKGREVISION=		8
 
 CONFLICTS+=		xine-xcb-[0-9]*
 
diff --git a/multimedia/xine-lib/Makefile.common b/multimedia/xine-lib/Makefile.common
index 4e96d7495e8..d122d648f98 100644
--- a/multimedia/xine-lib/Makefile.common
+++ b/multimedia/xine-lib/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.83 2014/08/13 08:23:50 wiz Exp $
+# $NetBSD: Makefile.common,v 1.84 2014/12/30 13:34:59 wiz Exp $
 #
 # used by audio/xine-alsa/Makefile
 # used by audio/xine-esound/Makefile
@@ -6,8 +6,8 @@
 # used by multimedia/xine-v4l/Makefile
 # used by multimedia/xine-v4l2/Makefile
 
-DISTNAME=		xine-lib-1.2.5
-XINE_PKGNAME=		xine-lib-1.2.5
+DISTNAME=		xine-lib-1.2.6
+XINE_PKGNAME=		xine-lib-1.2.6
 PKGNAME?=		${XINE_PKGNAME}
 CATEGORIES?=		multimedia
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=xine/}
@@ -18,7 +18,7 @@ HOMEPAGE=		http://xinehq.de/
 
 MAKE_JOBS_SAFE=		no
 
-XINE_MOD_DIR_VER=	2.4
+XINE_MOD_DIR_VER=	2.5
 PLIST_SUBST+=		XINE_MOD_DIR_VER=${XINE_MOD_DIR_VER:Q}
 
 DISTINFO_FILE=		${.CURDIR}/../../multimedia/xine-lib/distinfo
diff --git a/multimedia/xine-lib/distinfo b/multimedia/xine-lib/distinfo
index 97d25afdfb9..e64d529ac9a 100644
--- a/multimedia/xine-lib/distinfo
+++ b/multimedia/xine-lib/distinfo
@@ -1,37 +1,25 @@
-$NetBSD: distinfo,v 1.97 2014/06/30 13:41:00 jperkin Exp $
+$NetBSD: distinfo,v 1.98 2014/12/30 13:34:59 wiz Exp $
 
-SHA1 (xine-lib-1.2.5.tar.xz) = c7ef38fa8ee301e44ba28d6549220546d02d053d
-RMD160 (xine-lib-1.2.5.tar.xz) = bb9c3a06666f454e8dfda85471eb6605e2dcb685
-Size (xine-lib-1.2.5.tar.xz) = 5007012 bytes
-SHA1 (patch-ag) = a0edf812dd3fa4baf273950430fa47b7579ae53e
-SHA1 (patch-aj) = df1759c9aaedc00fe55ea03aa5a0800efd68b02d
-SHA1 (patch-at) = 9d83524bef9dacdb889b7d828053a3fef16a1689
+SHA1 (xine-lib-1.2.6.tar.xz) = ac929eef2b7bf5c27699bbed612b953a01fccba5
+RMD160 (xine-lib-1.2.6.tar.xz) = 05edcd9a36e93d2fc9d1bf13cae3b32d4bd996da
+Size (xine-lib-1.2.6.tar.xz) = 5020964 bytes
+SHA1 (patch-ag) = 108a626575cf4c9d964822cc879cf6868e0bbe24
 SHA1 (patch-cb) = 708ee946dd1708a40baef5ac193a46dc22bff8b5
-SHA1 (patch-cd) = 7cdb3c7b09ccb2ae1dd9245f0ab0b88ad753d7f1
 SHA1 (patch-fa) = 9312a3bab4ae8482a208948277f1d11fb7eaaf8c
 SHA1 (patch-include_xine_post.h) = 30629bff9486bf6b7ca889189cfad406eb242674
-SHA1 (patch-input_dvb.c) = c18aa1743f677f73b2a743d485952c171a346179
-SHA1 (patch-na) = a02ae3bd178d34fdc1d584dcde992b8c328a3ea3
-SHA1 (patch-src-demuxers-demux_qt.c) = 19d9999cd2ff3e42cb3c56121e35cf795abcbd4b
 SHA1 (patch-src-post-audio-stretch.c) = 6f950bcd47fdf68b691744dc105f59f821748ce1
 SHA1 (patch-src-post-audio-upmix.c) = 70ca6babfa9a7add0ac70a6024fcff429e1bc49d
 SHA1 (patch-src-post-audio-upmix_mono.c) = 2c70ded10118cbeed5be3c948886f7311ddb7bbd
 SHA1 (patch-src-post-audio-volnorm.c) = b110542ae4c21762cf369a4cf2b6c66343c3b761
-SHA1 (patch-src-post-deinterlace-plugins-greedy2frame.c) = bc9d23257043d239ded2d7a28de74ac8a23c6148
 SHA1 (patch-src-post-deinterlace-xine_plugin.c) = 536365d479b5cd0354365a53db4f19f8404788ac
-SHA1 (patch-src-post-goom-mmx.h) = dfcb3269de02849ee3875c89438338edcdd7faa6
 SHA1 (patch-src-post-mosaico-mosaico.c) = 04f21603055b1e8e7490ba5d6e006ca5a9b683a3
 SHA1 (patch-src-post-mosaico-switch.c) = ff46e13acfbcaf0167943b536b12cb95ec7591d4
 SHA1 (patch-src-post-planar-boxblur.c) = 191ce5819fce39a247adaefe07e3302870c3d1c3
 SHA1 (patch-src-post-planar-denoise3d.c) = e140ff0b7867fd850099ff073f67201b4649dcad
 SHA1 (patch-src-post-planar-eq.c) = 2c81fdb839456affa6882577479cea7934121619
-SHA1 (patch-src-post-planar-eq2.c) = d55acfe532088394c18f6a4be97f98d5c7fd3267
+SHA1 (patch-src-post-planar-eq2.c) = 7f33e001294e3933a7aad8ed817b678fa4379924
 SHA1 (patch-src-post-planar-expand.c) = 9d9ec1f5619f9a3d832bcace54d23011371f2067
 SHA1 (patch-src-post-planar-noise.c) = 2deabf5d80e2c45959a4f89bbf2528f7e1c9e1f5
 SHA1 (patch-src-post-planar-pp.c) = f5bea421785132c5f1422ae9f0d468974fb0ae5d
 SHA1 (patch-src-post-planar-unsharp.c) = 9f29c624f96a91760df960343096247d8c09c58d
-SHA1 (patch-src_audio__out_Makefile.am) = 6c5ef1716e5874de0b43b794e2e4b86da922f029
-SHA1 (patch-src_libw32dll_wine_Makefile.am) = e3161d50449c7b8cc8b7739b3ac15a6160d28101
-SHA1 (patch-src_libw32dll_wine_registry.c) = a90a9bb7c178e68c0161a8cbadcda540e19ed0b4
-SHA1 (patch-src_post_goom_convolve_fx.c) = 25fd003e2c82fa26cfe66da0ad73c766cae0eb27
 SHA1 (patch-src_xine-engine_Makefile.am) = e44ca141304e102faa40763ef083e8c1f60089e7
diff --git a/multimedia/xine-lib/patches/patch-ag b/multimedia/xine-lib/patches/patch-ag
index 9368cd02914..c6aaf2b7abe 100644
--- a/multimedia/xine-lib/patches/patch-ag
+++ b/multimedia/xine-lib/patches/patch-ag
@@ -1,12 +1,8 @@
-$NetBSD: patch-ag,v 1.27 2014/05/18 15:38:18 wiz Exp $
+$NetBSD: patch-ag,v 1.28 2014/12/30 13:34:59 wiz Exp $
 
 1. chunk:
 https://bugs.xine-project.org/show_bug.cgi?id=536
-2. chunk:
-https://bugs.xine-project.org/show_bug.cgi?id=532
-3. chunk:
-https://bugs.xine-project.org/show_bug.cgi?id=526
-4. chunk
+2. chunk
 https://bugs.xine-project.org/show_bug.cgi?id=531
 
 --- configure.ac.orig	2012-06-09 17:30:18.000000000 +0000
@@ -20,28 +16,6 @@ https://bugs.xine-project.org/show_bug.cgi?id=531
  AC_CONFIG_SRCDIR([src/xine-engine/xine.c])
  AC_CONFIG_MACRO_DIR([m4])
  AC_CONFIG_LIBOBJ_DIR([lib])
-@@ -272,6 +272,10 @@
- AC_CHECK_LIB([resolv], [hstrerror],     [NET_LIBS="-lresolv $NET_LIBS"])
- AC_SUBST(NET_LIBS)
- 
-+WINE_LIBS=""
-+AC_CHECK_LIB(i386, i386_set_ldt, WINE_LIBS="-li386 $WINE_LIBS",)
-+AC_SUBST(WINE_LIBS)
-+
- AC_CHECK_LIB([rt], [clock_getres],
-              [RT_LIBS="-lrt"
-               AC_DEFINE(HAVE_POSIX_TIMERS, 1, [Define this if you have POSIX timers.])], 
-@@ -361,6 +365,10 @@
- esac
- AC_CHECK_HEADERS([sys/dvdio.h sys/cdio.h sys/scsiio.h])
- 
-+dnl ----------------------------------------------
-+dnl Check for NetBSD DTV headers
-+dnl ----------------------------------------------
-+AC_CHECK_HEADERS([dev/dtv/dtvio.h])
- 
- dnl ----------------
- dnl checks for types
 @@ -905,6 +913,7 @@
  
  AC_FUNC_FSEEKO
diff --git a/multimedia/xine-lib/patches/patch-aj b/multimedia/xine-lib/patches/patch-aj
deleted file mode 100644
index 58a7164063c..00000000000
--- a/multimedia/xine-lib/patches/patch-aj
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-aj,v 1.10 2014/05/18 15:38:18 wiz Exp $
-
-https://bugs.xine-project.org/show_bug.cgi?id=521
-
---- src/input/libdvdnav/bswap.h.orig	2005-10-31 21:49:47.000000000 -0800
-+++ src/input/libdvdnav/bswap.h	2005-10-31 21:53:43.000000000 -0800
-@@ -53,7 +53,7 @@
- #define B2N_32(x) x = swap32(x)
- #define B2N_64(x) x = swap64(x)
- 
--#elif defined(__FreeBSD__) && __FreeBSD_version >= 470000
-+#elif defined(__DragonFly__) || (defined(__FreeBSD__) && __FreeBSD_version >= 470000)
- #include <sys/endian.h>
- #define B2N_16(x) x = be16toh(x)
- #define B2N_32(x) x = be32toh(x)
diff --git a/multimedia/xine-lib/patches/patch-at b/multimedia/xine-lib/patches/patch-at
deleted file mode 100644
index 569c55f95cb..00000000000
--- a/multimedia/xine-lib/patches/patch-at
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-at,v 1.8 2014/05/18 15:38:18 wiz Exp $
-
-https://bugs.xine-project.org/show_bug.cgi?id=535
-
---- src/xine-utils/memcpy.c.orig	2012-02-05 15:31:10.000000000 +0000
-+++ src/xine-utils/memcpy.c
-@@ -414,7 +414,7 @@ static uint64_t memcpy_timing[sizeof(mem
- static int64_t _x_gettime(void)
- {
-   struct timespec tm;
--  return (clock_gettime (CLOCK_THREAD_CPUTIME_ID, &tm) == -1)
-+  return (clock_gettime (CLOCK_MONOTONIC, &tm) == -1)
-        ? times (NULL)
-        : (int64_t)tm.tv_sec * 1e9 + tm.tv_nsec;
- }
diff --git a/multimedia/xine-lib/patches/patch-cd b/multimedia/xine-lib/patches/patch-cd
deleted file mode 100644
index 3ab4f84dd83..00000000000
--- a/multimedia/xine-lib/patches/patch-cd
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-cd,v 1.3 2014/05/18 15:38:18 wiz Exp $
-
-https://bugs.xine-project.org/show_bug.cgi?id=534
-
---- contrib/libdha/sysdep/pci_freebsd.c.orig	2005-07-10 21:02:09.000000000 +0000
-+++ contrib/libdha/sysdep/pci_freebsd.c
-@@ -8,7 +8,7 @@
- /* machine/console.h seems to be outdated by recent FreeBSD *
-  * however pcvt_ioctl.h seems to exist for very long time   */
- /* #include <machine/console.h>*/
--#include <machine/pcvt_ioctl.h>
-+#include <sys/kbio.h>
- #ifndef GCCUSESGAS
- #define GCCUSESGAS
- #endif
diff --git a/multimedia/xine-lib/patches/patch-input_dvb.c b/multimedia/xine-lib/patches/patch-input_dvb.c
deleted file mode 100644
index 1d5e250550d..00000000000
--- a/multimedia/xine-lib/patches/patch-input_dvb.c
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-input_dvb.c,v 1.3 2014/05/18 15:38:18 wiz Exp $
-
-https://bugs.xine-project.org/show_bug.cgi?id=526
-
---- src/input/input_dvb.c.orig	2012-02-04 00:41:43.000000000 +0000
-+++ src/input/input_dvb.c
-@@ -109,8 +109,12 @@
- /* XDG */
- #include <basedir.h>
- 
-+#ifdef HAVE_DEV_DTV_DTVIO_H
-+#include <dev/dtv/dtvio.h>
-+#else
- #include <linux/dvb/dmx.h>
- #include <linux/dvb/frontend.h>
-+#endif
- 
- #define LOG_MODULE "input_dvb"
- #define LOG_VERBOSE
diff --git a/multimedia/xine-lib/patches/patch-na b/multimedia/xine-lib/patches/patch-na
deleted file mode 100644
index d8438c43594..00000000000
--- a/multimedia/xine-lib/patches/patch-na
+++ /dev/null
@@ -1,38 +0,0 @@
-$NetBSD: patch-na,v 1.3 2014/05/19 12:43:33 wiz Exp $
-
-https://bugs.xine-project.org/show_bug.cgi?id=522
-
---- m4/audio_out.m4.orig	2012-02-05 12:50:15.000000000 +0000
-+++ m4/audio_out.m4
-@@ -151,9 +151,22 @@ AC_DEFUN([XINE_AUDIO_OUT_PLUGINS], [
-     dnl OSS (Open Sound System)
-     XINE_ARG_ENABLE([oss], [Enable OSS (Open Sound System) support])
-     if test x"$enable_oss" != x"no"; then
-+
-+   case "$host" in
-+     *-*-netbsd*)
-+       OSS_LIBS="-lossaudio"
-+       ;;
-+     *)
-+       OSS_LIBS=""
-+       ;;
-+   esac
-+
-         AC_CHECK_HEADERS([sys/soundcard.h machine/soundcard.h soundcard.h], [break])
-         AC_CHECK_DECL([SNDCTL_DSP_SETFRAGMENT], [have_oss=yes], [have_oss=no],
--                      [#ifdef HAVE_SYS_SOUNDCARD_H
-+                      [#ifdef __NetBSD__
-+		      #include <sys/ioctl.h>
-+		      #endif
-+		      #ifdef HAVE_SYS_SOUNDCARD_H
-                        # include <sys/soundcard.h>
-                        #endif
-                        #ifdef HAVE_MACHINE_SOUNDCARD_H
-@@ -167,6 +180,7 @@ AC_DEFUN([XINE_AUDIO_OUT_PLUGINS], [
-         fi
-     fi
-     AM_CONDITIONAL([ENABLE_OSS], [test x"$have_oss" = x"yes"])
-+    AC_SUBST(OSS_LIBS)
- 
- 
-     dnl PulseAudio
diff --git a/multimedia/xine-lib/patches/patch-src-demuxers-demux_qt.c b/multimedia/xine-lib/patches/patch-src-demuxers-demux_qt.c
deleted file mode 100644
index e153924b6f4..00000000000
--- a/multimedia/xine-lib/patches/patch-src-demuxers-demux_qt.c
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-src-demuxers-demux_qt.c,v 1.3 2014/05/18 15:38:18 wiz Exp $
-
-https://bugs.xine-project.org/show_bug.cgi?id=527
-
---- src/demuxers/demux_qt.c.orig	2014-02-26 15:49:10.000000000 +0000
-+++ src/demuxers/demux_qt.c
-@@ -151,7 +151,7 @@ typedef unsigned int qt_atom;
- #define TRUN_ATOM QT_ATOM('t', 'r', 'u', 'n')
- 
- /* placeholder for cutting and pasting
--#define _ATOM QT_ATOM('', '', '', '')
-+//#define _ATOM QT_ATOM('', '', '', '')
- */
- 
- #define ATOM_PREAMBLE_SIZE 8
diff --git a/multimedia/xine-lib/patches/patch-src-post-deinterlace-plugins-greedy2frame.c b/multimedia/xine-lib/patches/patch-src-post-deinterlace-plugins-greedy2frame.c
deleted file mode 100644
index eed464294af..00000000000
--- a/multimedia/xine-lib/patches/patch-src-post-deinterlace-plugins-greedy2frame.c
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-src-post-deinterlace-plugins-greedy2frame.c,v 1.3 2014/06/30 13:41:00 jperkin Exp $
-
-https://bugs.xine-project.org/show_bug.cgi?id=528
-
---- src/post/deinterlace/plugins/greedy2frame.c.orig	2012-05-26 21:49:59.000000000 +0100
-+++ src/post/deinterlace/plugins/greedy2frame.c	2012-08-15 08:08:27.000000000 +0100
-@@ -59,6 +59,8 @@
-                                     int bottom_field, int second_field, int width, int height )
- 
- {
-+#if (!defined(__APPLE__) && defined(ARCH_X86)) || defined(ARCH_X86_64)
-+
-     if (xine_mm_accel() & MM_ACCEL_X86_SSE2) {
-         if (((uintptr_t)output & 15) || (outstride & 15) ||
-             width & 7 ||
-@@ -82,6 +84,7 @@
-                                        bottom_field, second_field, width, height );
-         /* could fall back to 3dnow/mmx here too */
-     }
-+#endif /*ARCH_X86 */
- }
- 
- 
diff --git a/multimedia/xine-lib/patches/patch-src-post-goom-mmx.h b/multimedia/xine-lib/patches/patch-src-post-goom-mmx.h
deleted file mode 100644
index 3c5482e7e29..00000000000
--- a/multimedia/xine-lib/patches/patch-src-post-goom-mmx.h
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-src-post-goom-mmx.h,v 1.2 2014/05/18 15:38:18 wiz Exp $
-
-https://bugs.xine-project.org/show_bug.cgi?id=529
-
---- src/post/goom/mmx.h.orig	2011-08-30 13:41:26.000000000 +0000
-+++ src/post/goom/mmx.h
-@@ -728,8 +728,7 @@ void zoom_filter_xmmx (int prevX, int pr
- 
- #else
- 
--#define	emms() __asm__ __volatile__ ("emms"::: \
--                      "st(1)","st(2)","st(3)","st(4)","st(5)","st(6)","st(7)")
-+#define	emms() __asm__ volatile ("emms" ::: "memory");
- 
- #endif
- 
diff --git a/multimedia/xine-lib/patches/patch-src-post-planar-eq2.c b/multimedia/xine-lib/patches/patch-src-post-planar-eq2.c
index 77724b4122f..b50c218857e 100644
--- a/multimedia/xine-lib/patches/patch-src-post-planar-eq2.c
+++ b/multimedia/xine-lib/patches/patch-src-post-planar-eq2.c
@@ -1,46 +1,9 @@
-$NetBSD: patch-src-post-planar-eq2.c,v 1.4 2014/05/18 15:38:18 wiz Exp $
+$NetBSD: patch-src-post-planar-eq2.c,v 1.5 2014/12/30 13:34:59 wiz Exp $
 
-First half:
-In affine_1d_MMX(), move the initialisation of %mm3 and %mm4 registers
-into a separate asm statement, to give the compiler more freedom
-for register allocation.  Fixes a problem with gcc-4.5.4 on NetBSD/i386
-in which gcc complained:
-
-eq2.c: In function 'affine_1d_MMX':
-eq2.c:128:5: error: can't find a register in class 'GENERAL_REGS' while reloading 'asm'
-eq2.c:128:5: error: 'asm' operand has impossible constraints
-
-https://bugs.xine-project.org/show_bug.cgi?id=525
-
-Last chunk:
 https://bugs.xine-project.org/show_bug.cgi?id=524
 
 --- src/post/planar/eq2.c.orig	2012-02-05 19:17:02.000000000 +0000
 +++ src/post/planar/eq2.c
-@@ -126,8 +126,12 @@ void affine_1d_MMX (eq2_param_t *par, un
- 
-   while (h-- > 0) {
-     asm volatile (
--      "movq (%5), %%mm3 \n\t"
--      "movq (%6), %%mm4 \n\t"
-+      "movq (%0), %%mm3 \n\t"
-+      "movq (%1), %%mm4 \n\t"
-+      :
-+      : "r" (brvec), "r" (contvec)
-+    );
-+    asm volatile (
-       "pxor %%mm0, %%mm0 \n\t"
-       "movl %4, %%eax\n\t"
-       ASMALIGN(4)
-@@ -149,7 +153,7 @@ void affine_1d_MMX (eq2_param_t *par, un
-       "decl %%eax \n\t"
-       "jnz 1b \n\t"
-       : "=r" (src), "=r" (dst)
--      : "0" (src), "1" (dst), "r" (w >> 3), "r" (brvec), "r" (contvec)
-+      : "0" (src), "1" (dst), "r" (w >> 3)
-       : "%eax"
-     );
- 
 @@ -288,19 +292,26 @@ typedef struct eq2_parameters_s {
   * description of params struct
   */
diff --git a/multimedia/xine-lib/patches/patch-src_audio__out_Makefile.am b/multimedia/xine-lib/patches/patch-src_audio__out_Makefile.am
deleted file mode 100644
index d06611d0a33..00000000000
--- a/multimedia/xine-lib/patches/patch-src_audio__out_Makefile.am
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-src_audio__out_Makefile.am,v 1.3 2014/05/18 15:38:18 wiz Exp $
-
-https://bugs.xine-project.org/show_bug.cgi?id=522
-
---- src/audio_out/Makefile.am.orig	2012-02-04 00:41:43.000000000 +0000
-+++ src/audio_out/Makefile.am
-@@ -81,7 +81,7 @@ xineplug_ao_out_file_la_SOURCES = audio_
- xineplug_ao_out_file_la_LIBADD = $(XINE_LIB) $(LTLIBINTL)
- 
- xineplug_ao_out_oss_la_SOURCES = audio_oss_out.c
--xineplug_ao_out_oss_la_LIBADD = $(XINE_LIB) $(LTLIBINTL)
-+xineplug_ao_out_oss_la_LIBADD = $(XINE_LIB) $(LTLIBINTL) $(OSS_LIBS)
- 
- xineplug_ao_out_alsa_la_SOURCES = audio_alsa_out.c
- xineplug_ao_out_alsa_la_LIBADD = $(XINE_LIB) $(ALSA_LIBS) $(PTHREAD_LIBS) $(LTLIBINTL)
diff --git a/multimedia/xine-lib/patches/patch-src_libw32dll_wine_Makefile.am b/multimedia/xine-lib/patches/patch-src_libw32dll_wine_Makefile.am
deleted file mode 100644
index be8a039ec94..00000000000
--- a/multimedia/xine-lib/patches/patch-src_libw32dll_wine_Makefile.am
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-src_libw32dll_wine_Makefile.am,v 1.3 2014/05/18 15:38:18 wiz Exp $
-
-https://bugs.xine-project.org/show_bug.cgi?id=532
-
---- src/libw32dll/wine/Makefile.am.orig	2012-02-04 00:41:43.000000000 +0000
-+++ src/libw32dll/wine/Makefile.am
-@@ -51,6 +51,8 @@ noinst_HEADERS = \
- 
- noinst_LTLIBRARIES = libwine.la
- 
-+libwine_la_LIBADD = ${WINE_LIBS}
-+
- libwine_la_SOURCES = \
- 	afl.c \
- 	driver.c \
diff --git a/multimedia/xine-lib/patches/patch-src_libw32dll_wine_registry.c b/multimedia/xine-lib/patches/patch-src_libw32dll_wine_registry.c
deleted file mode 100644
index fe52be65cb9..00000000000
--- a/multimedia/xine-lib/patches/patch-src_libw32dll_wine_registry.c
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-src_libw32dll_wine_registry.c,v 1.2 2014/05/18 15:38:18 wiz Exp $
-
-https://bugs.xine-project.org/show_bug.cgi?id=521
-
---- src/libw32dll/wine/registry.c.orig	2012-02-04 00:41:43.000000000 +0000
-+++ src/libw32dll/wine/registry.c
-@@ -22,6 +22,10 @@
- #include <basedir.h>
- #endif
- 
-+#ifdef __DragonFly__
-+#include <sys/stat.h>
-+#endif
-+
- //#undef TRACE
- //#define TRACE printf
- 
diff --git a/multimedia/xine-lib/patches/patch-src_post_goom_convolve_fx.c b/multimedia/xine-lib/patches/patch-src_post_goom_convolve_fx.c
deleted file mode 100644
index 2e08126f6aa..00000000000
--- a/multimedia/xine-lib/patches/patch-src_post_goom_convolve_fx.c
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-src_post_goom_convolve_fx.c,v 1.2 2014/05/18 15:38:18 wiz Exp $
-
-Solaris cannot handle this MMX section, failing with:
-
- error: can't find a register in class GENERAL_REGS while reloading 'asm'.
-
-https://bugs.xine-project.org/show_bug.cgi?id=530
-
---- src/post/goom/convolve_fx.c.orig	2012-09-20 15:19:11.848384461 +0000
-+++ src/post/goom/convolve_fx.c	2012-09-20 15:19:24.654150136 +0000
-@@ -151,7 +151,7 @@
-     ytex = yprime + yi + CONV_MOTIF_W * 0x10000 / 2;
-     yprime += c;
- 
--#if defined(HAVE_MMX) && ! defined(ARCH_X86_64)
-+#if defined(HAVE_MMX) && ! defined(ARCH_X86_64) && !defined(__sun)
- /* This code uses 32-bit registers eax,ecx,esi */
-     __asm__ __volatile__
-       ("\n\t pxor  %%mm7,  %%mm7"  /* mm7 = 0   */