8 files changed, 24 insertions, 114 deletions
diff --git a/games/mupen64plus/README b/games/mupen64plus/README
index 3e6f164e0b7f9..35758d474de3a 100644
--- a/games/mupen64plus/README
+++ b/games/mupen64plus/README
@@ -4,5 +4,5 @@ emulators, with dynamic recompilers for 32-bit x86 and 64-bit amd64
 systems, and necessary plugins for audio, graphical rendering (RDP),
 signal co-processor (RSP), and input.
 
-By default the gtk2 GUI will be built. To build the Qt4 GUI pass GTK2=no
-to the script.
+The 2.0 branch of mupen64plus does not include a GUI.  If you want
+one install the m64py package.
diff --git a/games/mupen64plus/doinst.sh b/games/mupen64plus/doinst.sh
deleted file mode 100644
index 392c12adb9bd3..0000000000000
--- a/games/mupen64plus/doinst.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-if [ -x /usr/bin/update-desktop-database ]; then
-  /usr/bin/update-desktop-database -q usr/share/applications
-fi
-
diff --git a/games/mupen64plus/ftbfs-gvariant-type-conflicts.patch b/games/mupen64plus/ftbfs-gvariant-type-conflicts.patch
deleted file mode 100644
index 2a409d79f9787..0000000000000
--- a/games/mupen64plus/ftbfs-gvariant-type-conflicts.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff --git a/rice_video/typedefs.h b/rice_video/typedefs.h
-index 4cded542b06445f043fa1fabf77e4d20c9d52920..b7e16e9c4ba3248f9fed9762f79349c137ee2026 100644
---- a/rice_video/typedefs.h
-+++ b/rice_video/typedefs.h
-@@ -20,10 +20,12 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- #ifndef _TYPEDEFS_H_
- #define _TYPEDEFS_H_
- 
--#define uchar  unsigned char
--#define uint16 unsigned short
--#define uint32 unsigned int
--#define uint64 unsigned long long
-+#include <stdint.h>
-+
-+typedef uint8_t uchar;
-+typedef uint16_t uint16;
-+typedef uint32_t uint32;
-+typedef uint64_t uint64;
- 
- typedef unsigned char               uint8;
diff --git a/games/mupen64plus/gcc4.4-build.patch b/games/mupen64plus/gcc4.4-build.patch
deleted file mode 100644
index 10c668a83ca5d..0000000000000
--- a/games/mupen64plus/gcc4.4-build.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -up ./glide64/Combine.cpp.00 ./glide64/Combine.cpp
---- ./glide64/Combine.cpp.00	2010-01-28 12:08:11.367269059 -0800
-+++ ./glide64/Combine.cpp	2010-01-28 12:08:55.142019819 -0800
-@@ -11873,7 +11873,7 @@ void InitCombine ()
-   LOG ("InitCombine() ");
-   memset(&cmb, 0, sizeof(cmb));
-   const char *extensions = grGetString (GR_EXTENSION);
--  if (char * extstr = strstr(extensions, "COMBINE")) {
-+  if (char * extstr = (char *) strstr(extensions, "COMBINE")) { 
-     if (!strncmp(extstr, "COMBINE", 7)) {
-       LOG ("extensions ");
-       cmb.grColorCombineExt = (GRCOLORCOMBINEEXT) grGetProcAddress("grColorCombineExt");
-diff -up ./glide64/Main.cpp.00 ./glide64/Main.cpp
---- ./glide64/Main.cpp.00	2010-01-28 11:55:52.981269116 -0800
-+++ ./glide64/Main.cpp	2010-01-28 11:59:22.810019317 -0800
-@@ -784,7 +784,7 @@ BOOL InitGfx (BOOL evoodoo_using_window)
-   printf("bebefore2\n");
-   if (settings.fb_hires)
-   {
--    if (char * extstr = strstr(extensions, "TEXTUREBUFFER")) 
-+    if (char * extstr = (char *) strstr(extensions, "TEXTUREBUFFER"))  
-     {
-       if (!strncmp(extstr, "TEXTUREBUFFER", 13)) 
-       {
diff --git a/games/mupen64plus/mupen64plus.SlackBuild b/games/mupen64plus/mupen64plus.SlackBuild
index 21e92bf920fbf..7e8f4814e2699 100644
--- a/games/mupen64plus/mupen64plus.SlackBuild
+++ b/games/mupen64plus/mupen64plus.SlackBuild
@@ -1,32 +1,12 @@
 #!/bin/sh
 
-# Slackware build script for Mupen64Plus
+# Slackware build script for mupen64plus
 
-# Copyright 2008  Frank Caraballo <fecaraballo{at}gmail{dot}com>
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-# Modified by M.Dinslage
+# Written by M.Dinslage  contact: daedra1980@gmail.com
 
 PRGNAM=mupen64plus
-VERSION=${VERSION:-1.5}
-BUILD=${BUILD:-4}
+VERSION=2.0
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -44,59 +24,47 @@ OUTPUT=${OUTPUT:-/tmp}
 
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
-  LIBDIRSUFFIX=""
+  LBIDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-  LIBDIRSUFFIX=""
+  LBIDIRSUFFIX=""
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
+  LBIDIRSUFFIX="64"
 else
   SLKCFLAGS="-O2"
   LIBDIRSUFFIX=""
 fi
 
-if [ "${GTK2:-yes}" = "yes" ]; then
-  gui_opt="GTK2"
-else
-  gui_opt="QT4"
-fi
+set -e
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
-cd $TMP || exit 1
-rm -rf Mupen64Plus-1-5-src
-tar xvf $CWD/Mupen64Plus-1-5-src.tar.gz || exit 1
-cd Mupen64Plus-1-5-src || exit 1
-patch -p1 < $CWD/gcc4.4-build.patch
-patch -p1 < $CWD/ftbfs-gvariant-type-conflicts.patch
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-bundle-src-$VERSION.tar.gz
+cd $PRGNAM-bundle-src-$VERSION
 chown -R root:root .
 find . \
  \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
  -exec chmod 755 {} \; -o \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
-
+ 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
-make PREFIX=/usr GUI=$gui_opt all || exit 1
-make PREFIX=$PKG/usr install || exit 1
+./m64p_build.sh V=1 
+./m64p_install.sh PREFIX=/usr LIBDIR=/usr/lib${LBIDIRSUFFIX} MANDIR=/usr/man DESTDIR=$PKG
 
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+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 LICENSES README* RELEASE TODO \
-  $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a $TMP/$PRGNAM-bundle-src-$VERSION/test/doc/* $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
-mkdir -p $PKG/usr/share/{applications,pixmaps}
-cat $CWD/$PRGNAM.desktop > $PKG/usr/share/applications/$PRGNAM.desktop
-cat $CWD/mupen64plus.png > $PKG/usr/share/pixmaps/mupen64plus.png
-
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
-cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n -p $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/games/mupen64plus/mupen64plus.desktop b/games/mupen64plus/mupen64plus.desktop
deleted file mode 100644
index ecf7fb6c76c1f..0000000000000
--- a/games/mupen64plus/mupen64plus.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Name=Mupen64Plus
-GenericName=N64 emulator
-Exec=mupen64plus
-Terminal=false
-Type=Application
-Categories=Application;Game;Emulator;
-Icon=/usr/share/pixmaps/mupen64plus.png
-StartupNotify=false
diff --git a/games/mupen64plus/mupen64plus.info b/games/mupen64plus/mupen64plus.info
index 1acd0b48b885c..f90542d27306f 100644
--- a/games/mupen64plus/mupen64plus.info
+++ b/games/mupen64plus/mupen64plus.info
@@ -1,8 +1,8 @@
 PRGNAM="mupen64plus"
-VERSION="1.5"
+VERSION="2.0"
 HOMEPAGE="http://code.google.com/p/mupen64plus/"
-DOWNLOAD="http://ftp.riken.go.jp/pub/FreeBSD/distfiles/mupen64plus/Mupen64Plus-1-5-src.tar.gz"
-MD5SUM="c224b045d343ff02f6f933d328861b01"
+DOWNLOAD="http://mupen64plus.googlecode.com/files/mupen64plus-bundle-src-2.0.tar.gz"
+MD5SUM="f855b4233faa9616b780c364fc4a9a9a"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/games/mupen64plus/mupen64plus.png b/games/mupen64plus/mupen64plus.png
deleted file mode 100644
index 26c80c4031357..0000000000000
--- a/games/mupen64plus/mupen64plus.png
+++ /dev/null