Thu Apr 14 13:20:42 2022 UTC ()
Update multimedia/assimp to version 5.2.3

Update multimedia/assimp to version 5.2.3.

The reason for updating is that this
version has changes, mOrthographicWith in
aiCamera, needed by some packages in wip
(qt6).

This update should be safe since only wip
packages depend on it.

pkgsrc changes:
patch-assimp.pc.in came from upstream and
is now removed.
contrib/irrXML does not exist anymore so
patch-contrib_irrXML_CMakeLists.txt has
been removed.

Changes in package:
To many to mention.


(nros)
diff -r1.3 -r1.4 pkgsrc/multimedia/assimp/Makefile
diff -r1.2 -r1.3 pkgsrc/multimedia/assimp/PLIST
diff -r1.1 -r1.2 pkgsrc/multimedia/assimp/buildlink3.mk
diff -r1.7 -r1.8 pkgsrc/multimedia/assimp/distinfo
diff -r1.1 -r0 pkgsrc/multimedia/assimp/patches/patch-assimp.pc.in
diff -r1.1 -r0 pkgsrc/multimedia/assimp/patches/patch-contrib_irrXML_CMakeLists.txt
diff -r1.2 -r1.3 pkgsrc/multimedia/assimp/patches/patch-contrib_zip_src_zip.h
cvs diff -r1.3 -r1.4 pkgsrc/multimedia/assimp/Makefile (expand / switch to unified diff)

--- pkgsrc/multimedia/assimp/Makefile 2021/05/10 08:18:53 1.3
+++ pkgsrc/multimedia/assimp/Makefile 2022/04/14 13:20:42 1.4
@@ -1,17 +1,16 @@ @@ -1,17 +1,16 @@
1# $NetBSD: Makefile,v 1.3 2021/05/10 08:18:53 nros Exp $ 1# $NetBSD: Makefile,v 1.4 2022/04/14 13:20:42 nros Exp $
2 2
3DISTNAME= assimp-5.0.1 3DISTNAME= assimp-5.2.3
4PKGREVISION= 1 
5CATEGORIES= multimedia 4CATEGORIES= multimedia
6MASTER_SITES= ${MASTER_SITE_GITHUB:=assimp/} 5MASTER_SITES= ${MASTER_SITE_GITHUB:=assimp/}
7GITHUB_TAG= v${PKGVERSION_NOREV} 6GITHUB_TAG= v${PKGVERSION_NOREV}
8 7
9MAINTAINER= cfkoch@edgebsd.org 8MAINTAINER= cfkoch@edgebsd.org
10HOMEPAGE= http://www.assimp.org/ 9HOMEPAGE= http://www.assimp.org/
11COMMENT= Library to import various 3D model formats 10COMMENT= Library to import various 3D model formats
12LICENSE= modified-bsd 11LICENSE= modified-bsd
13 12
14USE_CMAKE= yes 13USE_CMAKE= yes
15USE_TOOLS+= pkg-config 14USE_TOOLS+= pkg-config
16USE_LANGUAGES= c c++ 15USE_LANGUAGES= c c++
17 16
cvs diff -r1.2 -r1.3 pkgsrc/multimedia/assimp/PLIST (expand / switch to unified diff)

--- pkgsrc/multimedia/assimp/PLIST 2021/01/05 04:50:53 1.2
+++ pkgsrc/multimedia/assimp/PLIST 2022/04/14 13:20:42 1.3
@@ -1,95 +1,98 @@ @@ -1,95 +1,98 @@
1@comment $NetBSD: PLIST,v 1.2 2021/01/05 04:50:53 gutteridge Exp $ 1@comment $NetBSD: PLIST,v 1.3 2022/04/14 13:20:42 nros Exp $
2bin/assimp 2bin/assimp
 3include/assimp/Base64.hpp
3include/assimp/BaseImporter.h 4include/assimp/BaseImporter.h
4include/assimp/Bitmap.h 5include/assimp/Bitmap.h
5include/assimp/BlobIOSystem.h 6include/assimp/BlobIOSystem.h
6include/assimp/ByteSwapper.h 7include/assimp/ByteSwapper.h
 8include/assimp/ColladaMetaData.h
