From ac0697a6e2cdc4d890b6f4cd71f149e798d41d79 Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Mon, 10 Jul 2023 12:35:42 +0000
Subject: [PATCH] extra/vbam to 2.1.6-1

---
 extra/vbam/PKGBUILD | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/extra/vbam/PKGBUILD b/extra/vbam/PKGBUILD
index b784a6562..3bbba5ecc 100644
--- a/extra/vbam/PKGBUILD
+++ b/extra/vbam/PKGBUILD
@@ -11,8 +11,8 @@ pkgname=(
   vbam-wx
 )
 _pkgname=visualboyadvance-m
-pkgver=2.1.5.r109.79061810
-pkgrel=2
+pkgver=2.1.6
+pkgrel=1
 pkgdesc='Nintendo GameBoy Advance emulator'
 arch=(x86_64)
 url=https://vba-m.com
@@ -41,12 +41,10 @@ makedepends=(
   wxwidgets-gtk3
   zip
 )
-#_tag=a964f4a5c69ce30d124bd6dcf987bdedc82f3928 # git rev-parse v${pkgver}
-#source=("git+https://github.com/${_pkgname}/${_pkgname}.git?signed#tag=${_tag}")
-_commit=790618102dea1a4c94a115e4f3e8b432eb53adee # master
-source=("git+https://github.com/${_pkgname}/${_pkgname}.git?#commit=${_commit}")
+_tag=f2db2f5635873723bbc5b6786623827e3d029323 # git rev-parse v${pkgver}
+source=("git+https://github.com/${_pkgname}/${_pkgname}.git?signed#tag=${_tag}")
 b2sums=('SKIP')
-#validpgpkeys=(A0C0E526E36FD2138C149D4D08AB596679D86240) # Rafael Kitover <rkitover@gmail.com>
+validpgpkeys=(A0C0E526E36FD2138C149D4D08AB596679D86240) # Rafael Kitover <rkitover@gmail.com>
 
 prepare() {
   cd ${_pkgname}
@@ -54,14 +52,14 @@ prepare() {
   sed -e 's|${CMAKE_SOURCE_DIR}/third_party|/usr|' -i src/wx/tests/CMakeLists.txt
 }
 
-pkgver() {
-  cd ${_pkgname}
-  git describe --tags | sed 's/^v//; s/-/.r/; s/-g/./'
-}
+#pkgver() {
+#  cd ${_pkgname}
+#  git describe --tags | sed 's/^v//; s/-/.r/; s/-g/./'
+#}
 
 build() {
   cmake -S ${_pkgname} -B build-sdl -G Ninja \
-    -DCMAKE_BUILD_TYPE='' \
+    -DCMAKE_BUILD_TYPE=Release \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DCMAKE_SKIP_RPATH=TRUE \
     -DENABLE_SDL=TRUE \