[arch-commits] Commit in vbam/trunk (PKGBUILD)

[Maxime Gauduin]

    Date: Tuesday, September 23, 2014 @ 19:12:05
  Author: alucryd
Revision: 119524

FS#42024: vbam 1.8.0.1202-3

Modified:
  vbam/trunk/PKGBUILD

----------+
 PKGBUILD |   25 +++++++++++++++----------
 1 file changed, 15 insertions(+), 10 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-09-23 16:34:08 UTC (rev 119523)
+++ PKGBUILD	2014-09-23 17:12:05 UTC (rev 119524)
@@ -5,11 +5,13 @@
 pkgbase=vbam
 pkgname=('vbam-cli' 'vbam-gtk' 'vbam-wx')
 pkgver=1.8.0.1202
-pkgrel=2
+pkgrel=3
 arch=('i686' 'x86_64')
-url="http://vba-m.com"
+url='http://vba-m.com'
 license=('GPL2')
-makedepends=('cmake' 'desktop-file-utils' 'freetype2' 'gtkglextmm' 'imagemagick' 'glew' 'libjpeg' 'libpng' 'libsndfile' 'libxrandr' 'mesa' 'openal' 'wxgtk2.8' 'zip')
+makedepends=('cmake' 'desktop-file-utils' 'freetype2' 'gtkglextmm'
+             'imagemagick' 'glew' 'libjpeg' 'libpng' 'libsndfile' 'libxrandr'
+             'openal' 'wxgtk2.8' 'zip')
 [[ $CARCH == i686 ]] && makedepends+=('nasm')
 source=("http://downloads.sourceforge.net/project/vbam/vbam-src/vbam-r${pkgver##*.}-src.tar.bz2"
         'http://downloads.sourceforge.net/sfml/SFML-1.6-sdk-linux-64.tar.gz'
@@ -30,7 +32,7 @@
 
 build() {
 # Build static SOIL
-  pushd "Simple OpenGL Image Library/src"
+  pushd 'Simple OpenGL Image Library/src'
   make -f "../projects/makefile/alternate Makefile.txt"
   make -f "../projects/makefile/alternate Makefile.txt" DESTDIR="${srcdir}/staging" install
   popd
@@ -47,8 +49,11 @@
   fi
   mkdir build && cd build
 
-  local _cmakeargs="-DCMAKE_INSTALL_PREFIX='/usr' -DCMAKE_CXX_FLAGS=-I${srcdir}/staging/usr/include -DENABLE_GTK='ON' -DENABLE_WX='ON' \
-                    -DwxWidgets_CONFIG_EXECUTABLE='/usr/bin/wx-config-2.8' -DwxWidgets_wxrc_EXECUTABLE='/usr/bin/wxrc-2.8'
+  local _cmakeargs="-DCMAKE_INSTALL_PREFIX='/usr' \
+                    -DCMAKE_CXX_FLAGS=-I${srcdir}/staging/usr/include \
+                    -DENABLE_GTK='ON' -DENABLE_WX='ON' \
+                    -DwxWidgets_CONFIG_EXECUTABLE='/usr/bin/wx-config-2.8' \
+                    -DwxWidgets_wxrc_EXECUTABLE='/usr/bin/wxrc-2.8'
                     -DSFML_INCLUDE_DIR='../staging/usr/include/SFML' \
                     -DSFML_AUDIO_INCLUDE_DIR='../staging/usr/include/SFML/Audio' \
                     -DSFML_AUDIO_LIBRARY='../staging/usr/lib/libsfml-audio-s.a' \
@@ -68,8 +73,8 @@
 }
 
 package_vbam-cli() {
-pkgdesc="Nintendo GameBoy Advance emulator - SDL version"
-depends=('mesa' 'libpng' 'sdl')
+pkgdesc='Nintendo GameBoy Advance emulator'
+depends=('libgl' 'libpng' 'sdl')
 backup=('etc/vbam.cfg')
 
   cd build
@@ -79,7 +84,7 @@
 }
 
 package_vbam-gtk() {
-pkgdesc="Nintendo GameBoy Advance emulator - GTK version"
+pkgdesc='Nintendo GameBoy Advance emulator'
 depends=('desktop-file-utils' 'gtkglextmm' 'sdl')
 conflicts=('vbam-wx')
 install='vbam-gtk.install'
@@ -92,7 +97,7 @@
 }
 
 package_vbam-wx() {
-pkgdesc="Nintendo GameBoy Advance emulator - wx version"
+pkgdesc='Nintendo GameBoy Advance emulator'
 depends=('wxgtk2.8')
 conflicts=('vbam-gtk')
 options=('!emptydirs')