xine-lib: Update to 1.2.10

xine-lib (1.2.10) 2019-12-13
  * Add first Android support.
  * Add (xcb)xv yuy2 emulation.
  * Add libavcodec v58 compatibility.
  * Add avio seek support.
  * Make libpostproc optional.
  * Add libdav1d, libaom and lavc AV1 video decoders.
  * Add libvpx multithreading.
  * Add libpng decoder.
  * Add a52 double and fixed point modes.
  * Add Opus audio support to ogg demuxer.
  * Add AV1 video support to matroska demuxer.
  * Add ivf demuxer.
  * Add mpeg-ts split payload support.
  * Add TLS support using gnutls or OpenSSL.
  * Add ftp input plugin (ftp://) with TLS support (ftpes://)
  * Add tls:// input plugin (raw TLS over TCP).
  * Add libnfs NFS input plugin.
  * Add ftp/http seek support.
  * Add scp forward seek support.
  * Add mp4 http streaming support (plain and fragment modes).
  * Add HLS streaming support.
  * Add HTTP 1.1 support.
  * Add OpenGL EGL and Wayland support.
  * Add generic bitrate estimation.
  * Add side stream feature.
  * Optimize demux_qt.
  * Optimize OSD.
  * Optimize output layers.
  * Optimize decoder threads.
  * Optimize event handling.
  * Optimize stream info.
  * Optimize TCP/TLS/HTTP network input.
  * Optimize network buffering control.
  * Alsa/oss startup optimization.
  * Optimize input_stdin_fifo.
  * Optimize internal liba52.
  * Optimize user seek.
  * Build optimizations.
  * Simply user config.
  * Better support for audio out drivers that cannot resume after pause.
  * Better support for mpeg pts jumps.
  * Better bluray seek.
  * XML parser fixes.
  * Fix midstream audio mode switch.
  * Fix FLAC audio playback via ffmpeg.
  * Fix ffmpeg mpeg1/2 video.
  * Fix C++ build.
  * Fix build on clang only systems.
  * Fix/optimize mpeg, mpeg-ts, qt, flv, matroska, real and asf demuxers.
  * Fix network seek.
  * Fix/optimize audio CD.
  * Fix DVD (occasional crashes, damaged video after a DVD had been played).
  * Fix opengl2 freeze after X server failure.
  * Fix tvtime deinterlacer crash.
  * Fix/optimize overlay.
  * Fix/optimize old VDR plugin.
  * Fix xine-ui freeze when opening a playlist while paused.
  * Security fixes.
  * Build fixes (C99 mode, vaapi, ImageMagick, libmvec, less warnings).
  * Many small fixes.
  * More error handling instead of aborting.
  * Update german translation.

15 files changed, 222 insertions, 192 deletions

diff --git a/multimedia/xine-lib/Makefile b/multimedia/xine-lib/Makefile
index a3a400bb964..e006ae7ecfa 100644
--- a/multimedia/xine-lib/Makefile
+++ b/multimedia/xine-lib/Makefile
@@ -1,18 +1,22 @@
-# $NetBSD: Makefile,v 1.157 2019/11/03 17:12:04 rillig Exp $
+# $NetBSD: Makefile,v 1.158 2020/04/02 15:52:46 nia Exp $
 
-PKGREVISION= 4
 .include "Makefile.common"
 
 COMMENT=		Multimedia player library
+LICENSE=		gnu-lgpl-v2
 
 CONFLICTS+=		xine-xcb-[0-9]*
 
 CONFIGURE_ARGS+=	--disable-v4l
 CONFIGURE_ARGS+=	--disable-v4l2
 CONFIGURE_ARGS+=	--disable-real-codecs
-CONFIGURE_ARGS+=	--disable-aalib
 CONFIGURE_ARGS+=	--disable-mlib
 CONFIGURE_ARGS+=	--disable-vaapi
+CONFIGURE_ARGS+=	--disable-vidix
+
+CONFIGURE_ARGS+=	--with-a52dec=internal
+CONFIGURE_ARGS+=	--without-dav1d
+CONFIGURE_ARGS+=	--without-esound
 
 SUBST_CLASSES+=		oss
 SUBST_STAGE.oss=	pre-configure
@@ -32,13 +36,6 @@ SUBST_MESSAGE.w32path=	Fixing win32 dll path.
 # Needed to fix build problems under, at least, NetBSD/amd64.
 BUILDLINK_API_DEPENDS.libcdio+=	libcdio>=0.75
 
-.if ${OPSYS} == "FreeBSD"
-PLIST_VARS+=	vidix
-.  if ${MACHINE_ARCH} == "i386"
-PLIST.vidix=	yes
-.  endif
-.endif
-
 PLIST_VARS+=	qtw32
 .if empty(MACHINE_PLATFORM:MDarwin-*-i386)
 PLIST.qtw32=	yes
@@ -55,32 +52,32 @@ CPPFLAGS.SunOS+=	-D__u32=uint32_t -DHAVE_SYSI86 -DHAVE_MMX_FALSE
 LDFLAGS.SunOS+=		-lresolv
 
 .include "options.mk"
-
-# flac is supported internally; don't know what the plugin is good for
-# but until autodetection is turned off, force external flac for now.
 .include "../../audio/flac/buildlink3.mk"
 .include "../../audio/faad2/buildlink3.mk"
-.include "../../audio/liba52/buildlink3.mk"
+#.include "../../audio/liba52/buildlink3.mk"
 .include "../../audio/libmad/buildlink3.mk"
-#.include "../../audio/libmpcdec/buildlink3.mk"
+.include "../../audio/libmodplug/buildlink3.mk"
 .include "../../audio/libvorbis/buildlink3.mk"
 .include "../../audio/speex/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
-# these could be options or (better) extra plugin packages
-#.include "../../devel/SDL/buildlink3.mk"
-#.include "../../graphics/ImageMagick/buildlink3.mk"
-CONFIGURE_ARGS+=	--disable-opengl
-#.include "../../graphics/aalib/buildlink3.mk"
+PLIST_VARS+=	egl
+.if ${OPSYS} != "Darwin"
+.  include "../../graphics/MesaLib/features.mk"
+.  if ${MESALIB_SUPPORTS_EGL} == "yes"
+PLIST.egl=	yes
+.  endif
+.  include "../../graphics/MesaLib/buildlink3.mk"
+.  include "../../graphics/glu/buildlink3.mk"
+.endif
 .include "../../graphics/mng/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../misc/libcdio/buildlink3.mk"
-CONFIGURE_ARGS+=	--with-external-dvdnav
+.include "../../multimedia/libaom/buildlink3.mk"
+.include "../../multimedia/libbluray/buildlink3.mk"
 .include "../../multimedia/libdvdnav/buildlink3.mk"
 .include "../../multimedia/libtheora/buildlink3.mk"
+.include "../../multimedia/libvpx/buildlink3.mk"
+.include "../../security/gnutls/buildlink3.mk"
 .include "../../sysutils/vcdimager/buildlink3.mk"
-.include "../../x11/libXext/buildlink3.mk"
-.include "../../x11/libXt/buildlink3.mk"
-.include "../../x11/libX11/buildlink3.mk"
-.include "../../x11/libXinerama/buildlink3.mk"
-.include "../../x11/libxcb/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/xine-lib/Makefile.common b/multimedia/xine-lib/Makefile.common
index ae6e4079ce8..ab4003d68a5 100644
--- a/multimedia/xine-lib/Makefile.common
+++ b/multimedia/xine-lib/Makefile.common
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile.common,v 1.89 2020/01/20 21:54:03 nia Exp $
+# $NetBSD: Makefile.common,v 1.90 2020/04/02 15:52:46 nia Exp $
 #
 # used by audio/xine-alsa/Makefile
 # used by audio/xine-pulse/Makefile
 # used by multimedia/xine-v4l/Makefile
 # used by multimedia/xine-v4l2/Makefile
 
-DISTNAME=		xine-lib-1.2.9
-XINE_PKGNAME=		xine-lib-1.2.9
+DISTNAME=		xine-lib-1.2.10
+XINE_PKGNAME=		xine-lib-1.2.10
 PKGNAME?=		${XINE_PKGNAME}
 CATEGORIES?=		multimedia
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=xine/}
@@ -17,7 +17,7 @@ HOMEPAGE=		https://www.xine-project.org/
 
 MAKE_JOBS_SAFE=		no
 
