From 7218e1b46bceac05841e90472501742d905fb3fc Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 12 Mar 2021 21:55:15 +0000 Subject: gentoo resync : 12.03.2021 --- games-emulation/Manifest.gz | Bin 9687 -> 9692 bytes games-emulation/jrommanager/Manifest | 2 +- .../jrommanager/jrommanager-1.8_p27-r1.ebuild | 25 ++--- games-emulation/ppsspp/Manifest | 13 ++- games-emulation/ppsspp/metadata.xml | 2 +- games-emulation/ppsspp/ppsspp-1.11.3.ebuild | 110 +++++++++++++++++++++ games-emulation/vbam/Manifest | 3 +- .../vbam/files/vbam-2.1.4-libsdl2-2.0.14.patch | 27 +++++ games-emulation/vbam/vbam-2.1.4.ebuild | 3 +- 9 files changed, 169 insertions(+), 16 deletions(-) create mode 100644 games-emulation/ppsspp/ppsspp-1.11.3.ebuild create mode 100644 games-emulation/vbam/files/vbam-2.1.4-libsdl2-2.0.14.patch (limited to 'games-emulation') diff --git a/games-emulation/Manifest.gz b/games-emulation/Manifest.gz index 5ebda7d01870..5f353f20986c 100644 Binary files a/games-emulation/Manifest.gz and b/games-emulation/Manifest.gz differ diff --git a/games-emulation/jrommanager/Manifest b/games-emulation/jrommanager/Manifest index f06e4d448beb..a3f211db6a3f 100644 --- a/games-emulation/jrommanager/Manifest +++ b/games-emulation/jrommanager/Manifest @@ -1,3 +1,3 @@ DIST JRomManager-1.8b27.zip 9382160 BLAKE2B a7508d7beef0939c99c18688a07f4dd41e5bef00c8c27d2b3cc2e46089c99a0a1b90a8ff67050c3f4ea223d48c5b39615a2457a369dbd8484344d55244e79016 SHA512 a3688760565ef3a6514b433eeba5850352d5159ab27243053ebdf2280f8edd0d5cfb014859925c1a9c74bc873dfd18a871789a5d13a9a34a2582de89747b1561 -EBUILD jrommanager-1.8_p27-r1.ebuild 979 BLAKE2B 397be5fbd18f6ed9ce5ef70a1be0cc1fb606093caecc6c8f8129741dc194ec0afe39342a56b8dc40586b77a94e31b4ac17030f1bea5358f996cac2ece65444f3 SHA512 f3a2a5e0fd3af976c1de234baed038f37bec3ffc6a49c06d61128e84695baa6720b405cbb0c164f180e1b404611422c097c12fb365320c6e8b53767ad54724a4 +EBUILD jrommanager-1.8_p27-r1.ebuild 986 BLAKE2B 5abedda50f84ff5c0d0809a4975e8f777f11e7eb5dcc530a55c3368f504edcd0d2f28445bc1f0b9e1215f89ec883c9d02608688d6fc991733f212230c7d36bfa SHA512 241eb40b667e2054791a4742f95e132c8eed020d2e184d85581e3b54865c4ab821698b7306461c0d65b17a72c9460ec25f4bce62f8093a12086ff8e0f5c2e9cd MISC metadata.xml 631 BLAKE2B c4a26f63a426df7d3ed2e87fcfd045e25b6e603a48e898cd9b9adb01e6f5428b1f9af94cabcfbbb9ea56b75170cc8079d49bc9b2fd54a0542f8e74bee5e34777 SHA512 3cd6c771f083cba5b96530a9ce573cc365e1856b06bba82c6085b8d0bba486caaa424b9b33dac60cc3f33d59a32dd8ff580c1c59588e63166de10571dea403dc diff --git a/games-emulation/jrommanager/jrommanager-1.8_p27-r1.ebuild b/games-emulation/jrommanager/jrommanager-1.8_p27-r1.ebuild index 5a3f091d0147..bdca596df276 100644 --- a/games-emulation/jrommanager/jrommanager-1.8_p27-r1.ebuild +++ b/games-emulation/jrommanager/jrommanager-1.8_p27-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -12,30 +12,33 @@ inherit desktop DESCRIPTION="A Mame and Retrogaming Rom Manager, Java alternative to ClrMamePro" HOMEPAGE="https://github.com/optyfr/JRomManager" SRC_URI="https://github.com/optyfr/${MY_PN}/releases/download/${MY_PV}/${MY_P}.zip" -QA_PREBUILT="*" - S="${WORKDIR}" LICENSE="GPL-2 GPL-2-with-classpath-exception BSD-2 MIT Apache-2.0 LGPL-2.1 unRAR" SLOT="0" KEYWORDS="~amd64 ~x86" -RDEPEND=">=virtual/jre-1.8" -DEPEND="${DEPEND} - app-arch/unzip" +RDEPEND=">=virtual/jre-1.8:1.8" +DEPEND="${RDEPEND}" +BDEPEND="app-arch/unzip" + +QA_PREBUILT="*" src_prepare() { default - sed -e "/cd.*/s:.*:cd \"${EROOT}/usr/share/${PN}\" || exit:" -i *.sh || die "sed failed!" + sed -e "/cd.*/s:.*:cd \"${EPREFIX}/usr/share/${PN}\" || exit:" -i *.sh \ + || die "sed failed!" + unzip -j ${MY_PN}.jar "jrm/resources/rom.png" || die } src_install() { - insinto "/usr/share/${PN}" + insinto /usr/share/${PN} doins *.jar doins -r lib - newbin "${MY_PN}-multi.sh" "${PN}" - newicon "rom.png" "${PN}.png" - make_desktop_entry "${PN}" '' '' 'Utility' + + newbin ${MY_PN}-multi.sh ${PN} + newicon rom.png ${PN}.png + make_desktop_entry ${PN} '' '' 'Utility' } diff --git a/games-emulation/ppsspp/Manifest b/games-emulation/ppsspp/Manifest index b39394aed7a6..612fe4349ddd 100644 --- a/games-emulation/ppsspp/Manifest +++ b/games-emulation/ppsspp/Manifest @@ -17,7 +17,18 @@ DIST ppsspp-1.11-ext_miniupnp.tar.gz 438926 BLAKE2B 1bfad3cb6b169cfcc12ea79d566c DIST ppsspp-1.11-ext_native_tools_prebuilt.tar.gz 897571 BLAKE2B b1c959a0cd1c61f65b3d7e2c204e9b60fc00e551d72ef3edcb8a3c8851e1e8d1dd3b0f79594ffd0ec767ba0ca34ae7fc8d3a5171ca5b449fcbab8ab9f63e22a9 SHA512 5e1b3d8c0cf581014e6fa375b865725a383128818df6e5135a03b1513807d2b8f615a7e58d37ca805d0603ea75d24e41fe079eaf4f41e94af1077d4c4b0c5a93 DIST ppsspp-1.11-ext_rapidjson.tar.gz 1054419 BLAKE2B 40b8ba0884943de2179b21d7a56716efed2ec5b4098aa33c061e52703b0952930fe2f1bda8cb6ec4a75b947753011e9d06fda953a3862e321d2a0187cd60385d SHA512 3472e129e710bf5343b8b27a61581a1480c8096493e466440b62702d8b5353745d561931f72b5405a736ad92525be3843ea1cf4b5ea5839721cc6d6b358f19bc DIST ppsspp-1.11-ffmpeg.tar.gz 396041681 BLAKE2B be67e136b232e6937061d1a7cc37a4302786105a27c454422acdfff3905dcfa58c9fcbdcdb4b6642222d57f69f427a6892ac34018bf34e70f3c66e7708cacb63 SHA512 5417476ba2eeaee9c30bee8297b70a5557f9ec10270d301cb2820f4711be24dbadc4c1ca58b0c4bfb588dfd0aa0d63e676c9b890c471b05f2298bfececbac6b4 +DIST ppsspp-1.11.3-assets_lang.tar.gz 662203 BLAKE2B 0c1e0852c9ab3b3146f149713710e969c685a89deb68e5853f53426973563908350b9aca9994202ee3d435229bd7992ad5385a63fe87956c2ca142b2d5ca754e SHA512 8976b68ebc8b83ca34be1abe4499ca39c21c21af38b977925cd0d5ef456518fbb3670e8a5f35320bb5037a1dda4603614fadb7abafad8378f45f7713743fe39b +DIST ppsspp-1.11.3-ext_SPIRV-Cross.tar.gz 814213 BLAKE2B cfed78ac0ae4e6e7d82874b4fec2b5475063b09f8c8a3bef9bd23024978820dfbee68209a3ebbd3b883e8c2011d4353e1c0c1b543578d860cde8d20a0b304440 SHA512 b3faff10e2578a27740a013e463750c5244796e651b9586f900a3c97adba060f5e978d47a411f9fb255dd8314e21ea54cccbf90f726d1779448d5dc030f64b65 +DIST ppsspp-1.11.3-ext_armips.tar.gz 197263 BLAKE2B 2b2cbeaabf5fb5f0b5cbf8c93ea61d4546e04054f54be5a7dad081ca0aaacf09d1fe1cc710fd0c66f28c7d4c84b98961a6d96bb9cea941f8b02492c1dff6344d SHA512 2a94e2c7b7280c00a39c8fc92d81ed15fc4b3270a124ef882e3cd8878db6ec827aefa06b0e646a60916636a95e4ebfa886e9878ba70c6bcfcd048def457368be +DIST ppsspp-1.11.3-ext_discord-rpc.tar.gz 2107457 BLAKE2B 8a8117b13791aa4eda7addb974ca1bdd22766961af2de28eaa24337bdb0035b4538ca8241f07d8de9532ad8cd64ba846361bd9c4edb37ebeec149b7e72545d1f SHA512 17fb5de5d5afea9b7e0cdc116d5e3611b147eb2cde3a295a1a4ceb688bceb93d54feb2e479d511ce39d53a1380462a75dcdf6be9ddc2cece9d44b7f8ff7504af +DIST ppsspp-1.11.3-ext_glslang.tar.gz 3138654 BLAKE2B fe5113842d18ce2327e59d2c40ac8847bc28cd8e53ea8d63f9585b6f97943587ba81521b8d0ac94bccde58e14487b1d524cebf61ded0944d9b55c2b7b63bf59b SHA512 153233429ac7ff16b8a530eae28152e55eb90481c9adca5119853fefe76b265b16b922694396d70e8e4511b2da5519c2e1e016bd79617befb90b609cad5a5fc3 +DIST ppsspp-1.11.3-ext_miniupnp.tar.gz 438926 BLAKE2B 1bfad3cb6b169cfcc12ea79d566c1897d7a3fddddac61f2c74eb129ff38d99b59dc713b1277a2d672b849fda33f54f7c99dc776080e983e908b7d2844d183fbb SHA512 99f336d44f2cb53f2f79bd65726ea5209023efe264207255161d3b8a0452082ed1830b70db81d8bf5ebbf40db66ed391eb000306b2af0918dfa171093b2680e7 +DIST ppsspp-1.11.3-ext_native_tools_prebuilt.tar.gz 897571 BLAKE2B b1c959a0cd1c61f65b3d7e2c204e9b60fc00e551d72ef3edcb8a3c8851e1e8d1dd3b0f79594ffd0ec767ba0ca34ae7fc8d3a5171ca5b449fcbab8ab9f63e22a9 SHA512 5e1b3d8c0cf581014e6fa375b865725a383128818df6e5135a03b1513807d2b8f615a7e58d37ca805d0603ea75d24e41fe079eaf4f41e94af1077d4c4b0c5a93 +DIST ppsspp-1.11.3-ext_rapidjson.tar.gz 1054419 BLAKE2B 40b8ba0884943de2179b21d7a56716efed2ec5b4098aa33c061e52703b0952930fe2f1bda8cb6ec4a75b947753011e9d06fda953a3862e321d2a0187cd60385d SHA512 3472e129e710bf5343b8b27a61581a1480c8096493e466440b62702d8b5353745d561931f72b5405a736ad92525be3843ea1cf4b5ea5839721cc6d6b358f19bc +DIST ppsspp-1.11.3-ffmpeg.tar.gz 396041681 BLAKE2B be67e136b232e6937061d1a7cc37a4302786105a27c454422acdfff3905dcfa58c9fcbdcdb4b6642222d57f69f427a6892ac34018bf34e70f3c66e7708cacb63 SHA512 5417476ba2eeaee9c30bee8297b70a5557f9ec10270d301cb2820f4711be24dbadc4c1ca58b0c4bfb588dfd0aa0d63e676c9b890c471b05f2298bfececbac6b4 +DIST ppsspp-1.11.3.tar.gz 30067677 BLAKE2B 7c5456d38c55c6c1d6a873d869c6df4f31d271f3dec75fd0c5b4f1f4db6ad8a22ad456ba183f0df84d8e2d293bef6c454843f8149c186a86fcbee127aeee7d9a SHA512 5890ae34f2aa4125a816a0fade46a7422385a0652ff04470c56fe653e3a2a697d55bc77f1d7d119bdfa8dbad313d6a1de18a03d1960eaaa9e987b5ddcfed2f48 DIST ppsspp-1.11.tar.gz 30064888 BLAKE2B e1865378a5938145fb1e7c5497ce2f8818a666141df64de3dde4813d2266409210ea3304e99c41a3bb21992dfb5868e2a09fbacd6e8298e5188c40f0bcf402c7 SHA512 de3c7a275151bb29db750a1e76f4c6b44990d85cb948a347acdc2f21013e3e730c1b04d72b4c07a9a21710eb449989da57b276530a0f2403ce4d954e4122b041 EBUILD ppsspp-1.10.3.ebuild 3329 BLAKE2B 1063dacbce06ae1ac2d6195dd237383abb4a4692ea46975c3f24e3e077ab24cf50c75934d7f7eb51f76b5e2b0630cbfa6b1666c92ed8be414b55ac48c8d43a07 SHA512 ceaf7940320c49c307e034c7aa1722965c7237bb4f0f78385869ba81006b66f4fa6d30dc4f21bc0a657833fef7f258026d584e74aed65ad3402f7b84ba9b790c +EBUILD ppsspp-1.11.3.ebuild 3383 BLAKE2B e7965bb10149f462062a40b2b8733af337a9fef8e03103be39c0a1c2329a3d4fe84e95f6024c69485ffa5e73ef0d18875d0b46e00751794412f35841a2f4abd2 SHA512 e802d25db5db6cab4944de324da7efd26de67442afe3d3fe0023530ba6165773389d21789dac527f026715a3473e2c8a4aed6663e4263a05416bf3395b183275 EBUILD ppsspp-1.11.ebuild 3383 BLAKE2B 4d668c861c2ce79517e15ef6103eb3332e58981188e0f43f1b31ae2b8a8f4e0b67095f27f8700a75919549fe055b5645b1f3999988be3149789754ef5d7e2cd0 SHA512 cb919d03adfa36e52924d335d0c37f603f154bce6704b972de161ed9c1e9534b6eccaf2d9fb61086b5bf09bb94e82bde620467d2352f8215d1821cb2b0c2f470 -MISC metadata.xml 783 BLAKE2B c8d77a184e90069b4c727f2eae05b93e634b940f16ef535ab34df784d170b4c3d0ce50e4daa5acc78d4aee107fe4df61dfa64491a8aded91d79efd78c3b12ce0 SHA512 570ea60678a3bde7c61d30188071610f570530f29a77b39bfb9e15737a0a8e4dc90bc1e18898e744f4672c7b0143db69e30c63f4945bc76d4a3553482337d0b8 +MISC metadata.xml 779 BLAKE2B e8db22082f3f23239aaf69468a96d48db9894270e2e13a4661a16d2927caa36ee570eca7ed6f91b72e3c3d05e92e78d4aab901f322cd9fa577e736ac9cc09d79 SHA512 a587761249d04fba1450e4d42a9390284dd7f9dd3713be7fba80e49222add29ffbedd2c4b09d04b47b5f8de04b3e111d1536de73230f0cf70996809652313455 diff --git a/games-emulation/ppsspp/metadata.xml b/games-emulation/ppsspp/metadata.xml index d19785f0a0cc..946bf657ce0e 100644 --- a/games-emulation/ppsspp/metadata.xml +++ b/games-emulation/ppsspp/metadata.xml @@ -2,7 +2,7 @@ - xgqt@protonmail.com + xgqt@riseup.net Maciej Barć diff --git a/games-emulation/ppsspp/ppsspp-1.11.3.ebuild b/games-emulation/ppsspp/ppsspp-1.11.3.ebuild new file mode 100644 index 000000000000..c833ea0b5f4a --- /dev/null +++ b/games-emulation/ppsspp/ppsspp-1.11.3.ebuild @@ -0,0 +1,110 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake desktop xdg + +DESCRIPTION="A PSP emulator written in C++" +HOMEPAGE="https://www.ppsspp.org/" +SRC_URI=" + https://github.com/hrydgard/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz + https://github.com/KhronosGroup/SPIRV-Cross/archive/a1f7c8dc8ea2f94443951ee27003bffa562c1f13.tar.gz -> ${P}-ext_SPIRV-Cross.tar.gz + https://github.com/Kingcom/armips/archive/7885552b208493a6a0f21663770c446c3ba65576.tar.gz -> ${P}-ext_armips.tar.gz + https://github.com/Tencent/rapidjson/archive/73063f5002612c6bf64fe24f851cd5cc0d83eef9.tar.gz -> ${P}-ext_rapidjson.tar.gz + https://github.com/hrydgard/glslang/archive/d0850f875ec392a130ccf00018dab458b546f27c.tar.gz -> ${P}-ext_glslang.tar.gz + https://github.com/hrydgard/miniupnp/archive/7e229ddd635933239583ab190d9b614bde018157.tar.gz -> ${P}-ext_miniupnp.tar.gz + https://github.com/hrydgard/ppsspp-freetype/archive/cbea79dc8fef4d9210e2bac7e7b9b5ff3388197a.tar.gz -> ${P}-ext_native_tools_prebuilt.tar.gz + https://github.com/hrydgard/ppsspp-lang/archive/6bd5b4bc983917ea8402f73c726b46e36f3de0b4.tar.gz -> ${P}-assets_lang.tar.gz + !system-ffmpeg? ( https://github.com/hrydgard/ppsspp-ffmpeg/archive/0b28335acea4f429ae798c5e75232e54881bf164.tar.gz -> ${P}-ffmpeg.tar.gz ) + discord? ( https://github.com/discordapp/discord-rpc/archive/3d3ae7129d17643bc706da0a2eea85aafd10ab3a.tar.gz -> ${P}-ext_discord-rpc.tar.gz ) +" + +RESTRICT="test" +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64" +IUSE="discord qt5 sdl +system-ffmpeg" +REQUIRED_USE="!qt5? ( sdl )" + +RDEPEND=" + app-arch/snappy:= + dev-libs/libzip:= + dev-util/glslang:= + media-libs/glew:= + sys-libs/zlib:= + virtual/opengl + sdl? ( media-libs/libsdl2 ) + system-ffmpeg? ( media-video/ffmpeg:= ) + qt5? ( + dev-qt/qtcore:5 + dev-qt/qtgui:5[-gles2-only] + dev-qt/qtmultimedia:5[-gles2-only] + dev-qt/qtopengl:5[-gles2-only] + dev-qt/qtwidgets:5[-gles2-only] + ) +" +DEPEND="${RDEPEND}" + +src_unpack() { + unpack "${P}.tar.gz" + + cd "${S}" || die + local i list=( + assets_lang + ext_SPIRV-Cross + ext_armips + ext_glslang + ext_miniupnp + ext_native_tools_prebuilt + ext_rapidjson + ) + ! use system-ffmpeg && list+=( ffmpeg ) + use discord && list+=( ext_discord-rpc ) + for i in "${list[@]}"; do + tar xf "${DISTDIR}/${P}-${i}.tar.gz" --strip-components 1 -C "${i//_//}" || die "Failed to unpack ${P}-${i}.tar.gz" + done +} + +src_prepare() { + if ! use system-ffmpeg; then + sed -i -e "s#-O3#-O2#g;" "${S}"/ffmpeg/linux_*.sh || die + fi + + cmake_src_prepare +} + +src_configure() { + local mycmakeargs=( + $(cmake_use_find_package sdl SDL2) + -DHEADLESS=false + -DUSE_DISCORD=$(usex discord) + -DUSE_SYSTEM_FFMPEG=$(usex system-ffmpeg) + -DUSE_SYSTEM_LIBZIP=ON + -DUSE_SYSTEM_SNAPPY=ON + -DUSING_QT_UI=$(usex qt5) + ) + cmake_src_configure +} + +src_install() { + insinto /usr/share/"${PN}" + doins -r "${BUILD_DIR}/assets" + + local i + for i in 16 24 32 48 64 96 128 256 512 ; do + doicon -s "${i}" icons/hicolor/"${i}x${i}"/apps/"${PN}.png" + done + + dobin "${BUILD_DIR}/PPSSPP$(usex qt5 Qt SDL)" + make_desktop_entry "PPSSPP$(usex qt5 Qt SDL)" "PPSSPP ($(usex qt5 Qt SDL))" "${PN}" "Game" +} + +pkg_postinst() { + xdg_pkg_postinst + + if use system-ffmpeg; then + ewarn "system-ffmpeg USE flag is enabled, some bugs might arise due to it." + ewarn "See https://github.com/hrydgard/ppsspp/issues/9026 for more informations." + fi +} diff --git a/games-emulation/vbam/Manifest b/games-emulation/vbam/Manifest index aff16d45efec..a670e0d3d14b 100644 --- a/games-emulation/vbam/Manifest +++ b/games-emulation/vbam/Manifest @@ -1,5 +1,6 @@ AUX vbam-2.1.4-cmake_fix.patch 5436 BLAKE2B 4af1b32f33c99cb66f7b551853fc49a402f860918214efcabb57bd1138bbe2977659fa50432f371cb443456cc0b75cbcd4f917936ae5246e1bb72a8868833cdf SHA512 3d33468003820d83b0a64fd4c086369293757a88c7883eaaf255f3fbc7aa438f08f249345a582b5eeb5269a6bf0bf0df1274aafed54931cafebda4c4c7112247 +AUX vbam-2.1.4-libsdl2-2.0.14.patch 783 BLAKE2B 36d4f89965b5097ec848e5d88b2cb600438baca4c73be0d5897a0b528275e433f596a6bb7fe6fd5a5cb3518ed9d7ff8a6f4166152ba6aa15ef90cff23a6159b5 SHA512 f97772215b857069ef881e859fa846400592c437ee85b5b2fd0f463df8be8f5cb40b322361ffa4718e89ab7460ec96a696c0a5683ef0914b2d901af4aacfaa8c DIST vbam-2.1.4.tar.gz 3891574 BLAKE2B 5255fe814ab583c433f273c31b36933c09301330b47b2deefa453453c1d127c29a1b9de2e945e6706b1f9d9ec517444989818f3db329b96c106bf5d51ec71ae3 SHA512 9070715797c6be1648661019f236eb9328eb409f52e80e15aac52d814cf4155cf1ea37c230557c1288f152f0d27d838b11bee38679787a8d5198ca81f173d896 -EBUILD vbam-2.1.4.ebuild 2168 BLAKE2B e30aa9e0541323b3feef7434cdfebbd7f3acd71800feda5714bd81f10c8c2cd0ea06f94f385db08ed4daf3de4b24d4ca1e979bfded45694032848d0e343efb3c SHA512 f9aca9ac2ca38bf62ea45642a95def70e0f1caa3781bc73514caac1efc78b1ad0022b9df91d5172446dafa75233ba8713cb9645d21ff2e6ba4003057a5142474 +EBUILD vbam-2.1.4.ebuild 2217 BLAKE2B 98fa777793850a90ae5fbcf66a216558c7510257416cab28b7704ea6be912bf5bc695a7b702e28108bca86b3d35360410e2b68a042b37841f26283c5654f7af1 SHA512 6492dedea6c134f1a556e49c25fbc08c5ba8ebaa2002aa9234113aefdf905116b0ea83d36fb909f7e3bf5df8abd62da35682f5736ec3eaff27717dea5dd3507e EBUILD vbam-9999.ebuild 2119 BLAKE2B 9d3e53a9c113dd5c63bc133e3bd58734fbe8c1c338621a3696d9435be51883b85994fb12f2a417bd82a6764a9641abb5c2002b0172b25de8e1012d0798b75fe6 SHA512 0dea0eda480ad7876c58c665e2d3ecaf3b90d7d20ac2ab4174a7bca529ad654650507b97272939d5a1c9ae87e454b42fa55615554d1d886c89e5c15c9103d5b7 MISC metadata.xml 479 BLAKE2B e5a7706e8db6c8c05cf4cf691d294c4bd54f3cc7aee5af270cce39c2d924cc81cc97a1b3d3612c1cf95d0b4b485181717d0f0daeef11a21b0c7ce0cf4d9eafda SHA512 6bd2212bd5ae35dd11f35322879f067981cac94c0c2d8f0c87e1e67170b5df245bd3616e5bb076d2892453c8b75537ee15aab49134029c0daa31d89d8aedf1d0 diff --git a/games-emulation/vbam/files/vbam-2.1.4-libsdl2-2.0.14.patch b/games-emulation/vbam/files/vbam-2.1.4-libsdl2-2.0.14.patch new file mode 100644 index 000000000000..a528a22e506e --- /dev/null +++ b/games-emulation/vbam/files/vbam-2.1.4-libsdl2-2.0.14.patch @@ -0,0 +1,27 @@ +From 619a5cce683ec4b1d03f08f316ba276d8f8cd824 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= +Date: Thu, 31 Dec 2020 00:22:21 +0100 +Subject: [PATCH] SDL: Fix build with SDL 2.0.14 after KMOD_GUI change to enum + +Since SDL 2.0.14, KMOD_GUI is no longer a macro but an enum value: +https://hg.libsdl.org/SDL/rev/15a0bc9612e9 + +So this code broke as the enum value doesn't satisfy `defined()`. +--- + src/sdl/SDL.cpp | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/sdl/SDL.cpp b/src/sdl/SDL.cpp +index ee8ae50a3..082b47c0c 100644 +--- a/src/sdl/SDL.cpp ++++ b/src/sdl/SDL.cpp +@@ -878,7 +878,8 @@ void sdlInitVideo() + + sdlResizeVideo(); + } +-#if defined(KMOD_GUI) ++ ++#ifndef KMOD_META + #define KMOD_META KMOD_GUI + #endif + diff --git a/games-emulation/vbam/vbam-2.1.4.ebuild b/games-emulation/vbam/vbam-2.1.4.ebuild index b9fd01b61bd3..21f3c2cf4a23 100644 --- a/games-emulation/vbam/vbam-2.1.4.ebuild +++ b/games-emulation/vbam/vbam-2.1.4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -56,6 +56,7 @@ BDEPEND=" PATCHES=( "${FILESDIR}"/${P}-cmake_fix.patch + "${FILESDIR}"/${P}-libsdl2-2.0.14.patch #762208 ) src_configure() { -- cgit v1.2.3