diff --git a/.gitignore b/.gitignore index ed1fbec..f17facd 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ /glm-0.9.6.3.zip /glm-0.9.7.0.zip /glm-0.9.7.2.zip +/glm-0.9.7.3.zip diff --git a/glm-0.9.7.2-setup-detect-GCC-6.0.patch b/glm-0.9.7.2-setup-detect-GCC-6.0.patch deleted file mode 100644 index 7b448be..0000000 --- a/glm-0.9.7.2-setup-detect-GCC-6.0.patch +++ /dev/null @@ -1,48 +0,0 @@ -From f0acbbd4aca300a5e7942977fe0ace996d849b89 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Joonas=20Saraj=C3=A4rvi?= -Date: Thu, 4 Feb 2016 19:42:25 +0200 -Subject: [PATCH] setup: detect GCC 6.0 - ---- - glm/detail/setup.hpp | 3 +++ - test/core/core_setup_message.cpp | 3 +++ - 2 files changed, 6 insertions(+) - -diff --git a/glm/detail/setup.hpp b/glm/detail/setup.hpp -index e455a43..f3c8609 100644 ---- a/glm/detail/setup.hpp -+++ b/glm/detail/setup.hpp -@@ -151,6 +151,7 @@ - #define GLM_COMPILER_GCC51 0x02000300 - #define GLM_COMPILER_GCC52 0x02000400 - #define GLM_COMPILER_GCC53 0x02000500 -+#define GLM_COMPILER_GCC60 0x02000600 - - // CUDA - #define GLM_COMPILER_CUDA 0x10000000 -@@ -312,6 +313,8 @@ - # define GLM_COMPILER (GLM_COMPILER_GCC52) - # elif (__GNUC__ == 5) && (__GNUC_MINOR__ >= 3) - # define GLM_COMPILER (GLM_COMPILER_GCC53) -+# elif (__GNUC__ == 6) && (__GNUC_MINOR__ >= 0) -+# define GLM_COMPILER (GLM_COMPILER_GCC60) - # else - # define GLM_COMPILER (GLM_COMPILER_GCC) - # endif -diff --git a/test/core/core_setup_message.cpp b/test/core/core_setup_message.cpp -index 6c9a376..3808dec 100644 ---- a/test/core/core_setup_message.cpp -+++ b/test/core/core_setup_message.cpp -@@ -71,6 +71,9 @@ int test_compiler() - case GLM_COMPILER_GCC53: - std::printf("GLM_COMPILER_GCC53\n"); - break; -+ case GLM_COMPILER_GCC60: -+ std::printf("GLM_COMPILER_GCC60\n"); -+ break; - default: - std::printf("GCC version not detected\n"); - Error += 1; --- -2.7.0 - diff --git a/glm.spec b/glm.spec index b7117b6..8fab48c 100644 --- a/glm.spec +++ b/glm.spec @@ -2,15 +2,14 @@ %global debug_package %{nil} Name: glm -Version: 0.9.7.2 -Release: 3%{?dist} +Version: 0.9.7.3 +Release: 1%{?dist} Summary: C++ mathematics library for graphics programming License: MIT URL: http://glm.g-truc.net/ Source0: https://github.com/g-truc/glm/releases/download/%{version}/%{name}-%{version}.zip Patch0: glm-0.9.6.1-ulp.patch -Patch1: glm-0.9.7.2-setup-detect-GCC-6.0.patch BuildRequires: cmake @@ -84,7 +83,6 @@ sed -i 's/\r//' test/core/core_setup_message.cpp %patch0 -p1 -b .ulp -%patch1 -p1 -b .setup-gcc6 %build mkdir build @@ -125,6 +123,9 @@ mv $RPM_BUILD_ROOT%{_libdir}/cmake $RPM_BUILD_ROOT%{_datadir}/cmake %doc doc/api/ %changelog +* Thu Mar 03 2016 Joonas Sarajärvi - 0.9.7.3-1 +- Update to upstream GLM version 0.9.7.3 + * Thu Feb 04 2016 Joonas Sarajärvi - 0.9.7.2-3 - Fix tests with GCC 6.0 diff --git a/sources b/sources index 2d2f80a..7ad0ee3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -29bdfde8cbd343a67e0ae5e1702d8a0e glm-0.9.7.2.zip +dafb5c5d718d19dce8051e4e9cce6daa glm-0.9.7.3.zip