Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild

- Force using Makefile generator (rhbz#2381152)

.cvsignore

@@ -1 +0,0 @@
-vavoom-1.27.1.tar.bz2

.gitignore

@@ -0,0 +1,2 @@
+vavoom-1.30.tar.bz2
+/vavoom-1.33.tar.bz2

Makefile

@@ -1,21 +0,0 @@
-# Makefile for source rpm: vavoom
-# $Id$
-NAME := vavoom
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attept a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)

doom-shareware.appdata.xml

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component type="desktop">
+  <id>doom-shareware.desktop</id>
+  <metadata_license>CC0-1.0</metadata_license>
+  <project_license>proprietary</project_license>
+  <name>Doom shareware installer</name>
+  <summary>Doom, id Software's classic first person shooter, shareware installer</summary>
+  <description>
+    <p>
+     Doom is id Software's classic first person shooter follow-up to
+     Wolfenstein 3D. The Doom engine is Open Source. The original Doom datafiles
+     however are not Open Source. There is a gratis, but not Open Source
+     shareware version available on the internet.
+    </p>
+    <p>
+     This package contains an applications menu entry for playing Doom shareware
+     using the vavoom engine. The first time you click this menu entry, it will
+     offer to download and install the Doom shareware datafiles for you.
+    </p>
+  </description>
+  <url type="homepage">https://en.wikipedia.org/wiki/Doom_%281993_video_game%29</url>
+  <screenshots>
+    <screenshot type="default">http://vavoom-engine.com/images/shots/shot00.jpg</screenshot>
+    <screenshot>http://vavoom-engine.com/images/shots/shot01.jpg</screenshot>
+    <screenshot>http://vavoom-engine.com/images/shots/shot02.jpg</screenshot>
+  </screenshots>
+  <updatecontact>jwrdegoede_at_fedoraproject.org</updatecontact>
+</component>

doom-shareware.desktop

@@ -1,9 +1,9 @@
 [Desktop Entry]
-Encoding=UTF-8
 Name=Doom
 Comment=Doom Shareware launcher, will automatically download the needed data-files
 Exec=doom-shareware
-Icon=doom-logo.png
+Icon=doom-logo
 Terminal=false
 Type=Application
 Categories=Game;ActionGame;
+Keywords=game;fps;first;person;shooter;doom;

doom-shareware.sh

@@ -2,6 +2,14 @@
 
 set -e
 
+# First check if a system-wide doom1.wad is installed and if it is
+# use that instead of downloading
+if [ -f /usr/share/games/doom/doom1.wad ]; then
+  exec /usr/bin/vavoom -iwaddir /usr/share/games/doom -doom "$@"
+elif [ -f /usr/share/doom/doom1.wad ]; then
+  exec /usr/bin/vavoom -iwaddir /usr/share/doom -doom "$@"
+fi
+
 if [ ! -f ~/.vavoom/doom-shareware/doom1.wad ]; then
   set +e
   /usr/share/autodl/AutoDL.py /usr/share/vavoom/doom.autodlrc

doom.autodlrc

@@ -39,7 +39,8 @@ ID SOFTWARE LICENSE
 	[MD5]244d181457c9be5f28b91b488e67e042[/MD5]
 	[PATH]$HOME/.vavoom/doom-shareware[/PATH]
 	[MIRRORS]
-		[URL]http://www.parkerinfo.com/dmdo/downloads/doom19s.zip[/URL]
+		[URL]http://downloads.sourceforge.net/salix-sbo/doom19s.zip[/URL]
+		[URL]http://mirrors.syringanetworks.net/idgames/idstuff/doom/doom19s.zip[/URL]
 		[URL]ftp://ftp.fu-berlin.de/pc/msdos/games/idgames/idstuff/doom/doom19s.zip[/URL]
 		[URL]ftp://ftp.idsoftware.com/idstuff/doom/doom19s.zip[/URL]
 	[/MIRRORS]

heretic-shareware.appdata.xml

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component type="desktop">
+  <id>heretic-shareware.desktop</id>
+  <metadata_license>CC0-1.0</metadata_license>
+  <project_license>proprietary</project_license>
+  <name>Heretic shareware installer</name>
+  <summary>Heretic, classic dark fantasy first person shooter, shareware installer</summary>
+  <description>
+    <p>
+     Heretic is Raven's classic dark fantasy first person shooter using a
+     modified Doom engine. The Heretic engine is Open Source. The original
+     Heretic datafiles however are not Open Source. There is a gratis, but not
+     Open Source shareware version available on the internet.
+    </p>
+    <p>
+     This package contains an applications menu entry for playing Heretic
+     shareware using the vavoom engine. The first time you click this menu
+     entry, it will offer to download and install the Heretic shareware
+     datafiles for you.
+    </p>
+  </description>
+  <url type="homepage">https://en.wikipedia.org/wiki/Heretic_%28video_game%29</url>
+  <screenshots>
+    <screenshot type="default">http://vavoom-engine.com/images/shots/shot03.jpg</screenshot>
+  </screenshots>
+  <updatecontact>jwrdegoede_at_fedoraproject.org</updatecontact>
+</component>

heretic-shareware.desktop

@@ -1,9 +1,9 @@
 [Desktop Entry]
-Encoding=UTF-8
 Name=Heretic
 Comment=Heretic Shareware launcher, will automatically download the needed data-files
 Exec=heretic-shareware
-Icon=tux-b2f.png
+Icon=tux-b2f
 Terminal=false
 Type=Application
 Categories=Game;ActionGame;
+Keywords=game;fps;first;person;shooter;heretic;

heretic.autodlrc

@@ -55,7 +55,8 @@ f.  In any manner and through any medium whatsoever commercially exploit the sof
 	[MD5]420b23b3d8f2cbd164c121369eaa2b09[/MD5]
 	[PATH]$HOME/.vavoom/heretic-shareware[/PATH]
 	[MIRRORS]
-		[URL]http://www.parkerinfo.com/dmdo/downloads/htic_v12.zip[/URL]
+		[URL]http://downloads.sourceforge.net/salix-sbo/htic_v12.zip[/URL]
+		[URL]http://mirrors.syringanetworks.net/idgames/idstuff/heretic/htic_v12.zip[/URL]
 		[URL]ftp://ftp.fu-berlin.de/pc/msdos/games/idgames/idstuff/heretic/htic_v12.zip[/URL]
 		[URL]ftp://ftp.idsoftware.com/idstuff/heretic/htic_v12.zip[/URL]
 	[/MIRRORS]

hexen-demo.appdata.xml

@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component type="desktop">
+  <id>hexen-demo.desktop</id>
+  <metadata_license>CC0-1.0</metadata_license>
+  <project_license>proprietary</project_license>
+  <name>Hexen demo installer</name>
+  <summary>Hexen, classic dark fantasy first person shooter, demo installer</summary>
+  <description>
+    <p>
+     Hexen: Beyond Heretic is Raven's classic dark fantasy first person shooter
+     follow-up to Heretic. The Hexen engine is Open Source. The original Hexen
+     datafiles however are not Open Source. There is a gratis, but not Open
+     Source demo version available on the internet.
+    </p>
+    <p>
+     This package contains an applications menu entry for playing Hexen
+     demo using the vavoom engine. The first time you click this menu
+     entry, it will offer to download and install the Hexen demo
+     datafiles for you.
+    </p>
+  </description>
+  <url type="homepage">https://en.wikipedia.org/wiki/Hexen:_Beyond_Heretic</url>
+  <screenshots>
+    <screenshot type="default">http://vavoom-engine.com/images/shots/shot04.jpg</screenshot>
+    <screenshot>http://vavoom-engine.com/images/shots/shot05.jpg</screenshot>
+    <screenshot>http://vavoom-engine.com/images/shots/shot06.jpg</screenshot>
+  </screenshots>
+  <updatecontact>jwrdegoede_at_fedoraproject.org</updatecontact>
+</component>

