CVS commit: pkgsrc/graphics/libheif

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

Module Name:    pkgsrc
Committed By:   wiz
Date:           Thu Nov  7 18:42:14 UTC 2024

Modified Files:
        pkgsrc/graphics/libheif: Makefile distinfo
Added Files:
        pkgsrc/graphics/libheif/patches: patch-libheif_api_libheif_heif.h
            patch-libheif_context.cc

Log Message:
libheif: add upstream commit to revert API change

Fixes py-pillow_heif.

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.36 -r1.37 pkgsrc/graphics/libheif/Makefile
cvs rdiff -u -r1.31 -r1.32 pkgsrc/graphics/libheif/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/graphics/libheif/patches/patch-libheif_api_libheif_heif.h \
    pkgsrc/graphics/libheif/patches/patch-libheif_context.cc

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

Modified files:

Index: pkgsrc/graphics/libheif/Makefile
diff -u pkgsrc/graphics/libheif/Makefile:1.36 pkgsrc/graphics/libheif/Makefile:1.37
--- pkgsrc/graphics/libheif/Makefile:1.36       Thu Nov  7 10:56:43 2024
+++ pkgsrc/graphics/libheif/Makefile    Thu Nov  7 18:42:14 2024
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.36 2024/11/07 10:56:43 wiz Exp $
+# $NetBSD: Makefile,v 1.37 2024/11/07 18:42:14 wiz Exp $
 
 DISTNAME=      libheif-1.19.2
+PKGREVISION=   1
 CATEGORIES=    graphics
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=strukturag/}
 GITHUB_RELEASE=        v${PKGVERSION_NOREV}

Index: pkgsrc/graphics/libheif/distinfo
diff -u pkgsrc/graphics/libheif/distinfo:1.31 pkgsrc/graphics/libheif/distinfo:1.32
--- pkgsrc/graphics/libheif/distinfo:1.31       Thu Nov  7 10:56:44 2024
+++ pkgsrc/graphics/libheif/distinfo    Thu Nov  7 18:42:14 2024
@@ -1,5 +1,7 @@
-$NetBSD: distinfo,v 1.31 2024/11/07 10:56:44 wiz Exp $
+$NetBSD: distinfo,v 1.32 2024/11/07 18:42:14 wiz Exp $
 
 BLAKE2s (libheif-1.19.2.tar.gz) = ee4f75b2f84445d8555979ebc0e4b46d0b43262b3fb179ef02bd0ff239cfb3c4
 SHA512 (libheif-1.19.2.tar.gz) = fdb4753b57087c3dd8241b6d1378f36ea6c529e22a4b2bef3f87207676ca3aa85e123f49a8f286b15c5d8c6a7d4f38d82a1c75363e555bf2a75a81e4ce6635ab
 Size (libheif-1.19.2.tar.gz) = 1714527 bytes
+SHA1 (patch-libheif_api_libheif_heif.h) = 66f238f51e2c5c844b61f8d0fa7ed88528a483e1
+SHA1 (patch-libheif_context.cc) = a2703484fc6f94b3ccfc82ffc2d0e123143a9210

Added files:

Index: pkgsrc/graphics/libheif/patches/patch-libheif_api_libheif_heif.h
diff -u /dev/null pkgsrc/graphics/libheif/patches/patch-libheif_api_libheif_heif.h:1.1
--- /dev/null   Thu Nov  7 18:42:14 2024
+++ pkgsrc/graphics/libheif/patches/patch-libheif_api_libheif_heif.h    Thu Nov  7 18:42:14 2024
@@ -0,0 +1,15 @@
+$NetBSD: patch-libheif_api_libheif_heif.h,v 1.1 2024/11/07 18:42:14 wiz Exp $
+
+https://github.com/strukturag/libheif/commit/3dd7019ff579c038cba96353390cd41edfda927e
+
+--- libheif/api/libheif/heif.h.orig    2024-11-06 16:43:03.000000000 +0000
++++ libheif/api/libheif/heif.h
+@@ -2363,7 +2363,7 @@ struct heif_encoding_options
+ 
+   // Set this to the NCLX parameters to be used in the output image or set to NULL
+   // when the same parameters as in the input image should be used.
+-  const struct heif_color_profile_nclx* output_nclx_profile;
++  struct heif_color_profile_nclx* output_nclx_profile;
+ 
+   uint8_t macOS_compatibility_workaround_no_nclx_profile;
+ 
Index: pkgsrc/graphics/libheif/patches/patch-libheif_context.cc
diff -u /dev/null pkgsrc/graphics/libheif/patches/patch-libheif_context.cc:1.1
--- /dev/null   Thu Nov  7 18:42:14 2024
+++ pkgsrc/graphics/libheif/patches/patch-libheif_context.cc    Thu Nov  7 18:42:14 2024
@@ -0,0 +1,15 @@
+$NetBSD: patch-libheif_context.cc,v 1.1 2024/11/07 18:42:14 wiz Exp $
+
+https://github.com/strukturag/libheif/commit/3dd7019ff579c038cba96353390cd41edfda927e
+
+--- libheif/context.cc.orig    2024-11-06 16:43:03.000000000 +0000
++++ libheif/context.cc
+@@ -1162,7 +1162,7 @@ Result<std::shared_ptr<ImageItem>> HeifC
+   heif_encoding_options options = in_options;
+ 
+   if (const auto* nclx = output_image_item->get_forced_output_nclx()) {
+-    options.output_nclx_profile = nclx;
++    options.output_nclx_profile = const_cast<heif_color_profile_nclx*>(nclx);
+   }
+ 
+   Result<std::shared_ptr<HeifPixelImage>> srcImageResult = output_image_item->convert_colorspace_for_encoding(pixel_image,