CVS commit: pkgsrc/graphics/camlimages

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

Module Name:    pkgsrc
Committed By:   wiz
Date:           Tue Jan 20 09:45:43 UTC 2026

Modified Files:
        pkgsrc/graphics/camlimages: distinfo
        pkgsrc/graphics/camlimages/patches: patch-src_pngread.c
            patch-src_tiffwrite.c

Log Message:
camlimages: fix build on NetBSD-current


To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 pkgsrc/graphics/camlimages/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/graphics/camlimages/patches/patch-src_pngread.c
cvs rdiff -u -r1.3 -r1.4 \
    pkgsrc/graphics/camlimages/patches/patch-src_tiffwrite.c

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

Modified files:

Index: pkgsrc/graphics/camlimages/distinfo
diff -u pkgsrc/graphics/camlimages/distinfo:1.20 pkgsrc/graphics/camlimages/distinfo:1.21
--- pkgsrc/graphics/camlimages/distinfo:1.20    Fri Jan 31 07:09:56 2025
+++ pkgsrc/graphics/camlimages/distinfo Tue Jan 20 09:45:43 2026
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.20 2025/01/31 07:09:56 wiz Exp $
+$NetBSD: distinfo,v 1.21 2026/01/20 09:45:43 wiz Exp $
 
 BLAKE2s (camlimages-4.0.1a/v4.0.1.tar.gz) = 0d8e3e7a10f89ff6afd5161a840ea9951a563daf8388f2717d2f75257b6276d4
 SHA512 (camlimages-4.0.1a/v4.0.1.tar.gz) = c4e2a816911ed128c0414308d1ace914bbb51e40b6d70a3c492690b38c860f79e3e01efa3f1be7d57654c78f8acca6f30bffb9e6b8fd423d1d36d6a477d0fd8d
@@ -36,7 +36,7 @@ SHA1 (patch-src_mstring.ml) = 84ec525bd5
 SHA1 (patch-src_oImages.ml) = 40d0b13cfa54647da850172142c054576a8ce073
 SHA1 (patch-src_oImages.mli) = 0b6290c409eadf60ee3dcece8895dbab90ae36be
 SHA1 (patch-src_png.ml) = 613dc0b5bace73423f3ccad0f393881220fcc877
-SHA1 (patch-src_pngread.c) = 00d753b8570b5ff9ffa71e6e62328496b03f9654
+SHA1 (patch-src_pngread.c) = 80686b7623aa955d923e3747f7efccf53317c329
 SHA1 (patch-src_pngwrite.c) = 4df4f69851769e0eefc2249a30ac8dd53aa8d755
 SHA1 (patch-src_rgb24.ml) = 9b30ac9f92992e30e0dc33fe4f0b09fffc4504d5
 SHA1 (patch-src_rgb24.mli) = 8a9e765a8b9c787796c7f7f3effc9d7fe542c32b
@@ -45,7 +45,7 @@ SHA1 (patch-src_rgba32.mli) = 4cb8e6b36d
 SHA1 (patch-src_tiff.ml) = a668e0a414121ba566d270eede9c4a0213419d54
 SHA1 (patch-src_tiff.mli) = 51938d692d0589134c9ef5bdd4ca25013fc74406
 SHA1 (patch-src_tiffread.c) = 42e5891b57bf46705a597d1515016e6fe84e65fe
-SHA1 (patch-src_tiffwrite.c) = c35f55594ab56373dd0f00d55c125209f7a88377
+SHA1 (patch-src_tiffwrite.c) = dd64b7ea6b7a5c582e3023038f1ad15c99b0ef32
 SHA1 (patch-src_units.ml) = 65f6b69092f2618756848ad7291432c84a230bce
 SHA1 (patch-src_xpm.ml) = f5eee2983770100f1f7999c1c2fbb6e1155b83cf
 SHA1 (patch-src_xvthumb.ml) = b1142f4aae2e1692ec4b6fe25633fc84aeff604f

Index: pkgsrc/graphics/camlimages/patches/patch-src_pngread.c
diff -u pkgsrc/graphics/camlimages/patches/patch-src_pngread.c:1.1 pkgsrc/graphics/camlimages/patches/patch-src_pngread.c:1.2
--- pkgsrc/graphics/camlimages/patches/patch-src_pngread.c:1.1  Sun Aug  7 20:36:20 2011
+++ pkgsrc/graphics/camlimages/patches/patch-src_pngread.c      Tue Jan 20 09:45:43 2026
@@ -1,10 +1,20 @@
-$NetBSD: patch-src_pngread.c,v 1.1 2011/08/07 20:36:20 wiz Exp $
+$NetBSD: patch-src_pngread.c,v 1.2 2026/01/20 09:45:43 wiz Exp $
 
