added scons_regression.patch for scons 4.5.1 until 4.5.2

OBS-URL: https://build.opensuse.org/package/show/games/godot?expand=0&rev=55
This commit is contained in:
c unix 2023-03-09 21:05:36 +00:00 committed by Git OBS Bridge
parent bc46c7f8b0
commit 04a313aaae
3 changed files with 27 additions and 0 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Thu Mar 9 12:00:00 UTC 2023 - cunix@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 <mliska@suse.cz> Thu Mar 9 11:54:06 UTC 2023 - Martin Liška <mliska@suse.cz>

View File

@ -37,6 +37,7 @@ Patch0: certs_fallback.patch
# Heap-buffer-overflow in bundled tinyexr # Heap-buffer-overflow in bundled tinyexr
Patch1: tinyexr_thirdparty_upstream.patch Patch1: tinyexr_thirdparty_upstream.patch
Patch2: VMA-fix-gcc13.patch Patch2: VMA-fix-gcc13.patch
Patch3: scons_regression.patch
BuildRequires: Mesa-devel BuildRequires: Mesa-devel
BuildRequires: desktop-file-utils BuildRequires: desktop-file-utils
BuildRequires: fdupes BuildRequires: fdupes
@ -234,6 +235,7 @@ Bash command line completion support for %{name} and %{name}-runner
%patch0 -p1 %patch0 -p1
%patch1 -p1 %patch1 -p1
%patch2 -p1 %patch2 -p1
%patch3 -p1
cp thirdparty/README.md thirdparty_README.md cp thirdparty/README.md thirdparty_README.md

20
scons_regression.patch Normal file
View File

@ -0,0 +1,20 @@
From: cunix@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 --git a/platform/linuxbsd/detect.py b/platform/linuxbsd/detect.py
index 549319a750..0214ebd8bd 100644
--- a/platform/linuxbsd/detect.py
+++ b/platform/linuxbsd/detect.py
@@ -306,6 +306,7 @@ def configure(env: "Environment"):
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: