From 1c4d93f77d8535f7deb15c900ae5327179a729c76a5775bce99bba46cf722ab3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Lie?= Date: Fri, 26 Mar 2021 12:12:40 +0000 Subject: [PATCH 1/2] Accepting request 881464 from home:dimstar:Factory - Add 93.patch: fix build with glib 2.67.3. "load error: /usr/lib64/libgomp.so.1: cannot allocate memory OBS-URL: https://build.opensuse.org/request/show/881464 OBS-URL: https://build.opensuse.org/package/show/graphics/gegl?expand=0&rev=107 --- 93.patch | 27 +++++++++++++++++++++++++++ gegl.changes | 7 ++++++- gegl.spec | 4 +++- 3 files changed, 36 insertions(+), 2 deletions(-) create mode 100644 93.patch diff --git a/93.patch b/93.patch new file mode 100644 index 0000000..a677ed2 --- /dev/null +++ b/93.patch @@ -0,0 +1,27 @@ +From 130cd583530dc41adfdec76d6662302f833e6033 Mon Sep 17 00:00:00 2001 +From: Olivier Tilloy +Date: Fri, 5 Mar 2021 12:58:18 +0100 +Subject: [PATCH] Fix build with glib 2.67.3 (see + https://gitlab.gnome.org/GNOME/glib/-/issues/2331). + +--- + operations/external/exr-load.cpp | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/operations/external/exr-load.cpp b/operations/external/exr-load.cpp +index e864f7e3e..28403639c 100644 +--- a/operations/external/exr-load.cpp ++++ b/operations/external/exr-load.cpp +@@ -29,9 +29,7 @@ property_file_path (path, "File", "") + #define GEGL_OP_NAME exr_load + #define GEGL_OP_C_FILE "exr-load.cpp" + +-extern "C" { + #include "gegl-op.h" +-} + + #include + #include +-- +GitLab + diff --git a/gegl.changes b/gegl.changes index 4404fdb..165b808 100644 --- a/gegl.changes +++ b/gegl.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Mar 26 08:14:25 UTC 2021 - Dominique Leuenberger + +- Add 93.patch: fix build with glib 2.67.3. + ------------------------------------------------------------------- Tue Dec 29 10:39:04 UTC 2020 - Bjørn Lie @@ -19,7 +24,7 @@ Tue Dec 29 10:39:04 UTC 2020 - Bjørn Lie Tue Sep 22 10:01:30 UTC 2020 - Guillaume GARDET - Fix build on aarch64 by pre-loading libgomp.so.1 to avoid: - "load error: /usr/lib64/libgomp.so.1: cannot allocate memory + "load error: /usr/lib64/libgomp.so.1: cannot allocate memory in static TLS block" ------------------------------------------------------------------- diff --git a/gegl.spec b/gegl.spec index 956c84c..144827c 100644 --- a/gegl.spec +++ b/gegl.spec @@ -1,7 +1,7 @@ # # spec file for package gegl # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -31,6 +31,8 @@ Group: Productivity/Graphics/Other URL: http://gegl.org/ Source0: https://download.gimp.org/pub/gegl/0.4/%{name}-%{version}.tar.xz Source99: baselibs.conf +# PATCH-FIX-UPSTREAM 93.patch dimstar@opensuse.org -- Fix build with glib 2.67.3 +Patch0: https://gitlab.gnome.org/GNOME/gegl/-/merge_requests/93.patch BuildRequires: ImageMagick BuildRequires: asciidoc From fb95dc9b4197886d08627d2675bb19bfb02efda43f8f9e212ed8a08dd83a42de Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Sat, 3 Apr 2021 13:32:48 +0000 Subject: [PATCH 2/2] Accepting request 881968 from home:polslinux:branches:graphics - Update to version 0.4.30: + New Operations: - negative-darkroom: This operation is for artists who use hybrid workflow technique of analog photography. After scanning a developed negative, this operation is used to invert the scan to create a positive image by simulating the light behaviour of darkroom enlarger and common photographic papers. + Operations: - jpg-load,png-load,tiff-load: show ICC relatd problems as warnings. - rgbe-load : fix handling of exponent=0 in RLE encoded files. - color-reduction : Added blue-noise modes, the patents are expired for some years already, also added fix to levels parameters; enabling bi-level. - fattal02 : ensure gaussian pyramid has at least one level. - paint-select (in workshop): multi-level banded graphcut, sub-region rather than full buffer rcomputations and other improvements. - Drop 93.patch OBS-URL: https://build.opensuse.org/request/show/881968 OBS-URL: https://build.opensuse.org/package/show/graphics/gegl?expand=0&rev=108 --- 93.patch | 27 --------------------------- gegl-0.4.28.tar.xz | 3 --- gegl-0.4.30.tar.xz | 3 +++ gegl.changes | 19 +++++++++++++++++++ gegl.spec | 8 +++----- 5 files changed, 25 insertions(+), 35 deletions(-) delete mode 100644 93.patch delete mode 100644 gegl-0.4.28.tar.xz create mode 100644 gegl-0.4.30.tar.xz diff --git a/93.patch b/93.patch deleted file mode 100644 index a677ed2..0000000 --- a/93.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 130cd583530dc41adfdec76d6662302f833e6033 Mon Sep 17 00:00:00 2001 -From: Olivier Tilloy -Date: Fri, 5 Mar 2021 12:58:18 +0100 -Subject: [PATCH] Fix build with glib 2.67.3 (see - https://gitlab.gnome.org/GNOME/glib/-/issues/2331). - ---- - operations/external/exr-load.cpp | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/operations/external/exr-load.cpp b/operations/external/exr-load.cpp -index e864f7e3e..28403639c 100644 ---- a/operations/external/exr-load.cpp -+++ b/operations/external/exr-load.cpp -@@ -29,9 +29,7 @@ property_file_path (path, "File", "") - #define GEGL_OP_NAME exr_load - #define GEGL_OP_C_FILE "exr-load.cpp" - --extern "C" { - #include "gegl-op.h" --} - - #include - #include --- -GitLab - diff --git a/gegl-0.4.28.tar.xz b/gegl-0.4.28.tar.xz deleted file mode 100644 index 56f48ce..0000000 --- a/gegl-0.4.28.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1d110d8577d54cca3b34239315bd37c57ccb27dd4355655074a2d2b3fd897900 -size 4966580 diff --git a/gegl-0.4.30.tar.xz b/gegl-0.4.30.tar.xz new file mode 100644 index 0000000..5c47458 --- /dev/null +++ b/gegl-0.4.30.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c112782cf4096969e23217ccdfabe42284e35d5435ff0c43d40e4c70faeca8dd +size 5398052 diff --git a/gegl.changes b/gegl.changes index 165b808..735f71f 100644 --- a/gegl.changes +++ b/gegl.changes @@ -1,3 +1,22 @@ +------------------------------------------------------------------- +Mon Mar 29 13:12:47 UTC 2021 - Paolo Stivanin + +- Update to version 0.4.30: + + New Operations: + - negative-darkroom: This operation is for artists who use hybrid workflow + technique of analog photography. After scanning a developed negative, this + operation is used to invert the scan to create a positive image by simulating + the light behaviour of darkroom enlarger and common photographic papers. + + Operations: + - jpg-load,png-load,tiff-load: show ICC relatd problems as warnings. + - rgbe-load : fix handling of exponent=0 in RLE encoded files. + - color-reduction : Added blue-noise modes, the patents are expired for some + years already, also added fix to levels parameters; enabling bi-level. + - fattal02 : ensure gaussian pyramid has at least one level. + - paint-select (in workshop): multi-level banded graphcut, sub-region rather + than full buffer rcomputations and other improvements. +- Drop 93.patch + ------------------------------------------------------------------- Fri Mar 26 08:14:25 UTC 2021 - Dominique Leuenberger diff --git a/gegl.spec b/gegl.spec index 144827c..c19d05d 100644 --- a/gegl.spec +++ b/gegl.spec @@ -23,7 +23,7 @@ %endif Name: gegl -Version: 0.4.28 +Version: 0.4.30 Release: 0 Summary: Generic Graphics Library License: GPL-3.0-or-later AND LGPL-3.0-or-later @@ -31,9 +31,6 @@ Group: Productivity/Graphics/Other URL: http://gegl.org/ Source0: https://download.gimp.org/pub/gegl/0.4/%{name}-%{version}.tar.xz Source99: baselibs.conf -# PATCH-FIX-UPSTREAM 93.patch dimstar@opensuse.org -- Fix build with glib 2.67.3 -Patch0: https://gitlab.gnome.org/GNOME/gegl/-/merge_requests/93.patch - BuildRequires: ImageMagick BuildRequires: asciidoc BuildRequires: gcc-c++ @@ -155,7 +152,7 @@ input and output. %lang_package -n %{name}-0_4 %prep -%autosetup -p1 +%autosetup %build %ifarch aarch64 @@ -195,6 +192,7 @@ find %{buildroot} -type f -name "*.la" -delete -print %{_libdir}/libgegl-sc-0.4.so %{_libdir}/libgegl-npd-0.4.so %{_libdir}/gegl-0.4/grey2.json +%{_libdir}/gegl-0.4/dropshadow2.json %if %{with luajit} # lua files %dir %{_datadir}/gegl-0.4/