Patch assimp-3.3.1

diff --git a/deal.II-toolchain/packages/assimp.package b/deal.II-toolchain/packages/assimp.package
index dcfb7a4c948c08e216009b8adced96aef1c6f705..acd343e1197f23e91ef993edcbe7af0c753dddf5 100644 (file)
--- a/deal.II-toolchain/packages/assimp.package
+++ b/deal.II-toolchain/packages/assimp.package
@@ -12,6 +12,14 @@ INSTALL_PATH=${INSTALL_PATH}/assimp-${VERSION}
 CONFOPTS="-D CMAKE_INSTALL_PREFIX=${INSTALL_PATH} \
  -D BUILD_SHARED_LIBS=ON"
 
+package_specific_patch () {
+    if [ "$VERSION" = "3.3.1" ]; then
+      cd ${UNPACK_PATH}/${EXTRACTSTO}
+      cecho ${WARN} "applying patch for assimp D3MFImporter problem"
+      patch -p0 --forward < ${ORIG_DIR}/${PROJECT}/patches/assimp-D3MFImporter.patch || true
+    fi
+}
+
 package_specific_register () {
     export ASSIMP_DIR=${INSTALL_PATH}
 }

diff --git a/deal.II-toolchain/patches/assimp-D3MFImporter.patch b/deal.II-toolchain/patches/assimp-D3MFImporter.patch
new file mode 100644 (file)
index 0000000..0c55a03
--- /dev/null
+++ b/deal.II-toolchain/patches/assimp-D3MFImporter.patch
@@ -0,0 +1,11 @@
+--- code/D3MFImporter.cpp      2018-05-13 23:05:48.421253063 +0200
++++ code/D3MFImporter.cpp      2018-05-13 23:03:57.314014344 +0200
+@@ -227,7 +227,7 @@
+         aiVector3D vertex;
+         vertex.x = ai_strtof(xmlReader->getAttributeValue(D3MF::XmlTag::x.c_str()), nullptr);
+         vertex.y = ai_strtof(xmlReader->getAttributeValue(D3MF::XmlTag::y.c_str()), nullptr);
+-        vertex.z = ai_strtof>(xmlReader->getAttributeValue(D3MF::XmlTag::z.c_str()), nullptr);
++        vertex.z = ai_strtof(xmlReader->getAttributeValue(D3MF::XmlTag::z.c_str()), nullptr);
+ 
+         return vertex;
+     }