Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package godot for openSUSE:Factory checked
in at 2023-03-10 22:07:31
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/godot (Old)
and /work/SRC/openSUSE:Factory/.godot.new.31432 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "godot"
Fri Mar 10 22:07:31 2023 rev:25 rq:1070572 version:4.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/godot/godot.changes 2023-03-09
17:46:34.683175558 +0100
+++ /work/SRC/openSUSE:Factory/.godot.new.31432/godot.changes 2023-03-10
22:07:38.597204439 +0100
@@ -1,0 +2,10 @@
+Thu Mar 9 12:00:00 UTC 2023 - cu...@mail.de
+
+- added scons_regression.patch for scons 4.5.1 until 4.5.2
+
+-------------------------------------------------------------------
+Thu Mar 9 11:54:06 UTC 2023 - Martin Liška <mli...@suse.cz>
+
+- Include upstream fix for GCC 13: VMA-fix-gcc13.patch.
+
+-------------------------------------------------------------------
New:
----
VMA-fix-gcc13.patch
scons_regression.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ godot.spec ++++++
--- /var/tmp/diff_new_pack.vFOWer/_old 2023-03-10 22:07:39.401208099 +0100
+++ /var/tmp/diff_new_pack.vFOWer/_new 2023-03-10 22:07:39.409208135 +0100
@@ -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.jo...@gmail.com
#
# All modifications and additions to the file contributed by third parties
@@ -36,6 +36,8 @@
Patch0: certs_fallback.patch
# Heap-buffer-overflow in bundled tinyexr
Patch1: tinyexr_thirdparty_upstream.patch
+Patch2: VMA-fix-gcc13.patch
+Patch3: scons_regression.patch
BuildRequires: Mesa-devel
BuildRequires: desktop-file-utils
BuildRequires: fdupes
@@ -62,11 +64,11 @@
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 +88,10 @@
# 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 +128,7 @@
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 +140,6 @@
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 +234,8 @@
%setup -q -n %{name}-%{version}-stable
%patch0 -p1
%patch1 -p1
+%patch2 -p1
+%patch3 -p1
cp thirdparty/README.md thirdparty_README.md
++++++ VMA-fix-gcc13.patch ++++++
>From b113e6d4ff18dc1b1e6f4ec1bd0e307fd1d8623d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= <rversche...@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.sawi...@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
++++++ scons_regression.patch ++++++
From: cu...@mail.de
Date: 2023-03-09 22:00:00
Subject: scons 4.5.1 regression
References: https://github.com/godotengine/godot/issues/74683
work around regression of scons 4.5.1
expected to be fixed with 4.5.2
---
diff -r -U 5 a/platform/linuxbsd/detect.py b/platform/linuxbsd/detect.py
--- a/platform/linuxbsd/detect.py
+++ b/platform/linuxbsd/detect.py
@@ -305,10 +305,11 @@
env.Append(CPPDEFINES=["ALSA_ENABLED", "ALSAMIDI_ENABLED"])
if env["pulseaudio"]:
if not env["use_sowrap"]:
if os.system("pkg-config --exists libpulse") == 0: # 0 means found
+ env["CPPDEFINES"] = list(env["CPPDEFINES"])
env.ParseConfig("pkg-config libpulse --cflags --libs")
env.Append(CPPDEFINES=["PULSEAUDIO_ENABLED", "_REENTRANT"])
else:
print("Warning: PulseAudio development libraries not found.
Disabling the PulseAudio audio driver.")
env["pulseaudio"] = False
