We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

[patch] Patch to fix the problem

fix-building-with-Mesa-19.2.patch (text/plain), 1.16 KB, created by Michael Olbrich on 2019-10-10 16:37:58 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Michael Olbrich

Created: 2019-10-10 16:37:58 UTC

Size: 1.16 KB

patch

obsolete

># HG changeset patch
># User Michael Olbrich <m.olbrich@pengutronix.de>
>
>fix building with Mesa 19.2
>
>With Mesa 19.2 building fails with:
>
>/include/GLES/gl.h:63:25: error: conflicting types for 'GLsizeiptr'
>
>The same type is defined in include/SDL_opengl.h for OpenGL and the two
>headers should not be included at the same time.
>This was just never noticed because the same header guard '__gl_h_' was
>used. This was changed in Mesa. The result is this error.
>
>Fix this the same way GLES2 already handles this: Don't include the GLES
>header when the OpenGL header was already included.
>---
> src/video/SDL_video.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
>diff --git a/src/video/SDL_video.c b/src/video/SDL_video.c
>index c63f74631b71..62b9075a3d5f 100644
>--- a/src/video/SDL_video.c
>+++ b/src/video/SDL_video.c
>@@ -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

Actions: View | Diff

Attachments on bug 4797: 3981

We are currently migrating Bugzilla to GitHub issues.Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.