From d83cde4a1883d655cce3a2d46f46f2df9593af68 Mon Sep 17 00:00:00 2001 From: durgajagadeesh Date: Thu, 6 Feb 2025 13:04:01 +0530 Subject: [PATCH] glew: Update to 2.2.0 (#10871) Co-authored-by: dj_palli --- .../glew/glew-2.2.0-gcc12-cplusplus.patch | 13 +++++++++++++ SPECS-EXTENDED/glew/glew.signatures.json | 2 +- SPECS-EXTENDED/glew/glew.spec | 15 ++++++++++++--- cgmanifest.json | 4 ++-- 4 files changed, 28 insertions(+), 6 deletions(-) create mode 100644 SPECS-EXTENDED/glew/glew-2.2.0-gcc12-cplusplus.patch diff --git a/SPECS-EXTENDED/glew/glew-2.2.0-gcc12-cplusplus.patch b/SPECS-EXTENDED/glew/glew-2.2.0-gcc12-cplusplus.patch new file mode 100644 index 00000000000..3d4a61ae01c --- /dev/null +++ b/SPECS-EXTENDED/glew/glew-2.2.0-gcc12-cplusplus.patch @@ -0,0 +1,13 @@ +diff -up glew-2.2.0/include/GL/glew.h~ glew-2.2.0/include/GL/glew.h +--- glew-2.2.0/include/GL/glew.h~ 2020-03-15 12:53:59.000000000 +0100 ++++ glew-2.2.0/include/GL/glew.h 2022-02-22 23:17:58.889834158 +0100 +@@ -220,7 +220,8 @@ typedef _W64 int ptrdiff_t; + */ + + #if defined(__APPLE__) || defined(__linux__) +-# if defined(__cplusplus) ++/* GCC12 errors out when including with __cplusplus < 201103L */ ++# if defined(__cplusplus) && __cplusplus >= 201103L + # include + # include + # else diff --git a/SPECS-EXTENDED/glew/glew.signatures.json b/SPECS-EXTENDED/glew/glew.signatures.json index eec800960c7..40103dff379 100644 --- a/SPECS-EXTENDED/glew/glew.signatures.json +++ b/SPECS-EXTENDED/glew/glew.signatures.json @@ -1,5 +1,5 @@ { "Signatures": { - "glew-2.1.0.tgz": "04de91e7e6763039bc11940095cd9c7f880baba82196a7765f727ac05a993c95" + "glew-2.2.0.tgz": "d4fc82893cfb00109578d0a1a2337fb8ca335b3ceccf97b97e5cc7f08e4353e1" } } diff --git a/SPECS-EXTENDED/glew/glew.spec b/SPECS-EXTENDED/glew/glew.spec index 5d38e4667cc..a0e1ca71fb5 100644 --- a/SPECS-EXTENDED/glew/glew.spec +++ b/SPECS-EXTENDED/glew/glew.spec @@ -1,16 +1,20 @@ Name: glew -Version: 2.1.0 -Release: 7%{?dist} +Version: 2.2.0 +Release: 1%{?dist} Summary: The OpenGL Extension Wrangler Library License: BSD and MIT Vendor: Microsoft Corporation Distribution: Azure Linux -URL: http://glew.sourceforge.net +URL: https://glew.sourceforge.net Source0: https://sourceforge.net/projects/glew/files/glew/%{version}/glew-%{version}.tgz Patch0: glew-2.1.0-install.patch +Patch1: glew-2.2.0-gcc12-cplusplus.patch + BuildRequires: gcc BuildRequires: libGLU-devel +BuildRequires: make + %description The OpenGL Extension Wrangler Library (GLEW) is a cross-platform C/C++ @@ -74,6 +78,11 @@ chmod 0755 $RPM_BUILD_ROOT%{_libdir}/*.so* %doc doc/* %changelog +* Tue Oct 29 2024 Durga Jagadeesh Palli - 2.2.0-1 +- Update to 2.2.0. +- change http URL to https +- License verified + * Thu Jun 17 2021 Thomas Crain - 2.1.0-7 - Initial CBL-Mariner import from Fedora 32 (license: MIT). - Remove redhat-specific config.guess seeding diff --git a/cgmanifest.json b/cgmanifest.json index 4b1c2a7e650..7842514c320 100644 --- a/cgmanifest.json +++ b/cgmanifest.json @@ -4340,8 +4340,8 @@ "type": "other", "other": { "name": "glew", - "version": "2.1.0", - "downloadUrl": "https://sourceforge.net/projects/glew/files/glew/2.1.0/glew-2.1.0.tgz" + "version": "2.2.0", + "downloadUrl": "https://sourceforge.net/projects/glew/files/glew/2.2.0/glew-2.2.0.tgz" } } },