Google Groups no longer supports new Usenet posts or subscriptions. Historical content remains viewable.
Dismiss

Bug#745081: game-data-packager: add support for full versions of wolf3d and spear of destiny

169 views
Skip to first unread message

Alexandre Detiste

unread,
Jan 4, 2015, 8:10:02 PM1/4/15
to
Hi,

A new shared engine has recently been added to G-D-P.
This uses yaml definition files to document the files needed by each games.

I've started the conversion for wolf3d (*):
https://github.com/a-detiste/game-data-packager/commit/2c942672e0b7cc119fd33340bdf940e069d5905b

Unfortunately, my *.wl6 files I've had for 20 years
doesn't work with either wolf4sdl-wl6 or wolf4sdl-wl6a
(but well with wolf3d.exe): I got this: "*** buffer overflow detected ***";

I guess I could by the Steam pack and see wich files are included.

You can also use the GDP in experimental and send
the result of "game-data-packager make-template the/directory/with/those/in/"
to this bug report.

Alexandre Detiste


(*) this needs some "subprocess.check_output(['/usr/bin/id-shr-extract',...])" extra glue-code in the engine


--
To UNSUBSCRIBE, email to debian-bugs-...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listm...@lists.debian.org

Fabian Greffrath

unread,
Jan 5, 2015, 2:20:02 AM1/5/15
to
Hi Alexandre and Simon,

Am Montag, den 05.01.2015, 02:07 +0100 schrieb Alexandre Detiste:
> A new shared engine has recently been added to G-D-P.
> This uses yaml definition files to document the files needed by each games.

This is really great news, thanks for you effort on this!

> Unfortunately, my *.wl6 files I've had for 20 years
> doesn't work with either wolf4sdl-wl6 or wolf4sdl-wl6a
> (but well with wolf3d.exe): I got this: "*** buffer overflow detected ***";

Your data files are probably not the latest version 1.4 which is
exclusively supported by wolf4sdl?

Until I understand the changes that g-d-p has currently undergone, maybe
I am helpful by providing checksums for the registered Wolfenstein *.wl6
files that I own (though I don't know anymore where exactly I got them
from, the ninetees are so far away) and that I know for sure work with
wolf4sdl:

$ cksum *.wl6
583668161 1156 audiohed.wl6
1281390593 320209 audiot.wl6
3277084604 150652 gamemaps.wl6
3907041798 402 maphead.wl6
4076084707 1024 vgadict.wl6
1025625630 276096 vgagraph.wl6
3433524788 450 vgahead.wl6
4156874368 1545400 vswap.wl6

$ md5sum *.wl6
a41af25a2f193e7d4afbcc4301b3d1ce audiohed.wl6
2385b488b18f8721633e5b2bdf054853 audiot.wl6
a4e73706e100dc0cadfb02d23de46481 gamemaps.wl6
b8d2a78bc7c50da7ec9ab1d94f7975e1 maphead.wl6
ccad1a688ebafad9856eca085a20dfc4 vgadict.wl6
f18b07d6ba988b8505415f7446235366 vgagraph.wl6
9059afb104a51140bd0c127b73717197 vgahead.wl6
a6d901dfb455dfac96db5e4705837cdb vswap.wl6

$ sha1sum *.wl6
2a8407cd436250b6df9d6022c971030882ae37ca audiohed.wl6
8a1e19ec1dc669ebe6916b1e24a261d10d9d5ff3 audiot.wl6
22bfcde221efec232b48258117d7fc04337cce3a gamemaps.wl6
1b5bf23e6edae13f6a582a44f72729c6e5a0e692 maphead.wl6
cb080bd0103f2995b92e185be92c63f80069caae vgadict.wl6
2b4edd39f016460b2c02864c5b2268c4204f32dd vgagraph.wl6
5a040087758a01189b57a1840a9064b38502f90e vgahead.wl6
e1a7cac993e4af7fddef80367090f10a2efa7196 vswap.wl6

$ sha256sum *.wl6
16e21eab17af2062019cc85cc271f887191301d1aa6de04b1afac5998aad9d9c
audiohed.wl6
2cc23cb811df16e656f1fea25cd2629859c1ec9997d35bc3b1776594094b67ef
audiot.wl6
3df9f2ad54c601e79ab117c8175477b5d96571ba9e290cb9cd7d910abfeaae56
gamemaps.wl6
289e04f47128a5ba19f9b3f912b4048e26dc16c6fa00205ead51efb1d8e23c69
maphead.wl6
4411cbdb446af98392cf685a583d3266e644edcff149807fab0ae5850c54586c
vgadict.wl6
0f7a038b8523d729eb98fe0bc50a858c47a41569e07cbbbf5d8aca8ff4e9863e
vgagraph.wl6
a9823004be77b68813f0e4d9ac35947e2e2586271fbc2fb0685ff8ecb1deb3d5
vgahead.wl6
49ba24e0b3916732cd065122de4fe6fb6e6a5009c353eafa407c0e3a5a503407
vswap.wl6


Cheers,

Fabian

Alexandre Detiste

unread,
Jan 5, 2015, 4:10:04 AM1/5/15
to
Here is what I have with the Steam version that only works with wolf4sdl-wl6

