[gentoo-commits] repo/gentoo:master commit in: media-libs/glm/, media-libs/glm/files/
commit: c74dcd154317d93fc07455b0f03bb442d592ca35 Author: Sam James gentoo org> AuthorDate: Fri Feb 5 21:57:16 2021 + Commit: Sam James gentoo org> CommitDate: Fri Feb 5 21:57:16 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c74dcd15 media-libs/glm: fix tests on big endian arches Closes: https://bugs.gentoo.org/673972 Package-Manager: Portage-3.0.14, Repoman-3.0.2 Signed-off-by: Sam James gentoo.org> .../glm/files/glm-0.9.9.8-big-endian-tests.patch | 186 + media-libs/glm/glm-0.9.9.8-r1.ebuild | 3 +- 2 files changed, 187 insertions(+), 2 deletions(-) diff --git a/media-libs/glm/files/glm-0.9.9.8-big-endian-tests.patch b/media-libs/glm/files/glm-0.9.9.8-big-endian-tests.patch new file mode 100644 index 000..cc8b1b637a8 --- /dev/null +++ b/media-libs/glm/files/glm-0.9.9.8-big-endian-tests.patch @@ -0,0 +1,186 @@ +https://github.com/g-truc/glm/commit/06ce42e72324b32b1f4c37c646e99950c2bd5f6b.patch +https://bugs.gentoo.org/673972 + +Not yet applied upstream because is not available on non-Linux platforms. + +From 06ce42e72324b32b1f4c37c646e99950c2bd5f6b Mon Sep 17 00:00:00 2001 +From: Max Rees +Date: Sun, 15 Mar 2020 15:13:27 -0400 +Subject: [PATCH] Fix test suite on big endian platforms + +--- + glm/gtc/packing.inl | 55 + test/gtc/gtc_packing.cpp | 3 ++- + 2 files changed, 57 insertions(+), 1 deletion(-) + +diff --git a/glm/gtc/packing.inl b/glm/gtc/packing.inl +index 8c906e16c..b1c99a507 100644 +--- a/glm/gtc/packing.inl b/glm/gtc/packing.inl +@@ -9,6 +9,9 @@ + #include "../detail/type_half.hpp" + #include + #include ++extern "C" { ++#include ++} + + namespace glm{ + namespace detail +@@ -183,9 +186,15 @@ namespace detail + { + struct + { ++#if BYTE_ORDER == LITTLE_ENDIAN + uint x : 3; + uint y : 3; + uint z : 2; ++#else ++ uint z : 2; ++ uint y : 3; ++ uint x : 3; ++#endif + } data; + uint8 pack; + }; +@@ -194,8 +203,13 @@ namespace detail + { + struct + { ++#if BYTE_ORDER == LITTLE_ENDIAN + uint x : 4; + uint y : 4; ++#else ++ uint y : 4; ++ uint x : 4; ++#endif + } data; + uint8 pack; + }; +@@ -204,10 +218,17 @@ namespace detail + { + struct + { ++#if BYTE_ORDER == LITTLE_ENDIAN + uint x : 4; + uint y : 4; + uint z : 4; + uint w : 4; ++#else ++ uint w : 4; ++ uint z : 4; ++ uint y : 4; ++ uint x : 4; ++#endif + } data; + uint16 pack; + }; +@@ -216,9 +237,15 @@ namespace detail + { + struct + { ++#if BYTE_ORDER == LITTLE_ENDIAN + uint x : 5; + uint y : 6; + uint z : 5; ++#else ++ uint z : 5; ++ uint y : 6; ++ uint x : 5; ++#endif + } data; + uint16 pack; + }; +@@ -227,10 +254,17 @@ namespace detail + { + struct + { ++#if BYTE_ORDER == LITTLE_ENDIAN + uint x : 5; + uint y : 5; + uint z : 5; + uint w : 1; ++#else ++ uint w : 1; ++ uint z : 5; ++ uint y : 5; ++ uint x : 5; ++#endif + } data; + uint16 pack; + }; +@@ -239,10 +273,17 @@ namespace detail + { + struct + { ++#if BYTE_ORDER == LITTLE_ENDIAN + uint x : 10; + uint y : 10; + uint z : 10; + uint w : 2; ++#else ++ uint w : 2; ++ uint z : 10; ++ uint y : 10; ++ uint x : 10; ++#endif + } data; + uint32 pack; + }; +@@ -251,10 +292,17 @@ namespace detail + { + struct + { ++#if BYTE_ORDER == LITTLE_ENDIAN + int x : 10; + int y : 10; + int z : 10; + int w : 2; ++#else ++ int w : 2; ++ int z : 10; ++ int y : 10; ++ int x : 10; ++#endif + } data; + uint32 pack; + }; +@@ -263,10 +311,17 @@ namespace detail + { +
[gentoo-commits] repo/gentoo:master commit in: media-libs/glm/, media-libs/glm/files/
commit: dc027e6f5fb7980a04d5ef54ddb38623fb1695fa Author: Alfredo Tupone gentoo org> AuthorDate: Tue Jul 7 06:51:10 2020 + Commit: Alfredo Tupone gentoo org> CommitDate: Tue Jul 7 06:51:10 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dc027e6f media-libs/glm: remove -Werror Closes: https://bugs.gentoo.org/730948 Package-Manager: Portage-2.3.99, Repoman-2.3.23 Signed-off-by: Alfredo Tupone gentoo.org> media-libs/glm/files/glm-0.9.9.8-clang.patch | 11 +++ media-libs/glm/glm-0.9.9.8.ebuild| 1 + 2 files changed, 12 insertions(+) diff --git a/media-libs/glm/files/glm-0.9.9.8-clang.patch b/media-libs/glm/files/glm-0.9.9.8-clang.patch new file mode 100644 index 000..af763d5b452 --- /dev/null +++ b/media-libs/glm/files/glm-0.9.9.8-clang.patch @@ -0,0 +1,11 @@ +--- a/test/CMakeLists.txt 2020-07-07 08:44:31.304955458 +0200 b/test/CMakeLists.txt 2020-07-07 08:44:38.962844309 +0200 +@@ -197,7 +197,7 @@ + message("GLM: Clang - ${CMAKE_CXX_COMPILER_ID} compiler") + endif() + +- add_compile_options(-Werror -Weverything) ++ add_compile_options(-Weverything) + add_compile_options(-Wno-c++98-compat -Wno-c++98-compat-pedantic -Wno-c++11-long-long -Wno-padded -Wno-gnu-anonymous-struct -Wno-nested-anon-types) + add_compile_options(-Wno-undefined-reinterpret-cast -Wno-sign-conversion -Wno-unused-variable -Wno-missing-prototypes -Wno-unreachable-code -Wno-missing-variable-declarations -Wno-sign-compare -Wno-global-constructors -Wno-unused-macros -Wno-format-nonliteral) + diff --git a/media-libs/glm/glm-0.9.9.8.ebuild b/media-libs/glm/glm-0.9.9.8.ebuild index dcd6a2c5911..6fd8711eea6 100644 --- a/media-libs/glm/glm-0.9.9.8.ebuild +++ b/media-libs/glm/glm-0.9.9.8.ebuild @@ -19,6 +19,7 @@ RDEPEND="" PATCHES=( "${FILESDIR}"/${PN}-0.9.9.6-simd.patch + "${FILESDIR}"/${P}-clang.patch ) src_prepare() {
[gentoo-commits] repo/gentoo:master commit in: media-libs/glm/, media-libs/glm/files/
commit: 19fd8f929f791c589312f4c54634bfdd6cb41d5f Author: Tupone Alfredo gentoo org> AuthorDate: Tue Sep 10 17:17:00 2019 + Commit: Alfredo Tupone gentoo org> CommitDate: Tue Sep 10 17:17:00 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=19fd8f92 media-libs/glm: respect EPREFIX Package-Manager: Portage-2.3.69, Repoman-2.3.16 Signed-off-by: Alfredo Tupone gentoo.org> media-libs/glm/files/{glm.pc => glm.pc.in} | 4 ++-- media-libs/glm/glm-0.9.9.6.ebuild | 10 +- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/media-libs/glm/files/glm.pc b/media-libs/glm/files/glm.pc.in similarity index 64% rename from media-libs/glm/files/glm.pc rename to media-libs/glm/files/glm.pc.in index e3bb5acc1af..fc5c7bb7f90 100644 --- a/media-libs/glm/files/glm.pc +++ b/media-libs/glm/files/glm.pc.in @@ -1,7 +1,7 @@ -prefix=/usr +prefix=@CMAKE_INSTALL_PREFIX@ includedir=${prefix}/include Name: GLM Description: OpenGL Mathematics -Version: 0.9.9 +Version: @GLM_VERSION@ Cflags: -I${includedir} diff --git a/media-libs/glm/glm-0.9.9.6.ebuild b/media-libs/glm/glm-0.9.9.6.ebuild index 8b84a358e2b..89d9894cf71 100644 --- a/media-libs/glm/glm-0.9.9.6.ebuild +++ b/media-libs/glm/glm-0.9.9.6.ebuild @@ -16,6 +16,14 @@ IUSE="test cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_avx cpu_flags_x86 RDEPEND="virtual/opengl" +src_prepare() { + cmake-utils_src_prepare + sed \ + -e "s:@CMAKE_INSTALL_PREFIX@:${EPREFIX}/usr:" \ + -e "s:@GLM_VERSION@:0.9.9:" \ + "${FILESDIR}"/glm.pc.in > glm.pc || die +} + src_configure() { if use test; then local mycmakeargs=( @@ -34,5 +42,5 @@ src_install() { doheader -r glm dodoc -r *md doc/* insinto /usr/$(get_libdir)/pkgconfig - doins "${FILESDIR}"/glm.pc + doins glm.pc }
[gentoo-commits] repo/gentoo:master commit in: media-libs/glm/, media-libs/glm/files/
commit: c5c19f7820c56475a0b0b3ee84f913f235949a87 Author: Tupone Alfredo gentoo org> AuthorDate: Wed Mar 6 19:45:56 2019 + Commit: Alfredo Tupone gentoo org> CommitDate: Wed Mar 6 19:46:29 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c5c19f78 media-libs/glm: Disable avx. Remove failing test. Closes: https://bugs.gentoo.org/669638 Signed-off-by: Alfredo Tupone gentoo.org> Package-Manager: Portage-2.3.51, Repoman-2.3.11 media-libs/glm/files/glm-0.9.9.2-avx.patch | 30 ++ media-libs/glm/glm-0.9.9.2.ebuild | 4 +++- 2 files changed, 33 insertions(+), 1 deletion(-) diff --git a/media-libs/glm/files/glm-0.9.9.2-avx.patch b/media-libs/glm/files/glm-0.9.9.2-avx.patch new file mode 100644 index 000..87d8c5bd598 --- /dev/null +++ b/media-libs/glm/files/glm-0.9.9.2-avx.patch @@ -0,0 +1,30 @@ +--- a/glm/simd/platform.h 2019-03-06 18:57:53.309630574 +0100 b/glm/simd/platform.h 2019-03-06 18:58:30.796988006 +0100 +@@ -233,7 +233,7 @@ + #define GLM_ARCH_SSSE3_BIT(0x0010) + #define GLM_ARCH_SSE41_BIT(0x0020) + #define GLM_ARCH_SSE42_BIT(0x0040) +-#define GLM_ARCH_AVX_BIT (0x0080) ++#define GLM_ARCH_AVX_BIT (0x) + #define GLM_ARCH_AVX2_BIT (0x0100) + + #define GLM_ARCH_UNKNOWN (0) +--- a/CMakeLists.txt 2019-03-06 19:27:14.052353176 +0100 b/CMakeLists.txt 2019-03-06 19:27:05.161503895 +0100 +@@ -203,7 +203,6 @@ + message("GLM: GCC - ${CMAKE_CXX_COMPILER_ID} compiler") + endif() + +- add_compile_options(-O2) + add_compile_options(-Wno-long-long) + + elseif(CMAKE_CXX_COMPILER_ID MATCHES "Intel") +--- a/test/perf/CMakeLists.txt 2019-03-06 20:32:35.172976526 +0100 b/test/perf/CMakeLists.txt 2019-03-06 20:33:04.138486121 +0100 +@@ -1,6 +1,4 @@ +-glmCreateTestGTC(perf_matrix_div) + glmCreateTestGTC(perf_matrix_inverse) + glmCreateTestGTC(perf_matrix_mul) +-glmCreateTestGTC(perf_matrix_mul_vector) + glmCreateTestGTC(perf_matrix_transpose) + glmCreateTestGTC(perf_vector_mul_matrix) diff --git a/media-libs/glm/glm-0.9.9.2.ebuild b/media-libs/glm/glm-0.9.9.2.ebuild index 8f93505e327..cb748d8c62e 100644 --- a/media-libs/glm/glm-0.9.9.2.ebuild +++ b/media-libs/glm/glm-0.9.9.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -16,6 +16,8 @@ IUSE="test cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_avx cpu_flags_x86 RDEPEND="virtual/opengl" +PATCHES=( "${FILESDIR}"/${P}-avx.patch ) + src_configure() { if use test; then local mycmakeargs=(