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

[Frederik Schwan via arch-commits]

Date: Sunday, September 13, 2020 @ 18:15:58
  Author: freswa
Revision: 705178

fix FS#67194

Modified:
  vbam/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-09-13 17:57:51 UTC (rev 705177)
+++ PKGBUILD2020-09-13 18:15:58 UTC (rev 705178)
@@ -7,7 +7,7 @@
   vbam-wx
 )
 pkgver=2.1.4
-pkgrel=2
+pkgrel=3
 pkgdesc='Nintendo GameBoy Advance emulator'
 arch=(x86_64)
 url=https://vba-m.com
@@ -27,7 +27,7 @@
   wxgtk3
   zip
 )
-source=(git+https://github.com/visualboyadvance-m/visualboyadvance-m.git#tag=09fbcbac07148ea32add848722dab34a7eb4f6b5)
+source=(git+https://github.com/visualboyadvance-m/visualboyadvance-m.git#tag=8f4862de88de2f95866b7e501304f1e57a4e0abb?signed)
 sha256sums=(SKIP)
 validpgpkeys=(A0C0E526E36FD2138C149D4D08AB596679D86240) # Rafael Kitover 

 

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

[Felix Yan via arch-commits]

Date: Tuesday, July 7, 2020 @ 13:47:32
  Author: felixonmars
Revision: 658594

upgpkg: vbam 2.1.4-2: reproducibility rebuild

Modified:
  vbam/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-07-07 13:47:30 UTC (rev 658593)
+++ PKGBUILD2020-07-07 13:47:32 UTC (rev 658594)
@@ -7,7 +7,7 @@
   vbam-wx
 )
 pkgver=2.1.4
-pkgrel=1
+pkgrel=2
 pkgdesc='Nintendo GameBoy Advance emulator'
 arch=(x86_64)
 url=https://vba-m.com

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

[Maxime Gauduin via arch-commits]

Date: Sunday, October 6, 2019 @ 17:23:33
  Author: alucryd
Revision: 513632

upgpkg: vbam 2.1.4-1

Modified:
  vbam/trunk/PKGBUILD

--+
 PKGBUILD |   13 ++---
 1 file changed, 10 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-10-06 17:21:07 UTC (rev 513631)
+++ PKGBUILD2019-10-06 17:23:33 UTC (rev 513632)
@@ -6,7 +6,7 @@
   vbam-sdl
   vbam-wx
 )
-pkgver=2.1.3
+pkgver=2.1.4
 pkgrel=1
 pkgdesc='Nintendo GameBoy Advance emulator'
 arch=(x86_64)
@@ -27,9 +27,16 @@
   wxgtk3
   zip
 )
-source=(git+https://github.com/visualboyadvance-m/visualboyadvance-m.git#tag=v${pkgver})
-sha256sums=('SKIP')
+source=(git+https://github.com/visualboyadvance-m/visualboyadvance-m.git#tag=09fbcbac07148ea32add848722dab34a7eb4f6b5)
+sha256sums=(SKIP)
+validpgpkeys=(A0C0E526E36FD2138C149D4D08AB596679D86240) # Rafael Kitover 

 
+pkgver() {
+  cd visualboyadvance-m
+
+  git describe --tags | sed 's/^v//'
+}
+
 prepare() {
   for p in sdl wx; do
 if [[ -d build-$p ]]; then

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

[Maxime Gauduin via arch-commits]

Date: Tuesday, April 23, 2019 @ 20:32:59
  Author: alucryd
Revision: 453235

upgpkg: vbam 2.1.3-1

Modified:
  vbam/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-04-23 20:30:47 UTC (rev 453234)
+++ PKGBUILD2019-04-23 20:32:59 UTC (rev 453235)
@@ -6,7 +6,7 @@
   vbam-sdl
   vbam-wx
 )
-pkgver=2.1.2
+pkgver=2.1.3
 pkgrel=1
 pkgdesc='Nintendo GameBoy Advance emulator'
 arch=(x86_64)
@@ -28,7 +28,7 @@
   zip
 )
 
source=(git+https://github.com/visualboyadvance-m/visualboyadvance-m.git#tag=v${pkgver})
-sha256sums=(SKIP)
+sha256sums=('SKIP')
 
 prepare() {
   for p in sdl wx; do

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

[Maxime Gauduin via arch-commits]

Date: Sunday, April 7, 2019 @ 07:26:29
  Author: alucryd
Revision: 450159

upgpkg: vbam 2.1.2-1

Modified:
  vbam/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-04-07 07:22:03 UTC (rev 450158)
+++ PKGBUILD2019-04-07 07:26:29 UTC (rev 450159)
@@ -6,8 +6,8 @@
   vbam-sdl
   vbam-wx
 )
-pkgver=2.1.1
-pkgrel=3
+pkgver=2.1.2
+pkgrel=1
 pkgdesc='Nintendo GameBoy Advance emulator'
 arch=(x86_64)
 url=https://vba-m.com

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

[Antonio Rojas via arch-commits]

Date: Sunday, March 31, 2019 @ 10:24:20
  Author: arojas
Revision: 446663

Rebuild to fix missing package

Modified:
  vbam/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-03-31 10:23:34 UTC (rev 446662)
+++ PKGBUILD2019-03-31 10:24:20 UTC (rev 446663)
@@ -7,7 +7,7 @@
   vbam-wx
 )
 pkgver=2.1.1
-pkgrel=2
+pkgrel=3
 pkgdesc='Nintendo GameBoy Advance emulator'
 arch=(x86_64)
 url=https://vba-m.com

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

[Maxime Gauduin via arch-commits]

Date: Monday, March 25, 2019 @ 10:50:32
  Author: alucryd
Revision: 443442

wxgtk 3.1.2 rebuild: vbam 2.1.1-2

Modified:
  vbam/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-03-25 10:47:04 UTC (rev 443441)
+++ PKGBUILD2019-03-25 10:50:32 UTC (rev 443442)
@@ -7,7 +7,7 @@
   vbam-wx
 )
 pkgver=2.1.1
-pkgrel=1
+pkgrel=2
 pkgdesc='Nintendo GameBoy Advance emulator'
 arch=(x86_64)
 url=https://vba-m.com

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

[Maxime Gauduin via arch-commits]

Date: Sunday, March 3, 2019 @ 20:10:52
  Author: alucryd
Revision: 437498

upgpkg: vbam 2.1.1-1

Modified:
  vbam/trunk/PKGBUILD

--+
 PKGBUILD |   85 +
 1 file changed, 52 insertions(+), 33 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-03-03 19:52:04 UTC (rev 437497)
+++ PKGBUILD2019-03-03 20:10:52 UTC (rev 437498)
@@ -2,17 +2,33 @@
 # Contributor: Bartłomiej Piotrowski 
 
 pkgbase=vbam
