diff --git a/.gitignore b/.gitignore index 13802fb..62335fa 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/glew-2.0.0.tgz +SOURCES/glew-2.2.0.tgz diff --git a/.glew.metadata b/.glew.metadata index 738a688..a116d35 100644 --- a/.glew.metadata +++ b/.glew.metadata @@ -1 +1 @@ -6e15c84f7e1fad34cd3679f784a233744ddf048f SOURCES/glew-2.0.0.tgz +22d6e9b9e691080eb6313407dbf51cfebc3345ea SOURCES/glew-2.2.0.tgz diff --git a/SOURCES/glew-2.1.0-install.patch b/SOURCES/glew-2.1.0-install.patch new file mode 100644 index 0000000..00537e1 --- /dev/null +++ b/SOURCES/glew-2.1.0-install.patch @@ -0,0 +1,19 @@ +diff -up glew-2.1.0/Makefile.install glew-2.1.0/Makefile +--- glew-2.1.0/Makefile.install 2018-08-15 13:51:45.220637107 +0200 ++++ glew-2.1.0/Makefile 2018-08-15 13:52:02.168740876 +0200 +@@ -231,6 +231,7 @@ install.bin: glew.bin + + install.include: + $(INSTALL) -d -m 0755 "$(DESTDIR)$(INCDIR)" ++ $(INSTALL) -m 0644 include/GL/eglew.h "$(DESTDIR)$(INCDIR)/" + $(INSTALL) -m 0644 include/GL/wglew.h "$(DESTDIR)$(INCDIR)/" + $(INSTALL) -m 0644 include/GL/glew.h "$(DESTDIR)$(INCDIR)/" + $(INSTALL) -m 0644 include/GL/glxew.h "$(DESTDIR)$(INCDIR)/" +@@ -241,6 +242,7 @@ install.pkgconfig: glew.pc + $(INSTALL) -m 0644 glew.pc "$(DESTDIR)$(PKGDIR)/" + + uninstall: ++ $(RM) "$(DESTDIR)$(INCDIR)/eglew.h" + $(RM) "$(DESTDIR)$(INCDIR)/wglew.h" + $(RM) "$(DESTDIR)$(INCDIR)/glew.h" + $(RM) "$(DESTDIR)$(INCDIR)/glxew.h" diff --git a/SOURCES/glew-2.2.0-gcc12-cplusplus.patch b/SOURCES/glew-2.2.0-gcc12-cplusplus.patch new file mode 100644 index 0000000..3d4a61a --- /dev/null +++ b/SOURCES/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/glew.spec b/SPECS/glew.spec index cad663a..386cd9b 100644 --- a/SPECS/glew.spec +++ b/SPECS/glew.spec @@ -1,13 +1,16 @@ Name: glew -Version: 2.0.0 -Release: 6%{?dist} +Version: 2.2.0 +Release: 2%{?dist} Summary: The OpenGL Extension Wrangler Library -Group: System Environment/Libraries License: BSD 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 +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++ @@ -22,9 +25,8 @@ are in libGLEW. %package devel Summary: Development files for glew -Group: Development/Libraries -Requires: libGLEW = %{version}-%{release} -Requires: libGLU-devel +Requires: libGLEW%{?_isa} = %{version}-%{release} +Requires: mesa-libGLU-devel%{?_isa} %description devel Development files for glew @@ -32,22 +34,28 @@ Development files for glew %package -n libGLEW Summary: libGLEW -Group: System Environment/Libraries %description -n libGLEW libGLEW %prep -%setup -q +%autosetup -p1 # update config.guess for new arch support cp /usr/lib/rpm/redhat/config.guess config/ %build -make %{?_smp_mflags} 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 -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 find $RPM_BUILD_ROOT -type f -name "*.a" -delete # sigh chmod 0755 $RPM_BUILD_ROOT%{_libdir}/*.so* @@ -55,12 +63,12 @@ chmod 0755 $RPM_BUILD_ROOT%{_libdir}/*.so* %ldconfig_scriptlets -n libGLEW %files -%doc LICENSE.txt +%license LICENSE.txt %{_bindir}/* %files -n libGLEW -%doc LICENSE.txt -%{_libdir}/libGLEW.so.* +%license LICENSE.txt +%{_libdir}/libGLEW.so.2.2* %files devel %{_libdir}/libGLEW.so @@ -69,6 +77,52 @@ chmod 0755 $RPM_BUILD_ROOT%{_libdir}/*.so* %doc doc/* %changelog +* Mon Jan 15 2024 Arkady L. Shane - 2.2.0-2 +- Rebuilt for MSVSphere 9.3 + +* Tue Feb 22 2022 Hans de Goede - 2.2.0-2 +- Fix 2.2.0 breaking c++ code build with -std=c++03 (#2053052, #2053073) + +* Wed Feb 09 2022 Orion Poplawski - 2.2.0-1 +- Update to 2.2.0 (bz#2049077) + +* Thu Jan 20 2022 Fedora Release Engineering - 2.1.0-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Thu Jul 22 2021 Fedora Release Engineering - 2.1.0-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Tue Jan 26 2021 Fedora Release Engineering - 2.1.0-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Sat Aug 01 2020 Fedora Release Engineering - 2.1.0-8 +- Second attempt - Rebuilt for + https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Mon Jul 27 2020 Fedora Release Engineering - 2.1.0-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Tue Jan 28 2020 Fedora Release Engineering - 2.1.0-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Thu Jul 25 2019 Fedora Release Engineering - 2.1.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Thu Jan 31 2019 Fedora Release Engineering - 2.1.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Thu Sep 6 2018 Owen Taylor - 2.1.0-3 +- Fix installation with prefix=/app + +* Thu Aug 23 2018 Nicolas Chauvet - 2.1.0-2 +- Fix mesa-libGLU-devel isnt't arched + +* Wed Aug 15 2018 Nicolas Chauvet - 2.1.0-1 +- Update to 2.1.0 + +* Fri Jul 13 2018 Fedora Release Engineering - 2.0.0-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Wed Feb 07 2018 Fedora Release Engineering - 2.0.0-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild