| 1 |
commit: f1f54feb4f20e305945cbf832344929c0619aeb7 |
| 2 |
Author: Alexey Sokolov <alexey+gentoo <AT> asokolov <DOT> org> |
| 3 |
AuthorDate: Mon Sep 6 00:01:37 2021 +0000 |
| 4 |
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Sep 8 00:03:13 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f1f54feb |
| 7 |
|
| 8 |
games-engines/scummvm: fix build, deps, bump eapi |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/744421 |
| 11 |
Closes: https://bugs.gentoo.org/801229 |
| 12 |
Package-Manager: Portage-3.0.20, Repoman-3.0.3 |
| 13 |
Signed-off-by: Alexey Sokolov <alexey+gentoo <AT> asokolov.org> |
| 14 |
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org> |
| 15 |
|
| 16 |
.../{scummvm-2.2.0-r1.ebuild => scummvm-2.2.0-r2.ebuild} | 15 ++++++++++----- |
| 17 |
1 file changed, 10 insertions(+), 5 deletions(-) |
| 18 |
|
| 19 |
diff --git a/games-engines/scummvm/scummvm-2.2.0-r1.ebuild b/games-engines/scummvm/scummvm-2.2.0-r2.ebuild |
| 20 |
similarity index 94% |
| 21 |
rename from games-engines/scummvm/scummvm-2.2.0-r1.ebuild |
| 22 |
rename to games-engines/scummvm/scummvm-2.2.0-r2.ebuild |
| 23 |
index b6022c564f3..afdf8a36bf7 100644 |
| 24 |
--- a/games-engines/scummvm/scummvm-2.2.0-r1.ebuild |
| 25 |
+++ b/games-engines/scummvm/scummvm-2.2.0-r2.ebuild |
| 26 |
@@ -1,7 +1,7 @@ |
| 27 |
# Copyright 1999-2021 Gentoo Authors |
| 28 |
# Distributed under the terms of the GNU General Public License v2 |
| 29 |
|
| 30 |
-EAPI=7 |
| 31 |
+EAPI=8 |
| 32 |
inherit desktop flag-o-matic toolchain-funcs xdg |
| 33 |
|
| 34 |
DESCRIPTION="Reimplementation of the SCUMM game engine used in Lucasarts adventures" |
| 35 |
@@ -29,13 +29,17 @@ RDEPEND=" |
| 36 |
jpeg? ( virtual/jpeg:0 ) |
| 37 |
mp3? ( media-libs/libmad ) |
| 38 |
mpeg2? ( media-libs/libmpeg2 ) |
| 39 |
- net? ( media-libs/sdl2-net ) |
| 40 |
+ net? ( |
| 41 |
+ media-libs/sdl2-net |
| 42 |
+ net-misc/curl |
| 43 |
+ ) |
| 44 |
opengl? ( || ( |
| 45 |
virtual/opengl |
| 46 |
media-libs/mesa[gles2] |
| 47 |
media-libs/mesa[gles1] |
| 48 |
) ) |
| 49 |
png? ( media-libs/libpng:0 ) |
| 50 |
+ sndio? ( media-sound/sndio:= ) |
| 51 |
speech? ( app-accessibility/speech-dispatcher ) |
| 52 |
truetype? ( media-libs/freetype:2 ) |
| 53 |
theora? ( media-libs/libtheora ) |
| 54 |
@@ -60,7 +64,7 @@ PATCHES=( |
| 55 |
) |
| 56 |
|
| 57 |
src_prepare() { |
| 58 |
- xdg_src_prepare |
| 59 |
+ default |
| 60 |
|
| 61 |
# -g isn't needed for nasm here |
| 62 |
sed -i \ |
| 63 |
@@ -75,6 +79,7 @@ src_prepare() { |
| 64 |
|
| 65 |
src_configure() { |
| 66 |
use x86 && append-ldflags -Wl,-z,noexecstack |
| 67 |
+ tc-export STRINGS |
| 68 |
|
| 69 |
local myconf=( |
| 70 |
--backend=sdl |
| 71 |
@@ -97,6 +102,7 @@ src_configure() { |
| 72 |
$(use_enable lua) |
| 73 |
$(use_enable mp3 mad) |
| 74 |
$(use_enable mpeg2) |
| 75 |
+ $(use_enable net libcurl) |
| 76 |
$(use_enable net sdlnet) |
| 77 |
$(use_enable png) |
| 78 |
$(use_enable sndio) |
| 79 |
@@ -117,8 +123,7 @@ src_configure() { |
| 80 |
src_compile() { |
| 81 |
emake \ |
| 82 |
AR="$(tc-getAR) cru" \ |
| 83 |
- RANLIB="$(tc-getRANLIB)" \ |
| 84 |
- STRINGS="$(tc-getSTRINGS)" |
| 85 |
+ RANLIB="$(tc-getRANLIB)" |
| 86 |
} |
| 87 |
|
| 88 |
src_install() { |
Archives