<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/62bb3ffd55c3d4559b5e109514f30c973b657701">https://github.com/macports/macports-ports/commit/62bb3ffd55c3d4559b5e109514f30c973b657701</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 62bb3ffd55c gegl: add gcc patch from gegl-devel; update to 0.4.50
</span>62bb3ffd55c is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 62bb3ffd55c3d4559b5e109514f30c973b657701
</span>Author: Christopher Nielsen <mascguy@github.com>
AuthorDate: Fri Nov 29 13:47:13 2024 -0500
<span style='display:block; white-space:pre;color:#404040;'> gegl: add gcc patch from gegl-devel; update to 0.4.50
</span>---
graphics/gegl/Portfile | 20 +++++++++++----
graphics/gegl/files/patch-fix-objc-flags.diff | 29 ++++++++++++++++++++++
...atch-gegl-opencl-fix-Leopard-and-less-only.diff | 20 ++++++---------
graphics/gegl/files/patch-meson-unistd.diff | 29 ++++++++++++++++++++++
4 files changed, 81 insertions(+), 17 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 aff760d7075..68a4b52d912 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;'>@@ -10,8 +10,8 @@ PortGroup debug 1.0
</span> name gegl
conflicts gegl-devel
set my_name gegl
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 0.4.48
</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.50
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span> epoch 1
license {GPL-3+ LGPL-3+}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -30,9 +30,9 @@ dist_subdir ${my_name}
</span> distname ${my_name}-${version}
use_xz yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 038b529c935a3e689f86358cd270fc569e289cec \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 418c26d94be8805d7d98f6de0c6825ca26bd74fcacb6c188da47533d9ee28247 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 5805488
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 a584ef82490559f5a3b838b0e6e79fae884b083d \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 6084969b06ee86ca71142133773f27e13f02e5a6a22c2cfce452ecaaddb790c1 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 5987700
</span>
# Disable unexpected download of subprojects
meson.wrap_mode nodownload
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -73,6 +73,10 @@ depends_lib-append \
</span> port:tiff \
port:webp
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# Fix define for HAVE_UNISTD_H, which otherwise fails for some older Clang versions
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# See: https://trac.macports.org/ticket/71253
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-meson-unistd.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</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;'>@@ -96,6 +100,12 @@ post-patch {
</span> }
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# cc1: error: argument to '-O' should be a non-negative integer, 'g', 's', 'z' or 'fast'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=117478
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if { [string match *gcc* ${configure.compiler}] } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-fix-objc-flags.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # needs C++14 C11
compiler.cxx_standard 2014
compiler.c_standard 2011
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/gegl/files/patch-fix-objc-flags.diff b/graphics/gegl/files/patch-fix-objc-flags.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..ce6c2d918d4
</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/patch-fix-objc-flags.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,29 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#==================================================================================================
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# From: Lukas Oberhuber
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Date: Sun, 10 Nov 2024 15:48:14 +0000
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Subject: [PATCH] meson: Fix objective c build for gcc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Merge Request:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# - https://gitlab.gnome.org/GNOME/gegl/-/merge_requests/201
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Related Issues:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# - https://gitlab.gnome.org/GNOME/gegl/-/issues/393
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# - https://gcc.gnu.org/bugzilla/show_bug.cgi?id=117478
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#==================================================================================================
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- meson.build.orig 2024-11-04 00:39:32.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ meson.build 2024-11-07 19:28:37.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -245,12 +245,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if os_osx
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ add_languages('objc')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- osx_ldflags = ['-Wl,-framework,Foundation', '-Wl,-framework,AppKit', '-ObjC']
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ osx_ldflags = ['-Wl,-framework,Foundation', '-Wl,-framework,AppKit']
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ add_project_link_arguments(osx_ldflags, language : ['objc', 'c'])
</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;'>+ if os_osx
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- add_project_arguments('-ObjC', language : 'c')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ add_project_arguments('-xobjective-c', language : 'c')
</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;color:#808080;'>diff --git a/graphics/gegl/files/patch-gegl-opencl-fix-Leopard-and-less-only.diff b/graphics/gegl/files/patch-gegl-opencl-fix-Leopard-and-less-only.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 4fdc77036d2..15d3590405b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/gegl/files/patch-gegl-opencl-fix-Leopard-and-less-only.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/gegl/files/patch-gegl-opencl-fix-Leopard-and-less-only.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,21 +1,17 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git gegl/meson.build gegl/meson.build
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 12c753c..95ed1b6 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,7 +80,7 @@ install_headers(gegl_headers,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- gegl/meson.build.orig 2024-11-03 10:39:32.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ gegl/meson.build 2024-11-06 07:44:10.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -89,7 +89,7 @@
</span> subdir: api_name
)
-gegl_ldflags = os_osx ? ['-framework', 'OpenCL'] : []
+gegl_ldflags = []
<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;'>-diff --git gegl/opencl/gegl-cl-init.c gegl/opencl/gegl-cl-init.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 22bdbb8..07d8ec8 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- gegl/opencl/gegl-cl-init.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ gegl/opencl/gegl-cl-init.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -689,7 +689,7 @@ gegl_cl_init_common (cl_device_type requested_device_type,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ opencl_dep = declare_dependency(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sources : [opencl_headers],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- gegl/opencl/gegl-cl-init.c.orig 2024-11-03 10:39:32.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ gegl/opencl/gegl-cl-init.c 2024-11-06 07:44:10.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -689,7 +689,7 @@
</span> if (!gegl_cl_init_get_gl_sharing_props (gl_contex_props, error))
return FALSE;
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/gegl/files/patch-meson-unistd.diff b/graphics/gegl/files/patch-meson-unistd.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..c63934985fb
</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/patch-meson-unistd.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,29 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#==================================================================================================
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Fix defintion of HAVE_UNISTD_H, which must be a number for some older Clang versions
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Author: Christopher Nielsen @ MacPorts
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Date: 2024-11-29
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#==================================================================================================
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- meson.build.orig 2024-11-29 12:46:39.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ meson.build 2024-11-29 13:07:03.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -272,7 +272,19 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ################################################################################
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Required Dependencies
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-config.set('HAVE_UNISTD_H', cc.has_header('unistd.h'))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# Some older Clang versions have difficulty when 'HAVE_UNISTD_H' isn't a number.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# Equivalent to using '#cmakedefine01' in 'config.h.in', for CMake builds:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# #if defined(__APPLE__) && !defined(__IOS__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# #cmakedefine01 HAVE_UNISTD_H
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# #else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# #cmakedefine HAVE_UNISTD_H
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++if os_osx
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ config.set('HAVE_UNISTD_H', cc.has_header('unistd.h').to_int())
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ config.set('HAVE_UNISTD_H', cc.has_header('unistd.h'))
</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;'>+ config.set('HAVE_EXECINFO_H', cc.has_header('execinfo.h'))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ config.set('HAVE_FSYNC', cc.has_function('fsync'))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ config.set('HAVE_MALLOC_TRIM', cc.has_function('malloc_trim'))
</span></pre><pre style='margin:0'>
</pre>