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

["Andreas Sturmlechner" <asturm@gentoo.org>]

commit:     4dc34dcb37ac697d2e3b0d17ef338affd5895317
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Mar  4 20:52:20 2025 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Mar  4 23:14:48 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4dc34dcb

games-emulation/dolphin: drop 5.0_p20220520-r4

Bug: https://bugs.gentoo.org/945757
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 games-emulation/dolphin/Manifest                   |   2 -
 .../dolphin/dolphin-5.0_p20220520-r4.ebuild        | 223 ---------------------
 .../files/dolphin-5.0_p20220520-gcc-14.patch       |  30 ---
 ...phin-5.0_p20220520-libfmt-9.0.0-fix-build.patch |  32 ---
 4 files changed, 287 deletions(-)

diff --git a/games-emulation/dolphin/Manifest b/games-emulation/dolphin/Manifest
index 99d2614d0e16..95a91365476c 100644
--- a/games-emulation/dolphin/Manifest
+++ b/games-emulation/dolphin/Manifest
@@ -2,9 +2,7 @@ DIST Vulkan-Headers-05fe2cc910a68c9ba5dac07db46ef78573acee72.tar.gz 2288519 BLAK
 DIST VulkanMemoryAllocator-009ecd192c1289c7529bff248a16cfe896254816.tar.gz 904841 BLAKE2B 64966d40b86197a18f86c9715acb2ea649ea6b69d3de38d9385a8130e35519036eca49b7503886123284be58d5c248dd9d7c5cb16a489c64d385439c382dcd30 SHA512 3a47a4bc81562b96f598f357b803d2219fa167e6eb87779837efa6e85fc6eaff8e1cfbdea0935117a7b3c630cc99944b94e91823eafa8a94d80b2c459f33c317
 DIST dolphin-2407.tar.gz 19773792 BLAKE2B a6de162479d45e6b1cba5444df5abdeafd92773d1e49cc837dfc6c1ab45ed11d7a3f72a582ddb56d0ecc6b550d03c1a02a9389852ba438d8a9235d5ea3285d4b SHA512 8bb8459d8b653708e34d5df184d96ba9705e8c50b00d066862d4012f78b7e71938207979b3bd900dd14c35c3b6c0258bb5c8fad9ba73267188e98d8a2edfb73f
 DIST dolphin-2412.tar.gz 19926717 BLAKE2B 89036561987283067a1f116aa38a94c92d0c8e3114d28a0545787f63b389cb204b265bdd4c2452ec02ca3fe90fccf5fc0fd55be3acb9b8bd346e3738f3f96767 SHA512 3025e24b4cdc8cf3493e23a7968064cb9090d622a3a830b0a964fc87af840227125de8c0f69243c7d3975fc5ea2dd0c485d870301c25e8fa078abe83ae88bca9
-DIST dolphin-5.0_p20220520.tar.gz 34880474 BLAKE2B 925cddfe8a5d6febced5721bea6ced7c8d2855619f74ca8940b95dc78ea523b4a1083b9ef6efe3561d833b8e9ecb742cb2adf5a1864c06b629b3ecd9e92cc871 SHA512 4993cb10061b142f6627c96493885a5f9d88857d8949c2e8e8d5df5ba6e19b4f98d199da5e641d3d61294884e1cbbe8191bc5b4445c60bf80723046b2524aad5
 DIST implot-cc5e1daa5c7f2335a9460ae79c829011dc5cef2d.tar.gz 137924 BLAKE2B c830275b05a74e8a60a7164f22c01dd9a5a35f9219736785c9cc17830dae809eb8cba65604b0388c3966d7658c9fe71cb9a8468c23d3ed17b7890581a2222cb8 SHA512 ab9935e759f38d19e6f60ed195c22018929ba46fccf783f4486346d7ffb7040b6097bc4c3d3b3577cc91f0c413684e07449a24bebf3db9c937638092c181de92
