[fix] Add fluidsynth dependency, cleanup

Use new flag for global installation, thanks @Ancurio!

3 files changed, 20 insertions, 19 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 86540b52ef37..7e2cd38d0093 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = mkxp-git
 	pkgdesc = Open source implementation of the Ruby Game Scripting System of RPG Maker XP (development version)
-	pkgver = r403.843a7bf
+	pkgver = r470.151a1f0
 	pkgrel = 1
 	url = https://github.com/Ancurio/mkxp
 	install = mkxp.install
@@ -22,9 +22,11 @@ pkgbase = mkxp-git
 	depends = boost-libs
 	depends = libgl
 	depends = libsigc++
+	depends = fluidsynth
+	optdepends = fluidsynth-git: reduced memory footprint for midi playback
 	provides = mkxp
 	conflicts = mkxp
-	source = mkxp::git+https://github.com/Ancurio/mkxp.git
+	source = git+https://github.com/Ancurio/mkxp.git
 	md5sums = SKIP
 
 pkgname = mkxp-git
diff --git a/PKGBUILD b/PKGBUILD
index 3c084df3c2a4..031eb09720a7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,41 +1,41 @@
 # Maintainer: carstene1ns <arch carsten-teibes de> - http://git.io/ctPKG
 
-_name=mkxp
-pkgname=$_name-git
-pkgver=r403.843a7bf
+pkgname=mkxp-git
+pkgver=r470.151a1f0
 pkgrel=1
 pkgdesc="Open source implementation of the Ruby Game Scripting System of RPG Maker XP (development version)"
 arch=('i686' 'x86_64')
 url="https://github.com/Ancurio/mkxp"
 license=('GPL2')
 depends=('ruby' 'physfs-hg' 'sdl2_image' 'sdl2_ttf' 'sdl_sound-patched-hg'
-         'pixman' 'openal' 'boost-libs' 'libgl' 'libsigc++')
+         'pixman' 'openal' 'boost-libs' 'libgl' 'libsigc++' 'fluidsynth')
 makedepends=('git' 'boost' 'cmake' 'mesa' 'vim')
 conflicts=('mkxp')
 provides=('mkxp')
-install=$_name.install
-source=($_name::"git+$url.git")
+optdepends=('fluidsynth-git: reduced memory footprint for midi playback')
+install=mkxp.install
+source=("git+$url.git")
 md5sums=('SKIP')
 
 pkgver() {
-  cd $_name
+  cd mkxp
   printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
 }
 
 build() {
-  cd $_name
+  cd mkxp
 
-  cmake ./ -DMRIVERSION=2.1
+  cmake ./ -DMRIVERSION=2.1 -DWORKDIR_CURRENT=ON
   make
 }
 
 package() {
-  cd $_name
+  cd mkxp
 
   # install architecture dependent executeable
-  install -Dm755 $_name.bin.x* "$pkgdir"/usr/bin/$_name
+  install -Dm755 mkxp.bin.x* "$pkgdir"/usr/bin/mkxp
 
   # install documentation
-  install -Dm644 README.md "$pkgdir"/usr/share/doc/$_name/README.md
-  install -m644 mkxp.conf.sample "$pkgdir"/usr/share/doc/$_name
+  install -Dm644 README.md "$pkgdir"/usr/share/doc/mkxp/README.md
+  install -m644 mkxp.conf.sample "$pkgdir"/usr/share/doc/mkxp
 }
diff --git a/mkxp.install b/mkxp.install
index 708511b87036..265c7912b578 100644
--- a/mkxp.install
+++ b/mkxp.install
@@ -1,9 +1,8 @@
 
 post_install() {
-  echo "Currently, you have to copy /usr/bin/mkxp to the directory of the"
-  echo "RPG Maker XP game you want to play, after that you can launch it"
-  echo "with ./mkxp in it's directory. You may want to add a mkxp.conf to game"
-  echo "directory for customisation, see sample file in /usr/share/doc/mkxp"
+  echo "To use mkxp, change into the directory of the RPG Maker XP game you want to play"
+  echo "and launch 'mkxp'. You may want to add a mkxp.conf to the game directory for"
+  echo "customisation, see sample file in '/usr/share/doc/mkxp'."
 }
 
 post_upgrade() {