<pre style='margin:0'>
Perry E. Metzger (pmetzger) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/4fb8088b2838539db152705c8ec612d71aa4d237">https://github.com/macports/macports-ports/commit/4fb8088b2838539db152705c8ec612d71aa4d237</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 4fb8088b283 gtk3, libepoxy: Remove dependency to mesa for +quartz
</span>4fb8088b283 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 4fb8088b2838539db152705c8ec612d71aa4d237
</span>Author: FlyingSamson <FlyingSamson@tuxcad.de>
AuthorDate: Mon Apr 29 18:48:14 2024 +0200
<span style='display:block; white-space:pre;color:#404040;'> gtk3, libepoxy: Remove dependency to mesa for +quartz
</span>---
gnome/gtk3-devel/Portfile | 17 +++++++------
gnome/gtk3/Portfile | 17 +++++++------
graphics/libepoxy/Portfile | 59 +++++++++++++++++++++++++++++-----------------
3 files changed, 54 insertions(+), 39 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/gtk3-devel/Portfile b/gnome/gtk3-devel/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 1e10dd4f4d7..9f886ec8533 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/gtk3-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/gtk3-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -13,7 +13,7 @@ name gtk3-devel
</span> conflicts gtk3
set my_name gtk3
version 3.24.41
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 2
</span> epoch 0
set proj_name gtk+
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -60,9 +60,6 @@ depends_lib-append \
</span> port:libepoxy \
path:lib/pkgconfig/pango.pc:pango
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# mesa required to configure both +x11, +quartz (not just +x11) due to their dependency on libepoxy
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib-append port:mesa
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> depends_run-append \
port:shared-mime-info \
port:hicolor-icon-theme
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -72,9 +69,6 @@ compiler.cxx_standard 2011
</span> # darwin 10 and earlier requires legacy support for O_CLOEXEC
legacysupport.newest_darwin_requires_legacy 10
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Upstream disables X11 for macOS; disable that behavior
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-meson.build-x11-enabled.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # Quartz patch to fix QuartzCore linking and compiling with 10.11
# Upstream merge request: https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/4298
patchfiles-append patch-quartz-calayer-contentsformat.diff
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -143,7 +137,7 @@ post-destroot {
</span> # avoid conflict with the gtk-update-icon-cache installed by gtk2
move ${destroot}${prefix}/bin/gtk-update-icon-cache \
${destroot}${prefix}/bin/gtk-update-icon-cache-3.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> ui_debug "Creating gtk.immodules..."
system "DYLD_LIBRARY_PATH=${destroot}${prefix}/lib \
${destroot}${prefix}/bin/gtk-query-immodules-3.0 \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -247,7 +241,7 @@ if {${universal_possible} && [variant_isset universal]} {
</span> reinplace s/@host@/${host}-apple-darwin${os.version}/ \
{*}[glob -directory ${worksrcpath} *.pc.in]
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> merger_arch_compiler yes
} else {
configure.cc "${configure.cc} ${configure.cc_archflags}"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -292,10 +286,12 @@ variant x11 conflicts quartz {
</span> require_active_variants path:lib/pkgconfig/pango.pc:pango x11
require_active_variants path:lib/pkgconfig/glib-2.0.pc:glib2 x11
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # mesa is required to configure with +x11 due to the dependency on libepoxy
</span> depends_lib-append \
port:at-spi2-atk \
port:fontconfig \
port:libxkbcommon-x11 \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:mesa \
</span> port:xorg-libXi \
port:xorg-libXrandr \
port:xorg-libXcursor \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -304,6 +300,9 @@ variant x11 conflicts quartz {
</span> port:xorg-libXcomposite \
port:xorg-libXfixes
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Upstream disables X11 for macOS; disable that behavior
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-meson.build-x11-enabled.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> configure.args-append \
-Dx11_backend=true \
-Dquartz_backend=false \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/gtk3/Portfile b/gnome/gtk3/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 2e8a33cc72d..54fc1e2b8cd 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/gtk3/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/gtk3/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -13,7 +13,7 @@ name gtk3
</span> conflicts gtk3-devel
set my_name gtk3
version 3.24.41
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 2
</span> epoch 1
set proj_name gtk+
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -60,9 +60,6 @@ depends_lib-append \
</span> port:libepoxy \
path:lib/pkgconfig/pango.pc:pango
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# mesa required to configure both +x11, +quartz (not just +x11) due to their dependency on libepoxy
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib-append port:mesa
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> depends_run-append \
port:shared-mime-info \
port:hicolor-icon-theme
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -72,9 +69,6 @@ compiler.cxx_standard 2011
</span> # darwin 10 and earlier requires legacy support for O_CLOEXEC
legacysupport.newest_darwin_requires_legacy 10
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Upstream disables X11 for macOS; disable that behavior
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-meson.build-x11-enabled.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # Quartz patch to fix QuartzCore linking and compiling with 10.11
# Upstream merge request: https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/4298
patchfiles-append patch-quartz-calayer-contentsformat.diff
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -143,7 +137,7 @@ post-destroot {
</span> # avoid conflict with the gtk-update-icon-cache installed by gtk2
move ${destroot}${prefix}/bin/gtk-update-icon-cache \
${destroot}${prefix}/bin/gtk-update-icon-cache-3.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> ui_debug "Creating gtk.immodules..."
system "DYLD_LIBRARY_PATH=${destroot}${prefix}/lib \
${destroot}${prefix}/bin/gtk-query-immodules-3.0 \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -247,7 +241,7 @@ if {${universal_possible} && [variant_isset universal]} {
</span> reinplace s/@host@/${host}-apple-darwin${os.version}/ \
{*}[glob -directory ${worksrcpath} *.pc.in]
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> merger_arch_compiler yes
} else {
configure.cc "${configure.cc} ${configure.cc_archflags}"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -292,10 +286,12 @@ variant x11 conflicts quartz {
</span> require_active_variants path:lib/pkgconfig/pango.pc:pango x11
require_active_variants path:lib/pkgconfig/glib-2.0.pc:glib2 x11
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # mesa is required to configure with +x11 due to the dependency on libepoxy
</span> depends_lib-append \
port:at-spi2-atk \
port:fontconfig \
port:libxkbcommon-x11 \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:mesa \
</span> port:xorg-libXi \
port:xorg-libXrandr \
port:xorg-libXcursor \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -304,6 +300,9 @@ variant x11 conflicts quartz {
</span> port:xorg-libXcomposite \
port:xorg-libXfixes
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Upstream disables X11 for macOS; disable that behavior
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-meson.build-x11-enabled.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> configure.args-append \
-Dx11_backend=true \
-Dquartz_backend=false \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/libepoxy/Portfile b/graphics/libepoxy/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 000abca053b..c24b7e302b0 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/libepoxy/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/libepoxy/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,7 +5,7 @@ PortGroup github 1.0
</span> PortGroup meson 1.0
github.setup anholt libepoxy 1.5.10
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> license MIT permissive
categories graphics
maintainers nomaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20,30 +20,11 @@ checksums rmd160 0c12937f3ab3645d4b1b96f29ffd2fb5ffc92712 \
</span> sha256 b3e076c5bea209ffa7789cb460d76718be206ccad65a8c915757957c76318376 \
size 332119
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Yes, mesa and xorg-libX11 are *build* dependencies. The library will function correctly
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# if they are not present because it loads mesa dynamically only when GLX is used. When
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# OpenGL.framework is used, there is no need to have mesa at runtime.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Clients of this library must link mesa directly and have it listed as their dependency
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# in order to use mesa with libepoxy.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_build port:pkgconfig \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:xorg-util-macros \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:mesa \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:xorg-libX11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build port:pkgconfig
</span>
patchfiles prefix.patch \
patch-src-gen_dispatch.py.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# enable GLX support
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# without this any gtk3 +x11 app will fail on load as follows
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# dyld: Symbol not found: _epoxy_glXBindTexImageEXT
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Referenced from: /opt/local/lib/libgdk-3.0.dylib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Expected in: /opt/local/lib/libepoxy.0.dylib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# in /opt/local/lib/libgdk-3.0.dylib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -Dglx=yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # https://trac.macports.org/ticket/64468
platform darwin 8 {
configure.cflags-append -DCGLReleasePixelFormat=CGLDestroyPixelFormat
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -57,3 +38,39 @@ post-patch {
</span> reinplace "s|@PREFIX@|${prefix}|g" ${worksrcpath}/src/dispatch_common.c
reinplace "s|@PYTHON3@|${prefix}/bin/python${python_vers}|g" ${worksrcpath}/src/gen_dispatch.py
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant quartz conflicts x11 {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append -Dx11=false
</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 conflicts quartz {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Yes, mesa and xorg-libX11 are *build* dependencies. The library will function correctly
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # if they are not present because it loads mesa dynamically only when GLX is used. When
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # OpenGL.framework is used, there is no need to have mesa at runtime.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Clients of this library must link mesa directly and have it listed as their dependency
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # in order to use mesa with libepoxy.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-append port:xorg-util-macros \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:mesa \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:xorg-libX11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # enable GLX support
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # without this any gtk3 +x11 app will fail on load as follows
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # dyld: Symbol not found: _epoxy_glXBindTexImageEXT
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Referenced from: /opt/local/lib/libgdk-3.0.dylib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Expected in: /opt/local/lib/libepoxy.0.dylib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # in /opt/local/lib/libgdk-3.0.dylib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append -Dglx=yes
</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 {![variant_isset quartz]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_variants +x11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {![variant_isset x11]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_variants +quartz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {![variant_isset quartz] && ![variant_isset x11]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pre-configure {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return -code error "Either +x11 or +quartz is required"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span></pre><pre style='margin:0'>
</pre>