pool/godot
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 773320 from home:demonpig:Games:Tools

Browse Source 
- 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

OBS-URL: https://build.opensuse.org/request/show/773320
OBS-URL: https://build.opensuse.org/package/show/games/godot?expand=0&rev=4
This commit is contained in:
c unix 2020-02-11 23:10:18 +00:00 committed by Git OBS Bridge
parent 681b834735
commit 83a66432e5
9 changed files with 117 additions and 145 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
export_presets.cfg
View File

@ -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=""

13
fix-pie-warning.patch
View File

@ -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)

3
godot-3.1.2-stable.tar.xz
View File

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

1
godot-3.1.2-stable.tar.xz.sha256
View File

@ -1 +0,0 @@
44cccbeec37490768429d5adf1495cd904a195f56b7157308c5650e075d9b89e release-3.1.2-stable/godot-3.1.2-stable.tar.xz

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

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

1
godot-3.2-stable.tar.xz.sha256 Normal file
View File

@ -0,0 +1 @@
258e166a33f0d71aec59016d8e0d96342a0047a4d84aad2346c232bac8b3c0ce godot-3.2-stable.tar.xz

82
godot.changes
View File

@ -1,3 +1,85 @@
-------------------------------------------------------------------
Sat Feb 1 04:33:27 UTC 2020 - Max Mitschke <maxmitschke@fastmail.com>
- 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 Mon Jan 13 16:00:00 UTC 2020 - cunix@mail.de

