Date: Sunday, December 18, 2022 @ 15:30:44
Author: arojas
Revision: 464568
upgpkg: krita 5.1.4-2: libraw 0.21 rebuild
Added:
krita/trunk/krita-libraw-0.21.patch
Modified:
krita/trunk/PKGBUILD
-------------------------+
PKGBUILD | 9 ++++++---
krita-libraw-0.21.patch | 16 ++++++++++++++++
2 files changed, 22 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2022-12-18 15:15:05 UTC (rev 464567)
+++ PKGBUILD 2022-12-18 15:30:44 UTC (rev 464568)
@@ -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 @@
'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
<[email protected]>
'E9FB29E74ADEACC5E3035B8AB69EB4CF7468332F' # Dmitry Kazakov
(main key) <[email protected]>
'064182440C674D9F8D0F6F8B4DA79EDA231C852B') # Stichting Krita
Foundation <[email protected]>
@@ -28,6 +30,7 @@
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() {
Added: krita-libraw-0.21.patch
===================================================================
--- krita-libraw-0.21.patch (rev 0)
+++ krita-libraw-0.21.patch 2022-12-18 15:30:44 UTC (rev 464568)
@@ -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)
