diff -Nru assimp-5.2.5~ds0/debian/changelog assimp-5.2.5~ds0/debian/changelog --- assimp-5.2.5~ds0/debian/changelog 2022-09-11 02:46:39.000000000 +0000 +++ assimp-5.2.5~ds0/debian/changelog 2022-11-28 20:25:28.000000000 +0000 @@ -1,17 +1,25 @@ -assimp (5.2.5~ds0-0ubuntu1~22.04.sav0) jammy; urgency=medium +assimp (5.2.5~ds0-1build1~22.04.sav0) jammy; urgency=medium - * New upstream release - * debian/rules: Add ASSIMP_BUILD_ASSIMP_TOOLS=ON config (default is now OFF) - * debian/patches/: Add fix-project-version.patch for version 5.2.5 - - Drop {index_overflow,use-system-minizip}.patch (upstream fixes) + * Backport to Jammy - -- Rob Savoury Sat, 10 Sep 2022 19:46:39 -0700 + -- Rob Savoury Mon, 28 Nov 2022 12:25:28 -0800 -assimp (5.2.4~ds0-3~22.04.sav0) jammy; urgency=medium +assimp (5.2.5~ds0-1build1) lunar; urgency=medium - * Backport to Jammy + * No-change rebuilds against libdraco7 + + -- Graham Inggs Wed, 16 Nov 2022 14:43:07 +0000 + +assimp (5.2.5~ds0-1) unstable; urgency=medium + + * New upstream version 5.2.5~ds0 + + Refresh patches + + Drop patch applied upstream + + Disable index_overflow.patch for now + * Explicitly enable building of assimp tools + * Modernize d/watch - -- Rob Savoury Thu, 25 Aug 2022 08:45:49 -0700 + -- IOhannes m zmölnig (Debian/GNU) Fri, 16 Sep 2022 15:39:37 +0200 assimp (5.2.4~ds0-3) unstable; urgency=medium diff -Nru assimp-5.2.5~ds0/debian/patches/index_overflow.patch assimp-5.2.5~ds0/debian/patches/index_overflow.patch --- assimp-5.2.5~ds0/debian/patches/index_overflow.patch 1970-01-01 00:00:00.000000000 +0000 +++ assimp-5.2.5~ds0/debian/patches/index_overflow.patch 2022-09-16 13:39:37.000000000 +0000 @@ -0,0 +1,67 @@ +From: =?utf-8?q?Timo_R=C3=B6hling?= +Date: Sat, 6 Aug 2022 19:00:12 +0200 +Subject: Fix various index overflow errors + +These errors have been discovered through the improved diagnostics +of GCC-12. +--- + code/AssetLib/SMD/SMDLoader.cpp | 4 ++-- + code/AssetLib/X3D/X3DImporter_Geometry2D.cpp | 4 ++-- + code/AssetLib/glTF2/glTF2Exporter.cpp | 4 +++- + 3 files changed, 7 insertions(+), 5 deletions(-) + +diff --git a/code/AssetLib/SMD/SMDLoader.cpp b/code/AssetLib/SMD/SMDLoader.cpp +index 46fd968..0d0f5b2 100644 +--- a/code/AssetLib/SMD/SMDLoader.cpp ++++ b/code/AssetLib/SMD/SMDLoader.cpp +@@ -252,10 +252,10 @@ void SMDImporter::CreateOutputMeshes() { + iFace = asTriangles.begin(); + iFace != asTriangles.end();++iFace,++iNum) { + if (UINT_MAX == (*iFace).iTexture) { +- aaiFaces[(*iFace).iTexture].push_back( 0 ); ++ aaiFaces[0].push_back(iNum); + } else if ((*iFace).iTexture >= aszTextures.size()) { + ASSIMP_LOG_INFO("[SMD/VTA] Material index overflow in face"); +- aaiFaces[(*iFace).iTexture].push_back((unsigned int)aszTextures.size()-1); ++ aaiFaces[(unsigned int)aszTextures.size()-1].push_back(iNum); + } else { + aaiFaces[(*iFace).iTexture].push_back(iNum); + } +diff --git a/code/AssetLib/X3D/X3DImporter_Geometry2D.cpp b/code/AssetLib/X3D/X3DImporter_Geometry2D.cpp +index 8d0f5ba..b936ae8 100644 +--- a/code/AssetLib/X3D/X3DImporter_Geometry2D.cpp ++++ b/code/AssetLib/X3D/X3DImporter_Geometry2D.cpp +@@ -274,8 +274,8 @@ void X3DImporter::readDisk2D(XmlNode &node) { + } + + // add last quad +- vlist.push_back(*tlist_i.end()); // 1st point +- vlist.push_back(*tlist_o.end()); // 2nd point ++ vlist.push_back(*tlist_i.rbegin()); // 1st point ++ vlist.push_back(*tlist_o.rbegin()); // 2nd point + vlist.push_back(*tlist_o.begin()); // 3rd point + vlist.push_back(*tlist_o.begin()); // 4th point + +diff --git a/code/AssetLib/glTF2/glTF2Exporter.cpp b/code/AssetLib/glTF2/glTF2Exporter.cpp +index ffd8d22..36292e3 100644 +--- a/code/AssetLib/glTF2/glTF2Exporter.cpp ++++ b/code/AssetLib/glTF2/glTF2Exporter.cpp +@@ -57,7 +57,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + #include + + // Header files, standard library. ++#include + #include ++#include + #include + #include + +@@ -683,7 +685,7 @@ bool glTF2Exporter::GetMatSheen(const aiMaterial &mat, glTF2::MaterialSheen &she + } + + // Default Sheen color factor {0,0,0} disables Sheen, so do not export +- if (sheen.sheenColorFactor == defaultSheenFactor) { ++ if (std::equal(std::begin(sheen.sheenColorFactor), std::end(sheen.sheenColorFactor), std::begin(defaultSheenFactor))) { + return false; + } + diff -Nru assimp-5.2.5~ds0/debian/patches/series assimp-5.2.5~ds0/debian/patches/series --- assimp-5.2.5~ds0/debian/patches/series 2022-09-11 01:58:01.000000000 +0000 +++ assimp-5.2.5~ds0/debian/patches/series 2022-11-28 20:16:58.000000000 +0000 @@ -4,4 +4,5 @@ pyassimp.patch pyassimp_faces.patch doxygen.patch +#index_overflow.patch fix-project-version.patch diff -Nru assimp-5.2.5~ds0/debian/patches/use-system-libdraco.patch assimp-5.2.5~ds0/debian/patches/use-system-libdraco.patch --- assimp-5.2.5~ds0/debian/patches/use-system-libdraco.patch 2022-08-11 22:22:38.000000000 +0000 +++ assimp-5.2.5~ds0/debian/patches/use-system-libdraco.patch 2022-09-16 13:39:37.000000000 +0000 @@ -7,7 +7,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ --- assimp.orig/code/CMakeLists.txt +++ assimp/code/CMakeLists.txt -@@ -1224,6 +1224,9 @@ +@@ -1230,6 +1230,9 @@ endif() ENDIF() diff -Nru assimp-5.2.5~ds0/debian/patches/use-system-stb_image.patch assimp-5.2.5~ds0/debian/patches/use-system-stb_image.patch --- assimp-5.2.5~ds0/debian/patches/use-system-stb_image.patch 2022-08-11 22:22:38.000000000 +0000 +++ assimp-5.2.5~ds0/debian/patches/use-system-stb_image.patch 2022-09-16 13:39:37.000000000 +0000 @@ -25,7 +25,7 @@ #pragma warning(default: 4100) // Enable warning 'unreferenced formal parameter' --- assimp.orig/code/CMakeLists.txt +++ assimp/code/CMakeLists.txt -@@ -1084,11 +1084,11 @@ +@@ -1085,11 +1085,11 @@ hunter_add_package(stb) find_package(stb CONFIG REQUIRED) ELSE() diff -Nru assimp-5.2.5~ds0/debian/patches/use-system-utf8cpp.patch assimp-5.2.5~ds0/debian/patches/use-system-utf8cpp.patch --- assimp-5.2.5~ds0/debian/patches/use-system-utf8cpp.patch 2022-08-11 22:22:38.000000000 +0000 +++ assimp-5.2.5~ds0/debian/patches/use-system-utf8cpp.patch 2022-09-16 13:39:37.000000000 +0000 @@ -53,7 +53,7 @@ #include --- assimp.orig/code/Common/BaseImporter.cpp +++ assimp/code/Common/BaseImporter.cpp -@@ -332,7 +332,7 @@ +@@ -334,7 +334,7 @@ #ifdef ASSIMP_USE_HUNTER #include #else diff -Nru assimp-5.2.5~ds0/debian/rules assimp-5.2.5~ds0/debian/rules --- assimp-5.2.5~ds0/debian/rules 2022-09-11 02:46:39.000000000 +0000 +++ assimp-5.2.5~ds0/debian/rules 2022-09-16 13:39:37.000000000 +0000 @@ -40,8 +40,8 @@ override_dh_auto_configure: dh_auto_configure -- \ -DASSIMP_BUILD_ARCHITECTURE=$(DEB_HOST_ARCH) \ - -DASSIMP_BUILD_ASSIMP_TOOLS=ON \ -DASSIMP_BUILD_DOCS=ON \ + -DASSIMP_BUILD_ASSIMP_TOOLS=ON \ -DASSIMP_BUILD_SAMPLES=OFF \ -DASSIMP_BUILD_TESTS=OFF \ -DASSIMP_BUILD_ZLIB=OFF \ diff -Nru assimp-5.2.5~ds0/debian/watch assimp-5.2.5~ds0/debian/watch --- assimp-5.2.5~ds0/debian/watch 2022-08-11 22:22:38.000000000 +0000 +++ assimp-5.2.5~ds0/debian/watch 2022-09-16 13:39:37.000000000 +0000 @@ -1,4 +1,7 @@ # Run the "uscan" command to check for upstream updates and more. version=4 -opts=uversionmangle=s%(rc|a|b|c)%~$1%,dversionmangle=auto,oversionmangle=s%$%~ds0% \ - https://github.com/assimp/assimp/releases .*/v?@ANY_VERSION@@ARCHIVE_EXT@ +opts=\ + uversionmangle=s%(rc|a|b|c)%~$1%,\ + repacksuffix=~ds0,\ + dversionmangle=auto \ + https://github.com/assimp/assimp/tags .*/v?@ANY_VERSION@@ARCHIVE_EXT@