community/vbam to 2.1.0-1

community/vbam/PKGBUILD

@@ -7,18 +7,16 @@
 
 pkgbase=vbam
 pkgname=('vbam-sdl' 'vbam-wx')
-pkgver=2.0.2
-pkgrel=4
+pkgver=2.1.0
+pkgrel=1
 pkgdesc='Nintendo GameBoy Advance emulator'
 arch=('x86_64')
 url='http://vba-m.com'
 license=('GPL2')
 depends=('gcc-libs' 'glibc' 'libgl' 'libpng' 'sdl2' 'sfml' 'zlib')
-makedepends=('cmake' 'ffmpeg' 'wxgtk3' 'zip')
-source=("vbam-${pkgver}.tar.gz::https://github.com/visualboyadvance-m/visualboyadvance-m/archive/v${pkgver}.tar.gz"
-        "https://github.com/visualboyadvance-m/visualboyadvance-m/commit/f3f6ee7b1c9f95cc1e8df368652034b9da84c130.patch")
-sha256sums=('f77461faa660b5fd955249087e45dc1dfa87ab8af8208ad7909b424af0879657'
-            '7f2b98913117ca873a610e9a0c7bdcd70521daf3c68ba010a2a400a2d1978bd6')
+makedepends=('cmake' 'ffmpeg' 'git' 'libglvnd' 'wxgtk3' 'zip')
+source=("git+https://github.com/visualboyadvance-m/visualboyadvance-m.git#tag=v${pkgver}")
+sha256sums=('SKIP')
 
 prepare() {
   for p in sdl wx; do
@@ -27,17 +25,12 @@ prepare() {
     fi
     mkdir build-$p
   done
-
-  cd visualboyadvance-m-${pkgver}
-
-  # Fix build against ffmpeg 4.0
-  patch -Np1 -i ../f3f6ee7b1c9f95cc1e8df368652034b9da84c130.patch
 }
 
 build() {
   cd build-sdl
 
-  cmake ../visualboyadvance-m-${pkgver} \
+  cmake ../visualboyadvance-m \
     -DCMAKE_BUILD_TYPE='Release' \
     -DCMAKE_INSTALL_PREFIX='/usr' \
     -DCMAKE_SKIP_RPATH='TRUE' \
@@ -49,7 +42,7 @@ build() {
 
   cd ../build-wx
 
-  cmake ../visualboyadvance-m-${pkgver} \
+  cmake ../visualboyadvance-m \
     -DCMAKE_BUILD_TYPE='Release' \
     -DCMAKE_INSTALL_PREFIX='/usr' \
     -DCMAKE_SKIP_RPATH='TRUE' \
@@ -63,22 +56,20 @@ build() {
 }
 
 package_vbam-sdl() {
-backup=('etc/vbam.cfg')
-conflicts=('vbam-wx')
+  backup=('etc/vbam.cfg')
+  conflicts=('vbam-wx')
 
-  cd build-sdl
-
-  make DESTDIR="${pkgdir}" install
+  make DESTDIR="${pkgdir}" -C build-sdl install
 }
 
 package_vbam-wx() {
-depends+=('glib2' 'gtk3' 'openal' 'wxgtk3' 'zip'
-          'libavcodec.so' 'libavformat.so' 'libavutil.so' 'libswscale.so')
-conflicts=('vbam-sdl')
+  depends+=(
+    'glib2' 'gtk3' 'openal' 'wxgtk3' 'zip'
+    'libavcodec.so' 'libavformat.so' 'libavutil.so' 'libswscale.so'
+  )
+  conflicts=('vbam-sdl')
 
-  cd build-wx
-
-  make DESTDIR="${pkgdir}" install
+  make DESTDIR="${pkgdir}" -C build-wx install
 }
 
 # vim: ts=2 sw=2 et: