xine-lib: update to 1.2.9

2018-01-11: Release
xine-lib 1.2.9
 Changes include new video single step feature, keyframe index and x32
 support. Optimizations in xine engine core functionality, resulting in
 ex. faster seeking and smaller CPU usage. Small fixes and optimizations
 all around the codebase.

2017-02-21: Release
xine-lib 1.2.8
 Lot of changes since 1.2.6. Support for modern codecs, hardware and
 software. Small fixes and optimizations all around the codebase.

 OpenGL 2.0, Xv and VAAPI fixes. H.265 hardware decoding support (VAAPI).
 Hardware overlay support with Raspbery Pi.

 Support for recent ffmpeg versions. Deep color support (9/10bit) with
 ffmpeg. Multithreaded decoding fixes.

 Audio channel mixing and gain control improvements (ffmpeg, faad), AAC
 LATM support with faad, DVB AAC compatibility fixes. "Time Domain Audio
 Analyzer" Visualization Post Plugin.

 Auto recover from temporary DVB signal loss. Improved Matroska
 compatibility (TrueHD and PCM sound, HDMV/Text subtitles, compressed
 PGS subtitles). Qt fixes, support for low framerate mp4 and H.265 in mp4.
 mp3 compatibility fixes.

15 files changed, 90 insertions, 237 deletions

diff --git a/multimedia/xine-lib/Makefile b/multimedia/xine-lib/Makefile
index 3d972504902..4c507deb440 100644
--- a/multimedia/xine-lib/Makefile
+++ b/multimedia/xine-lib/Makefile
@@ -1,6 +1,5 @@
-# $NetBSD: Makefile,v 1.150 2018/10/09 15:15:20 abs Exp $
+# $NetBSD: Makefile,v 1.151 2018/11/13 11:10:41 markd Exp $
 
-PKGREVISION= 13
 .include "Makefile.common"
 
 COMMENT=		Multimedia player library
diff --git a/multimedia/xine-lib/Makefile.common b/multimedia/xine-lib/Makefile.common
index 86bea333d63..a957fa156c0 100644
--- a/multimedia/xine-lib/Makefile.common
+++ b/multimedia/xine-lib/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.85 2016/09/25 20:54:11 wiz Exp $
+# $NetBSD: Makefile.common,v 1.86 2018/11/13 11:10:41 markd 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.6
-XINE_PKGNAME=		xine-lib-1.2.6
+DISTNAME=		xine-lib-1.2.9
+XINE_PKGNAME=		xine-lib-1.2.9
 PKGNAME?=		${XINE_PKGNAME}
 CATEGORIES?=		multimedia
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=xine/}
@@ -18,7 +18,7 @@ HOMEPAGE=		https://www.xine-project.org/
 
 MAKE_JOBS_SAFE=		no
 
-XINE_MOD_DIR_VER=	2.5
+XINE_MOD_DIR_VER=	2.7
 PLIST_SUBST+=		XINE_MOD_DIR_VER=${XINE_MOD_DIR_VER:Q}
 
 DISTINFO_FILE=		${.CURDIR}/../../multimedia/xine-lib/distinfo
@@ -76,6 +76,6 @@ pre-configure:
 
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
-.include "../../multimedia/ffmpeg2/buildlink3.mk"
+.include "../../multimedia/ffmpeg3/buildlink3.mk"
 .include "../../mk/oss.buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
diff --git a/multimedia/xine-lib/PLIST.Linux b/multimedia/xine-lib/PLIST.Linux
index a0da0ddfa76..04ca37f8fa3 100644
--- a/multimedia/xine-lib/PLIST.Linux
+++ b/multimedia/xine-lib/PLIST.Linux
@@ -1,10 +1,14 @@
-@comment $NetBSD: PLIST.Linux,v 1.16 2012/04/26 10:34:41 sbd Exp $
+@comment $NetBSD: PLIST.Linux,v 1.17 2018/11/13 11:10:41 markd Exp $
 lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_ao_out_oss.a
 lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_ao_out_oss.so
 lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_decode_dxr3_spu.a
 lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_decode_dxr3_spu.so
 lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_decode_dxr3_video.a
 lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_decode_dxr3_video.so
+lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_decode_vdpau.a
+lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_decode_vdpau.so
+lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_flac.a
+lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_flac.so
 lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_inp_dvb.a
 lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_inp_dvb.so
 lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_inp_vcdo.a
@@ -13,3 +17,7 @@ lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_vo_out_dxr3.a
 lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_vo_out_dxr3.so
 lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_vo_out_fb.a
 lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_vo_out_fb.so
+lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_vo_out_vaapi.a
+lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_vo_out_vaapi.so
+lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_vo_out_vdpau.a
+lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_vo_out_vdpau.so
diff --git a/multimedia/xine-lib/PLIST.common b/multimedia/xine-lib/PLIST.common
index d860bd46028..ca8391ca21b 100644
--- a/multimedia/xine-lib/PLIST.common
+++ b/multimedia/xine-lib/PLIST.common
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.common,v 1.39 2016/04/19 13:48:31 jperkin Exp $
+@comment $NetBSD: PLIST.common,v 1.40 2018/11/13 11:10:41 markd Exp $
 bin/xine-config
 bin/xine-list-1.2
 include/xine.h
