On Thu, Jan 14, 2021 at 07:48:02PM -0500, Brad Smith wrote:
> On Thu, Jan 14, 2021 at 12:31:34AM +0000, a...@sdf.org wrote:
> > 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.
>
> This is missing patch removals. Here is a more appropriate diff..
I almost forgot. I do a major bump whenever the API rev is bumped.
Index: Makefile
===================================================================
RCS file: /home/cvs/ports/multimedia/xine-lib/Makefile,v
retrieving revision 1.145
diff -u -p -u -p -r1.145 Makefile
--- Makefile 20 Mar 2020 16:44:25 -0000 1.145
+++ Makefile 17 Jan 2021 20:47:36 -0000
@@ -2,12 +2,12 @@
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
-SHARED_LIBS= xine 35.0
+SHARED_LIBS= xine 36.0
HOMEPAGE= https://www.xine-project.org/
@@ -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: /home/cvs/ports/multimedia/xine-lib/distinfo,v
retrieving revision 1.31
diff -u -p -u -p -r1.31 distinfo
--- distinfo 25 Dec 2019 15:50:45 -0000 1.31
+++ distinfo 14 Jan 2021 23:25:26 -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: /home/cvs/ports/multimedia/xine-lib/patches/patch-configure_ac,v
retrieving revision 1.22
diff -u -p -u -p -r1.22 patch-configure_ac
--- patches/patch-configure_ac 25 Dec 2019 15:50:45 -0000 1.22
+++ patches/patch-configure_ac 15 Jan 2021 00:05:22 -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-include_xine_buffer_h
===================================================================
RCS file: patches/patch-include_xine_buffer_h
diff -N patches/patch-include_xine_buffer_h
--- patches/patch-include_xine_buffer_h 25 Dec 2019 15:50:45 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,15 +0,0 @@
-$OpenBSD: patch-include_xine_buffer_h,v 1.3 2019/12/25 15:50:45 ajacoutot Exp $
-
-Include pthread.h (BSD fix).
-
-Index: include/xine/buffer.h
---- include/xine/buffer.h.orig
-+++ include/xine/buffer.h
-@@ -37,6 +37,7 @@ extern "C" {
-
- #include <string.h> /* memcmp */
- #include <sys/types.h> /* pthread_* */
-+#include <pthread.h>
-
- #include <xine/os_types.h>
- #include <xine/attributes.h>
Index: patches/patch-include_xine_xineutils_h
===================================================================
RCS file: patches/patch-include_xine_xineutils_h
diff -N patches/patch-include_xine_xineutils_h
--- patches/patch-include_xine_xineutils_h 25 Dec 2019 15:50:45 -0000
1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,29 +0,0 @@
-$OpenBSD: patch-include_xine_xineutils_h,v 1.1 2019/12/25 15:50:45 ajacoutot
Exp $
-
-(Attempt to) fix clang build.
-
-Index: include/xine/xineutils.h
---- include/xine/xineutils.h.orig
-+++ include/xine/xineutils.h
-@@ -206,12 +206,21 @@ extern void *(* xine_fast_memcpy)(void *to, const void
- static inline void *xine_small_memcpy (void *to, const void *from, size_t
len) {
- void *t2 = to;
- size_t l2 = len;
-+# if !defined(__clang__)
- __asm__ __volatile__ (
- "cld\n\trep movsb"
- : "=S" (from), "=D" (t2), "=c" (l2), "=m" (*(struct {char foo[len];} *)to)
- : "0" (from), "1" (t2), "2" (l2)
- : "cc"
- );
-+# else /* clang dislikes virtual variable size struct */
-+ __asm__ __volatile__ (
-+ "cld\n\trep movsb"
-+ : "=S" (from), "=D" (t2), "=c" (l2)
-+ : "0" (from), "1" (t2), "2" (l2)
-+ : "cc", "memory"
-+ );
-+# endif
- (void)from;
- (void)t2;
- (void)l2;
Index: patches/patch-m4_decoders_m4
===================================================================
RCS file: /home/cvs/ports/multimedia/xine-lib/patches/patch-m4_decoders_m4,v
retrieving revision 1.6
diff -u -p -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 23:24:01 -0000
@@ -1,7 +1,5 @@
$OpenBSD: patch-m4_decoders_m4,v 1.6 2019/12/25 15:50:45 ajacoutot Exp $
-- Fix some --with[out]-*.
-
Index: m4/decoders.m4
--- m4/decoders.m4.orig
+++ m4/decoders.m4
@@ -14,175 +12,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: /home/cvs/ports/multimedia/xine-lib/patches/patch-m4_input_m4,v
retrieving revision 1.3
diff -u -p -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 15 Jan 2021 00:05:38 -0000
@@ -1,20 +1,11 @@
$OpenBSD: patch-m4_input_m4,v 1.3 2019/12/25 15:50:45 ajacoutot Exp $
-- Enable libv4l on OpenBSD.
-- Don't pick up GnuTLS over OpenSSL.
+Don't pick up GnuTLS over OpenSSL.
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_demuxers_demux_ts_c
===================================================================
RCS file: patches/patch-src_demuxers_demux_ts_c
diff -N patches/patch-src_demuxers_demux_ts_c
--- patches/patch-src_demuxers_demux_ts_c 25 Dec 2019 15:50:45 -0000
1.7
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,13 +0,0 @@
-$OpenBSD: patch-src_demuxers_demux_ts_c,v 1.7 2019/12/25 15:50:45 ajacoutot
Exp $
-
-Index: src/demuxers/demux_ts.c
---- src/demuxers/demux_ts.c.orig
-+++ src/demuxers/demux_ts.c
-@@ -3238,7 +3238,6 @@ static demux_plugin_t *open_plugin (demux_class_t *cla
- this->bpts = 0;
- this->last_pts[0] = 0;
- this->last_pts[1] = 0;
-- this->newpts_fifo = NULL;
- # if TS_PACKET_READER == 2
- this->buf_pos = 0;
- this->buf_size = 0;
Index: patches/patch-src_input_http_helper_c
===================================================================
RCS file: patches/patch-src_input_http_helper_c
diff -N patches/patch-src_input_http_helper_c
--- patches/patch-src_input_http_helper_c 25 Dec 2019 15:50:45 -0000
1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,17 +0,0 @@
-$OpenBSD: patch-src_input_http_helper_c,v 1.1 2019/12/25 15:50:45 ajacoutot
Exp $
-
-network: fix BSD.
-
-Index: src/input/http_helper.c
---- src/input/http_helper.c.orig
-+++ src/input/http_helper.c
-@@ -24,7 +24,9 @@
- #include "config.h"
- #endif
-
-+#ifdef HAVE_MALLOC_H
- #include <malloc.h>
-+#endif
- #include <string.h>
- #include <stdint.h>
-
Index: patches/patch-src_input_input_cdda_c
===================================================================
RCS file: patches/patch-src_input_input_cdda_c
diff -N patches/patch-src_input_input_cdda_c
--- patches/patch-src_input_input_cdda_c 25 Dec 2019 15:50:45 -0000
1.9
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,25 +0,0 @@
-$OpenBSD: patch-src_input_input_cdda_c,v 1.9 2019/12/25 15:50:45 ajacoutot Exp
$
-
-cdda: fix BSD.
-
-Index: src/input/input_cdda.c
---- src/input/input_cdda.c.orig
-+++ src/input/input_cdda.c
-@@ -782,7 +782,7 @@ static cdrom_toc_t *read_cdrom_toc (int fd) {
-
- /* allocate space for the toc entries */
- toc = calloc (1, sizeof (cdrom_toc_t) + total_tracks * sizeof
(cdrom_toc_entry_t));
-- if (!toc->toc_entries) {
-+ if (!toc) {
- perror("calloc");
- return NULL;
- }
-@@ -874,7 +874,7 @@ static cdrom_toc_t *read_cdrom_toc (int fd) {
- 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) +
Index: patches/patch-src_input_input_http_c
===================================================================
RCS file: patches/patch-src_input_input_http_c
diff -N patches/patch-src_input_input_http_c
--- patches/patch-src_input_input_http_c 25 Dec 2019 15:50:45 -0000
1.10
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,17 +0,0 @@
-$OpenBSD: patch-src_input_input_http_c,v 1.10 2019/12/25 15:50:45 ajacoutot
Exp $
-
-network: fix BSD.
-
-Index: src/input/input_http.c
---- src/input/input_http.c.orig
-+++ src/input/input_http.c
-@@ -30,6 +30,9 @@
- #ifdef HAVE_NETDB_H
- #include <netdb.h>
- #endif
-+#ifdef HAVE_SYS_SOCKET_H
-+#include <sys/socket.h>
-+#endif
- #include <ctype.h>
- #include <errno.h>
- #include <zlib.h>
Index: patches/patch-src_vdr_input_vdr_c
===================================================================
RCS file: patches/patch-src_vdr_input_vdr_c
diff -N patches/patch-src_vdr_input_vdr_c
--- patches/patch-src_vdr_input_vdr_c 25 Dec 2019 15:50:45 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,40 +0,0 @@
-$OpenBSD: patch-src_vdr_input_vdr_c,v 1.1 2019/12/25 15:50:45 ajacoutot Exp $
-
-Fix pointer alignment.
-
-Index: src/vdr/input_vdr.c
---- src/vdr/input_vdr.c.orig
-+++ src/vdr/input_vdr.c
-@@ -1319,7 +1319,7 @@ break;
- READ_DATA_OR_FAIL(video_size, lprintf("got VIDEO SIZE\n"));
-
- {
-- int format;
-+ int format, width, height, ratio;
-
- result_video_size_t result_video_size;
- result_video_size.header.func = data->header.func;
-@@ -1331,15 +1331,18 @@ break;
- result_video_size.height = -1;
- result_video_size.ratio = 0;
-
-- xine_get_current_frame_s(this->stream, &result_video_size.width,
&result_video_size.height, &result_video_size.ratio, &format, NULL, NULL);
-+ xine_get_current_frame_s(this->stream, &width, &height, &ratio,
&format, NULL, NULL);
-+ result_video_size.width = width;
-+ result_video_size.height = height;
-+ result_video_size.ratio = ratio;
-
-- if (result_video_size.ratio == XINE_VO_ASPECT_SQUARE)
-+ if (ratio == XINE_VO_ASPECT_SQUARE)
- result_video_size.ratio = 10000;
-- else if (result_video_size.ratio == XINE_VO_ASPECT_4_3)
-+ else if (ratio == XINE_VO_ASPECT_4_3)
- result_video_size.ratio = 13333;
-- else if (result_video_size.ratio == XINE_VO_ASPECT_ANAMORPHIC)
-+ else if (ratio == XINE_VO_ASPECT_ANAMORPHIC)
- result_video_size.ratio = 17778;
-- else if (result_video_size.ratio == XINE_VO_ASPECT_DVB)
-+ else if (ratio == XINE_VO_ASPECT_DVB)
- result_video_size.ratio = 21100;
-
- if (0 != this->frame_size.x
Index: patches/patch-src_xine-engine_builtins_h
===================================================================
RCS file: patches/patch-src_xine-engine_builtins_h
diff -N patches/patch-src_xine-engine_builtins_h
--- patches/patch-src_xine-engine_builtins_h 25 Dec 2019 15:50:45 -0000
1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,24 +0,0 @@
-$OpenBSD: patch-src_xine-engine_builtins_h,v 1.1 2019/12/25 15:50:45 ajacoutot
Exp $
-
-Simplify.
-
-Index: src/xine-engine/builtins.h
---- src/xine-engine/builtins.h.orig
-+++ src/xine-engine/builtins.h
-@@ -23,16 +23,8 @@
- #ifndef XINE_ENGINE_BUILTINS_H
- #define XINE_ENGINE_BUILTINS_H
-
--#if defined(HAVE_CONFIG_H) && !defined(__XINE_LIB_CONFIG_H__)
--# error config.h not included
--#endif
--
--#ifdef XINE_MAKE_BUILTINS
--
- #include <xine/xine_internal.h>
-
- extern const plugin_info_t xine_builtin_plugin_info[];
--
--#endif
-
- #endif
Index: patches/patch-src_xine-engine_load_plugins_c
===================================================================
RCS file: patches/patch-src_xine-engine_load_plugins_c
diff -N patches/patch-src_xine-engine_load_plugins_c
--- patches/patch-src_xine-engine_load_plugins_c 25 Dec 2019 15:50:45
-0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,17 +0,0 @@
-$OpenBSD: patch-src_xine-engine_load_plugins_c,v 1.1 2019/12/25 15:50:45
ajacoutot Exp $
-
-Simplify.
-
-Index: src/xine-engine/load_plugins.c
---- src/xine-engine/load_plugins.c.orig
-+++ src/xine-engine/load_plugins.c
-@@ -71,7 +71,9 @@
-
- #include "xine_private.h"
-
-+#ifdef XINE_MAKE_BUILTINS
- #include "builtins.h"
-+#endif
-
- #if 0
-
Index: patches/patch-src_xine-utils_memcpy_c
===================================================================
RCS file:
/home/cvs/ports/multimedia/xine-lib/patches/patch-src_xine-utils_memcpy_c,v
retrieving revision 1.6
diff -u -p -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 15 Jan 2021 00:05:20 -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: patches/patch-src_xine-utils_xmlparser_c
===================================================================
RCS file: patches/patch-src_xine-utils_xmlparser_c
diff -N patches/patch-src_xine-utils_xmlparser_c
--- patches/patch-src_xine-utils_xmlparser_c 25 Dec 2019 15:50:45 -0000
1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,16 +0,0 @@
-$OpenBSD: patch-src_xine-utils_xmlparser_c,v 1.1 2019/12/25 15:50:45 ajacoutot
Exp $
-
-Avoid NULL string argument for printf().
-
-Index: src/xine-utils/xmlparser.c
---- src/xine-utils/xmlparser.c.orig
-+++ src/xine-utils/xmlparser.c
-@@ -145,7 +145,7 @@ static void xml_parser_free_props(xml_property_t *curr
- }
-
- static void xml_parser_free_tree_rec(xml_node_t *current_node, int free_next)
{
-- lprintf("xml_parser_free_tree_rec: %s\n", current_node ? current_node->name
: NULL);
-+ lprintf("xml_parser_free_tree_rec: %s\n", current_node ? current_node->name
: "(null)");
-
- if (current_node) {
- /* properties */
Index: pkg/PLIST
===================================================================
RCS file: /home/cvs/ports/multimedia/xine-lib/pkg/PLIST,v
retrieving revision 1.27
diff -u -p -u -p -r1.27 PLIST
--- pkg/PLIST 25 Dec 2019 15:50:45 -0000 1.27
+++ pkg/PLIST 14 Jan 2021 23:25:05 -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