-pkgname=('vbam-sdl' 'vbam-wx')
-pkgver=2.1.0
-pkgrel=2
+pkgname=(
+  vbam-sdl
+  vbam-wx
+)
+pkgver=2.1.1
+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')
+arch=(x86_64)
+url=https://vba-m.com
+license=(GPL2)
+depends=(
+  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
@@ -21,10 +37,6 @@
 fi
 mkdir build-$p
   done
-
-  cd visualboyadvance-m
-
-  git cherry-pick -n a8d0508cf299a58b2a659d6017b049db121de8ba  #FS59479
 }
 
 build() {
@@ -31,31 +43,31 @@
   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'
+-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'
+-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')
+  backup=(etc/vbam.cfg)
+  conflicts=(vbam-wx)
 
   make DESTDIR="${pkgdir}" -C build-sdl install
 }
@@ -62,10 +74,17 @@
 
 package_vbam-wx() {
   depends+=(
-'glib2' 'gtk3' 'openal' 'wxgtk3' 'zip'
-'libavcodec.so' 'libavformat.so' 'libavutil.so' 'libswscale.so'
+glib2
+gtk3
+libavcodec.so
+libavformat.so
+libavutil.so
+libswscale.so
+openal
+wxgtk3
+zip
   )
-  conflicts=('vbam-sdl')
+  conflicts=(vbam-sdl)
 
   make DESTDIR="${pkgdir}" -C build-wx install
 }

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

[Maxime Gauduin via arch-commits]

Date: Thursday, August 2, 2018 @ 07:11:26
  Author: alucryd
Revision: 367239

FS#59479: vbam 2.1.0-2

Modified:
  vbam/trunk/PKGBUILD

--+
 PKGBUILD |6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-08-02 06:13:12 UTC (rev 367238)
+++ PKGBUILD2018-08-02 07:11:26 UTC (rev 367239)
@@ -5,7 +5,7 @@
 pkgbase=vbam
 pkgname=('vbam-sdl' 'vbam-wx')
 pkgver=2.1.0
-pkgrel=1
+pkgrel=2
 pkgdesc='Nintendo GameBoy Advance emulator'
 arch=('x86_64')
 url='http://vba-m.com'
@@ -22,6 +22,10 @@
 fi
 mkdir build-$p
   done
+
+  cd visualboyadvance-m
+
+  git cherry-pick -n a8d0508cf299a58b2a659d6017b049db121de8ba  #FS59479
 }
 
 build() {

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

[Maxime Gauduin via arch-commits]

Date: Monday, July 2, 2018 @ 13:55:16
  Author: alucryd
Revision: 349782

upgpkg: vbam 2.1.0-1

Modified:
  vbam/trunk/PKGBUILD

--+
 PKGBUILD |   41 -
 1 file changed, 16 insertions(+), 25 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-07-02 13:55:06 UTC (rev 349781)
+++ PKGBUILD2018-07-02 13:55:16 UTC (rev 349782)
@@ -4,18 +4,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
@@ -24,17 +22,12 @@
 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' \
@@ -45,7 +38,7 @@
 
   cd ../build-wx
 
-  cmake ../visualboyadvance-m-${pkgver} \
+  cmake ../visualboyadvance-m \
 -DCMAKE_BUILD_TYPE='Release' \
 -DCMAKE_INSTALL_PREFIX='/usr' \
 -DCMAKE_SKIP_RPATH='TRUE' \
@@ -58,22 +51,20 @@
 }
 
 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:

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

[Sven-Hendrik Haase via arch-commits]

Date: Wednesday, May 9, 2018 @ 03:32:01
  Author: svenstaro
Revision: 319759

upgpkg: vbam 2.0.2-4

Modified:
  vbam/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-05-09 03:26:31 UTC (rev 319758)
+++ PKGBUILD2018-05-09 03:32:01 UTC (rev 319759)
@@ -5,7 +5,7 @@
 pkgbase=vbam
 pkgname=('vbam-sdl' 'vbam-wx')
 pkgver=2.0.2
-pkgrel=3
+pkgrel=4
 pkgdesc='Nintendo GameBoy Advance emulator'
 arch=('x86_64')
 url='http://vba-m.com'

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

[Sven-Hendrik Haase via arch-commits]

Date: Wednesday, May 9, 2018 @ 03:26:27
  Author: svenstaro
Revision: 319757

upgpkg: vbam 2.0.2-3

Modified:
  vbam/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-05-09 03:24:56 UTC (rev 319756)
+++ PKGBUILD2018-05-09 03:26:27 UTC (rev 319757)
@@ -5,7 +5,7 @@
 pkgbase=vbam
 pkgname=('vbam-sdl' 'vbam-wx')
 pkgver=2.0.2
-pkgrel=2
+pkgrel=3
 pkgdesc='Nintendo GameBoy Advance emulator'
 arch=('x86_64')
 url='http://vba-m.com'

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

[Maxime Gauduin via arch-commits]

Date: Monday, April 23, 2018 @ 18:31:30
  Author: alucryd
Revision: 317426

upgpkg: vbam 2.0.2-2

Modified:
  vbam/trunk/PKGBUILD

--+
 PKGBUILD |   13 ++---
 1 file changed, 10 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-04-23 18:26:13 UTC (rev 317425)
+++ PKGBUILD2018-04-23 18:31:30 UTC (rev 317426)
@@ -5,7 +5,7 @@
 pkgbase=vbam
 pkgname=('vbam-sdl' 'vbam-wx')
 pkgver=2.0.2
-pkgrel=1
+pkgrel=2
 pkgdesc='Nintendo GameBoy Advance emulator'
 arch=('x86_64')
 url='http://vba-m.com'
@@ -12,8 +12,10 @@
 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;)
-sha256sums=('f77461faa660b5fd955249087e45dc1dfa87ab8af8208ad7909b424af0879657')
+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')
 
 prepare() {
   for p in sdl wx; do
@@ -22,6 +24,11 @@
 fi
 mkdir build-$p
   done
+
+  cd visualboyadvance-m-${pkgver}
+
+  # Fix build against ffmpeg 4.0
+  patch -Np1 -i ../f3f6ee7b1c9f95cc1e8df368652034b9da84c130.patch
 }
 
 build() {

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

[Maxime Gauduin via arch-commits]

Date: Thursday, March 29, 2018 @ 09:10:46
  Author: alucryd
Revision: 313340

upgpkg: vbam 2.0.2-1

Modified:
  vbam/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-03-29 09:02:41 UTC (rev 313339)
+++ PKGBUILD2018-03-29 09:10:46 UTC (rev 313340)
@@ -4,7 +4,7 @@
 
 pkgbase=vbam
 pkgname=('vbam-sdl' 'vbam-wx')
-pkgver=2.0.1
+pkgver=2.0.2
 pkgrel=1
 pkgdesc='Nintendo GameBoy Advance emulator'
 arch=('x86_64')
@@ -13,7 +13,7 @@
 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;)