-DIST mgba-40d4c430fc36caeb7ea32fd39624947ed487d2f2.tar.gz 12921593 BLAKE2B 8c5cf7b9b53f897f6248ad6bc51efafaa8a9d5df137d42d30f4b042b6d1527049644595938626c8cae1385d329bc45bf42db8dcc4424b963a3899e0df53246eb SHA512 26d7b60cbc7415652bb9ca2a42ccd532856867db57bf6dd91d8204551970109b6b9f4a96c42d643ea96b9d071d6aec924d3c1bb79c251c95183b7fb8536456c9
 DIST mgba-8739b22fbc90fdf0b4f6612ef9c0520f0ba44a51.tar.gz 14488880 BLAKE2B 5beec2de9a0999a93a4ad704f45246b551824a9ddd576a5b77e731b269fb8f7d311d1c4e2cfb217f34e22a49050498c70e52d714d9c0bb7b4e4d178f49f15c3d SHA512 782d456b7bf827591c774f146a88821b41b3b936faefddb5aee82bb0dd16ca7ad7228a1c331e1e517eac40a71cc4c94cc44bee12560946328c8433e1c6327225
 DIST minizip-ng-3eed562ef0ea3516db30d1c8ecb0e1b486d8cb70.tar.gz 770054 BLAKE2B 7d5b24a5be7134ac17178869883625b28fa80a55f878231ca4156901057db72b20b4d342f8d0bb04a436fcd72d7ccbb0f79adc8503a16e1197a84f3a476da730 SHA512 f76a2cefd7d9ad47f8c3c73b3483b657fab0507605e0b29895eaec759718a65f0d2915ea7022831f3f98493891a1ab4f5035971bf09d4860abbf4cde0b091869
 DIST tinygltf-c5641f2c22d117da7971504591a8f6a41ece488b.tar.gz 5903179 BLAKE2B 0ef4b36cf26f3a5a544d0c739317b8cce041121b1dec58d1d9dbc3bbc892df284d80aa4c45ec1ebc332ba96b151230a5b0dbf95b95aefcf86ee7878c393eda5d SHA512 486bcf32be137dea5746117074dc51bc978290698de7831e1c4bbaa4acb56ed99fc34c38e69878a955b3e5f10f43eab07b0637164f822beae0fddd099aa0c56d

