[gentoo-commits] repo/gentoo:master commit in: games-emulation/dolphin/

["Michał Górny" <mgorny@gentoo.org>]

commit:     38cfe8b6df92866003b5e88c66304862dc3c55d1
Author:     Alfred Wingate <parona <AT> protonmail <DOT> com>
AuthorDate: Sat Jan 18 14:25:49 2025 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Jan 18 16:34:06 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=38cfe8b6

games-emulation/dolphin: update live

Signed-off-by: Alfred Wingate <parona <AT> protonmail.com>
Closes: https://github.com/gentoo/gentoo/pull/40191
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 games-emulation/dolphin/dolphin-9999.ebuild | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/games-emulation/dolphin/dolphin-9999.ebuild b/games-emulation/dolphin/dolphin-9999.ebuild
index 3b46bec0ea5d..b18e0c26a48b 100644
--- a/games-emulation/dolphin/dolphin-9999.ebuild
+++ b/games-emulation/dolphin/dolphin-9999.ebuild
@@ -72,8 +72,7 @@ RDEPEND="
 	app-arch/xz-utils
 	>=app-arch/zstd-1.4.0:=
 	dev-libs/hidapi
-	<dev-libs/libfmt-11.1:=
-	>=dev-libs/libfmt-10.1
+	>=dev-libs/libfmt-10.1:=
 	dev-libs/lzo:2
 	dev-libs/pugixml
 	dev-libs/xxhash
@@ -127,6 +126,8 @@ declare -A KEEP_BUNDLED=(
 	# please keep this list in CMakeLists.txt order
 
 	# TODO: use system libraries
+	# bug #873952
+	# https://github.com/dolphin-emu/dolphin/pull/13089
 	[zlib-ng]=ZLIB
 	[minizip-ng]=ZLIB
 
@@ -155,7 +156,6 @@ declare -A KEEP_BUNDLED=(
 )
 
 PATCHES=(
-	"${FILESDIR}"/dolphin-2407-libfmt-11-fix.patch
 	"${FILESDIR}"/dolphin-2407-minizip.patch
 )
 
@@ -196,11 +196,6 @@ src_prepare() {
 	einfo "removing sources: ${remove[*]}"
 	rm -r "${remove[@]}" || die
 
-	# About 50% compile-time speedup
-	if ! use vulkan; then
-		sed -i -e '/Externals\/glslang/d' CMakeLists.txt || die
-	fi
-
 	# Remove dirty suffix: needed for netplay
 	sed -i -e 's/--dirty/&=""/' CMake/ScmRevGen.cmake || die
 }
@@ -226,7 +221,6 @@ src_configure() {
 		-DENCODE_FRAMEDUMPS=$(usex ffmpeg)
 		-DFASTLOG=$(usex log)
 		-DOPROFILING=$(usex profile)
-		-DSTEAM=OFF
 		-DUSE_DISCORD_PRESENCE=$(usex discord-presence)
 		-DUSE_MGBA=$(usex mgba)
 		-DUSE_RETRO_ACHIEVEMENTS=OFF
@@ -242,7 +236,6 @@ src_configure() {
 		-DUSE_SYSTEM_BZIP2=ON
 		-DUSE_SYSTEM_LIBLZMA=ON
 		-DUSE_SYSTEM_ZSTD=ON
-		-DUSE_SYSTEM_ZLIB=OFF
 		-DUSE_SYSTEM_MINIZIP=OFF
 		-DUSE_SYSTEM_LZO=ON
 		-DUSE_SYSTEM_LZ4=ON