-sha256sums=('0204787317311cf6dd08e28f2dff4f52cdb97356dd851b96a9054abe4281143e')
+sha256sums=('f77461faa660b5fd955249087e45dc1dfa87ab8af8208ad7909b424af0879657')
 
 prepare() {
   for p in sdl wx; do

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

[Maxime Gauduin via arch-commits]

Date: Sunday, December 31, 2017 @ 13:09:54
  Author: alucryd
Revision: 277576

upgpkg: vbam 2.0.1-1

Modified:
  vbam/trunk/PKGBUILD   (contents, properties)
Deleted:
  vbam/trunk/vbam-fixes.patch

--+
 PKGBUILD |   96 -
 vbam-fixes.patch |   56 --
 2 files changed, 37 insertions(+), 115 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-12-31 12:31:52 UTC (rev 277575)
+++ PKGBUILD2017-12-31 13:09:54 UTC (rev 277576)
@@ -3,92 +3,70 @@
 # Contributor: Bartłomiej Piotrowski 
 
 pkgbase=vbam
-pkgname=('vbam-sdl' 'vbam-gtk' 'vbam-wx')
-pkgver=2.0.0b2
-pkgrel=3
+pkgname=('vbam-sdl' 'vbam-wx')
+pkgver=2.0.1
+pkgrel=1
 pkgdesc='Nintendo GameBoy Advance emulator'
 arch=('x86_64')
 url='http://vba-m.com'
 license=('GPL2')
-depends=('sdl2' 'sfml' 'zip')
-makedepends=('cmake' 'desktop-file-utils' 'freetype2' 'git' 'glew' 'gtkglextmm'
- 'imagemagick' 'libjpeg' 'libpng' 'libsndfile' 'libxrandr'
- 'openal' 'subversion' 'wxgtk3')
-makedepends_i686=('nasm')
-options=('!emptydirs')
-_commit='1eb768578bc0c4fa17396f573a4b37a652f12acd'
-source=("vbam::git+https://github.com/visualboyadvance-m/visualboyadvance-m.git#commit=${_commit};
-'vbam-fixes.patch')
-sha256sums=('SKIP'
-'be860c010e1185c1fa3938f57fd824b9e8e8430a00f851ff21a033de7bce5cf8')
+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;)
+sha256sums=('0204787317311cf6dd08e28f2dff4f52cdb97356dd851b96a9054abe4281143e')
 
 prepare() {
-  cd vbam
-
-  if [[ -d build ]]; then
-rm -rf build
-  fi
-  mkdir build
-
-  patch -Np1 -i ../vbam-fixes.patch
+  for p in sdl wx; do
+if [[ -d build-$p ]]; then
+  rm -rf build-$p
+fi
+mkdir build-$p
+  done
 }
 
 build() {
-  cd vbam/build
+  cd build-sdl
 
-  _cmakeargs="-DCMAKE_BUILD_TYPE='Release' \
-  -DCMAKE_INSTALL_PREFIX='/usr' \
-  -DCMAKE_SKIP_RPATH='TRUE' \
-  -DENABLE_GTK='TRUE' \
-  -DENABLE_WX='TRUE' \
-  -DENABLE_FFMPEG='FALSE' \
-  -DENABLE_LINK='TRUE' \
-  -DwxWidgets_CONFIG_EXECUTABLE=/usr/bin/wx-config-gtk3"
+  cmake ../visualboyadvance-m-${pkgver} \
+-DCMAKE_BUILD_TYPE='Release' \
+-DCMAKE_INSTALL_PREFIX='/usr' \
+-DCMAKE_SKIP_RPATH='TRUE' \
+-DENABLE_SDL='TRUE' \
+-DENABLE_WX='FALSE' \
+-DENABLE_LINK='TRUE'
+  make
 
-  if [[ $CARCH == i686 ]]; then
-_cmakeargs="${_cmakeargs} \
--DENABLE_ASM_CORE='TRUE' \
--DENABLE_ASM_SCALERS='TRUE'"
-  fi
+  cd ../build-wx
 
-  CXXFLAGS+=' -std=c++11 -fpermissive'
-
-  cmake .. ${_cmakeargs}
+  cmake ../visualboyadvance-m-${pkgver} \
+-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() {
-replaces=('vbam-cli')
 backup=('etc/vbam.cfg')
-
-  cd vbam/build
-
-  make DESTDIR="${pkgdir}" install
-  mv "${pkgdir}"/{usr/etc,}
-  rm -rf 
"${pkgdir}"/usr/{bin/{g,wx}vbam,share/{applications,icons,locale,man/man1/{g,wx}vbam.1,vbam}}
-}
-
-package_vbam-gtk() {
-depends+=('gtkglextmm')
 conflicts=('vbam-wx')
 
-  cd vbam/build
+  cd build-sdl
 
   make DESTDIR="${pkgdir}" install
-  rm -rf "${pkgdir}"/{etc,usr/{bin/vbam,etc,share/man/man1/vbam.1}}
-  find "${pkgdir}" -type f -regex .*wxvbam.* -exec rm {} +
 }
 
 package_vbam-wx() {
-depends+=('wxgtk3')
-conflicts=('vbam-gtk')
+depends+=('glib2' 'gtk3' 'openal' 'wxgtk3' 'zip'
+  'libavcodec.so' 'libavformat.so' 'libavutil.so' 'libswscale.so')
+conflicts=('vbam-sdl')
 
-  cd vbam/build
+  cd build-wx
 
   make DESTDIR="${pkgdir}" install
-  install -m 755 visualboyadvance-m "${pkgdir}"/usr/bin/
-  rm -rf "${pkgdir}"/{etc,usr/{bin/vbam,etc,share/man/man1/vbam.1}}
-  find "${pkgdir}" -type f -regex .*gvbam.* -exec rm {} +
 }
 
 # vim: ts=2 sw=2 et:


Property changes on: vbam/trunk/PKGBUILD
___
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Deleted: vbam-fixes.patch
===
--- vbam-fixes.patch2017-12-31 12:31:52 UTC (rev 277575)
+++ vbam-fixes.patch2017-12-31 13:09:54 UTC (rev 277576)
@@ -1,56 +0,0 @@
-diff -rupN vbam.orig/src/gtk/CMakeLists.txt vbam/src/gtk/CMakeLists.txt
 vbam.orig/src/gtk/CMakeLists.txt   2016-10-23 19:14:22.423451961 +0200
-+++ vbam/src/gtk/CMakeLists.txt2016-10-23 19:14:33.346550202 +0200
-@@ -47,7 +47,7 @@ 

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

[Balló György]

Date: Monday, July 3, 2017 @ 07:59:34
  Author: bgyorgy
Revision: 242108

upgpkg: vbam 2.0.0b2-3

Rebuild with wxgtk3

Modified:
  vbam/trunk/PKGBUILD

--+
 PKGBUILD |9 +
 1 file changed, 5 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-07-03 07:43:46 UTC (rev 242107)
+++ PKGBUILD2017-07-03 07:59:34 UTC (rev 242108)
@@ -5,7 +5,7 @@
 pkgbase=vbam
 pkgname=('vbam-sdl' 'vbam-gtk' 'vbam-wx')
 pkgver=2.0.0b2
-pkgrel=2
+pkgrel=3
 pkgdesc='Nintendo GameBoy Advance emulator'
 arch=('i686' 'x86_64')
 url='http://vba-m.com'
@@ -13,7 +13,7 @@
 depends=('sdl2' 'sfml' 'zip')
 makedepends=('cmake' 'desktop-file-utils' 'freetype2' 'git' 'glew' 'gtkglextmm'
  'imagemagick' 'libjpeg' 'libpng' 'libsndfile' 'libxrandr'
- 'openal' 'subversion' 'wxgtk')
+ 'openal' 'subversion' 'wxgtk3')
 makedepends_i686=('nasm')
 options=('!emptydirs')
 _commit='1eb768578bc0c4fa17396f573a4b37a652f12acd'
