From dcca120cd486566ac85b1ef77503c8952ac9a0d0 Mon Sep 17 00:00:00 2001
From: "Eric B. Pratt" <eric.b.pratt@gmail.com>
Date: Tue, 14 Mar 2017 01:27:44 +0000
Subject: system/vice: Updated for version 3.0.

Signed-off-by: David Spencer <idlemoor@slackbuilds.org>
---
 system/vice/README          | 11 +++++++----
 system/vice/vice.SlackBuild | 16 ++++++++++------
 system/vice/vice.info       |  6 +++---
 3 files changed, 20 insertions(+), 13 deletions(-)

(limited to 'system/vice')

diff --git a/system/vice/README b/system/vice/README
index 2750b6aac4..ade2df503f 100644
--- a/system/vice/README
+++ b/system/vice/README
@@ -1,7 +1,10 @@
-VICE is the one and only Versatile Commodore Emulator. It provides emulation 
+VICE is the one and only Versatile Commodore Emulator. It provides emulation
 of the Commodore C64, C128, VIC20, PET, PLUS4 and CBM-II computers.
 
-To enable recording of videos you need the optional dependency ffmpeg:
-enable this passing to the script the parameter
 
-  FFMPEG=yes
+Optional Dependency
+
+To enable recording of videos, you need ffmpeg. Enable this by passing
+to the script the parameter:
+
+  FFMPEG=yes ./vice.SlackBuild
diff --git a/system/vice/vice.SlackBuild b/system/vice/vice.SlackBuild
index 768bf720ee..5ad4476b66 100644
--- a/system/vice/vice.SlackBuild
+++ b/system/vice/vice.SlackBuild
@@ -24,13 +24,13 @@
 
 # Initialize variables
 PRGNAM=vice
-VERSION=${VERSION:-2.4.24}
+VERSION=${VERSION:-3.0}
 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
@@ -41,8 +41,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" = "i586" ]; then
   SLKCFLAGS="-O2 -march=i586 -mtune=i686"
@@ -90,6 +90,11 @@ sed -i "s/\/usr\/lib\//\/usr\/lib${LIBDIRSUFFIX}\//g" doc/vice.* doc/html/*html
 sed -i "s/AM_CONDITIONAL(BUILD_PDF, true)/AM_CONDITIONAL(BUILD_PDF, false)/g" \
   configure.ac
 
+# Don't install fonts in $HOME and run fc-cache on the build system
+sed -i -e '/@HAVE_FC_CACHE_TRUE@/d' data/fonts/Makefile.am
+
+autoreconf -vif
+
 # Configure the software
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
@@ -120,7 +125,6 @@ make install DESTDIR=$PKG
 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
 
-# Compress man pages
 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
 
@@ -140,7 +144,7 @@ mv $PKG/usr/lib$LIBDIRSUFFIX/$PRGNAM/doc $PKG/usr/doc/$PRGNAM-$VERSION
 ( cd $PKG/usr/doc/$PRGNAM-$VERSION
   chmod 644 *
   mkdir html
-  mv *.html *.png *.gif *.jpg *.css html/ )
+  mv *.html *.png *.gif *.css html/ )
 ( cd $PKG/usr/lib$LIBDIRSUFFIX/$PRGNAM ; ln -s /usr/doc/$PRGNAM-$VERSION doc )
 
 # Copy additional program documentation
diff --git a/system/vice/vice.info b/system/vice/vice.info
index bb52733460..094b1ebd7e 100644
--- a/system/vice/vice.info
+++ b/system/vice/vice.info
@@ -1,8 +1,8 @@
 PRGNAM="vice"
-VERSION="2.4.24"
+VERSION="3.0"
 HOMEPAGE="http://vice-emu.sourceforge.net"
-DOWNLOAD="http://downloads.sourceforge.net/vice-emu/vice-2.4.24.tar.gz"
-MD5SUM="bd064f09908737951ccc75e734b6720c"
+DOWNLOAD="http://downloads.sourceforge.net/vice-emu/vice-3.0.tar.gz"
+MD5SUM="c732d76a70ac1232a43456dae540b43a"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-- 
cgit v1.2.3