[arch-commits] Commit in vbam/trunk (5 files)
Maxime Gauduin
alucryd at archlinux.org
Sun Oct 23 17:45:08 UTC 2016
Date: Sunday, October 23, 2016 @ 17:45:08
Author: alucryd
Revision: 193106
upgpkg: vbam 2.0.0b2-2
Added:
vbam/trunk/vbam-fixes.patch
Modified:
vbam/trunk/PKGBUILD
Deleted:
vbam/trunk/cxx11-fixes.patch
vbam/trunk/vbam-gtk.install
vbam/trunk/vbam-wx.install
-------------------+
PKGBUILD | 26 ++++++++++++------------
cxx11-fixes.patch | 53 -------------------------------------------------
vbam-fixes.patch | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++
vbam-gtk.install | 14 -------------
vbam-wx.install | 13 ------------
5 files changed, 69 insertions(+), 93 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2016-10-23 17:27:09 UTC (rev 193105)
+++ PKGBUILD 2016-10-23 17:45:08 UTC (rev 193106)
@@ -5,31 +5,32 @@
pkgbase=vbam
pkgname=('vbam-sdl' 'vbam-gtk' 'vbam-wx')
pkgver=2.0.0b2
-pkgrel=1
+pkgrel=2
pkgdesc='Nintendo GameBoy Advance emulator'
arch=('i686' 'x86_64')
url='http://vba-m.com'
license=('GPL2')
-depends=('sdl' 'sfml' 'zip')
+depends=('sdl2' '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')
+_commit='1eb768578bc0c4fa17396f573a4b37a652f12acd'
+source=("vbam::git+https://github.com/visualboyadvance-m/visualboyadvance-m.git#commit=${_commit}"
+ 'vbam-fixes.patch')
sha256sums=('SKIP'
- '610d770bfcea8da990cddc33c6360b572bc20683b216ab1e6f23424e9d494417')
+ 'be860c010e1185c1fa3938f57fd824b9e8e8430a00f851ff21a033de7bce5cf8')
prepare() {
cd vbam
- patch -Np1 -i ../cxx11-fixes.patch
-
if [[ -d build ]]; then
rm -rf build
fi
mkdir build
+
+ patch -Np1 -i ../vbam-fixes.patch
}
build() {
@@ -62,31 +63,30 @@
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+=('desktop-file-utils' 'gtkglextmm')
+depends+=('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}}
+ 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+=('desktop-file-utils' 'wxgtk')
+depends+=('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}}
+ rm -rf "${pkgdir}"/{etc,usr/{bin/vbam,etc,share/man/man1/vbam.1}}
find "${pkgdir}" -type f -regex .*gvbam.* -exec rm {} +
}
Deleted: cxx11-fixes.patch
===================================================================
--- cxx11-fixes.patch 2016-10-23 17:27:09 UTC (rev 193105)
+++ cxx11-fixes.patch 2016-10-23 17:45:08 UTC (rev 193106)
@@ -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"
Added: vbam-fixes.patch
===================================================================
--- vbam-fixes.patch (rev 0)
+++ vbam-fixes.patch 2016-10-23 17:45:08 UTC (rev 193106)
@@ -0,0 +1,56 @@
+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.txt 2016-10-23 19:14:33.346550202 +0200
+@@ -47,7 +47,7 @@ SET(SRC_GTK
+ soundconfig.cpp
+ screenarea.cpp
+ screenarea-cairo.cpp
+- #screenarea-opengl.cpp
++ screenarea-opengl.cpp
+ tools.cpp
+ window.cpp
+ ../sdl/inputSDL.cpp
+diff -rupN vbam.orig/src/gtk/screenarea.cpp vbam/src/gtk/screenarea.cpp
+--- vbam.orig/src/gtk/screenarea.cpp 2016-10-23 19:14:22.423451961 +0200
++++ vbam/src/gtk/screenarea.cpp 2016-10-23 19:14:33.346550202 +0200
+@@ -49,7 +49,7 @@ ScreenArea::ScreenArea(int _iWidth, int
+ pixbuf->fill(0);
+
+ #if !GTK_CHECK_VERSION(3, 0, 0)
+- m_poEmptyCursor = new Gdk::Cursor(get_display, pixbuf, 0, 0);
++ m_poEmptyCursor = new Gdk::Cursor(get_display(), pixbuf, 0, 0);
+ #else
+ m_poEmptyCursor = Gdk::Cursor::create(get_display(), pixbuf, 0, 0);
+ #endif
+diff -rupN vbam.orig/src/sdl/expr.cpp vbam/src/sdl/expr.cpp
+--- vbam.orig/src/sdl/expr.cpp 2016-10-23 19:14:22.423451961 +0200
++++ vbam/src/sdl/expr.cpp 2016-10-23 19:14:33.346550202 +0200
+@@ -85,12 +85,10 @@ enum yytokentype {
+ /* Copy the first part of user declarations. */
+ #line 1 "expr.ypp"
+
+-namespace std {
+ #include <memory.h>
+ #include <stdio.h>
+-#include <stdlib.h>
++#include <cstdlib>
+ #include <string.h>
+-}
+
+ using namespace std;
+
+diff -rupN vbam.orig/src/sdl/expr.ypp vbam/src/sdl/expr.ypp
+--- vbam.orig/src/sdl/expr.ypp 2016-10-23 19:14:22.423451961 +0200
++++ vbam/src/sdl/expr.ypp 2016-10-23 19:15:20.352228711 +0200
+@@ -1,10 +1,8 @@
+ %{
+-namespace std {
+ #include <stdio.h>
+ #include <memory.h>
+-#include <stdlib.h>
++#include <cstdlib>
+ #include <string.h>
+-}
+
+ using namespace std;
+
Deleted: vbam-gtk.install
===================================================================
--- vbam-gtk.install 2016-10-23 17:27:09 UTC (rev 193105)
+++ vbam-gtk.install 2016-10-23 17:45:08 UTC (rev 193106)
@@ -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:
Deleted: vbam-wx.install
===================================================================
--- vbam-wx.install 2016-10-23 17:27:09 UTC (rev 193105)
+++ vbam-wx.install 2016-10-23 17:45:08 UTC (rev 193106)
@@ -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:
More information about the arch-commits
mailing list