[arch-commits] Commit in vbam/repos (16 files)
Maxime Gauduin
alucryd at archlinux.org
Sun Feb 21 18:51:36 UTC 2016
Date: Sunday, February 21, 2016 @ 19:51:35
Author: alucryd
Revision: 163099
archrelease: copy trunk to community-testing-i686, community-testing-x86_64
Added:
vbam/repos/community-testing-i686/PKGBUILD
(from rev 163098, vbam/trunk/PKGBUILD)
vbam/repos/community-testing-i686/cxx11-fixes.patch
(from rev 163098, vbam/trunk/cxx11-fixes.patch)
vbam/repos/community-testing-i686/vbam-gtk.install
(from rev 163098, vbam/trunk/vbam-gtk.install)
vbam/repos/community-testing-i686/vbam-wx.install
(from rev 163098, vbam/trunk/vbam-wx.install)
vbam/repos/community-testing-x86_64/PKGBUILD
(from rev 163098, vbam/trunk/PKGBUILD)
vbam/repos/community-testing-x86_64/cxx11-fixes.patch
(from rev 163098, vbam/trunk/cxx11-fixes.patch)
vbam/repos/community-testing-x86_64/vbam-gtk.install
(from rev 163098, vbam/trunk/vbam-gtk.install)
vbam/repos/community-testing-x86_64/vbam-wx.install
(from rev 163098, vbam/trunk/vbam-wx.install)
Deleted:
vbam/repos/community-testing-i686/PKGBUILD
vbam/repos/community-testing-i686/cxx11-fixes.patch
vbam/repos/community-testing-i686/vbam-gtk.install
vbam/repos/community-testing-i686/vbam-wx.install
vbam/repos/community-testing-x86_64/PKGBUILD
vbam/repos/community-testing-x86_64/cxx11-fixes.patch
vbam/repos/community-testing-x86_64/vbam-gtk.install
vbam/repos/community-testing-x86_64/vbam-wx.install
--------------------------------------------+
/PKGBUILD | 186 +++++++++++++++++++++++++++
/cxx11-fixes.patch | 106 +++++++++++++++
/vbam-gtk.install | 28 ++++
/vbam-wx.install | 26 +++
community-testing-i686/PKGBUILD | 86 ------------
community-testing-i686/cxx11-fixes.patch | 53 -------
community-testing-i686/vbam-gtk.install | 14 --
community-testing-i686/vbam-wx.install | 13 -
community-testing-x86_64/PKGBUILD | 86 ------------
community-testing-x86_64/cxx11-fixes.patch | 53 -------
community-testing-x86_64/vbam-gtk.install | 14 --
community-testing-x86_64/vbam-wx.install | 13 -
12 files changed, 346 insertions(+), 332 deletions(-)
Deleted: community-testing-i686/PKGBUILD
===================================================================
--- community-testing-i686/PKGBUILD 2016-02-21 18:51:17 UTC (rev 163098)
+++ community-testing-i686/PKGBUILD 2016-02-21 18:51:35 UTC (rev 163099)
@@ -1,86 +0,0 @@
-# $Id$
-# Maintainer: Maxime Gauduin <alucryd at archlinux.org>
-# Contributor: Bartłomiej Piotrowski <nospam at bpiotrowski.pl>
-
-pkgbase=vbam
-pkgname=('vbam-sdl' 'vbam-gtk' 'vbam-wx')
-pkgver=2.0.0b1
-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' 'freetype2' 'imagemagick' 'glew'
- 'gtkglextmm' '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"
- 'cxx11-fixes.patch')
-sha256sums=('SKIP'
- '610d770bfcea8da990cddc33c6360b572bc20683b216ab1e6f23424e9d494417')
-
-prepare() {
- cd vbam
- patch -Np1 -i ../cxx11-fixes.patch
- mkdir build
-}
-
-build() {
- cd vbam/build
-
- _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'"
-
- if [[ $CARCH == i686 ]]; then
- _cmakeargs="${_cmakeargs} \
- -DENABLE_ASM_CORE='TRUE' \
- -DENABLE_ASM_SCALERS='TRUE'"
- fi
-
- CXXFLAGS+=' -std=c++11 -fpermissive'
- cmake .. ${_cmakeargs}
- make
-}
-
-package_vbam-sdl() {
-replaces=('vbam-cli')
-backup=('etc/vbam.cfg')
-
- cd vbam/build
-
- make DESTDIR="${pkgdir}" install
- 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')
-conflicts=('vbam-wx')
-install='vbam-gtk.install'
-
- cd vbam/build
-
- make DESTDIR="${pkgdir}" install
- rm -rf "${pkgdir}"/{etc,usr/{bin/vbam,share/man/man1/vbam.1}}
- find "${pkgdir}" -type f -regex .*wxvbam.* -exec rm {} +
-}
-
-package_vbam-wx() {
-depends+=('wxgtk')
-conflicts=('vbam-gtk')
-install='vbam-wx.install'
-
- cd vbam/build
-
- make DESTDIR="${pkgdir}" install
- rm -rf "${pkgdir}"/{etc,usr/{bin/vbam,share/man/man1/vbam.1}}
- find "${pkgdir}" -type f -regex .*gvbam.* -exec rm {} +
-}
-
-# vim: ts=2 sw=2 et:
Copied: vbam/repos/community-testing-i686/PKGBUILD (from rev 163098, vbam/trunk/PKGBUILD)
===================================================================
--- community-testing-i686/PKGBUILD (rev 0)
+++ community-testing-i686/PKGBUILD 2016-02-21 18:51:35 UTC (rev 163099)
@@ -0,0 +1,93 @@
+# $Id$
+# Maintainer: Maxime Gauduin <alucryd at archlinux.org>
+# Contributor: Bartłomiej Piotrowski <nospam at bpiotrowski.pl>
+
+pkgbase=vbam
+pkgname=('vbam-sdl' 'vbam-gtk' 'vbam-wx')
+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' 'git' 'glew' 'gtkglextmm'
+ 'imagemagick' 'libjpeg' 'libpng' 'libsndfile' 'libxrandr'
+ 'openal' 'subversion' 'wxgtk')
+makedepends_i686=('nasm')
+options=('!emptydirs')
+source=('vbam::git+https://github.com/visualboyadvance-m/visualboyadvance-m.git#tag=VBA-M_Beta_2'
+ 'cxx11-fixes.patch')
+sha256sums=('SKIP'
+ '610d770bfcea8da990cddc33c6360b572bc20683b216ab1e6f23424e9d494417')
+
+prepare() {
+ cd vbam
+
+ patch -Np1 -i ../cxx11-fixes.patch
+
+ if [[ -d build ]]; then
+ rm -rf build
+ fi
+ mkdir build
+}
+
+build() {
+ cd vbam/build
+
+ _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'"
+
+ if [[ $CARCH == i686 ]]; then
+ _cmakeargs="${_cmakeargs} \
+ -DENABLE_ASM_CORE='TRUE' \
+ -DENABLE_ASM_SCALERS='TRUE'"
+ fi
+
+ CXXFLAGS+=' -std=c++11 -fpermissive'
+
+ cmake .. ${_cmakeargs}
+ make
+}
+
+package_vbam-sdl() {
+replaces=('vbam-cli')
+backup=('etc/vbam.cfg')
+
+ cd vbam/build
+
+ make DESTDIR="${pkgdir}" install
+ 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')
+conflicts=('vbam-wx')
+install='vbam-gtk.install'
+
+ cd vbam/build
+
+ make DESTDIR="${pkgdir}" install
+ rm -rf "${pkgdir}"/{etc,usr/{bin/vbam,share/man/man1/vbam.1}}
+ find "${pkgdir}" -type f -regex .*wxvbam.* -exec rm {} +
+}
+
+package_vbam-wx() {
+depends+=('desktop-file-utils' 'wxgtk')
+conflicts=('vbam-gtk')
+install='vbam-wx.install'
+
+ 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 {} +
+}
+
+# vim: ts=2 sw=2 et:
Deleted: community-testing-i686/cxx11-fixes.patch
===================================================================
--- community-testing-i686/cxx11-fixes.patch 2016-02-21 18:51:17 UTC (rev 163098)
+++ community-testing-i686/cxx11-fixes.patch 2016-02-21 18:51:35 UTC (rev 163099)
@@ -1,53 +0,0 @@
-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.cpp 2015-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"
Copied: vbam/repos/community-testing-i686/cxx11-fixes.patch (from rev 163098, vbam/trunk/cxx11-fixes.patch)
===================================================================
--- community-testing-i686/cxx11-fixes.patch (rev 0)
+++ community-testing-i686/cxx11-fixes.patch 2016-02-21 18:51:35 UTC (rev 163099)
@@ -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.cpp 2015-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"
Deleted: community-testing-i686/vbam-gtk.install
===================================================================
--- community-testing-i686/vbam-gtk.install 2016-02-21 18:51:17 UTC (rev 163098)
+++ community-testing-i686/vbam-gtk.install 2016-02-21 18:51:35 UTC (rev 163099)
@@ -1,14 +0,0 @@
-post_install() {
- update-desktop-database -q
- gtk-update-icon-cache -ftq usr/share/icons/hicolor
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
-
-# vim: ts=2 sw=2 et:
Copied: vbam/repos/community-testing-i686/vbam-gtk.install (from rev 163098, vbam/trunk/vbam-gtk.install)
===================================================================
--- community-testing-i686/vbam-gtk.install (rev 0)
+++ community-testing-i686/vbam-gtk.install 2016-02-21 18:51:35 UTC (rev 163099)
@@ -0,0 +1,14 @@
+post_install() {
+ update-desktop-database -q
+ gtk-update-icon-cache -ftq usr/share/icons/hicolor
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
+
+# vim: ts=2 sw=2 et:
Deleted: community-testing-i686/vbam-wx.install
===================================================================
--- community-testing-i686/vbam-wx.install 2016-02-21 18:51:17 UTC (rev 163098)
+++ community-testing-i686/vbam-wx.install 2016-02-21 18:51:35 UTC (rev 163099)
@@ -1,13 +0,0 @@
-post_install() {
- gtk-update-icon-cache -ftq usr/share/icons/hicolor
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
-
-# vim: ts=2 sw=2 et:
Copied: vbam/repos/community-testing-i686/vbam-wx.install (from rev 163098, vbam/trunk/vbam-wx.install)
===================================================================
--- community-testing-i686/vbam-wx.install (rev 0)
+++ community-testing-i686/vbam-wx.install 2016-02-21 18:51:35 UTC (rev 163099)
@@ -0,0 +1,13 @@
+post_install() {
+ gtk-update-icon-cache -ftq usr/share/icons/hicolor
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
+
+# vim: ts=2 sw=2 et:
Deleted: community-testing-x86_64/PKGBUILD
===================================================================
--- community-testing-x86_64/PKGBUILD 2016-02-21 18:51:17 UTC (rev 163098)
+++ community-testing-x86_64/PKGBUILD 2016-02-21 18:51:35 UTC (rev 163099)
@@ -1,86 +0,0 @@
-# $Id$
-# Maintainer: Maxime Gauduin <alucryd at archlinux.org>
-# Contributor: Bartłomiej Piotrowski <nospam at bpiotrowski.pl>
-
-pkgbase=vbam
-pkgname=('vbam-sdl' 'vbam-gtk' 'vbam-wx')
-pkgver=2.0.0b1
-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' 'freetype2' 'imagemagick' 'glew'
- 'gtkglextmm' '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"
- 'cxx11-fixes.patch')
-sha256sums=('SKIP'
- '610d770bfcea8da990cddc33c6360b572bc20683b216ab1e6f23424e9d494417')
-
-prepare() {
- cd vbam
- patch -Np1 -i ../cxx11-fixes.patch
- mkdir build
-}
-
-build() {
- cd vbam/build
-
- _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'"
-
- if [[ $CARCH == i686 ]]; then
- _cmakeargs="${_cmakeargs} \
- -DENABLE_ASM_CORE='TRUE' \
- -DENABLE_ASM_SCALERS='TRUE'"
- fi
-
- CXXFLAGS+=' -std=c++11 -fpermissive'
- cmake .. ${_cmakeargs}
- make
-}
-
-package_vbam-sdl() {
-replaces=('vbam-cli')
-backup=('etc/vbam.cfg')
-
- cd vbam/build
-
- make DESTDIR="${pkgdir}" install
- 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')
-conflicts=('vbam-wx')
-install='vbam-gtk.install'
-
- cd vbam/build
-
- make DESTDIR="${pkgdir}" install
- rm -rf "${pkgdir}"/{etc,usr/{bin/vbam,share/man/man1/vbam.1}}
- find "${pkgdir}" -type f -regex .*wxvbam.* -exec rm {} +
-}
-
-package_vbam-wx() {
-depends+=('wxgtk')
-conflicts=('vbam-gtk')
-install='vbam-wx.install'
-
- cd vbam/build
-
- make DESTDIR="${pkgdir}" install
- rm -rf "${pkgdir}"/{etc,usr/{bin/vbam,share/man/man1/vbam.1}}
- find "${pkgdir}" -type f -regex .*gvbam.* -exec rm {} +
-}
-
-# vim: ts=2 sw=2 et:
Copied: vbam/repos/community-testing-x86_64/PKGBUILD (from rev 163098, vbam/trunk/PKGBUILD)
===================================================================
--- community-testing-x86_64/PKGBUILD (rev 0)
+++ community-testing-x86_64/PKGBUILD 2016-02-21 18:51:35 UTC (rev 163099)
@@ -0,0 +1,93 @@
+# $Id$
+# Maintainer: Maxime Gauduin <alucryd at archlinux.org>
+# Contributor: Bartłomiej Piotrowski <nospam at bpiotrowski.pl>
+
+pkgbase=vbam
+pkgname=('vbam-sdl' 'vbam-gtk' 'vbam-wx')
+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' 'git' 'glew' 'gtkglextmm'
+ 'imagemagick' 'libjpeg' 'libpng' 'libsndfile' 'libxrandr'
+ 'openal' 'subversion' 'wxgtk')
+makedepends_i686=('nasm')
+options=('!emptydirs')
+source=('vbam::git+https://github.com/visualboyadvance-m/visualboyadvance-m.git#tag=VBA-M_Beta_2'
+ 'cxx11-fixes.patch')
+sha256sums=('SKIP'
+ '610d770bfcea8da990cddc33c6360b572bc20683b216ab1e6f23424e9d494417')
+
+prepare() {
+ cd vbam
+
+ patch -Np1 -i ../cxx11-fixes.patch
+
+ if [[ -d build ]]; then
+ rm -rf build
+ fi
+ mkdir build
+}
+
+build() {
+ cd vbam/build
+
+ _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'"
+
+ if [[ $CARCH == i686 ]]; then
+ _cmakeargs="${_cmakeargs} \
+ -DENABLE_ASM_CORE='TRUE' \
+ -DENABLE_ASM_SCALERS='TRUE'"
+ fi
+
+ CXXFLAGS+=' -std=c++11 -fpermissive'
+
+ cmake .. ${_cmakeargs}
+ make
+}
+
+package_vbam-sdl() {
+replaces=('vbam-cli')
+backup=('etc/vbam.cfg')
+
+ cd vbam/build
+
+ make DESTDIR="${pkgdir}" install
+ 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')
+conflicts=('vbam-wx')
+install='vbam-gtk.install'
+
+ cd vbam/build
+
+ make DESTDIR="${pkgdir}" install
+ rm -rf "${pkgdir}"/{etc,usr/{bin/vbam,share/man/man1/vbam.1}}
+ find "${pkgdir}" -type f -regex .*wxvbam.* -exec rm {} +
+}
+
+package_vbam-wx() {
+depends+=('desktop-file-utils' 'wxgtk')
+conflicts=('vbam-gtk')
+install='vbam-wx.install'
+
+ 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 {} +
+}
+
+# vim: ts=2 sw=2 et:
Deleted: community-testing-x86_64/cxx11-fixes.patch
===================================================================
--- community-testing-x86_64/cxx11-fixes.patch 2016-02-21 18:51:17 UTC (rev 163098)
+++ community-testing-x86_64/cxx11-fixes.patch 2016-02-21 18:51:35 UTC (rev 163099)
@@ -1,53 +0,0 @@
-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.cpp 2015-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"
Copied: vbam/repos/community-testing-x86_64/cxx11-fixes.patch (from rev 163098, vbam/trunk/cxx11-fixes.patch)
===================================================================
--- community-testing-x86_64/cxx11-fixes.patch (rev 0)
+++ community-testing-x86_64/cxx11-fixes.patch 2016-02-21 18:51:35 UTC (rev 163099)
@@ -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.cpp 2015-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"
Deleted: community-testing-x86_64/vbam-gtk.install
===================================================================
--- community-testing-x86_64/vbam-gtk.install 2016-02-21 18:51:17 UTC (rev 163098)
+++ community-testing-x86_64/vbam-gtk.install 2016-02-21 18:51:35 UTC (rev 163099)
@@ -1,14 +0,0 @@
-post_install() {
- update-desktop-database -q
- gtk-update-icon-cache -ftq usr/share/icons/hicolor
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
-
-# vim: ts=2 sw=2 et:
Copied: vbam/repos/community-testing-x86_64/vbam-gtk.install (from rev 163098, vbam/trunk/vbam-gtk.install)
===================================================================
--- community-testing-x86_64/vbam-gtk.install (rev 0)
+++ community-testing-x86_64/vbam-gtk.install 2016-02-21 18:51:35 UTC (rev 163099)
@@ -0,0 +1,14 @@
+post_install() {
+ update-desktop-database -q
+ gtk-update-icon-cache -ftq usr/share/icons/hicolor
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
+
+# vim: ts=2 sw=2 et:
Deleted: community-testing-x86_64/vbam-wx.install
===================================================================
--- community-testing-x86_64/vbam-wx.install 2016-02-21 18:51:17 UTC (rev 163098)
+++ community-testing-x86_64/vbam-wx.install 2016-02-21 18:51:35 UTC (rev 163099)
@@ -1,13 +0,0 @@
-post_install() {
- gtk-update-icon-cache -ftq usr/share/icons/hicolor
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
-
-# vim: ts=2 sw=2 et:
Copied: vbam/repos/community-testing-x86_64/vbam-wx.install (from rev 163098, vbam/trunk/vbam-wx.install)
===================================================================
--- community-testing-x86_64/vbam-wx.install (rev 0)
+++ community-testing-x86_64/vbam-wx.install 2016-02-21 18:51:35 UTC (rev 163099)
@@ -0,0 +1,13 @@
+post_install() {
+ gtk-update-icon-cache -ftq usr/share/icons/hicolor
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
+
+# vim: ts=2 sw=2 et:
More information about the arch-commits
mailing list