| 1 |
commit: 2433f7afd26cdce6843ab85af86650bfb5ff623d |
| 2 |
Author: Alexey Sokolov <alexey+gentoo <AT> asokolov <DOT> org> |
| 3 |
AuthorDate: Tue Sep 7 19:11:33 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=2433f7af |
| 7 |
|
| 8 |
games-engines/scummvm: sync live ebuild |
| 9 |
|
| 10 |
Package-Manager: Portage-3.0.20, Repoman-3.0.3 |
| 11 |
Signed-off-by: Alexey Sokolov <alexey+gentoo <AT> asokolov.org> |
| 12 |
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org> |
| 13 |
|
| 14 |
games-engines/scummvm/scummvm-2.2.0-r2.ebuild | 13 +++++++++--- |
| 15 |
games-engines/scummvm/scummvm-9999.ebuild | 30 +++++++++++++++++++-------- |
| 16 |
2 files changed, 31 insertions(+), 12 deletions(-) |
| 17 |
|
| 18 |
diff --git a/games-engines/scummvm/scummvm-2.2.0-r2.ebuild b/games-engines/scummvm/scummvm-2.2.0-r2.ebuild |
| 19 |
index afdf8a36bf7..65afd2a5beb 100644 |
| 20 |
--- a/games-engines/scummvm/scummvm-2.2.0-r2.ebuild |
| 21 |
+++ b/games-engines/scummvm/scummvm-2.2.0-r2.ebuild |
| 22 |
@@ -6,11 +6,18 @@ inherit desktop flag-o-matic toolchain-funcs xdg |
| 23 |
|
| 24 |
DESCRIPTION="Reimplementation of the SCUMM game engine used in Lucasarts adventures" |
| 25 |
HOMEPAGE="https://www.scummvm.org/" |
| 26 |
-SRC_URI="https://scummvm.org/frs/scummvm/${PV}/${P}.tar.xz" |
| 27 |
+ |
| 28 |
+if [[ ${PV} == *9999* ]]; then |
| 29 |
+ inherit git-r3 |
| 30 |
+ EGIT_REPO_URI="https://github.com/scummvm/scummvm" |
| 31 |
+else |
| 32 |
+ SRC_URI="https://scummvm.org/frs/scummvm/${PV}/${P}.tar.xz" |
| 33 |
+ KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86" |
| 34 |
+ S="${WORKDIR}/${PN}-${P}" |
| 35 |
+fi |
| 36 |
|
| 37 |
LICENSE="GPL-2+ LGPL-2.1 BSD GPL-3-with-font-exception" |
| 38 |
SLOT="0" |
| 39 |
-KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86" |
| 40 |
IUSE="a52 aac alsa debug flac fluidsynth fribidi +gtk jpeg lua mpeg2 mp3 +net opengl png sndio speech theora truetype unsupported vorbis zlib" |
| 41 |
RESTRICT="test" # it only looks like there's a test there #77507 |
| 42 |
|
| 43 |
@@ -117,7 +124,7 @@ src_configure() { |
| 44 |
echo "configure ${myconf[@]}" |
| 45 |
# NOT AN AUTOCONF SCRIPT SO DONT CALL ECONF |
| 46 |
SDL_CONFIG="sdl2-config" \ |
| 47 |
- ./configure "${myconf[@]}" "${EXTRA_ECONF}" || die |
| 48 |
+ ./configure "${myconf[@]}" ${EXTRA_ECONF} || die |
| 49 |
} |
| 50 |
|
| 51 |
src_compile() { |
| 52 |
|
| 53 |
diff --git a/games-engines/scummvm/scummvm-9999.ebuild b/games-engines/scummvm/scummvm-9999.ebuild |
| 54 |
index f6a91ef83cd..cf7685a08e0 100644 |
| 55 |
--- a/games-engines/scummvm/scummvm-9999.ebuild |
| 56 |
+++ b/games-engines/scummvm/scummvm-9999.ebuild |
| 57 |
@@ -1,16 +1,23 @@ |
| 58 |
# Copyright 1999-2021 Gentoo Authors |
| 59 |
# Distributed under the terms of the GNU General Public License v2 |
| 60 |
|
| 61 |
-EAPI=7 |
| 62 |
-inherit desktop flag-o-matic git-r3 toolchain-funcs xdg |
| 63 |
+EAPI=8 |
| 64 |
+inherit desktop flag-o-matic toolchain-funcs xdg |
| 65 |
|
| 66 |
DESCRIPTION="Reimplementation of the SCUMM game engine used in Lucasarts adventures" |
| 67 |
HOMEPAGE="https://www.scummvm.org/" |
| 68 |
-EGIT_REPO_URI="https://github.com/scummvm/scummvm" |
| 69 |
+ |
| 70 |
+if [[ ${PV} == *9999* ]]; then |
| 71 |
+ inherit git-r3 |
| 72 |
+ EGIT_REPO_URI="https://github.com/scummvm/scummvm" |
| 73 |
+else |
| 74 |
+ SRC_URI="https://scummvm.org/frs/scummvm/${PV}/${P}.tar.xz" |
| 75 |
+ KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86" |
| 76 |
+ S="${WORKDIR}/${PN}-${P}" |
| 77 |
+fi |
| 78 |
|
| 79 |
LICENSE="GPL-2+ LGPL-2.1 BSD GPL-3-with-font-exception" |
| 80 |
SLOT="0" |
| 81 |
-KEYWORDS="" |
| 82 |
IUSE="a52 aac alsa debug flac fluidsynth fribidi glew +gtk jpeg lua mpeg2 mp3 +net opengl png sndio speech theora truetype unsupported vorbis zlib" |
| 83 |
RESTRICT="test" # it only looks like there's a test there #77507 |
| 84 |
|
| 85 |
@@ -20,7 +27,7 @@ RDEPEND=" |
| 86 |
aac? ( media-libs/faad2 ) |
| 87 |
alsa? ( media-libs/alsa-lib ) |
| 88 |
flac? ( media-libs/flac ) |
| 89 |
- fluidsynth? ( media-sound/fluidsynth ) |
| 90 |
+ fluidsynth? ( media-sound/fluidsynth:= ) |
| 91 |
fribidi? ( dev-libs/fribidi ) |
| 92 |
gtk? ( |
| 93 |
dev-libs/glib:2 |
| 94 |
@@ -29,7 +36,10 @@ RDEPEND=" |
| 95 |
jpeg? ( virtual/jpeg:0 ) |
| 96 |
mp3? ( media-libs/libmad ) |
| 97 |
mpeg2? ( media-libs/libmpeg2 ) |
| 98 |
- net? ( media-libs/sdl2-net ) |
| 99 |
+ net? ( |
| 100 |
+ media-libs/sdl2-net |
| 101 |
+ net-misc/curl |
| 102 |
+ ) |
| 103 |
opengl? ( |
| 104 |
|| ( |
| 105 |
virtual/opengl |
| 106 |
@@ -39,6 +49,7 @@ RDEPEND=" |
| 107 |
glew? ( media-libs/glew:0= ) |
| 108 |
) |
| 109 |
png? ( media-libs/libpng:0 ) |
| 110 |
+ sndio? ( media-sound/sndio:= ) |
| 111 |
speech? ( app-accessibility/speech-dispatcher ) |
| 112 |
truetype? ( media-libs/freetype:2 ) |
| 113 |
theora? ( media-libs/libtheora ) |
| 114 |
@@ -58,7 +69,7 @@ BDEPEND=" |
| 115 |
S="${WORKDIR}/${P/_/}" |
| 116 |
|
| 117 |
src_prepare() { |
| 118 |
- xdg_src_prepare |
| 119 |
+ default |
| 120 |
|
| 121 |
# -g isn't needed for nasm here |
| 122 |
sed -i \ |
| 123 |
@@ -73,6 +84,7 @@ src_prepare() { |
| 124 |
|
| 125 |
src_configure() { |
| 126 |
use x86 && append-ldflags -Wl,-z,noexecstack |
| 127 |
+ tc-export STRINGS |
| 128 |
|
| 129 |
local myconf=( |
| 130 |
--backend=sdl |
| 131 |
@@ -96,6 +108,7 @@ src_configure() { |
| 132 |
$(use_enable lua) |
| 133 |
$(use_enable mp3 mad) |
| 134 |
$(use_enable mpeg2) |
| 135 |
+ $(use_enable net libcurl) |
| 136 |
$(use_enable net sdlnet) |
| 137 |
$(use_enable png) |
| 138 |
$(use_enable sndio) |
| 139 |
@@ -116,8 +129,7 @@ src_configure() { |
| 140 |
src_compile() { |
| 141 |
emake \ |
| 142 |
AR="$(tc-getAR) cru" \ |
| 143 |
- RANLIB="$(tc-getRANLIB)" \ |
| 144 |
- STRINGS="$(tc-getSTRINGS)" |
| 145 |
+ RANLIB="$(tc-getRANLIB)" |
| 146 |
} |
| 147 |
|
| 148 |
src_install() { |
Archives