gegl*: use libsdl2, move libsdl1 into a variant

barracuda156 · Sep 15, 2024 · 0fa52e2 · 0fa52e2
1 parent e1aca3a
commit 0fa52e2
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 24 deletions.
diff --git a/graphics/gegl-devel/Portfile b/graphics/gegl-devel/Portfile
@@ -58,6 +58,7 @@ depends_lib-append \
                     port:libraw \
                     path:include/turbojpeg.h:libjpeg-turbo \
                     path:lib/pkgconfig/librsvg-2.0.pc:librsvg \
+                    port:libsdl2 \
                     port:libspiro \
                     path:lib/libluajit-5.1.2.dylib:luajit \
                     port:openexr \
@@ -69,18 +70,6 @@ depends_lib-append \
                     port:tiff \
                     port:webp
 
-# libsdl2 requires minimum Xcode 10.7 SDK to build successfully, but builds on 10.6 x86.
-# On earlier systems and all PPC use libsdl1 instead.
-if {${os.platform} eq "darwin" && (${os.major} < 10 || ${configure.build_arch} in [list ppc ppc64])} {
-    depends_lib-append  port:libsdl
-    configure.args-append \
-                    -Dsdl2=disabled \
-                    -Dsdl1=enabled
-} else {
-    depends_lib-append \
-                    port:libsdl2
-}
-
 # proposed fix for 32 bit builds
 # https://trac.macports.org/ticket/58524
 patchfiles-append   patch-gegl-32bit-host-statistics.diff
@@ -170,6 +159,14 @@ variant gtk_docs description {Build API docs using gtk-doc} {
                     -Dgtk-doc=true
 }
 
+variant sdl1 description {Build with SDL v. 1} {
+    depends_lib-replace \
+                    port:libsdl2 port:libsdl
+    configure.args-append \
+                    -Dsdl2=disabled \
+                    -Dsdl1=enabled
+}
+
 variant vala description {Enable build of vala extensions} {
     depends_lib-append \
                     path:bin/vala:vala

diff --git a/graphics/gegl/Portfile b/graphics/gegl/Portfile
@@ -58,6 +58,7 @@ depends_lib-append \
                     port:libraw \
                     path:include/turbojpeg.h:libjpeg-turbo \
                     path:lib/pkgconfig/librsvg-2.0.pc:librsvg \
+                    port:libsdl2 \
                     port:libspiro \
                     path:lib/libluajit-5.1.2.dylib:luajit \
                     port:openexr \
@@ -69,18 +70,6 @@ depends_lib-append \
                     port:tiff \
                     port:webp
 
-# libsdl2 requires minimum Xcode 10.7 SDK to build successfully, but builds on 10.6 x86.
-# On earlier systems and all PPC use libsdl1 instead.
-if {${os.platform} eq "darwin" && (${os.major} < 10 || ${configure.build_arch} in [list ppc ppc64])} {
-    depends_lib-append  port:libsdl
-    configure.args-append \
-                    -Dsdl2=disabled \
-                    -Dsdl1=enabled
-} else {
-    depends_lib-append \
-                    port:libsdl2
-}
-
 # proposed fix for 32 bit builds
 # https://trac.macports.org/ticket/58524
 patchfiles-append   patch-gegl-32bit-host-statistics.diff
@@ -170,6 +159,14 @@ variant gtk_docs description {Build API docs using gtk-doc} {
                     -Dgtk-doc=true
 }
 
+variant sdl1 description {Build with SDL v. 1} {
+    depends_lib-replace \
+                    port:libsdl2 port:libsdl
+    configure.args-append \
+                    -Dsdl2=disabled \
+                    -Dsdl1=enabled
+}
+
 variant vala description {Enable build of vala extensions} {
     depends_lib-append \
                     path:bin/vala:vala