Accepting request 952070 from games
Update to 5.2.1 (forwarded request 952069 from cgiboudeaux) OBS-URL: https://build.opensuse.org/request/show/952070 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/assimp?expand=0&rev=14
This commit is contained in:
Dominique Leuenberger
Git OBS Bridge
commit
c2389dfab7
@ -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?=
|
|
||||||
<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
|
|
||||||
|
|
||||||
2
_service
2
_service
@ -2,7 +2,7 @@
|
|||||||
<service name="tar_scm" mode="disabled">
|
<service name="tar_scm" mode="disabled">
|
||||||
<param name="scm">git</param>
|
<param name="scm">git</param>
|
||||||
<param name="url">git://github.com/assimp/assimp</param>
|
<param name="url">git://github.com/assimp/assimp</param>
|
||||||
<param name="revision">5.2.0</param>
|
<param name="revision">v5.2.1</param>
|
||||||
<param name="versionformat">@PARENT_TAG@</param>
|
<param name="versionformat">@PARENT_TAG@</param>
|
||||||
<param name="versionrewrite-pattern">v(.*)</param>
|
<param name="versionrewrite-pattern">v(.*)</param>
|
||||||
<!-- non-OSI media -->
|
<!-- non-OSI media -->
|
||||||
|
|||||||
@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:5e36c289a5407e2642f1ecb298d8e77abdf2c5d8a37d80de65ec538613f39c23
|
|
||||||
size 25205892
|
|
||||||
3
assimp-5.2.1.tar.xz
Normal file
3
assimp-5.2.1.tar.xz
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:1375f2499bff96937d4e381b322b339471cfd0bbe473480bb81eb688676500f6
|
||||||
|
size 25183984
|
||||||
@ -1,3 +1,17 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Mon Feb 7 09:51:05 UTC 2022 - Christophe Giboudeaux <christophe@krop.fr>
|
||||||
|
|
||||||
|
- 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 <christophe@krop.fr>
|
Wed Feb 2 10:24:27 UTC 2022 - Christophe Giboudeaux <christophe@krop.fr>
|
||||||
|
|
||||||
|
|||||||
@ -18,7 +18,7 @@
|
|||||||
|
|
||||||
%define sover 5
|
%define sover 5
|
||||||
Name: assimp
|
Name: assimp
|
||||||
Version: 5.2.0
|
Version: 5.2.1
|
||||||
Release: 0
|
Release: 0
|
||||||
Summary: Library to load and process 3D scenes from various data formats
|
Summary: Library to load and process 3D scenes from various data formats
|
||||||
License: BSD-3-Clause AND MIT
|
License: BSD-3-Clause AND MIT
|
||||||
@ -27,8 +27,6 @@ URL: https://www.assimp.org/
|
|||||||
Source0: %{name}-%{version}.tar.xz
|
Source0: %{name}-%{version}.tar.xz
|
||||||
# PATCH-FIX-UPSTREAM
|
# PATCH-FIX-UPSTREAM
|
||||||
Patch0: 0001-Fix-build-with-zlib.patch
|
Patch0: 0001-Fix-build-with-zlib.patch
|
||||||
# PATCH-FIX-UPSTREAM
|
|
||||||
Patch1: 0001-use-fully-qualified-namespace-in-byteswap-macros.patch
|
|
||||||
BuildRequires: cmake
|
BuildRequires: cmake
|
||||||
BuildRequires: dos2unix
|
BuildRequires: dos2unix
|
||||||
BuildRequires: gcc-c++
|
BuildRequires: gcc-c++
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user