-XINE_MOD_DIR_VER=	2.7
+XINE_MOD_DIR_VER=	2.8
 PLIST_SUBST+=		XINE_MOD_DIR_VER=${XINE_MOD_DIR_VER:Q}
 
 DISTINFO_FILE=		${.CURDIR}/../../multimedia/xine-lib/distinfo
@@ -28,44 +28,21 @@ USE_PKGLOCALEDIR=	YES
 USE_LIBTOOL=		YES
 LIBTOOL_OVERRIDE=	libtool libtool-nofpic
 PKGCONFIG_OVERRIDE=	misc/libxine.pc.in
-USE_TOOLS+=		autoconf automake gmake msgfmt pkg-config xmkmf perl gsed
+USE_TOOLS+=		aclocal autoconf automake
+USE_TOOLS+=		msgfmt msgmerge xgettext
+USE_TOOLS+=		gmake pkg-config xmkmf perl gsed
+
+CPPFLAGS+=		-DHAVE_ZERO_SAFE_MEM=1
 
 CONFIGURE_ARGS+=	--with-w32-path='${PREFIX}/lib/win32'
 #CONFIGURE_ARGS+=	--without-external-ffmpeg --disable-ffmpegtest
 CONFIGURE_ENV+=		have_libpng="yes"
 CONFIGURE_ENV+=		PNG_CFLAGS="-I${PREFIX}/include"
-CONFIGURE_ENV+=		PNG_LIBS="-L${PREFIX}/lib -Wl,-R${PREFIX}/lib -lpng"
+CONFIGURE_ENV+=		PNG_LIBS="-L${PREFIX}/lib ${COMPILER_RPATH_FLAG}${PREFIX}/lib -lpng"
 # XXX broken configure check in 1.2.1
 CONFIGURE_ENV+=		cc_cv_cflags__Werror_implicit_function_declaration="no"
 PKGSRC_MAKE_ENV+=	"mkdir_p"="mkdir -p"
 
