summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
author B. Watson <yalhcru@gmail.com>2016-10-16 13:30:38 -0400
committer Willy Sudiarto Raharjo <willysr@slackbuilds.org>2016-10-22 08:47:29 +0700
commit87d13a495f7b8d33c4e38bdcc5acc8e9e5fdc7f1 (patch)
treed480775fdc48b0c9ba8a2efcfdc6d9d82e372ec8
parent7ff718db7bc17eb2c41a8895034a0c2d52f5f1b0 (diff)
downloadslackbuilds-87d13a495f7b8d33c4e38bdcc5acc8e9e5fdc7f1.tar.gz
slackbuilds-87d13a495f7b8d33c4e38bdcc5acc8e9e5fdc7f1.tar.xz
games/xroar: Updated for version 0.34.5.
-rw-r--r--games/xroar/README4
-rw-r--r--games/xroar/xroar.SlackBuild24
-rw-r--r--games/xroar/xroar.info6
3 files changed, 18 insertions, 16 deletions
diff --git a/games/xroar/README b/games/xroar/README
index 4968d69380..583db8b08a 100644
--- a/games/xroar/README
+++ b/games/xroar/README
@@ -14,6 +14,10 @@ jack-audio-connection-kit - if you want to use JACK for audio output,
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.
+
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
/usr/share/xroar/roms, and must be given the filenames xroar expects. See
diff --git a/games/xroar/xroar.SlackBuild b/games/xroar/xroar.SlackBuild
index c3c4266bb3..667b1b65ce 100644
--- a/games/xroar/xroar.SlackBuild
+++ b/games/xroar/xroar.SlackBuild
@@ -6,6 +6,12 @@
# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+# 20161016 bkw:
+# - update for 0.34.5
+# - move binary to /usr/games
+# - mention SDL2 in README
+# - fix jack option (--with-jack, not --enable-jack)
+
# 20150912 bkw:
# - update for 0.33.2
# - use upstream's man page, get rid of mine
@@ -34,7 +40,7 @@
# - mention gtkglext in README as an optional dep
PRGNAM=xroar
-VERSION=${VERSION:-0.33.2}
+VERSION=${VERSION:-0.34.5}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -86,8 +92,8 @@ find -L . \
patch -p1 < $CWD/alsa_first.diff
# Not sure why anyone would need this, but it's easy to support.
-JACKOPT="--disable-jack"
-[ "${JACK:-no}" = "yes" ] && JACKOPT="--enable-jack"
+JACKOPT="--without-jack"
+[ "${JACK:-no}" = "yes" ] && JACKOPT="--with-jack"
# fix underlinking via LDFLAGS instead of a .diff
@@ -96,6 +102,7 @@ CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
./configure \
$JACKOPT \
+ --bindir=/usr/games \
--prefix=/usr \
--libdir=/usr/lib${LIBDIRSUFFIX} \
--sysconfdir=/etc \
@@ -106,7 +113,7 @@ CXXFLAGS="$SLKCFLAGS" \
make
make install DESTDIR=$PKG
-strip $PKG/usr/bin/$PRGNAM
+strip $PKG/usr/games/$PRGNAM
# man page needs to be in section 6, since this is in games/
mkdir -p $PKG/usr/man/man6
@@ -161,15 +168,6 @@ cp -a COPYING* ChangeLog $PKG/usr/doc/$PRGNAM-$VERSION
( cd doc && make $PRGNAM.html )
cp doc/$PRGNAM.html doc/*png $PKG/usr/doc/$PRGNAM-$VERSION
-# Don't keep duplicates of the doc images, use symlinks
-cd $PKG/usr/info
-for i in *.png; do
- if [ -e ../doc/$PRGNAM-$VERSION/$i ]; then
- rm -f $i
- ln -s ../doc/$PRGNAM-$VERSION/$i .
- fi
-done
-
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
mkdir -p $PKG/install
diff --git a/games/xroar/xroar.info b/games/xroar/xroar.info
index 5be24338b4..3eda87fb02 100644
--- a/games/xroar/xroar.info
+++ b/games/xroar/xroar.info
@@ -1,8 +1,8 @@
PRGNAM="xroar"
-VERSION="0.33.2"
+VERSION="0.34.5"
HOMEPAGE="http://www.6809.org.uk/dragon/xroar.shtml"
-DOWNLOAD="http://www.6809.org.uk/xroar/dl/0.33/xroar-0.33.2.tar.gz"
-MD5SUM="d17eb0c201d0c8572fb4f89605ea0f79"
+DOWNLOAD="http://www.6809.org.uk/xroar/dl/0.34/xroar-0.34.5.tar.gz"
+MD5SUM="53596139bdf1a3a02bcbe6e149f77e98"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""