a41af25a2f193e7d4afbcc4301b3d1ce audiohed.wl6
2385b488b18f8721633e5b2bdf054853 audiot.wl6
a4e73706e100dc0cadfb02d23de46481 gamemaps.wl6
b8d2a78bc7c50da7ec9ab1d94f7975e1 maphead.wl6
dec8939cff5a4ec27ae7b43e8f52ec28 vgadict.wl6
8b40b5b785f898e229bf1c2f2e3ee003 vgagraph.wl6
8e75e3ffb842ed3d08abe6ffea97b231 vgahead.wl6
b8ff4997461bafa5ef2a94c11f9de001 vswap.wl6



> $ md5sum *.wl6
> a41af25a2f193e7d4afbcc4301b3d1ce audiohed.wl6
> 2385b488b18f8721633e5b2bdf054853 audiot.wl6
> a4e73706e100dc0cadfb02d23de46481 gamemaps.wl6
> b8d2a78bc7c50da7ec9ab1d94f7975e1 maphead.wl6
> ccad1a688ebafad9856eca085a20dfc4 vgadict.wl6
> f18b07d6ba988b8505415f7446235366 vgagraph.wl6
> 9059afb104a51140bd0c127b73717197 vgahead.wl6
> a6d901dfb455dfac96db5e4705837cdb vswap.wl6

Does these only work with wolf4sdl-wl6a ?

Fabian Greffrath

unread,
Jan 5, 2015, 4:40:03 AM1/5/15
to
More checksums for Spear of Destiny:

$ cksum *.s*
3311987448 1072 audiohed.sod
2143942565 328620 audiot.sod
38338034 135024 gamemaps.sd2
1656044045 148534 gamemaps.sd3
1623432876 68290 gamemaps.sod
1413511892 86 maphead.sd2
2416058489 86 maphead.sd3
2833983920 402 maphead.sod
3842239033 1024 vgadict.sod
1710998175 947979 vgagraph.sod
2581315576 510 vgahead.sod
2555517412 1879712 vswap.sd2
2009956332 1881760 vswap.sd3
2374872835 1616544 vswap.sod

$ md5sum *.s*
6e914d15335125872737718470061ad8 audiohed.sod
10020fce0f04d21bd07b1b5b951c360a audiot.sod
fa5752c5b1e25ee5c4a9ec0e9d4013a9 gamemaps.sd2
29860b87c31348e163e10f8aa6f19295 gamemaps.sd3
04f16534235b4b57fc379d5709f88f4a gamemaps.sod
d55508cd58e2e61076ac81b98aeb9269 maphead.sd2
a8b24dd3d3271e0b7fc6f2f995915f27 maphead.sd3
276c79a4a6419db6b23e7699e41cb9fa maphead.sod
30b11372b9ec6bc06289eb3e9b2ef0b9 vgadict.sod
3b85f170098fb48d91d8bedd0cac4e0d vgagraph.sod
fb75007a1167bba05c4acadf90bc30d8 vgahead.sod
25d92ac0ba012a1e9335c747eb4ab177 vswap.sd2
94aeef7980ef640c448087f92be16d83 vswap.sd3
b1dac0a8786c7cdbb09331a4eba00652 vswap.sod

$ sha1sum *.s*
112c82fcc5eb575003853d6d3aa77e0fd8aeca14 audiohed.sod
5ac8fb7a0a05f1351dfadd5eaa4473d5ccc2f96e audiot.sod
a1c411725c027dfa0ba9e063f654abc6a3fcdf78 gamemaps.sd2
8e358dd0cbd6ffa942f14f013f3f7e5c4eecfca4 gamemaps.sd3
eec367f635026ed2ecb7677ed75dddabcf24b29c gamemaps.sod
18e3538dcb7c5cdaad5fad835207510c5e99bee0 maphead.sd2
a80bdd3d87b54517040347c452962b53a8a5e225 maphead.sd3
ac9e66fdf6564438d8a33573503ad201dd35bb94 maphead.sod
e688cc0d44d97f059b0c998f75a8c620fdd8c4e9 vgadict.sod
51ff6f2a5754af4b849c854653772d241c01f56b vgagraph.sod
889c3312b323ec7cf3e6e602e6a99261e2970817 vgahead.sod
1ea21468b6c48007c1524918c7c7b4fc34939560 vswap.sd2
97197d0effbe61fbe204c3d8e870888460de4353 vswap.sd3
a80d902aa9ce745b239d295290f96d88c0a7b915 vswap.sod