-.include "../../mk/bsd.prefs.mk"
-
-PLIST_VARS+=		xv xvmc
-.include "../../x11/libXv/buildlink3.mk"
-.include "../../x11/libXvMC/buildlink3.mk"
-
-.if ${X11_TYPE} == "modular"
-PLIST.xv=		yes
-PLIST.xvmc=		yes
-.else
-.  if exists(${X11BASE}/lib/libXv.so)
-CONFIGURE_ARGS+=	--with-xv-path='${X11BASE}/lib'
-PLIST.xv=		yes
-.  endif
-.  if exists(${X11BASE}/lib/libXvMC.so)
-CONFIGURE_ARGS+=	--with-xvmc-path='${X11BASE}/lib'
-CONFIGURE_ARGS+=	--with-xxmc-path='${X11BASE}/lib'
-PLIST.xvmc=		yes
-.  endif
-.endif # X11_TYPE
-
-.include "../../mk/bsd.prefs.mk"
-.if ${OPSYS} == "NetBSD" && !empty(OS_VERSION:M[1-4].*)
-# --no-undefined causes errors if shlibs are not linked against libc
-BUILDLINK_TRANSFORM+=	"rm:-Wl,--no-undefined"
-.endif
-
 pre-configure:
 	${TOUCH} ${WRKSRC}/lib/dummy.c
 	cd ${WRKSRC} && aclocal -I m4
diff --git a/multimedia/xine-lib/PLIST.FreeBSD b/multimedia/xine-lib/PLIST.FreeBSD
index f27e03b147a..ebd433c836c 100644
--- a/multimedia/xine-lib/PLIST.FreeBSD
+++ b/multimedia/xine-lib/PLIST.FreeBSD
@@ -1,31 +1,5 @@
-@comment $NetBSD: PLIST.FreeBSD,v 1.7 2014/12/31 16:10:41 rumko Exp $
-${PLIST.vidix}lib/xine/plugins/${XINE_MOD_DIR_VER}/vidix/cyberblade_vid.a
-${PLIST.vidix}lib/xine/plugins/${XINE_MOD_DIR_VER}/vidix/cyberblade_vid.so
-${PLIST.vidix}lib/xine/plugins/${XINE_MOD_DIR_VER}/vidix/mach64_vid.a
-${PLIST.vidix}lib/xine/plugins/${XINE_MOD_DIR_VER}/vidix/mach64_vid.so
-${PLIST.vidix}lib/xine/plugins/${XINE_MOD_DIR_VER}/vidix/mga_crtc2_vid.a
-${PLIST.vidix}lib/xine/plugins/${XINE_MOD_DIR_VER}/vidix/mga_crtc2_vid.so
-${PLIST.vidix}lib/xine/plugins/${XINE_MOD_DIR_VER}/vidix/mga_vid.a
-${PLIST.vidix}lib/xine/plugins/${XINE_MOD_DIR_VER}/vidix/mga_vid.so
-${PLIST.vidix}lib/xine/plugins/${XINE_MOD_DIR_VER}/vidix/nvidia_vid.a
-${PLIST.vidix}lib/xine/plugins/${XINE_MOD_DIR_VER}/vidix/nvidia_vid.so
-${PLIST.vidix}lib/xine/plugins/${XINE_MOD_DIR_VER}/vidix/pm2_vid.a
-${PLIST.vidix}lib/xine/plugins/${XINE_MOD_DIR_VER}/vidix/pm2_vid.so
-${PLIST.vidix}lib/xine/plugins/${XINE_MOD_DIR_VER}/vidix/pm3_vid.a
-${PLIST.vidix}lib/xine/plugins/${XINE_MOD_DIR_VER}/vidix/pm3_vid.so
-${PLIST.vidix}lib/xine/plugins/${XINE_MOD_DIR_VER}/vidix/radeon_vid.a
-${PLIST.vidix}lib/xine/plugins/${XINE_MOD_DIR_VER}/vidix/radeon_vid.so
-${PLIST.vidix}lib/xine/plugins/${XINE_MOD_DIR_VER}/vidix/rage128_vid.a
-${PLIST.vidix}lib/xine/plugins/${XINE_MOD_DIR_VER}/vidix/rage128_vid.so
-${PLIST.vidix}lib/xine/plugins/${XINE_MOD_DIR_VER}/vidix/savage_vid.a
-${PLIST.vidix}lib/xine/plugins/${XINE_MOD_DIR_VER}/vidix/savage_vid.so
-${PLIST.vidix}lib/xine/plugins/${XINE_MOD_DIR_VER}/vidix/sis_vid.a
-${PLIST.vidix}lib/xine/plugins/${XINE_MOD_DIR_VER}/vidix/sis_vid.so
-${PLIST.vidix}lib/xine/plugins/${XINE_MOD_DIR_VER}/vidix/unichrome_vid.a
-${PLIST.vidix}lib/xine/plugins/${XINE_MOD_DIR_VER}/vidix/unichrome_vid.so
+@comment $NetBSD: PLIST.FreeBSD,v 1.8 2020/04/02 15:52:46 nia 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_inp_vcdo.a
 lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_inp_vcdo.so
