!21 Update to 2.2.0
From: @lyn1001 Reviewed-by: @starlet-dx Signed-off-by: @starlet-dx
This commit is contained in:
commit
62a10013ee
@ -1,26 +0,0 @@
|
|||||||
From f5f69b25eb3495775aef94f443487a4295c0a57e Mon Sep 17 00:00:00 2001
|
|
||||||
From: Olli Kallioinen <olli.kallioinen@iki.fi>
|
|
||||||
Date: Fri, 29 Dec 2017 16:54:53 +0200
|
|
||||||
Subject: [PATCH] Fix for issue #169 (glew cmake project requires a c++
|
|
||||||
compiler)
|
|
||||||
|
|
||||||
---
|
|
||||||
build/cmake/CMakeLists.txt | 2 +-
|
|
||||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/build/cmake/CMakeLists.txt b/build/cmake/CMakeLists.txt
|
|
||||||
index 5081e0f..d724e10 100644
|
|
||||||
--- a/build/cmake/CMakeLists.txt
|
|
||||||
+++ b/build/cmake/CMakeLists.txt
|
|
||||||
@@ -2,7 +2,7 @@ if ( NOT DEFINED CMAKE_BUILD_TYPE )
|
|
||||||
set( CMAKE_BUILD_TYPE Release CACHE STRING "Build type" )
|
|
||||||
endif ()
|
|
||||||
|
|
||||||
-project (glew)
|
|
||||||
+project (glew C)
|
|
||||||
|
|
||||||
cmake_minimum_required (VERSION 2.8.12)
|
|
||||||
|
|
||||||
--
|
|
||||||
2.37.3.windows.1
|
|
||||||
|
|
||||||
@ -1,37 +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
|
|
||||||
---
|
|
||||||
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
|
|
||||||
|
|
||||||
@ -1,25 +0,0 @@
|
|||||||
From 15ab6eebecf7bc7028dfedb3af2afaea16231dfd Mon Sep 17 00:00:00 2001
|
|
||||||
From: Rene <rene_blath@yahoo.de>
|
|
||||||
Date: Wed, 27 Sep 2017 11:42:00 +0200
|
|
||||||
Subject: [PATCH] Include description of glew in README.md
|
|
||||||
|
|
||||||
Description has been taken from glew.sourceforge.net
|
|
||||||
---
|
|
||||||
README.md | 2 ++
|
|
||||||
1 file changed, 2 insertions(+)
|
|
||||||
|
|
||||||
diff --git a/README.md b/README.md
|
|
||||||
index 6d8245b..1b427b8 100644
|
|
||||||
--- a/README.md
|
|
||||||
+++ b/README.md
|
|
||||||
@@ -1,5 +1,7 @@
|
|
||||||
# GLEW - The OpenGL Extension Wrangler Library
|
|
||||||
|
|
||||||
+The OpenGL Extension Wrangler Library (GLEW) is a cross-platform open-source C/C++ extension loading library. GLEW provides efficient run-time mechanisms for determining which OpenGL extensions are supported on the target platform. OpenGL core and extension functionality is exposed in a single header file. GLEW has been tested on a variety of operating systems, including Windows, Linux, Mac OS X, FreeBSD, Irix, and Solaris.
|
|
||||||
+
|
|
||||||

