CVS commit: pkgsrc/graphics/osg

["Paolo Vincenzo Olivo" <vins%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   vins
Date:           Sat Dec 13 09:40:51 UTC 2025

Modified Files:
        pkgsrc/graphics/osg: distinfo
Added Files:
        pkgsrc/graphics/osg/patches: patch-src_osgPlugins_zip_unzip.cpp

Log Message:
graphics/osg: fix build error


To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 pkgsrc/graphics/osg/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/graphics/osg/patches/patch-src_osgPlugins_zip_unzip.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/osg/distinfo
diff -u pkgsrc/graphics/osg/distinfo:1.17 pkgsrc/graphics/osg/distinfo:1.18
--- pkgsrc/graphics/osg/distinfo:1.17   Tue Oct 26 10:46:35 2021
+++ pkgsrc/graphics/osg/distinfo        Sat Dec 13 09:40:51 2025
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.17 2021/10/26 10:46:35 nia Exp $
+$NetBSD: distinfo,v 1.18 2025/12/13 09:40:51 vins Exp $
 
 BLAKE2s (osg-3.6.5.tar.gz) = 8582bbae847f3496dc6e95d603955bd993b18bbca160c5a88a586ffeacbebec1
 SHA512 (osg-3.6.5.tar.gz) = 7002fa30a3bcf6551d2e1050b4ca75a3736013fd190e4f50953717406864da1952deb09f530bc8c5ddf6e4b90204baec7dbc283f497829846d46d561f66feb4b
@@ -14,4 +14,5 @@ SHA1 (patch-src_osgPlugins_exr_ReaderWri
 SHA1 (patch-src_osgPlugins_osc_ip_posix_NetworkingUtils.cpp) = 5748636ed17d23a0a595d38b2b392e773840a102
 SHA1 (patch-src_osgPlugins_osc_osc_OscHostEndianness.h) = 4202df06c8ab49fa5f3787cc1c59e9f247d1a21b
 SHA1 (patch-src_osgPlugins_osc_osc_OscOutboundPacketStream.cpp) = b9bc38773bfdc78056a4575f772abd7a1fbf09f3
+SHA1 (patch-src_osgPlugins_zip_unzip.cpp) = cf19fe13cc0147587a8dde7de294e55bbf72812e
 SHA1 (patch-src_osg_GLExtensions.cpp) = 5fc04fa162c5cf8aa34ddfb0152092b02e8eec08

Added files:

Index: pkgsrc/graphics/osg/patches/patch-src_osgPlugins_zip_unzip.cpp
diff -u /dev/null pkgsrc/graphics/osg/patches/patch-src_osgPlugins_zip_unzip.cpp:1.1
--- /dev/null   Sat Dec 13 09:40:52 2025
+++ pkgsrc/graphics/osg/patches/patch-src_osgPlugins_zip_unzip.cpp      Sat Dec 13 09:40:51 2025
@@ -0,0 +1,18 @@
+$NetBSD: patch-src_osgPlugins_zip_unzip.cpp,v 1.1 2025/12/13 09:40:51 vins Exp $
+
+Prevent conflicting types with system zlib.
+
+--- src/osgPlugins/zip/unzip.cpp.orig  2020-01-31 11:03:07.000000000 +0000
++++ src/osgPlugins/zip/unzip.cpp
+@@ -399,8 +399,9 @@ typedef unsigned int   uInt;  // 16 bits
+ typedef unsigned long  uLong; // 32 bits or more
+ typedef void *voidpf;
+ typedef void     *voidp;
+-typedef long z_off_t;
+-
++#ifndef z_off_t
++#define z_off_t long
++#endif
+ 
+ 
+