-${PLIST.vidix}lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_vo_out_vidix.a
-${PLIST.vidix}lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_vo_out_vidix.so
diff --git a/multimedia/xine-lib/PLIST.Linux-i386 b/multimedia/xine-lib/PLIST.Linux-i386
deleted file mode 100644
index a24d4964368..00000000000
--- a/multimedia/xine-lib/PLIST.Linux-i386
+++ /dev/null
@@ -1,27 +0,0 @@
-@comment $NetBSD: PLIST.Linux-i386,v 1.1 2011/10/19 01:12:01 sbd Exp $
-lib/xine/plugins/${XINE_MOD_DIR_VER}/vidix/cyberblade_vid.a
-lib/xine/plugins/${XINE_MOD_DIR_VER}/vidix/cyberblade_vid.so
-lib/xine/plugins/${XINE_MOD_DIR_VER}/vidix/mach64_vid.a
-lib/xine/plugins/${XINE_MOD_DIR_VER}/vidix/mach64_vid.so
-lib/xine/plugins/${XINE_MOD_DIR_VER}/vidix/mga_crtc2_vid.a
-lib/xine/plugins/${XINE_MOD_DIR_VER}/vidix/mga_crtc2_vid.so
-lib/xine/plugins/${XINE_MOD_DIR_VER}/vidix/mga_vid.a
-lib/xine/plugins/${XINE_MOD_DIR_VER}/vidix/mga_vid.so
-lib/xine/plugins/${XINE_MOD_DIR_VER}/vidix/nvidia_vid.a
-lib/xine/plugins/${XINE_MOD_DIR_VER}/vidix/nvidia_vid.so
-lib/xine/plugins/${XINE_MOD_DIR_VER}/vidix/pm2_vid.a
-lib/xine/plugins/${XINE_MOD_DIR_VER}/vidix/pm2_vid.so
-lib/xine/plugins/${XINE_MOD_DIR_VER}/vidix/pm3_vid.a
-lib/xine/plugins/${XINE_MOD_DIR_VER}/vidix/pm3_vid.so
-lib/xine/plugins/${XINE_MOD_DIR_VER}/vidix/radeon_vid.a
-lib/xine/plugins/${XINE_MOD_DIR_VER}/vidix/radeon_vid.so
-lib/xine/plugins/${XINE_MOD_DIR_VER}/vidix/rage128_vid.a
-lib/xine/plugins/${XINE_MOD_DIR_VER}/vidix/rage128_vid.so
-lib/xine/plugins/${XINE_MOD_DIR_VER}/vidix/savage_vid.a
-lib/xine/plugins/${XINE_MOD_DIR_VER}/vidix/savage_vid.so
-lib/xine/plugins/${XINE_MOD_DIR_VER}/vidix/sis_vid.a
-lib/xine/plugins/${XINE_MOD_DIR_VER}/vidix/sis_vid.so
-lib/xine/plugins/${XINE_MOD_DIR_VER}/vidix/unichrome_vid.a
-lib/xine/plugins/${XINE_MOD_DIR_VER}/vidix/unichrome_vid.so
-lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_vo_out_vidix.a
-lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_vo_out_vidix.so
diff --git a/multimedia/xine-lib/PLIST.common b/multimedia/xine-lib/PLIST.common
index ca8391ca21b..7ebca59d661 100644
--- a/multimedia/xine-lib/PLIST.common
+++ b/multimedia/xine-lib/PLIST.common
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.common,v 1.40 2018/11/13 11:10:41 markd Exp $
+@comment $NetBSD: PLIST.common,v 1.41 2020/04/02 15:52:46 nia Exp $
 bin/xine-config
 bin/xine-list-1.2
 include/xine.h
@@ -29,6 +29,7 @@ include/xine/scratch.h
 include/xine/sorted_array.h
 include/xine/spu.h
 include/xine/spu_decoder.h
+include/xine/tickets.h
 include/xine/vdr.h
 include/xine/version.h
 include/xine/video_decoder.h
@@ -37,6 +38,7 @@ include/xine/video_overlay.h
 include/xine/vo_scale.h
 include/xine/xine_buffer.h
 include/xine/xine_internal.h
+include/xine/xine_module.h
 include/xine/xine_plugin.h
 include/xine/xineintl.h
 include/xine/xineutils.h
@@ -56,8 +58,8 @@ lib/xine/plugins/${XINE_MOD_DIR_VER}/post/xineplug_post_planar.a
 lib/xine/plugins/${XINE_MOD_DIR_VER}/post/xineplug_post_planar.so
 lib/xine/plugins/${XINE_MOD_DIR_VER}/post/xineplug_post_switch.a
 lib/xine/plugins/${XINE_MOD_DIR_VER}/post/xineplug_post_switch.so
