mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-08 21:00:05 +02:00
assimp, bump to 6.0.3, fix libVersionCompat (#13652)
re-instate 5.4.3 for Qt5 (which isn't using it?)
This commit is contained in:
Schrijvers Luc
GitHub
@@ -4,11 +4,11 @@ Open Source library to import various well-known 3D model formats in a \
|
||||
uniform manner. The most recent version also knows how to export 3d files \
|
||||
and is therefore suitable as a general-purpose 3D model converter."
|
||||
HOMEPAGE="https://assimp.org"
|
||||
COPYRIGHT="2006-2025, assimp team"
|
||||
COPYRIGHT="2006-2026 assimp team"
|
||||
LICENSE="BSD (3-clause)"
|
||||
REVISION="3"
|
||||
REVISION="1"
|
||||
SOURCE_URI="https://github.com/assimp/assimp/archive/v$portVersion.tar.gz"
|
||||
CHECKSUM_SHA256="d1822d9a19c9205d6e8bc533bf897174ddb360ce504680f294170cc1d6319751"
|
||||
CHECKSUM_SHA256="9be912589023c7d5a6f2b1db8858b689ce815d5eacf0fea82f869708479b1e51"
|
||||
SOURCE_DIR="assimp-$portVersion"
|
||||
PATCHES="assimp-$portVersion.patchset"
|
||||
|
||||
@@ -16,7 +16,7 @@ ARCHITECTURES="all !x86_gcc2"
|
||||
SECONDARY_ARCHITECTURES="x86"
|
||||
|
||||
libVersion="$portVersion"
|
||||
libVersionCompat="$libVersion compat >= 5"
|
||||
libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
|
||||
|
||||
PROVIDES="
|
||||
assimp$secondaryArchSuffix = $portVersion
|
||||
71
media-libs/assimp/assimp5-5.4.3.recipe
Normal file
71
media-libs/assimp/assimp5-5.4.3.recipe
Normal file
@@ -0,0 +1,71 @@
|
||||
SUMMARY="Importer library to import assets from 3D files"
|
||||
DESCRIPTION="Open Asset Import Library (short name: Assimp) is a portable \
|
||||
Open Source library to import various well-known 3D model formats in a \
|
||||
uniform manner. The most recent version also knows how to export 3d files \
|
||||
and is therefore suitable as a general-purpose 3D model converter."
|
||||
HOMEPAGE="https://assimp.org"
|
||||
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="66dfbaee288f2bc43172440a55d0235dfc7bf885dda6435c038e8000e79582cb"
|
||||
SOURCE_DIR="assimp-$portVersion"
|
||||
PATCHES="assimp-$portVersion.patchset"
|
||||
|
||||
ARCHITECTURES="all !x86_gcc2"
|
||||
SECONDARY_ARCHITECTURES="x86"
|
||||
|
||||
libVersion="$portVersion"
|
||||
libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
|
||||
|
||||
PROVIDES="
|
||||
assimp5$secondaryArchSuffix = $portVersion
|
||||
lib:libassimp$secondaryArchSuffix = $libVersionCompat
|
||||
"
|
||||
REQUIRES="
|
||||
haiku$secondaryArchSuffix
|
||||
lib:libGL$secondaryArchSuffix
|
||||
lib:libglu$secondaryArchSuffix
|
||||
lib:libgtest$secondaryArchSuffix
|
||||
lib:libgomp$secondaryArchSuffix
|
||||
lib:libminizip$secondaryArchSuffix
|
||||
lib:libz$secondaryArchSuffix
|
||||
"
|
||||
|
||||
BUILD_REQUIRES="
|
||||
haiku${secondaryArchSuffix}_devel
|
||||
devel:libGL$secondaryArchSuffix
|
||||
devel:libglu$secondaryArchSuffix
|
||||
devel:libgomp$secondaryArchSuffix
|
||||
devel:libminizip$secondaryArchSuffix
|
||||
devel:libz$secondaryArchSuffix
|
||||
"
|
||||
BUILD_PREREQUIRES="
|
||||
cmd:cmake
|
||||
cmd:gcc$secondaryArchSuffix
|
||||
cmd:ninja
|
||||
cmd:pkg_config$secondaryArchSuffix
|
||||
"
|
||||
|
||||
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 \
|
||||
-DASSIMP_BUILD_ASSIMP_TOOLS=OFF \
|
||||
-DASSIMP_WARNINGS_AS_ERRORS=OFF
|
||||
ninja -C build $jobArgs
|
||||
}
|
||||
|
||||
INSTALL()
|
||||
{
|
||||
ninja -C build install
|
||||
|
||||
prepareInstalledDevelLib libassimp
|
||||
fixPkgconfig
|
||||
|
||||
rm -rf $developDir $libDir/cmake
|
||||
}
|
||||
22
media-libs/assimp/patches/assimp-5.4.3.patchset
Normal file
22
media-libs/assimp/patches/assimp-5.4.3.patchset
Normal file
@@ -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
|
||||
|
||||
@@ -1,14 +1,14 @@
|
||||
From 5706da3c7976aeed5eea8e56c868a373ccc9564d Mon Sep 17 00:00:00 2001
|
||||
From aa0b656ecd6722a9e3563e6eb8a9aa878d166362 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 392951b..27c0249 100644
|
||||
index 93cbab5..43ab280 100644
|
||||
--- a/test/CMakeLists.txt
|
||||
+++ b/test/CMakeLists.txt
|
||||
@@ -110,8 +110,6 @@ SET(Geometry
|
||||
@@ -114,8 +114,6 @@ SET(Geometry
|
||||
|
||||
SET( IMPORTERS
|
||||
unit/ImportExport/Assxml/utAssxmlImportExport.cpp
|
||||
@@ -18,10 +18,10 @@ index 392951b..27c0249 100644
|
||||
unit/utglTFImportExport.cpp
|
||||
unit/utglTF2ImportExport.cpp
|
||||
--
|
||||
2.48.1
|
||||
2.52.0
|
||||
|
||||
|
||||
From 7a19ed47db9e9bc3ee9c9588ee16484034719d9f Mon Sep 17 00:00:00 2001
|
||||
From c356025bd9e60823918a986b87a1c165948e9240 Mon Sep 17 00:00:00 2001
|
||||
From: Luc Schrijvers <begasus@gmail.com>
|
||||
Date: Tue, 22 Jul 2025 10:01:27 +0200
|
||||
Subject: Add missing prefix for pkg-config
|
||||
@@ -37,5 +37,5 @@ index 555a3a1..280abe6 100644
|
||||
includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
|
||||
|
||||
--
|
||||
2.48.1
|
||||
2.52.0
|
||||
|
||||
Reference in New Issue
Block a user