From e3517fac85aff1a0f94791b145dc54c6dac9056f912af48ff1dfe4e3dd12190a Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux Date: Wed, 2 Feb 2022 10:24:59 +0000 Subject: [PATCH 1/3] big endian fix OBS-URL: https://build.opensuse.org/package/show/games/assimp?expand=0&rev=30 --- assimp.changes | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/assimp.changes b/assimp.changes index d9614c0..37dad3b 100644 --- a/assimp.changes +++ b/assimp.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Feb 2 10:24:27 UTC 2022 - Christophe Giboudeaux + +- 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 From 8f681fda97a35f7b23baf8e28cbd8e20465ba9db346240f5039b255e861f34de Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux Date: Wed, 2 Feb 2022 10:25:21 +0000 Subject: [PATCH 2/3] OBS-URL: https://build.opensuse.org/package/show/games/assimp?expand=0&rev=31 --- ...alified-namespace-in-byteswap-macros.patch | 70 +++++++++++++++++++ 1 file changed, 70 insertions(+) create mode 100644 0001-use-fully-qualified-namespace-in-byteswap-macros.patch diff --git a/0001-use-fully-qualified-namespace-in-byteswap-macros.patch b/0001-use-fully-qualified-namespace-in-byteswap-macros.patch new file mode 100644 index 0000000..da843be --- /dev/null +++ b/0001-use-fully-qualified-namespace-in-byteswap-macros.patch @@ -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?= + +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 struct ByteSwap::_swapper { + // -------------------------------------------------------------------------------------- + #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 struct ByteSwap::_swapper { + # 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 struct ByteSwap::_swapper { + # 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 + From b5643fa7696b36c5adf20e55d0a401734aa7d829371150acc7e0be9dc62d54c6 Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux Date: Wed, 2 Feb 2022 10:44:36 +0000 Subject: [PATCH 3/3] OBS-URL: https://build.opensuse.org/package/show/games/assimp?expand=0&rev=32 --- assimp.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/assimp.spec b/assimp.spec index b11f6d5..932a978 100644 --- a/assimp.spec +++ b/assimp.spec @@ -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++