hexen-demo.desktop

@@ -1,9 +1,9 @@
 [Desktop Entry]
-Encoding=UTF-8
 Name=Hexen
 Comment=Hexen Demo launcher, will automatically download the needed data-files
 Exec=hexen-demo
-Icon=tux-b2f.png
+Icon=tux-b2f
 Terminal=false
 Type=Application
 Categories=Game;ActionGame;
+Keywords=game;fps;first;person;shooter;hexen;

hexen.autodlrc

@@ -38,7 +38,8 @@ id Software, inc.[/TEXT]
 	[MD5]b30672df8b41fd35fafe40ce0c3855c3[/MD5]
 	[PATH]$HOME/.vavoom/hexen-demo[/PATH]
 	[MIRRORS]
-		[URL]http://www.parkerinfo.com/dmdo/downloads/hexndemo.zip[/URL]
+		[URL]http://downloads.sourceforge.net/salix-sbo/hexndemo.zip[/URL]
+		[URL]http://mirrors.syringanetworks.net/idgames/idstuff/hexen/hexndemo.zip[/URL]
 		[URL]ftp://ftp.fu-berlin.de/pc/msdos/games/idgames/idstuff/hexen/hexndemo.zip[/URL]
 		[URL]ftp://ftp.idsoftware.com/idstuff/hexen/hexndemo.zip[/URL]
 	[/MIRRORS]

sources

@@ -1 +1 @@
-0a0d3781cfeb5625d54abf6a1f4da4bc  vavoom-1.27.1.tar.bz2
+f3b40df71eeb2f1c8956b81c995dfc28  vavoom-1.33.tar.bz2

strife-demo.appdata.xml

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component type="desktop">
+  <id>strife-demo.desktop</id>
+  <metadata_license>CC0-1.0</metadata_license>
+  <project_license>proprietary</project_license>
+  <name>Strife demo installer</name>
+  <summary>Strife, classic first person shooter, demo installer</summary>
+  <description>
+    <p>
+     Strife is Rogue Entertainment's classic first person shooter with
+     role-playing game elements. The Strife engine is Open Source. The original
+     Strife datafiles however are not Open Source. There is a gratis, but not
+     Open Source demo version available on the internet.
+    </p>
+    <p>
+     This package contains an applications menu entry for playing Strife
+     demo using the vavoom engine. The first time you click this menu
+     entry, it will offer to download and install the Strife demo
+     datafiles for you.
+    </p>
+  </description>
+  <url type="homepage">https://en.wikipedia.org/wiki/Strife_%28video_game%29</url>
+  <screenshots>
+    <screenshot type="default">http://vavoom-engine.com/images/shots/shot07.jpg</screenshot>
+  </screenshots>
+  <updatecontact>jwrdegoede_at_fedoraproject.org</updatecontact>
+</component>

strife-demo.desktop

@@ -1,9 +1,9 @@
 [Desktop Entry]
-Encoding=UTF-8
 Name=Strife
 Comment=Strife Demo launcher, will automatically download the needed data-files
 Exec=strife-demo
-Icon=tux-b2f.png
+Icon=tux-b2f
 Terminal=false
 Type=Application
 Categories=Game;ActionGame;
+Keywords=game;fps;first;person;shooter;strife;

strife.autodlrc

@@ -17,10 +17,8 @@ Please click Accept to allow access to the internet to download the necessary da
 	[MD5]972070afb30c96fc3c69d954dfab2424[/MD5]
 	[PATH]$HOME/.vavoom/strife-demo[/PATH]
 	[MIRRORS]
-		[URL]http://www.gamers.org/pub/games/strife/strife11.zip[/URL]
+		[URL]http://mirrors.syringanetworks.net/idgames/roguestuff/strife11.zip[/URL]
 		[URL]ftp://ftp.fu-berlin.de/pc/msdos/games/idgames/roguestuff/strife11.zip[/URL]
-		[URL]http://downloads.planetmirror.com/pub/idgames/roguestuff/strife11.zip[/URL]
-		[URL]ftp://archives.3dgamers.com/pub/games/strife/strife11.zip[/URL]
 	[/MIRRORS]
 [/FILE]
 [/FILELIST]

vavoom-1.26-mikmod32.patch

@@ -1,13 +0,0 @@
-diff -up vavoom-1.26/source/s_mikmod.cpp~ vavoom-1.26/source/s_mikmod.cpp
---- vavoom-1.26/source/s_mikmod.cpp~	2008-02-17 20:10:24.000000000 +0100
-+++ vavoom-1.26/source/s_mikmod.cpp	2008-02-17 20:10:24.000000000 +0100
-@@ -97,6 +97,9 @@ MDRIVER			VMikModAudioCodec::Driver =
- 	255,
- #if (LIBMIKMOD_VERSION > 0x030106)
- 	"vavoom",
-+#if (LIBMIKMOD_VERSION >= 0x030200)
-+	"",
-+#endif
- 	NULL,
- #endif
- 	VMikModAudioCodec::Drv_IsThere,

vavoom-1.33-cmake4.patch

@@ -0,0 +1,35 @@
+diff -up vavoom-1.33/CMakeLists.txt~ vavoom-1.33/CMakeLists.txt
+--- vavoom-1.33/CMakeLists.txt~	2010-12-13 22:58:25.000000000 +0100
++++ vavoom-1.33/CMakeLists.txt	2026-02-13 16:38:52.528113329 +0100
+@@ -2,10 +2,7 @@ project(vavoom)
+ 
+ option(ENABLE_ZONE_DEBUG "Enable memory allocation debuging")
+ 
+-cmake_minimum_required(VERSION 2.4)
+-if(COMMAND cmake_policy)
+-	cmake_policy(SET CMP0003 NEW)
+-endif(COMMAND cmake_policy)
++cmake_minimum_required(VERSION 3.5)
+ 
+ if(NOT DEFINED DATADIR)
+ 	set(DATADIR share/vavoom)
+diff -up vavoom-1.33/basev/CMakeLists.txt~ vavoom-1.33/basev/CMakeLists.txt
+--- vavoom-1.33/basev/CMakeLists.txt~	2009-11-13 22:42:38.000000000 +0100
++++ vavoom-1.33/basev/CMakeLists.txt	2026-02-13 16:38:00.031421478 +0100
+@@ -1,5 +1,5 @@
+-get_target_property(VLUMPY vlumpy LOCATION)
+-get_target_property(ACC acc LOCATION)
++set (VLUMPY $<TARGET_FILE_NAME:vlumpy>)
++set (ACC $<TARGET_FILE_NAME:acc>)
+ 
+ add_subdirectory(common)
+ add_subdirectory(doom)
+diff -up vavoom-1.33/progs/CMakeLists.txt~ vavoom-1.33/progs/CMakeLists.txt
+--- vavoom-1.33/progs/CMakeLists.txt~	2008-09-11 22:10:51.000000000 +0200
++++ vavoom-1.33/progs/CMakeLists.txt	2026-02-13 16:36:57.736787137 +0100
+@@ -1,4 +1,4 @@
+-get_target_property(VCC vcc LOCATION)
++set (VCC $<TARGET_FILE_NAME:vcc>)
+ 
+ add_subdirectory(common)
+ add_subdirectory(doom)

vavoom-1.33-crash-on-exit.patch

