diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2021-09-10 04:21:55 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2021-09-10 04:21:55 +0100 |
| commit | 677b7ba5c317778df2ad7e70df94b9b7eec4adbc (patch) | |
| tree | 6c418a1546fff5becab5d8b9ed6803323e7f316e /games-engines/scummvm-tools | |
| parent | fbda87924e6faa7a1919f1a2b4182490bde5ec5c (diff) | |
gentoo resync : 10.09.2021
Diffstat (limited to 'games-engines/scummvm-tools')
| -rw-r--r-- | games-engines/scummvm-tools/Manifest | 3 | ||||
| -rw-r--r-- | games-engines/scummvm-tools/files/scummvm-tools-2.2.0-strings.patch | 17 | ||||
| -rw-r--r-- | games-engines/scummvm-tools/scummvm-tools-2.2.0.ebuild | 13 |
3 files changed, 24 insertions, 9 deletions
diff --git a/games-engines/scummvm-tools/Manifest b/games-engines/scummvm-tools/Manifest index b3ca9d992b75..7d11aabbb1ba 100644 --- a/games-engines/scummvm-tools/Manifest +++ b/games-engines/scummvm-tools/Manifest @@ -1,6 +1,7 @@ AUX scummvm-tools-1.8.0-binprefix.patch 539 BLAKE2B 8c3ebc7202e209552fe2521e445a8a1dd025bfa872bd78cc31f05c01b2d559f619f3f1f15dd9f26a66d192410fc5404a5b0afee636cd33603112535500d07459 SHA512 4d2f06dcc3092dd5abab218b68c83dfc2353810b56e3a1d41fab1c7eb20b008ed2e54af486c4c4f2ecbd383ef0afa6f333ed90c694ed3b1733393a6f2ef6fbe3 +AUX scummvm-tools-2.2.0-strings.patch 559 BLAKE2B 44d3c40cd57293cc589a19b7e73f737e84cbbc88ece32e8b078dbf3ada0b4a9d8cafa0a96ad2c2020803da61172ae3f8dfadc66842cb773b2192091a71a3eeb7 SHA512 60e53a68acbab3ee983471f604a691eb66344f2f4a6a30a57d268c52d00cac05083606ec062f043bcf511edb32c27fce69d95c5a17229e94dd16af98806ac701 DIST scummvm-tools-2.1.0.tar.xz 710124 BLAKE2B e6985c2e12a31aa9b11a80193186b101e663ce7eaf95de68639482bc82e104c879518f253c40e733c829ceb75b62d4905314cf7ad959766c4b7b49c1ee9e0136 SHA512 40e0b1a545257922dd1846d520ef0c18ef7a2682a3d7bb1709bcd49b1338ed7cefea438958941586329271d84e01bf189a14e31f5758e500df607d162ee9cc15 DIST scummvm-tools-2.2.0.tar.xz 712048 BLAKE2B bb5307ee25476c9b4042fa0704f8b9bbfc4a57c09670bc699c83b9d5ebb0a7b9cda55f7267aafa6ae57e3ce53993740a1523616e39cf0a2c0c7249b23208372e SHA512 97d23a94772809b6fe6dcfc4d1bde9e1a12c124cb49b0a465456adbbd56358a1612b9797abb9577dc350e1150fb4a70d4b7451e794c436c8e91692b4a83deb89 EBUILD scummvm-tools-2.1.0.ebuild 1303 BLAKE2B 13cc74cfc4fc745e1f0debfef0a2415b5b693f92e1544e9969cd65d0c4f832c61084b26617e433eeca36c70071f9e8459336c6fd5f44fe946ace11a731310a4e SHA512 952d76a10e16e13ac2c138d19132e295972d705773cd2428dde0e67ffec22a1febdb81e16095d1a50a5f4f623d3f7c61680396751364f222e4baf7acb87adee5 -EBUILD scummvm-tools-2.2.0.ebuild 1397 BLAKE2B ff7e453710830f99d665a72afe8d528751c79081ecd67f58f5cbcdb2c318ccfcaf792f11af7ca7a21adad5bc310da9a361030918c5c4f35db71ba95c0b0ac200 SHA512 4cf8eed7f6d4f9a1bb50427c15276a7a8454c24d8296d59fba5511eb2f00be9cfcd0822469bdfb191f9bab6df9c69523d016557841c4aa192f01f03476e8986e +EBUILD scummvm-tools-2.2.0.ebuild 1355 BLAKE2B b4bde979f3fff1ed906df2b407b219f5abc764ee5384c4d44d88ba9f42f5f35c5c350988e496e32410c456f6b92ea906d7f556d9d938df97399860b5385edf9f SHA512 85111baa1aff00857fb22de4c99cfb076829d220c8244e6099526a952282ee192d2fab535daea8710d8dd5dcec73e154c89ad7a6bdb0514d70c3b75a5748627f MISC metadata.xml 330 BLAKE2B 4f070e6c8bc4c2f6b4efb4f0eb84ea861773fba85acda1f4dec223a6594e2cdf4ac90c895a98819e2fab2ba2cd30081aee591554d2e932025a9da6d3c16a275b SHA512 4541c93daab84bd6d0764adccf44bb4986ba02303e731b5b9a7a8060bb88a32c1cef91e2b2910e15915b67cf3ea2b5f31b4e637909d1d0b7c3b627f1134206dc diff --git a/games-engines/scummvm-tools/files/scummvm-tools-2.2.0-strings.patch b/games-engines/scummvm-tools/files/scummvm-tools-2.2.0-strings.patch new file mode 100644 index 000000000000..1bd3f9f399dc --- /dev/null +++ b/games-engines/scummvm-tools/files/scummvm-tools-2.2.0-strings.patch @@ -0,0 +1,17 @@ +Fix build without native symlinks +https://bugs.gentoo.org/744424 + +--- a/configure ++++ b/configure +@@ -1026,9 +1026,9 @@ void _ebcdic() { char* s = (char*) ebcdi + int main() { _ascii (); _ebcdic (); return 0; } + EOF + $CXX $CXXFLAGS -c -o $TMPO.o tmp_endianness_check.cpp +-if strings $TMPO.o | grep BIGenDianSyS >/dev/null; then ++if ${STRINGS} $TMPO.o | grep BIGenDianSyS >/dev/null; then + _endian=big +-elif strings $TMPO.o | grep LiTTleEnDian >/dev/null; then ++elif ${STRINGS} $TMPO.o | grep LiTTleEnDian >/dev/null; then + _endian=little + fi + echo $_endian; diff --git a/games-engines/scummvm-tools/scummvm-tools-2.2.0.ebuild b/games-engines/scummvm-tools/scummvm-tools-2.2.0.ebuild index c514a09b8b71..3af45ddd2fa7 100644 --- a/games-engines/scummvm-tools/scummvm-tools-2.2.0.ebuild +++ b/games-engines/scummvm-tools/scummvm-tools-2.2.0.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 WX_GTK_VER=3.0-gtk3 inherit wxwidgets toolchain-funcs @@ -17,7 +17,7 @@ IUSE="flac iconv mad png vorbis" RESTRICT="test" # some tests require external files RDEPEND=" - >=dev-libs/boost-1.32:= + dev-libs/boost:= sys-libs/zlib x11-libs/wxGTK:${WX_GTK_VER} flac? ( media-libs/flac ) @@ -35,17 +35,18 @@ BDEPEND=" PATCHES=( "${FILESDIR}/${PN}-1.8.0-binprefix.patch" + "${FILESDIR}/${PN}-2.2.0-strings.patch" ) src_prepare() { default - rm -rf *.bat dists/win32 || die - sed -ri -e '/^(CC|CXX)\b/d' Makefile || die + rm -r *.bat dists/win32 || die } src_configure() { setup-wxwidgets + tc-export CXX STRINGS # Not an autoconf script ./configure \ @@ -61,10 +62,6 @@ src_configure() { $(use_enable vorbis) || die } -src_compile() { - emake STRINGS="$(tc-getSTRINGS)" -} - src_install() { EXEPREFIX="${PN}-" default } |