diff options
Diffstat (limited to 'games/clksignal')
| -rw-r--r-- | games/clksignal/9342c60.diff | 34 | ||||
| -rw-r--r-- | games/clksignal/README | 3 | ||||
| -rw-r--r-- | games/clksignal/clksignal-qt.6 | 20 | ||||
| -rw-r--r-- | games/clksignal/clksignal-qt.rst | 18 | ||||
| -rw-r--r-- | games/clksignal/clksignal.SlackBuild | 38 | ||||
| -rw-r--r-- | games/clksignal/clksignal.info | 6 | ||||
| -rw-r--r-- | games/clksignal/slack-desc | 2 |
7 files changed, 95 insertions, 26 deletions
diff --git a/games/clksignal/9342c60.diff b/games/clksignal/9342c60.diff new file mode 100644 index 0000000000..02f707d3c0 --- /dev/null +++ b/games/clksignal/9342c60.diff @@ -0,0 +1,34 @@ +diff --git a/OSBindings/Qt/clksignal.pro b/OSBindings/Qt/clksignal.pro +index cb1e865b2..e26e3e77b 100644 +--- a/OSBindings/Qt/clksignal.pro ++++ b/OSBindings/Qt/clksignal.pro +@@ -113,8 +113,6 @@ SOURCES += \ + $$SRC/Processors/6502/Implementation/*.cpp \ + $$SRC/Processors/6502/State/*.cpp \ + $$SRC/Processors/65816/Implementation/*.cpp \ +- $$SRC/Processors/68000/Implementation/*.cpp \ +- $$SRC/Processors/68000/State/*.cpp \ + $$SRC/Processors/Z80/Implementation/*.cpp \ + $$SRC/Processors/Z80/State/*.cpp \ + \ +@@ -259,7 +257,6 @@ HEADERS += \ + $$SRC/Processors/65816/Implementation/*.hpp \ + $$SRC/Processors/68000/*.hpp \ + $$SRC/Processors/68000/Implementation/*.hpp \ +- $$SRC/Processors/68000/State/*.hpp \ + $$SRC/Processors/Z80/*.hpp \ + $$SRC/Processors/Z80/Implementation/*.hpp \ + $$SRC/Processors/Z80/State/*.hpp \ +diff --git a/OSBindings/SDL/SConstruct b/OSBindings/SDL/SConstruct +index 6b1e6e849..af2dd675c 100644 +--- a/OSBindings/SDL/SConstruct ++++ b/OSBindings/SDL/SConstruct +@@ -100,8 +100,6 @@ SOURCES += glob.glob('../../Outputs/OpenGL/Primitives/*.cpp') + SOURCES += glob.glob('../../Processors/6502/Implementation/*.cpp') + SOURCES += glob.glob('../../Processors/6502/State/*.cpp') + SOURCES += glob.glob('../../Processors/65816/Implementation/*.cpp') +-SOURCES += glob.glob('../../Processors/68000/Implementation/*.cpp') +-SOURCES += glob.glob('../../Processors/68000/State/*.cpp') + SOURCES += glob.glob('../../Processors/Z80/Implementation/*.cpp') + SOURCES += glob.glob('../../Processors/Z80/State/*.cpp') + diff --git a/games/clksignal/README b/games/clksignal/README index 8ad1d233f7..84f393a0fb 100644 --- a/games/clksignal/README +++ b/games/clksignal/README @@ -4,7 +4,7 @@ CLK, also known as Clock Signal, is an emulator for tourists that seeks to be invisible. Users directly launch classic software with no emulator or per-emulated-machine learning curve. -It currently emulates the Acorn Electron, Amstrad CPC, Apple +It currently emulates the Acorn Electron, Amstrad CPC, Amiga, Apple II/II+/IIe, Atari 2600, Atari ST, ColecoVision, Commodore VIC-20, Enterprise 64/128, 512K Mac/Mac+, MSX-1, Oric/Atmos, Sega Master System, Sinclair ZX81/81, and Sinclair ZX Spectrum. @@ -21,6 +21,7 @@ it. Notes: - clksignal requires ROM images for most of the systems it emulates. + Install clksignal-roms to get a "starter" set of ROM images. When an image is missing, it will tell you the name, size, and CRC of the image, so you can go search for it on the web. diff --git a/games/clksignal/clksignal-qt.6 b/games/clksignal/clksignal-qt.6 index 7941495642..613e824dac 100644 --- a/games/clksignal/clksignal-qt.6 +++ b/games/clksignal/clksignal-qt.6 @@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] .in \\n[rst2man-indent\\n[rst2man-indent-level]]u .. -.TH "CLKSIGNAL-QT" 6 "2022-01-08" "20211219" "SlackBuilds.org" +.TH "CLKSIGNAL-QT" 6 "2023-07-16" "20230515" "SlackBuilds.org" .SH NAME clksignal-qt \- graphical interface for clksignal emulator .\" RST source for clksignal-qt(6) man page. Convert with: @@ -51,9 +51,25 @@ automatically be started. .sp Unlike \fBclksignal\fP, \fBclksignal\-qt\fP \fIonly\fP supports PulseAudio for audio output. No, it won\(aqt work with \fBapulse\fP(1), either. +.SH FILES +.sp +\fBclksignal\-qt\fP looks for ROM files in several directories, including: +.INDENT 0.0 +.TP +.B /usr/share/clksignal\-qt/ROMImages/ +To populate this directory, install the \fBclksignal\-roms\fP package from +SlackBuilds.org +.TP +.B $HOME/.local/share/clksignal\-qt/ROMImages/ +Simply copy files here (or drag\-and\-drop them into the UI when asked to). +.UNINDENT +.sp +Each of these directories has subdirectories named after the emulated +system (e.g. \fBAppleII/\fP, \fBVic20/\fP). To see the full list of systems, +run \fBclksignal\fP \fI\-\-help\fP\&. .SH COPYRIGHT .sp -See the file /usr/doc/clksignal\-20211219/LICENSE for license information. +See the file /usr/doc/clksignal\-20230515/LICENSE for license information. .SH AUTHORS .sp clksignal\-qt was written by Thomas Harte. diff --git a/games/clksignal/clksignal-qt.rst b/games/clksignal/clksignal-qt.rst index 487dac6936..e556498f77 100644 --- a/games/clksignal/clksignal-qt.rst +++ b/games/clksignal/clksignal-qt.rst @@ -2,7 +2,7 @@ .. rst2man.py clksignal-qt.rst > clksignal-qt.6 .. rst2man.py comes from the SBo development/docutils package. -.. |version| replace:: 20211219 +.. |version| replace:: 20230515 .. |date| date:: ============ @@ -37,6 +37,22 @@ automatically be started. Unlike **clksignal**, **clksignal-qt** *only* supports PulseAudio for audio output. No, it won't work with **apulse**\(1), either. +FILES +===== + +**clksignal-qt** looks for ROM files in several directories, including: + +/usr/share/clksignal-qt/ROMImages/ + To populate this directory, install the **clksignal-roms** package from + SlackBuilds.org + +$HOME/.local/share/clksignal-qt/ROMImages/ + Simply copy files here (or drag-and-drop them into the UI when asked to). + +Each of these directories has subdirectories named after the emulated +system (e.g. **AppleII/**, **Vic20/**). To see the full list of systems, +run **clksignal** *--help*. + COPYRIGHT ========= diff --git a/games/clksignal/clksignal.SlackBuild b/games/clksignal/clksignal.SlackBuild index eb79e2a899..21c7ff7fda 100644 --- a/games/clksignal/clksignal.SlackBuild +++ b/games/clksignal/clksignal.SlackBuild @@ -6,12 +6,22 @@ # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details. +# 20230716 bkw: updated for v20230515, expand man page a bit. +# 20230530 bkw: remove unused flags. + +# 20230114 bkw: updated for v20221125. +# - fix my typo that prevented the qt5 UI from being built. +# - rename ROM dir AppleIIGS => AppleIIgs (the latter is hardcoded +# in the emulator binary). +# - make PRINT_PACKAGE_NAME work. + cd $(dirname $0) ; CWD=$(pwd) PRGNAM=clksignal -VERSION=${VERSION:-20211219} +VERSION=${VERSION:-20230515} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} +PKGTYPE=${PKGTYPE:-tgz} SRCNAM=CLK SRCVER="$( echo $VERSION | sed 's,^\(....\)\(..\)\(..\),\1\-\2-\3,' )" @@ -33,20 +43,6 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - set -e rm -rf $PKG @@ -59,10 +55,14 @@ chown -R root:root . find -L . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \ \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+ +# 20230716 bkw: upstream removed some C++ source files without removing them +# from the qt5 .pro file. fixed after 20230515 release. +[ "$VERSION" = "20230515" ] && patch -p1 < $CWD/9342c60.diff + mkdir -p $PKG/usr/games $PKG/usr/man/man6 $PKG/usr/share/applications # Qt5 user interface is optional. -if [ "{QT:-yes}" = "yes" ]; then +if [ "${QT:-yes}" = "yes" ]; then cd OSBindings/Qt qmake-qt5 make @@ -83,8 +83,10 @@ THLINE=".TH $PRGNAM 6 \\\"$SRCVER\\\" \\\"$VERSION\\\" \\\"SlackBuilds.org\\\"" sed '/^\.TH/s,.*,'"$THLINE"',' Packaging/templates/$PRGNAM.1.j2 | \ gzip -9c > $PKG/usr/man/man6/$PRGNAM.6.gz -# there actually are a few ROMs in here, plus lots of readme.txt +# there actually are a few ROMs in here, plus lots of readme.txt. +# one dir has the wrong capitalization. mkdir -p $PKG/usr/share/$SRCNAM +mv ROMImages/AppleIIGS ROMImages/AppleIIgs cp -a ROMImages/* $PKG/usr/share/$SRCNAM MACICONS="OSBindings/Mac/Clock Signal/Assets.xcassets/AppIcon.appiconset/" @@ -120,4 +122,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc cat $CWD/doinst.sh > $PKG/install/doinst.sh cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/games/clksignal/clksignal.info b/games/clksignal/clksignal.info index ac348f4e15..a582f28bc1 100644 --- a/games/clksignal/clksignal.info +++ b/games/clksignal/clksignal.info @@ -1,8 +1,8 @@ PRGNAM="clksignal" -VERSION="20211219" +VERSION="20230515" HOMEPAGE="https://github.com/TomHarte/CLK" -DOWNLOAD="https://github.com/TomHarte/CLK/archive/2021-12-19/CLK-2021-12-19.tar.gz" -MD5SUM="76cc593607574ee77fda180ec3cbcd68" +DOWNLOAD="https://github.com/TomHarte/CLK/archive/2023-05-15/CLK-2023-05-15.tar.gz" +MD5SUM="a58bf452f0c21f68c5bc90819a426bbf" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/games/clksignal/slack-desc b/games/clksignal/slack-desc index a947ca4126..fdfcb73423 100644 --- a/games/clksignal/slack-desc +++ b/games/clksignal/slack-desc @@ -12,7 +12,7 @@ clksignal: CLK, also known as Clock Signal, is an emulator for tourists that clksignal: seeks to be invisible. Users directly launch classic software with no clksignal: emulator or per-emulated-machine learning curve. clksignal: -clksignal: It currently emulates the Acorn Electron, Amstrad CPC, Apple +clksignal: It currently emulates the Acorn Electron, Amstrad CPC, Amiga, Apple clksignal: II/II+/IIe, Atari 2600, Atari ST, ColecoVision, Commodore VIC-20, clksignal: Enterprise 64/128, 512K Mac/Mac+, MSX-1, Oric/Atmos, Sega Master clksignal: System, Sinclair ZX81/81, and Sinclair ZX Spectrum. |