diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2019-12-04 20:12:41 +0100 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2019-12-04 20:12:41 +0100 |
| commit | 33b59c1a3edbb81735e8d4e977b107f3ba1c2f9f (patch) | |
| tree | 79ee86a29266d0a32ec0d0aa790ee5904b1098b8 /gnu/packages/patches/sdl2-mesa-compat.patch | |
| parent | 936aa05209402dd399869ffae188db5dd5f67d69 (diff) | |
| parent | d733a469d74f74734825f1ce777956fb4cac5534 (diff) | |
| download | guix-33b59c1a3edbb81735e8d4e977b107f3ba1c2f9f.tar guix-33b59c1a3edbb81735e8d4e977b107f3ba1c2f9f.tar.gz | |
Merge branch '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, 21 insertions, 0 deletions
diff --git a/gnu/packages/patches/sdl2-mesa-compat.patch b/gnu/packages/patches/sdl2-mesa-compat.patch new file mode 100644 index 0000000000..8182e582e7 --- /dev/null +++ b/gnu/packages/patches/sdl2-mesa-compat.patch @@ -0,0 +1,21 @@ +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 + |