@@ -60,14 +60,8 @@ ${PLIST.xv}lib/xine/plugins/${XINE_MOD_DIR_VER}/post/xineplug_post_tvtime.a
 ${PLIST.xv}lib/xine/plugins/${XINE_MOD_DIR_VER}/post/xineplug_post_tvtime.so
 lib/xine/plugins/${XINE_MOD_DIR_VER}/post/xineplug_post_visualizations.a
 lib/xine/plugins/${XINE_MOD_DIR_VER}/post/xineplug_post_visualizations.so
-lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_ao_out_file.a
-lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_ao_out_file.so
-lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_ao_out_none.a
-lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_ao_out_none.so
 lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_decode_a52.a
 lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_decode_a52.so
-lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_decode_bitplane.a
-lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_decode_bitplane.so
 ${PLIST.dts}lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_decode_dts.a
 ${PLIST.dts}lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_decode_dts.so
 lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_decode_dvaudio.a
@@ -90,8 +84,8 @@ lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_decode_mpc.a
 lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_decode_mpc.so
 lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_decode_mpeg2.a
 lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_decode_mpeg2.so
-lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_decode_rgb.a
-lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_decode_rgb.so
+lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_decode_rawvideo.a
+lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_decode_rawvideo.so
 lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_decode_spu.a
 lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_decode_spu.so
 lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_decode_spucc.a
@@ -102,80 +96,38 @@ lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_decode_spudvb.a
 lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_decode_spudvb.so
 lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_decode_spuhdmv.a
 lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_decode_spuhdmv.so
-lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_decode_yuv.a
-lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_decode_yuv.so
 lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_dmx_asf.a
 lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_dmx_asf.so
 lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_dmx_audio.a
 lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_dmx_audio.so
-lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_dmx_avi.a
-lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_dmx_avi.so
 lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_dmx_fli.a
 lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_dmx_fli.so
-lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_dmx_flv.a
-lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_dmx_flv.so
 lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_dmx_games.a
 lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_dmx_games.so
-lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_dmx_iff.a
-lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_dmx_iff.so
-lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_dmx_matroska.a
-lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_dmx_matroska.so
 lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_dmx_mng.a
 lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_dmx_mng.so
-lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_dmx_mpeg.a
-lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_dmx_mpeg.so
-lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_dmx_mpeg_block.a
-lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_dmx_mpeg_block.so
-lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_dmx_mpeg_elem.a
-lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_dmx_mpeg_elem.so
-lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_dmx_mpeg_pes.a
-lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_dmx_mpeg_pes.so
-lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_dmx_mpeg_ts.a
-lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_dmx_mpeg_ts.so
 lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_dmx_nsv.a
 lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_dmx_nsv.so
 lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_dmx_playlist.a
 lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_dmx_playlist.so
 lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_dmx_pva.a
 lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_dmx_pva.so
-lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_dmx_qt.a
-lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_dmx_qt.so
-lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_dmx_rawdv.a
-lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_dmx_rawdv.so
-lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_dmx_real.a
-lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_dmx_real.so
 lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_dmx_slave.a
 lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_dmx_slave.so
-lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_dmx_vc1_es.a
-lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_dmx_vc1_es.so
-lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_dmx_yuv4mpeg2.a
-lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_dmx_yuv4mpeg2.so
-lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_dmx_yuv_frames.a
-lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_dmx_yuv_frames.so
+lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_dmx_video.a
+lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_dmx_video.so
 lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_flac.a
 lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_flac.so
 lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_inp_cdda.a
 lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_inp_cdda.so
 lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_inp_dvd.a
 lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_inp_dvd.so
-lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_inp_file.a
-lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_inp_file.so
-lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_inp_http.a
-lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_inp_http.so
 lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_inp_mms.a
 lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_inp_mms.so
-lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_inp_net.a
-lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_inp_net.so
-lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_inp_pnm.a
-lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_inp_pnm.so
+lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_inp_network.a
+lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_inp_network.so
 lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_inp_rtp.a
 lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_inp_rtp.so
-lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_inp_rtsp.a
-lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_inp_rtsp.so
-lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_inp_stdin_fifo.a
-lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_inp_stdin_fifo.so
-lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_inp_test.a
-lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_inp_test.so
 lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_inp_vcd.a
 lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_inp_vcd.so
 lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_nsf.a
@@ -184,8 +136,6 @@ lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_sputext.a
 lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_sputext.so
 lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_vdr.a
 lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_vdr.so
-lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_vo_out_none.a
-lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_vo_out_none.so
 lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_vo_out_raw.a
 lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_vo_out_raw.so
 lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_vo_out_xcbshm.a
diff --git a/multimedia/xine-lib/buildlink3.mk b/multimedia/xine-lib/buildlink3.mk
index 7e868b097c3..3d223269f5b 100644
--- a/multimedia/xine-lib/buildlink3.mk
+++ b/multimedia/xine-lib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.37 2018/03/12 11:15:41 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.38 2018/11/13 11:10:41 markd Exp $
 
 BUILDLINK_TREE+=	xine-lib
 
