diff options
| -rw-r--r-- | games/xroar/README | 14 | ||||
| -rw-r--r-- | games/xroar/slack-desc | 10 | ||||
| -rw-r--r-- | games/xroar/xroar.SlackBuild | 32 | ||||
| -rw-r--r-- | games/xroar/xroar.info | 6 |
4 files changed, 44 insertions, 18 deletions
diff --git a/games/xroar/README b/games/xroar/README index 583db8b08aed..c01c0256e3c5 100644 --- a/games/xroar/README +++ b/games/xroar/README @@ -7,16 +7,18 @@ Tandy Colour Computer (CoCo) models 1 & 2. Optional dependenies: gtkglext - if you want a full GTK+ user interface, install gtkglext - before building xroar. + before building xroar. If gtkglext is installed, you can build + without it by setting GTKGLEXT=no in the environment. jack-audio-connection-kit - if you want to use JACK for audio output, - install jack-audio-connection-kit and set JACK=yes in the - environment before building xroar. If JACK audio has x-runs, - try 'setcap cap_ipc_lock,cap_sys_nice=ep /usr/bin/xroar'. + install jack-audio-connection-kit and set JACK=yes in the + environment before building xroar. If JACK audio has x-runs, + try 'setcap cap_ipc_lock,cap_sys_nice=ep /usr/bin/xroar'. SDL2 - if you prefer SDL2 to SDL1, install SDL2 before building xroar. - I haven't noticed any difference between xroar built with SDL1 or - SDL2, but the option is there in case you need it. + I haven't noticed any difference between xroar built with SDL1 or SDL2, + but the option is there in case you need it. If SDL2 is installed, + you can build without it by setting SDL2=no in the environment. To usefully emulate the Dragon or CoCo, you will need the images of the system ROMs for the target system. The ROM images must be copied to diff --git a/games/xroar/slack-desc b/games/xroar/slack-desc index dfb43e6ec09b..921de8d0f29e 100644 --- a/games/xroar/slack-desc +++ b/games/xroar/slack-desc @@ -12,8 +12,8 @@ xroar: XRoar is a Dragon emulator for Linux, Unix, Mac OS X, GP32, Nintendo xroar: DS and Windows. Due to hardware similarities, XRoar also emulates xroar: the Tandy Colour Computer (CoCo) models 1 & 2. xroar: -xroar: -xroar: -xroar: -xroar: -xroar: +xroar: This package is built with: +xroar: GtkGLExt: @GTKGLEXT@ +xroar: JACK support: @JACK@ +xroar: SDL version: @SDLVER@ +xroar: Included ROMs: @ROMS@ diff --git a/games/xroar/xroar.SlackBuild b/games/xroar/xroar.SlackBuild index 207ccddeb9cf..a3144c3183da 100644 --- a/games/xroar/xroar.SlackBuild +++ b/games/xroar/xroar.SlackBuild @@ -6,6 +6,11 @@ # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details. +# 20170822 bkw: +# - update for 0.34.8 +# - add SDL2=no and GTKGLEXT=no options, mostly for my own testing +# - record build options in slack-desc + # 20170122 bkw: # - update for 0.34.7 @@ -43,7 +48,7 @@ # - mention gtkglext in README as an optional dep PRGNAM=xroar -VERSION=${VERSION:-0.34.7} +VERSION=${VERSION:-0.34.8} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -98,13 +103,17 @@ patch -p1 < $CWD/alsa_first.diff JACKOPT="--without-jack" [ "${JACK:-no}" = "yes" ] && JACKOPT="--with-jack" +[ "${SDL2:-yes}" = "no" ] && SDL2OPT="--without-sdl2" + +[ "${GTKGLEXT:-yes}" = "no" ] && GTKGLOPT="--without-gtkgl" + # fix underlinking via LDFLAGS instead of a .diff LDFLAGS="-lm" \ CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ - $JACKOPT \ + $JACKOPT $SDL2OPT $GTKGLOPT \ --bindir=/usr/games \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ @@ -118,6 +127,15 @@ make make install DESTDIR=$PKG strip $PKG/usr/games/$PRGNAM +# set these for use in the slack-desc +SDLVER=1.2 +JACK=no +GTKGLEXT=no +ldd $PKG/usr/games/$PRGNAM > ldd.tmp +grep -q libSDL2 ldd.tmp && SDLVER=2 +grep -q libjack ldd.tmp && JACK=yes +grep -q libgtkglext ldd.tmp && GTKGLEXT=yes + # man page needs to be in section 6, since this is in games/ mkdir -p $PKG/usr/man/man6 sed '1s,\<1\>,6,' \ @@ -137,19 +155,21 @@ mkdir -p $PKG/usr/share/xroar/roms # dragon.rom comes from http://www.6809.org.uk/dragon/dragon.rom cat $CWD/dragon.rom > $PKG/usr/share/$PRGNAM/roms/mini-dragon.rom +ROMS="mini-dragon" # Optional ROM images (from MESS site) for zip in coco coco2 cocoe dragon32 dragon64; do if [ -e $CWD/$zip.zip ]; then rm -f *.rom unzip $CWD/$zip.zip install -oroot -groot -m0644 *.rom $PKG/usr/share/$PRGNAM/roms + ROMS="$ROMS $zip" fi done # If the user doesn't include a d32.rom from a zip file, make the mini-rom # the default (at least the emu will start, that way) if [ ! -e $PKG/usr/share/$PRGNAM/roms/d32.rom ]; then - ln -s mini-dragon.rom $PKG/usr/share/$PRGNAM/roms/d32.rom + ln -s mini-dragon.rom $PKG/usr/share/$PRGNAM/roms/d32.rom fi # Icon taken from Fedora package here: @@ -174,7 +194,11 @@ cp doc/$PRGNAM.html doc/*png $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc +sed -e "s,@JACK@,$JACK," \ + -e "s,@SDLVER@,$SDLVER," \ + -e "s,@GTKGLEXT@,$GTKGLEXT," \ + -e "s,@ROMS@,$ROMS," \ + $CWD/slack-desc > $PKG/install/slack-desc cat $CWD/doinst.sh > $PKG/install/doinst.sh cd $PKG diff --git a/games/xroar/xroar.info b/games/xroar/xroar.info index 1fb7be78560b..a6103b4a6ae6 100644 --- a/games/xroar/xroar.info +++ b/games/xroar/xroar.info @@ -1,8 +1,8 @@ PRGNAM="xroar" -VERSION="0.34.7" +VERSION="0.34.8" HOMEPAGE="http://www.6809.org.uk/dragon/xroar.shtml" -DOWNLOAD="http://www.6809.org.uk/xroar/dl/0.34/xroar-0.34.7.tar.gz" -MD5SUM="47d6b13880e14bfc737b89f150d6deb0" +DOWNLOAD="http://www.6809.org.uk/xroar/dl/0.34/xroar-0.34.8.tar.gz" +MD5SUM="0bc89467646ffbcf1dd4fd2939889ea0" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" |