diff options
| -rw-r--r-- | games/vbam/README | 9 | ||||
| -rw-r--r-- | games/vbam/c++11.patch | 54 | ||||
| -rw-r--r-- | games/vbam/vbam.SlackBuild | 20 | ||||
| -rw-r--r-- | games/vbam/vbam.info | 12 |
4 files changed, 17 insertions, 78 deletions
diff --git a/games/vbam/README b/games/vbam/README index c2116aa9d93f1..a30d9dd81ab1f 100644 --- a/games/vbam/README +++ b/games/vbam/README @@ -7,8 +7,8 @@ original Game Boy hand held systems and its Super and Color variants. VBA-M is a continued development of the now inactive VisualBoy Advance project, with many improvements from various developments of VBA. -This application is the GTK GUI version of VisualBoyAdvance-M. The name of the -executable is "gvbam". +This application is the wxGTK GUI version of VisualBoyAdvance-M. The name of the +executable is "wxvbam". FFMPEG=ON will enable recording and playback. It requires FFMPEG. @@ -16,8 +16,3 @@ There are a couple of alternatives you might try instead of this VBAM SlackBuild. The first is mGBA, which is available on SlackBuilds.org. - -The second is RetroArch with the VBAM core. The SlackBuilds for that are -here: - -https://github.com/duganchen/slackware-libretro diff --git a/games/vbam/c++11.patch b/games/vbam/c++11.patch deleted file mode 100644 index 700802c902721..0000000000000 --- a/games/vbam/c++11.patch +++ /dev/null @@ -1,54 +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" - diff --git a/games/vbam/vbam.SlackBuild b/games/vbam/vbam.SlackBuild index 9320c1036a53a..dc91a31b4209f 100644 --- a/games/vbam/vbam.SlackBuild +++ b/games/vbam/vbam.SlackBuild @@ -22,8 +22,8 @@ # Modified by the SlackBuilds.org project. PRGNAM=vbam -VERSION=${VERSION:-r1231} -BUILD=${BUILD:-2} +VERSION=${VERSION:-r1507} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} # Set to ON to enable FFMPEG A/V recording. @@ -31,7 +31,7 @@ FFMPEG=${FFMPEG:-OFF} if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac @@ -42,8 +42,8 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" ASM=ON # x86 ASM optimizations are available. elif [ "$ARCH" = "i686" ]; then @@ -75,18 +75,15 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -patch -p1 < $CWD/c++11.patch mkdir -p build cd build cmake \ -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS -std=c++11 -fpermissive" \ + -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_INSTALL_PREFIX=/usr \ -DENABLE_ASM_CORE=${ASM} \ -DENABLE_ASM_SCALERS=${ASM} \ -DENABLE_FFMPEG=${FFMPEG} \ - -DENABLE_DEBUGGER=OFF \ - -DENABLE_SDL=OFF \ -DCMAKE_BUILD_TYPE=Release .. make make install DESTDIR=$PKG @@ -95,8 +92,9 @@ cd .. find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true -mkdir -p $PKG/usr/man/man1 -gzip -9c debian/gvbam.1 > $PKG/usr/man/man1/gvbam.1.gz +mv $PKG/usr/share/man $PKG/usr/man +find $PKG/usr/man -type f -exec gzip -9 {} \; +for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a doc/* $PKG/usr/doc/$PRGNAM-$VERSION diff --git a/games/vbam/vbam.info b/games/vbam/vbam.info index a03004ac4b971..7e3bfcb8dd502 100644 --- a/games/vbam/vbam.info +++ b/games/vbam/vbam.info @@ -1,10 +1,10 @@ PRGNAM="vbam" -VERSION="r1231" +VERSION="r1507" HOMEPAGE="http://vba-m.com/" -DOWNLOAD="http://duganchen.ca/files/vbam-r1231.tar.xz" -MD5SUM="f435c424cddbe9e8e1fe9a0ffcddd324" +DOWNLOAD="http://ks392457.kimsufi.com/orbea/stuff/slackbuilds/src/vbam-r1507.tar.xz" +MD5SUM="c7be66a3224eaabb98548dc887ba7e0f" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="SFML gtkglextmm" -MAINTAINER="Dugan Chen" -EMAIL="thedoogster [at] gmail [dot] com" +REQUIRES="OpenAL wxGTK3" +MAINTAINER="B. Watson" +EMAIL="yalhcru@gmail.com" |