@@ -9,7 +9,7 @@ BUILDLINK_API_DEPENDS.xine-lib+=	xine-lib>=1rc3c
 BUILDLINK_ABI_DEPENDS.xine-lib+=	xine-lib>=1.2.6nb11
 BUILDLINK_PKGSRCDIR.xine-lib?=		../../multimedia/xine-lib
 
-.include "../../multimedia/ffmpeg2/buildlink3.mk"
+.include "../../multimedia/ffmpeg3/buildlink3.mk"
 .endif # XINE_LIB_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-xine-lib
diff --git a/multimedia/xine-lib/distinfo b/multimedia/xine-lib/distinfo
index 90d24b75c3f..e1be304897d 100644
--- a/multimedia/xine-lib/distinfo
+++ b/multimedia/xine-lib/distinfo
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.108 2017/08/02 03:41:35 maya Exp $
+$NetBSD: distinfo,v 1.109 2018/11/13 11:10:41 markd Exp $
 
-SHA1 (xine-lib-1.2.6.tar.xz) = ac929eef2b7bf5c27699bbed612b953a01fccba5
-RMD160 (xine-lib-1.2.6.tar.xz) = 05edcd9a36e93d2fc9d1bf13cae3b32d4bd996da
-SHA512 (xine-lib-1.2.6.tar.xz) = ed4b1bc29daf85021cb83393d010ddca0ce9da508a8ddb9fec554f18eda1d156fc08f0aeaabeb7afe93fc445f049f84057e0708e6c87cd123c5cd2b20f8a25fd
-Size (xine-lib-1.2.6.tar.xz) = 5020964 bytes
-SHA1 (patch-ag) = e2eb9fdf9b7c013c3958c095edbfb09e6d1aedaf
+SHA1 (xine-lib-1.2.9.tar.xz) = ad6e72b7d8ff6172a8a170ab1bc38577ae321371
+RMD160 (xine-lib-1.2.9.tar.xz) = 3feb81b93add382c5382984980189f323f2ac746
+SHA512 (xine-lib-1.2.9.tar.xz) = bc672b32d6d72e6fa5641319e0bd15d721ea4b65e6d025e3cdbf6ba3655a7b2c714809d919a53fca8a908a7ce37541a341c13dd8a336799c2e942d5f86b84d3c
+Size (xine-lib-1.2.9.tar.xz) = 5180452 bytes
+SHA1 (patch-ag) = ef924c08b4d1d0dbc48f619d69b608c9d0def9fe
 SHA1 (patch-cb) = 708ee946dd1708a40baef5ac193a46dc22bff8b5
-SHA1 (patch-contrib_libxdg-basedir_basedir.c) = 307900aadc912d9a4b71b602821bf7d6b27f3e0f
+SHA1 (patch-contrib_libxdg-basedir_basedir.c) = 8dd88fd712853e58363148023be6ef0906486206
 SHA1 (patch-fa) = 9312a3bab4ae8482a208948277f1d11fb7eaaf8c
 SHA1 (patch-include_xine_attributes.h) = e7cb5f50d95a2523e2de83250fe11a12f0126a7f
 SHA1 (patch-include_xine_post.h) = 30629bff9486bf6b7ca889189cfad406eb242674
@@ -14,19 +14,17 @@ 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-xine_plugin.c) = 536365d479b5cd0354365a53db4f19f8404788ac
+SHA1 (patch-src-post-deinterlace-xine_plugin.c) = 996db1d9546bc2fcf5ca03d15befae3fdb9a6c00
 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) = 3a99bf71d43d17628fd21a261974e7a854eb70aa
+SHA1 (patch-src-post-planar-eq.c) = ae26bd7cbd53bc750319964f0be0b75a781367bb
+SHA1 (patch-src-post-planar-eq2.c) = 7711ea2c3b8ede9adf9b54f7b95f4458ffed852b
 SHA1 (patch-src-post-planar-expand.c) = 9d9ec1f5619f9a3d832bcace54d23011371f2067
-SHA1 (patch-src-post-planar-noise.c) = 2deabf5d80e2c45959a4f89bbf2528f7e1c9e1f5
+SHA1 (patch-src-post-planar-noise.c) = 8a9a2fee5d41af6d4e318abfcbeddd0ced33e478
 SHA1 (patch-src-post-planar-pp.c) = f5bea421785132c5f1422ae9f0d468974fb0ae5d
 SHA1 (patch-src-post-planar-unsharp.c) = 9f29c624f96a91760df960343096247d8c09c58d
-SHA1 (patch-src_input_input__dvd.c) = 9e491411a22e1f4467ce0e1aba83346305a1b6d3
 SHA1 (patch-src_libw32dll_wine_registry.c) = a36b4155a1d0d43ae698641178ef4afc97e7e70a