@@ -42,7 +42,8 @@
   -DENABLE_GTK='TRUE' \
   -DENABLE_WX='TRUE' \
   -DENABLE_FFMPEG='FALSE' \
-  -DENABLE_LINK='TRUE'"
+  -DENABLE_LINK='TRUE' \
+  -DwxWidgets_CONFIG_EXECUTABLE=/usr/bin/wx-config-gtk3"
 
   if [[ $CARCH == i686 ]]; then
 _cmakeargs="${_cmakeargs} \
@@ -79,7 +80,7 @@
 }
 
 package_vbam-wx() {
-depends+=('wxgtk')
+depends+=('wxgtk3')
 conflicts=('vbam-gtk')
 
   cd vbam/build

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

[Maxime Gauduin]

Date: Sunday, February 21, 2016 @ 19:51:17
  Author: alucryd
Revision: 163098

upgpkg: vbam 2.0.0b2-1

Modified:
  vbam/trunk/PKGBUILD

--+
 PKGBUILD |   19 +--
 1 file changed, 13 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-02-21 17:43:52 UTC (rev 163097)
+++ PKGBUILD2016-02-21 18:51:17 UTC (rev 163098)
@@ -4,19 +4,19 @@
 
 pkgbase=vbam
 pkgname=('vbam-sdl' 'vbam-gtk' 'vbam-wx')
-pkgver=2.0.0b1
-pkgrel=3
+pkgver=2.0.0b2
+pkgrel=1
 pkgdesc='Nintendo GameBoy Advance emulator'
 arch=('i686' 'x86_64')
 url='http://vba-m.com'
 license=('GPL2')
 depends=('sdl' 'sfml' 'zip')
-makedepends=('cmake' 'desktop-file-utils' 'freetype2' 'imagemagick' 'glew'
- 'gtkglextmm' 'libjpeg' 'libpng' 'libsndfile' 'libxrandr'
+makedepends=('cmake' 'desktop-file-utils' 'freetype2' 'git' 'glew' 'gtkglextmm'
+ 'imagemagick' 'libjpeg' 'libpng' 'libsndfile' 'libxrandr'
  'openal' 'subversion' 'wxgtk')
 makedepends_i686=('nasm')
 options=('!emptydirs')
-source=("vbam::svn+http://svn.code.sf.net/p/vbam/code/trunk#revision=1465;
+source=('vbam::git+https://github.com/visualboyadvance-m/visualboyadvance-m.git#tag=VBA-M_Beta_2'
 'cxx11-fixes.patch')
 sha256sums=('SKIP'
 '610d770bfcea8da990cddc33c6360b572bc20683b216ab1e6f23424e9d494417')
@@ -23,7 +23,12 @@
 
 prepare() {
   cd vbam
+
   patch -Np1 -i ../cxx11-fixes.patch
+
+  if [[ -d build ]]; then
+rm -rf build
+  fi
   mkdir build
 }
 
@@ -45,6 +50,7 @@
   fi
 
   CXXFLAGS+=' -std=c++11 -fpermissive'
+
   cmake .. ${_cmakeargs}
   make
 }
@@ -72,7 +78,7 @@
 }
 
 package_vbam-wx() {
-depends+=('wxgtk')
+depends+=('desktop-file-utils' 'wxgtk')
 conflicts=('vbam-gtk')
 install='vbam-wx.install'
 
@@ -79,6 +85,7 @@
   cd vbam/build
 
   make DESTDIR="${pkgdir}" install
+  install -m 755 visualboyadvance-m "${pkgdir}"/usr/bin/
   rm -rf "${pkgdir}"/{etc,usr/{bin/vbam,share/man/man1/vbam.1}}
   find "${pkgdir}" -type f -regex .*gvbam.* -exec rm {} +
 }

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

[Maxime Gauduin]

Date: Tuesday, February 16, 2016 @ 20:49:29
  Author: alucryd
Revision: 161878

upgpkg: vbam 2.0.0b1-3

Modified:
  vbam/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2016-02-16 19:29:15 UTC (rev 161877)
+++ PKGBUILD2016-02-16 19:49:29 UTC (rev 161878)
@@ -5,14 +5,14 @@
 pkgbase=vbam
 pkgname=('vbam-sdl' 'vbam-gtk' 'vbam-wx')
 pkgver=2.0.0b1
-pkgrel=2
+pkgrel=3
 pkgdesc='Nintendo GameBoy Advance emulator'
 arch=('i686' 'x86_64')
 url='http://vba-m.com'
 license=('GPL2')
 depends=('sdl' 'sfml' 'zip')
-makedepends=('cmake' 'desktop-file-utils' 'ffmpeg' 'freetype2' 'imagemagick'
- 'glew' 'gtkglextmm' 'libjpeg' 'libpng' 'libsndfile' 'libxrandr'
+makedepends=('cmake' 'desktop-file-utils' 'freetype2' 'imagemagick' 'glew'
+ 'gtkglextmm' 'libjpeg' 'libpng' 'libsndfile' 'libxrandr'
  'openal' 'subversion' 'wxgtk')
 makedepends_i686=('nasm')
 options=('!emptydirs')
@@ -35,7 +35,7 @@
   -DCMAKE_SKIP_RPATH='TRUE' \
   -DENABLE_GTK='TRUE' \
   -DENABLE_WX='TRUE' \
-  -DENABLE_FFMPEG='TRUE' \
+  -DENABLE_FFMPEG='FALSE' \
   -DENABLE_LINK='TRUE'"
 
   if [[ $CARCH == i686 ]]; then
@@ -72,7 +72,7 @@
 }
 
 package_vbam-wx() {
-depends+=('ffmpeg' 'wxgtk')
+depends+=('wxgtk')
 conflicts=('vbam-gtk')
 install='vbam-wx.install'
 

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

[Evangelos Foutras]

Date: Monday, December 7, 2015 @ 22:14:58
  Author: foutrelis
Revision: 150132

Build in C++11 mode

Modified:
  vbam/trunk/PKGBUILD

--+
 PKGBUILD |1 +
 1 file changed, 1 insertion(+)

Modified: PKGBUILD
===
--- PKGBUILD2015-12-07 21:05:54 UTC (rev 150131)
+++ PKGBUILD2015-12-07 21:14:58 UTC (rev 150132)
@@ -41,6 +41,7 @@
 -DENABLE_ASM_SCALERS='TRUE'"
   fi
 
+  CXXFLAGS+=' -std=c++11 -fpermissive'
   cmake .. ${_cmakeargs}
   make
 }

[arch-commits] Commit in vbam/trunk (PKGBUILD cxx11-fixes.patch)

[Evangelos Foutras]

Date: Monday, December 7, 2015 @ 22:30:30
  Author: foutrelis
Revision: 150133

Fix build on i686

Added:
  vbam/trunk/cxx11-fixes.patch
Modified:
  vbam/trunk/PKGBUILD

---+
 PKGBUILD  |   17 +---
 cxx11-fixes.patch |   53 
 2 files changed, 63 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-12-07 21:14:58 UTC (rev 150132)
+++ PKGBUILD2015-12-07 21:30:30 UTC (rev 150133)
@@ -16,16 +16,19 @@
  'openal' 'subversion' 'wxgtk')
 makedepends_i686=('nasm')
 options=('!emptydirs')
