pool/deutex
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 562642 from games:tools

Browse Source 
@jengelh all of your patches are upstream now :)


One minor difference with your "nolimit" fix, the upstream has chosen to emit a warning instead of an error:

f8b1336bbc (diff-737f0ad7650b480ebdf2807f16ae18ca)


- 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 (forwarded request 562640 from avindra)

OBS-URL: https://build.opensuse.org/request/show/562642
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/deutex?expand=0&rev=7
This commit is contained in:
Dominique Leuenberger 2018-01-19 10:52:21 +00:00 committed by Git OBS Bridge
commit 7a9195ad3c
11 changed files with 116 additions and 330 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
deutex-4.4.902.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:faed02b5b286044e28c71a82c72243408dc89a8d14677500b5eea607f048afe8
size 263351

3
deutex-5.1.1.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:92034232cb8911e7e1d53aa9f1236cc44995664f86f5d33cf2bfcd1ac7a21f7b
size 163584

16
deutex-5.1.1.tar.xz.sig Normal file
View File

@ -0,0 +1,16 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEEmUWc4ncAN/9VZutLhkmzdgeggEIFAlpS9mwACgkQhkmzdgeg
gEKweQ//dqMrjsxDs0NMDh5AUXZDP9bgSeQTYuFJTVfbm6ndhjibiVdY9DVXvPcc
xrYELmfykoBb5IU1hwn9WtVS06OaBfHQ9uNaucdFNJ/5SlNJqnDnyTgeJtdUf0bq
eOaol3CVwghFGUVT0EEi8mLkoqndXTaTETbFaIxICuSmrCbeUr8z+wkN27+opFoI
y3Cci1qSRqVm/HReOJUZcr1kBkGQYgyGU2Me03SbUrgsECBSdRWq64SgquSAkzC3
cy7Ct35ARxs+Wc4pVVtwjgw2W2e1u7f08d7jzNit/nD5zLo9jXPao73q4K8lNCbT
F1OcWrb5czBorv1xnV6pGV1tXfgpznT3pfl7sHZA+CDR1DJHtqbcoRjo3nmCR9MT
nSYj436Pi0mr/tyeBgWZrlhm1Twal+5WEzUi/9t78QPKSH1vLGxA3XC7dmSmGno8
i9zCd46C/Vx9I/6pQLOQOcdLIvdZosrQ46v9SiM+2C6zFUTkjxeYO20CcnORZsXB
Nx0vBzVOTnHNwJJeYCwtqMmuu+a4zozEASrJvcFTkTFArJ+Sa1sgOA+u5cH3qcce
J0yfVk7eNMILwADBG8/XKOiBNtnjP2+6aAc2Ad/fDjDN76Qtaq6AsTaEaQvZdQuH
P97gQvkLBRk/yPpBRsovxz3vpiMJnvLdpvSe4JGxh2yqUPIrVhE=
=zUkY
-----END PGP SIGNATURE-----

75
deutex-automake.diff
View File

@ -1,75 +0,0 @@
---
Makefile.am | 37 +++++++++++++++++++++++++++++++++++++
configure.ac | 9 +++++++++
src/deutex.h | 2 +-
3 files changed, 47 insertions(+), 1 deletion(-)
Index: deutex-4.4.902/Makefile.am
===================================================================
--- /dev/null
+++ deutex-4.4.902/Makefile.am
@@ -0,0 +1,37 @@
+# -*- Makefile -*-
+
+AM_CFLAGS = -Wall -Wpointer-arith -Wstrict-prototypes
+
+bin_PROGRAMS = deusf deutex
+
+deutex_SOURCES = \
+ src/color.c \
+ src/compose.c \
+ src/deutex.c \
+ src/endianio.c \
+ src/endianm.c \
+ src/extract.c \
+ src/gifcodec.c \
+ src/ident.c \
+ src/listdir.c \
+ src/lists.c \
+ src/log.c \
+ src/lzw.c \
+ src/merge.c \
+ src/mkwad.c \
+ src/picture.c \
+ src/sound.c \
+ src/sscript.c \
+ src/substit.c \
+ src/text.c \
+ src/texture.c \
+ src/tools.c \
+ src/usedidx.c \
+ src/version.c \
+ src/wadio.c
+deutex_CFLAGS = ${AM_CFLAGS} -DDeuTex
+
+deusf_SOURCES = ${deutex_SOURCES}
+deusf_CFLAGS = ${AM_CFLAGS} -DDeuSF
+
+man_MANS = deutex.6
Index: deutex-4.4.902/configure.ac
===================================================================
--- /dev/null
+++ deutex-4.4.902/configure.ac
@@ -0,0 +1,9 @@
+AC_INIT([deutex], [4.4.902])
+AC_CONFIG_HEADERS([config.h])
+AM_INIT_AUTOMAKE([-Wall foreign subdir-objects])
+AC_PROG_CC
+AC_PROG_INSTALL
+AC_CHECK_HEADERS([inttypes.h])
+AC_CHECK_FUNCS([snprintf])
+AC_CONFIG_FILES([Makefile])
+AC_OUTPUT
Index: deutex-4.4.902/src/deutex.h
===================================================================
--- deutex-4.4.902.orig/src/deutex.h
+++ deutex-4.4.902/src/deutex.h
@@ -100,7 +100,7 @@ extern const char deutex_version[];
#endif
/* Fixed-size types */
-#ifdef HAVE_INTTYPES
+#ifdef HAVE_INTTYPES_H
# include <inttypes.h>
#endif

