<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/cf4aa2a18ed3932ce6bf976cfda9d56c50579ce7">https://github.com/macports/macports-ports/commit/cf4aa2a18ed3932ce6bf976cfda9d56c50579ce7</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit cf4aa2a18ed3932ce6bf976cfda9d56c50579ce7
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Thu Dec 16 19:56:41 2021 -0600
<span style='display:block; white-space:pre;color:#404040;'> xine-lib: Update to 1.2.11
</span>---
multimedia/xine-lib/Portfile | 14 +++++------
multimedia/xine-lib/files/attributes.patch | 16 ++++++++++++
multimedia/xine-lib/files/clang.patch | 27 --------------------
multimedia/xine-lib/files/demux_ts.c.patch | 12 ---------
multimedia/xine-lib/files/headers.patch | 40 ------------------------------
5 files changed, 22 insertions(+), 87 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 c9d416ab36c..2417f063627 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;'>@@ -3,11 +3,11 @@
</span> PortSystem 1.0
name xine-lib
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 1.2.10
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 1dba24e9e6c4f21e766d9b696dd02f4e645f4c8c \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 9cb3f069d3c1ffb7456ea91a936a85bbb07ac2ab7be1e9d0d2c94ffe4110dc57 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 5226116
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 1.2.11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 025b1bd5b46e98d8676293359f6e4237df7d7e39 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 ef51b21d10dda1045fa7d711bd9171cfdaf0a5a2874233bcf16ffdf28ec07005 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 5282204
</span>
categories multimedia
platforms darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -64,9 +64,7 @@ depends_lib port:a52dec \
</span> port:xorg-libXvMC \
port:xorg-xcb-util
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append clang.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- demux_ts.c.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- headers.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append attributes.patch \
</span> implicit.patch \
libcaca0.99.beta20.patch
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/xine-lib/files/attributes.patch b/multimedia/xine-lib/files/attributes.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..fc2bf5b7bd4
</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/attributes.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,16 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Revert https://sourceforge.net/p/xine/xine-lib-1.2/ci/10606a9eead360fc11276a27a32d5658acb1ada8/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+to fix "error: config.h not included in source file !"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://sourceforge.net/p/xine/mailman/message/37402193/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- include/xine/attributes.h.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ include/xine/attributes.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -27,9 +27,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define ATTRIBUTE_H_
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef XINE_COMPILE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# if defined(HAVE_CONFIG_H) && !defined(__XINE_LIB_CONFIG_H__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# error config.h not included in source file !
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# include "configure.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95 )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # define SUPPORT_ATTRIBUTE_PACKED 1
</span><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>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index be2c6c42f97..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/xine-lib/files/clang.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,27 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Fix "error: fields must have a constant size: 'variable length array in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-structure' extension will never be supported"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://sourceforge.net/p/xine/xine-lib-1.2/ci/8a600997a405b2ba0608741c38bfc2dac9dbcea1/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- include/xine/xineutils.h.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ include/xine/xineutils.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -206,12 +206,21 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static inline void *xine_small_memcpy (void *to, const void *from, size_t len) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void *t2 = to;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size_t l2 = len;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# if !defined(__clang__)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- __asm__ __volatile__ (
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "cld\n\trep movsb"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- : "=S" (from), "=D" (t2), "=c" (l2), "=m" (*(struct {char foo[len];} *)to)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- : "0" (from), "1" (t2), "2" (l2)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- : "cc"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# else /* clang dislikes virtual variable size struct */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ __asm__ __volatile__ (
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "cld\n\trep movsb"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ : "=S" (from), "=D" (t2), "=c" (l2)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ : "0" (from), "1" (t2), "2" (l2)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ : "cc", "memory"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- (void)from;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- (void)t2;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- (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>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 3ec7d53a0ed..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/xine-lib/files/demux_ts.c.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,12 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Fix non-Linux build.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://sourceforge.net/p/xine/xine-lib-1.2/ci/5941252eda4dfb2d8f5f4d3046e102b3b48f474f/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/demuxers/demux_ts.c.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/demuxers/demux_ts.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3238,7 +3238,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- this->bpts = 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- this->last_pts[0] = 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- this->last_pts[1] = 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- this->newpts_fifo = NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # if TS_PACKET_READER == 2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- this->buf_pos = 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 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>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 3c139c02952..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/xine-lib/files/headers.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,40 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Don't include malloc.h when it doesn't exist. Do include sys/socket.h.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://sourceforge.net/p/xine/xine-lib-1.2/ci/e3f5170b04a872b58f87027d11c4e34a2b80462e/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/input/http_helper.c.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/input/http_helper.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -24,7 +24,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "config.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef HAVE_MALLOC_H
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <malloc.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <string.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <stdint.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/input/input_http.c.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/input/input_http.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -29,6 +29,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <string.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef HAVE_NETDB_H
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <netdb.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef HAVE_SYS_SOCKET_H
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <sys/socket.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <ctype.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <errno.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/input/tls/tls_gnutls.c.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/input/tls/tls_gnutls.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -41,7 +41,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifndef XINE_GNUTLS_3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# include <malloc.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# ifdef HAVE_MALLOC_H
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# include <malloc.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # include <string.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # include <sys/stat.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # include <dirent.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span></pre><pre style='margin:0'>
</pre>