Use system libmgba for dolphin-emu-git

2 files changed, 14 insertions, 15 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ef211990216e..934d2a69ba01 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = dolphin-emu-git
 	pkgdesc = A Gamecube / Wii emulator
-	pkgver = 5.0.r17960.g44f8b8c100
+	pkgver = 5.0.r18076.gd853da3b0b
 	pkgrel = 1
 	url = https://dolphin-emu.org
 	arch = x86_64
@@ -17,6 +17,7 @@ pkgbase = dolphin-emu-git
 	depends = hidapi
 	depends = libevdev
 	depends = libgl
+	depends = libmgba
 	depends = libpulse
 	depends = libx11
 	depends = libxi
@@ -39,17 +40,17 @@ pkgbase = dolphin-emu-git
 	depends = libusb-1.0.so
 	optdepends = pulseaudio: PulseAudio backend
 	source = dolphin-emu-git::git+https://github.com/dolphin-emu/dolphin
-	source = dolphin-emu-git-mgba::git+https://github.com/mgba-emu/mgba.git
 	source = dolphin-emu-git-spirvcross::git+https://github.com/KhronosGroup/SPIRV-Cross.git
 	source = dolphin-emu-git-zlibng::git+https://github.com/zlib-ng/zlib-ng.git
 	source = dolphin-emu-git-libspng::git+https://github.com/randy408/libspng.git
 	source = dolphin-emu-git-vma::git+https://github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator.git
+	source = dolphin-emu-git-5.0.r18076.gd853da3b0b-1-system-libmgba.diff::https://github.com/dolphin-emu/dolphin/commit/afde3a0e0d2bc49a5d890d16611432aa6eb76428.diff
 	sha512sums = SKIP
 	sha512sums = SKIP
 	sha512sums = SKIP
 	sha512sums = SKIP
 	sha512sums = SKIP
-	sha512sums = SKIP
+	sha512sums = 1fe1501ccacb158464bd17efaae5263f0bc8639edb40a29227969d803e1c99860373df40fe0da7828f4bd2fecff4801695f7d303a49bdfbb8087fbca3b1b468d
 
 pkgname = dolphin-emu-git
 	pkgdesc = A Gamecube / Wii emulator - git version
diff --git a/PKGBUILD b/PKGBUILD
index 843deaaa4381..0cc0f85a8089 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@ _mainpkgname="$_projectname-emu"
 _noguipkgname="$_projectname-emu-nogui"
 pkgbase="$_mainpkgname-git"
 pkgname=("$pkgbase" "$_noguipkgname-git")
-pkgver='5.0.r17960.g44f8b8c100'
+pkgver='5.0.r18076.gd853da3b0b'
 pkgrel='1'
 pkgdesc='A Gamecube / Wii emulator'
 _pkgdescappend=' - git version'
@@ -14,27 +14,28 @@ arch=('x86_64' 'aarch64')
 url="https://$_mainpkgname.org"
 license=('GPL2')
 depends=(
-	'alsa-lib' 'bluez-libs' 'cubeb' 'enet' 'hidapi' 'libevdev' 'libgl' 'libpulse'
-	'libx11' 'libxi' 'libxrandr' 'lzo' 'mbedtls' 'minizip-ng' 'pugixml' 'qt6-base'
-	'sfml' 'zlib' 'libavcodec.so' 'libavformat.so' 'libavutil.so' 'libcurl.so'
-	'libfmt.so' 'libminiupnpc.so' 'libswscale.so' 'libudev.so' 'libusb-1.0.so'
+	'alsa-lib' 'bluez-libs' 'cubeb' 'enet' 'hidapi' 'libevdev' 'libgl' 'libmgba'
+	'libpulse' 'libx11' 'libxi' 'libxrandr' 'lzo' 'mbedtls' 'minizip-ng' 'pugixml'
+	'qt6-base' 'sfml' 'zlib'
+	'libavcodec.so' 'libavformat.so' 'libavutil.so' 'libcurl.so' 'libfmt.so'
+	'libminiupnpc.so' 'libswscale.so' 'libudev.so' 'libusb-1.0.so'
 )
 makedepends=('cmake' 'git' 'ninja' 'python')
 optdepends=('pulseaudio: PulseAudio backend')
 source=(
 	"$pkgname::git+https://github.com/$_mainpkgname/$_projectname"
-	"$pkgname-mgba::git+https://github.com/mgba-emu/mgba.git"
 	"$pkgname-spirvcross::git+https://github.com/KhronosGroup/SPIRV-Cross.git"
 	"$pkgname-zlibng::git+https://github.com/zlib-ng/zlib-ng.git"
 	"$pkgname-libspng::git+https://github.com/randy408/libspng.git"
 	"$pkgname-vma::git+https://github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator.git"
+	"$pkgname-$pkgver-$pkgrel-system-libmgba.diff::https://github.com/$_mainpkgname/$_projectname/commit/afde3a0e0d2bc49a5d890d16611432aa6eb76428.diff" # https://github.com/dolphin-emu/dolphin/pull/11362
 )
 sha512sums=('SKIP'
             'SKIP'
             'SKIP'
             'SKIP'
             'SKIP'
-            'SKIP')
+            '1fe1501ccacb158464bd17efaae5263f0bc8639edb40a29227969d803e1c99860373df40fe0da7828f4bd2fecff4801695f7d303a49bdfbb8087fbca3b1b468d')
 
 _sourcedirectory="$pkgname"
 
@@ -43,11 +44,8 @@ prepare() {
 	if [ -d 'build/' ]; then rm -rf 'build/'; fi
 	mkdir 'build/'
 
-	# Provide mgba submodule
-	_mgbapath='Externals/mGBA/mgba'
-	git submodule init "$_mgbapath"
-	git config "submodule.$_mgbapath.url" "$srcdir/$pkgname-mgba/"
-	git -c protocol.file.allow=always submodule update "$_mgbapath"
+	# Apply patch to use system libmgba
+	patch --forward -p1 < "$srcdir/$pkgname-$pkgver-$pkgrel-system-libmgba.diff"
 
 	# Provide SPIRV-Cross submodule
 	_spirvcrosspath='Externals/spirv_cross/SPIRV-Cross'