$ sha256sum *.s*
74f038a0d17e3075a8ed8be58b58a6f4ce590cd5371a140be49f8312de0415a5
audiohed.sod
531b33871d4503f6f5e9131225d0739a6a24b07b0d02de62723bba813719e909
audiot.sod
29c6c1c3dbd2fe21e2e642615a0f6943952c1d7aff70e148d1b3b54e254899ba
gamemaps.sd2
4f4a9d0a9cda58eb6dfc6663b8e63090a7f4e941b71b01261964c242b9bc7470
gamemaps.sd3
772d834d97d429388be3cd7caa517e49a7e82e06367bd6f16d46c6b96e25ae1d
gamemaps.sod
b3749cd2175284ed8b3ae4dbbd3704f5ef116b30ea49a373fed5538170bc0bbe
maphead.sd2
3d7f82e2d578f9081da6887119c6324e19137dae5bee11cdf6a8e8147fc5d503
maphead.sd3
3093aa7b0c88a3dfac9f5cc16d9f1b2fee338a9c4f43e1063ce15ca109498736
maphead.sod
80713ce71576626acf5f83701ae163bc15511ce6a22416748d47d80bf406ce3d
vgadict.sod
80f96fbaf7fa91c1eb5a8aa1d4bffdebce8a9b508aa60a1354bdcc50fa537d97
vgagraph.sod
79950407f8948fa09479d8ba738aaeadc146e115a9d23e289e1a2105361e5909
vgahead.sod
97112755b1a07ab9ef5031f76ff04288de7e5bf910020e965f4bde9bcb7a96a6
vswap.sd2
d3e357682f5ff5e54c7406a191d207e8e25bfd2d42c80206a2e378fb658c4c5d
vswap.sd3
6d9e54808a4738f11c37964d032c9a1c68a8ca98fcb18e6ccba286502967a568
vswap.sod

Fabian Greffrath

unread,
Jan 5, 2015, 4:40:03 AM1/5/15
to
Am Montag, den 05.01.2015, 10:00 +0100 schrieb Alexandre Detiste:
> Does these only work with wolf4sdl-wl6a ?

No, my files only work with -wl6; -wl6a crashes.

- Fabian

Alexandre Detiste

unread,
Jan 5, 2015, 5:10:04 AM1/5/15
to
> No, my files only work with -wl6; -wl6a crashes.
>
> - Fabian
>
>

