Accepting request 817324 from games

OBS-URL: https://build.opensuse.org/request/show/817324
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/godot?expand=0&rev=4

godot-3.2.1-stable.tar.xz

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

godot-3.2.1-stable.tar.xz.sha256

@@ -1 +0,0 @@
-556b564079fb1b21a05320c359268b2032c87d8b3bfaa4fd104ebf9c909ab87d  godot-3.2.1-stable.tar.xz

godot-3.2.2-stable.tar.xz

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

godot-3.2.2-stable.tar.xz.sha256

@@ -0,0 +1 @@
+a1969caf1a17fed25054cb43a971c14104fd94f595fcfbbc2745cff479c73e03  godot-3.2.2-stable.tar.xz

godot.changes

@@ -1,3 +1,58 @@
+-------------------------------------------------------------------
+Fri Jun 26 21:00:00 UTC 2020 - cunix@mail.de
+
+- In .desktop file "PrefersNonDefaultGPU" prefixed with "X-"
+
+-------------------------------------------------------------------
+Fri Jun 26 17:23:58 UTC 2020 - Max Mitschke <maxmitschke@fastmail.com>
+
+- Update to 3.2.2
+
+  Highlights:
+  * 2D batching for the GLES2 renderer
+  * C# support for the iOS platform
+  * Re-architecture of the Android plugin system
+  * DTLS support and ENet integration
+  * Better handling of Variants pointing to released Objects
+  * Updated and localized documentation
+
+  Added:
+  * 2D: MODULATE builtin for canvas item shaders
+  * Editor: rotation widget in 3D viewport
+  * Editor: Allow duplicating files when holding Control
+  * GLES2/GLES3: support for OpenGL external textures
+  * Import: support for glTF lights
+  * Input: keyboard layout enumeration / set / get functions
+  * Object: has_signal method
+  * RegEx: Enable Unicode support for RegEx class
+  * Shaders: shader time scaling
+  * Add 'custom_modules' build option to compile external user modules
+  * SCons: Allow to read 'custom_modules' option via a file
+  * Provide the ability for clients of the Godot library
+    to add their own command line arguments
+  * Request the dedicated GPU when starting Godot from the '.desktop' file
+  * set_frame, pause, and oneshot to AnimatedTexture
+  * selection outline to locked nodes
+
+  Fixed:
+  * Audio: volume interpolation in positional audio nodes
+  * Import: changing the import type of multiple files at once
+  * Particles: uninitialized memory in CPUParticles and CPUParticles2D
+  * Physics: Make soft body completely stiff to attachment point
+  * Physics: Normalize up direction vector in move_and_slide()
+  * Account for file deletion and renaming in Export Presets
+  * can't convert Transform -> Transform2D
+  * Emit signal when animation ends by seek
+  * Othographic camera in-editor now uses Z near/far settings
+    instead of a hardcoded value
+  * Editor 2D: Change pixel alignment strategy, jittering in high zoom
+  * Allow single quotes in comments
+
+  And more:
+  https://downloads.tuxfamily.org/godotengine/3.2.2/Godot_v3.2.2-stable_changelog_chrono.txt
+
+- "linker_pie_flag.patch" adjusted.
+
 -------------------------------------------------------------------
 Tue Mar 10 16:00:00 UTC 2020 - cunix@mail.de
 

godot.spec

@@ -24,7 +24,7 @@
 %define ca_bundle %{_localstatedir}/lib/ca-certificates/ca-bundle.pem
 
 Name:           godot
-Version:        3.2.1
+Version:        3.2.2
 Release:        0
 Summary:        Cross-Platform Game Engine with an Integrated Editor
 License:        MIT
@@ -76,8 +76,8 @@ BuildRequires:  pkgconfig(miniupnpc)
 %else
 %if 0%{?is_opensuse}
 # SLES seems not to have wslay and miniupnpc
-BuildRequires:  pkgconfig(libwslay)
 BuildRequires:  libminiupnpc-devel
+BuildRequires:  pkgconfig(libwslay)
 %if 0%{?sle_version} >= 150200
 BuildRequires:  mbedtls-devel
 %endif
@@ -99,36 +99,35 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 # Has some modifications for IPv6 support, upstream enet is unresponsive
 # Should not be unbundled.
-Provides:       bundled(enet) = 1.3.14
+Provides:       bundled(enet) = 1.3.15
 
 # Has custom changes to support seeking in zip archives
 # Should not be unbundled.
 Provides:       bundled(minizip) = 1.2.11
 
+Provides:       bundled(FastLZ)
+Provides:       bundled(Tangent_Space_Normal_Maps)
 Provides:       bundled(cvtt)
