assimp, bump version (#10760)

media-libs/assimp/assimp-5.4.2.recipe

@@ -8,18 +8,18 @@ COPYRIGHT="2006-2021, assimp team"
 LICENSE="BSD (3-clause)"
 REVISION="1"
 SOURCE_URI="https://github.com/assimp/assimp/archive/v$portVersion.tar.gz"
-CHECKSUM_SHA256="a07666be71afe1ad4bc008c2336b7c688aca391271188eb9108d0c6db1be53f1"
+CHECKSUM_SHA256="7414861a7b038e407b510e8b8c9e58d5bf8ca76c9dfe07a01d20af388ec5086a"
+SOURCE_DIR="assimp-$portVersion"
 PATCHES="assimp-$portVersion.patchset"
 
 ARCHITECTURES="all !x86_gcc2"
 SECONDARY_ARCHITECTURES="x86"
 
-libVersion="5.3.0"
+libVersion="5.4.1"
 libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
 
 PROVIDES="
 	assimp$secondaryArchSuffix = $portVersion
-	cmd:assimp$secondaryArchSuffix = $portVersion
 	lib:libassimp$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES="
@@ -40,6 +40,17 @@ REQUIRES_devel="
 	assimp$secondaryArchSuffix == $portVersion base
 	"
 
+PROVIDES_tools="
+	assimp${secondaryArchSuffix}_tools = $portVersion
+	cmd:assimp = $portVersion
+	"
+REQUIRES_tools="
+	assimp$secondaryArchSuffix == $portVersion
+	haiku$secondaryArchSuffix
+	lib:libminizip$secondaryArchSuffix
+	lib:libz$secondaryArchSuffix
+	"
+
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	devel:libGL$secondaryArchSuffix
@@ -63,6 +74,7 @@ BUILD()
 {
 	cmake -Bbuild -S. -GNinja -DCMAKE_BUILD_TYPE=Release \
 		$cmakeDirArgs \
+		-DCMAKE_INSTALL_BINDIR=$prefix/bin \
 		-DBUILD_SHARED_LIBS=ON \
 		-DASSIMP_BUILD_ZLIB=OFF \
 		-DASSIMP_BUILD_TESTS=OFF \
@@ -81,6 +93,9 @@ INSTALL()
 	packageEntries devel \
 		$developDir \
 		$libDir/cmake
+
+	packageEntries tools \
+		$prefix/bin
 }
 
 TEST()

media-libs/assimp/patches/assimp-5.3.1.patchset

@@ -1,83 +0,0 @@
-From 48b6f973962fbe0023f3d3e7dadde15df15bc035 Mon Sep 17 00:00:00 2001
-From: Begasus <begasus@gmail.com>
-Date: Wed, 27 Sep 2023 09:27:45 +0200
-Subject: Disable CMAKE_POSITION_INDEPENDENT_CODE for Haiku too
-
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 75b160c..88f6917 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -258,7 +258,7 @@ IF( UNIX )
- ENDIF()
- 
- # Grouped compiler settings ########################################
--IF ((CMAKE_C_COMPILER_ID MATCHES "GNU") AND NOT MINGW)
-+IF ((CMAKE_C_COMPILER_ID MATCHES "GNU") AND NOT MINGW AND NOT HAIKU)
-   IF(NOT ASSIMP_HUNTER_ENABLED)
-     SET(CMAKE_POSITION_INDEPENDENT_CODE ON)
-   ENDIF()
--- 
-2.37.3
-
-
-From 94d91eef89e0c9d2a64e9c0e08ea37255ced84b2 Mon Sep 17 00:00:00 2001
-From: Begasus <begasus@gmail.com>
-Date: Wed, 27 Sep 2023 09:46:35 +0200
-Subject: Fix undefined symbol ftello64
-
-
-diff --git a/contrib/unzip/ioapi.h b/contrib/unzip/ioapi.h
-index ae9ca7e..548dafb 100644
---- a/contrib/unzip/ioapi.h
-+++ b/contrib/unzip/ioapi.h
-@@ -50,7 +50,7 @@
- #define ftello64 ftell
- #define fseeko64 fseek
- #else
--#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)
-+#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__HAIKU__)
- #define fopen64 fopen
- #define ftello64 ftello
- #define fseeko64 fseeko
--- 
-2.37.3
-
-
-From a1afb06c7065c550bf8435205540ff7e2ba0535f Mon Sep 17 00:00:00 2001
-From: Begasus <begasus@gmail.com>
-Date: Wed, 27 Sep 2023 10:04:20 +0200
-Subject: Disable failing/crashing tests
-
-
-diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
-index afe4874..25dcff0 100644
---- a/test/CMakeLists.txt
-+++ b/test/CMakeLists.txt
-@@ -108,8 +108,6 @@ SET(Geometry
- 
- SET( IMPORTERS
-   unit/ImportExport/Assxml/utAssxmlImportExport.cpp
--  unit/utLWSImportExport.cpp
--  unit/utLWOImportExport.cpp
-   unit/utSMDImportExport.cpp
-   unit/utglTFImportExport.cpp
-   unit/utglTF2ImportExport.cpp
-diff --git a/test/unit/utVersion.cpp b/test/unit/utVersion.cpp
-index e4378e9..f6c45ad 100644
---- a/test/unit/utVersion.cpp
-+++ b/test/unit/utVersion.cpp
-@@ -68,10 +68,6 @@ TEST_F( utVersion, aiGetCompileFlagsTest ) {
-     EXPECT_NE( aiGetCompileFlags(), 0U );
- }
- 
--TEST_F( utVersion, aiGetVersionRevisionTest ) {
--    EXPECT_NE( aiGetVersionRevision(), 0U );
--}
--
- TEST_F( utVersion, aiGetBranchNameTest ) {
-     EXPECT_NE( nullptr, aiGetBranchName() );
- }
--- 
-2.37.3
-

media-libs/assimp/patches/assimp-5.4.2.patchset

@@ -0,0 +1,22 @@
+From e8c7c5679e7f7f6b01157aab25049e1e70b5e531 Mon Sep 17 00:00:00 2001
+From: Begasus <begasus@gmail.com>
+Date: Wed, 27 Sep 2023 10:04:20 +0200
+Subject: Disable failing/crashing tests
+
+
+diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
+index a59cafb..2e9976f 100644
+--- a/test/CMakeLists.txt
++++ b/test/CMakeLists.txt
+@@ -108,8 +108,6 @@ SET(Geometry
+ 
+ SET( IMPORTERS
+   unit/ImportExport/Assxml/utAssxmlImportExport.cpp
+-  unit/utLWSImportExport.cpp
+-  unit/utLWOImportExport.cpp
+   unit/utSMDImportExport.cpp
+   unit/utglTFImportExport.cpp
+   unit/utglTF2ImportExport.cpp
+-- 
+2.45.2
+