[rpms/warzone2100] rawhide: 4.7.0

[rpms/warzone2100] rawhide: 4.7.0

[Gwyn Ciesla]

A new commit has been pushed.

Repo   : rpms/warzone2100
Branch : rawhide
Commit : 3898de6f87c138540f0514322e03236408416fbb
Author : Gwyn Ciesla <gwync@protonmail.com>
Date   : 2026-08-10T08:08:57-05:00
Stats  : +55/-3 in 3 file(s)
URL    : https://src.fedoraproject.org/rpms/warzone2100/c/3898de6f87c138540f0514322e03236408416fbb?branch=rawhide

Log:
4.7.0

---
diff --git a/8701c62ae68ca70da43ec915cbf6776c492e6656.patch b/8701c62ae68ca70da43ec915cbf6776c492e6656.patch
new file mode 100644
index 0000000..a4b432c
--- /dev/null
+++ b/8701c62ae68ca70da43ec915cbf6776c492e6656.patch
@@ -0,0 +1,44 @@
+From 8701c62ae68ca70da43ec915cbf6776c492e6656 Mon Sep 17 00:00:00 2001
+From: Dmitry Marakasov <amdmi3@amdmi3.ru>
+Date: Tue, 12 May 2026 22:55:00 +0300
+Subject: [PATCH] Replace deprecated vulkan enum value
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Replace `eVkColorspaceSrgbNonlinear` with `eSrgbNonlinear`, as the
+former was removed in vulkan 1.4.350, and was a legacy alias to the latter
+(more precisely, `eSrgbNonlinear` → `VK_COLORSPACE_SRGB_NONLINEAR_KHR` →
+[legacy alias to] `VK_COLOR_SPACE_SRGB_NONLINEAR_KHR` ← `eSrgbNonlinear`).
+---
+ lib/ivis_opengl/gfx_api_vk.cpp | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/lib/ivis_opengl/gfx_api_vk.cpp b/lib/ivis_opengl/gfx_api_vk.cpp
+index f137f496509..dcedf473de7 100644
+--- a/lib/ivis_opengl/gfx_api_vk.cpp
++++ b/lib/ivis_opengl/gfx_api_vk.cpp
+@@ -4255,10 +4255,10 @@ void VkRoot::createNewSwapchainAndSwapchainSpecificStuff(const vk::Result& reaso
+ vk::SurfaceFormatKHR chooseSwapSurfaceFormat(const std::vector<vk::SurfaceFormatKHR>& availableFormats)
+ {
+ 	const auto desiredFormats = std::array<vk::SurfaceFormatKHR, 4> {
+-		vk::SurfaceFormatKHR{ vk::Format::eA2B10G10R10UnormPack32, vk::ColorSpaceKHR::eVkColorspaceSrgbNonlinear },
+-		vk::SurfaceFormatKHR{ vk::Format::eA2R10G10B10UnormPack32, vk::ColorSpaceKHR::eVkColorspaceSrgbNonlinear },
+-		vk::SurfaceFormatKHR{ vk::Format::eB8G8R8A8Unorm, vk::ColorSpaceKHR::eVkColorspaceSrgbNonlinear },
+-		vk::SurfaceFormatKHR{ vk::Format::eR8G8B8A8Unorm, vk::ColorSpaceKHR::eVkColorspaceSrgbNonlinear }
++		vk::SurfaceFormatKHR{ vk::Format::eA2B10G10R10UnormPack32, vk::ColorSpaceKHR::eSrgbNonlinear },
++		vk::SurfaceFormatKHR{ vk::Format::eA2R10G10B10UnormPack32, vk::ColorSpaceKHR::eSrgbNonlinear },
++		vk::SurfaceFormatKHR{ vk::Format::eB8G8R8A8Unorm, vk::ColorSpaceKHR::eSrgbNonlinear },
++		vk::SurfaceFormatKHR{ vk::Format::eR8G8B8A8Unorm, vk::ColorSpaceKHR::eSrgbNonlinear }
+ 	};
+ 
+ 	if(availableFormats.size() == 1
+@@ -4266,7 +4266,7 @@ vk::SurfaceFormatKHR chooseSwapSurfaceFormat(const std::vector<vk::SurfaceFormat
+ 	{
+ 		// don't appear to be any preferred formats, so create one
+ 		vk::SurfaceFormatKHR format;
+-		format.colorSpace = vk::ColorSpaceKHR::eVkColorspaceSrgbNonlinear;
++		format.colorSpace = vk::ColorSpaceKHR::eSrgbNonlinear;
+ 		format.format = vk::Format::eB8G8R8A8Unorm;
+ 		return format;
+ 	}

diff --git a/sources b/sources
index 4225166..a03906b 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (warzone2100_src.tar.xz) = 14b7e502dd2f5b5350d80e5210718aa9118859381e3f33e80ae0b83a05136103b480d1e510e56b0cfac20a56bc51801db98c25c15636d21f1c847a70a56bf8ed
+SHA512 (warzone2100_src.tar.xz) = 78d2ac1379f218852d677c59a714f8066731f88c041a4eca1bcca48fa3c75609eca64dde863ef61b5b6215061a60929942a27f48a24d1ab3ed8307f85dba7da2
 SHA512 (high-quality-en-sequences.wz) = 2a4a9e299412fe1adac21001848d10575be69039bb2d762bcad94faefbf498ff72ff0e37fc4017c7598692d250456a444d6d5619c88a9772cfd3a03d4b780f12

diff --git a/warzone2100.spec b/warzone2100.spec
index d08667e..68db1e1 100644
--- a/warzone2100.spec
+++ b/warzone2100.spec
@@ -1,9 +1,10 @@
 # Don't build internal static libs as shared
 %global _cmake_shared_libs %{nil}
+%global debug_package %{nil}
 
 Name:           warzone2100
-Version:        4.6.3
-Release:        3%{?dist}
+Version:        4.7.0
+Release:        1%{?dist}
 Summary:        Innovative 3D real-time strategy
 
 # See COPYING.NONGPL
@@ -13,6 +14,7 @@ Source0:        https://github.com/Warzone2100/warzone2100/releases/download/%{v
 Source1:        https://github.com/Warzone2100/wz-sequences/releases/download/v3/high-quality-en-sequences.wz
 
 Patch1:         cmake4.patch
+Patch2:         8701c62ae68ca70da43ec915cbf6776c492e6656.patch
 
 # https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval
 ExcludeArch:    %{ix86}
@@ -86,6 +88,9 @@ mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/128x128/apps
 mv $RPM_BUILD_ROOT%{_datadir}/icons/net.wz2100.warzone2100.png \
    $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/128x128/apps/net.wz2100.warzone2100.png
 
+#Not sure where this is coming from.
+rm -f %{buildroot}%{_bindir}/warzone2100.debug
+
 %files -f %{name}.lang
 %license COPYING COPYING.NONGPL COPYING.README
 %doc AUTHORS ChangeLog
@@ -101,6 +106,9 @@ mv $RPM_BUILD_ROOT%{_datadir}/icons/net.wz2100.warzone2100.png \
 %{_datadir}/warzone2100/sequences.wz
 
 %changelog
+* Thu Aug 06 2026 Gwyn Ciesla <gwync@protonmail.com> - 4.7.0-1
+- 4.7.0
+
 * Fri Jul 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 4.6.3-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild