[neon/backports-focal/assimp/Neon/release] debian: new release
Jonathan Riddell
null at kde.org
Wed Jan 26 13:21:02 GMT 2022
Git commit 2a99c42a0319263dcb0ec76527d9d6646063e81d by Jonathan Riddell.
Committed on 26/01/2022 at 13:20.
Pushed by jriddell into branch 'Neon/release'.
new release
M +6 -0 debian/changelog
M +9 -5 debian/patches/use-system-libdraco.patch
M +9 -5 debian/patches/use-system-stb_image.patch
M +27 -16 debian/patches/use-system-utf8cpp.patch
https://invent.kde.org/neon/backports-focal/assimp/commit/2a99c42a0319263dcb0ec76527d9d6646063e81d
diff --git a/debian/changelog b/debian/changelog
index fb73470..7774634 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+assimp (5.2.0-0neon) UNRELEASED; urgency=medium
+
+ * New release
+
+ -- Jonathan Riddell <jr at jriddell.org> Wed, 26 Jan 2022 12:42:17 +0000
+
assimp (5.1.6~ds0-1) unstable; urgency=medium
* New upstream version 5.1.6~ds0
diff --git a/debian/patches/use-system-libdraco.patch b/debian/patches/use-system-libdraco.patch
index 76df300..8085fd0 100644
--- a/debian/patches/use-system-libdraco.patch
+++ b/debian/patches/use-system-libdraco.patch
@@ -5,9 +5,11 @@ Forwarded: no
Last-Update: 2021-11-23
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- assimp.orig/code/CMakeLists.txt
-+++ assimp/code/CMakeLists.txt
-@@ -1207,6 +1207,9 @@
+Index: assimp-5.2.0/code/CMakeLists.txt
+===================================================================
+--- assimp-5.2.0.orig/code/CMakeLists.txt
++++ assimp-5.2.0/code/CMakeLists.txt
+@@ -1216,6 +1216,9 @@ ELSE()
endif()
ENDIF()
@@ -17,8 +19,10 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
if(ASSIMP_ANDROID_JNIIOSYSTEM)
set(ASSIMP_ANDROID_JNIIOSYSTEM_PATH port/AndroidJNI)
add_subdirectory(../${ASSIMP_ANDROID_JNIIOSYSTEM_PATH}/ ../${ASSIMP_ANDROID_JNIIOSYSTEM_PATH}/)
---- assimp.orig/cmake-modules/assimp-plain-config.cmake.in
-+++ assimp/cmake-modules/assimp-plain-config.cmake.in
+Index: assimp-5.2.0/cmake-modules/assimp-plain-config.cmake.in
+===================================================================
+--- assimp-5.2.0.orig/cmake-modules/assimp-plain-config.cmake.in
++++ assimp-5.2.0/cmake-modules/assimp-plain-config.cmake.in
@@ -1,5 +1,7 @@
@PACKAGE_INIT@
diff --git a/debian/patches/use-system-stb_image.patch b/debian/patches/use-system-stb_image.patch
index 232f817..bd0234c 100644
--- a/debian/patches/use-system-stb_image.patch
+++ b/debian/patches/use-system-stb_image.patch
@@ -12,8 +12,10 @@ Last-Update: 2019-10-17
samples/SimpleTexturedOpenGL/SimpleTexturedOpenGL/src/model_loading.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---- assimp.orig/samples/SimpleTexturedOpenGL/SimpleTexturedOpenGL/src/model_loading.cpp
-+++ assimp/samples/SimpleTexturedOpenGL/SimpleTexturedOpenGL/src/model_loading.cpp
+Index: assimp-5.2.0/samples/SimpleTexturedOpenGL/SimpleTexturedOpenGL/src/model_loading.cpp
+===================================================================
+--- assimp-5.2.0.orig/samples/SimpleTexturedOpenGL/SimpleTexturedOpenGL/src/model_loading.cpp
++++ assimp-5.2.0/samples/SimpleTexturedOpenGL/SimpleTexturedOpenGL/src/model_loading.cpp
@@ -23,7 +23,7 @@
#endif // _MSC_VER
@@ -23,9 +25,11 @@ Last-Update: 2019-10-17
#ifdef _MSC_VER
#pragma warning(default: 4100) // Enable warning 'unreferenced formal parameter'
---- assimp.orig/code/CMakeLists.txt
-+++ assimp/code/CMakeLists.txt
-@@ -1069,11 +1069,11 @@
+Index: assimp-5.2.0/code/CMakeLists.txt
+===================================================================
+--- assimp-5.2.0.orig/code/CMakeLists.txt
++++ assimp-5.2.0/code/CMakeLists.txt
+@@ -1078,11 +1078,11 @@ IF(ASSIMP_HUNTER_ENABLED)
hunter_add_package(stb)
find_package(stb CONFIG REQUIRED)
ELSE()
diff --git a/debian/patches/use-system-utf8cpp.patch b/debian/patches/use-system-utf8cpp.patch
index 7c05621..fc0d22a 100644
--- a/debian/patches/use-system-utf8cpp.patch
+++ b/debian/patches/use-system-utf8cpp.patch
@@ -17,9 +17,11 @@ Last-Update: 2019-10-17
code/X3D/FIReader.cpp | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
---- assimp.orig/code/AssetLib/STEPParser/STEPFileEncoding.cpp
-+++ assimp/code/AssetLib/STEPParser/STEPFileEncoding.cpp
-@@ -48,7 +48,7 @@
+Index: assimp-5.2.0/code/AssetLib/STEPParser/STEPFileEncoding.cpp
+===================================================================
+--- assimp-5.2.0.orig/code/AssetLib/STEPParser/STEPFileEncoding.cpp
++++ assimp-5.2.0/code/AssetLib/STEPParser/STEPFileEncoding.cpp
+@@ -48,7 +48,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE
#ifdef ASSIMP_USE_HUNTER
# include <utf8.h>
#else
@@ -28,9 +30,11 @@ Last-Update: 2019-10-17
#endif
#include <memory>
---- assimp.orig/code/AssetLib/MMD/MMDPmxParser.cpp
-+++ assimp/code/AssetLib/MMD/MMDPmxParser.cpp
-@@ -45,7 +45,7 @@
+Index: assimp-5.2.0/code/AssetLib/MMD/MMDPmxParser.cpp
+===================================================================
+--- assimp-5.2.0.orig/code/AssetLib/MMD/MMDPmxParser.cpp
++++ assimp-5.2.0/code/AssetLib/MMD/MMDPmxParser.cpp
+@@ -45,7 +45,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE
#ifdef ASSIMP_USE_HUNTER
# include <utf8.h>
#else
@@ -39,20 +43,27 @@ Last-Update: 2019-10-17
#endif
#include <assimp/Exceptional.h>
---- assimp.orig/code/AssetLib/SIB/SIBImporter.cpp
-+++ assimp/code/AssetLib/SIB/SIBImporter.cpp
-@@ -62,7 +62,7 @@
+Index: assimp-5.2.0/code/AssetLib/SIB/SIBImporter.cpp
+===================================================================
+--- assimp-5.2.0.orig/code/AssetLib/SIB/SIBImporter.cpp
++++ assimp-5.2.0/code/AssetLib/SIB/SIBImporter.cpp
+@@ -56,11 +56,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ #include <assimp/ByteSwapper.h>
+ #include <assimp/StreamReader.h>
+ #include <assimp/TinyFormatter.h>
+-#ifdef ASSIMP_USE_HUNTER
#include <utf8.h>
- #else
- //# include "../contrib/ConvertUTF/ConvertUTF.h"
+-#else
-#include "../contrib/utf8cpp/source/utf8.h"
-+#include <utf8.h>
- #endif
+-#endif
#include <assimp/importerdesc.h>
#include <assimp/scene.h>
---- assimp.orig/code/Common/BaseImporter.cpp
-+++ assimp/code/Common/BaseImporter.cpp
-@@ -331,7 +331,7 @@
+ #include <assimp/DefaultLogger.hpp>
+Index: assimp-5.2.0/code/Common/BaseImporter.cpp
+===================================================================
+--- assimp-5.2.0.orig/code/Common/BaseImporter.cpp
++++ assimp-5.2.0/code/Common/BaseImporter.cpp
+@@ -332,7 +332,7 @@ std::string BaseImporter::GetExtension(c
#ifdef ASSIMP_USE_HUNTER
#include <utf8.h>
#else
More information about the Neon-commits
mailing list