From e423865e1fc13bfb03c98143e9b53f8ff36d7681 Mon Sep 17 00:00:00 2001 From: miqlas <5569059+extrowerk@users.noreply.github.com> Date: Sun, 2 Dec 2018 20:17:50 +0100 Subject: [PATCH] Assimp: bump (#3358) --- ...ssimp-4.0.1.recipe => assimp-4.1.0.recipe} | 26 +++++++++++++------ 1 file changed, 18 insertions(+), 8 deletions(-) rename media-libs/assimp/{assimp-4.0.1.recipe => assimp-4.1.0.recipe} (69%) diff --git a/media-libs/assimp/assimp-4.0.1.recipe b/media-libs/assimp/assimp-4.1.0.recipe similarity index 69% rename from media-libs/assimp/assimp-4.0.1.recipe rename to media-libs/assimp/assimp-4.1.0.recipe index d3e6fdd49..3fc90a4be 100644 --- a/media-libs/assimp/assimp-4.0.1.recipe +++ b/media-libs/assimp/assimp-4.1.0.recipe @@ -4,19 +4,22 @@ 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://github.com/assimp/assimp" -COPYRIGHT="2006-2016, assimp team" +COPYRIGHT="2006-2017, assimp team" LICENSE="BSD (3-clause)" REVISION="1" SOURCE_URI="https://github.com/assimp/assimp/archive/v$portVersion.tar.gz" -CHECKSUM_SHA256="60080d8ab4daaab309f65b3cffd99f19eb1af8d05623fff469b9b652818e286e" +CHECKSUM_SHA256="3520b1e9793b93a2ca3b797199e16f40d61762617e072f2d525fad70f9678a71" ARCHITECTURES="!x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86" +libVersion="$portVersion" +libVersionCompat="$libVersion compat >= ${libVersion%%.*}" + PROVIDES=" assimp$secondaryArchSuffix = $portVersion - cmd:assimp$secondaryArchSuffix - lib:libassimp$secondaryArchSuffix = 4.0.1 compat >= 4 + cmd:assimp$secondaryArchSuffix = $portVersion + lib:libassimp$secondaryArchSuffix = $libVersionCompat " REQUIRES=" haiku$secondaryArchSuffix @@ -29,7 +32,8 @@ REQUIRES=" PROVIDES_devel=" assimp${secondaryArchSuffix}_devel = $portVersion - devel:libassimp$secondaryArchSuffix = 4.0.1 compat >= 4 + devel:libassimp$secondaryArchSuffix = $libVersionCompat + devel:libirrxml$secondaryArchSuffix = $libVersionCompat " REQUIRES_devel=" assimp$secondaryArchSuffix == $portVersion base @@ -49,13 +53,18 @@ BUILD_PREREQUIRES=" cmd:pkg_config$secondaryArchSuffix " +defineDebugInfoPackage assimp$secondaryArchSuffix \ + "$libDir"/libassimp.so.$libVersion + BUILD() { mkdir -p build cd build cmake -DASSIMP_BIN_INSTALL_DIR=$binDir \ -DASSIMP_LIB_INSTALL_DIR=$libDir \ - -DASSIMP_INCLUDE_INSTALL_DIR=$includeDir .. + -DASSIMP_INCLUDE_INSTALL_DIR=$includeDir \ + -DBUILD_SHARED_LIBS=ON \ + .. make $jobArgs } @@ -64,10 +73,11 @@ INSTALL() cd build make install - prepareInstalledDevelLib libassimp + prepareInstalledDevelLibs libassimp libIrrXML fixPkgconfig packageEntries devel \ - $developDir + $developDir \ + $libDir/cmake }