CVS commit: pkgsrc/graphics/simage

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/graphics/simage
From: "Robert Swindells" <rjs%netbsd.org@localhost>
Date: Tue, 8 Oct 2024 20:43:18 +0000

Module Name:    pkgsrc
Committed By:   rjs
Date:           Tue Oct  8 20:43:18 UTC 2024

Modified Files:
        pkgsrc/graphics/simage: Makefile buildlink3.mk distinfo
Added Files:
        pkgsrc/graphics/simage/patches: patch-src_simage__gif.c
            patch-src_simage__tiff.c

Log Message:
Update graphics/simage to version 1.8.3.

Change log from previous version not available.


To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.34 pkgsrc/graphics/simage/Makefile
cvs rdiff -u -r1.30 -r1.31 pkgsrc/graphics/simage/buildlink3.mk
cvs rdiff -u -r1.7 -r1.8 pkgsrc/graphics/simage/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/graphics/simage/patches/patch-src_simage__gif.c \
    pkgsrc/graphics/simage/patches/patch-src_simage__tiff.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/simage/Makefile
diff -u pkgsrc/graphics/simage/Makefile:1.33 pkgsrc/graphics/simage/Makefile:1.34
--- pkgsrc/graphics/simage/Makefile:1.33        Sat Oct 21 17:10:42 2023
+++ pkgsrc/graphics/simage/Makefile     Tue Oct  8 20:43:17 2024
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.33 2023/10/21 17:10:42 gdt Exp $
+# $NetBSD: Makefile,v 1.34 2024/10/08 20:43:17 rjs Exp $
 
-DISTNAME=              simage-1.7.0
-PKGREVISION=           11
+DISTNAME=              simage-1.8.3
 CATEGORIES=            graphics
-MASTER_SITES=          https://bitbucket.org/Coin3D/coin/downloads/
+MASTER_SITES=          ${MASTER_SITE_GITHUB:=coin3d/}
+GITHUB_PROJECT=                simage
+GITHUB_TAG=            v1.8.3
 
 MAINTAINER=            pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=              http://www.coin3d.org/

Index: pkgsrc/graphics/simage/buildlink3.mk
diff -u pkgsrc/graphics/simage/buildlink3.mk:1.30 pkgsrc/graphics/simage/buildlink3.mk:1.31
--- pkgsrc/graphics/simage/buildlink3.mk:1.30   Sat Oct 21 17:10:42 2023
+++ pkgsrc/graphics/simage/buildlink3.mk        Tue Oct  8 20:43:17 2024
@@ -1,12 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.30 2023/10/21 17:10:42 gdt Exp $
+# $NetBSD: buildlink3.mk,v 1.31 2024/10/08 20:43:17 rjs Exp $
 
 BUILDLINK_TREE+=       simage
 
 .if !defined(SIMAGE_BUILDLINK3_MK)
 SIMAGE_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.simage+= simage>=1.6.1
-BUILDLINK_ABI_DEPENDS.simage+= simage>=1.7.0nb11
+BUILDLINK_API_DEPENDS.simage+= simage>=1.8.3
+BUILDLINK_ABI_DEPENDS.simage+= simage>=1.8.3
 BUILDLINK_PKGSRCDIR.simage?=   ../../graphics/simage
 
 .include "../../audio/libsndfile/buildlink3.mk"

Index: pkgsrc/graphics/simage/distinfo
diff -u pkgsrc/graphics/simage/distinfo:1.7 pkgsrc/graphics/simage/distinfo:1.8
--- pkgsrc/graphics/simage/distinfo:1.7 Tue Oct 26 10:46:54 2021
+++ pkgsrc/graphics/simage/distinfo     Tue Oct  8 20:43:17 2024
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.7 2021/10/26 10:46:54 nia Exp $
+$NetBSD: distinfo,v 1.8 2024/10/08 20:43:17 rjs Exp $
 
