From af92e8df8c95e16421ce15add5eb2f7a76fbd52e Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Tue, 22 Apr 2008 00:26:00 +0000 Subject: [PATCH 01/70] Initialize branch F-9 for vavoom --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..1c26f78 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-9 From d91df2fe63742fa621570c713b7dd4f2f30e5b0a Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Mon, 16 Jun 2008 06:06:53 +0000 Subject: [PATCH 02/70] - New upstream release 1.28 --- .cvsignore | 2 +- sources | 2 +- vavoom.spec | 5 ++++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index 5ccb951..dad9559 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -vavoom-1.27.1.tar.bz2 +vavoom-1.28.tar.bz2 diff --git a/sources b/sources index 2aee70e..c047561 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -0a0d3781cfeb5625d54abf6a1f4da4bc vavoom-1.27.1.tar.bz2 +df12818579f50cb0777b4280b694cc91 vavoom-1.28.tar.bz2 diff --git a/vavoom.spec b/vavoom.spec index d923c6c..f830c73 100644 --- a/vavoom.spec +++ b/vavoom.spec @@ -1,5 +1,5 @@ Name: vavoom -Version: 1.27.1 +Version: 1.28 Release: 1%{?dist} Summary: Enhanced Doom, Heretic, Hexen and Strife source port Source0: http://downloads.sourceforge.net/vavoom/%{name}-%{version}.tar.bz2 @@ -123,6 +123,9 @@ fi %changelog +* Mon Jun 16 2008 Hans de Goede 1.28-1 +- New upstream release 1.28 + * Sun Apr 13 2008 Hans de Goede 1.27.1-1 - New upstream bugfix release 1.27.1 From e76f0c07b6489eee34d9ab6d7d5adf121b2de9c5 Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Wed, 29 Oct 2008 13:18:22 +0000 Subject: [PATCH 03/70] - New upstream release 1.29 --- .cvsignore | 2 +- sources | 2 +- vavoom-1.26-mikmod32.patch | 13 ------------- vavoom.spec | 11 ++++++----- 4 files changed, 8 insertions(+), 20 deletions(-) delete mode 100644 vavoom-1.26-mikmod32.patch diff --git a/.cvsignore b/.cvsignore index dad9559..73d0ad9 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -vavoom-1.28.tar.bz2 +vavoom-1.29.tar.bz2 diff --git a/sources b/sources index c047561..222a0f8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -df12818579f50cb0777b4280b694cc91 vavoom-1.28.tar.bz2 +752a29d890c3c5f4964a13ff54fcbad9 vavoom-1.29.tar.bz2 diff --git a/vavoom-1.26-mikmod32.patch b/vavoom-1.26-mikmod32.patch deleted file mode 100644 index e3fb4d5..0000000 --- a/vavoom-1.26-mikmod32.patch +++ /dev/null @@ -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, diff --git a/vavoom.spec b/vavoom.spec index f830c73..822772f 100644 --- a/vavoom.spec +++ b/vavoom.spec @@ -1,5 +1,5 @@ Name: vavoom -Version: 1.28 +Version: 1.29 Release: 1%{?dist} Summary: Enhanced Doom, Heretic, Hexen and Strife source port Source0: http://downloads.sourceforge.net/vavoom/%{name}-%{version}.tar.bz2 @@ -18,8 +18,7 @@ Source12: strife-demo.desktop Source13: doom-logo.png Source14: tux-b2f.png Patch0: vavoom-1.21-datadir.patch -Patch1: vavoom-1.26-mikmod32.patch -Patch2: vavoom-1.27-CMakeLists.patch +Patch1: vavoom-1.27-CMakeLists.patch URL: http://vavoom-engine.com/ Group: Amusements/Games License: GPLv2+ @@ -40,8 +39,7 @@ to play these classics under Linux. %prep %setup -q %patch0 -p1 -b .datadir -%patch1 -p1 -b .mikmod32 -%patch2 -p1 +%patch1 -p1 %build @@ -123,6 +121,9 @@ fi %changelog +* Tue Oct 28 2008 Hans de Goede 1.29-1 +- New upstream release 1.29 + * Mon Jun 16 2008 Hans de Goede 1.28-1 - New upstream release 1.28 From 4ec7c548596f21b161d6da20eccfbfeef9517567 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Wed, 25 Feb 2009 23:49:30 +0000 Subject: [PATCH 04/70] - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild --- vavoom.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vavoom.spec b/vavoom.spec index 822772f..98d99e2 100644 --- a/vavoom.spec +++ b/vavoom.spec @@ -1,6 +1,6 @@ Name: vavoom Version: 1.29 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Enhanced Doom, Heretic, Hexen and Strife source port Source0: http://downloads.sourceforge.net/vavoom/%{name}-%{version}.tar.bz2 Source1: doom.autodlrc @@ -121,6 +121,9 @@ fi %changelog +* Wed Feb 25 2009 Fedora Release Engineering - 1.29-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Tue Oct 28 2008 Hans de Goede 1.29-1 - New upstream release 1.29 From 4c673c129cf0cd58b96e83483a2fe5903bed21a2 Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Fri, 20 Mar 2009 08:49:54 +0000 Subject: [PATCH 05/70] - New upstream release 1.30 - Fix vavoom not working at all when compiled with gcc-4.4 --- .cvsignore | 2 +- sources | 2 +- vavoom-1.30-gcc44-fix.patch | 22 ++++++++++++++++++++++ vavoom.spec | 10 ++++++++-- 4 files changed, 32 insertions(+), 4 deletions(-) create mode 100644 vavoom-1.30-gcc44-fix.patch diff --git a/.cvsignore b/.cvsignore index 73d0ad9..6654b42 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -vavoom-1.29.tar.bz2 +vavoom-1.30.tar.bz2 diff --git a/sources b/sources index 222a0f8..cf72d0e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -752a29d890c3c5f4964a13ff54fcbad9 vavoom-1.29.tar.bz2 +205c3645006232d75790fb8779a54e85 vavoom-1.30.tar.bz2 diff --git a/vavoom-1.30-gcc44-fix.patch b/vavoom-1.30-gcc44-fix.patch new file mode 100644 index 0000000..9e5ae77 --- /dev/null +++ b/vavoom-1.30-gcc44-fix.patch @@ -0,0 +1,22 @@ +diff -up vavoom-1.30/source/p_switch.cpp~ vavoom-1.30/source/p_switch.cpp +--- vavoom-1.30/source/p_switch.cpp~ 2008-05-18 18:46:18.000000000 +0200 ++++ vavoom-1.30/source/p_switch.cpp 2009-03-20 09:31:58.000000000 +0100 +@@ -54,6 +54,7 @@ enum EBWhere + class VButton : public VThinker + { + DECLARE_CLASS(VButton, VThinker, 0) ++ VButton() {} + + vint32 Side; + vuint8 Where; +diff -up vavoom-1.30/source/ui_widget.h~ vavoom-1.30/source/ui_widget.h +--- vavoom-1.30/source/ui_widget.h~ 2008-01-03 09:36:55.000000000 +0100 ++++ vavoom-1.30/source/ui_widget.h 2009-03-20 09:31:59.000000000 +0100 +@@ -45,6 +45,7 @@ struct VClipRect + class VWidget : public VObject + { + DECLARE_CLASS(VWidget, VObject, 0) ++ VWidget() {} + + private: + // Parent container widget. diff --git a/vavoom.spec b/vavoom.spec index 98d99e2..3a58313 100644 --- a/vavoom.spec +++ b/vavoom.spec @@ -1,6 +1,6 @@ Name: vavoom -Version: 1.29 -Release: 2%{?dist} +Version: 1.30 +Release: 1%{?dist} Summary: Enhanced Doom, Heretic, Hexen and Strife source port Source0: http://downloads.sourceforge.net/vavoom/%{name}-%{version}.tar.bz2 Source1: doom.autodlrc @@ -19,6 +19,7 @@ Source13: doom-logo.png Source14: tux-b2f.png Patch0: vavoom-1.21-datadir.patch Patch1: vavoom-1.27-CMakeLists.patch +Patch2: vavoom-1.30-gcc44-fix.patch URL: http://vavoom-engine.com/ Group: Amusements/Games License: GPLv2+ @@ -40,6 +41,7 @@ to play these classics under Linux. %setup -q %patch0 -p1 -b .datadir %patch1 -p1 +%patch2 -p1 %build @@ -121,6 +123,10 @@ fi %changelog +* Fri Mar 20 2009 Hans de Goede 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 - 1.29-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From e0badc429f3463a3b5f3a9d4fe42113bf1a2b138 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Mon, 27 Jul 2009 06:44:40 +0000 Subject: [PATCH 06/70] - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild --- vavoom.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vavoom.spec b/vavoom.spec index 3a58313..47f8fce 100644 --- a/vavoom.spec +++ b/vavoom.spec @@ -1,6 +1,6 @@ Name: vavoom Version: 1.30 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Enhanced Doom, Heretic, Hexen and Strife source port Source0: http://downloads.sourceforge.net/vavoom/%{name}-%{version}.tar.bz2 Source1: doom.autodlrc @@ -123,6 +123,9 @@ fi %changelog +* Sun Jul 26 2009 Fedora Release Engineering - 1.30-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + * Fri Mar 20 2009 Hans de Goede 1.30-1 - New upstream release 1.30 - Fix vavoom not working at all when compiled with gcc-4.4 From f78cd0229e795ac8571474cfe2bffa6e9751a4de Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Mon, 17 Aug 2009 08:31:50 +0000 Subject: [PATCH 07/70] - Switch to openal-soft --- vavoom.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/vavoom.spec b/vavoom.spec index 47f8fce..adba4ae 100644 --- a/vavoom.spec +++ b/vavoom.spec @@ -1,6 +1,6 @@ Name: vavoom Version: 1.30 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Enhanced Doom, Heretic, Hexen and Strife source port Source0: http://downloads.sourceforge.net/vavoom/%{name}-%{version}.tar.bz2 Source1: doom.autodlrc @@ -25,7 +25,7 @@ Group: Amusements/Games License: GPLv2+ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 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 @@ -123,6 +123,9 @@ fi %changelog +* Sun Aug 16 2009 Hans de Goede 1.30-3 +- Switch to openal-soft + * Sun Jul 26 2009 Fedora Release Engineering - 1.30-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild From c5be6c1159026098c4e6cd935d0a9141677b35c2 Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Fri, 20 Nov 2009 12:39:38 +0000 Subject: [PATCH 08/70] - Fix building with cmake-2.8.x (#539127) --- vavoom-1.30-cmake28-fix.patch | 14 ++++++++++++++ vavoom.spec | 7 ++++++- 2 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 vavoom-1.30-cmake28-fix.patch diff --git a/vavoom-1.30-cmake28-fix.patch b/vavoom-1.30-cmake28-fix.patch new file mode 100644 index 0000000..bc51828 --- /dev/null +++ b/vavoom-1.30-cmake28-fix.patch @@ -0,0 +1,14 @@ +diff -up vavoom-1.30/utils/vlaunch/CMakeLists.txt~ vavoom-1.30/utils/vlaunch/CMakeLists.txt +--- vavoom-1.30/utils/vlaunch/CMakeLists.txt~ 2008-10-19 19:43:02.000000000 +0200 ++++ vavoom-1.30/utils/vlaunch/CMakeLists.txt 2009-11-20 11:46:46.000000000 +0100 +@@ -1,8 +1,7 @@ + if(ENABLE_LAUNCHER) + +- find_package(wxWidgets REQUIRED) +- add_definitions(${wxWidgets_DEFINITIONS}) +- include_directories(${wxWidgets_INCLUDE_DIRS}) ++ FIND_PACKAGE(wxWidgets REQUIRED) ++ INCLUDE(${wxWidgets_USE_FILE}) + + set(VLAUNCH_SRC vlaunch.cpp) + diff --git a/vavoom.spec b/vavoom.spec index adba4ae..1bb5e8c 100644 --- a/vavoom.spec +++ b/vavoom.spec @@ -1,6 +1,6 @@ Name: vavoom Version: 1.30 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Enhanced Doom, Heretic, Hexen and Strife source port Source0: http://downloads.sourceforge.net/vavoom/%{name}-%{version}.tar.bz2 Source1: doom.autodlrc @@ -20,6 +20,7 @@ Source14: tux-b2f.png Patch0: vavoom-1.21-datadir.patch Patch1: vavoom-1.27-CMakeLists.patch Patch2: vavoom-1.30-gcc44-fix.patch +Patch3: vavoom-1.30-cmake28-fix.patch URL: http://vavoom-engine.com/ Group: Amusements/Games License: GPLv2+ @@ -42,6 +43,7 @@ to play these classics under Linux. %patch0 -p1 -b .datadir %patch1 -p1 %patch2 -p1 +%patch3 -p1 %build @@ -123,6 +125,9 @@ fi %changelog +* Fri Nov 20 2009 Hans de Goede 1.30-4 +- Fix building with cmake-2.8.x (#539127) + * Sun Aug 16 2009 Hans de Goede 1.30-3 - Switch to openal-soft From 130f1615a8dafc6d59decc95d57affaa3ef9340d Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 25 Nov 2009 22:43:19 +0000 Subject: [PATCH 09/70] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index f0b8757..676be97 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: vavoom -# $Id$ +# $Id: Makefile,v 1.1 2007/05/21 17:36:40 wtogami Exp $ 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 +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From bc438080f407fdf8946b8b5d32342c30c1768294 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:11:57 +0000 Subject: [PATCH 10/70] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index f0b8757..676be97 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: vavoom -# $Id$ +# $Id: Makefile,v 1.1 2007/05/21 17:36:40 wtogami Exp $ 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 +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From 9d6dc58d3cea8c6f2303afdf0b1598158dcceaad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20Hor=C3=A1k?= Date: Wed, 14 Jul 2010 12:51:21 +0000 Subject: [PATCH 11/70] - rebuilt against wxGTK-2.8.11-2 --- vavoom.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vavoom.spec b/vavoom.spec index 1bb5e8c..e8961d4 100644 --- a/vavoom.spec +++ b/vavoom.spec @@ -1,6 +1,6 @@ Name: vavoom Version: 1.30 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Enhanced Doom, Heretic, Hexen and Strife source port Source0: http://downloads.sourceforge.net/vavoom/%{name}-%{version}.tar.bz2 Source1: doom.autodlrc @@ -125,6 +125,9 @@ fi %changelog +* Wed Jul 14 2010 Dan Horák - 1.30-5 +- rebuilt against wxGTK-2.8.11-2 + * Fri Nov 20 2009 Hans de Goede 1.30-4 - Fix building with cmake-2.8.x (#539127) From 23db317bf7772aa82c2da48c75ccb95aa64547c3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 14:54:16 +0000 Subject: [PATCH 12/70] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- 2 files changed, 21 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 676be97..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: vavoom -# $Id: Makefile,v 1.1 2007/05/21 17:36:40 wtogami Exp $ -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 $$d/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) From 9642ff0394903ff9fda96aa79e8cb57582d0d25d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 14:54:16 +0000 Subject: [PATCH 13/70] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 676be97..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: vavoom -# $Id: Makefile,v 1.1 2007/05/21 17:36:40 wtogami Exp $ -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 $$d/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) diff --git a/branch b/branch deleted file mode 100644 index 1c26f78..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-9 From cc291401f4b475e896231490c34a046edaa99a85 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Mon, 7 Feb 2011 18:58:53 -0600 Subject: [PATCH 14/70] - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild --- vavoom.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vavoom.spec b/vavoom.spec index e8961d4..4dde758 100644 --- a/vavoom.spec +++ b/vavoom.spec @@ -1,6 +1,6 @@ Name: vavoom Version: 1.30 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Enhanced Doom, Heretic, Hexen and Strife source port Source0: http://downloads.sourceforge.net/vavoom/%{name}-%{version}.tar.bz2 Source1: doom.autodlrc @@ -125,6 +125,9 @@ fi %changelog +* Mon Feb 07 2011 Fedora Release Engineering - 1.30-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + * Wed Jul 14 2010 Dan Horák - 1.30-5 - rebuilt against wxGTK-2.8.11-2 From 2b914eaea5057c160b5ea1561e948ef3a477ffe2 Mon Sep 17 00:00:00 2001 From: Rahul Sundaram Date: Sat, 20 Aug 2011 14:11:45 +0530 Subject: [PATCH 15/70] 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 --- .gitignore | 1 + doom.autodlrc | 1 - sources | 2 +- vavoom-1.30-cmake28-fix.patch | 14 -------------- vavoom-1.30-gcc44-fix.patch | 22 ---------------------- vavoom.spec | 30 ++++++++++-------------------- 6 files changed, 12 insertions(+), 58 deletions(-) delete mode 100644 vavoom-1.30-cmake28-fix.patch delete mode 100644 vavoom-1.30-gcc44-fix.patch diff --git a/.gitignore b/.gitignore index 6654b42..fa92122 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ vavoom-1.30.tar.bz2 +/vavoom-1.33.tar.bz2 diff --git a/doom.autodlrc b/doom.autodlrc index 0ed372f..31d5193 100644 --- a/doom.autodlrc +++ b/doom.autodlrc @@ -39,7 +39,6 @@ ID SOFTWARE LICENSE [MD5]244d181457c9be5f28b91b488e67e042[/MD5] [PATH]$HOME/.vavoom/doom-shareware[/PATH] [MIRRORS] - [URL]http://www.parkerinfo.com/dmdo/downloads/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] diff --git a/sources b/sources index cf72d0e..674ae59 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -205c3645006232d75790fb8779a54e85 vavoom-1.30.tar.bz2 +f3b40df71eeb2f1c8956b81c995dfc28 vavoom-1.33.tar.bz2 diff --git a/vavoom-1.30-cmake28-fix.patch b/vavoom-1.30-cmake28-fix.patch deleted file mode 100644 index bc51828..0000000 --- a/vavoom-1.30-cmake28-fix.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -up vavoom-1.30/utils/vlaunch/CMakeLists.txt~ vavoom-1.30/utils/vlaunch/CMakeLists.txt ---- vavoom-1.30/utils/vlaunch/CMakeLists.txt~ 2008-10-19 19:43:02.000000000 +0200 -+++ vavoom-1.30/utils/vlaunch/CMakeLists.txt 2009-11-20 11:46:46.000000000 +0100 -@@ -1,8 +1,7 @@ - if(ENABLE_LAUNCHER) - -- find_package(wxWidgets REQUIRED) -- add_definitions(${wxWidgets_DEFINITIONS}) -- include_directories(${wxWidgets_INCLUDE_DIRS}) -+ FIND_PACKAGE(wxWidgets REQUIRED) -+ INCLUDE(${wxWidgets_USE_FILE}) - - set(VLAUNCH_SRC vlaunch.cpp) - diff --git a/vavoom-1.30-gcc44-fix.patch b/vavoom-1.30-gcc44-fix.patch deleted file mode 100644 index 9e5ae77..0000000 --- a/vavoom-1.30-gcc44-fix.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff -up vavoom-1.30/source/p_switch.cpp~ vavoom-1.30/source/p_switch.cpp ---- vavoom-1.30/source/p_switch.cpp~ 2008-05-18 18:46:18.000000000 +0200 -+++ vavoom-1.30/source/p_switch.cpp 2009-03-20 09:31:58.000000000 +0100 -@@ -54,6 +54,7 @@ enum EBWhere - class VButton : public VThinker - { - DECLARE_CLASS(VButton, VThinker, 0) -+ VButton() {} - - vint32 Side; - vuint8 Where; -diff -up vavoom-1.30/source/ui_widget.h~ vavoom-1.30/source/ui_widget.h ---- vavoom-1.30/source/ui_widget.h~ 2008-01-03 09:36:55.000000000 +0100 -+++ vavoom-1.30/source/ui_widget.h 2009-03-20 09:31:59.000000000 +0100 -@@ -45,6 +45,7 @@ struct VClipRect - class VWidget : public VObject - { - DECLARE_CLASS(VWidget, VObject, 0) -+ VWidget() {} - - private: - // Parent container widget. diff --git a/vavoom.spec b/vavoom.spec index 4dde758..b76729a 100644 --- a/vavoom.spec +++ b/vavoom.spec @@ -1,6 +1,6 @@ Name: vavoom -Version: 1.30 -Release: 6%{?dist} +Version: 1.33 +Release: 1%{?dist} Summary: Enhanced Doom, Heretic, Hexen and Strife source port Source0: http://downloads.sourceforge.net/vavoom/%{name}-%{version}.tar.bz2 Source1: doom.autodlrc @@ -19,12 +19,9 @@ Source13: doom-logo.png Source14: tux-b2f.png Patch0: vavoom-1.21-datadir.patch Patch1: vavoom-1.27-CMakeLists.patch -Patch2: vavoom-1.30-gcc44-fix.patch -Patch3: vavoom-1.30-cmake28-fix.patch URL: http://vavoom-engine.com/ Group: Amusements/Games License: GPLv2+ -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: SDL_mixer-devel SDL_net-devel libpng-devel libjpeg-devel BuildRequires: libvorbis-devel mikmod-devel flac-devel openal-soft-devel BuildRequires: libGLU-devel wxGTK-devel desktop-file-utils cmake @@ -37,14 +34,10 @@ Heretic, Hexen and Strife. Compared to the original games it adds extra features such as translucency and freelook support and ofcourse the capability to play these classics under Linux. - %prep %setup -q %patch0 -p1 -b .datadir %patch1 -p1 -%patch2 -p1 -%patch3 -p1 - %build %cmake -DWITH_LIBMAD:BOOL=OFF @@ -52,13 +45,11 @@ to play these classics under Linux. # 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 make VERBOSE=1 - %install -rm -rf $RPM_BUILD_ROOT make install \ DESTDIR=$RPM_BUILD_ROOT \ INSTALL_PARMS="-m 0755" \ @@ -97,11 +88,6 @@ mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps install -p -m 644 %{SOURCE13} %{SOURCE14} \ $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 @@ -114,17 +100,21 @@ if [ -x %{_bindir}/gtk-update-icon-cache ]; then %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : fi - %files -%defattr(-,root,root,-) %doc docs/*.log docs/gnu.txt docs/vavoom.txt %{_bindir}/* %{_datadir}/%{name} %{_datadir}/applications/fedora-*.desktop %{_datadir}/icons/hicolor/48x48/apps/*.png - %changelog +* Sat Aug 20 2011 Rahul Sundaram 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 - 1.30-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild From 23eac1793e7f4add61c415e43fd4a6271be3458a Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Tue, 6 Dec 2011 01:24:19 -0500 Subject: [PATCH 16/70] Rebuild for new libpng --- vavoom.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vavoom.spec b/vavoom.spec index b76729a..b9a953f 100644 --- a/vavoom.spec +++ b/vavoom.spec @@ -1,6 +1,6 @@ Name: vavoom Version: 1.33 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Enhanced Doom, Heretic, Hexen and Strife source port Source0: http://downloads.sourceforge.net/vavoom/%{name}-%{version}.tar.bz2 Source1: doom.autodlrc @@ -108,6 +108,9 @@ fi %{_datadir}/icons/hicolor/48x48/apps/*.png %changelog +* Tue Dec 06 2011 Adam Jackson - 1.33-2 +- Rebuild for new libpng + * Sat Aug 20 2011 Rahul Sundaram 1.33-1 - New upstream release - Drop definition of buildroot, defattr and clean stage From 68f02789595ba219ace45bf9d7d51173774c145c Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 14 Jan 2012 01:45:54 -0600 Subject: [PATCH 17/70] - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild --- vavoom.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vavoom.spec b/vavoom.spec index b9a953f..329282d 100644 --- a/vavoom.spec +++ b/vavoom.spec @@ -1,6 +1,6 @@ Name: vavoom Version: 1.33 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Enhanced Doom, Heretic, Hexen and Strife source port Source0: http://downloads.sourceforge.net/vavoom/%{name}-%{version}.tar.bz2 Source1: doom.autodlrc @@ -108,6 +108,9 @@ fi %{_datadir}/icons/hicolor/48x48/apps/*.png %changelog +* Sat Jan 14 2012 Fedora Release Engineering - 1.33-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + * Tue Dec 06 2011 Adam Jackson - 1.33-2 - Rebuild for new libpng From 8d850c047122ad35632c6116031917da9209d071 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 21 Jul 2012 21:28:02 -0500 Subject: [PATCH 18/70] - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild --- vavoom.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vavoom.spec b/vavoom.spec index 329282d..193ce4c 100644 --- a/vavoom.spec +++ b/vavoom.spec @@ -1,6 +1,6 @@ Name: vavoom Version: 1.33 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Enhanced Doom, Heretic, Hexen and Strife source port Source0: http://downloads.sourceforge.net/vavoom/%{name}-%{version}.tar.bz2 Source1: doom.autodlrc @@ -108,6 +108,9 @@ fi %{_datadir}/icons/hicolor/48x48/apps/*.png %changelog +* Sun Jul 22 2012 Fedora Release Engineering - 1.33-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + * Sat Jan 14 2012 Fedora Release Engineering - 1.33-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild From b6f35728c7aefc782924428a57bc852617c4d611 Mon Sep 17 00:00:00 2001 From: Adam Tkac Date: Fri, 21 Dec 2012 20:37:15 +0100 Subject: [PATCH 19/70] rebuild against new libjpeg Signed-off-by: Adam Tkac --- vavoom.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vavoom.spec b/vavoom.spec index 193ce4c..9f3940b 100644 --- a/vavoom.spec +++ b/vavoom.spec @@ -1,6 +1,6 @@ Name: vavoom Version: 1.33 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Enhanced Doom, Heretic, Hexen and Strife source port Source0: http://downloads.sourceforge.net/vavoom/%{name}-%{version}.tar.bz2 Source1: doom.autodlrc @@ -108,6 +108,9 @@ fi %{_datadir}/icons/hicolor/48x48/apps/*.png %changelog +* Fri Dec 21 2012 Adam Tkac - 1.33-5 +- rebuild against new libjpeg + * Sun Jul 22 2012 Fedora Release Engineering - 1.33-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild From 96c4ac820051be4eee921b7c1ca023e33915d58d Mon Sep 17 00:00:00 2001 From: Adam Tkac Date: Mon, 21 Jan 2013 17:38:54 +0100 Subject: [PATCH 20/70] Rebuild due to "jpeg8-ABI" feature drop Signed-off-by: Adam Tkac --- vavoom.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vavoom.spec b/vavoom.spec index 9f3940b..0553c16 100644 --- a/vavoom.spec +++ b/vavoom.spec @@ -1,6 +1,6 @@ Name: vavoom Version: 1.33 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Enhanced Doom, Heretic, Hexen and Strife source port Source0: http://downloads.sourceforge.net/vavoom/%{name}-%{version}.tar.bz2 Source1: doom.autodlrc @@ -108,6 +108,9 @@ fi %{_datadir}/icons/hicolor/48x48/apps/*.png %changelog +* Mon Jan 21 2013 Adam Tkac - 1.33-6 +- rebuild due to "jpeg8-ABI" feature drop + * Fri Dec 21 2012 Adam Tkac - 1.33-5 - rebuild against new libjpeg From d29ea5e4338d9149aaa6851bf0abfdbe9590d2dd Mon Sep 17 00:00:00 2001 From: Parag Nemade Date: Sat, 9 Feb 2013 21:56:34 +0530 Subject: [PATCH 21/70] Remove vendor tag from desktop file as per https://fedorahosted.org/fesco/ticket/1077 - Cleanup spec as per recently changed packaging guidelines --- vavoom.spec | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/vavoom.spec b/vavoom.spec index 0553c16..688b2a3 100644 --- a/vavoom.spec +++ b/vavoom.spec @@ -1,6 +1,6 @@ Name: vavoom Version: 1.33 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Enhanced Doom, Heretic, Hexen and Strife source port Source0: http://downloads.sourceforge.net/vavoom/%{name}-%{version}.tar.bz2 Source1: doom.autodlrc @@ -72,16 +72,16 @@ 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 \ +desktop-file-install \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ %{SOURCE9} -desktop-file-install --vendor fedora \ +desktop-file-install \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ %{SOURCE10} -desktop-file-install --vendor fedora \ +desktop-file-install \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ %{SOURCE11} -desktop-file-install --vendor fedora \ +desktop-file-install \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ %{SOURCE12} mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps @@ -104,10 +104,14 @@ fi %doc docs/*.log docs/gnu.txt docs/vavoom.txt %{_bindir}/* %{_datadir}/%{name} -%{_datadir}/applications/fedora-*.desktop +%{_datadir}/applications/*.desktop %{_datadir}/icons/hicolor/48x48/apps/*.png %changelog +* Sat Feb 09 2013 Parag Nemade - 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 - 1.33-6 - rebuild due to "jpeg8-ABI" feature drop From 95f726cee0c268eb8f6e9d234db10a52a625f9d6 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sun, 4 Aug 2013 00:57:33 -0500 Subject: [PATCH 22/70] - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild --- vavoom.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vavoom.spec b/vavoom.spec index 688b2a3..3bf77c1 100644 --- a/vavoom.spec +++ b/vavoom.spec @@ -1,6 +1,6 @@ Name: vavoom Version: 1.33 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Enhanced Doom, Heretic, Hexen and Strife source port Source0: http://downloads.sourceforge.net/vavoom/%{name}-%{version}.tar.bz2 Source1: doom.autodlrc @@ -108,6 +108,9 @@ fi %{_datadir}/icons/hicolor/48x48/apps/*.png %changelog +* Sun Aug 04 2013 Fedora Release Engineering - 1.33-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + * Sat Feb 09 2013 Parag Nemade - 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 From 83a56f77f703ab9838ae0e9072a82019714c716a Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 7 Jun 2014 22:19:15 -0500 Subject: [PATCH 23/70] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild --- vavoom.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vavoom.spec b/vavoom.spec index 3bf77c1..3f107c0 100644 --- a/vavoom.spec +++ b/vavoom.spec @@ -1,6 +1,6 @@ Name: vavoom Version: 1.33 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Enhanced Doom, Heretic, Hexen and Strife source port Source0: http://downloads.sourceforge.net/vavoom/%{name}-%{version}.tar.bz2 Source1: doom.autodlrc @@ -108,6 +108,9 @@ fi %{_datadir}/icons/hicolor/48x48/apps/*.png %changelog +* Sun Jun 08 2014 Fedora Release Engineering - 1.33-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + * Sun Aug 04 2013 Fedora Release Engineering - 1.33-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild From b56387602a8bb8a6a722685c72a0664fb5851fa8 Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Fri, 20 Jun 2014 15:30:16 +0200 Subject: [PATCH 24/70] Fix FTBFS (rhbz#1037375) --- vavoom-1.33-format-security.patch | 51 +++++++++++++++++++++++++++++++ vavoom.spec | 9 ++++-- 2 files changed, 58 insertions(+), 2 deletions(-) create mode 100644 vavoom-1.33-format-security.patch diff --git a/vavoom-1.33-format-security.patch b/vavoom-1.33-format-security.patch new file mode 100644 index 0000000..28d04c2 --- /dev/null +++ b/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()); + } + + //************************************************************************** diff --git a/vavoom.spec b/vavoom.spec index 3f107c0..186f89e 100644 --- a/vavoom.spec +++ b/vavoom.spec @@ -1,6 +1,6 @@ Name: vavoom Version: 1.33 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Enhanced Doom, Heretic, Hexen and Strife source port Source0: http://downloads.sourceforge.net/vavoom/%{name}-%{version}.tar.bz2 Source1: doom.autodlrc @@ -19,6 +19,7 @@ Source13: doom-logo.png Source14: tux-b2f.png Patch0: vavoom-1.21-datadir.patch Patch1: vavoom-1.27-CMakeLists.patch +Patch2: vavoom-1.33-format-security.patch URL: http://vavoom-engine.com/ Group: Amusements/Games License: GPLv2+ @@ -38,6 +39,7 @@ to play these classics under Linux. %setup -q %patch0 -p1 -b .datadir %patch1 -p1 +%patch2 -p1 %build %cmake -DWITH_LIBMAD:BOOL=OFF @@ -108,6 +110,9 @@ fi %{_datadir}/icons/hicolor/48x48/apps/*.png %changelog +* Fri Jun 20 2014 Hans de Goede - 1.33-10 +- Fix FTBFS (rhbz#1037375) + * Sun Jun 08 2014 Fedora Release Engineering - 1.33-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild @@ -217,7 +222,7 @@ fi * Sun Jul 23 2006 Wart 1.21.1-1 - Update to 1.21.1 -* Sat Jul 16 2006 Wart 1.21-2 +* Sun Jul 16 2006 Wart 1.21-2 - Remove some comments from the spec file - Remove shell script wrappers from /usr/bin - Update datadir patch to 1.21 From 6a106c9d0802f9213bb62d64933cee65473226c4 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Mon, 18 Aug 2014 07:33:05 +0000 Subject: [PATCH 25/70] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild --- vavoom.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vavoom.spec b/vavoom.spec index 186f89e..52e6755 100644 --- a/vavoom.spec +++ b/vavoom.spec @@ -1,6 +1,6 @@ Name: vavoom Version: 1.33 -Release: 10%{?dist} +Release: 11%{?dist} Summary: Enhanced Doom, Heretic, Hexen and Strife source port Source0: http://downloads.sourceforge.net/vavoom/%{name}-%{version}.tar.bz2 Source1: doom.autodlrc @@ -110,6 +110,9 @@ fi %{_datadir}/icons/hicolor/48x48/apps/*.png %changelog +* Mon Aug 18 2014 Fedora Release Engineering - 1.33-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + * Fri Jun 20 2014 Hans de Goede - 1.33-10 - Fix FTBFS (rhbz#1037375) From b44581afc0ea283e7e78d06aaa6706f5d059b74c Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Sat, 2 May 2015 18:23:55 +0200 Subject: [PATCH 26/70] Rebuilt for GCC 5 C++11 ABI change --- vavoom.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vavoom.spec b/vavoom.spec index 52e6755..6d8f889 100644 --- a/vavoom.spec +++ b/vavoom.spec @@ -1,6 +1,6 @@ Name: vavoom Version: 1.33 -Release: 11%{?dist} +Release: 12%{?dist} Summary: Enhanced Doom, Heretic, Hexen and Strife source port Source0: http://downloads.sourceforge.net/vavoom/%{name}-%{version}.tar.bz2 Source1: doom.autodlrc @@ -110,6 +110,9 @@ fi %{_datadir}/icons/hicolor/48x48/apps/*.png %changelog +* Sat May 02 2015 Kalev Lember - 1.33-12 +- Rebuilt for GCC 5 C++11 ABI change + * Mon Aug 18 2014 Fedora Release Engineering - 1.33-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild From 5aa3f61f44030063ecf4b0b627952764415f4e6e Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 19 Jun 2015 01:50:35 +0000 Subject: [PATCH 27/70] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- vavoom.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vavoom.spec b/vavoom.spec index 6d8f889..b583429 100644 --- a/vavoom.spec +++ b/vavoom.spec @@ -1,6 +1,6 @@ Name: vavoom Version: 1.33 -Release: 12%{?dist} +Release: 13%{?dist} Summary: Enhanced Doom, Heretic, Hexen and Strife source port Source0: http://downloads.sourceforge.net/vavoom/%{name}-%{version}.tar.bz2 Source1: doom.autodlrc @@ -110,6 +110,9 @@ fi %{_datadir}/icons/hicolor/48x48/apps/*.png %changelog +* Fri Jun 19 2015 Fedora Release Engineering - 1.33-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + * Sat May 02 2015 Kalev Lember - 1.33-12 - Rebuilt for GCC 5 C++11 ABI change From 609a41f7d5e00a398ad41dab8e55dca2a905e6b5 Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Mon, 4 Jan 2016 19:14:54 +0100 Subject: [PATCH 28/70] Fix crash in mesa / i965_dri.so caused by globally overriding delete - Add a manpage and support for freedoom (from Debian) - Add appdata --- doom-shareware.desktop | 3 +- doom-shareware.sh | 6 + freedoom-support.patch | 421 +++++++++++++++++++++++++ freedoom-vlaunch.patch | 51 +++ heretic-shareware.desktop | 3 +- hexen-demo.desktop | 3 +- strife-demo.desktop | 3 +- vavoom-1.33-dont-override-delete.patch | 151 +++++++++ vavoom.6 | 133 ++++++++ vavoom.appdata.xml | 33 ++ vavoom.desktop | 9 + vavoom.png | Bin 0 -> 9300 bytes vavoom.spec | 77 +++-- 13 files changed, 859 insertions(+), 34 deletions(-) create mode 100644 freedoom-support.patch create mode 100644 freedoom-vlaunch.patch create mode 100644 vavoom-1.33-dont-override-delete.patch create mode 100644 vavoom.6 create mode 100644 vavoom.appdata.xml create mode 100644 vavoom.desktop create mode 100644 vavoom.png diff --git a/doom-shareware.desktop b/doom-shareware.desktop index 6e994ea..fb6300b 100644 --- a/doom-shareware.desktop +++ b/doom-shareware.desktop @@ -1,9 +1,8 @@ [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; diff --git a/doom-shareware.sh b/doom-shareware.sh index b7c11ab..6a7649e 100644 --- a/doom-shareware.sh +++ b/doom-shareware.sh @@ -2,6 +2,12 @@ set -e +# First check if the rpmfusion system-wide DOOM1.WAD is installed and +# if it is use that instead of downloading +if [ -f /usr/share/doom-shareware/DOOM1.WAD ]; then + exec /usr/bin/vavoom -iwaddir /usr/share/doom-shareware -iwad DOOM1.WAD -doom "$@" +fi + if [ ! -f ~/.vavoom/doom-shareware/doom1.wad ]; then set +e /usr/share/autodl/AutoDL.py /usr/share/vavoom/doom.autodlrc diff --git a/freedoom-support.patch b/freedoom-support.patch new file mode 100644 index 0000000..4a148ec --- /dev/null +++ b/freedoom-support.patch @@ -0,0 +1,421 @@ +Description: FreeDoom enablement for Vavoom. + this patch allows to run freedoom on vavoom with a single parameter + it also allows to save games on a dedicated directory instead of sharing with doom 2. +Author: gustavo panizzo +Bug-Debian: http://bugs.debian.org/661233 +Last-Update: 2012-02-28 + +--- vavoom-1.33.orig/basev/CMakeLists.txt ++++ vavoom-1.33/basev/CMakeLists.txt +@@ -10,5 +10,6 @@ add_subdirectory(hexen) + add_subdirectory(plutonia) + add_subdirectory(strife) + add_subdirectory(tnt) ++add_subdirectory(freedoom) + + install(FILES games.txt DESTINATION ${DATADIR}/basev) +--- vavoom-1.33.orig/basev/games.txt ++++ vavoom-1.33/basev/games.txt +@@ -78,3 +78,9 @@ iwad strife1.wad + addfile voices.wad + param -strife + end ++ ++// FreeDoom ++game basev/freedoom ++iwad freedoom.wad ++param -freedoom ++end +--- /dev/null ++++ vavoom-1.33/basev/freedoom/mapinfo.txt +@@ -0,0 +1,364 @@ ++//------------------------------------------------------ ++// Episode definition ++clearepisodes ++ ++episode map01 ++name "FreeDoom" ++ ++//------------------------------------------------------ ++map map01 lookup hustr_1 ++titlepatch cwilv00 ++cluster 5 ++next map02 ++secretnext map02 ++sky1 sky1 0 ++music d_runnin ++par 30 ++sucktime 1 ++ ++map map02 lookup hustr_2 ++titlepatch cwilv01 ++cluster 5 ++next map03 ++secretnext map03 ++sky1 sky1 0 ++music d_stalks ++par 90 ++sucktime 1 ++ ++map map03 lookup hustr_3 ++titlepatch cwilv02 ++cluster 5 ++next map04 ++secretnext map04 ++sky1 sky1 0 ++music d_countd ++par 120 ++sucktime 1 ++ ++map map04 lookup hustr_4 ++titlepatch cwilv03 ++cluster 5 ++next map05 ++secretnext map05 ++sky1 sky1 0 ++music d_betwee ++par 120 ++sucktime 1 ++ ++map map05 lookup hustr_5 ++titlepatch cwilv04 ++cluster 5 ++next map06 ++secretnext map06 ++sky1 sky1 0 ++music d_doom ++par 90 ++sucktime 1 ++ ++map map06 lookup hustr_6 ++titlepatch cwilv05 ++cluster 5 ++next map07 ++secretnext map07 ++sky1 sky1 0 ++music d_the_da ++par 150 ++sucktime 1 ++ ++;------------------------------------------------------ ++map map07 lookup hustr_7 ++titlepatch cwilv06 ++cluster 6 ++next map08 ++secretnext map08 ++sky1 sky1 0 ++music d_shawn ++par 120 ++sucktime 1 ++map07special ++ ++map map08 lookup hustr_8 ++titlepatch cwilv07 ++cluster 6 ++next map09 ++secretnext map09 ++sky1 sky1 0 ++music d_ddtblu ++par 120 ++sucktime 1 ++ ++map map09 lookup hustr_9 ++titlepatch cwilv08 ++cluster 6 ++next map10 ++secretnext map10 ++sky1 sky1 0 ++music d_in_cit ++par 270 ++sucktime 1 ++ ++map map10 lookup hustr_10 ++titlepatch cwilv09 ++cluster 6 ++next map11 ++secretnext map11 ++sky1 sky1 0 ++music d_dead ++par 90 ++sucktime 1 ++ ++map map11 lookup hustr_11 ++titlepatch cwilv10 ++cluster 6 ++next map12 ++secretnext map12 ++sky1 sky1 0 ++music d_stlks2 ++par 210 ++sucktime 1 ++ ++;------------------------------------------------------ ++map map12 lookup hustr_12 ++titlepatch cwilv11 ++cluster 7 ++next map13 ++secretnext map13 ++sky1 sky2 0 ++music d_theda2 ++par 150 ++sucktime 1 ++ ++map map13 lookup hustr_13 ++titlepatch cwilv12 ++cluster 7 ++next map14 ++secretnext map14 ++sky1 sky2 0 ++music d_doom2 ++par 150 ++sucktime 1 ++ ++map map14 lookup hustr_14 ++titlepatch cwilv13 ++cluster 7 ++next map15 ++secretnext map15 ++sky1 sky2 0 ++music d_ddtbl2 ++par 150 ++sucktime 1 ++ ++map map15 lookup hustr_15 ++titlepatch cwilv14 ++cluster 7 ++next map16 ++secretnext map31 ++sky1 sky2 0 ++music d_runni2 ++par 210 ++sucktime 1 ++ ++map map16 lookup hustr_16 ++titlepatch cwilv15 ++cluster 7 ++next map17 ++secretnext map17 ++sky1 sky2 0 ++music d_dead2 ++par 150 ++sucktime 1 ++ ++map map17 lookup hustr_17 ++titlepatch cwilv16 ++cluster 7 ++next map18 ++secretnext map18 ++sky1 sky2 0 ++music d_stlks3 ++par 420 ++sucktime 1 ++ ++map map18 lookup hustr_18 ++titlepatch cwilv17 ++cluster 7 ++next map19 ++secretnext map19 ++sky1 sky2 0 ++music d_romero ++par 150 ++sucktime 1 ++ ++map map19 lookup hustr_19 ++titlepatch cwilv18 ++cluster 7 ++next map20 ++secretnext map20 ++sky1 sky2 0 ++music d_shawn2 ++par 210 ++sucktime 1 ++ ++map map20 lookup hustr_20 ++titlepatch cwilv19 ++cluster 7 ++next map21 ++secretnext map21 ++sky1 sky2 0 ++music d_messag ++par 150 ++sucktime 1 ++ ++;------------------------------------------------------- ++map map21 lookup hustr_21 ++titlepatch cwilv20 ++cluster 8 ++next map22 ++secretnext map22 ++sky1 sky3 0 ++music d_count2 ++par 240 ++sucktime 1 ++ ++map map22 lookup hustr_22 ++titlepatch cwilv21 ++cluster 8 ++next map23 ++secretnext map23 ++sky1 sky3 0 ++music d_ddtbl3 ++par 150 ++sucktime 1 ++ ++map map23 lookup hustr_23 ++titlepatch cwilv22 ++cluster 8 ++next map24 ++secretnext map24 ++sky1 sky3 0 ++music d_ampie ++par 180 ++sucktime 1 ++ ++map map24 lookup hustr_24 ++titlepatch cwilv23 ++cluster 8 ++next map25 ++secretnext map25 ++sky1 sky3 0 ++music d_theda3 ++par 150 ++sucktime 1 ++ ++map map25 lookup hustr_25 ++titlepatch cwilv24 ++cluster 8 ++next map26 ++secretnext map26 ++sky1 sky3 0 ++music d_adrian ++par 150 ++sucktime 1 ++ ++map map26 lookup hustr_26 ++titlepatch cwilv25 ++cluster 8 ++next map27 ++secretnext map27 ++sky1 sky3 0 ++music d_messg2 ++par 300 ++sucktime 1 ++ ++map map27 lookup hustr_27 ++titlepatch cwilv26 ++cluster 8 ++next map28 ++secretnext map28 ++sky1 sky3 0 ++music d_romer2 ++par 330 ++sucktime 1 ++ ++map map28 lookup hustr_28 ++titlepatch cwilv27 ++cluster 8 ++next map29 ++secretnext map29 ++sky1 sky3 0 ++music d_tense ++par 420 ++sucktime 1 ++ ++map map29 lookup hustr_29 ++titlepatch cwilv28 ++cluster 8 ++next map30 ++secretnext map30 ++sky1 sky3 0 ++music d_shawn3 ++par 300 ++sucktime 1 ++ ++map map30 lookup hustr_30 ++titlepatch cwilv29 ++cluster 8 ++next EndGameC ++secretnext EndGameC ++sky1 sky3 0 ++music d_openin ++par 180 ++sucktime 1 ++allowmonstertelefrags ++ ++;------------------------------------------------------ ++map map31 lookup hustr_31 ++titlepatch cwilv30 ++cluster 9 ++next map16 ++secretnext map32 ++sky1 sky3 0 ++music d_evil ++par 120 ++sucktime 1 ++ ++map map32 lookup hustr_32 ++titlepatch cwilv31 ++cluster 10 ++next map16 ++secretnext map16 ++sky1 sky3 0 ++music d_ultima ++par 30 ++sucktime 1 ++ ++;------------------------------------------------------ ++clusterdef 5 ++exittext lookup c1text ++flat slime16 ++music d_read_m ++ ++clusterdef 6 ++exittext lookup c2text ++flat rrock14 ++music d_read_m ++ ++clusterdef 7 ++exittext lookup c3text ++flat rrock07 ++music d_read_m ++ ++clusterdef 8 ++exittext lookup c4text ++flat rrock17 ++music d_read_m ++ ++clusterdef 9 ++entertext lookup c5text ++flat rrock13 ++music d_read_m ++ ++clusterdef 10 ++entertext lookup c6text ++flat rrock19 ++music d_read_m +--- /dev/null ++++ vavoom-1.33/basev/freedoom/CMakeLists.txt +@@ -0,0 +1,12 @@ ++configure_file(basepak.ls.in ${CMAKE_CURRENT_BINARY_DIR}/basepak.ls) ++ ++add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/basepak.pk3 ++ COMMAND ${VLUMPY} ARGS basepak.ls ++ DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/basepak.ls vlumpy ++ basepak.ls.in ++ mapinfo.txt ++ ) ++add_custom_target(freedoom_basepak ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/basepak.pk3) ++ ++install(FILES ${CMAKE_CURRENT_BINARY_DIR}/basepak.pk3 base.txt ++ DESTINATION ${DATADIR}/basev/freedoom) +--- /dev/null ++++ vavoom-1.33/basev/freedoom/basepak.ls.in +@@ -0,0 +1,3 @@ ++$dest basepak.pk3 ++ ++mapinfo.txt @CMAKE_CURRENT_SOURCE_DIR@/mapinfo.txt +--- /dev/null ++++ vavoom-1.33/basev/freedoom/base.txt +@@ -0,0 +1,2 @@ ++game basev/doom2 ++end diff --git a/freedoom-vlaunch.patch b/freedoom-vlaunch.patch new file mode 100644 index 0000000..85659cf --- /dev/null +++ b/freedoom-vlaunch.patch @@ -0,0 +1,51 @@ +Description: Add FreeDoom to vlaunch menu + this patch adds freedoom to vlaunch's menu. +Author: gustavo panizzo +Bug-Debian: http://bugs.debian.org/661233 +Last-Update: 2012-02-28 + +--- vavoom-1.33.orig/utils/vlaunch/vlaunch.cpp ++++ vavoom-1.33/utils/vlaunch/vlaunch.cpp +@@ -153,16 +153,17 @@ VMain::VMain() + gsizer->Add(new wxStaticText(page, -1, wxT(" ")), 0, wxALL, 4); + + gsizer->Add(new wxStaticText(page, -1, wxT("Game:")), 0, wxALL, 4); +- wxString GameChoices[8]; ++ wxString GameChoices[9]; + GameChoices[0] = wxT("(Autodetect)"); + GameChoices[1] = wxT("Doom"); + GameChoices[2] = wxT("Doom 2: Hell On Earth"); + GameChoices[3] = wxT("Doom 2: TNT Evilution"); + GameChoices[4] = wxT("Doom 2: The Plutonia Experiment"); +- GameChoices[5] = wxT("Heretic"); +- GameChoices[6] = wxT("Hexen"); +- GameChoices[7] = wxT("Strife"); +- Game = new wxComboBox(page, -1, GameChoices[0], wxDefaultPosition, wxDefaultSize, 8, GameChoices, wxCB_READONLY); ++ GameChoices[5] = wxT("FreeDoom"); ++ GameChoices[6] = wxT("Heretic"); ++ GameChoices[7] = wxT("Hexen"); ++ GameChoices[8] = wxT("Strife"); ++ Game = new wxComboBox(page, -1, GameChoices[0], wxDefaultPosition, wxDefaultSize, 9, GameChoices, wxCB_READONLY); + gsizer->Add(Game, 0, wxALL, 4); + + gsizer->Add(new wxStaticText(page, -1, wxT("Custom game:")), 0, wxALL, 4); +@@ -443,13 +444,16 @@ void VMain::OnRun(wxCommandEvent&) + case 4: + CmdLine += wxT(" -plutonia"); + break; +- case 5: ++ case 5: ++ CmdLine += wxT(" -freedoom"); ++ break; ++ case 6: + CmdLine += wxT(" -heretic"); + break; +- case 6: ++ case 7: + CmdLine += wxT(" -hexen"); + break; +- case 7: ++ case 8: + CmdLine += wxT(" -strife"); + break; + } diff --git a/heretic-shareware.desktop b/heretic-shareware.desktop index cfaf645..75774a2 100644 --- a/heretic-shareware.desktop +++ b/heretic-shareware.desktop @@ -1,9 +1,8 @@ [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; diff --git a/hexen-demo.desktop b/hexen-demo.desktop index b4f44b2..ea2ebd9 100644 --- a/hexen-demo.desktop +++ b/hexen-demo.desktop @@ -1,9 +1,8 @@ [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; diff --git a/strife-demo.desktop b/strife-demo.desktop index c23af96..6621c57 100644 --- a/strife-demo.desktop +++ b/strife-demo.desktop @@ -1,9 +1,8 @@ [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; diff --git a/vavoom-1.33-dont-override-delete.patch b/vavoom-1.33-dont-override-delete.patch new file mode 100644 index 0000000..aaf499e --- /dev/null +++ b/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 + +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 +--- 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(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); diff --git a/vavoom.6 b/vavoom.6 new file mode 100644 index 0000000..106b0d6 --- /dev/null +++ b/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\ +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\ +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\ +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\
+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\ +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\ +specifies custom game. +.TP +.BI \-devgame\ +like \fI-game\fR, but also sets Vavoom in development mode. +.TP +.BI \-devsound\ +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\ +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\ [ \.\.\.] +specifies additional files. +.TP +.BI \-iwaddir\ [ \.\.\.] +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\