From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id BCEAE138334 for ; Mon, 8 Apr 2019 19:53:52 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B0A9BE088A; Mon, 8 Apr 2019 19:53:51 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 6D407E088A for ; Mon, 8 Apr 2019 19:53:51 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 636AF335D1B for ; Mon, 8 Apr 2019 19:53:49 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 69A9B549 for ; Mon, 8 Apr 2019 19:53:47 +0000 (UTC) From: "Alfredo Tupone" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Alfredo Tupone" Message-ID: <1554753208.7a4ffbffc1336d3036ce4339691ac533212d2bc4.tupone@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/glm/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/glm/files/glm-0.9.8.5-gcc7_tests.patch media-libs/glm/files/glm-gcc73.patch X-VCS-Directories: media-libs/glm/files/ X-VCS-Committer: tupone X-VCS-Committer-Name: Alfredo Tupone X-VCS-Revision: 7a4ffbffc1336d3036ce4339691ac533212d2bc4 X-VCS-Branch: master Date: Mon, 8 Apr 2019 19:53:47 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 9af71ca1-a182-49d5-8854-288b304b25eb X-Archives-Hash: 3306c86dc4429c63f1171a9f0a09005c commit: 7a4ffbffc1336d3036ce4339691ac533212d2bc4 Author: Tupone Alfredo gentoo org> AuthorDate: Mon Apr 8 19:53:28 2019 +0000 Commit: Alfredo Tupone gentoo org> CommitDate: Mon Apr 8 19:53:28 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a4ffbff media-libs/glm: remove unused patch Closes: https://github.com/gentoo/gentoo/pull/11625 Signed-off-by: Alfredo Tupone gentoo.org> Package-Manager: Portage-2.3.62, Repoman-2.3.11 media-libs/glm/files/glm-0.9.8.5-gcc7_tests.patch | 70 ----------------------- media-libs/glm/files/glm-gcc73.patch | 35 ------------ 2 files changed, 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 -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 -+#include - #include - #include - #include -@@ -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())) ? 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 -+#include - #include - #include - #include -@@ -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())) ? 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 - #include - #include - #include -@@ -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())) ? 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;