summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-graphics/glew/glew/0001-Fixed-compilation-with-current-mesa-versions.patch73
-rw-r--r--meta/recipes-graphics/glew/glew_2.1.0.bb3
2 files changed, 75 insertions, 1 deletions
diff --git a/meta/recipes-graphics/glew/glew/0001-Fixed-compilation-with-current-mesa-versions.patch b/meta/recipes-graphics/glew/glew/0001-Fixed-compilation-with-current-mesa-versions.patch
new file mode 100644
index 0000000000..64f3e2fd9b
--- /dev/null
+++ b/meta/recipes-graphics/glew/glew/0001-Fixed-compilation-with-current-mesa-versions.patch
@@ -0,0 +1,73 @@
1From 7f65a36866f4e24dd1446fe1c9d21424f28bcabd Mon Sep 17 00:00:00 2001
2From: Deve <deveee@gmail.com>
3Date: Wed, 14 Nov 2018 21:07:29 +0100
4Subject: [PATCH] Fixed compilation with current mesa versions.
5
6As you can see in
7https://cgit.freedesktop.org/mesa/mesa/tree/include/GL/glext.h
8now the file uses __gl_glext_h_ instead of __glext_h_
9It's precisely caused by commit f7d42ee7d319256608ad60778f6787c140badada
10
11Backoprt 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
19Upstream-Status: Backport [1]
20
21[1] https://github.com/nigels-com/glew/commit/7f65a36866f4e24dd1446fe1c9d21424f28bcabd
22
23Signed-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
29diff --git a/auto/src/glew_head.h b/auto/src/glew_head.h
30index 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)
50diff --git a/include/GL/glew.h b/include/GL/glew.h
51index 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--
722.20.1
73
diff --git a/meta/recipes-graphics/glew/glew_2.1.0.bb b/meta/recipes-graphics/glew/glew_2.1.0.bb
index be725e0530..18e6909aa7 100644
--- a/meta/recipes-graphics/glew/glew_2.1.0.bb
+++ b/meta/recipes-graphics/glew/glew_2.1.0.bb
@@ -6,7 +6,8 @@ LICENSE = "MIT"
6LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=2ac251558de685c6b9478d89be3149c2" 6LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=2ac251558de685c6b9478d89be3149c2"
7 7
8SRC_URI = "${SOURCEFORGE_MIRROR}/project/glew/glew/${PV}/glew-${PV}.tgz \ 8SRC_URI = "${SOURCEFORGE_MIRROR}/project/glew/glew/${PV}/glew-${PV}.tgz \
9 file://no-strip.patch" 9 file://no-strip.patch \
10 file://0001-Fixed-compilation-with-current-mesa-versions.patch"
10 11
11SRC_URI[md5sum] = "b2ab12331033ddfaa50dc39345343980" 12SRC_URI[md5sum] = "b2ab12331033ddfaa50dc39345343980"
12SRC_URI[sha256sum] = "04de91e7e6763039bc11940095cd9c7f880baba82196a7765f727ac05a993c95" 13SRC_URI[sha256sum] = "04de91e7e6763039bc11940095cd9c7f880baba82196a7765f727ac05a993c95"