+Add missing header for strcmp().
 Fix build with png-1.5.
 
---- src/pngread.c.orig 2011-01-25 14:10:44.000000000 +0000
-+++ src/pngread.c      2011-04-17 13:35:40.000000000 +0000
-@@ -69,7 +69,7 @@
+--- src/pngread.c.orig 2011-06-22 18:04:32.000000000 +0000
++++ src/pngread.c
+@@ -21,6 +21,8 @@
+ #include "oversized.h"
+ #include <png.h>
+ 
++#include <string.h>
++
+ #include <caml/mlvalues.h>
+ #include <caml/alloc.h>
+ #include <caml/memory.h>
+@@ -69,7 +71,7 @@ value read_png_file_as_rgb24( name )
    }
  
    /* error handling */
@@ -13,7 +23,7 @@ Fix build with png-1.5.
      /* Free all of the memory associated with the png_ptr and info_ptr */
      png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp)NULL);
      fclose(fp);
-@@ -134,7 +134,7 @@
+@@ -134,7 +136,7 @@ value read_png_file_as_rgb24( name )
      png_set_rows(png_ptr, info_ptr, row_pointers);
  
      /* Later, we can return something */
@@ -22,7 +32,7 @@ Fix build with png-1.5.
        /* Free all of the memory associated with the png_ptr and info_ptr */
        png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp)NULL);
        fclose(fp);
-@@ -243,7 +243,7 @@
+@@ -243,7 +245,7 @@ value read_png_file( name )
    }
  
    /* error handling */
@@ -31,7 +41,7 @@ Fix build with png-1.5.
      /* Free all of the memory associated with the png_ptr and info_ptr */
      png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp)NULL);
      fclose(fp);
-@@ -302,7 +302,7 @@
+@@ -302,7 +304,7 @@ value read_png_file( name )
      png_set_rows(png_ptr, info_ptr, row_pointers);
  
      /* Later, we can return something */

Index: pkgsrc/graphics/camlimages/patches/patch-src_tiffwrite.c
diff -u pkgsrc/graphics/camlimages/patches/patch-src_tiffwrite.c:1.3 pkgsrc/graphics/camlimages/patches/patch-src_tiffwrite.c:1.4
--- pkgsrc/graphics/camlimages/patches/patch-src_tiffwrite.c:1.3        Sun Dec 26 05:28:23 2021
+++ pkgsrc/graphics/camlimages/patches/patch-src_tiffwrite.c    Tue Jan 20 09:45:43 2026
@@ -1,4 +1,4 @@
-$NetBSD: patch-src_tiffwrite.c,v 1.3 2021/12/26 05:28:23 dholland Exp $
+$NetBSD: patch-src_tiffwrite.c,v 1.4 2026/01/20 09:45:43 wiz Exp $
 
 - ocaml/caml/compatibility.h defines int16 and uint16, which break tiff.
 They're not needed, so clear them out. (There are no more int32/uint32
@@ -10,7 +10,7 @@ defines, so that logic can be removed.)
 
 --- src/tiffwrite.c.orig       2011-06-22 18:04:32.000000000 +0000
 +++ src/tiffwrite.c
-@@ -20,18 +20,11 @@
+@@ -20,19 +20,12 @@
  #include <caml/memory.h>
  #include <caml/fail.h>
  
@@ -27,12 +27,13 @@ defines, so that logic can be removed.)
  #undef uint16
 -#undef int32
 -#undef uint32
-+
-+#include <tiffio.h>
  
++#include <tiffio.h>
++
  extern value *imglib_error;
  
-@@ -56,8 +49,8 @@ value open_tiff_file_for_write( value fi
+ value open_tiff_file_for_write( value file,
+@@ -56,8 +49,8 @@ value open_tiff_file_for_write( value file,
      /* Resolution */
      /* FillOrder */
      
@@ -43,7 +44,7 @@ defines, so that logic can be removed.)
      TIFFSetField(tif, TIFFTAG_ORIENTATION, ORIENTATION_TOPLEFT);
      TIFFSetField(tif, TIFFTAG_SAMPLESPERPIXEL, 3);
      TIFFSetField(tif, TIFFTAG_BITSPERSAMPLE, 8);
-@@ -83,6 +76,6 @@ value write_tiff_scanline( tiffh, buf, r
+@@ -83,6 +76,6 @@ value write_tiff_scanline( tiffh, buf, row )
       value row;
  {
    CAMLparam3(tiffh,buf,row);