Commit in gegl/trunk (PKGBUILD gegl-libraw-0.21.patch)

[Christian Hesse]

    Date: Wednesday, February 22, 2023 @ 11:34:20
  Author: eworm
Revision: 469434

upgpkg: gegl 0.4.42-1: new upstream release

Modified:
  gegl/trunk/PKGBUILD
Deleted:
  gegl/trunk/gegl-libraw-0.21.patch

------------------------+
 PKGBUILD               |   16 +++++-----------
 gegl-libraw-0.21.patch |   16 ----------------
 2 files changed, 5 insertions(+), 27 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD    2023-02-22 11:31:17 UTC (rev 469433)
+++ PKGBUILD    2023-02-22 11:34:20 UTC (rev 469434)
@@ -1,9 +1,9 @@
 # Maintainer: Daniel Isenmann <dan...@archlinux.org>
 
 pkgname=gegl
-_tag='1d26feb07a7221b9d386b54bcdad963c8421e594'
-pkgver=0.4.40
-pkgrel=4
+_tag='2a7d3122429f0b9a5bc8c1545680cb3fbafdeb80'
+pkgver=0.4.42
+pkgrel=1
 pkgdesc='Graph based image processing framework'
 arch=('x86_64')
 url='https://www.gegl.org/'
@@ -14,10 +14,8 @@
              'meson' 'python-gobject' 'ruby' 'vala')
 optdepends=('ffmpeg: ffmpeg plugin'
             'graphviz: for gegl-introspect')
-source=("git+https://gitlab.gnome.org/GNOME/gegl.git#tag=$_tag";
-         gegl-libraw-0.21.patch)
-sha256sums=('SKIP'
-            '16bfd56e3139dba47f4839e46d27df339a1ed9f57c63b58cb071713c5741c8c7')
+source=("git+https://gitlab.gnome.org/GNOME/gegl.git#tag=$_tag";)
+sha256sums=('SKIP')
 
 pkgver() {
   cd "${pkgname}"
@@ -24,10 +22,6 @@
   git describe --tags | sed 's/^GEGL_//;s/_$//;s/_/./g;s/-/+/g'
 }
 
-prepare() {
-  patch -d $pkgname -p1 < gegl-libraw-0.21.patch # Fix build with libraw 0.21
-}
-
 build() {
   mkdir -p build
   cd build

Deleted: gegl-libraw-0.21.patch
===================================================================
--- gegl-libraw-0.21.patch      2023-02-22 11:31:17 UTC (rev 469433)
+++ gegl-libraw-0.21.patch      2023-02-22 11:34:20 UTC (rev 469434)
@@ -1,16 +0,0 @@
-diff --git a/operations/external/raw-load.c b/operations/external/raw-load.c
-index 13eb661c2..7de2e232d 100644
---- a/operations/external/raw-load.c
-+++ b/operations/external/raw-load.c
-@@ -114,7 +114,11 @@ prepare (GeglOperation *operation)
-         g_warning ("raw-load: Error Initializing raw library");
-       else
-         {
-+#if LIBRAW_COMPILE_CHECK_VERSION_NOTLESS(0, 21)
-+          p->LibRaw->rawparams.shot_select = o->image_num;
-+#else
-           p->LibRaw->params.shot_select = o->image_num;
-+#endif
-     
-           p->LibRaw->params.aber[0] = 1.0;
-           p->LibRaw->params.aber[2] = 1.0;