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

[Maxime Gauduin]

    Date: Monday, January 6, 2014 @ 00:05:13
  Author: alucryd
Revision: 103439

wxgtk rebuild: vbam 1.8.0.1202-2

Modified:
  vbam/trunk/PKGBUILD

----------+
 PKGBUILD |    8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-01-05 21:24:54 UTC (rev 103438)
+++ PKGBUILD	2014-01-05 23:05:13 UTC (rev 103439)
@@ -5,11 +5,11 @@
 pkgbase=vbam
 pkgname=('vbam-cli' 'vbam-gtk' 'vbam-wx')
 pkgver=1.8.0.1202
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url="http://vba-m.com"
 license=('GPL2')
-makedepends=('cmake' 'desktop-file-utils' 'freetype2' 'gtkglextmm' 'imagemagick' 'glew' 'libjpeg' 'libpng' 'libsndfile' 'libxrandr' 'mesa' 'openal' 'wxgtk' 'zip')
+makedepends=('cmake' 'desktop-file-utils' 'freetype2' 'gtkglextmm' 'imagemagick' 'glew' 'libjpeg' 'libpng' 'libsndfile' 'libxrandr' 'mesa' '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'
@@ -25,6 +25,7 @@
 prepare() {
   patch -Np0 -i soil.patch
   patch -Np0 -i sfml.patch
+  sed 's/wxrc/wxrc-2.8/g' -i {po/update_pot.sh,src/wx/CMakeLists.txt}
 }
 
 build() {
@@ -47,6 +48,7 @@
   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'
                     -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' \
@@ -91,7 +93,7 @@
 
 package_vbam-wx() {
 pkgdesc="Nintendo GameBoy Advance emulator - wx version"
-depends=('wxgtk')
+depends=('wxgtk2.8')
 conflicts=('vbam-gtk')
 options=('!emptydirs')
 install='vbam-wx.install'