Updated to 0.3.2

3 files changed, 20 insertions, 46 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 9bbbe9990b05..412b65842834 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,8 @@
+# Generated by mksrcinfo v8
+# Tue Sep  6 22:48:34 UTC 2016
 pkgbase = reminiscence
 	pkgdesc = A rewrite of the flashback engine
-	pkgver = 0.2.1
+	pkgver = 0.3.2
 	pkgrel = 1
 	url = http://cyxdown.free.fr/reminiscence/
 	arch = i686
@@ -8,13 +10,15 @@ pkgbase = reminiscence
 	license = GPL
 	makedepends = p7zip
 	depends = sdl
-	source = http://cyxdown.free.fr/reminiscence/REminiscence-0.2.1.tar.bz2
+	depends = libmodplug
+	depends = zlib
+	depends = bash
+	noextract = flashback_data_files.7z
+	source = http://cyxdown.free.fr/reminiscence/REminiscence-0.3.2.tar.bz2
 	source = http://gtamp.com/PSP/flashback_data_files.7z
-	source = fix-keys.diff
 	source = reminiscence.sh
-	md5sums = 59e7c5b3848c65f8eddb0e8c0e588221
+	md5sums = 35b891b82c2b1c8ce69dbda550d5de27
 	md5sums = f994412ad4246c587896dab7d2eb9627
-	md5sums = e470517e2933c09362681c620938d218
 	md5sums = 4ed0350e4b81e9ba305f90e157c75371
 
 pkgname = reminiscence
diff --git a/PKGBUILD b/PKGBUILD
index 19e4bea8b777..aaacdc63d349 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,33 +3,34 @@
 # flashback_data_files.7z if from http://gtamp.com/PSP/reminiscencepsp.php
 
 pkgname=reminiscence
-pkgver=0.2.1
+pkgver=0.3.2
 pkgrel=1
 pkgdesc="A rewrite of the flashback engine"
 arch=('i686' 'x86_64')
 url="http://cyxdown.free.fr/reminiscence/"
 license=('GPL')
-depends=('sdl')
+depends=('sdl' 'libmodplug' 'zlib' 'bash')
 makedepends=('p7zip')
 source=(http://cyxdown.free.fr/reminiscence/REminiscence-${pkgver}.tar.bz2
         http://gtamp.com/PSP/flashback_data_files.7z
-        fix-keys.diff
         reminiscence.sh)
-md5sums=('59e7c5b3848c65f8eddb0e8c0e588221'
+md5sums=('35b891b82c2b1c8ce69dbda550d5de27'
          'f994412ad4246c587896dab7d2eb9627'
-         'e470517e2933c09362681c620938d218'
          '4ed0350e4b81e9ba305f90e157c75371')
+noextract=('flashback_data_files.7z')
 
 build() {
   cd "$srcdir/REminiscence-$pkgver"
 
-  patch -p1 -i "$srcdir/fix-keys.diff"
+  make CXX=g++ CXXFLAGS="-Wall -MMD \$(SDL_CFLAGS) -DUSE_MODPLUG -DUSE_ZLIB -O"
+}
 
-  make
+package() {
+  cd "$srcdir/REminiscence-$pkgver"
 
-  install -d "$pkgdir/usr/bin"
-  install -m755 rs "$pkgdir/usr/bin/reminiscence.bin"
-  install -m755 "$srcdir/reminiscence.sh" "$pkgdir/usr/bin/reminiscence"
+  #install -d "$pkgdir/usr/bin"
+  install -Dm755 rs "$pkgdir/usr/bin/reminiscence.bin"
+  install -Dm755 "$srcdir/reminiscence.sh" "$pkgdir/usr/bin/reminiscence"
 
   msg2 "Extracting flashback_data_files.7z with p7zip"
   install -m755 -d "$pkgdir/usr/share/reminiscence"
diff --git a/fix-keys.diff b/fix-keys.diff
deleted file mode 100644
index 10a0df94c1ca..000000000000
--- a/fix-keys.diff
+++ /dev/null
@@ -1,31 +0,0 @@
-Index: REminiscence-0.2.1/systemstub_sdl.cpp
-===================================================================
---- REminiscence-0.2.1.orig/systemstub_sdl.cpp
-+++ REminiscence-0.2.1/systemstub_sdl.cpp
-@@ -403,12 +403,12 @@ while (true) {
- 			if (ev.key.keysym.mod & KMOD_ALT) {
- 				if (ev.key.keysym.sym == SDLK_RETURN) {
- 					switchGfxMode(!_fullscreen, _currentScaler);
--				} else if (ev.key.keysym.sym == SDLK_KP_PLUS) {
-+				} else if (ev.key.keysym.sym == SDLK_PLUS) {
- 					uint8 s = _currentScaler + 1;
- 					if (s < NUM_SCALERS) {
- 						switchGfxMode(_fullscreen, s);
- 					}
--				} else if (ev.key.keysym.sym == SDLK_KP_MINUS) {
-+				} else if (ev.key.keysym.sym == SDLK_MINUS) {
- 					int8 s = _currentScaler - 1;
- 					if (_currentScaler > 0) {
- 						switchGfxMode(_fullscreen, s);
-@@ -429,9 +429,9 @@ while (true) {
- 					_pi.save = true;
- 				} else if (ev.key.keysym.sym == SDLK_l) {
- 					_pi.load = true;
--				} else if (ev.key.keysym.sym == SDLK_KP_PLUS) {
-+				} else if (ev.key.keysym.sym == SDLK_PLUS) {
- 					_pi.stateSlot = 1;
--				} else if (ev.key.keysym.sym == SDLK_KP_MINUS) {
-+				} else if (ev.key.keysym.sym == SDLK_MINUS) {
- 					_pi.stateSlot = -1;
- 				} else if (ev.key.keysym.sym == SDLK_r) {
- 					_pi.inpRecord = true;