Hello,
This update xine-lib to version 1.2.11.
A lot of code from patches had been applied upstream.
Tested in arm64.
xine-lib/1.2.11/README.txt:
xine-lib (1.2.11) 2020-12-06
* Add gopher input plugin.
* Add user settings for IPv6.
* Split a52 spdif output to separate decoder.
* Code cleanup.
* More engine optimization.
* Small optimizations (opengl2, dvb subtitles, png, mpeg-ts).
* Better A/V sync.
* Fix a few crashes.
* Fix bluray playback.
* Fix VAAPI picture jitter and green flashes.
* Fix Opus and EAC3 audio playback.
* Fix text subtitles.
* Fix mpeg-ts (hdmv mode, detection of cut TV recordings).
* Fix mpeg layer 1-4 audio timing.
* Fix some VDR issues.
* Fix HLS VOD mode.
* Many small fixes.
* Build fixes.
* BSD fixes.
* Update german translation.
* Update internal libdca to upstream 0.0.7.
Regards,
adr.
? multimedia_xine-lib.diff
Index: Makefile
===================================================================
RCS file: /cvs/ports/multimedia/xine-lib/Makefile,v
retrieving revision 1.145
diff -u -p -r1.145 Makefile
--- Makefile 20 Mar 2020 16:44:25 -0000 1.145
+++ Makefile 14 Jan 2021 00:20:50 -0000
@@ -2,7 +2,7 @@
COMMENT= multimedia decoding library
-DISTNAME= xine-lib-1.2.10
+DISTNAME= xine-lib-1.2.11
CATEGORIES= multimedia
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=xine/}
EXTRACT_SUFX= .tar.xz
@@ -28,7 +28,7 @@ WANTLIB += xcb-dri2 xcb-dri3 xcb-glx xcb
WANTLIB += xcb-sync xcb-xfixes xcb-xv xdg-basedir xml2 xshmfence
WANTLIB += xvidcore z
-XINEAPI_REV= 2.8
+XINEAPI_REV= 2.9
SUBST_VARS+= XINEAPI_REV
COMPILER= base-clang ports-gcc
Index: distinfo
===================================================================
RCS file: /cvs/ports/multimedia/xine-lib/distinfo,v
retrieving revision 1.31
diff -u -p -r1.31 distinfo
--- distinfo 25 Dec 2019 15:50:45 -0000 1.31
+++ distinfo 14 Jan 2021 00:20:50 -0000
@@ -1,2 +1,2 @@
-SHA256 (xine-lib-1.2.10.tar.xz) = nLPwadPB/7dFbqkak2qFu7B6wqt74enQ0slP/kEQ3Fc=
-SIZE (xine-lib-1.2.10.tar.xz) = 5226116
+SHA256 (xine-lib-1.2.11.tar.xz) = 71GyHRDdoQRfp9cRvZFxz9rwpaKHQjO88W/98o7AcAU=
+SIZE (xine-lib-1.2.11.tar.xz) = 5282204
Index: patches/patch-configure_ac
===================================================================
RCS file: /cvs/ports/multimedia/xine-lib/patches/patch-configure_ac,v
retrieving revision 1.22
diff -u -p -r1.22 patch-configure_ac
--- patches/patch-configure_ac 25 Dec 2019 15:50:45 -0000 1.22
+++ patches/patch-configure_ac 14 Jan 2021 00:20:50 -0000
@@ -3,7 +3,7 @@ $OpenBSD: patch-configure_ac,v 1.22 2019
Index: configure.ac
--- configure.ac.orig
+++ configure.ac
-@@ -891,9 +891,7 @@ AC_ARG_ENABLE([optimizations],
+@@ -888,9 +888,7 @@ AC_ARG_ENABLE([optimizations],
[AS_HELP_STRING([--disable-optimizations], [Don't try to guess
what optimization to enable])],
[], [test x"$enable_debug" != x"no" &&
enable_optimizations="no"])
AM_CONDITIONAL([DISABLE_OPTIMIZATIONS], [test x"$enable_optimizations" =
x"no"])
@@ -14,7 +14,7 @@ Index: configure.ac
dnl For multi-pass compilation: never when cross-compiling
if test x"$cross_compiling" != x"yes"; then
if test x"$GCC" = x"yes"; then
-@@ -914,7 +912,7 @@ AC_SUBST(O0_CFLAGS)
+@@ -911,7 +909,7 @@ AC_SUBST(O0_CFLAGS)
AC_SUBST(PASS1_CFLAGS)
AC_SUBST(PASS2_CFLAGS)
@@ -23,7 +23,7 @@ Index: configure.ac
dnl xineutils.h:dlist_*
-@@ -1297,9 +1295,9 @@ t q
+@@ -1324,9 +1322,9 @@ t q
b
:q
q"
Index: patches/patch-m4_decoders_m4
===================================================================
RCS file: /cvs/ports/multimedia/xine-lib/patches/patch-m4_decoders_m4,v
retrieving revision 1.6
diff -u -p -r1.6 patch-m4_decoders_m4
--- patches/patch-m4_decoders_m4 25 Dec 2019 15:50:45 -0000 1.6
+++ patches/patch-m4_decoders_m4 14 Jan 2021 00:20:50 -0000
@@ -14,175 +14,3 @@ Index: m4/decoders.m4
if test x"$have_external_libmpcdec" != x"yes"; then
AC_MSG_RESULT([*** no usable version of libmpcdec found,
using internal copy ***])
else
-@@ -538,48 +538,42 @@ a52_init ();
-
-
- dnl Ogg/Speex (optional; enabled by default; external)
-- AC_ARG_WITH([speex],
-- [AS_HELP_STRING([--with-speex], [Enable Speex audio decoder
support (default: enabled)])],
-- [test x"$withval" != x"no" && with_speex="yes"])
-+ AC_ARG_WITH([speex], [AS_HELP_STRING([--with-speex], [Enable Speex audio
decoder support (default: enabled)])],
-+ [], [with_speex="try"])
- if test x"$with_speex" != x"no"; then
-- PKG_CHECK_MODULES([SPEEX], [ogg speex], [have_speex=yes],
[have_speex=no])
-- if test x"$with_speex" = x"yes" && test x"$have_speex" != x"yes"; then
-+ PKG_CHECK_MODULES([SPEEX], [ogg speex], [with_speex=yes], [test
x"$with_speex" = x"yes" && with_speex=fail])
-+ if test x"$with_speex" = x"fail" ; then
- AC_MSG_ERROR([Speex support requested, but libspeex and/or libogg
not found])
-- elif test x"$have_speex" = x"yes"; then
-- AC_DEFINE([HAVE_SPEEX], 1, [Define this if you have speex])
- fi
- fi
-- AM_CONDITIONAL([ENABLE_SPEEX], [test x"$have_speex" = x"yes"])
-+ test x"$with_speex" = x"yes" && AC_DEFINE([HAVE_SPEEX], 1, [Define this
if you have speex])
-+ AM_CONDITIONAL([ENABLE_SPEEX], [test x"$with_speex" = x"yes"])
-
-
- dnl Ogg/Theora (optional; enabled by default; external)
-- AC_ARG_WITH([theora],
-- [AS_HELP_STRING([--with-theora], [Enable Theora video decoder
support (default: enabled)])],
-- [test x"$withval" != x"no" && with_theora="yes"])
-+ AC_ARG_WITH([theora], [AS_HELP_STRING([--with-theora], [Enable Theora
video decoder support (default: enabled)])],
-+ [], [with_theora="try"])
- if test x"$with_theora" != x"no"; then
-- PKG_CHECK_MODULES([THEORA], [ogg theora], [have_theora=yes],
[have_theora=no])
-- if test x"$with_theora" = x"yes" && test x"$have_theora" = x"no"; then
-+ PKG_CHECK_MODULES([THEORA], [ogg theora], [with_theora=yes], [test
x"$with_theora" = x"yes" && with_theora=fail])
-+ if test x"$with_theora" = x"fail" ; then
- AC_MSG_ERROR([Theora support requested, but libtheora and/or
libogg not found])
-- elif test x"$have_theora" = x"yes"; then
-- AC_DEFINE([HAVE_THEORA], 1, [Define this if you have theora])
- fi
- fi
-- AM_CONDITIONAL([ENABLE_THEORA], [test x"$have_theora" = x"yes"])
-+ test x"$with_theora" = x"yes" && AC_DEFINE([HAVE_THEORA], 1, [Define this
if you have theora])
-+ AM_CONDITIONAL([ENABLE_THEORA], [test x"$with_theora" = x"yes"])
-
-
- dnl Ogg/Vorbis (optional; enabled by default; external)
-- AC_ARG_WITH([vorbis],
-- [AS_HELP_STRING([--with-vorbis], [Enable Vorbis audio decoder
support (default: enabled)])],
-- [test x"$withval" != x"no" && with_vorbis="yes"])
-- if test x"$with_vorbis" != x"no"; then
-- PKG_CHECK_MODULES([VORBIS], [ogg vorbis], [have_vorbis=yes],
[have_vorbis=no])
-- if test x"$with_vorbis" = x"yes" && test x"$have_vorbis" = "xno"; then
-+ AC_ARG_WITH([vorbis], [AS_HELP_STRING([--with-vorbis], [Enable Vorbis
audio decoder support (default: enabled)])],
-+ [], [with_vorbis="try"])
-+ if test x"$with_vorbis" != x"no" ; then
-+ PKG_CHECK_MODULES([VORBIS], [ogg vorbis], [with_vorbis=yes], [test
x"$with_vorbis" = x"yes" && with_vorbis=fail])
-+ if test x"$with_vorbis" = x"fail" ; then
- AC_MSG_ERROR([Vorbis support requested, but libvorbis and/or
libogg not found])
-- elif test x"$have_vorbis" = x"yes"; then
-- AC_DEFINE([HAVE_VORBIS], 1, [Define this if you have vorbis])
- fi
- fi
-- AM_CONDITIONAL([ENABLE_VORBIS], [test x"$have_vorbis" = x"yes"])
-+ test x"$with_vorbis" = x"yes" && AC_DEFINE([HAVE_VORBIS], 1, [Define this
if you have vorbis])
-+ AM_CONDITIONAL([ENABLE_VORBIS], [test x"$with_vorbis" = x"yes"])
-
-
- dnl real (optional; enabled by default)
-@@ -640,18 +634,16 @@ a52_init ();
- AC_SUBST(w32_path)
- AM_CONDITIONAL([ENABLE_W32DLL], [test x"$have_w32dll" = x"yes"])
-
--
- dnl wavpack (optional; disabled by default)
-- AC_ARG_WITH([wavpack],
-- [AS_HELP_STRING([--with-wavpack], [Enable Wavpack decoder
(requires libwavpack)])],
-- [test x"$withval" != x"no" && with_wavpack="yes"],
[with_wavpack="no"])
-- if test x"$with_wavpack" != x"no"; then
-- PKG_CHECK_MODULES([WAVPACK], [wavpack], [have_wavpack=yes],
[have_wavpack=no])
-- if test x"$with_wavpack" = x"yes" && test x"$have_wavpack" != x"yes";
then
-+ AC_ARG_WITH([wavpack], [AS_HELP_STRING([--with-wavpack], [Enable Wavpack
decoder (requires libwavpack)])],
-+ [], [with_wavpack="no"])
-+ if test x"$with_wavpack" = x"yes"; then
-+ PKG_CHECK_MODULES([WAVPACK], [wavpack], [], [with_wavpack=fail])
-+ if test x"$with_wavpack" = x"fail" ; then
- AC_MSG_ERROR([Wavpack decoder support requested, but libwavpack
not found])
- fi
- fi
-- AM_CONDITIONAL([ENABLE_WAVPACK], [test x"$have_wavpack" = x"yes"])
-+ AM_CONDITIONAL([ENABLE_WAVPACK], [test x"$with_wavpack" = x"yes"])
-
- dnl libvpx decoder plugin
- AC_ARG_ENABLE([vpx],
-@@ -669,50 +661,48 @@ a52_init ();
- AM_CONDITIONAL([ENABLE_VPX], [test x"$have_vpx" = x"yes"])
-
- dnl libOpenHevc decoder plugin
-- AC_ARG_WITH([openhevc],
-- [AS_HELP_STRING([--with-openhevc], [Enable libOpenHevc HEVC
decoder support (default: enabled)])],
-- [test x"$enableval" != x"no" && enable_openhevc="yes"])
-- if test x"$enable_openhevc" != x"no"; then
--
-- AC_CHECK_LIB([LibOpenHevcWrapper], [libOpenHevcInit],
[have_openhevc=yes], [have_openhevc=no])
-- if test x"$enable_openhevc" = x"yes" && test x"$have_openhevc" !=
x"yes"; then
-- AC_MSG_ERROR([Cannot find LibOpenHevcWrapper])
-+ AC_ARG_WITH([openhevc], [AS_HELP_STRING([--with-openhevc], [Enable
libOpenHevc HEVC decoder support (default: enabled)])],
-+ [], [with_openhevc="try"])
-+ if test x"$with_openhevc" != x"no"; then
-+ AC_CHECK_LIB([LibOpenHevcWrapper], [libOpenHevcInit], [], [test
x"$with_openhevc" = x"yes" && with_openhevc=fail])
-+ if test x"$with_openhevc" = x"fail" ; then
-+ AC_MSG_ERROR([openhevc support requested, but LibOpenHevcWrapper
not found])
- else
-- AC_CHECK_HEADERS([openHevcWrapper.h], [have_openhevc=yes],
[have_openhevc=no])
-- if test x"$enable_openhevc" = x"yes" && test x"$have_openhevc" !=
x"yes"; then
-- AC_MSG_ERROR([Cannot find openHevcWrapper.h])
-+ AC_CHECK_HEADERS([openHevcWrapper.h], [with_openhevc=yes], [test
x"$with_openhevc" = x"yes" && with_openhevc=fail])
-+ if test x"$with_openhevc" = x"fail" ; then
-+ AC_MSG_ERROR([openhevc support requested, but
openHevcWrapper.h not found])
- fi
-- OPENHEVC_CFLAGS=''
-- OPENHEVC_LIBS='-lLibOpenHevcWrapper'
-- AC_SUBST(OPENHEVC_CFLAGS)
-- AC_SUBST(OPENHEVC_LIBS)
- fi
- fi
-- AM_CONDITIONAL([ENABLE_OPENHEVC], [test x"$have_openhevc" = x"yes"])
-+ if test x"$with_openhevc" = x"yes" ; then
-+ OPENHEVC_CFLAGS=''
-+ OPENHEVC_LIBS='-lLibOpenHevcWrapper'
-+ AC_SUBST(OPENHEVC_CFLAGS)
-+ AC_SUBST(OPENHEVC_LIBS)
-+ fi
-+ AM_CONDITIONAL([ENABLE_OPENHEVC], [test x"$with_openhevc" = x"yes"])
-
- dnl libaom AV1 decoder plugin
-- AC_ARG_WITH([libaom],
-- [AS_HELP_STRING([--with-libaom], [Enable libaom AV1 decoder
support (default: enabled)])],
-- [test x"$enableval" != x"no" && enable_libaom="yes"])
-- if test x"$enable_libaom" != x"no"; then
-- PKG_CHECK_MODULES([AOM], [aom >= 1.0] , [have_libaom=yes],
[have_libaom=no])
-- if test x"$enable_libaom" = x"yes" && test x"$have_libaom" != x"yes";
then
-+ AC_ARG_WITH([libaom], [AS_HELP_STRING([--with-libaom], [Enable libaom AV1
decoder support (default: enabled)])],
-+ [], [with_libaom="try"])
-+ if test x"$with_libaom" != x"no"; then
-+ PKG_CHECK_MODULES([AOM], [aom >= 1.0] , [with_libaom=yes], [test
x"$with_libaom" = x"yes" && with_libaom=fail])
-+ if test x"$with_libaom" = x"fail" ; then
- AC_MSG_ERROR([libaom AV1 support requested, but libaom not found])
- fi
- fi
-- AM_CONDITIONAL([ENABLE_LIBAOM], [test x"$have_libaom" = x"yes"])
-+ AM_CONDITIONAL([ENABLE_LIBAOM], [test x"$with_libaom" = x"yes"])
-
- dnl dav1d AV1 decoder plugin
-- AC_ARG_WITH([dav1d],
-- [AS_HELP_STRING([--with-dav1d], [Enable dav1d AV1 decoder
support (default: enabled)])],
-- [test x"$enableval" != x"no" && enable_dav1d="yes"])
-- if test x"$enable_dav1d" != x"no"; then
-- PKG_CHECK_MODULES([DAV1D], [dav1d >= 0.3.1] , [have_dav1d=yes],
[have_dav1d=no])
-- if test x"$enable_dav1d" = x"yes" && test x"$have_dav1d" != x"yes";
then
-+ AC_ARG_WITH([dav1d], [AS_HELP_STRING([--with-dav1d], [Enable dav1d AV1
decoder support (default: enabled)])],
-+ [], [with_dav1d=try])
-+ if test x"$with_dav1d" != x"no"; then
-+ PKG_CHECK_MODULES([DAV1D], [dav1d >= 0.3.1] , [with_dav1d=yes], [test
x"$with_dav1d" = x"yes" && with_dav1d=fail])
-+ if test x"$with_dav1d" = x"fail" ; then
- AC_MSG_ERROR([dav1d AV1 support requested, but dav1d not found])
- fi
- fi
-- AM_CONDITIONAL([ENABLE_DAV1D], [test x"$have_dav1d" = x"yes"])
-+ AM_CONDITIONAL([ENABLE_DAV1D], [test x"$with_dav1d" = x"yes"])
-
- dnl Broadcom MMAL (Multi Media Abstraction Layer) decoder plugin for RPi
- AC_ARG_ENABLE([mmal],
Index: patches/patch-m4_input_m4
===================================================================
RCS file: /cvs/ports/multimedia/xine-lib/patches/patch-m4_input_m4,v
retrieving revision 1.3
diff -u -p -r1.3 patch-m4_input_m4
--- patches/patch-m4_input_m4 25 Dec 2019 15:50:45 -0000 1.3
+++ patches/patch-m4_input_m4 14 Jan 2021 00:20:50 -0000
@@ -6,15 +6,7 @@ $OpenBSD: patch-m4_input_m4,v 1.3 2019/1
Index: m4/input.m4
--- m4/input.m4.orig
+++ m4/input.m4
-@@ -42,6 +42,7 @@ AC_DEFUN([XINE_INPUT_PLUGINS], [
- ;;
- netbsd* | openbsd*)
- default_enable_v4l2=yes
-+ default_enable_libv4l=yes
- ;;
- linux-android*)
- default_enable_gnomevfs=no
-@@ -256,8 +257,7 @@ AC_DEFUN([XINE_INPUT_PLUGINS], [
+@@ -257,8 +257,7 @@ AC_DEFUN([XINE_INPUT_PLUGINS], [
dnl TLS support (ftps, https)
XINE_ARG_ENABLE([tls], [Enable TLS support using gnutls (enables secure
http (https) and ftp (ftps)])
if test "x$enable_tls" != "xno"; then
Index: patches/patch-src_xine-utils_memcpy_c
===================================================================
RCS file: /cvs/ports/multimedia/xine-lib/patches/patch-src_xine-utils_memcpy_c,v
retrieving revision 1.6
diff -u -p -r1.6 patch-src_xine-utils_memcpy_c
--- patches/patch-src_xine-utils_memcpy_c 25 Dec 2019 15:50:45 -0000
1.6
+++ patches/patch-src_xine-utils_memcpy_c 14 Jan 2021 00:20:50 -0000
@@ -5,7 +5,7 @@ Make use of clock_gettime().
Index: src/xine-utils/memcpy.c
--- src/xine-utils/memcpy.c.orig
+++ src/xine-utils/memcpy.c
-@@ -592,7 +592,7 @@ static const struct {
+@@ -593,7 +593,7 @@ static const struct {
static uint64_t memcpy_timing[sizeof(memcpy_method)/sizeof(memcpy_method[0])]
= { 0, };
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/multimedia/xine-lib/pkg/PLIST,v
retrieving revision 1.27
diff -u -p -r1.27 PLIST
--- pkg/PLIST 25 Dec 2019 15:50:45 -0000 1.27
+++ pkg/PLIST 14 Jan 2021 00:20:50 -0000
@@ -83,6 +83,7 @@ lib/xine/plugins/${XINEAPI_REV}/post/
@so lib/xine/plugins/${XINEAPI_REV}/xineplug_decode_spucmml.so
@so lib/xine/plugins/${XINEAPI_REV}/xineplug_decode_spudvb.so
@so lib/xine/plugins/${XINEAPI_REV}/xineplug_decode_spuhdmv.so
+@so lib/xine/plugins/${XINEAPI_REV}/xineplug_decode_to_spdif.so
@so lib/xine/plugins/${XINEAPI_REV}/xineplug_dmx_asf.so
@so lib/xine/plugins/${XINEAPI_REV}/xineplug_dmx_audio.so
@so lib/xine/plugins/${XINEAPI_REV}/xineplug_dmx_fli.so
--
? multimedia_xine-lib.diff
Index: Makefile
===================================================================
RCS file: /cvs/ports/multimedia/xine-lib/Makefile,v
retrieving revision 1.145
diff -u -p -r1.145 Makefile
--- Makefile 20 Mar 2020 16:44:25 -0000 1.145
+++ Makefile 14 Jan 2021 00:20:50 -0000
@@ -2,7 +2,7 @@
COMMENT= multimedia decoding library
-DISTNAME= xine-lib-1.2.10
+DISTNAME= xine-lib-1.2.11
CATEGORIES= multimedia
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=xine/}
EXTRACT_SUFX= .tar.xz
@@ -28,7 +28,7 @@ WANTLIB += xcb-dri2 xcb-dri3 xcb-glx xcb
WANTLIB += xcb-sync xcb-xfixes xcb-xv xdg-basedir xml2 xshmfence
WANTLIB += xvidcore z
-XINEAPI_REV= 2.8
+XINEAPI_REV= 2.9
SUBST_VARS+= XINEAPI_REV
COMPILER= base-clang ports-gcc
Index: distinfo
===================================================================
RCS file: /cvs/ports/multimedia/xine-lib/distinfo,v
retrieving revision 1.31
diff -u -p -r1.31 distinfo
--- distinfo 25 Dec 2019 15:50:45 -0000 1.31
+++ distinfo 14 Jan 2021 00:20:50 -0000
@@ -1,2 +1,2 @@
-SHA256 (xine-lib-1.2.10.tar.xz) = nLPwadPB/7dFbqkak2qFu7B6wqt74enQ0slP/kEQ3Fc=
-SIZE (xine-lib-1.2.10.tar.xz) = 5226116
+SHA256 (xine-lib-1.2.11.tar.xz) = 71GyHRDdoQRfp9cRvZFxz9rwpaKHQjO88W/98o7AcAU=
+SIZE (xine-lib-1.2.11.tar.xz) = 5282204
Index: patches/patch-configure_ac
===================================================================
RCS file: /cvs/ports/multimedia/xine-lib/patches/patch-configure_ac,v
retrieving revision 1.22
diff -u -p -r1.22 patch-configure_ac
--- patches/patch-configure_ac 25 Dec 2019 15:50:45 -0000 1.22
+++ patches/patch-configure_ac 14 Jan 2021 00:20:50 -0000
@@ -3,7 +3,7 @@ $OpenBSD: patch-configure_ac,v 1.22 2019
Index: configure.ac
--- configure.ac.orig
+++ configure.ac
-@@ -891,9 +891,7 @@ AC_ARG_ENABLE([optimizations],
+@@ -888,9 +888,7 @@ AC_ARG_ENABLE([optimizations],
[AS_HELP_STRING([--disable-optimizations], [Don't try to guess
what optimization to enable])],
[], [test x"$enable_debug" != x"no" &&
enable_optimizations="no"])
AM_CONDITIONAL([DISABLE_OPTIMIZATIONS], [test x"$enable_optimizations" =
x"no"])
@@ -14,7 +14,7 @@ Index: configure.ac
dnl For multi-pass compilation: never when cross-compiling
if test x"$cross_compiling" != x"yes"; then
if test x"$GCC" = x"yes"; then
-@@ -914,7 +912,7 @@ AC_SUBST(O0_CFLAGS)
+@@ -911,7 +909,7 @@ AC_SUBST(O0_CFLAGS)
AC_SUBST(PASS1_CFLAGS)
AC_SUBST(PASS2_CFLAGS)
@@ -23,7 +23,7 @@ Index: configure.ac
dnl xineutils.h:dlist_*
-@@ -1297,9 +1295,9 @@ t q
+@@ -1324,9 +1322,9 @@ t q
b
:q
q"
Index: patches/patch-m4_decoders_m4
===================================================================
RCS file: /cvs/ports/multimedia/xine-lib/patches/patch-m4_decoders_m4,v
retrieving revision 1.6
diff -u -p -r1.6 patch-m4_decoders_m4
--- patches/patch-m4_decoders_m4 25 Dec 2019 15:50:45 -0000 1.6
+++ patches/patch-m4_decoders_m4 14 Jan 2021 00:20:50 -0000
@@ -14,175 +14,3 @@ Index: m4/decoders.m4
if test x"$have_external_libmpcdec" != x"yes"; then
AC_MSG_RESULT([*** no usable version of libmpcdec found,
using internal copy ***])
else
-@@ -538,48 +538,42 @@ a52_init ();
-
-
- dnl Ogg/Speex (optional; enabled by default; external)
-- AC_ARG_WITH([speex],
-- [AS_HELP_STRING([--with-speex], [Enable Speex audio decoder
support (default: enabled)])],
-- [test x"$withval" != x"no" && with_speex="yes"])
-+ AC_ARG_WITH([speex], [AS_HELP_STRING([--with-speex], [Enable Speex audio
decoder support (default: enabled)])],
-+ [], [with_speex="try"])
- if test x"$with_speex" != x"no"; then
-- PKG_CHECK_MODULES([SPEEX], [ogg speex], [have_speex=yes],
[have_speex=no])
-- if test x"$with_speex" = x"yes" && test x"$have_speex" != x"yes"; then
-+ PKG_CHECK_MODULES([SPEEX], [ogg speex], [with_speex=yes], [test
x"$with_speex" = x"yes" && with_speex=fail])
-+ if test x"$with_speex" = x"fail" ; then
- AC_MSG_ERROR([Speex support requested, but libspeex and/or libogg
not found])
-- elif test x"$have_speex" = x"yes"; then
-- AC_DEFINE([HAVE_SPEEX], 1, [Define this if you have speex])
- fi
- fi
-- AM_CONDITIONAL([ENABLE_SPEEX], [test x"$have_speex" = x"yes"])
-+ test x"$with_speex" = x"yes" && AC_DEFINE([HAVE_SPEEX], 1, [Define this
if you have speex])
-+ AM_CONDITIONAL([ENABLE_SPEEX], [test x"$with_speex" = x"yes"])
-
-
- dnl Ogg/Theora (optional; enabled by default; external)
-- AC_ARG_WITH([theora],
-- [AS_HELP_STRING([--with-theora], [Enable Theora video decoder
support (default: enabled)])],
-- [test x"$withval" != x"no" && with_theora="yes"])
-+ AC_ARG_WITH([theora], [AS_HELP_STRING([--with-theora], [Enable Theora
video decoder support (default: enabled)])],
-+ [], [with_theora="try"])
- if test x"$with_theora" != x"no"; then
-- PKG_CHECK_MODULES([THEORA], [ogg theora], [have_theora=yes],
[have_theora=no])
-- if test x"$with_theora" = x"yes" && test x"$have_theora" = x"no"; then
-+ PKG_CHECK_MODULES([THEORA], [ogg theora], [with_theora=yes], [test
x"$with_theora" = x"yes" && with_theora=fail])
-+ if test x"$with_theora" = x"fail" ; then
- AC_MSG_ERROR([Theora support requested, but libtheora and/or
libogg not found])
-- elif test x"$have_theora" = x"yes"; then
-- AC_DEFINE([HAVE_THEORA], 1, [Define this if you have theora])
- fi
- fi
-- AM_CONDITIONAL([ENABLE_THEORA], [test x"$have_theora" = x"yes"])
-+ test x"$with_theora" = x"yes" && AC_DEFINE([HAVE_THEORA], 1, [Define this
if you have theora])
-+ AM_CONDITIONAL([ENABLE_THEORA], [test x"$with_theora" = x"yes"])
-
-
- dnl Ogg/Vorbis (optional; enabled by default; external)
-- AC_ARG_WITH([vorbis],
-- [AS_HELP_STRING([--with-vorbis], [Enable Vorbis audio decoder
support (default: enabled)])],
-- [test x"$withval" != x"no" && with_vorbis="yes"])
-- if test x"$with_vorbis" != x"no"; then
-- PKG_CHECK_MODULES([VORBIS], [ogg vorbis], [have_vorbis=yes],
[have_vorbis=no])
-- if test x"$with_vorbis" = x"yes" && test x"$have_vorbis" = "xno"; then
-+ AC_ARG_WITH([vorbis], [AS_HELP_STRING([--with-vorbis], [Enable Vorbis
audio decoder support (default: enabled)])],
-+ [], [with_vorbis="try"])
-+ if test x"$with_vorbis" != x"no" ; then
-+ PKG_CHECK_MODULES([VORBIS], [ogg vorbis], [with_vorbis=yes], [test
x"$with_vorbis" = x"yes" && with_vorbis=fail])
-+ if test x"$with_vorbis" = x"fail" ; then
- AC_MSG_ERROR([Vorbis support requested, but libvorbis and/or
libogg not found])
-- elif test x"$have_vorbis" = x"yes"; then
-- AC_DEFINE([HAVE_VORBIS], 1, [Define this if you have vorbis])
- fi
- fi
-- AM_CONDITIONAL([ENABLE_VORBIS], [test x"$have_vorbis" = x"yes"])
-+ test x"$with_vorbis" = x"yes" && AC_DEFINE([HAVE_VORBIS], 1, [Define this
if you have vorbis])
-+ AM_CONDITIONAL([ENABLE_VORBIS], [test x"$with_vorbis" = x"yes"])
-
-
- dnl real (optional; enabled by default)
-@@ -640,18 +634,16 @@ a52_init ();
- AC_SUBST(w32_path)
- AM_CONDITIONAL([ENABLE_W32DLL], [test x"$have_w32dll" = x"yes"])
-
--
- dnl wavpack (optional; disabled by default)
-- AC_ARG_WITH([wavpack],
-- [AS_HELP_STRING([--with-wavpack], [Enable Wavpack decoder
(requires libwavpack)])],
-- [test x"$withval" != x"no" && with_wavpack="yes"],
[with_wavpack="no"])
-- if test x"$with_wavpack" != x"no"; then
-- PKG_CHECK_MODULES([WAVPACK], [wavpack], [have_wavpack=yes],
[have_wavpack=no])
-- if test x"$with_wavpack" = x"yes" && test x"$have_wavpack" != x"yes";
then
-+ AC_ARG_WITH([wavpack], [AS_HELP_STRING([--with-wavpack], [Enable Wavpack
decoder (requires libwavpack)])],
-+ [], [with_wavpack="no"])
-+ if test x"$with_wavpack" = x"yes"; then
-+ PKG_CHECK_MODULES([WAVPACK], [wavpack], [], [with_wavpack=fail])
-+ if test x"$with_wavpack" = x"fail" ; then
- AC_MSG_ERROR([Wavpack decoder support requested, but libwavpack
not found])
- fi
- fi
-- AM_CONDITIONAL([ENABLE_WAVPACK], [test x"$have_wavpack" = x"yes"])
-+ AM_CONDITIONAL([ENABLE_WAVPACK], [test x"$with_wavpack" = x"yes"])
-
- dnl libvpx decoder plugin
- AC_ARG_ENABLE([vpx],
-@@ -669,50 +661,48 @@ a52_init ();
- AM_CONDITIONAL([ENABLE_VPX], [test x"$have_vpx" = x"yes"])
-
- dnl libOpenHevc decoder plugin
-- AC_ARG_WITH([openhevc],
-- [AS_HELP_STRING([--with-openhevc], [Enable libOpenHevc HEVC
decoder support (default: enabled)])],
-- [test x"$enableval" != x"no" && enable_openhevc="yes"])
-- if test x"$enable_openhevc" != x"no"; then
--
-- AC_CHECK_LIB([LibOpenHevcWrapper], [libOpenHevcInit],
[have_openhevc=yes], [have_openhevc=no])
-- if test x"$enable_openhevc" = x"yes" && test x"$have_openhevc" !=
x"yes"; then
-- AC_MSG_ERROR([Cannot find LibOpenHevcWrapper])
-+ AC_ARG_WITH([openhevc], [AS_HELP_STRING([--with-openhevc], [Enable
libOpenHevc HEVC decoder support (default: enabled)])],
-+ [], [with_openhevc="try"])
-+ if test x"$with_openhevc" != x"no"; then
-+ AC_CHECK_LIB([LibOpenHevcWrapper], [libOpenHevcInit], [], [test
x"$with_openhevc" = x"yes" && with_openhevc=fail])
-+ if test x"$with_openhevc" = x"fail" ; then
-+ AC_MSG_ERROR([openhevc support requested, but LibOpenHevcWrapper
not found])
- else
-- AC_CHECK_HEADERS([openHevcWrapper.h], [have_openhevc=yes],
[have_openhevc=no])
-- if test x"$enable_openhevc" = x"yes" && test x"$have_openhevc" !=
x"yes"; then
-- AC_MSG_ERROR([Cannot find openHevcWrapper.h])
-+ AC_CHECK_HEADERS([openHevcWrapper.h], [with_openhevc=yes], [test
x"$with_openhevc" = x"yes" && with_openhevc=fail])
-+ if test x"$with_openhevc" = x"fail" ; then
-+ AC_MSG_ERROR([openhevc support requested, but
openHevcWrapper.h not found])
- fi
-- OPENHEVC_CFLAGS=''
-- OPENHEVC_LIBS='-lLibOpenHevcWrapper'
-- AC_SUBST(OPENHEVC_CFLAGS)
-- AC_SUBST(OPENHEVC_LIBS)
- fi
- fi
-- AM_CONDITIONAL([ENABLE_OPENHEVC], [test x"$have_openhevc" = x"yes"])
-+ if test x"$with_openhevc" = x"yes" ; then
-+ OPENHEVC_CFLAGS=''
-+ OPENHEVC_LIBS='-lLibOpenHevcWrapper'
-+ AC_SUBST(OPENHEVC_CFLAGS)
-+ AC_SUBST(OPENHEVC_LIBS)
-+ fi
-+ AM_CONDITIONAL([ENABLE_OPENHEVC], [test x"$with_openhevc" = x"yes"])
-
- dnl libaom AV1 decoder plugin
-- AC_ARG_WITH([libaom],
-- [AS_HELP_STRING([--with-libaom], [Enable libaom AV1 decoder
support (default: enabled)])],
-- [test x"$enableval" != x"no" && enable_libaom="yes"])
-- if test x"$enable_libaom" != x"no"; then
-- PKG_CHECK_MODULES([AOM], [aom >= 1.0] , [have_libaom=yes],
[have_libaom=no])
-- if test x"$enable_libaom" = x"yes" && test x"$have_libaom" != x"yes";
then
-+ AC_ARG_WITH([libaom], [AS_HELP_STRING([--with-libaom], [Enable libaom AV1
decoder support (default: enabled)])],
-+ [], [with_libaom="try"])
-+ if test x"$with_libaom" != x"no"; then
-+ PKG_CHECK_MODULES([AOM], [aom >= 1.0] , [with_libaom=yes], [test
x"$with_libaom" = x"yes" && with_libaom=fail])
-+ if test x"$with_libaom" = x"fail" ; then
- AC_MSG_ERROR([libaom AV1 support requested, but libaom not found])
- fi
- fi
-- AM_CONDITIONAL([ENABLE_LIBAOM], [test x"$have_libaom" = x"yes"])
-+ AM_CONDITIONAL([ENABLE_LIBAOM], [test x"$with_libaom" = x"yes"])
-
- dnl dav1d AV1 decoder plugin
-- AC_ARG_WITH([dav1d],
-- [AS_HELP_STRING([--with-dav1d], [Enable dav1d AV1 decoder
support (default: enabled)])],
-- [test x"$enableval" != x"no" && enable_dav1d="yes"])
-- if test x"$enable_dav1d" != x"no"; then
-- PKG_CHECK_MODULES([DAV1D], [dav1d >= 0.3.1] , [have_dav1d=yes],
[have_dav1d=no])
-- if test x"$enable_dav1d" = x"yes" && test x"$have_dav1d" != x"yes";
then
-+ AC_ARG_WITH([dav1d], [AS_HELP_STRING([--with-dav1d], [Enable dav1d AV1
decoder support (default: enabled)])],
-+ [], [with_dav1d=try])
-+ if test x"$with_dav1d" != x"no"; then
-+ PKG_CHECK_MODULES([DAV1D], [dav1d >= 0.3.1] , [with_dav1d=yes], [test
x"$with_dav1d" = x"yes" && with_dav1d=fail])
-+ if test x"$with_dav1d" = x"fail" ; then
- AC_MSG_ERROR([dav1d AV1 support requested, but dav1d not found])
- fi
- fi
-- AM_CONDITIONAL([ENABLE_DAV1D], [test x"$have_dav1d" = x"yes"])
-+ AM_CONDITIONAL([ENABLE_DAV1D], [test x"$with_dav1d" = x"yes"])
-
- dnl Broadcom MMAL (Multi Media Abstraction Layer) decoder plugin for RPi
- AC_ARG_ENABLE([mmal],
Index: patches/patch-m4_input_m4
===================================================================
RCS file: /cvs/ports/multimedia/xine-lib/patches/patch-m4_input_m4,v
retrieving revision 1.3
diff -u -p -r1.3 patch-m4_input_m4
--- patches/patch-m4_input_m4 25 Dec 2019 15:50:45 -0000 1.3
+++ patches/patch-m4_input_m4 14 Jan 2021 00:20:50 -0000
@@ -6,15 +6,7 @@ $OpenBSD: patch-m4_input_m4,v 1.3 2019/1
Index: m4/input.m4
--- m4/input.m4.orig
+++ m4/input.m4
-@@ -42,6 +42,7 @@ AC_DEFUN([XINE_INPUT_PLUGINS], [
- ;;
- netbsd* | openbsd*)
- default_enable_v4l2=yes
-+ default_enable_libv4l=yes
- ;;
- linux-android*)
- default_enable_gnomevfs=no
-@@ -256,8 +257,7 @@ AC_DEFUN([XINE_INPUT_PLUGINS], [
+@@ -257,8 +257,7 @@ AC_DEFUN([XINE_INPUT_PLUGINS], [
dnl TLS support (ftps, https)
XINE_ARG_ENABLE([tls], [Enable TLS support using gnutls (enables secure
http (https) and ftp (ftps)])
if test "x$enable_tls" != "xno"; then
Index: patches/patch-src_xine-utils_memcpy_c
===================================================================
RCS file: /cvs/ports/multimedia/xine-lib/patches/patch-src_xine-utils_memcpy_c,v
retrieving revision 1.6
diff -u -p -r1.6 patch-src_xine-utils_memcpy_c
--- patches/patch-src_xine-utils_memcpy_c 25 Dec 2019 15:50:45 -0000
1.6
+++ patches/patch-src_xine-utils_memcpy_c 14 Jan 2021 00:20:50 -0000
@@ -5,7 +5,7 @@ Make use of clock_gettime().
Index: src/xine-utils/memcpy.c
--- src/xine-utils/memcpy.c.orig
+++ src/xine-utils/memcpy.c
-@@ -592,7 +592,7 @@ static const struct {
+@@ -593,7 +593,7 @@ static const struct {
static uint64_t memcpy_timing[sizeof(memcpy_method)/sizeof(memcpy_method[0])]
= { 0, };
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/multimedia/xine-lib/pkg/PLIST,v
retrieving revision 1.27
diff -u -p -r1.27 PLIST
--- pkg/PLIST 25 Dec 2019 15:50:45 -0000 1.27
+++ pkg/PLIST 14 Jan 2021 00:20:50 -0000
@@ -83,6 +83,7 @@ lib/xine/plugins/${XINEAPI_REV}/post/
@so lib/xine/plugins/${XINEAPI_REV}/xineplug_decode_spucmml.so
@so lib/xine/plugins/${XINEAPI_REV}/xineplug_decode_spudvb.so
@so lib/xine/plugins/${XINEAPI_REV}/xineplug_decode_spuhdmv.so
+@so lib/xine/plugins/${XINEAPI_REV}/xineplug_decode_to_spdif.so
@so lib/xine/plugins/${XINEAPI_REV}/xineplug_dmx_asf.so
@so lib/xine/plugins/${XINEAPI_REV}/xineplug_dmx_audio.so
@so lib/xine/plugins/${XINEAPI_REV}/xineplug_dmx_fli.so
