From 0cb1f29dbb533193ec76e27ed16c4fa63ef990a5 Mon Sep 17 00:00:00 2001 From: "B. Watson" Date: Mon, 27 Apr 2020 00:53:28 -0400 Subject: games/hatari: Support IPF/CTR images, various fixes. Signed-off-by: B. Watson Signed-off-by: Willy Sudiarto Raharjo --- games/hatari/hatari.SlackBuild | 87 ++++++++++++++++++++++++++++++++++++------ 1 file changed, 76 insertions(+), 11 deletions(-) (limited to 'games/hatari/hatari.SlackBuild') diff --git a/games/hatari/hatari.SlackBuild b/games/hatari/hatari.SlackBuild index 87f9dcb703797..35adec40d0ccd 100644 --- a/games/hatari/hatari.SlackBuild +++ b/games/hatari/hatari.SlackBuild @@ -6,6 +6,21 @@ # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details. +# 20200426 bkw: +# - BUILD=2 +# - Include support for IPF and CTR images (copy-protected images), +# with new optional dep libcapsimage. +# - Switch to cmake instead of using fake autotools. +# - Add missing chown/find/chmod after tarball extraction. +# - Doubleplusungood refs unfiles in man pages. +# - Install a couple more doc files in doc dir. +# - Patch hatariui to have it create a default user config file if +# if can't find one, rather than dying. +# - Install utf-8 French man page in correct dir, also convert & install +# a 8859-1 one. +# - Nitpick README and slack-desc. +# - Make cmake find readline, for history/completion in the debugger. + # 20191130 bkw: updated for v2.2.1. # 20180612 bkw: updated for v2.1.0. @@ -44,7 +59,7 @@ PRGNAM=hatari VERSION=${VERSION:-2.2.1} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then @@ -62,12 +77,16 @@ 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 @@ -77,9 +96,22 @@ mkdir -p $TMP $PKG $OUTPUT cd $TMP tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2 cd $PRGNAM-$VERSION - -# configure script is really a wrapper for cmake, doesn't support -# --bindir, --mandir, --docdir. cheat a little. +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 {} \+ + +# hatariui will fail to start if there's no ~/.config/hatari/hatari.cfg. +# hatari's got a --saveconfig option that creates a default hatari.cfg, +# so let's have hatariui use that instead of failing. +patch -p1 < $CWD/hatariui-create-cfg-if-missing.diff + +# man page hadn't been updated since 2014, it says the config file lives +# in the old ~/.hatari/ location. also fix a few typos and formatting +# issues. +patch -p1 < $CWD/manpage.diff + +# cmake doesn't support anything like --bindir, --mandir, --docdir. cheat +# a little. sed -i \ -e 's,BINDIR *bin,BINDIR games,' \ -e 's,share/man/man1,man/man6,' \ @@ -99,11 +131,33 @@ if pkg-config --exists sdl2 && [ "${SDL2:-yes}" != "no" ]; then SDL2OPT="" WITHSDL=2.0 else - SDL2OPT="--disable-sdl2" + SDL2OPT="-DENABLE_SDL2:BOOL=0" WITHSDL=1.2 fi -./configure $SDL2OPT --prefix=/usr +# stoopid overcomplex SHOUTY cmake stuff... +sed -i 's/ncurses\.h/&;readline.h/' cmake/FindReadline.cmake + +# and libcapsimage 5.1 doesn't support a couple of typedefs that +# existed in 4.2. +sed -i \ + -e '1i#include ' \ + -e 's,CapsLong,int32_t,g' \ + -e 's,CapsULong,uint32_t,g' \ + src/floppy_ipf.c + +# 20200427 bkw: upstream actually runs cmake directly in the source +# dir rather than the "mkdir build; cd build; cmake .." stuff from +# our template. I'm going to do it their way. +cmake \ + -DCMAKE_VERBOSE_MAKEFILE=TRUE \ + $SDL2OPT \ + -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DLIB_SUFFIX=${LIBDIRSUFFIX} \ + -DMAN_INSTALL_DIR=/usr/man \ + -DCMAKE_BUILD_TYPE=Release . # Hard-coded paths for icon symlinks, they end up getting created in the # real /usr, not $PKG/usr. @@ -122,18 +176,24 @@ cat $CWD/$PRGNAM.SlackBuild > $DOCDIR/$PRGNAM.SlackBuild cp tools/hmsa/readme-hmsa.txt readme.txt gpl.txt \ doc/changelog.txt doc/coding.txt doc/toc.js \ doc/video-recording.txt doc/fr/clavier-exemple.txt \ + doc/de/*.txt \ $DOCDIR -# The UI has its own docs: +# The UI has its own docs. These are actually used by the UI, so they +# must be available in /usr/share/hatari (hence the symlinks). UIDOCDIR=$DOCDIR/${PRGNAM}ui mkdir -p $UIDOCDIR for i in README TODO release-notes.txt; do ln -s ../../../share/$PRGNAM/${PRGNAM}ui/$i $UIDOCDIR/$i done -# Someone might find the French man page useful: -mkdir -p $PKG/usr/man/fr/man6 -gzip -9c < doc/fr/$PRGNAM.1 > $PKG/usr/man/fr/man6/$PRGNAM.6.gz +# Someone might find the French man page useful. It's in utf-8, so +# put it in the right dir. +mkdir -p $PKG/usr/man/fr.UTF-8/man6 $PKG/usr/man/fr/man6 +gzip -9c < doc/fr/$PRGNAM.1 > $PKG/usr/man/fr.UTF-8/man6/$PRGNAM.6.gz +# For non-UTF-8 users: +iconv --to ISO-8859-1 doc/fr/$PRGNAM.1 | \ + gzip -9c > $PKG/usr/man/fr/man6/$PRGNAM.6.gz # Replace .desktop with modified one, auto-associates ST disks/executables. cat $CWD/${PRGNAM}ui.desktop > $PKG/usr/share/applications/${PRGNAM}ui.desktop @@ -153,8 +213,13 @@ ln -s application-x-st-disk-image.svg \ # Don't symlink emutos to tos here, do it conditionally in doinst.sh. ( cd $PKG/usr/share/$PRGNAM && mv tos.img emutos.img ) +WITHLCAPS=without +ldd $PKG/usr/games/$PRGNAM | grep -q libcapsimage && WITHLCAPS=with + mkdir -p $PKG/install -sed "s,@WITHSDL@,$WITHSDL," $CWD/slack-desc > $PKG/install/slack-desc +sed -e "s,@WITHSDL@,$WITHSDL," \ + -e "s,@WITHLCAPS@,$WITHLCAPS," \ + $CWD/slack-desc > $PKG/install/slack-desc cat $CWD/doinst.sh > $PKG/install/doinst.sh cd $PKG -- cgit v1.2.3