Removal of custom built libmpg123 and cleanup of start script

4 files changed, 29 insertions, 19 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6f33a330b54d..66fe0afed25f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = kega-fusion
 	pkgdesc = An emulator of classic Sega consoles, including SMS/GG, Genesis/Megadrive and add-ons
 	pkgver = 3.63
-	pkgrel = 16
+	pkgrel = 17
 	url = http://www.carpeludum.com/kega-fusion
 	install = kega-fusion.install
 	arch = i686
@@ -12,20 +12,19 @@ pkgbase = kega-fusion
 	depends = glu
 	depends = libsm
 	depends = gtk2
-	optdepends = lib32-gtk-engines: libclearlooks.so library
+	depends = mpg123
+	optdepends = gtk-engines: libclearlooks.so library
 	options = !strip
 	source = http://www.carpeludum.com/download/Fusion363x.tar.gz
 	source = http://www.carpeludum.com/download/PluginsLinux.tar.gz
-	source = http://trya.alwaysdata.net/linux/libmpg123.so.0.11.4.gz
 	source = http://trya.alwaysdata.net/linux/icons/kega-fusion.png
 	source = kega-fusion.sh
 	source = kega-fusion.desktop
 	source = Fusion.ini
 	md5sums = 9a6f93c2f3bd48ef09a9170e7f0512f4
 	md5sums = 6121a37c42026da032386d9d5a5e9c42
-	md5sums = 6e9516000e527e025ad9de0b15573a87
 	md5sums = 1fdaacf18fb2965fb6f64a769037056b
-	md5sums = dfe05fd67cc555767b76031885844d9a
+	md5sums = 130ce3ac8bd1993a32be20c051ffc779
 	md5sums = 5ecf6ba3ef1eff460ee659ef7b6e78db
 	md5sums = 6d744c098bdf2085fe144ffd2794fe6d
 
diff --git a/PKGBUILD b/PKGBUILD
index fa72fbe3520e..47fbd30c6443 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,32 +2,29 @@
 
 pkgname=kega-fusion
 pkgver=3.63
-pkgrel=16
+pkgrel=17
 pkgdesc="An emulator of classic Sega consoles, including SMS/GG, Genesis/Megadrive and add-ons"
 url="http://www.carpeludum.com/kega-fusion"
 license=('custom')
 arch=('i686' 'x86_64')
 if [ "$CARCH" == "x86_64" ]; then
-  depends=('lib32-alsa-lib' 'lib32-glu' 'lib32-libsm' 'lib32-gtk2')
+  depends=('lib32-alsa-lib' 'lib32-glu' 'lib32-libsm' 'lib32-gtk2' 'lib32-mpg123')
   optdepends=('lib32-gtk-engines: libclearlooks.so library'
               'lib32-alsa-plugins: for PulseAudio users')
 else
-  depends=('alsa-lib' 'glu' 'libsm' 'gtk2')
+  depends=('alsa-lib' 'glu' 'libsm' 'gtk2' 'mpg123')
   optdepends=('gtk-engines: libclearlooks.so library')
 fi
 makedepends=('upx')
-optdepends=('lib32-gtk-engines: libclearlooks.so library')
 install="kega-fusion.install"
 source=("http://www.carpeludum.com/download/Fusion363x.tar.gz"
         "http://www.carpeludum.com/download/PluginsLinux.tar.gz"
-        "http://trya.alwaysdata.net/linux/libmpg123.so.0.11.4.gz"
         "http://trya.alwaysdata.net/linux/icons/kega-fusion.png"
         kega-fusion.sh kega-fusion.desktop Fusion.ini)
 md5sums=('9a6f93c2f3bd48ef09a9170e7f0512f4'
          '6121a37c42026da032386d9d5a5e9c42'
-         '6e9516000e527e025ad9de0b15573a87'
          '1fdaacf18fb2965fb6f64a769037056b'
-         'dfe05fd67cc555767b76031885844d9a'
+         '130ce3ac8bd1993a32be20c051ffc779'
          '5ecf6ba3ef1eff460ee659ef7b6e78db'
          '6d744c098bdf2085fe144ffd2794fe6d')
 options=(!strip)
