Dominique Leuenberger 2021-11-11 20:38:09 +00:00 committed by Git OBS Bridge
commit 955216f0bc
8 changed files with 109 additions and 17 deletions

View File

@ -5,6 +5,7 @@ References: https://github.com/godotengine/godot/pull/22066#issuecomment-4215657
https://github.com/godotengine/godot/pull/22066#issuecomment-422528664
https://github.com/godotengine/godot/issues/22232
Upstream: offered to upstream
Rebased: 2021-11-08
If project has no value set for "network/ssl/certificates" (the default),
"default_certs" is not filled by function "load_default_certificates" because
@ -26,13 +27,12 @@ See comments in patch for more details.
---
diff -r -U 5 a/modules/mbedtls/crypto_mbedtls.cpp b/modules/mbedtls/crypto_mbedtls.cpp
--- a/modules/mbedtls/crypto_mbedtls.cpp
+++ b/modules/mbedtls/crypto_mbedtls.cpp
@@ -44,10 +44,12 @@
#define PEM_END_CRT "-----END CERTIFICATE-----\n"
@@ -45,10 +45,12 @@
#include <mbedtls/debug.h>
#include <mbedtls/md.h>
#include <mbedtls/pem.h>
+#include <string.h>
@ -41,13 +41,14 @@ diff -r -U 5 a/modules/mbedtls/crypto_mbedtls.cpp b/modules/mbedtls/crypto_mbedt
return memnew(CryptoKeyMbedTLS);
}
Error CryptoKeyMbedTLS::load(String p_path) {
@@ -204,10 +206,21 @@
ERR_FAIL_COND(default_certs == NULL);
Error CryptoKeyMbedTLS::load(String p_path, bool p_public_only) {
@@ -317,10 +319,22 @@
ERR_FAIL_COND(default_certs == nullptr);
if (p_path != "") {
// Use certs defined in project settings.
default_certs->load(p_path);
+
+ } else if (strcmp(_SYSTEM_CERTS_PATH, "") != 0) {
+ // Use system certs only if user did not override in project settings
+ // and if _SYSTEM_CERTS_PATH is set.

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:9f53a7d6d63f4e9d793c41ad1bef89518619f3e1f0ddd089a6521f2d5edc5859
size 20682120

View File

@ -1 +0,0 @@
9f53a7d6d63f4e9d793c41ad1bef89518619f3e1f0ddd089a6521f2d5edc5859 godot-3.3.4-stable.tar.xz

3
godot-3.4-stable.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:1b01aa3cef9ac41c1033d0365c5e4ce74ea2d9547f333aa81804e60d33dfb4e6
size 22647212

View File

@ -0,0 +1 @@
1b01aa3cef9ac41c1033d0365c5e4ce74ea2d9547f333aa81804e60d33dfb4e6 godot-3.4-stable.tar.xz

View File

@ -1,3 +1,89 @@
-------------------------------------------------------------------
Mon Nov 8 12:00:00 UTC 2021 - cunix@mail.de
- Update to 3.4
Added:
* "AESContext", RSA public keys, encryption, decryption, sign, and verify
* "HMACContext"
* Revamped UI theme editor
* Support for translating the class reference
* Initial support for the RISC-V architecture
* Rooms and portals-based occlusion culling
* Ring emitter for 3D particles
* Structs and fragment-to-light varyings in shaders
* Global const arrays in shaders
* Object validity checks
* High quality tonemapper
* Auto-reload scripts with external editor
* Allow to create a node at specific position
* Assign value to property by dropping to scene tree
* Allow dropping property path into script editor
* Save branch as scene by dropping to filesystem
* Implement a "%command%" placeholder in the Main Run Args settin
* Keyboard shortcuts to the project manager
* History navigation in the script editor using extra mouse buttons
* Focus font color for Button and derivatives
* ButtonGroup: "pressed" signal
* ColorPicker: Display previous color and allow selecting it back
* DynamicFont: Allow using WOFF fonts
* ScrollBar: "increment_pressed" and "decrement_pressed" icons
* Theme: support for partial custom editor theme
* Theme: API to retrieve the default font
* Improved glTF module with scene export support
* Lossless WebP encoding
* Input: physical scancodes to fix non-latin layout scancodes
* Allow checking for exact matches with action events
* Multiple address resolution in DNS requests
* Enable setting the number of physics solver iterations
* Heightmap collision shape support in Physics 3D
* Expose collider RID in 2D/3D kinematic collision
* Support for disabling physics on "SoftBody"
* GLES2: Add basic support for CPU blendshapes
* GLES3: Add support for contrast-adaptive sharpening in 3D
* Soft shadows for the CPU lightmapper
* High quality glow mode
* Horizon specular occlusion
* Shaders: "TIME" available in custom functions by default
* Allow dropping custom node scripts in VisualScript editor
* Frame delta smoothing
* OS data directory getter methods exposed
* Getter for the project data directory
* BVH thread safety
* Property "Engine.print_error_messages" to disable printing errors
* Setting to configure number of threads for lightmap baking
* Allow for platform "Thread" implementation override
* Method "Thread.is_alive()" to check if the thread is still doing work
* Method "String::parse_url()" for parsing URLs
* Property "dtls_hostname" for ENet
* Animation "reset" track
* Options to clean/simplify convex hull generated from mesh
* 2D Viewport scale factor property
* LSP: support for custom host setting
Changed:
* Most recently added current "Camera2D" takes precedence
* Add Node name to "print()" of all nodes
* Thread callbacks can now take optional parameters
* "AStar.get_available_point_id()" returns 0 instead of 1 when empty
* Button: Don't change hovering during focus events
* DynamicFont: Re-add support for kerning
* LineEdit: Double click selects words, triple click selects all the content
* Return RID instead of Object ID in "area"-/"body_shape_entered"/-"exited"
* "VisualServer" now sorts based on AABB position
* Default shader specular render mode to "SCHLICK_GGX"
Fixed:
* Make all file access 64-bit
* Ignore property groups and categories in GDScript code completion
* LSP: "SymbolKind" reporting wrong types and better "get_node()" parsing
* Breaking Compatibility: swapped axes in "OpenSimplexNoise.get_image()"
And much more:
https://downloads.tuxfamily.org/godotengine/3.4/Godot_v3.4-stable_changelog_chrono.txt
- "certs_fallback.patch" and "linker_pie_flag.patch" rebased
-------------------------------------------------------------------
Tue Oct 5 12:00:00 UTC 2021 - cunix@mail.de

View File

@ -24,7 +24,7 @@
%define ca_bundle %{_localstatedir}/lib/ca-certificates/ca-bundle.pem
Name: godot
Version: 3.3.4
Version: 3.4
Release: 0
Summary: Cross-Platform Game Engine with an Integrated Editor
License: MIT
@ -69,8 +69,10 @@ 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
BuildRequires: mbedtls-devel
BuildRequires: pkgconfig(bullet)
BuildRequires: pkgconfig(bullet) >= 2.90
BuildRequires: pkgconfig(libwslay)
BuildRequires: pkgconfig(libzstd)
BuildRequires: pkgconfig(miniupnpc)
@ -139,13 +141,15 @@ 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
# per 20211108 Factory is at 3.13.0, Leap at 3.8 .
# Currently build fails with Distro (unbundled) embree on Tumbleweed although
# the required version is available.
# Perhaps because it is build with special flags (static) for blender.
Provides: bundled(embree) = 3.13.0
%if 0%{?suse_version} > 1500
%else
Provides: bundled(bullet) = 2.89
Provides: bundled(bullet) = 3.17
Provides: bundled(libzstd)
%if 0%{?sle_version} < 150200
Provides: bundled(mbedtls) = 2.16.11

View File

@ -6,6 +6,7 @@ References: https://github.com/godotengine/godot/pull/23542#issuecomment-4363858
https://github.com/godotengine/godot/issues/34533
Upstream: seems to do the opposite
Rebased: 2021-04-22
Rebased: 2021-11-08
Linker flag "-no-pie" is added by upstream.
rpmlint complains this violates project policy.
@ -16,7 +17,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
@@ -199,11 +199,11 @@
@@ -205,11 +205,11 @@
# Check for gcc version >= 6 before adding -no-pie
version = get_compiler_version(env) or [-1, -1]
if using_gcc(env):