1 files changed, 20 insertions, 46 deletions
diff --git a/games/higan/higan.SlackBuild b/games/higan/higan.SlackBuild
index b147533ab2..a9511ca33c 100644
--- a/games/higan/higan.SlackBuild
+++ b/games/higan/higan.SlackBuild
@@ -4,6 +4,7 @@
 
 # Based on bsnes SlackBuild by Erik Hanson <erik@slackbuilds.org>
 # Maintained by Gabriel Magno <gabrielmagno1[at]gmail[dot]com>
+# Modified by Johannes Schoepfer <slackbuilds[at]schoepfer[dot]info>
 
 # Copyright 2013 Gabriel Magno, Belo Horizonte, MG, Brazil
 # All rights reserved.
@@ -26,13 +27,13 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=higan
-VERSION=${VERSION:-094}
+VERSION=${VERSION:-101}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
@@ -43,8 +44,8 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -63,7 +64,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf ${PRGNAM}_v${VERSION}-source
-tar xvf $CWD/${PRGNAM}_v${VERSION}-source.tar.xz
+7z x $CWD/${PRGNAM}_v${VERSION}-source.7z
 cd ${PRGNAM}_v${VERSION}-source
 find . -type d -exec chmod -R 0755 {} \;
 chown -R root:root .
@@ -73,58 +74,31 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-# Apply the patch to allow proper install on Slackware as root
-patch -p1 -i $CWD/higan-v094.patch
-
-# Fix building with QT >= 4.8.0.
-moc -i -Iphoenix/qt/ -o phoenix/qt/platform.moc phoenix/qt/platform.moc.hpp
-
-# Choose whether a qt or gtk interface is built.
-INTERFACE=${INTERFACE:-qt}
-
-# Determine which mode to build higan.
-# Possible values for PROFILE: accuracy, balanced, and performance.
-PROFILE=${PROFILE:-balanced}
-
-# Options to build with additional audio driver support
-OPENAL=${OPENAL:-no}
+# Thanks to the Arch folks
+patch -p1 -i $CWD/higan-flags.patch
 
 CXXFLAGS="$SLKCFLAGS" \
-make \
-  compiler=g++ \
-  cppflags="-std=c++11" \
+make -C icarus \
   prefix=/usr \
   platform=linux \
-  with_openal="$OPENAL" \
-  with_pulseaudio="yes" \
-  phoenix="$INTERFACE" \
-  profile="$PROFILE"
+  hiro=qt \
 
-make install DESTDIR=$PKG prefix=/usr platform=linux profile=$PROFILE
-
-# Compile ananke (tool to import ROM game files into the higan library).
-make -C ananke \
-  compiler=g++ \
-  cppflags="-std=c++11" \
+CXXFLAGS="$SLKCFLAGS" \
+make -C higan \
+  prefix=/usr \
   platform=linux \
-  phoenix="$INTERFACE" \
-  profile="$PROFILE"
-make -C ananke install path=$PKG/usr/lib${LIBDIRSUFFIX} platform=linux
+  hiro=qt
 
-# Copy shaders
-mkdir $PKG/usr/share/higan/Video\ Shaders
-cp -r shaders/*.shader $PKG/usr/share/higan/Video\ Shaders
-chmod -R 777 $PKG/usr/share/higan/Video\ Shaders
+install -dm 755 $PKG/usr/{bin,share/{applications,higan,pixmaps}}
+install -m 755 icarus/out/icarus $PKG/usr/bin/
+install -m 755 higan/out/higan $PKG/usr/bin/
+install -m 644 higan/data/higan.desktop $PKG/usr/share/applications/
+install -m 644 higan/data/higan.png $PKG/usr/share/pixmaps/
+cp -dr higan/systems/* higan/data/cheats.bml $PKG/usr/share/higan/
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
-# Fix broken link.
-cd $PKG/usr/lib${LIBDIRSUFFIX}
-  rm libananke.so
-  ln -s libananke.so.1 libananke.so
-cd -
-
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild