aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorB. Watson <yalhcru@gmail.com>2014-03-06 21:10:25 +0700
committerWilly Sudiarto Raharjo <willysr@slackbuilds.org>2014-03-06 21:10:25 +0700
commit1a63d5f6b9b7ba88f3bb54c43f8768bf5cc84902 (patch)
tree9cd1d3a41267443decb1c15ff8a09266ed233446
parentb62afb9d18929e3936df8f7860b75f03045f8a95 (diff)
games/gzdoom: Updated for version 1.8.2.
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
-rw-r--r--games/gzdoom/README.source21
-rw-r--r--games/gzdoom/gzdoom.SlackBuild23
-rw-r--r--games/gzdoom/gzdoom.info6
3 files changed, 31 insertions, 19 deletions
diff --git a/games/gzdoom/README.source b/games/gzdoom/README.source
new file mode 100644
index 0000000000000..d3f91ba59d12f
--- /dev/null
+++ b/games/gzdoom/README.source
@@ -0,0 +1,21 @@
+A note about the source: upstream doesn't do release tarballs. The source
+is only available via git (older versions used svn). What I had to do
+to get the 1.8.2 source: download the windows binary, run strings on it
+to find the git commit hash, then clone the git repo and check out that
+revision. Then I spent a couple hours trying to patch it so it would
+compile, then said "hell with it" and used the latest git (which compiles
+and runs fine). So my VERSION is a lie, which might cause problems if
+you want to play multiplayer with people using the windows 1.8.2 binary
+release. Blame upstream, not me.
+
+For reference, the windows binary's commit hash is:
+cbdfa61619ee99db541361b8ca174d58848e4
+
+The one in my tarball is: 4a23b97963d8e57d4c62efa41323910df903d
+
+gzdoom's build process requires it to be built from a git checkout.
+It uses the .git stuff to define a GIT_REVISION variable. That's why
+the source tarball contains a .git/ dir. If it doesn't, you end up with
+a gzdoom that announces itself as revision <unknown> (shows up in the
+console and titlebar of the window). Also the revision is used to check
+savegame compatibility, so it's not just cosmetic.
diff --git a/games/gzdoom/gzdoom.SlackBuild b/games/gzdoom/gzdoom.SlackBuild
index 7b456ddc85ec0..d5738b3063a9c 100644
--- a/games/gzdoom/gzdoom.SlackBuild
+++ b/games/gzdoom/gzdoom.SlackBuild
@@ -6,6 +6,11 @@
# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+# 20140305 bkw:
+# - Moved giant block comments about the source to README.source,
+# updated them to reflect upstream's change from svn to git.
+# - Updated for 1.8.2 (sort-of; see README.source)
+
# 20130612 bkw: Updated for 1.8.00
# 20130416 bkw:
@@ -15,22 +20,8 @@
# - Fix CRLF endings in usr/doc/gzdoom-*/*
# - Add WTFPL
-# A note about the source: upstream doesn't do release tarballs. The source
-# is only available via SVN. Every release before 1.7.01 has a tag in the
-# SVN tree, but 1.7.01 does not. What I did to get the 1.7.01 source was
-# to download the windows exe for 1.7.01 and use strings on it, to find its
-# SVN revision, then checked out that revision and made a tarball of it.
-# Had to do the same again, for 1.8.00.
-
-# gzdoom's build process requires it to be built from an SVN checkout: It
-# uses the .svn stuff to define a SVN_REVISION variable, and if you use
-# 'svn export' instead, you end up with a gzdoom that announces itself as
-# revision 0 (shows up in the console and titlebar of the window). Also the
-# SVN revision is used to check savegame compatibility, so it's not just
-# cosmetic.
-
PRGNAM=gzdoom
-VERSION=${VERSION:-1.8.00}
+VERSION=${VERSION:-1.8.2}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -90,7 +81,7 @@ cd build
-DLIB_SUFFIX=${LIBDIRSUFFIX} \
-DMAN_INSTALL_DIR=/usr/man \
-DCMAKE_BUILD_TYPE=Release ..
- make
+ make -j1
mkdir -p $PKG/usr/bin $PKG/usr/share/games/doom
install -m0755 -s $PRGNAM $PKG/usr/bin/$PRGNAM
install -m0644 *.pk3 $PKG/usr/share/games/doom/
diff --git a/games/gzdoom/gzdoom.info b/games/gzdoom/gzdoom.info
index 21c4dddd6c9d3..cfbf92b710efb 100644
--- a/games/gzdoom/gzdoom.info
+++ b/games/gzdoom/gzdoom.info
@@ -1,8 +1,8 @@
PRGNAM="gzdoom"
-VERSION="1.8.00"
+VERSION="1.8.2"
HOMEPAGE="http://www.osnanet.de/c.oelckers/gzdoom/"
-DOWNLOAD="http://urchlay.naptime.net/~urchlay/src/gzdoom-1.8.00.tar.gz"
-MD5SUM="fdd96225890341e7428042c61ea05c90"
+DOWNLOAD="http://urchlay.naptime.net/~urchlay/src/gzdoom-1.8.2.tar.gz"
+MD5SUM="ec19f5b8b0106c0ead3240c0693c4807"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="fmodapi"