diff --git a/games-emulation/dolphin/dolphin-5.0_p20220520-r4.ebuild b/games-emulation/dolphin/dolphin-5.0_p20220520-r4.ebuild
deleted file mode 100644
index 4294f15f1643..000000000000
--- a/games-emulation/dolphin/dolphin-5.0_p20220520-r4.ebuild
+++ /dev/null
@@ -1,223 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake desktop flag-o-matic xdg-utils pax-utils
-
-if [[ ${PV} == *9999 ]]
-then
-	EGIT_REPO_URI="https://github.com/dolphin-emu/dolphin"
-	EGIT_SUBMODULES=( Externals/mGBA/mgba )
-	inherit git-r3
-else
-	EGIT_COMMIT=0f2540a0d1133950467845f20b1e003181147781
-	MGBA_COMMIT=40d4c430fc36caeb7ea32fd39624947ed487d2f2
-	SRC_URI="
-		https://github.com/dolphin-emu/dolphin/archive/${EGIT_COMMIT}.tar.gz
-			-> ${P}.tar.gz
-		mgba? (
-			https://github.com/mgba-emu/mgba/archive/${MGBA_COMMIT}.tar.gz
-				-> mgba-${MGBA_COMMIT}.tar.gz
-		)
-	"
-	S=${WORKDIR}/${PN}-${EGIT_COMMIT}
-	KEYWORDS="amd64 ~arm64"
-fi
-
-DESCRIPTION="Gamecube and Wii game emulator"
-HOMEPAGE="https://dolphin-emu.org/"
-
-LICENSE="GPL-2+ BSD BSD-2 LGPL-2.1+ MIT ZLIB"
-SLOT="0"
-IUSE="
-	alsa bluetooth discord-presence doc +evdev ffmpeg +gui log mgba
-	profile pulseaudio systemd upnp vulkan
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-libfmt-9.0.0-fix-build.patch"
-	# https://github.com/dolphin-emu/dolphin/pull/12575
-	"${FILESDIR}/${P}-gcc-14.patch"
-)
-
-RDEPEND="
-	app-arch/bzip2:=
-	app-arch/xz-utils:=
-	app-arch/zstd:=
-	dev-libs/hidapi:=
-	<dev-libs/libfmt-10:=
-	dev-libs/lzo:=
-	dev-libs/pugixml:=
-	media-libs/cubeb:=
-	media-libs/libpng:=
-	media-libs/libsfml:=
-	media-libs/mesa[egl(+)]
-	net-libs/enet:1.3
-	net-libs/mbedtls:0=
-	net-misc/curl:=
-	sys-libs/readline:=
-	sys-libs/zlib:=[minizip]
-	x11-libs/libXext
-	x11-libs/libXi
-	x11-libs/libXrandr
-	virtual/libusb:1
-	virtual/opengl
-	alsa? ( media-libs/alsa-lib )
-	bluetooth? ( net-wireless/bluez )
-	evdev? (
-		dev-libs/libevdev
-		virtual/udev
-	)
-	ffmpeg? ( media-video/ffmpeg:= )
-	gui? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-	)
-	profile? ( dev-util/oprofile )
-	pulseaudio? ( media-sound/pulseaudio )
-	systemd? ( sys-apps/systemd:0= )
-	upnp? ( net-libs/miniupnpc )
-"
-DEPEND="
-	${RDEPEND}
-"
-BDEPEND="
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-# vulkan-loader required for vulkan backend which can be selected
-# at runtime.
-RDEPEND+="
-	vulkan? ( media-libs/vulkan-loader )
-"
-
-# [directory]=license
-declare -A KEEP_BUNDLED=(
-	# please keep this list in CMakeLists.txt order
-
-	[Bochs_disasm]=LGPL-2.1+
-	[cpp-optparse]=MIT
-	[imgui]=MIT
-	[glslang]=BSD
-
-	# FIXME: xxhash can't be found by cmake
-	[xxhash]=BSD-2
-
-	# FIXME: requires minizip-ng
-	#[minizip]=ZLIB
-
-	[FreeSurround]=GPL-2+
-	[soundtouch]=LGPL-2.1+
-
-	# FIXME: discord-rpc not packaged
-	[discord-rpc]=MIT
-
-	[mGBA]=MPL-2.0
-
-	[picojson]=BSD-2
-	[rangeset]=ZLIB
-	[gtest]= # (build-time only)
-)
-
-src_prepare() {
-	if use mgba && [[ ${PV} != *9999 ]]; then
-		rmdir Externals/mGBA/mgba || die
-		mv "${WORKDIR}/mgba-${MGBA_COMMIT}" Externals/mGBA/mgba || die
-	fi
-
-	cmake_src_prepare
-
-	local s remove=()
-	for s in Externals/*; do
-		[[ -f ${s} ]] && continue
-		if ! has "${s#Externals/}" "${!KEEP_BUNDLED[@]}"; then
-			remove+=( "${s}" )
-		fi
-	done
-
-	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
-
-	# Allow regular minizip.
-	sed -i -e '/minizip/s:>=2[.]0[.]0::' CMakeLists.txt || die
-
-	# Remove dirty suffix: needed for netplay
-	sed -i -e 's/--dirty/&=""/' CMakeLists.txt || die
-
-	# Force Qt5 rather than automagic until support is properly handled here
-	sed -i -e '/NAMES Qt6 COMP/d' Source/Core/DolphinQt/CMakeLists.txt || die
-}
-
-src_configure() {
-	# bug #891225 (https://bugs.dolphin-emu.org/issues/11481, QTBUG-61710)
-	use gui && filter-lto
-
-	local mycmakeargs=(
-		# Use ccache only when user did set FEATURES=ccache (or similar)
-		# not when ccache binary is present in system (automagic).
-		-DCCACHE_BIN=CCACHE_BIN-NOTFOUND
-		-DENABLE_ALSA=$(usex alsa)
-		-DENABLE_AUTOUPDATE=OFF
-		-DENABLE_BLUEZ=$(usex bluetooth)
-		-DENABLE_EVDEV=$(usex evdev)
-		-DENCODE_FRAMEDUMPS=$(usex ffmpeg)
-		-DENABLE_LLVM=OFF
-		# just adds -flto, user can do that via flags
-		-DENABLE_LTO=OFF
-		-DUSE_MGBA=$(usex mgba)
-		-DENABLE_PULSEAUDIO=$(usex pulseaudio)
-		-DENABLE_QT=$(usex gui)
-		-DENABLE_SDL=OFF # not supported: #666558
-		-DENABLE_VULKAN=$(usex vulkan)
-		-DFASTLOG=$(usex log)
-		-DOPROFILING=$(usex profile)
-		-DUSE_DISCORD_PRESENCE=$(usex discord-presence)
-		-DUSE_SHARED_ENET=ON
-		-DUSE_UPNP=$(usex upnp)
-
-		# Undo cmake.eclass's defaults.
-		# All dolphin's libraries are private
-		# and rely on circular dependency resolution.
-		-DBUILD_SHARED_LIBS=OFF
-
-		# Avoid warning spam around unset variables.
-		-Wno-dev
-	)
-
-	cmake_src_configure
-}
-
-src_test() {
-	cmake_build unittests
-}
-
-src_install() {
-	cmake_src_install
-
-	dodoc Readme.md
-	if use doc; then
-		dodoc -r docs/ActionReplay docs/DSP docs/WiiMote
-	fi
-
-	doicon -s 48 Data/dolphin-emu.png
-	doicon -s scalable Data/dolphin-emu.svg
-	doicon Data/dolphin-emu.svg
-}
-
-pkg_postinst() {
-	# Add pax markings for hardened systems
-	pax-mark -m "${EPREFIX}"/usr/games/bin/"${PN}"-emu
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}

diff --git a/games-emulation/dolphin/files/dolphin-5.0_p20220520-gcc-14.patch b/games-emulation/dolphin/files/dolphin-5.0_p20220520-gcc-14.patch
deleted file mode 100644
index 44ffb50ae257..000000000000
--- a/games-emulation/dolphin/files/dolphin-5.0_p20220520-gcc-14.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 3da2e15e6b95f02f66df461e87c8b896e450fdab Mon Sep 17 00:00:00 2001
-From: Peter Lafreniere <peter@n8pjl.ca>
-Date: Sun, 11 Feb 2024 20:55:31 -0500
-Subject: [PATCH] IOFile: avoid clearing errors on null file struct
-
-When performing a default compilation with recent GCC & glibc,
-the use of -Werror=nonnull causes a build error.
-
-The error is given as IOFile::ClearError() can call std::clearerr()
-with a null file, which can trigger a null-pointer dereference in libc.
-
-Change the std::clearerr() call to be conditional on a file being open.
----
- Source/Core/Common/IOFile.h | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/Source/Core/Common/IOFile.h b/Source/Core/Common/IOFile.h
-index 4b12c3188853..b5895333b1be 100644
---- a/Source/Core/Common/IOFile.h
-+++ b/Source/Core/Common/IOFile.h
-@@ -116,7 +116,8 @@ class IOFile
-   void ClearError()
-   {
-     m_good = true;
--    std::clearerr(m_file);
-+    if (IsOpen())
-+      std::clearerr(m_file);
-   }
- 
- private:

diff --git a/games-emulation/dolphin/files/dolphin-5.0_p20220520-libfmt-9.0.0-fix-build.patch b/games-emulation/dolphin/files/dolphin-5.0_p20220520-libfmt-9.0.0-fix-build.patch
deleted file mode 100644
index 5bc2ae3877f4..000000000000
--- a/games-emulation/dolphin/files/dolphin-5.0_p20220520-libfmt-9.0.0-fix-build.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From: Christopher Rudolph
-Fix build with libfmt-9.0.0
-Upstream report: https://github.com/dolphin-emu/dolphin/pull/10825
-
-diff --git a/Source/Core/Common/MsgHandler.h b/Source/Core/Common/MsgHandler.h
-index 750da51..1d6a467 100644
---- a/Source/Core/Common/MsgHandler.h
-+++ b/Source/Core/Common/MsgHandler.h
-@@ -41,7 +41,11 @@ bool MsgAlertFmt(bool yes_no, MsgType style, Common::Log::LogType log_type, cons
-   static_assert(NumFields == sizeof...(args),
-                 "Unexpected number of replacement fields in format string; did you pass too few or "
-                 "too many arguments?");
-+#if FMT_VERSION >= 90000
-+  static_assert(fmt::detail::is_compile_string<S>::value);
-+#else
-   static_assert(fmt::is_compile_string<S>::value);
-+#endif
-   return MsgAlertFmtImpl(yes_no, style, log_type, file, line, format,
-                          fmt::make_format_args(args...));
- }
-@@ -56,7 +60,11 @@ bool MsgAlertFmtT(bool yes_no, MsgType style, Common::Log::LogType log_type, con
-   static_assert(NumFields == sizeof...(args),
-                 "Unexpected number of replacement fields in format string; did you pass too few or "
-                 "too many arguments?");
-+#if FMT_VERSION >= 90000
-+  static_assert(fmt::detail::is_compile_string<S>::value);
-+#else
-   static_assert(fmt::is_compile_string<S>::value);
-+#endif
-   auto arg_list = fmt::make_format_args(args...);
-   return MsgAlertFmtImpl(yes_no, style, log_type, file, line, translated_format, arg_list);
- }