From 7f0ccc917c7abe6223784c703d86cd14755691fb Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 3 Jul 2021 22:39:47 +0100 Subject: gentoo resync : 03.07.2021 --- games-emulation/dolphin/Manifest | 3 ++- .../dolphin/dolphin-5.0_p20210506.ebuild | 2 ++ .../dolphin/files/dolphin-5.0_p20210506-musl.patch | 24 ++++++++++++++++++++++ 3 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 games-emulation/dolphin/files/dolphin-5.0_p20210506-musl.patch (limited to 'games-emulation/dolphin') diff --git a/games-emulation/dolphin/Manifest b/games-emulation/dolphin/Manifest index a0b2631e78ab..d68baced5a32 100644 --- a/games-emulation/dolphin/Manifest +++ b/games-emulation/dolphin/Manifest @@ -1,4 +1,5 @@ +AUX dolphin-5.0_p20210506-musl.patch 779 BLAKE2B 5f962082cf58377801a266ec987417b731332e31ce6d79bb8e66204f6299dc1912aea760a9545ac671b090e6a3625c54b9e00583695790bd5c51ba54d524e0d7 SHA512 7a611de89b84e0f706c37d2aacdfb62cb4115098ad1b31daa4e40bd47e3793ab59f626fced184965361ba776891a63d02d66a54f8b69f675b6b88047a283bd9e DIST dolphin-5.0_p20210506.tar.gz 42098693 BLAKE2B bb9e5b5eb344bd944753c0198d5835109399fdfae46e6858833e5f279ff1979d39e0c512bedb96a91a1241fff525c6f945d16ce1a6b6cc22798490d73b853862 SHA512 5d23e9356995011a0e7b07622d58c8dddc5134a4ec83b3d9343b9eca8d0d2c200ea8c9a299c6aa2550ca74d8e28e258531368f7c167fe620053eb2a0f73b1f2f -EBUILD dolphin-5.0_p20210506.ebuild 4776 BLAKE2B c57e99a792364b830e2e341cdac7810a0fd1d3df80e46b04767be72f710010543c67d780194552df739eedbd553bd1382a89114be9c2b51843bee19d6809614e SHA512 9e3d28ac322cbe22059e579f280113c3c673f2dba81b8a059f3f54154c958eaa7850e61deb1fc6debf344b7c03fe12e0a7abfc9453a8e3ac6793964fc06cfb36 +EBUILD dolphin-5.0_p20210506.ebuild 4817 BLAKE2B dadfd063ee1ab17262bd26eebb005843b3c5d09f3ff3370201eb4abb157fe8be024f09489baad716f7608fe235d355bd3205ddf46107c44e02cf9c4a8af151a8 SHA512 0dbbaa92a81d5f1367a768cc1588c1fa68248cf46043ecbbfb1e8b76bafb0e8ae8c2c0646952fe9e97d8e734ca5203676c92ad8abb24100131a10878d5c00e28 EBUILD dolphin-9999.ebuild 4790 BLAKE2B 7265a71932941ab75c1836237b380be893563c532e45e414d6880cb8d2e446ff53718a3b961b6eb1a3a04724a9e058f2cf432854d608e0ff6a79e8f01b87b638 SHA512 535fcef911387f2ee2f271a0b42ca36065030640728d745b96cdaae2c4744eda626c171576459d29abb6ee7d0ece31d64417029f39cd166ce7197945973bc5bc MISC metadata.xml 856 BLAKE2B 982e3d9ee65ed158e831ccb72d144944eaab8efd8f535f120f2d9e14f8332a980244bb23ee7fe0ca6c1ca8b6f2cdc6c1c766439b4416e17fc8df93fc24ca7655 SHA512 994efa4a7b1504a2d02f4d470382c212f0b9c2f929bbc67483b1a4efa4e68d4422216737dca65977ad99afd26fb6772224f6b1902a0eb6b869f155cf010aff33 diff --git a/games-emulation/dolphin/dolphin-5.0_p20210506.ebuild b/games-emulation/dolphin/dolphin-5.0_p20210506.ebuild index 2a9debffb0ff..fd44c78fa9e2 100644 --- a/games-emulation/dolphin/dolphin-5.0_p20210506.ebuild +++ b/games-emulation/dolphin/dolphin-5.0_p20210506.ebuild @@ -71,6 +71,8 @@ BDEPEND=" RDEPEND="${RDEPEND} vulkan? ( media-libs/vulkan-loader )" +PATCHES=("${FILESDIR}"/${P}-musl.patch) + src_prepare() { cmake_src_prepare diff --git a/games-emulation/dolphin/files/dolphin-5.0_p20210506-musl.patch b/games-emulation/dolphin/files/dolphin-5.0_p20210506-musl.patch new file mode 100644 index 000000000000..51570151c112 --- /dev/null +++ b/games-emulation/dolphin/files/dolphin-5.0_p20210506-musl.patch @@ -0,0 +1,24 @@ +https://bugs.gentoo.org/799281 +https://github.com/dolphin-emu/dolphin/commit/7a1922fd8f0f6686188d179732c9757faf2d1b4f.patch + +From 7a1922fd8f0f6686188d179732c9757faf2d1b4f Mon Sep 17 00:00:00 2001 +From: thyrc +Date: Mon, 14 Jun 2021 10:18:34 +0200 +Subject: [PATCH] Fix includes for musl libc + +--- + Source/Core/Core/MemoryWatcher.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/Source/Core/Core/MemoryWatcher.cpp b/Source/Core/Core/MemoryWatcher.cpp +index 491ecd83150a..13843e2021ca 100644 +--- a/Source/Core/Core/MemoryWatcher.cpp ++++ b/Source/Core/Core/MemoryWatcher.cpp +@@ -2,6 +2,7 @@ + // Licensed under GPLv2+ + // Refer to the license.txt file included. + ++#include + #include + #include + #include -- cgit v1.2.3