From a5ae5a7f5b22398cb62a395a3bff19326318caf4b08e18f58f758cec9df794ac Mon Sep 17 00:00:00 2001 From: Dmitriy Perlow Date: Thu, 10 Jun 2021 13:33:16 +0000 Subject: [PATCH] Accepting request 897727 from home:cunix:godot Exclude %arm OBS-URL: https://build.opensuse.org/request/show/897727 OBS-URL: https://build.opensuse.org/package/show/games/godot?expand=0&rev=28 --- godot.changes | 7 ++++++- godot.spec | 10 +++++----- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/godot.changes b/godot.changes index 4a5e3cd..1f4387a 100644 --- a/godot.changes +++ b/godot.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Jun 03 12:00:00 UTC 2021 - cunix@mail.de + +- Exclude currently failing %arm builds + ------------------------------------------------------------------- Tue May 25 12:00:00 UTC 2021 - cunix@mail.de @@ -57,7 +62,7 @@ Fri May 21 12:00:00 UTC 2021 - cunix@mail.de - "use_system_zlib_for_fbx.patch" dropped - fixed upstream -- aarch64: enable modules lightmapper_cpu_enabled and raycast_enabled +- aarch64 and %arm: enable modules lightmapper_cpu_enabled and raycast_enabled ------------------------------------------------------------------- Thu Apr 29 12:37:28 UTC 2021 - Guillaume GARDET diff --git a/godot.spec b/godot.spec index d5cd610..2613f33 100644 --- a/godot.spec +++ b/godot.spec @@ -84,6 +84,7 @@ BuildRequires: mbedtls-devel %endif %endif %endif + Requires: ca-certificates Recommends: ca-certificates-mozilla Requires(post): update-desktop-files @@ -156,6 +157,9 @@ Provides: bundled(miniupnpc) %endif %endif +# Build currently fails on armv7l +ExcludeArch: %arm + %description Godot is a game engine. It provides a set of tools and a visually oriented workflow that can export games to PC, Mobile and Web @@ -300,12 +304,8 @@ touch thirdparty/certs/ca-certificates.crt system_certs_path=%{ca_bundle} $system_libs %ifarch aarch64 %arm -%ifarch aarch64 -%define build_args %{build_args_common} module_denoise_enabled=no -%else # Disable unsupported features - https://github.com/godotengine/godot/issues/48297#issuecomment-829165296 -%define build_args %{build_args_common} module_denoise_enabled=no module_lightmapper_cpu_enabled=no module_raycast_enabled=no -%endif +%define build_args %{build_args_common} module_denoise_enabled=no %else %define build_args %{build_args_common} %endif