From 08bbac84819a0b6eeb1aa6f9d4257003efc82e5f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joonas=20Saraj=C3=A4rvi?= Date: Sun, 4 Feb 2018 06:31:28 +0200 Subject: [PATCH] glm-0.9.8.5 - New upstream release - The compiler list patch is rebased --- .gitignore | 1 + ...r-list.patch => glm-0.9.8.5-compiler-list.patch | 14 +++++++------- glm.spec | 9 ++++++--- sources | 2 +- 4 files changed, 15 insertions(+), 11 deletions(-) rename glm-compiler-list.patch => glm-0.9.8.5-compiler-list.patch (95%) diff --git a/.gitignore b/.gitignore index c0d7f2c..58b3440 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ /glm-0.9.8.2.zip /glm-0.9.8.3.zip /glm-0.9.8.4.zip +/glm-0.9.8.5.zip diff --git a/glm-compiler-list.patch b/glm-0.9.8.5-compiler-list.patch similarity index 95% rename from glm-compiler-list.patch rename to glm-0.9.8.5-compiler-list.patch index 5db3029..47d7ee2 100644 --- a/glm-compiler-list.patch +++ b/glm-0.9.8.5-compiler-list.patch @@ -1,6 +1,6 @@ -diff -ur -bB glm/glm/simd/platform.h glm-compiler-list/glm/simd/platform.h ---- glm/glm/simd/platform.h 2017-01-22 12:12:28.000000000 +0200 -+++ glm-compiler-list/glm/simd/platform.h 2018-01-27 02:38:37.250243391 +0200 +diff -ru glm/glm/simd/platform.h glm.compiler-list/glm/simd/platform.h +--- glm/glm/simd/platform.h 2018-02-04 06:40:56.358999859 +0200 ++++ glm.compiler-list/glm/simd/platform.h 2018-02-04 06:46:34.359917919 +0200 @@ -77,58 +77,37 @@ // Intel @@ -95,7 +95,7 @@ diff -ur -bB glm/glm/simd/platform.h glm-compiler-list/glm/simd/platform.h @@ -178,28 +153,18 @@ // Clang #elif defined(__clang__) - # if GLM_PLATFORM & GLM_PLATFORM_APPLE + # if defined(__apple_build_version__) -# if __clang_major__ == 5 && __clang_minor__ == 0 -# define GLM_COMPILER GLM_COMPILER_CLANG33 -# elif __clang_major__ == 5 && __clang_minor__ == 1 @@ -209,9 +209,9 @@ diff -ur -bB glm/glm/simd/platform.h glm-compiler-list/glm/simd/platform.h # endif #else -diff -ur -bB glm/test/core/core_setup_message.cpp glm-compiler-list/test/core/core_setup_message.cpp ---- glm/test/core/core_setup_message.cpp 2017-01-22 12:12:28.000000000 +0200 -+++ glm-compiler-list/test/core/core_setup_message.cpp 2018-01-27 02:38:37.250243391 +0200 +diff -ru glm/test/core/core_setup_message.cpp glm.compiler-list/test/core/core_setup_message.cpp +--- glm/test/core/core_setup_message.cpp 2018-02-04 06:40:56.359999845 +0200 ++++ glm.compiler-list/test/core/core_setup_message.cpp 2018-02-04 06:41:19.846652644 +0200 @@ -10,12 +10,6 @@ { switch(GLM_COMPILER) diff --git a/glm.spec b/glm.spec index 1db2a77..f24cc6b 100644 --- a/glm.spec +++ b/glm.spec @@ -2,8 +2,8 @@ %global debug_package %{nil} Name: glm -Version: 0.9.8.4 -Release: 5%{?dist} +Version: 0.9.8.5 +Release: 1%{?dist} Summary: C++ mathematics library for graphics programming License: MIT @@ -12,7 +12,7 @@ Source0: https://github.com/g-truc/glm/releases/download/%{version}/%{nam Patch0: glm-0.9.6.1-ulp.patch # https://github.com/g-truc/glm/commit/dd48b56e44d699a022c69155c8672caacafd9e8a -Patch1: glm-compiler-list.patch +Patch1: glm-0.9.8.5-compiler-list.patch BuildRequires: cmake @@ -132,6 +132,9 @@ rmdir $RPM_BUILD_ROOT%{_libdir} %doc doc/api/ %changelog +* Sun Feb 04 2018 Joonas Sarajärvi - 0.9.8.5-1 +- Update to upstream GLM version 0.9.8.5 + * Mon Jan 29 2018 Joonas Sarajärvi - 0.9.8.4-5 - Fix compatibility with GCC 7.3.1 #1539568 diff --git a/sources b/sources index 1cb53c1..3dbf2cc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (glm-0.9.8.4.zip) = c9a508b737106bbb3b815f92ad10c5805b4d5b09a278ae0183915cb1905ed2f1a5cbc6c86decb727e2973d37c8babe459dd683268b02f6876554a69b130b4e3a +SHA512 (glm-0.9.8.5.zip) = 8a0213c08722641f4ff419e7d704478f23f901f0332596bdb55282d7f7746258e227bfef5a6a3ee70c0db82f7f089dceeb5131d2ad0dc56d360453c71b46467f