summaryrefslogtreecommitdiff
path: root/media-libs/glm
diff options
context:
space:
mode:
authorV3n3RiX <venerix@koprulu.sector>2021-12-22 14:08:05 +0000
committerV3n3RiX <venerix@koprulu.sector>2021-12-22 14:08:05 +0000
commit93a93e9a3b53c1a73142a305ea1f8136846942ee (patch)
treeb9791a06ab3284e27b568412c59316c66240c682 /media-libs/glm
parent2771f79232c273bc2a57d23bf335dd81ccf6af28 (diff)
gentoo resync : 22.12.2021
Diffstat (limited to 'media-libs/glm')
-rw-r--r--media-libs/glm/Manifest5
-rw-r--r--media-libs/glm/glm-0.9.9.7.ebuild52
-rw-r--r--media-libs/glm/glm-0.9.9.8-r1.ebuild8
-rw-r--r--media-libs/glm/glm-0.9.9.8.ebuild53
4 files changed, 7 insertions, 111 deletions
diff --git a/media-libs/glm/Manifest b/media-libs/glm/Manifest
index 6c6d01813974..ad639a39bfb2 100644
--- a/media-libs/glm/Manifest
+++ b/media-libs/glm/Manifest
@@ -2,9 +2,6 @@ AUX glm-0.9.9.6-simd.patch 427 BLAKE2B 9f6e4637ff526497ba9a77247125d1fe5f06eda9b
AUX glm-0.9.9.8-big-endian-tests.patch 3463 BLAKE2B 4a71bfd885de6cbd715dfb4eefff0d6e7795001de2f418085455609b3a53be71e22e895236a7a20b8a38e886621cca758aa489522c4514534182890d33586d9a SHA512 6b5432bde02f57251203a40b52991c9b41422683740f3f2138b5adef96d47ec9123e4caee3b27be4c38cc3f0418ca821e1016966a5370b6df433b8e05fdd5eab
AUX glm-0.9.9.8-clang.patch 712 BLAKE2B 1bd883548efd33e33759828979f9d62be0576b76ae187ea0ff52a817b58262e5e7859d99d5405e87ebef1fa30bb70f712636acb4bdf12e61b54536b363074b69 SHA512 be04ae74a3466516a284dd159dae0c0e063f2b5b424b3552888d36adbd24a937c7beb27bd0bbb917343bb9746198ae14b39fdad5ff117e408d89b4bf00badd1a
AUX glm.pc.in 149 BLAKE2B 9a34ca2590ef006315e004fa6ba0b08469c9da348d8354d0ab6a7e602da1d49126cffbd28c2aab2e2dbe711d047d482b4aead45d1e8770ab571e23e895201b4d SHA512 c875971c208bac82c1a326ebcd327ec9dd92a5b86981d26bf759516107204876a401ac9c57ca6c9965021364678ebbffcaaca6a3b4ee0e532d468d7b03b3ab9b
-DIST glm-0.9.9.7.tar.gz 4357077 BLAKE2B 59746a8775e0fc20fe8a8c3ae01c48841066d6092ce3cd7fa93bbf29f5247c42645bc920a3dbf3f0b4b61eb1e47f46514d9cd98c4e6df133ced0072ba6a570ee SHA512 9c557788d6382777317c94f8b30bc3df7e533877705514fa5d384f97b076d6bc750e841acbecdec8113e21af07bd8850159f5f1e079aaa2cde25540b480f983b
DIST glm-0.9.9.8.tar.gz 4368032 BLAKE2B 41e4d4a9fbd75c6c6717e43b6a6ae09bb7da3b4b2ee7c5b04308f3aa875b306638b638aca3e457c039845c489fcf0716a080ec2166bf5e9db93c25944f4ba81a SHA512 9484b0c12175414237c5b9486a2990099b1cb727e442f25ecda18b081aa661f7e92a44481f642989553cd3da7992a773441ee5688991bd539ce19fb66a5ce9e8
-EBUILD glm-0.9.9.7.ebuild 1211 BLAKE2B b567e64d07b301f9290e7ab533145497307185050b3ffea4de9fc8c27ba6c3d2f6eb3356d35b2aa1517aa1495cd2632de8afdbba0d157186246789841950f5f6 SHA512 c7ff576f73564277be087ac108e255699017ede17ead85ea50074b08bcacadf25f1bcdd6286f046893f3f4afc514ca03c7612462707cb170d8c982f409225a0a
-EBUILD glm-0.9.9.8-r1.ebuild 1427 BLAKE2B 4099337f2b6e077fb212d3d4d80a1ffc987e04b4616c84b69de479e12d5c96ffb6e9176f994823a987bd99cb818cfcf9da9524ec6907e687adeef9bdec4c44ee SHA512 3871f0b1c4d07f496997d4bac2284d8213227af6c5b89bd5caaacbcf83f094c3bb13fb47caa3734fe5e63ec7cf4a622a697cc8a2b64f06dd0fd3d6d1add768b1
-EBUILD glm-0.9.9.8.ebuild 1229 BLAKE2B 137b4407d122ed1cabce0a0083216499fd4cad705fcc0f66bc14191b5abdac188b58746c9272f7ca316311547410d9f0eb297b437adf98f36b7a5d05d80d2d22 SHA512 3b103f7db0bd6df218109da65d17f1f323aaae481dea170ae6fc34e51aab7f802478abeba6bf5d40c848b02068f7217d4c0de5adae7667f78e98420e531b80df
+EBUILD glm-0.9.9.8-r1.ebuild 1557 BLAKE2B af9acf876e3afca5e5093b409558bd4bc2a55e40c777ced4905e14402c113a410797ca4fe6c20e762d0fa1cea124a9560e4da621efdf84b05012b1ed3a088916 SHA512 002a6b0d6b75b037561335ab44581e97677cb226346ea1fc1d4740e612905b8e02f91c7b1acf46c3921b50d35abd59b29c6c8a4295ea15ef243c435dc93c8642
MISC metadata.xml 545 BLAKE2B 90098d29455b2202bfce4c4ba4eb53499bbd348d477ad554d6c9561dad4ca9b3083f729dfe2f94224b5ce1b4f515ed0cd4121663c264d57bf8829e6e9c1b245f SHA512 2327ea232b899c7b8d2bf50ed3dba7cfc347c4aa9e31dfa2de50ce5815ef5105da921937081e4b1fb38b1406e65d585a50e3705d78fac39ec54e624bb27c617d
diff --git a/media-libs/glm/glm-0.9.9.7.ebuild b/media-libs/glm/glm-0.9.9.7.ebuild
deleted file mode 100644
index 23177ad7f0d5..000000000000
--- a/media-libs/glm/glm-0.9.9.7.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-utils
-
-DESCRIPTION="OpenGL Mathematics"
-HOMEPAGE="http://glm.g-truc.net/"
-SRC_URI="https://github.com/g-truc/glm/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="|| ( HappyBunny MIT )"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc64 x86"
-IUSE="test cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_avx cpu_flags_x86_avx2"
-RESTRICT="!test? ( test )"
-
-RDEPEND=""
-
-PATCHES=(
- "${FILESDIR}"/${PN}-0.9.9.6-simd.patch
-)
-
-src_prepare() {
- sed \
- -e "s:@CMAKE_INSTALL_PREFIX@:${EPREFIX}/usr:" \
- -e "s:@GLM_VERSION@:0.9.9:" \
- "${FILESDIR}"/glm.pc.in \
- > glm.pc
- cmake-utils_src_prepare
-}
-
-src_configure() {
- if use test; then
- local mycmakeargs=(
- -DGLM_TEST_ENABLE=ON
- -DGLM_TEST_ENABLE_SIMD_SSE2="$(usex cpu_flags_x86_sse2 ON OFF)"
- -DGLM_TEST_ENABLE_SIMD_SSE3="$(usex cpu_flags_x86_sse3 ON OFF)"
- -DGLM_TEST_ENABLE_SIMD_AVX="$(usex cpu_flags_x86_avx ON OFF)"
- -DGLM_TEST_ENABLE_SIMD_AVX2="$(usex cpu_flags_x86_avx2 ON OFF)"
- )
- fi
-
- cmake-utils_src_configure
-}
-
-src_install() {
- doheader -r glm
- insinto /usr/$(get_libdir)/pkgconfig
- doins glm.pc
- dodoc readme.md manual.md
-}
diff --git a/media-libs/glm/glm-0.9.9.8-r1.ebuild b/media-libs/glm/glm-0.9.9.8-r1.ebuild
index 04922fcc2113..1b411e2a5fab 100644
--- a/media-libs/glm/glm-0.9.9.8-r1.ebuild
+++ b/media-libs/glm/glm-0.9.9.8-r1.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-inherit cmake
+inherit cmake flag-o-matic
DESCRIPTION="OpenGL Mathematics"
HOMEPAGE="http://glm.g-truc.net/"
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/g-truc/glm/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="|| ( HappyBunny MIT )"
SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc ppc64 ~riscv sparc x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv sparc x86"
IUSE="test cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_avx cpu_flags_x86_avx2"
RESTRICT="!test? ( test )"
@@ -24,6 +24,10 @@ PATCHES=(
src_configure() {
# Header-only library
if use test; then
+ # See https://github.com/g-truc/glm/pull/1087
+ # https://bugs.gentoo.org/818235
+ append-cxxflags -fno-ipa-modref
+
local mycmakeargs=(
-DGLM_TEST_ENABLE=ON
-DGLM_TEST_ENABLE_SIMD_SSE2="$(usex cpu_flags_x86_sse2 ON OFF)"
diff --git a/media-libs/glm/glm-0.9.9.8.ebuild b/media-libs/glm/glm-0.9.9.8.ebuild
deleted file mode 100644
index 6fd8711eea6d..000000000000
--- a/media-libs/glm/glm-0.9.9.8.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="OpenGL Mathematics"
-HOMEPAGE="http://glm.g-truc.net/"
-SRC_URI="https://github.com/g-truc/glm/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="|| ( HappyBunny MIT )"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="test cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_avx cpu_flags_x86_avx2"
-RESTRICT="!test? ( test )"
-
-RDEPEND=""
-
-PATCHES=(
- "${FILESDIR}"/${PN}-0.9.9.6-simd.patch
- "${FILESDIR}"/${P}-clang.patch
-)
-
-src_prepare() {
- sed \
- -e "s:@CMAKE_INSTALL_PREFIX@:${EPREFIX}/usr:" \
- -e "s:@GLM_VERSION@:0.9.9:" \
- "${FILESDIR}"/glm.pc.in \
- > glm.pc
- cmake_src_prepare
-}
-
-src_configure() {
- if use test; then
- local mycmakeargs=(
- -DGLM_TEST_ENABLE=ON
- -DGLM_TEST_ENABLE_SIMD_SSE2="$(usex cpu_flags_x86_sse2 ON OFF)"
- -DGLM_TEST_ENABLE_SIMD_SSE3="$(usex cpu_flags_x86_sse3 ON OFF)"
- -DGLM_TEST_ENABLE_SIMD_AVX="$(usex cpu_flags_x86_avx ON OFF)"
- -DGLM_TEST_ENABLE_SIMD_AVX2="$(usex cpu_flags_x86_avx2 ON OFF)"
- )
- fi
-
- cmake_src_configure
-}
-
-src_install() {
- doheader -r glm
- insinto /usr/$(get_libdir)/pkgconfig
- doins glm.pc
- dodoc readme.md manual.md
-}
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-27 06:17:26 +0000