commit: cc2279976640dfafe6ef94dace763448469551d3 Author: Joshua Vandaële <joshua <AT> vandaele <DOT> software> AuthorDate: Fri Oct 3 02:30:18 2025 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Fri Oct 3 13:09:31 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cc227997
games-emulation/dolphin: 2509 release Closes: https://bugs.gentoo.org/873952 Signed-off-by: Joshua Vandaële <joshua <AT> vandaele.software> Part-of: https://github.com/gentoo/gentoo/pull/44001 Closes: https://github.com/gentoo/gentoo/pull/44001 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> Part-of: https://github.com/gentoo/gentoo/pull/44001 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> games-emulation/dolphin/Manifest | 3 ++ .../{dolphin-9999.ebuild => dolphin-2509.ebuild} | 35 ++++++++------------ games-emulation/dolphin/dolphin-9999.ebuild | 38 +++++++++------------- .../files/dolphin-2509-retroachievents-test.patch | 29 +++++++++++++++++ 4 files changed, 62 insertions(+), 43 deletions(-) diff --git a/games-emulation/dolphin/Manifest b/games-emulation/dolphin/Manifest index 41fbe3bd9e49..ac0bcc4436a9 100644 --- a/games-emulation/dolphin/Manifest +++ b/games-emulation/dolphin/Manifest @@ -1,8 +1,11 @@ DIST Vulkan-Headers-39f924b810e561fd86b2558b6711ca68d4363f68.tar.gz 2497345 BLAKE2B 66c276e4ecb6f648fb0ba7f211edda51d6ef8c439b88abdafd0bb33a7aa255e9189e88ef2a40179e9ab8433c82f98cbb40a8aaadbbd6a6e72c7a838ad68d07ae SHA512 2d722e32e3c5a217a62d0583fd1597fcf5e05c7092f0c629f54025ae8fdb22b12dba375d1aeeeb90e4a69507e254f33aebe435bf8f058f55a5ed3f5e6d351d6f DIST VulkanMemoryAllocator-3bab6924988e5f19bf36586a496156cf72f70d9f.tar.gz 937902 BLAKE2B d4c9d002ab787045e4d117237c3f7d031ec4dae514e958881529c6dc11cc6105dd57a26f214791f8e0943e2cfa105f90e99ee958b97c1c386ef44fcaad6b7d33 SHA512 6e2935ce6fbafc2cc8c5a34bf3eaa5dc2e8f65c97c886cfa57da0b45ca83bc8ade4429a7556ce6292af9aeb947d69231b50ae64a55a281c304176e8ea1cd2098 DIST dolphin-2506.tar.gz 19891520 BLAKE2B ffff679899d70322b5b02f2b045cd063123a9c94fa65641af9597d41cd88849c971179f0131d4db8d4ce8090e70052cf6bbd2b19e720794adb1977b8ed48037e SHA512 7f2a053e18f53c535c9de6e67a098d92e8ffaa240f8cc44ce5b0db19e506373f31eefecfe7d215d69e054ed0254f92ce96f73f2cb737df86d2b55cdc4fdc4ac3 +DIST dolphin-2509.tar.gz 19735915 BLAKE2B cc52b0e1eca0f8b874852b7914415a8f58d3d12dd0d0c26ec03ac9e1ad7a1834e78f325107e08b2447ee76f03dea5d63995f03012f6892889383379dab0dabd0 SHA512 26f28c4d851ca4b8c1dd2d084a2e744b4df3bc83d479389ccd5bca81f2b804936d7d6df5f5100de3dcbedda9851a84f6daf96b408a306ccc29ebb6b3f4211003 DIST implot-18c72431f8265e2b0b5378a3a73d8a883b2175ff.tar.gz 138121 BLAKE2B 481fe2b4ebd1ab3554465aff07b2c2e85f2db033de1ac69b95bcf56d269fcf01d8a0f951ad45ddcc0e192f1cc6cac3478633f006f403b8e930350891945ae87f SHA512 9cb2581a4e8d844914606f55a667afcfb31374973b0035b4d81488253e350df67439e97b46b236324c2a1e01146e6a191ad94d70823a3888c97e9380715272fa +DIST implot-3da8bd34299965d3b0ab124df743fe3e076fa222.tar.gz 141430 BLAKE2B 5fde32ccb24a8ceaa125e188fce9faf087fa5d2294379fc6bb31071878c4b63adb998aa0100dc48ed7a379d2b1cd49e109a150bec5ebf521f70d661673b4e4a8 SHA512 8a95f76ae4a14adf6f3bcd798d2334d8282ff7b50fc7def6308c0556adcc1dbd151c0a36aa676a82e10e1ae80d1ecc1ac54e705180650eed46d0a609611c73c5 DIST mgba-8739b22fbc90fdf0b4f6612ef9c0520f0ba44a51.tar.gz 14488880 BLAKE2B 5beec2de9a0999a93a4ad704f45246b551824a9ddd576a5b77e731b269fb8f7d311d1c4e2cfb217f34e22a49050498c70e52d714d9c0bb7b4e4d178f49f15c3d SHA512 782d456b7bf827591c774f146a88821b41b3b936faefddb5aee82bb0dd16ca7ad7228a1c331e1e517eac40a71cc4c94cc44bee12560946328c8433e1c6327225 DIST minizip-ng-55db144e03027b43263e5ebcb599bf0878ba58de.tar.gz 772757 BLAKE2B 853a252d2a8f8c0668804cf961626413aaf89a7eb85b27142860e379e933a54c0d847d976b007071636461b29dd85d6b910d44a6c140581b983b59b14bc4fd9c SHA512 88d1222886a3b5cd3ca1aff7b12902d1d19462c446ef39a092a56bb91b5889956afcce047b4227c79a50a95d9275bd0a23f5cd6cbef76478b6e21bbf86dd486b DIST tinygltf-c5641f2c22d117da7971504591a8f6a41ece488b.tar.gz 5903179 BLAKE2B 0ef4b36cf26f3a5a544d0c739317b8cce041121b1dec58d1d9dbc3bbc892df284d80aa4c45ec1ebc332ba96b151230a5b0dbf95b95aefcf86ee7878c393eda5d SHA512 486bcf32be137dea5746117074dc51bc978290698de7831e1c4bbaa4acb56ed99fc34c38e69878a955b3e5f10f43eab07b0637164f822beae0fddd099aa0c56d +DIST watcher-b03bdcfc11549df595b77239cefe2643943a3e2f.tar.gz 165510 BLAKE2B 63df0dac02af6da4c736953145c959973e452d22fc30b4170adbcb5ed950bdf0ef33d2304fda58efdd5a99ad8a0b229429f93cd17eedf0310c345252e8222e88 SHA512 b1e4bad6564b5036f4bf66ea269b148c9818d5e6fa4626a0f7d04e65b81be737a0fbcd995c103681297240e78e54d8152825c1b6674a45e8bbe0c35b9bf900d0 DIST zlib-ng-ce01b1e41da298334f8214389cc9369540a7560f.tar.gz 2223118 BLAKE2B c79a138c31c74c291ae38a6c4d8983e0884169ced4147d7242d1a766f70777de0368ceba815ac2261bd2543dba55a6106b70f7e040fae4f200863da217f88978 SHA512 73f4e56410ae298ef211ebab52b1a0d3d5bfae91c2de3cd294b56cd0a78ab50e1203b396c7df462f360c1aaaa9392ec5625473d1e9eb084cc64bc813e28d12a1 diff --git a/games-emulation/dolphin/dolphin-9999.ebuild b/games-emulation/dolphin/dolphin-2509.ebuild similarity index 88% copy from games-emulation/dolphin/dolphin-9999.ebuild copy to games-emulation/dolphin/dolphin-2509.ebuild index 6920f9699241..f7d24802780c 100644 --- a/games-emulation/dolphin/dolphin-9999.ebuild +++ b/games-emulation/dolphin/dolphin-2509.ebuild @@ -17,17 +17,15 @@ if [[ ${PV} == *9999 ]]; then Externals/tinygltf/tinygltf Externals/Vulkan-Headers Externals/VulkanMemoryAllocator - Externals/zlib-ng/zlib-ng - Externals/minizip-ng/minizip-ng + Externals/watcher/watcher ) else MGBA_COMMIT=8739b22fbc90fdf0b4f6612ef9c0520f0ba44a51 - IMPLOT_COMMIT=18c72431f8265e2b0b5378a3a73d8a883b2175ff + IMPLOT_COMMIT=3da8bd34299965d3b0ab124df743fe3e076fa222 TINYGLTF_COMMIT=c5641f2c22d117da7971504591a8f6a41ece488b VULKAN_HEADERS_COMMIT=39f924b810e561fd86b2558b6711ca68d4363f68 VULKANMEMORYALLOCATOR_COMMIT=3bab6924988e5f19bf36586a496156cf72f70d9f - ZLIB_NG_COMMIT=ce01b1e41da298334f8214389cc9369540a7560f - MINIZIP_NG_COMMIT=55db144e03027b43263e5ebcb599bf0878ba58de + WATCHER_COMMIT=b03bdcfc11549df595b77239cefe2643943a3e2f SRC_URI=" https://github.com/dolphin-emu/dolphin/archive/${PV}.tar.gz -> ${P}.tar.gz @@ -39,10 +37,8 @@ else -> Vulkan-Headers-${VULKAN_HEADERS_COMMIT}.tar.gz https://github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator/archive/${VULKANMEMORYALLOCATOR_COMMIT}.tar.gz -> VulkanMemoryAllocator-${VULKANMEMORYALLOCATOR_COMMIT}.tar.gz - https://github.com/zlib-ng/zlib-ng/archive/${ZLIB_NG_COMMIT}.tar.gz - -> zlib-ng-${ZLIB_NG_COMMIT}.tar.gz - https://github.com/zlib-ng/minizip-ng/archive/${MINIZIP_NG_COMMIT}.tar.gz - -> minizip-ng-${MINIZIP_NG_COMMIT}.tar.gz + https://github.com/e-dant/watcher/archive/${WATCHER_COMMIT}.tar.gz + -> watcher-${WATCHER_COMMIT}.tar.gz mgba? ( https://github.com/mgba-emu/mgba/archive/${MGBA_COMMIT}.tar.gz -> mgba-${MGBA_COMMIT}.tar.gz @@ -71,6 +67,8 @@ RDEPEND=" >=app-arch/lz4-1.8:= app-arch/xz-utils >=app-arch/zstd-1.4.0:= + >=sys-libs/zlib-ng-1.3.1:= + >=sys-libs/minizip-ng-4.0.4:= dev-libs/hidapi >=dev-libs/libfmt-10.1:= dev-libs/lzo:2 @@ -101,7 +99,7 @@ RDEPEND=" llvm? ( $(llvm_gen_dep 'llvm-core/llvm:${LLVM_SLOT}=') ) profile? ( dev-util/oprofile ) pulseaudio? ( media-libs/libpulse ) - sdl? ( >=media-libs/libsdl2-2.30.9 ) + sdl? ( >=media-libs/libsdl3-3.2.20 ) systemd? ( sys-apps/systemd:0= ) upnp? ( net-libs/miniupnpc:= ) " @@ -125,12 +123,6 @@ RDEPEND+=" 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 - [Bochs_disasm]=LGPL-2.1+ [cpp-optparse]=MIT [imgui]=MIT @@ -153,10 +145,11 @@ declare -A KEEP_BUNDLED=( [FatFs]=FatFs [Vulkan-Headers]="|| ( Apache-2.0 MIT )" [VulkanMemoryAllocator]=MIT + [watcher]=MIT ) PATCHES=( - "${FILESDIR}"/dolphin-2407-minizip.patch + "${FILESDIR}"/dolphin-2509-retroachievents-test.patch ) add_bundled_licenses() { @@ -176,8 +169,7 @@ src_prepare() { mv -T "${WORKDIR}/tinygltf-${TINYGLTF_COMMIT}" Externals/tinygltf/tinygltf || die mv -T "${WORKDIR}/Vulkan-Headers-${VULKAN_HEADERS_COMMIT}" Externals/Vulkan-Headers || die mv -T "${WORKDIR}/VulkanMemoryAllocator-${VULKANMEMORYALLOCATOR_COMMIT}" Externals/VulkanMemoryAllocator || die - mv -T "${WORKDIR}/zlib-ng-${ZLIB_NG_COMMIT}" Externals/zlib-ng/zlib-ng || die - mv -T "${WORKDIR}/minizip-ng-${MINIZIP_NG_COMMIT}" Externals/minizip-ng/minizip-ng || die + mv -T "${WORKDIR}/watcher-${WATCHER_COMMIT}" Externals/watcher/watcher || die if use mgba; then mv -T "${WORKDIR}/mgba-${MGBA_COMMIT}" Externals/mGBA/mgba || die fi @@ -238,7 +230,8 @@ src_configure() { -DUSE_SYSTEM_BZIP2=ON -DUSE_SYSTEM_LIBLZMA=ON -DUSE_SYSTEM_ZSTD=ON - -DUSE_SYSTEM_MINIZIP=OFF + -DUSE_SYSTEM_ZLIB=ON + -DUSE_SYSTEM_MINIZIP-NG=ON -DUSE_SYSTEM_LZO=ON -DUSE_SYSTEM_LZ4=ON -DUSE_SYSTEM_SPNG=ON @@ -268,7 +261,7 @@ src_configure() { use test && mycmakeargs+=( -DUSE_SYSTEM_GTEST=ON ) use mgba && mycmakeargs+=( -DUSE_SYSTEM_LIBMGBA=OFF ) - use sdl && mycmakeargs+=( -DUSE_SYSTEM_SDL2=ON ) + use sdl && mycmakeargs+=( -DUSE_SYSTEM_SDL3=ON ) use upnp && mycmakeargs+=( -DUSE_SYSTEM_MINIUPNPC=ON ) cmake_src_configure diff --git a/games-emulation/dolphin/dolphin-9999.ebuild b/games-emulation/dolphin/dolphin-9999.ebuild index 6920f9699241..341f1e23a42a 100644 --- a/games-emulation/dolphin/dolphin-9999.ebuild +++ b/games-emulation/dolphin/dolphin-9999.ebuild @@ -17,17 +17,15 @@ if [[ ${PV} == *9999 ]]; then Externals/tinygltf/tinygltf Externals/Vulkan-Headers Externals/VulkanMemoryAllocator - Externals/zlib-ng/zlib-ng - Externals/minizip-ng/minizip-ng + Externals/watcher/watcher ) else MGBA_COMMIT=8739b22fbc90fdf0b4f6612ef9c0520f0ba44a51 - IMPLOT_COMMIT=18c72431f8265e2b0b5378a3a73d8a883b2175ff + IMPLOT_COMMIT=3da8bd34299965d3b0ab124df743fe3e076fa222 TINYGLTF_COMMIT=c5641f2c22d117da7971504591a8f6a41ece488b VULKAN_HEADERS_COMMIT=39f924b810e561fd86b2558b6711ca68d4363f68 VULKANMEMORYALLOCATOR_COMMIT=3bab6924988e5f19bf36586a496156cf72f70d9f - ZLIB_NG_COMMIT=ce01b1e41da298334f8214389cc9369540a7560f - MINIZIP_NG_COMMIT=55db144e03027b43263e5ebcb599bf0878ba58de + WATCHER_COMMIT=b03bdcfc11549df595b77239cefe2643943a3e2f SRC_URI=" https://github.com/dolphin-emu/dolphin/archive/${PV}.tar.gz -> ${P}.tar.gz @@ -39,10 +37,8 @@ else -> Vulkan-Headers-${VULKAN_HEADERS_COMMIT}.tar.gz https://github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator/archive/${VULKANMEMORYALLOCATOR_COMMIT}.tar.gz -> VulkanMemoryAllocator-${VULKANMEMORYALLOCATOR_COMMIT}.tar.gz - https://github.com/zlib-ng/zlib-ng/archive/${ZLIB_NG_COMMIT}.tar.gz - -> zlib-ng-${ZLIB_NG_COMMIT}.tar.gz - https://github.com/zlib-ng/minizip-ng/archive/${MINIZIP_NG_COMMIT}.tar.gz - -> minizip-ng-${MINIZIP_NG_COMMIT}.tar.gz + https://github.com/e-dant/watcher/archive/${WATCHER_COMMIT}.tar.gz + -> watcher-${WATCHER_COMMIT}.tar.gz mgba? ( https://github.com/mgba-emu/mgba/archive/${MGBA_COMMIT}.tar.gz -> mgba-${MGBA_COMMIT}.tar.gz @@ -71,8 +67,11 @@ RDEPEND=" >=app-arch/lz4-1.8:= app-arch/xz-utils >=app-arch/zstd-1.4.0:= + >=sys-libs/zlib-ng-1.3.1:= + >=sys-libs/minizip-ng-4.0.4:= dev-libs/hidapi >=dev-libs/libfmt-10.1:= + >=dev-util/glslang-1.4.321.0:= dev-libs/lzo:2 dev-libs/pugixml dev-libs/xxhash @@ -101,7 +100,7 @@ RDEPEND=" llvm? ( $(llvm_gen_dep 'llvm-core/llvm:${LLVM_SLOT}=') ) profile? ( dev-util/oprofile ) pulseaudio? ( media-libs/libpulse ) - sdl? ( >=media-libs/libsdl2-2.30.9 ) + sdl? ( >=media-libs/libsdl3-3.2.20 ) systemd? ( sys-apps/systemd:0= ) upnp? ( net-libs/miniupnpc:= ) " @@ -125,17 +124,10 @@ RDEPEND+=" 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 - [Bochs_disasm]=LGPL-2.1+ [cpp-optparse]=MIT [imgui]=MIT [implot]=MIT - [glslang]=BSD [tinygltf]=MIT @@ -153,10 +145,11 @@ declare -A KEEP_BUNDLED=( [FatFs]=FatFs [Vulkan-Headers]="|| ( Apache-2.0 MIT )" [VulkanMemoryAllocator]=MIT + [watcher]=MIT ) PATCHES=( - "${FILESDIR}"/dolphin-2407-minizip.patch + "${FILESDIR}"/dolphin-2509-retroachievents-test.patch ) add_bundled_licenses() { @@ -176,8 +169,7 @@ src_prepare() { mv -T "${WORKDIR}/tinygltf-${TINYGLTF_COMMIT}" Externals/tinygltf/tinygltf || die mv -T "${WORKDIR}/Vulkan-Headers-${VULKAN_HEADERS_COMMIT}" Externals/Vulkan-Headers || die mv -T "${WORKDIR}/VulkanMemoryAllocator-${VULKANMEMORYALLOCATOR_COMMIT}" Externals/VulkanMemoryAllocator || die - mv -T "${WORKDIR}/zlib-ng-${ZLIB_NG_COMMIT}" Externals/zlib-ng/zlib-ng || die - mv -T "${WORKDIR}/minizip-ng-${MINIZIP_NG_COMMIT}" Externals/minizip-ng/minizip-ng || die + mv -T "${WORKDIR}/watcher-${WATCHER_COMMIT}" Externals/watcher/watcher || die if use mgba; then mv -T "${WORKDIR}/mgba-${MGBA_COMMIT}" Externals/mGBA/mgba || die fi @@ -232,13 +224,15 @@ src_configure() { # Use system libraries -DUSE_SYSTEM_FMT=ON + -DUSE_SYSTEM_GLSLANG=ON -DUSE_SYSTEM_PUGIXML=ON -DUSE_SYSTEM_ENET=ON -DUSE_SYSTEM_XXHASH=ON -DUSE_SYSTEM_BZIP2=ON -DUSE_SYSTEM_LIBLZMA=ON -DUSE_SYSTEM_ZSTD=ON - -DUSE_SYSTEM_MINIZIP=OFF + -DUSE_SYSTEM_ZLIB=ON + -DUSE_SYSTEM_MINIZIP-NG=ON -DUSE_SYSTEM_LZO=ON -DUSE_SYSTEM_LZ4=ON -DUSE_SYSTEM_SPNG=ON @@ -268,7 +262,7 @@ src_configure() { use test && mycmakeargs+=( -DUSE_SYSTEM_GTEST=ON ) use mgba && mycmakeargs+=( -DUSE_SYSTEM_LIBMGBA=OFF ) - use sdl && mycmakeargs+=( -DUSE_SYSTEM_SDL2=ON ) + use sdl && mycmakeargs+=( -DUSE_SYSTEM_SDL3=ON ) use upnp && mycmakeargs+=( -DUSE_SYSTEM_MINIUPNPC=ON ) cmake_src_configure diff --git a/games-emulation/dolphin/files/dolphin-2509-retroachievents-test.patch b/games-emulation/dolphin/files/dolphin-2509-retroachievents-test.patch new file mode 100644 index 000000000000..d7fa3cccbe7e --- /dev/null +++ b/games-emulation/dolphin/files/dolphin-2509-retroachievents-test.patch @@ -0,0 +1,29 @@ +From 200fd2e83f82e2726e5dc447490b788f8177cbd6 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Joshua=20Vanda=C3=ABle?= <[email protected]> +Date: Fri, 3 Oct 2025 14:43:47 +0200 +Subject: [PATCH] Retro Achievements Test + +--- + Source/UnitTests/Core/PatchAllowlistTest.cpp | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/Source/UnitTests/Core/PatchAllowlistTest.cpp b/Source/UnitTests/Core/PatchAllowlistTest.cpp +index c2b6be61e6..4d91514689 100644 +--- a/Source/UnitTests/Core/PatchAllowlistTest.cpp ++++ b/Source/UnitTests/Core/PatchAllowlistTest.cpp +@@ -1,6 +1,7 @@ + // Copyright 2024 Dolphin Emulator Project + // SPDX-License-Identifier: GPL-2.0-or-later + ++#ifdef USE_RETRO_ACHIEVEMENTS + #include <array> + #include <map> + #include <string> +@@ -191,3 +192,4 @@ void ReadVerified(const Common::IniFile& ini, const std::string& filename, + } + } + } ++#endif // USE_RETRO_ACHIEVEMENTS +-- +2.49.1 +
