system/vice: Updated for version 2.4.24.

Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>

6 files changed, 57 insertions, 163 deletions

diff --git a/system/vice/README b/system/vice/README
index d083b9685b..2750b6aac4 100644
--- a/system/vice/README
+++ b/system/vice/README
@@ -1,6 +1,7 @@
 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 have to build with this an internal
-(static) version of ffmpeg: enable this passing to the script the parameter
-FFMPEG=yes
+To enable recording of videos you need the optional dependency ffmpeg:
+enable this passing to the script the parameter
+
+  FFMPEG=yes
diff --git a/system/vice/patches/vice-2.4.18-64bit.patch b/system/vice/patches/vice-2.4.18-64bit.patch
deleted file mode 100644
index ee07f3f2b9..0000000000
--- a/system/vice/patches/vice-2.4.18-64bit.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-diff -Naur vice-2.4.18.orig/doc/vice.guide vice-2.4.18/doc/vice.guide
---- vice-2.4.18.orig/doc/vice.guide	2015-02-23 19:11:07.000000000 +0100
-+++ vice-2.4.18/doc/vice.guide	2015-03-06 17:40:53.822159935 +0100
-@@ -1339,7 +1339,7 @@
- `Directory' resource, which is a colon (`:')-separated search path
- list, like the UNIX `PATH' environment variable.  The default value is
- 
--     PREFIX/lib/vice/EMU:$HOME/.vice/EMU:BOOTPATH/EMU
-+     PREFIX/lib64/vice/EMU:$HOME/.vice/EMU:BOOTPATH/EMU
- 
- Where `PREFIX' is the installation prefix (usually `/usr/local'), `EMU'
- is the name of the emulated machine (`C64', `C64DTV', `C128', `PET',
-@@ -1354,12 +1354,12 @@
- 
- then the value will be
- 
--     /usr/local/lib/vice/C64:$HOME/.vice/C64:/usr/local/bin/C64
-+     /usr/local/lib64/vice/C64:$HOME/.vice/C64:/usr/local/bin/C64
- 
- And system files will be searched for under the following directories,
- in the specified order:
- 
--  1. `/usr/local/lib/VICE/C64'
-+  1. `/usr/local/lib64/VICE/C64'
- 
-   2. `$HOME/.vice/C64'
- 
-diff -Naur vice-2.4.18.orig/doc/vice.texi vice-2.4.18/doc/vice.texi
---- vice-2.4.18.orig/doc/vice.texi	2015-02-17 20:32:19.000000000 +0100
-+++ vice-2.4.18/doc/vice.texi	2015-03-06 17:40:53.829159935 +0100
-@@ -1502,7 +1502,7 @@
- default value is
- 
- @example
--PREFIX/lib/vice/EMU:$HOME/.vice/EMU:BOOTPATH/EMU
-+PREFIX/lib64/vice/EMU:$HOME/.vice/EMU:BOOTPATH/EMU
- @end example
- 
- Where @code{PREFIX} is the installation prefix (usually
-@@ -1521,7 +1521,7 @@
- then the value will be
- 
- @example
--/usr/local/lib/vice/C64:$HOME/.vice/C64:/usr/local/bin/C64
-+/usr/local/lib64/vice/C64:$HOME/.vice/C64:/usr/local/bin/C64
- @end example
- 
- And system files will be searched for under the following directories,
-@@ -1529,7 +1529,7 @@
- 
- @enumerate 1
- @item
--@code{/usr/local/lib/VICE/C64}
-+@code{/usr/local/lib64/VICE/C64}
- @item
- @code{$HOME/.vice/C64}
- @item
-diff -Naur vice-2.4.18.orig/doc/vice.txt vice-2.4.18/doc/vice.txt
---- vice-2.4.18.orig/doc/vice.txt	2015-02-23 19:11:07.000000000 +0100
-+++ vice-2.4.18/doc/vice.txt	2015-03-06 17:40:53.834159935 +0100
-@@ -1094,7 +1094,7 @@
- `Directory' resource, which is a colon (`:')-separated search path
- list, like the UNIX `PATH' environment variable.  The default value is
- 
--PREFIX/lib/vice/EMU:$HOME/.vice/EMU:BOOTPATH/EMU
-+PREFIX/lib64/vice/EMU:$HOME/.vice/EMU:BOOTPATH/EMU
- 
- Where `PREFIX' is the installation prefix (usually `/usr/local'), `EMU'
- is the name of the emulated machine (`C64', `C64DTV', `C128', `PET',
-@@ -1109,12 +1109,12 @@
- 
- then the value will be
- 
--/usr/local/lib/vice/C64:$HOME/.vice/C64:/usr/local/bin/C64
-+/usr/local/lib64/vice/C64:$HOME/.vice/C64:/usr/local/bin/C64
- 
- And system files will be searched for under the following directories,
- in the specified order:
- 
--1. `/usr/local/lib/VICE/C64'
-+1. `/usr/local/lib64/VICE/C64'
- 
- 2. `$HOME/.vice/C64'
- 
diff --git a/system/vice/patches/vice-2.4.4-no-pdf.patch b/system/vice/patches/vice-2.4.4-no-pdf.patch
deleted file mode 100644
index 51e9fd015f..0000000000
--- a/system/vice/patches/vice-2.4.4-no-pdf.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -Naur vice-2.4.4.orig/configure.proto vice-2.4.4/configure.proto
---- vice-2.4.4.orig/configure.proto	2013-06-02 02:37:13.000000000 +0200
-+++ vice-2.4.4/configure.proto	2013-06-03 11:58:05.355979729 +0200
-@@ -349,11 +349,7 @@
- 
- AC_CHECK_PROGS(TEXI2DVI, texi2dvi, no)
- AC_CHECK_PROGS(PDFTEX, pdftex, no)
--if test x"$TEXI2DVI" = "xno" -o x"$PDFTEX" = "xno"; then
--  AM_CONDITIONAL(BUILD_PDF, false)
--else
--  AM_CONDITIONAL(BUILD_PDF, true)
--fi
-+AM_CONDITIONAL(BUILD_PDF, false)
- 
- AC_CHECK_PROGS(DOS2UNIX, dos2unix, dos2unix)
- 
diff --git a/system/vice/patches/vice-fix-help.patch b/system/vice/patches/vice-fix-help.patch
deleted file mode 100644
index e2bfe04f4f..0000000000
--- a/system/vice/patches/vice-fix-help.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -Naur vice-2.4.1.orig/man/vice.1 vice-2.4.1/man/vice.1
---- vice-2.4.1.orig/man/vice.1	2012-11-29 12:44:39.000000000 +0100
-+++ vice-2.4.1/man/vice.1	2013-01-23 19:48:47.065865099 +0100
-@@ -43,7 +43,7 @@
- .PP
- The whole documentation for these programs is available in HTML
- format; the main file should be installed on your system as
--/usr/local/lib/vice/doc/vice_toc.html.
-+/usr/doc/vice-@VERSION@/html/vice_toc.html.
- .P
- For up to date news about VICE, have a look at the official home page
- at
-diff -Naur vice-2.4.1.orig/src/arch/unix/gui/uicommands.c vice-2.4.1/src/arch/unix/gui/uicommands.c
---- vice-2.4.1.orig/src/arch/unix/gui/uicommands.c	2012-12-30 15:12:52.000000000 +0100
-+++ vice-2.4.1/src/arch/unix/gui/uicommands.c	2013-01-23 19:50:01.276832152 +0100
-@@ -162,7 +162,7 @@
-         char *manual_path;
-         manual_path = util_concat(boot_path, "/../doc/vice_toc.html", NULL);
- #else
--        static const char manual_path[] = DOCDIR "/vice_toc.html";
-+        static const char manual_path[] = DOCDIR "/html/vice_toc.html";
- #endif
-         
-         char *res_ptr;
diff --git a/system/vice/vice.SlackBuild b/system/vice/vice.SlackBuild
index 7003d78209..768bf720ee 100644
--- a/system/vice/vice.SlackBuild
+++ b/system/vice/vice.SlackBuild
@@ -22,8 +22,9 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# Initialize variables
 PRGNAM=vice
-VERSION=${VERSION:-2.4.21}
+VERSION=${VERSION:-2.4.24}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -43,6 +44,9 @@ OUTPUT=${OUTPUT:-/tmp}
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
   LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
   LIBDIRSUFFIX=""
@@ -54,11 +58,13 @@ else
   LIBDIRSUFFIX=""
 fi
 
-# Only the internal ffmpeg libraries seems to work ATM
-if [ "${FFMPEG:-no}" = "yes" ]; then ffmpeg="--enable-static-ffmpeg"; else ffmpeg=""; fi
+# Only an external ffmpeg seems to work ATM (might change from version to version)
+if [ "${FFMPEG:-no}" = "yes" ]; then ffmpeg="--enable-external-ffmpeg"; else ffmpeg=""; fi
 
-set -e 
+# Exit if errors encountered
+set -e
 
+# Setup for package creation
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
@@ -72,70 +78,81 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-# Set the help path correctly with respect to the actually installed doc
-# folder (the folder set up by "make install" is quite broken).
-patch -p1 <$CWD/patches/vice-fix-help.patch
-
-# A small fix to avoid avoid building the pdf (broken, we use the one provided)
-patch -p1 < $CWD/patches/vice-2.4.4-no-pdf.patch
-
-# Use /usr/lib64 on 64-bit Slackware
-[ "$ARCH" = "x86_64" ] && patch -p1 < $CWD/patches/vice-2.4.18-64bit.patch
+# Set proper paths in documentation.
+sed -i "s/\/usr\/local\/lib\//\/usr\/lib${LIBDIRSUFFIX}\//g" \
+  man/vice.1 src/geninfocontrib_h.sh src/arch/win32/utils/geninfocontrib.c
+sed -i 's/"\/vice_toc\.html"/"\/html\/vice_toc\.html"/g' \
+  src/arch/unix/gui/uicommands.c
+sed -i "s/\/usr\/local/\/usr/g" doc/vice.* doc/html/*html
+sed -i "s/\/usr\/lib\//\/usr\/lib${LIBDIRSUFFIX}\//g" doc/vice.* doc/html/*html
 
-sh autogen.sh || true
+# Disable PDF generation because it bombs
+sed -i "s/AM_CONDITIONAL(BUILD_PDF, true)/AM_CONDITIONAL(BUILD_PDF, false)/g" \
+  configure.ac
 
+# Configure the software
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
-  --enable-fullscreen \
-  --enable-gnomeui \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
   --mandir=/usr/man \
   --infodir=/usr/info \
   $ffmpeg \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --with-sdlsound \
+  --with-x \
+  --enable-fullscreen \
+  --enable-quicktime \
+  --enable-ethernet \
+  --enable-parsid \
+  --enable-memmap \
+  --enable-gnomeui \
   --build=$ARCH-slackware-linux
 
+# Build the software
 make
 make install DESTDIR=$PKG
 
+# Strip symbols from binaries
 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
 
+# Compress info files
 rm -f $PKG/usr/info/dir
 gzip -9 $PKG/usr/info/*
 
-# Create link to documentation folder in the place VICE expects to find it.
-( cd $PKG/usr/lib$LIBDIRSUFFIX/$PRGNAM ; ln -s /usr/doc/$PRGNAM-$VERSION doc )
-
-# Copy the CBM.ttf font to the fonts directory
-# ('make install' spits an error on this, I haven't investigated why)
-mkdir -p $PKG/usr/share/fonts/TTF
-cp data/fonts/CBM.ttf $PKG/usr/share/fonts/TTF
-
 # Install icon and menu entries
 mkdir -p $PKG/usr/share/{applications,pixmaps}
-cp $CWD/config/*.desktop $PKG/usr/share/applications
-cp $CWD/config/vice.png $PKG/usr/share/pixmaps
+install -D -m 0644 $CWD/config/*.desktop $PKG/usr/share/applications
+install -D -m 0644 $CWD/config/vice.png $PKG/usr/share/pixmaps
 
-# Remove the documentation folder installed by "make install", which
-# is a broken mess of almost unrelated files in the wrong place
-rm -rf $PKG/usr/lib$LIBDIRSUFFIX/$PRGNAM/doc
-# Copy the original documentation folder to the usual place
+# Move the original documentation folder to the usual place
+# and create a link to where vice expect it to be
 mkdir -p $PKG/usr/doc
-cp -a doc $PKG/usr/doc/$PRGNAM-$VERSION
-find $PKG/usr/doc/$PRGNAM-$VERSION -name "Makefile*" -exec rm -f {} \;
-find $PKG/usr/doc/$PRGNAM-$VERSION -name "tex*" -exec rm -f {} \;
+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/ )
+( cd $PKG/usr/lib$LIBDIRSUFFIX/$PRGNAM ; ln -s /usr/doc/$PRGNAM-$VERSION doc )
+
 # Copy additional program documentation
 cp -a AUTHORS ChangeLog COPYING FEEDBACK INSTALL NEWS README \
    $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
+# Setup package install directory
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
+# Create package
 cd $PKG
 /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/vice/vice.info b/system/vice/vice.info
index dabfa9fe17..bb52733460 100644
--- a/system/vice/vice.info
+++ b/system/vice/vice.info
@@ -1,8 +1,8 @@
 PRGNAM="vice"
-VERSION="2.4.21"
+VERSION="2.4.24"
 HOMEPAGE="http://vice-emu.sourceforge.net"
-DOWNLOAD="http://ponce.cc/slackware/sources/repo/vice-2.4.21.tar.xz"
-MD5SUM="d5dd6d53dc8e8c3abb66c2ce487f146f"
+DOWNLOAD="http://downloads.sourceforge.net/vice-emu/vice-2.4.24.tar.gz"
+MD5SUM="bd064f09908737951ccc75e734b6720c"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""