CVS commit: pkgsrc/multimedia/assimp

["David H. Gutteridge" <gutteridge%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   gutteridge
Date:           Thu Jan  7 05:15:47 UTC 2021

Modified Files:
        pkgsrc/multimedia/assimp: distinfo
Added Files:
        pkgsrc/multimedia/assimp/patches: patch-contrib_zip_src_zip.h

Log Message:
assimp: build fix for 32-bit architectures

Rather than add to the ifdef stew that's already there, simply don't
try to second-guess the host platform. Otherwise, we'd need more macro
checks added for, at least, NetBSD, FreeBSD, and musl, but including
sys/types.h should "just work".

(There's seemingly another unrelated portability issue directly below
that code block, but it won't break builds, and would require different
means of correction.)


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 pkgsrc/multimedia/assimp/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/multimedia/assimp/patches/patch-contrib_zip_src_zip.h

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

Modified files:

Index: pkgsrc/multimedia/assimp/distinfo
diff -u pkgsrc/multimedia/assimp/distinfo:1.2 pkgsrc/multimedia/assimp/distinfo:1.3
--- pkgsrc/multimedia/assimp/distinfo:1.2       Tue Jan  5 04:50:53 2021
+++ pkgsrc/multimedia/assimp/distinfo   Thu Jan  7 05:15:47 2021
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.2 2021/01/05 04:50:53 gutteridge Exp $
+$NetBSD: distinfo,v 1.3 2021/01/07 05:15:47 gutteridge Exp $
 
 SHA1 (assimp-5.0.1.tar.gz) = f148ba31dc1e7e00e59cc09b25535af997dc1998
 RMD160 (assimp-5.0.1.tar.gz) = 1c8311f5a1e2943f786c5385128a934274a4230d
 SHA512 (assimp-5.0.1.tar.gz) = 51b704ffea778638b9e228578650f62691c56ee1a90337f8bbbee37e807455466d818234be24852334e5806260e5690932c9bd8e00f055c5c26782e0636538f0
 Size (assimp-5.0.1.tar.gz) = 46607553 bytes
 SHA1 (patch-contrib_irrXML_CMakeLists.txt) = 0c2dd457cfacf7be1b9c64068848b3e3bb476afa
+SHA1 (patch-contrib_zip_src_zip.h) = e324a0c5c9a09d6c273a41aa2fa02483673fc15b

Added files:

Index: pkgsrc/multimedia/assimp/patches/patch-contrib_zip_src_zip.h
diff -u /dev/null pkgsrc/multimedia/assimp/patches/patch-contrib_zip_src_zip.h:1.1
--- /dev/null   Thu Jan  7 05:15:47 2021
+++ pkgsrc/multimedia/assimp/patches/patch-contrib_zip_src_zip.h        Thu Jan  7 05:15:47 2021
@@ -0,0 +1,24 @@
+$NetBSD: patch-contrib_zip_src_zip.h,v 1.1 2021/01/07 05:15:47 gutteridge Exp $
+
+Fix builds on some 32-bit architectures.
+
+--- contrib/zip/src/zip.h.orig 2020-01-12 11:56:40.000000000 +0000
++++ contrib/zip/src/zip.h
+@@ -21,13 +21,14 @@ extern "C" {
+ 
+ #if !defined(_SSIZE_T_DEFINED) && !defined(_SSIZE_T_DEFINED_) &&               \
+     !defined(_SSIZE_T) && !defined(_SSIZE_T_) && !defined(__ssize_t_defined)
+-#define _SSIZE_T
++//#define _SSIZE_T
+ // 64-bit Windows is the only mainstream platform
+ // where sizeof(long) != sizeof(void*)
+ #ifdef _WIN64
++#define _SSIZE_T
+ typedef long long  ssize_t;  /* byte count or error */
+-#else
+-typedef long  ssize_t;  /* byte count or error */
++//#else
++//typedef long  ssize_t;  /* byte count or error */
+ #endif
+ #endif
+