-${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_tvtime.a
+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_decode_a52.a
@@ -72,8 +74,12 @@ lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_decode_ff.a
 lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_decode_ff.so
 lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_decode_gsm610.a
 lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_decode_gsm610.so
+lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_decode_libaom.a
+lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_decode_libaom.so
 lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_decode_libjpeg.a
 lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_decode_libjpeg.so
+lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_decode_libpng.a
+lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_decode_libpng.so
 lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_decode_libvpx.a
 lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_decode_libvpx.so
 lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_decode_lpcm.a
@@ -104,8 +110,12 @@ 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_games.a
 lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_dmx_games.so
+lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_dmx_image.a
+lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_dmx_image.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_modplug.a
+lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_dmx_modplug.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
@@ -118,6 +128,8 @@ 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_bluray.a
+lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_inp_bluray.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
@@ -132,24 +144,40 @@ 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
 lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_nsf.so
+lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_tls_gnutls.a
+lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_tls_gnutls.so
 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
+${PLIST.x11}lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_vo_gl_glx.a
+${PLIST.x11}lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_vo_gl_glx.so
+${PLIST.egl}${PLIST.wayland}lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_vo_gl_egl_wl.a
+${PLIST.egl}${PLIST.wayland}lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_vo_gl_egl_wl.so
+${PLIST.egl}${PLIST.x11}lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_vo_gl_egl_x11.a
+${PLIST.egl}${PLIST.x11}lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_vo_gl_egl_x11.so
+${PLIST.aalib}lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_vo_out_aa.a
+${PLIST.aalib}lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_vo_out_aa.so
+${PLIST.x11}lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_vo_out_opengl.a
+${PLIST.x11}lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_vo_out_opengl.so
+${PLIST.gl2}lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_vo_out_opengl2.a
+${PLIST.gl2}lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_vo_out_opengl2.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
-lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_vo_out_xcbshm.so
-lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_vo_out_xcbxv.a
-lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_vo_out_xcbxv.so
-lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_vo_out_xshm.a
-lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_vo_out_xshm.so
-${PLIST.xv}lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_vo_out_xv.a
-${PLIST.xv}lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_vo_out_xv.so
-${PLIST.xvmc}lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_vo_out_xvmc.a
-${PLIST.xvmc}lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_vo_out_xvmc.so
-${PLIST.xvmc}lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_vo_out_xxmc.a
-${PLIST.xvmc}lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_vo_out_xxmc.so
+${PLIST.sdl}lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_vo_out_sdl.a
+${PLIST.sdl}lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_vo_out_sdl.so
+${PLIST.x11}lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_vo_out_xcbshm.a
+${PLIST.x11}lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_vo_out_xcbshm.so
+${PLIST.x11}lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_vo_out_xcbxv.a
+${PLIST.x11}lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_vo_out_xcbxv.so
+${PLIST.x11}lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_vo_out_xshm.a
+${PLIST.x11}lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_vo_out_xshm.so
+${PLIST.x11}lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_vo_out_xv.a
+${PLIST.x11}lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_vo_out_xv.so
+${PLIST.x11}lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_vo_out_xvmc.a
+${PLIST.x11}lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_vo_out_xvmc.so
+${PLIST.x11}lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_vo_out_xxmc.a
+${PLIST.x11}lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_vo_out_xxmc.so
 lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_xiph.a
 lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_xiph.so
 man/man1/xine-config.1
diff --git a/multimedia/xine-lib/distinfo b/multimedia/xine-lib/distinfo
index ec511d5d91b..31c5ffddcb9 100644
--- a/multimedia/xine-lib/distinfo
+++ b/multimedia/xine-lib/distinfo
@@ -1,15 +1,15 @@
-$NetBSD: distinfo,v 1.110 2018/11/19 12:48:31 jperkin Exp $
+$NetBSD: distinfo,v 1.111 2020/04/02 15:52:46 nia Exp $
 
-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 (xine-lib-1.2.10.tar.xz) = 66fe7a7d372f74967df46834167f85f5c2d43ae7
+RMD160 (xine-lib-1.2.10.tar.xz) = 1dba24e9e6c4f21e766d9b696dd02f4e645f4c8c
+SHA512 (xine-lib-1.2.10.tar.xz) = 1cbe033da606d67a0a59f19968b2fe1cb46eaeb32c4b4aca7b91125b7230e15bd36d1e3e39e48e6eda56e556018f9f9bf84acb0012d3dd634306e7110fdc4c5f
+Size (xine-lib-1.2.10.tar.xz) = 5226116 bytes
 SHA1 (patch-ag) = ef924c08b4d1d0dbc48f619d69b608c9d0def9fe
 SHA1 (patch-cb) = 708ee946dd1708a40baef5ac193a46dc22bff8b5
 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
+SHA1 (patch-include_xine_post.h) = 3ada327a7f171bdf680074b30f005099011a201c
 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
@@ -19,12 +19,14 @@ SHA1 (patch-src-post-mosaico-mosaico.c) = 04f21603055b1e8e7490ba5d6e006ca5a9b683
 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) = ae26bd7cbd53bc750319964f0be0b75a781367bb
+SHA1 (patch-src-post-planar-eq.c) = 9ad80656f4a9c21651d889c3a5b5c709e5ecea83
 SHA1 (patch-src-post-planar-eq2.c) = 7711ea2c3b8ede9adf9b54f7b95f4458ffed852b
 SHA1 (patch-src-post-planar-expand.c) = 9d9ec1f5619f9a3d832bcace54d23011371f2067
-SHA1 (patch-src-post-planar-noise.c) = ad3ddd33b3e818ff41b9a5f520c2b80d46d476a1
+SHA1 (patch-src-post-planar-noise.c) = db5ba28ae527995084ce3ad65c52867209d4b13f
 SHA1 (patch-src-post-planar-pp.c) = f5bea421785132c5f1422ae9f0d468974fb0ae5d
 SHA1 (patch-src-post-planar-unsharp.c) = 9f29c624f96a91760df960343096247d8c09c58d
+SHA1 (patch-src_input_input__cdda.c) = 7dddab513b42ff334319da6fbd858f036d6665cd
+SHA1 (patch-src_input_input__http.c) = 80de20be0f99efa5cb67230c900acbf6e4ee9e7c
 SHA1 (patch-src_libw32dll_wine_registry.c) = a36b4155a1d0d43ae698641178ef4afc97e7e70a
