git » krita.git » commit d7ed5be

libraw 0.21 rebuild

author Antonio Rojas
2022-12-18 15:30:44 UTC
committer Antonio Rojas
2022-12-18 15:30:44 UTC
parent bf63c17011340c3d3b66788e8d35ffc4c95266f0

libraw 0.21 rebuild

PKGBUILD +6 -3
krita-libraw-0.21.patch +16 -0

diff --git a/PKGBUILD b/PKGBUILD
index 7254281..6c9f8b9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 pkgname=krita
 _pkgver=5.1.4
 pkgver=${_pkgver/-/}
-pkgrel=1
+pkgrel=2
 pkgdesc='Edit and paint images'
 arch=(x86_64)
 url='https://krita.org'
@@ -17,10 +17,12 @@ optdepends=('poppler-qt5: PDF filter' 'ffmpeg: to save animations'
             'kseexpr: SeExpr generator layer' 'kimageformats: PSD support' 'libmypaint: support for MyPaint brushes'
             'krita-plugin-gmic: GMic plugin' 'libjxl: JPEG-XL filter')
 source=(https://download.kde.org/stable/krita/$_pkgver/$pkgname-$_pkgver.tar.gz{,.sig}
-        find-xsimd.patch)
+        find-xsimd.patch
+        krita-libraw-0.21.patch)
 sha256sums=('c22b020862596eb2fdd911e1b179dbbce7b081be111457a2eacaf6ae1cca2dcb'
             'SKIP'
-            '622c9ffbbfef72dd024b391b879c79ae34da11d52b2f3488dfd8ee42bf7b453b')
+            '622c9ffbbfef72dd024b391b879c79ae34da11d52b2f3488dfd8ee42bf7b453b'
+            '583559875b48d099f120703663e229bd7df8d55b2de45b4d3ce1ca36d3572baa')
 validpgpkeys=('05D00A8B73A686789E0A156858B9596C722EA3BD'  # Boudewijn Rempt <foundation@krita.org>
               'E9FB29E74ADEACC5E3035B8AB69EB4CF7468332F'  # Dmitry Kazakov (main key) <dimula73@gmail.com>
               '064182440C674D9F8D0F6F8B4DA79EDA231C852B') # Stichting Krita Foundation <foundation@krita.org>
@@ -28,6 +30,7 @@ options=(debug)
 
 prepare() {
   patch -d $pkgname-$_pkgver -p1 < find-xsimd.patch
+  patch -d $pkgname-$_pkgver -p1 < krita-libraw-0.21.patch # Fix build with libraw 0.21
 }
 
 build() {
diff --git a/krita-libraw-0.21.patch b/krita-libraw-0.21.patch
new file mode 100644
index 0000000..28c4562
--- /dev/null
+++ b/krita-libraw-0.21.patch
@@ -0,0 +1,16 @@
+diff --git a/plugins/impex/raw/3rdparty/libkdcraw/src/kdcraw.cpp b/plugins/impex/raw/3rdparty/libkdcraw/src/kdcraw.cpp
+index dcaecc6fa7..71425f909c 100644
+--- a/plugins/impex/raw/3rdparty/libkdcraw/src/kdcraw.cpp
++++ b/plugins/impex/raw/3rdparty/libkdcraw/src/kdcraw.cpp
+@@ -383,7 +383,11 @@ bool KDcraw::extractRAWData(const QString& filePath, QByteArray& rawData, DcrawI
+     d->setProgress(0.3);
+ 
+     raw.imgdata.params.output_bps  = 16;
++#if LIBRAW_COMPILE_CHECK_VERSION_NOTLESS(0, 21)
++    raw.imgdata.rawparams.shot_select = shotSelect;
++#else
+     raw.imgdata.params.shot_select = shotSelect;
++#endif
+     ret                            = raw.unpack();
+ 
+     if (ret != LIBRAW_SUCCESS)