Reflect upstream build changes

2 files changed, 9 insertions, 34 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 58c86198e409..6a3876f1834f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,25 +1,17 @@
 pkgbase = nanoboyadvance-git
 	pkgdesc = Accuracy-focused Game Boy Advance emulator.
-	pkgver = 1.7.1.r50.gf94692a4
+	pkgver = 1.7.1.r53.gd5e47e52
 	pkgrel = 1
 	url = https://github.com/nba-emu/NanoBoyAdvance
 	arch = x86_64
 	license = GPL3
 	makedepends = cmake
-	makedepends = make
 	makedepends = git
-	makedepends = gcc
-	makedepends = imagemagick
 	depends = qt5-base
 	depends = glew
 	depends = sdl2
+	depends = fmt
 	source = git+https://github.com/nba-emu/NanoBoyAdvance.git
-	source = git+https://github.com/fmtlib/fmt.git
-	source = git+https://github.com/ToruNiina/toml11.git
-	source = git+https://github.com/selmf/unarr.git
-	sha256sums = SKIP
-	sha256sums = SKIP
-	sha256sums = SKIP
 	sha256sums = SKIP
 
 pkgname = nanoboyadvance-git
diff --git a/PKGBUILD b/PKGBUILD
index 998df81f5f73..1e1a07e051ac 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,45 +4,28 @@ _pkgbase=nanoboyadvance
 pkgbase="${_pkgbase}-git"
 pkgname="${_pkgbase}-git"
 pkgdesc="Accuracy-focused Game Boy Advance emulator."
-pkgver=1.7.1.r50.gf94692a4
+pkgver=1.7.1.r53.gd5e47e52
 pkgrel=1
 arch=(x86_64)
 url="https://github.com/nba-emu/NanoBoyAdvance"
 license=(GPL3)
-makedepends=(cmake make git gcc imagemagick)
-depends=(qt5-base glew sdl2)
+makedepends=(cmake git)
+depends=(qt5-base glew sdl2 fmt)
 
-source=(
-	"git+https://github.com/nba-emu/NanoBoyAdvance.git" 
-	"git+https://github.com/fmtlib/fmt.git"
-	"git+https://github.com/ToruNiina/toml11.git"
-	"git+https://github.com/selmf/unarr.git"
-)
-
-sha256sums=('SKIP'
-        'SKIP'
-        'SKIP'
-        'SKIP')
+source=("git+https://github.com/nba-emu/NanoBoyAdvance.git")
+sha256sums=('SKIP')
 
 pkgver() {
 	cd NanoBoyAdvance
 	git describe --tags | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
 }
 
-prepare() {
-	cd NanoBoyAdvance
-	git submodule init
-	git submodule set-url external/fmtlib "${srcdir}/fmt"
-	git submodule set-url external/toml11 "${srcdir}/toml11"
-	git submodule set-url external/unarr "${srcdir}/unarr"
-	git -c protocol.file.allow=always submodule update
-}
-
 build() {
 	cd "$srcdir/NanoBoyAdvance"
 	cmake -B build \
 		-DCMAKE_BUILD_TYPE=None \
 		-DPORTABLE_MODE=OFF \
+		-DUSE_SYSTEM_FMT=ON \
 		-DCMAKE_INSTALL_PREFIX=/usr
 
 	cmake --build build
@@ -51,5 +34,5 @@ build() {
 package() {
 	cd "$srcdir/NanoBoyAdvance"
 
-	DESTDIR="$pkgdir" cmake -P build/bin/qt/cmake_install.cmake
+	DESTDIR="$pkgdir" cmake --install build
 }