CVS commit: pkgsrc/graphics/krita

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

Module Name:    pkgsrc
Committed By:   wiz
Date:           Wed Jul  9 19:00:44 UTC 2025

Modified Files:
        pkgsrc/graphics/krita: distinfo
Added Files:
        pkgsrc/graphics/krita/patches: patch-plugins_impex_heif_HeifExport.cpp
            patch-plugins_impex_heif_HeifImport.cpp

Log Message:
krita: fix build with libheif 1.20


To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 pkgsrc/graphics/krita/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/graphics/krita/patches/patch-plugins_impex_heif_HeifExport.cpp \
    pkgsrc/graphics/krita/patches/patch-plugins_impex_heif_HeifImport.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/krita/distinfo
diff -u pkgsrc/graphics/krita/distinfo:1.18 pkgsrc/graphics/krita/distinfo:1.19
--- pkgsrc/graphics/krita/distinfo:1.18 Tue May  6 13:32:34 2025
+++ pkgsrc/graphics/krita/distinfo      Wed Jul  9 19:00:44 2025
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.18 2025/05/06 13:32:34 wiz Exp $
+$NetBSD: distinfo,v 1.19 2025/07/09 19:00:44 wiz Exp $
 
 BLAKE2s (krita-5.2.9.tar.xz) = f1fc1d1342f07bb3049b3474ddd8966463fce8e896bf079a5796b8e27d7ab42b
 SHA512 (krita-5.2.9.tar.xz) = fc4af177371afad307a77047ceff3fb793c76e6e8b64382acd950bd89d6fc12fb2c83d76d8e8d0482860add178b8fe70ac05b1db4bc0e17520be53b9190e4bfe
@@ -6,3 +6,5 @@ Size (krita-5.2.9.tar.xz) = 186574780 by
 SHA1 (patch-cmake_modules_FindLibMyPaint.cmake) = 4d2273db42e4427f1ec2f4f2e1c86d976c0e24f3
 SHA1 (patch-krita_data_CMakeLists.txt) = bc0a37c1a60a2e0702c4a87b70ae0abf8359cc45
 SHA1 (patch-plugins_dockers_CMakeLists.txt) = 67623184a85eea82727e67eb076cc7b7c772d348
+SHA1 (patch-plugins_impex_heif_HeifExport.cpp) = 80acc79bccb9faba2b9f7a4ab7296c5a3215a41e
+SHA1 (patch-plugins_impex_heif_HeifImport.cpp) = 391653be4bbfc191914d1be3d94150c75390333e

Added files:

Index: pkgsrc/graphics/krita/patches/patch-plugins_impex_heif_HeifExport.cpp
diff -u /dev/null pkgsrc/graphics/krita/patches/patch-plugins_impex_heif_HeifExport.cpp:1.1
--- /dev/null   Wed Jul  9 19:00:44 2025
+++ pkgsrc/graphics/krita/patches/patch-plugins_impex_heif_HeifExport.cpp       Wed Jul  9 19:00:44 2025
@@ -0,0 +1,52 @@
+$NetBSD: patch-plugins_impex_heif_HeifExport.cpp,v 1.1 2025/07/09 19:00:44 wiz Exp $
+
+Compatibility with libheif 1.20.
+
+--- plugins/impex/heif/HeifExport.cpp.orig     2025-07-09 18:49:36.283731814 +0000
++++ plugins/impex/heif/HeifExport.cpp
+@@ -250,10 +250,10 @@ KisImportExportErrorCode HeifExport::con
+                 img.add_plane(heif_channel_G, width,height, 8);
+                 img.add_plane(heif_channel_B, width,height, 8);
+ 
+-                int strideR = 0;
+-                int strideG = 0;
+-                int strideB = 0;
+-                int strideA = 0;
++                size_t strideR = 0;
++                size_t strideG = 0;
++                size_t strideB = 0;
++                size_t strideA = 0;
+ 
+                 uint8_t *ptrR = img.get_plane(heif_channel_R, &strideR);
+                 uint8_t *ptrG = img.get_plane(heif_channel_G, &strideG);
+@@ -289,7 +289,7 @@ KisImportExportErrorCode HeifExport::con
+                 img.create(width, height, heif_colorspace_RGB, chroma);
+                 img.add_plane(heif_channel_interleaved, width, height, 12);
+ 
+-                int stride = 0;
++                size_t stride = 0;
+ 
+                 uint8_t *ptr = img.get_plane(heif_channel_interleaved, &stride);
+ 
+@@ -330,8 +330,8 @@ KisImportExportErrorCode HeifExport::con
+ 
+                 img.add_plane(heif_channel_Y, width, height, 8);
+ 
+-                int strideG = 0;
+-                int strideA = 0;
++                size_t strideG = 0;
++                size_t strideA = 0;
+ 
+                 uint8_t *ptrG = img.get_plane(heif_channel_Y, &strideG);
+                 uint8_t *ptrA = [&]() -> uint8_t * {
+@@ -363,8 +363,8 @@ KisImportExportErrorCode HeifExport::con
+ 
+                 img.add_plane(heif_channel_Y, width, height, 12);
+ 
+-                int strideG = 0;
+-                int strideA = 0;
++                size_t strideG = 0;
++                size_t strideA = 0;
+ 
+                 uint8_t *ptrG = img.get_plane(heif_channel_Y, &strideG);
+                 uint8_t *ptrA = [&]() -> uint8_t * {
Index: pkgsrc/graphics/krita/patches/patch-plugins_impex_heif_HeifImport.cpp
diff -u /dev/null pkgsrc/graphics/krita/patches/patch-plugins_impex_heif_HeifImport.cpp:1.1
--- /dev/null   Wed Jul  9 19:00:44 2025
+++ pkgsrc/graphics/krita/patches/patch-plugins_impex_heif_HeifImport.cpp       Wed Jul  9 19:00:44 2025
@@ -0,0 +1,50 @@
+$NetBSD: patch-plugins_impex_heif_HeifImport.cpp,v 1.1 2025/07/09 19:00:44 wiz Exp $
+
+Compatibility with libheif 1.20.
+
+--- plugins/impex/heif/HeifImport.cpp.orig     2025-07-09 18:54:00.656835767 +0000
++++ plugins/impex/heif/HeifImport.cpp
+@@ -387,8 +387,8 @@ KisImportExportErrorCode HeifImport::con
+ 
+         if (heifChroma == heif_chroma_monochrome) {
+             dbgFile << "monochrome heif file, bits:" << luma;
+-            int strideG = 0;
+-            int strideA = 0;
++            size_t strideG = 0;
++            size_t strideA = 0;
+             const uint8_t *imgG = heifimage.get_plane(heif_channel_Y, &strideG);
+             const uint8_t *imgA =
+                 heifimage.get_plane(heif_channel_Alpha, &strideA);
+@@ -409,10 +409,10 @@ KisImportExportErrorCode HeifImport::con
+         } else if (heifChroma == heif_chroma_444) {
+             dbgFile << "planar heif file, bits:" << luma;
+ 
+-            int strideR = 0;
+-            int strideG = 0;
+-            int strideB = 0;
+-            int strideA = 0;
++            size_t strideR = 0;
++            size_t strideG = 0;
++            size_t strideB = 0;
++            size_t strideA = 0;
+             const uint8_t* imgR = heifimage.get_plane(heif_channel_R, &strideR);
+             const uint8_t* imgG = heifimage.get_plane(heif_channel_G, &strideG);
+             const uint8_t* imgB = heifimage.get_plane(heif_channel_B, &strideB);
+@@ -439,7 +439,7 @@ KisImportExportErrorCode HeifImport::con
+                                     displayNits,
+                                     colorSpace);
+         } else if (heifChroma == heif_chroma_interleaved_RGB || heifChroma == heif_chroma_interleaved_RGBA) {
+-            int stride = 0;
++            size_t stride = 0;
+             dbgFile << "interleaved SDR heif file, bits:" << luma;
+ 
+             const uint8_t *img = heifimage.get_plane(heif_channel_interleaved, &stride);
+@@ -461,7 +461,7 @@ KisImportExportErrorCode HeifImport::con
+                                       colorSpace);
+ 
+         } else if (heifChroma == heif_chroma_interleaved_RRGGBB_LE || heifChroma == heif_chroma_interleaved_RRGGBBAA_LE || heifChroma == heif_chroma_interleaved_RRGGBB_BE || heifChroma == 
heif_chroma_interleaved_RRGGBB_BE) {
+-            int stride = 0;
++            size_t stride = 0;
+             dbgFile << "interleaved HDR heif file, bits:" << luma;
+ 
+             const uint8_t *img =