diff -Nru assimp-4.1.0~dfsg/debian/changelog assimp-4.1.0~dfsg/debian/changelog --- assimp-4.1.0~dfsg/debian/changelog 2018-04-22 12:45:39.000000000 +0000 +++ assimp-4.1.0~dfsg/debian/changelog 2018-10-23 19:55:26.000000000 +0000 @@ -1,3 +1,13 @@ +assimp (4.1.0~dfsg-5) unstable; urgency=medium + + * Backport fix for data-misalignment (Closes: #911484) + * Refresh patches with "gbp pq" + * Use https:// for copyright URI + * Declare that the package does not require "root" for building + * Bump standards version to 4.2.1 + + -- IOhannes m zmölnig (Debian/GNU) Tue, 23 Oct 2018 21:55:26 +0200 + assimp (4.1.0~dfsg-4) unstable; urgency=medium * Made python3-pyassimp depend on required python-modules (Closes: #896199) diff -Nru assimp-4.1.0~dfsg/debian/control assimp-4.1.0~dfsg/debian/control --- assimp-4.1.0~dfsg/debian/control 2018-04-22 12:45:39.000000000 +0000 +++ assimp-4.1.0~dfsg/debian/control 2018-10-23 19:55:26.000000000 +0000 @@ -3,7 +3,7 @@ Priority: optional Maintainer: IOhannes m zmölnig (Debian/GNU) Homepage: http://assimp.org -Standards-Version: 4.1.4 +Standards-Version: 4.2.1 Build-Depends: debhelper (>=10~), dh-python, @@ -18,6 +18,7 @@ doxygen, python-all, python3-all, +Rules-Requires-Root: no Vcs-Git: https://salsa.debian.org/debian/assimp.git Vcs-Browser: https://salsa.debian.org/debian/assimp diff -Nru assimp-4.1.0~dfsg/debian/copyright assimp-4.1.0~dfsg/debian/copyright --- assimp-4.1.0~dfsg/debian/copyright 2018-04-22 12:45:39.000000000 +0000 +++ assimp-4.1.0~dfsg/debian/copyright 2018-10-23 19:55:26.000000000 +0000 @@ -1,4 +1,4 @@ -Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: assimp Upstream-Contact: assimp-discussions@lists.sourceforge.net Source: https://github.com/assimp/assimp @@ -293,4 +293,4 @@ OTHER DEALINGS IN THE SOFTWARE. . For more information, please refer to - \ No newline at end of file + diff -Nru assimp-4.1.0~dfsg/debian/patches/0005-STLLoader-closes-https-github.com-assimp-assimp-issu.patch assimp-4.1.0~dfsg/debian/patches/0005-STLLoader-closes-https-github.com-assimp-assimp-issu.patch --- assimp-4.1.0~dfsg/debian/patches/0005-STLLoader-closes-https-github.com-assimp-assimp-issu.patch 1970-01-01 00:00:00.000000000 +0000 +++ assimp-4.1.0~dfsg/debian/patches/0005-STLLoader-closes-https-github.com-assimp-assimp-issu.patch 2018-10-23 19:55:26.000000000 +0000 @@ -0,0 +1,52 @@ +From: Kim Kulling +Date: Tue, 16 Jan 2018 16:31:15 +0100 +Subject: STLLoader: closes https://github.com/assimp/assimp/issues/1660: use + memcpy instead of a c-style dynamic cast to parse a aiVector3D + +--- + code/STLLoader.cpp | 20 +++++++++++--------- + 1 file changed, 11 insertions(+), 9 deletions(-) + +diff --git a/code/STLLoader.cpp b/code/STLLoader.cpp +index be4c758..71c9608 100644 +--- a/code/STLLoader.cpp ++++ b/code/STLLoader.cpp +@@ -444,27 +444,29 @@ bool STLImporter::LoadBinaryFile() + + pMesh->mNumVertices = pMesh->mNumFaces*3; + +- aiVector3D* vp,*vn; +- vp = pMesh->mVertices = new aiVector3D[pMesh->mNumVertices]; +- vn = pMesh->mNormals = new aiVector3D[pMesh->mNumVertices]; +- +- for (unsigned int i = 0; i < pMesh->mNumFaces;++i) { ++ ++ aiVector3D *vp = pMesh->mVertices = new aiVector3D[pMesh->mNumVertices]; ++ aiVector3D *vn = pMesh->mNormals = new aiVector3D[pMesh->mNumVertices]; + ++ for ( unsigned int i = 0; i < pMesh->mNumFaces; ++i ) { + // NOTE: Blender sometimes writes empty normals ... this is not + // our fault ... the RemoveInvalidData helper step should fix that +- *vn = *((aiVector3D*)sz); ++ ::memcpy( vn, sz, sizeof( aiVector3D ) ); + sz += sizeof(aiVector3D); + *(vn+1) = *vn; + *(vn+2) = *vn; + vn += 3; + +- *vp++ = *((aiVector3D*)sz); ++ ::memcpy( vp, sz, sizeof( aiVector3D ) ); ++ ++vp; + sz += sizeof(aiVector3D); + +- *vp++ = *((aiVector3D*)sz); ++ ::memcpy( vp, sz, sizeof( aiVector3D ) ); ++ ++vp; + sz += sizeof(aiVector3D); + +- *vp++ = *((aiVector3D*)sz); ++ ::memcpy( vp, sz, sizeof( aiVector3D ) ); ++ ++vp; + sz += sizeof(aiVector3D); + + uint16_t color = *((uint16_t*)sz); diff -Nru assimp-4.1.0~dfsg/debian/patches/doxygen.patch assimp-4.1.0~dfsg/debian/patches/doxygen.patch --- assimp-4.1.0~dfsg/debian/patches/doxygen.patch 2018-04-22 12:45:39.000000000 +0000 +++ assimp-4.1.0~dfsg/debian/patches/doxygen.patch 2018-10-23 19:55:26.000000000 +0000 @@ -1,10 +1,20 @@ -Author: IOhannes m zmölnig -Description: removed calls to HHC (only available on w32) - and install into tmp-directories (make 'clean' target easier) +From: =?utf-8?q?=22IOhannes_m_zm=C3=B6lnig_=28Debian/GNU=29=22?= + +Date: Tue, 23 Oct 2018 21:49:33 +0200 +Subject: removed calls to HHC (only available on w32) + +and install into tmp-directories (make 'clean' target easier) Last-Updated: 2015-07-25 ---- assimp.orig/doc/Doxyfile.in -+++ assimp/doc/Doxyfile.in -@@ -1066,7 +1066,6 @@ +--- + doc/Doxyfile.in | 1 - + doc/Doxyfile_Cmd | 3 +-- + 2 files changed, 1 insertion(+), 3 deletions(-) + +diff --git a/doc/Doxyfile.in b/doc/Doxyfile.in +index ffe39f9..7ae8d0d 100644 +--- a/doc/Doxyfile.in ++++ b/doc/Doxyfile.in +@@ -1066,7 +1066,6 @@ CHM_FILE = AssimpDoc.chm # the HTML help compiler (hhc.exe). If non-empty doxygen will try to run # the HTML help compiler on the generated index.hhp. @@ -12,9 +22,11 @@ # If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag # controls if a separate .chi index file is generated (YES) or that ---- assimp.orig/doc/Doxyfile_Cmd -+++ assimp/doc/Doxyfile_Cmd -@@ -58,7 +58,7 @@ +diff --git a/doc/Doxyfile_Cmd b/doc/Doxyfile_Cmd +index f0a56e7..f440aa1 100644 +--- a/doc/Doxyfile_Cmd ++++ b/doc/Doxyfile_Cmd +@@ -58,7 +58,7 @@ PROJECT_LOGO = # entered, it will be relative to the location where doxygen was started. If # left blank the current directory will be used. @@ -23,7 +35,7 @@ # If the CREATE_SUBDIRS tag is set to YES, then doxygen will create 4096 sub- # directories (in 2 levels) under the output directory of each output format and -@@ -1281,7 +1281,6 @@ +@@ -1281,7 +1281,6 @@ CHM_FILE = AssimpCmdDoc.chm # The file has to be specified with full path. # This tag requires that the tag GENERATE_HTMLHELP is set to YES. diff -Nru assimp-4.1.0~dfsg/debian/patches/drop-stripped-sources.patch assimp-4.1.0~dfsg/debian/patches/drop-stripped-sources.patch --- assimp-4.1.0~dfsg/debian/patches/drop-stripped-sources.patch 2018-04-22 12:45:39.000000000 +0000 +++ assimp-4.1.0~dfsg/debian/patches/drop-stripped-sources.patch 2018-10-23 19:55:26.000000000 +0000 @@ -1,23 +1,50 @@ -Description: exclude stripped sources from build - since we stripped out the entire tests/ directory, we must not include it in - the build -Author: IOhannes m zmölnig +From: =?utf-8?q?=22IOhannes_m_zm=C3=B6lnig_=28Debian/GNU=29=22?= + +Date: Tue, 23 Oct 2018 21:49:33 +0200 +Subject: exclude stripped sources from build + +since we stripped out the entire tests/ directory, we must not include it in +the build Forwarded: not-needed (Debian specific) --- -This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ ---- assimp.orig/tools/assimp_cmd/CMakeLists.txt -+++ assimp/tools/assimp_cmd/CMakeLists.txt -@@ -46,7 +46,6 @@ - LINK_DIRECTORIES( ${Assimp_BINARY_DIR} ${Assimp_BINARY_DIR}/lib ) + code/D3MFImporter.cpp | 2 +- + code/D3MFOpcPackage.cpp | 2 +- + code/IFCLoader.cpp | 2 +- + code/Q3BSPZipArchive.h | 2 +- + tools/assimp_cmd/CMakeLists.txt | 1 - + 5 files changed, 4 insertions(+), 5 deletions(-) + +diff --git a/code/D3MFImporter.cpp b/code/D3MFImporter.cpp +index 372416d..e683966 100644 +--- a/code/D3MFImporter.cpp ++++ b/code/D3MFImporter.cpp +@@ -57,7 +57,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + #include - ADD_EXECUTABLE( assimp_cmd -- assimp_cmd.rc - CompareDump.cpp - ImageExtractor.cpp - Main.cpp ---- assimp.orig/code/IFCLoader.cpp -+++ assimp/code/IFCLoader.cpp -@@ -51,7 +51,7 @@ + #include "D3MFOpcPackage.h" +-#include ++#include + #include "irrXMLWrapper.h" + #include "3MFXmlTags.h" + +diff --git a/code/D3MFOpcPackage.cpp b/code/D3MFOpcPackage.cpp +index 49143fe..0ae53ff 100644 +--- a/code/D3MFOpcPackage.cpp ++++ b/code/D3MFOpcPackage.cpp +@@ -55,7 +55,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + #include + #include + #include +-#include ++#include + #include "3MFXmlTags.h" + + namespace Assimp { +diff --git a/code/IFCLoader.cpp b/code/IFCLoader.cpp +index 85382d4..f82ee8d 100644 +--- a/code/IFCLoader.cpp ++++ b/code/IFCLoader.cpp +@@ -51,7 +51,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include #ifndef ASSIMP_BUILD_NO_COMPRESSED_IFC @@ -26,9 +53,11 @@ #endif #include "IFCLoader.h" ---- assimp.orig/code/Q3BSPZipArchive.h -+++ assimp/code/Q3BSPZipArchive.h -@@ -41,7 +41,7 @@ +diff --git a/code/Q3BSPZipArchive.h b/code/Q3BSPZipArchive.h +index 5430bac..9e62c75 100644 +--- a/code/Q3BSPZipArchive.h ++++ b/code/Q3BSPZipArchive.h +@@ -41,7 +41,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef AI_Q3BSP_ZIPARCHIVE_H_INC #define AI_Q3BSP_ZIPARCHIVE_H_INC @@ -37,25 +66,15 @@ #include #include #include ---- assimp.orig/code/D3MFImporter.cpp -+++ assimp/code/D3MFImporter.cpp -@@ -57,7 +57,7 @@ - #include - - #include "D3MFOpcPackage.h" --#include -+#include - #include "irrXMLWrapper.h" - #include "3MFXmlTags.h" - ---- assimp.orig/code/D3MFOpcPackage.cpp -+++ assimp/code/D3MFOpcPackage.cpp -@@ -55,7 +55,7 @@ - #include - #include - #include --#include -+#include - #include "3MFXmlTags.h" +diff --git a/tools/assimp_cmd/CMakeLists.txt b/tools/assimp_cmd/CMakeLists.txt +index cb78942..3872aa6 100644 +--- a/tools/assimp_cmd/CMakeLists.txt ++++ b/tools/assimp_cmd/CMakeLists.txt +@@ -46,7 +46,6 @@ INCLUDE_DIRECTORIES( + LINK_DIRECTORIES( ${Assimp_BINARY_DIR} ${Assimp_BINARY_DIR}/lib ) - namespace Assimp { + ADD_EXECUTABLE( assimp_cmd +- assimp_cmd.rc + CompareDump.cpp + ImageExtractor.cpp + Main.cpp diff -Nru assimp-4.1.0~dfsg/debian/patches/fix-hurd-FTBFS.patch assimp-4.1.0~dfsg/debian/patches/fix-hurd-FTBFS.patch --- assimp-4.1.0~dfsg/debian/patches/fix-hurd-FTBFS.patch 2018-04-22 12:45:39.000000000 +0000 +++ assimp-4.1.0~dfsg/debian/patches/fix-hurd-FTBFS.patch 2018-10-23 19:55:26.000000000 +0000 @@ -1,11 +1,18 @@ -Description: fix FTBFS on the Hurd (non-Apple mach) -Author: IOhannes m zmölnig +From: =?utf-8?q?=22IOhannes_m_zm=C3=B6lnig_=28Debian/GNU=29=22?= + +Date: Tue, 23 Oct 2018 21:49:33 +0200 +Subject: fix FTBFS on the Hurd (non-Apple mach) + Last-Update: 2017-12-14 --- -This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ ---- assimp.orig/contrib/Open3DGC/o3dgcTimer.h -+++ assimp/contrib/Open3DGC/o3dgcTimer.h -@@ -30,7 +30,7 @@ + contrib/Open3DGC/o3dgcTimer.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/contrib/Open3DGC/o3dgcTimer.h b/contrib/Open3DGC/o3dgcTimer.h +index 00fe5b6..d9a2859 100644 +--- a/contrib/Open3DGC/o3dgcTimer.h ++++ b/contrib/Open3DGC/o3dgcTimer.h +@@ -30,7 +30,7 @@ THE SOFTWARE. /* Thank you, Microsoft, for file WinDef.h with min/max redefinition. */ #define NOMINMAX #include @@ -14,7 +21,7 @@ #include #include #else -@@ -73,7 +73,7 @@ +@@ -73,7 +73,7 @@ namespace o3dgc LARGE_INTEGER m_freq; }; diff -Nru assimp-4.1.0~dfsg/debian/patches/pyassimp.patch assimp-4.1.0~dfsg/debian/patches/pyassimp.patch --- assimp-4.1.0~dfsg/debian/patches/pyassimp.patch 2018-04-22 12:45:39.000000000 +0000 +++ assimp-4.1.0~dfsg/debian/patches/pyassimp.patch 2018-10-23 19:55:26.000000000 +0000 @@ -1,14 +1,24 @@ -Author: IOhannes m zmölnig -Description: simple dylib loading by using ctypes functionality - simplified original (complicated and somewhat broken) dylib loading - functionality with code suggested by Jakub Wilk. - This has not been forwarded (yet) to upstream, as the fix will not - work on platforms such as w32 +From: =?utf-8?q?=22IOhannes_m_zm=C3=B6lnig_=28Debian/GNU=29=22?= + +Date: Tue, 23 Oct 2018 21:49:33 +0200 +Subject: simple dylib loading by using ctypes functionality + +simplified original (complicated and somewhat broken) dylib loading +functionality with code suggested by Jakub Wilk. +This has not been forwarded (yet) to upstream, as the fix will not +work on platforms such as w32 Forwarded: no Last-Updated: 2015-08-10 ---- assimp.orig/port/PyAssimp/pyassimp/helper.py -+++ assimp/port/PyAssimp/pyassimp/helper.py -@@ -7,7 +7,7 @@ +--- + port/PyAssimp/pyassimp/helper.py | 126 +++++---------------------------------- + port/PyAssimp/setup.py | 2 - + 2 files changed, 14 insertions(+), 114 deletions(-) + +diff --git a/port/PyAssimp/pyassimp/helper.py b/port/PyAssimp/pyassimp/helper.py +index 85bb53a..031ec54 100644 +--- a/port/PyAssimp/pyassimp/helper.py ++++ b/port/PyAssimp/pyassimp/helper.py +@@ -7,7 +7,7 @@ Some fancy helper functions. import os import ctypes from ctypes import POINTER @@ -17,7 +27,7 @@ from distutils.sysconfig import get_python_lib import re -@@ -20,42 +20,6 @@ +@@ -20,42 +20,6 @@ import logging;logger = logging.getLogger("pyassimp") from .errors import AssimpError @@ -60,7 +70,7 @@ def vec2tuple(x): """ Converts a VECTOR3D to a Tuple """ return (x.x, x.y, x.z) -@@ -161,43 +125,6 @@ +@@ -161,43 +125,6 @@ def get_bounding_box_for_node(node, bb_min, bb_max, transformation): return bb_min, bb_max @@ -104,7 +114,7 @@ def search_library(): ''' Loads the assimp library. -@@ -209,8 +136,6 @@ +@@ -209,8 +136,6 @@ def search_library(): release function, dll) ''' @@ -113,7 +123,7 @@ # silence 'DLL not found' message boxes on win try: -@@ -218,46 +143,23 @@ +@@ -218,46 +143,23 @@ def search_library(): except AttributeError: pass @@ -173,9 +183,11 @@ def hasattr_silent(object, name): """ ---- assimp.orig/port/PyAssimp/setup.py -+++ assimp/port/PyAssimp/setup.py -@@ -9,8 +9,6 @@ +diff --git a/port/PyAssimp/setup.py b/port/PyAssimp/setup.py +index 26cf9b4..b71a1bf 100644 +--- a/port/PyAssimp/setup.py ++++ b/port/PyAssimp/setup.py +@@ -9,8 +9,6 @@ setup(name='pyassimp', url='https://github.com/assimp/assimp', packages=['pyassimp'], data_files=[ diff -Nru assimp-4.1.0~dfsg/debian/patches/series assimp-4.1.0~dfsg/debian/patches/series --- assimp-4.1.0~dfsg/debian/patches/series 2018-04-22 12:45:39.000000000 +0000 +++ assimp-4.1.0~dfsg/debian/patches/series 2018-10-23 19:55:26.000000000 +0000 @@ -2,3 +2,4 @@ drop-stripped-sources.patch pyassimp.patch fix-hurd-FTBFS.patch +0005-STLLoader-closes-https-github.com-assimp-assimp-issu.patch