84
godot.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package godot # 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 # Copyright (c) 2017 Luke Jones, luke.nukem.jones@gmail.com
# #
# All modifications and additions to the file contributed by third parties # 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 %define ca_bundle /var/lib/ca-certificates/ca-bundle.pem
Name: godot Name: godot
Version: 3.1.2 Version: 3.2
Release: 0 Release: 0
Summary: Cross-Platform Game Engine with an Integrated Editor Summary: Cross-Platform Game Engine with an Integrated Editor
License: MIT License: MIT
@ -29,12 +29,7 @@ Group: Development/Tools/Other
URL: https://godotengine.org/ URL: https://godotengine.org/
Source0: https://downloads.tuxfamily.org/godotengine/%{version}/%{name}-%{version}-stable.tar.xz 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 Source1: https://downloads.tuxfamily.org/godotengine/%{version}/%{name}-%{version}-stable.tar.xz.sha256
Source2: export_presets.cfg
Source3: %{name}-rpmlintrc 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: Mesa-devel
BuildRequires: fdupes BuildRequires: fdupes
BuildRequires: gcc BuildRequires: gcc
@ -52,6 +47,7 @@ BuildRequires: pkgconfig(libpng)
BuildRequires: pkgconfig(libpulse) BuildRequires: pkgconfig(libpulse)
BuildRequires: pkgconfig(libudev) BuildRequires: pkgconfig(libudev)
BuildRequires: pkgconfig(libwebp) BuildRequires: pkgconfig(libwebp)
BuildRequires: pkgconfig(libwslay)
BuildRequires: pkgconfig(ogg) BuildRequires: pkgconfig(ogg)
BuildRequires: pkgconfig(openssl) BuildRequires: pkgconfig(openssl)
BuildRequires: pkgconfig(opus) BuildRequires: pkgconfig(opus)
@ -67,9 +63,9 @@ BuildRequires: pkgconfig(xi)
BuildRequires: pkgconfig(xinerama) BuildRequires: pkgconfig(xinerama)
BuildRequires: pkgconfig(xrandr) BuildRequires: pkgconfig(xrandr)
BuildRequires: pkgconfig(zlib) BuildRequires: pkgconfig(zlib)
%if %{suse_version} > 1500 %if 0%{?suse_version} > 1500
BuildRequires: mbedtls-devel BuildRequires: pkgconfig(bullet)
BuildRequires: pkgconfig(miniupnpc) BuildRequires: pkgconfig(libzstd)
%endif %endif
Requires: ca-certificates Requires: ca-certificates
Recommends: ca-certificates-mozilla Recommends: ca-certificates-mozilla
@ -84,37 +80,29 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build
# Fedora Godot specfile. # Fedora Godot specfile.
# Link: https://src.fedoraproject.org/rpms/godot/blob/master/f/godot.spec # 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 # Has some modifications for IPv6 support, upstream enet is unresponsive
# Should not be unbundled. # Should not be unbundled.
Provides: bundled(enet) = 1.3.13 Provides: bundled(enet) = 1.3.14
# 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
# Has custom changes to support seeking in zip archives # Has custom changes to support seeking in zip archives
# Should not be unbundled. # Should not be unbundled.
Provides: bundled(minizip) = 1.2.11 Provides: bundled(minizip) = 1.2.11
# Could be unbundled if packaged. # Can be unbundled if packaged
# Version: git (25241c5, 2019)
Provides: bundled(nanosvg) Provides: bundled(nanosvg)
# Could be unbundled if packaged.
Provides: bundled(squish) = 1.15 Provides: bundled(squish) = 1.15
# Can't be unbundled out-of-the-box as it uses experimental APIs available # Has custom changes
# only to static linking. They're not critical features though and could Provides: bundled(mbedtls) = 2.16.4
# maybe be patched away to link against a shared zstd. Provides: bundled(miniupnpc)
Provides: bundled(zstd) = 1.4.4
# Has custom changes made to library to aid in build configurations ## Need to update in Factory ##
Provides: bundled(libwebsockets) = 3.0.1 Provides: bundled(assimp)
%if 0%{?suse_version} > 1500
%else
Provides: bundled(bullet) = 2.89
%endif
%description %description
Godot is a game engine. It provides a set of tools and a visually Godot is a game engine. It provides a set of tools and a visually
@ -124,8 +112,8 @@ platforms.
%package headless %package headless
Summary: Headless version of Godot editor useful for command line Summary: Headless version of Godot editor useful for command line
Group: Development/Tools/Other Group: Development/Tools/Other
Requires: godot-rpm-macros Requires: ca-certificates
Requires: godot-runner Recommends: ca-certificates-mozilla
%description headless %description headless
This package is the headless version of the Godot editor that is suited for 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 %package server
Summary: Godot headless binary for servers Summary: Godot headless binary for servers
Group: Amusements/Games/Other Group: Amusements/Games/Other
Requires: ca-certificates
Recommends: ca-certificates-mozilla
%description server %description server
This package contains the headless binary for the Godot game engine This package contains the headless binary for the Godot game engine
@ -152,8 +142,6 @@ particularly suited for running dedicated servers.
%prep %prep
%setup -q -n %{name}-%{version}-stable %setup -q -n %{name}-%{version}-stable
%patch0 -p1
%patch1 -p1
%build %build
# Adding distribution name to build name # Adding distribution name to build name
@ -167,11 +155,11 @@ particularly suited for running dedicated servers.
# Configuring build to use some distribution libraries # Configuring build to use some distribution libraries
unbundle_libs=('certs' 'freetype' 'libogg' 'libpng' 'libtheora' 'libvorbis' \ unbundle_libs=('certs' 'freetype' 'libogg' 'libpng' 'libtheora' 'libvorbis' \
'libwebp' 'opus' 'pcre2' 'zlib') 'libwebp' 'opus' 'pcre2' 'wslay' 'zlib')
# Unbundle more libs for Tumbleweed # Unbundle more libs for Tumbleweed
%if %{suse_version} > 1500 %if %{suse_version} > 1500
unbundle_libs+=('mbedtls' 'miniupnpc') unbundle_libs+=('bullet' 'zstd')
%endif %endif
# Unbundle libvpx only if it doesn't meet the minimum requirement. # Unbundle libvpx only if it doesn't meet the minimum requirement.
@ -197,17 +185,10 @@ rm -rf thirdparty/rtaudio
mkdir -pv thirdparty/certs mkdir -pv thirdparty/certs
touch thirdparty/certs/ca-certificates.crt 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} \\\ %define build_args %{?_smp_mflags} \\\
progress=yes verbose=yes udev=yes %{use_lto} \\\ progress=yes verbose=yes udev=yes use_lto=1 \\\
CCFLAGS='%{optflags}' system_certs_path=%{ca_bundle} \\\ CCFLAGS='%{optflags}' \\\
$system_libs system_certs_path=%{ca_bundle} $system_libs
# Build graphical editor (tools) # Build graphical editor (tools)
scons %{build_args} platform=x11 tools=yes target=release_debug 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 # Installing the server
install -D -p -m 755 bin/%{name}_server.x11.opt.%{__isa_bits} %{buildroot}%{_bindir}/%{name}-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 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.png %{buildroot}%{_datadir}/icons/hicolor/256x256/apps/%{name}.png
install -D -p -m 644 icon.svg %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg 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 %files
%license LICENSE.txt LOGO_LICENSE.md COPYRIGHT.txt thirdparty_README.md %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
%dir %{_datadir}/icons/hicolor/256x256 %dir %{_datadir}/icons/hicolor/256x256
%dir %{_datadir}/icons/hicolor/256x256/apps %dir %{_datadir}/icons/hicolor/256x256/apps
@ -261,19 +241,17 @@ cp thirdparty/README.md thirdparty_README.md
%files headless %files headless
%license LICENSE.txt LOGO_LICENSE.md COPYRIGHT.txt thirdparty_README.md %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}/%{name}
%{_bindir}/%{name}-headless %{_bindir}/%{name}-headless
%{_datadir}/%{name}/export_presets.cfg
%files runner %files runner
%license LICENSE.txt LOGO_LICENSE.md COPYRIGHT.txt thirdparty_README.md %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 %{_bindir}/%{name}-runner
%files server %files server
%license LICENSE.txt LOGO_LICENSE.md COPYRIGHT.txt thirdparty_README.md %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 %{_bindir}/%{name}-server
%changelog %changelog

51
project_certs_fallback.patch
View File

@ -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 <string.h>
+
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);