+Provides:       bundled(easing)
 Provides:       bundled(etc2comp)
-Provides:       bundled(noto-sans-fonts)
-Provides:       bundled(hack-fonts)
-Provides:       bundled(google-droid-fonts)
 Provides:       bundled(glad)
+Provides:       bundled(google-droid-fonts)
+Provides:       bundled(hack-fonts)
+Provides:       bundled(hqx)
+Provides:       bundled(ifaddrs-android)
 Provides:       bundled(jpeg-compressor)
 Provides:       bundled(libsimplewebm)
-Provides:       bundled(polyclipping)
+Provides:       bundled(noto-sans-fonts)
-Provides:       bundled(FastLZ)
-Provides:       bundled(hqx)
 Provides:       bundled(open-simplex-noise-in-c)
 Provides:       bundled(pcg)
-Provides:       bundled(smaz)
+Provides:       bundled(polyclipping)
 Provides:       bundled(polypartition)
-Provides:       bundled(curl_hostcheck)
-Provides:       bundled(yuv2rgb)
-Provides:       bundled(ifaddrs-android)
-Provides:       bundled(easing)
-Provides:       bundled(Tangent_Space_Normal_Maps)
-Provides:       bundled(stb)
 Provides:       bundled(pvrtccompressor)
+Provides:       bundled(smaz)
+Provides:       bundled(stb)
 Provides:       bundled(tinyexr)
 Provides:       bundled(vhacd)
+Provides:       bundled(yuv2rgb)
 
 # Can be unbundled if packaged
 Provides:       bundled(nanosvg)
@@ -142,10 +141,10 @@ Provides:       bundled(assimp)
 
 %if 0%{?suse_version} > 1500
 %else
-Provides:       bundled(bullet) = 2.89
+Provides:       bundled(bullet) = 2.90
 Provides:       bundled(libzstd)
 %if 0%{?sle_version} < 150200
-Provides:       bundled(mbedtls) = 2.16.5
+Provides:       bundled(mbedtls) = 2.16.6
 %endif
 %if !0%{?is_opensuse}
 # SLES seems not to have miniupnpc and wslay
@@ -221,6 +220,9 @@ cp thirdparty/README.md thirdparty_README.md
 # actual doc location in openSUSE
 sed -i 's/\/usr\/share\/doc\/godot\//\/usr\/share\/doc\/packages\/godot\//' misc/dist/linux/godot.6
 
+# rpmlint considers file invalid without "X-" prefix
+sed -i 's/PrefersNonDefaultGPU=true/X-PrefersNonDefaultGPU=true/' misc/dist/linux/org.godotengine.Godot.desktop
+
 # disarm shebang
 sed -i '1s/#!/##/' misc/dist/shell/godot.bash-completion
 

linker_pie_flag.patch

@@ -5,6 +5,7 @@ References: https://github.com/godotengine/godot/pull/23542#issuecomment-4363858
             https://github.com/godotengine/godot/pull/23542
             https://github.com/godotengine/godot/issues/34533
 Upstream:   seems to do the opposite
+Rebased:    2020-06-25
 
 Linker flag "-no-pie" is added by upstream.
 rpmlint complains this violates project policy.
@@ -12,19 +13,15 @@ Patch replaces flag "-no-pie" with "-pie".
 
 ---
 
-diff -r -U 5 a/platform/x11/detect.py b/platform/x11/detect.py
+diff -Naur a/platform/x11/detect.py b/platform/x11/detect.py
---- a/platform/x11/detect.py
+--- a/platform/x11/detect.py	2020-06-26 12:57:27.036237658 -0400
-+++ b/platform/x11/detect.py
++++ b/platform/x11/detect.py	2020-06-26 12:57:50.187746327 -0400
-@@ -182,11 +182,11 @@
+@@ -185,7 +185,7 @@
-     # Check for gcc version >= 6 before adding -no-pie
-     version = get_compiler_version(env) or [-1, -1]
      if using_gcc(env):
          if version[0] >= 6:
-             env.Append(CCFLAGS=['-fpie'])
+             env.Append(CCFLAGS=["-fpie"])
--            env.Append(LINKFLAGS=['-no-pie'])
+-            env.Append(LINKFLAGS=["-no-pie"])
-+            env.Append(LINKFLAGS=['-pie'])
++            env.Append(LINKFLAGS=["-pie"])
      # Do the same for clang should be fine with Clang 4 and higher
      if using_clang(env):
          if version[0] >= 4:
-             env.Append(CCFLAGS=['-fpie'])
-             env.Append(LINKFLAGS=['-no-pie'])