From 2fa59bd78505246abd6d344a9ef85a2259b60148 Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Sun, 15 Sep 2024 13:24:03 +0000
Subject: [PATCH] extra/vbam to 2.1.11-1

---
 extra/vbam/.SRCINFO | 8 ++++----
 extra/vbam/PKGBUILD | 8 +++-----
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/extra/vbam/.SRCINFO b/extra/vbam/.SRCINFO
index 83d6e10fe..8751683e1 100644
--- a/extra/vbam/.SRCINFO
+++ b/extra/vbam/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = vbam
 	pkgdesc = Nintendo GameBoy Advance emulator
-	pkgver = 2.1.10
-	pkgrel = 2
+	pkgver = 2.1.11
+	pkgrel = 1
 	url = https://visualboyadvance-m.org
 	arch = x86_64
 	license = GPL2
@@ -20,10 +20,10 @@ pkgbase = vbam
 	depends = sdl2
 	depends = sfml
 	depends = zlib
-	source = git+https://github.com/visualboyadvance-m/visualboyadvance-m.git?signed#tag=v2.1.10
+	source = git+https://github.com/visualboyadvance-m/visualboyadvance-m.git?signed#tag=v2.1.11
 	validpgpkeys = A0C0E526E36FD2138C149D4D08AB596679D86240
 	validpgpkeys = 0662A706ABE516087A23D1B9F2E06F4EE438BE81
-	b2sums = 81c21a5e2ddc1a9c3ca100c95d804cad11b376ba88e0846ba2d25a9ca96c8fe0c379a332daf4f919958b8a47bbf4d7ded412ec0bf879a94203305c310d665438
+	b2sums = caa270b95f5fa1ea543d57d9ed4309b7bdb345b421d91c4fd1511b8918997339a3143333bad08ce754207ea38f4686d7f7b594b951ea1636a5e7a99a7db4790a
 
 pkgname = vbam-sdl
 	conflicts = vbam-wx
diff --git a/extra/vbam/PKGBUILD b/extra/vbam/PKGBUILD
index 8090ba8ca..dc02755be 100644
--- a/extra/vbam/PKGBUILD
+++ b/extra/vbam/PKGBUILD
@@ -10,8 +10,8 @@ pkgname=(
   vbam-sdl
   vbam-wx
 )
-pkgver=2.1.10
-pkgrel=2
+pkgver=2.1.11
+pkgrel=1
 pkgdesc='Nintendo GameBoy Advance emulator'
 arch=(x86_64)
 url='https://visualboyadvance-m.org'
@@ -37,15 +37,13 @@ makedepends=(
 )
 _pkgname=visualboyadvance-m
 source=("git+https://github.com/${_pkgname}/${_pkgname}.git?signed#tag=v${pkgver}")
-b2sums=('81c21a5e2ddc1a9c3ca100c95d804cad11b376ba88e0846ba2d25a9ca96c8fe0c379a332daf4f919958b8a47bbf4d7ded412ec0bf879a94203305c310d665438')
+b2sums=('caa270b95f5fa1ea543d57d9ed4309b7bdb345b421d91c4fd1511b8918997339a3143333bad08ce754207ea38f4686d7f7b594b951ea1636a5e7a99a7db4790a')
 validpgpkeys=('A0C0E526E36FD2138C149D4D08AB596679D86240' # Rafael Kitover <rkitover@gmail.com>
               '0662A706ABE516087A23D1B9F2E06F4EE438BE81' # Zach Bacon <zachbacon@vba-m.com>
 )
 
 prepare() {
   cd ${_pkgname}
-  # fix conflict with gtest
-  git cherry-pick -n d619ee2bb14b3412ca7193cd4ff4a056193189de
 }
 
 build() {