games/colem: Updated for version 4.2.

Signed-off-by: B. Watson <yalhcru@gmail.com>.

5 files changed, 29 insertions, 16 deletions

diff --git a/games/colem/README b/games/colem/README
index 7ff796550c..08d1919f5f 100644
--- a/games/colem/README
+++ b/games/colem/README
@@ -4,10 +4,8 @@ ColEm is a portable emulator of the old ColecoVision videogame console.
 It should run most ColecoVision games and supports Coleco's SuperAction
 controllers with spin wheels.
 
-ColEm uses OSS for audio, so you'll have to either load the OSS emulation
-modules (via /etc/rc.d/rc.alsa-oss), run it as "aoss colem" from the
-command line, or launch it from your desktop by opening a .cv or .col file
-(which will use aoss automatically).
+ColEm uses PulseAudio for audio. If you *really* *hate* pulse, see the
+file README.oss.
 
 In order to run ColecoVision games, you will need a copy of the system
 ROM image, but for copyright reasons, no ROM image is included.
diff --git a/games/colem/README.oss b/games/colem/README.oss
new file mode 100644
index 0000000000..bf97c950c1
--- /dev/null
+++ b/games/colem/README.oss
@@ -0,0 +1,7 @@
+If you really don't want to use PulseAudio, you can set 'PULSE=no'
+in the script's environment.
+
+When built without PulseAudio support, ColEm uses OSS for audio. You'll
+have to either load the OSS emulation modules (via /etc/rc.d/rc.alsa-oss),
+run it as "aoss colem" from the command line, or launch it from your
+desktop by opening a .cv or .col file (which will use aoss automatically).
diff --git a/games/colem/colem.SlackBuild b/games/colem/colem.SlackBuild
index 8e7de638a8..a4fa1fa674 100644
--- a/games/colem/colem.SlackBuild
+++ b/games/colem/colem.SlackBuild
@@ -6,6 +6,10 @@
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
+# 20171218 bkw: updated for 4.2.
+# - upstream started using PulseAudio, but I want to be able to build
+#   with or without it, so added PULSE=no option.
+
 # 20170819 bkw:
 # - updated for 4.1. according to upstream's docs, the only changes from
 #   4.0 to 4.1 are for windows, so don't expect any new features here.
@@ -51,7 +55,7 @@
 #     with OSS modules disabled by default.
 
 PRGNAM=colem
-VERSION=${VERSION:-4.1}
+VERSION=${VERSION:-4.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -112,13 +116,6 @@ find -L . \
 
 sed -i "s/-O2/$SLKCFLAGS/" EMULib/Rules.gcc
 
-# colem still uses OSS audio. I thought linking with -laoss would Just Work,
-# avoiding the need for the aoss wrapper script, but it doesn't work. code
-# left here for references (I may revisit this someday).
-##if [ "${AOSS:-yes}" = "yes" ]; then
-##  sed -i '/^LIBS/s,$, -laoss,' EMULib/Rules.Unix
-##fi
-
 # Make the emulator look in /usr/share/colem and ~/.colem for the
 # system ROMs, as well as the current directory. Without this, it's
 # quite annoying to use colem from either the command line or KDE.
@@ -128,6 +125,14 @@ patch -p1 < $CWD/rom_path.diff
 # at least not in the *nix port.
 sed -i 's,and PKZIPped ,,' ColEm/Help.h ColEm/ColEm.html
 
+# Allow optional building without pulse.
+if [ "${PULSE:-yes}" = "no" ]; then
+  sed -i \
+      -e 's,-DPULSE_AUDIO,,' \
+      -e 's,-lpulse-simple,,' \
+      EMULib/Rules.Unix
+fi
+
 cd $ZIPNAME/Unix
 
 # ColEm.html claims that -DGIFLIB makes the F10 key save a GIF snapshot,
@@ -171,6 +176,9 @@ cat $CWD/$PRGNAM.png > $PKG/usr/share/pixmaps/$PRGNAM.png
 # sources and modified to get rid of the Maemo-specific stuff.
 mkdir -p $PKG/usr/share/applications
 cat $CWD/$PRGNAM.desktop > $PKG/usr/share/applications/$PRGNAM.desktop
+if [ "${PULSE:-yes}" = "no" ]; then
+  sed -i 's,^Exec=,&aoss ,' $PKG/usr/share/applications/$PRGNAM.desktop
+fi
 
 mkdir -p $PKG/usr/share/mime/packages
 cat $CWD/$PRGNAM.xml > $PKG/usr/share/mime/packages/$PRGNAM.xml
diff --git a/games/colem/colem.desktop b/games/colem/colem.desktop
index 8c80b46dbc..2a2f9632c9 100644
--- a/games/colem/colem.desktop
+++ b/games/colem/colem.desktop
@@ -12,4 +12,4 @@ MimeType=application/x-cvrom;
 
 [Desktop Action Play]
 Name=Play
-Exec=aoss colem %f
+Exec=colem %f
diff --git a/games/colem/colem.info b/games/colem/colem.info
index d4293b9688..250ec4d02d 100644
--- a/games/colem/colem.info
+++ b/games/colem/colem.info
@@ -1,8 +1,8 @@
 PRGNAM="colem"
-VERSION="4.1"
+VERSION="4.2"
 HOMEPAGE="http://fms.komkon.org/ColEm/"
-DOWNLOAD="http://urchlay.naptime.net/~urchlay/src/ColEm41-Source.zip"
-MD5SUM="b44fe0b00db10ed2fb1791404d366e02"
+DOWNLOAD="http://urchlay.naptime.net/~urchlay/src/ColEm42-Source.zip"
+MD5SUM="0e6effe3476bac014dd6040fab82c8b2"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""