Since about a week ago, Dolphin introduced integrated mgba: https://dolphin-emu.org/blog/2021/07/21/integrated-gba/ This isn't worked into the ebuild yet. In my tests, all that needs to change is adding `Externals/mGBA/mgba` to `EGIT_SUBMODULES` and `Externals/mGBA` to `KEEP_SOURCES` (I've thrown the git diff into the Additional Information section) Reproducible: Always Steps to Reproduce: Try to install games-emulation/dolphin-9999 Actual Results: CMake Error at CMakeLists.txt:835 (add_subdirectory): add_subdirectory given source "Externals/mGBA" which is not an existing directory. Expected Results: building and installation diff --git a/games-emulation/dolphin/dolphin-9999.ebuild b/games-emulation/dolphin/dolphin-9999.ebuild index b2fd4d445542..fd99d4066165 100644 --- a/games-emulation/dolphin/dolphin-9999.ebuild +++ b/games-emulation/dolphin/dolphin-9999.ebuild @@ -11,7 +11,7 @@ inherit cmake desktop xdg-utils pax-utils plocale if [[ ${PV} == *9999 ]] then EGIT_REPO_URI="https://github.com/dolphin-emu/dolphin" - EGIT_SUBMODULES=() + EGIT_SUBMODULES=( Externals/mGBA/mgba ) inherit git-r3 else inherit vcs-snapshot @@ -109,6 +109,9 @@ src_prepare() { picojson # No code to detect shared library. zstd + + # This is a stripped-down mGBA for integrated GBA support + mGBA ) local s for s in "${KEEP_SOURCES[@]}"; do
*** Bug 804669 has been marked as a duplicate of this bug. ***
The patch looks good! We can revisit later why EGIT_SUBMODULES is needed at all. I suspect it's some old remnant. Can you attach a patch in `git format-patch` format so I could just apply it with `git am` keeping your attribution?
Created attachment 727410 [details, diff] games-emulation/dolphin: enable mGBA Sure, thanks; this is my first rodeo with format-patch, but I think this should be right, after reviewing GLEP 66.
The bug has been closed via the following commit(s): https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ec76e3439fd84be67bcd5b1e6591ccd24253b0d2 commit ec76e3439fd84be67bcd5b1e6591ccd24253b0d2 Author: Taylor C. Richberger <taywee@gmx.com> AuthorDate: 2021-07-28 03:25:08 +0000 Commit: Sergei Trofimovich <slyfox@gentoo.org> CommitDate: 2021-07-28 06:45:46 +0000 games-emulation/dolphin: enable mGBA support Closes: https://bugs.gentoo.org/804666 Reported-by: Taylor C. Richberger <taywee@gmx.com> Reviewed-by: Sergei Trofimovich <slyfox@gentoo.org> Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org> games-emulation/dolphin/dolphin-9999.ebuild | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
That's perfect! Pulled as is. Thank you!
