summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Le Cuirot <chewi@gentoo.org>2020-03-28 20:33:32 +0000
committerJames Le Cuirot <chewi@gentoo.org>2020-03-28 20:37:30 +0000
commit6ce37119f6937bc62019af613d6ce6bad6d87b67 (patch)
tree2e91864a6686ce1c6fc77f81f444b0f5eabdd845 /games-action/supertuxkart/files
parentgames-action/supertuxkart: Version bump to 1.1 (diff)
downloadgentoo-6ce37119f6937bc62019af613d6ce6bad6d87b67.tar.gz
gentoo-6ce37119f6937bc62019af613d6ce6bad6d87b67.tar.bz2
gentoo-6ce37119f6937bc62019af613d6ce6bad6d87b67.zip
games-action/supertuxkart: Drop old 1.0
Package-Manager: Portage-2.3.96, Repoman-2.3.20 Signed-off-by: James Le Cuirot <chewi@gentoo.org>
Diffstat (limited to 'games-action/supertuxkart/files')
-rw-r--r--games-action/supertuxkart/files/supertuxkart-0.9.3-irrlicht-arch-support.patch47
-rw-r--r--games-action/supertuxkart/files/supertuxkart-1.0-fix-buildsystem.patch20
-rw-r--r--games-action/supertuxkart/files/supertuxkart-1.0-system-squish.patch43
3 files changed, 0 insertions, 110 deletions
diff --git a/games-action/supertuxkart/files/supertuxkart-0.9.3-irrlicht-arch-support.patch b/games-action/supertuxkart/files/supertuxkart-0.9.3-irrlicht-arch-support.patch
deleted file mode 100644
index 66191861a963..000000000000
--- a/games-action/supertuxkart/files/supertuxkart-0.9.3-irrlicht-arch-support.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From: Christoph Egger <debian@christoph-egger.org>
-Subject: [PATCH] debian/arch-support
-
-Building on non-linux architectures currently fails with unpatched
-irrlicht because irrlicht tries to create Joystick support using
-linux-specific headers. However there's infrastructure to disable
-Joystick support, we just need to activate that on non-linux
-architectures.
-
-Additionally if built on a sparc machine irrlicht assumes wrongly it's
-a solaris system. We fix this wrong assumption as our sparc builds are
-all on linux.
-
-Finally irrlicht exceeds the size constraights for -fpic requiering to
-build with -fPIC. As upstream doesn't do that we need to fix this for
-sparc and s390 builds (powerPC?).
-
-Signed-off-by: Christoph Egger <debian@christoph-egger.org>
-
----
- lib/irrlicht/include/IrrCompileConfig.h | 10 +++++-----
- 1 files changed, 5 insertions(+), 5 deletions(-)
-
---- a/lib/irrlicht/include/IrrCompileConfig.h
-+++ b/lib/irrlicht/include/IrrCompileConfig.h
-@@ -110,4 +110,8 @@
- #ifndef _IRR_SOLARIS_PLATFORM_
- #define _IRR_LINUX_PLATFORM_
-+#include <endian.h>
-+ #if __BYTE_ORDER == __BIG_ENDIAN
-+ #define __BIG_ENDIAN__
-+ #endif
- #endif
- #define _IRR_POSIX_API_
-@@ -460,11 +464,7 @@
- #undef _IRR_WCHAR_FILESYSTEM
- #endif
-
--#if defined(__sparc__) || defined(__sun__)
--#define __BIG_ENDIAN__
--#endif
--
--#if defined(_IRR_SOLARIS_PLATFORM_)
-+#if defined(_IRR_SOLARIS_PLATFORM_) || defined(__FreeBSD_kernel__) || defined(__gnu_hurd__)
- #undef _IRR_COMPILE_WITH_JOYSTICK_EVENTS_
- #endif
-
diff --git a/games-action/supertuxkart/files/supertuxkart-1.0-fix-buildsystem.patch b/games-action/supertuxkart/files/supertuxkart-1.0-fix-buildsystem.patch
deleted file mode 100644
index 23e8280a18f4..000000000000
--- a/games-action/supertuxkart/files/supertuxkart-1.0-fix-buildsystem.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff --git a/lib/irrlicht/CMakeLists.txt b/lib/irrlicht/CMakeLists.txt
-index 92a881c81..1371fdf11 100644
---- a/lib/irrlicht/CMakeLists.txt
-+++ b/lib/irrlicht/CMakeLists.txt
-@@ -96,15 +96,6 @@ endif()
- if(WIN32)
- add_definitions(-D_IRR_STATIC_LIB_)
- add_definitions(-D_CRT_SECURE_NO_WARNINGS) # Shut up about unsafe stuff
--else()
-- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -pipe -O3 -fno-exceptions -fstrict-aliasing")
-- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -pipe -O3 -fno-exceptions -fstrict-aliasing")
-- if(CMAKE_COMPILER_IS_GNUCC)
-- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fexpensive-optimizations")
-- endif()
-- if(CMAKE_COMPILER_IS_GNUCXX)
-- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fexpensive-optimizations")
-- endif()
- endif()
-
- if(USE_GLES2)
diff --git a/games-action/supertuxkart/files/supertuxkart-1.0-system-squish.patch b/games-action/supertuxkart/files/supertuxkart-1.0-system-squish.patch
deleted file mode 100644
index 8158c4bb9e5e..000000000000
--- a/games-action/supertuxkart/files/supertuxkart-1.0-system-squish.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From e1601b1ae07e3c1ac05cffe05b82e0c60998bc72 Mon Sep 17 00:00:00 2001
-From: James Le Cuirot <chewi@gentoo.org>
-Date: Mon, 13 May 2019 22:51:21 +0100
-Subject: [PATCH] CMake: Add option to use system Squish library
-
-The system version was preferred before but it wasn't possible to
-explicitly disable it, making its use automagic, which is bad for
-packaging.
-
-Closes: https://github.com/supertuxkart/stk-code/pull/3916
----
- CMakeLists.txt | 8 ++++++--
- 1 file changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 8a7f03264..40e7790fe 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -31,6 +31,8 @@ CMAKE_DEPENDENT_OPTION(BUILD_RECORDER "Build opengl recorder" ON
- "NOT SERVER_ONLY;NOT APPLE" OFF)
- CMAKE_DEPENDENT_OPTION(USE_FRIBIDI "Support for right-to-left languages" ON
- "NOT SERVER_ONLY" OFF)
-+CMAKE_DEPENDENT_OPTION(USE_SYSTEM_SQUISH "Use system Squish library instead of the built-in version, when available." ON
-+ "NOT SERVER_ONLY" OFF)
- CMAKE_DEPENDENT_OPTION(USE_WIIUSE "Support for wiimote input devices" ON
- "NOT SERVER_ONLY;NOT MINGW;NOT CYGWIN" OFF)
-
-@@ -247,8 +249,10 @@ if(NOT SERVER_ONLY)
- endif()
-
- if(NOT SERVER_ONLY)
-- find_library(SQUISH_LIBRARY NAMES squish libsquish)
-- find_path(SQUISH_INCLUDEDIR NAMES squish.h PATHS)
-+ if(USE_SYSTEM_SQUISH)
-+ find_library(SQUISH_LIBRARY NAMES squish libsquish)
-+ find_path(SQUISH_INCLUDEDIR NAMES squish.h PATHS)
-+ endif()
- if (NOT SQUISH_LIBRARY OR NOT SQUISH_INCLUDEDIR)
- add_subdirectory("${PROJECT_SOURCE_DIR}/lib/libsquish")
- include_directories("${PROJECT_SOURCE_DIR}/lib/libsquish")
---
-2.20.1
-