@@ -0,0 +1,12 @@
+--- vavoom-1.33/source/vc_object.cpp~	2016-08-09 12:35:44.000000000 +0200
++++ vavoom-1.33/source/vc_object.cpp	2016-08-09 12:55:12.565307581 +0200
+@@ -187,7 +187,8 @@ void VObject::StaticExit()
+ 	GObjObjects.Clear();
+ 	GObjAvailable.Clear();
+ 	GObjInitialised = false;
+-	VMemberBase::StaticExit();
++	// This causes vavoom to crash on exit when build with -std=c++11
++	// VMemberBase::StaticExit();
+ }
+ 
+ //==========================================================================

vavoom-1.33-cx11.patch

@@ -0,0 +1,74 @@
+--- vavoom-1.33/libs/core/exception.h	2010-04-03 18:27:57.000000000 +0200
++++ vavoom-1.33.new/libs/core/exception.h	2016-08-09 12:20:12.901732326 +0200
+@@ -23,7 +23,7 @@
+ //**
+ //**************************************************************************
+ 
+-#define DO_GUARD		1
++#define DO_GUARD		0
+ #define DO_CHECK		1
+ 
+ #ifdef PARANOID
+@@ -95,9 +95,9 @@
+ #endif
+ 
+ #if defined(_DEBUG) || !DO_GUARD
+-#define guard(name)		{static const char __FUNC_NAME__[] = #name; {
+-#define unguard			}}
+-#define unguardf(msg)	}}
++#define guard(name)		{
++#define unguard			}
++#define unguardf(msg)		}
+ #elif defined(USE_GUARD_SIGNAL_CONTEXT)
+ #define guard(name)		{static const char __FUNC_NAME__[] = #name; \
+ 	__Context __LOCAL_CONTEXT__; try { if (setjmp(__Context::Env)) { \
+--- vavoom-1.33/source/sys_bsd.cpp	2010-04-03 16:16:11.000000000 +0200
++++ vavoom-1.33.new/source/sys_bsd.cpp	2016-08-09 12:27:56.608952461 +0200
+@@ -270,7 +270,7 @@
+ 	signal(s, SIG_IGN);
+ 
+ 	//	Exit with error message
+-#ifdef __linux__
++#if defined __linux__ && DO_GUARD
+ 	switch (s)
+ 	{
+ 	case SIGABRT:
+--- vavoom-1.33/source/vc_object.cpp	2016-08-09 12:31:16.124337565 +0200
++++ vavoom-1.33.new/source/vc_object.cpp	2016-08-09 12:15:13.828657354 +0200
+@@ -135,7 +135,7 @@
+ //
+ //==========================================================================
+ 
+-void VObject::operator delete(void* Object)
++void VObject::operator delete(void* Object) noexcept
+ {
+ 	Z_Free(Object);
+ }
+@@ -146,7 +146,12 @@
+ //
+ //==========================================================================
+ 
+-void VObject::operator delete(void* Object, const char*, int)
++void VObject::operator delete(void* Object, const char*, int) noexcept
++{
++	Z_Free(Object);
++}
++
++void VObject::operator delete(void* Object, std::size_t size) noexcept
+ {
+ 	Z_Free(Object);
+ }
+--- vavoom-1.33/source/vc_object.h	2010-04-03 16:16:11.000000000 +0200
++++ vavoom-1.33.new/source/vc_object.h	2016-08-09 12:15:25.499738024 +0200
+@@ -147,8 +147,9 @@
+ #endif
+ 	void* operator new(size_t);
+ 	void* operator new(size_t, const char*, int);
+-	void operator delete(void*);
+-	void operator delete(void*, const char*, int);
++	void operator delete(void*) noexcept;
++	void operator delete(void*, const char*, int) noexcept;
++	void operator delete(void*, std::size_t size) noexcept;
+ #ifdef ZONE_DEBUG_NEW
+ #define new ZONE_DEBUG_NEW
+ #endif

vavoom-1.33-default-iwaddir.patch

@@ -0,0 +1,23 @@
+Subject: Add support for system iwad dirs
+Author: Hans de Goede <hdegoede@redhat.com>
+
+Make vavoom check /usr/share/games/doom and /usr/share/doom for wads
+when no iwaddir is specified on the commandline.
+
+Signed-off-by: Hans de Goede <hdegoede@redhat.com>
+diff -up vavoom-1.33/source/files.cpp~ vavoom-1.33/source/files.cpp
+--- vavoom-1.33/source/files.cpp~	2016-01-04 21:09:15.000000000 +0100
++++ vavoom-1.33/source/files.cpp	2016-01-04 21:16:04.440620918 +0100
+@@ -487,6 +487,12 @@ void FL_Init()
+ 		}
+ 	}
+ 
++	// If no dirs were specified look in the system default dir
++	if (IWadDirs.Num() == 0) {
++		IWadDirs.Append("/usr/share/games/doom");
++		IWadDirs.Append("/usr/share/doom");
++	}
++
+ 	AddGameDir("basev/common");
+ 
+ 	p = GArgs.CheckValue("-iwad");

vavoom-1.33-dont-override-delete.patch

@@ -0,0 +1,151 @@
+Subject: Don't override the global new and delete operators
+Author: Hans de Goede <hdegoede@redhat.com>
+
+vavoom used to override the global new and delete operators, this is a
+bad idea and leads to e.g. crashes inside mesa.
+
+Some code paths in vavoom rely on Z_Malloc / new resp. Z_Free / delete
+to be interchangable, e.g. source/vc_type.cpp VScriptArray::Clear
+sometimes calls delete[] on memory allocated with Z_Malloc.
+
+So we cannot simply just remove the custom new / delete operator
+implementations, in stead this patch removes these operator overrides,
+and re-implements Z_Malloc / Z_Free as wrappers around new / delete,
+keeping the interchangability, while dropping the troublesome override
+of the global new / delete operators.
+
+Signed-off-by: Hans de Goede <hdegoede@redhat.com>
+--- vavoom-1.33/libs/core/zone.cpp	2010-04-21 15:15:40.000000000 +0200
++++ vavoom-1.33.new/libs/core/zone.cpp	2016-01-03 20:38:07.029914648 +0100
+@@ -33,6 +33,8 @@
+ 
+ #include "core.h"
+ 
++#if 0
++
+ // MACROS ------------------------------------------------------------------
+ 
+ #define SMALLID				0x22
+@@ -516,3 +518,4 @@
+ }
+ 
+ #endif
++#endif
+--- vavoom-1.33/libs/core/zone.h	2010-12-23 20:47:55.000000000 +0100
++++ vavoom-1.33.new/libs/core/zone.h	2016-01-03 20:39:57.420007907 +0100
+@@ -27,88 +27,20 @@
+ //**
+ //**************************************************************************
+ 
+-//#define ZONE_DEBUG		1
+-
+ void Z_Shutdown();
+ 
+-#ifdef ZONE_DEBUG
+-
+-void* Z_Malloc(int size, const char* FileName, int LineNumber);
+-void* Z_Calloc(int size, const char* FileName, int LineNumber);
+-void Z_Free(void* ptr, const char* FileName, int LineNumber);
+-
+-inline void* operator new(size_t Size, const char* FileName, int LineNumber)
+-{
+-	return Z_Malloc(Size, FileName, LineNumber);
+-}
+-
+-inline void operator delete(void* Ptr, const char* FileName, int LineNumber)
+-{
+-	Z_Free(Ptr, FileName, LineNumber);
+-}
+-
+-inline void* operator new[](size_t Size, const char* FileName, int LineNumber)
+-{
+-	return Z_Malloc(Size, FileName, LineNumber);
+-}
+-
+-inline void operator delete[](void* Ptr, const char* FileName, int LineNumber)
+-{
+-	Z_Free(Ptr, FileName, LineNumber);
+-}
+-
+-inline void* operator new(size_t Size)
+-{
+-	return Z_Malloc(Size, "", 0);
+-}
+-
+-inline void operator delete(void* Ptr)
++static inline void* Z_Malloc(int size)
+ {
+-	Z_Free(Ptr, "", 0);
++  return static_cast<void *>(operator new(size));
+ }
+ 
+-inline void* operator new[](size_t Size)
++static inline void* Z_Calloc(int size)
+ {
+-	return Z_Malloc(Size, "", 0);
++  return memset(Z_Malloc(size), 0, size);
+ }
+ 
+-inline void operator delete[](void* Ptr)
++static inline void Z_Free(void* ptr)
+ {
+-	Z_Free(Ptr, "", 0);
++  char *p = (char *)ptr;
++  delete p;
+ }
+-
+-#define Z_Malloc(size)				Z_Malloc(size, __FILE__, __LINE__)
+-#define Z_Calloc(size)				Z_Calloc(size, __FILE__, __LINE__)
+-#define Z_Free(ptr)					Z_Free(ptr, __FILE__, __LINE__)
+-
+-#define ZONE_DEBUG_NEW				new(__FILE__, __LINE__)
+-#undef new
+-#define new							ZONE_DEBUG_NEW
+-
+-#else
+-
+-void* Z_Malloc(int size);
+-void* Z_Calloc(int size);
+-void Z_Free(void* ptr);
+-
+-inline void* operator new(size_t Size)
+-{
+-	return Z_Malloc(int(Size));
+-}
+-
+-inline void operator delete(void* Ptr)
+-{
+-	Z_Free(Ptr);
+-}
+-
+-inline void* operator new[](size_t Size)
+-{
+-	return Z_Malloc(int(Size));
+-}
+-
+-inline void operator delete[](void* Ptr)
+-{
+-	Z_Free(Ptr);
+-}
+-
+-#endif
+--- vavoom-1.33/source/host.cpp	2010-06-04 23:20:22.000000000 +0200
++++ vavoom-1.33.new/source/host.cpp	2016-01-03 20:42:04.898651198 +0100
+@@ -706,5 +706,5 @@
+ 
+ 	SAFE_SHUTDOWN(VObject::StaticExit, ())
+ 	SAFE_SHUTDOWN(VName::StaticExit, ())
+-	SAFE_SHUTDOWN(Z_Shutdown, ())
++//	SAFE_SHUTDOWN(Z_Shutdown, ())
+ }
+--- vavoom-1.33/source/sys_sdl.cpp~	2010-09-07 22:05:19.000000000 +0200
++++ vavoom-1.33/source/sys_sdl.cpp	2016-01-03 20:52:32.566259819 +0100
+@@ -530,7 +530,7 @@ int main(int argc,char** argv)
+ 	catch (VavoomError &e)
+ 	{
+ 		Host_Shutdown();
+-		stack_trace();
++//		stack_trace();
+ 
+ 		printf("\n%s\n", e.message);
+ 		dprintf("\n\nERROR: %s\n", e.message);

vavoom-1.33-format-security.patch

@@ -0,0 +1,51 @@
+diff -up vavoom-1.33/utils/vcc/vcc.cpp~ vavoom-1.33/utils/vcc/vcc.cpp
+--- vavoom-1.33/utils/vcc/vcc.cpp~	2010-04-21 15:15:40.000000000 +0200
++++ vavoom-1.33/utils/vcc/vcc.cpp	2014-06-20 15:15:47.297819212 +0200
+@@ -122,7 +122,7 @@ int main(int argc, char **argv)
+ 	}
+ 	catch (VException& e)
+ 	{
+-		FatalError(e.What());
++		FatalError("%s", e.What());
+ 	}
+ 	return 0;
+ }
+diff -up vavoom-1.33/source/misc.cpp~ vavoom-1.33/source/misc.cpp
+--- vavoom-1.33/source/misc.cpp~	2010-09-01 20:26:05.000000000 +0200
++++ vavoom-1.33/source/misc.cpp	2014-06-20 15:23:18.803404958 +0200
+@@ -119,7 +119,7 @@ void FOutputDevice::Logf(EName Type, con
+ 
+ void VLogSysError::Serialise(const char* V, EName)
+ {
+-	Sys_Error(V);
++	Sys_Error("%s", V);
+ }
+ 
+ //==========================================================================
+@@ -130,7 +130,7 @@ void VLogSysError::Serialise(const char*
+ 
+ void VLogHostError::Serialise(const char* V, EName)
+ {
+-	Host_Error(V);
++	Host_Error("%s", V);
+ }
+ 
+ //==========================================================================
+diff -up vavoom-1.33/source/vc_object.cpp~ vavoom-1.33/source/vc_object.cpp
+--- vavoom-1.33/source/vc_object.cpp~	2010-06-04 23:20:21.000000000 +0200
++++ vavoom-1.33/source/vc_object.cpp	2014-06-20 15:27:33.178529910 +0200
+@@ -477,12 +477,12 @@ IMPLEMENT_FUNCTION(VObject, IsDestroyed)
+ 
+ IMPLEMENT_FUNCTION(VObject, Error)
+ {
+-	Host_Error(*PF_FormatString());
++	Host_Error("%s", *PF_FormatString());
+ }
+ 
+ IMPLEMENT_FUNCTION(VObject, FatalError)
+ {
+-	Sys_Error(*PF_FormatString());
++	Sys_Error("%s", *PF_FormatString());
+ }
+ 
+ //**************************************************************************

vavoom-1.33-gcc6.patch

@@ -0,0 +1,23 @@
+diff -up vavoom-1.33/source/vc_dehacked.cpp~ vavoom-1.33/source/vc_dehacked.cpp
+--- vavoom-1.33/source/vc_dehacked.cpp~	2010-06-04 23:20:22.000000000 +0200
++++ vavoom-1.33/source/vc_dehacked.cpp	2016-02-22 14:25:53.611745006 +0100
+@@ -128,8 +128,8 @@ static const VDehFlag DehFlags[] =
+ 	{ 0, "TRANSLUC75", 0x20000000 },
+ 	{ 0, "STEALTH", 0x40000000 },
+ 	{ 0, "UNUSED4", 0x40000000 },
+-	{ 0, "TRANSLUCENT", 0x80000000 },
+-	{ 0, "TRANSLUC50", 0x80000000 },
++	{ 0, "TRANSLUCENT", (int)0x80000000 },
++	{ 0, "TRANSLUC50", (int)0x80000000 },
+ 	{ 1, "LOGRAV", 0x00000001 },
+ 	{ 1, "WINDTHRUST", 0x00000002 },
+ 	{ 1, "FLOORBOUNCE", 0x00000004 },
+@@ -161,7 +161,7 @@ static const VDehFlag DehFlags[] =
+ 	{ 1, "DORMANT", 0x10000000 },
+ 	{ 1, "ICEDAMAGE", 0x20000000 },
+ 	{ 1, "SEEKERMISSILE", 0x40000000 },
+-	{ 1, "REFLECTIVE", 0x80000000 },
++	{ 1, "REFLECTIVE", (int)0x80000000 },
+ 	//	Ignored flags
+ 	{ 0, "SLIDE", 0 },
+ 	{ 0, "UNUSED2", 0 },

vavoom-1.33-misc-fixes.patch

@@ -0,0 +1,44 @@
+--- vavoom-1.33/source/host.cpp~	2016-08-09 12:31:16.000000000 +0200
++++ vavoom-1.33/source/host.cpp	2016-08-09 12:42:15.942913575 +0200
+@@ -522,8 +522,8 @@ void Host_Error(const char *error, ...)
+ 
+ COMMAND(Version)
+ {
+-	GCon->Log("VAVOOM version " VERSION_TEXT" (r" SVN_REVISION_STRING ").");
+-	GCon->Log("Compiled "__DATE__" "__TIME__".");
++	GCon->Log("VAVOOM version " VERSION_TEXT " (r" SVN_REVISION_STRING ").");
++	GCon->Log("Compiled " __DATE__ " " __TIME__ ".");
+ }
+ 
+ //==========================================================================
+--- vavoom-1.33/source/vc_expr_invoke.cpp~	2010-09-01 20:26:05.000000000 +0200
++++ vavoom-1.33/source/vc_expr_invoke.cpp	2016-08-09 12:41:08.959449151 +0200
+@@ -740,7 +740,7 @@ void VInvocation::CheckParams(VEmitConte
+ 					if (!Args[i]->Type.Equals(Func->ParamTypes[i]))
+ 					{
+ 						//FIXME This should be error.
+-						if (!Func->ParamFlags[NumArgs] & FPARM_Optional)
++						if (!(Func->ParamFlags[NumArgs] & FPARM_Optional))
+ 						{
+ 							Args[i]->Type.CheckMatch(Args[i]->Loc, Func->ParamTypes[i]);
+ 							//ParseError(Args[i]->Loc, "Out parameter types must be equal");
+@@ -750,7 +750,7 @@ void VInvocation::CheckParams(VEmitConte
+ 				}
+ 				else
+ 				{
+-					if (!Func->ParamFlags[NumArgs] & FPARM_Optional)
++					if (!(Func->ParamFlags[NumArgs] & FPARM_Optional))
+ 					{
+ 						Args[i]->Type.CheckMatch(Args[i]->Loc, Func->ParamTypes[i]);
+ 					}
+--- vavoom-1.33/utils/vcc/vcc.cpp~	2016-08-09 12:31:16.000000000 +0200
++++ vavoom-1.33/utils/vcc/vcc.cpp	2016-08-09 12:43:16.904336245 +0200
+@@ -171,7 +171,7 @@ static void DisplayUsage()
+ {
+ 	//	Print usage.
+ 	printf("\n");
+-	printf("VCC Version 1.%d. Copyright (c)2000-2001 by JL.          ("__DATE__" "__TIME__")\n", PROG_VERSION);
++	printf("VCC Version 1.%d. Copyright (c)2000-2001 by JL.          (" __DATE__ " " __TIME__ ")\n", PROG_VERSION);
+ 	printf("Usage: vcc [options] source[.c] [object[.dat]]\n");
+ 	printf("    -d<file>     Output debugging information into specified file\n");
+ 	printf("    -a<function> Output function's ASM statements into debug file\n");

vavoom-1.33-wxwidgets3.0.patch

@@ -0,0 +1,23 @@
+diff -up vavoom-1.33/utils/vlaunch/CMakeLists.txt.wx3 vavoom-1.33/utils/vlaunch/CMakeLists.txt
+--- vavoom-1.33/utils/vlaunch/CMakeLists.txt.wx3	2010-12-13 16:01:21.000000000 -0500
++++ vavoom-1.33/utils/vlaunch/CMakeLists.txt	2018-10-28 20:53:27.545594859 -0400
+@@ -1,5 +1,7 @@
+ if(ENABLE_LAUNCHER)
+ 
++	set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
++
+ 	find_package(wxWidgets REQUIRED)
+ 	include(${wxWidgets_USE_FILE})
+ 
+diff -up vavoom-1.33/utils/vlaunch/vlaunch.cpp.wx3 vavoom-1.33/utils/vlaunch/vlaunch.cpp
+--- vavoom-1.33/utils/vlaunch/vlaunch.cpp.wx3	2011-01-01 06:51:56.000000000 -0500
++++ vavoom-1.33/utils/vlaunch/vlaunch.cpp	2018-10-28 20:32:37.076595864 -0400
+@@ -133,7 +133,7 @@ IMPLEMENT_APP(VLaunchApp)
+ 
+ VMain::VMain()
+ : wxFrame(NULL, wxID_ANY, wxT("Vavoom launcher"), wxDefaultPosition, wxDefaultSize,
+-	wxDEFAULT_FRAME_STYLE & ~ (wxRESIZE_BORDER | wxRESIZE_BOX | wxMAXIMIZE_BOX))
++	wxDEFAULT_FRAME_STYLE & ~ (wxRESIZE_BORDER | wxMAXIMIZE_BOX))
+ {
+ 	SetIcon(wxICON(vlaunch));
+ 

vavoom.6

@@ -0,0 +1,133 @@
+.TH vavoom 6 games
+.SS NAME 
+vavoom \- The most advanced Doom/Heretic/Hexen/Strife source port around!
+.SH SYNOPSIS
+.B vavoom
+[ \-opengl ] [ \-d3d ] [ \-particles \fIn\fR ] [ \-surfcachesize \fIn\fR ] [ \-nosound ] [ \-no3dsound ] [ \-nomusic ] [ \-cddev \fIfile\fR ] [ \-openal ] [ \-nomouse ] [ \-nojoy ] [ \-nolan ] [ \-noudp ] [ \-ip \fIip_addr\fR ] [ \-noipx ] [ \-mpath ] [ \-port \fIn\fR ] { [ \-freedoom] | [ \-doom ] | [ \-doom2 ] | [ \-tnt ] | [ \-plutonia ] | [ \-heretic ] | [ \-hexen ] | [ \-strife ] } [ \-game \fIdirectory\fR ] [ \-devgame \fIdirectory\fR ] [ \-devsnd \fIsndinfo_script\fR ] [ \-progs \fIdirectory\fP ] 
+
+.SH DESCRIPTION
+
+.B Vavoom
+is a source port based on sources of Doom, Heretic, Hexen and
+a little bit from Quake. Supported platforms are Windows and Linux.
+Vavoom has a graphical launcher (vlaunch).
+
+.SH Graphic Options
+.TP
+.BI \-opengl
+selects OpenGL driver
+.TP
+.BI \-d3d
+selects Direct3D driver
+.TP
+.BI \-particles\  <count> 
+specifies number of particles to use, default is 2048, but you can't have less than 512 (i.e. you can't disable them)
+.TP
+.BI \-surfcachesize\  <size>
+specifies size of surface cache memory, in kilobytes
+.SH Sound Options
+.TP
+.BI \-nosound
+disables all sound, music and CD-Audio
+.TP
+.BI \-nosfx
+disables sound
+.TP
+.BI \-no3dsound
+disables 3D sound, use original mode, Windows version only
+.TP
+.BI \-nomusic
+disables music
+.TP
+.BI \-nocdaudio
+disables CD music
+.TP
+.BI \-cddev\  <file>
+specifies CD device \fIfile\fP, default /dev/cdrom, LINUX version only
+.TP
+.BI \-openal
+enabled OpenAL driver.
+.SH Input Options
+.BI \-nomouse
+disables mouse
+.TP
+.BI \-nojoy
+disables joystick
+.SH Network Options
+.BI \-nolan
+disables all LAN drivers
+.TP
+.BI \-noudp
+disables TCP/IP driver
+.TP
+.BI \-ip\  <address>
+specifies IP address, Windows version only
+.TP
+.BI \-noipx
+disables IPX driver
+.TP
+.BI \-mpath
+enables MPATH TCP/IP driver, DOS version only
+.TP
+.BI \-port\  <port>
+sets default LAN port
+.SH Game selection
+.BI \-freedoom
+look only for FreeDoom IWAD files
+.TP
+.BI \-doom
+look only for Doom IWAD files
+.TP
+.BI \-doom2
+look only for Doom 2: Hell On Earth IWAD files
+.TP
+.BI \-tnt
+look only for Doom TNT: Evilution IWAD files
+.TP
+.BI \-plutonia
+look only for Doom: The Plutionia Experiment IWAD files
+.TP
+.BI \-heretic
+look only for Heretic IWAD files
+.TP
+.BI \-hexen
+look only for Hexen IWAD files
+.TP
+.BI \-strife
+look only for Strife IWAD files
+.SH Custom games and development
+.BI \-game\  <directory>
+specifies custom game.
+.TP
+.BI \-devgame\  <directory>
+like \fI-game\fR, but also sets Vavoom in development mode.
+.TP
+.BI \-devsound\  <SNDINFO_script>
+sets sound development mode, uses given SNDINFO script, sounds and music are loaded form archive \fIdirectory\fP, which is specified in script.
+.TP
+.BI \-progs\   <directory>
+specifies \fIdirectory\fP where to look for progs. Server progs are loaded from \fIfile\fP svprogs.dat, client progs - clprogs.dat. Path must include ending slash.
+    Example: \-progs progs/myprogs/
+.TP
+.BI \-file\   <file1> [<file2> \.\.\.]
+specifies additional files.
+.TP
+.BI \-iwaddir\   <dir1> [<dir2> \.\.\.]
+specifies additional directories where to look for IWAD files.
+.SH Debugging Options
+.BI \-debug
+creates a debug \fIfile\fP basev/debug.txt with all console messages.
+.TP
+.BI \-starttime\  <time>
+sets start time, not in LINUX version and dedicated servers
+.TP
+.BI \-rhide
+prints debugfile to stderr, in DOS version Sys_Error exits with call frame traceback
+.SH More Information
+http://vavoom-engine.com/wiki/index.php?title=Command_line_arguments
+
+/usr/share/doc/vavoom/vavoom.txt.gz
+.PP
+Doom is a registered trademark of id software (http://www.idsoftware.com/).
+.SH Author
+See the copyright file on \fI/usr/share/doc/vavoom/copyright\fR

vavoom.appdata.xml

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component type="desktop">
+  <id>vavoom.desktop</id>
+  <metadata_license>CC0-1.0</metadata_license>
+  <project_license>GPL-2.0+</project_license>
+  <name>Vavoom</name>
+  <summary>Enhanced Doom/Heretic/Hexen/Strife engine</summary>
+  <description>
+    <p>
+     Vavoom is an enhanced open-source port of Doom. Allowing you to play the
+     classic 3D first-person shooter Doom and the Doom derived classics
+     Heretic, Hexen and Strife.
+    </p>
+    <p>     
+     Compared to the original games vavoom adds extra features such as
+     translucency, freelook support, opengl-rendering and a Quake like console.
+    </p>
+  </description>
+  <url type="homepage">http://vavoom-engine.com/</url>
+  <screenshots>
+    <screenshot type="default">http://vavoom-engine.com/images/shots/shot00.jpg</screenshot>
+    <screenshot>http://vavoom-engine.com/images/shots/shot01.jpg</screenshot>
+    <screenshot>http://vavoom-engine.com/images/shots/shot03.jpg</screenshot>
+    <screenshot>http://vavoom-engine.com/images/shots/shot04.jpg</screenshot>
+    <screenshot>http://vavoom-engine.com/images/shots/shot07.jpg</screenshot>
+  </screenshots>
+  <updatecontact>jwrdegoede_at_fedoraproject.org</updatecontact>
+</component>

vavoom.desktop

@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=Vavoom
+Comment=Vavoom launcher
+Exec=vlaunch
+Icon=vavoom
+Terminal=false
+Type=Application
+Categories=Game;ActionGame;
+Keywords=game;fps;first;person;shooter;doom;heretic;hexen;strife;

vavoom.spec

@@ -1,7 +1,10 @@
+# vavoom's CMakefiles are a mess, force in-source building
+%global _vpath_builddir .
+
 Name:           vavoom
-Version:        1.27.1
-Release:        1%{?dist}
-Summary:        Enhanced Doom, Heretic, Hexen and Strife source port
+Version:        1.33
+Release:        51%{?dist}
+Summary:        Enhanced Doom, Heretic, Hexen and Strife source port - meta package
 Source0:        http://downloads.sourceforge.net/vavoom/%{name}-%{version}.tar.bz2
 Source1:        doom.autodlrc
 Source2:        heretic.autodlrc
@@ -15,21 +18,56 @@ Source9:        doom-shareware.desktop
 Source10:       heretic-shareware.desktop
 Source11:       hexen-demo.desktop
 Source12:       strife-demo.desktop
-Source13:       doom-logo.png
-Source14:       tux-b2f.png
+Source13:       vavoom.desktop
+Source14:       doom-shareware.appdata.xml
+Source15:       heretic-shareware.appdata.xml
+Source16:       hexen-demo.appdata.xml
+Source17:       strife-demo.appdata.xml
+Source18:       vavoom.appdata.xml
+Source19:       vavoom.png
+Source20:       doom-logo.png
+Source21:       tux-b2f.png
+Source22:       vavoom.6
 Patch0:         vavoom-1.21-datadir.patch
-Patch1:         vavoom-1.26-mikmod32.patch
-Patch2:         vavoom-1.27-CMakeLists.patch
+Patch1:         vavoom-1.27-CMakeLists.patch
+Patch2:         vavoom-1.33-format-security.patch
+Patch3:         vavoom-1.33-dont-override-delete.patch
+Patch4:         vavoom-1.33-default-iwaddir.patch
+Patch5:         vavoom-1.33-gcc6.patch
+Patch6:         vavoom-1.33-misc-fixes.patch
+# Incomplete patch to build with -std=c++11 not used as this crashes on exit
+#Patch7:        vavoom-1.33-cx11.patch
+# Hack for crash on exit when building with -std=c++11, not used
+#Patch8:        vavoom-1.33-crash-on-exit.patch
+Patch9:         vavoom-1.33-wxwidgets3.0.patch
+Patch10:        vavoom-1.33-cmake4.patch
 URL:            http://vavoom-engine.com/
-Group:          Amusements/Games
-License:        GPLv2+
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+# Automatically converted from old format: GPLv2+ - review is highly recommended.
+License:        GPL-2.0-or-later
+BuildRequires: make
+BuildRequires:  gcc
+BuildRequires:  gcc-c++
 BuildRequires:  SDL_mixer-devel SDL_net-devel libpng-devel libjpeg-devel
-BuildRequires:  libvorbis-devel mikmod-devel flac-devel openal-devel
+BuildRequires:  libvorbis-devel mikmod-devel flac-devel openal-soft-devel
 BuildRequires:  libGLU-devel wxGTK-devel desktop-file-utils cmake
-Requires:       timidity++-patches hicolor-icon-theme autodownloader
+BuildRequires:  libappstream-glib
+Requires:       %{name}-engine = %{version}-%{release}
+Requires:       %{name}-doom-shareware = %{version}-%{release}
+Requires:       %{name}-heretic-shareware = %{version}-%{release}
+Requires:       %{name}-hexen-demo = %{version}-%{release}
+Requires:       %{name}-strife-demo = %{version}-%{release}
 
 %description
+Vavoom is an enhanced open-source port of Doom. The "vavoom" meta-package
+installs vavoom-engine, and launchers / menu-entries to download and play
+doom-shareware, heretic-shareware, hexen-demo and strife-demo.
+
+
+%package engine
+Summary:        Enhanced Doom, Heretic, Hexen and Strife game engine
+Requires:       timidity++-patches hicolor-icon-theme
+
+%description engine
 Vavoom is an enhanced open-source port of Doom. Allowing you to play not only
 the classic 3D first-person shooter Doom, but also the Doom derived classics
 Heretic, Hexen and Strife. Compared to the original games it adds extra
@@ -37,26 +75,104 @@ features such as translucency and freelook support and ofcourse the capability
 to play these classics under Linux.
 
 
+%package doom-shareware
+Summary:        Doom shareware installer
+BuildArch:      noarch
+Requires:       %{name}-engine = %{version}-%{release}
+Requires:       autodownloader unzip
+
+%description doom-shareware
+Doom is id Software's classic first person shooter follow-up to
+Wolfenstein 3D. The Doom engine is Open Source. The original Doom datafiles
+however are not Open Source. There is a gratis, but not Open Source shareware
+version available on the internet.
+
+This package contains an applications menu entry for playing Doom shareware
+using the vavoom engine.  The first time you click this menu entry, it will
+offer to download and install the Doom shareware datafiles for you.
+
+
+%package heretic-shareware
+Summary:        Heretic shareware installer
+BuildArch:      noarch
+Requires:       %{name}-engine = %{version}-%{release}
+Requires:       autodownloader unzip
+
+%description heretic-shareware
+Heretic is Raven's classic dark fantasy first person shooter using a
+modified Doom engine. The Heretic engine is Open Source. The original
+Heretic datafiles however are not Open Source. There is a gratis, but not
+Open Source shareware version available on the internet.
+
+This package contains an applications menu entry for playing Heretic
+shareware using the vavoom engine. The first time you click this menu
+entry, it will offer to download and install the Heretic shareware
+datafiles for you.
+
+
+%package hexen-demo
+Summary:        Hexen demo installer
+BuildArch:      noarch
+Requires:       %{name}-engine = %{version}-%{release}
+Requires:       autodownloader unzip
+
+%description hexen-demo
+Hexen: Beyond Heretic is Raven's classic dark fantasy first person shooter
+follow-up to Heretic. The Hexen engine is Open Source. The original Hexen
+datafiles however are not Open Source. There is a gratis, but not Open
+Source demo version available on the internet.
+
+This package contains an applications menu entry for playing Hexen
+demo using the vavoom engine. The first time you click this menu
+entry, it will offer to download and install the Hexen demo
+datafiles for you.
+
+
+%package strife-demo
+Summary:        Strife demo installer
+BuildArch:      noarch
+Requires:       %{name}-engine = %{version}-%{release}
+Requires:       autodownloader unzip
+
+%description strife-demo
+Strife is Rogue Entertainment's classic first person shooter with
+role-playing game elements. The Strife engine is Open Source. The original
+Strife datafiles however are not Open Source. There is a gratis, but not
+Open Source demo version available on the internet.
+
+This package contains an applications menu entry for playing Strife
+demo using the vavoom engine. The first time you click this menu
+entry, it will offer to download and install the Strife demo
+datafiles for you.
+
+
 %prep 
-%setup -q
-%patch0 -p1 -b .datadir
-%patch1 -p1 -b .mikmod32
-%patch2 -p1
+%autosetup -p1
 
 
 %build
+# Allow for CMake 4.0
+export CMAKE_POLICY_VERSION_MINIMUM=3.5
+# Build looks too complicated to allow building with Ninja
+# Keep on using Makefile
+%global _cmake_generator "Unix Makefiles"
+# Build with -std=gnu++98, c++11 causes issues on exit, likely due to
+# bad interactions with the new / delete overloading in vc_object.cpp
+export CXXFLAGS="$RPM_OPT_FLAGS -std=gnu++98 -fno-strict-aliasing -Wno-unused -Wno-unused-but-set-variable -Wno-unused-result -Wno-sign-compare -Wno-reorder"
 %cmake -DWITH_LIBMAD:BOOL=OFF
 
 # This one line sed command is easier than trying to muck with the Makefile
 # to add the proper -D definition.
 sed -i "s|#define FL_BASEDIR.*|#define FL_BASEDIR \"%{_datadir}/%{name}\"|" source/files.h
-sed -i "s|#define CONFIG_FILE.*|#define CONFIG_FILE \"%{_sysconfdir}/timidity.cfg\"|" source/timidity/config.h
+sed -i "s|#define CONFIG_FILE.*|#define CONFIG_FILE \"%{_sysconfdir}/timidity.cfg\"|" source/timidity/timidity.h
 
+# source/CMakeLists.txt lacks dependencies to generate svnrev.h, force it
+make -C source revision_check
+make linespec
+# no -j# because there are more dependency issues in source/CMakeLists.txt
 make VERBOSE=1
 
-
 %install
-rm -rf $RPM_BUILD_ROOT
 make install \
         DESTDIR=$RPM_BUILD_ROOT \
         INSTALL_PARMS="-m 0755" \
@@ -66,6 +182,9 @@ make install \
 mv $RPM_BUILD_ROOT%{_bindir}/%{name}.* $RPM_BUILD_ROOT%{_bindir}/%{name}
 mv $RPM_BUILD_ROOT%{_bindir}/%{name}-dedicated.* $RPM_BUILD_ROOT%{_bindir}/%{name}-dedicated
 
+# rm obsolete icon
+rm $RPM_BUILD_ROOT%{_datadir}/%{name}/%{name}.png
+
 # install autodl files and wrapper scripts
 install -p -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/%{name}
 install -p -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/%{name}
@@ -79,50 +198,262 @@ install -p -m 755 %{SOURCE8} $RPM_BUILD_ROOT%{_bindir}/strife-demo
 
 # below is the desktop file and icon stuff.
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
-desktop-file-install --vendor fedora            \
-  --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-  %{SOURCE9}
-desktop-file-install --vendor fedora            \
-  --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-  %{SOURCE10}
-desktop-file-install --vendor fedora            \
-  --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-  %{SOURCE11}
-desktop-file-install --vendor fedora            \
-  --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-  %{SOURCE12}
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps
-install -p -m 644 %{SOURCE13} %{SOURCE14} \
+for i in %{SOURCE9} %{SOURCE10} %{SOURCE11} %{SOURCE12} %{SOURCE13}; do
+  desktop-file-install --dir $RPM_BUILD_ROOT%{_datadir}/applications "$i"
+done
+
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/appdata
+for i in %{SOURCE14} %{SOURCE15} %{SOURCE16} %{SOURCE17} %{SOURCE18}; do
+  install -p -m 644 "$i" $RPM_BUILD_ROOT%{_datadir}/appdata
+  appstream-util validate-relax --nonet \
+    $RPM_BUILD_ROOT%{_datadir}/appdata/$(basename "$i")
+done
+
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/{48x48,96x96}/apps
+install -p -m 644 %{SOURCE19} \
+  $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/96x96/apps/
+install -p -m 644 %{SOURCE20} %{SOURCE21} \
   $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/
 
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
-%post
-touch --no-create %{_datadir}/icons/hicolor || :
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-fi
-
-%postun
-touch --no-create %{_datadir}/icons/hicolor || :
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-fi
-
+mkdir -p $RPM_BUILD_ROOT%{_mandir}/man6
+install -p -m 644 %{SOURCE22} $RPM_BUILD_ROOT%{_mandir}/man6
 
 %files
-%defattr(-,root,root,-)
-%doc docs/*.log docs/gnu.txt docs/vavoom.txt
+# no files, meta-package
+
+%files engine
+%doc docs/*.log docs/vavoom.txt
+%license docs/gnu.txt
 %{_bindir}/*
-%{_datadir}/%{name}
-%{_datadir}/applications/fedora-*.desktop
-%{_datadir}/icons/hicolor/48x48/apps/*.png
+%{_mandir}/man6/%{name}.6*
+%dir %{_datadir}/%{name}
+%{_datadir}/%{name}/basev
+%{_datadir}/appdata/%{name}.appdata.xml
+%{_datadir}/applications/%{name}.desktop
+%{_datadir}/icons/hicolor/*/apps/*.png
+
+%files doom-shareware
+%{_datadir}/%{name}/doom.autodlrc
+%{_datadir}/appdata/doom-shareware.appdata.xml
+%{_datadir}/applications/doom-shareware.desktop
+
+%files heretic-shareware
+%{_datadir}/%{name}/heretic.autodlrc
+%{_datadir}/appdata/heretic-shareware.appdata.xml
+%{_datadir}/applications/heretic-shareware.desktop
+
+%files hexen-demo
+%{_datadir}/%{name}/hexen.autodlrc
+%{_datadir}/appdata/hexen-demo.appdata.xml
+%{_datadir}/applications/hexen-demo.desktop
+
+%files strife-demo
+%{_datadir}/%{name}/strife.autodlrc
+%{_datadir}/appdata/strife-demo.appdata.xml
+%{_datadir}/applications/strife-demo.desktop
 
 
 %changelog
+* Fri Jul 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 1.33-51
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild
+
+* Fri Feb 13 2026 Cristian Le <git@lecris.dev> - 1.33-50
+- Allow to build with CMake 4.0 (rhbz#2381629)
+- Force using Makefile generator (rhbz#2381152)
+
+* Sat Jan 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 1.33-49
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
+
+* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.33-48
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
+
+* Tue May 27 2025 Jitka Plesnikova <jplesnik@redhat.com> - 1.33-47
+- Rebuilt for flac 1.5.0
+
+* Sun Jan 19 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.33-46
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
+
+* Fri Jul 26 2024 Miroslav Suchý <msuchy@redhat.com> - 1.33-45
+- convert license to SPDX
+
+* Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.33-44
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
+
+* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.33-43
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.33-42
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.33-41
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Wed Sep 14 2022 Michel Alexandre Salim <salimma@fedoraproject.org> - 1.33-40
+- Rebuilt for flac 1.4.0
+
+* Thu Aug 04 2022 Scott Talbert <swt@techie.net> - 1.33-39
+- Rebuild with wxWidgets 3.2
+
+* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.33-38
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.33-37
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.33-36
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.33-35
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Mon Aug 24 2020 Hans de Goede <hdegoede@redhat.com> - 1.33-34
+- Fix FTBFS (rhbz#1865603)
+
+* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.33-33
+- Second attempt - Rebuilt for
+  https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.33-32
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.33-31
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Fri Jan 17 2020 Jeff Law <law@redhat.com> - 1.33-30
+- Make linespec explicitly to ensure it's built early enough
+  as the generated Makefiles are missing dependencies
+
+* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.33-29
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.33-28
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Mon Oct 29 2018 Scott Talbert <swt@techie.net> - 1.33-27
+- Rebuild with wxWidgets 3.0
+
+* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.33-26
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.33-25
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
+* Thu Jan 18 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 1.33-24
+- Remove obsolete scriptlets
+
+* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.33-23
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
+
+* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.33-22
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
+* Mon Feb 13 2017 Hans de Goede <hdegoede@redhat.com> - 1.33-21
+- Fix FTBFS
+
+* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.33-20
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
+* Tue Aug  9 2016 Hans de Goede <hdegoede@redhat.com> - 1.33-19
+- Fix a bunch of compiler warnings (and silence some others)
+- Fix crash on exit:
+  https://retrace.fedoraproject.org/faf/reports/1192370/
+
+* Mon Feb 22 2016 Hans de Goede <hdegoede@redhat.com> - 1.33-18
+- Fix FTBFS (rhbz#1308217)
+
+* Fri Feb 05 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.33-17
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+
+* Mon Jan 11 2016 Hans de Goede <hdegoede@redhat.com> - 1.33-16
+- Split out the .desktop files, wrapper scripts and autodownloader files for:
+  doom-shareware, heretic-shareware, hexen-demo and strife-demo into
+  seperate sub-packages
+- Add one .appdata.xml file per .desktop file
+
+* Tue Jan  5 2016 Hans de Goede <hdegoede@redhat.com> - 1.33-15
+- Make vavoom work better with iwads installed in system dirs
+- Drop freedoom support again, this uses a builtin mapinfo.txt which is
+  already out of date with the latest freedoom version; advice: use prboom
+  to play freedoom instead
+- Update mirror lists
+
+* Mon Jan  4 2016 Hans de Goede <hdegoede@redhat.com> - 1.33-14
+- Fix crash in mesa / i965_dri.so caused by globally overriding delete
+- Add a manpage and support for freedoom (from Debian)
+- Add appdata
+
+* Fri Jun 19 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.33-13
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
+
+* Sat May 02 2015 Kalev Lember <kalevlember@gmail.com> - 1.33-12
+- Rebuilt for GCC 5 C++11 ABI change
+
+* Mon Aug 18 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.33-11
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
+
+* Fri Jun 20 2014 Hans de Goede <hdegoede@redhat.com> - 1.33-10
+- Fix FTBFS (rhbz#1037375)
+
+* Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.33-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
+* Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.33-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+
+* Sat Feb 09 2013 Parag Nemade <paragn AT fedoraproject DOT org> - 1.33-7
+- Remove vendor tag from desktop file as per https://fedorahosted.org/fesco/ticket/1077
+- Cleanup spec as per recently changed packaging guidelines
+
+* Mon Jan 21 2013 Adam Tkac <atkac redhat com> - 1.33-6
+- rebuild due to "jpeg8-ABI" feature drop
+
+* Fri Dec 21 2012 Adam Tkac <atkac redhat com> - 1.33-5
+- rebuild against new libjpeg
+
+* Sun Jul 22 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.33-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
+* Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.33-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+
+* Tue Dec 06 2011 Adam Jackson <ajax@redhat.com> - 1.33-2
+- Rebuild for new libpng
+
+* Sat Aug 20 2011 Rahul Sundaram <sundaram@fedoraproject.org> 1.33-1
+- New upstream release
+- Drop definition of buildroot, defattr and clean stage
+- Drop obsolete patches
+- Remove no longer valid doom shareware mirror in doom.autodlrc
+- Fixed sed line to apply to timidity.h instead of config.h which no longer exists
+
+* Mon Feb 07 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.30-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
+* Wed Jul 14 2010 Dan Horák <dan@danny.cz> - 1.30-5
+- rebuilt against wxGTK-2.8.11-2
+
+* Fri Nov 20 2009 Hans de Goede <hdegoede@redhat.com> 1.30-4
+- Fix building with cmake-2.8.x (#539127)
+
+* Sun Aug 16 2009 Hans de Goede <hdegoede@redhat.com> 1.30-3
+- Switch to openal-soft
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.30-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Fri Mar 20 2009 Hans de Goede <hdegoede@redhat.com> 1.30-1
+- New upstream release 1.30
+- Fix vavoom not working at all when compiled with gcc-4.4
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.29-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Tue Oct 28 2008 Hans de Goede <hdegoede@redhat.com> 1.29-1
+- New upstream release 1.29
+
+* Mon Jun 16 2008 Hans de Goede <j.w.r.degoede@hhs.nl> 1.28-1
+- New upstream release 1.28
+
 * Sun Apr 13 2008 Hans de Goede <j.w.r.degoede@hhs.nl> 1.27.1-1
 - New upstream bugfix release 1.27.1
 
@@ -172,7 +503,7 @@ fi
 * Sun Jul 23 2006 Wart <wart at kobold dot org> 1.21.1-1
 - Update to 1.21.1
 
-* Sat Jul 16 2006 Wart <wart at kobold dot org> 1.21-2
+* Sun Jul 16 2006 Wart <wart at kobold dot org> 1.21-2
 - Remove some comments from the spec file
 - Remove shell script wrappers from /usr/bin
 - Update datadir patch to 1.21