<pre style='margin:0'>
Christopher Nielsen (mascguy) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/f0108566a3672a56c1ed227807435078871be3c1">https://github.com/macports/macports-ports/commit/f0108566a3672a56c1ed227807435078871be3c1</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit f0108566a3672a56c1ed227807435078871be3c1
</span>Author: Christopher Nielsen <mascguy@github.com>
AuthorDate: Mon Jun 26 11:45:16 2023 -0400
<span style='display:block; white-space:pre;color:#404040;'> gegl-devel: cleanup
</span>---
graphics/gegl-devel/Portfile | 89 +++++++++++++++++++++-----------------------
1 file changed, 42 insertions(+), 47 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 04f90d7c3e4..315bbbbc16d 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;'>@@ -13,18 +13,18 @@ set my_name gegl
</span> version 0.4.44
revision 4
epoch 0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set branch [join [lrange [split ${version} .] 0 1] .]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> license {GPL-3+ LGPL-3+}
categories graphics
maintainers {mascguy @mascguy} openmaintainer
description GEGL is a graph based image processing framework.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> long_description GEGL is a graph based image processing framework offering image processing and \
compositing on large images. GEGL is suitable for projects ranging from small \
one-off projects to interactive applications.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> homepage http://gegl.org/
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set branch [join [lrange [split ${version} .] 0 1] .]
</span> master_sites gimp:${my_name}/${branch}/
dist_subdir ${my_name}
distname ${my_name}-${version}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -48,9 +48,9 @@ depends_lib-append \
</span> path:lib/pkgconfig/cairo.pc:cairo \
port:exiv2 \
path:lib/libavcodec.dylib:ffmpeg \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:lib/pkgconfig/gdk-pixbuf-2.0.pc:gdk-pixbuf2 \
</span> port:gettext-runtime \
port:gexiv2 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- path:lib/pkgconfig/gdk-pixbuf-2.0.pc:gdk-pixbuf2 \
</span> path:lib/pkgconfig/gobject-introspection-1.0.pc:gobject-introspection \
port:jasper \
port:json-glib \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -74,10 +74,11 @@ depends_lib-append \
</span> if {${os.platform} eq "darwin" && (${os.major} < 10 || ${configure.build_arch} in [list ppc ppc64])} {
depends_lib-append port:libsdl
configure.args-append \
<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:#e0ffe0;'>+ -Dsdl2=disabled \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Dsdl1=enabled
</span> } else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:libsdl2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libsdl2
</span> }
# proposed fix for 32 bit builds
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -98,7 +99,8 @@ platform darwin {
</span> post-patch {
# https://trac.macports.org/ticket/35148
if {${os.major} < 10} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|OpenGL/CGLDevice.h|OpenGL/CGLTypes.h|" ${worksrcpath}/gegl/opencl/cl_gl.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|OpenGL/CGLDevice.h|OpenGL/CGLTypes.h|" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/gegl/opencl/cl_gl.h
</span> }
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -118,67 +120,60 @@ if { [string match *clang* ${configure.compiler}] } {
</span> -Wno-unknown-warning-option
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.pkg_config_path ${py_framework}/lib/pkgconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.pkg_config_path \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${py_framework}/lib/pkgconfig
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# disable vala extensions by default (currently broken)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# enable with +vala variant for testing
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args-append -Dvapigen=disabled \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -Ddocs=false
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Ddocs=false \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Dvapigen=disabled
</span>
# at present, luajit does not build on PowerPC
platform darwin powerpc {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-delete path:lib/libluajit-5.1.2.dylib:luajit
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append -Dlua=disabled
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-delete \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:lib/libluajit-5.1.2.dylib:luajit
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Dlua=disabled
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# TODO
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Adding --build=whatever doesn't work with meson. How do we do this?
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#platform darwin {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# if {[variant_isset universal]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# # In order to build universal on Leopard, you need MacPorts 2.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# set merger_configure_args(x86_64) --build=${configure.build_arch}-apple-${os.platform}${os.version}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# set merger_configure_cflags(ppc) -fno-altivec
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# set merger_configure_cxxflags(ppc) -fno-altivec
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# } elseif {${configure.build_arch} eq "ppc"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# configure.cflags-append -fno-altivec
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# configure.cxxflags-append -fno-altivec
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# } elseif {${configure.build_arch} eq "x86_64"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# configure.args-append --build=${configure.build_arch}-apple-${os.platform}${os.version}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # gobject-introspection uses g-ir-scanner, which uses $CC from env
if {${universal_possible} && [variant_isset universal]} {
foreach arch ${configure.universal_archs} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- lappend merger_build_env(${arch}) "CC=${configure.cc} -arch ${arch}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- lappend merger_destroot_env(${arch}) "CC=${configure.cc} -arch ${arch}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lappend merger_build_env(${arch}) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "CC=${configure.cc} -arch ${arch}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lappend merger_destroot_env(${arch}) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "CC=${configure.cc} -arch ${arch}"
</span> }
} else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- build.env-append "CC=${configure.cc} ${configure.cc_archflags}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- destroot.env-append "CC=${configure.cc} ${configure.cc_archflags}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.env-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "CC=${configure.cc} ${configure.cc_archflags}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ destroot.env-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "CC=${configure.cc} ${configure.cc_archflags}"
</span> }
variant gtk_docs description {Build API docs using gtk-doc} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_build-append port:gtk-doc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append -Ddocs=true
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:gtk-doc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Ddocs=false \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Ddocs=true
</span> }
variant vala description {Enable build of vala extensions} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append path:bin/vala:vala
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-delete -Dvapigen=disabled
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:bin/vala:vala
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Dvapigen=disabled \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Dvapigen=enabled
</span> }
variant workshop description {Enable build of workshop operations} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:lensfun
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append -Dworkshop=true
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:lensfun
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Dworkshop=true
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# the following dummy variants are used
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# to identify this port's binary dependencies
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# inherited from libsdl and librsvg
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Dummy variants used to identify this port's dependencies
</span> variant x11 conflicts quartz {}
variant quartz conflicts x11 {}
</pre><pre style='margin:0'>
</pre>