Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package warzone2100 for openSUSE:Factory checked in at 2023-09-04 22:53:19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/warzone2100 (Old) and /work/SRC/openSUSE:Factory/.warzone2100.new.1766 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "warzone2100" Mon Sep 4 22:53:19 2023 rev:27 rq:1108816 version:4.3.5 Changes: -------- --- /work/SRC/openSUSE:Factory/warzone2100/warzone2100.changes 2023-04-20 15:15:20.190212995 +0200 +++ /work/SRC/openSUSE:Factory/.warzone2100.new.1766/warzone2100.changes 2023-09-04 22:53:56.304522952 +0200 @@ -1,0 +2,7 @@ +Sun Sep 3 17:46:20 UTC 2023 - Carsten Ziepke <kiel...@gmail.com> + +- Add warzone2100_fix_build_with_newer_vulkan.patch, fix building + with vulkan-header >= 1.3.260, see + https://github.com/Warzone2100/warzone2100/pull/3353 + +------------------------------------------------------------------- New: ---- warzone2100_fix_build_with_newer_vulkan.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ warzone2100.spec ++++++ --- /var/tmp/diff_new_pack.Fzv2Ty/_old 2023-09-04 22:53:58.812611608 +0200 +++ /var/tmp/diff_new_pack.Fzv2Ty/_new 2023-09-04 22:53:58.816611749 +0200 @@ -32,6 +32,8 @@ URL: http://wz2100.net/ Source: https://github.com/Warzone2100/warzone2100/releases/download/%{version}/warzone2100_src.tar.xz Source99: %{name}.changes +# PATCH-FIX-UPSTREAM - warzone2100_fix_build_with_newer_vulkan.patch - fix building with vulkan >= 1.3.260 +Patch0: warzone2100_fix_build_with_newer_vulkan.patch BuildRequires: asciidoc BuildRequires: cmake >= 3.5 BuildRequires: fdupes @@ -110,6 +112,9 @@ %prep %setup -q -n %{name} +%if %{with vulkan} +%patch0 -p1 +%endif # constant timestamp for reproducible builds modified="$(sed -n '/^----/n;s/ - .*$//;p;q' "%{SOURCE99}")" ++++++ warzone2100_fix_build_with_newer_vulkan.patch ++++++ diff -Nur warzone2100-orig/lib/ivis_opengl/gfx_api_vk.cpp warzone2100/lib/ivis_opengl/gfx_api_vk.cpp --- warzone2100-orig/lib/ivis_opengl/gfx_api_vk.cpp 2023-04-16 19:42:55.000000000 +0200 +++ warzone2100/lib/ivis_opengl/gfx_api_vk.cpp 2023-09-03 20:14:58.425366514 +0200 @@ -59,6 +59,12 @@ #pragma GCC diagnostic ignored "-Wdeprecated-copy" // Ignore warnings caused by vulkan.hpp 148 #endif +#if VK_HEADER_VERSION >= 260 +# define WZ_THROW_VK_RESULT_EXCEPTION(result, message) vk::detail::throwResultException(result, message) +#else +# define WZ_THROW_VK_RESULT_EXCEPTION(result, message) vk::throwResultException(result, message) +#endif + const uint32_t minSupportedVulkanVersion = VK_API_VERSION_1_0; #if defined(DEBUG) // For debug builds, limit to the minimum that should be supported by this backend (which is Vulkan 1.0, see above) @@ -521,7 +527,7 @@ if (result != vk::Result::eSuccess) { // Failed to allocate memory! - vk::throwResultException( result, "vmaCreateBuffer" ); + WZ_THROW_VK_RESULT_EXCEPTION( result, "vmaCreateBuffer" ); } if (autoMap) @@ -1540,7 +1546,7 @@ object = std::move(result.value); break; default: - vk::throwResultException(result.result, "createGraphicsPipeline"); + WZ_THROW_VK_RESULT_EXCEPTION(result.result, "createGraphicsPipeline"); } } @@ -1604,7 +1610,7 @@ if (result != vk::Result::eSuccess) { // Failed to allocate memory! - vk::throwResultException( result, "vmaCreateBuffer" ); + WZ_THROW_VK_RESULT_EXCEPTION( result, "vmaCreateBuffer" ); } buffer_size = size; @@ -1737,7 +1743,7 @@ if (result != vk::Result::eSuccess) { // Failed to allocate memory! - vk::throwResultException( result, "vmaCreateImage" ); + WZ_THROW_VK_RESULT_EXCEPTION( result, "vmaCreateImage" ); } if (root.debugUtilsExtEnabled)
