git » libkdcraw.git » commit 83d523e

libraw 0.21 rebuild

author Antonio Rojas
2022-12-18 14:57:20 UTC
committer Antonio Rojas
2022-12-18 14:57:20 UTC
parent 46d0ccd60aab36b5605e0e91d29a974402c010ac

libraw 0.21 rebuild

PKGBUILD +9 -3
libkdcraw-libraw-0.21.patch +16 -0

diff --git a/PKGBUILD b/PKGBUILD
index 3df0dd8..7415699 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,21 +4,27 @@
 
 pkgname=libkdcraw
 pkgver=22.12.0
-pkgrel=1
+pkgrel=2
 pkgdesc='A C++ interface used to decode RAW picture'
 url='https://www.kde.org/'
 arch=(x86_64)
 license=(GPL LGPL FDL)
 depends=(qt5-base libraw)
 makedepends=(extra-cmake-modules)
-source=(https://download.kde.org/stable/release-service/$pkgver/src/$pkgname-$pkgver.tar.xz{,.sig})
+source=(https://download.kde.org/stable/release-service/$pkgver/src/$pkgname-$pkgver.tar.xz{,.sig}
+        libkdcraw-libraw-0.21.patch)
 sha256sums=('e609cbafe53d7e79ed0674bdb514a42c36b8a8984cfd49348d24b3bce163c164'
-            'SKIP')
+            'SKIP'
+            '73afee3d0d6a50b809fa9370a4505ba44c35f9d9ea69aab878ca28b932549488')
 validpgpkeys=(CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7  # Albert Astals Cid <aacid@kde.org>
               F23275E4BF10AFC1DF6914A6DBD2CE893E2D1C87  # Christoph Feck <cfeck@kde.org>
               D81C0CB38EB725EF6691C385BB463350D6EF31EF) # Heiko Becker <heiko.becker@kde.org>
 options=(debug)
 
+prepare() {
+  patch -d $pkgname-$pkgver -p1 < libkdcraw-libraw-0.21.patch # Fix build with libraw 0.21
+}
+
 build() {
   cmake -B build -S $pkgname-$pkgver \
     -DBUILD_TESTING=OFF
diff --git a/libkdcraw-libraw-0.21.patch b/libkdcraw-libraw-0.21.patch
new file mode 100644
index 0000000..59cf97a
--- /dev/null
+++ b/libkdcraw-libraw-0.21.patch
@@ -0,0 +1,16 @@
+diff --git a/src/kdcraw.cpp b/src/kdcraw.cpp
+index 376a37d..1433c4b 100644
+--- a/src/kdcraw.cpp
++++ b/src/kdcraw.cpp
+@@ -357,7 +357,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)