diff --git a/vavoom-1.33-cmake4.patch b/vavoom-1.33-cmake4.patch new file mode 100644 index 0000000..ac4e123 --- /dev/null +++ b/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 $) ++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.spec b/vavoom.spec index e366d1d..1085408 100644 --- a/vavoom.spec +++ b/vavoom.spec @@ -3,7 +3,7 @@ Name: vavoom Version: 1.33 -Release: 36%{?dist} +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 @@ -36,18 +36,20 @@ 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 +#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/ -License: GPLv2+ +# 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-soft-devel -BuildRequires: libGLU-devel wxGTK3-devel desktop-file-utils cmake +BuildRequires: libGLU-devel wxGTK-devel desktop-file-utils cmake BuildRequires: libappstream-glib Requires: %{name}-engine = %{version}-%{release} Requires: %{name}-doom-shareware = %{version}-%{release} @@ -145,18 +147,15 @@ datafiles for you. %prep -%setup -q -%patch0 -p1 -b .datadir -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 -%patch6 -p1 -%patch9 -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" @@ -255,6 +254,52 @@ 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