[packages/supertuxkart] - up to 1.4
mrozowik
mrozowik at pld-linux.org
Sat Nov 25 12:19:47 CET 2023
commit 8d089bf3661046b5ef2ebe6ea2d9a52ee5ea8490
Author: Krzysztof Mrozowicz <mrozowik at pld-linux.org>
Date: Sat Nov 25 10:17:53 2023 +0000
- up to 1.4
gcc13.patch | 228 +++++++++++++++++++++++++++++++++++++++
supertuxkart-desktop.patch | 25 -----
supertuxkart-useless_files.patch | 11 --
supertuxkart.spec | 82 +++++++++-----
4 files changed, 282 insertions(+), 64 deletions(-)
---
diff --git a/supertuxkart.spec b/supertuxkart.spec
index fb1f547..49c9ec6 100644
--- a/supertuxkart.spec
+++ b/supertuxkart.spec
@@ -1,26 +1,33 @@
Summary: SuperTuxKart - an enhanced version of TuxKart
Summary(pl.UTF-8): SuperTuxKart - ulepszona wersja gry TuxKart
Name: supertuxkart
-Version: 0.8
-Release: 3
+Version: 1.4
+Release: 1
License: GPL v1, GPL v2, GPL v3+, CC-BY-SA v3, CC-BY-SA v3+
Group: X11/Applications/Games
-Source0: http://downloads.sourceforge.net/supertuxkart/%{name}-%{version}-src.tar.bz2
-# Source0-md5: 0b939ce601374758938119e0b0dd1fec
-Patch0: %{name}-desktop.patch
-Patch1: %{name}-useless_files.patch
-URL: http://supertuxkart.sourceforge.net/
+Source0: https://github.com/supertuxkart/stk-code/releases/download/%{version}/SuperTuxKart-%{version}-src.tar.xz
+# Source0-md5: c87a67ea6d5b52d464fe3d112db20263
+Patch0: gcc13.patch
+URL: https://supertuxkart.net/
BuildRequires: OpenAL-devel
BuildRequires: OpenGL-devel
-BuildRequires: OpenGL-glut-devel
-BuildRequires: SDL-devel
-BuildRequires: autoconf
-BuildRequires: automake
-BuildRequires: irrlicht-devel >= 1.7
+BuildRequires: SDL2-devel
+BuildRequires: bluez-libs-devel
+BuildRequires: cmake
+BuildRequires: curl-devel
+BuildRequires: freetype-devel
+BuildRequires: harfbuzz-devel
+BuildRequires: libjpeg-devel
+BuildRequires: libogg-devel
+BuildRequires: libpng-devel
BuildRequires: libvorbis-devel
+BuildRequires: openssl-devel
BuildRequires: pkgconfig
-BuildRequires: sed >= 4.0
-BuildRequires: unzip
+BuildRequires: python3 >= 1:3
+BuildRequires: sqlite3-devel
+BuildRequires: squish-devel
+BuildRequires: wiiuse-devel
+BuildRequires: zlib-devel
Requires: %{name}-data = %{version}-%{release}
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -42,38 +49,57 @@ BuildArch: noarch
%description data
SuperTuxKart data files
+%post
+%update_desktop_database_post
+%update_icon_cache hicolor
+
+%postun
+%update_desktop_database_postun
+%update_icon_cache hicolor
+
%prep
-%setup -q -n SuperTuxKart-%{version}
+%setup -q -n SuperTuxKart-%{version}-src
%patch0 -p1
-%patch1 -p1
-%{__sed} -i -e 's#$(prefix)/games#%{_bindir}#' src/Makefile.am
%build
-%{__aclocal}
-%{__autoconf}
-%{__automake}
-%configure
+mkdir -p build
+cd build
+# cmake makro doesnn't work in this case
+cmake .. \
+ -DCMAKE_INSTALL_PREFIX=%{_prefix} \
+ -DCMAKE_C_FLAGS="%{optflags} -fno-strict-aliasing" \
+ -DCMAKE_CXX_FLAGS="%{optflags} -fno-strict-aliasing" \
+ -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON \
+ -DBUILD_RECORDER=0 \
+ -DOpenGL_GL_PREFERENCE=GLVND \
+ -DUSE_SYSTEM_WIIUSE:BOOL=ON \
+ -DCMAKE_BUILD_TYPE=RelWithDebInfo
+
%{__make}
%install
rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_desktopdir}
+cd build
%{__make} install \
DESTDIR=$RPM_BUILD_ROOT
-cp -p data/%{name}.desktop $RPM_BUILD_ROOT%{_desktopdir}
+# angelscript is not needed
+%{__rm} $RPM_BUILD_ROOT%{_includedir}/angelscript.h
+%{__rm} -r $RPM_BUILD_ROOT%{_prefix}/lib/cmake/Angelscript
+%{__rm} $RPM_BUILD_ROOT%{_prefix}/lib/libangelscript.a
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr(644,root,root,755)
-%doc ChangeLog README TODO data/CREDITS
-%attr(755,root,root) %{_bindir}/*
-%{_desktopdir}/%{name}.desktop
-%{_pixmapsdir}/%{name}_32.xpm
+%doc CHANGELOG.md NETWORKING.md README.md data/CREDITS
+%attr(755,root,root) %{_bindir}/supertuxkart
+%{_desktopdir}/supertuxkart.desktop
+%{_iconsdir}/hicolor/*x*/apps/supertuxkart.png
+%{_datadir}/metainfo/supertuxkart.appdata.xml
%files data
%defattr(644,root,root,755)
-%{_datadir}/games/%{name}
+%{_datadir}/%{name}
diff --git a/gcc13.patch b/gcc13.patch
new file mode 100644
index 0000000..1f0c6ef
--- /dev/null
+++ b/gcc13.patch
@@ -0,0 +1,228 @@
+From 0163e3fa88b72634c3ddff5304c9086b649f53b1 Mon Sep 17 00:00:00 2001
+From: Heiko Becker <heirecka at exherbo.org>
+Date: Thu, 26 Jan 2023 16:35:54 +0100
+Subject: [PATCH] Add missing includes to fix the build with gcc 13
+
+Like other versions before, gcc 13 moved some includes around and as a
+result <stdexcept> and <cstdio> are no longer transitively included.
+Explicitly include them for std::runtime_error and snprintf.
+---
+ lib/graphics_engine/include/vk_mem_alloc.h | 1 +
+ lib/graphics_engine/src/ge_spm_buffer.cpp | 1 +
+ lib/graphics_engine/src/ge_vulkan_array_texture.cpp | 1 +
+ lib/graphics_engine/src/ge_vulkan_command_loader.cpp | 1 +
+ lib/graphics_engine/src/ge_vulkan_depth_texture.cpp | 2 ++
+ lib/graphics_engine/src/ge_vulkan_draw_call.cpp | 1 +
+ lib/graphics_engine/src/ge_vulkan_fbo_texture.cpp | 1 +
+ lib/graphics_engine/src/ge_vulkan_mesh_cache.cpp | 1 +
+ lib/graphics_engine/src/ge_vulkan_skybox_renderer.cpp | 1 +
+ lib/graphics_engine/src/ge_vulkan_texture.cpp | 1 +
+ lib/graphics_engine/src/ge_vulkan_texture_descriptor.cpp | 1 +
+ 11 files changed, 12 insertions(+)
+
+Index: SuperTuxKart-1.4-src/lib/graphics_engine/include/vk_mem_alloc.h
+===================================================================
+--- SuperTuxKart-1.4-src.orig/lib/graphics_engine/include/vk_mem_alloc.h
++++ SuperTuxKart-1.4-src/lib/graphics_engine/include/vk_mem_alloc.h
+@@ -2563,6 +2563,7 @@ VMA_CALL_PRE void VMA_CALL_POST vmaFreeS
+ #undef VMA_IMPLEMENTATION
+
+ #include <cstdint>
++#include <cstdio>
+ #include <cstdlib>
+ #include <cstring>
+ #include <utility>
+Index: SuperTuxKart-1.4-src/lib/graphics_engine/src/ge_spm_buffer.cpp
+===================================================================
+--- SuperTuxKart-1.4-src.orig/lib/graphics_engine/src/ge_spm_buffer.cpp
++++ SuperTuxKart-1.4-src/lib/graphics_engine/src/ge_spm_buffer.cpp
+@@ -5,6 +5,7 @@
+ #include "ge_vulkan_features.hpp"
+
+ #include <algorithm>
++#include <stdexcept>
+
+ namespace GE
+ {
+Index: SuperTuxKart-1.4-src/lib/graphics_engine/src/ge_vulkan_array_texture.cpp
+===================================================================
+--- SuperTuxKart-1.4-src.orig/lib/graphics_engine/src/ge_vulkan_array_texture.cpp
++++ SuperTuxKart-1.4-src/lib/graphics_engine/src/ge_vulkan_array_texture.cpp
+@@ -12,6 +12,7 @@
+
+ #include <IImageLoader.h>
+ #include <cassert>
++#include <stdexcept>
+
+ namespace GE
+ {
+Index: SuperTuxKart-1.4-src/lib/graphics_engine/src/ge_vulkan_command_loader.cpp
+===================================================================
+--- SuperTuxKart-1.4-src.orig/lib/graphics_engine/src/ge_vulkan_command_loader.cpp
++++ SuperTuxKart-1.4-src/lib/graphics_engine/src/ge_vulkan_command_loader.cpp
+@@ -8,6 +8,7 @@
+ #include <deque>
+ #include <memory>
+ #include <mutex>
++#include <stdexcept>
+ #include <thread>
+
+ #include "../source/Irrlicht/os.h"
+Index: SuperTuxKart-1.4-src/lib/graphics_engine/src/ge_vulkan_depth_texture.cpp
+===================================================================
+--- SuperTuxKart-1.4-src.orig/lib/graphics_engine/src/ge_vulkan_depth_texture.cpp
++++ SuperTuxKart-1.4-src/lib/graphics_engine/src/ge_vulkan_depth_texture.cpp
+@@ -3,6 +3,8 @@
+ #include "ge_main.hpp"
+ #include "ge_vulkan_driver.hpp"
+
++#include <stdexcept>
++
+ namespace GE
+ {
+ GEVulkanDepthTexture::GEVulkanDepthTexture(GEVulkanDriver* vk,
+Index: SuperTuxKart-1.4-src/lib/graphics_engine/src/ge_vulkan_draw_call.cpp
+===================================================================
+--- SuperTuxKart-1.4-src.orig/lib/graphics_engine/src/ge_vulkan_draw_call.cpp
++++ SuperTuxKart-1.4-src/lib/graphics_engine/src/ge_vulkan_draw_call.cpp
+@@ -25,6 +25,7 @@
+ #include <algorithm>
+ #include <cmath>
+ #include <limits>
++#include <stdexcept>
+
+ #include "../source/Irrlicht/os.h"
+ #include "quaternion.h"
+Index: SuperTuxKart-1.4-src/lib/graphics_engine/src/ge_vulkan_fbo_texture.cpp
+===================================================================
+--- SuperTuxKart-1.4-src.orig/lib/graphics_engine/src/ge_vulkan_fbo_texture.cpp
++++ SuperTuxKart-1.4-src/lib/graphics_engine/src/ge_vulkan_fbo_texture.cpp
+@@ -6,6 +6,7 @@
+
+ #include <array>
+ #include <exception>
++#include <stdexcept>
+
+ namespace GE
+ {
+Index: SuperTuxKart-1.4-src/lib/graphics_engine/src/ge_vulkan_mesh_cache.cpp
+===================================================================
+--- SuperTuxKart-1.4-src.orig/lib/graphics_engine/src/ge_vulkan_mesh_cache.cpp
++++ SuperTuxKart-1.4-src/lib/graphics_engine/src/ge_vulkan_mesh_cache.cpp
+@@ -10,6 +10,7 @@
+
+ #include <algorithm>
+ #include <cassert>
++#include <stdexcept>
+ #include <vector>
+
+ namespace GE
+Index: SuperTuxKart-1.4-src/lib/graphics_engine/src/ge_vulkan_skybox_renderer.cpp
+===================================================================
+--- SuperTuxKart-1.4-src.orig/lib/graphics_engine/src/ge_vulkan_skybox_renderer.cpp
++++ SuperTuxKart-1.4-src/lib/graphics_engine/src/ge_vulkan_skybox_renderer.cpp
+@@ -11,6 +11,7 @@
+
+ #include <array>
+ #include <cstdint>
++#include <stdexcept>
+ #include <unordered_map>
+
+ namespace GE
+Index: SuperTuxKart-1.4-src/lib/graphics_engine/src/ge_vulkan_texture.cpp
+===================================================================
+--- SuperTuxKart-1.4-src.orig/lib/graphics_engine/src/ge_vulkan_texture.cpp
++++ SuperTuxKart-1.4-src/lib/graphics_engine/src/ge_vulkan_texture.cpp
+@@ -21,6 +21,7 @@ extern "C"
+ #include <IAttributes.h>
+ #include <IImageLoader.h>
+ #include <limits>
++#include <stdexcept>
+
+ namespace GE
+ {
+Index: SuperTuxKart-1.4-src/lib/graphics_engine/src/ge_vulkan_texture_descriptor.cpp
+===================================================================
+--- SuperTuxKart-1.4-src.orig/lib/graphics_engine/src/ge_vulkan_texture_descriptor.cpp
++++ SuperTuxKart-1.4-src/lib/graphics_engine/src/ge_vulkan_texture_descriptor.cpp
+@@ -6,6 +6,7 @@
+
+ #include <algorithm>
+ #include <exception>
++#include <stdexcept>
+
+ namespace GE
+ {
+From 27eb0f3116921492e183ad3aa685ddb147ed7183 Mon Sep 17 00:00:00 2001
+From: Gwyn Ciesla <gwync at protonmail.com>
+Date: Thu, 23 Feb 2023 08:56:27 -0600
+Subject: [PATCH] gcc13 fixes
+
+---
+ lib/graphics_engine/include/vk_mem_alloc.h | 2 ++
+ lib/graphics_engine/src/ge_vulkan_command_loader.cpp | 1 +
+ lib/graphics_engine/src/ge_vulkan_depth_texture.cpp | 2 ++
+ lib/graphics_engine/src/ge_vulkan_mesh_cache.cpp | 1 +
+ lib/graphics_engine/src/ge_vulkan_skybox_renderer.cpp | 1 +
+ 5 files changed, 7 insertions(+)
+
+diff --git a/lib/graphics_engine/include/vk_mem_alloc.h b/lib/graphics_engine/include/vk_mem_alloc.h
+index d4b683a755..ac82aedb15 100644
+--- a/lib/graphics_engine/include/vk_mem_alloc.h
++++ b/lib/graphics_engine/include/vk_mem_alloc.h
+@@ -20,6 +20,8 @@
+ // THE SOFTWARE.
+ //
+
++#include <cstdio>
++
+ #ifndef AMD_VULKAN_MEMORY_ALLOCATOR_H
+ #define AMD_VULKAN_MEMORY_ALLOCATOR_H
+
+diff --git a/lib/graphics_engine/src/ge_vulkan_command_loader.cpp b/lib/graphics_engine/src/ge_vulkan_command_loader.cpp
+index a1e5b3a71b..13cadd63da 100644
+--- a/lib/graphics_engine/src/ge_vulkan_command_loader.cpp
++++ b/lib/graphics_engine/src/ge_vulkan_command_loader.cpp
+@@ -10,6 +10,7 @@
+ #include <mutex>
+ #include <stdexcept>
+ #include <thread>
++#include <stdexcept>
+
+ #include "../source/Irrlicht/os.h"
+
+diff --git a/lib/graphics_engine/src/ge_vulkan_depth_texture.cpp b/lib/graphics_engine/src/ge_vulkan_depth_texture.cpp
+index 4a5d3d391b..0411c617df 100644
+--- a/lib/graphics_engine/src/ge_vulkan_depth_texture.cpp
++++ b/lib/graphics_engine/src/ge_vulkan_depth_texture.cpp
+@@ -1,3 +1,5 @@
++#include <stdexcept>
++
+ #include "ge_vulkan_depth_texture.hpp"
+
+ #include "ge_main.hpp"
+diff --git a/lib/graphics_engine/src/ge_vulkan_mesh_cache.cpp b/lib/graphics_engine/src/ge_vulkan_mesh_cache.cpp
+index f510f91813..a821ee4a96 100644
+--- a/lib/graphics_engine/src/ge_vulkan_mesh_cache.cpp
++++ b/lib/graphics_engine/src/ge_vulkan_mesh_cache.cpp
+@@ -12,6 +12,7 @@
+ #include <cassert>
+ #include <stdexcept>
+ #include <vector>
++#include <stdexcept>
+
+ namespace GE
+ {
+diff --git a/lib/graphics_engine/src/ge_vulkan_skybox_renderer.cpp b/lib/graphics_engine/src/ge_vulkan_skybox_renderer.cpp
+index fe7fcc4551..82977f0078 100644
+--- a/lib/graphics_engine/src/ge_vulkan_skybox_renderer.cpp
++++ b/lib/graphics_engine/src/ge_vulkan_skybox_renderer.cpp
+@@ -13,6 +13,7 @@
+ #include <cstdint>
+ #include <stdexcept>
+ #include <unordered_map>
++#include <stdexcept>
+
+ namespace GE
+ {
+
diff --git a/supertuxkart-desktop.patch b/supertuxkart-desktop.patch
deleted file mode 100644
index f211485..0000000
--- a/supertuxkart-desktop.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- supertuxkart-0.6/data/supertuxkart_desktop.template~ 2009-01-22 14:42:20.000000000 +0100
-+++ supertuxkart-0.6/data/supertuxkart_desktop.template 2009-01-22 14:42:21.000000000 +0100
-@@ -1,15 +1,16 @@
- [Desktop Entry]
- Encoding=UTF-8
- Name=SuperTuxKart
--Icon=@PREFIX@/share/pixmaps/supertuxkart_64.xpm
-+Icon=supertuxkart_32.xpm
- GenericName=A kart racing game
--GenericName[de_DE]=Ein Kart-Rennspiel
--GenericName[fr_FR]=Un jeu de karting
-+GenericName[de]=Ein Kart-Rennspiel
-+GenericName[fr]=Un jeu de karting
- GenericName[gl]=Xogo de carreiras con karts
--GenericName[ro_RO]=Un joc de curse cu carturi
--Exec=@PREFIX@/games/supertuxkart --log=file
-+GenericName[ro]=Un joc de curse cu carturi
-+GenericName[pl]=Gra wyścigowa
-+Exec=supertuxkart --log=file
- Terminal=false
- StartupNotify=false
- Type=Application
--TryExec=@PREFIX@/games/supertuxkart
- Categories=Game;ArcadeGame;
-+# vi: encoding=utf-8
diff --git a/supertuxkart-useless_files.patch b/supertuxkart-useless_files.patch
deleted file mode 100644
index 912f0f3..0000000
--- a/supertuxkart-useless_files.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- supertuxkart-0.6/data/Makefile.am~ 2009-01-22 14:44:06.000000000 +0100
-+++ supertuxkart-0.6/data/Makefile.am 2009-01-22 14:49:00.000000000 +0100
-@@ -17,7 +17,7 @@
- desktop_DATA = supertuxkart.desktop
-
- icondir = $(prefix)/share/pixmaps
--dist_icon_DATA = supertuxkart_32.xpm supertuxkart_64.xpm
-+dist_icon_DATA = supertuxkart_32.xpm
-
-
- # The desktop file needs the absolute path to the binary
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/supertuxkart.git/commitdiff/8d089bf3661046b5ef2ebe6ea2d9a52ee5ea8490
More information about the pld-cvs-commit
mailing list