diff options
Diffstat (limited to 'main/bsnes')
| -rw-r--r-- | main/bsnes/APKBUILD | 16 | ||||
| -rw-r--r-- | main/bsnes/define-disassembler_read-relb.patch | 13 | ||||
| -rw-r--r-- | main/bsnes/nall-strlcpy.patch | 31 | ||||
| -rw-r--r-- | main/bsnes/no-pulseaudio.patch | 16 |
4 files changed, 31 insertions, 45 deletions
diff --git a/main/bsnes/APKBUILD b/main/bsnes/APKBUILD index 0916f07e7..67331253e 100644 --- a/main/bsnes/APKBUILD +++ b/main/bsnes/APKBUILD @@ -1,7 +1,7 @@ # Contributor: William Pitcock <nenolod@dereferenced.org> # Maintainer: William Pitcock <nenolod@dereferenced.org> pkgname=bsnes -pkgver=0.83 +pkgver=0.86 _x=${pkgver%.*} _y=${pkgver#*.} _pkgver="v${_x}${_y}" @@ -11,13 +11,15 @@ url="http://byuu.org/bsnes/" arch="all" license="GPL" depends= -depends_dev="qt-dev openal-soft-dev sdl-dev alsa-lib-dev mesa-dev libao-dev libxv-dev" +depends_dev="qt-dev openal-soft-dev sdl-dev alsa-lib-dev mesa-dev libao-dev + libxv-dev gtk+-dev" makedepends="$depends_dev" install="" subpackages= source="http://bsnes.googlecode.com/files/${pkgname}_${_pkgver}-source.tar.bz2 - nall-strlcpy.patch - no-pulseaudio.patch" + no-pulseaudio.patch + define-disassembler_read-relb.patch + " _builddir="${srcdir}/${pkgname}_${_pkgver}-source/bsnes" prepare() { @@ -40,6 +42,6 @@ package() { make DESTDIR="$pkgdir" prefix=/usr profile=performance install || return 1 } -md5sums="a1f017f5276ec5be0bc553db2b7e2241 bsnes_v083-source.tar.bz2 -11d7129c769add65a4b03ef9193729f2 nall-strlcpy.patch -07caea846bf49ee6f5deaf999dffbd5f no-pulseaudio.patch" +md5sums="54f73b38d24405186b538e01713b0c1f bsnes_v086-source.tar.bz2 +e67461ca1ffa9840936ed08e9a31d775 no-pulseaudio.patch +4a820f42ecb7f17eab0ffd91ffd9a18b define-disassembler_read-relb.patch" diff --git a/main/bsnes/define-disassembler_read-relb.patch b/main/bsnes/define-disassembler_read-relb.patch new file mode 100644 index 000000000..323e4c385 --- /dev/null +++ b/main/bsnes/define-disassembler_read-relb.patch @@ -0,0 +1,13 @@ +diff --git a/bsnes/snes/alt/smp/smp.hpp b/bsnes/snes/alt/smp/smp.hpp +index f81c454..ad04d3e 100755 +--- a/bsnes/snes/alt/smp/smp.hpp ++++ b/bsnes/snes/alt/smp/smp.hpp +@@ -22,6 +22,8 @@ public: + ~SMP(); + + void disassemble_opcode(char *output, uint16 addr); ++ uint8 disassemble_read(uint16); ++ uint16 relb(int8, int); + + //private: + struct Flags { diff --git a/main/bsnes/nall-strlcpy.patch b/main/bsnes/nall-strlcpy.patch deleted file mode 100644 index fa0859d44..000000000 --- a/main/bsnes/nall-strlcpy.patch +++ /dev/null @@ -1,31 +0,0 @@ ---- ./bsnes/ui/tools/state-manager.cpp.orig -+++ ./bsnes/ui/tools/state-manager.cpp -@@ -135,7 +135,7 @@ - string StateManager::slotLoadDescription(unsigned n) { - if(slot[n].capacity() == 0) return "(empty)"; - char text[DescriptionLength]; -- strlcpy(text, (const char*)slot[n].data() + HeaderLength, DescriptionLength); -+ nall::strlcpy(text, (const char*)slot[n].data() + HeaderLength, DescriptionLength); - return text; - } - -@@ -143,7 +143,7 @@ - if(stateList.selected() == false) return; - string text = descEdit.text(); - if(slot[stateList.selection()].capacity() > 0) { -- strlcpy((char*)slot[stateList.selection()].data() + HeaderLength, (const char*)text, DescriptionLength); -+ nall::strlcpy((char*)slot[stateList.selection()].data() + HeaderLength, (const char*)text, DescriptionLength); - } - refresh(); - } ---- ./bsnes/snes/system/serialization.cpp.orig -+++ ./bsnes/snes/system/serialization.cpp -@@ -7,7 +7,7 @@ - char description[512], profile[16]; - memset(&description, 0, sizeof description); - memset(&profile, 0, sizeof profile); -- strlcpy(profile, Info::Profile, sizeof profile); -+ nall::strlcpy(profile, Info::Profile, sizeof profile); - - s.integer(signature); - s.integer(version); diff --git a/main/bsnes/no-pulseaudio.patch b/main/bsnes/no-pulseaudio.patch index 5a5dea3e1..829670f71 100644 --- a/main/bsnes/no-pulseaudio.patch +++ b/main/bsnes/no-pulseaudio.patch @@ -1,11 +1,13 @@ ---- bsnes_v077-source.orig/bsnes/ui/Makefile -+++ bsnes_v077-source/bsnes/ui/Makefile -@@ -14,7 +14,7 @@ - link += `pkg-config --libs QtCore QtGui` - +diff --git a/bsnes/ui/Makefile b/bsnes/ui/Makefile +index 8b9a1a6..11e7b99 100755 +--- a/bsnes/ui/Makefile ++++ b/bsnes/ui/Makefile +@@ -11,7 +11,7 @@ ui_objects += $(if $(call streq,$(platform),win),resource) + # platform + ifeq ($(platform),x) ruby := video.glx video.xv video.sdl - ruby += audio.alsa audio.openal audio.oss audio.pulseaudio audio.pulseaudiosimple audio.ao + ruby += audio.alsa audio.openal audio.oss audio.ao ruby += input.sdl input.x - - link += $(if $(findstring audio.openal,$(ruby)),-lopenal) + else ifeq ($(platform),osx) + ruby := |