Notification time stamped 2021-08-01 01:56:15 UTC
From 951ad340bef7f5e8da99adabb2a9427a8eaba83b Mon Sep 17 00:00:00 2001
From: Rich Mattes <richmattes(a)gmail.com>
Date: Mar 08 2021 01:43:46 +0000
Subject: EPEL8 fixes
Remove build dep on unavailable pkgconfig(ILUT)
Update paths to utf8cpp utf8.h for older version in EPEL8
---
diff --git a/assimp-5.0.1-irrxml.patch b/assimp-5.0.1-irrxml.patch
index 59bc73f..3da7b6c 100644
--- a/assimp-5.0.1-irrxml.patch
+++ b/assimp-5.0.1-irrxml.patch
@@ -1,6 +1,6 @@
diff -up ./code/X3D/FIReader.cpp.irrxml ./code/X3D/FIReader.cpp
--- ./code/X3D/FIReader.cpp.irrxml 2020-01-12 06:56:40.000000000 -0500
-+++ ./code/X3D/FIReader.cpp 2021-02-27 15:49:55.138400544 -0500
++++ ./code/X3D/FIReader.cpp 2021-03-07 20:38:31.402545036 -0500
@@ -60,11 +60,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE
#include <assimp/types.h>
#include <assimp/MemoryIOWrapper.h>
@@ -10,7 +10,7 @@ diff -up ./code/X3D/FIReader.cpp.irrxml ./code/X3D/FIReader.cpp
-#else
-# include "../contrib/utf8cpp/source/utf8.h"
-#endif
-+#include <utf8cpp/utf8.h>
++#include <utf8.h>
#include <assimp/fast_atof.h>
#include <stack>
#include <map>
@@ -34,7 +34,7 @@ diff -up ./code/X3D/FIReader.cpp.irrxml ./code/X3D/FIReader.cpp
diff -up ./include/assimp/irrXMLWrapper.h.irrxml ./include/assimp/irrXMLWrapper.h
--- ./include/assimp/irrXMLWrapper.h.irrxml 2020-01-12 06:56:40.000000000 -0500
-+++ ./include/assimp/irrXMLWrapper.h 2021-02-27 15:46:23.410557453 -0500
++++ ./include/assimp/irrXMLWrapper.h 2021-03-07 20:38:15.760525926 -0500
@@ -133,7 +133,7 @@ public:
//
----------------------------------------------------------------------------------
diff --git a/assimp-5.0.1-unbundle.patch b/assimp-5.0.1-unbundle.patch
index 8db4aff..0d937d5 100644
--- a/assimp-5.0.1-unbundle.patch
+++ b/assimp-5.0.1-unbundle.patch
@@ -52,7 +52,7 @@ diff -up ./code/CMakeLists.txt.unbundle ./code/CMakeLists.txt
find_package(utf8 CONFIG REQUIRED)
ELSE(HUNTER_ENABLED)
- # utf8 is header-only, so Assimp doesn't need to do anything.
-+ find_package(utf8cpp REQUIRED)
++ find_package(utf8cpp)
ENDIF(HUNTER_ENABLED)
# polyclipping
@@ -188,7 +188,7 @@ diff -up ./code/Common/BaseImporter.cpp.unbundle
./code/Common/BaseImporter.cpp
-#else
-# include "../contrib/utf8cpp/source/utf8.h"
-#endif
-+# include <utf8cpp/utf8.h>
++# include <utf8.h>
//
------------------------------------------------------------------------------------------------
// Convert to UTF8 data
@@ -242,7 +242,7 @@ diff -up ./code/Importer/STEPParser/STEPFileEncoding.cpp.unbundle
./code/Importe
-#else
-# include <contrib/utf8cpp/source/utf8.h>
-#endif
-+#include <utf8cpp/utf8.h>
++#include <utf8.h>
#include <memory>
@@ -258,7 +258,7 @@ diff -up ./code/MMD/MMDPmxParser.cpp.unbundle
./code/MMD/MMDPmxParser.cpp
-#else
-# include "../contrib/utf8cpp/source/utf8.h"
-#endif
-+#include <utf8cpp/utf8.h>
++#include <utf8.h>
#include <assimp/Exceptional.h>
namespace pmx
@@ -275,7 +275,7 @@ diff -up ./code/SIB/SIBImporter.cpp.unbundle
./code/SIB/SIBImporter.cpp
-//# include "../contrib/ConvertUTF/ConvertUTF.h"
-# include "../contrib/utf8cpp/source/utf8.h"
-#endif
-+#include <utf8cpp/utf8.h>
++#include <utf8.h>
#include <assimp/IOSystem.hpp>
#include <assimp/DefaultLogger.hpp>
#include <assimp/scene.h>
diff --git a/assimp.spec b/assimp.spec
index 5f21875..a7fa51c 100644
--- a/assimp.spec
+++ b/assimp.spec
@@ -44,13 +44,16 @@ BuildRequires: gtest-devel
BuildRequires: make
BuildRequires: pkgconfig(zzip-zlib-config)
BuildRequires: pkgconfig(zlib)
-BuildRequires: pkgconfig(ILUT)
BuildRequires: pkgconfig(python3)
BuildRequires: poly2tri-devel
BuildRequires: python3-devel
BuildRequires: rapidjson-devel
BuildRequires: utf8cpp-devel
+%if 0%{?fedora}
+BuildRequires: pkgconfig(ILUT)
+%endif
+
# Incompatible -
https://github.com/assimp/assimp/issues/788
#BuildRequires: pkgconfig(polyclipping)
Provides: bundled(polyclipping) = 4.8.8
https://src.fedoraproject.org/rpms/assimp/c/951ad340bef7f5e8da99adabb2a94...