games/xroar: Updated for version 0.35.

Signed-off-by: B. Watson <yalhcru@gmail.com>
This commit is contained in:
B. Watson 2018-08-29 04:17:07 -04:00 committed by Willy Sudiarto Raharjo
parent e82d7a735d
commit 8ed58d113d
No known key found for this signature in database
GPG Key ID: 887B8374D7333381
6 changed files with 88 additions and 83 deletions

32
games/xroar/ChangeLog.old Normal file
View File

@ -0,0 +1,32 @@
# 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
# 20140824 bkw:
# - update for 0.32
# - somehow I lost the POD source to the man page, recreate from xroar.6
# 20140313 bkw:
# - update for 0.31.1
# - change download link to upstream's, looks OK now
# - update alsa_first.diff (module.c -> src/module.c)
# - update man page (new options, convert to POD)
# - add jack support
# 20130617 bkw:
# - update for 0.29.5
# 20121218 bkw:
# - update for 0.28.1
# - change download link to my own server, since upstream changes their URL
# for every release
# - include missing .png file for HTML doc
# - add patch to prefer ALSA over OSS
# - LDFLAGS=-lm (wasn't needed for old version)
# - mention gtkglext in README as an optional dep

View File

@ -4,7 +4,7 @@ XRoar is a Dragon emulator for Linux, Unix, Mac OS X, GP32, Nintendo
DS and Windows. Due to hardware similarities, XRoar also emulates the
Tandy Colour Computer (CoCo) models 1 & 2.
Optional dependenies:
Optional dependencies:
gtkglext - if you want a full GTK+ user interface, install gtkglext
before building xroar. If gtkglext is installed, you can build
@ -15,10 +15,12 @@ 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. If SDL2 is installed,
you can build without it by setting SDL2=no in the environment.
Other build options (environment variables):
OSS - use OSS for audio? Default is "no", export OSS="yes" to enable.
Most users won't need this.
PULSE - use PulseAudio? Default is "yes", export PULSE="no" to disable.
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

View File

@ -1,23 +0,0 @@
diff -Naur xroar-0.31.1/src/module.c xroar-0.31.1.patched/src/module.c
--- xroar-0.31.1/src/module.c 2013-12-04 02:38:24.000000000 -0500
+++ xroar-0.31.1.patched/src/module.c 2014-03-14 01:03:20.000000000 -0400
@@ -90,6 +90,9 @@
#ifdef HAVE_SUN_AUDIO
&sound_sun_module,
#endif
+#ifdef HAVE_ALSA_AUDIO
+ &sound_alsa_module,
+#endif
#ifdef HAVE_OSS_AUDIO
&sound_oss_module,
#endif
@@ -104,9 +107,6 @@
#ifdef HAVE_SDL
&sound_sdl_module,
#endif
-#ifdef HAVE_ALSA_AUDIO
- &sound_alsa_module,
-#endif
#ifdef HAVE_JACK_AUDIO
&sound_jack_module,
#endif

View File

@ -13,7 +13,7 @@ xroar: DS and Windows. Due to hardware similarities, XRoar also emulates
xroar: the Tandy Colour Computer (CoCo) models 1 & 2.
xroar:
xroar: This package is built with:
xroar: GtkGLExt: @GTKGLEXT@
xroar: JACK support: @JACK@
xroar: SDL version: @SDLVER@
xroar: SDL version: @SDLVER@ | GtkGLExt: @GTKGLEXT@
xroar: PulseAudio: @PULSE@ | OSS audio: @OSS@ | JACK audio: @JACK@
xroar:
xroar: Included ROMs: @ROMS@

View File

