From 5390200a722132365c90e07790b9a24a06af7134 Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Mon, 3 Jan 2022 22:08:16 +0100 Subject: [PATCH] package/assimp: bump version to 5.1.5 - remove 0002-BlenderScene-use-explicit-namespace-instead-of-using.patch (upstream applied [1]). For details see [2]. [1] https://github.com/assimp/assimp/commit/a099fe7cd331a839137115db5df1733c4c1c8070 [2] https://github.com/assimp/assimp/releases/tag/v5.1.5 Signed-off-by: Peter Seiderer Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- ...-explicit-namespace-instead-of-using.patch | 57 ------------------- package/assimp/assimp.hash | 2 +- package/assimp/assimp.mk | 2 +- 3 files changed, 2 insertions(+), 59 deletions(-) delete mode 100644 package/assimp/0002-BlenderScene-use-explicit-namespace-instead-of-using.patch diff --git a/package/assimp/0002-BlenderScene-use-explicit-namespace-instead-of-using.patch b/package/assimp/0002-BlenderScene-use-explicit-namespace-instead-of-using.patch deleted file mode 100644 index c83e9c50a4..0000000000 --- a/package/assimp/0002-BlenderScene-use-explicit-namespace-instead-of-using.patch +++ /dev/null @@ -1,57 +0,0 @@ -From a099fe7cd331a839137115db5df1733c4c1c8070 Mon Sep 17 00:00:00 2001 -From: Peter Seiderer -Date: Thu, 30 Dec 2021 18:01:54 +0100 -Subject: [PATCH] BlenderScene: use explicit namespace instead of using - namespace - -Fixes (using g++ Sourcery CodeBench Lite 2014.05-29 - 4.8.3 20140320): - - .../build/assimp-5.1.4/code/AssetLib/Blender/BlenderScene.cpp:101:33: error: specialization of 'template void Assimp::Blender::Structure::Convert(T&, const Assimp::Blender::FileDatabase&) const' in different namespace [-fpermissive] - const FileDatabase &db) const { - ^ - In file included from .../build/assimp-5.1.4/code/AssetLib/Blender/BlenderScene.h:49:0, - from .../build/assimp-5.1.4/code/AssetLib/Blender/BlenderScene.cpp:47: - .../build/assimp-5.1.4/code/AssetLib/Blender/BlenderDNA.h:266:10: error: from definition of 'template void Assimp::Blender::Structure::Convert(T&, const Assimp::Blender::FileDatabase&) const' [-fpermissive] - void Convert(T &dest, const FileDatabase &db) const; - ^ - .../build/assimp-5.1.4/code/AssetLib/Blender/BlenderScene.cpp:121:33: error: specialization of 'template void Assimp::Blender::Structure::Convert(T&, const Assimp::Blender::FileDatabase&) const' in different namespace [-fpermissive] - const FileDatabase &db) const { - ^ - In file included from .../build/assimp-5.1.4/code/AssetLib/Blender/BlenderScene.h:49:0, - from .../build/assimp-5.1.4/code/AssetLib/Blender/BlenderScene.cpp:47: - .../build/assimp-5.1.4/code/AssetLib/Blender/BlenderDNA.h:266:10: error: from definition of 'template void Assimp::Blender::Structure::Convert(T&, const Assimp::Blender::FileDatabase&) const' [-fpermissive] - void Convert(T &dest, const FileDatabase &db) const; - ^ - -[backport from upstream commit a099fe7cd331] -Signed-off-by: Peter Seiderer ---- - code/AssetLib/Blender/BlenderScene.cpp | 7 +++++-- - 1 file changed, 5 insertions(+), 2 deletions(-) - -diff --git a/code/AssetLib/Blender/BlenderScene.cpp b/code/AssetLib/Blender/BlenderScene.cpp -index c93d913fc..9ad086fe6 100644 ---- a/code/AssetLib/Blender/BlenderScene.cpp -+++ b/code/AssetLib/Blender/BlenderScene.cpp -@@ -49,8 +49,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - #include "BlenderDNA.h" - #include "BlenderSceneGen.h" - --using namespace Assimp; --using namespace Assimp::Blender; -+namespace Assimp { -+namespace Blender { - - //-------------------------------------------------------------------------------- - template <> -@@ -885,4 +885,7 @@ void DNA::RegisterConverters() { - converters["CollectionObject"] = DNA::FactoryPair(&Structure::Allocate, &Structure::Convert); - } - -+} // namespace Blender -+} //namespace Assimp -+ - #endif // ASSIMP_BUILD_NO_BLEND_IMPORTER --- -2.34.1 - diff --git a/package/assimp/assimp.hash b/package/assimp/assimp.hash index 89b8d168c2..8f6d613bb4 100644 --- a/package/assimp/assimp.hash +++ b/package/assimp/assimp.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 bd32cdc27e1f8b7ac09d914ab92dd81d799c97e9e47315c1f40dcb7c6f7938c6 assimp-5.1.4.tar.gz +sha256 d62b58ed3b35c20f89570863a5415df97cb1b301b444d39687140fc883717ced assimp-5.1.5.tar.gz sha256 147874443d242b4e2bae97036e26ec9d6b37f706174c1bd5ecfcc8c1294cef51 LICENSE diff --git a/package/assimp/assimp.mk b/package/assimp/assimp.mk index ead5d73bca..b5f84ef56f 100644 --- a/package/assimp/assimp.mk +++ b/package/assimp/assimp.mk @@ -4,7 +4,7 @@ # ################################################################################ -ASSIMP_VERSION = 5.1.4 +ASSIMP_VERSION = 5.1.5 ASSIMP_SITE = $(call github,assimp,assimp,v$(ASSIMP_VERSION)) ASSIMP_LICENSE = BSD-3-Clause ASSIMP_LICENSE_FILES = LICENSE