CVS commit: pkgsrc/graphics/openimageio

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

Module Name:    pkgsrc
Committed By:   wiz
Date:           Tue Jul  8 05:54:48 UTC 2025

Modified Files:
        pkgsrc/graphics/openimageio: distinfo
Added Files:
        pkgsrc/graphics/openimageio/patches:
            patch-src_heif.imageio_heifinput.cpp
            patch-src_heif.imageio_heifoutput.cpp

Log Message:
openimageio: fix build with libheif 1.20

>From Robert Whitlock in PR 59516.


To generate a diff of this commit:
cvs rdiff -u -r1.35 -r1.36 pkgsrc/graphics/openimageio/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/graphics/openimageio/patches/patch-src_heif.imageio_heifinput.cpp \
    pkgsrc/graphics/openimageio/patches/patch-src_heif.imageio_heifoutput.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/openimageio/distinfo
diff -u pkgsrc/graphics/openimageio/distinfo:1.35 pkgsrc/graphics/openimageio/distinfo:1.36
--- pkgsrc/graphics/openimageio/distinfo:1.35   Sat Feb 15 15:47:55 2025
+++ pkgsrc/graphics/openimageio/distinfo        Tue Jul  8 05:54:48 2025
@@ -1,10 +1,12 @@
-$NetBSD: distinfo,v 1.35 2025/02/15 15:47:55 wiz Exp $
+$NetBSD: distinfo,v 1.36 2025/07/08 05:54:48 wiz Exp $
 
 BLAKE2s (OpenImageIO-2.5.17.0.tar.gz) = 5e381a7ef26c5cba138c75ad1eb06e24a182a0e86b63a88b95ff2d0bcd2eec4f
 SHA512 (OpenImageIO-2.5.17.0.tar.gz) = a979d84ce985d80d42058ea9cdc631096ddcd712643eef497425e63f5d747cad0c5acb9a87af47be529f850c902f4bcaf33857fb3adec53e41a3d950d49a59d2
 Size (OpenImageIO-2.5.17.0.tar.gz) = 52548216 bytes
 SHA1 (patch-src_cmake_compiler.cmake) = d4abc010c5016cfcffab51191b5ea37edbfdd9cc
 SHA1 (patch-src_cmake_externalpackages.cmake) = 710f1f66e55fbee5f7e330064db8535e7a1110fe
+SHA1 (patch-src_heif.imageio_heifinput.cpp) = c638e9630c2f44c8591a0ac3a8b17982407a43e8
+SHA1 (patch-src_heif.imageio_heifoutput.cpp) = 4b22ce1ec0297c792c2dd3cefe3da297869835af
 SHA1 (patch-src_include_OpenImageIO_imagebuf.h) = 6460cb5ff97b7d2c3eaedd7fb157dfce9d8d7984
 SHA1 (patch-src_include_OpenImageIO_strutil.h) = 90efe95bf763881478aea851cce0ea67a9de9c1a
 SHA1 (patch-src_libutil_strutil.cpp) = fd63f4648cd9750d7b9e496c183886d348c2cff5

Added files:

Index: pkgsrc/graphics/openimageio/patches/patch-src_heif.imageio_heifinput.cpp
diff -u /dev/null pkgsrc/graphics/openimageio/patches/patch-src_heif.imageio_heifinput.cpp:1.1
--- /dev/null   Tue Jul  8 05:54:48 2025
+++ pkgsrc/graphics/openimageio/patches/patch-src_heif.imageio_heifinput.cpp    Tue Jul  8 05:54:48 2025
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_heif.imageio_heifinput.cpp,v 1.1 2025/07/08 05:54:48 wiz Exp $
+
+Fix build with libheif 1.20.
+
+--- src/heif.imageio/heifinput.cpp.orig        2025-07-08 05:50:37.935201903 +0000
++++ src/heif.imageio/heifinput.cpp
+@@ -394,7 +394,7 @@ HeifInput::read_native_scanline(int subi
+     if (y < 0 || y >= m_spec.height)  // out of range scanline
+         return false;
+ 
+-    int ystride          = 0;
++    size_t ystride          = 0;
+     const uint8_t* hdata = m_himage.get_plane(heif_channel_interleaved,
+                                               &ystride);
+     if (!hdata) {
Index: pkgsrc/graphics/openimageio/patches/patch-src_heif.imageio_heifoutput.cpp
diff -u /dev/null pkgsrc/graphics/openimageio/patches/patch-src_heif.imageio_heifoutput.cpp:1.1
--- /dev/null   Tue Jul  8 05:54:48 2025
+++ pkgsrc/graphics/openimageio/patches/patch-src_heif.imageio_heifoutput.cpp   Tue Jul  8 05:54:48 2025
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_heif.imageio_heifoutput.cpp,v 1.1 2025/07/08 05:54:48 wiz Exp $
+
+Fix build with libheif 1.20.
+
+--- src/heif.imageio/heifoutput.cpp.orig       2025-07-08 05:50:55.597638959 +0000
++++ src/heif.imageio/heifoutput.cpp
+@@ -149,7 +149,7 @@ HeifOutput::write_scanline(int y, int /*
+                            stride_t xstride)
+ {
+     data           = to_native_scanline(format, data, xstride, scratch);
+-    int hystride   = 0;
++    size_t hystride   = 0;
+     uint8_t* hdata = m_himage.get_plane(heif_channel_interleaved, &hystride);
+     hdata += hystride * (y - m_spec.y);
+     memcpy(hdata, data, hystride);