The package rpms/godot.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s): https://src.fedoraproject.org/cgit/rpms/godot.git/commit/?id=2247f344fe0eafd....
Change: -%ifarch %{arm32}
Thanks.
Full change: ============
commit 59c375546127f2e11d2cc8bb403d45e06c67fe0e Author: Rémi Verschelde rverschelde@gmail.com Date: Tue Dec 12 14:00:09 2023 +0100
Use bundled openxr on Fedora < 39, needs at least 1.0.28
- And fix name of LOGO_LICENSE.txt.
diff --git a/godot.spec b/godot.spec index 4ca14a8..7c14107 100644 --- a/godot.spec +++ b/godot.spec @@ -57,7 +57,6 @@ BuildRequires: pkgconfig(libwebp) BuildRequires: pkgconfig(libwslay) BuildRequires: pkgconfig(libzstd) BuildRequires: pkgconfig(ogg) -BuildRequires: pkgconfig(openxr) BuildRequires: pkgconfig(speech-dispatcher) BuildRequires: pkgconfig(theora) BuildRequires: pkgconfig(vorbis) @@ -81,6 +80,7 @@ BuildRequires: python3-scons # See bundled section for explanations. %define system_embree 0%{?mageia} || (0%{?fedora} && 0%{?fedora} < 38) %define system_glslang 0 +%define system_openxr 0%{?fedora} >= 39 %define system_recastnavigation 0%{?mageia}
%if %{system_embree} @@ -93,6 +93,10 @@ BuildRequires: embree-devel < 4 BuildRequires: glslang-devel %endif
+%if %{system_openxr} +BuildRequires: pkgconfig(openxr) +%endif + %if %{system_recastnavigation} BuildRequires: recastnavigation-devel %endif @@ -137,6 +141,10 @@ Provides: bundled(glslang) = 12.3.1 Provides: bundled(minizip) = 1.3 # Could be unbundled if packaged. Provides: bundled(msdfgen) = 1.10 +%if ! %{system_openxr} +# Needs at least 1.0.28. +Provides: bundled(openxr) = 1.0.31 +%endif %if ! %{system_recastnavigation} # Could be unbundled if packaged. Provides: bundled(recastnavigation) = 1.6.0 @@ -159,7 +167,7 @@ export games from the source code), use the --headless flag.
%files %doc CHANGELOG.md DONORS.md README.md -%license AUTHORS.md COPYRIGHT.txt LICENSE.txt LOGO_LICENSE.md +%license AUTHORS.md COPYRIGHT.txt LICENSE.txt LOGO_LICENSE.txt %{_bindir}/%{name} %{_datadir}/applications/%{rdnsname}.desktop %{_datadir}/bash-completion/completions/%{name} @@ -215,7 +223,7 @@ end} %build # Needs to be in %%build so that system_libs stays in scope # We don't unbundle enet and minizip as they have necessary custom changes -to_unbundle="brotli freetype graphite harfbuzz icu4c libogg libpng libtheora libvorbis libwebp mbedtls miniupnpc openxr pcre2 squish wslay zlib zstd" +to_unbundle="brotli freetype graphite harfbuzz icu4c libogg libpng libtheora libvorbis libwebp mbedtls miniupnpc pcre2 squish wslay zlib zstd"
%if %{system_embree} to_unbundle+=" embree" @@ -223,6 +231,9 @@ to_unbundle+=" embree" %if %{system_glslang} to_unbundle+=" glslang" %endif +%if %{system_openxr} +to_unbundle+=" openxr" +%endif %if %{system_recastnavigation} to_unbundle+=" recastnavigation" %endif
commit 2247f344fe0eafdc858b291f82fadf9e37466e9c Author: Rémi Verschelde rverschelde@gmail.com Date: Tue Dec 12 13:43:03 2023 +0100
Version 4.2.1-stable
- OIDN no longer bundled, recommend system package for the oidnDenoise binary
diff --git a/.gitignore b/.gitignore index 143c3a1..4573f40 100644 --- a/.gitignore +++ b/.gitignore @@ -35,3 +35,5 @@ /godot-4.1-stable.tar.xz.sha256 /godot-4.1.2-stable.tar.xz /godot-4.1.2-stable.tar.xz.sha256 +/godot-4.2.1-stable.tar.xz +/godot-4.2.1-stable.tar.xz.sha256 diff --git a/godot.spec b/godot.spec index 9d9110e..4ca14a8 100644 --- a/godot.spec +++ b/godot.spec @@ -15,7 +15,7 @@ %define rdnsname org.godotengine.Godot
Name: godot -Version: 4.1.2 +Version: 4.2.1 Release: 1%{?dist} Summary: Multi-platform 2D and 3D game engine with a feature-rich editor %if 0%{?mageia} @@ -27,8 +27,8 @@ URL: https://godotengine.org Source0: https://downloads.tuxfamily.org/godotengine/%%7Bversion%7D/%%7B?prerel:%%7Bs... Source1: https://downloads.tuxfamily.org/godotengine/%%7Bversion%7D/%%7B?prerel:%%7Bs...
-# Preconfigure Blender path to use system-installed version to import .blend files -Patch0: preconfigure-blender-path.patch +# Preconfigure Blender and oidnDenoise paths to use system-installed versions. +Patch0: preconfigure-blender-oidn-paths.patch
# Upstream does not support this arch (for now) ExcludeArch: s390x @@ -80,7 +80,7 @@ BuildRequires: python3-scons
# See bundled section for explanations. %define system_embree 0%{?mageia} || (0%{?fedora} && 0%{?fedora} < 38) -%define system_glslang 0%{?mageia} +%define system_glslang 0 %define system_recastnavigation 0%{?mageia}
%if %{system_embree} @@ -110,6 +110,8 @@ Requires: hicolor-icon-theme
# To support importing .blend files Recommends: blender +# For better denoising of lightmaps, using oidnDenoise +Recommends: oidn
# Bundled libraries: many of the libraries code in `thirdparty` can be # unbundled when the libraries are provided by the system. Keep in mind @@ -127,19 +129,14 @@ Provides: bundled(embree) = 3.13.5 Provides: bundled(enet) %if ! %{system_glslang} # Fedora package only provides static libs, needs more work to be usable. -Provides: bundled(glslang) = 12.2.0 +Provides: bundled(glslang) = 12.3.1 %endif -# Has custom changes to support seeking in zip archives +# Has custom changes to support seeking in zip archives. # Should not be unbundled. -Provides: bundled(minizip) = 1.2.13 +# Includes fix for CVE-2023-45853. +Provides: bundled(minizip) = 1.3 # Could be unbundled if packaged. Provides: bundled(msdfgen) = 1.10 -%ifarch x86_64 -# Could be unbundled but requires some upstream work, and it's not clear if -# upstream code would be compatible with more recent OIDN releases. -# Godot 4.2+ will drop this and allow using oidnDenoise from command line. -Provides: bundled(oidn) = 1.1.0 -%endif %if ! %{system_recastnavigation} # Could be unbundled if packaged. Provides: bundled(recastnavigation) = 1.6.0 @@ -239,15 +236,7 @@ for lib in $to_unbundle; do rm -rf thirdparty/$lib done
-use_lto="use_lto=yes" -%if 0%{?fedora} && 0%{?fedora} < 37 -%ifarch %{arm32} -# We run out of memory when linking. -use_lto="use_lto=no" -%endif -%endif - -%define _scons scons-3 %{?_smp_mflags} "CCFLAGS=%{?build_cflags}" "LINKFLAGS=%{?build_ldflags}" arch=%{godot_arch} $system_libs $use_lto use_static_cpp=no debug_symbols=yes progress=no +%define _scons scons-3 %{?_smp_mflags} "CCFLAGS=%{?build_cflags}" "LINKFLAGS=%{?build_ldflags}" arch=%{godot_arch} $system_libs use_lto=yes use_static_cpp=no debug_symbols=yes progress=no
%if 0%{?fedora} export BUILD_NAME="fedora" @@ -290,6 +279,10 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{rdnsname}.desktop appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/%{rdnsname}.appdata.xml
%changelog +* Tue Dec 12 2023 Rémi Verschelde akien@fedoraproject.org - 4.2.1-1 +- Version 4.2.1-stable +- OIDN no longer bundled, recommend system package for the oidnDenoise binary + * Thu Oct 12 2023 Rémi Verschelde akien@fedoraproject.org - 4.1.2-1 - Version 4.1.2-stable - Updates tinyexr to 1.0.7, fixes CVE-2022-34300 (rhbz#2233637) diff --git a/preconfigure-blender-oidn-paths.patch b/preconfigure-blender-oidn-paths.patch new file mode 100644 index 0000000..da2449e --- /dev/null +++ b/preconfigure-blender-oidn-paths.patch @@ -0,0 +1,21 @@ +Index: godot-4.2-stable/editor/editor_settings.cpp +=================================================================== +--- godot-4.2-stable/editor/editor_settings.cpp ++++ godot-4.2-stable/editor/editor_settings.cpp 2023-11-30 10:55:53.927080877 +0100 +@@ -514,13 +514,13 @@ + EDITOR_SETTING(Variant::INT, PROPERTY_HINT_RANGE, "filesystem/file_dialog/thumbnail_size", 64, "32,128,16") + + // Import (for glft module) +- EDITOR_SETTING_USAGE(Variant::STRING, PROPERTY_HINT_GLOBAL_DIR, "filesystem/import/blender/blender3_path", "", "", PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_RESTART_IF_CHANGED) ++ EDITOR_SETTING_USAGE(Variant::STRING, PROPERTY_HINT_GLOBAL_DIR, "filesystem/import/blender/blender3_path", "/usr/bin", "", PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_RESTART_IF_CHANGED) + EDITOR_SETTING_USAGE(Variant::INT, PROPERTY_HINT_RANGE, "filesystem/import/blender/rpc_port", 6011, "0,65535,1", PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_RESTART_IF_CHANGED) + EDITOR_SETTING_USAGE(Variant::FLOAT, PROPERTY_HINT_RANGE, "filesystem/import/blender/rpc_server_uptime", 5, "0,300,1,or_greater,suffix:s", PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_RESTART_IF_CHANGED) + EDITOR_SETTING_USAGE(Variant::STRING, PROPERTY_HINT_GLOBAL_FILE, "filesystem/import/fbx/fbx2gltf_path", "", "", PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_RESTART_IF_CHANGED) + + // Tools (denoise) +- EDITOR_SETTING_USAGE(Variant::STRING, PROPERTY_HINT_GLOBAL_DIR, "filesystem/tools/oidn/oidn_denoise_path", "", "", PROPERTY_USAGE_DEFAULT) ++ EDITOR_SETTING_USAGE(Variant::STRING, PROPERTY_HINT_GLOBAL_DIR, "filesystem/tools/oidn/oidn_denoise_path", "/usr/bin", "", PROPERTY_USAGE_DEFAULT) + + /* Docks */ + + diff --git a/sources b/sources index 647b79f..fb1a2f1 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (godot-4.1.2-stable.tar.xz) = d9e3c948aeece3586632ed2a8c94ca2107a6b5b4bb1ae8dc264e350fbfcb4cc1f4cd4cf7fdcd61a5b0351511c12e34d83275a79d5e0361e2eee67c8447b5f831 -SHA512 (godot-4.1.2-stable.tar.xz.sha256) = 058ab5cb784432e38e913f40269136372c1804ff1c1c961b2460e72c4ed8d8e3663df6a482fb118b978eeeb61068562074f0cd9ec5f4ff957c4c882588e99d24 +SHA512 (godot-4.2.1-stable.tar.xz) = ac09046532f5cf504bd57c867ac8fcb40b30848152cd6a95ee2a2d2c7e9cce027fdfceb66fcf1146e562cbca853a484da861c45c2a5fc0a63021d309bdf04590 +SHA512 (godot-4.2.1-stable.tar.xz.sha256) = b0fc784540105a0dc183b01bc4447b6fdd080a86e97033727b09b1f9876bd85dabf91de44d11802ddbcbabec575b1e87f018e9c4f346a51c0f1fc277c35137c2
arch-excludes@lists.fedoraproject.org