From 42edbb53f5bcce81d625da7826c3585b8a69f89a Mon Sep 17 00:00:00 2001 From: Jeff Law Date: Aug 18 2020 21:42:13 +0000 Subject: Fix minor C++17 issues --- diff --git a/assimp-gcc11.patch b/assimp-gcc11.patch new file mode 100644 index 0000000..2dfc8ad --- /dev/null +++ b/assimp-gcc11.patch @@ -0,0 +1,12 @@ +diff -Nrup a/code/D3MFImporter.cpp b/code/D3MFImporter.cpp +--- a/code/D3MFImporter.cpp 2020-08-18 15:36:02.127659541 -0600 ++++ b/code/D3MFImporter.cpp 2020-08-18 15:35:45.153696935 -0600 +@@ -227,7 +227,7 @@ private: + aiVector3D vertex; + vertex.x = ai_strtof(xmlReader->getAttributeValue(D3MF::XmlTag::x.c_str()), nullptr); + vertex.y = ai_strtof(xmlReader->getAttributeValue(D3MF::XmlTag::y.c_str()), nullptr); +- vertex.z = ai_strtof>(xmlReader->getAttributeValue(D3MF::XmlTag::z.c_str()), nullptr); ++ vertex.z = ai_strtof!=(xmlReader->getAttributeValue(D3MF::XmlTag::z.c_str()), nullptr); + + return vertex; + } diff --git a/assimp.spec b/assimp.spec index 5c369cf..9c63c0a 100644 --- a/assimp.spec +++ b/assimp.spec @@ -1,7 +1,7 @@ %undefine __cmake_in_source_build Name: assimp Version: 3.3.1 -Release: 26%{?dist} +Release: 27%{?dist} Summary: Library to import various 3D model formats into applications # Assimp is BSD, the bundled openddlparser is MIT. License: BSD and MIT @@ -23,6 +23,7 @@ Patch2: 0001-Assimp-cmake-provider-fix.patch Patch3: assimp-3.3.1-namespace-bigendian.patch Patch10: assimp-3.3.1-install-pkgconfig.patch Patch11: assimp-3.3.1-cmakemacros.patch +Patch12: assimp-gcc11.patch #Upstream backports # Collada morph animation @@ -109,6 +110,7 @@ rm -r contrib/poly2tri %patch101 -p1 -b .qt3d %patch102 -p1 -b .systemirrxml %patch11 -p0 -b .cmakemacros +%patch12 -p1 -b .gcc11 %build %cmake \ @@ -163,6 +165,9 @@ install -m0644 port/PyAssimp/pyassimp/*.py %{buildroot}%{python3_sitelib}/pyassi %endif %changelog +* Tue Aug 18 2020 Jeff Law - 3.3.1-27 +- Fix minor C++17 issues + * Sat Aug 01 2020 Fedora Release Engineering - 3.3.1-26 - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild