Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Ismael Luceno (b40a9a3237fb0d2b2cf0046a467ec8e008016a91)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Ismael Luceno <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Ismael Luceno (b40a9a3237fb0d2b2cf0046a467ec8e008016a91)
  • Date: Thu, 23 Dec 2021 00:52:01 +0000

GIT changes to master grimoire by Ismael Luceno <ismael AT sourcemage.org>:

graphics-libs/gegl/DEPENDS
| 1
graphics-libs/gegl/DETAILS
| 4
graphics-libs/gegl/HISTORY
| 6 +
graphics-libs/gegl/PRE_BUILD
| 1

graphics-libs/gegl/patches/0001-Include-opencl_dep-as-a-dependency-in-gegl_lib-target.patch
| 46 ++++++++++
5 files changed, 56 insertions(+), 2 deletions(-)

New commits:
commit b40a9a3237fb0d2b2cf0046a467ec8e008016a91
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

gegl 0.4.34

diff --git a/graphics-libs/gegl/DEPENDS b/graphics-libs/gegl/DEPENDS
index 9a752fd..1450d13 100755
--- a/graphics-libs/gegl/DEPENDS
+++ b/graphics-libs/gegl/DEPENDS
@@ -8,6 +8,7 @@ depends json-glib &&
depends babl &&
depends gtk+2 &&
depends gtk-doc &&
+depends libnsgif &&
depends libpng &&
depends JPEG &&

diff --git a/graphics-libs/gegl/DETAILS b/graphics-libs/gegl/DETAILS
index 7c1722d..d58457f 100755
--- a/graphics-libs/gegl/DETAILS
+++ b/graphics-libs/gegl/DETAILS
@@ -1,8 +1,8 @@
. "${GRIMOIRE}/MESON_FUNCTIONS"
SPELL=gegl
- VERSION=0.4.32
+ VERSION=0.4.34
SOURCE=$SPELL-$VERSION.tar.xz
-
SOURCE_HASH=sha512:68da02b8df0a1d234063958896f3678ead62772e611bddb39a6f21ec58cc744599d0a691224c057f2da4d04f2ccfb155a545deea92e77c728dbaeeb90e68cad6
+
SOURCE_HASH=sha512:13bbc19c4fb1feee609d2191b09fe1d2f020da1be788f9dcf7ed89dfef8465ce77dc34a9cb74279c88336aa0f3d3a7a44ca35335a3c2374516f590a40edbc08e
SOURCE_URL[0]=https://download.gimp.org/pub/$SPELL/${VERSION%.*}/$SOURCE
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
WEB_SITE=http://gegl.org/
diff --git a/graphics-libs/gegl/HISTORY b/graphics-libs/gegl/HISTORY
index 9fdf140..e0211a3 100644
--- a/graphics-libs/gegl/HISTORY
+++ b/graphics-libs/gegl/HISTORY
@@ -1,3 +1,9 @@
+2021-12-23 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: updated spell to 0.4.34
+ * 0001-Include-opencl_dep-as-a-dependency-in-gegl_lib-target.patch,
+ PRE_BUILD: Fixed buildsystem bug causing build failures
+ * DEPENDS: added missing dependency on libnsgif
+
2021-09-26 Florian Franzmann <bwlf AT bandrate.org>
* DETAILS: version 0.4.32

diff --git a/graphics-libs/gegl/PRE_BUILD b/graphics-libs/gegl/PRE_BUILD
index 24df05a..1f78dd1 100755
--- a/graphics-libs/gegl/PRE_BUILD
+++ b/graphics-libs/gegl/PRE_BUILD
@@ -1,3 +1,4 @@
default_pre_build &&
cd ${SOURCE_DIRECTORY} &&
+apply_patch_dir patches &&
[ -f gegl/gegl-0.1.deps ] || echo 'Babl-0.1' > gegl/gegl-0.1.deps
diff --git
a/graphics-libs/gegl/patches/0001-Include-opencl_dep-as-a-dependency-in-gegl_lib-target.patch

b/graphics-libs/gegl/patches/0001-Include-opencl_dep-as-a-dependency-in-gegl_lib-target.patch
new file mode 100644
index 0000000..327ff73
--- /dev/null
+++
b/graphics-libs/gegl/patches/0001-Include-opencl_dep-as-a-dependency-in-gegl_lib-target.patch
@@ -0,0 +1,46 @@
+From 8ccc92ba77b47e21ad0a1543228c9a20a2954e4f Mon Sep 17 00:00:00 2001
+From: Caleb Xu <calebcenter AT live.com>
+Date: Wed, 22 Dec 2021 11:19:20 -0500
+Subject: [PATCH] Include opencl_dep as a dependency in gegl_lib target
+
+Follow-up to 392e60be7371362c1149a9825d7644df86416692.
+
+In the above commit, the opencl_dep dependency was declared but
+this dependency was never added to the gegl_lib target, which
+needs it. As such, the addition was a no-op.
+
+This commit adds the opencl_dep dependency to the gegl_lib target
+and keeps only the opencl_headers sources, since the gegl_sources
+are already included in the gegl_lib target.
+
+Origin: Upstream
+Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/gegl/-/issues/288]
+---
+ gegl/meson.build | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/gegl/meson.build b/gegl/meson.build
+index 86c7a6fa1..5f459491a 100644
+--- a/gegl/meson.build
++++ b/gegl/meson.build
+@@ -92,8 +92,7 @@ install_headers(gegl_headers,
+ gegl_ldflags = os_osx ? ['-framework', 'OpenCL'] : []
+
+ opencl_dep = declare_dependency(
+- sources : [opencl_headers],
+- link_with : [gegl_sources],
++ sources : [opencl_headers],
+ )
+
+ gegl_lib = library(api_name,
+@@ -105,6 +104,7 @@ gegl_lib = library(api_name,
+ gio,
+ math,
+ gmodule,
++ opencl_dep,
+ ],
+ c_args: gegl_cflags,
+ link_args: gegl_ldflags,
+--
+GitLab
+



  • [SM-Commit] GIT changes to master grimoire by Ismael Luceno (b40a9a3237fb0d2b2cf0046a467ec8e008016a91), Ismael Luceno, 12/22/2021

Archive powered by MHonArc 2.6.24.

Top of Page