[arch-commits] Commit in vbam/repos/community-x86_64 (PKGBUILD PKGBUILD)

[Maxime Gauduin]

    Date: Thursday, August 2, 2018 @ 07:11:36
  Author: alucryd
Revision: 367240

archrelease: copy trunk to community-x86_64

Added:
  vbam/repos/community-x86_64/PKGBUILD
    (from rev 367239, vbam/trunk/PKGBUILD)
Deleted:
  vbam/repos/community-x86_64/PKGBUILD

----------+
 PKGBUILD |  144 +++++++++++++++++++++++++++++++------------------------------
 1 file changed, 74 insertions(+), 70 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2018-08-02 07:11:26 UTC (rev 367239)
+++ PKGBUILD	2018-08-02 07:11:36 UTC (rev 367240)
@@ -1,70 +0,0 @@
-# $Id$
-# Maintainer: Maxime Gauduin <alucryd at archlinux.org>
-# Contributor: Bartłomiej Piotrowski <nospam at bpiotrowski.pl>
-
-pkgbase=vbam
-pkgname=('vbam-sdl' 'vbam-wx')
-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' '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
-    if [[ -d build-$p ]]; then
-      rm -rf build-$p
-    fi
-    mkdir build-$p
-  done
-}
-
-build() {
-  cd build-sdl
-
-  cmake ../visualboyadvance-m \
-    -DCMAKE_BUILD_TYPE='Release' \
-    -DCMAKE_INSTALL_PREFIX='/usr' \
-    -DCMAKE_SKIP_RPATH='TRUE' \
-    -DENABLE_SDL='TRUE' \
-    -DENABLE_WX='FALSE' \
-    -DENABLE_LINK='TRUE'
-  make
-
-  cd ../build-wx
-
-  cmake ../visualboyadvance-m \
-    -DCMAKE_BUILD_TYPE='Release' \
-    -DCMAKE_INSTALL_PREFIX='/usr' \
-    -DCMAKE_SKIP_RPATH='TRUE' \
-    -DENABLE_SDL='FALSE' \
-    -DENABLE_WX='TRUE' \
-    -DENABLE_FFMPEG='TRUE' \
-    -DENABLE_LINK='TRUE' \
-    -DwxWidgets_CONFIG_EXECUTABLE='/usr/bin/wx-config-gtk3'
-  make
-}
-
-package_vbam-sdl() {
-  backup=('etc/vbam.cfg')
-  conflicts=('vbam-wx')
-
-  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')
-
-  make DESTDIR="${pkgdir}" -C build-wx install
-}
-
-# vim: ts=2 sw=2 et:

Copied: vbam/repos/community-x86_64/PKGBUILD (from rev 367239, vbam/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2018-08-02 07:11:36 UTC (rev 367240)
@@ -0,0 +1,74 @@
+# $Id$
+# Maintainer: Maxime Gauduin <alucryd at archlinux.org>
+# Contributor: Bartłomiej Piotrowski <nospam at bpiotrowski.pl>
+
+pkgbase=vbam
+pkgname=('vbam-sdl' 'vbam-wx')
+pkgver=2.1.0
+pkgrel=2
+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' '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
+    if [[ -d build-$p ]]; then
+      rm -rf build-$p
+    fi
+    mkdir build-$p
+  done
+
+  cd visualboyadvance-m
+
+  git cherry-pick -n a8d0508cf299a58b2a659d6017b049db121de8ba  #FS59479
+}
+
+build() {
+  cd build-sdl
+
+  cmake ../visualboyadvance-m \
+    -DCMAKE_BUILD_TYPE='Release' \
+    -DCMAKE_INSTALL_PREFIX='/usr' \
+    -DCMAKE_SKIP_RPATH='TRUE' \
+    -DENABLE_SDL='TRUE' \
+    -DENABLE_WX='FALSE' \
+    -DENABLE_LINK='TRUE'
+  make
+
+  cd ../build-wx
+
+  cmake ../visualboyadvance-m \
+    -DCMAKE_BUILD_TYPE='Release' \
+    -DCMAKE_INSTALL_PREFIX='/usr' \
+    -DCMAKE_SKIP_RPATH='TRUE' \
+    -DENABLE_SDL='FALSE' \
+    -DENABLE_WX='TRUE' \
+    -DENABLE_FFMPEG='TRUE' \
+    -DENABLE_LINK='TRUE' \
+    -DwxWidgets_CONFIG_EXECUTABLE='/usr/bin/wx-config-gtk3'
+  make
+}
+
+package_vbam-sdl() {
+  backup=('etc/vbam.cfg')
+  conflicts=('vbam-wx')
+
+  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')
+
+  make DESTDIR="${pkgdir}" -C build-wx install
+}
+
+# vim: ts=2 sw=2 et: