From 51ff2f0e8f841ce7bf6f92dc5782caeee890c9f1e002ce13dc0f9e507d5f6acf Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Tue, 18 Feb 2025 21:02:32 +0000 Subject: [PATCH 1/2] [info=51074f49ee907094ea7994f38e6433d2ccd06a0b701adaf1052177f4bcb0002f] OBS-URL: https://build.opensuse.org/package/show/games:tools/deutex?expand=0&rev=11 --- .gitattributes | 23 +++++++ .gitignore | 1 + _scmsync.obsinfo | 4 ++ build.specials.obscpio | 3 + deutex-5.2.2.tar.zst | 3 + deutex-5.2.2.tar.zst.sig | 2 + deutex.changes | 135 +++++++++++++++++++++++++++++++++++++++ deutex.spec | 67 +++++++++++++++++++ 8 files changed, 238 insertions(+) create mode 100644 .gitattributes create mode 100644 .gitignore create mode 100644 _scmsync.obsinfo create mode 100644 build.specials.obscpio create mode 100644 deutex-5.2.2.tar.zst create mode 100644 deutex-5.2.2.tar.zst.sig create mode 100644 deutex.changes create mode 100644 deutex.spec diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..9b03811 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,23 @@ +## Default LFS +*.7z filter=lfs diff=lfs merge=lfs -text +*.bsp filter=lfs diff=lfs merge=lfs -text +*.bz2 filter=lfs diff=lfs merge=lfs -text +*.gem filter=lfs diff=lfs merge=lfs -text +*.gz filter=lfs diff=lfs merge=lfs -text +*.jar filter=lfs diff=lfs merge=lfs -text +*.lz filter=lfs diff=lfs merge=lfs -text +*.lzma filter=lfs diff=lfs merge=lfs -text +*.obscpio filter=lfs diff=lfs merge=lfs -text +*.oxt filter=lfs diff=lfs merge=lfs -text +*.pdf filter=lfs diff=lfs merge=lfs -text +*.png filter=lfs diff=lfs merge=lfs -text +*.rpm filter=lfs diff=lfs merge=lfs -text +*.tbz filter=lfs diff=lfs merge=lfs -text +*.tbz2 filter=lfs diff=lfs merge=lfs -text +*.tgz filter=lfs diff=lfs merge=lfs -text +*.ttf filter=lfs diff=lfs merge=lfs -text +*.txz filter=lfs diff=lfs merge=lfs -text +*.whl filter=lfs diff=lfs merge=lfs -text +*.xz filter=lfs diff=lfs merge=lfs -text +*.zip filter=lfs diff=lfs merge=lfs -text +*.zst filter=lfs diff=lfs merge=lfs -text diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..57affb6 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.osc diff --git a/_scmsync.obsinfo b/_scmsync.obsinfo new file mode 100644 index 0000000..929cdab --- /dev/null +++ b/_scmsync.obsinfo @@ -0,0 +1,4 @@ +mtime: 1619729207 +commit: 51074f49ee907094ea7994f38e6433d2ccd06a0b701adaf1052177f4bcb0002f +url: https://src.opensuse.org/jengelh/deutex +revision: master diff --git a/build.specials.obscpio b/build.specials.obscpio new file mode 100644 index 0000000..525bbcd --- /dev/null +++ b/build.specials.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:17a4524784e08eae24c16129ee7a7747c814fdb95845c64053e8b0ac4d40c8e8 +size 256 diff --git a/deutex-5.2.2.tar.zst b/deutex-5.2.2.tar.zst new file mode 100644 index 0000000..1718ad1 --- /dev/null +++ b/deutex-5.2.2.tar.zst @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:10ed0e7a533ec97cb6d03548d4258fbec88852a45b5ea4cf5434376ad4174b5f +size 172022 diff --git a/deutex-5.2.2.tar.zst.sig b/deutex-5.2.2.tar.zst.sig new file mode 100644 index 0000000..8a796c6 --- /dev/null +++ b/deutex-5.2.2.tar.zst.sig @@ -0,0 +1,2 @@ +untrusted comment: verify with deutex.pub +RWQFKSch/pCmBvZHyTLsRc3Y3Tyj9/oz25IFWLo88lsRmcSy+gsd5iQH/huDC1+bXmCUkWZWLyNYFSzLTCRdhaWp7fuwoM4LHAY= diff --git a/deutex.changes b/deutex.changes new file mode 100644 index 0000000..e030bfc --- /dev/null +++ b/deutex.changes @@ -0,0 +1,135 @@ +------------------------------------------------------------------- +Thu Apr 29 12:32:44 UTC 2021 - Ferdinand Thiessen + +- Update to new upstream release 5.2.2 + * Hexen graphics are now treated a bit more specially, + the last entry in the palette no longer counting as a candidate + to produce transparency in the output file. + +------------------------------------------------------------------- +Fri Aug 23 17:57:35 UTC 2019 - Jan Engelhardt + +- Update to new upstream release 5.2.1 + * DeuTex supports textures in TX_START and TX_END markers + (introduced in ZDoom in 2003). These are used by certain + editors/engines for textures, with support for storing PNG and + JPEG files directly in the WAD. Extraction is likewise handled + for all formats. + +------------------------------------------------------------------- +Sun Sep 16 18:07:30 UTC 2018 - Avindra Goolcharan + +- update to 5.1.2 + * fix segfault with --help +- partial cleanup with spec-cleaner + +------------------------------------------------------------------- +Tue Jan 9 00:09:12 UTC 2018 - avindra@opensuse.org + +- update to 5.1.1 + * Fixed: texture name array: the maximum possible string size is + now supported. + * Fixed: some warnings and errors with old versions of pkg-config + and gcc + * Fixed: Aliasing errors (caused crashes on some architectures, + such as sparc64) + * Can now build WADs with an arbitrary number of lumps. A warning + is emitted when more than 4046 are included (vanilla Doom limit). +- remove 0001-increase-array-size-for-char-tname-variable-51.patch + * upstreamed in 7024dd74a33780ef2dbdf614f4e52526cc3ab457 +- remove 0001-Fix-strict-aliasing-violations.patch + * upstreamed in 85d821dd3c145be1a998ca2a704930caaad73030 +- remove deutex-proto.diff + * upstreamed in 07bd0a5083fc15db20bee9056511bd3e10dd1362 +- remove deutex-nolimit.diff + * fixed in f8b1336bbcb7bc387d3e856cc7c9f75697cd0f0b +- remove deprecated BuildRoot option + +------------------------------------------------------------------- +Mon Jan 1 18:18:37 UTC 2018 - jengelh@inai.de + +- Add 0001-increase-array-size-for-char-tname-variable-51.patch, + 0001-Fix-strict-aliasing-violations.patch +- Explain some changelog entries better. + +------------------------------------------------------------------- +Mon Jan 1 07:58:11 UTC 2018 - avindra@opensuse.org + +- update to 5.1.0 + * The -overwrite option now works. + * Levels are extracted/inserted in a way to preserve GL nodes. + * Inserting pictures with a height of 1 pixel no longer causes + a malloc error, and allows the operation of rebuilding a + Doom 1 or 2 IWAD. + * Texture lump file names can now be overridden. + * Support reading and writing sprite offsets based on PNG + "grAb" chunks (cf. grabpng package) in a manner compatible + with SLADE and ZDoom. wadinfo.txt overrides these offsets + unless -pngoffsets is used. +- includes 5.0.0 + * Removed DeuSF program mode. + * Removed command line options used by WinTex. + * Removed MS-DOS and OS/2 support code. + * Removed the "-man" option from deutex. + * Removed incomplete Rise of the Triad support. + * PNG support added. This is the default extraction format now. + * Sun Audio (.au) and Creative .voc sound file format support + has been removed. RIFF WAVE is the only supported format. + * Full sound lumps from the WAD are always extracted (-fullsnd + option). + * MIDI files can be included just by being named *.mid, and are + extracted to the same file name extension. + * Log file support has been removed, in favor of the user doing + a shell redirection (e.g. with > or 2>) instead. + * Arch-vile sprites are now extracted and inserted using + literal names for sprites with the '[' and ']' characters in + names (were illegal in DOS), and sprite names with '\' are + now altered to use '^' on-disk, matching the ZDoom PK3 + standard. + * Graphics with a height > 128 and < 256 are now inserted into + Doom WAD files correctly. + * UDMF (Universal Doom Map Format) support. +- remove patches obsoleted by upstream cleanup and refactoring + * deutex-automake.diff + * deutex-braces.diff + * deutex-init-stdfp.diff + - check_types removed (b76fafa6fee9a64929e7b1087ac36ea3ce39e27d) + * deutex-soundbuf.diff +- rebase deutex-proto.diff +- rebase deutex-nolimit.diff +- renumber patches + +------------------------------------------------------------------- +Fri Jul 7 14:49:32 UTC 2017 - jengelh@inai.de + +- Add deutex-nolimit.diff: raise limit for WAD directory reading + +------------------------------------------------------------------- +Wed Feb 22 16:47:15 UTC 2012 - jreidinger@suse.com + +- add explicit buildrequires for autotools +- use license format conforming SPDX + +------------------------------------------------------------------- +Tue Jun 7 20:57:13 UTC 2011 - jengelh@medozas.de + +- update to deutex-4.4.902 +- start specfile afresh + +------------------------------------------------------------------- +Mon Aug 23 10:13:21 UTC 2010 - jengelh@medozas.de + +- (imported changelog entry from non-Fedora based spec file) +* deutex-4.4.0 package +* fixed crash in check_types +* fix types such that deutex works on 64-bit + +------------------------------------------------------------------- +Sat Nov 8 16:49:24 CET 2008 - prusnak@suse.cz + +- fix overflows (overflow.patch) + +------------------------------------------------------------------- +Sun Dec 23 09:03:00 CET 2007 - claes.backstrom@fsfe.org + +- Initial package built from Fedora package (4.4.0-6) diff --git a/deutex.spec b/deutex.spec new file mode 100644 index 0000000..705ace9 --- /dev/null +++ b/deutex.spec @@ -0,0 +1,67 @@ +# +# spec file for package deutex +# +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + +# Please submit bugfixes or comments via https://bugs.opensuse.org/ +# + + +Name: deutex +Version: 5.2.2 +Release: 0 +Summary: WAD composer for Doom and related games +License: GPL-2.0-or-later +Group: Development/Tools/Other +#Historic-URL: http://www.teaser.fr/~amajorel/deutex/ +URL: https://github.com/Doom-Utils/deutex +Source: https://github.com/Doom-Utils/deutex/releases/download/v%version/%name-%version.tar.zst +Source2: https://github.com/Doom-Utils/deutex/releases/download/v%version/%name-%version.tar.zst.sig +BuildRequires: asciidoc +BuildRequires: automake +BuildRequires: pkg-config +BuildRequires: zstd + +%description +DeuTex is a .wad file composer for Doom, Heretic, Hexen and Strife. +It can be used to extract the lumps of a WAD and save them as +individual files. Conversely, it can also build a WAD from separate +files. When extracting a lump to a file, it does not just copy the +raw data, it converts it to an appropriate format (such as PNG for +graphics, WAVE for audio samples, etc.). Conversely, when it reads +files for inclusion in PWADs, it does the necessary conversions (for +example, from PPM to Doom picture format). In addition, DeuTex has +functions such as merging WADs. + +%prep +%if 0%{?suse_version} < 1550 +# Leap <= 15.3 does not support tar with zstd +%setup -T -c +tar -I zstd --strip-components=1 -xf %{SOURCE0} +%else +%autosetup -p1 +%endif + +%build +autoreconf -fiv +%configure --enable-man +%make_build + +%install +%make_install + +%files +%license COPYING COPYING.LIB +%_bindir/* +%_mandir/man6/%name.6%ext_man + +%changelog From 11c5e2b6003a7c53a1c9595d0d2f6ca428fc5b4fe525e9430893adc85a364738 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Tue, 18 Feb 2025 21:08:43 +0000 Subject: [PATCH 2/2] [info=37a09bb1a86f0eec324545eb7eace96dfc322a1aee410174b7c862b1b40da4b1] OBS-URL: https://build.opensuse.org/package/show/games:tools/deutex?expand=0&rev=12 --- _scmsync.obsinfo | 4 ++-- build.specials.obscpio | 2 +- deutex-5.2.2.tar.zst | 3 --- deutex-5.2.2.tar.zst.sig | 2 -- deutex-5.2.3.tar.zst | 3 +++ deutex.changes | 9 +++++++++ deutex.spec | 11 ++--------- 7 files changed, 17 insertions(+), 17 deletions(-) delete mode 100644 deutex-5.2.2.tar.zst delete mode 100644 deutex-5.2.2.tar.zst.sig create mode 100644 deutex-5.2.3.tar.zst diff --git a/_scmsync.obsinfo b/_scmsync.obsinfo index 929cdab..80919d3 100644 --- a/_scmsync.obsinfo +++ b/_scmsync.obsinfo @@ -1,4 +1,4 @@ -mtime: 1619729207 -commit: 51074f49ee907094ea7994f38e6433d2ccd06a0b701adaf1052177f4bcb0002f +mtime: 1739912911 +commit: 37a09bb1a86f0eec324545eb7eace96dfc322a1aee410174b7c862b1b40da4b1 url: https://src.opensuse.org/jengelh/deutex revision: master diff --git a/build.specials.obscpio b/build.specials.obscpio index 525bbcd..f30c098 100644 --- a/build.specials.obscpio +++ b/build.specials.obscpio @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:17a4524784e08eae24c16129ee7a7747c814fdb95845c64053e8b0ac4d40c8e8 +oid sha256:08498fc598ca60bb1396e33b9cd7980a6e69228a9b390e4f15d254f337b039a8 size 256 diff --git a/deutex-5.2.2.tar.zst b/deutex-5.2.2.tar.zst deleted file mode 100644 index 1718ad1..0000000 --- a/deutex-5.2.2.tar.zst +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:10ed0e7a533ec97cb6d03548d4258fbec88852a45b5ea4cf5434376ad4174b5f -size 172022 diff --git a/deutex-5.2.2.tar.zst.sig b/deutex-5.2.2.tar.zst.sig deleted file mode 100644 index 8a796c6..0000000 --- a/deutex-5.2.2.tar.zst.sig +++ /dev/null @@ -1,2 +0,0 @@ -untrusted comment: verify with deutex.pub -RWQFKSch/pCmBvZHyTLsRc3Y3Tyj9/oz25IFWLo88lsRmcSy+gsd5iQH/huDC1+bXmCUkWZWLyNYFSzLTCRdhaWp7fuwoM4LHAY= diff --git a/deutex-5.2.3.tar.zst b/deutex-5.2.3.tar.zst new file mode 100644 index 0000000..8ff7da6 --- /dev/null +++ b/deutex-5.2.3.tar.zst @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:935dcae490fb574e8ad90ef54bdeb599c7055fedca117d79ce837cbc19d070ab +size 174847 diff --git a/deutex.changes b/deutex.changes index e030bfc..dd1181b 100644 --- a/deutex.changes +++ b/deutex.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Tue Feb 18 21:06:58 UTC 2025 - Jan Engelhardt + +- Update to release 5.2.3 + * DeuTex now checks the position of the directory offset in a WAD + file instead of an arbitrary value, which may get exceeded for + reasonably large files. This fixes the extraction of extras.wad + in modern Doom releases. + ------------------------------------------------------------------- Thu Apr 29 12:32:44 UTC 2021 - Ferdinand Thiessen diff --git a/deutex.spec b/deutex.spec index 705ace9..59a46ce 100644 --- a/deutex.spec +++ b/deutex.spec @@ -1,7 +1,7 @@ # # spec file for package deutex # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2025 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: deutex -Version: 5.2.2 +Version: 5.2.3 Release: 0 Summary: WAD composer for Doom and related games License: GPL-2.0-or-later @@ -25,7 +25,6 @@ Group: Development/Tools/Other #Historic-URL: http://www.teaser.fr/~amajorel/deutex/ URL: https://github.com/Doom-Utils/deutex Source: https://github.com/Doom-Utils/deutex/releases/download/v%version/%name-%version.tar.zst -Source2: https://github.com/Doom-Utils/deutex/releases/download/v%version/%name-%version.tar.zst.sig BuildRequires: asciidoc BuildRequires: automake BuildRequires: pkg-config @@ -43,13 +42,7 @@ example, from PPM to Doom picture format). In addition, DeuTex has functions such as merging WADs. %prep -%if 0%{?suse_version} < 1550 -# Leap <= 15.3 does not support tar with zstd -%setup -T -c -tar -I zstd --strip-components=1 -xf %{SOURCE0} -%else %autosetup -p1 -%endif %build autoreconf -fiv