[gentoo-commits] repo/gentoo:master commit in: media-libs/glm/files/, media-libs/glm/
commit: 2ef83bfaadaa71aec36fa57a9ebc1af6d656cd73
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sun Mar 10 19:43:19 2024 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Tue Aug 6 20:33:14 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ef83bfa
media-libs/glm: drop 0.9.9.8-r1
Closes: https://bugs.gentoo.org/926345
Signed-off-by: Andreas Sturmlechner gentoo.org>
media-libs/glm/Manifest | 1 -
media-libs/glm/files/glm-0.9.9.8-clang.patch | 11 -
media-libs/glm/glm-0.9.9.8-r1.ebuild | 62
3 files changed, 74 deletions(-)
diff --git a/media-libs/glm/Manifest b/media-libs/glm/Manifest
index 9701cf7e2d20..657fb9fb3084 100644
--- a/media-libs/glm/Manifest
+++ b/media-libs/glm/Manifest
@@ -1,2 +1 @@
-DIST glm-0.9.9.8.tar.gz 4368032 BLAKE2B
41e4d4a9fbd75c6c6717e43b6a6ae09bb7da3b4b2ee7c5b04308f3aa875b306638b638aca3e457c039845c489fcf0716a080ec2166bf5e9db93c25944f4ba81a
SHA512
9484b0c12175414237c5b9486a2990099b1cb727e442f25ecda18b081aa661f7e92a44481f642989553cd3da7992a773441ee5688991bd539ce19fb66a5ce9e8
DIST glm-1.0.1.tar.gz 4567161 BLAKE2B
2a6f399710f5812d4060b994df454e0c0e4fc7fcaccdfa62de6de2886987349b266944313539a398733708043c887f1324fe33eef8aa2205ef77e7c0dff28fec
SHA512
c6c6fa1ea7a7e97820e36ee042a78be248ae828c99c1b080d9bf334a5160c9993a70312351c92a867cd49907c95f9f357c8dfe2bc29946da6e83e27ba20c
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
deleted file mode 100644
index af763d5b452a..
--- a/media-libs/glm/files/glm-0.9.9.8-clang.patch
+++ /dev/null
@@ -1,11 +0,0 @@
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-r1.ebuild
b/media-libs/glm/glm-0.9.9.8-r1.ebuild
deleted file mode 100644
index 8c3edfc5425a..
--- a/media-libs/glm/glm-0.9.9.8-r1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake flag-o-matic
-
-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 ~loong 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 )"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-0.9.9.6-simd.patch
- "${FILESDIR}"/${P}-clang.patch
- "${FILESDIR}"/${PN}-0.9.9.8-big-endian-tests.patch
-)
-
-src_configure() {
- # Header-only library
- if use test; then
- # See https://github.com/g-truc/glm/pull/1087
- # https://bugs.gentoo.org/818235
- test-flag-CXX -fno-ipa-modref && append-cxxflags -fno-ipa-modref
-
- 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)"
- )
- cmake_src_configure
- fi
-
- sed \
- -e "s:@CMAKE_INSTALL_PREFIX@:${EPREFIX}/usr:" \
- -e "s:@GLM_VERSION@:$(ver_cut 1-3):" \
- "${FILESDIR}"/glm.pc.in \
- > "${BUILD_DIR}/glm.pc" || die
-}
-
-src_compile() {
- # Header-only library
- if use test; then
- cmake_src_compile
- fi
-}
-
-src_install() {
- doheader -r glm
- insinto /usr/share/pkgconfig
- doins "${BUILD_DIR}/glm.pc"
- insinto /usr/share
- doins -r cmake
- dodoc readme.md manual.md
-}
[gentoo-commits] repo/gentoo:master commit in: media-libs/glm/files/, media-libs/glm/
commit: bbb69c0f35c0fc985c50282bd5fb7c9b98d9080b
Author: Alfredo Tupone gentoo org>
AuthorDate: Thu Jan 25 06:49:34 2024 +
Commit: Alfredo Tupone gentoo org>
CommitDate: Thu Jan 25 06:49:55 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bbb69c0f
media-libs/glm: add 1.0.0
Signed-off-by: Alfredo Tupone gentoo.org>
media-libs/glm/Manifest| 1 +
media-libs/glm/files/glm-1.0.0-clang.patch | 19 +
media-libs/glm/glm-1.0.0.ebuild| 62 ++
3 files changed, 82 insertions(+)
diff --git a/media-libs/glm/Manifest b/media-libs/glm/Manifest
index b2981f94c415..b9db1fa2e0bf 100644
--- a/media-libs/glm/Manifest
+++ b/media-libs/glm/Manifest
@@ -1 +1,2 @@
DIST glm-0.9.9.8.tar.gz 4368032 BLAKE2B
41e4d4a9fbd75c6c6717e43b6a6ae09bb7da3b4b2ee7c5b04308f3aa875b306638b638aca3e457c039845c489fcf0716a080ec2166bf5e9db93c25944f4ba81a
SHA512
9484b0c12175414237c5b9486a2990099b1cb727e442f25ecda18b081aa661f7e92a44481f642989553cd3da7992a773441ee5688991bd539ce19fb66a5ce9e8
+DIST glm-1.0.0.tar.gz 4523789 BLAKE2B
66c26067085bd5878dc1f6e473c1c8449d2a609351ababd8f893010983b9e20dae8e7cb2c9a4469b7e46592b7d350fda75e2975676b8696288065a7b776a21a5
SHA512
62e22002a6369a54e1f0ee2885a65f2780af7d2a446573e5387b81518f5dc7e8076053837cb99ae850a0166ce8b0f077bed009e8986d9884d01c456ce467553f
diff --git a/media-libs/glm/files/glm-1.0.0-clang.patch
b/media-libs/glm/files/glm-1.0.0-clang.patch
new file mode 100644
index ..0223129f6c04
--- /dev/null
+++ b/media-libs/glm/files/glm-1.0.0-clang.patch
@@ -0,0 +1,19 @@
+--- a/CMakeLists.txt 2024-01-25 07:39:25.528947981 +0100
b/CMakeLists.txt 2024-01-25 07:39:45.377618695 +0100
+@@ -241,7 +241,7 @@
+ endif()
+
+ if(NOT GLM_DISABLE_AUTO_DETECTION)
+- add_compile_options(-Werror -Weverything)
++ add_compile_options(-Weverything)
+ endif()
+ # 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
-Wno-float-equal)
+@@ -252,7 +252,6 @@
+ endif()
+
+ if(NOT GLM_DISABLE_AUTO_DETECTION)
+- add_compile_options(-Werror)
+ # add_compile_options(-Wpedantic)
+ # add_compile_options(-Wall)
+ # add_compile_options(-Wextra)
diff --git a/media-libs/glm/glm-1.0.0.ebuild b/media-libs/glm/glm-1.0.0.ebuild
new file mode 100644
index ..5138d21e6371
--- /dev/null
+++ b/media-libs/glm/glm-1.0.0.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake flag-o-matic
+
+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 ~loong ~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 )"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-0.9.9.6-simd.patch
+ "${FILESDIR}"/${P}-clang.patch
+ "${FILESDIR}"/${PN}-0.9.9.8-big-endian-tests.patch
+)
+
+src_configure() {
+ # Header-only library
+ if use test; then
+ # See https://github.com/g-truc/glm/pull/1087
+ # https://bugs.gentoo.org/818235
+ test-flag-CXX -fno-ipa-modref && append-cxxflags -fno-ipa-modref
+
+ 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)"
+ )
+ cmake_src_configure
+ fi
+
+ sed \
+ -e "s:@CMAKE_INSTALL_PREFIX@:${EPREFIX}/usr:" \
+ -e "s:@GLM_VERSION@:$(ver_cut 1-3):" \
+ "${FILESDIR}"/glm.pc.in \
+ > "${BUILD_DIR}/glm.pc" || die
+}
+
+src_compile() {
+ # Header-only library
+ if use test; then
+ cmake_src_compile
+ fi
+}
+
+src_install() {
+ doheader -r glm
+ insinto /usr/share/pkgconfig
+ doins "${BUILD_DIR}/glm.pc"
+ insinto /usr/share
+ doins -r cmake
+ dodoc readme.md manual.md
+}
[gentoo-commits] repo/gentoo:master commit in: media-libs/glm/files/, media-libs/glm/
commit: 3f944f98d92107b26f7347aee359dd7bf2defb42
Author: Tupone Alfredo gentoo org>
AuthorDate: Wed Jan 8 07:33:05 2020 +
Commit: Alfredo Tupone gentoo org>
CommitDate: Wed Jan 8 07:33:05 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3f944f98
media-libs/glm: Version bump to 0.9.9.7
Package-Manager: Portage-2.3.79, Repoman-2.3.16
Signed-off-by: Alfredo Tupone gentoo.org>
media-libs/glm/Manifest | 1 +
media-libs/glm/files/glm.pc.in| 7 ++
media-libs/glm/glm-0.9.9.7.ebuild | 46 +++
3 files changed, 54 insertions(+)
diff --git a/media-libs/glm/Manifest b/media-libs/glm/Manifest
index b26407fe392..ce1570fce00 100644
--- a/media-libs/glm/Manifest
+++ b/media-libs/glm/Manifest
@@ -3,3 +3,4 @@ DIST glm-0.9.9.4.tar.gz 4578404 BLAKE2B
4c0bb64bb477ca46d45b4d25d7d992a39a82a7d7
DIST glm-0.9.9.5.tar.gz 4578601 BLAKE2B
9ce4dc7e638a651f958e2e0e1bfa0da121aefc382579838bfd810952bb8f4253e17caa6d743de713c86a4e8bd5f1afa38f8162e5f2d98ab141d94574d1103d40
SHA512
3b329acf5144aab1c0f47f8045d34e097699bd6685118ad8322c5ce23afdcb44ba2bb07e49301db06355b8eef7d4340b72251d55e113b533740d1e6ef6609911
DIST glm-0.9.9.6-install.patch.gz 7594 BLAKE2B
a273e1e2adc6bdcaab2a3b66457b59e42384215c19b12ce6d27706d74c4d0ec5f010912c295dff4300a44ebc16cabc09c381df5dede01daf7ebe60cf8b95d060
SHA512
bf489673077dcfc821264cbda55d63cf7a01f4e27cdcadf3f6e0d73f016a24fe590142144e2fa5d074cbc518acf34164653c31a346ab6909cfbd7af6c294e79f
DIST glm-0.9.9.6.tar.gz 4354114 BLAKE2B
e62af8d4fe22eced565a2703f5d02ad935a18a4c9352302fdb203c85149b9374066684246f940e417882d2700d13b93fc0232921151680ec58c9df80ee0be1fd
SHA512
1bc8fc1da21e19f95d4a24259993c7932db328fdd2d0db68dbf60c07f372e19003a8df094fb4e153bb7f50df584c17cf0a540d3d3c38b7a287f3b55314ec2d70
+DIST glm-0.9.9.7.tar.gz 4357077 BLAKE2B
59746a8775e0fc20fe8a8c3ae01c48841066d6092ce3cd7fa93bbf29f5247c42645bc920a3dbf3f0b4b61eb1e47f46514d9cd98c4e6df133ced0072ba6a570ee
SHA512
9c557788d6382777317c94f8b30bc3df7e533877705514fa5d384f97b076d6bc750e841acbecdec8113e21af07bd8850159f5f1e079aaa2cde25540b480f983b
diff --git a/media-libs/glm/files/glm.pc.in b/media-libs/glm/files/glm.pc.in
new file mode 100644
index 000..fc5c7bb7f90
--- /dev/null
+++ b/media-libs/glm/files/glm.pc.in
@@ -0,0 +1,7 @@
+prefix=@CMAKE_INSTALL_PREFIX@
+includedir=${prefix}/include
+
+Name: GLM
+Description: OpenGL Mathematics
+Version: @GLM_VERSION@
+Cflags: -I${includedir}
diff --git a/media-libs/glm/glm-0.9.9.7.ebuild
b/media-libs/glm/glm-0.9.9.7.ebuild
new file mode 100644
index 000..ac6c4ff427a
--- /dev/null
+++ b/media-libs/glm/glm-0.9.9.7.ebuild
@@ -0,0 +1,46 @@
+# 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="virtual/opengl"
+
+src_prepare() {
+ sed -e "s:@CMAKE_INSTALL_PREFIX@:${EPREFIX}/usr:" \
+ "${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
+}
[gentoo-commits] repo/gentoo:master commit in: media-libs/glm/files/, media-libs/glm/
commit: 752fa45e66e9f949f62ba9bec05ef4691269c97c
Author: Tupone Alfredo gentoo org>
AuthorDate: Tue Oct 29 21:22:04 2019 +
Commit: Alfredo Tupone gentoo org>
CommitDate: Tue Oct 29 21:22:04 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=752fa45e
media-libs/glm: revert to cmake install
Closes: https://bugs.gentoo.org/695648
Package-Manager: Portage-2.3.76, Repoman-2.3.16
Signed-off-by: Alfredo Tupone gentoo.org>
media-libs/glm/Manifest| 1 +
media-libs/glm/files/glm.pc.in | 7 ---
.../{glm-0.9.9.6.ebuild => glm-0.9.9.6-r1.ebuild} | 23 ++
3 files changed, 7 insertions(+), 24 deletions(-)
diff --git a/media-libs/glm/Manifest b/media-libs/glm/Manifest
index 571ab1845ac..b26407fe392 100644
--- a/media-libs/glm/Manifest
+++ b/media-libs/glm/Manifest
@@ -1,4 +1,5 @@
DIST glm-0.9.9.2.tar.gz 4572279 BLAKE2B
8b9ade542989b3f73f1a80403b73b5c04c5d64ae259891a6b41564eb7b4417876d527ea8440352f2feec6480ec926ca877a4849c4e75c6ece3692d24d87c942a
SHA512
80a5fbeaaea5f1034cd6f8ad3f4daf8b5fa8d9410ccce15ced20f37e24c0f6083332fde82b1fa7357399b3e37c1a31dd3a14f257b7847a5f1ddefa627b50351a
DIST glm-0.9.9.4.tar.gz 4578404 BLAKE2B
4c0bb64bb477ca46d45b4d25d7d992a39a82a7d745d4564dfac04c7f6e31ea0741b33d2d6c7832580e6f51f62a2efe269a9601c10d87f1e68b333e71e20c3d02
SHA512
50e4784fcd5f1da4ae27830948ffe4b412ec53447b89d30c6dcc2b4e0f9ec05cca4b07461d3d8a339eb103fae8dac325fabc87607b5397122ce2021d6e15a1a1
DIST glm-0.9.9.5.tar.gz 4578601 BLAKE2B
9ce4dc7e638a651f958e2e0e1bfa0da121aefc382579838bfd810952bb8f4253e17caa6d743de713c86a4e8bd5f1afa38f8162e5f2d98ab141d94574d1103d40
SHA512
3b329acf5144aab1c0f47f8045d34e097699bd6685118ad8322c5ce23afdcb44ba2bb07e49301db06355b8eef7d4340b72251d55e113b533740d1e6ef6609911
+DIST glm-0.9.9.6-install.patch.gz 7594 BLAKE2B
a273e1e2adc6bdcaab2a3b66457b59e42384215c19b12ce6d27706d74c4d0ec5f010912c295dff4300a44ebc16cabc09c381df5dede01daf7ebe60cf8b95d060
SHA512
bf489673077dcfc821264cbda55d63cf7a01f4e27cdcadf3f6e0d73f016a24fe590142144e2fa5d074cbc518acf34164653c31a346ab6909cfbd7af6c294e79f
DIST glm-0.9.9.6.tar.gz 4354114 BLAKE2B
e62af8d4fe22eced565a2703f5d02ad935a18a4c9352302fdb203c85149b9374066684246f940e417882d2700d13b93fc0232921151680ec58c9df80ee0be1fd
SHA512
1bc8fc1da21e19f95d4a24259993c7932db328fdd2d0db68dbf60c07f372e19003a8df094fb4e153bb7f50df584c17cf0a540d3d3c38b7a287f3b55314ec2d70
diff --git a/media-libs/glm/files/glm.pc.in b/media-libs/glm/files/glm.pc.in
deleted file mode 100644
index fc5c7bb7f90..000
--- a/media-libs/glm/files/glm.pc.in
+++ /dev/null
@@ -1,7 +0,0 @@
-prefix=@CMAKE_INSTALL_PREFIX@
-includedir=${prefix}/include
-
-Name: GLM
-Description: OpenGL Mathematics
-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-r1.ebuild
similarity index 71%
rename from media-libs/glm/glm-0.9.9.6.ebuild
rename to media-libs/glm/glm-0.9.9.6-r1.ebuild
index 7049a117fce..196d3f431fc 100644
--- a/media-libs/glm/glm-0.9.9.6.ebuild
+++ b/media-libs/glm/glm-0.9.9.6-r1.ebuild
@@ -7,7 +7,8 @@ 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"
+SRC_URI="https://github.com/g-truc/glm/archive/${PV}.tar.gz -> ${P}.tar.gz
+ https://dev.gentoo.org/~tupone/distfiles/${P}-install.patch.gz";
LICENSE="|| ( HappyBunny MIT )"
SLOT="0"
@@ -16,15 +17,10 @@ IUSE="test cpu_flags_x86_sse2 cpu_flags_x86_sse3
cpu_flags_x86_avx cpu_flags_x86
RDEPEND="virtual/opengl"
-PATCHES=( "${FILESDIR}"/${P}-simd.patch )
-
-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
-}
+PATCHES=(
+ "${FILESDIR}"/${P}-simd.patch
+ "${WORKDIR}"/${P}-install.patch
+)
src_configure() {
if use test; then
@@ -39,10 +35,3 @@ src_configure() {
cmake-utils_src_configure
}
-
-src_install() {
- doheader -r glm
- dodoc -r *md doc/*
- insinto /usr/$(get_libdir)/pkgconfig
- doins glm.pc
-}
[gentoo-commits] repo/gentoo:master commit in: media-libs/glm/files/, media-libs/glm/
commit: ac0397adc5b4ddfc44e26de96c743f2e54a7a91a
Author: Tupone Alfredo gentoo org>
AuthorDate: Thu Sep 12 07:01:50 2019 +
Commit: Alfredo Tupone gentoo org>
CommitDate: Thu Sep 12 07:01:50 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac0397ad
media-libs/glm: disable SSE2
Closes: https://bugs.gentoo.org/693954
Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Alfredo Tupone gentoo.org>
media-libs/glm/files/glm-0.9.9.6-simd.patch | 11 +++
media-libs/glm/glm-0.9.9.6.ebuild | 2 ++
2 files changed, 13 insertions(+)
diff --git a/media-libs/glm/files/glm-0.9.9.6-simd.patch
b/media-libs/glm/files/glm-0.9.9.6-simd.patch
new file mode 100644
index 000..5ed2bf1f6d6
--- /dev/null
+++ b/media-libs/glm/files/glm-0.9.9.6-simd.patch
@@ -0,0 +1,11 @@
+--- 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
+@@ -245,7 +245,7 @@
+
+ #define GLM_ARCH_NEON_BIT (0x0001)
+ #define GLM_ARCH_SSE_BIT (0x0002)
+-#define GLM_ARCH_SSE2_BIT (0x0004)
++#define GLM_ARCH_SSE2_BIT (0x)
+ #define GLM_ARCH_SSE3_BIT (0x0008)
+ #define GLM_ARCH_SSSE3_BIT(0x0010)
+ #define GLM_ARCH_SSE41_BIT(0x0020)
diff --git a/media-libs/glm/glm-0.9.9.6.ebuild
b/media-libs/glm/glm-0.9.9.6.ebuild
index 89d9894cf71..7049a117fce 100644
--- a/media-libs/glm/glm-0.9.9.6.ebuild
+++ b/media-libs/glm/glm-0.9.9.6.ebuild
@@ -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}-simd.patch )
+
src_prepare() {
cmake-utils_src_prepare
sed \
[gentoo-commits] repo/gentoo:master commit in: media-libs/glm/files/, media-libs/glm/
commit: 4524f4ea0d795dc109c5499f471160b2e7d9d338
Author: Tupone Alfredo gentoo org>
AuthorDate: Tue Sep 10 06:47:50 2019 +
Commit: Alfredo Tupone gentoo org>
CommitDate: Tue Sep 10 06:47:50 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4524f4ea
media-libs/glm: re-add glm.pc
Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Alfredo Tupone gentoo.org>
media-libs/glm/files/glm.pc | 7 +++
media-libs/glm/glm-0.9.9.6.ebuild | 2 ++
2 files changed, 9 insertions(+)
diff --git a/media-libs/glm/files/glm.pc b/media-libs/glm/files/glm.pc
new file mode 100644
index 000..e3bb5acc1af
--- /dev/null
+++ b/media-libs/glm/files/glm.pc
@@ -0,0 +1,7 @@
+prefix=/usr
+includedir=${prefix}/include
+
+Name: GLM
+Description: OpenGL Mathematics
+Version: 0.9.9
+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 6e35cfa670b..8b84a358e2b 100644
--- a/media-libs/glm/glm-0.9.9.6.ebuild
+++ b/media-libs/glm/glm-0.9.9.6.ebuild
@@ -33,4 +33,6 @@ src_configure() {
src_install() {
doheader -r glm
dodoc -r *md doc/*
+ insinto /usr/$(get_libdir)/pkgconfig
+ doins "${FILESDIR}"/glm.pc
}
[gentoo-commits] repo/gentoo:master commit in: media-libs/glm/files/, media-libs/glm/
commit: 2b7bb52573775e7a2a8334ba3c633d5b223d3d54
Author: Peter Levine gmail com>
AuthorDate: Sat Mar 31 06:25:53 2018 +
Commit: Alfredo Tupone gentoo org>
CommitDate: Fri Apr 13 16:57:25 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b7bb525
media-libs/glm: Fix tests with GCC-7
Bug: https://bugs.gentoo.org/638312
Closes: https://bugs.gentoo.org/638312
Closes: https://github.com/gentoo/gentoo/pull/7730
Package-Manager: Portage-2.3.16, Repoman-2.3.6
media-libs/glm/files/glm-0.9.8.5-gcc7_tests.patch | 70 +++
media-libs/glm/glm-0.9.8.5-r1.ebuild | 1 +
2 files changed, 71 insertions(+)
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
new file mode 100644
index 000..d7744aed555
--- /dev/null
+++ b/media-libs/glm/files/glm-0.9.8.5-gcc7_tests.patch
@@ -0,0 +1,70 @@
+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/glm-0.9.8.5-r1.ebuild
b/media-libs/glm/glm-0.9.8.5-r1.ebuild
index 073f3bee1e2..b30d2b1a0f8 100644
--- a/media-libs/glm/glm-0.9.8.5-r1.ebuild
+++ b/media-libs/glm/glm-0.9.8.5-r1.ebuild
@@ -18,6 +18,7 @@ RDEPEND="virtual/opengl"
PATCHES=(
"${FILESDIR}/glm-gcc73.patch"
+ "${FILESDIR}/${P}-gcc7_tests.patch"
)
src_configure() {
[gentoo-commits] repo/gentoo:master commit in: media-libs/glm/files/, media-libs/glm/
commit: 1e45f7cd1dfa04ef4b89eb453df04b62ee432425
Author: Patrick McLean gentoo org>
AuthorDate: Fri Jan 26 23:52:31 2018 +
Commit: Patrick McLean gentoo org>
CommitDate: Fri Jan 26 23:52:52 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e45f7cd
media-libs/glm: Add patch to support gcc-7.3 to 0.9.8.5
Package-Manager: Portage-2.3.20, Repoman-2.3.6
media-libs/glm/files/glm-gcc73.patch | 35 +++
media-libs/glm/glm-0.9.8.5.ebuild| 6 +-
2 files changed, 40 insertions(+), 1 deletion(-)
diff --git a/media-libs/glm/files/glm-gcc73.patch
b/media-libs/glm/files/glm-gcc73.patch
new file mode 100644
index 000..68033b5b6f6
--- /dev/null
+++ b/media-libs/glm/files/glm-gcc73.patch
@@ -0,0 +1,35 @@
+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.0
-0700
glm-0.9.8.5/glm/simd/platform.h2018-01-26 15:38:57.584130263 -0800
+@@ -111,7 +111,8 @@
+ #define GLM_COMPILER_GCC700x02000A00
+ #define GLM_COMPILER_GCC710x02000B00
+ #define GLM_COMPILER_GCC720x02000C00
+-#define GLM_COMPILER_GCC800x02000D00
++#define GLM_COMPILER_GCC730x02000D00
++#define GLM_COMPILER_GCC800x02000E00
+
+ // CUDA
+ #define GLM_COMPILER_CUDA 0x1000
+@@ -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.0 -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;
diff --git a/media-libs/glm/glm-0.9.8.5.ebuild
b/media-libs/glm/glm-0.9.8.5.ebuild
index 548d897c684..073f3bee1e2 100644
--- a/media-libs/glm/glm-0.9.8.5.ebuild
+++ b/media-libs/glm/glm-0.9.8.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -16,6 +16,10 @@ IUSE="test cpu_flags_x86_sse2 cpu_flags_x86_sse3
cpu_flags_x86_avx cpu_flags_x86
RDEPEND="virtual/opengl"
+PATCHES=(
+ "${FILESDIR}/glm-gcc73.patch"
+)
+
src_configure() {
if use test; then
local mycmakeargs=(