|
|
||||||
|
|
||||||
http://glew.sourceforge.net/
|
|
||||||
--
|
|
||||||
2.37.3.windows.1
|
|
||||||
|
|
||||||
BIN
glew-2.1.0.tgz
BIN
glew-2.1.0.tgz
Binary file not shown.
BIN
glew-2.2.0.tgz
Normal file
BIN
glew-2.2.0.tgz
Normal file
Binary file not shown.
28
glew.spec
28
glew.spec
@ -1,21 +1,17 @@
|
|||||||
Name: glew
|
Name: glew
|
||||||
Version: 2.1.0
|
Version: 2.2.0
|
||||||
Release: 8
|
Release: 1
|
||||||
Summary: The OpenGL Extension Wrangler Library
|
Summary: The OpenGL Extension Wrangler Library
|
||||||
License: BSD-3-Clause and MIT
|
License: BSD-3-Clause and MIT
|
||||||
URL: http://glew.sourceforge.net
|
URL: https://github.com/nigels-com/glew
|
||||||
|
|
||||||
Source0: https://sourceforge.net/projects/glew/files/glew/%{version}/glew-%{version}.tgz
|
Source0: https://github.com/nigels-com/glew/releases/download/glew-%{version}/glew-%{version}.tgz
|
||||||
Patch0000: glew-2.1.0-install.patch
|
Patch0000: glew-2.1.0-install.patch
|
||||||
BuildRequires: libGLU-devel gcc
|
BuildRequires: libGLU-devel gcc make
|
||||||
|
|
||||||
Provides: libGLEW = %{version}-%{release}
|
Provides: libGLEW = %{version}-%{release}
|
||||||
Obsoletes: 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
|
|
||||||
Patch6002: backport-0001-Fix-for-issue-169-glew-cmake-project-requires-a-c-co.patch
|
|
||||||
|
|
||||||
%description
|
%description
|
||||||
OpenGL Extension Wrangler Library (GLEW) is a cross-platform
|
OpenGL Extension Wrangler Library (GLEW) is a cross-platform
|
||||||
extension loading library for c / c ++.
|
extension loading library for c / c ++.
|
||||||
@ -40,10 +36,17 @@ Development files for glew
|
|||||||
cp /usr/lib/rpm/%{_vendor}/config.guess config/
|
cp /usr/lib/rpm/%{_vendor}/config.guess config/
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%make_build CFLAGS.EXTRA="$RPM_OPT_FLAGS -fPIC" includedir=%{_includedir} STRIP= LIBDIR=%{_libdir} PKGDIR=%{_libdir}/pkgconfig
|
%make_build CFLAGS.EXTRA="$RPM_OPT_FLAGS -fPIC"\
|
||||||
|
STRIP= \
|
||||||
|
GLEW_PREFIX=%{_prefix} GLEW_DEST=%{_prefix} \
|
||||||
|
includedir=%{_includedir} \
|
||||||
|
BINDIR=%{_bindir} LIBDIR=%{_libdir} PKGDIR=%{_libdir}/pkgconfig
|
||||||
|
|
||||||
%install
|
%install
|
||||||
make install.all DESTDIR="$RPM_BUILD_ROOT" LIBDIR=%{_libdir} PKGDIR=%{_libdir}/pkgconfig
|
make install.all DESTDIR="$RPM_BUILD_ROOT" \
|
||||||
|
GLEW_PREFIX=%{_prefix} GLEW_DEST=%{_prefix} \
|
||||||
|
includedir=%{_includedir} \
|
||||||
|
BINDIR=%{_bindir} LIBDIR=%{_libdir} PKGDIR=%{_libdir}/pkgconfig
|
||||||
chmod 0755 $RPM_BUILD_ROOT%{_libdir}/*.so*
|
chmod 0755 $RPM_BUILD_ROOT%{_libdir}/*.so*
|
||||||
%delete_la_and_a
|
%delete_la_and_a
|
||||||
|
|
||||||
@ -65,6 +68,9 @@ chmod 0755 $RPM_BUILD_ROOT%{_libdir}/*.so*
|
|||||||
%doc doc/*
|
%doc doc/*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu Oct 12 2023 liyanan <thistleslyn@163.com> - 2.2.0-1
|
||||||
|
- Update to 2.2.0
|
||||||
|
|
||||||
* Sat Jan 7 2023 mengwenhua <mengwenhua@xfusion.com> - 2.1.0-8
|
* Sat Jan 7 2023 mengwenhua <mengwenhua@xfusion.com> - 2.1.0-8
|
||||||
- glew cmake project requires a c++ compiler
|
- glew cmake project requires a c++ compiler
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user