| 1 |
commit: e97bb8a8a1c7d14bf1f42cd397b8065c8a9c9849 |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Apr 25 19:04:12 2021 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Apr 25 19:13:31 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e97bb8a8 |
| 7 |
|
| 8 |
games-fps/darkplaces: fix pre-stripped files, respecting CC |
| 9 |
|
| 10 |
Can't reproduce CFLAGS issue right now. |
| 11 |
|
| 12 |
Closes: https://bugs.gentoo.org/739194 |
| 13 |
Closes: https://bugs.gentoo.org/739200 |
| 14 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 15 |
|
| 16 |
games-fps/darkplaces/darkplaces-20140513-r1.ebuild | 23 +++++++++++++++++----- |
| 17 |
1 file changed, 18 insertions(+), 5 deletions(-) |
| 18 |
|
| 19 |
diff --git a/games-fps/darkplaces/darkplaces-20140513-r1.ebuild b/games-fps/darkplaces/darkplaces-20140513-r1.ebuild |
| 20 |
index c0fafee1498..171eaa03f68 100644 |
| 21 |
--- a/games-fps/darkplaces/darkplaces-20140513-r1.ebuild |
| 22 |
+++ b/games-fps/darkplaces/darkplaces-20140513-r1.ebuild |
| 23 |
@@ -1,8 +1,9 @@ |
| 24 |
# Copyright 1999-2021 Gentoo Authors |
| 25 |
# Distributed under the terms of the GNU General Public License v2 |
| 26 |
|
| 27 |
-EAPI=6 |
| 28 |
-inherit eutils flag-o-matic unpacker |
| 29 |
+EAPI=7 |
| 30 |
+ |
| 31 |
+inherit desktop flag-o-matic wrapper unpacker |
| 32 |
|
| 33 |
# Latest versions are in http://icculus.org/twilight/darkplaces/files/ |
| 34 |
MY_PV="${PV/_beta/beta}" |
| 35 |
@@ -18,6 +19,7 @@ SRC_URI="http://icculus.org/twilight/${PN}/files/${MY_ENGINE} |
| 36 |
lights? ( |
| 37 |
http://www.fuhquake.net/files/extras/${MY_LIGHTS} |
| 38 |
http://www.kgbsyndicate.com/romi/id1.pk3 )" |
| 39 |
+S="${WORKDIR}/${PN}" |
| 40 |
|
| 41 |
LICENSE="GPL-2" |
| 42 |
SLOT="0" |
| 43 |
@@ -60,14 +62,17 @@ DEPEND="lights? ( || ( |
| 44 |
!opengl? ( !sdl? ( !dedicated? ( |
| 45 |
${UIRDEPEND} |
| 46 |
${UIDEPEND} ) ) ) |
| 47 |
- virtual/pkgconfig |
| 48 |
+" |
| 49 |
+BDEPEND=" |
| 50 |
app-arch/unzip |
| 51 |
+ virtual/pkgconfig |
| 52 |
" |
| 53 |
|
| 54 |
-S="${WORKDIR}/${PN}" |
| 55 |
dir="/usr/share/quake1" |
| 56 |
|
| 57 |
-opengl_client() { use opengl || ( ! use dedicated && ! use sdl ) } |
| 58 |
+opengl_client() { |
| 59 |
+ use opengl || ( ! use dedicated && ! use sdl ) |
| 60 |
+} |
| 61 |
|
| 62 |
src_unpack() { |
| 63 |
if use lights ; then |
| 64 |
@@ -76,6 +81,7 @@ src_unpack() { |
| 65 |
mv *.lit maps/ || die |
| 66 |
mv ReadMe.txt rtlights.txt |
| 67 |
fi |
| 68 |
+ |
| 69 |
unpack "${MY_ENGINE}" |
| 70 |
unpack ./${PN}*.zip |
| 71 |
} |
| 72 |
@@ -115,6 +121,12 @@ src_prepare() { |
| 73 |
src_compile() { |
| 74 |
local opts="DP_FS_BASEDIR=\"${dir}\" DP_LINK_TO_LIBJPEG=1" |
| 75 |
|
| 76 |
+ # Protect against people choosing a strip implementation |
| 77 |
+ # bug #739194 |
| 78 |
+ opts+="STRIP=true" |
| 79 |
+ |
| 80 |
+ tc-export CC |
| 81 |
+ |
| 82 |
# Preferred sound is alsa |
| 83 |
local sound_api="NULL" |
| 84 |
use oss && sound_api="OSS" |
| 85 |
@@ -168,6 +180,7 @@ src_install() { |
| 86 |
if use lights ; then |
| 87 |
insinto "${dir}"/id1 |
| 88 |
doins -r "${WORKDIR}"/{cubemaps,maps} |
| 89 |
+ |
| 90 |
if use demo ; then |
| 91 |
# Set up symlinks, for the demo levels to include the lights |
| 92 |
local d |
Archives