games/colem: Updated for version 3.3.

1 files changed, 24 insertions, 5 deletions

diff --git a/games/colem/colem.SlackBuild b/games/colem/colem.SlackBuild
index b5cf0e3548..5753180f5d 100644
--- a/games/colem/colem.SlackBuild
+++ b/games/colem/colem.SlackBuild
@@ -6,6 +6,13 @@
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
+# 20150506 bkw:
+# - updated for 3.3. Lots of little changes, meaning the script
+#   won't work for 2.9 any more.
+# - stop the CRLF madness, extract with 'unzip -aa' and get rid of
+#   the carriage returns in rom_path.diff.
+# - get rid of POD warnings when making man page.
+
 # 20140825 bkw:
 # - updated for 2.9
 # - include icon in slackbuild dir (upstream removed it from src tarball)
@@ -27,7 +34,7 @@
 #     with OSS modules disabled by default.
 
 PRGNAM=colem
-VERSION=${VERSION:-2.9}
+VERSION=${VERSION:-3.3}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -78,7 +85,7 @@ cd $TMP
 rm -rf $PRGNAM-$VERSION
 mkdir $PRGNAM-$VERSION
 cd $PRGNAM-$VERSION
-unzip $CWD/$ZIPNAME$ZIPVER-Source.zip
+unzip -aa $CWD/$ZIPNAME$ZIPVER-Source.zip
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -102,13 +109,25 @@ cd $ZIPNAME/Unix
 # ColEm.html claims that -DGIFLIB makes the F10 key save a GIF snapshot,
 # but it's not actually implemented in ColEm-2.9. In 2.6 it was implemented
 # only for MS-DOS.
-#sed -i "/^DEFINES/s/$/ -DGIFLIB/" Makefile
+#sed -i "/^DEFINES/s,-DCOLEM,& -DGIFLIB," Makefile
+
+# I have no idea why 3.3 suddenly defaults to 16-bit colordepth. Does
+# anyone still use less than 24-bit, this century? Getting rid of
+# -DBPP32 gives us a binary that works in 16 and 32 bit depth.
+sed -i "/^DEFINES/s,-DBPP..,," Makefile
+
+# If PNG support actually *did* anything, this is how we'd enable it:
+#sed -i "/^DEFINES/s,-DCOLEM,& -DLIBPNG," Makefile
+#sed -i "/^LIBS/s,=,& -lpng," ../../EMULib/Rules.gcc
 
 # Allow building on big-endian platforms (such as s390)
 if [ "${BIGENDIAN:-no}" != "no" ]; then
   sed -i "/^DEFINES/s/-DLSB_FIRST/-DMSB_FIRST/" Makefile
 fi
 
+# Fix linking on ColEm-3.3 (same .o file given twice in link command)
+sed -i '/^RECORD/d' ../../EMULib/Rules.gcc
+
 make
 
 # no 'make install', do it manually.
@@ -137,9 +156,9 @@ mkdir -p $PKG/usr/share/$PRGNAM
 
 # Look for zipped ROM images and unzip them.
 if [ -e $CWD/coleco.zip ]; then
-	unzip -o $CWD/coleco.zip
+  unzip -o $CWD/coleco.zip
 elif [ -e $CWD/COLECO.ZIP ]; then
-	unzip -o $CWD/COLECO.ZIP
+  unzip -o $CWD/COLECO.ZIP
 fi
 
 # Look for non-zipped ROM images, either unzipped above or in $CWD.