-SHA1 (patch-src_video__out_Makefile.am) = 49a3c53da9cde55a96b5798cc32467f9334e2d76
+SHA1 (patch-src_video__out_Makefile.am) = f94911c06a181d1ef9735912db60883b6e4f05dc
 SHA1 (patch-src_video__out_macosx_Makefile.am) = 8350a75e3a4c0b2f684e07dcc18259fcc5b28115
-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 13360a8fd1f..0e3ca8efbfd 100644
--- a/multimedia/xine-lib/patches/patch-ag
+++ b/multimedia/xine-lib/patches/patch-ag
@@ -1,22 +1,8 @@
-$NetBSD: patch-ag,v 1.29 2016/06/19 23:05:17 joerg Exp $
+$NetBSD: patch-ag,v 1.30 2018/11/13 11:10:41 markd Exp $
 
-1. chunk:
-https://bugs.xine-project.org/show_bug.cgi?id=536
-3. chunk
-https://bugs.xine-project.org/show_bug.cgi?id=531
-
---- configure.ac.orig	2014-05-29 11:11:59.000000000 +0000
+--- configure.ac.orig	2018-01-11 12:49:46.000000000 +0000
 +++ configure.ac
-@@ -9,7 +9,7 @@ m4_esyscmd([./version.sh])
- 
- dnl Initialize autoconf, autoheader, and automake
- AC_INIT([xine-lib], XINE_VERSION_SPEC, [xine-bugs@lists.sourceforge.net])
--AM_INIT_AUTOMAKE
-+AM_INIT_AUTOMAKE([subdir-objects])
- AC_CONFIG_SRCDIR([src/xine-engine/xine.c])
- AC_CONFIG_MACRO_DIR([m4])
- AC_CONFIG_LIBOBJ_DIR([lib])
-@@ -466,7 +466,8 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]],
+@@ -468,7 +468,8 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]],
  CC_ATTRIBUTE_ALIGNED
  
  CC_ATTRIBUTE_VISIBILITY([protected],
@@ -26,11 +12,3 @@ https://bugs.xine-project.org/show_bug.cgi?id=531
                          [CC_ATTRIBUTE_VISIBILITY([default], [visibility_export="default"])])
  CC_ATTRIBUTE_VISIBILITY([internal])
  
