system/vice: Updated for version 3.8.

Signed-off-by: B. Watson <urchlay@slackware.uk>

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

3 files changed, 69 insertions, 23 deletions

diff --git a/system/vice/fix_texi.diff b/system/vice/fix_texi.diff
index 62b0aceabc2b3..c1a264538a224 100644
--- a/system/vice/fix_texi.diff
+++ b/system/vice/fix_texi.diff
@@ -1,25 +1,43 @@
-diff -Naur vice-3.7.1/doc/vice.texi vice-3.7.1.patched/doc/vice.texi
---- vice-3.7.1/doc/vice.texi	2022-12-27 18:57:48.000000000 -0500
-+++ vice-3.7.1.patched/doc/vice.texi	2023-05-04 02:57:02.622937677 -0400
-@@ -1840,7 +1840,7 @@
+diff -Naur vice-3.8/doc/vice.texi vice-3.8.patched/doc/vice.texi
+--- vice-3.8/doc/vice.texi	2023-12-24 12:42:36.000000000 -0500
++++ vice-3.8.patched/doc/vice.texi	2024-02-13 20:17:44.907985392 -0500
+@@ -1486,7 +1486,7 @@
  * Romset files::                Files defining the machine's ROM set.
  @end menu
  
 -@node ROM files, Keymap files, Gtk3 Hotkeys files, System files, System files
-+@node ROM files, Keymap files, Gtk3 Hotkeys files, System files
++@node ROM files, Keymap files, Hotkeys files, System files
  @section ROM files
  
  Every emulator requires its own ROM set.  For the VIC20 and the C64, the
-@@ -5178,7 +5178,7 @@
+@@ -2415,17 +2415,6 @@
+ Directives are special commands for the parser. They start with
+ @strong{@code{!}} and are case-insensitive.
+ 
+-@menu
+-* !CLEAR::
+-* !DEBUG::
+-* !ELSE::
+-* !ENDIF::
+-* !IF::
+-* !INCLUDE::
+-* !UNDEF::
+-* !WARNING::
+-@end menu
+-
+ @strong{!CLEAR}
+ @quotation
+ 
+@@ -4954,7 +4943,7 @@
  
  xplus4 control ports and devices:
  
--@multitable @columnfractions .05 .33 .05 .05 .05 .05
-+@multitable @columnfractions .05 .33 .05 .05 .05 .05 .05 .05
+-@multitable @columnfractions .05 .33 .05 .05 .05 .05 .05 .05 .05 .05 .05
++@multitable @columnfractions .05 .33 .05 .05 .05 .05 .05 .05 .05 .05 .05 .05 .05
  @headitem nr
  @tab device
  @tab N1
-@@ -8047,8 +8047,8 @@
+@@ -8005,8 +7994,8 @@
  
  The windows driver understands various options passed in the so called "mode string"
  after a colon after the ports name: @code{COMx[:]} @code{[baud=b]} @code{[parity=p]}
@@ -30,7 +48,7 @@ diff -Naur vice-3.7.1/doc/vice.texi vice-3.7.1.patched/doc/vice.texi
  @end table
  
  @table @code
-@@ -8179,8 +8179,8 @@
+@@ -8142,8 +8131,8 @@
  
  The windows driver understands various options passed in the so called "mode string"
  after a colon after the ports name: @code{COMx[:]} @code{[baud=b]} @code{[parity=p]}
@@ -41,3 +59,21 @@ diff -Naur vice-3.7.1/doc/vice.texi vice-3.7.1.patched/doc/vice.texi
  @end table
  
  @table @code