@@ -38,7 +35,11 @@ package() {
   # plugins
   install -d "$pkgdir/usr/lib/kega-fusion/plugins"
   install -m644 Plugins/*.rpi "$pkgdir/usr/lib/kega-fusion/plugins"
-  install -m644 libmpg123.so.0.11.4 "$pkgdir/usr/lib/kega-fusion"
+  if [ "$CARCH" == "x86_64" ]; then
+    ln -s /usr/lib32/libmpg123.so.0 "$pkgdir/usr/lib/kega-fusion"  
+  else
+    ln -s /usr/lib/libmpg123.so.0 "$pkgdir/usr/lib/kega-fusion" 
+  fi
   
   # default configuration and documentation
   install -Dm644 Fusion.ini "$pkgdir/usr/share/kega-fusion/Fusion.ini"
@@ -48,7 +49,7 @@ package() {
   # startup script and executable
   install -Dm755 kega-fusion.sh "$pkgdir/usr/bin/kega-fusion"
   upx -d "$srcdir/Fusion/Fusion"
-  install -Dm755 Fusion/Fusion "$pkgdir/usr/lib/kega-fusion/kega-fusion"
+  install -Dm755 Fusion/Fusion "$pkgdir/usr/lib/kega-fusion"
   
   # desktop icon
   install -Dm644 kega-fusion.desktop "$pkgdir/usr/share/applications/kega-fusion.desktop"
diff --git a/kega-fusion.install b/kega-fusion.install
index 8b770941d842..a2fd97d830ed 100644
--- a/kega-fusion.install
+++ b/kega-fusion.install
@@ -1,7 +1,7 @@
 post_install() {
 	echo ""
-	echo "Some notes:"
-	echo "-----------"
+	echo "Some notes about Kega Fusion:"
+	echo "-----------------------------"
 	echo "- Kega expects Fusion.ini to be in '~/.Kega Fusion' and"
 	echo "  the render plugins to be in '~/.Kega Fusion/Plugins'."
 	echo "  This behaviour cannot be changed, so don't forget it"
@@ -14,5 +14,13 @@ post_install() {
 }
 
 post_upgrade() {
-	post_install
+	echo ""
+	echo "Kega Fusion now uses system libmpg123 for MP3 playback."
+	echo "If you already have a Fusion.ini configuration file"
+	echo "in '~/.Kega Fusion', you should edit it so that the MP3"
+	echo "library path parameter reflects the change."
+	echo "It should now looks like this:"
+	echo ""
+	echo "libmpg123path=/usr/lib/kega-fusion/libmpg123.so.0"
+	echo ""
 }
diff --git a/kega-fusion.sh b/kega-fusion.sh
index 9e933f4de526..9e7836f27795 100644
--- a/kega-fusion.sh
+++ b/kega-fusion.sh
@@ -10,7 +10,9 @@ mkdir -p "$kega_localdir/Plugins"
 # create links for every included plugin
 if [ $(ls -1A $kega_libdir/plugins | wc -l) -gt 0 ]; then
   for i in $kega_libdir/plugins/*; do
-    ln -sf "$i" "$kega_localdir/Plugins/$(basename "$i")"
+    if [ ! -e "$kega_localdir/Plugins/$(basename "$i")" ]; then
+      ln -sf "$i" "$kega_localdir/Plugins/"
+    fi
   done
 fi
 
@@ -20,4 +22,4 @@ if ! [ -f "$kega_localdir/Fusion.ini" ]; then
 fi
 
 # here we go!
-$kega_libdir/kega-fusion "$@"
+$kega_libdir/Fusion "$@"