<pre style='margin:0'>
David B. Evans (dbevans) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/ab0574731f1fc836119182ce0a13a6329f948440">https://github.com/macports/macports-ports/commit/ab0574731f1fc836119182ce0a13a6329f948440</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit ab0574731f1fc836119182ce0a13a6329f948440
</span>Author: David B. Evans <devans@macports.org>
AuthorDate: Fri May 11 00:13:59 2018 -0700
<span style='display:block; white-space:pre;color:#404040;'> gstreamer1-gst-plugins-good: update to version 1.14.0
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> * update dependencies, configuration
</span><span style='display:block; white-space:pre;color:#404040;'> * add plugins, variants moved from bad/ugly
</span><span style='display:block; white-space:pre;color:#404040;'> * deactivate conflicting ports bad/ugly in pre-activate
</span>---
gnome/gstreamer1-gst-plugins-good/Portfile | 90 +++++++++++++++++-----
.../files/snowleopard-memmem.patch | 2 +-
.../files/snowleopard-strnlen.patch | 2 +-
3 files changed, 73 insertions(+), 21 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/gstreamer1-gst-plugins-good/Portfile b/gnome/gstreamer1-gst-plugins-good/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 096bb3f..c911167 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/gstreamer1-gst-plugins-good/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/gstreamer1-gst-plugins-good/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,17 +4,13 @@ PortSystem 1.0
</span>
# https://bugzilla.gnome.org/show_bug.cgi?id=636134
PortGroup muniversal 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup active_variants 1.1
</span> PortGroup compiler_blacklist_versions 1.0
name gstreamer1-gst-plugins-good
set my_name gst-plugins-good
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# unstable versions of the gstreamer1 series are typically, well, unstable
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# typical issues are movement of plugins from one category to another (e.q. bad->good),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# addition of new plugins and removal of others, missing files, etc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# beginning with the 1.12 stable series please only push stable versions to git
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# and then only after addressing any possible issues discovered during the previous unstable series.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-version 1.12.4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# please only commit stable updates (even numbered releases)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 1.14.0
</span> description A set of good-quality plug-ins for GStreamer under GStreamer's preferred \
license, LGPL.
long_description GStreamer Good Plug-ins is a set of plug-ins that GStreamer's developers \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -30,19 +26,19 @@ master_sites https://gstreamer.freedesktop.org/src/${my_name}/
</span> use_xz yes
distname ${my_name}-${version}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 9ec4a9709d62b4ac156547674fbfef6da8d9e6c1 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 649f49bec60892d47ee6731b92266974c723554da1c6649f21296097715eb957
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 71b866bbc5d86abf03901ee4e8b1406b30e08575 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 6afa35747d528d3ab4ed8f5eac13f7235d7d28100d6a24dd78f81ec7c0d04688 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 3769304
</span>
depends_build port:pkgconfig
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# libvpx 1.7.0 now provides a shared library
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# move dependency from depends_build to depends_lib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> depends_lib port:gstreamer1-gst-plugins-base \
port:aalib \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:lib/pkgconfig/cairo.pc:cairo \
</span> port:flac \
port:gdk-pixbuf2 \
port:jpeg \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:lame \
</span> path:lib/libcaca.dylib:libcaca \
port:libdv \
port:libpng \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -50,7 +46,10 @@ depends_lib port:gstreamer1-gst-plugins-base \
</span> port:libsoup \
path:lib/libspeex.dylib:speex \
port:libvpx \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:mpg123 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:orc \
</span> port:taglib \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:twolame \
</span> port:wavpack
platform darwin {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -72,9 +71,12 @@ configure.args-append \
</span> --disable-fatal-warnings \
--disable-silent-rules \
--disable-gtk-doc \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-default-videosink=ximagesink \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --disable-examples \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --disable-gtk3 \
</span> --disable-jack \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-pulse
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --disable-pulse \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --disable-qt \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --disable-x
</span>
configure.env-append "HAVE_CXX=yes"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -90,19 +92,51 @@ platform darwin {
</span> }
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+variant gtk3 requires x11 description {Enable GTK3 X11/GL windowing elements} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:gtk3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-delete --disable-gtk3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# gtk3 elements require gtk3 +x11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[variant_isset gtk3]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ require_active_variants gtk3 x11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> variant jack description {Enable Jack plugin} {
depends_lib-append port:jack
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-replace --disable-jack \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-jack
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-delete --disable-jack
</span> }
variant pulseaudio description {Enable PulseAudio plugin} {
depends_lib-append port:pulseaudio
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-replace --disable-pulse \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-pulse
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-delete --disable-pulse
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant x11 {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:xorg-libX11 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:xorg-libXfixes \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:xorg-libXdamage \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:xorg-libXext
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --with-default-videosink=ximagesink
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-delete --disable-x
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-default_variants +pulseaudio
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default_variants +pulseaudio +x11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant qt description {Enable QT5 MAC windowing elements } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PortGroup qt5 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PortGroup cxx11 1.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ qt5.depends_component qtdeclarative \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ qtmacextras
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-delete --disable-qt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # avoid:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # ${prefix}/libexec/qt5/include/QtCore/qcompilerdetection.h:562:6: error: Qt requires a C++11 compiler and yours does not seem to be that.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.cxxflags-append -std=c++11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
if {[variant_isset universal]} {
set merger_host(x86_64) x86_64-apple-${os.platform}${os.major}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -125,6 +159,24 @@ if {[variant_isset universal]} {
</span> # <rdar://problem/9694837> - Fixed in XCode 4.2 (clang 211.10.1)
compiler.blacklist {clang < 211.10.1}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# in version 1.14.0 some functionality moved here from bad and ugly
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# deactivate the old ports before activating the new one
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+pre-activate {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {![catch {set installed [lindex [registry_active gstreamer1-gst-plugins-bad] 0]}]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set _version [lindex $installed 1]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[vercmp $_version 1.14.0] < 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ registry_deactivate_composite gstreamer1-gst-plugins-bad "" [list ports_nodepcheck 1]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {![catch {set installed [lindex [registry_active gstreamer1-gst-plugins-ugly] 0]}]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set _version [lindex $installed 1]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[vercmp $_version 1.14.0] < 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ registry_deactivate_composite gstreamer1-gst-plugins-ugly "" [list ports_nodepcheck 1]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> livecheck.type regex
livecheck.url ${master_sites}
livecheck.regex "${my_name}-(\\d+\\\.\\d*\[02468\](?:\\.\\d+)*)${extract.suffix}"
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/gstreamer1-gst-plugins-good/files/snowleopard-memmem.patch b/gnome/gstreamer1-gst-plugins-good/files/snowleopard-memmem.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index a38102e..348b600 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/gstreamer1-gst-plugins-good/files/snowleopard-memmem.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/gstreamer1-gst-plugins-good/files/snowleopard-memmem.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span> --- tests/icles/test-accurate-seek.c.orig 2015-03-05 03:07:44.000000000 -0800
+++ tests/icles/test-accurate-seek.c 2015-10-10 22:35:30.000000000 -0700
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -147,6 +147,35 @@ generate_test_sound (const gchar * fn, c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -169,6 +169,35 @@ generate_test_sound (const gchar * fn, c
</span> /* g_print ("Done %s\n", fn); */
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/gstreamer1-gst-plugins-good/files/snowleopard-strnlen.patch b/gnome/gstreamer1-gst-plugins-good/files/snowleopard-strnlen.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index dd3cc86..7afc2e9 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/gstreamer1-gst-plugins-good/files/snowleopard-strnlen.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/gstreamer1-gst-plugins-good/files/snowleopard-strnlen.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span> --- ./gst/isomp4/gstqtmux.c.orig 2015-06-24 02:14:41.000000000 -0700
+++ ./gst/isomp4/gstqtmux.c 2015-10-10 22:20:32.000000000 -0700
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -686,6 +686,18 @@ gst_qt_mux_prepare_jpc_buffer (GstQTPad
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -854,6 +854,18 @@ gst_qt_mux_prepare_jpc_buffer (GstQTPad
</span> return newbuf;
}
</pre><pre style='margin:0'>
</pre>