diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2018-07-14 20:58:29 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2018-07-14 20:58:29 +0100 |
commit | 0cf2f20608308acdf3cb922c3736446bbd8f3388 (patch) | |
tree | 07815070629c7c11000a7f51ceb8ccbccb49a809 /games-engines/scummvm | |
parent | 1798c4aeca70ac8d0a243684d6a798fbc65735f8 (diff) |
gentoo resync : 14.07.2018
Diffstat (limited to 'games-engines/scummvm')
-rw-r--r-- | games-engines/scummvm/Manifest | 6 | ||||
-rw-r--r-- | games-engines/scummvm/files/scummvm-2.0.0-freetype_pkgconfig.patch | 99 | ||||
-rw-r--r-- | games-engines/scummvm/metadata.xml | 16 | ||||
-rw-r--r-- | games-engines/scummvm/scummvm-1.9.0.ebuild | 102 | ||||
-rw-r--r-- | games-engines/scummvm/scummvm-2.0.0.ebuild | 106 |
5 files changed, 0 insertions, 329 deletions
diff --git a/games-engines/scummvm/Manifest b/games-engines/scummvm/Manifest deleted file mode 100644 index 719bb82ab845..000000000000 --- a/games-engines/scummvm/Manifest +++ /dev/null @@ -1,6 +0,0 @@ -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.ebuild 2674 BLAKE2B da7418300d9679edba0a941b91300ee9cdc998375ff256910add03158e0038e8663f225585dd4f065173886bc7b1ff88a66d3e9ba73e1f60682f2339795b7dbd SHA512 a4617505bc8f601e78cf347e2459a4f1bdd3a5957ac500a4bf57a0cec574df8e110bd9fb6ef7ca7d44378b236f571b88b4724de4d41ebef45ba77a15a2b43ab7 -MISC metadata.xml 594 BLAKE2B 0c282f09b9bb6fbd7bf89a07595064c7102ad05b39cba2689451fd9555206eb66ee331fcec41b75b7c0a41b01a2301c142608d1a4d4371fcc59d45a2d337ec7d SHA512 6f1c61823667d4fa79900a3be3cb553e37bded1e39124f037cbef7a81bad52f4fbdd79987e28505ea27261b4ca2728bc63eeec0f93034a6e67c5504d915fbfd6 diff --git a/games-engines/scummvm/files/scummvm-2.0.0-freetype_pkgconfig.patch b/games-engines/scummvm/files/scummvm-2.0.0-freetype_pkgconfig.patch deleted file mode 100644 index ca5c5e892710..000000000000 --- a/games-engines/scummvm/files/scummvm-2.0.0-freetype_pkgconfig.patch +++ /dev/null @@ -1,99 +0,0 @@ -From 48a3f5bcba1837517e3d9d029ebe5e8fbd3f0966 Mon Sep 17 00:00:00 2001 -From: Lars Wendler <polynomial-c@gentoo.org> -Date: Sun, 6 May 2018 20:55:29 +0200 -Subject: [PATCH] Prefer pkg-config over freetype-config if possible - -As of freetype-2.9.1 the freetype-config script no longer gets installed -by default. ---- - configure | 56 ++++++++++++++++++++++++++++++++++++------------------- - 1 file changed, 37 insertions(+), 19 deletions(-) - -diff --git a/configure b/configure -index 8e2a387acc..210951e343 100755 ---- a/configure -+++ b/configure -@@ -204,6 +204,7 @@ _sparklepath= - _sdlconfig=sdl2-config - _libcurlconfig=curl-config - _freetypeconfig=freetype-config -+_freetype_found="false" - _sdlpath="$PATH" - _freetypepath="$PATH" - _libcurlpath="$PATH" -@@ -4668,28 +4669,45 @@ echo "$_libunity" - # - # Check for FreeType2 to be present - # --if test "$_freetype2" != "no"; then -- -- # Look for the freetype-config script -- find_freetypeconfig -- -- if test -z "$_freetypeconfig"; then -- _freetype2=no -+find_freetype() { -+ # Wrapper function which tries to find freetype -+ # either by callimg freetype-config or by using -+ # pkg-config. -+ # As of freetype-2.9.1 the freetype-config file -+ # no longer gets installed by default. -+ -+ if pkg-config --exists freetype2; then -+ FREETYPE2_LIBS=`pkg-config --libs freetype2` -+ FREETYPE2_CFLAGS=`pkg-config --cflags freetype2` -+ FREETYPE2_STATIC_LIBS=`pkg-config --static --libs freetype2` -+ _freetype_found="true" - else -- # Since 2.3.12, freetype-config prepends $SYSROOT to everything. -- # This means we can't pass it a --prefix that includes $SYSROOT. -- freetypeprefix="$_freetypepath" -- if test -n "$SYSROOT" -a "$SYSROOT" != "/"; then -- teststring=VeryImplausibleSysrootX1Y2Z3 -- if ( env SYSROOT=/$teststring "$_freetypeconfig" --cflags | grep $teststring 2> /dev/null > /dev/null ); then -- echo "Adapting FreeType prefix to SYSROOT" >> "$TMPLOG" -- freetypeprefix="${freetypeprefix##$SYSROOT}" -+ # Look for the freetype-config script -+ find_freetypeconfig -+ if test -n "$_freetypeconfig"; then -+ # Since 2.3.12, freetype-config prepends $SYSROOT to everything. -+ # This means we can't pass it a --prefix that includes $SYSROOT. -+ freetypeprefix="$_freetypepath" -+ if test -n "$SYSROOT" -a "$SYSROOT" != "/"; then -+ teststring=VeryImplausibleSysrootX1Y2Z3 -+ if ( env SYSROOT=/$teststring "$_freetypeconfig" --cflags | grep $teststring 2> /dev/null > /dev/null ); then -+ echo "Adapting FreeType prefix to SYSROOT" >> "$TMPLOG" -+ freetypeprefix="${freetypeprefix##$SYSROOT}" -+ fi - fi -+ FREETYPE2_LIBS=`$_freetypeconfig --prefix="$freetypeprefix" --libs` -+ FREETYPE2_CFLAGS=`$_freetypeconfig --prefix="$freetypeprefix" --cflags` -+ FREETYPE2_STATIC_LIBS=`$_freetypeconfig --prefix="$freetypeprefix" --static --libs 2>/dev/null` -+ _freetype_found="true" - fi -+ fi -+} - -- FREETYPE2_LIBS=`$_freetypeconfig --prefix="$freetypeprefix" --libs` -- FREETYPE2_CFLAGS=`$_freetypeconfig --prefix="$freetypeprefix" --cflags` -- -+if test "$_freetype2" != "no"; then -+ find_freetype -+ if test $_freetype_found != true; then -+ _freetype2=no -+ else - if test "$_freetype2" = "auto"; then - _freetype2=no - -@@ -4709,7 +4727,7 @@ EOF - # required flags for static linking. We abuse this to detect - # FreeType2 builds which are static themselves. - if test "$_freetype2" != "yes"; then -- FREETYPE2_LIBS=`$_freetypeconfig --prefix="$_freetypepath" --static --libs 2>/dev/null` -+ FREETYPE2_LIBS="$FREETYPE2_STATIC_LIBS" - cc_check_no_clean $FREETYPE2_CFLAGS $FREETYPE2_LIBS && _freetype2=yes - fi - cc_check_clean --- -2.17.0 - diff --git a/games-engines/scummvm/metadata.xml b/games-engines/scummvm/metadata.xml deleted file mode 100644 index 3f7ace82af07..000000000000 --- a/games-engines/scummvm/metadata.xml +++ /dev/null @@ -1,16 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>games@gentoo.org</email> - <name>Gentoo Games Project</name> - </maintainer> - <use> - <flag name="fluidsynth">compile with support for fluidsynth</flag> - <flag name="mpeg2">enable mpeg2 codec for cutscenes</flag> - <flag name="unsupported">enable unsupported and/or broken game engines (you're on your own)</flag> - </use> - <upstream> - <remote-id type="sourceforge">scummvm</remote-id> - </upstream> -</pkgmetadata> diff --git a/games-engines/scummvm/scummvm-1.9.0.ebuild b/games-engines/scummvm/scummvm-1.9.0.ebuild deleted file mode 100644 index 5e45b6299556..000000000000 --- a/games-engines/scummvm/scummvm-1.9.0.ebuild +++ /dev/null @@ -1,102 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit eutils flag-o-matic gnome2-utils toolchain-funcs - -DESCRIPTION="Reimplementation of the SCUMM game engine used in Lucasarts adventures" -HOMEPAGE="http://scummvm.sourceforge.net/" -SRC_URI="http://scummvm.org/frs/scummvm/${PV}/${P}.tar.xz" - -LICENSE="GPL-2+ LGPL-2.1 BSD GPL-3-with-font-exception" -SLOT="0" -KEYWORDS="~amd64 ~ppc64 ~x86 ~x86-fbsd" -IUSE="aac alsa debug flac fluidsynth jpeg mpeg2 mp3 opengl png 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] - zlib? ( sys-libs/zlib ) - jpeg? ( virtual/jpeg:0 ) - png? ( media-libs/libpng:0 ) - vorbis? ( media-libs/libogg media-libs/libvorbis ) - theora? ( media-libs/libtheora ) - aac? ( media-libs/faad2 ) - alsa? ( media-libs/alsa-lib ) - mp3? ( media-libs/libmad ) - mpeg2? ( media-libs/libmpeg2 ) - flac? ( media-libs/flac ) - opengl? ( virtual/opengl ) - truetype? ( media-libs/freetype:2 ) - fluidsynth? ( media-sound/fluidsynth )" -DEPEND="${RDEPEND} - app-arch/xz-utils - x86? ( dev-lang/nasm )" - -S=${WORKDIR}/${P/_/} - -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 - - # 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 -} - -src_compile() { - 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 -} - -pkg_postinst() { - gnome2_icon_cache_update -} - -pkg_postrm() { - gnome2_icon_cache_update -} diff --git a/games-engines/scummvm/scummvm-2.0.0.ebuild b/games-engines/scummvm/scummvm-2.0.0.ebuild deleted file mode 100644 index b4df47b76af2..000000000000 --- a/games-engines/scummvm/scummvm-2.0.0.ebuild +++ /dev/null @@ -1,106 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit eutils flag-o-matic gnome2-utils toolchain-funcs xdg-utils - -DESCRIPTION="Reimplementation of the SCUMM game engine used in Lucasarts adventures" -HOMEPAGE="http://scummvm.sourceforge.net/" -SRC_URI="http://scummvm.org/frs/scummvm/${PV}/${P}.tar.xz" - -LICENSE="GPL-2+ LGPL-2.1 BSD GPL-3-with-font-exception" -SLOT="0" -KEYWORDS="~amd64 ~ppc64 ~x86 ~x86-fbsd" -IUSE="aac alsa debug flac fluidsynth jpeg mpeg2 mp3 opengl png 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] - zlib? ( sys-libs/zlib ) - jpeg? ( virtual/jpeg:0 ) - png? ( media-libs/libpng:0 ) - vorbis? ( media-libs/libogg media-libs/libvorbis ) - theora? ( media-libs/libtheora ) - aac? ( media-libs/faad2 ) - alsa? ( media-libs/alsa-lib ) - mp3? ( media-libs/libmad ) - mpeg2? ( media-libs/libmpeg2 ) - flac? ( media-libs/flac ) - opengl? ( virtual/opengl ) - truetype? ( media-libs/freetype:2 ) - fluidsynth? ( media-sound/fluidsynth )" -DEPEND="${RDEPEND} - app-arch/xz-utils - truetype? ( virtual/pkgconfig ) - x86? ( dev-lang/nasm )" - -S="${WORKDIR}/${P/_/}" - -PATCHES=( "${FILESDIR}/${PN}-2.0.0-freetype_pkgconfig.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 - - # 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 -} - -src_compile() { - emake AR="$(tc-getAR) cru" RANLIB=$(tc-getRANLIB) -} - -src_install() { - default - doicon -s scalable icons/scummvm.svg -} - -pkg_preinst() { - gnome2_icon_savelist -} - -pkg_postinst() { - gnome2_icon_cache_update - xdg_desktop_database_update -} - -pkg_postrm() { - gnome2_icon_cache_update - xdg_desktop_database_update -} |