CVS commit: pkgsrc/graphics/libkdcraw

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Sat Mar 18 05:55:11 UTC 2023

Modified Files:
        pkgsrc/graphics/libkdcraw: buildlink3.mk distinfo
Added Files:
        pkgsrc/graphics/libkdcraw/patches: patch-src_kdcraw.cpp

Log Message:
libkdcraw: fix build with libraw-0.21


To generate a diff of this commit:
cvs rdiff -u -r1.64 -r1.65 pkgsrc/graphics/libkdcraw/buildlink3.mk
cvs rdiff -u -r1.29 -r1.30 pkgsrc/graphics/libkdcraw/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/graphics/libkdcraw/patches/patch-src_kdcraw.cpp

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/graphics/libkdcraw/buildlink3.mk
diff -u pkgsrc/graphics/libkdcraw/buildlink3.mk:1.64 pkgsrc/graphics/libkdcraw/buildlink3.mk:1.65
--- pkgsrc/graphics/libkdcraw/buildlink3.mk:1.64        Sun Jan 29 21:14:41 2023
+++ pkgsrc/graphics/libkdcraw/buildlink3.mk     Sat Mar 18 05:55:11 2023
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.64 2023/01/29 21:14:41 ryoon Exp $
+# $NetBSD: buildlink3.mk,v 1.65 2023/03/18 05:55:11 wiz Exp $
 
 BUILDLINK_TREE+=       libkdcraw
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=        libkdcraw
 LIBKDCRAW_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.libkdcraw+=      libkdcraw>=17.12.1
-BUILDLINK_ABI_DEPENDS.libkdcraw?=              libkdcraw>=22.08.1nb2
+BUILDLINK_ABI_DEPENDS.libkdcraw?=      libkdcraw>=22.08.1nb2
 BUILDLINK_PKGSRCDIR.libkdcraw?=                ../../graphics/libkdcraw
 
 .include "../../x11/qt5-qtbase/buildlink3.mk"

Index: pkgsrc/graphics/libkdcraw/distinfo
diff -u pkgsrc/graphics/libkdcraw/distinfo:1.29 pkgsrc/graphics/libkdcraw/distinfo:1.30
--- pkgsrc/graphics/libkdcraw/distinfo:1.29     Thu Sep 29 00:53:11 2022
+++ pkgsrc/graphics/libkdcraw/distinfo  Sat Mar 18 05:55:11 2023
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.29 2022/09/29 00:53:11 markd Exp $
+$NetBSD: distinfo,v 1.30 2023/03/18 05:55:11 wiz Exp $
 
 BLAKE2s (libkdcraw-22.08.1.tar.xz) = 2aa17071b56ea36b1494b86cb5a0a2ec3bb34a595af8300d183279260a3d7f26
 SHA512 (libkdcraw-22.08.1.tar.xz) = 77d59955b53a02a819e04bda08cc42c171ee8fae78390dd27654d2bee279f94e5241d1d1b4d9aa0bdde88b42f3b8ea15eeb321162c0c7d6d20770c9882790b2b
 Size (libkdcraw-22.08.1.tar.xz) = 37424 bytes
+SHA1 (patch-src_kdcraw.cpp) = a58c3d1f140e0543d8dea642daefefa151640d6d

Added files:

Index: pkgsrc/graphics/libkdcraw/patches/patch-src_kdcraw.cpp
diff -u /dev/null pkgsrc/graphics/libkdcraw/patches/patch-src_kdcraw.cpp:1.1
--- /dev/null   Sat Mar 18 05:55:11 2023
+++ pkgsrc/graphics/libkdcraw/patches/patch-src_kdcraw.cpp      Sat Mar 18 05:55:11 2023
@@ -0,0 +1,18 @@
+$NetBSD: patch-src_kdcraw.cpp,v 1.1 2023/03/18 05:55:11 wiz Exp $
+
+Fix build with libraw-0.21.
+
+--- src/kdcraw.cpp.orig        2022-07-13 12:24:57.000000000 +0000
++++ src/kdcraw.cpp
+@@ -357,7 +357,11 @@ bool KDcraw::extractRAWData(const QStrin
+     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)