community/vbam to 2.1.5-2

community/vbam/PKGBUILD

@@ -1,4 +1,5 @@
 # Maintainer: Maxime Gauduin <alucryd@archlinux.org>
+# Maintainer: T.J. Townsend <blakkheim@archlinux.org>
 # Contributor: Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
 
 # ALARM: Kevin Mihelich <kevin@archlinuxarm.org>
@@ -9,8 +10,9 @@ pkgname=(
   vbam-sdl
   vbam-wx
 )
+_pkgname=visualboyadvance-m
 pkgver=2.1.5
-pkgrel=1
+pkgrel=2
 pkgdesc='Nintendo GameBoy Advance emulator'
 arch=(x86_64)
 url=https://vba-m.com
@@ -37,33 +39,37 @@ makedepends=(
   wxwidgets-gtk3
   zip
 )
-_tag=a964f4a5c69ce30d124bd6dcf987bdedc82f3928
-source=(git+https://github.com/visualboyadvance-m/visualboyadvance-m.git?signed#tag=${_tag})
+_tag=a964f4a5c69ce30d124bd6dcf987bdedc82f3928 # 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>
 
 prepare() {
-  cd visualboyadvance-m
+  cd ${_pkgname}
   # Unbundle doctest (bundled one is not glibc 2.34 compatible)
   sed -e 's|${CMAKE_SOURCE_DIR}/third_party|/usr|' -i src/wx/tests/CMakeLists.txt
+  # Fix build with openal 1.23
+  sed -e '/AL_NO_PROTOTYPES/d' -i src/wx/openal.h
 }
 
-pkgver() {
-  cd visualboyadvance-m
-  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 visualboyadvance-m -B build-sdl -G Ninja \
+  cmake -S ${_pkgname} -B build-sdl -G Ninja \
     -DCMAKE_BUILD_TYPE='' \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DCMAKE_SKIP_RPATH=TRUE \
     -DENABLE_SDL=TRUE \
     -DENABLE_WX=FALSE \
     -DENABLE_LINK=TRUE \
-    -DENABLE_LTO=FALSE
+    -DENABLE_LTO=FALSE \
+    -Wno-dev
   cmake --build build-sdl
-  cmake -S visualboyadvance-m -B build-wx -G Ninja \
+
+  cmake -S ${_pkgname} -B build-wx -G Ninja \
     -DCMAKE_BUILD_TYPE=Release \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DCMAKE_SKIP_RPATH=TRUE \
@@ -71,7 +77,8 @@ build() {
     -DENABLE_WX=TRUE \
     -DENABLE_FFMPEG=TRUE \
     -DENABLE_LINK=TRUE \
-    -DENABLE_LTO=FALSE
+    -DENABLE_LTO=FALSE \
+    -Wno-dev
   cmake --build build-wx
 }