I found out I had 1.1 ... :-( so I bought 1.4 on Steam and added the sums:

https://github.com/a-detiste/game-data-packager/commit/adaccc086d595972c24ae64e3b88825416a6cda8

so now we have 2 working sets of files known for wl6 & none for wl6a.

can you also give me the size/ cksums / sha1sum / sha256sum of your alternative

vgadict.wl6 / vgagraph.wl6 / vgahead.wl6 / vswap.wl6

Simon has added support for alternatives in the python engine
because RTCW had been localised;
so we should be able to follow this example:

[ files:
[ main/sp_pak1.pk3:
[ install: true
[ alternatives:
[ - main/sp_pak1.pk3_en
[ - main/sp_pak1.pk3_fr

Fabian Greffrath

unread,
Jan 5, 2015, 5:20:04 AM1/5/15
to
Am Montag, den 05.01.2015, 11:01 +0100 schrieb Alexandre Detiste:
> so now we have 2 working sets of files known for wl6 & none for wl6a.
>
> can you also give me the size/ cksums / sha1sum / sha256sum of your alternative
>
> vgadict.wl6 / vgagraph.wl6 / vgahead.wl6 / vswap.wl6

Sorry, but I don't have any alternative files. Seems I've only played
-wl6 so far and never got -wl6a to working without even knowing.

- Fabian

Stephen Kitt

unread,
Jan 5, 2015, 6:00:04 PM1/5/15
to
Hi,

On Mon, 05 Jan 2015 11:01:12 +0100, Alexandre Detiste
<alexandr...@gmail.com> wrote:
> > No, my files only work with -wl6; -wl6a crashes.
>
> I found out I had 1.1 ... :-( so I bought 1.4 on Steam and added the sums:
>
> https://github.com/a-detiste/game-data-packager/commit/adaccc086d595972c24ae64e3b88825416a6cda8
>
> so now we have 2 working sets of files known for wl6 & none for wl6a.
>
> can you also give me the size/ cksums / sha1sum / sha256sum of your
> alternative
>
> vgadict.wl6 / vgagraph.wl6 / vgahead.wl6 / vswap.wl6

As an extra data-point my checksums for both Wolfenstein 3D and Spear of
Destiny match those given in the above commit; I have the id Anthology on CD.

Regards,

Stephen

Stephen Kitt

unread,
Jan 7, 2015, 6:50:04 PM1/7/15
to
Hi,

On Mon, 05 Jan 2015 11:11:41 +0100, Fabian Greffrath <fab...@greffrath.com>
wrote:
> Am Montag, den 05.01.2015, 11:01 +0100 schrieb Alexandre Detiste:
> > so now we have 2 working sets of files known for wl6 & none for wl6a.
> >
> > can you also give me the size/ cksums / sha1sum / sha256sum of your
> > alternative
> >
> > vgadict.wl6 / vgagraph.wl6 / vgahead.wl6 / vswap.wl6
>
> Sorry, but I don't have any alternative files. Seems I've only played
> -wl6 so far and never got -wl6a to working without even knowing.

I just realised that the new 3D Realms Anthology has different versions of
the WL6 files, and they work with -wl6a (and not with -wl6):

$ cksum *.wl6
583668161 1156 audiohed.wl6
1281390593 320209 audiot.wl6
3721027769 522 config.wl6
3277084604 150652 gamemaps.wl6
3907041798 402 maphead.wl6
3356851916 1024 vgadict.wl6
3380985220 334506 vgagraph.wl6
3071614724 486 vgahead.wl6
4156874368 1545400 vswap.wl6

$ md5sum *.wl6
a41af25a2f193e7d4afbcc4301b3d1ce audiohed.wl6
2385b488b18f8721633e5b2bdf054853 audiot.wl6
3e676d1c1350de03d1bd58e7b8dda498 config.wl6
a4e73706e100dc0cadfb02d23de46481 gamemaps.wl6
b8d2a78bc7c50da7ec9ab1d94f7975e1 maphead.wl6
adb10b0d6fdddba9fcc3d1a7c16937e7 vgadict.wl6
4e96d7b4e89a5b3a4beeebf5d7d87eb7 vgagraph.wl6
a08905e2b0d299b3fad259f90c0efb1a vgahead.wl6
a6d901dfb455dfac96db5e4705837cdb vswap.wl6

$ sha1sum *.wl6
2a8407cd436250b6df9d6022c971030882ae37ca audiohed.wl6
8a1e19ec1dc669ebe6916b1e24a261d10d9d5ff3 audiot.wl6
7ba5c91c46ff27b0ee5a70dc3c0d2edcd733b0a6 config.wl6
22bfcde221efec232b48258117d7fc04337cce3a gamemaps.wl6
1b5bf23e6edae13f6a582a44f72729c6e5a0e692 maphead.wl6
45f17d1a8e43dcf3411e41f1da7e452dc1fb72b9 vgadict.wl6
7ea4ccb7c446628a528c8f68ebd1fbcb8b5366e6 vgagraph.wl6
c5100bcbaaf2a78fc831f6780089bd3fa46bd9a5 vgahead.wl6
e1a7cac993e4af7fddef80367090f10a2efa7196 vswap.wl6

$ sha256sum *.wl6
16e21eab17af2062019cc85cc271f887191301d1aa6de04b1afac5998aad9d9c audiohed.wl6
2cc23cb811df16e656f1fea25cd2629859c1ec9997d35bc3b1776594094b67ef audiot.wl6
50122e269bd891a5d0828b9abc323482a13348128138f957bfe74f324472d939 config.wl6
3df9f2ad54c601e79ab117c8175477b5d96571ba9e290cb9cd7d910abfeaae56 gamemaps.wl6
289e04f47128a5ba19f9b3f912b4048e26dc16c6fa00205ead51efb1d8e23c69 maphead.wl6
e4ca6e61a1da1de5b4b59b75fbd702f173238577b2f870e679fd499cfe78bf00 vgadict.wl6
84adea791e3ab1251312ee159414e48d5114622dc84348cebbac8a1dacb4b41f vgagraph.wl6
386b56a62ce79cdfa502542b0c9a9bad0d29fab4250edf17e05ee4ac51aa37a8 vgahead.wl6
49ba24e0b3916732cd065122de4fe6fb6e6a5009c353eafa407c0e3a5a503407 vswap.wl6

Regards,

Stephen

Alexandre Detiste

unread,
Jan 7, 2015, 8:20:03 PM1/7/15
to
> I just realised that the new 3D Realms Anthology has different versions of
> the WL6 files, and they work with -wl6a (and not with -wl6):

Thanks, I've added these too.

Have you got some license / copyright file shipped with your game ?

In the Steam version, there is nothing.

Stephen Kitt

unread,
Jan 8, 2015, 6:40:03 PM1/8/15
to
On Thu, 08 Jan 2015 02:13:27 +0100, Alexandre Detiste
<alexandr...@gmail.com> wrote:
> > I just realised that the new 3D Realms Anthology has different versions of
> > the WL6 files, and they work with -wl6a (and not with -wl6):
>
> Thanks, I've added these too.
>
> Have you got some license / copyright file shipped with your game ?
>
> In the Steam version, there is nothing.

There's a LICENSE.DOC file, with the following cksum, MD5, SHA-1 and SHA-256:

1260526910 2606 LICENSE.DOC
8eccd0fe00da18e06227426292f3d863 LICENSE.DOC
cd03e6f036764464eeb29705f67ebd356f26cde9 LICENSE.DOC
578ed140d4a0c32109ceba304bc2aa537e4372459afd90acfe2ec3041b9faf44 LICENSE.DOC

Regards,

Stephen

Alexandre Detiste

unread,
Jan 9, 2015, 1:50:03 AM1/9/15
to
Thanks,

I meant, could you provide the file itself ?

I guess a copyright file is like and EULA, and it can be freely shared
and read before you accept to use a package.

I will add an excerpt from this in data/wolf3d-full-data.copyright.

I would also add this LICENSE.DOC as an "optional file" (AFAIK no yet implemented in yaml description)

> > > I just realised that the new 3D Realms Anthology has different versions of
> > > the WL6 files, and they work with -wl6a (and not with -wl6):
> >
> > Thanks, I've added these too.
> >
> > Have you got some license / copyright file shipped with your game ?
> >
> > In the Steam version, there is nothing.
>
> There's a LICENSE.DOC file, with the following cksum, MD5, SHA-1 and SHA-256:
>
> 1260526910 2606 LICENSE.DOC
> 8eccd0fe00da18e06227426292f3d863 LICENSE.DOC
> cd03e6f036764464eeb29705f67ebd356f26cde9 LICENSE.DOC
> 578ed140d4a0c32109ceba304bc2aa537e4372459afd90acfe2ec3041b9faf44 LICENSE.DOC

Regards,

Alexandre
signature.asc

Simon McVittie

unread,
Jan 15, 2015, 5:40:03 AM1/15/15
to
On Thu, 17 Apr 2014 at 22:37:38 +0200, esp wrote:
> 1) Wolfenstein 3D v1.1 full Apogee

Debian does not build this variant of wolf4sdl, but g-d-p git master
(which will become v39) knows how to recognise v1.1 and v1.2 files and
flag them as unsupported.

> 2) Wolfenstein 3D v1.4 full Apogee (not tested)

This is Debian's wolf4sdl-wl6a binary. game-data-packager git master
(the future version 39) supports the files found in Stephen Kitt's
copy of the 3D Realms Anthology.

> 3) Wolfenstein 3D v1.4 full GT/ID/Activision

This is Debian's wolf4sdl-wl6 binary. game-data-packager git supports
two variants of this version: the one in Stephen Kitt's id Anthology CD
(which matches your version, and also matches what's shipped on Steam),
and some unspecified other variant that Fabian Greffrath has.

> 4) Wolfenstein 3D v1.0 shareware Apogee
> 5) Wolfenstein 3D v1.1 shareware Apogee
> 6) Wolfenstein 3D v1.2 shareware Apogee

Not supported in Debian. I don't see much point in trying to support
older versions of something where the newer version is freely downloadable.

v1.0 and v1.1 are recognised as unsupported. v1.2 is not (I couldn't
find it).

> 7) Wolfenstein 3D v1.4 shareware

Supported for a long time.

> 8) Spear of Destiny full
> 9) Spear of Destiny demo
> 10) Spear of Destiny - Mission 2: Return to Danger (not tested)
> 11) Spear of Destiny - Mission 3: Ultimate Challenge (not tested)

Supported since v38.

On Thu, 08 Jan 2015 at 00:43:42 +0100, Stephen Kitt wrote:
> 3721027769 522 config.wl6

According to README.WL1 in the shareware version, CONFIG.WL1 should not
be distributed because it is (was?) created by the game on first-run.
So I have not included this file in the packaging (but its checksums are
in git history if we need them).

On Fri, 09 Jan 2015 at 07:40:29 +0100, Alexandre Detiste wrote:
> I would also add this LICENSE.DOC as an "optional file" (AFAIK no yet
> implemented in yaml description)

This is now implemented, and the file will be included if found.
Stephen, please test this (I can't, I only have the shareware and
Steam versions).

S

Stephen Kitt

unread,
Jan 15, 2015, 6:10:03 PM1/15/15
to
Hi Simon,

On Thu, 15 Jan 2015 10:37:10 +0000, Simon McVittie <sm...@debian.org> wrote:
> On Thu, 17 Apr 2014 at 22:37:38 +0200, esp wrote:
> > 7) Wolfenstein 3D v1.4 shareware
>
> Supported for a long time.

It no longer works for me:

$ game-data-packager wolf3d
INFO:game-data-packager:downloading http://pkg-games.alioth.debian.org/game-data/1wolf14.zip
decompressing: w3dhelp.exe, compressed size: 36575
decompressing: wolf3d.exe, compressed size: 118660
decompressing: audiohed.wl1, compressed size: 570
decompressing: audiot.wl1, compressed size: 49012
decompressing: gamemaps.wl1, compressed size: 18595
decompressing: maphead.wl1, compressed size: 43
decompressing: vgadict.wl1, compressed size: 1120
decompressing: vgagraph.wl1, compressed size: 209547
decompressing: vgahead.wl1, compressed size: 496
decompressing: vswap.wl1, compressed size: 347321
decompressing: vendor.doc, compressed size: 3846
decompressing: order.frm, compressed size: 2550
ERROR:game-data-packager:Failed to download necessary files for wolf3d-demo-data
usage: game-data-packager wolf3d [-h] [-i | -n] [-d OUTDIR]
[-z | --no-compress] [--search | --no-search]
[--demo] [-f 1wolf14.zip] [-w]
[DIRECTORY|FILE [DIRECTORY|FILE ...]]

positional arguments:
DIRECTORY|FILE Files to use in constructing the .deb

