pool/assimp
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 950710 from games

Browse Source 
- Add patch to fix build in big endian archs:
  * 0001-use-fully-qualified-namespace-in-byteswap-macros.patch

OBS-URL: https://build.opensuse.org/request/show/950710
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/assimp?expand=0&rev=13
This commit is contained in:
Dominique Leuenberger 2022-02-02 21:41:50 +00:00 committed by Git OBS Bridge
commit d9fed28e45
3 changed files with 78 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
0001-use-fully-qualified-namespace-in-byteswap-macros.patch Normal file
View File

@ -0,0 +1,70 @@
From ed6b6cd65c5a707842366e08eb7804828359b090 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?IOhannes=20m=20zm=C3=B6lnig=20=28Debian/GNU=29?=
<umlaeute@debian.org>
Date: Mon, 31 Jan 2022 14:41:41 +0100
Subject: [PATCH] use fully qualified namespace in byteswap macros
Closes: https://github.com/assimp/assimp/issues/4358
---
include/assimp/ByteSwapper.h | 28 ++++++++++++++--------------
1 file changed, 14 insertions(+), 14 deletions(-)
diff --git a/include/assimp/ByteSwapper.h b/include/assimp/ByteSwapper.h
index cf3a703b0..488f7a51d 100644
--- a/include/assimp/ByteSwapper.h
+++ b/include/assimp/ByteSwapper.h
@@ -211,7 +211,7 @@ template <typename T> struct ByteSwap::_swapper<T,8> {
// --------------------------------------------------------------------------------------
#if (defined AI_BUILD_BIG_ENDIAN)
# define AI_LE(t) (t)
-# define AI_BE(t) ByteSwap::Swapped(t)
+# define AI_BE(t) Assimp::ByteSwap::Swapped(t)
# define AI_LSWAP2(p)
# define AI_LSWAP4(p)
# define AI_LSWAP8(p)
@@ -219,16 +219,16 @@ template <typename T> struct ByteSwap::_swapper<T,8> {
# define AI_LSWAP4P(p)
# define AI_LSWAP8P(p)
# define LE_NCONST const
-# define AI_SWAP2(p) ByteSwap::Swap2(&(p))
-# define AI_SWAP4(p) ByteSwap::Swap4(&(p))
-# define AI_SWAP8(p) ByteSwap::Swap8(&(p))
-# define AI_SWAP2P(p) ByteSwap::Swap2((p))
-# define AI_SWAP4P(p) ByteSwap::Swap4((p))
-# define AI_SWAP8P(p) ByteSwap::Swap8((p))
+# define AI_SWAP2(p) Assimp::ByteSwap::Swap2(&(p))
+# define AI_SWAP4(p) Assimp::ByteSwap::Swap4(&(p))
+# define AI_SWAP8(p) Assimp::ByteSwap::Swap8(&(p))
+# define AI_SWAP2P(p) Assimp::ByteSwap::Swap2((p))
+# define AI_SWAP4P(p) Assimp::ByteSwap::Swap4((p))
+# define AI_SWAP8P(p) Assimp::ByteSwap::Swap8((p))
# define BE_NCONST
#else
# define AI_BE(t) (t)
-# define AI_LE(t) ByteSwap::Swapped(t)
+# define AI_LE(t) Assimp::ByteSwap::Swapped(t)
# define AI_SWAP2(p)
# define AI_SWAP4(p)
# define AI_SWAP8(p)
@@ -236,12 +236,12 @@ template <typename T> struct ByteSwap::_swapper<T,8> {
# define AI_SWAP4P(p)
# define AI_SWAP8P(p)
# define BE_NCONST const
-# define AI_LSWAP2(p) ByteSwap::Swap2(&(p))
-# define AI_LSWAP4(p) ByteSwap::Swap4(&(p))
-# define AI_LSWAP8(p) ByteSwap::Swap8(&(p))
-# define AI_LSWAP2P(p) ByteSwap::Swap2((p))
-# define AI_LSWAP4P(p) ByteSwap::Swap4((p))
-# define AI_LSWAP8P(p) ByteSwap::Swap8((p))
+# define AI_LSWAP2(p) Assimp::ByteSwap::Swap2(&(p))
+# define AI_LSWAP4(p) Assimp::ByteSwap::Swap4(&(p))
+# define AI_LSWAP8(p) Assimp::ByteSwap::Swap8(&(p))
+# define AI_LSWAP2P(p) Assimp::ByteSwap::Swap2((p))
+# define AI_LSWAP4P(p) Assimp::ByteSwap::Swap4((p))
+# define AI_LSWAP8P(p) Assimp::ByteSwap::Swap8((p))
# define LE_NCONST
#endif
--
2.34.1

6
assimp.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Wed Feb 2 10:24:27 UTC 2022 - Christophe Giboudeaux <christophe@krop.fr>
- Add patch to fix build in big endian archs:
* 0001-use-fully-qualified-namespace-in-byteswap-macros.patch
-------------------------------------------------------------------
Tue Jan 25 13:02:13 UTC 2022 - Christophe Giboudeaux <christophe@krop.fr>

2
assimp.spec
View File

@ -27,6 +27,8 @@ URL: https://www.assimp.org/
Source0: %{name}-%{version}.tar.xz
# PATCH-FIX-UPSTREAM
Patch0: 0001-Fix-build-with-zlib.patch
# PATCH-FIX-UPSTREAM
Patch1: 0001-use-fully-qualified-namespace-in-byteswap-macros.patch
BuildRequires: cmake
BuildRequires: dos2unix
BuildRequires: gcc-c++