From f1e819b5283b98519dfcd8b333444c85c9708873 Mon Sep 17 00:00:00 2001 From: "Eric B. Pratt" Date: Sat, 4 Apr 2020 05:18:02 +0700 Subject: system/vice: Updated for version 3.4. Signed-off-by: Willy Sudiarto Raharjo --- system/vice/README | 12 +++++------- system/vice/config/vsid.desktop | 9 +++++++++ system/vice/config/x128.desktop | 2 +- system/vice/config/x64dtv.desktop | 2 +- system/vice/config/x64sc.desktop | 9 +++++++++ system/vice/config/xcbm2.desktop | 4 ++-- system/vice/config/xcbm5x0.desktop | 9 +++++++++ system/vice/config/xpet.desktop | 2 +- system/vice/config/xplus4.desktop | 4 ++-- system/vice/config/xscpu64.desktop | 9 +++++++++ system/vice/config/xvic.desktop | 2 +- system/vice/slack-desc | 14 +++++++------- system/vice/vice.SlackBuild | 14 ++------------ system/vice/vice.info | 8 ++++---- 14 files changed, 62 insertions(+), 38 deletions(-) create mode 100644 system/vice/config/vsid.desktop create mode 100644 system/vice/config/x64sc.desktop create mode 100644 system/vice/config/xcbm5x0.desktop create mode 100644 system/vice/config/xscpu64.desktop (limited to 'system') diff --git a/system/vice/README b/system/vice/README index ade2df503f..d023ecb72c 100644 --- a/system/vice/README +++ b/system/vice/README @@ -1,10 +1,8 @@ VICE is the one and only Versatile Commodore Emulator. It provides emulation of the Commodore C64, C128, VIC20, PET, PLUS4 and CBM-II computers. - -Optional Dependency - -To enable recording of videos, you need ffmpeg. Enable this by passing -to the script the parameter: - - FFMPEG=yes ./vice.SlackBuild +NOTE: To use the standard application menu instead of the in-emulator +PETSCII menu, GTK3 v3.22 is required. Slackware 14.2 ships with 3.18 and +there is no upgrade package for this. Slackware Current has 3.22. So to +use the normal application menus, you either need to use Slackware Current +or find a way to upgrade your Slackware 14.2's GTK3 to v3.22. diff --git a/system/vice/config/vsid.desktop b/system/vice/config/vsid.desktop new file mode 100644 index 0000000000..c1dfd32f55 --- /dev/null +++ b/system/vice/config/vsid.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Name=VICE SID Player +Comment=A SID Player +StartupNotify=true +Exec=vsid +Icon=vice +Terminal=false +Type=Application +Categories=System diff --git a/system/vice/config/x128.desktop b/system/vice/config/x128.desktop index d4e5d4fad8..92ab76c637 100644 --- a/system/vice/config/x128.desktop +++ b/system/vice/config/x128.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Name=VICE C128 emulator -Comment=Commodore 128 emulator from the VICE team +Comment=A Commodore 128 emulator StartupNotify=true Exec=x128 Icon=vice diff --git a/system/vice/config/x64dtv.desktop b/system/vice/config/x64dtv.desktop index b6e1bc1112..f3d82b642d 100644 --- a/system/vice/config/x64dtv.desktop +++ b/system/vice/config/x64dtv.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Name=VICE C64DTV emulator -Comment=Commodore 64 DTV emulator from the VICE team +Comment=A C64DTV emulator StartupNotify=true Exec=x64dtv Icon=vice diff --git a/system/vice/config/x64sc.desktop b/system/vice/config/x64sc.desktop new file mode 100644 index 0000000000..46d5b89ee0 --- /dev/null +++ b/system/vice/config/x64sc.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Name=VICE C64 emulator +Comment=An accurate Commodore 64 emulator +StartupNotify=true +Exec=x64sc +Icon=vice +Terminal=false +Type=Application +Categories=System diff --git a/system/vice/config/xcbm2.desktop b/system/vice/config/xcbm2.desktop index 017254e8ac..1411e41883 100644 --- a/system/vice/config/xcbm2.desktop +++ b/system/vice/config/xcbm2.desktop @@ -1,6 +1,6 @@ [Desktop Entry] -Name=VICE CBM2 emulator -Comment=Commodore CBM2 emulator from the VICE team +Name=VICE CBM-II emulator +Comment=A Commodore CBM-II (6x0/7x0) emulator StartupNotify=true Exec=xcbm2 Icon=vice diff --git a/system/vice/config/xcbm5x0.desktop b/system/vice/config/xcbm5x0.desktop new file mode 100644 index 0000000000..2acabe36d5 --- /dev/null +++ b/system/vice/config/xcbm5x0.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Name=VICE CBM-II emulator +Comment=A Commodore CBM-II (5x0) emulator +StartupNotify=true +Exec=xcbm5x0 +Icon=vice +Terminal=false +Type=Application +Categories=System diff --git a/system/vice/config/xpet.desktop b/system/vice/config/xpet.desktop index 53f125405d..1efabc6b61 100644 --- a/system/vice/config/xpet.desktop +++ b/system/vice/config/xpet.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Name=VICE PET emulator -Comment=Commodore PET emulator from the VICE team +Comment=A Commodore PET emulator StartupNotify=true Exec=xpet Icon=vice diff --git a/system/vice/config/xplus4.desktop b/system/vice/config/xplus4.desktop index a10f256ef1..63f095c95a 100644 --- a/system/vice/config/xplus4.desktop +++ b/system/vice/config/xplus4.desktop @@ -1,6 +1,6 @@ [Desktop Entry] -Name=VICE PLUS4 emulator -Comment=Commodore PLUS4 emulator from the VICE team +Name=VICE Plus4 emulator +Comment=A Commodore Plus4 emulator StartupNotify=true Exec=xplus4 Icon=vice diff --git a/system/vice/config/xscpu64.desktop b/system/vice/config/xscpu64.desktop new file mode 100644 index 0000000000..295643f0c8 --- /dev/null +++ b/system/vice/config/xscpu64.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Name=VICE C64 SuperCPU emulator +Comment=An accurate SuperCPU64 emulator +StartupNotify=true +Exec=xscpu64 +Icon=vice +Terminal=false +Type=Application +Categories=System diff --git a/system/vice/config/xvic.desktop b/system/vice/config/xvic.desktop index fe29db9bed..d06423e8be 100644 --- a/system/vice/config/xvic.desktop +++ b/system/vice/config/xvic.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Name=VICE VIC-20 emulator -Comment=Commodore VIC-20 emulator from the VICE team +Comment=A Commodore VIC-20 emulator StartupNotify=true Exec=xvic Icon=vice diff --git a/system/vice/slack-desc b/system/vice/slack-desc index 953758d889..b7266deab0 100644 --- a/system/vice/slack-desc +++ b/system/vice/slack-desc @@ -6,14 +6,14 @@ # customary to leave one space after the ':' except on otherwise blank lines. |-----handy-ruler------------------------------------------------------| -vice: vice (the one and only Versatile Commodore Emulator) +vice: vice (the Versatile Commodore Emulator) vice: -vice: VICE is a program that runs on a Unix, MS-DOS, Win32, OS/2, Acorn -vice: RISC OS, BeOS, QNX 6.x, Amiga, GP2X or Mac OS X machine and executes +vice: VICE is a program that runs on a Unix, MS-DOS, Win32, OS/2, BeOS, +vice: QNX 4.x, QNX 6.x, Amiga, Syllable or Mac OS X machine and executes vice: programs intended for the old 8-bit computers. The current version -vice: emulates the C64, the C128, the VIC20, almost all PET models, the -vice: PLUS4 and the CBM-II (aka C610). -vice: -vice: Homepage: http://vice-emu.sourceforge.net +vice: emulates the C64, the C64DTV, the C128, the VIC20, practically all +vice: PET models, the PLUS4 and the CBM-II (aka C610/C510). An extra +vice: emulator is provided for C64 expanded with the CMD SuperCPU. vice: +vice: Homepage: http://vice-emu.sourceforge.io vice: diff --git a/system/vice/vice.SlackBuild b/system/vice/vice.SlackBuild index 43c1de7bc4..f745447368 100644 --- a/system/vice/vice.SlackBuild +++ b/system/vice/vice.SlackBuild @@ -24,7 +24,7 @@ # Initialize variables PRGNAM=vice -VERSION=${VERSION:-3.3} +VERSION=${VERSION:-3.4} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -58,9 +58,6 @@ else LIBDIRSUFFIX="" 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 - # Exit if errors encountered set -e @@ -86,13 +83,6 @@ sed -i 's/"\/vice_toc\.html"/"\/html\/vice_toc\.html"/g' \ 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 -# Disable PDF generation because it bombs -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 @@ -105,7 +95,7 @@ CXXFLAGS="$SLKCFLAGS" \ --localstatedir=/var \ --mandir=/usr/man \ --infodir=/usr/info \ - $ffmpeg \ + --enable-shared-ffmpeg \ --docdir=/usr/doc/$PRGNAM-$VERSION \ --with-x \ --enable-quicktime \ diff --git a/system/vice/vice.info b/system/vice/vice.info index ff9cf49f60..0ba82114ce 100644 --- a/system/vice/vice.info +++ b/system/vice/vice.info @@ -1,8 +1,8 @@ PRGNAM="vice" -VERSION="3.3" -HOMEPAGE="http://vice-emu.sourceforge.net" -DOWNLOAD="https://downloads.sourceforge.net/project/vice-emu/releases/vice-3.3.tar.gz" -MD5SUM="b0797f534b33f638220418207d606cf5" +VERSION="3.4" +HOMEPAGE="http://vice-emu.sourceforge.io" +DOWNLOAD="https://downloads.sourceforge.net/project/vice-emu/releases/vice-3.4.tar.gz" +MD5SUM="24d83f692910f5d87de19857e8095f0b" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="SDL2 xa" -- cgit v1.2.3