optional arguments:
-h, --help show this help message and exit
-i, --install install the generated package
-n, --no-install do not install the generated package (requires -d,
default)
-d OUTDIR, --destination OUTDIR
write the generated .deb(s) to OUTDIR
-z, --compress compress generated .deb (default if -d is used)
--no-compress do not compress generated .deb (default without -d)
--search look for installed files in Steam and other likely
places (default)
--no-search only look in paths provided on the command line
--demo Build demo package even if files for full version are
available
-f 1wolf14.zip Path to 1wolf14.zip
-w Download 1wolf14.zip (done automatically if necessary)
rmdir: failed to remove ‘/tmp/user/1000/game-data-packager.B0RceG’: Directory not empty
Files remaining in /tmp/user/1000/game-data-packager.B0RceG:
.
./tmp
./tmp/W3DSW14.SHR.d
./tmp/W3DSW14.SHR.d/order.frm
./tmp/W3DSW14.SHR.d/vendor.doc
./tmp/W3DSW14.SHR.d/vswap.wl1
./tmp/W3DSW14.SHR.d/vgahead.wl1
./tmp/W3DSW14.SHR.d/vgagraph.wl1
./tmp/W3DSW14.SHR.d/vgadict.wl1
./tmp/W3DSW14.SHR.d/maphead.wl1
./tmp/W3DSW14.SHR.d/gamemaps.wl1
./tmp/W3DSW14.SHR.d/audiot.wl1
./tmp/W3DSW14.SHR.d/audiohed.wl1
./tmp/W3DSW14.SHR.d/wolf3d.exe
./tmp/W3DSW14.SHR.d/w3dhelp.exe
./tmp/W3DSW14.SHR
./tmp/1wolf14.zip



(BTW, this new default goes against the main help message, which ends with
"run game-data-packager [game] to see game-specific arguments".)

> On Fri, 09 Jan 2015 at 07:40:29 +0100, Alexandre Detiste wrote:
> > I would also add this LICENSE.DOC as an "optional file" (AFAIK no yet
> > implemented in yaml description)
>
> This is now implemented, and the file will be included if found.
> Stephen, please test this (I can't, I only have the shareware and
> Steam versions).

Unfortunately it doesn't work:

$ ls -l ~/.wine-3drealms/drive_c/Program\ Files/3DRealms/Anthology/Wolfenstein\ 3D/LICENSE.DOC
-rw-r--r-- 1 steve steve 2606 Jul 24 1998 /home/steve/.wine-3drealms/drive_c/Program\ Files/3DRealms/Anthology/Wolfenstein\ 3D/LICENSE.DOC

$ cksum ~/.wine-3drealms/drive_c/Program\ Files/3DRealms/Anthology/Wolfenstein\ 3D/LICENSE.DOC
1260526910 2606 /home/steve/.wine-3drealms/drive_c/Program Files/3DRealms/Anthology/Wolfenstein 3D/LICENSE.DOC

$ game-data-packager wolf3d ~/.wine-3drealms/drive_c/Program\ Files/3DRealms/Anthology/Wolfenstein\ 3D
generated "/home/steve/Debian/games/game-data-packager/wolf3d-full-data_39_all.deb"

$ dpkg-deb -c wolf3d-full-data_39_all.deb
drwxr-xr-x root/root 0 2015-01-16 00:01 ./
drwxr-xr-x root/root 0 2015-01-16 00:01 ./usr/
drwxr-xr-x root/root 0 2015-01-16 00:01 ./usr/share/
drwxr-xr-x root/root 0 2015-01-16 00:01 ./usr/share/games/
drwxr-xr-x root/root 0 2015-01-16 00:01 ./usr/share/games/wolf3d/
-rw-r--r-- root/root 334506 2015-01-16 00:01 ./usr/share/games/wolf3d/vgagraph.wl6
-rw-r--r-- root/root 150652 2015-01-16 00:01 ./usr/share/games/wolf3d/gamemaps.wl6
-rw-r--r-- root/root 402 2015-01-16 00:01 ./usr/share/games/wolf3d/maphead.wl6
-rw-r--r-- root/root 1545400 2015-01-16 00:01 ./usr/share/games/wolf3d/vswap.wl6
-rw-r--r-- root/root 1024 2015-01-16 00:01 ./usr/share/games/wolf3d/vgadict.wl6
-rw-r--r-- root/root 320209 2015-01-16 00:01 ./usr/share/games/wolf3d/audiot.wl6
-rw-r--r-- root/root 1156 2015-01-16 00:01 ./usr/share/games/wolf3d/audiohed.wl6
-rw-r--r-- root/root 486 2015-01-16 00:01 ./usr/share/games/wolf3d/vgahead.wl6
drwxr-xr-x root/root 0 2015-01-16 00:01 ./usr/share/doc/
drwxr-xr-x root/root 0 2015-01-16 00:01 ./usr/share/doc/wolf3d-full-data/
-rw-r--r-- root/root 822 2015-01-16 00:01 ./usr/share/doc/wolf3d-full-data/copyright
-rw-r--r-- root/root 6661 2015-01-16 00:01 ./usr/share/doc/wolf3d-full-data/changelog.gz


I had a look in the Python library but couldn't find any actual use of the
optional property. (On g-d-p master.)

