<pre style='margin:0'>
Renee Otten (reneeotten) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/3acd6df58cddebfcd2fbb7f18cefce0a7a309b6b">https://github.com/macports/macports-ports/commit/3acd6df58cddebfcd2fbb7f18cefce0a7a309b6b</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 3acd6df58cddebfcd2fbb7f18cefce0a7a309b6b
</span>Author: Sergey Fedorov <barracuda@macos-powerpc.org>
AuthorDate: Mon Sep 16 03:39:31 2024 +0800
<span style='display:block; white-space:pre;color:#404040;'> gegl*: use libsdl2, move libsdl1 into a variant
</span>---
graphics/gegl-devel/Portfile | 21 +++++++++------------
graphics/gegl/Portfile | 21 +++++++++------------
2 files changed, 18 insertions(+), 24 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/gegl-devel/Portfile b/graphics/gegl-devel/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 2088e3a81a9..07464c59800 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/gegl-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/gegl-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -58,6 +58,7 @@ depends_lib-append \
</span> port:libraw \
path:include/turbojpeg.h:libjpeg-turbo \
path:lib/pkgconfig/librsvg-2.0.pc:librsvg \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libsdl2 \
</span> port:libspiro \
path:lib/libluajit-5.1.2.dylib:luajit \
port:openexr \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -69,18 +70,6 @@ depends_lib-append \
</span> port:tiff \
port:webp
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# libsdl2 requires minimum Xcode 10.7 SDK to build successfully, but builds on 10.6 x86.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# On earlier systems and all PPC use libsdl1 instead.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if {${os.platform} eq "darwin" && (${os.major} < 10 || ${configure.build_arch} in [list ppc ppc64])} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:libsdl
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -Dsdl2=disabled \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -Dsdl1=enabled
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libsdl2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # proposed fix for 32 bit builds
# https://trac.macports.org/ticket/58524
patchfiles-append patch-gegl-32bit-host-statistics.diff
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -170,6 +159,14 @@ variant gtk_docs description {Build API docs using gtk-doc} {
</span> -Dgtk-doc=true
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+variant sdl1 description {Build with SDL v. 1} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-replace \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libsdl2 port:libsdl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Dsdl2=disabled \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Dsdl1=enabled
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> variant vala description {Enable build of vala extensions} {
depends_lib-append \
path:bin/vala:vala
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/gegl/Portfile b/graphics/gegl/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 8c7757492e4..0a29038fc34 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/gegl/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/gegl/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -58,6 +58,7 @@ depends_lib-append \
</span> port:libraw \
path:include/turbojpeg.h:libjpeg-turbo \
path:lib/pkgconfig/librsvg-2.0.pc:librsvg \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libsdl2 \
</span> port:libspiro \
path:lib/libluajit-5.1.2.dylib:luajit \
port:openexr \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -69,18 +70,6 @@ depends_lib-append \
</span> port:tiff \
port:webp
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# libsdl2 requires minimum Xcode 10.7 SDK to build successfully, but builds on 10.6 x86.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# On earlier systems and all PPC use libsdl1 instead.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if {${os.platform} eq "darwin" && (${os.major} < 10 || ${configure.build_arch} in [list ppc ppc64])} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:libsdl
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -Dsdl2=disabled \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -Dsdl1=enabled
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libsdl2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # proposed fix for 32 bit builds
# https://trac.macports.org/ticket/58524
patchfiles-append patch-gegl-32bit-host-statistics.diff
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -170,6 +159,14 @@ variant gtk_docs description {Build API docs using gtk-doc} {
</span> -Dgtk-doc=true
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+variant sdl1 description {Build with SDL v. 1} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-replace \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libsdl2 port:libsdl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Dsdl2=disabled \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Dsdl1=enabled
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> variant vala description {Enable build of vala extensions} {
depends_lib-append \
path:bin/vala:vala
</pre><pre style='margin:0'>
</pre>