| 1 |
commit: 752fa45e66e9f949f62ba9bec05ef4691269c97c |
| 2 |
Author: Tupone Alfredo <tupone <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Oct 29 21:22:04 2019 +0000 |
| 4 |
Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Oct 29 21:22:04 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=752fa45e |
| 7 |
|
| 8 |
media-libs/glm: revert to cmake install |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/695648 |
| 11 |
Package-Manager: Portage-2.3.76, Repoman-2.3.16 |
| 12 |
Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org> |
| 13 |
|
| 14 |
media-libs/glm/Manifest | 1 + |
| 15 |
media-libs/glm/files/glm.pc.in | 7 ------- |
| 16 |
.../{glm-0.9.9.6.ebuild => glm-0.9.9.6-r1.ebuild} | 23 ++++++---------------- |
| 17 |
3 files changed, 7 insertions(+), 24 deletions(-) |
| 18 |
|
| 19 |
diff --git a/media-libs/glm/Manifest b/media-libs/glm/Manifest |
| 20 |
index 571ab1845ac..b26407fe392 100644 |
| 21 |
--- a/media-libs/glm/Manifest |
| 22 |
+++ b/media-libs/glm/Manifest |
| 23 |
@@ -1,4 +1,5 @@ |
| 24 |
DIST glm-0.9.9.2.tar.gz 4572279 BLAKE2B 8b9ade542989b3f73f1a80403b73b5c04c5d64ae259891a6b41564eb7b4417876d527ea8440352f2feec6480ec926ca877a4849c4e75c6ece3692d24d87c942a SHA512 80a5fbeaaea5f1034cd6f8ad3f4daf8b5fa8d9410ccce15ced20f37e24c0f6083332fde82b1fa7357399b3e37c1a31dd3a14f257b7847a5f1ddefa627b50351a |
| 25 |
DIST glm-0.9.9.4.tar.gz 4578404 BLAKE2B 4c0bb64bb477ca46d45b4d25d7d992a39a82a7d745d4564dfac04c7f6e31ea0741b33d2d6c7832580e6f51f62a2efe269a9601c10d87f1e68b333e71e20c3d02 SHA512 50e4784fcd5f1da4ae27830948ffe4b412ec53447b89d30c6dcc2b4e0f9ec05cca4b07461d3d8a339eb103fae8dac325fabc87607b5397122ce2021d6e15a1a1 |
| 26 |
DIST glm-0.9.9.5.tar.gz 4578601 BLAKE2B 9ce4dc7e638a651f958e2e0e1bfa0da121aefc382579838bfd810952bb8f4253e17caa6d743de713c86a4e8bd5f1afa38f8162e5f2d98ab141d94574d1103d40 SHA512 3b329acf5144aab1c0f47f8045d34e097699bd6685118ad8322c5ce23afdcb44ba2bb07e49301db06355b8eef7d4340b72251d55e113b533740d1e6ef6609911 |
| 27 |
+DIST glm-0.9.9.6-install.patch.gz 7594 BLAKE2B a273e1e2adc6bdcaab2a3b66457b59e42384215c19b12ce6d27706d74c4d0ec5f010912c295dff4300a44ebc16cabc09c381df5dede01daf7ebe60cf8b95d060 SHA512 bf489673077dcfc821264cbda55d63cf7a01f4e27cdcadf3f6e0d73f016a24fe590142144e2fa5d074cbc518acf34164653c31a346ab6909cfbd7af6c294e79f |
| 28 |
DIST glm-0.9.9.6.tar.gz 4354114 BLAKE2B e62af8d4fe22eced565a2703f5d02ad935a18a4c9352302fdb203c85149b9374066684246f940e417882d2700d13b93fc0232921151680ec58c9df80ee0be1fd SHA512 1bc8fc1da21e19f95d4a24259993c7932db328fdd2d0db68dbf60c07f372e19003a8df094fb4e153bb7f50df584c17cf0a540d3d3c38b7a287f3b55314ec2d70 |
| 29 |
|
| 30 |
diff --git a/media-libs/glm/files/glm.pc.in b/media-libs/glm/files/glm.pc.in |
| 31 |
deleted file mode 100644 |
| 32 |
index fc5c7bb7f90..00000000000 |
| 33 |
--- a/media-libs/glm/files/glm.pc.in |
| 34 |
+++ /dev/null |
| 35 |
@@ -1,7 +0,0 @@ |
| 36 |
-prefix=@CMAKE_INSTALL_PREFIX@ |
| 37 |
-includedir=${prefix}/include |
| 38 |
- |
| 39 |
-Name: GLM |
| 40 |
-Description: OpenGL Mathematics |
| 41 |
-Version: @GLM_VERSION@ |
| 42 |
-Cflags: -I${includedir} |
| 43 |
|
| 44 |
diff --git a/media-libs/glm/glm-0.9.9.6.ebuild b/media-libs/glm/glm-0.9.9.6-r1.ebuild |
| 45 |
similarity index 71% |
| 46 |
rename from media-libs/glm/glm-0.9.9.6.ebuild |
| 47 |
rename to media-libs/glm/glm-0.9.9.6-r1.ebuild |
| 48 |
index 7049a117fce..196d3f431fc 100644 |
| 49 |
--- a/media-libs/glm/glm-0.9.9.6.ebuild |
| 50 |
+++ b/media-libs/glm/glm-0.9.9.6-r1.ebuild |
| 51 |
@@ -7,7 +7,8 @@ inherit cmake-utils |
| 52 |
|
| 53 |
DESCRIPTION="OpenGL Mathematics" |
| 54 |
HOMEPAGE="http://glm.g-truc.net/" |
| 55 |
-SRC_URI="https://github.com/g-truc/glm/archive/${PV}.tar.gz -> ${P}.tar.gz" |
| 56 |
+SRC_URI="https://github.com/g-truc/glm/archive/${PV}.tar.gz -> ${P}.tar.gz |
| 57 |
+ https://dev.gentoo.org/~tupone/distfiles/${P}-install.patch.gz" |
| 58 |
|
| 59 |
LICENSE="|| ( HappyBunny MIT )" |
| 60 |
SLOT="0" |
| 61 |
@@ -16,15 +17,10 @@ IUSE="test cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_avx cpu_flags_x86 |
| 62 |
|
| 63 |
RDEPEND="virtual/opengl" |
| 64 |
|
| 65 |
-PATCHES=( "${FILESDIR}"/${P}-simd.patch ) |
| 66 |
- |
| 67 |
-src_prepare() { |
| 68 |
- cmake-utils_src_prepare |
| 69 |
- sed \ |
| 70 |
- -e "s:@CMAKE_INSTALL_PREFIX@:${EPREFIX}/usr:" \ |
| 71 |
- -e "s:@GLM_VERSION@:0.9.9:" \ |
| 72 |
- "${FILESDIR}"/glm.pc.in > glm.pc || die |
| 73 |
-} |
| 74 |
+PATCHES=( |
| 75 |
+ "${FILESDIR}"/${P}-simd.patch |
| 76 |
+ "${WORKDIR}"/${P}-install.patch |
| 77 |
+) |
| 78 |
|
| 79 |
src_configure() { |
| 80 |
if use test; then |
| 81 |
@@ -39,10 +35,3 @@ src_configure() { |
| 82 |
|
| 83 |
cmake-utils_src_configure |
| 84 |
} |
| 85 |
- |
| 86 |
-src_install() { |
| 87 |
- doheader -r glm |
| 88 |
- dodoc -r *md doc/* |
| 89 |
- insinto /usr/$(get_libdir)/pkgconfig |
| 90 |
- doins glm.pc |
| 91 |
-} |
Archives