From 2030b599e720671ffcffb6bc070f2d4514a917090b89038a941de47da1a7e15b Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux Date: Mon, 7 Feb 2022 10:06:43 +0000 Subject: [PATCH] Accepting request 952069 from home:cgiboudeaux:games Update to 5.2.1 OBS-URL: https://build.opensuse.org/request/show/952069 OBS-URL: https://build.opensuse.org/package/show/games/assimp?expand=0&rev=33 --- ...alified-namespace-in-byteswap-macros.patch | 70 ------------------- _service | 2 +- assimp-5.2.0.tar.xz | 3 - assimp-5.2.1.tar.xz | 3 + assimp.changes | 14 ++++ assimp.spec | 4 +- 6 files changed, 19 insertions(+), 77 deletions(-) delete mode 100644 0001-use-fully-qualified-namespace-in-byteswap-macros.patch delete mode 100644 assimp-5.2.0.tar.xz create mode 100644 assimp-5.2.1.tar.xz diff --git a/0001-use-fully-qualified-namespace-in-byteswap-macros.patch b/0001-use-fully-qualified-namespace-in-byteswap-macros.patch deleted file mode 100644 index da843be..0000000 --- a/0001-use-fully-qualified-namespace-in-byteswap-macros.patch +++ /dev/null @@ -1,70 +0,0 @@ -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 - diff --git a/_service b/_service index b5f93db..b51ee51 100644 --- a/_service +++ b/_service @@ -2,7 +2,7 @@ git git://github.com/assimp/assimp - 5.2.0 + v5.2.1 @PARENT_TAG@ v(.*) diff --git a/assimp-5.2.0.tar.xz b/assimp-5.2.0.tar.xz deleted file mode 100644 index 92c0f70..0000000 --- a/assimp-5.2.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5e36c289a5407e2642f1ecb298d8e77abdf2c5d8a37d80de65ec538613f39c23 -size 25205892 diff --git a/assimp-5.2.1.tar.xz b/assimp-5.2.1.tar.xz new file mode 100644 index 0000000..fd91626 --- /dev/null +++ b/assimp-5.2.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1375f2499bff96937d4e381b322b339471cfd0bbe473480bb81eb688676500f6 +size 25183984 diff --git a/assimp.changes b/assimp.changes index 37dad3b..06d2ff7 100644 --- a/assimp.changes +++ b/assimp.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Mon Feb 7 09:51:05 UTC 2022 - Christophe Giboudeaux + +- Update to 5.2.1 + * ASE: Fix warning unreachable code + * HMP: Fix override during copying position data + * use fully qualified namespace in byteswap macros + * fix compilation with clangcl on windows + * Delete .travis.sh by @kimkulling + * Update ccpp.yml by @kimkulling + * LWO: validate enum value before parsing it +- Drop 0001-use-fully-qualified-namespace-in-byteswap-macros.patch + Merged upstream + ------------------------------------------------------------------- Wed Feb 2 10:24:27 UTC 2022 - Christophe Giboudeaux diff --git a/assimp.spec b/assimp.spec index 932a978..baab4cb 100644 --- a/assimp.spec +++ b/assimp.spec @@ -18,7 +18,7 @@ %define sover 5 Name: assimp -Version: 5.2.0 +Version: 5.2.1 Release: 0 Summary: Library to load and process 3D scenes from various data formats License: BSD-3-Clause AND MIT @@ -27,8 +27,6 @@ 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++