Skip to content

Commit

Permalink
games-action/supertuxkart: fix patch line-endings
Browse files Browse the repository at this point in the history
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 <[email protected]>
  • Loading branch information
thesamesam committed Sep 2, 2020
1 parent 285d1df commit 4a338c7
Showing 1 changed file with 24 additions and 26 deletions.
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -10,14 +8,14 @@ Signed-off-by: Christoph Egger <[email protected]
--- 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 @@
Expand Down Expand Up @@ -50,20 +48,20 @@ Signed-off-by: Christoph Egger <[email protected]
--- 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

0 comments on commit 4a338c7

Please sign in to comment.