Accepting request 1070400 from home:marxin:branches:games

- Include upstream fix for GCC 13: VMA-fix-gcc13.patch.

OBS-URL: https://build.opensuse.org/request/show/1070400
OBS-URL: https://build.opensuse.org/package/show/games/godot?expand=0&rev=54

VMA-fix-gcc13.patch

@@ -0,0 +1,59 @@
+From b113e6d4ff18dc1b1e6f4ec1bd0e307fd1d8623d Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= <rverschelde@gmail.com>
+Date: Thu, 9 Mar 2023 10:46:35 +0100
+Subject: [PATCH] Vulkan: Fix VMA build with GCC 13
+
+Fixes #74647.
+---
+ thirdparty/vulkan/patches/VMA-fix-gcc13.patch | 26 +++++++++++++++++++
+ thirdparty/vulkan/vk_mem_alloc.h              |  4 +++
+ 2 files changed, 30 insertions(+)
+ create mode 100644 thirdparty/vulkan/patches/VMA-fix-gcc13.patch
+
+diff --git a/thirdparty/vulkan/patches/VMA-fix-gcc13.patch b/thirdparty/vulkan/patches/VMA-fix-gcc13.patch
+new file mode 100644
+index 000000000000..08928503a768
+--- /dev/null
++++ b/thirdparty/vulkan/patches/VMA-fix-gcc13.patch
+@@ -0,0 +1,26 @@
++From 29d492b60c84ca784ea0943efc7d2e6e0f3bdaac Mon Sep 17 00:00:00 2001
++From: Adam Sawicki <adam.sawicki@amd.com>
++Date: Thu, 19 Jan 2023 13:19:55 +0100
++Subject: [PATCH] Added missing #include <cstdio>
++
++For snprintf, for compatibility with GCC 13.
++Fixes #312 - thanks @marxin !
++---
++ thirdparty/vulkan/vk_mem_alloc.h | 4 ++++
++ 1 file changed, 4 insertions(+)
++
++diff --git a/thirdparty/vulkan/vk_mem_alloc.h b/thirdparty/vulkan/vk_mem_alloc.h
++index b787c36..0fe459b 100644
++--- a/thirdparty/vulkan/vk_mem_alloc.h
+++++ b/thirdparty/vulkan/vk_mem_alloc.h
++@@ -2614,6 +2614,10 @@ VMA_CALL_PRE void VMA_CALL_POST vmaFreeStatsString(
++     #include <bit> // For std::popcount
++ #endif
++ 
+++#if VMA_STATS_STRING_ENABLED
+++    #include <cstdio> // For snprintf
+++#endif
+++
++ /*******************************************************************************
++ CONFIGURATION SECTION
++ 
+diff --git a/thirdparty/vulkan/vk_mem_alloc.h b/thirdparty/vulkan/vk_mem_alloc.h
+index 184ee005d827..ea30060649f2 100644
+--- a/thirdparty/vulkan/vk_mem_alloc.h
++++ b/thirdparty/vulkan/vk_mem_alloc.h
+@@ -2582,6 +2582,10 @@ VMA_CALL_PRE void VMA_CALL_POST vmaFreeStatsString(
+     #include <bit> // For std::popcount
+ #endif
+ 
++#if VMA_STATS_STRING_ENABLED
++    #include <cstdio> // For snprintf
++#endif
++
+ /*******************************************************************************
+ CONFIGURATION SECTION
+ 

godot.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Mar  9 11:54:06 UTC 2023 - Martin Liška <mliska@suse.cz>
+
+- Include upstream fix for GCC 13: VMA-fix-gcc13.patch.
+
 -------------------------------------------------------------------
 Fri Mar 3 12:00:00 UTC 2023 - cunix@mail.de
 

godot.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package godot
 #
-# Copyright (c) 2022 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
 # Copyright (c) 2017 Luke Jones, luke.nukem.jones@gmail.com
 #
 # All modifications and additions to the file contributed by third parties
@@ -36,6 +36,7 @@ Source1:        https://downloads.tuxfamily.org/godotengine/%{version}/%{name}-%
 Patch0:         certs_fallback.patch
 # Heap-buffer-overflow in bundled tinyexr
 Patch1:         tinyexr_thirdparty_upstream.patch
+Patch2:         VMA-fix-gcc13.patch
 BuildRequires:  Mesa-devel
 BuildRequires:  desktop-file-utils
 BuildRequires:  fdupes
@@ -62,11 +63,11 @@ BuildRequires:  pkgconfig(theoradec)
 BuildRequires:  pkgconfig(vorbis)
 BuildRequires:  pkgconfig(vorbisfile)
 BuildRequires:  pkgconfig(x11)
-BuildRequires:  pkgconfig(xkbcommon)
 BuildRequires:  pkgconfig(xcursor)
 BuildRequires:  pkgconfig(xext)
 BuildRequires:  pkgconfig(xi)
 BuildRequires:  pkgconfig(xinerama)
+BuildRequires:  pkgconfig(xkbcommon)
 BuildRequires:  pkgconfig(xrandr)
 BuildRequires:  pkgconfig(xrender)
 
@@ -86,10 +87,10 @@ BuildRequires:  pkgconfig(freetype2) >= 2.10.2
 # Using bundled freetype2 throws build errors, if
 #   we don't use bundled libpng and zlib as well.
 BuildRequires:  pkgconfig(libpng)
-BuildRequires:  pkgconfig(graphite2)
-BuildRequires:  pkgconfig(harfbuzz)
 BuildRequires:  glslang-devel
 BuildRequires:  mbedtls-devel
+BuildRequires:  pkgconfig(graphite2)
+BuildRequires:  pkgconfig(harfbuzz)
 BuildRequires:  pkgconfig(libwslay)
 BuildRequires:  pkgconfig(libzstd)
 BuildRequires:  pkgconfig(miniupnpc)
@@ -126,6 +127,7 @@ Provides:       bundled(minizip) = 1.2.13
 
 Provides:       bundled(FastLZ)
 Provides:       bundled(FastNoiseLite)
+Provides:       bundled(JetBrainsMono_Regular)
 Provides:       bundled(RVO2-3D)
 Provides:       bundled(Tangent_Space_Normal_Maps)
 Provides:       bundled(amd-fsr) = 1.0.2
@@ -137,7 +139,6 @@ Provides:       bundled(doctest) = 2.4.9
 Provides:       bundled(etcpak) = 1.0
 Provides:       bundled(glad) = 2.0.2
 Provides:       bundled(google-droid-fonts)
-Provides:       bundled(JetBrainsMono_Regular)
 Provides:       bundled(hqx)
 Provides:       bundled(icu4c) = 72.1
 Provides:       bundled(ifaddrs-android)
@@ -232,6 +233,7 @@ Bash command line completion support for %{name} and %{name}-runner
 %setup -q -n %{name}-%{version}-stable
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 cp thirdparty/README.md thirdparty_README.md