@ -6,49 +6,24 @@
# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
# 20180828 bkw:
# - update for 0.35
# - build with --without-oss by default, add OSS=yes option
# - get rid of alsa_first.diff (doesn't apply any more anyway)
# - add PULSE=no option
# - move cruft out of here & into ChangeLog.old
# - SDL 1.x build broke in 0.35, so remove SDL2=no and add SDL2
# to REQUIRES.
# 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
# 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
# 20140824 bkw:
# - update for 0.32
# - somehow I lost the POD source to the man page, recreate from xroar.6
# 20140313 bkw:
# - update for 0.31.1
# - change download link to upstream's, looks OK now
# - update alsa_first.diff (module.c -> src/module.c)
# - update man page (new options, convert to POD)
# - add jack support
# 20130617 bkw:
# - update for 0.29.5
# 20121218 bkw:
# - update for 0.28.1
# - change download link to my own server, since upstream changes their URL
# for every release
# - include missing .png file for HTML doc
# - add patch to prefer ALSA over OSS
# - LDFLAGS=-lm (wasn't needed for old version)
# - mention gtkglext in README as an optional dep
# 20170122 bkw: update for 0.34.7
PRGNAM=xroar
VERSION=${VERSION:-0.34.8}
VERSION=${VERSION:-0.35}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@ -88,22 +63,37 @@ rm -rf $PRGNAM-$VERSION
tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
cd $PRGNAM-$VERSION
chown -R root:root .
find -L . \
\( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
-exec chmod 755 {} \; -o \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \;
find -L . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
\! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
# Have the emulator try ALSA before OSS. This prevents the emu from
# taking over the ALSA device when using OSS emulation (stops other
# apps from making any sound at all!)
patch -p1 < $CWD/alsa_first.diff
# Most users will want to leave OSS and PULSE alone.
# Can't check ldd output to see if OSS is built-in, so take
# some care to leave the value of OSS presentable for use in
# the slack-desc.
OSS="${OSS:-no}"
case "$OSS" in
y*|Y*) OSS=yes ;;
*) OSS=no ;;
esac
[ "$OSS" = "yes" ] || OSSOPT="--without-oss"
[ "${PULSE:-yes}" = "yes" ] || PULSEOPT="--without-pulse"
# Not sure why anyone would need this, but it's easy to support.
JACKOPT="--without-jack"
[ "${JACK:-no}" = "yes" ] && JACKOPT="--with-jack"
[ "${SDL2:-yes}" = "no" ] && SDL2OPT="--without-sdl2"
# 20180829 bkw: SDL 1.x build is broken in xroar-0.35! If upstream
# fixes it, uncomment the SDL2 check below, remove SDL2 from REQUIRES
# in the .info file, and re-add this to the README:
## 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. If SDL2 is installed,
## you can build without it by setting SDL2=no in the environment.
#[ "${SDL2:-yes}" = "no" ] && SDL2OPT="--without-sdl2"
[ "${GTKGLEXT:-yes}" = "no" ] && GTKGLOPT="--without-gtkgl"
@ -113,7 +103,7 @@ LDFLAGS="-lm" \
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
./configure \
$JACKOPT $SDL2OPT $GTKGLOPT \
$OSSOPT $PULSEOPT $JACKOPT $SDL2OPT $GTKGLOPT \
--bindir=/usr/games \
--prefix=/usr \
--libdir=/usr/lib${LIBDIRSUFFIX} \
@ -131,10 +121,12 @@ strip $PKG/usr/games/$PRGNAM
SDLVER=1.2
JACK=no
GTKGLEXT=no
PULSE=no
ldd $PKG/usr/games/$PRGNAM > ldd.tmp
grep -q libSDL2 ldd.tmp && SDLVER=2
grep -q libSDL2 ldd.tmp && SDLVER=2.0
grep -q libjack ldd.tmp && JACK=yes
grep -q libgtkglext ldd.tmp && GTKGLEXT=yes
grep -q libpulse.so ldd.tmp && PULSE=yes
# man page needs to be in section 6, since this is in games/
mkdir -p $PKG/usr/man/man6
@ -198,6 +190,8 @@ sed -e "s,@JACK@,$JACK," \
-e "s,@SDLVER@,$SDLVER," \
-e "s,@GTKGLEXT@,$GTKGLEXT," \
-e "s,@ROMS@,$ROMS," \
-e "s,@PULSE@,$PULSE," \
-e "s,@OSS@,$OSS," \
$CWD/slack-desc > $PKG/install/slack-desc
cat $CWD/doinst.sh > $PKG/install/doinst.sh

View File

@ -1,10 +1,10 @@
PRGNAM="xroar"
VERSION="0.34.8"
VERSION="0.35"
HOMEPAGE="http://www.6809.org.uk/dragon/xroar.shtml"
DOWNLOAD="http://www.6809.org.uk/xroar/dl/0.34/xroar-0.34.8.tar.gz"
MD5SUM="0bc89467646ffbcf1dd4fd2939889ea0"
DOWNLOAD="http://www.6809.org.uk/xroar/dl/0.35/xroar-0.35.tar.gz"
MD5SUM="c786d5fee430a066a6cc0e1b048907d1"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
REQUIRES="SDL2"
MAINTAINER="B. Watson"
EMAIL="yalhcru@gmail.com"