Browse Source

package/assimp: fix namespace related compile failure

Fixes:

  - http://autobuild.buildroot.net/results/0861c66ec02a55e984577094e28b65c78b95a330

  .../build/assimp-5.1.4/code/AssetLib/Blender/BlenderScene.cpp:101:33: error: specialization of 'template<class T> 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<class T> 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<class T> 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<class T> void Assimp::Blender::Structure::Convert(T&, const Assimp::Blender::FileDatabase&) const' [-fpermissive]
       void Convert(T &dest, const FileDatabase &db) const;
            ^

Signed-off-by: Peter Seiderer <ps.report@gmx.net>
[yann.morin.1998@free.fr: update upstream status]
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
Peter Seiderer 3 years ago
parent
commit
d6dfb23a40

+ 57 - 0
package/assimp/0002-BlenderScene-use-explicit-namespace-instead-of-using.patch

@@ -0,0 +1,57 @@
+From a099fe7cd331a839137115db5df1733c4c1c8070 Mon Sep 17 00:00:00 2001
+From: Peter Seiderer <ps.report@gmx.net>
+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<class T> 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<class T> 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<class T> 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<class T> 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 <ps.report@gmx.net>
+---
+ 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<CollectionObject>, &Structure::Convert<CollectionObject>);
+ }
+ 
++} // namespace Blender
++} //namespace Assimp
++
+ #endif // ASSIMP_BUILD_NO_BLEND_IMPORTER
+-- 
+2.34.1
+