From af4dc006c49dfca00e6562f6711c1da90f2ec6ab5280492217e3be4c0845081b Mon Sep 17 00:00:00 2001 From: c unix Date: Sat, 14 Oct 2023 14:25:45 +0000 Subject: [PATCH] Accepting request 1117061 from home:cunix:godot regex adapted OBS-URL: https://build.opensuse.org/request/show/1117061 OBS-URL: https://build.opensuse.org/package/show/games/godot?expand=0&rev=69 --- godot-4.1.1-stable.tar.xz | 3 -- godot-4.1.1-stable.tar.xz.sha256 | 1 - godot-4.1.2-stable.tar.xz | 3 ++ godot-4.1.2-stable.tar.xz.sha256 | 1 + godot.changes | 68 ++++++++++++++++++++++++++++++++ godot.spec | 19 +++++---- improve_linker_detection.patch | 31 +++++++++++++++ 7 files changed, 114 insertions(+), 12 deletions(-) delete mode 100644 godot-4.1.1-stable.tar.xz delete mode 100644 godot-4.1.1-stable.tar.xz.sha256 create mode 100644 godot-4.1.2-stable.tar.xz create mode 100644 godot-4.1.2-stable.tar.xz.sha256 create mode 100644 improve_linker_detection.patch diff --git a/godot-4.1.1-stable.tar.xz b/godot-4.1.1-stable.tar.xz deleted file mode 100644 index 58637b5..0000000 --- a/godot-4.1.1-stable.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:cd3cee1364020eb069f7cfdf2c484ba54fdeadc5a4d23fb9732d8e52923e1a71 -size 30681136 diff --git a/godot-4.1.1-stable.tar.xz.sha256 b/godot-4.1.1-stable.tar.xz.sha256 deleted file mode 100644 index 7b06471..0000000 --- a/godot-4.1.1-stable.tar.xz.sha256 +++ /dev/null @@ -1 +0,0 @@ -cd3cee1364020eb069f7cfdf2c484ba54fdeadc5a4d23fb9732d8e52923e1a71 godot-4.1.1-stable.tar.xz diff --git a/godot-4.1.2-stable.tar.xz b/godot-4.1.2-stable.tar.xz new file mode 100644 index 0000000..2521c8d --- /dev/null +++ b/godot-4.1.2-stable.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:41c9aedf1de788bd8e6c16bbb7a75411fde48023b54a8abbd936df47879d0108 +size 31020196 diff --git a/godot-4.1.2-stable.tar.xz.sha256 b/godot-4.1.2-stable.tar.xz.sha256 new file mode 100644 index 0000000..5eb2237 --- /dev/null +++ b/godot-4.1.2-stable.tar.xz.sha256 @@ -0,0 +1 @@ +41c9aedf1de788bd8e6c16bbb7a75411fde48023b54a8abbd936df47879d0108 godot-4.1.2-stable.tar.xz diff --git a/godot.changes b/godot.changes index ab8f57f..bba52f4 100644 --- a/godot.changes +++ b/godot.changes @@ -1,3 +1,71 @@ +------------------------------------------------------------------- +Thu Oct 5 12:00:00 UTC 2023 - cunix@mail.de + +- Update to 4.1.2 + + Added: + * Check to ensure registered classes are declared + * Motion vector support for GPU 3D Particles + * More hint types for uniform arrays in shaders + * Autocomplete for filter/repeat hints on uniform arrays in shaders + + Changed: + * Disable C++ exception handling + * 3D property hint range for camera attributes exposure multiplier + * Don't use splash minimum display time in editor + * Automatically add path to built-in scripts + * Uncollapse favorites by default in the editor FileSystem dock + * Use "ui_text_submit" instead of "ui_accept" + to confirm and close text prompts + * Make editor camera speed indicator use "m/s" and "m" + * Enable transparent background for GUI tooltips + * Ensure "joy_connection_changed" is emitted on the main thread + * Do not fail DisplayServer init if non-essential extensions are missing + * Enable depth writes during shadow pass and depth pass, + disable during color pass + * Clamp Volumetric Fog Length property to prevent rendering issues + + Fixed: + * Camera2D crash when edited scene root is null + * "CanvasModulate" logic for modulating the canvas + * VoxelGI saving VoxelGIData as a built-in file, + despite being prompted to save it to an external file + * Curve3D baking up vectors for nontrivial curves + * Remove animation tracks with correct indices + * Audio stream generators getting freed accidentally + * Range error for "Array.slice" + * Recursion level check for array stringification + * Global transform validity for "Node2D" and "Control" + * String conversion for -0.0 float values + * "generate_random_bytes" for large chunks + * Improve resolution of script type icons + * Make the single window mode check more strict + * Crash when using "Close All Tabs" + * Version check for GDExtension + * Overriding "_export_begin", "_export_file" and + "_export_end" from GDExtension + * Conflict between property and group names + * RichTextLabel character line and paragraph index getters + * Delay on tab resizing when (un)hovering tabs + * Button clipping when internal margins exist + * "OptionButton" resize when disabling "Fit to Longest Item" + * "Button" text when the overrun behavior is other than "No Trimming" + * Crash when hiding subwindow during popup of new subwindow + * ItemList not updating when icon scale changes + * NavigationObstacle2D debug position + * Prevent crash when accessing "Node" Multiplayer from thread + * ENet: Better handle truncated socket messages + * ENet: Properly set transfer flags when using custom channels + * File permissions set to 0666 + * Shader type detection + * Shader and ShaderInclude resource loading + * Empty shader resource loading + + and more: + https://godotengine.github.io/godot-interactive-changelog/#4.1.2 + +- added improve_linker_detection.patch for pck embedding with runner + ------------------------------------------------------------------- Wed Jul 19 12:00:00 UTC 2023 - cunix@mail.de diff --git a/godot.spec b/godot.spec index 01f7d9f..2d4aa00 100644 --- a/godot.spec +++ b/godot.spec @@ -29,7 +29,7 @@ %define compiler_version_leap 10 Name: godot -Version: 4.1.1 +Version: 4.1.2 Release: 0 Summary: Cross-Platform Game Engine with an Integrated Editor License: MIT @@ -37,6 +37,8 @@ Group: Development/Tools/Other URL: https://godotengine.org/ Source0: https://downloads.tuxfamily.org/godotengine/%{version}/%{name}-%{version}-stable.tar.xz Source1: https://downloads.tuxfamily.org/godotengine/%{version}/%{name}-%{version}-stable.tar.xz.sha256 +# better linker version detection for pck embedding with runner +Patch0: improve_linker_detection.patch BuildRequires: Mesa-devel BuildRequires: desktop-file-utils BuildRequires: fdupes @@ -147,7 +149,7 @@ Provides: bundled(etcpak) = 1.0 Provides: bundled(glad) = 2.0.4 Provides: bundled(google-droid-fonts) Provides: bundled(hqx) -Provides: bundled(icu4c) = 73.1 +Provides: bundled(icu4c) = 73.2 Provides: bundled(ifaddrs-android) Provides: bundled(jpeg-compressor) = 2.00 Provides: bundled(meshoptimizer) @@ -156,7 +158,7 @@ Provides: bundled(msdfgen) = 1.10 Provides: bundled(noto-sans-fonts) Provides: bundled(nvapi) = R525 Provides: bundled(oidn) = 1.9.2 -Provides: bundled(openxr) = 1.0.26 +Provides: bundled(openxr) = 1.0.28 Provides: bundled(pcg) Provides: bundled(polyclipping) Provides: bundled(polypartition) @@ -165,7 +167,7 @@ Provides: bundled(smaz) Provides: bundled(spirv-reflect) = sdk-1.3.250.0 Provides: bundled(stb) Provides: bundled(thorvg) = 0.9.0 -Provides: bundled(tinyexr) = 1.0.5 +Provides: bundled(tinyexr) = 1.0.7 Provides: bundled(vhacd) Provides: bundled(volk) = sdk-1.3.250.0 Provides: bundled(vulkan) = sdk-1.3.250.0 @@ -188,20 +190,20 @@ Provides: bundled(embree) = 3.13.5 Provides: bundled(brotli) Provides: bundled(glslang) = 12.2.0 # see comments for freetype2, libpng and zlib Factory BuildRequires -Provides: bundled(freetype2) = 2.13.0 +Provides: bundled(freetype2) = 2.13.2 Provides: bundled(graphite) = 1.3.14 Provides: bundled(harfbuzz) = 7.3.0 -Provides: bundled(libpng) = 1.6.38 +Provides: bundled(libpng) = 1.6.40 Provides: bundled(libzstd) = 1.5.5 Provides: bundled(zlib) %if 0%{?sle_version} < 150200 -Provides: bundled(mbedtls) = 2.28.3 +Provides: bundled(mbedtls) = 2.28.4 %endif %if !0%{?is_opensuse} # SLES seems not to have miniupnpc and wslay Provides: bundled(libwslay) = 1.1.1 -Provides: bundled(miniupnpc) = 2.2.4 +Provides: bundled(miniupnpc) = 2.2.5 %endif %endif @@ -240,6 +242,7 @@ Bash command line completion support for %{name} and %{name}-runner %prep %setup -q -n %{name}-%{version}-stable +%patch0 -p1 cp thirdparty/README.md thirdparty_README.md diff --git a/improve_linker_detection.patch b/improve_linker_detection.patch new file mode 100644 index 0000000..9da8fec --- /dev/null +++ b/improve_linker_detection.patch @@ -0,0 +1,31 @@ +From: cunix@mail.de +Date: 2023-09-21 12:00:00 +Subject: regex in linker detection for template builds fails sometimes to recognize correct ld version +References: https://github.com/godotengine/godot/issues/82078 + +distro added stuff to "ld --version" output prevents correct +version detection. +regex adjusted to improve detection of linker to include +pck embedding code in template builds. + +dstoecker helped to improve the changed regex and gave hints for the implied +dangers regarding assumptions about the parsed string + +--- + +diff -r -U 5 a/platform/linuxbsd/detect.py b/platform/linuxbsd/detect.py +--- a/platform/linuxbsd/detect.py ++++ b/platform/linuxbsd/detect.py +@@ -453,11 +453,11 @@ + import re + + linker_version_str = subprocess.check_output( + [env.subst(env["LINK"]), "-Wl,--version"] + env.subst(env["LINKFLAGS"]) + ).decode("utf-8") +- gnu_ld_version = re.search(r"^GNU ld [^$]*(\d+\.\d+)$", linker_version_str, re.MULTILINE) ++ gnu_ld_version = re.search(r"^GNU ld \(GNU Binutils[^)]*\) (\d+\.\d+)", linker_version_str, re.MULTILINE) + if not gnu_ld_version: + print( + "Warning: Creating export template binaries enabled for PCK embedding is currently only supported with GNU ld, not gold, LLD or mold." + ) + else: