1 |
commit: cb4e0fff8ee47621a4cbbb3f905a3ff63ae316c0 |
2 |
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Sep 29 21:10:18 2019 +0000 |
4 |
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Sep 29 21:31:10 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cb4e0fff |
7 |
|
8 |
media-libs/freeglut: Version bump to 3.2.1 |
9 |
|
10 |
Closes: https://bugs.gentoo.org/694774 |
11 |
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> |
12 |
|
13 |
media-libs/freeglut/Manifest | 2 +- |
14 |
.../freeglut/{freeglut-3.2.0.ebuild => freeglut-3.2.1.ebuild} | 6 ++++++ |
15 |
profiles/package.mask | 4 ---- |
16 |
3 files changed, 7 insertions(+), 5 deletions(-) |
17 |
|
18 |
diff --git a/media-libs/freeglut/Manifest b/media-libs/freeglut/Manifest |
19 |
index 1fd8ae404de..395bdc3311a 100644 |
20 |
--- a/media-libs/freeglut/Manifest |
21 |
+++ b/media-libs/freeglut/Manifest |
22 |
@@ -1,2 +1,2 @@ |
23 |
DIST freeglut-3.0.0.tar.gz 419095 BLAKE2B 6065044fb2816ddfebd363189cdb897e00fa433d79c09f5a705b80ff730e1312158ed5db8d7a2cbfc2ddac0d0a9400300c5c245d967c33c937da11303fc316de SHA512 9c45d5b203b26a7ff92331b3e080a48e806c92fbbe7c65d9262dd18c39cd6efdad8a795a80f499a2d23df84b4909dbd7c1bab20d7dd3555d3d88782ce9dd15b0 |
24 |
-DIST freeglut-3.2.0.tar.gz 443147 BLAKE2B e33ad6e0aae49350a0268413791ebf0b8a416a0c590a058063038a3d4f5405c24e743218633c25a4f5393754c41531631feaac1eb1a290ff1c4cc1dc3d97d98a SHA512 78da1eaa845607ddd97a6744f3a97ff26cdb562fdf990695c8ac97a60d9d692496e4bf3672acfc522add60823c2f3bc7435e19e8041fbbb5d95851c0b641a818 |
25 |
+DIST freeglut-3.2.1.tar.gz 440228 BLAKE2B ed8a4b2361416cfee5540350ee50c32a56e5ea75d6834c677c5cec676967a04e13b2adf3da1cc9a3a2c73fbc6147b3b0bc91953a6edf1e35ce8c933eeff6f97a SHA512 aced4bbcd36269ce6f4ee1982e0f9e3fffbf18c94f785d3215ac9f4809b992e166c7ada496ed6174e13d77c0f7ef3ca4c57d8a282e96cbbe6ff086339ade3b08 |
26 |
|
27 |
diff --git a/media-libs/freeglut/freeglut-3.2.0.ebuild b/media-libs/freeglut/freeglut-3.2.1.ebuild |
28 |
similarity index 90% |
29 |
rename from media-libs/freeglut/freeglut-3.2.0.ebuild |
30 |
rename to media-libs/freeglut/freeglut-3.2.1.ebuild |
31 |
index 78f9dc109c4..a696fe8a8fd 100644 |
32 |
--- a/media-libs/freeglut/freeglut-3.2.0.ebuild |
33 |
+++ b/media-libs/freeglut/freeglut-3.2.1.ebuild |
34 |
@@ -32,8 +32,14 @@ HTML_DOCS=( doc/. ) |
35 |
src_configure() { |
36 |
local mycmakeargs=( |
37 |
"-DFREEGLUT_GLES=OFF" |
38 |
+ "-DFREEGLUT_BUILD_DEMOS=OFF" |
39 |
"-DFREEGLUT_BUILD_STATIC_LIBS=$(usex static-libs ON OFF)" |
40 |
) |
41 |
# $(cmake-utils_use gles FREEGLUT_GLES) |
42 |
cmake-multilib_src_configure |
43 |
} |
44 |
+ |
45 |
+multilib_src_install() { |
46 |
+ cmake-utils_src_install |
47 |
+ cp "${D}"/usr/$(get_libdir)/pkgconfig/{,free}glut.pc |
48 |
+} |
49 |
|
50 |
diff --git a/profiles/package.mask b/profiles/package.mask |
51 |
index 4900fa8a9dd..b1d71acf50e 100644 |
52 |
--- a/profiles/package.mask |
53 |
+++ b/profiles/package.mask |
54 |
@@ -140,10 +140,6 @@ sci-chemistry/azara |
55 |
app-admin/systemrescuecd-x86 |
56 |
sys-boot/systemrescuecd-x86-grub |
57 |
|
58 |
-# Matt Turner <mattst88@g.o> (2019-09-03) |
59 |
-# Broken. Bug #694774 |
60 |
->=media-libs/freeglut-3.2.0 |
61 |
- |
62 |
# Michał Górny <mgorny@g.o> (2019-09-17) |
63 |
# Unmaintained EAPI 0 Apache modules + mod_access_dnsbl as a revdep. |
64 |
# Removal in 30 days. Bug #694608. |