[neon/backports-focal/assimp/Neon/release] debian: copy in http://deb.debian.org/debian/pool/main/a/assimp/assimp_5.2.2~ds0-1.debian.tar.xz
Jonathan Esk-Riddell
null at kde.org
Tue Mar 1 12:59:21 GMT 2022
Git commit d0b49fa461990e011a0c7e42c184af93c7ced93b by Jonathan Esk-Riddell.
Committed on 01/03/2022 at 12:59.
Pushed by jriddell into branch 'Neon/release'.
copy in http://deb.debian.org/debian/pool/main/a/assimp/assimp_5.2.2~ds0-1.debian.tar.xz
M +26 -3 debian/changelog
M +2 -2 debian/copyright
M +10 -2 debian/copyright_hints
M +5 -9 debian/patches/use-system-libdraco.patch
M +5 -9 debian/patches/use-system-stb_image.patch
M +17 -27 debian/patches/use-system-utf8cpp.patch
https://invent.kde.org/neon/backports-focal/assimp/commit/d0b49fa461990e011a0c7e42c184af93c7ced93b
diff --git a/debian/changelog b/debian/changelog
index 4f920d5..e29ec8d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,31 @@
-assimp (5.2.0~ds0-0neon) UNRELEASED; urgency=medium
+assimp (5.2.2~ds0-1) unstable; urgency=medium
- * New release
+ * New upstream version 5.2.2~ds0
+ + Refresh patches
+
+ -- IOhannes m zmölnig (Debian/GNU) <umlaeute at debian.org> Mon, 21 Feb 2022 16:49:57 +0100
+
+assimp (5.2.1~ds0-1) unstable; urgency=medium
+
+ * New upstream version 5.2.1~ds0
+ + Drop patches applied upstream
+
+ -- IOhannes m zmölnig (Debian/GNU) <umlaeute at debian.org> Wed, 09 Feb 2022 14:44:50 +0100
+
+assimp (5.2.0~ds0-2) unstable; urgency=medium
+
+ * Add patch to prevent FTBFS on big-endian architectures
+
+ -- IOhannes m zmölnig (Debian/GNU) <umlaeute at debian.org> Mon, 31 Jan 2022 15:30:58 +0100
+
+assimp (5.2.0~ds0-1) unstable; urgency=medium
+
+ * New upstream version 5.2.0~ds0
+ + Refresh patches
+ * Update dates in d/copyright
+ + Regenerate d/copyright_hints
- -- Jonathan Riddell <jr at jriddell.org> Wed, 26 Jan 2022 12:42:17 +0000
+ -- IOhannes m zmölnig (Debian/GNU) <umlaeute at debian.org> Mon, 31 Jan 2022 11:52:15 +0100
assimp (5.1.6~ds0-1) unstable; urgency=medium
diff --git a/debian/copyright b/debian/copyright
index 883d26e..16550b6 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -35,7 +35,7 @@ Copyright: 2004-2008, Paul Hsieh.
License: BSD-3-clause
Files: code/Common/CreateAnimMesh.cpp
-Copyright: 2006-2021, ASSIMP Development Team
+Copyright: 2006-2022, ASSIMP Development Team
2016, The Qt Company Ltd.
License: BSD-3-clause
@@ -52,7 +52,7 @@ Copyright: 2002, Randy Reddig & seaw0lf
License: BSD-3-clause
Files: code/AssetLib/M3D/*
-Copyright: 2006-2021, ASSIMP Development Team
+Copyright: 2006-2022, ASSIMP Development Team
2019, bzt (bztsrc at gitlab)
License: BSD-3-clause
diff --git a/debian/copyright_hints b/debian/copyright_hints
index 0fe5a30..7d9e127 100644
--- a/debian/copyright_hints
+++ b/debian/copyright_hints
@@ -123,6 +123,8 @@ Files: code/AssetLib/3DS/3DSConverter.cpp
code/AssetLib/IFC/IFCProfile.cpp
code/AssetLib/IFC/IFCUtil.cpp
code/AssetLib/IFC/IFCUtil.h
+ code/AssetLib/IQM/IQMImporter.cpp
+ code/AssetLib/IQM/IQMImporter.h
code/AssetLib/Irr/IRRLoader.cpp
code/AssetLib/Irr/IRRLoader.h
code/AssetLib/Irr/IRRMeshLoader.cpp
@@ -283,6 +285,7 @@ Files: code/AssetLib/3DS/3DSConverter.cpp
code/Common/AssertHandler.cpp
code/Common/AssertHandler.h
code/Common/Assimp.cpp
+ code/Common/Base64.cpp
code/Common/BaseImporter.cpp
code/Common/BaseProcess.cpp
code/Common/BaseProcess.h
@@ -295,6 +298,7 @@ Files: code/AssetLib/3DS/3DSConverter.cpp
code/Common/Exporter.cpp
code/Common/FileLogStream.h
code/Common/FileSystemFilter.h
+ code/Common/IOSystem.cpp
code/Common/Importer.cpp
code/Common/Importer.h
code/Common/ImporterRegistry.cpp
@@ -389,6 +393,7 @@ Files: code/AssetLib/3DS/3DSConverter.cpp
code/PostProcessing/ValidateDataStructure.cpp
code/PostProcessing/ValidateDataStructure.h
fuzz/assimp_fuzzer.cc
+ include/assimp/Base64.hpp
include/assimp/BaseImporter.h
include/assimp/Bitmap.h
include/assimp/BlobIOSystem.h
@@ -519,6 +524,7 @@ Files: code/AssetLib/3DS/3DSConverter.cpp
test/unit/AssimpAPITest_aiVector3D.cpp
test/unit/Common/uiScene.cpp
test/unit/Common/utAssertHandler.cpp
+ test/unit/Common/utBase64.cpp
test/unit/Common/utLineSplitter.cpp
test/unit/Common/utMesh.cpp
test/unit/Common/utSpatialSort.cpp
@@ -675,6 +681,7 @@ Files: code/AssetLib/3DS/3DSConverter.cpp
Copyright: 2006-2019, assimp team
2006-2020, assimp team
2006-2021, assimp team
+ 2006-2022, assimp team
License: BSD-3-clause
FIXME
@@ -1019,6 +1026,7 @@ Files: Build.md
Readme.md
code/AssetLib/Blender/BlenderCustomData.cpp
code/AssetLib/Blender/BlenderCustomData.h
+ code/AssetLib/IQM/iqm.h
code/AssetLib/Irr/IRRShared.h
code/AssetLib/X3D/X3DExporter.cpp
code/AssetLib/X3D/X3DExporter.hpp
@@ -1477,7 +1485,7 @@ Files: code/AssetLib/M3D/M3DExporter.cpp
code/AssetLib/M3D/M3DMaterials.h
code/AssetLib/M3D/M3DWrapper.cpp
code/AssetLib/M3D/M3DWrapper.h
-Copyright: 2006-2021, assimp team
+Copyright: 2006-2022, assimp team
2019, bzt
License: BSD-3-clause
FIXME
@@ -1578,7 +1586,7 @@ License: BSD-3-clause
FIXME
Files: code/Common/CreateAnimMesh.cpp
-Copyright: 2006-2021, assimp team
+Copyright: 2006-2022, assimp team
2016, The Qt Company Ltd.
License: BSD-3-clause
FIXME
diff --git a/debian/patches/use-system-libdraco.patch b/debian/patches/use-system-libdraco.patch
index 8085fd0..affcf98 100644
--- a/debian/patches/use-system-libdraco.patch
+++ b/debian/patches/use-system-libdraco.patch
@@ -5,11 +5,9 @@ Forwarded: no
Last-Update: 2021-11-23
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-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()
+--- assimp.orig/code/CMakeLists.txt
++++ assimp/code/CMakeLists.txt
+@@ -1218,6 +1218,9 @@
endif()
ENDIF()
@@ -19,10 +17,8 @@ Index: assimp-5.2.0/code/CMakeLists.txt
if(ASSIMP_ANDROID_JNIIOSYSTEM)
set(ASSIMP_ANDROID_JNIIOSYSTEM_PATH port/AndroidJNI)
add_subdirectory(../${ASSIMP_ANDROID_JNIIOSYSTEM_PATH}/ ../${ASSIMP_ANDROID_JNIIOSYSTEM_PATH}/)
-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
+--- assimp.orig/cmake-modules/assimp-plain-config.cmake.in
++++ assimp/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 bd0234c..cf789ad 100644
--- a/debian/patches/use-system-stb_image.patch
+++ b/debian/patches/use-system-stb_image.patch
@@ -12,10 +12,8 @@ Last-Update: 2019-10-17
samples/SimpleTexturedOpenGL/SimpleTexturedOpenGL/src/model_loading.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
-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
+--- assimp.orig/samples/SimpleTexturedOpenGL/SimpleTexturedOpenGL/src/model_loading.cpp
++++ assimp/samples/SimpleTexturedOpenGL/SimpleTexturedOpenGL/src/model_loading.cpp
@@ -23,7 +23,7 @@
#endif // _MSC_VER
@@ -25,11 +23,9 @@ Index: assimp-5.2.0/samples/SimpleTexturedOpenGL/SimpleTexturedOpenGL/src/model_
#ifdef _MSC_VER
#pragma warning(default: 4100) // Enable warning 'unreferenced formal parameter'
-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)
+--- assimp.orig/code/CMakeLists.txt
++++ assimp/code/CMakeLists.txt
+@@ -1080,11 +1080,11 @@
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 fc0d22a..d9b0138 100644
--- a/debian/patches/use-system-utf8cpp.patch
+++ b/debian/patches/use-system-utf8cpp.patch
@@ -17,11 +17,9 @@ Last-Update: 2019-10-17
code/X3D/FIReader.cpp | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
-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
+--- assimp.orig/code/AssetLib/STEPParser/STEPFileEncoding.cpp
++++ assimp/code/AssetLib/STEPParser/STEPFileEncoding.cpp
+@@ -48,7 +48,7 @@
#ifdef ASSIMP_USE_HUNTER
# include <utf8.h>
#else
@@ -30,11 +28,9 @@ Index: assimp-5.2.0/code/AssetLib/STEPParser/STEPFileEncoding.cpp
#endif
#include <memory>
-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
+--- assimp.orig/code/AssetLib/MMD/MMDPmxParser.cpp
++++ assimp/code/AssetLib/MMD/MMDPmxParser.cpp
+@@ -45,7 +45,7 @@
#ifdef ASSIMP_USE_HUNTER
# include <utf8.h>
#else
@@ -43,27 +39,21 @@ Index: assimp-5.2.0/code/AssetLib/MMD/MMDPmxParser.cpp
#endif
#include <assimp/Exceptional.h>
-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
+--- assimp.orig/code/AssetLib/SIB/SIBImporter.cpp
++++ assimp/code/AssetLib/SIB/SIBImporter.cpp
+@@ -59,7 +59,8 @@
+ #ifdef ASSIMP_USE_HUNTER
#include <utf8.h>
--#else
+ #else
-#include "../contrib/utf8cpp/source/utf8.h"
--#endif
++//# include "../contrib/ConvertUTF/ConvertUTF.h"
++#include <utf8.h>
+ #endif
#include <assimp/importerdesc.h>
#include <assimp/scene.h>
- #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
+--- assimp.orig/code/Common/BaseImporter.cpp
++++ assimp/code/Common/BaseImporter.cpp
+@@ -332,7 +332,7 @@
#ifdef ASSIMP_USE_HUNTER
#include <utf8.h>
#else
More information about the Neon-commits
mailing list