From 569767c7536a40778ea21ff6fb869ea513525b3e Mon Sep 17 00:00:00 2001 From: nros Date: Thu, 14 Apr 2022 13:20:42 +0000 Subject: 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. --- multimedia/assimp/Makefile | 5 ++--- multimedia/assimp/PLIST | 23 ++++++++++++---------- multimedia/assimp/buildlink3.mk | 3 ++- multimedia/assimp/distinfo | 12 +++++------ multimedia/assimp/patches/patch-assimp.pc.in | 15 -------------- .../patches/patch-contrib_irrXML_CMakeLists.txt | 20 ------------------- .../assimp/patches/patch-contrib_zip_src_zip.h | 14 ++++++------- 7 files changed, 28 insertions(+), 64 deletions(-) delete mode 100644 multimedia/assimp/patches/patch-assimp.pc.in delete mode 100644 multimedia/assimp/patches/patch-contrib_irrXML_CMakeLists.txt (limited to 'multimedia') diff --git a/multimedia/assimp/Makefile b/multimedia/assimp/Makefile index 8e3a0757280..677eed54248 100644 --- a/multimedia/assimp/Makefile +++ b/multimedia/assimp/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.3 2021/05/10 08:18:53 nros Exp $ +# $NetBSD: Makefile,v 1.4 2022/04/14 13:20:42 nros Exp $ -DISTNAME= assimp-5.0.1 -PKGREVISION= 1 +DISTNAME= assimp-5.2.3 CATEGORIES= multimedia MASTER_SITES= ${MASTER_SITE_GITHUB:=assimp/} GITHUB_TAG= v${PKGVERSION_NOREV} diff --git a/multimedia/assimp/PLIST b/multimedia/assimp/PLIST index 93f0776bbe9..df40f25c0d9 100644 --- a/multimedia/assimp/PLIST +++ b/multimedia/assimp/PLIST @@ -1,9 +1,11 @@ -@comment $NetBSD: PLIST,v 1.2 2021/01/05 04:50:53 gutteridge Exp $ +@comment $NetBSD: PLIST,v 1.3 2022/04/14 13:20:42 nros Exp $ bin/assimp +include/assimp/Base64.hpp include/assimp/BaseImporter.h include/assimp/Bitmap.h include/assimp/BlobIOSystem.h include/assimp/ByteSwapper.h +include/assimp/ColladaMetaData.h include/assimp/Compiler/poppack1.h include/assimp/Compiler/pstdint.h include/assimp/Compiler/pushpack1.h @@ -11,10 +13,10 @@ include/assimp/CreateAnimMesh.h include/assimp/DefaultIOStream.h include/assimp/DefaultIOSystem.h include/assimp/DefaultLogger.hpp -include/assimp/Defines.h include/assimp/Exceptional.h include/assimp/Exporter.hpp include/assimp/GenericProperty.h +include/assimp/GltfMaterial.h include/assimp/Hash.h include/assimp/IOStream.hpp include/assimp/IOStreamBuffer.h @@ -24,10 +26,10 @@ include/assimp/LineSplitter.h include/assimp/LogAux.h include/assimp/LogStream.hpp include/assimp/Logger.hpp -include/assimp/Macros.h include/assimp/MathFunctions.h include/assimp/MemoryIOWrapper.h include/assimp/NullLogger.hpp +include/assimp/ObjMaterial.h include/assimp/ParsingUtils.h include/assimp/Profiler.h include/assimp/ProgressHandler.hpp @@ -35,6 +37,7 @@ include/assimp/RemoveComments.h include/assimp/SGSpatialSort.h include/assimp/SceneCombiner.h include/assimp/SkeletonMeshBuilder.h +include/assimp/SmallVector.h include/assimp/SmoothingGroups.h include/assimp/SmoothingGroups.inl include/assimp/SpatialSort.h @@ -47,6 +50,7 @@ include/assimp/Subdivision.h include/assimp/TinyFormatter.h include/assimp/Vertex.h include/assimp/XMLTools.h +include/assimp/XmlParser.h include/assimp/ZipArchiveIOSystem.h include/assimp/aabb.h include/assimp/ai_assert.h @@ -57,11 +61,11 @@ include/assimp/cfileio.h include/assimp/cimport.h include/assimp/color4.h include/assimp/color4.inl +include/assimp/commonMetaData.h include/assimp/config.h include/assimp/defs.h include/assimp/fast_atof.h include/assimp/importerdesc.h -include/assimp/irrXMLWrapper.h include/assimp/light.h include/assimp/material.h include/assimp/material.inl @@ -84,12 +88,11 @@ include/assimp/vector2.inl include/assimp/vector3.h include/assimp/vector3.inl include/assimp/version.h -lib/cmake/assimp-5.0/assimp-config-version.cmake -lib/cmake/assimp-5.0/assimp-config.cmake -lib/cmake/assimp-5.0/assimpTargets-release.cmake -lib/cmake/assimp-5.0/assimpTargets.cmake -lib/libIrrXML.so +lib/cmake/assimp-5.2/assimpConfig.cmake +lib/cmake/assimp-5.2/assimpConfigVersion.cmake +lib/cmake/assimp-5.2/assimpTargets-noconfig.cmake +lib/cmake/assimp-5.2/assimpTargets.cmake lib/libassimp.so lib/libassimp.so.5 -lib/libassimp.so.5.0.0 +lib/libassimp.so.5.2.0 lib/pkgconfig/assimp.pc diff --git a/multimedia/assimp/buildlink3.mk b/multimedia/assimp/buildlink3.mk index 3bb94839310..a8b79d5a277 100644 --- a/multimedia/assimp/buildlink3.mk +++ b/multimedia/assimp/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1 2021/01/02 07:35:44 pin Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2022/04/14 13:20:42 nros Exp $ BUILDLINK_TREE+= assimp @@ -6,6 +6,7 @@ BUILDLINK_TREE+= assimp ASSIMP_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.assimp+= assimp>=5.0.1 +BUILDLINK_ABI_DEPENDS.assimp+= assimp>=5.2.3 BUILDLINK_PKGSRCDIR.assimp?= ../../multimedia/assimp .include "../../devel/zlib/buildlink3.mk" diff --git a/multimedia/assimp/distinfo b/multimedia/assimp/distinfo index 40b3963da8b..cb65f86e01a 100644 --- a/multimedia/assimp/distinfo +++ b/multimedia/assimp/distinfo @@ -1,8 +1,6 @@ -$NetBSD: distinfo,v 1.7 2021/10/26 11:00:58 nia Exp $ +$NetBSD: distinfo,v 1.8 2022/04/14 13:20:42 nros Exp $ -BLAKE2s (assimp-5.0.1.tar.gz) = 1ae0836cd6f38ad6aeed2e893abdac4c3f57b82e8bda7b72e960c48118317288 -SHA512 (assimp-5.0.1.tar.gz) = 51b704ffea778638b9e228578650f62691c56ee1a90337f8bbbee37e807455466d818234be24852334e5806260e5690932c9bd8e00f055c5c26782e0636538f0 -Size (assimp-5.0.1.tar.gz) = 46607553 bytes -SHA1 (patch-assimp.pc.in) = 4c8bc0922ba046dfe37a007f5631254cf256101e -SHA1 (patch-contrib_irrXML_CMakeLists.txt) = 0c2dd457cfacf7be1b9c64068848b3e3bb476afa -SHA1 (patch-contrib_zip_src_zip.h) = 824462e986010e705b3089f3055eecd23093cf7c +BLAKE2s (assimp-5.2.3.tar.gz) = 92b8beeef45d19c1dbb81771014802fedf1b9f92f1b6db6e5883d5b34402a3bf +SHA512 (assimp-5.2.3.tar.gz) = accc1020877b631431bd0bc2de20b530d7e8d234e960904070292a4a08e768c55d1d0cf614c68d38f099fab2d086420c3ffd3f729cb538b169c1275ef0be1eaa +Size (assimp-5.2.3.tar.gz) = 49606233 bytes +SHA1 (patch-contrib_zip_src_zip.h) = 1eac9382ac0536d4ede0b9c4f9e72c7ef1dfbf63 diff --git a/multimedia/assimp/patches/patch-assimp.pc.in b/multimedia/assimp/patches/patch-assimp.pc.in deleted file mode 100644 index f279b079874..00000000000 --- a/multimedia/assimp/patches/patch-assimp.pc.in +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-assimp.pc.in,v 1.1 2021/05/10 08:18:53 nros Exp $ - -* set correct includedir - ---- assimp.pc.in.orig 2021-05-09 20:07:26.984559921 +0000 -+++ assimp.pc.in -@@ -1,7 +1,7 @@ - prefix=@CMAKE_INSTALL_PREFIX@ - exec_prefix=@CMAKE_INSTALL_PREFIX@/ - libdir=@CMAKE_INSTALL_PREFIX@/@ASSIMP_LIB_INSTALL_DIR@ --includedir=@CMAKE_INSTALL_PREFIX@/../include/@ASSIMP_INCLUDE_INSTALL_DIR@ -+includedir=@CMAKE_INSTALL_PREFIX@/@ASSIMP_INCLUDE_INSTALL_DIR@ - - Name: @CMAKE_PROJECT_NAME@ - Description: Import various well-known 3D model formats in an uniform manner. diff --git a/multimedia/assimp/patches/patch-contrib_irrXML_CMakeLists.txt b/multimedia/assimp/patches/patch-contrib_irrXML_CMakeLists.txt deleted file mode 100644 index a8a4e761ac0..00000000000 --- a/multimedia/assimp/patches/patch-contrib_irrXML_CMakeLists.txt +++ /dev/null @@ -1,20 +0,0 @@ -$NetBSD: patch-contrib_irrXML_CMakeLists.txt,v 1.1 2021/01/05 04:50:53 gutteridge Exp $ - -Build IrrXML library consistently across all pkgsrc platforms. - ---- contrib/irrXML/CMakeLists.txt.orig 2020-01-12 11:56:40.000000000 +0000 -+++ contrib/irrXML/CMakeLists.txt -@@ -13,10 +13,10 @@ if ( MSVC ) - ADD_DEFINITIONS( -D_CRT_SECURE_NO_WARNINGS ) - endif ( MSVC ) - --IF(CMAKE_SYSTEM_NAME MATCHES "(Darwin|FreeBSD)") -- add_library(IrrXML ${IrrXML_SRCS}) --ELSE() -+IF(CMAKE_SYSTEM_NAME MATCHES "Windows") - add_library(IrrXML STATIC ${IrrXML_SRCS}) -+ELSE() -+ add_library(IrrXML ${IrrXML_SRCS}) - ENDIF() - set(IRRXML_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}" CACHE INTERNAL "IrrXML_Include" ) - set(IRRXML_LIBRARY "IrrXML" CACHE INTERNAL "IrrXML" ) diff --git a/multimedia/assimp/patches/patch-contrib_zip_src_zip.h b/multimedia/assimp/patches/patch-contrib_zip_src_zip.h index fb4568a330a..2fc8dae3c8f 100644 --- a/multimedia/assimp/patches/patch-contrib_zip_src_zip.h +++ b/multimedia/assimp/patches/patch-contrib_zip_src_zip.h @@ -1,22 +1,20 @@ -$NetBSD: patch-contrib_zip_src_zip.h,v 1.2 2021/01/10 05:20:00 gutteridge Exp $ +$NetBSD: patch-contrib_zip_src_zip.h,v 1.3 2022/04/14 13:20:42 nros 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.orig 2022-03-17 10:35:44.000000000 +0000 +++ contrib/zip/src/zip.h -@@ -19,18 +19,6 @@ +@@ -19,16 +19,6 @@ extern "C" { #endif --#if !defined(_SSIZE_T_DEFINED) && !defined(_SSIZE_T_DEFINED_) && \ -- !defined(_SSIZE_T) && !defined(_SSIZE_T_) && !defined(__ssize_t_defined) --#define _SSIZE_T +-#if !defined(_POSIX_C_SOURCE) && defined(_MSC_VER) -// 64-bit Windows is the only mainstream platform -// where sizeof(long) != sizeof(void*) -#ifdef _WIN64 --typedef long long ssize_t; /* byte count or error */ +-typedef long long ssize_t; /* byte count or error */ -#else --typedef long ssize_t; /* byte count or error */ +-typedef long ssize_t; /* byte count or error */ -#endif -#endif - -- cgit v1.2.3