-SHA1 (patch-src_video__out_Makefile.am) = f94911c06a181d1ef9735912db60883b6e4f05dc
+SHA1 (patch-src_video__out_Makefile.am) = 623e41b3f142426c5128c6c61c6ebefee170734e
 SHA1 (patch-src_video__out_macosx_Makefile.am) = 8350a75e3a4c0b2f684e07dcc18259fcc5b28115
diff --git a/multimedia/xine-lib/options.mk b/multimedia/xine-lib/options.mk
index 094e755e119..3f0b40b9aa2 100644
--- a/multimedia/xine-lib/options.mk
+++ b/multimedia/xine-lib/options.mk
@@ -1,11 +1,44 @@
-# $NetBSD: options.mk,v 1.2 2016/04/19 13:48:31 jperkin Exp $
+# $NetBSD: options.mk,v 1.3 2020/04/02 15:52:46 nia Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.xine-lib
 
-PKG_SUPPORTED_OPTIONS=	dts
+# Video outputs
+PKG_SUPPORTED_OPTIONS+=	aalib sdl wayland x11
+# Codecs
+PKG_SUPPORTED_OPTIONS+=	dts
+
+.include "../../mk/bsd.fast.prefs.mk"
+.include "../../mk/oss.buildlink3.mk"
+
+.if ${OSS_TYPE} == "none" && \
+    ${OPSYS} != "Darwin" && \
+    ${OPSYS} != "NetBSD" && \
+    ${OPSYS} != "SunOS" && \
+    ${OPSYS} != "Linux"
+PKG_SUGGESTED_OPTIONS+=	sdl
+.endif
+
+PKG_SUGGESTED_OPTIONS+=	x11
+
+.include "../../devel/wayland/platform.mk"
+
+.if ${PLATFORM_SUPPORTS_WAYLAND} == "yes"
+PKG_SUGGESTED_OPTIONS+=	wayland
+.endif
+
+PLIST_VARS+=	gl2
 
 .include "../../mk/bsd.options.mk"
 
+PLIST_VARS+=		aalib
+.if !empty(PKG_OPTIONS:Maalib)
+PLIST.aalib=		yes
+CONFIGURE_ARGS+=	--enable-aalib
+.include "../../graphics/aalib/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=	--disable-aalib
+.endif
+
 # Marked NO_BIN_ON_*.  Only enable if you don't want to distribute packages.
 PLIST_VARS+=		dts
 .if !empty(PKG_OPTIONS:Mdts)
@@ -14,3 +47,40 @@ PLIST.dts=		yes
 .else
 CONFIGURE_ARGS+=	--disable-dts
 .endif
+
+PLIST_VARS+=		sdl
+.if !empty(PKG_OPTIONS:Msdl)
+PLIST.sdl=		yes
+CONFIGURE_ARGS+=	--with-sdl
+.include "../../devel/SDL/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=	--without-sdl
+.endif
+
+PLIST_VARS+=		wayland
+.if !empty(PKG_OPTIONS:Mwayland)
+PLIST.wayland=		yes
+PLIST.gl2=		yes
+CONFIGURE_ARGS+=	--enable-wayland
+.include "../../devel/wayland/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=	--disable-wayland
+.endif
+
+PLIST_VARS+=		x11
+.if !empty(PKG_OPTIONS:Mx11)
+PLIST.x11=		yes
+PLIST.gl2=		yes
+CONFIGURE_ARGS+=	--with-x
+.include "../../x11/libXext/buildlink3.mk"
+.include "../../x11/libXt/buildlink3.mk"
+.include "../../x11/libX11/buildlink3.mk"
+.include "../../x11/libXinerama/buildlink3.mk"
+.include "../../x11/libXv/buildlink3.mk"
+.include "../../x11/libXvMC/buildlink3.mk"
+.include "../../x11/libxcb/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=	--disable-xvmc
+CONFIGURE_ARGS+=	--without-x
+CONFIGURE_ARGS+=	--without-xcb
+.endif
diff --git a/multimedia/xine-lib/patches/patch-include_xine_post.h b/multimedia/xine-lib/patches/patch-include_xine_post.h
index fa0bbca1e72..0c7d80f2aac 100644
--- a/multimedia/xine-lib/patches/patch-include_xine_post.h
+++ b/multimedia/xine-lib/patches/patch-include_xine_post.h
@@ -1,19 +1,15 @@
-$NetBSD: patch-include_xine_post.h,v 1.2 2014/05/18 15:38:18 wiz Exp $
+$NetBSD: patch-include_xine_post.h,v 1.3 2020/04/02 15:52:46 nia Exp $
 
 https://bugs.xine-project.org/show_bug.cgi?id=524
 
---- include/xine/post.h.orig	2014-02-26 15:49:10.000000000 +0000
+--- include/xine/post.h.orig	2019-12-13 20:47:50.000000000 +0000
 +++ include/xine/post.h
