[gentoo-commits] repo/gentoo:master commit in: games-action/supertuxkart/files/

[gentoo-commits] repo/gentoo:master commit in: games-action/supertuxkart/files/

[Sam James]

commit:     4a338c733fff32fc0f42fe5ce3a94613cb87522d
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Sep  2 13:00:36 2020 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Sep  2 13:00:36 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4a338c73

games-action/supertuxkart: fix patch line-endings

Unfortunately, I tested this *pre-commit* at which point
git used its autocrlf to adapt the line-endings.

Closes: https://bugs.gentoo.org/740030
Package-Manager: Portage-3.0.5, Repoman-3.0.1
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../supertuxkart-1.2-irrlicht-system-libs.patch    | 50 +++++++++++-----------
 1 file changed, 24 insertions(+), 26 deletions(-)

diff --git a/games-action/supertuxkart/files/supertuxkart-1.2-irrlicht-system-libs.patch b/games-action/supertuxkart/files/supertuxkart-1.2-irrlicht-system-libs.patch
index 2a23e51323d..f9681733cfb 100644
--- a/games-action/supertuxkart/files/supertuxkart-1.2-irrlicht-system-libs.patch
+++ b/games-action/supertuxkart/files/supertuxkart-1.2-irrlicht-system-libs.patch
@@ -1,5 +1,3 @@
-https://salsa.debian.org/games-team/supertuxkart/-/raw/master/debian/patches/irrlicht/use-system-libs.diff
-----
 Subject: [PATCH] debian/use-system-libs
 
 Path to build irrlicht using the system libraries for png,zlib and
@@ -10,14 +8,14 @@ Signed-off-by: Christoph Egger <debian@christoph-egger.org
 --- a/lib/irrlicht/source/Irrlicht/CIrrDeviceLinux.cpp
 +++ b/lib/irrlicht/source/Irrlicht/CIrrDeviceLinux.cpp
 @@ -35,7 +35,7 @@
- #include <GL/gl.h>
- #ifdef _IRR_OPENGL_USE_EXTPOINTER_
- #define GLX_GLXEXT_PROTOTYPES
--#include "glxext.h"
-+#include <GL/glxext.h>
- #endif
- #endif
- 
+ #include <GL/gl.h>
+ #ifdef _IRR_OPENGL_USE_EXTPOINTER_
+ #define GLX_GLXEXT_PROTOTYPES
+-#include "glxext.h"
++#include <GL/glxext.h>
+ #endif
+ #endif
+ 
 --- a/lib/irrlicht/source/Irrlicht/COpenGLExtensionHandler.h
 +++ b/lib/irrlicht/source/Irrlicht/COpenGLExtensionHandler.h
 @@ -24,7 +24,7 @@
@@ -50,20 +48,20 @@ Signed-off-by: Christoph Egger <debian@christoph-egger.org
 --- a/lib/irrlicht/source/Irrlicht/COpenGLSLMaterialRenderer.h
 +++ b/lib/irrlicht/source/Irrlicht/COpenGLSLMaterialRenderer.h
 @@ -12,7 +12,7 @@
- 	#define WIN32_LEAN_AND_MEAN
- 	#include <windows.h>
- 	#include <GL/gl.h>
--	#include "glext.h"
-+	#include <GL/glext.h>
- #else
- #if defined(_IRR_OPENGL_USE_EXTPOINTER_)
- 	#define GL_GLEXT_LEGACY 1
+ 	#define WIN32_LEAN_AND_MEAN
+ 	#include <windows.h>
+ 	#include <GL/gl.h>
+-	#include "glext.h"
++	#include <GL/glext.h>
+ #else
+ #if defined(_IRR_OPENGL_USE_EXTPOINTER_)
+ 	#define GL_GLEXT_LEGACY 1
 @@ -26,7 +26,7 @@
- 	#include <GL/gl.h>
- #endif
- #if defined(_IRR_OPENGL_USE_EXTPOINTER_)
--	#include "glext.h"
-+	#include <GL/glext.h>
- #endif
- #endif
- 
+ 	#include <GL/gl.h>
+ #endif
+ #if defined(_IRR_OPENGL_USE_EXTPOINTER_)
+-	#include "glext.h"
++	#include <GL/glext.h>
+ #endif
+ #endif
+ 

[gentoo-commits] repo/gentoo:master commit in: games-action/supertuxkart/files/

[Conrad Kostecki]

commit:     b9eaec2d2c18dc7c9131963f9f2c19b766cb5e61
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Mon Nov  1 16:26:50 2021 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Mon Nov  1 17:55:44 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b9eaec2d

games-action/supertuxkart: remove unused patch

Closes: https://github.com/gentoo/gentoo/pull/22786
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 .../files/supertuxkart-1.1-fix-buildsystem.patch     | 20 --------------------
 1 file changed, 20 deletions(-)

diff --git a/games-action/supertuxkart/files/supertuxkart-1.1-fix-buildsystem.patch b/games-action/supertuxkart/files/supertuxkart-1.1-fix-buildsystem.patch
deleted file mode 100644
index 394a1963199..00000000000
--- a/games-action/supertuxkart/files/supertuxkart-1.1-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
-@@ -94,15 +94,6 @@
- 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 -fstrict-aliasing")
--    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -pipe -O3 -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)