CVS commit: pkgsrc/graphics/jasper

["Tobias Nygren" <tnn%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tnn
Date:           Sat Sep 27 15:02:00 UTC 2025

Modified Files:
        pkgsrc/graphics/jasper: distinfo
Added Files:
        pkgsrc/graphics/jasper/patches: patch-src_libjasper_jp2_jp2__cod.h

Log Message:
jasper: change type of jp2_colr_t.iccp to appease GCC

Already reported upstream.


To generate a diff of this commit:
cvs rdiff -u -r1.60 -r1.61 pkgsrc/graphics/jasper/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/graphics/jasper/patches/patch-src_libjasper_jp2_jp2__cod.h

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

Modified files:

Index: pkgsrc/graphics/jasper/distinfo
diff -u pkgsrc/graphics/jasper/distinfo:1.60 pkgsrc/graphics/jasper/distinfo:1.61
--- pkgsrc/graphics/jasper/distinfo:1.60        Wed Aug  6 04:36:37 2025
+++ pkgsrc/graphics/jasper/distinfo     Sat Sep 27 15:01:59 2025
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.60 2025/08/06 04:36:37 adam Exp $
+$NetBSD: distinfo,v 1.61 2025/09/27 15:01:59 tnn Exp $
 
 BLAKE2s (jasper-4.2.8.tar.gz) = 7a6f49c1df69d125426ed585dcdf1d1e8a2629be9e743b1125b47dee87de5049
 SHA512 (jasper-4.2.8.tar.gz) = 0479ad0e0a6e679e158c8d5e75e1921b7884e5f0aacc10376f528fa61aa27f057c4a2a5d71efa17a617e641577c0a51405a7ed798a1cd38e1590bc59ab319648
 Size (jasper-4.2.8.tar.gz) = 2127775 bytes
 SHA1 (patch-CMakeLists.txt) = f60e98b33f6e36903fe589d3ae04b8b2b61230de
+SHA1 (patch-src_libjasper_jp2_jp2__cod.h) = 685d9e375abfd6d01f2b35e275e5cceac2166a28
 SHA1 (patch-src_libjasper_pnm_pnm__enc.c) = a2d5d53cd28f653f9e6e302f76c187fba50b1ce2

Added files:

Index: pkgsrc/graphics/jasper/patches/patch-src_libjasper_jp2_jp2__cod.h
diff -u /dev/null pkgsrc/graphics/jasper/patches/patch-src_libjasper_jp2_jp2__cod.h:1.1
--- /dev/null   Sat Sep 27 15:02:00 2025
+++ pkgsrc/graphics/jasper/patches/patch-src_libjasper_jp2_jp2__cod.h   Sat Sep 27 15:01:59 2025
@@ -0,0 +1,19 @@
+$NetBSD: patch-src_libjasper_jp2_jp2__cod.h,v 1.1 2025/09/27 15:01:59 tnn Exp $
+
+Arguably jp2_colr_t.iccp should be of type void* since it points to
+an opaque ICCP profile and to match usage with jas_malloc, jas_stream_read
+and jas_stream_write which all operate on void*.
+
+https://github.com/jasper-software/jasper/issues/406
+
+--- src/libjasper/jp2/jp2_cod.h.orig   2025-09-27 14:50:56.282303343 +0000
++++ src/libjasper/jp2/jp2_cod.h
+@@ -177,7 +177,7 @@ typedef struct {
+       uint_fast8_t pri;
+       uint_fast8_t approx;
+       uint_fast32_t csid;
+-      uint_fast8_t *iccp;
++      void *iccp;
+       size_t iccplen;
+       /* XXX - Someday we ought to add ICC profile data here. */
+ } jp2_colr_t;