mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-02 18:32:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

glew: upgrade 2.1.0 -> 2.2.0

Browse Source 
0001-Fixed-compilation-with-current-mesa-versions.patch
removed since it is included in 2.2.0

(From OE-Core rev: 39e59246cb8e3b5b65ad10935e08078f5053e350)

Signed-off-by: Wang Mingyu <wangmy@cn.fujitsu.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Wang Mingyu
2020-03-19 00:41:44 -07:00
committed by Richard Purdie
parent 3e3b66ca1d
commit 10121e7a3c
2 changed files with 3 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

73
meta/recipes-graphics/glew/glew/0001-Fixed-compilation-with-current-mesa-versions.patch
View File

@@ -1,73 +0,0 @@
From 7f65a36866f4e24dd1446fe1c9d21424f28bcabd Mon Sep 17 00:00:00 2001
From: Deve <deveee@gmail.com>
Date: Wed, 14 Nov 2018 21:07:29 +0100
Subject: [PATCH] Fixed compilation with current mesa versions.
As you can see in
https://cgit.freedesktop.org/mesa/mesa/tree/include/GL/glext.h
now the file uses __gl_glext_h_ instead of __glext_h_
It's precisely caused by commit f7d42ee7d319256608ad60778f6787c140badada
Backoprt notes:
* The original patch adjusts auto/src/glew_head.h only
* include/GL/glew.h is not part of git repo and gets created on tarball
creation
=> patch include/GL/glew.h either to cause the desired fix
Upstream-Status: Backport [1]
[1] https://github.com/nigels-com/glew/commit/7f65a36866f4e24dd1446fe1c9d21424f28bcabd
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
auto/src/glew_head.h | 3 ++-
include/GL/glew.h | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/auto/src/glew_head.h b/auto/src/glew_head.h
index c19cefb..8f313d9 100644
--- a/auto/src/glew_head.h
+++ b/auto/src/glew_head.h
@@ -14,7 +14,7 @@
#if defined(__REGAL_H__)
#error Regal.h included before glew.h
#endif
-#if defined(__glext_h_) || defined(__GLEXT_H_)
+#if defined(__glext_h_) || defined(__GLEXT_H_) || defined(__gl_glext_h_)
#error glext.h included before glew.h
#endif
#if defined(__gl_ATI_h_)
@@ -30,6 +30,7 @@
#define __X_GL_H
#define __glext_h_
#define __GLEXT_H_
+#define __gl_glext_h_
#define __gl_ATI_h_
#if defined(_WIN32)
diff --git a/include/GL/glew.h b/include/GL/glew.h
index b5b6987..a9f9e4b 100644
--- a/include/GL/glew.h
+++ b/include/GL/glew.h
@@ -93,7 +93,7 @@
#if defined(__REGAL_H__)
#error Regal.h included before glew.h
#endif
-#if defined(__glext_h_) || defined(__GLEXT_H_)
+#if defined(__glext_h_) || defined(__GLEXT_H_) || defined(__gl_glext_h_)
#error glext.h included before glew.h
#endif
#if defined(__gl_ATI_h_)
@@ -109,6 +109,7 @@
#define __X_GL_H
#define __glext_h_
#define __GLEXT_H_
+#define __gl_glext_h_
#define __gl_ATI_h_
#if defined(_WIN32)
--
2.20.1

7
meta/recipes-graphics/glew/glew_2.1.0.bb → meta/recipes-graphics/glew/glew_2.2.0.bb
View File

@@ -6,11 +6,10 @@ LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=2ac251558de685c6b9478d89be3149c2"
SRC_URI = "${SOURCEFORGE_MIRROR}/project/glew/glew/${PV}/glew-${PV}.tgz \
file://no-strip.patch \
file://0001-Fixed-compilation-with-current-mesa-versions.patch"
file://no-strip.patch"
SRC_URI[md5sum] = "b2ab12331033ddfaa50dc39345343980"
SRC_URI[sha256sum] = "04de91e7e6763039bc11940095cd9c7f880baba82196a7765f727ac05a993c95"
SRC_URI[md5sum] = "3579164bccaef09e36c0af7f4fd5c7c7"
SRC_URI[sha256sum] = "d4fc82893cfb00109578d0a1a2337fb8ca335b3ceccf97b97e5cc7f08e4353e1"
UPSTREAM_CHECK_URI = "http://sourceforge.net/projects/glew/files/glew"
UPSTREAM_CHECK_REGEX = "/glew/(?P<pver>(\d+[\.\-_]*)+)/"