Control: tags 870217 + patch
Control: tags 870217 + pending
Dear maintainer,
I've prepared an NMU for glm (versioned as 0.9.8.4-1.1) and
uploaded it to DELAYED/2. Please feel free to tell me if I
should delay it longer.
Regards.
diff -Nru glm-0.9.8.4/debian/changelog glm-0.9.8.4/debian/changelog
--- glm-0.9.8.4/debian/changelog 2017-06-24 17:27:12.000000000 +0200
+++ glm-0.9.8.4/debian/changelog 2017-10-22 15:21:32.000000000 +0200
@@ -1,3 +1,14 @@
+glm (0.9.8.4-1.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Cherrypick patch from upstream for FTBFS for GCC-7 (Closes: #870217)
+ * Replace priority extra with optional. Fixes linitian:
+ priority-extra-is-replaced-by-priority-optional
+ * Remove Testsuite: autopkgtest from d/control as it is no longer
+ needed. Fixes lintian unnecessary-testsuite-autopkgtest-header
+
+ -- Tobias Frost <t...@debian.org> Sun, 22 Oct 2017 15:21:32 +0200
+
glm (0.9.8.4-1) unstable; urgency=medium
* New upstream release.
diff -Nru glm-0.9.8.4/debian/control glm-0.9.8.4/debian/control
--- glm-0.9.8.4/debian/control 2017-06-24 17:08:14.000000000 +0200
+++ glm-0.9.8.4/debian/control 2017-10-22 15:19:20.000000000 +0200
@@ -3,7 +3,7 @@
Uploaders: Guus Sliepen <g...@debian.org>
Section: libs
Testsuite: autopkgtest
-Priority: extra
+Priority: optional
Build-Depends: debhelper (>= 10),
cmake
Standards-Version: 4.0.0
diff -Nru glm-0.9.8.4/debian/patches/870217.patch glm-0.9.8.4/debian/patches/870217.patch
--- glm-0.9.8.4/debian/patches/870217.patch 1970-01-01 01:00:00.000000000 +0100
+++ glm-0.9.8.4/debian/patches/870217.patch 2017-10-22 15:10:34.000000000 +0200
@@ -0,0 +1,54 @@
+Description: Patch fixing the FTBFS with gcc-7: Test failures
+Author: Christophe Riccio <christophe.ric...@unity3d.com>
+Origin: https://github.com/g-truc/glm/commit/e37cf6e47fa4305c82845103b17af58f6cfe23db.patch
+
+--- a/test/core/core_type_mat2x4.cpp
++++ b/test/core/core_type_mat2x4.cpp
+@@ -1,3 +1,5 @@
++#include <glm/gtc/epsilon.hpp>
++#include <glm/gtc/constants.hpp>
+ #include <glm/vector_relational.hpp>
+ #include <glm/mat2x2.hpp>
+ #include <glm/mat2x3.hpp>
+@@ -83,7 +85,7 @@
+ glm::mat2x4 Identity(1.0f);
+
+ for(glm::length_t i = 0, length = B.length(); i < length; ++i)
+- Error += glm::all(glm::equal(B[i], Identity[i])) ? 0 : 1;
++ Error += glm::all(glm::epsilonEqual(B[i], Identity[i], glm::epsilon<float>())) ? 0 : 1;
+
+ return Error;
+ }
+--- a/test/core/core_type_mat3x4.cpp
++++ b/test/core/core_type_mat3x4.cpp
+@@ -1,3 +1,5 @@
++#include <glm/gtc/epsilon.hpp>
++#include <glm/gtc/constants.hpp>
+ #include <glm/vector_relational.hpp>
+ #include <glm/mat2x2.hpp>
+ #include <glm/mat2x3.hpp>
+@@ -87,7 +89,7 @@
+ glm::mat3x4 Identity(1.0f);
+
+ for(glm::length_t i = 0, length = B.length(); i < length; ++i)
+- Error += glm::all(glm::equal(B[i], Identity[i])) ? 0 : 1;
++ Error += glm::all(glm::epsilonEqual(B[i], Identity[i], glm::epsilon<float>())) ? 0 : 1;
+
+ return Error;
+ }
+--- a/test/core/core_type_mat4x4.cpp
++++ b/test/core/core_type_mat4x4.cpp
+@@ -1,3 +1,4 @@
++#include <glm/gtc/constants.hpp>
+ #include <glm/gtc/epsilon.hpp>
+ #include <glm/matrix.hpp>
+ #include <glm/mat2x2.hpp>
+@@ -263,7 +264,7 @@
+ glm::mat4x4 Identity(1.0f);
+
+ for(glm::length_t i = 0, length = B.length(); i < length; ++i)
+- Error += glm::all(glm::equal(B[i], Identity[i])) ? 0 : 1;
++ Error += glm::all(glm::epsilonEqual(B[i], Identity[i], glm::epsilon<float>())) ? 0 : 1;
+
+ return Error;
+ }
diff -Nru glm-0.9.8.4/debian/patches/series glm-0.9.8.4/debian/patches/series
--- glm-0.9.8.4/debian/patches/series 2017-06-24 17:05:01.000000000 +0200
+++ glm-0.9.8.4/debian/patches/series 2017-10-22 15:07:26.000000000 +0200
@@ -1,2 +1,3 @@
Fix-CMake-package-version-file.patch
fix-infiloop
+870217.patch
--
debian-science-maintainers mailing list
debian-science-maintainers@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-science-maintainers
