From 9e811c89fcec82399b8eb8cf9216ebd6e3552888 Mon Sep 17 00:00:00 2001 From: Your Name Date: Fri, 31 Jan 2025 15:09:18 +0000 Subject: [PATCH] Add .gitignore and .gitea/workflows/ci.yml --- .gitea/workflows/ci.yml | 1 + godot.spec | 17 +++++++++++------ 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/.gitea/workflows/ci.yml b/.gitea/workflows/ci.yml index d5b8b48..dd7cf08 100644 --- a/.gitea/workflows/ci.yml +++ b/.gitea/workflows/ci.yml @@ -13,4 +13,5 @@ jobs: with: CI_DEPLOY: ${{ secrets.CI_DEPLOY }} PUBLICATOR: ${{ secrets.PUBLICATOR }} + REPO_DEPLOY: ${{ secrets.REPO_DEPLOY }} diff --git a/godot.spec b/godot.spec index 9273c86..97e5dcf 100644 --- a/godot.spec +++ b/godot.spec @@ -1,9 +1,10 @@ +%global optflags %(echo %{optflags} | sed -e 's/-ffat-lto-objects//g' -e 's/-fvar-tracking-assignments//g') %bcond_without server %define status stable %define uversion %{version}-%{status} -%define dversion 3.0-d69cc10 +%define dversion 3.3-2ce76ff %ifarch %{ix86} %define arch 32 @@ -13,18 +14,20 @@ Summary: Multi-platform 2D and 3D game engine with a feature rich editor Name: godot -Version: 3.0.2 +Version: 3.3.2 Release: 1 License: MIT Group: Games/Other Url: https://godotengine.org Source0: https://github.com/godotengine/godot/archive/%{uversion}/%{name}-%{uversion}.tar.gz -Source1: https://github.com/godotengine/godot-demo-projects/archive/godot-demo-projects-%{dversion}.tar.gz +Source1: https://github.com/godotengine/godot-demo-projects/archive/%{dversion}/godot-demo-projects-%{dversion}.tar.gz # Upstream fix for https://github.com/godotengine/godot/issues/17245 Patch0: 0001-SCons-Fix-linking-system-pcre2-on-server-platform.patch # Upstream fix Patch1: 0001-Dist-Fix-Linux-desktop-file-launch-argument.patch BuildRequires: scons +BuildRequires: clang +BuildRequires: llvm BuildRequires: pkgconfig(alsa) BuildRequires: pkgconfig(freetype2) BuildRequires: pkgconfig(glew) @@ -46,6 +49,8 @@ BuildRequires: pkgconfig(xcursor) BuildRequires: pkgconfig(xinerama) BuildRequires: pkgconfig(xrandr) BuildRequires: pkgconfig(zlib) +BuildRequires: %{_lib}atomic-static-devel +BuildRequires: stdc++-gcc10-devel Suggests: %{name}-demos %description @@ -116,8 +121,8 @@ by pointing to the location of the game's data package. %prep %setup -qn %{name}-%{uversion} -a 1 -%patch0 -p1 -%patch1 -p1 +#patch0 -p1 +#patch1 -p1 # Windows-specific rm -rf thirdparty/rtaudio @@ -134,7 +139,7 @@ for lib in $to_unbundle; do system_libs+="builtin_"$lib"=no " rm -rf thirdparty/$lib done -%define _scons %scons CCFLAGS="%{optflags}" LINKFLAGS="%{ldflags}" $system_libs +%define _scons %scons CCFLAGS="%{optflags} -I/usr/include/libstdc++-gcc10 -I/usr/include/libstdc++-gcc10/%{_host}" LINKFLAGS="%{ldflags} -lstdc++-gcc10" CC=clang CXX=clang++ $system_libs export BUILD_REVISION="RosaLinuxRo"