Buildroot Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Rodrigo Rebello <rprebello@gmail.com>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH v4 2/3] doom-wad: bump to version 1.9
Date: Fri,  6 Nov 2015 17:47:58 -0200	[thread overview]
Message-ID: <1446839279-9021-2-git-send-email-rprebello@gmail.com> (raw)
In-Reply-To: <1446839279-9021-1-git-send-email-rprebello@gmail.com>

Also add a hash file.

The extraction method had to be changed, since the WAD file for this
version is not distributed as a stand-alone file, but comes inside a
2-part DOS self-extracting zip archive.

Signed-off-by: Rodrigo Rebello <rprebello@gmail.com>
---
Changes v1 -> v2:
  - Upgrade shareware Doom WAD file to the latest 1.9 version. This
    allows dropping the comment in the next commit about having to pass
    the option "-gameversion 1.8" to the chocolate-doom-* executables.
---
 package/doom-wad/doom-wad.hash |  2 ++
 package/doom-wad/doom-wad.mk   | 10 ++++++----
 2 files changed, 8 insertions(+), 4 deletions(-)
 create mode 100644 package/doom-wad/doom-wad.hash

diff --git a/package/doom-wad/doom-wad.hash b/package/doom-wad/doom-wad.hash
new file mode 100644
index 0000000..fa069c1
--- /dev/null
+++ b/package/doom-wad/doom-wad.hash
@@ -0,0 +1,2 @@
+# Locally computed
+sha256	cacf0142b31ca1af00796b4a0339e07992ac5f21bc3f81e7532fe1b5e1b486e6	doom19s.zip
diff --git a/package/doom-wad/doom-wad.mk b/package/doom-wad/doom-wad.mk
index 6f4f9da..6c870d0 100644
--- a/package/doom-wad/doom-wad.mk
+++ b/package/doom-wad/doom-wad.mk
@@ -4,16 +4,18 @@
 #
 ################################################################################
 
-DOOM_WAD_VERSION = 1.8
-DOOM_WAD_SOURCE = doom-$(DOOM_WAD_VERSION).wad.gz
+DOOM_WAD_VERSION = 1.9
+DOOM_WAD_SOURCE = doom19s.zip
 DOOM_WAD_SITE = ftp://ftp.idsoftware.com/idstuff/doom
 
 define DOOM_WAD_EXTRACT_CMDS
-	$(ZCAT) $(DL_DIR)/$($(PKG)_SOURCE) > $(@D)/doom1.wad
+	$(UNZIP) -p $(DL_DIR)/$($(PKG)_SOURCE) 'DOOMS_19.[12]' > \
+		$(@D)/doom-$(DOOM_WAD_VERSION).zip
+	$(UNZIP) -d $(@D) $(@D)/doom-$(DOOM_WAD_VERSION).zip DOOM1.WAD
 endef
 
 define DOOM_WAD_INSTALL_TARGET_CMDS
-	$(INSTALL) -m 0644 -D $(@D)/doom1.wad \
+	$(INSTALL) -m 0644 -D $(@D)/DOOM1.WAD \
 		$(TARGET_DIR)/usr/share/games/doom/doom1.wad
 endef
 
-- 
2.1.4

  reply	other threads:[~2015-11-06 19:47 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-11-06 19:47 [Buildroot] [PATCH v4 1/3] chocolate-doom: new package Rodrigo Rebello
2015-11-06 19:47 ` Rodrigo Rebello [this message]
2015-12-23 22:37   ` [Buildroot] [PATCH v4 2/3] doom-wad: bump to version 1.9 Thomas Petazzoni
2015-12-23 23:59     ` Rodrigo Rebello
2015-12-24  7:28       ` Thomas Petazzoni
2015-11-06 19:47 ` [Buildroot] [PATCH v4 3/3] doom-wad: add BR2_PACKAGE_CHOCOLATE_DOOM as alternate dependency Rodrigo Rebello
2015-12-23 22:35   ` Thomas Petazzoni
2015-12-23 22:34 ` [Buildroot] [PATCH v4 1/3] chocolate-doom: new package Thomas Petazzoni
2015-12-24  0:33   ` Rodrigo Rebello
2015-12-24  7:29     ` Thomas Petazzoni
2015-12-24 11:11       ` Rodrigo Rebello
2016-02-21 16:23         ` Romain Naour

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1446839279-9021-2-git-send-email-rprebello@gmail.com \
    --to=rprebello@gmail.com \
    --cc=buildroot@busybox.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox