Upgrade to upstream version 0.4.40

3 files changed, 28 insertions, 10 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e69e2eeeb90b..a4656d95f00d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Sun Aug  7 07:47:53 UTC 2022
+# Tue Dec 27 15:09:05 UTC 2022
 pkgbase = lib32-gegl
 	pkgdesc = Graph based image processing framework (32-bit)
-	pkgver = 0.4.38
+	pkgver = 0.4.40
 	pkgrel = 1
 	url = https://www.gegl.org/
 	arch = x86_64
@@ -20,25 +20,27 @@ pkgbase = lib32-gegl
 	makedepends = lib32-gobject-introspection
 	makedepends = lib32-sdl2
 	makedepends = python-gobject
-	depends = gegl>=0.4.38
+	depends = gegl>=0.4.40
 	depends = lib32-babl
 	depends = lib32-libspiro
 	depends = lib32-json-glib
 	depends = lib32-poppler-glib
 	depends = lib32-libgexiv2
-	depends = lib32-libraw
+	depends = lib32-libraw>=0.21.0
 	depends = lib32-openexr
 	depends = lib32-librsvg
 	depends = lib32-libtiff
 	depends = lib32-lensfun
 	depends = lib32-luajit
-	depends = lib32-jasper
+	depends = lib32-openjpeg2
 	depends = lib32-suitesparse
 	depends = lib32-ffmpeg
 	depends = ffmpeg
-	source = git+https://gitlab.gnome.org/GNOME/gegl.git#commit=b7fbf39e8010a95977a1642b747b94205892ea57
+	source = git+https://gitlab.gnome.org/GNOME/gegl.git#commit=b3222c10c5ce8760bcd2a603dad2b3deb50fde6c
+	source = libraw-0.21.patch
 	source = x86-linux-gnu
 	sha512sums = SKIP
+	sha512sums = 25a4b3792dbbe87782d76657e57638c23c8e6cd3b1badadb1d614222099bda0d66b0c79b066c9266ed4abf6427f15274b09d0a9e5205d8edb531c1ac36dfcd0d
 	sha512sums = 97c193bdf744a8853b4463dd9f995faea0e8b269b1b7ef3b9ffcf10c173aa44a0e6edcda5cb69be71af8a4a649332cb841ac5849ea8256f0cfeb5a3cedea251c
 
 pkgname = lib32-gegl
diff --git a/PKGBUILD b/PKGBUILD
index 25865ac1e339..2a626e9251a3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,8 +3,8 @@
 
 pkgname=lib32-gegl
 _pkgbase=gegl
-pkgver=0.4.38
-_commit=b7fbf39e8010a95977a1642b747b94205892ea57  # tags/GEGL_0_4_38
+pkgver=0.4.40
+_commit=b3222c10c5ce8760bcd2a603dad2b3deb50fde6c  # tags/GEGL_0_4_40
 pkgrel=1
 pkgdesc="Graph based image processing framework (32-bit)"
 arch=('x86_64')
@@ -13,18 +13,20 @@ license=('GPL3' 'LGPL3')
 depends=("gegl>=$pkgver"
          'lib32-babl' 'lib32-libspiro' 'lib32-json-glib'
          'lib32-poppler-glib'
-         'lib32-libgexiv2' 'lib32-libraw' 'lib32-openexr'
+         'lib32-libgexiv2' 'lib32-libraw>=0.21.0' 'lib32-openexr'
          'lib32-librsvg' 'lib32-libtiff'
          'lib32-lensfun' 'lib32-luajit'
-         'lib32-jasper'
+         'lib32-openjpeg2'
          'lib32-suitesparse'
          'lib32-ffmpeg' 'ffmpeg')
 makedepends=('intltool' 'ruby' 'mesa' 'glu' 'exiv2' 'meson' 'vala'
              'xorgproto' 'shared-mime-info' 'lib32-gobject-introspection'
              'lib32-sdl2' 'python-gobject')
 source=("git+https://gitlab.gnome.org/GNOME/$_pkgbase.git#commit=$_commit"
+        "libraw-0.21.patch"
         "x86-linux-gnu")
 sha512sums=('SKIP'
+            '25a4b3792dbbe87782d76657e57638c23c8e6cd3b1badadb1d614222099bda0d66b0c79b066c9266ed4abf6427f15274b09d0a9e5205d8edb531c1ac36dfcd0d'
             '97c193bdf744a8853b4463dd9f995faea0e8b269b1b7ef3b9ffcf10c173aa44a0e6edcda5cb69be71af8a4a649332cb841ac5849ea8256f0cfeb5a3cedea251c')
 
 prepare() {
@@ -35,6 +37,7 @@ prepare() {
       cp "/usr/share/pkgconfig/$pkg" "$srcdir/"
   done
   cd "$_pkgbase"
+  patch -p1 < "$srcdir"/libraw-0.21.patch
 }
 
 build() {
@@ -52,6 +55,7 @@ build() {
       --wrap-mode     nodownload \
       -Db_lto=true -Db_pie=true \
       -Dworkshop=true -Dmrg=disabled -Dmaxflow=disabled \
+      -Djasper=disabled \
       --cross-file  x86-linux-gnu
   ninja -C "build"
 }
diff --git a/libraw-0.21.patch b/libraw-0.21.patch
new file mode 100644
index 000000000000..b05ba5598aa9
--- /dev/null
+++ b/libraw-0.21.patch
@@ -0,0 +1,12 @@
+diff -ruN gegl.orig/operations/external/raw-load.c gegl/operations/external/raw-load.c
+--- gegl.orig/operations/external/raw-load.c	2022-12-27 18:33:32.189320103 +0330
++++ gegl/operations/external/raw-load.c	2022-12-27 18:34:23.096128846 +0330
+@@ -114,7 +114,7 @@
+         g_warning ("raw-load: Error Initializing raw library");
+       else
+         {
+-          p->LibRaw->params.shot_select = o->image_num;
++          p->LibRaw->rawparams.shot_select = o->image_num;
+     
+           p->LibRaw->params.aber[0] = 1.0;
+           p->LibRaw->params.aber[2] = 1.0;