105
deutex-braces.diff
View File

@ -1,105 +0,0 @@
From: Jan Engelhardt <jengelh@medozas.de>
Fix build warnings.
src/mkwad.c: In function "WADRreadBytes":
src/mkwad.c:386:6: warning: suggest explicit braces to avoid ambiguous "else"
src/mkwad.c: In function "WADRreadShort":
src/mkwad.c:405:6: warning: suggest explicit braces to avoid ambiguous "else"
src/mkwad.c: In function "WADRreadLong":
src/mkwad.c:417:6: warning: suggest explicit braces to avoid ambiguous "else"
src/mkwad.c: In function "WADRreadEntry2":
src/mkwad.c:492:6: warning: suggest explicit braces to avoid ambiguous "else"
src/color.c: In function "COLinit":
src/color.c:224:6: warning: suggest explicit braces to avoid ambiguous "else"
---
src/color.c | 3 ++-
src/mkwad.c | 12 ++++++++----
2 files changed, 10 insertions(+), 5 deletions(-)
Index: deutex-4.4.902/src/color.c
===================================================================
--- deutex-4.4.902.orig/src/color.c
+++ deutex-4.4.902/src/color.c
@@ -221,12 +221,13 @@ void COLinit( UInt8 invR, UInt8 invG, UI
const char *name = NULL;
/*Int16 R,G,B;*/
if(COLok!=FALSE) Bug("PL02", "COLok");
- if(Colsz< 256*sizeof(struct PIXEL))
+ if(Colsz< 256*sizeof(struct PIXEL)) {
if (lumpname == NULL)
ProgError ("PL03", "%s: wrong size for PLAYPAL", fname (pathname));
else
ProgError ("PL04", "%s: %s: wrong size for PLAYPAL",
fname (pathname), lump_name (lumpname));
+ }
COLok=TRUE;
COLpal= (struct PIXEL *)Malloc(256*sizeof(struct PIXEL));
for(i=0;i< NCOLOURS;i++)
Index: deutex-4.4.902/src/mkwad.c
===================================================================
--- deutex-4.4.902.orig/src/mkwad.c
+++ deutex-4.4.902/src/mkwad.c
@@ -383,7 +383,7 @@ iolen_t WADRreadBytes (struct WADINFO *i
{
long ofs = ftell (info->fd);
iolen_t result = WADRreadBytes2 (info, buffer, nbytes);
- if (result != nbytes)
+ if (result != nbytes) {
if (ferror (info->fd))
ProgError ("WR43", "%s: read error (got %lu/%lu bytes)",
fnameofs (info->filename, ofs),
@@ -394,6 +394,7 @@ iolen_t WADRreadBytes (struct WADINFO *i
fnameofs (info->filename, ofs),
(unsigned long) result,
(unsigned long) nbytes);
+ }
return nbytes;
}
@@ -402,11 +403,12 @@ Int16 WADRreadShort(struct WADINFO *info
{ Int16 res;
long ofs = ftell (info->fd);
if (!(info->ok&WADR_READ)) Bug("WR51", "WadRdS");
- if (wad_read_i16 (info->fd, &res))
+ if (wad_read_i16 (info->fd, &res)) {
if (ferror (info->fd))
ProgError ("WR53", "%s: read error", fnameofs (info->filename, ofs));
else
ProgError ("WR55", "%s: unexpected EOF", fnameofs (info->filename, ofs));
+ }
return res;
}
@@ -414,11 +416,12 @@ Int32 WADRreadLong(struct WADINFO *info)
{ Int32 res;
long ofs = ftell (info->fd);
if (!(info->ok&WADR_READ)) Bug("WR61", "WadRdL");
- if (wad_read_i32 (info->fd, &res))
+ if (wad_read_i32 (info->fd, &res)) {
if (ferror (info->fd))
ProgError ("WR63", "%s: read error", fnameofs (info->filename, ofs));
else
ProgError ("WR65", "%s: unexpected EOF", fnameofs (info->filename, ofs));
+ }
return res;
}
@@ -489,7 +492,7 @@ char *WADRreadEntry2 (struct WADINFO *in
buffer = Malloc (size);
WADRseek (info, start);
actual_size = WADRreadBytes2 (info, buffer, size);
- if (actual_size < size)
+ if (actual_size < size) {
if (ferror (info->fd))
ProgError ("WR78", "%s: Lump %s: read error at byte %ld",
fnameofs (info->filename, start + actual_size),
@@ -500,6 +503,7 @@ char *WADRreadEntry2 (struct WADINFO *in
fnameofs (info->filename, start + actual_size),
lump_name (info->dir[n].name),
(long) actual_size);
+ }
*psize = actual_size;
return buffer;
}

35
deutex-init-stdfp.diff
View File

@ -1,35 +0,0 @@
From: Jan Engelhardt <jengelh@medozas.de>
Date: 2010-08-23 12:14:04 +0200
Stderr needs to be initialized first, otherwise ProgError will
crash when called from a check_types that does detect a size
mismatch.
---
src/deutex.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
Index: deutex-4.4.902/src/deutex.c
===================================================================
--- deutex-4.4.902.orig/src/deutex.c
+++ deutex-4.4.902/src/deutex.c
@@ -975,9 +975,6 @@ int main (int argc, char *argv_non_const
"\t+------------------------------------+\n\n");
#endif
- /* Sanity checks */
- check_types ();
-
/*
** default parameters
*/
@@ -1017,6 +1014,9 @@ int main (int argc, char *argv_non_const
PrintInit(FALSE);
PrintVerbosity(2);
+ /* Sanity checks */
+ check_types();
+
/* Do a second pass through argv to catch options like --help that
shouldn't cause the creation of a log file. */
{

21
deutex-nolimit.diff
View File

@ -1,21 +0,0 @@
From: Jan Engelhardt <jengelh@inai.de>
Date: 2017-07-07 16:45:59.059496819 +0200
Permit reading of WADs with more than 4096 entries.
---
src/mkwad.c | 2 --
1 file changed, 2 deletions(-)
Index: deutex-4.4.902/src/mkwad.c
===================================================================
--- deutex-4.4.902.orig/src/mkwad.c
+++ deutex-4.4.902/src/mkwad.c
@@ -125,8 +125,6 @@ void WADRopenR(struct WADINFO *info, con
ntry = WADRreadLong(info);
if(ntry<=0)
ProgError("WR09", "%s: zero entries", fname (wadin));
- if(ntry>=0x2000)
- ProgError("WR11", "%s: too many entries", fname (wadin));
info->dirpos= dirpos= WADRreadLong(info);
if((dirpos<0)||(dirpos>0x10000000L))
ProgError("WR13", "%s: invalid directory offset %08lX",

31
deutex-proto.diff
View File

@ -1,31 +0,0 @@
From: Jan Engelhardt <jengelh@medozas.de>
src/deutex.c:108:1: warning: function declaration is not a prototype
src/deutex.c:1611:13: warning: function declaration is not a prototype
---
src/deutex.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Index: deutex-4.4.902/src/deutex.c
===================================================================
--- deutex-4.4.902.orig/src/deutex.c
+++ deutex-4.4.902/src/deutex.c
@@ -105,7 +105,7 @@ const char *logfile
static char anon[1] = { '\0' };
typedef void (*comfun_t) (int argc, const char *argv[]);
-static void opt_widths ();
+static void opt_widths (void);
static int is_prefix (const char *s1, const char *s2);
static void call_opt (comfun_t func, ...);
@@ -1608,7 +1608,7 @@ void COMmanopt(int argc, const char *arg
/*
* opt_widths - make a pass through Com and compute widths per section
*/
-static void opt_widths ()
+static void opt_widths (void)
{
comdef_t *d;
comdef_t *current_section = NULL;

23
deutex-soundbuf.diff
View File

@ -1,23 +0,0 @@
From: Jan Engelhardt <jengelh@medozas.de>
I: Statement might potentially overflow a destination buffer, where a size
larger than the actual buffer was specified
E: deutex destbufferoverflow src/sound.c:315:11
---
src/sound.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Index: deutex-4.4.902/src/sound.c
===================================================================
--- deutex-4.4.902.orig/src/sound.c
+++ deutex-4.4.902/src/sound.c
@@ -312,7 +312,7 @@ char *SNDloadVocFile(char *file, Int32
ProgError("VR12", "%s: bad magic", fname (file));
if(fseek(fp,headv.block1,SEEK_SET))
ProgError("VR13", "%s: bad header", fname (file));
- if(fread(&blockv,sizeof(struct VOCHEAD),1,fp)!=1)
+ if(fread(&blockv,sizeof(struct VOCBLOCK1),1,fp)!=1)
ProgError("VR14", "%s: read error in first block", fname (file));
if(blockv.type!=1)
ProgError("VR15", "%s: first block is not sound", fname (file));

77
deutex.changes
View File

@ -1,3 +1,79 @@
-------------------------------------------------------------------
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
@ -32,4 +108,3 @@ Sat Nov 8 16:49:24 CET 2008 - prusnak@suse.cz
Sun Dec 23 09:03:00 CET 2007 - claes.backstrom@fsfe.org
- Initial package built from Fedora package (4.4.0-6)

57
deutex.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package deutex
#
# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
# 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
@ -17,60 +17,45 @@
Name: deutex
Version: 4.4.902
Version: 5.1.1
Release: 0
Summary: WAD composer for Doom and related games
License: GPL-2.0+
Group: Development/Tools/Other
Url: http://www.teaser.fr/~amajorel/deutex/
#Historic-Url: http://www.teaser.fr/~amajorel/deutex/
URL: https://github.com/Doom-Utils/deutex
# This prerelease tarball is unfortunately not linked from the homepage,
# but referenced from
# http://doom-editing.gamehourz.com/DeuTex-release-candidate-ftopict85808.html
Source: http://www.teaser.fr/~amajorel/deutex/fungus/%name-%version.tar.gz
Patch1: deutex-automake.diff
Patch2: deutex-braces.diff
Patch3: deutex-proto.diff
Patch4: deutex-init-stdfp.diff
Patch5: deutex-soundbuf.diff
Patch6: deutex-nolimit.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: autoconf
Source: https://github.com/Doom-Utils/deutex/releases/download/v%version/%name-%version.tar.xz
Source2: https://github.com/Doom-Utils/deutex/releases/download/v%version/%name-%version.tar.xz.sig
BuildRequires: asciidoc
BuildRequires: automake
BuildRequires: libtool
Provides: deusf = %version
BuildRequires: pkgconfig
%description
DeuTex is a wad 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 PPM for graphics, Sun
audio for 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, etc.
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
%setup -q
%patch -P 1 -P 2 -P 3 -P 4 -P 5 -P 6 -p1
%build
autoreconf -fi
autoreconf -fiv
%configure
make CFLAGS="%optflags" %{?_smp_mflags}
iconv -f iso8859-1 -t utf-8 <deutex.6 >deutex.6.new;
iconv -f iso8859-1 -t utf-8 <dtexman6.txt >dtexman6.txt.new;
mv deutex.6.new deutex.6;
mv dtexman6.txt.new dtexman6.txt;
make %{?_smp_mflags}
%install
%make_install
%files
%defattr(-,root,root)
%_bindir/*
%doc %_mandir/*/*
%doc dtexman6.txt CHANGES COPYING COPYING.LIB FAQ
%_mandir/man6/%name.6%ext_man
%doc COPYING COPYING.LIB
%changelog