Fix dolphin-emu-git functionality check, update dependencies

2 files changed, 42 insertions, 10 deletions

diff --git a/.SRCINFO b/.SRCINFO
index db08a7dee171..f15da8e73716 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = dolphin-emu-git
 	pkgdesc = A Gamecube / Wii emulator
-	pkgver = 5.0.r21148.g5090a028e6
+	pkgver = 5.0.r21506.g57c890d4fc
 	pkgrel = 1
 	url = https://dolphin-emu.org
 	arch = x86_64
@@ -9,7 +9,6 @@ pkgbase = dolphin-emu-git
 	checkdepends = gtest
 	makedepends = cmake
 	makedepends = git
-	makedepends = miniupnpc
 	makedepends = ninja
 	makedepends = python
 	makedepends = qt6-base
@@ -38,6 +37,7 @@ pkgbase = dolphin-emu-git
 	depends = libavutil.so
 	depends = libcurl.so
 	depends = libfmt.so
+	depends = libminiupnpc.so
 	depends = libsfml-network.so
 	depends = libsfml-system.so
 	depends = libspng.so
@@ -88,6 +88,7 @@ pkgname = dolphin-emu-git
 	depends = libavutil.so
 	depends = libcurl.so
 	depends = libfmt.so
+	depends = libminiupnpc.so
 	depends = libsfml-network.so
 	depends = libsfml-system.so
 	depends = libspng.so
@@ -96,7 +97,6 @@ pkgname = dolphin-emu-git
 	depends = libusb-1.0.so
 	depends = libxxhash.so
 	depends = hicolor-icon-theme
-	depends = libminiupnpc.so
 	depends = qt6-base
 	depends = qt6-svg
 	provides = dolphin-emu
@@ -104,6 +104,38 @@ pkgname = dolphin-emu-git
 
 pkgname = dolphin-emu-nogui-git
 	pkgdesc = A Gamecube / Wii emulator - no GUI - git version
+	depends = alsa-lib
+	depends = bluez-libs
+	depends = bzip2
+	depends = hidapi
+	depends = libevdev
+	depends = libgl
+	depends = libpulse
+	depends = libx11
+	depends = libxi
+	depends = libxrandr
+	depends = lzo
+	depends = mbedtls2
+	depends = pugixml
+	depends = sfml
+	depends = speexdsp
+	depends = xz
+	depends = zstd
+	depends = cubeb
+	depends = zlib-ng
+	depends = libavcodec.so
+	depends = libavformat.so
+	depends = libavutil.so
+	depends = libcurl.so
+	depends = libfmt.so
+	depends = libminiupnpc.so
+	depends = libsfml-network.so
+	depends = libsfml-system.so
+	depends = libspng.so
+	depends = libswscale.so
+	depends = libudev.so
+	depends = libusb-1.0.so
+	depends = libxxhash.so
 	depends = dolphin-emu
 	optdepends = 
 	provides = dolphin-emu-nogui
diff --git a/PKGBUILD b/PKGBUILD
index 64d9525f608d..929b16e826dd 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,7 +8,7 @@ _noguipkgname="$_projectname-emu-nogui"
 _toolpkgname="$_projectname-emu-tool"
 pkgbase="$_mainpkgname-git"
 pkgname=("$pkgbase" "$_noguipkgname-git" "$_toolpkgname-git")
-pkgver='5.0.r21148.g5090a028e6'
+pkgver='5.0.r21506.g57c890d4fc'
 pkgrel='1'
 pkgdesc='A Gamecube / Wii emulator'
 _pkgdescappend=' - git version'
@@ -20,10 +20,10 @@ depends=(
 	'libxi' 'libxrandr' 'lzo' 'mbedtls2' 'pugixml' 'sfml' 'speexdsp' 'xz' 'zstd'
 	'cubeb' 'zlib-ng'
 	'libavcodec.so' 'libavformat.so' 'libavutil.so' 'libcurl.so' 'libfmt.so'
-	'libsfml-network.so' 'libsfml-system.so' 'libspng.so' 'libswscale.so'
-	'libudev.so' 'libusb-1.0.so' 'libxxhash.so'
+	'libminiupnpc.so' 'libsfml-network.so' 'libsfml-system.so' 'libspng.so'
+	'libswscale.so' 'libudev.so' 'libusb-1.0.so' 'libxxhash.so'
 )
-makedepends=('cmake' 'git' 'miniupnpc' 'ninja' 'python' 'qt6-base' 'qt6-svg')
+makedepends=('cmake' 'git' 'ninja' 'python' 'qt6-base' 'qt6-svg')
 checkdepends=('gtest')
 optdepends=('pulseaudio: PulseAudio backend')
 options=('!lto')
@@ -108,12 +108,12 @@ check() {
 	ninja unittests
 
 	# Verify that the basic functionality works
-	"$srcdir/$_sourcedirectory/build/Binaries/$_mainpkgname" --version | tee '/dev/stderr' | grep -q "^$_checkversion$"
+	"$srcdir/$_sourcedirectory/build/Binaries/$_noguipkgname" --version | tee '/dev/stderr' | grep -q "^$_checkversion$"
 }
 
 package_dolphin-emu-git() {
 	pkgdesc="$pkgdesc$_pkgdescappend"
-	depends+=('hicolor-icon-theme' 'libminiupnpc.so' 'qt6-base' 'qt6-svg')
+	depends+=('hicolor-icon-theme' 'qt6-base' 'qt6-svg')
 	provides=("$_mainpkgname")
 	conflicts=("$_mainpkgname")
 
@@ -128,7 +128,7 @@ package_dolphin-emu-git() {
 
 package_dolphin-emu-nogui-git() {
 	pkgdesc="$pkgdesc - no GUI$_pkgdescappend"
-	depends=("$_mainpkgname")
+	depends+=("$_mainpkgname")
 	optdepends=()
 	provides=("$_noguipkgname" "$_mainpkgname-cli")
 	conflicts=("$_noguipkgname" "$_mainpkgname-cli")