diff options
| author |   Alexey Sokolov <alexey+gentoo@asokolov.org> | 2021-09-06 01:01:37 +0100 |
|---|---|---|
| committer |   Ionen Wolkens <ionen@gentoo.org> | 2021-09-07 20:03:13 -0400 |
| commit | f1f54feb4f20e305945cbf832344929c0619aeb7 (patch) | |
| tree | d3e119df7e5deb1c6fa93219be75ec0b068e305e /games-engines | |
| parent | www-servers/servefile: 0.5.2 (diff) | |
| download | gentoo-f1f54feb4f20e305945cbf832344929c0619aeb7.tar.gz gentoo-f1f54feb4f20e305945cbf832344929c0619aeb7.tar.bz2 gentoo-f1f54feb4f20e305945cbf832344929c0619aeb7.zip | |
games-engines/scummvm: fix build, deps, bump eapi
Closes: https://bugs.gentoo.org/744421
Closes: https://bugs.gentoo.org/801229
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Alexey Sokolov <alexey+gentoo@asokolov.org>
Signed-off-by: Ionen Wolkens <ionen@gentoo.org>
Diffstat (limited to 'games-engines')
| -rw-r--r-- | games-engines/scummvm/scummvm-2.2.0-r2.ebuild (renamed from games-engines/scummvm/scummvm-2.2.0-r1.ebuild) | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/games-engines/scummvm/scummvm-2.2.0-r1.ebuild b/games-engines/scummvm/scummvm-2.2.0-r2.ebuild index b6022c564f3f..afdf8a36bf7c 100644 --- a/games-engines/scummvm/scummvm-2.2.0-r1.ebuild +++ b/games-engines/scummvm/scummvm-2.2.0-r2.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit desktop flag-o-matic toolchain-funcs xdg DESCRIPTION="Reimplementation of the SCUMM game engine used in Lucasarts adventures" @@ -29,13 +29,17 @@ RDEPEND=" jpeg? ( virtual/jpeg:0 ) mp3? ( media-libs/libmad ) mpeg2? ( media-libs/libmpeg2 ) - net? ( media-libs/sdl2-net ) + net? ( + media-libs/sdl2-net + net-misc/curl + ) opengl? ( || ( virtual/opengl media-libs/mesa[gles2] media-libs/mesa[gles1] ) ) png? ( media-libs/libpng:0 ) + sndio? ( media-sound/sndio:= ) speech? ( app-accessibility/speech-dispatcher ) truetype? ( media-libs/freetype:2 ) theora? ( media-libs/libtheora ) @@ -60,7 +64,7 @@ PATCHES=( ) src_prepare() { - xdg_src_prepare + default # -g isn't needed for nasm here sed -i \ @@ -75,6 +79,7 @@ src_prepare() { src_configure() { use x86 && append-ldflags -Wl,-z,noexecstack + tc-export STRINGS local myconf=( --backend=sdl @@ -97,6 +102,7 @@ src_configure() { $(use_enable lua) $(use_enable mp3 mad) $(use_enable mpeg2) + $(use_enable net libcurl) $(use_enable net sdlnet) $(use_enable png) $(use_enable sndio) @@ -117,8 +123,7 @@ src_configure() { src_compile() { emake \ AR="$(tc-getAR) cru" \ - RANLIB="$(tc-getRANLIB)" \ - STRINGS="$(tc-getSTRINGS)" + RANLIB="$(tc-getRANLIB)" } src_install() { |