<pre style='margin:0'>
Mihai Moldovan (Ionic) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/1b5491fea996e493a165b1cae71c2015c758c206">https://github.com/macports/macports-ports/commit/1b5491fea996e493a165b1cae71c2015c758c206</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 1b5491fea996e493a165b1cae71c2015c758c206
</span>Author: Mihai Moldovan <ionic@ionic.de>
AuthorDate: Wed Jul 4 12:14:07 2018 +0200
<span style='display:block; white-space:pre;color:#404040;'> gnome/gstreamer1-gst-plugins-base: rework OpenGL X11/Cocoa handling again, revbump.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes: https://trac.macports.org/ticket/56764
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Makes the cocoa and x11 variants conflicting. This will only affect the
</span><span style='display:block; white-space:pre;color:#404040;'> OpenGL plugin - and we only want to link one runtime there anyway.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Older systems, universal builds or architectures other than x86_64 will
</span><span style='display:block; white-space:pre;color:#404040;'> get OpenGL support through MESA's libGL via the default-enabled x11
</span><span style='display:block; white-space:pre;color:#404040;'> variant.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Otherwise, we prefer the cocoa variant.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Additionally, completely disable OpenGL|ES support. It causes compile
</span><span style='display:block; white-space:pre;color:#404040;'> failures due to type differences in 32bit mode and is not useful to the
</span><span style='display:block; white-space:pre;color:#404040;'> non-embedded systems we support.
</span>---
gnome/gstreamer1-gst-plugins-base/Portfile | 19 ++++++---
.../files/patch-allow-MESA-GL-on-macOS.diff | 48 ++++++++++++++++++++++
2 files changed, 61 insertions(+), 6 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/gstreamer1-gst-plugins-base/Portfile b/gnome/gstreamer1-gst-plugins-base/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index b86befa..16faa54 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/gstreamer1-gst-plugins-base/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/gstreamer1-gst-plugins-base/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -10,7 +10,7 @@ name gstreamer1-gst-plugins-base
</span> set my_name gst-plugins-base
# please only commit stable updates (even numbered releases)
version 1.14.1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 4
</span> description This is gst-plugins, a set of plug-ins for GStreamer.
long_description ${description}
maintainers nomaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -38,6 +38,12 @@ depends_lib port:gstreamer1 \
</span>
gobject_introspection yes
<span style='display:block; white-space:pre;background:#e0ffe0;'>+use_autoreconf yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+autoreconf.args -fvi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-allow-MESA-GL-on-macOS.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Embedded systems are not our primary target, so disable OpenGL|ES support.
</span> configure.args-append \
--disable-fatal-warnings \
--disable-silent-rules \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -54,6 +60,7 @@ configure.args-append \
</span> --disable-xvideo \
--disable-cocoa \
--disable-opengl \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ --disable-gles2 \
</span> --disable-xshm
#gstbasetextoverlay.c:1511: error: 'for' loop initial declaration used outside C99 mode
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -68,7 +75,7 @@ platform darwin {
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant x11 {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant x11 conflicts cocoa {
</span> depends_lib-append \
port:mesa \
port:xorg-libX11 \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -87,9 +94,7 @@ variant x11 {
</span> --enable-opengl
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-default_variants +x11
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-variant cocoa conflicts universal description {Add support for native Cocoa output. Only supported for pure x86_64 builds.} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant cocoa conflicts universal x11 description {Add support for the OpenGL Cocoa backend. Only supported for pure x86_64 builds.} {
</span> if {${build_arch} ne "x86_64"} {
ui_error "The variant cocoa is not supported on architectures other than x86_64"
error "Cocoa output only supported on x86_64 architecture"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -106,8 +111,10 @@ variant cocoa conflicts universal description {Add support for native Cocoa outp
</span> --enable-opengl
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {${os.major} >= 13 && ![variant_isset universal] && ${build_arch} eq "x86_64"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${os.major} >= 13 && ![variant_isset universal] && ![variant_isset x11] && ${build_arch} eq "x86_64"} {
</span> default_variants +cocoa
<span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_variants +x11
</span> }
variant ogg description {Build with support for libogg, libvorbis, libtheora} {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/gstreamer1-gst-plugins-base/files/patch-allow-MESA-GL-on-macOS.diff b/gnome/gstreamer1-gst-plugins-base/files/patch-allow-MESA-GL-on-macOS.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..3120eaf
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/gstreamer1-gst-plugins-base/files/patch-allow-MESA-GL-on-macOS.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,48 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- gst-libs/gst/gl/gstglfuncs.h.old 2018-03-23 21:44:42.000000000 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ gst-libs/gst/gl/gstglfuncs.h 2018-07-04 11:23:52.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -54,7 +54,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* OpenGL for desktop systems */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if GST_GL_HAVE_OPENGL
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# ifdef __APPLE__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# if GST_GL_HAVE_WINDOW_COCOA
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # include <OpenGL/OpenGL.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # include <OpenGL/gl.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # if MAC_OS_X_VERSION_MAX_ALLOWED >= 1070
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- m4/gst-gl.m4.old 2018-03-23 21:44:42.000000000 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ m4/gst-gl.m4 2018-07-04 11:56:10.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -338,12 +338,16 @@ dnl check if we can include both GL and
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if test "x$HAVE_GL" = "xyes" -a "x$HAVE_GLES2" = "xyes"; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GLES3_H_DEFINE=0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GLES3EXT3_H_DEFINE=0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ NEED_COCOA_DEFINE=0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if test "x$HAVE_GLES3_H" == "xyes"; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GLES3_H_DEFINE=1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if test "x$HAVE_GLES3EXT3_H" == "xyes"; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GLES3EXT3_H_DEFINE=1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if test "x$NEED_COCOA" == "xyes"; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ NEED_COCOA_DEFINE=1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GL_INCLUDES="
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef __GNUC__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # pragma GCC diagnostic push
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -367,7 +371,7 @@ if test "x$HAVE_GL" = "xyes" -a "x$HAVE_
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # include <GLES2/gl2ext.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# ifdef __APPLE__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# if $NEED_COCOA_DEFINE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # include <OpenGL/OpenGL.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # include <OpenGL/gl.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # if MAC_OS_X_VERSION_MAX_ALLOWED >= 1070
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -881,7 +881,7 @@ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if test "x$USE_OPENGL" = "xyes"; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GL_INCLUDES="$GL_INCLUDES
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# ifdef __APPLE__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# if $GST_GL_HAVE_WINDOW_COCOA
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # include <OpenGL/OpenGL.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # include <OpenGL/gl.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # else
</span></pre><pre style='margin:0'>
</pre>