diff --git a/export_presets.cfg b/export_presets.cfg deleted file mode 100644 index 2e70dd2..0000000 --- a/export_presets.cfg +++ /dev/null @@ -1,24 +0,0 @@ -[preset.0] - -name="Linux/X11" -platform="Linux/X11" -runnable=true -custom_features="" -export_filter="all_resources" -include_filter="" -exclude_filter="" -export_path="" -patch_list=PoolStringArray( ) -script_export_mode=1 -script_encryption_key="" - -[preset.0.options] - -texture_format/bptc=false -texture_format/s3tc=true -texture_format/etc=false -texture_format/etc2=false -texture_format/no_bptc_fallbacks=true -binary_format/64_bits=true -custom_template/release="/usr/bin/godot-runner" -custom_template/debug="" \ No newline at end of file diff --git a/fix-pie-warning.patch b/fix-pie-warning.patch deleted file mode 100644 index 47ecc5c..0000000 --- a/fix-pie-warning.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/platform/x11/detect.py b/platform/x11/detect.py -index 28f5335..35892d8 100644 ---- a/platform/x11/detect.py -+++ b/platform/x11/detect.py -@@ -160,7 +160,7 @@ def configure(env): - version = get_compiler_version(env) - if version != None and version[0] >= '6': - env.Append(CCFLAGS=['-fpie']) -- env.Append(LINKFLAGS=['-no-pie']) -+ - # Do the same for clang should be fine with Clang 4 and higher - if using_clang(env): - version = get_compiler_version(env) diff --git a/godot-3.1.2-stable.tar.xz b/godot-3.1.2-stable.tar.xz deleted file mode 100644 index 6e2ce0b..0000000 --- a/godot-3.1.2-stable.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:44cccbeec37490768429d5adf1495cd904a195f56b7157308c5650e075d9b89e -size 13197308 diff --git a/godot-3.1.2-stable.tar.xz.sha256 b/godot-3.1.2-stable.tar.xz.sha256 deleted file mode 100644 index d97c79a..0000000 --- a/godot-3.1.2-stable.tar.xz.sha256 +++ /dev/null @@ -1 +0,0 @@ -44cccbeec37490768429d5adf1495cd904a195f56b7157308c5650e075d9b89e release-3.1.2-stable/godot-3.1.2-stable.tar.xz diff --git a/godot-3.2-stable.tar.xz b/godot-3.2-stable.tar.xz new file mode 100644 index 0000000..bba30d5 --- /dev/null +++ b/godot-3.2-stable.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:258e166a33f0d71aec59016d8e0d96342a0047a4d84aad2346c232bac8b3c0ce +size 14038472 diff --git a/godot-3.2-stable.tar.xz.sha256 b/godot-3.2-stable.tar.xz.sha256 new file mode 100644 index 0000000..62901df --- /dev/null +++ b/godot-3.2-stable.tar.xz.sha256 @@ -0,0 +1 @@ +258e166a33f0d71aec59016d8e0d96342a0047a4d84aad2346c232bac8b3c0ce godot-3.2-stable.tar.xz diff --git a/godot.changes b/godot.changes index 5e9d6bd..f7664bd 100644 --- a/godot.changes +++ b/godot.changes @@ -1,3 +1,85 @@ +------------------------------------------------------------------- +Sat Feb 1 04:33:27 UTC 2020 - Max Mitschke + +- Removed patch files as they are no longer needed +- Removed export_presets.cfg file as games should supply this file + +- Update to v3.2 + + Added: + * Support for importing 3D scense using Assimp + * Support for high-level multiplayer API and NAT traversal for + WebRTC + * Support for enabling / disabling parts of the editor or specific + nodes + * Added language server for GDScript + * Added version control integration into the editor + * Added a network profiler + * Editor is now capped to 20FPS when the window is unfocused + * Added MSAA support in the GLES2 renderer + * Ability to define script templates on a per-project basis + * Ability to limit the minimum and maximum window size + * Minimap in the script editor + * CSV files can now be imported as non-translation files + * Multicast support in PacketPeerUDP + * WebSocket improvements. + * Support for SSL in WebSocketServer. + * WebSocketClient can now use custom SSL certificates + (except on HTML5). + * WebSocketClient can now define custom headers. + * The editor now features a built-in Web server for testing HTML5 + projects + * Reimplemented support for embedding project data in the PCK file + + Changed: + * Tabs and space indentation can no longer be mixed in the same + GDScript file + * assert() in GDScript must now always be used with parentheses + * UDP broadcasting is now disabled by default and must be enabled + by calling + set_broadcast_enabled(true) on the PacketPeerUDP instance + * 3D collision shapes and RayCasts are now drawn in gray when disabled + * The SCons build system now automatically detects the host platform + * Exporting a project PCK or ZIP from the command line must now + be done with the new --export-pack command-line argument + * Exported PCK files now contain the Godot patch version in their + header + * "Set as Main Scene" context option for scenes in the FileSystem dock + + Removed: + + * Unused Panel panelf and panelnc styles. + * thekla_atlas dependency, as light baking now relies on xatlas + for UV unwrapping. + * Rating icons in the Asset Library + * Some editor languages are no longer available due to missing + support for RTL and text shaping in Godot. + * Arabic + * Bengali + * Persian + * Hebrew + * Hindi + * Malayalam + * Sinhalese + * Tamil + * Telugu + * Urdu + * Android: ARMv6 support. + * iOS: ARMv7 support. + + Fixed: + * The Project Manager now remembers the sorting option that was + previously set + * Fixed issues with PBR environment mapping + * Several fixes to the GLES2 renderer + * Fixed importing BMP images + * Exporting a project via the command-line now returns a non-zero + exit code if an error occurred during exporting + * Fixed autocompletion in the script editor + + And more: + https://github.com/godotengine/godot/blob/3.2/CHANGELOG.md + ------------------------------------------------------------------- Mon Jan 13 16:00:00 UTC 2020 - cunix@mail.de diff --git a/godot.spec b/godot.spec index 2358ae2..eefdc12 100644 --- a/godot.spec +++ b/godot.spec @@ -1,7 +1,7 @@ # # spec file for package godot # -# Copyright (c) 2019 SUSE LLC +# Copyright (c) 2020 SUSE LLC # Copyright (c) 2017 Luke Jones, luke.nukem.jones@gmail.com # # All modifications and additions to the file contributed by third parties @@ -21,7 +21,7 @@ %define ca_bundle /var/lib/ca-certificates/ca-bundle.pem Name: godot -Version: 3.1.2 +Version: 3.2 Release: 0 Summary: Cross-Platform Game Engine with an Integrated Editor License: MIT @@ -29,12 +29,7 @@ Group: Development/Tools/Other URL: https://godotengine.org/ Source0: https://downloads.tuxfamily.org/godotengine/%{version}/%{name}-%{version}-stable.tar.xz Source1: https://downloads.tuxfamily.org/godotengine/%{version}/%{name}-%{version}-stable.tar.xz.sha256 -Source2: export_presets.cfg Source3: %{name}-rpmlintrc -# PATCH-FIX-OPENSUSE Allows building all files with -lpie -Patch0: fix-pie-warning.patch -# Use system certificates as fallback for project certificates -Patch1: project_certs_fallback.patch BuildRequires: Mesa-devel BuildRequires: fdupes BuildRequires: gcc @@ -52,6 +47,7 @@ BuildRequires: pkgconfig(libpng) BuildRequires: pkgconfig(libpulse) BuildRequires: pkgconfig(libudev) BuildRequires: pkgconfig(libwebp) +BuildRequires: pkgconfig(libwslay) BuildRequires: pkgconfig(ogg) BuildRequires: pkgconfig(openssl) BuildRequires: pkgconfig(opus) @@ -67,9 +63,9 @@ BuildRequires: pkgconfig(xi) BuildRequires: pkgconfig(xinerama) BuildRequires: pkgconfig(xrandr) BuildRequires: pkgconfig(zlib) -%if %{suse_version} > 1500 -BuildRequires: mbedtls-devel -BuildRequires: pkgconfig(miniupnpc) +%if 0%{?suse_version} > 1500 +BuildRequires: pkgconfig(bullet) +BuildRequires: pkgconfig(libzstd) %endif Requires: ca-certificates Recommends: ca-certificates-mozilla @@ -84,37 +80,29 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build # Fedora Godot specfile. # Link: https://src.fedoraproject.org/rpms/godot/blob/master/f/godot.spec -# Git commit slightly newer than 2.87 -# Can be unbundled if bullet 2.88+ is available -Provides: bundled(bullet) = 2.88 - # Has some modifications for IPv6 support, upstream enet is unresponsive # Should not be unbundled. -Provides: bundled(enet) = 1.3.13 - -# Upstream commit from 2016, newer than 1.0.0.27 which is last tag -# Could be unbundled if packaged. -# Godot upstream will soon deprecate this "libsimplewebm" module. -Provides: bundled(libwebm) = 1.0.2 +Provides: bundled(enet) = 1.3.14 # Has custom changes to support seeking in zip archives # Should not be unbundled. Provides: bundled(minizip) = 1.2.11 -# Could be unbundled if packaged. -# Version: git (25241c5, 2019) +# Can be unbundled if packaged Provides: bundled(nanosvg) - -# Could be unbundled if packaged. Provides: bundled(squish) = 1.15 -# Can't be unbundled out-of-the-box as it uses experimental APIs available -# only to static linking. They're not critical features though and could -# maybe be patched away to link against a shared zstd. -Provides: bundled(zstd) = 1.4.4 +# Has custom changes +Provides: bundled(mbedtls) = 2.16.4 +Provides: bundled(miniupnpc) -# Has custom changes made to library to aid in build configurations -Provides: bundled(libwebsockets) = 3.0.1 +## Need to update in Factory ## +Provides: bundled(assimp) + +%if 0%{?suse_version} > 1500 +%else +Provides: bundled(bullet) = 2.89 +%endif %description Godot is a game engine. It provides a set of tools and a visually @@ -124,8 +112,8 @@ platforms. %package headless Summary: Headless version of Godot editor useful for command line Group: Development/Tools/Other -Requires: godot-rpm-macros -Requires: godot-runner +Requires: ca-certificates +Recommends: ca-certificates-mozilla %description headless This package is the headless version of the Godot editor that is suited for @@ -145,6 +133,8 @@ by pointing to the location of the game's data package. %package server Summary: Godot headless binary for servers Group: Amusements/Games/Other +Requires: ca-certificates +Recommends: ca-certificates-mozilla %description server This package contains the headless binary for the Godot game engine @@ -152,8 +142,6 @@ particularly suited for running dedicated servers. %prep %setup -q -n %{name}-%{version}-stable -%patch0 -p1 -%patch1 -p1 %build # Adding distribution name to build name @@ -167,11 +155,11 @@ particularly suited for running dedicated servers. # Configuring build to use some distribution libraries unbundle_libs=('certs' 'freetype' 'libogg' 'libpng' 'libtheora' 'libvorbis' \ - 'libwebp' 'opus' 'pcre2' 'zlib') + 'libwebp' 'opus' 'pcre2' 'wslay' 'zlib') # Unbundle more libs for Tumbleweed %if %{suse_version} > 1500 -unbundle_libs+=('mbedtls' 'miniupnpc') +unbundle_libs+=('bullet' 'zstd') %endif # Unbundle libvpx only if it doesn't meet the minimum requirement. @@ -197,17 +185,10 @@ rm -rf thirdparty/rtaudio mkdir -pv thirdparty/certs touch thirdparty/certs/ca-certificates.crt -# Common build arguments for all targets -%if %{suse_version} >= 1500 -%define use_lto use_lto=1 -%else -%define use_lto use_lto=0 -%endif - %define build_args %{?_smp_mflags} \\\ - progress=yes verbose=yes udev=yes %{use_lto} \\\ - CCFLAGS='%{optflags}' system_certs_path=%{ca_bundle} \\\ - $system_libs + progress=yes verbose=yes udev=yes use_lto=1 \\\ + CCFLAGS='%{optflags}' \\\ + system_certs_path=%{ca_bundle} $system_libs # Build graphical editor (tools) scons %{build_args} platform=x11 tools=yes target=release_debug @@ -234,7 +215,6 @@ install -D -p -m 755 bin/%{name}.x11.opt.%{__isa_bits} %{buildroot}%{_bindir}/%{ # Installing the server install -D -p -m 755 bin/%{name}_server.x11.opt.%{__isa_bits} %{buildroot}%{_bindir}/%{name}-server -install -D -p -m 644 %{S:2} %{buildroot}%{_datadir}/%{name}/export_presets.cfg install -D -p -m 644 misc/dist/linux/godot.6 %{buildroot}/%{_mandir}/man6/%{name}.6%{?ext_man} install -D -p -m 644 icon.png %{buildroot}%{_datadir}/icons/hicolor/256x256/apps/%{name}.png install -D -p -m 644 icon.svg %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg @@ -246,7 +226,7 @@ cp thirdparty/README.md thirdparty_README.md %files %license LICENSE.txt LOGO_LICENSE.md COPYRIGHT.txt thirdparty_README.md -%doc AUTHORS.md CHANGELOG.md CONTRIBUTING.md DONORS.md ISSUE_TEMPLATE.md README.md +%doc AUTHORS.md CHANGELOG.md CONTRIBUTING.md DONORS.md README.md CODE_OF_CONDUCT.md %dir %{_datadir}/icons/hicolor %dir %{_datadir}/icons/hicolor/256x256 %dir %{_datadir}/icons/hicolor/256x256/apps @@ -261,19 +241,17 @@ cp thirdparty/README.md thirdparty_README.md %files headless %license LICENSE.txt LOGO_LICENSE.md COPYRIGHT.txt thirdparty_README.md -%doc AUTHORS.md CHANGELOG.md CONTRIBUTING.md DONORS.md ISSUE_TEMPLATE.md README.md -%dir %{_datadir}/%{name} +%doc AUTHORS.md CHANGELOG.md CONTRIBUTING.md DONORS.md README.md CODE_OF_CONDUCT.md %{_bindir}/%{name}-headless -%{_datadir}/%{name}/export_presets.cfg %files runner %license LICENSE.txt LOGO_LICENSE.md COPYRIGHT.txt thirdparty_README.md -%doc AUTHORS.md CHANGELOG.md CONTRIBUTING.md DONORS.md ISSUE_TEMPLATE.md README.md +%doc AUTHORS.md CHANGELOG.md CONTRIBUTING.md DONORS.md README.md CODE_OF_CONDUCT.md %{_bindir}/%{name}-runner %files server %license LICENSE.txt LOGO_LICENSE.md COPYRIGHT.txt thirdparty_README.md -%doc AUTHORS.md CHANGELOG.md CONTRIBUTING.md DONORS.md ISSUE_TEMPLATE.md README.md +%doc AUTHORS.md CHANGELOG.md CONTRIBUTING.md DONORS.md README.md CODE_OF_CONDUCT.md %{_bindir}/%{name}-server %changelog diff --git a/project_certs_fallback.patch b/project_certs_fallback.patch deleted file mode 100644 index a0f0e1f..0000000 --- a/project_certs_fallback.patch +++ /dev/null @@ -1,51 +0,0 @@ -From: cunix@bitmessage.ch -Date: 2019-04-29 16:00:00 -Subject: System certs as fallback for project certs -References: https://github.com/godotengine/godot/pull/22066#issuecomment-421565719 - https://github.com/godotengine/godot/pull/22066#issuecomment-422528664 - https://github.com/godotengine/godot/issues/22232 -Upstream: might be offered to upstream - -If project has no value set for "network/ssl/certificates" (the default), -function "get_project_cert_array" returns no certificates because we don't -use builtin certs - BUILTIN_CERTS_ENABLED is not defined. Therefore the -editor shows an error. - -We use a distro specific "system_certs_path" as build option and apply it here -via "_SYSTEM_CERTS_PATH" (defined in included "core/io/certs_compressed.gen.h") -as fallback for project certificates. - ---- - -diff -r -U 5 a/core/io/stream_peer_ssl.cpp b/core/io/stream_peer_ssl.cpp ---- a/core/io/stream_peer_ssl.cpp -+++ b/core/io/stream_peer_ssl.cpp -@@ -33,10 +33,12 @@ - #include "core/io/certs_compressed.gen.h" - #include "core/io/compression.h" - #include "core/os/file_access.h" - #include "core/project_settings.h" - -+#include -+ - StreamPeerSSL *(*StreamPeerSSL::_create)() = NULL; - - StreamPeerSSL *StreamPeerSSL::create() { - - return _create(); -@@ -96,10 +98,14 @@ - ProjectSettings::get_singleton()->set_custom_property_info("network/ssl/certificates", PropertyInfo(Variant::STRING, "network/ssl/certificates", PROPERTY_HINT_FILE, "*.crt")); - - if (certs_path != "") { - // Use certs defined in project settings. - return get_cert_file_as_array(certs_path); -+ } else if (strcmp(_SYSTEM_CERTS_PATH, "") != 0) { -+ // Use system certs only if user did not override it in project settings -+ // and if _SYSTEM_CERTS_PATH is set. -+ return get_cert_file_as_array(_SYSTEM_CERTS_PATH); - } - #ifdef BUILTIN_CERTS_ENABLED - else { - // Use builtin certs only if user did not override it in project settings. - out.resize(_certs_uncompressed_size + 1); -