+@@ -9332,7 +9321,7 @@
+ 
+ @c ----------------------------------------------------------------
+ 
+-@c @node Misc settings,  , Monitor settings, Settings and resources
++@node Misc settings,  , Monitor settings, Settings and resources
+ @c @section Miscellaneous settings
+ 
+ @node Machine-specific features, Platform-specific features, Settings and resources, Top
+@@ -20784,7 +20773,7 @@
+ @end table
+ 
+ 
+-@c @node Miscellaneous commands,  , Profiling commands, Monitor
++@node Miscellaneous commands,  , Profiling commands, Monitor
+ @section Resources commands
+ 
+ @table @code
diff --git a/system/vice/vice.SlackBuild b/system/vice/vice.SlackBuild
index c0725a72af936..38aa08d8c5a8a 100644
--- a/system/vice/vice.SlackBuild
+++ b/system/vice/vice.SlackBuild
@@ -7,6 +7,14 @@
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
+# 20240213 bkw: update for v3.8.
+# - had to add --disable-parsid to the configure command. it was breaking
+#   the build. also, do you really have a SID chip connected to your
+#   parallel port? (do you even *have* a parallel port?)... if so, either
+#   send me a patch, or wait until upstream does another release.
+# - LAME is no longer supported, remove --enable-lame.
+# - add --enable-catweasel.
+
 # 20230504 bkw: BUILD=2.
 # - fix vice.texi so the GNU info file gets generated.
 # - remove old ./configure arguments and fix a couple of wrong ones.
@@ -52,8 +60,8 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=vice
-VERSION=${VERSION:-3.7.1}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-3.8}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
 
@@ -98,6 +106,8 @@ set -e
 [ -x /usr/bin/ffmpeg ] && ffmpeg="--enable-ffmpeg"
 
 # Anticipating 15.0's pure-alsa-system
+# 20240214 bkw: which sadly never materialized. I keep this here for
+# my own use, anyway.
 if [ "${PULSE:-yes}" != "yes" ]; then
   pulseopt="--without-pulse"
 fi
@@ -109,10 +119,7 @@ mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
 
-# Fancy tar command here, avoid extracting what we don't need.
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz \
-    --wildcards \
-    --exclude='*/src/lib/lib*'
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 
 cd $PRGNAM-$VERSION
 chown -R root:root .
@@ -180,7 +187,7 @@ config() {
     --infodir=/usr/info \
     --docdir=$DOCDIR \
     --enable-ethernet \
-    --enable-parsid \
+    --disable-parsid \
     --enable-cpuhistory \
     --with-mpg123 \
     --with-flac \
@@ -188,7 +195,7 @@ config() {
     --with-gif \
     --with-png \
     --enable-midi \
-    --enable-lame \
+    --enable-catweasel \
     --build=$ARCH-slackware-linux
 
   make
@@ -236,8 +243,11 @@ config "--enable-gtk3ui --enable-desktop-files"
 make
 make install-strip DESTDIR=$PKG
 
-# This is a source file, doesn't belong in the package.
-rm -f $PKGDOC/*.texi
+# 20240214 bkw: in 3.8, 'make install' no longer installs any of
+# the docs. Do it manually. Leave out building/ (we don't need to
+# care about building on fedora, windows, mac OS).
+mkdir -p $PKGDOC
+cp -a doc/*.txt $PKGDOC
 
 # Install desktop files manually.
 mkdir -p $PKG/usr/share/desktop-directories \
diff --git a/system/vice/vice.info b/system/vice/vice.info
index f54498f265c7b..f3ab5a74cb5d8 100644
--- a/system/vice/vice.info
+++ b/system/vice/vice.info
@@ -1,8 +1,8 @@
 PRGNAM="vice"
-VERSION="3.7.1"
+VERSION="3.8"
 HOMEPAGE="https://vice-emu.sourceforge.io"
-DOWNLOAD="https://downloads.sourceforge.net/project/vice-emu/releases/vice-3.7.1.tar.gz"
-MD5SUM="ffcb48e9b688d14dc5f86de22c30ee32"
+DOWNLOAD="https://downloads.sourceforge.net/project/vice-emu/releases/vice-3.8.tar.gz"
+MD5SUM="023febe71bef57ff2537b6b5e961bd7a"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""