While I'm at it, on master g-d-p doesn't build, game-data-packager.install
lists out/quake/*.copyright and out/quake2/*.copyright but dh_install can't
find them.

Thanks to Alexandre and you for all your work on g-d-p! You might want to add
yourselves to debian/copyright ;-).

Regards,

Stephen

Simon McVittie

unread,
Jan 15, 2015, 7:40:03 PM1/15/15
to
On 15/01/15 23:06, Stephen Kitt wrote:
> Hi Simon,
>
> On Thu, 15 Jan 2015 10:37:10 +0000, Simon McVittie <sm...@debian.org> wrote:
>> On Thu, 17 Apr 2014 at 22:37:38 +0200, esp wrote:
>>> 7) Wolfenstein 3D v1.4 shareware
>>
>> Supported for a long time.
>
> It no longer works for me

Sorry, logic error. A 2-line patch later, it works again.

> (BTW, this new default goes against the main help message, which ends with
> "run game-data-packager [game] to see game-specific arguments".)

Hmm, yes. I'm not sure what should happen there...

On one hand, if there's an obvious Easy Correct Thing for
"game-data-packager $game" to do, it should just go and do it rather
than expecting extra command-line arguments. It seemed particularly
silly that for smallish and free-to-download games like Tyrian and the
Panzer General files for LGeneral, you need to add "-w" to make it
actually give you a .deb.

On the other hand, if it goes off and downloads the demo or shareware
version automatically, the ability to get the full game isn't as
discoverable as it could be.

I might go for some sort of compromise, like: if there's suitable
full-version data in a --search path, just do it; else require some sort
of hint to the user's intentions before we go off and download things
(with some standard argument like --auto to mean "do what I mean"). Or
perhaps I should always require --auto, but allow it to be enabled in a
configuration file.

Regardless, the help text should probably say "game-data-packager GAME
--help" instead.

> I had a look in the Python library but couldn't find any actual use of the
> optional property. (On g-d-p master.)

You're quite right. I hadn't actually implemented that feature yet...
now I have. Hopefully it works.

Stephen Kitt

unread,
Jan 16, 2015, 1:00:03 AM1/16/15
to
On Fri, 16 Jan 2015 00:28:20 +0000, Simon McVittie <sm...@debian.org> wrote:
> On 15/01/15 23:06, Stephen Kitt wrote:
> > On Thu, 15 Jan 2015 10:37:10 +0000, Simon McVittie <sm...@debian.org>
> > wrote:
> >> On Thu, 17 Apr 2014 at 22:37:38 +0200, esp wrote:
> >>> 7) Wolfenstein 3D v1.4 shareware
> >>
> >> Supported for a long time.
> >
> > It no longer works for me
>
> Sorry, logic error. A 2-line patch later, it works again.

Indeed, thanks!

> > (BTW, this new default goes against the main help message, which ends with
> > "run game-data-packager [game] to see game-specific arguments".)
>
> Hmm, yes. I'm not sure what should happen there...
>
> On one hand, if there's an obvious Easy Correct Thing for
> "game-data-packager $game" to do, it should just go and do it rather
> than expecting extra command-line arguments. It seemed particularly
> silly that for smallish and free-to-download games like Tyrian and the
> Panzer General files for LGeneral, you need to add "-w" to make it
> actually give you a .deb.
>
> On the other hand, if it goes off and downloads the demo or shareware
> version automatically, the ability to get the full game isn't as
> discoverable as it could be.
>
> I might go for some sort of compromise, like: if there's suitable
> full-version data in a --search path, just do it; else require some sort
> of hint to the user's intentions before we go off and download things
> (with some standard argument like --auto to mean "do what I mean"). Or
> perhaps I should always require --auto, but allow it to be enabled in a
> configuration file.
>
> Regardless, the help text should probably say "game-data-packager GAME
> --help" instead.

That all seems perfectly sensible. I definitely like the idea of just doing
the right thing if it's possible by default!

> > I had a look in the Python library but couldn't find any actual use of the
> > optional property. (On g-d-p master.)
>
> You're quite right. I hadn't actually implemented that feature yet...
> now I have. Hopefully it works.

It works fine now, yes, thanks!

Regards,

Stephen

Alexandre Detiste

unread,
Jan 16, 2015, 1:50:03 AM1/16/15
to
>>Thanks to Alexandre and you for all your work on g-d-p!
> * Add myself and Alexandre to debian/copyright

Mmm, that's not fair, Simon did 95% of the work.
If that makes it simpler, I don't mind if it is GPL-2 or GPL-2+.

Please pull in the little bits from my github.

> > (BTW, this new default goes against the main help message, which ends with
> > "run game-data-packager [game] to see game-specific arguments".)
>
...
> Regardless, the help text should probably say "game-data-packager GAME
> --help" instead.

Then games/ rott.py | tyrian.py | wolf3d.py feel like useless duplicated boilerplate.

The only missing bit in the core argparser is the one that would construct
"Download %s (done automatically if necessary)" in the help text (where %s is tyrian21.zip/1rott13.zip/1wolf14.zip)
from the yaml file or simply decide that this is stuff that the users
doesn't need to care about and remove this stuff and the -w|-f switches altogether.

Simon McVittie

unread,
Jan 16, 2015, 6:10:03 AM1/16/15
to
Control: retitle 691772 command-line processing should be consistent
Control: block 691772 by 775082 775083

Redirecting this to #691772 because I think this is getting way off
topic for a bug about Wolfenstein 3D support; please excuse the
resulting full-quoting.

I think I would prefer to get all the games into Python/YAML (which
means writing CD-ripping and lgeneral-processing code), *then* think
about how to make their command-line syntax consistent and optimal once
we know the technical constrains; and that's getting into the same sort
of thing previously discussed on #691772, so I'm going to repurpose
#691772 for that.

On 16/01/15 06:39, Alexandre Detiste wrote:
>> Regardless, the help text should probably say "game-data-packager
>> GAME --help" instead.
>
> Then games/ rott.py | tyrian.py | wolf3d.py feel like useless
> duplicated boilerplate.

There's a good reason why they feel like useless duplicated boilerplate:
it's because they are :-P

The only reason I wrote those files was to keep the -w and -f
command-line arguments working for now. When we have all the games
converted and can see more clearly what features we do and don't need,
I'm seriously considering removing support for those arguments.

We should probably have a common --download/--no-download option (with
--download being the default) so you can tell gdp not to go and download
stuff automatically; but I would like to get everything YAML'd first,
because implementing new global options in the shell script wrapper
seems like wasted effort when we only have a couple of games that really
still need it, and those are hopefully on their way out.

> The only missing bit in the core argparser is the one that would
> construct "Download %s (done automatically if necessary)" in the help
> text (where %s is tyrian21.zip/1rott13.zip/1wolf14.zip)
> from the yaml file or simply decide that this is stuff that the users
> doesn't need to care about and remove this stuff and the -w|-f
> switches altogether.

I don't think the "Download %s" text is important. It's only there
because I needed the Python "plugin" for -w/-f anyway, and having
written that, the help text was trivial.

On 16/01/15 05:55, Stephen Kitt wrote:
> On Fri, 16 Jan 2015 00:28:20 +0000, Simon McVittie <sm...@debian.org>
wrote:
>> On 15/01/15 23:06, Stephen Kitt wrote:
>>> (BTW, this new default goes against the main help message, which
>>> ends with
>>> "run game-data-packager [game] to see game-specific arguments".)
>>
>> Hmm, yes. I'm not sure what should happen there...
>>
>> On one hand, if there's an obvious Easy Correct Thing for
>> "game-data-packager $game" to do, it should just go and do it rather
>> than expecting extra command-line arguments. It seemed particularly
>> silly that for smallish and free-to-download games like Tyrian and
>> the Panzer General files for LGeneral, you need to add "-w" to make
>> it actually give you a .deb.
>>
>> On the other hand, if it goes off and downloads the demo or shareware
>> version automatically, the ability to get the full game isn't as
>> discoverable as it could be.
>>
>> I might go for some sort of compromise, like: if there's suitable
>> full-version data in a --search path, just do it; else require some
>> sort of hint to the user's intentions before we go off and download
>> things (with some standard argument like --auto to mean "do what I
>> mean"). Or perhaps I should always require --auto, but allow it to
>> be enabled in a configuration file.
>>
>> Regardless, the help text should probably say "game-data-packager
>> GAME --help" instead.
>
> That all seems perfectly sensible. I definitely like the idea of just
> doing the right thing if it's possible by default!

As I said above, I think the time to sort this out is after everything
is Python/YAML.

Regards,
S

Fabian Greffrath

unread,
May 28, 2015, 3:40:04 AM5/28/15
to
Sudden memory recovery:

Am Montag, den 05.01.2015, 08:14 +0100 schrieb Fabian Greffrath:
> Until I understand the changes that g-d-p has currently undergone, maybe
> I am helpful by providing checksums for the registered Wolfenstein *.wl6
> files that I own (though I don't know anymore where exactly I got them
> from, the ninetees are so far away) and that I know for sure work with
> wolf4sdl:

My registered Wolfenstein *.wl6 files were from the Quake Shareware CD.
All previous ID games were also present on this CD packed in encrypted
archives. IIRC you had to call somewhere and buy a key to unlock them.
That's were I got these files from.

Cheers,

Fabian

signature.asc

Alexandre Detiste

unread,
May 28, 2015, 4:00:02 AM5/28/15
to
Thanks,

I've copy-pasted this blurb as-is in the yaml.
http://anonscm.debian.org/cgit/pkg-games/game-data-packager.git/commit/?id=6480e8788596dc90331b161d8a1400c0218ff161



I was a bit concerned that if someone had several different v1.4 files,
a .deb could be built with a mix-match of files that makes wolf4sdl segfault;
but as the 'paths' in look_for_files() are kept in a list, not in a set;
this shouldn't happen in real life.

http://anonscm.debian.org/cgit/pkg-games/game-data-packager.git/tree/game_data_packager/__init__.py#n2231

One way to solve this is to turn wolf3d-v14-data into wolf3d-v14-data/wolf3d-v14alt-data/wolf3d-v14a-data
that all provides & conflicts on virtual package wolf3d-data

wolf3d-v12-data would also provides & conflicts on virtual package wolf3d-data.

But that breaks previous setups where spear-of-destiny provided wolf3d-data.
(we'd need yet another virtual package "wolf3d-full-data" ?)

Alexandre
signature.asc

Fabian Greffrath

unread,
May 28, 2015, 4:10:03 AM5/28/15
to
Am Donnerstag, den 28.05.2015, 09:55 +0200 schrieb Alexandre Detiste:
> But that breaks previous setups where spear-of-destiny provided wolf3d-data.
> (we'd need yet another virtual package "wolf3d-full-data" ?)

Please no. We do already have far too many virtual packages.

- Fabian

signature.asc
0 new messages