<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/03a1d2db4593381c4023c9b8a24f2959942b69c7">https://github.com/macports/macports-ports/commit/03a1d2db4593381c4023c9b8a24f2959942b69c7</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 03a1d2d xine-lib: Update to 1.2.10
</span>03a1d2d is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 03a1d2db4593381c4023c9b8a24f2959942b69c7
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Mon Apr 27 04:36:57 2020 -0500
<span style='display:block; white-space:pre;color:#404040;'> xine-lib: Update to 1.2.10
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Add configure args to be more specific about which features we want
</span><span style='display:block; white-space:pre;color:#404040;'> enabled.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Add patches to fix build failures that are already fixed upstream.
</span>---
multimedia/xine-lib/Portfile | 61 +++++++++++++++++++---
multimedia/xine-lib/files/clang.patch | 27 ++++++++++
multimedia/xine-lib/files/demux_ts.c.patch | 12 +++++
multimedia/xine-lib/files/headers.patch | 40 ++++++++++++++
.../files/src_xine-engine_Makefile.in.diff | 6 +--
5 files changed, 135 insertions(+), 11 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/xine-lib/Portfile b/multimedia/xine-lib/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 1a4969f..5efacfa 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/xine-lib/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/xine-lib/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,8 +1,12 @@
</span> PortSystem 1.0
name xine-lib
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 1.2.9
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 1.2.10
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 1dba24e9e6c4f21e766d9b696dd02f4e645f4c8c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 9cb3f069d3c1ffb7456ea91a936a85bbb07ac2ab7be1e9d0d2c94ffe4110dc57 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 5226116
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> description xine-lib is a free multimedia engine, released under the GPL.
long_description ${description}
maintainers {ryandesign @ryandesign} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -14,48 +18,89 @@ homepage http://www.xine-project.org
</span> master_sites sourceforge:project/xine/xine-lib/${version}
use_xz yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 3feb81b93add382c5382984980189f323f2ac746 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 32b34e8049feb762d75a551d5d2cdb56c396fdd83e35b9b7de5fd08e498e948d \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 5180452
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> depends_build port:libtool \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:optipng \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:xmlto \
</span> port:pkgconfig
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib port:aalib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib port:a52dec \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:aalib \
</span> port:esound \
port:faad2 \
path:lib/libavcodec.dylib:ffmpeg \
port:flac \
port:fontconfig \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:freetype \
</span> port:gdk-pixbuf2 \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:gnutls \
</span> port:ImageMagick \
port:jack \
port:libbluray \
port:libcaca \
port:libcdio \
port:libdca \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libdvdread \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libdvdnav \
</span> port:libmad \
port:libmng \
port:libmpcdec \
port:libogg \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libsdl \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libssh2 \
</span> port:libvorbis \
port:libvpx \
port:mesa \
port:vcdimager \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:wavpack \
</span> port:xorg-libXinerama \
port:xorg-libXt \
port:xorg-libXvMC \
port:xorg-xcb-util
<span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append clang.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ demux_ts.c.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ headers.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # bad register name `%rax'
universal_variant no
# unsupported inline asm: input constraint with a matching output constraint of incompatible type!
compiler.blacklist *llvm-gcc-4.2
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args --disable-silent-rules
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args --disable-silent-rules \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --enable-a52dec \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --enable-dvd \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --enable-faad \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --enable-ffmpeg \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --enable-libjpeg \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --enable-libpng \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --enable-mad \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --enable-mng \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --enable-modplug \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --enable-sftp \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --enable-tls \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --enable-vpx \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --enable-xinerama \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --enable-xvmc \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-esound \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-external-dvdnav \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-fontconfig \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-freetype \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-jack \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-libflac \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-imagemagick \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-sdl \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-speex \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-theora \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-vorbis \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-wavpack \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-x \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-xcb
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> if {${os.platform} eq "darwin" && [string match *64 $build_arch]} {
configure.args-append --build=${build_arch}-apple-${os.platform}${os.version}
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> build.args V=1
platform darwin {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/xine-lib/files/clang.patch b/multimedia/xine-lib/files/clang.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..be2c6c4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/xine-lib/files/clang.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,27 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fix "error: fields must have a constant size: 'variable length array in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+structure' extension will never be supported"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://sourceforge.net/p/xine/xine-lib-1.2/ci/8a600997a405b2ba0608741c38bfc2dac9dbcea1/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- include/xine/xineutils.h.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ include/xine/xineutils.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -206,12 +206,21 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static inline void *xine_small_memcpy (void *to, const void *from, size_t len) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void *t2 = to;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size_t l2 = len;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# if !defined(__clang__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ __asm__ __volatile__ (
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "cld\n\trep movsb"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ : "=S" (from), "=D" (t2), "=c" (l2), "=m" (*(struct {char foo[len];} *)to)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ : "0" (from), "1" (t2), "2" (l2)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ : "cc"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# else /* clang dislikes virtual variable size struct */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ __asm__ __volatile__ (
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "cld\n\trep movsb"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ : "=S" (from), "=D" (t2), "=c" (l2)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ : "0" (from), "1" (t2), "2" (l2)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ : "cc", "memory"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (void)from;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (void)t2;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (void)l2;
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/xine-lib/files/demux_ts.c.patch b/multimedia/xine-lib/files/demux_ts.c.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..3ec7d53
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/xine-lib/files/demux_ts.c.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fix non-Linux build.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://sourceforge.net/p/xine/xine-lib-1.2/ci/5941252eda4dfb2d8f5f4d3046e102b3b48f474f/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/demuxers/demux_ts.c.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/demuxers/demux_ts.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3238,7 +3238,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ this->bpts = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ this->last_pts[0] = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ this->last_pts[1] = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- this->newpts_fifo = NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # if TS_PACKET_READER == 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ this->buf_pos = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ this->buf_size = 0;
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/xine-lib/files/headers.patch b/multimedia/xine-lib/files/headers.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..3c139c0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/xine-lib/files/headers.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,40 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Don't include malloc.h when it doesn't exist. Do include sys/socket.h.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://sourceforge.net/p/xine/xine-lib-1.2/ci/e3f5170b04a872b58f87027d11c4e34a2b80462e/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/input/http_helper.c.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/input/http_helper.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -24,7 +24,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "config.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef HAVE_MALLOC_H
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <malloc.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <string.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <stdint.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/input/input_http.c.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/input/input_http.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -29,6 +29,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <string.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef HAVE_NETDB_H
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <netdb.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef HAVE_SYS_SOCKET_H
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <sys/socket.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <ctype.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <errno.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/input/tls/tls_gnutls.c.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/input/tls/tls_gnutls.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -41,7 +41,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifndef XINE_GNUTLS_3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# include <malloc.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# ifdef HAVE_MALLOC_H
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# include <malloc.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # include <string.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # include <sys/stat.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # include <dirent.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/xine-lib/files/src_xine-engine_Makefile.in.diff b/multimedia/xine-lib/files/src_xine-engine_Makefile.in.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 90955d6..80431115 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/xine-lib/files/src_xine-engine_Makefile.in.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/xine-lib/files/src_xine-engine_Makefile.in.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,8 +1,8 @@
</span> ar: no archive members specified
https://bugs.xine-project.org/show_bug.cgi?id=456
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/xine-engine/Makefile.in.orig 2018-01-11 06:51:14.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/xine-engine/Makefile.in 2018-01-26 09:06:53.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -715,7 +715,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/xine-engine/Makefile.in.orig 2019-12-13 15:36:00.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/xine-engine/Makefile.in 2020-04-26 23:57:24.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -751,7 +751,11 @@
</span> }
libxine-interface.la: $(libxine_interface_la_OBJECTS) $(libxine_interface_la_DEPENDENCIES) $(EXTRA_libxine_interface_la_DEPENDENCIES)
</pre><pre style='margin:0'>
</pre>