-@@ -920,6 +921,7 @@ AC_CHECK_FUNCS([strncasecmp _strnicmp], 
- 
- AC_FUNC_FSEEKO
- 
-+AC_LIBOBJ(dummy)
- AC_REPLACE_FUNCS([asprintf basename gettimeofday setenv strcasestr strndup strpbrk strsep strtok_r timegm unsetenv memmem])
- 
- AC_LIBSOURCE([hstrerror.c])
diff --git a/multimedia/xine-lib/patches/patch-contrib_libxdg-basedir_basedir.c b/multimedia/xine-lib/patches/patch-contrib_libxdg-basedir_basedir.c
index 4d57502da0c..e69378e8899 100644
--- a/multimedia/xine-lib/patches/patch-contrib_libxdg-basedir_basedir.c
+++ b/multimedia/xine-lib/patches/patch-contrib_libxdg-basedir_basedir.c
@@ -1,31 +1,15 @@
-$NetBSD: patch-contrib_libxdg-basedir_basedir.c,v 1.1 2016/06/19 23:05:17 joerg Exp $
+$NetBSD: patch-contrib_libxdg-basedir_basedir.c,v 1.2 2018/11/13 11:10:41 markd Exp $
 
 Fix empty body problems.
 
---- contrib/libxdg-basedir/basedir.c.orig	2016-06-19 19:28:26.879811053 +0000
+--- contrib/libxdg-basedir/basedir.c.orig	2018-01-11 12:49:47.000000000 +0000
 +++ contrib/libxdg-basedir/basedir.c
-@@ -143,14 +143,14 @@ static void xdgFreeStringList(char** lis
- /** Free all data in the cache and set pointers to null. */
- static void xdgFreeData(xdgCachedData *cache)
- {
--	if (cache->dataHome);
-+	if (cache->dataHome)
- 	{
- 		/* the first element of the directory lists is usually the home directory */
- 		if (cache->searchableDataDirectories[0] != cache->dataHome)
- 			free(cache->dataHome);
- 		cache->dataHome = 0;
- 	}
--	if (cache->configHome);
-+	if (cache->configHome)
- 	{
- 		if (cache->searchableConfigDirectories[0] != cache->configHome)
- 			free(cache->configHome);
-@@ -280,9 +280,9 @@ static char** xdgGetPathListEnv(const ch
+@@ -282,10 +282,9 @@ static char** xdgGetPathListEnv(const ch
  	else
  	{
  		if (!strings) return NULL;
--		for (size = 0; strings[size]; ++size) ; ++size;
+-		for (size = 0; strings[size]; ++size) ;
+-                ++size;
 -		if (!(itemlist = (char**)malloc(sizeof(char*)*size))) return NULL;
 -		xdgZeroMemory(itemlist, sizeof(char*)*(size));
 +		for (size = 0; strings[size++];)
diff --git a/multimedia/xine-lib/patches/patch-src-post-deinterlace-xine_plugin.c b/multimedia/xine-lib/patches/patch-src-post-deinterlace-xine_plugin.c
index 426c52895ee..db75f979fe8 100644
--- a/multimedia/xine-lib/patches/patch-src-post-deinterlace-xine_plugin.c
+++ b/multimedia/xine-lib/patches/patch-src-post-deinterlace-xine_plugin.c
@@ -1,48 +1,48 @@
-$NetBSD: patch-src-post-deinterlace-xine_plugin.c,v 1.2 2014/05/18 15:38:18 wiz Exp $
+$NetBSD: patch-src-post-deinterlace-xine_plugin.c,v 1.3 2018/11/13 11:10:41 markd Exp $
 
 https://bugs.xine-project.org/show_bug.cgi?id=524
 
---- src/post/deinterlace/xine_plugin.c.orig	2011-08-30 13:13:35.000000000 +0000
+--- src/post/deinterlace/xine_plugin.c.orig	2018-01-11 12:49:47.000000000 +0000
 +++ src/post/deinterlace/xine_plugin.c
-@@ -86,23 +86,32 @@ typedef struct deinterlace_parameters_s 
+@@ -86,23 +86,32 @@ typedef struct deinterlace_parameters_s
   * description of params struct
   */
  START_PARAM_DESCR( deinterlace_parameters_t )
--PARAM_ITEM( POST_PARAM_TYPE_INT, method, enum_methods, 0, 0, 0,
+-PARAM_ITEM( POST_PARAM_TYPE_INT, method, (char **)enum_methods, 0, 0, 0,
 +PARAM_ITEM( deinterlace_parameters_t,
-+	    POST_PARAM_TYPE_INT, method, enum_methods, 0, 0, 0,
++            POST_PARAM_TYPE_INT, method, (char **)enum_methods, 0, 0, 0,
              "deinterlace method" )
 -PARAM_ITEM( POST_PARAM_TYPE_BOOL, enabled, NULL, 0, 1, 0,
 +PARAM_ITEM( deinterlace_parameters_t,
-+	    POST_PARAM_TYPE_BOOL, enabled, NULL, 0, 1, 0,
++            POST_PARAM_TYPE_BOOL, enabled, NULL, 0, 1, 0,
              "enable/disable" )
--PARAM_ITEM( POST_PARAM_TYPE_INT, pulldown, enum_pulldown, 0, 0, 0,
+-PARAM_ITEM( POST_PARAM_TYPE_INT, pulldown, (char **)enum_pulldown, 0, 0, 0,
 +PARAM_ITEM( deinterlace_parameters_t,
-+	    POST_PARAM_TYPE_INT, pulldown, enum_pulldown, 0, 0, 0,
++            POST_PARAM_TYPE_INT, pulldown, (char **)enum_pulldown, 0, 0, 0,
              "pulldown algorithm" )
 -PARAM_ITEM( POST_PARAM_TYPE_INT, pulldown_error_wait, NULL, 0, 0, 0,
 +PARAM_ITEM( deinterlace_parameters_t,
-+	    POST_PARAM_TYPE_INT, pulldown_error_wait, NULL, 0, 0, 0,
++            POST_PARAM_TYPE_INT, pulldown_error_wait, NULL, 0, 0, 0,
              "number of frames of telecine pattern sync required before mode change" )
--PARAM_ITEM( POST_PARAM_TYPE_INT, framerate_mode, enum_framerate, 0, 0, 0,
+-PARAM_ITEM( POST_PARAM_TYPE_INT, framerate_mode, (char **)enum_framerate, 0, 0, 0,
 +PARAM_ITEM( deinterlace_parameters_t,
-+	    POST_PARAM_TYPE_INT, framerate_mode, enum_framerate, 0, 0, 0,
++            POST_PARAM_TYPE_INT, framerate_mode, (char **)enum_framerate, 0, 0, 0,
              "framerate output mode" )
 -PARAM_ITEM( POST_PARAM_TYPE_BOOL, judder_correction, NULL, 0, 1, 0,
 +PARAM_ITEM( deinterlace_parameters_t,
-+	    POST_PARAM_TYPE_BOOL, judder_correction, NULL, 0, 1, 0,
++            POST_PARAM_TYPE_BOOL, judder_correction, NULL, 0, 1, 0,
              "make frames evenly spaced for film mode (24 fps)" )
 -PARAM_ITEM( POST_PARAM_TYPE_BOOL, use_progressive_frame_flag, NULL, 0, 1, 0,
 +PARAM_ITEM( deinterlace_parameters_t,
-+	    POST_PARAM_TYPE_BOOL, use_progressive_frame_flag, NULL, 0, 1, 0,
++            POST_PARAM_TYPE_BOOL, use_progressive_frame_flag, NULL, 0, 1, 0,
              "disable deinterlacing when progressive_frame flag is set" )
 -PARAM_ITEM( POST_PARAM_TYPE_BOOL, chroma_filter, NULL, 0, 1, 0,
 +PARAM_ITEM( deinterlace_parameters_t,
-+	    POST_PARAM_TYPE_BOOL, chroma_filter, NULL, 0, 1, 0,
++            POST_PARAM_TYPE_BOOL, chroma_filter, NULL, 0, 1, 0,
              "apply chroma filter after deinterlacing" )
 -PARAM_ITEM( POST_PARAM_TYPE_BOOL, cheap_mode, NULL, 0, 1, 0,
 +PARAM_ITEM( deinterlace_parameters_t,
-+	    POST_PARAM_TYPE_BOOL, cheap_mode, NULL, 0, 1, 0,
++            POST_PARAM_TYPE_BOOL, cheap_mode, NULL, 0, 1, 0,
              "skip image format conversion - cheaper but not 100% correct" )
  END_PARAM_DESCR( param_descr )
  
diff --git a/multimedia/xine-lib/patches/patch-src-post-planar-eq.c b/multimedia/xine-lib/patches/patch-src-post-planar-eq.c
index 536e6545f70..3a55d084dc4 100644
--- a/multimedia/xine-lib/patches/patch-src-post-planar-eq.c
+++ b/multimedia/xine-lib/patches/patch-src-post-planar-eq.c
@@ -1,21 +1,21 @@
-$NetBSD: patch-src-post-planar-eq.c,v 1.3 2014/06/27 12:17:22 jperkin Exp $
+$NetBSD: patch-src-post-planar-eq.c,v 1.4 2018/11/13 11:10:41 markd Exp $
 
 https://bugs.xine-project.org/show_bug.cgi?id=524
 
 Disable MMX sections on SunOS.
 
---- src/post/planar/eq.c.orig	2013-09-18 10:04:54.000000000 +0000
+--- src/post/planar/eq.c.orig	2018-01-11 12:49:47.000000000 +0000
 +++ src/post/planar/eq.c
 @@ -31,7 +31,7 @@
  #include <pthread.h>
  
  
--#if defined(ARCH_X86) || defined(ARCH_X86_64)
-+#if (defined(ARCH_X86) || defined(ARCH_X86_64)) && !defined(__sun)
- static void process_MMX(unsigned char *dest, int dstride, unsigned char *src, int sstride,
- 		    int w, int h, int brightness, int contrast)
- {
-@@ -138,9 +138,11 @@ typedef struct eq_parameters_s {
+-#if defined(ARCH_X86)
++#if defined(ARCH_X86) && !defined(__sun)
+ 
+ #if defined(ARCH_X86_64)
+ #  define MEM1(reg) "(%"reg")"
+@@ -157,9 +157,11 @@ typedef struct eq_parameters_s {
   * description of params struct
   */
  START_PARAM_DESCR( eq_parameters_t )
@@ -29,12 +29,12 @@ Disable MMX sections on SunOS.
              "contrast" )
  END_PARAM_DESCR( param_descr )
  
-@@ -259,7 +261,7 @@ static post_plugin_t *eq_open_plugin(pos
+@@ -278,7 +280,7 @@ static post_plugin_t *eq_open_plugin(pos
    }
  
    process = process_C;
--#if defined(ARCH_X86) || defined(ARCH_X86_64)
-+#if (defined(ARCH_X86) || defined(ARCH_X86_64)) && !defined(__sun)
+-#if defined(ARCH_X86)
++#if defined(ARCH_X86) && !defined(__sun)
    if( xine_mm_accel() & MM_ACCEL_X86_MMX )
      process = process_MMX;
  #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 83251fa0db9..901e53f4776 100644
--- a/multimedia/xine-lib/patches/patch-src-post-planar-eq2.c
+++ b/multimedia/xine-lib/patches/patch-src-post-planar-eq2.c
@@ -1,22 +1,10 @@
-$NetBSD: patch-src-post-planar-eq2.c,v 1.8 2015/02/04 20:50:16 joerg Exp $
-
-First chunk:
-https://bugs.xine-project.org/show_bug.cgi?id=556
+$NetBSD: patch-src-post-planar-eq2.c,v 1.9 2018/11/13 11:10:41 markd Exp $
 
 Rest:
 https://bugs.xine-project.org/show_bug.cgi?id=524
 
 --- src/post/planar/eq2.c.orig	2014-06-09 16:08:42.000000000 +0000
 +++ src/post/planar/eq2.c
-@@ -129,7 +129,7 @@ void affine_1d_MMX (eq2_param_t *par, un
-     "movq (%1), %%mm4 \n\t"
-     "pxor %%mm0, %%mm0 \n\t"
-     :
--    : "g" (brvec), "g" (contvec)
-+    : "r" (brvec), "r" (contvec)
-   );
- 
-   while (h-- > 0) {
 @@ -293,19 +293,26 @@ typedef struct eq2_parameters_s {
   * description of params struct
   */
diff --git a/multimedia/xine-lib/patches/patch-src-post-planar-noise.c b/multimedia/xine-lib/patches/patch-src-post-planar-noise.c
index 1cef6707514..dee4ea5f77e 100644
--- a/multimedia/xine-lib/patches/patch-src-post-planar-noise.c
+++ b/multimedia/xine-lib/patches/patch-src-post-planar-noise.c
@@ -1,30 +1,21 @@
-$NetBSD: patch-src-post-planar-noise.c,v 1.3 2014/06/27 12:17:22 jperkin Exp $
+$NetBSD: patch-src-post-planar-noise.c,v 1.4 2018/11/13 11:10:41 markd Exp $
 
 https://bugs.xine-project.org/show_bug.cgi?id=524
 
 Disable MMX sections on SunOS.
 
---- src/post/planar/noise.c.orig	2013-09-18 10:04:54.000000000 +0000
+--- src/post/planar/noise.c.orig	2018-01-11 12:49:47.000000000 +0000
 +++ src/post/planar/noise.c
-@@ -155,7 +155,7 @@ static inline void lineNoise_C(uint8_t *
-     }
- }
- 
--#ifdef ARCH_X86
-+#if defined(ARCH_X86) && !defined(__sun)
- static inline void lineNoise_MMX(uint8_t *dst, uint8_t *src, int8_t *noise, int len, int shift){
-     intarch_t mmx_len= len&(~7);
-     noise+=shift;
-@@ -224,7 +224,7 @@ static inline void lineNoiseAvg_C(uint8_
+@@ -141,7 +141,7 @@ static inline void lineNoise_C(uint8_t *
      }
  }
  
 -#ifdef ARCH_X86
 +#if defined(ARCH_X86) && !defined(__sun)
  
- static inline void lineNoiseAvg_MMX(uint8_t *dst, uint8_t *src, int len, int8_t **shift){
-     intarch_t mmx_len= len&(~7);
-@@ -333,15 +333,20 @@ static const char *const enum_quality[]
+ #if defined(ARCH_X86_64)
+ #  define TYPEA int64_t
+@@ -340,15 +340,20 @@ static const char *const enum_quality[]
   * description of params struct
   */
  START_PARAM_DESCR( noise_parameters_t )
@@ -33,24 +24,24 @@ Disable MMX sections on SunOS.
 +    POST_PARAM_TYPE_INT, luma_strength, NULL, 0, 100, 0,
      "Amount of noise to add to luma channel" )
 -PARAM_ITEM( POST_PARAM_TYPE_INT, chroma_strength, NULL, 0, 100, 0,
-+PARAM_ITEM( noise_parameters_t, 
++PARAM_ITEM( noise_parameters_t,
 +    POST_PARAM_TYPE_INT, chroma_strength, NULL, 0, 100, 0,
      "Amount of noise to add to chroma channel" )
--PARAM_ITEM( POST_PARAM_TYPE_INT, quality, enum_quality, 0, 0, 0,
-+PARAM_ITEM( noise_parameters_t, 
-+    POST_PARAM_TYPE_INT, quality, enum_quality, 0, 0, 0,
+-PARAM_ITEM( POST_PARAM_TYPE_INT, quality, (char **)enum_quality, 0, 0, 0,
++PARAM_ITEM( noise_parameters_t,
++    POST_PARAM_TYPE_INT, quality, (char **)enum_quality, 0, 0, 0,
      "Quality level of noise" )
--PARAM_ITEM( POST_PARAM_TYPE_INT, type, enum_types, 0, 0, 0,
-+PARAM_ITEM( noise_parameters_t, 
-+    POST_PARAM_TYPE_INT, type, enum_types, 0, 0, 0,
+-PARAM_ITEM( POST_PARAM_TYPE_INT, type, (char **)enum_types, 0, 0, 0,
++PARAM_ITEM( noise_parameters_t,
++    POST_PARAM_TYPE_INT, type, (char **)enum_types, 0, 0, 0,
      "Type of noise" )
 -PARAM_ITEM( POST_PARAM_TYPE_BOOL, pattern, NULL, 0, 1, 0,
-+PARAM_ITEM( noise_parameters_t, 
++PARAM_ITEM( noise_parameters_t,
 +    POST_PARAM_TYPE_BOOL, pattern, NULL, 0, 1, 0,
      "Mix random noise with a (semi)regular pattern" )
  END_PARAM_DESCR( param_descr )
  
-@@ -460,7 +465,7 @@ void *noise_init_plugin(xine_t *xine, vo
+@@ -467,7 +472,7 @@ void *noise_init_plugin(xine_t *xine, vo
      class->description     = N_("Adds noise");
      class->dispose         = default_post_class_dispose;
  
@@ -59,12 +50,12 @@ Disable MMX sections on SunOS.
      if (xine_mm_accel() & MM_ACCEL_X86_MMX) {
          lineNoise = lineNoise_MMX;
          lineNoiseAvg = lineNoiseAvg_MMX;
-@@ -579,7 +584,7 @@ static int noise_draw(vo_frame_t *frame,
+@@ -587,7 +592,7 @@ static int noise_draw(vo_frame_t *frame,
                frame->width * 2, frame->height, &this->params[0]);
      }
  
 -#ifdef ARCH_X86
 +#if defined(ARCH_X86) && !defined(__sun)
      if (xine_mm_accel() & MM_ACCEL_X86_MMX)
-         asm volatile ("emms\n\t");
+         __asm__ __volatile__ ("emms\n\t");
      if (xine_mm_accel() & MM_ACCEL_X86_MMXEXT)
diff --git a/multimedia/xine-lib/patches/patch-src_input_input__dvd.c b/multimedia/xine-lib/patches/patch-src_input_input__dvd.c
deleted file mode 100644
index 2387e2f013a..00000000000
--- a/multimedia/xine-lib/patches/patch-src_input_input__dvd.c
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-src_input_input__dvd.c,v 1.1 2016/07/21 12:21:36 wiz Exp $
-
-Environment variable fix for libdvdcss 1.4.0 and later.
-
---- src/input/input_dvd.c.orig	2016-07-19 20:02:16.000000000 +0000
-+++ src/input/input_dvd.c
-@@ -1401,7 +1401,11 @@ static int dvd_parse_try_open(dvd_input_
-     /* we have an alternative dvd_path */
-     intended_dvd_device = locator;
-     /* do not use the raw device for the alternative */
-+#if 1	 /* libdvdcss version 1.4.0 or later */
-+    unsetenv("DVDCSS_RAW_DEVICE");
-+#else
-     xine_setenv("DVDCSS_RAW_DEVICE", "", 1);
-+#endif
-   } else {
-     /* use default DVD device */
-     dvd_input_class_t *class = (dvd_input_class_t*)this->input_plugin.input_class;
diff --git a/multimedia/xine-lib/patches/patch-src_video__out_Makefile.am b/multimedia/xine-lib/patches/patch-src_video__out_Makefile.am
index cf5caf207c1..a2ec76808b0 100644
--- a/multimedia/xine-lib/patches/patch-src_video__out_Makefile.am
+++ b/multimedia/xine-lib/patches/patch-src_video__out_Makefile.am
@@ -1,19 +1,9 @@
-$NetBSD: patch-src_video__out_Makefile.am,v 1.3 2016/05/23 16:30:31 wiz Exp $
+$NetBSD: patch-src_video__out_Makefile.am,v 1.4 2018/11/13 11:10:41 markd Exp $
 
-chunk 1: https://bugs.xine-project.org/show_bug.cgi?id=572
-chunk 2: Libtool is unable to infer ObjC by itself.
+chunk 1: Libtool is unable to infer ObjC by itself.
 
 --- src/video_out/Makefile.am.orig	2014-06-09 16:08:42.000000000 +0000
 +++ src/video_out/Makefile.am
-@@ -147,7 +147,7 @@ xineplug_vo_out_xcbshm_la_LIBADD = $(YUV
- xineplug_vo_out_xcbshm_la_CFLAGS = $(AM_CFLAGS) $(XCB_CFLAGS) $(XCBSHM_CFLAGS) $(AVUTIL_CFLAGS)
- 
- xineplug_vo_out_xcbxv_la_SOURCES = video_out_xcbxv.c $(XCBOSD)
--xineplug_vo_out_xcbxv_la_LIBADD = $(XINE_LIB) $(PTHREAD_LIBS) $(LTLIBINTL) $(XCBXV_LIBS) $(XCB_LIBS)
-+xineplug_vo_out_xcbxv_la_LIBADD = $(XINE_LIB) $(PTHREAD_LIBS) $(LTLIBINTL) $(XCBXV_LIBS) $(XCBSHM_LIBS) $(XCB_LIBS)
- xineplug_vo_out_xcbxv_la_CFLAGS = $(AM_CFLAGS) $(XCB_CFLAGS) $(XCBXV_CFLAGS)
- 
- xineplug_vo_out_xshm_la_SOURCES = video_out_xshm.c $(X11OSD)
 @@ -241,3 +241,4 @@ xineplug_vo_out_raw_la_CFLAGS = $(AM_CFL
  xineplug_vo_out_macosx_la_SOURCES = video_out_macosx.m
  xineplug_vo_out_macosx_la_LIBADD = $(XINE_LIB) $(PTHREAD_LIBS)
diff --git a/multimedia/xine-lib/patches/patch-src_xine-engine_Makefile.am b/multimedia/xine-lib/patches/patch-src_xine-engine_Makefile.am
deleted file mode 100644
index b816d118523..00000000000
--- a/multimedia/xine-lib/patches/patch-src_xine-engine_Makefile.am
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-src_xine-engine_Makefile.am,v 1.2 2014/05/18 15:38:18 wiz Exp $
-
-Ensure we link something.
-https://bugs.xine-project.org/show_bug.cgi?id=531
-
---- src/xine-engine/Makefile.am.orig	2012-09-20 14:30:26.827382120 +0000
-+++ src/xine-engine/Makefile.am	2012-09-20 14:31:37.419849112 +0000
-@@ -50,6 +50,7 @@
- 	-version-info $(XINE_LT_CURRENT):$(XINE_LT_REVISION):$(XINE_LT_AGE)
- 
- libxine_interface_la_SOURCES =
-+libxine_interface_la_LIBADD = @LTLIBOBJS@
- 
- libxine_interface_la_LDFLAGS = $(AM_LDFLAGS) $(def_ldflags) \
- 	-version-info $(XINE_LT_CURRENT):$(XINE_LT_REVISION):$(XINE_LT_AGE)