<pre style='margin:0'>
David B. Evans (dbevans) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/84b603b212c0347aadd2a28b6d5c55fb8b29c43d">https://github.com/macports/macports-ports/commit/84b603b212c0347aadd2a28b6d5c55fb8b29c43d</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 84b603b212c0347aadd2a28b6d5c55fb8b29c43d
</span>Author: David B. Evans <devans@macports.org>
AuthorDate: Mon Nov 4 02:36:25 2019 -0800
<span style='display:block; white-space:pre;color:#404040;'> gegl: update to version 0.4.18, meson build, dependencies
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> * retire PortGroup cxx11 1.1
</span><span style='display:block; white-space:pre;color:#404040;'> * retire PortGroup gobject-introspection
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> @kencu: please test babl and gegl meson builds for compatibility with older platforms.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> See https://trac.macports.org/ticket/58524.
</span>---
graphics/gegl/Portfile | 105 ++++++++++-----------
.../gegl/files/meson-add-host-cpu-message.patch | 26 +++++
graphics/gegl/files/meson-fix-cpu-detection.patch | 51 ++++++++++
graphics/gegl/files/meson-osx-build-fixes.patch | 52 ++++++++++
graphics/gegl/files/patch-configure.ac.diff | 20 ----
5 files changed, 181 insertions(+), 73 deletions(-)
<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 fe4edc7..68e40eb 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;'>@@ -3,13 +3,11 @@
</span> PortSystem 1.0
PortGroup muniversal 1.0
PortGroup compiler_blacklist_versions 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup cxx11 1.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup gobject_introspection 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup meson 1.0
</span> PortGroup legacysupport 1.0
name gegl
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 0.4.16
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 0.4.18
</span> set branch [join [lrange [split ${version} .] 0 1] .]
conflicts gegl-devel
license {GPL-3+ LGPL-3+}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -26,40 +24,45 @@ long_description GEGL is a graph based image processing framework offering im
</span> homepage http://gegl.org/
master_sites gimp:${name}/${branch}/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-use_bzip2 yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+use_xz yes
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 afbf13eb80749842548c73c1dbda349f7b257463 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 0112df690301d9eb993cc48965fc71b7751c9021a4f4ee08fcae366c326b5e5a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 7304904
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 c33c56c7b839b508f9f89a1bf4ae51ccd6758ca2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 c946dfb45beb7fe0fb95b89a25395b449eda2b205ba3e8a1ffb1ef992d9eca64 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 4812756
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_build port:pkgconfig \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:pkgconfig \
</span> port:w3m \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:python27
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:python37
</span>
depends_lib port:babl \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:lib/pkgconfig/cairo.pc:cairo \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:lib/pkgconfig/pango.pc:pango \
</span> port:gdk-pixbuf2 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:gtk2 \
</span> port:jpeg \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:lua \
</span> port:luajit \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- path:bin/dot:graphviz \
</span> port:exiv2 \
port:gexiv2 \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:gobject-introspection \
</span> port:jasper \
port:json-glib \
port:lcms2 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:lensfun \
</span> port:libraw \
port:librsvg \
path:lib/libavcodec.dylib:ffmpeg \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libsdl2 \
</span> port:libspiro \
port:openexr \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:poly2tri-c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py37-gobject3 \
</span> port:poppler \
port:SuiteSparse_UMFPACK \
port:vala \
port:webp
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-configure.ac.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles meson-fix-cpu-detection.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ meson-add-host-cpu-message.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ meson-osx-build-fixes.patch
</span>
post-patch {
# https://trac.macports.org/ticket/35148
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -68,63 +71,59 @@ post-patch {
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-gobject_introspection yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# needs C++11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.cxx_standard 2011
</span>
# blacklist compilers that do not support C11 (redefinition of typedef 'GeglDownscale2x2Fun' in gegl-algorithms.h at line 51)
# tweak gcc blacklisting for 10.5 ppc
# version 0.4.14+ requires apple clang 700.0.72 (Xcode 7.0.0) to build new parallelization code
# ../gegl/gegl-parallel.h:134:29: error: expected expression '[] (gint i,'
<span style='display:block; white-space:pre;background:#ffe0e0;'>-compiler.blacklist *gcc-3.* *gcc-4.* {clang < 700}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.blacklist-append *gcc-3.* *gcc-4.* {clang < 700}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-use_autoreconf yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-autoreconf.args -fvi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.python ${prefix}/bin/python2.7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args --disable-docs \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-silent-rules \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --without-sdl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set python_framework ${frameworks_dir}/Python.framework/Versions/3.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.pkg_config_path ${python_framework}/lib/pkgconfig
</span>
# at present, luajit does not build on PowerPC
platform darwin powerpc {
depends_lib-delete port:luajit
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-delete port:lua
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --without-lua
</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;'>-# use version specific binary suffix to avoid conflict with gegl, gegl-0.3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-post-destroot {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set suffix "-0.4"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach bin [glob -nocomplain -tails -directory "${destroot}${prefix}/bin" *] {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- move ${destroot}${prefix}/bin/${bin} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${prefix}/bin/${bin}${suffix}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append -Dlua=false
</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=${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 {${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 {${build_arch} eq "x86_64"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --build=${build_arch}-apple-${os.platform}${os.version}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# TODO
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Adding --build=whatever doesn't work with meson. How do we do this?
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#platform darwin {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# if {[variant_isset universal]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# # In order to build universal on Leopard, you need MacPorts 2.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# set merger_configure_args(x86_64) --build=${build_arch}-apple-${os.platform}${os.version}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# set merger_configure_cflags(ppc) -fno-altivec
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# set merger_configure_cxxflags(ppc) -fno-altivec
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# } elseif {${build_arch} eq "ppc"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# configure.cflags-append -fno-altivec
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# configure.cxxflags-append -fno-altivec
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# } elseif {${build_arch} eq "x86_64"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# configure.args-append --build=${build_arch}-apple-${os.platform}${os.version}
</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;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# gobject-introspection uses g-ir-scanner, which uses $CC from env
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[variant_isset universal]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach arch ${configure.universal_archs} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lappend merger_build_env(${arch}) "CC=${configure.cc} -arch ${arch}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lappend merger_destroot_env(${arch}) "CC=${configure.cc} -arch ${arch}"
</span> }
<span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.env-append "CC=${configure.cc} ${configure.cc_archflags}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ destroot.env-append "CC=${configure.cc} ${configure.cc_archflags}"
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant html_doc description {Build html docs with enscript and asciidoc} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_build-append port:asciidoc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-delete --disable-docs
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --enable-docs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant gtk_docs description {Build API docs using gtk-doc} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-append port:gtk-doc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append -Ddocs=true
</span> }
variant workshop description {Enable build of workshop operations} {
depends_lib-append port:lensfun
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --enable-workshop
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append -Dworkshop=true
</span> }
#
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/gegl/files/meson-add-host-cpu-message.patch b/graphics/gegl/files/meson-add-host-cpu-message.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..d853842
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/gegl/files/meson-add-host-cpu-message.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,26 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 010cc96333e203894c08cd32eac9cec4bd245877 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Ell <ell_se@yahoo.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Mon, 28 Oct 2019 07:58:52 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] meson: add host cpu message
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+... to be consistent with babl and GIMP.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ meson.build | 2 ++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 2 insertions(+)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/meson.build b/meson.build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 540498921..bda702b80 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- meson.build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ meson.build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -74,6 +74,8 @@ endif
</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;'>+ host_cpu_family = host_machine.cpu_family()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++message('Host machine cpu family: ' + host_cpu_family)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if host_cpu_family == 'x86'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ have_x86 = true
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ config.set10('ARCH_X86', true)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.22.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/gegl/files/meson-fix-cpu-detection.patch b/graphics/gegl/files/meson-fix-cpu-detection.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..a4517ec
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/gegl/files/meson-fix-cpu-detection.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,51 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 6bcf95fd0f32cf5e8b1ddbe17b14d9ad049bded8 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Christoph Reiter <reiter.christoph@gmail.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Sun, 27 Oct 2019 14:10:08 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] meson: fix cpu detection
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Use host_machine.cpu_family() instead of cpu(). Only the former
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+provides a stable/defined set of values.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Also don't error out on some arches for no good reason.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+This fixes the build on 32bit Windows.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ meson.build | 12 +++++-------
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 5 insertions(+), 7 deletions(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/meson.build b/meson.build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index af133a0f1..540498921 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- meson.build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ meson.build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -73,23 +73,21 @@ if os_osx and cc.get_id() != 'clang'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif
</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;'>+-host_cpu = host_machine.cpu()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-if host_cpu.startswith('i') and host_cpu.endswith('86')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++host_cpu_family = host_machine.cpu_family()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++if host_cpu_family == 'x86'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ have_x86 = true
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ config.set10('ARCH_X86', true)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-elif host_cpu == 'x86_64'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++elif host_cpu_family == 'x86_64'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ have_x86 = true
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ config.set10('ARCH_X86', true)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ config.set10('ARCH_X86_64', true)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-elif host_cpu == 'ppc' or host_cpu == 'powerpc'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++elif host_cpu_family == 'ppc'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ have_ppc = true
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ config.set10('ARCH_PPC', true)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-elif host_cpu == 'ppc64' or host_cpu == 'powerpc64'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++elif host_cpu_family == 'ppc64'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ have_ppc = true
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ config.set10('ARCH_PPC', true)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ config.set10('ARCH_PPC64', true)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- error('Unknown host architecture')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif
</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;'>+--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.22.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/gegl/files/meson-osx-build-fixes.patch b/graphics/gegl/files/meson-osx-build-fixes.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..ea2294a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/gegl/files/meson-osx-build-fixes.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,52 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 2bc06bfedee4fb25f6a966c8235b75292e24e55f Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Alex Samorukov <samm@net-art.cz>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Thu, 31 Oct 2019 09:20:11 +0000
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] Fix meson build on Darwin platform and replace library
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extension
</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;'>+ gegl/meson.build | 3 +++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gegl/module/geglmoduledb.c | 5 ++++-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 2 files changed, 7 insertions(+), 1 deletion(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/gegl/meson.build b/gegl/meson.build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 020639be9..12c753cab 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- gegl/meson.build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ gegl/meson.build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -80,6 +80,8 @@ install_headers(gegl_headers,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ subdir: api_name
</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;'>++gegl_ldflags = os_osx ? ['-framework', 'OpenCL'] : []
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gegl_lib = library(api_name,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gegl_sources,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ include_directories: [ rootInclude, geglInclude, ],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -91,6 +93,7 @@ gegl_lib = library(api_name,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gmodule,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ c_args: [ gegl_cflags, ],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ link_args: [ gegl_ldflags, ],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ install: true,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version: so_version,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/gegl/module/geglmoduledb.c b/gegl/module/geglmoduledb.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 8821df216..f7d7936f0 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- gegl/module/geglmoduledb.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ gegl/module/geglmoduledb.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -310,8 +310,11 @@ valid_module_name (const gchar *filename)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return 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;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef __APPLE__ /* G_MODULE_SUFFIX is defined to .so instead of .dylib */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (! gegl_datafiles_check_extension (basename, ".dylib" ))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (! gegl_datafiles_check_extension (basename, "." G_MODULE_SUFFIX))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ g_free (basename);
</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;'>+2.22.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/gegl/files/patch-configure.ac.diff b/graphics/gegl/files/patch-configure.ac.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index b91ee0c..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/gegl/files/patch-configure.ac.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,20 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.ac.orig 2015-11-24 13:15:06.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure.ac 2015-12-01 11:00:04.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -662,6 +662,17 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AM_CONDITIONAL(HAVE_DOT, test "x$have_dot" = "xyes")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+dnl Override standard python locations with MacPorts version specific ones
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+AC_SUBST([PYTHON_PREFIX], [`$PYTHON -c 'import sys; print(sys.prefix);'`])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+AC_SUBST([PYTHON_EXEC_PREFIX], [`$PYTHON -c 'import sys; print(sys.exec_prefix)'`])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+am_cv_python_pythondir=$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+am_cv_python_pyexecdir=$PYTHON_EXEC_PREFIX/lib/python$PYTHON_VERSION/site-packages
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+AC_SUBST([pythondir], [$am_cv_python_pythondir])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+AC_SUBST([pyexecdir], [$am_cv_python_pyexecdir])
</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;'>- # Check for Python (optional, used for introspection unittests)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #################
</span></pre><pre style='margin:0'>
</pre>