<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/8e3ba7872289f732dece82402f2c969c7d84477a">https://github.com/macports/macports-ports/commit/8e3ba7872289f732dece82402f2c969c7d84477a</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 8e3ba78 xine-lib: Update to 1.2.8
</span>8e3ba78 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 8e3ba7872289f732dece82402f2c969c7d84477a
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Sat Mar 4 06:33:24 2017 -0600
<span style='display:block; white-space:pre;color:#404040;'> xine-lib: Update to 1.2.8
</span>---
multimedia/xine-lib/Portfile | 12 +++----
multimedia/xine-lib/files/patch-ffmpeg-3.0.diff | 42 ----------------------
.../files/patch-src-post-planar-eq2.c.diff | 13 -------
.../files/src_xine-engine_Makefile.in.diff | 8 +++--
.../xine-lib/files/xine_builtin_plugin_info.patch | 15 ++++++++
5 files changed, 24 insertions(+), 66 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 63badb5..216aa19 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,7 @@
</span> PortSystem 1.0
name xine-lib
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 1.2.6
</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.8
</span> description xine-lib is a free multimedia engine, released under the GPL.
long_description ${description}
maintainers ryandesign openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -14,8 +13,8 @@ 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 05edcd9a36e93d2fc9d1bf13cae3b32d4bd996da \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 bd041d738817c7c0c6392a3c0e5bda5a664a47e035135b5a449364f8c9b6a005
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 6e20ba7f06650b0a8cfc152de09182930afcd2b9 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 f1b299a71dcae075bf6792e7b5a2020ed5ac8c46ad5091e004ce266aac40e8a6
</span>
depends_build port:libtool \
port:pkgconfig
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -43,8 +42,7 @@ depends_lib port:aalib \
</span> port:xorg-libXvMC \
port:xorg-xcb-util
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-src-post-planar-eq2.c.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-ffmpeg-3.0.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles xine_builtin_plugin_info.patch
</span>
# bad register name `%rax'
universal_variant no
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -59,8 +57,6 @@ if {${os.platform} eq "darwin" && [string match *64 $build_arch]} {
</span> build.args V=1
platform darwin {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # fix "ar: no archive members specified"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # https://bugs.xine-project.org/show_bug.cgi?id=456
</span> patchfiles-append src_xine-engine_Makefile.in.diff
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/xine-lib/files/patch-ffmpeg-3.0.diff b/multimedia/xine-lib/files/patch-ffmpeg-3.0.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 7badb5f..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/xine-lib/files/patch-ffmpeg-3.0.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,42 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -u src/combined/ffmpeg.orig/ff_audio_decoder.c src/combined/ffmpeg/ff_audio_decoder.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/combined/ffmpeg.orig/ff_audio_decoder.c 2014-06-09 09:08:42.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/combined/ffmpeg/ff_audio_decoder.c 2016-04-21 22:16:46.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -590,7 +590,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int got_frame;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- float gain = this->class->gain;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (!this->av_frame)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- this->av_frame = avcodec_alloc_frame ();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ this->av_frame = av_frame_alloc ();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- consumed = avcodec_decode_audio4 (this->context, this->av_frame, &got_frame, &avpkt);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if ((consumed >= 0) && got_frame) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1071,7 +1071,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* try to reset the wma decoder */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if( this->decoder_ok ) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #if AVAUDIO > 3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- avcodec_free_frame (&this->av_frame);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ av_frame_free (&this->av_frame);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pthread_mutex_lock (&ffmpeg_lock);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- avcodec_close (this->context);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1105,7 +1105,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if( this->context && this->decoder_ok ) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #if AVAUDIO > 3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- avcodec_free_frame (&this->av_frame);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ av_frame_free (&this->av_frame);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pthread_mutex_lock (&ffmpeg_lock);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- avcodec_close (this->context);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -u src/combined/ffmpeg.orig/ff_video_decoder.c src/combined/ffmpeg/ff_video_decoder.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/combined/ffmpeg.orig/ff_video_decoder.c 2014-06-24 09:21:06.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/combined/ffmpeg/ff_video_decoder.c 2016-04-21 22:14:45.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2523,7 +2523,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- this->stream = stream;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- this->class = (ff_video_class_t *) class_gen;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- this->av_frame = avcodec_alloc_frame();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ this->av_frame = av_frame_alloc();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- this->context = avcodec_alloc_context();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- this->context->opaque = this;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #if AVPALETTE == 1
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/xine-lib/files/patch-src-post-planar-eq2.c.diff b/multimedia/xine-lib/files/patch-src-post-planar-eq2.c.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 3996c73..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/xine-lib/files/patch-src-post-planar-eq2.c.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,13 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://bugs.xine-project.org/show_bug.cgi?id=541
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://svnweb.freebsd.org/ports/head/multimedia/libxine/files/patch-src-post-planar-eq2.c?revision=371159&view=markup
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/post/planar/eq2.c.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/post/planar/eq2.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -129,7 +129,7 @@ void affine_1d_MMX (eq2_param_t *par, un
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "movq (%1), %%mm4 \n\t"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "pxor %%mm0, %%mm0 \n\t"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- :
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- : "g" (brvec), "g" (contvec)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ : "r" (brvec), "r" (contvec)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- while (h-- > 0) {
</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 f7c2490..01c9086 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,6 +1,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/xine-engine/Makefile.in.orig 2013-09-23 15:58:19.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/xine-engine/Makefile.in 2013-09-24 19:12:24.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -693,7 +693,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ar: no archive members specified
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://bugs.xine-project.org/show_bug.cgi?id=456
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/xine-engine/Makefile.in.orig 2017-02-21 11:03:56.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/xine-engine/Makefile.in 2017-03-04 05:44:04.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -712,7 +712,11 @@
</span> }
libxine-interface.la: $(libxine_interface_la_OBJECTS) $(libxine_interface_la_DEPENDENCIES) $(EXTRA_libxine_interface_la_DEPENDENCIES)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/xine-lib/files/xine_builtin_plugin_info.patch b/multimedia/xine-lib/files/xine_builtin_plugin_info.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..597f153
</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/xine_builtin_plugin_info.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,15 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+duplicate symbol _xine_builtin_plugin_info in:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .libs/load_plugins.o
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .libs/builtins.o
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://bugs.xine-project.org/show_bug.cgi?id=579
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/xine-engine/builtins.h.orig 2017-02-21 05:13:13.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/xine-engine/builtins.h 2017-03-04 06:22:57.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -31,7 +31,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <xine/xine_internal.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-const plugin_info_t xine_builtin_plugin_info[7];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++extern const plugin_info_t xine_builtin_plugin_info[7];
</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;'>+
</span></pre><pre style='margin:0'>
</pre>