From 04a313aaae14ce802b29a1416ddee02563fb52db5ff81077a9f2c7964ba7b669 Mon Sep 17 00:00:00 2001 From: c unix Date: Thu, 9 Mar 2023 21:05:36 +0000 Subject: [PATCH] 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 --- godot.changes | 5 +++++ godot.spec | 2 ++ scons_regression.patch | 20 ++++++++++++++++++++ 3 files changed, 27 insertions(+) create mode 100644 scons_regression.patch diff --git a/godot.changes b/godot.changes index 83be65a..914156b 100644 --- a/godot.changes +++ b/godot.changes @@ -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 diff --git a/godot.spec b/godot.spec index 753067d..80486e6 100644 --- a/godot.spec +++ b/godot.spec @@ -37,6 +37,7 @@ 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 @@ -234,6 +235,7 @@ Bash command line completion support for %{name} and %{name}-runner %patch0 -p1 %patch1 -p1 %patch2 -p1 +%patch3 -p1 cp thirdparty/README.md thirdparty_README.md diff --git a/scons_regression.patch b/scons_regression.patch new file mode 100644 index 0000000..9708160 --- /dev/null +++ b/scons_regression.patch @@ -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: \ No newline at end of file