[v4,2/3] 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.

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

Dear Rodrigo Rebello,

On Fri,  6 Nov 2015 17:47:58 -0200, Rodrigo Rebello wrote:

> 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

So shouldn't the version be "19" and not "1.9" ? It is a bit weird to
have a version not used in the _SOURCE variable. Or if you really want
to have 1.9 as the version, then:

	DOOM_WAD_SOURCE = doom$(subst .,,$(DOOM_WAD_VERSION))s.zip

>  DOOM_WAD_SITE = ftp://ftp.idsoftware.com/idstuff/doom

However, the main reason I didn't apply is because this server seems to
be unavailable at the moment. So I can't test the package, and it would
cause build failures in the autobuilders.

Are you also experiencing the same issue?

Thanks,

Thomas

Thomas,

2015-12-23 20:37 GMT-02:00 Thomas Petazzoni
<thomas.petazzoni@free-electrons.com>:
> Dear Rodrigo Rebello,
>
> On Fri,  6 Nov 2015 17:47:58 -0200, Rodrigo Rebello wrote:
>
>> 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
>
> So shouldn't the version be "19" and not "1.9" ? It is a bit weird to
> have a version not used in the _SOURCE variable. Or if you really want
> to have 1.9 as the version, then:
>
>         DOOM_WAD_SOURCE = doom$(subst .,,$(DOOM_WAD_VERSION))s.zip
>

Indeed, I agree that looks a bit weird. I believe the zip filename
carries the number '19' instead of '1.9' merely because it dates back
to the old times of DOS, when its FAT filesystem imposed quite a few
limitations, like the dot character being allowed in a filename only
to separate it from its extension.

The correct version number, however, is really 1.9, so I'd prefer to
keep DOOM_WAD_VERSION untouched and apply the substitution you
proposed to the zip filename only. Would that be OK to you?

>>  DOOM_WAD_SITE = ftp://ftp.idsoftware.com/idstuff/doom
>
> However, the main reason I didn't apply is because this server seems to
> be unavailable at the moment. So I can't test the package, and it would
> cause build failures in the autobuilders.
>
> Are you also experiencing the same issue?
>

Yes, I have confirmed the server is unresponsive at the moment. I have
found an alternative URL that seems to work fine, though:

http://www.jbserver.com/downloads/games/doom/misc/shareware/doom19s.zip

Should I respin this patch with that temporary URL?

Regards,
Rodrigo

> Thanks,
>
> Thomas
> --
> Thomas Petazzoni, CTO, Free Electrons
> Embedded Linux, Kernel and Android engineering
> http://free-electrons.com

Rodrigo,

On Wed, 23 Dec 2015 21:59:08 -0200, Rodrigo Rebello wrote:

> Indeed, I agree that looks a bit weird. I believe the zip filename
> carries the number '19' instead of '1.9' merely because it dates back
> to the old times of DOS, when its FAT filesystem imposed quite a few
> limitations, like the dot character being allowed in a filename only
> to separate it from its extension.
> 
> The correct version number, however, is really 1.9, so I'd prefer to
> keep DOOM_WAD_VERSION untouched and apply the substitution you
> proposed to the zip filename only. Would that be OK to you?

Yes, this is perfectly fine.

> 
> >>  DOOM_WAD_SITE = ftp://ftp.idsoftware.com/idstuff/doom
> >
> > However, the main reason I didn't apply is because this server seems to
> > be unavailable at the moment. So I can't test the package, and it would
> > cause build failures in the autobuilders.
> >
> > Are you also experiencing the same issue?
> 
> Yes, I have confirmed the server is unresponsive at the moment. I have
> found an alternative URL that seems to work fine, though:
> 
> http://www.jbserver.com/downloads/games/doom/misc/shareware/doom19s.zip
> 
> Should I respin this patch with that temporary URL?

Yes, if the hash matches the one from the original server, it is fine
to use an alternate one. Indicate it in the .mk file:

# Official server currently unavailable
# DOOM_WAD_SITE = ....
DOOM_WAD_SITE = http://www.jbserver.com/downloads/games/doom/misc/shareware/

Thanks!

Thomas