7include/assimp/Compiler/poppack1.h 9include/assimp/Compiler/poppack1.h
8include/assimp/Compiler/pstdint.h 10include/assimp/Compiler/pstdint.h
9include/assimp/Compiler/pushpack1.h 11include/assimp/Compiler/pushpack1.h
10include/assimp/CreateAnimMesh.h 12include/assimp/CreateAnimMesh.h
11include/assimp/DefaultIOStream.h 13include/assimp/DefaultIOStream.h
12include/assimp/DefaultIOSystem.h 14include/assimp/DefaultIOSystem.h
13include/assimp/DefaultLogger.hpp 15include/assimp/DefaultLogger.hpp
14include/assimp/Defines.h 
15include/assimp/Exceptional.h 16include/assimp/Exceptional.h
16include/assimp/Exporter.hpp 17include/assimp/Exporter.hpp
17include/assimp/GenericProperty.h 18include/assimp/GenericProperty.h
 19include/assimp/GltfMaterial.h
18include/assimp/Hash.h 20include/assimp/Hash.h
19include/assimp/IOStream.hpp 21include/assimp/IOStream.hpp
20include/assimp/IOStreamBuffer.h 22include/assimp/IOStreamBuffer.h
21include/assimp/IOSystem.hpp 23include/assimp/IOSystem.hpp
22include/assimp/Importer.hpp 24include/assimp/Importer.hpp
23include/assimp/LineSplitter.h 25include/assimp/LineSplitter.h
24include/assimp/LogAux.h 26include/assimp/LogAux.h
25include/assimp/LogStream.hpp 27include/assimp/LogStream.hpp
26include/assimp/Logger.hpp 28include/assimp/Logger.hpp
27include/assimp/Macros.h 
28include/assimp/MathFunctions.h 29include/assimp/MathFunctions.h
29include/assimp/MemoryIOWrapper.h 30include/assimp/MemoryIOWrapper.h
30include/assimp/NullLogger.hpp 31include/assimp/NullLogger.hpp
 32include/assimp/ObjMaterial.h
31include/assimp/ParsingUtils.h 33include/assimp/ParsingUtils.h
32include/assimp/Profiler.h 34include/assimp/Profiler.h
33include/assimp/ProgressHandler.hpp 35include/assimp/ProgressHandler.hpp
34include/assimp/RemoveComments.h 36include/assimp/RemoveComments.h
35include/assimp/SGSpatialSort.h 37include/assimp/SGSpatialSort.h
36include/assimp/SceneCombiner.h 38include/assimp/SceneCombiner.h
37include/assimp/SkeletonMeshBuilder.h 39include/assimp/SkeletonMeshBuilder.h
 40include/assimp/SmallVector.h
38include/assimp/SmoothingGroups.h 41include/assimp/SmoothingGroups.h
39include/assimp/SmoothingGroups.inl 42include/assimp/SmoothingGroups.inl
40include/assimp/SpatialSort.h 43include/assimp/SpatialSort.h
41include/assimp/StandardShapes.h 44include/assimp/StandardShapes.h
42include/assimp/StreamReader.h 45include/assimp/StreamReader.h
43include/assimp/StreamWriter.h 46include/assimp/StreamWriter.h
44include/assimp/StringComparison.h 47include/assimp/StringComparison.h
45include/assimp/StringUtils.h 48include/assimp/StringUtils.h
46include/assimp/Subdivision.h 49include/assimp/Subdivision.h
47include/assimp/TinyFormatter.h 50include/assimp/TinyFormatter.h
48include/assimp/Vertex.h 51include/assimp/Vertex.h
49include/assimp/XMLTools.h 52include/assimp/XMLTools.h
 53include/assimp/XmlParser.h
50include/assimp/ZipArchiveIOSystem.h 54include/assimp/ZipArchiveIOSystem.h
51include/assimp/aabb.h 55include/assimp/aabb.h
52include/assimp/ai_assert.h 56include/assimp/ai_assert.h
53include/assimp/anim.h 57include/assimp/anim.h
54include/assimp/camera.h 58include/assimp/camera.h
55include/assimp/cexport.h 59include/assimp/cexport.h
56include/assimp/cfileio.h 60include/assimp/cfileio.h
57include/assimp/cimport.h 61include/assimp/cimport.h
58include/assimp/color4.h 62include/assimp/color4.h
59include/assimp/color4.inl 63include/assimp/color4.inl
 64include/assimp/commonMetaData.h
