From 525610e395ecd933843e198e8aea3fa5c06bfb19fc8ae62effcab332b9b186d3 Mon Sep 17 00:00:00 2001 From: c unix Date: Sun, 14 Aug 2022 15:03:28 +0000 Subject: [PATCH] Accepting request 994155 from home:cunix:godot Update to 3.5 OBS-URL: https://build.opensuse.org/request/show/994155 OBS-URL: https://build.opensuse.org/package/show/games/godot?expand=0&rev=44 --- godot-3.4.5-stable.tar.xz | 3 -- godot-3.4.5-stable.tar.xz.sha256 | 1 - godot-3.5-stable.tar.xz | 3 ++ godot-3.5-stable.tar.xz.sha256 | 1 + godot.changes | 69 ++++++++++++++++++++++++++++++++ godot.spec | 35 +++++++++++----- linker_pie_flag.patch | 3 +- 7 files changed, 101 insertions(+), 14 deletions(-) delete mode 100644 godot-3.4.5-stable.tar.xz delete mode 100644 godot-3.4.5-stable.tar.xz.sha256 create mode 100644 godot-3.5-stable.tar.xz create mode 100644 godot-3.5-stable.tar.xz.sha256 diff --git a/godot-3.4.5-stable.tar.xz b/godot-3.4.5-stable.tar.xz deleted file mode 100644 index 6823ced..0000000 --- a/godot-3.4.5-stable.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1857ccb0d4847211664b944c8feaed1832c9845a0f1e5aa886136de66110a388 -size 22630816 diff --git a/godot-3.4.5-stable.tar.xz.sha256 b/godot-3.4.5-stable.tar.xz.sha256 deleted file mode 100644 index d566b60..0000000 --- a/godot-3.4.5-stable.tar.xz.sha256 +++ /dev/null @@ -1 +0,0 @@ -1857ccb0d4847211664b944c8feaed1832c9845a0f1e5aa886136de66110a388 godot-3.4.5-stable.tar.xz diff --git a/godot-3.5-stable.tar.xz b/godot-3.5-stable.tar.xz new file mode 100644 index 0000000..fa36106 --- /dev/null +++ b/godot-3.5-stable.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:22a47065392b8a2a19690db42085b2756c2f67996bd24688cb17307f8a4b59c8 +size 24044340 diff --git a/godot-3.5-stable.tar.xz.sha256 b/godot-3.5-stable.tar.xz.sha256 new file mode 100644 index 0000000..6ef2d9e --- /dev/null +++ b/godot-3.5-stable.tar.xz.sha256 @@ -0,0 +1 @@ +22a47065392b8a2a19690db42085b2756c2f67996bd24688cb17307f8a4b59c8 godot-3.5-stable.tar.xz diff --git a/godot.changes b/godot.changes index 2b94c7d..7a71836 100644 --- a/godot.changes +++ b/godot.changes @@ -1,3 +1,72 @@ +------------------------------------------------------------------- +Sat Aug 6 12:00:00 UTC 2022 - cunix@mail.de + +- Update to 3.5 + + Added: + * NavigationServer with obstacle avoidance + * Physics interpolation in 3D + * SceneTreeTween + * Time singleton + * Label3D node and Sprite3D material render priority + * Scene unique nodes + * FlowContainer + * Asynchronous shader compilation and caching + * OccluderShapePolygon + * "material_overlay" property for MeshInstance + * Transparent background Viewports with post processing effects + * Changing directional shadows at runtime + * Setting visibility for CanvasLayer + * push, pull, fetch and improved diff view to VCS UI + * "global_translation" and "global_rotation"` to Spatial + * Option to paste animation as duplicate + * Configuring loop mode on WAV import + * Pinning property values and Consistent property defaults + * Deep comparison of Array and Dictionary + * methods "OS.is_process_running()", "OS.crash()", "OS.has_clipboard()", + "OS.get_processor_name()", "OS.get_screen_refresh_rate()", + "OS.move_to_trash()", "Image.fill_rect()", "String.get_slice()", + "String.join()", "Dictionary.merge()" + * Search methods for PoolArrays: "has()", "count()", "find()", "rfind()" + * Option to keep or skip carriage return (CR) in "File.get_as_text()" + * GradientTexture2D + * Signal to notify when children nodes enter or exit tree + * Alt + Mouse wheel to adjust FOV in the 3D editor viewport + * Make overridden properties link to parent definition + * drag and drop for NodePaths + * drag and drop to TextEdit, LineEdit, RichTextLabel + * drag start/end signals for Slider + * Option to make selection unique to TextEdit, LineEdit, RichTextLabel + * alignment options to Button icons + * WOFF2 font support and brotli decoder + * RichTextLabel: "deselect()" and "get_selected_text()" methods + * Binary MO translation file support + * Proxy support for HTTPClient and the editor + * "set_extra_headers()" to WebSocketServer + * Support for primary clipboard + * Viewport property to use full floating-point precision in HDR + * Saving multiple Images in BakedLightmap + * "max_distance" for VisibilityNotifier + * "VERTEX_ID" and "INSTANCE_ID" to user created shaders + * Random initial color feature for all Particles nodes + + Changed: + * Create onready variables when dropping nodes and holding Ctrl + * Don't switch to 2D/3D viewports when selecting nodes while in Script Editor + * Re-enable input accumulation disabled by error in 3.4 + * Navigation and Navigation2D nodes were kept for compatibility but are now + deprecated. Their functionality is replaced by the NavigationServer + and Navigation2DServer. + * WebSocket hostname resolution non-blocking + * Use application name as PulseAudio device name + + And much more: + https://downloads.tuxfamily.org/godotengine/3.5/Godot_v3.5-stable_changelog_chrono.txt + +- "linker_pie_flag.patch" rebased + +- Use bundled freetype, libpng and zlib for non-Tumbleweed builds. + ------------------------------------------------------------------- Tue Aug 2 12:00:00 UTC 2022 - cunix@mail.de diff --git a/godot.spec b/godot.spec index c0eee91..e2865eb 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.4.5 +Version: 3.5 Release: 0 Summary: Cross-Platform Game Engine with an Integrated Editor License: MIT @@ -47,10 +47,8 @@ BuildRequires: scons BuildRequires: update-desktop-files BuildRequires: yasm-devel BuildRequires: pkgconfig(alsa) -BuildRequires: pkgconfig(freetype2) BuildRequires: pkgconfig(glesv2) BuildRequires: pkgconfig(libpcre2-32) -BuildRequires: pkgconfig(libpng) BuildRequires: pkgconfig(libpulse) BuildRequires: pkgconfig(libudev) BuildRequires: pkgconfig(libwebp) @@ -67,15 +65,29 @@ BuildRequires: pkgconfig(xcursor) BuildRequires: pkgconfig(xi) BuildRequires: pkgconfig(xinerama) BuildRequires: pkgconfig(xrandr) -BuildRequires: pkgconfig(zlib) + %if 0%{?suse_version} > 1500 # Does not work currently: # BuildRequires: embree-devel-static >= 3.13.0 + +# https://github.com/godotengine/godot/issues/64090 : +# unbundled freetype needs to be build with brotli decompression support +# to load build in WOFF2 editor fonts since godot version 3.5. +# This was added according to +# https://build.opensuse.org/package/view_file/M17N/freetype2/freetype2.changes +# in freetype2 version 2.10.2 +# By default this seems to be currently only available in Tumbleweed (v2.12.1). +# As of 20220808 Leap 15.2, .3 and .4 report freetype2 version as 2.10.1 +BuildRequires: pkgconfig(freetype2) >= 2.10.2 +# Using bundled freetype2 throws build errors, if +# we don't use bundled libpng and zlib as well. +BuildRequires: pkgconfig(libpng) BuildRequires: mbedtls-devel BuildRequires: pkgconfig(bullet) >= 2.90 BuildRequires: pkgconfig(libwslay) BuildRequires: pkgconfig(libzstd) BuildRequires: pkgconfig(miniupnpc) +BuildRequires: pkgconfig(zlib) %else %if 0%{?is_opensuse} # SLES seems not to have wslay and miniupnpc @@ -110,9 +122,10 @@ Provides: bundled(enet) = 1.3.17 Provides: bundled(minizip) = 1.2.12 Provides: bundled(FastLZ) +Provides: bundled(RVO2-3D) Provides: bundled(Tangent_Space_Normal_Maps) +Provides: bundled(brotli) Provides: bundled(cvtt) -Provides: bundled(easing) Provides: bundled(etc2comp) Provides: bundled(glad) Provides: bundled(google-droid-fonts) @@ -150,8 +163,12 @@ Provides: bundled(embree) = 3.13.0 %if 0%{?suse_version} > 1500 %else -Provides: bundled(bullet) = 3.17 +Provides: bundled(bullet) = 3.24 +# see comments for freetype2, libpng and zlib Factory BuildRequires +Provides: bundled(freetype2) +Provides: bundled(libpng) Provides: bundled(libzstd) +Provides: bundled(zlib) %if 0%{?sle_version} < 150200 Provides: bundled(mbedtls) = 2.18.1 %endif @@ -260,8 +277,8 @@ sed -i '$s/_complete_godot_bash godot/_complete_godot_bash godot-server/' misc/d %build # Configuring build to use some distribution libraries -unbundle_libs=('certs' 'freetype' 'libogg' 'libpng' 'libtheora' 'libvorbis' \ - 'libwebp' 'opus' 'pcre2' 'zlib') +unbundle_libs=('certs' 'libogg' 'libtheora' 'libvorbis' \ + 'libwebp' 'opus' 'pcre2') # Adding distribution name to build name %if 0%{?suse_version} @@ -276,7 +293,7 @@ unbundle_libs=('certs' 'freetype' 'libogg' 'libpng' 'libtheora' 'libvorbis' \ # Unbundle more libs for Tumbleweed %if %{suse_version} > 1500 -unbundle_libs+=('bullet' 'mbedtls' 'zstd') +unbundle_libs+=('bullet' 'freetype' 'libpng' 'mbedtls' 'zlib' 'zstd') %else # Unbundle more libs for coming Leap %if 0%{?sle_version} >= 150200 && 0%{?is_opensuse} diff --git a/linker_pie_flag.patch b/linker_pie_flag.patch index 2373fbf..3710280 100644 --- a/linker_pie_flag.patch +++ b/linker_pie_flag.patch @@ -7,6 +7,7 @@ References: https://github.com/godotengine/godot/pull/23542#issuecomment-4363858 Upstream: seems to do the opposite Rebased: 2021-04-22 Rebased: 2021-11-08 +Rebased: 2022-08-06 Linker flag "-no-pie" is added by upstream. rpmlint complains this violates project policy. @@ -17,7 +18,7 @@ Patch replaces flag "-no-pie" with "-pie". diff -r -U 5 a/platform/x11/detect.py b/platform/x11/detect.py --- a/platform/x11/detect.py +++ b/platform/x11/detect.py -@@ -205,11 +205,11 @@ +@@ -236,11 +236,11 @@ # Check for gcc version >= 6 before adding -no-pie version = get_compiler_version(env) or [-1, -1] if using_gcc(env):