diff options
| author | Jakub Kądziołka <kuba@kadziolka.net> | 2020-04-29 11:08:42 +0200 |
|---|---|---|
| committer | Jakub Kądziołka <kuba@kadziolka.net> | 2020-04-29 11:08:42 +0200 |
| commit | 4035c3e3525599c3aa958d498c5bc789a4adffc3 (patch) | |
| tree | e55a02215fcdb635d0504fc129526bfbf66abd14 /gnu/packages/patches/sdl2-mesa-compat.patch | |
| parent | 492b82bd4d592276e65c4b9bfbe1b679a00ff09f (diff) | |
| parent | 4f0f46e4af0e342d84c5ad448258702029601e4b (diff) | |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/patches/sdl2-mesa-compat.patch')
| -rw-r--r-- | gnu/packages/patches/sdl2-mesa-compat.patch | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/gnu/packages/patches/sdl2-mesa-compat.patch b/gnu/packages/patches/sdl2-mesa-compat.patch deleted file mode 100644 index 8182e582e7..0000000000 --- a/gnu/packages/patches/sdl2-mesa-compat.patch +++ /dev/null @@ -1,21 +0,0 @@ -Do not include GLES header when OpenGL headers are already included. - -Taken from upstream: -https://hg.libsdl.org/SDL/rev/369b01006eb2 - -diff -r 4cbaffd0083b -r 369b01006eb2 src/video/SDL_video.c ---- a/src/video/SDL_video.c Fri Oct 11 06:18:24 2019 +0200 -+++ b/src/video/SDL_video.c Sat Oct 12 18:47:56 2019 +0200 -@@ -37,9 +37,9 @@ - #include "SDL_opengl.h" - #endif /* SDL_VIDEO_OPENGL */ - --#if SDL_VIDEO_OPENGL_ES -+#if SDL_VIDEO_OPENGL_ES && !SDL_VIDEO_OPENGL - #include "SDL_opengles.h" --#endif /* SDL_VIDEO_OPENGL_ES */ -+#endif /* SDL_VIDEO_OPENGL_ES && !SDL_VIDEO_OPENGL */ - - /* GL and GLES2 headers conflict on Linux 32 bits */ - #if SDL_VIDEO_OPENGL_ES2 && !SDL_VIDEO_OPENGL - |