Skip to contentSkip to conversation

doom-wad: bump to version 1.9

PATCH New Rodrigo Rebello 2 participants 2 messages Dec 24, 2015

lore
Share & tools
lore
#0 lore raw

PATCH v5 1/1 doom-wad: bump to version 1.9

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.

---
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.

Changes v4 -> v5:
- Use temporary download URL as the official server is currently unavailable
- Make use of DOOM_WAD_VERSION in DOOM_WAD_SOURCE (Thomas Petazzoni)

---
 package/doom-wad/doom-wad.hash |  2 ++
 package/doom-wad/doom-wad.mk   | 14 +++++++++-----
 2 files changed, 11 insertions(+), 5 deletions(-)
 create mode 100644 package/doom-wad/doom-wad.hash
package/doom-wad/doom-wad.hash new file +2 -0
new file mode 100644
index 0000000..fa069c1
@@ -0,0 +1,2 @@
+# Locally computed
+sha256	cacf0142b31ca1af00796b4a0339e07992ac5f21bc3f81e7532fe1b5e1b486e6	doom19s.zip
package/doom-wad/doom-wad.mk +9 -5
index 6f4f9da..d3ac731 100644
@@ -4,16 +4,20 @@
 #
 ################################################################################
 
-DOOM_WAD_VERSION = 1.8
-DOOM_WAD_SOURCE = doom-$(DOOM_WAD_VERSION).wad.gz
-DOOM_WAD_SITE = ftp://ftp.idsoftware.com/idstuff/doom
+DOOM_WAD_VERSION = 1.9
+DOOM_WAD_SOURCE = doom$(subst .,,$(DOOM_WAD_VERSION))s.zip
+# Official server currently unavailable
+# DOOM_WAD_SITE = ftp://ftp.idsoftware.com/idstuff/doom
+DOOM_WAD_SITE = http://www.jbserver.com/downloads/games/doom/misc/shareware
 
 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
 
Signature · 1 line
2.1.4
#1 lore raw

PATCH v5 1/1 doom-wad: bump to version 1.9

Dear Rodrigo Rebello,

Quoted 6 lines · Rodrigo Rebello

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.

Quoted 6 lines

---
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.

Applied, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com