From 55e8fd93b7bce114c5947522ba8faa14e3e44e96114d6acd46ac05a33fb34743 Mon Sep 17 00:00:00 2001 From: c unix Date: Fri, 28 May 2021 16:36:47 +0000 Subject: [PATCH] Accepting request 895409 from home:cunix:godot Update to 3.3.2 OBS-URL: https://build.opensuse.org/request/show/895409 OBS-URL: https://build.opensuse.org/package/show/games/godot?expand=0&rev=27 --- godot-3.3-stable.tar.xz | 3 -- godot-3.3-stable.tar.xz.sha256 | 1 - godot-3.3.2-stable.tar.xz | 3 ++ godot-3.3.2-stable.tar.xz.sha256 | 1 + godot.changes | 61 ++++++++++++++++++++++++++++++++ godot.spec | 15 +++++--- use_system_zlib_for_fbx.patch | 28 --------------- 7 files changed, 75 insertions(+), 37 deletions(-) delete mode 100644 godot-3.3-stable.tar.xz delete mode 100644 godot-3.3-stable.tar.xz.sha256 create mode 100644 godot-3.3.2-stable.tar.xz create mode 100644 godot-3.3.2-stable.tar.xz.sha256 delete mode 100644 use_system_zlib_for_fbx.patch diff --git a/godot-3.3-stable.tar.xz b/godot-3.3-stable.tar.xz deleted file mode 100644 index d83b4eb..0000000 --- a/godot-3.3-stable.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:fcbbc6aaab16059e6622482c3358d58098d34ed51e099c854ec0ad79f466d555 -size 20581028 diff --git a/godot-3.3-stable.tar.xz.sha256 b/godot-3.3-stable.tar.xz.sha256 deleted file mode 100644 index 73676b1..0000000 --- a/godot-3.3-stable.tar.xz.sha256 +++ /dev/null @@ -1 +0,0 @@ -fcbbc6aaab16059e6622482c3358d58098d34ed51e099c854ec0ad79f466d555 godot-3.3-stable.tar.xz diff --git a/godot-3.3.2-stable.tar.xz b/godot-3.3.2-stable.tar.xz new file mode 100644 index 0000000..ea708e5 --- /dev/null +++ b/godot-3.3.2-stable.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7693c4ef541b815fa5035f136aaf75187a30f0ea8d15cf4ef05433c1c246c2d8 +size 20619728 diff --git a/godot-3.3.2-stable.tar.xz.sha256 b/godot-3.3.2-stable.tar.xz.sha256 new file mode 100644 index 0000000..ceaee14 --- /dev/null +++ b/godot-3.3.2-stable.tar.xz.sha256 @@ -0,0 +1 @@ +7693c4ef541b815fa5035f136aaf75187a30f0ea8d15cf4ef05433c1c246c2d8 godot-3.3.2-stable.tar.xz diff --git a/godot.changes b/godot.changes index ac33668..4a5e3cd 100644 --- a/godot.changes +++ b/godot.changes @@ -1,3 +1,64 @@ +------------------------------------------------------------------- +Tue May 25 12:00:00 UTC 2021 - cunix@mail.de + +- Update to 3.3.2 + + Added: + * GDScript: Allow "warning-ignore" in the same line + as the respective warning + * Import: Print warning when importing a + repeating NPOT texture in a GLES2 project + + Changed: + * Remove high radiance sizes from the editor due to issues on specific GPUs + + Fixed: + * STL to Godot type conversion of polypartition + * Duplicate close file when deconstructing ZipArchive + * Swapped front/rear directions in viewport rotation control + * Editor crash when exporting profiler data + * glTF: Improved error handling around invalid images and invalid meshes + * ragdoll simulation when parent was readded to scene + * Crash on debug shapes update if CollisionObject is not in tree + * Batching: "item_batch_flags" stale state causing glitches + +------------------------------------------------------------------- +Fri May 21 12:00:00 UTC 2021 - cunix@mail.de + +- Update to 3.3.1 + + Added: + * Expose "Shape.get_debug_mesh()" to the scripting API + * Add Ctrl+Shift+A to instance scene in Scene Tree dock + * Allow negative contrast values in the editor theme settings + * TileMap: Apply modulate on autotile previews + * Add support for ARM64 architecture for the Embree raycaster + + Changed: + * Create "CollisionObject" debug shapes using VisualServer + + Fixed: + * SkeletonIK root bones being twisted incorrectly when rotated + * Skinning initialization in "MeshInstance" when loaded from thread + * Linux packaging fixes + * ZIP files being opened with two file descriptors + * CSG Path Polygon cache being removed after connect + * LineEdit: Fix double click to select words + and triple click to select whole line + * Race condition in font preview generation + could lock the editor on first edit + * 3D scene preview generation + * Handle having no sinks in the PulseAudio driver + * Batching: GLES3 light pass modulates + * Batching: Crash with wrong number of verts in translation + * Batching: Fallback for 2D skinning with unrigged polygons + * Lightmapper: Fixes to environment energy + * Disable GIProbe emission when disabled on a material + +- "use_system_zlib_for_fbx.patch" dropped - fixed upstream + +- aarch64: enable modules lightmapper_cpu_enabled and raycast_enabled + ------------------------------------------------------------------- Thu Apr 29 12:37:28 UTC 2021 - Guillaume GARDET diff --git a/godot.spec b/godot.spec index 0b50536..d5cd610 100644 --- a/godot.spec +++ b/godot.spec @@ -24,7 +24,7 @@ %define ca_bundle %{_localstatedir}/lib/ca-certificates/ca-bundle.pem Name: godot -Version: 3.3 +Version: 3.3.2 Release: 0 Summary: Cross-Platform Game Engine with an Integrated Editor License: MIT @@ -36,8 +36,6 @@ Source1: https://downloads.tuxfamily.org/godotengine/%{version}/%{name}-% Patch0: linker_pie_flag.patch # Use system certificates as fallback for certificates Patch1: certs_fallback.patch -# Do not use zlib from thirdparty directory -Patch2: use_system_zlib_for_fbx.patch BuildRequires: Mesa-devel BuildRequires: desktop-file-utils BuildRequires: fdupes @@ -112,7 +110,6 @@ Provides: bundled(FastLZ) Provides: bundled(Tangent_Space_Normal_Maps) Provides: bundled(cvtt) Provides: bundled(easing) -Provides: bundled(embree) Provides: bundled(etc2comp) Provides: bundled(glad) Provides: bundled(google-droid-fonts) @@ -140,6 +137,11 @@ Provides: bundled(recastnavigation) Provides: bundled(squish) = 1.15 Provides: bundled(xatlas) +# Embree 3.13.0+ supports both x86_64 and aarch64. +# per 20210521 Factory is at 3.12.2, Leap at 3.8 . +# Currently build fails on Leap and Tumbleweed with Distro (unbundled) embree +Provides: bundled(embree) = 3.12.1 + %if 0%{?suse_version} > 1500 %else Provides: bundled(bullet) = 2.89 @@ -215,7 +217,6 @@ Bash command line completion support for %{name}, %{name}-headless, %setup -q -n %{name}-%{version}-stable %patch0 -p1 %patch1 -p1 -%patch2 -p1 cp thirdparty/README.md thirdparty_README.md @@ -299,8 +300,12 @@ touch thirdparty/certs/ca-certificates.crt system_certs_path=%{ca_bundle} $system_libs %ifarch aarch64 %arm +%ifarch aarch64 +%define build_args %{build_args_common} module_denoise_enabled=no +%else # Disable unsupported features - https://github.com/godotengine/godot/issues/48297#issuecomment-829165296 %define build_args %{build_args_common} module_denoise_enabled=no module_lightmapper_cpu_enabled=no module_raycast_enabled=no +%endif %else %define build_args %{build_args_common} %endif diff --git a/use_system_zlib_for_fbx.patch b/use_system_zlib_for_fbx.patch deleted file mode 100644 index f808ef4..0000000 --- a/use_system_zlib_for_fbx.patch +++ /dev/null @@ -1,28 +0,0 @@ -From: cunix@mail.de -Date: 2021-04-22 12:00:00 -Subject: FBXParser should compile with system zlib -References: https://github.com/godotengine/godot/pull/48074 - -Although zlib is unbundled, FBXParser.cpp wants to use the bundled -header file. Fix this. - -Upstream patch probably included in 3.3.1. - ---- - -diff -r -U 5 a/modules/fbx/fbx_parser/FBXParser.cpp b/modules/fbx/fbx_parser/FBXParser.cpp ---- a/modules/fbx/fbx_parser/FBXParser.cpp -+++ b/modules/fbx/fbx_parser/FBXParser.cpp -@@ -72,11 +72,11 @@ - - /** @file FBXParser.cpp - * @brief Implementation of the FBX parser and the rudimentary DOM that we use - */ - --#include "thirdparty/zlib/zlib.h" -+#include "/usr/include/zlib.h" - #include /* strtol */ - - #include "ByteSwapper.h" - #include "FBXParseTools.h" - #include "FBXParser.h"