From ccdf88e5ac7db3f2d15fba5ff5ae9c66faa76fc2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joonas=20Saraj=C3=A4rvi?= Date: Tue, 2 Jul 2013 11:19:47 +0300 Subject: [PATCH] Update to glm-0.9.4.4 --- .gitignore | 1 + glm-0.9.4.2-negative-multiple.patch | 48 ----------------------------- glm.spec | 16 ++++++---- sources | 2 +- 4 files changed, 12 insertions(+), 55 deletions(-) delete mode 100644 glm-0.9.4.2-negative-multiple.patch diff --git a/.gitignore b/.gitignore index 7d9d80d..48ab958 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /glm-0.9.3.4.zip /glm-0.9.4.2.zip /glm-0.9.4.3.zip +/glm-0.9.4.4.zip diff --git a/glm-0.9.4.2-negative-multiple.patch b/glm-0.9.4.2-negative-multiple.patch deleted file mode 100644 index fa899ac..0000000 --- a/glm-0.9.4.2-negative-multiple.patch +++ /dev/null @@ -1,48 +0,0 @@ -diff -ru glm-0.9.4.2.orig/test/gtx/gtx_multiple.cpp glm-0.9.4.2/test/gtx/gtx_multiple.cpp ---- glm-0.9.4.2.orig/test/gtx/gtx_multiple.cpp 2012-12-22 14:39:48.000000000 +0200 -+++ glm-0.9.4.2/test/gtx/gtx_multiple.cpp 2013-03-07 23:53:19.101880834 +0200 -@@ -14,12 +14,17 @@ - { - int Error(0); - -- int Higher0 = glm::higherMultiple(-5, 4); -- Error += Higher0 == -4 ? 0 : 1; -- Error += glm::higherMultiple(-4, 4) == -4 ? 0 : 1; -- Error += glm::higherMultiple(-3, 4) == -4 ? 0 : 1; -- Error += glm::higherMultiple(-2, 4) == -4 ? 0 : 1; -- Error += glm::higherMultiple(-1, 4) == -4 ? 0 : 1; -+ // Upstream claims that negative input is not supported. -+ // Thus we do not test for it, to avoid test failure. -+ // -+ // See https://github.com/g-truc/glm/issues/51 -+ // int Higher0 = glm::higherMultiple(-5, 4); -+ // Error += Higher0 == -4 ? 0 : 1; -+ // Error += glm::higherMultiple(-4, 4) == -4 ? 0 : 1; -+ // Error += glm::higherMultiple(-3, 4) == -4 ? 0 : 1; -+ // Error += glm::higherMultiple(-2, 4) == -4 ? 0 : 1; -+ // Error += glm::higherMultiple(-1, 4) == -4 ? 0 : 1; -+ - Error += glm::higherMultiple(0, 4) == 0 ? 0 : 1; - Error += glm::higherMultiple(4, 4) == 4 ? 0 : 1; - Error += glm::higherMultiple(5, 4) == 8 ? 0 : 1; -@@ -35,11 +40,15 @@ - { - int Error(0); - -- Error += glm::lowerMultiple(-5, 4) == -4 ? 0 : 1; -- Error += glm::lowerMultiple(-4, 4) == -4 ? 0 : 1; -- Error += glm::lowerMultiple(-3, 4) == 0 ? 0 : 1; -- Error += glm::lowerMultiple(-2, 4) == 0 ? 0 : 1; -- Error += glm::lowerMultiple(-1, 4) == 0 ? 0 : 1; -+ // Upstream claims that negative input is not supported. -+ // Thus we do not test for it, to avoid test failure. -+ // -+ // See https://github.com/g-truc/glm/issues/51 -+ // Error += glm::lowerMultiple(-5, 4) == -4 ? 0 : 1; -+ // Error += glm::lowerMultiple(-4, 4) == -4 ? 0 : 1; -+ // Error += glm::lowerMultiple(-3, 4) == 0 ? 0 : 1; -+ // Error += glm::lowerMultiple(-2, 4) == 0 ? 0 : 1; -+ // Error += glm::lowerMultiple(-1, 4) == 0 ? 0 : 1; - Error += glm::lowerMultiple(0, 4) == 0 ? 0 : 1; - Error += glm::lowerMultiple(4, 4) == 4 ? 0 : 1; - Error += glm::lowerMultiple(5, 4) == 4 ? 0 : 1; diff --git a/glm.spec b/glm.spec index 9420951..475919b 100644 --- a/glm.spec +++ b/glm.spec @@ -2,15 +2,14 @@ %global debug_package %{nil} Name: glm -Version: 0.9.4.3 +Version: 0.9.4.4 Release: 1%{?dist} Summary: C++ mathematics library for graphics programming License: MIT URL: http://glm.g-truc.net/ Source0: http://downloads.sourceforge.net/ogl-math/%{name}-%{version}/%{name}-%{version}.zip -Patch0: glm-0.9.4.2-negative-multiple.patch -Patch1: glm-0.9.3.4-secondary.patch +Patch0: glm-0.9.3.4-secondary.patch BuildRequires: cmake %description @@ -62,12 +61,13 @@ a programming manual for the %{name}-devel package. # forgetting to convert line endings in some files. sed -i 's/\r//' copying.txt sed -i 's/\r//' readme.txt -sed -i 's/\r//' doc/api/tabs.css sed -i 's/\r//' doc/api/doxygen.css +sed -i 's/\r//' doc/api/dynsections.js +sed -i 's/\r//' doc/api/jquery.js +sed -i 's/\r//' doc/api/tabs.css -%patch0 -p1 %ifnarch %{ix86} x86_64 -%patch1 -p1 -b .secondary +%patch0 -p1 -b .secondary %endif %build @@ -97,6 +97,10 @@ find $RPM_BUILD_ROOT -name CMakeLists.txt -exec rm -f {} ';' %doc doc/api/ %changelog +* Sat Jul 06 2013 Joonas Sarajärvi - 0.9.4.4-1 +- Update to upstream GLM version 0.9.4.4 +- Bug fixes + * Mon Apr 15 2013 Joonas Sarajärvi - 0.9.4.3-1 - Update to upstream GLM version 0.9.4.3 - This version introduces just minor bug fixes diff --git a/sources b/sources index 0ebc0fa..6eaaad6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b32dc6ba8807c112d9a8ff80cf753f98 glm-0.9.4.3.zip +3118904f39befdb7063168316b6a33f1 glm-0.9.4.4.zip