-BLAKE2s (simage-1.7.0.tar.gz) = ed5d124f1ac957d11139c0169f15b3a9a82822106b0b45baf7aac480af0700b3
-SHA512 (simage-1.7.0.tar.gz) = 944ec009dd7041692073ddd9795fdd633fe3bc9101f1c1234e8be3746487a9431aecf52abde01563e719153fbe1ca7d29f9b64042e4a64ea08d6cb14666dd89f
-Size (simage-1.7.0.tar.gz) = 752602 bytes
-SHA1 (patch-src_simage__png.c) = d511a7c45db46c60ea4aacff748b1325e83e396d
+BLAKE2s (simage-1.8.3.tar.gz) = e5c6deb15b03afc86ba24548d5f758500d853e3a4229a0a6c1d5efb16bfb6d15
+SHA512 (simage-1.8.3.tar.gz) = 42981f1dc67f17bc6bfc49ecbf035444b79ab467d5ece4310841856f5ec87d2b4352d5a7cb5713fb14ac5a25928f7d657fb74c93acdcd86b8b0dd89f26a5008a
+Size (simage-1.8.3.tar.gz) = 812285 bytes
+SHA1 (patch-src_simage__gif.c) = 22a29585cf05ccb3de60dee34057e0a7b6b50b16
+SHA1 (patch-src_simage__tiff.c) = 0fe01b8cf6e8310263cfe05b607533a9c44610c2

Added files:

Index: pkgsrc/graphics/simage/patches/patch-src_simage__gif.c
diff -u /dev/null pkgsrc/graphics/simage/patches/patch-src_simage__gif.c:1.1
--- /dev/null   Tue Oct  8 20:43:18 2024
+++ pkgsrc/graphics/simage/patches/patch-src_simage__gif.c      Tue Oct  8 20:43:17 2024
@@ -0,0 +1,13 @@
+$NetBSD: patch-src_simage__gif.c,v 1.1 2024/10/08 20:43:17 rjs Exp $
+
+--- src/simage_gif.c.orig      2024-09-17 15:41:13.777192650 +0000
++++ src/simage_gif.c
+@@ -34,7 +34,7 @@
+ #if GIFLIB_MAJOR > 5 || GIFLIB_MAJOR == 5 && GIFLIB_MINOR >= 2 || GIFLIB_MAJOR == 5 && GIFLIB_MINOR == 1 && GIFLIB_RELEASE >= 9
+ //see https://sourceforge.net/p/giflib/bugs/132/
+ //and https://sourceforge.net/p/giflib/bugs/142/
+-#include <quantize.h>
++//#include <quantize.h>
+ #endif
+ 
+ #if GIFLIB_MAJOR > 5 || GIFLIB_MAJOR == 5 && GIFLIB_MINOR >= 1
Index: pkgsrc/graphics/simage/patches/patch-src_simage__tiff.c
diff -u /dev/null pkgsrc/graphics/simage/patches/patch-src_simage__tiff.c:1.1
--- /dev/null   Tue Oct  8 20:43:18 2024
+++ pkgsrc/graphics/simage/patches/patch-src_simage__tiff.c     Tue Oct  8 20:43:17 2024
@@ -0,0 +1,117 @@
+$NetBSD: patch-src_simage__tiff.c,v 1.1 2024/10/08 20:43:17 rjs Exp $
+
+--- src/simage_tiff.c.orig     2024-09-17 15:21:49.117656332 +0000
++++ src/simage_tiff.c
+@@ -85,7 +85,7 @@ tiff_warn(const char * module, const cha
+ }
+ 
+ static int
+-checkcmap(int n, uint16* r, uint16* g, uint16* b)
++checkcmap(int n, uint16_t * r, uint16_t * g, uint16_t * b)
+ {
+   while (n-- > 0)
+     if (*r++ >= 256 || *g++ >= 256 || *b++ >= 256)
+@@ -212,17 +212,17 @@ simage_tiff_load(const char *filename,
+                  int *numComponents_ret)
+ {
+   TIFF *in;
+-  uint16 samplesperpixel;
+-  uint16 bitspersample;
+-  uint16 photometric;
+-  uint32 w, h;
+-  uint16 config;
+-  uint16* red;
+-  uint16* green;
+-  uint16* blue;
++  uint16_t samplesperpixel;
++  uint16_t bitspersample;
++  uint16_t photometric;
++  uint32_t w, h;
++  uint16_t config;
++  uint16_t * red;
++  uint16_t * green;
++  uint16_t * blue;
+   unsigned char *inbuf = NULL;
+   tsize_t rowsize;
+-  uint32 row;
++  uint32_t row;
+   int format;
+   unsigned char *buffer;
+   int width;
+@@ -387,7 +387,7 @@ simage_tiff_load(const char *filename,
+       for (row = 0; !tifferror && row < h; row++) {
+         int s;
+         for (s = 0; s < format; s++) {
+-          if (TIFFReadScanline(in, (tdata_t)(inbuf+s*rowsize), (uint32)row, (tsample_t)s) < 0) {
++          if (TIFFReadScanline(in, (tdata_t)(inbuf+s*rowsize), (uint32_t)row, (tsample_t)s) < 0) {
+             tifferror = ERR_READ; break;
+           }
+         }
+@@ -427,7 +427,7 @@ simage_tiff_save(const char *filename,
+                  int height,
+                  int numcomponents)
+ {
+-  uint16 photometric;
++  uint16_t photometric;
+   TIFF * out;
+   int y, bytesperrow;
+   short config = PLANARCONFIG_CONTIG;
+@@ -439,8 +439,8 @@ simage_tiff_save(const char *filename,
+     return 0;
+   }
+ 
+-  TIFFSetField(out, TIFFTAG_IMAGEWIDTH, (uint32) width);
+-  TIFFSetField(out, TIFFTAG_IMAGELENGTH, (uint32) height);
++  TIFFSetField(out, TIFFTAG_IMAGEWIDTH, (uint32_t) width);
++  TIFFSetField(out, TIFFTAG_IMAGELENGTH, (uint32_t) height);
+   TIFFSetField(out, TIFFTAG_BITSPERSAMPLE, 8);
+   TIFFSetField(out, TIFFTAG_COMPRESSION, compression);
+   if (numcomponents <= 2)
+@@ -452,12 +452,12 @@ simage_tiff_save(const char *filename,
+   TIFFSetField(out, TIFFTAG_ORIENTATION, ORIENTATION_TOPLEFT);
+   TIFFSetField(out, TIFFTAG_SAMPLESPERPIXEL, numcomponents);
+   if (numcomponents == 2 || numcomponents == 4) {
+-    uint16 v[1];
++    uint16_t v[1];
+     v[0] = EXTRASAMPLE_UNASSALPHA;
+     TIFFSetField(out, TIFFTAG_EXTRASAMPLES, 1, v);
+   }
+-  TIFFSetField(out, TIFFTAG_MINSAMPLEVALUE, (uint16) 0);
+-  TIFFSetField(out, TIFFTAG_MAXSAMPLEVALUE, (uint16) 255);
++  TIFFSetField(out, TIFFTAG_MINSAMPLEVALUE, (uint16_t) 0);
++  TIFFSetField(out, TIFFTAG_MAXSAMPLEVALUE, (uint16_t) 255);
+   TIFFSetField(out, TIFFTAG_PLANARCONFIG, config);
+   /* force 1 row/strip for library limitation */
+   TIFFSetField(out, TIFFTAG_ROWSPERSTRIP, 1L);
+@@ -479,14 +479,14 @@ simage_tiff_save(const char *filename,
+ 
+ typedef struct {
+   TIFF * in;
+-  uint16 samplesperpixel;
+-  uint16 bitspersample;
+-  uint16 photometric;
+-  uint32 w, h;
+-  uint16 config;
+-  uint16 * red;
+-  uint16 * green;
+-  uint16 * blue;
++  uint16_t samplesperpixel;
++  uint16_t bitspersample;
++  uint16_t photometric;
++  uint32_t w, h;
++  uint16_t config;
++  uint16_t * red;
++  uint16_t * green;
++  uint16_t * blue;
+   int format;
+   int rowsize;
+   unsigned char * inbuf;
+@@ -664,7 +664,7 @@ simage_tiff_read_line(void * opendata, i
+     case pack(PHOTOMETRIC_RGB, PLANARCONFIG_SEPARATE):
+       for (s = 0; s < od->format; s++) {
+         if (TIFFReadScanline(od->in, (tdata_t)(od->inbuf+s*od->rowsize),
+-                             (uint32)row, (tsample_t)s) < 0) {
++                             (uint32_t)row, (tsample_t)s) < 0) {
+           tifferror = ERR_READ; break;
+         }
+       }

Prev by Date: CVS commit: pkgsrc/doc
Next by Date: CVS commit: pkgsrc/doc
Previous by Thread: CVS commit: pkgsrc/doc
Next by Thread: CVS commit: pkgsrc/doc
Indexes:

Home | Main Index | Thread Index | Old Index