<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/b841d7752676313bb9aa794995ec21121e7ee7fc">https://github.com/macports/macports-ports/commit/b841d7752676313bb9aa794995ec21121e7ee7fc</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 b841d77 gegl: update to version 0.4.22
</span>b841d77 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit b841d7752676313bb9aa794995ec21121e7ee7fc
</span>Author: David B. Evans <devans@macports.org>
AuthorDate: Sat Feb 22 20:17:10 2020 -0800
<span style='display:block; white-space:pre;color:#404040;'> gegl: update to version 0.4.22
</span>---
graphics/gegl/Portfile | 12 ++---
.../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 ----------------------
4 files changed, 4 insertions(+), 137 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 19c48b8..93eec3f 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;'>@@ -7,7 +7,7 @@ PortGroup meson 1.0
</span> PortGroup legacysupport 1.0
name gegl
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 0.4.18
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 0.4.22
</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,9 +26,9 @@ master_sites gimp:${name}/${branch}/
</span>
use_xz yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 c33c56c7b839b508f9f89a1bf4ae51ccd6758ca2 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 c946dfb45beb7fe0fb95b89a25395b449eda2b205ba3e8a1ffb1ef992d9eca64 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 4812756
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 0503f071c9a8117324abf03c11e392b4f4f5f384 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 1888ec41dfd19fe28273795c2209efc1a542be742691561816683990dc642c61 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 4826748
</span>
depends_build-append \
port:pkgconfig \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -60,10 +60,6 @@ depends_lib port:babl \
</span> port:vala \
port:webp
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles meson-fix-cpu-detection.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- meson-add-host-cpu-message.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- meson-osx-build-fixes.patch
</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;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>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index d853842..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/gegl/files/meson-add-host-cpu-message.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,26 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 010cc96333e203894c08cd32eac9cec4bd245877 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: Ell <ell_se@yahoo.com>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Mon, 28 Oct 2019 07:58:52 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH] meson: add host cpu message
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-... to be consistent with babl and GIMP.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- meson.build | 2 ++
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1 file changed, 2 insertions(+)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/meson.build b/meson.build
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 540498921..bda702b80 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- meson.build
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ meson.build
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -74,6 +74,8 @@ endif
</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;'>- host_cpu_family = host_machine.cpu_family()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+message('Host machine cpu family: ' + host_cpu_family)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if host_cpu_family == 'x86'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- have_x86 = true
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- config.set10('ARCH_X86', true)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-2.22.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</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>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index a4517ec..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/gegl/files/meson-fix-cpu-detection.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,51 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 6bcf95fd0f32cf5e8b1ddbe17b14d9ad049bded8 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: Christoph Reiter <reiter.christoph@gmail.com>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Sun, 27 Oct 2019 14:10:08 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH] meson: fix cpu detection
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Use host_machine.cpu_family() instead of cpu(). Only the former
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-provides a stable/defined set of values.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Also don't error out on some arches for no good reason.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-This fixes the build on 32bit Windows.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- meson.build | 12 +++++-------
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1 file changed, 5 insertions(+), 7 deletions(-)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/meson.build b/meson.build
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index af133a0f1..540498921 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- meson.build
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ meson.build
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -73,23 +73,21 @@ if os_osx and cc.get_id() != 'clang'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif
</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;'>--host_cpu = host_machine.cpu()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--if host_cpu.startswith('i') and host_cpu.endswith('86')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+host_cpu_family = host_machine.cpu_family()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+if host_cpu_family == 'x86'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- have_x86 = true
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- config.set10('ARCH_X86', true)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--elif host_cpu == 'x86_64'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+elif host_cpu_family == 'x86_64'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- have_x86 = true
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- config.set10('ARCH_X86', true)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- config.set10('ARCH_X86_64', true)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--elif host_cpu == 'ppc' or host_cpu == 'powerpc'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+elif host_cpu_family == 'ppc'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- have_ppc = true
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- config.set10('ARCH_PPC', true)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--elif host_cpu == 'ppc64' or host_cpu == 'powerpc64'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+elif host_cpu_family == 'ppc64'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- have_ppc = true
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- config.set10('ARCH_PPC', true)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- config.set10('ARCH_PPC64', true)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- error('Unknown host architecture')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif
</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><span style='display:block; white-space:pre;background:#ffe0e0;'>-2.22.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</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>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index ea2294a..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/gegl/files/meson-osx-build-fixes.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,52 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 2bc06bfedee4fb25f6a966c8235b75292e24e55f Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: Alex Samorukov <samm@net-art.cz>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Thu, 31 Oct 2019 09:20:11 +0000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH] Fix meson build on Darwin platform and replace library
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- extension
</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;'>- gegl/meson.build | 3 +++
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gegl/module/geglmoduledb.c | 5 ++++-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 2 files changed, 7 insertions(+), 1 deletion(-)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/gegl/meson.build b/gegl/meson.build
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 020639be9..12c753cab 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- gegl/meson.build
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ gegl/meson.build
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -80,6 +80,8 @@ install_headers(gegl_headers,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- subdir: api_name
</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;'>-+gegl_ldflags = os_osx ? ['-framework', 'OpenCL'] : []
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gegl_lib = library(api_name,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gegl_sources,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- include_directories: [ rootInclude, geglInclude, ],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -91,6 +93,7 @@ gegl_lib = library(api_name,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gmodule,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- c_args: [ gegl_cflags, ],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ link_args: [ gegl_ldflags, ],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- install: true,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- version: so_version,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/gegl/module/geglmoduledb.c b/gegl/module/geglmoduledb.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 8821df216..f7d7936f0 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- gegl/module/geglmoduledb.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ gegl/module/geglmoduledb.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -310,8 +310,11 @@ valid_module_name (const gchar *filename)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return FALSE;
</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><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef __APPLE__ /* G_MODULE_SUFFIX is defined to .so instead of .dylib */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (! gegl_datafiles_check_extension (basename, ".dylib" ))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (! gegl_datafiles_check_extension (basename, "." G_MODULE_SUFFIX))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- g_free (basename);
</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;'>-2.22.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span></pre><pre style='margin:0'>
</pre>