From f1f54feb4f20e305945cbf832344929c0619aeb7 Mon Sep 17 00:00:00 2001 From: Alexey Sokolov Date: Mon, 6 Sep 2021 01:01:37 +0100 Subject: 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 Signed-off-by: Ionen Wolkens --- games-engines/scummvm/scummvm-2.2.0-r1.ebuild | 127 ------------------------- games-engines/scummvm/scummvm-2.2.0-r2.ebuild | 132 ++++++++++++++++++++++++++ 2 files changed, 132 insertions(+), 127 deletions(-) delete mode 100644 games-engines/scummvm/scummvm-2.2.0-r1.ebuild create mode 100644 games-engines/scummvm/scummvm-2.2.0-r2.ebuild diff --git a/games-engines/scummvm/scummvm-2.2.0-r1.ebuild b/games-engines/scummvm/scummvm-2.2.0-r1.ebuild deleted file mode 100644 index b6022c564f3f..000000000000 --- a/games-engines/scummvm/scummvm-2.2.0-r1.ebuild +++ /dev/null @@ -1,127 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit desktop flag-o-matic toolchain-funcs xdg - -DESCRIPTION="Reimplementation of the SCUMM game engine used in Lucasarts adventures" -HOMEPAGE="https://www.scummvm.org/" -SRC_URI="https://scummvm.org/frs/scummvm/${PV}/${P}.tar.xz" - -LICENSE="GPL-2+ LGPL-2.1 BSD GPL-3-with-font-exception" -SLOT="0" -KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86" -IUSE="a52 aac alsa debug flac fluidsynth fribidi +gtk jpeg lua mpeg2 mp3 +net opengl png sndio speech theora truetype unsupported vorbis zlib" -RESTRICT="test" # it only looks like there's a test there #77507 - -RDEPEND=" - >=media-libs/libsdl2-2.0.0[sound,joystick,video] - a52? ( media-libs/a52dec ) - aac? ( media-libs/faad2 ) - alsa? ( media-libs/alsa-lib ) - flac? ( media-libs/flac ) - fluidsynth? ( media-sound/fluidsynth:= ) - fribidi? ( dev-libs/fribidi ) - gtk? ( - dev-libs/glib:2 - x11-libs/gtk+:3 - ) - jpeg? ( virtual/jpeg:0 ) - mp3? ( media-libs/libmad ) - mpeg2? ( media-libs/libmpeg2 ) - net? ( media-libs/sdl2-net ) - opengl? ( || ( - virtual/opengl - media-libs/mesa[gles2] - media-libs/mesa[gles1] - ) ) - png? ( media-libs/libpng:0 ) - speech? ( app-accessibility/speech-dispatcher ) - truetype? ( media-libs/freetype:2 ) - theora? ( media-libs/libtheora ) - vorbis? ( - media-libs/libogg - media-libs/libvorbis - ) - zlib? ( sys-libs/zlib:= ) -" -DEPEND="${RDEPEND}" -BDEPEND=" - app-arch/xz-utils - truetype? ( virtual/pkgconfig ) - x86? ( dev-lang/nasm ) -" - -S="${WORKDIR}/${P/_/}" - -PATCHES=( - "${FILESDIR}/${P}-ultima_engine_lua_dep.patch" - "${FILESDIR}/${P}-fluidsynth-2.2.patch" -) - -src_prepare() { - xdg_src_prepare - - # -g isn't needed for nasm here - sed -i \ - -e '/NASMFLAGS/ s/-g//' \ - configure || die - sed -i \ - -e '/INSTALL.*doc/d' \ - -e '/INSTALL.*\/pixmaps/d' \ - -e 's/-s //' \ - ports.mk || die -} - -src_configure() { - use x86 && append-ldflags -Wl,-z,noexecstack - - local myconf=( - --backend=sdl - --host=${CHOST} - --enable-verbose-build - --prefix="${EPREFIX}/usr" - --libdir="${EPREFIX}/usr/$(get_libdir)" - --opengl-mode=$(usex opengl auto none) - --with-sdl-prefix="${EPREFIX}/usr" - $(use_enable a52) - $(use_enable aac faad) - $(use_enable alsa) - $(use_enable debug) - $(use_enable !debug release-mode) - $(use_enable flac) - $(usex fluidsynth '' --disable-fluidsynth) - $(use_enable fribidi) - $(use_enable gtk) - $(use_enable jpeg) - $(use_enable lua) - $(use_enable mp3 mad) - $(use_enable mpeg2) - $(use_enable net sdlnet) - $(use_enable png) - $(use_enable sndio) - $(use_enable speech tts) - $(use_enable theora theoradec) - $(use_enable truetype freetype2) - $(usex unsupported --enable-all-engines '') - $(use_enable vorbis) - $(use_enable zlib) - $(use_enable x86 nasm) - ) - echo "configure ${myconf[@]}" - # NOT AN AUTOCONF SCRIPT SO DONT CALL ECONF - SDL_CONFIG="sdl2-config" \ - ./configure "${myconf[@]}" "${EXTRA_ECONF}" || die -} - -src_compile() { - emake \ - AR="$(tc-getAR) cru" \ - RANLIB="$(tc-getRANLIB)" \ - STRINGS="$(tc-getSTRINGS)" -} - -src_install() { - default - doicon -s scalable icons/scummvm.svg -} diff --git a/games-engines/scummvm/scummvm-2.2.0-r2.ebuild b/games-engines/scummvm/scummvm-2.2.0-r2.ebuild new file mode 100644 index 000000000000..afdf8a36bf7c --- /dev/null +++ b/games-engines/scummvm/scummvm-2.2.0-r2.ebuild @@ -0,0 +1,132 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +inherit desktop flag-o-matic toolchain-funcs xdg + +DESCRIPTION="Reimplementation of the SCUMM game engine used in Lucasarts adventures" +HOMEPAGE="https://www.scummvm.org/" +SRC_URI="https://scummvm.org/frs/scummvm/${PV}/${P}.tar.xz" + +LICENSE="GPL-2+ LGPL-2.1 BSD GPL-3-with-font-exception" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86" +IUSE="a52 aac alsa debug flac fluidsynth fribidi +gtk jpeg lua mpeg2 mp3 +net opengl png sndio speech theora truetype unsupported vorbis zlib" +RESTRICT="test" # it only looks like there's a test there #77507 + +RDEPEND=" + >=media-libs/libsdl2-2.0.0[sound,joystick,video] + a52? ( media-libs/a52dec ) + aac? ( media-libs/faad2 ) + alsa? ( media-libs/alsa-lib ) + flac? ( media-libs/flac ) + fluidsynth? ( media-sound/fluidsynth:= ) + fribidi? ( dev-libs/fribidi ) + gtk? ( + dev-libs/glib:2 + x11-libs/gtk+:3 + ) + jpeg? ( virtual/jpeg:0 ) + mp3? ( media-libs/libmad ) + mpeg2? ( media-libs/libmpeg2 ) + 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 ) + vorbis? ( + media-libs/libogg + media-libs/libvorbis + ) + zlib? ( sys-libs/zlib:= ) +" +DEPEND="${RDEPEND}" +BDEPEND=" + app-arch/xz-utils + truetype? ( virtual/pkgconfig ) + x86? ( dev-lang/nasm ) +" + +S="${WORKDIR}/${P/_/}" + +PATCHES=( + "${FILESDIR}/${P}-ultima_engine_lua_dep.patch" + "${FILESDIR}/${P}-fluidsynth-2.2.patch" +) + +src_prepare() { + default + + # -g isn't needed for nasm here + sed -i \ + -e '/NASMFLAGS/ s/-g//' \ + configure || die + sed -i \ + -e '/INSTALL.*doc/d' \ + -e '/INSTALL.*\/pixmaps/d' \ + -e 's/-s //' \ + ports.mk || die +} + +src_configure() { + use x86 && append-ldflags -Wl,-z,noexecstack + tc-export STRINGS + + local myconf=( + --backend=sdl + --host=${CHOST} + --enable-verbose-build + --prefix="${EPREFIX}/usr" + --libdir="${EPREFIX}/usr/$(get_libdir)" + --opengl-mode=$(usex opengl auto none) + --with-sdl-prefix="${EPREFIX}/usr" + $(use_enable a52) + $(use_enable aac faad) + $(use_enable alsa) + $(use_enable debug) + $(use_enable !debug release-mode) + $(use_enable flac) + $(usex fluidsynth '' --disable-fluidsynth) + $(use_enable fribidi) + $(use_enable gtk) + $(use_enable jpeg) + $(use_enable lua) + $(use_enable mp3 mad) + $(use_enable mpeg2) + $(use_enable net libcurl) + $(use_enable net sdlnet) + $(use_enable png) + $(use_enable sndio) + $(use_enable speech tts) + $(use_enable theora theoradec) + $(use_enable truetype freetype2) + $(usex unsupported --enable-all-engines '') + $(use_enable vorbis) + $(use_enable zlib) + $(use_enable x86 nasm) + ) + echo "configure ${myconf[@]}" + # NOT AN AUTOCONF SCRIPT SO DONT CALL ECONF + SDL_CONFIG="sdl2-config" \ + ./configure "${myconf[@]}" "${EXTRA_ECONF}" || die +} + +src_compile() { + emake \ + AR="$(tc-getAR) cru" \ + RANLIB="$(tc-getRANLIB)" +} + +src_install() { + default + doicon -s scalable icons/scummvm.svg +} -- cgit v1.2.3-18-g5258