-@@ -400,9 +400,9 @@ static xine_post_api_parameter_t temp_p[
+@@ -436,7 +436,7 @@ static xine_post_api_parameter_t temp_p[
  #include <stddef.h>
  #endif
  
 -#define PARAM_ITEM( param_type, var, enumv, min, max, readonly, descr ) \
--{ param_type, #var, sizeof(temp_s.var), \
--  offsetof(temp_t, var), enumv, min, max, readonly, descr },
 +#define PARAM_ITEM( param_t, param_type, var, enumv, min, max, readonly, descr ) \
-+{ param_type, #var, sizeof(temp_s.var), offsetof(param_t, var), \
-+  enumv, min, max, readonly, descr },
+ { param_type, #var, sizeof(((temp_t*)0)->var),                        \
+   offsetof(temp_t, var), enumv, min, max, readonly, descr },
  
- #define END_PARAM_DESCR( name ) \
-   { POST_PARAM_TYPE_LAST, NULL, 0, 0, NULL, 0, 0, 1, NULL } \
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 3a55d084dc4..10a12c6d36a 100644
--- a/multimedia/xine-lib/patches/patch-src-post-planar-eq.c
+++ b/multimedia/xine-lib/patches/patch-src-post-planar-eq.c
@@ -1,12 +1,12 @@
-$NetBSD: patch-src-post-planar-eq.c,v 1.4 2018/11/13 11:10:41 markd Exp $
+$NetBSD: patch-src-post-planar-eq.c,v 1.5 2020/04/02 15:52:46 nia Exp $
 
 https://bugs.xine-project.org/show_bug.cgi?id=524
 
 Disable MMX sections on SunOS.
 
---- src/post/planar/eq.c.orig	2018-01-11 12:49:47.000000000 +0000
+--- src/post/planar/eq.c.orig	2019-12-13 20:47:50.000000000 +0000
 +++ src/post/planar/eq.c
-@@ -31,7 +31,7 @@
+@@ -33,7 +33,7 @@
  #include <pthread.h>
  
  
@@ -15,7 +15,7 @@ Disable MMX sections on SunOS.
  
  #if defined(ARCH_X86_64)
  #  define MEM1(reg) "(%"reg")"
-@@ -157,9 +157,11 @@ typedef struct eq_parameters_s {
+@@ -155,9 +155,11 @@ typedef struct eq_parameters_s {
   * description of params struct
   */
  START_PARAM_DESCR( eq_parameters_t )
@@ -29,8 +29,8 @@ Disable MMX sections on SunOS.
              "contrast" )
  END_PARAM_DESCR( param_descr )
  
-@@ -278,7 +280,7 @@ static post_plugin_t *eq_open_plugin(pos
-   }
+@@ -360,7 +362,7 @@ static post_plugin_t *eq_open_plugin(pos
+   (void)audio_target;
  
    process = process_C;
 -#if defined(ARCH_X86)
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 2c608e25aab..169b1be3d1f 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,12 @@
-$NetBSD: patch-src-post-planar-noise.c,v 1.5 2018/11/19 12:48:32 jperkin Exp $
+$NetBSD: patch-src-post-planar-noise.c,v 1.6 2020/04/02 15:52:46 nia Exp $
 
 https://bugs.xine-project.org/show_bug.cgi?id=524
 
 Disable MMX sections on SunOS.
 
---- src/post/planar/noise.c.orig	2018-01-11 12:49:47.000000000 +0000
+--- src/post/planar/noise.c.orig	2019-12-13 20:47:50.000000000 +0000
 +++ src/post/planar/noise.c
-@@ -141,7 +141,7 @@ static inline void lineNoise_C(uint8_t *
-     }
- }
- 
--#ifdef ARCH_X86
-+#if defined(ARCH_X86) && !defined(__sun)
- 
- #if defined(ARCH_X86_64)
- #  define TYPEA int64_t
-@@ -231,7 +231,7 @@ static inline void lineNoiseAvg_C(uint8_
-     }
- }
- 
--#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){
-   TYPEA mmx_len = len & (~7);
-@@ -340,15 +340,20 @@ static const char *const enum_quality[]
+@@ -220,15 +220,20 @@ static const char *const enum_quality[] 
   * description of params struct
   */
  START_PARAM_DESCR( noise_parameters_t )
@@ -50,16 +32,7 @@ Disable MMX sections on SunOS.
      "Mix random noise with a (semi)regular pattern" )
  END_PARAM_DESCR( param_descr )
  
-@@ -467,7 +472,7 @@ void *noise_init_plugin(xine_t *xine, vo
-     class->description     = N_("Adds noise");
-     class->dispose         = default_post_class_dispose;
- 
--#ifdef ARCH_X86
-+#if defined(ARCH_X86) && !defined(__sun)
-     if (xine_mm_accel() & MM_ACCEL_X86_MMX) {
-         lineNoise = lineNoise_MMX;
-         lineNoiseAvg = lineNoiseAvg_MMX;
-@@ -587,7 +592,7 @@ static int noise_draw(vo_frame_t *frame,
+@@ -372,7 +377,7 @@ static int noise_draw(vo_frame_t *frame,
                frame->width * 2, frame->height, &this->params[0]);
      }
  
@@ -68,3 +41,12 @@ Disable MMX sections on SunOS.
      if (xine_mm_accel() & MM_ACCEL_X86_MMX)
          __asm__ __volatile__ ("emms\n\t");
      if (xine_mm_accel() & MM_ACCEL_X86_MMXEXT)
+@@ -447,7 +452,7 @@ static post_plugin_t *noise_open_plugin(
+ 
+     this->params[0].lineNoise = lineNoise_C;
+     this->params[0].lineNoiseAvg = lineNoiseAvg_C;
+-#ifdef ARCH_X86
++#if defined(ARCH_X86) && !defined(__sun)
+     if (xine_mm_accel() & MM_ACCEL_X86_MMX) {
+         this->params[0].lineNoise = lineNoise_MMX;
+         this->params[0].lineNoiseAvg = lineNoiseAvg_MMX;
diff --git a/multimedia/xine-lib/patches/patch-src_input_input__cdda.c b/multimedia/xine-lib/patches/patch-src_input_input__cdda.c
new file mode 100644
index 00000000000..cd782c24a9c
--- /dev/null
+++ b/multimedia/xine-lib/patches/patch-src_input_input__cdda.c
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_input_input__cdda.c,v 1.1 2020/04/02 15:52:46 nia Exp $
+
+Fix syntax.
+
+--- src/input/input_cdda.c.orig	2019-12-13 20:47:50.000000000 +0000
++++ src/input/input_cdda.c
+@@ -874,7 +874,7 @@ static cdrom_toc_t *read_cdrom_toc (int 
+   toc->toc_entries[i].track_mode = (tocentry.data->control & 0x04) ? 1 : 0;
+   toc->toc_entries[i].first_frame_minute = tocentry.data->addr.msf.minute;
+   toc->toc_entries[i].first_frame_second = tocentry.data->addr.msf.second;
+-  toc->toc_entries[i]..first_frame_frame = tocentry.data->addr.msf.frame;
++  toc->toc_entries[i].first_frame_frame = tocentry.data->addr.msf.frame;
+   toc->toc_entries[i].first_frame =
+     (tocentry.data->addr.msf.minute * CD_SECONDS_PER_MINUTE * CD_FRAMES_PER_SECOND) +
+     (tocentry.data->addr.msf.second * CD_FRAMES_PER_SECOND) +
diff --git a/multimedia/xine-lib/patches/patch-src_input_input__http.c b/multimedia/xine-lib/patches/patch-src_input_input__http.c
new file mode 100644
index 00000000000..6bfeaeff0fc
--- /dev/null
+++ b/multimedia/xine-lib/patches/patch-src_input_input__http.c
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_input_input__http.c,v 1.1 2020/04/02 15:52:46 nia Exp $
+
+Needs sys/socket.h for AF_INET.
+
+--- src/input/input_http.c.orig	2019-12-13 20:47:50.000000000 +0000
++++ src/input/input_http.c
+@@ -36,6 +36,8 @@
+ 
+ #ifdef WIN32
+ #include <winsock.h>
++#else
++#include <sys/socket.h> /* AF_INET */
+ #endif
+ 
+ #define LOG_MODULE "input_http"
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 a2ec76808b0..a7d86ffc7ec 100644
--- a/multimedia/xine-lib/patches/patch-src_video__out_Makefile.am
+++ b/multimedia/xine-lib/patches/patch-src_video__out_Makefile.am
@@ -1,11 +1,14 @@
-$NetBSD: patch-src_video__out_Makefile.am,v 1.4 2018/11/13 11:10:41 markd Exp $
+$NetBSD: patch-src_video__out_Makefile.am,v 1.5 2020/04/02 15:52:46 nia Exp $
 
 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.orig	2019-12-13 20:47:50.000000000 +0000
 +++ src/video_out/Makefile.am
-@@ -241,3 +241,4 @@ xineplug_vo_out_raw_la_CFLAGS = $(AM_CFL
+@@ -256,6 +256,7 @@ 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)
  xineplug_vo_out_macosx_la_LDFLAGS = $(AM_LDFLAGS) -framework Cocoa -framework OpenGL
 +xineplug_vo_out_macosx_la_LIBTOOLFLAGS = --tag=CC
+ 
+ # GL provider plugins
+ 
diff --git a/multimedia/xine-v4l/Makefile b/multimedia/xine-v4l/Makefile
index 3c44730cbc9..c23c34b6cd0 100644
--- a/multimedia/xine-v4l/Makefile
+++ b/multimedia/xine-v4l/Makefile
@@ -1,6 +1,5 @@
-# $NetBSD: Makefile,v 1.26 2019/11/03 17:12:04 rillig Exp $
+# $NetBSD: Makefile,v 1.27 2020/04/02 15:52:46 nia Exp $
 
-PKGREVISION= 2
 .include "../../multimedia/xine-lib/Makefile.common"
 
 PKGNAME=	${XINE_PKGNAME:S/lib/v4l/}
diff --git a/multimedia/xine-v4l2/Makefile b/multimedia/xine-v4l2/Makefile
index 77a108ddff4..3b3d90c2fe9 100644
--- a/multimedia/xine-v4l2/Makefile
+++ b/multimedia/xine-v4l2/Makefile
@@ -1,6 +1,5 @@
-# $NetBSD: Makefile,v 1.24 2019/11/03 17:12:05 rillig Exp $
+# $NetBSD: Makefile,v 1.25 2020/04/02 15:52:46 nia Exp $
 
-PKGREVISION= 2
 .include "../../multimedia/xine-lib/Makefile.common"
 
 PKGNAME=	${XINE_PKGNAME:S/lib/v4l2/}