60include/assimp/config.h 65include/assimp/config.h
61include/assimp/defs.h 66include/assimp/defs.h
62include/assimp/fast_atof.h 67include/assimp/fast_atof.h
63include/assimp/importerdesc.h 68include/assimp/importerdesc.h
64include/assimp/irrXMLWrapper.h 
65include/assimp/light.h 69include/assimp/light.h
66include/assimp/material.h 70include/assimp/material.h
67include/assimp/material.inl 71include/assimp/material.inl
68include/assimp/matrix3x3.h 72include/assimp/matrix3x3.h
69include/assimp/matrix3x3.inl 73include/assimp/matrix3x3.inl
70include/assimp/matrix4x4.h 74include/assimp/matrix4x4.h
71include/assimp/matrix4x4.inl 75include/assimp/matrix4x4.inl
72include/assimp/mesh.h 76include/assimp/mesh.h
73include/assimp/metadata.h 77include/assimp/metadata.h
74include/assimp/pbrmaterial.h 78include/assimp/pbrmaterial.h
75include/assimp/postprocess.h 79include/assimp/postprocess.h
76include/assimp/qnan.h 80include/assimp/qnan.h
77include/assimp/quaternion.h 81include/assimp/quaternion.h
78include/assimp/quaternion.inl 82include/assimp/quaternion.inl
79include/assimp/scene.h 83include/assimp/scene.h
80include/assimp/texture.h 84include/assimp/texture.h
81include/assimp/types.h 85include/assimp/types.h
82include/assimp/vector2.h 86include/assimp/vector2.h
83include/assimp/vector2.inl 87include/assimp/vector2.inl
84include/assimp/vector3.h 88include/assimp/vector3.h
85include/assimp/vector3.inl 89include/assimp/vector3.inl
86include/assimp/version.h 90include/assimp/version.h
87lib/cmake/assimp-5.0/assimp-config-version.cmake 91lib/cmake/assimp-5.2/assimpConfig.cmake
88lib/cmake/assimp-5.0/assimp-config.cmake 92lib/cmake/assimp-5.2/assimpConfigVersion.cmake
89lib/cmake/assimp-5.0/assimpTargets-release.cmake 93lib/cmake/assimp-5.2/assimpTargets-noconfig.cmake
90lib/cmake/assimp-5.0/assimpTargets.cmake 94lib/cmake/assimp-5.2/assimpTargets.cmake
91lib/libIrrXML.so 
92lib/libassimp.so 95lib/libassimp.so
93lib/libassimp.so.5 96lib/libassimp.so.5
94lib/libassimp.so.5.0.0 97lib/libassimp.so.5.2.0
95lib/pkgconfig/assimp.pc 98lib/pkgconfig/assimp.pc
cvs diff -r1.1 -r1.2 pkgsrc/multimedia/assimp/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/multimedia/assimp/buildlink3.mk 2021/01/02 07:35:44 1.1
+++ pkgsrc/multimedia/assimp/buildlink3.mk 2022/04/14 13:20:42 1.2
@@ -1,14 +1,15 @@ @@ -1,14 +1,15 @@
1# $NetBSD: buildlink3.mk,v 1.1 2021/01/02 07:35:44 pin Exp $ 1# $NetBSD: buildlink3.mk,v 1.2 2022/04/14 13:20:42 nros Exp $
2 2
3BUILDLINK_TREE+= assimp 3BUILDLINK_TREE+= assimp
4 4
5.if !defined(ASSIMP_BUILDLINK3_MK) 5.if !defined(ASSIMP_BUILDLINK3_MK)
6ASSIMP_BUILDLINK3_MK:= 6ASSIMP_BUILDLINK3_MK:=
7 7
8BUILDLINK_API_DEPENDS.assimp+= assimp>=5.0.1 8BUILDLINK_API_DEPENDS.assimp+= assimp>=5.0.1
 9BUILDLINK_ABI_DEPENDS.assimp+= assimp>=5.2.3
9BUILDLINK_PKGSRCDIR.assimp?= ../../multimedia/assimp 10BUILDLINK_PKGSRCDIR.assimp?= ../../multimedia/assimp
10 11
11.include "../../devel/zlib/buildlink3.mk" 12.include "../../devel/zlib/buildlink3.mk"
12.endif # ASSIMP_BUILDLINK3_MK 13.endif # ASSIMP_BUILDLINK3_MK
13 14
14BUILDLINK_TREE+= -assimp 15BUILDLINK_TREE+= -assimp
cvs diff -r1.7 -r1.8 pkgsrc/multimedia/assimp/distinfo (expand / switch to unified diff)

