diff --git a/vavoom-1.33-cmake4.patch b/vavoom-1.33-cmake4.patch deleted file mode 100644 index ac4e123..0000000 --- a/vavoom-1.33-cmake4.patch +++ /dev/null @@ -1,35 +0,0 @@ -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 $) -+set (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 $) - - add_subdirectory(common) - add_subdirectory(doom) diff --git a/vavoom-1.33-wxwidgets3.0.patch b/vavoom-1.33-wxwidgets3.0.patch deleted file mode 100644 index d51556a..0000000 --- a/vavoom-1.33-wxwidgets3.0.patch +++ /dev/null @@ -1,23 +0,0 @@ -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)); - diff --git a/vavoom.spec b/vavoom.spec index 1085408..c609f2e 100644 --- a/vavoom.spec +++ b/vavoom.spec @@ -1,9 +1,6 @@ -# vavoom's CMakefiles are a mess, force in-source building -%global _vpath_builddir . - Name: vavoom Version: 1.33 -Release: 51%{?dist} +Release: 25%{?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 @@ -36,17 +33,12 @@ 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 +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 +Patch8: vavoom-1.33-crash-on-exit.patch URL: http://vavoom-engine.com/ -# Automatically converted from old format: GPLv2+ - review is highly recommended. -License: GPL-2.0-or-later -BuildRequires: make -BuildRequires: gcc -BuildRequires: gcc-c++ +Group: Amusements/Games +License: GPLv2+ 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 @@ -147,15 +139,17 @@ datafiles for you. %prep -%autosetup -p1 +%setup -q +%patch0 -p1 -b .datadir +%patch1 -p1 +%patch2 -p1 +%patch3 -p1 +%patch4 -p1 +%patch5 -p1 +%patch6 -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" @@ -168,7 +162,6 @@ sed -i "s|#define CONFIG_FILE.*|#define CONFIG_FILE \"%{_sysconfdir}/timidity.cf # 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 @@ -254,87 +247,6 @@ install -p -m 644 %{SOURCE22} $RPM_BUILD_ROOT%{_mandir}/man6 %changelog -* Fri Jul 17 2026 Fedora Release Engineering - 1.33-51 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild - -* Fri Feb 13 2026 Cristian Le - 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 - 1.33-49 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild - -* Fri Jul 25 2025 Fedora Release Engineering - 1.33-48 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Tue May 27 2025 Jitka Plesnikova - 1.33-47 -- Rebuilt for flac 1.5.0 - -* Sun Jan 19 2025 Fedora Release Engineering - 1.33-46 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Fri Jul 26 2024 Miroslav Suchý - 1.33-45 -- convert license to SPDX - -* Sat Jul 20 2024 Fedora Release Engineering - 1.33-44 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Sat Jan 27 2024 Fedora Release Engineering - 1.33-43 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Sat Jul 22 2023 Fedora Release Engineering - 1.33-42 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Sat Jan 21 2023 Fedora Release Engineering - 1.33-41 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Wed Sep 14 2022 Michel Alexandre Salim - 1.33-40 -- Rebuilt for flac 1.4.0 - -* Thu Aug 04 2022 Scott Talbert - 1.33-39 -- Rebuild with wxWidgets 3.2 - -* Sat Jul 23 2022 Fedora Release Engineering - 1.33-38 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Sat Jan 22 2022 Fedora Release Engineering - 1.33-37 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Fri Jul 23 2021 Fedora Release Engineering - 1.33-36 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Wed Jan 27 2021 Fedora Release Engineering - 1.33-35 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Mon Aug 24 2020 Hans de Goede - 1.33-34 -- Fix FTBFS (rhbz#1865603) - -* Sat Aug 01 2020 Fedora Release Engineering - 1.33-33 -- Second attempt - Rebuilt for - https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Wed Jul 29 2020 Fedora Release Engineering - 1.33-32 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Fri Jan 31 2020 Fedora Release Engineering - 1.33-31 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Fri Jan 17 2020 Jeff Law - 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 - 1.33-29 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Sun Feb 03 2019 Fedora Release Engineering - 1.33-28 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Mon Oct 29 2018 Scott Talbert - 1.33-27 -- Rebuild with wxWidgets 3.0 - -* Sat Jul 14 2018 Fedora Release Engineering - 1.33-26 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - * Fri Feb 09 2018 Fedora Release Engineering - 1.33-25 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild