diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2020-08-25 10:45:55 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2020-08-25 10:45:55 +0100 |
| commit | 3cf7c3ef441822c889356fd1812ebf2944a59851 (patch) | |
| tree | c513fe68548b40365c1c2ebfe35c58ad431cdd77 /games-engines/scummvm | |
| parent | 05b8b0e0af1d72e51a3ee61522941bf7605cd01c (diff) | |
gentoo resync : 25.08.2020
Diffstat (limited to 'games-engines/scummvm')
| -rw-r--r-- | games-engines/scummvm/Manifest | 5 | ||||
| -rw-r--r-- | games-engines/scummvm/files/scummvm-2.1.0-tts_pthread_link.patch | 22 | ||||
| -rw-r--r-- | games-engines/scummvm/scummvm-2.1.2.ebuild (renamed from games-engines/scummvm/scummvm-2.1.0.ebuild) | 9 |
3 files changed, 6 insertions, 30 deletions
diff --git a/games-engines/scummvm/Manifest b/games-engines/scummvm/Manifest index d5cfff21c75f..be596921f54c 100644 --- a/games-engines/scummvm/Manifest +++ b/games-engines/scummvm/Manifest @@ -1,5 +1,4 @@ AUX scummvm-2.1.0-fluidsynth.patch 1393 BLAKE2B 080c704d493d21f0e5e4387bba0bf1a2354aaccf0e96b7383f956ef89eb973cf0cdf9f60a922a8e7bd25e520a6922a1879cc5614b42731c610c2c7da64033cad SHA512 6e577087ad6d67ee45d488c762ea41d4899001a31730c47cdf263619cc079e0abd3871aa8f947f681b6d59d76094c0278bd4ed8c2439ccc4d700aa32f860c318 -AUX scummvm-2.1.0-tts_pthread_link.patch 610 BLAKE2B 7ae2613cb65f47888a668504c64196bbcb9aafa48f37e8f08cba52a21e765adb20fd9255f1218f2e3b887111587f32919cd448017543c3df303d1ed5ae1ac80c SHA512 93137b7bea5d8c6528dba3aa81b0486d64f53f57aaf975561b79a3fccc882f36f0acf327a997892b2d2c3fe1d7134cc3a3d029bd14852dbae932b07d7633da55 -DIST scummvm-2.1.0.tar.xz 27188916 BLAKE2B b808ff335e5b25c58c8caebfe660b4c2938dcb6eada0aa5b31777b97ff2fb7cb3732d516fc4d981ab1bee16876d62f634f69517158c7c233e11cc22575b15c09 SHA512 9a03cf207660aa49e49f53e1df10b774b7c9711dffd527e00518015e7e7057f25538a7dd89e248e9237434cf08a9f7ea6b215805fb65a770fb20596f5e713218 -EBUILD scummvm-2.1.0.ebuild 2765 BLAKE2B bfb9bddcb3c8bca3a2046e8f6e70b2c49e5cac41248689d57323013f9f15a45e0b57ef5e4b535f9848c33d8274733b4fdef1abbe15db530e3a52576e83bef2d7 SHA512 ae0c50a090892c2242d9617b6976f407dc67cafae072eed6cba951b861090863fee937a4b640e3a4744b7fa9545181b6427db10d8c9e27f3ace049ba92a5221b +DIST scummvm-2.1.2.tar.xz 27056972 BLAKE2B 0afedd27350ea80c3610106b7e09fd57aaebc8847eebdb180628559ca30f49d005a5466bd3991a76271eff39a782e8abf3bf1a3ace25909a1d9947a1b539d6c2 SHA512 a6462bc55d90a229e32389380504d6ecf0c836c8a6733775c993f8db34918ef1f9d0559acc7c110e98719b32cf84408a01021dcfa3fe5a821fe4265c1bc49ecc +EBUILD scummvm-2.1.2.ebuild 2789 BLAKE2B 5b7cb6a8ae1f1fc3bc29d68ea541b4257ea4d22f2467b2e9a3054e463742dc089d0e8d4d0d721c56387ba8963edcb43dedf098d99ce7fa81491d1d61a0f5f7bc SHA512 cd0d059b6fed3c9cca2583f825a2c9bdc60fb96e00e82763e017a1d642558b3d30cdeb3a03f2bb1d27103fae09c57edaae4ebb38c40a012da4612012a463d32e MISC metadata.xml 794 BLAKE2B 55a51df988ba376df42552e2e943f3028aba2b9125d671f026d4a47a10da79d5da49f6307aabd33aa237812a3440b8014d498794c9837b859274221832625cca SHA512 03f3a6e1554afecc3d4f57ca58ed73a5887649170872df4940ad2bcab90a7a98fde3d2de3524c528b60f37f8ecf2b463189be72057d4495c849363d97b824b83 diff --git a/games-engines/scummvm/files/scummvm-2.1.0-tts_pthread_link.patch b/games-engines/scummvm/files/scummvm-2.1.0-tts_pthread_link.patch deleted file mode 100644 index 70440be0e13a..000000000000 --- a/games-engines/scummvm/files/scummvm-2.1.0-tts_pthread_link.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 26c09be3a091e47419ba2629c5f2a346ad6a5543 Mon Sep 17 00:00:00 2001 -From: Christian Krause <chkr@plauener.de> -Date: Wed, 16 Oct 2019 22:41:27 +0200 -Subject: [PATCH] TTS: Link libpthread explicitly on Linux platform - ---- - configure | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure b/configure -index 0adf0bb7bad..dbfe336e6d0 100755 ---- a/configure -+++ b/configure -@@ -5504,7 +5504,7 @@ else - echo "linux" - _tts=yes - define_in_config_if_yes $_tts 'USE_SPEECH_DISPATCHER' -- append_var LIBS '-lspeechd' -+ append_var LIBS '-lspeechd -lpthread' - ;; - mingw*) - echo "win32" diff --git a/games-engines/scummvm/scummvm-2.1.0.ebuild b/games-engines/scummvm/scummvm-2.1.2.ebuild index 06cc2f964fec..5f7022f10551 100644 --- a/games-engines/scummvm/scummvm-2.1.0.ebuild +++ b/games-engines/scummvm/scummvm-2.1.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -10,7 +10,7 @@ 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 ~ppc ~ppc64 ~x86" +KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86" IUSE="a52 aac alsa debug flac fluidsynth jpeg lua mpeg2 mp3 net opengl png speech theora truetype unsupported vorbis zlib" RESTRICT="test" # it only looks like there's a test there #77507 @@ -25,7 +25,7 @@ RDEPEND=" mp3? ( media-libs/libmad ) mpeg2? ( media-libs/libmpeg2 ) net? ( media-libs/sdl2-net ) - opengl? ( virtual/opengl ) + 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 ) @@ -46,8 +46,7 @@ BDEPEND=" S="${WORKDIR}/${P/_/}" PATCHES=( - "${FILESDIR}/${P}-tts_pthread_link.patch" - "${FILESDIR}/${P}-fluidsynth.patch" + "${FILESDIR}/${PN}-2.1.0-fluidsynth.patch" ) src_prepare() { |