--- pkgsrc/multimedia/assimp/distinfo 2021/10/26 11:00:58 1.7
+++ pkgsrc/multimedia/assimp/distinfo 2022/04/14 13:20:42 1.8
@@ -1,8 +1,6 @@ @@ -1,8 +1,6 @@
1$NetBSD: distinfo,v 1.7 2021/10/26 11:00:58 nia Exp $ 1$NetBSD: distinfo,v 1.8 2022/04/14 13:20:42 nros Exp $
2 2
3BLAKE2s (assimp-5.0.1.tar.gz) = 1ae0836cd6f38ad6aeed2e893abdac4c3f57b82e8bda7b72e960c48118317288 3BLAKE2s (assimp-5.2.3.tar.gz) = 92b8beeef45d19c1dbb81771014802fedf1b9f92f1b6db6e5883d5b34402a3bf
4SHA512 (assimp-5.0.1.tar.gz) = 51b704ffea778638b9e228578650f62691c56ee1a90337f8bbbee37e807455466d818234be24852334e5806260e5690932c9bd8e00f055c5c26782e0636538f0 4SHA512 (assimp-5.2.3.tar.gz) = accc1020877b631431bd0bc2de20b530d7e8d234e960904070292a4a08e768c55d1d0cf614c68d38f099fab2d086420c3ffd3f729cb538b169c1275ef0be1eaa
5Size (assimp-5.0.1.tar.gz) = 46607553 bytes 5Size (assimp-5.2.3.tar.gz) = 49606233 bytes
6SHA1 (patch-assimp.pc.in) = 4c8bc0922ba046dfe37a007f5631254cf256101e 6SHA1 (patch-contrib_zip_src_zip.h) = 1eac9382ac0536d4ede0b9c4f9e72c7ef1dfbf63
7SHA1 (patch-contrib_irrXML_CMakeLists.txt) = 0c2dd457cfacf7be1b9c64068848b3e3bb476afa 
8SHA1 (patch-contrib_zip_src_zip.h) = 824462e986010e705b3089f3055eecd23093cf7c 
File Deleted: pkgsrc/multimedia/assimp/patches/Attic/patch-assimp.pc.in
File Deleted: pkgsrc/multimedia/assimp/patches/Attic/patch-contrib_irrXML_CMakeLists.txt
cvs diff -r1.2 -r1.3 pkgsrc/multimedia/assimp/patches/patch-contrib_zip_src_zip.h (expand / switch to unified diff)

--- pkgsrc/multimedia/assimp/patches/patch-contrib_zip_src_zip.h 2021/01/10 05:20:00 1.2
+++ pkgsrc/multimedia/assimp/patches/patch-contrib_zip_src_zip.h 2022/04/14 13:20:42 1.3
@@ -1,25 +1,23 @@ @@ -1,25 +1,23 @@
1$NetBSD: patch-contrib_zip_src_zip.h,v 1.2 2021/01/10 05:20:00 gutteridge Exp $ 1$NetBSD: patch-contrib_zip_src_zip.h,v 1.3 2022/04/14 13:20:42 nros Exp $
2 2
3Fix builds on some 32-bit architectures. 3Fix builds on some 32-bit architectures.
4 4
5--- contrib/zip/src/zip.h.orig 2020-01-12 11:56:40.000000000 +0000 5--- contrib/zip/src/zip.h.orig 2022-03-17 10:35:44.000000000 +0000
6+++ contrib/zip/src/zip.h 6+++ contrib/zip/src/zip.h
7@@ -19,18 +19,6 @@ 7@@ -19,16 +19,6 @@
8 extern "C" { 8 extern "C" {
9 #endif 9 #endif
10  10
11-#if !defined(_SSIZE_T_DEFINED) && !defined(_SSIZE_T_DEFINED_) && \ 11-#if !defined(_POSIX_C_SOURCE) && defined(_MSC_VER)
12- !defined(_SSIZE_T) && !defined(_SSIZE_T_) && !defined(__ssize_t_defined) 
13-#define _SSIZE_T 
14-// 64-bit Windows is the only mainstream platform 12-// 64-bit Windows is the only mainstream platform
15-// where sizeof(long) != sizeof(void*) 13-// where sizeof(long) != sizeof(void*)
16-#ifdef _WIN64 14-#ifdef _WIN64
17-typedef long long ssize_t; /* byte count or error */ 15-typedef long long ssize_t; /* byte count or error */
18-#else 16-#else
19-typedef long ssize_t; /* byte count or error */ 17-typedef long ssize_t; /* byte count or error */
20-#endif 18-#endif
21-#endif 19-#endif
22- 20-
23 #ifndef MAX_PATH 21 #ifndef MAX_PATH
24 #define MAX_PATH 32767 /* # chars in a path name including NULL */ 22 #define MAX_PATH 32767 /* # chars in a path name including NULL */
25 #endif 23 #endif