| 1 |
commit: 1e45f7cd1dfa04ef4b89eb453df04b62ee432425 |
| 2 |
Author: Patrick McLean <chutzpah <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Jan 26 23:52:31 2018 +0000 |
| 4 |
Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Jan 26 23:52:52 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e45f7cd |
| 7 |
|
| 8 |
media-libs/glm: Add patch to support gcc-7.3 to 0.9.8.5 |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.20, Repoman-2.3.6 |
| 11 |
|
| 12 |
media-libs/glm/files/glm-gcc73.patch | 35 +++++++++++++++++++++++++++++++++++ |
| 13 |
media-libs/glm/glm-0.9.8.5.ebuild | 6 +++++- |
| 14 |
2 files changed, 40 insertions(+), 1 deletion(-) |
| 15 |
|
| 16 |
diff --git a/media-libs/glm/files/glm-gcc73.patch b/media-libs/glm/files/glm-gcc73.patch |
| 17 |
new file mode 100644 |
| 18 |
index 00000000000..68033b5b6f6 |
| 19 |
--- /dev/null |
| 20 |
+++ b/media-libs/glm/files/glm-gcc73.patch |
| 21 |
@@ -0,0 +1,35 @@ |
| 22 |
+diff -ur glm-0.9.8.5.orig/glm/simd/platform.h glm-0.9.8.5/glm/simd/platform.h |
| 23 |
+--- glm-0.9.8.5.orig/glm/simd/platform.h 2017-08-16 05:15:24.000000000 -0700 |
| 24 |
++++ glm-0.9.8.5/glm/simd/platform.h 2018-01-26 15:38:57.584130263 -0800 |
| 25 |
+@@ -111,7 +111,8 @@ |
| 26 |
+ #define GLM_COMPILER_GCC70 0x02000A00 |
| 27 |
+ #define GLM_COMPILER_GCC71 0x02000B00 |
| 28 |
+ #define GLM_COMPILER_GCC72 0x02000C00 |
| 29 |
+-#define GLM_COMPILER_GCC80 0x02000D00 |
| 30 |
++#define GLM_COMPILER_GCC73 0x02000D00 |
| 31 |
++#define GLM_COMPILER_GCC80 0x02000E00 |
| 32 |
+ |
| 33 |
+ // CUDA |
| 34 |
+ #define GLM_COMPILER_CUDA 0x10000000 |
| 35 |
+@@ -283,6 +284,8 @@ |
| 36 |
+ # define GLM_COMPILER (GLM_COMPILER_GCC71) |
| 37 |
+ # elif (__GNUC__ == 7) && (__GNUC_MINOR__ == 2) |
| 38 |
+ # define GLM_COMPILER (GLM_COMPILER_GCC72) |
| 39 |
++# elif (__GNUC__ == 7) && (__GNUC_MINOR__ == 3) |
| 40 |
++# define GLM_COMPILER (GLM_COMPILER_GCC73) |
| 41 |
+ # elif (__GNUC__ >= 8) |
| 42 |
+ # define GLM_COMPILER (GLM_COMPILER_GCC80) |
| 43 |
+ # else |
| 44 |
+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 |
| 45 |
+--- glm-0.9.8.5.orig/test/core/core_setup_message.cpp 2017-08-16 05:15:24.000000000 -0700 |
| 46 |
++++ glm-0.9.8.5/test/core/core_setup_message.cpp 2018-01-26 15:37:56.953298475 -0800 |
| 47 |
+@@ -86,6 +86,9 @@ |
| 48 |
+ case GLM_COMPILER_GCC72: |
| 49 |
+ std::printf("GCC 7.2\n"); |
| 50 |
+ break; |
| 51 |
++ case GLM_COMPILER_GCC73: |
| 52 |
++ std::printf("GCC 7.3\n"); |
| 53 |
++ break; |
| 54 |
+ case GLM_COMPILER_GCC80: |
| 55 |
+ std::printf("GCC 8.0\n"); |
| 56 |
+ break; |
| 57 |
|
| 58 |
diff --git a/media-libs/glm/glm-0.9.8.5.ebuild b/media-libs/glm/glm-0.9.8.5.ebuild |
| 59 |
index 548d897c684..073f3bee1e2 100644 |
| 60 |
--- a/media-libs/glm/glm-0.9.8.5.ebuild |
| 61 |
+++ b/media-libs/glm/glm-0.9.8.5.ebuild |
| 62 |
@@ -1,4 +1,4 @@ |
| 63 |
-# Copyright 1999-2017 Gentoo Foundation |
| 64 |
+# Copyright 1999-2018 Gentoo Foundation |
| 65 |
# Distributed under the terms of the GNU General Public License v2 |
| 66 |
|
| 67 |
EAPI=6 |
| 68 |
@@ -16,6 +16,10 @@ IUSE="test cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_avx cpu_flags_x86 |
| 69 |
|
| 70 |
RDEPEND="virtual/opengl" |
| 71 |
|
| 72 |
+PATCHES=( |
| 73 |
+ "${FILESDIR}/glm-gcc73.patch" |
| 74 |
+) |
| 75 |
+ |
| 76 |
src_configure() { |
| 77 |
if use test; then |
| 78 |
local mycmakeargs=( |
Archives