diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2019-03-19 11:37:34 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2019-03-19 11:37:34 +0000 |
commit | b7b97785ebbb2f11d24d14dab8b81ed274f4ce6a (patch) | |
tree | 9fd110f9fc996e8a4213eeda994a8c112491b86d /games-engines/scummvm | |
parent | 066d27181e9a797ad9f8fc43b49fc9a10ff2f707 (diff) |
gentoo resync : 19.03.2019
Diffstat (limited to 'games-engines/scummvm')
-rw-r--r-- | games-engines/scummvm/Manifest | 3 | ||||
-rw-r--r-- | games-engines/scummvm/scummvm-2.0.0-r1.ebuild (renamed from games-engines/scummvm/scummvm-1.9.0.ebuild) | 82 |
2 files changed, 46 insertions, 39 deletions
diff --git a/games-engines/scummvm/Manifest b/games-engines/scummvm/Manifest index 719bb82ab845..23a78401199c 100644 --- a/games-engines/scummvm/Manifest +++ b/games-engines/scummvm/Manifest @@ -1,6 +1,5 @@ AUX scummvm-2.0.0-freetype_pkgconfig.patch 3651 BLAKE2B 59d53792e79b01e65d604f35b7947c83f700fa6019625c925f798bd389fbe3e1f21b28577ed93ce9c22ebd065ab61538cc80792a9a7c5e71248e6fd6a61690e1 SHA512 6e4cae49814442d111fb07f238108cbe995a8af4d0e23951e4d040d08db7e3925ff97b91b9053495cfd757396ed8790ec4dc8a44d7782cde915837118be95b44 -DIST scummvm-1.9.0.tar.xz 22020384 BLAKE2B 10f2c20cf1e32a60897c9e909e0bfda7827a646eb38aaf4923b76708fb5b797c66f94d92f7c095ca77570712223cd0d037fccc563c709448d4d2093299050773 SHA512 c81248e8474ad5b354a46741ab2e40b8ddfb99e196b0c837424e9ccced285d03d5f12fc41be57034be53bdb8254a61ca0c9d9cd9a2340875d32e1bffa31699c2 DIST scummvm-2.0.0.tar.xz 21291656 BLAKE2B 303aa4254d1c940ce6d65d192f2678a033015f1b85e38c62902aa8fac05a1ff33fd7e3fe9de47825cd0cf72076027adb21c72a63a38349f9ee8f63566f3db948 SHA512 5f4c11145c5dfcc7ae95d5c0e5ac9e938912cc5060b9d5fdfcb699a745755b31412e44199e487ad388ca5e091afc3366f874610adb44d440f336e26d6cd4812c -EBUILD scummvm-1.9.0.ebuild 2572 BLAKE2B 31a15a603f5b6fa33ad38da05a439e0285e4af3cf9212c8e9e403775184045a60ccff0910733ad258772420325d2395f52a54a75582f177b87bd3ad628324f0d SHA512 6d6d2bbddd94c21be730b1903f6c315a2fffe0d4ac95b41ab5cc41e08c67871a74936faaacdd49b3c2a0118caef8c7a5703ff850bc938449e233a7acfa08b606 +EBUILD scummvm-2.0.0-r1.ebuild 2593 BLAKE2B 33241fd8d519d764fe159ba8878eb54b6c82133e86c56b546e7154322640c2d52b9603986235937eb0717faa75650e3982abd4ba9a8d77a7a163cb13882a6125 SHA512 6ede107638bb458fc88ce58ca2e258fdef8afbdf6658a5ad77b174788979acf58e0a000ebd6bb92a54ab6b0dd9e0366cd69f4ea4cec455b7a34a28c16473e8c3 EBUILD scummvm-2.0.0.ebuild 2674 BLAKE2B da7418300d9679edba0a941b91300ee9cdc998375ff256910add03158e0038e8663f225585dd4f065173886bc7b1ff88a66d3e9ba73e1f60682f2339795b7dbd SHA512 a4617505bc8f601e78cf347e2459a4f1bdd3a5957ac500a4bf57a0cec574df8e110bd9fb6ef7ca7d44378b236f571b88b4724de4d41ebef45ba77a15a2b43ab7 MISC metadata.xml 594 BLAKE2B 0c282f09b9bb6fbd7bf89a07595064c7102ad05b39cba2689451fd9555206eb66ee331fcec41b75b7c0a41b01a2301c142608d1a4d4371fcc59d45a2d337ec7d SHA512 6f1c61823667d4fa79900a3be3cb553e37bded1e39124f037cbef7a81bad52f4fbdd79987e28505ea27261b4ca2728bc63eeec0f93034a6e67c5504d915fbfd6 diff --git a/games-engines/scummvm/scummvm-1.9.0.ebuild b/games-engines/scummvm/scummvm-2.0.0-r1.ebuild index 5e45b6299556..858b3bcc36b5 100644 --- a/games-engines/scummvm/scummvm-1.9.0.ebuild +++ b/games-engines/scummvm/scummvm-2.0.0-r1.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 -inherit eutils flag-o-matic gnome2-utils toolchain-funcs +EAPI=7 +inherit desktop flag-o-matic toolchain-funcs xdg DESCRIPTION="Reimplementation of the SCUMM game engine used in Lucasarts adventures" HOMEPAGE="http://scummvm.sourceforge.net/" @@ -15,10 +15,13 @@ IUSE="aac alsa debug flac fluidsynth jpeg mpeg2 mp3 opengl png theora truetype u RESTRICT="test" # it only looks like there's a test there #77507 RDEPEND=">=media-libs/libsdl2-2.0.0[sound,joystick,video] - zlib? ( sys-libs/zlib ) + zlib? ( sys-libs/zlib:= ) jpeg? ( virtual/jpeg:0 ) png? ( media-libs/libpng:0 ) - vorbis? ( media-libs/libogg media-libs/libvorbis ) + vorbis? ( + media-libs/libogg + media-libs/libvorbis + ) theora? ( media-libs/libtheora ) aac? ( media-libs/faad2 ) alsa? ( media-libs/alsa-lib ) @@ -28,11 +31,16 @@ RDEPEND=">=media-libs/libsdl2-2.0.0[sound,joystick,video] opengl? ( virtual/opengl ) truetype? ( media-libs/freetype:2 ) fluidsynth? ( media-sound/fluidsynth )" -DEPEND="${RDEPEND} +DEPEND="${RDEPEND}" +BDEPEND=" app-arch/xz-utils - x86? ( dev-lang/nasm )" + truetype? ( virtual/pkgconfig ) + x86? ( dev-lang/nasm ) +" -S=${WORKDIR}/${P/_/} +S="${WORKDIR}/${P/_/}" + +PATCHES=( "${FILESDIR}/${PN}-2.0.0-freetype_pkgconfig.patch" ) src_prepare() { default @@ -51,52 +59,52 @@ src_prepare() { 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) + $(use_enable aac faad) + $(use_enable alsa) + $(use_enable debug) + $(use_enable !debug release-mode) + $(use_enable flac) + $(usex fluidsynth '' --disable-fluidsynth) + $(use_enable jpeg) + $(use_enable mp3 mad) + $(use_enable mpeg2) + $(use_enable png) + $(use_enable theora theoradec) + $(use_enable truetype freetype2) + $(usex unsupported --enable-all-engines '') + $(use_enable vorbis) + $(use_enable zlib) + $(use_enable x86 nasm) + ) # NOT AN AUTOCONF SCRIPT SO DONT CALL ECONF SDL_CONFIG="sdl2-config" \ - ./configure \ - --backend=sdl \ - --host=${CHOST} \ - --enable-verbose-build \ - --prefix=/usr \ - --libdir="/usr/$(get_libdir)" \ - --opengl-mode=$(usex opengl auto none) \ - $(use_enable aac faad) \ - $(use_enable alsa) \ - $(use_enable debug) \ - $(use_enable !debug release-mode) \ - $(use_enable flac) \ - $(usex fluidsynth '' --disable-fluidsynth) \ - $(use_enable jpeg) \ - $(use_enable mp3 mad) \ - $(use_enable mpeg2) \ - $(use_enable png) \ - $(use_enable theora theoradec) \ - $(use_enable truetype freetype2) \ - $(usex unsupported --enable-all-engines '') \ - $(use_enable vorbis) \ - $(use_enable zlib) \ - $(use_enable x86 nasm) \ - ${myconf} ${EXTRA_ECONF} || die + ./configure "${myconf[@]}" "${EXTRA_ECONF}" || die } src_compile() { - emake AR="$(tc-getAR) cru" RANLIB=$(tc-getRANLIB) + emake AR="$(tc-getAR) cru" RANLIB="$(tc-getRANLIB)" } src_install() { default doicon -s scalable icons/scummvm.svg - make_desktop_entry scummvm ScummVM scummvm "Game;AdventureGame" } pkg_preinst() { - gnome2_icon_savelist + xdg_pkg_preinst } pkg_postinst() { - gnome2_icon_cache_update + xdg_pkg_postinst } pkg_postrm() { - gnome2_icon_cache_update + xdg_pkg_postrm } |