diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2018-05-06 11:18:16 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2018-05-06 11:18:16 +0100 |
| commit | ebce8994fe3cc4ca9fbc96ca837cb4c4e98adcbd (patch) | |
| tree | f2204ce5f94dc3cb13728ff93649d889944952bb /games-engines | |
| parent | fe1c8b732bd548b699d4c2ef725f67f8b8c8911c (diff) | |
gentoo resync : 06.05.2018
Diffstat (limited to 'games-engines')
| -rw-r--r-- | games-engines/Manifest.gz | bin | 3376 -> 3378 bytes | |||
| -rw-r--r-- | games-engines/scummvm/Manifest | 3 | ||||
| -rw-r--r-- | games-engines/scummvm/files/scummvm-2.0.0-freetype_pkgconfig.patch | 50 | ||||
| -rw-r--r-- | games-engines/scummvm/scummvm-2.0.0.ebuild | 6 |
4 files changed, 56 insertions, 3 deletions
diff --git a/games-engines/Manifest.gz b/games-engines/Manifest.gz Binary files differindex 46eae48f54dc..c0e59d97f564 100644 --- a/games-engines/Manifest.gz +++ b/games-engines/Manifest.gz diff --git a/games-engines/scummvm/Manifest b/games-engines/scummvm/Manifest index 9ba251b0f11e..ea6065e0442a 100644 --- a/games-engines/scummvm/Manifest +++ b/games-engines/scummvm/Manifest @@ -1,5 +1,6 @@ +AUX scummvm-2.0.0-freetype_pkgconfig.patch 1268 BLAKE2B 5e8ba330de40cd2c7165ab76b3d282f5c2fd94a3caeace93e6c4953fb72486a515f5ebcb0a40d3ca2e38759402c28cf243755cac438c6e4d5d78c34752327644 SHA512 efe188427c15b8442eb49dbbd431fb87c48d59057b5d941fe7a4f41d022a846f6b4f24e7f3bec8496ae306c2b56ed5eb53cc270e15fb767672b090fed9309118 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 2575 BLAKE2B 7965ddcff62fd65ec4c12c0baadb7a448e0502f60c9a34a336924fced0b65c7850408cde3433dffc6bc380776bb419a055aef2602f4052aa4279a6c50ab96e0b SHA512 56eac37da16d842732e436607093d7c9564dedc9c7557259de23211670ed7e215f1731aef3ba445ffce2215c158a2208a2d5d449578f37a4d86d445a750d86d3 +EBUILD scummvm-2.0.0.ebuild 2641 BLAKE2B 6ea118364671f276388e1528faf3028cce59707edbd3d517e943873e641864458d9a16bb8d9194c6d8e2c21a3e2e1b5e3236c66de07bd850571f5dd6603a3948 SHA512 856bbfb2567125ab8e94c672d4e379952928be2fec3ce97f9fa08711f66375b8c4c1c07973ad2c582fb473e8037a6b717f3e446d9211ea7d55f3ece27c98788f 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 new file mode 100644 index 000000000000..669cffc945ce --- /dev/null +++ b/games-engines/scummvm/files/scummvm-2.0.0-freetype_pkgconfig.patch @@ -0,0 +1,50 @@ +From 86c7fd67e5ab2e721de8493d162d7605b1b08823 Mon Sep 17 00:00:00 2001 +From: Lars Wendler <polynomial-c@gentoo.org> +Date: Sun, 6 May 2018 10:22:48 +0200 +Subject: [PATCH] Use pkg-config to find freetype if freetype-config is not + available + +--- + configure | 17 +++++++++++------ + 1 file changed, 11 insertions(+), 6 deletions(-) + +diff --git a/configure b/configure +index 8e2a387acc..e3c15a9a2a 100755 +--- a/configure ++++ b/configure +@@ -4674,7 +4674,13 @@ if test "$_freetype2" != "no"; then + find_freetypeconfig + + if test -z "$_freetypeconfig"; then +- _freetype2=no ++ if pkg-config --exists freetype2; then ++ FREETYPE2_LIBS=`pkg-config --libs freetype2` ++ FREETYPE2_CFLAGS=`pkg-config --cflags freetype2` ++ _freetype2=yes ++ else ++ _freetype2=no ++ fi + else + # Since 2.3.12, freetype-config prepends $SYSROOT to everything. + # This means we can't pass it a --prefix that includes $SYSROOT. +@@ -4714,13 +4720,12 @@ EOF + fi + cc_check_clean + fi +- +- if test "$_freetype2" = "yes"; then +- append_var LIBS "$FREETYPE2_LIBS" +- append_var INCLUDES "$FREETYPE2_CFLAGS" +- fi + fi + ++ if test "$_freetype2" = "yes"; then ++ append_var LIBS "$FREETYPE2_LIBS" ++ append_var INCLUDES "$FREETYPE2_CFLAGS" ++ fi + fi + + echocheck "FreeType2" +-- +2.17.0 + diff --git a/games-engines/scummvm/scummvm-2.0.0.ebuild b/games-engines/scummvm/scummvm-2.0.0.ebuild index 4f775bc1705d..0df104f23aa1 100644 --- a/games-engines/scummvm/scummvm-2.0.0.ebuild +++ b/games-engines/scummvm/scummvm-2.0.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -32,7 +32,9 @@ DEPEND="${RDEPEND} app-arch/xz-utils x86? ( dev-lang/nasm )" -S=${WORKDIR}/${P/_/} +S="${WORKDIR}/${P/_/}" + +PATCHES=( "${FILESDIR}/${PN}-2.0.0-freetype_pkgconfig.patch" ) src_prepare() { default |