diff options
| author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2025-01-20 10:22:53 +0900 |
|---|---|---|
| committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2025-01-26 22:59:59 +0900 |
| commit | be058cf6fcf01be49e98b8a646e1ffdb34130db6 (patch) | |
| tree | 847be348675db141b92f6b0e7077dc4993cdb884 /gnu | |
| parent | 826a9df7dd461639bafb32195e85d7fa4a3270b1 (diff) | |
gnu: dolphin-emu: Patch data.
This resolves a hang in the menu of the WaveRace game.
* gnu/packages/patches/dolphin-emu-data.patch: New file.
* gnu/packages/patches/libretro-dolphin-emu-data.patch: Likewise.
* gnu/local.mk (dist_patch_DATA): Register them.
* gnu/packages/emulators.scm (dolphin-emu) [source]: Apply dolphin-emu patch.
(libretro-dolphin-emu) [source]: Apply libretro-dolphin-emu patch.
Reviewed-by: Sou Bunnbu (宋文武) <iyzsong@member.fsf.org>
Change-Id: Ie22a7bba527724179f5296a44f1874d2efdbd94c
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/local.mk | 4 | ||||
| -rw-r--r-- | gnu/packages/emulators.scm | 6 | ||||
| -rw-r--r-- | gnu/packages/patches/dolphin-emu-data.patch | 15 | ||||
| -rw-r--r-- | gnu/packages/patches/libretro-dolphin-emu-data.patch | 17 |
4 files changed, 39 insertions, 3 deletions
diff --git a/gnu/local.mk b/gnu/local.mk index 5091f93eb8c..9457fbf4cbd 100644 --- a/gnu/local.mk +++ b/gnu/local.mk | |||
| @@ -19,7 +19,7 @@ | |||
| 19 | # Copyright © 2018 Amirouche Boubekki <amirouche@hypermove.net> | 19 | # Copyright © 2018 Amirouche Boubekki <amirouche@hypermove.net> |
| 20 | # Copyright © 2018, 2019, 2020, 2021, 2022, 2024 Oleg Pykhalov <go.wigust@gmail.com> | 20 | # Copyright © 2018, 2019, 2020, 2021, 2022, 2024 Oleg Pykhalov <go.wigust@gmail.com> |
| 21 | # Copyright © 2018 Stefan Stefanović <stefanx2ovic@gmail.com> | 21 | # Copyright © 2018 Stefan Stefanović <stefanx2ovic@gmail.com> |
| 22 | # Copyright © 2018, 2020, 2021, 2022, 2023, 2024 Maxim Cournoyer <maxim.cournoyer@gmail.com> | 22 | # Copyright © 2018, 2020-2025 Maxim Cournoyer <maxim.cournoyer@gmail.com> |
| 23 | # Copyright © 2019, 2020, 2021, 2022, 2024 Guillaume Le Vaillant <glv@posteo.net> | 23 | # Copyright © 2019, 2020, 2021, 2022, 2024 Guillaume Le Vaillant <glv@posteo.net> |
| 24 | # Copyright © 2019, 2020 John Soo <jsoo1@asu.edu> | 24 | # Copyright © 2019, 2020 John Soo <jsoo1@asu.edu> |
| 25 | # Copyright © 2019 Jonathan Brielmaier <jonathan.brielmaier@web.de> | 25 | # Copyright © 2019 Jonathan Brielmaier <jonathan.brielmaier@web.de> |
| @@ -1182,6 +1182,7 @@ dist_patch_DATA = \ | |||
| 1182 | %D%/packages/patches/docbook2x-static-datadir-evaluation.patch \ | 1182 | %D%/packages/patches/docbook2x-static-datadir-evaluation.patch \ |
| 1183 | %D%/packages/patches/doc++-include-directives.patch \ | 1183 | %D%/packages/patches/doc++-include-directives.patch \ |
| 1184 | %D%/packages/patches/doc++-segfault-fix.patch \ | 1184 | %D%/packages/patches/doc++-segfault-fix.patch \ |
| 1185 | %D%/packages/patches/dolphin-emu-data.patch \ | ||
| 1185 | %D%/packages/patches/dovecot-opensslv3.patch \ | 1186 | %D%/packages/patches/dovecot-opensslv3.patch \ |
| 1186 | %D%/packages/patches/dovecot-trees-support-dovecot-2.3.patch \ | 1187 | %D%/packages/patches/dovecot-trees-support-dovecot-2.3.patch \ |
| 1187 | %D%/packages/patches/dstat-fix-crash-when-specifying-delay.patch \ | 1188 | %D%/packages/patches/dstat-fix-crash-when-specifying-delay.patch \ |
| @@ -1659,6 +1660,7 @@ dist_patch_DATA = \ | |||
| 1659 | %D%/packages/patches/libgeotiff-fix-tests-on-i386.patch \ | 1660 | %D%/packages/patches/libgeotiff-fix-tests-on-i386.patch \ |
| 1660 | %D%/packages/patches/libguestfs-syms.patch \ | 1661 | %D%/packages/patches/libguestfs-syms.patch \ |
| 1661 | %D%/packages/patches/libobjc2-unbundle-robin-map.patch \ | 1662 | %D%/packages/patches/libobjc2-unbundle-robin-map.patch \ |
| 1663 | %D%/packages/patches/libretro-dolphin-emu-data.patch \ | ||
| 1662 | %D%/packages/patches/librewolf-use-system-wide-dir.patch \ | 1664 | %D%/packages/patches/librewolf-use-system-wide-dir.patch \ |
| 1663 | %D%/packages/patches/libvirt-add-install-prefix.patch \ | 1665 | %D%/packages/patches/libvirt-add-install-prefix.patch \ |
| 1664 | %D%/packages/patches/libziparchive-add-includes.patch \ | 1666 | %D%/packages/patches/libziparchive-add-includes.patch \ |
diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index 43d8d2bdf72..f20b6da79b3 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm | |||
| @@ -337,7 +337,8 @@ console.") | |||
| 337 | (substitute* "CMakeLists.txt" | 337 | (substitute* "CMakeLists.txt" |
| 338 | ((".*add_subdirectory.*Externals/enet.*") "") | 338 | ((".*add_subdirectory.*Externals/enet.*") "") |
| 339 | ((".*add_subdirectory.*Externals/soundtouch.*") "") | 339 | ((".*add_subdirectory.*Externals/soundtouch.*") "") |
| 340 | ((".*add_subdirectory.*Externals/xxhash.*") "")))))) | 340 | ((".*add_subdirectory.*Externals/xxhash.*") "")))) |
| 341 | (patches (search-patches "dolphin-emu-data.patch")))) | ||
| 341 | (build-system cmake-build-system) | 342 | (build-system cmake-build-system) |
| 342 | (arguments | 343 | (arguments |
| 343 | (list | 344 | (list |
| @@ -499,7 +500,8 @@ turbo speed, networked multiplayer, and graphical enhancements.") | |||
| 499 | (file-name (git-file-name name version)) | 500 | (file-name (git-file-name name version)) |
| 500 | (sha256 | 501 | (sha256 |
| 501 | (base32 | 502 | (base32 |
| 502 | "1fvm6hy0ihc0j3sgv88a7ak08c0kyikmmiif827j981fy7zvglvz")))) | 503 | "1fvm6hy0ihc0j3sgv88a7ak08c0kyikmmiif827j981fy7zvglvz")) |
| 504 | (patches (search-patches "libretro-dolphin-emu-data.patch")))) | ||
| 503 | (arguments | 505 | (arguments |
| 504 | (substitute-keyword-arguments (package-arguments dolphin-emu) | 506 | (substitute-keyword-arguments (package-arguments dolphin-emu) |
| 505 | ((#:configure-flags flags ''()) | 507 | ((#:configure-flags flags ''()) |
diff --git a/gnu/packages/patches/dolphin-emu-data.patch b/gnu/packages/patches/dolphin-emu-data.patch new file mode 100644 index 00000000000..6ba959b9291 --- /dev/null +++ b/gnu/packages/patches/dolphin-emu-data.patch | |||
| @@ -0,0 +1,15 @@ | |||
| 1 | Resolve a hang in the menu of this game. | ||
| 2 | |||
| 3 | Upstream-status: https://github.com/dolphin-emu/dolphin/pull/13285 | ||
| 4 | |||
| 5 | diff --git a/Data/Sys/GameSettings/GWR.ini b/Data/Sys/GameSettings/GWR.ini | ||
| 6 | new file mode 100644 | ||
| 7 | index 0000000000..fdbc0c312f | ||
| 8 | --- /dev/null | ||
| 9 | +++ b/Data/Sys/GameSettings/GWR.ini | ||
| 10 | @@ -0,0 +1,5 @@ | ||
| 11 | +# GWR - WAVE RACE / BLUE STORM | ||
| 12 | + | ||
| 13 | +[Core] | ||
| 14 | +# Disable multi-threading to avoid a hang in the game menu. | ||
| 15 | +CPUThread = False | ||
diff --git a/gnu/packages/patches/libretro-dolphin-emu-data.patch b/gnu/packages/patches/libretro-dolphin-emu-data.patch new file mode 100644 index 00000000000..e98660d8abc --- /dev/null +++ b/gnu/packages/patches/libretro-dolphin-emu-data.patch | |||
| @@ -0,0 +1,17 @@ | |||
| 1 | Resolve a hang in the menu of this game. | ||
| 2 | |||
| 3 | Upstream-status: https://github.com/libretro/dolphin/pull/337 | ||
| 4 | |||
| 5 | diff --git a/Data/Sys/GameSettings/GWR.ini b/Data/Sys/GameSettings/GWR.ini | ||
| 6 | new file mode 100644 | ||
| 7 | index 0000000000..a55f4d29cd | ||
| 8 | --- /dev/null | ||
| 9 | +++ b/Data/Sys/GameSettings/GWR.ini | ||
| 10 | @@ -0,0 +1,7 @@ | ||
| 11 | +# GWR - WAVE RACE / BLUE STORM | ||
| 12 | + | ||
| 13 | +[Core] | ||
| 14 | +# Disable multi-threading to avoid a hang in the game menu. | ||
| 15 | +# TODO: Change to 'CPUThread = False' after rebasing to latest | ||
| 16 | +# upstream (see commit 869edd5a66). | ||
| 17 | +SyncGPU = True | ||
