diff --git a/godot-4.1.3-stable.tar.xz b/godot-4.1.3-stable.tar.xz deleted file mode 100644 index 52c235c..0000000 --- a/godot-4.1.3-stable.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4b7bdc1feae5722bf6491c15215dade68d77c0b35ec5e7592966a32368cc9ea4 -size 31027024 diff --git a/godot-4.1.3-stable.tar.xz.sha256 b/godot-4.1.3-stable.tar.xz.sha256 deleted file mode 100644 index 8cfc2a1..0000000 --- a/godot-4.1.3-stable.tar.xz.sha256 +++ /dev/null @@ -1 +0,0 @@ -4b7bdc1feae5722bf6491c15215dade68d77c0b35ec5e7592966a32368cc9ea4 godot-4.1.3-stable.tar.xz diff --git a/godot-4.2-stable.tar.xz b/godot-4.2-stable.tar.xz new file mode 100644 index 0000000..13433d8 --- /dev/null +++ b/godot-4.2-stable.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a4ecd31f976de88293dc9bb1c70816499b9982f0bb33fd0d51e221696e1552af +size 26673572 diff --git a/godot-4.2-stable.tar.xz.sha256 b/godot-4.2-stable.tar.xz.sha256 new file mode 100644 index 0000000..034b2a2 --- /dev/null +++ b/godot-4.2-stable.tar.xz.sha256 @@ -0,0 +1 @@ +a4ecd31f976de88293dc9bb1c70816499b9982f0bb33fd0d51e221696e1552af godot-4.2-stable.tar.xz diff --git a/godot.changes b/godot.changes index 9776987..c11ae81 100644 --- a/godot.changes +++ b/godot.changes @@ -1,3 +1,37 @@ +------------------------------------------------------------------- +Thu Nov 30 12:00:00 UTC 2023 - cunix@mail.de + +- Update to 4.2 + + Breaking possible: + * AnimationMixer between AnimationPlayer and AnimationTree + * GraphEdit and GraphNode reworked + * GLTF importer + * Internal storing of meshes + * "change_scene_to_"* methods + * "bus_layout_changed" signal removed in AudioServer + * NOTIFICATION_NODE_RECACHE_REQUESTED removed + + Some highlights: + * Onion skinning mode to preview animations + * 2D navigation mesh baking + * Multi-threading when baking the navigation mesh + * Editor code regions + * Project manager reorganized + * GDExtension hot reload in editor + * Import type changes are picked up on the fly + * KTX image format + * Native file selection dialogs + * Copying and pasting images to clipboard + * OIDN dropped as default denoiser + * GPU and CPU particles start to deviate + * Full support for threaded code in script debugger + + and much more: + https://godotengine.github.io/godot-interactive-changelog/#4.2 + +- rebased improve_linker_detection.patch + ------------------------------------------------------------------- Tue Nov 7 12:00:00 UTC 2023 - cunix@mail.de diff --git a/godot.spec b/godot.spec index 44a97b6..51ece01 100644 --- a/godot.spec +++ b/godot.spec @@ -29,7 +29,7 @@ %define compiler_version_leap 10 Name: godot -Version: 4.1.3 +Version: 4.2 Release: 0 Summary: Cross-Platform Game Engine with an Integrated Editor License: MIT @@ -97,7 +97,6 @@ BuildRequires: pkgconfig(freetype2) >= 2.10.2 BuildRequires: pkgconfig(libpng) BuildRequires: pkgconfig(libbrotlicommon) BuildRequires: pkgconfig(libbrotlidec) -BuildRequires: glslang-devel BuildRequires: mbedtls-devel < 3 BuildRequires: pkgconfig(graphite2) BuildRequires: pkgconfig(harfbuzz) @@ -136,41 +135,46 @@ Provides: bundled(enet) = 1.3.17 Provides: bundled(minizip) = 1.3 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 +Provides: bundled(amd-fsr2) = 2.2.1 +Provides: bundled(angle) Provides: bundled(astcenc) = 4.4.0 Provides: bundled(basis_universal) = 1.16.4 +Provides: bundled(clipper2) = 1.2.2 Provides: bundled(cvtt) Provides: bundled(doctest) = 2.4.11 Provides: bundled(etcpak) = 1.0 Provides: bundled(glad) = 2.0.4 +# same version for glslang, spirv-reflect, volk and vulkan needed +Provides: bundled(glslang) = sdk-1.3.261.1 Provides: bundled(google-droid-fonts) -Provides: bundled(hqx) Provides: bundled(icu4c) = 73.2 Provides: bundled(ifaddrs-android) Provides: bundled(jpeg-compressor) = 2.00 +Provides: bundled(libktx) = 4.1.0 Provides: bundled(meshoptimizer) +Provides: bundled(mingw-std-threads) Provides: bundled(minimp3) Provides: bundled(msdfgen) = 1.10 +Provides: bundled(noise) Provides: bundled(noto-sans-fonts) Provides: bundled(nvapi) = R525 -Provides: bundled(oidn) = 1.9.2 -Provides: bundled(openxr) = 1.0.28 +Provides: bundled(openxr) = 1.0.31 Provides: bundled(pcg) Provides: bundled(polyclipping) Provides: bundled(polypartition) Provides: bundled(pvrtccompressor) Provides: bundled(smaz) -Provides: bundled(spirv-reflect) = sdk-1.3.250.0 +Provides: bundled(spirv-reflect) = sdk-1.3.261.1 Provides: bundled(stb) Provides: bundled(thorvg) = 0.9.0 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 +Provides: bundled(volk) = sdk-1.3.261.1 +Provides: bundled(vulkan) = sdk-1.3.261.1 Provides: bundled(yuv2rgb) # Can be unbundled if packaged @@ -187,18 +191,17 @@ Provides: bundled(embree) = 3.13.5 %if 0%{?suse_version} > 1500 %else -Provides: bundled(brotli) -Provides: bundled(glslang) = 12.2.0 +Provides: bundled(brotli) = 1.1.0 + # see comments for freetype2, libpng and zlib Factory BuildRequires Provides: bundled(freetype2) = 2.13.2 Provides: bundled(graphite) = 1.3.14 -Provides: bundled(harfbuzz) = 7.3.0 - +Provides: bundled(harfbuzz) = 8.2.2 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.4 +Provides: bundled(mbedtls) = 2.28.5 %endif %if !0%{?is_opensuse} # SLES seems not to have miniupnpc and wslay @@ -289,7 +292,7 @@ unbundle_libs=('certs' 'libogg' 'libtheora' 'libvorbis' \ # Unbundle more libs for Tumbleweed %if %{suse_version} > 1500 -unbundle_libs+=('brotli' 'freetype' 'glslang' 'graphite' 'harfbuzz' 'libpng' 'mbedtls' 'zlib' 'zstd') +unbundle_libs+=('brotli' 'freetype' 'graphite' 'harfbuzz' 'libpng' 'mbedtls' 'zlib' 'zstd') %else # Unbundle more libs for coming Leap %if 0%{?sle_version} >= 150200 && 0%{?is_opensuse} @@ -374,7 +377,7 @@ install -D -p -m 644 misc/dist/shell/godot-runner %{buildroot}%{_datadir}/bash-c %fdupes -s %{buildroot}/%{_prefix} %files -%license LICENSE.txt LOGO_LICENSE.md COPYRIGHT.txt thirdparty_README.md +%license LICENSE.txt LOGO_LICENSE.txt COPYRIGHT.txt thirdparty_README.md %doc AUTHORS.md CHANGELOG.md CONTRIBUTING.md DONORS.md README.md logo.svg %dir %{_datadir}/icons/hicolor %dir %{_datadir}/icons/hicolor/256x256 @@ -390,7 +393,7 @@ install -D -p -m 644 misc/dist/shell/godot-runner %{buildroot}%{_datadir}/bash-c %if !0%{?faster_build} %files runner -%license LICENSE.txt LOGO_LICENSE.md COPYRIGHT.txt thirdparty_README.md +%license LICENSE.txt LOGO_LICENSE.txt COPYRIGHT.txt thirdparty_README.md %doc AUTHORS.md CHANGELOG.md CONTRIBUTING.md DONORS.md README.md logo.svg %{_bindir}/%{name}-runner %endif diff --git a/improve_linker_detection.patch b/improve_linker_detection.patch index 9da8fec..28e6df8 100644 --- a/improve_linker_detection.patch +++ b/improve_linker_detection.patch @@ -2,6 +2,7 @@ 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 +Rebased: 2023-11-30 distro added stuff to "ld --version" output prevents correct version detection. @@ -16,7 +17,7 @@ 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 @@ +@@ -463,16 +463,17 @@ import re linker_version_str = subprocess.check_output( @@ -29,3 +30,8 @@ diff -r -U 5 a/platform/linuxbsd/detect.py b/platform/linuxbsd/detect.py "Warning: Creating export template binaries enabled for PCK embedding is currently only supported with GNU ld, not gold, LLD or mold." ) else: ++ print("gnu_ld_version found by patch: " + str(gnu_ld_version.group(1))) + if float(gnu_ld_version.group(1)) >= 2.30: + env.Append(LINKFLAGS=["-T", "platform/linuxbsd/pck_embed.ld"]) + else: + env.Append(LINKFLAGS=["-T", "platform/linuxbsd/pck_embed.legacy.ld"])