| Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame^] | 1 | From 7f65a36866f4e24dd1446fe1c9d21424f28bcabd Mon Sep 17 00:00:00 2001 |
| 2 | From: Deve <deveee@gmail.com> |
| 3 | Date: Wed, 14 Nov 2018 21:07:29 +0100 |
| 4 | Subject: [PATCH] Fixed compilation with current mesa versions. |
| 5 | |
| 6 | As you can see in |
| 7 | https://cgit.freedesktop.org/mesa/mesa/tree/include/GL/glext.h |
| 8 | now the file uses __gl_glext_h_ instead of __glext_h_ |
| 9 | It's precisely caused by commit f7d42ee7d319256608ad60778f6787c140badada |
| 10 | |
| 11 | Backoprt notes: |
| 12 | |
| 13 | * The original patch adjusts auto/src/glew_head.h only |
| 14 | * include/GL/glew.h is not part of git repo and gets created on tarball |
| 15 | creation |
| 16 | |
| 17 | => patch include/GL/glew.h either to cause the desired fix |
| 18 | |
| 19 | Upstream-Status: Backport [1] |
| 20 | |
| 21 | [1] https://github.com/nigels-com/glew/commit/7f65a36866f4e24dd1446fe1c9d21424f28bcabd |
| 22 | |
| 23 | Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> |
| 24 | --- |
| 25 | auto/src/glew_head.h | 3 ++- |
| 26 | include/GL/glew.h | 3 ++- |
| 27 | 2 files changed, 4 insertions(+), 2 deletions(-) |
| 28 | |
| 29 | diff --git a/auto/src/glew_head.h b/auto/src/glew_head.h |
| 30 | index c19cefb..8f313d9 100644 |
| 31 | --- a/auto/src/glew_head.h |
| 32 | +++ b/auto/src/glew_head.h |
| 33 | @@ -14,7 +14,7 @@ |
| 34 | #if defined(__REGAL_H__) |
| 35 | #error Regal.h included before glew.h |
| 36 | #endif |
| 37 | -#if defined(__glext_h_) || defined(__GLEXT_H_) |
| 38 | +#if defined(__glext_h_) || defined(__GLEXT_H_) || defined(__gl_glext_h_) |
| 39 | #error glext.h included before glew.h |
| 40 | #endif |
| 41 | #if defined(__gl_ATI_h_) |
| 42 | @@ -30,6 +30,7 @@ |
| 43 | #define __X_GL_H |
| 44 | #define __glext_h_ |
| 45 | #define __GLEXT_H_ |
| 46 | +#define __gl_glext_h_ |
| 47 | #define __gl_ATI_h_ |
| 48 | |
| 49 | #if defined(_WIN32) |
| 50 | diff --git a/include/GL/glew.h b/include/GL/glew.h |
| 51 | index b5b6987..a9f9e4b 100644 |
| 52 | --- a/include/GL/glew.h |
| 53 | +++ b/include/GL/glew.h |
| 54 | @@ -93,7 +93,7 @@ |
| 55 | #if defined(__REGAL_H__) |
| 56 | #error Regal.h included before glew.h |
| 57 | #endif |
| 58 | -#if defined(__glext_h_) || defined(__GLEXT_H_) |
| 59 | +#if defined(__glext_h_) || defined(__GLEXT_H_) || defined(__gl_glext_h_) |
| 60 | #error glext.h included before glew.h |
| 61 | #endif |
| 62 | #if defined(__gl_ATI_h_) |
| 63 | @@ -109,6 +109,7 @@ |
| 64 | #define __X_GL_H |
| 65 | #define __glext_h_ |
| 66 | #define __GLEXT_H_ |
| 67 | +#define __gl_glext_h_ |
| 68 | #define __gl_ATI_h_ |
| 69 | |
| 70 | #if defined(_WIN32) |
| 71 | -- |
| 72 | 2.20.1 |
| 73 | |