summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTupone Alfredo <tupone@gentoo.org>2019-04-08 21:53:28 +0200
committerTupone Alfredo <tupone@gentoo.org>2019-04-08 21:53:28 +0200
commit7a4ffbffc1336d3036ce4339691ac533212d2bc4 (patch)
tree9c3f15617a92b64d1934525a2865f4cf7865bb62 /media-libs
parentx11-terms/alacritty: bump to 0.3.0 (diff)
downloadgentoo-7a4ffbffc1336d3036ce4339691ac533212d2bc4.tar.gz
gentoo-7a4ffbffc1336d3036ce4339691ac533212d2bc4.tar.bz2
gentoo-7a4ffbffc1336d3036ce4339691ac533212d2bc4.zip
media-libs/glm: remove unused patch
Closes: https://github.com/gentoo/gentoo/pull/11625 Signed-off-by: Alfredo Tupone <tupone@gentoo.org> Package-Manager: Portage-2.3.62, Repoman-2.3.11
Diffstat (limited to 'media-libs')
-rw-r--r--media-libs/glm/files/glm-0.9.8.5-gcc7_tests.patch70
-rw-r--r--media-libs/glm/files/glm-gcc73.patch35
2 files changed, 0 insertions, 105 deletions
diff --git a/media-libs/glm/files/glm-0.9.8.5-gcc7_tests.patch b/media-libs/glm/files/glm-0.9.8.5-gcc7_tests.patch
deleted file mode 100644
index d7744aed555..00000000000
--- a/media-libs/glm/files/glm-0.9.8.5-gcc7_tests.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-Bug: https://bugs.gentoo.org/638312
-Upstream commit: https://github.com/g-truc/glm/commit/e37cf6e47fa4305c82845103b17af58f6cfe23db
-
-From e37cf6e47fa4305c82845103b17af58f6cfe23db Mon Sep 17 00:00:00 2001
-From: Christophe Riccio <christophe.riccio@unity3d.com>
-Date: Thu, 17 Aug 2017 00:08:37 +0200
-Subject: [PATCH] Fixed GCC 7.1.0 failing tests #666
-
----
- test/core/core_type_mat2x4.cpp | 4 +++-
- test/core/core_type_mat3x4.cpp | 4 +++-
- test/core/core_type_mat4x4.cpp | 3 ++-
- 3 files changed, 8 insertions(+), 3 deletions(-)
-
-diff --git a/test/core/core_type_mat2x4.cpp b/test/core/core_type_mat2x4.cpp
-index 17afebf91..eea3e46f4 100644
---- 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 @@ namespace cast
- 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;
- }
-diff --git a/test/core/core_type_mat3x4.cpp b/test/core/core_type_mat3x4.cpp
-index e3b78d31b..74a45d87a 100644
---- 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 @@ namespace cast
- 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;
- }
-diff --git a/test/core/core_type_mat4x4.cpp b/test/core/core_type_mat4x4.cpp
-index 3966c2b7f..fd2aca8b4 100644
---- 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 @@ namespace cast
- 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 --git a/media-libs/glm/files/glm-gcc73.patch b/media-libs/glm/files/glm-gcc73.patch
deleted file mode 100644
index 68033b5b6f6..00000000000
--- a/media-libs/glm/files/glm-gcc73.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-diff -ur glm-0.9.8.5.orig/glm/simd/platform.h glm-0.9.8.5/glm/simd/platform.h
---- glm-0.9.8.5.orig/glm/simd/platform.h 2017-08-16 05:15:24.000000000 -0700
-+++ glm-0.9.8.5/glm/simd/platform.h 2018-01-26 15:38:57.584130263 -0800
-@@ -111,7 +111,8 @@
- #define GLM_COMPILER_GCC70 0x02000A00
- #define GLM_COMPILER_GCC71 0x02000B00
- #define GLM_COMPILER_GCC72 0x02000C00
--#define GLM_COMPILER_GCC80 0x02000D00
-+#define GLM_COMPILER_GCC73 0x02000D00
-+#define GLM_COMPILER_GCC80 0x02000E00
-
- // CUDA
- #define GLM_COMPILER_CUDA 0x10000000
-@@ -283,6 +284,8 @@
- # define GLM_COMPILER (GLM_COMPILER_GCC71)
- # elif (__GNUC__ == 7) && (__GNUC_MINOR__ == 2)
- # define GLM_COMPILER (GLM_COMPILER_GCC72)
-+# elif (__GNUC__ == 7) && (__GNUC_MINOR__ == 3)
-+# define GLM_COMPILER (GLM_COMPILER_GCC73)
- # elif (__GNUC__ >= 8)
- # define GLM_COMPILER (GLM_COMPILER_GCC80)
- # else
-diff -ur glm-0.9.8.5.orig/test/core/core_setup_message.cpp glm-0.9.8.5/test/core/core_setup_message.cpp
---- glm-0.9.8.5.orig/test/core/core_setup_message.cpp 2017-08-16 05:15:24.000000000 -0700
-+++ glm-0.9.8.5/test/core/core_setup_message.cpp 2018-01-26 15:37:56.953298475 -0800
-@@ -86,6 +86,9 @@
- case GLM_COMPILER_GCC72:
- std::printf("GCC 7.2\n");
- break;
-+ case GLM_COMPILER_GCC73:
-+ std::printf("GCC 7.3\n");
-+ break;
- case GLM_COMPILER_GCC80:
- std::printf("GCC 8.0\n");
- break;