Fixed compilation with current mesa versions.

Signed-off-by: mengwenhua <mengwenhua@xfusion.com>
This commit is contained in:
mengwenhua 2023-01-06 18:15:06 +08:00
parent 86b51b66cd
commit 037cf85513
2 changed files with 42 additions and 1 deletions

View File

@ -0,0 +1,37 @@
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
---
auto/src/glew_head.h | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/auto/src/glew_head.h b/auto/src/glew_head.h
index 41e5a26..742f27f 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)
--
2.37.3.windows.1

View File

@ -1,6 +1,6 @@
Name: glew
Version: 2.1.0
Release: 6
Release: 7
Summary: The OpenGL Extension Wrangler Library
License: BSD-3-Clause and MIT
URL: http://glew.sourceforge.net
@ -13,6 +13,7 @@ Provides: libGLEW = %{version}-%{release}
Obsoletes: libGLEW < %{version}-%{release}
Patch6000: backport-0001-Include-description-of-glew-in-README.md.patch
Patch6001: backport-0001-Fixed-compilation-with-current-mesa-versions.patch
%description
OpenGL Extension Wrangler Library (GLEW) is a cross-platform
@ -63,6 +64,9 @@ chmod 0755 $RPM_BUILD_ROOT%{_libdir}/*.so*
%doc doc/*
%changelog
* Fri Jan 6 2023 mengwenhua<mengwenhua@xfusion.com> - 2.1.0-7
- Fixed compilation with current mesa versions.
* Thu Jan 5 2023 mengwenhua<mengwenhua@xfusion.com> - 2.1.0-6
- Type:bugfix
- CVE:NA