From patchwork Mon Oct 26 17:12:57 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rodrigo Rebello X-Patchwork-Id: 536114 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ozlabs.org (Postfix) with ESMTP id B66D8140D97 for ; Tue, 27 Oct 2015 04:13:19 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=W8eueqsJ; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 9B88387433; Mon, 26 Oct 2015 17:13:18 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 7d9w8zuK-tCu; Mon, 26 Oct 2015 17:13:17 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id CC47D875C4; Mon, 26 Oct 2015 17:13:15 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id DF5181C11CD for ; Mon, 26 Oct 2015 17:13:12 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id DAAB9889E0 for ; Mon, 26 Oct 2015 17:13:12 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id T4qb7bA0FhK5 for ; Mon, 26 Oct 2015 17:13:12 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-qg0-f54.google.com (mail-qg0-f54.google.com [209.85.192.54]) by whitealder.osuosl.org (Postfix) with ESMTPS id 2E3E788654 for ; Mon, 26 Oct 2015 17:13:12 +0000 (UTC) Received: by qgad10 with SMTP id d10so124860661qga.3 for ; Mon, 26 Oct 2015 10:13:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=7uvT2Qpypz91JUhLldEz07jz+TfMQiCCOAgI6lBCKFk=; b=W8eueqsJJWO2LkDqAAYXPQ7ryDL3lCrUrqZRJB0uMOdGmFEFMuqndIQoVSnO8UhHBI gwujIcprpsFsilrkEGQj6jIuyBHWhXtnA84LAJyh9Vxsg+ZB8z2pMwc5K86Yo0b3EZKU d6Y5gyEnvVxRVgJGWHL8uMEgS3dzy8fzZdf+jGCnVg8eEdsQbpw/n0qPeVr8FFXjz2gg qdMYLeMXHfxjd4e8NSprA8Ie4AvEWH9gcwVN/mzYJ5P0Qer3pgoOBT96EX1SGUTmECt9 Owrzm/YUtW7r6kKyIS8b0XwxINyYnV3/9xdYauSFhS7XV3OCN1qqb5xjR0nC6VtW9ndg dFuw== X-Received: by 10.140.31.199 with SMTP id f65mr43656144qgf.22.1445879591301; Mon, 26 Oct 2015 10:13:11 -0700 (PDT) Received: from PKL1114.parks.local (pkproxy.parks.com.br. [186.227.188.5]) by smtp.gmail.com with ESMTPSA id t19sm13444873qki.23.2015.10.26.10.13.09 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 26 Oct 2015 10:13:10 -0700 (PDT) From: Rodrigo Rebello To: buildroot@buildroot.org Date: Mon, 26 Oct 2015 15:12:57 -0200 Message-Id: <1445879578-404-2-git-send-email-rprebello@gmail.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1445879578-404-1-git-send-email-rprebello@gmail.com> References: <1445879578-404-1-git-send-email-rprebello@gmail.com> Cc: Rodrigo Rebello Subject: [Buildroot] [PATCH v3 2/3] doom-wad: bump to version 1.9 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" 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 --- 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