-source=("vbam::svn+http://svn.code.sf.net/p/vbam/code/trunk#revision=1465;)
-sha256sums=('SKIP')
+source=("vbam::svn+http://svn.code.sf.net/p/vbam/code/trunk#revision=1465;
+'cxx11-fixes.patch')
+sha256sums=('SKIP'
+'610d770bfcea8da990cddc33c6360b572bc20683b216ab1e6f23424e9d494417')
 
-build() {
+prepare() {
   cd vbam
+  patch -Np1 -i ../cxx11-fixes.patch
+  mkdir build
+}
 
-  if [[ -d build ]]; then
-rm -rf build
-  fi
-  mkdir build && cd build
+build() {
+  cd vbam/build
 
   _cmakeargs="-DCMAKE_BUILD_TYPE='Release' \
   -DCMAKE_INSTALL_PREFIX='/usr' \

Added: cxx11-fixes.patch
===
--- cxx11-fixes.patch   (rev 0)
+++ cxx11-fixes.patch   2015-12-07 21:30:30 UTC (rev 150133)
@@ -0,0 +1,53 @@
+diff -uprb vbam.orig/src/gba/GBA-arm.cpp vbam/src/gba/GBA-arm.cpp
+--- vbam.orig/src/gba/GBA-arm.cpp  2015-12-07 23:23:30.613871906 +0200
 vbam/src/gba/GBA-arm.cpp   2015-12-07 23:25:49.425706904 +0200
+@@ -298,18 +298,18 @@ static void count(u32 opcode, int cond_r
+ #ifdef __GNUC__
+  #define ALU_HEADER   asm("mov %%ecx, %%edi; "
+  #define ALU_TRAILER  : "=D" (opcode) : "c" (opcode) : "eax", "ebx", 
"edx", "esi")
+- #define EMIT0(op)#op"; "
+- #define EMIT1(op,arg)#op" "arg"; "
+- #define EMIT2(op,src,dest)   #op" "src", "dest"; "
+- #define KONST(val)   "$"#val
++ #define EMIT0(op)#op "; "
++ #define EMIT1(op,arg)#op " " arg "; "
++ #define EMIT2(op,src,dest)   #op " " src ", " dest "; "
++ #define KONST(val)   "$" #val
+  #define ASMVAR(cvar) ASMVAR2 (__USER_LABEL_PREFIX__, cvar)
+  #define ASMVAR2(prefix,cvar) STRING (prefix) cvar
+  #define STRING(x)#x
+  #define VAR(var) ASMVAR(#var)
+  #define VARL(var)ASMVAR(#var)
+- #define REGREF1(index)   ASMVAR("reg("index")")
+- #define REGREF2(index,scale) ASMVAR("reg(,"index","#scale")")
+- #define LABEL(n) #n": "
++ #define REGREF1(index)   ASMVAR("reg(" index ")")
++ #define REGREF2(index,scale) ASMVAR("reg(," index "," #scale ")")
++ #define LABEL(n) #n ": "
+  #define LABELREF(n,dir)  #n#dir
+  #define al "%%al"
+  #define ah "%%ah"
+diff -uprb vbam.orig/src/gba/GBA-thumb.cpp vbam/src/gba/GBA-thumb.cpp
+--- vbam.orig/src/gba/GBA-thumb.cpp2015-12-07 23:23:30.613871906 +0200
 vbam/src/gba/GBA-thumb.cpp 2015-12-07 23:26:23.646159392 +0200
+@@ -305,15 +305,15 @@ static INSN_REGPARM void thumbBreakpoint
+ V_FLAG = (Flags >> 26) & 1;   \
+ }
+ #else
+-  #define EMIT1(op,arg)#op" "arg"; "
+-  #define EMIT2(op,src,dest)   #op" "src", "dest"; "
+-  #define KONST(val)   "$"#val
++  #define EMIT1(op,arg)#op " " arg "; "
++  #define EMIT2(op,src,dest)   #op " " src ", " dest "; "
++  #define KONST(val)   "$" #val
+   #define ASMVAR(cvar) ASMVAR2 (__USER_LABEL_PREFIX__, cvar)
+   #define ASMVAR2(prefix,cvar) STRING (prefix) cvar
+   #define STRING(x)#x
+   #define VAR(var) ASMVAR(#var)
+-  #define REGREF1(index)   ASMVAR("reg("index")")
+-  #define REGREF2(index,scale) ASMVAR("reg(,"index","#scale")")
++  #define REGREF1(index)   ASMVAR("reg(" index ")")
++  #define REGREF2(index,scale) ASMVAR("reg(," index "," #scale ")")
+   #define eax "%%eax"
+   #define ecx "%%ecx"
+   #define edx "%%edx"

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

[Antonio Rojas]

Date: Monday, December 7, 2015 @ 22:37:55
  Author: arojas
Revision: 150134

C++11 ABI rebuild

Modified:
  vbam/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-12-07 21:30:30 UTC (rev 150133)
+++ PKGBUILD2015-12-07 21:37:55 UTC (rev 150134)
@@ -5,7 +5,7 @@
 pkgbase=vbam
 pkgname=('vbam-sdl' 'vbam-gtk' 'vbam-wx')
 pkgver=2.0.0b1
-pkgrel=1
+pkgrel=2
 pkgdesc='Nintendo GameBoy Advance emulator'
 arch=('i686' 'x86_64')
 url='http://vba-m.com'

[arch-commits] Commit in vbam/trunk (PKGBUILD vbam-wx-icon.patch)

[Maxime Gauduin]

Date: Thursday, May 21, 2015 @ 15:30:43
  Author: alucryd
Revision: 133923

upgpkg: vbam 2.0.0b1-1

Modified:
  vbam/trunk/PKGBUILD
Deleted:
  vbam/trunk/vbam-wx-icon.patch

+
 PKGBUILD   |   42 +++---
 vbam-wx-icon.patch |   18 --
 2 files changed, 15 insertions(+), 45 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-05-21 13:28:10 UTC (rev 133922)
+++ PKGBUILD2015-05-21 13:30:43 UTC (rev 133923)
@@ -4,29 +4,21 @@
 
 pkgbase=vbam
 pkgname=('vbam-sdl' 'vbam-gtk' 'vbam-wx')
-pkgver=1.8.0.1292
-pkgrel=2
+pkgver=2.0.0b1
+pkgrel=1
 pkgdesc='Nintendo GameBoy Advance emulator'
 arch=('i686' 'x86_64')
 url='http://vba-m.com'
 license=('GPL2')
-makedepends=('cmake' 'desktop-file-utils' 'ffmpeg' 'freetype2' 'gtkglextmm'
- 'imagemagick' 'glew' 'libjpeg' 'libpng' 'libsndfile' 'libxrandr'
- 'openal' 'sfml' 'subversion' 'wxgtk2.8' 'zip')
+depends=('sdl' 'sfml' 'zip')
+makedepends=('cmake' 'desktop-file-utils' 'ffmpeg' 'freetype2' 'imagemagick'
+ 'glew' 'gtkglextmm' 'libjpeg' 'libpng' 'libsndfile' 'libxrandr'
+ 'openal' 'subversion' 'wxgtk')
 makedepends_i686=('nasm')
-source=(vbam::svn+http://svn.code.sf.net/p/vbam/code/trunk#revision=${pkgver##*.};
-'vbam-wx-icon.patch')
-sha256sums=('SKIP'
-'2c7280ba6135904edbad4f522aa8b03f3b00a4ab7600b76f60b83a394ea5')
+options=('!emptydirs')
+source=(vbam::svn+http://svn.code.sf.net/p/vbam/code/trunk#revision=1465;)
+sha256sums=('SKIP')
 
-prepare() {
-  cd vbam
-
-  patch -Np1 -i ../vbam-wx-icon.patch
-  sed 's/wxrc/wxrc-2.8/g' -i {po/update_pot.sh,src/wx/CMakeLists.txt}
-  sed 's|Common/|common/|' -i src/gba/debugger-expr-yacc.cpp
-}
-
 build() {
   cd vbam
 
@@ -41,9 +33,7 @@
   -DENABLE_GTK='TRUE' \
   -DENABLE_WX='TRUE' \
   -DENABLE_FFMPEG='TRUE' \
-  -DENABLE_LINK='TRUE' \
-  -DwxWidgets_CONFIG_EXECUTABLE='/usr/bin/wx-config-2.8' \
-  -DwxWidgets_wxrc_EXECUTABLE='/usr/bin/wxrc-2.8'
+  -DENABLE_LINK='TRUE'
 
   if [[ $CARCH == i686 ]]; then
 _cmakeargs=${_cmakeargs} \
@@ -56,7 +46,6 @@
 }
 
 package_vbam-sdl() {
-depends=('sdl' 'sfml')
 replaces=('vbam-cli')
 backup=('etc/vbam.cfg')
 
@@ -63,11 +52,11 @@
   cd vbam/build
 
   make DESTDIR=${pkgdir} install
-  rm -rf ${pkgdir}/usr/{bin/{g,wx}vbam,share}
+  rm -rf 
${pkgdir}/usr/{bin/{g,wx}vbam,share/{applications,icons,locale,man/man1/{g,wx}vbam.1,vbam}}
 }
 
 package_vbam-gtk() {
-depends=('desktop-file-utils' 'gtkglextmm' 'sdl' 'sfml')
+depends+=('desktop-file-utils' 'gtkglextmm')
 conflicts=('vbam-wx')
 install='vbam-gtk.install'
 
@@ -74,20 +63,19 @@
   cd vbam/build
 
   make DESTDIR=${pkgdir} install
-  rm -rf ${pkgdir}/{etc,usr/bin/vbam}
+  rm -rf ${pkgdir}/{etc,usr/{bin/vbam,share/man/man1/vbam.1}}
   find ${pkgdir} -type f -regex .*wxvbam.* -exec rm {} +
 }
 
 package_vbam-wx() {
-depends=('ffmpeg' 'sfml' 'wxgtk2.8')
+depends+=('ffmpeg' 'wxgtk')
 conflicts=('vbam-gtk')
-options=('!emptydirs')
 install='vbam-wx.install'
 
   cd vbam/build
 
   make DESTDIR=${pkgdir} install
-  rm -rf ${pkgdir}/{etc,usr/{bin,share}/vbam}
+  rm -rf ${pkgdir}/{etc,usr/{bin/vbam,share/man/man1/vbam.1}}
   find ${pkgdir} -type f -regex .*gvbam.* -exec rm {} +
 }
 

Deleted: vbam-wx-icon.patch
===
--- vbam-wx-icon.patch  2015-05-21 13:28:10 UTC (rev 133922)
+++ vbam-wx-icon.patch  2015-05-21 13:30:43 UTC (rev 133923)
@@ -1,18 +0,0 @@
-diff -rupN vbam.orig/src/wx/CMakeLists.txt vbam/src/wx/CMakeLists.txt
 vbam.orig/src/wx/CMakeLists.txt2015-04-09 10:39:02.684326894 +0200
-+++ vbam/src/wx/CMakeLists.txt 2015-04-09 10:39:28.696831250 +0200
-@@ -76,6 +76,7 @@ file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/ic
- ADD_CUSTOM_COMMAND(OUTPUT wxvbam.xrs
-# doing this in its own dir prevents name prefixes
-  COMMAND ${CMAKE_COMMAND} -E copy 
${CMAKE_CURRENT_SOURCE_DIR}/wxvbam.xrc wxvbam.xrc
-+ COMMAND ${CMAKE_COMMAND} -E copy 
${CMAKE_CURRENT_SOURCE_DIR}/vbam.png vbam.png
-COMMAND wxrc wxvbam.xrc -o wxvbam.xrs
-WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-  DEPENDS wxvbam.xrc)
-@@ -184,4 +185,4 @@ if(APPLE)
- SET_SOURCE_FILES_PROPERTIES(wxvbam.icns PROPERTIES 
MACOSX_PACKAGE_LOCATION Resources)
- endif(APPLE)
- 
--SET(WX_EXE_NAME wxvbam${CMAKE_EXECUTABLE_SUFFIX})
-\ No newline at end of file
-+SET(WX_EXE_NAME wxvbam${CMAKE_EXECUTABLE_SUFFIX})

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

[Maxime Gauduin]

Date: Monday, May 11, 2015 @ 14:57:13
  Author: alucryd
Revision: 133229

sfml 2.3 rebuild: vbam 1.8.0.1292-2

Modified:
  vbam/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-05-11 11:53:32 UTC (rev 133228)
+++ PKGBUILD2015-05-11 12:57:13 UTC (rev 133229)
@@ -5,7 +5,7 @@
 pkgbase=vbam
 pkgname=('vbam-sdl' 'vbam-gtk' 'vbam-wx')
 pkgver=1.8.0.1292
-pkgrel=1
+pkgrel=2
 pkgdesc='Nintendo GameBoy Advance emulator'
 arch=('i686' 'x86_64')
 url='http://vba-m.com'

[arch-commits] Commit in vbam/trunk (PKGBUILD vbam-ffmpeg2.patch vbam-util.patch)

[Maxime Gauduin]

Date: Monday, January 5, 2015 @ 11:09:07
  Author: alucryd
Revision: 125390

FS#4: vbam 1.8.0.1229-1

Added:
  vbam/trunk/vbam-ffmpeg2.patch
  vbam/trunk/vbam-util.patch
Modified:
  vbam/trunk/PKGBUILD

+
 PKGBUILD   |   68 ++-
 vbam-ffmpeg2.patch |   34 +
 vbam-util.patch|   11 
 3 files changed, 85 insertions(+), 28 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-01-05 10:04:41 UTC (rev 125389)
+++ PKGBUILD2015-01-05 10:09:07 UTC (rev 125390)
@@ -1,32 +1,41 @@
 # $Id$
-# Maintainer: Maxime Gauduin aluc...@gmail.com
+# Maintainer: Maxime Gauduin aluc...@archlinux.org
 # Contributor: Bartłomiej Piotrowski nos...@bpiotrowski.pl
 
 pkgbase=vbam
 pkgname=('vbam-cli' 'vbam-gtk' 'vbam-wx')
-pkgver=1.8.0.1202
-pkgrel=4
+pkgver=1.8.0.1229
+pkgrel=1
 arch=('i686' 'x86_64')
 url='http://vba-m.com'
 license=('GPL2')
-makedepends=('cmake' 'desktop-file-utils' 'freetype2' 'gtkglextmm'
+makedepends=('cmake' 'desktop-file-utils' 'ffmpeg' 'freetype2' 'gtkglextmm'
  'imagemagick' 'glew' 'libjpeg' 'libpng' 'libsndfile' 'libxrandr'
- 'openal' 'wxgtk2.8' 'zip')
+ 'openal' 'subversion' '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'
+source=(vbam::svn+http://svn.code.sf.net/p/vbam/code/trunk#revision=${pkgver##*.};
+'http://www.sfml-dev.org/files/SFML-1.6-sdk-linux-64.tar.gz'
 'http://www.lonesock.net/files/soil.zip'
 'sfml.patch'
-'soil.patch')
-sha256sums=('148d866c08d7a810be5c845247d212f1d1d07395f2ccdecef10ad81a76072877'
+'soil.patch'
+'vbam-util.patch'
+'vbam-ffmpeg2.patch')
+sha256sums=('SKIP'
 '05bdc32286ab2ec8cb1ccdafe53f31830284e09e11ebfc3ab3836c99a0d9654b'
 'a2305b8d64f6d636e36d669bbdb0ca5445d1345c754b3d61d3f037dad2e5f701'
 'c3c2fc48f4edc303ad24d91583a57aef9b7ca3b78de1d6734cb666745fff9bad'
-'65705aeef90667bd4e28dd03ac0b43685470f2925b642637b7ff6e2f3acd34c7')
+'65705aeef90667bd4e28dd03ac0b43685470f2925b642637b7ff6e2f3acd34c7'
+'54515cd8207cc110940c748c9bef801cb160a51071fdedcbea681d9af04bd09e'
+'91c468480ba5bfbe208a50dc6118a6229aabd3e9c7d41b0d59454b25014343b0')
 
 prepare() {
   patch -Np0 -i soil.patch
   patch -Np0 -i sfml.patch
+
+  cd vbam
+
+  patch -Np1 -i ../vbam-util.patch
+  patch -Np1 -i ../vbam-ffmpeg2.patch
   sed 's/wxrc/wxrc-2.8/g' -i {po/update_pot.sh,src/wx/CMakeLists.txt}
 }
 
@@ -44,6 +53,8 @@
   popd
 
 # Build VBA-M
+  cd vbam
+
   if [[ -d build ]]; then
 rm -rf build
   fi
@@ -50,24 +61,25 @@
   mkdir build  cd build
 
   local _cmakeargs=-DCMAKE_BUILD_TYPE='Release' \
+-DCMAKE_CXX_FLAGS=-I${srcdir}/staging/usr/include \
+-DCMAKE_INSTALL_PREFIX='/usr' \
 -DCMAKE_SKIP_RPATH='TRUE' \
--DCMAKE_INSTALL_PREFIX='/usr' \
--DCMAKE_CXX_FLAGS=-I${srcdir}/staging/usr/include \
--DENABLE_GTK='ON' -DENABLE_WX='ON' \
+-DENABLE_GTK='TRUE' -DENABLE_WX='TRUE' \
+-DENABLE_FFMPEG='TRUE' -DENABLE_LINK='TRUE' \
+-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' \
+
-DSFML_GRAPHICS_INCLUDE_DIR='../../staging/usr/include/SFML/Graphics' \
+
-DSFML_GRAPHICS_LIBRARY='../../staging/usr/lib/libsfml-graphics-s.a' \
+
-DSFML_NETWORK_INCLUDE_DIR='../../staging/usr/include/SFML/Network' \
+
-DSFML_NETWORK_LIBRARY='../../staging/usr/lib/libsfml-network-s.a' \
+
-DSFML_SYSTEM_INCLUDE_DIR='../../staging/usr/include/SFML/System' \
+
-DSFML_SYSTEM_LIBRARY='../../staging/usr/lib/libsfml-system-s.a' \
 -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' \
-
-DSFML_GRAPHICS_INCLUDE_DIR='../staging/usr/include/SFML/Graphics' \
-
-DSFML_GRAPHICS_LIBRARY='../staging/usr/lib/libsfml-graphics-s.a' \
-
-DSFML_NETWORK_INCLUDE_DIR='../staging/usr/include/SFML/Network' \
-

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

[Maxime Gauduin]

Date: Monday, January 5, 2015 @ 11:38:44
  Author: alucryd
Revision: 125402

upgpkg: vbam 1.8.0.1229-2

Modified:
  vbam/trunk/PKGBUILD

--+
 PKGBUILD |   50 +++---
 1 file changed, 23 insertions(+), 27 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-01-05 10:37:24 UTC (rev 125401)
+++ PKGBUILD2015-01-05 10:38:44 UTC (rev 125402)
@@ -3,9 +3,10 @@
 # Contributor: Bartłomiej Piotrowski nos...@bpiotrowski.pl
 
 pkgbase=vbam
-pkgname=('vbam-cli' 'vbam-gtk' 'vbam-wx')
+pkgname=('vbam-sdl' 'vbam-gtk' 'vbam-wx')
 pkgver=1.8.0.1229
-pkgrel=1
+pkgrel=2
+pkgdesc='Nintendo GameBoy Advance emulator'
 arch=('i686' 'x86_64')
 url='http://vba-m.com'
 license=('GPL2')
@@ -12,7 +13,7 @@
 makedepends=('cmake' 'desktop-file-utils' 'ffmpeg' 'freetype2' 'gtkglextmm'
  'imagemagick' 'glew' 'libjpeg' 'libpng' 'libsndfile' 'libxrandr'
  'openal' 'subversion' 'wxgtk2.8' 'zip')
-[[ $CARCH == i686 ]]  makedepends+=('nasm')
+makedepends_i686=('nasm')
 
source=(vbam::svn+http://svn.code.sf.net/p/vbam/code/trunk#revision=${pkgver##*.};
 'http://www.sfml-dev.org/files/SFML-1.6-sdk-linux-64.tar.gz'
 'http://www.lonesock.net/files/soil.zip'
@@ -40,19 +41,16 @@
 }
 
 build() {
-# Build static SOIL
   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
 
-# Build static SFML
   pushd SFML-1.6
   make
   make DESTDIR=${srcdir}/staging/usr install
   popd
 
-# Build VBA-M
   cd vbam
 
   if [[ -d build ]]; then
@@ -60,23 +58,23 @@
   fi
   mkdir build  cd build
 
-  local _cmakeargs=-DCMAKE_BUILD_TYPE='Release' \
--DCMAKE_CXX_FLAGS=-I${srcdir}/staging/usr/include \
--DCMAKE_INSTALL_PREFIX='/usr' \
--DCMAKE_SKIP_RPATH='TRUE' \
--DENABLE_GTK='TRUE' -DENABLE_WX='TRUE' \
--DENABLE_FFMPEG='TRUE' -DENABLE_LINK='TRUE' \
--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' \
-
-DSFML_GRAPHICS_INCLUDE_DIR='../../staging/usr/include/SFML/Graphics' \
-
-DSFML_GRAPHICS_LIBRARY='../../staging/usr/lib/libsfml-graphics-s.a' \
-
-DSFML_NETWORK_INCLUDE_DIR='../../staging/usr/include/SFML/Network' \
-
-DSFML_NETWORK_LIBRARY='../../staging/usr/lib/libsfml-network-s.a' \
-
-DSFML_SYSTEM_INCLUDE_DIR='../../staging/usr/include/SFML/System' \
-
-DSFML_SYSTEM_LIBRARY='../../staging/usr/lib/libsfml-system-s.a' \
--DwxWidgets_CONFIG_EXECUTABLE='/usr/bin/wx-config-2.8' \
--DwxWidgets_wxrc_EXECUTABLE='/usr/bin/wxrc-2.8'
+  _cmakeargs=-DCMAKE_BUILD_TYPE='Release' \
+  -DCMAKE_CXX_FLAGS=-I${srcdir}/staging/usr/include \
+  -DCMAKE_INSTALL_PREFIX='/usr' \
+  -DCMAKE_SKIP_RPATH='TRUE' \
+  -DENABLE_GTK='TRUE' -DENABLE_WX='TRUE' \
+  -DENABLE_FFMPEG='TRUE' -DENABLE_LINK='TRUE' \
+  -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' \
+  
-DSFML_GRAPHICS_INCLUDE_DIR='../../staging/usr/include/SFML/Graphics' \
+  
-DSFML_GRAPHICS_LIBRARY='../../staging/usr/lib/libsfml-graphics-s.a' \
+  
-DSFML_NETWORK_INCLUDE_DIR='../../staging/usr/include/SFML/Network' \
+  
-DSFML_NETWORK_LIBRARY='../../staging/usr/lib/libsfml-network-s.a' \
+  
-DSFML_SYSTEM_INCLUDE_DIR='../../staging/usr/include/SFML/System' \
+  -DSFML_SYSTEM_LIBRARY='../../staging/usr/lib/libsfml-system-s.a' 
\
+  -DwxWidgets_CONFIG_EXECUTABLE='/usr/bin/wx-config-2.8' \
+  -DwxWidgets_wxrc_EXECUTABLE='/usr/bin/wxrc-2.8'
 
   if [[ $CARCH == i686 ]]; then
 cmake .. ${_cmakeargs} -DENABLE_ASM_{CORE,SCALERS}='TRUE'
@@ -86,9 +84,9 @@
   make
 }
 
-package_vbam-cli() {
-pkgdesc='Nintendo GameBoy Advance emulator'
+package_vbam-sdl() {
 depends=('libgl' 'libpng' 'sdl')
+replaces=('vbam-cli')
 backup=('etc/vbam.cfg')
 
   cd vbam/build
@@ -98,7 +96,6 @@
 }
 
 package_vbam-gtk() {
-pkgdesc='Nintendo GameBoy Advance emulator'
 depends=('desktop-file-utils' 'gtkglextmm' 'sdl')
 conflicts=('vbam-wx')
 install='vbam-gtk.install'
@@ -111,7 +108,6 @@
 }
 
 package_vbam-wx() {
-pkgdesc='Nintendo GameBoy Advance emulator'
 depends=('ffmpeg' 'wxgtk2.8')
 conflicts=('vbam-gtk')
 options=('!emptydirs')

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

[Maxime Gauduin]

Date: Monday, December 8, 2014 @ 10:08:09
  Author: alucryd
Revision: 123625

FS#43021: vbam 1.8.0.1202-4

Modified:
  vbam/trunk/PKGBUILD

--+
 PKGBUILD |6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-12-08 08:33:32 UTC (rev 123624)
+++ PKGBUILD2014-12-08 09:08:09 UTC (rev 123625)
@@ -5,7 +5,7 @@
 pkgbase=vbam
 pkgname=('vbam-cli' 'vbam-gtk' 'vbam-wx')
 pkgver=1.8.0.1202
-pkgrel=3
+pkgrel=4
 arch=('i686' 'x86_64')
 url='http://vba-m.com'
 license=('GPL2')
@@ -49,7 +49,9 @@
   fi
   mkdir build  cd build
 
-  local _cmakeargs=-DCMAKE_INSTALL_PREFIX='/usr' \
+  local _cmakeargs=-DCMAKE_BUILD_TYPE='Release' \
+-DCMAKE_SKIP_RPATH='TRUE' \
+-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' \

[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
===
--- PKGBUILD2014-09-23 16:34:08 UTC (rev 119523)
+++ PKGBUILD2014-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')

[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
===
--- PKGBUILD2014-01-05 21:24:54 UTC (rev 103438)
+++ PKGBUILD2014-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'