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 build issue

0002-Fixed-build-with-mesa-19.2.1.patch (text/plain), 1.90 KB, created by Alistair on 2019-10-24 20:46:24 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alistair

Created: 2019-10-24 20:46:24 UTC

Size: 1.90 KB

patch

obsolete

># HG changeset patch
># User Alistair Francis <alistair.francis@wdc.com>
># Date 1571948613 25200
>#      Thu Oct 24 13:23:33 2019 -0700
># Node ID 14a94f6e9e77a5c323741aebade5e484a22236cf
># Parent  f530cdaaab6261e9942a3ec254273533ed0df08c
>Fixed build with mesa 19.2.1
>
>Fix the following two build failures when building for x86 with mesa 19.2.1
>
>In file included from /include/SDL_opengles.h:33,
>                 from /src/video/SDL_video.c:41:
>/usr/include/GLES/gl.h:63:25: error: conflicting types for 'GLsizeiptr'
>  63 | typedef khronos_ssize_t GLsizeiptr;
>     |                         ^~~~~~~~~~
>In file included from /include/SDL_opengl.h:2105,
>                from /src/video/SDL_video.c:37:
>/include/SDL_opengl_glext.h:472:19: note: previous declaration of 'GLsizeiptr' was here
> 472 | typedef ptrdiff_t GLsizeiptr;
>     |                   ^~~~~~~~~~
>
>
>In file included from /include/SDL_opengles.h:33,
>                from /src/video/SDL_video.c:41:
>/usr/include/GLES/gl.h:64:26: error: conflicting types for 'GLintptr'
>  64 | typedef khronos_intptr_t GLintptr;
>     |                          ^~~~~~~~
>In file included from /include/SDL_opengl.h:2105,
>                from /src/video/SDL_video.c:37:
>/include/SDL_opengl_glext.h:473:19: note: previous declaration of 'GLintptr' was here
> 473 | typedef ptrdiff_t GLintptr;
>     |                   ^~~~~~~~
>
>diff -r f530cdaaab62 -r 14a94f6e9e77 include/SDL_opengl_glext.h
>--- a/include/SDL_opengl_glext.h	Thu Oct 24 18:07:30 2019 +0200
>+++ b/include/SDL_opengl_glext.h	Thu Oct 24 13:23:33 2019 -0700
>@@ -468,13 +468,8 @@
> #ifndef GL_VERSION_1_5
> #define GL_VERSION_1_5 1
> #include <stddef.h>
>-#ifdef __MACOSX__
> typedef long GLsizeiptr;
> typedef long GLintptr;
>-#else
>-typedef ptrdiff_t GLsizeiptr;
>-typedef ptrdiff_t GLintptr;
>-#endif
> #define GL_BUFFER_SIZE                    0x8764
> #define GL_BUFFER_USAGE                   0x8765
> #define GL_QUERY_COUNTER_BITS             0x8864

Actions: View | Diff

Attachments on bug 4846: 4018

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.