Compare commits

...

No commits in common. 'c9' and 'i8' have entirely different histories.
c9 ... i8

2
.gitignore vendored

@ -1 +1 @@
SOURCES/glu-9.0.1.tar.xz SOURCES/glu-9.0.0.tar.bz2

@ -1 +1 @@
b6ffef562ba55d3f80146d4238589cb9b1de66f5 SOURCES/glu-9.0.1.tar.xz c2814bbaf1e60e28a75ec80f4646047c0da742bd SOURCES/glu-9.0.0.tar.bz2

@ -0,0 +1,25 @@
From 6b4c55d80dd64ca850159d8497178bc70f8ec51c Mon Sep 17 00:00:00 2001
From: Sergey Cherevko <s.cherevko@msvsphere-os.ru>
Date: Tue, 28 Nov 2023 13:01:49 +0300
Subject: [PATCH] MSVSphere include stddef.h
---
src/libutil/error.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/libutil/error.c b/src/libutil/error.c
index 7212748..c71ffdf 100644
--- a/src/libutil/error.c
+++ b/src/libutil/error.c
@@ -31,7 +31,7 @@
#include "gluos.h"
#include "gluint.h"
#include <GL/glu.h>
-
+#include <stddef.h>
struct token_string
{
--
2.39.3

@ -0,0 +1,33 @@
From bfdf99d6ff64b9c2d840e8a5767eaa57e4363c79 Mon Sep 17 00:00:00 2001
From: Mike Gorchak <mike.gorchak.qnx@gmail.com>
Date: Wed, 2 Jan 2013 13:39:50 -0700
Subject: [PATCH 1/2] glu: initialize PriorityQ::order field to NULL in
pqNewPriorityQ()
pqNewPriorityQ() function creates and setups PriorityQ structure, all
except for the field "order". It is filled later in function
pqInit(). Depending on vertices of polygon which must be tesselated
there possible following situation, pqDeletePriorityQ() is called
right after pqNewPriorityQ() function. pqNewPriorityQ() tries to free
memory using pq->order as pointer, which is unitialized at this point.
Signed-off-by: Brian Paul <brianp@vmware.com>
---
src/libtess/priorityq.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/libtess/priorityq.c b/src/libtess/priorityq.c
index c6b99cc..db7cd59 100644
--- a/src/libtess/priorityq.c
+++ b/src/libtess/priorityq.c
@@ -65,6 +65,7 @@ PriorityQ *pqNewPriorityQ( int (*leq)(PQkey key1, PQkey key2) )
return NULL;
}
+ pq->order = NULL;
pq->size = 0;
pq->max = INIT_SIZE;
pq->initialized = FALSE;
--
1.8.3.1

@ -0,0 +1,35 @@
From 069211570c32a8d5848e127975a2943e9d8fc6b9 Mon Sep 17 00:00:00 2001
From: Matt Turner <mattst88@gmail.com>
Date: Thu, 21 Feb 2013 20:40:31 -0800
Subject: [PATCH 2/2] Add -D(N)DEBUG to CFLAGS dependent on --enable-debug
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Tested-by: Blaž Hrastnik <speed.the.bboy@gmail.com>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=61003
---
configure.ac | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/configure.ac b/configure.ac
index cbfd047..45abf17 100644
--- a/configure.ac
+++ b/configure.ac
@@ -42,9 +42,10 @@ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
AC_ARG_ENABLE(debug,
AS_HELP_STRING([--enable-debug],
[Enable debugging information]),
- [CFLAGS="$CFLAGS -g -O0"
- CXXFLAGS="$CXXFLAGS -g -O0"],
- [])
+ [CFLAGS="$CFLAGS -g -O0 -DDEBUG"
+ CXXFLAGS="$CXXFLAGS -g -O0 -DDEBUG"],
+ [CFLAGS="$CFLAGS -DNDEBUG"
+ CXXFLAGS="$CXXFLAGS -DNDEBUG"])
dnl Make sure the pkg-config macros are defined
m4_ifndef([PKG_PROG_PKG_CONFIG],
--
1.8.3.1

@ -1,17 +1,20 @@
#define gitdate 20120904 #define gitdate 20120904
Name: mesa-libGLU Name: mesa-libGLU
Version: 9.0.1 Version: 9.0.0
Release: 6%{?dist} Release: 15%{?dist}.inferit
Summary: Mesa libGLU library Summary: Mesa libGLU library
License: MIT License: MIT
URL: http://mesa3d.org/ URL: http://mesa3d.org/
Source0: https://ftp.freedesktop.org/pub/mesa/glu/glu-%{version}.tar.xz Source0: ftp://ftp.freedesktop.org/pub/mesa/glu/glu-%{version}.tar.bz2
Source2: make-git-snapshot.sh Source2: make-git-snapshot.sh
BuildRequires: make Patch1: 0001-glu-initialize-PriorityQ-order-field-to-NULL-in-pqNe.patch
BuildRequires: gcc-c++ Patch2: 0002-Add-D-N-DEBUG-to-CFLAGS-dependent-on-enable-debug.patch
# MSVSphere
Patch100: 0001-MSVSphere-include-stddef.h.patch
BuildRequires: autoconf automake libtool BuildRequires: autoconf automake libtool
BuildRequires: mesa-libGL-devel BuildRequires: mesa-libGL-devel
#Requires: #Requires:
@ -32,16 +35,19 @@ developing applications that use %{name}.
%prep %prep
%setup -q -n glu-%{?gitdate:%{gitdate}}%{?!gitdate:%{version}} %setup -q -n glu-%{?gitdate:%{gitdate}}%{?!gitdate:%{version}}
%patch1 -p1
%patch2 -p1
%patch100 -p1
%build %build
autoreconf -v -i -f autoreconf -v -i -f
%configure --disable-static %configure --disable-static
%make_build
make %{?_smp_mflags} make %{?_smp_mflags}
%install %install
%make_install rm -rf $RPM_BUILD_ROOT
find $RPM_BUILD_ROOT -name '*.la' -delete make install DESTDIR=$RPM_BUILD_ROOT
find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
rm -rf $RPM_BUILD_ROOT%{_datadir}/man/man3/gl[A-Z]* rm -rf $RPM_BUILD_ROOT%{_datadir}/man/man3/gl[A-Z]*
%ldconfig_post %ldconfig_post
@ -58,30 +64,9 @@ rm -rf $RPM_BUILD_ROOT%{_datadir}/man/man3/gl[A-Z]*
%{_libdir}/pkgconfig/glu.pc %{_libdir}/pkgconfig/glu.pc
%changelog %changelog
* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 9.0.1-6 * Tue Nov 28 2023 Sergey Cherevko <s.cherevko@msvsphere-os.ru> - 9.0.0-15.inferit
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags - Added #include <stddef.h> in error.c for successful build
Related: rhbz#1991688 - Rebuilt for MSVSphere 8.8
* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 9.0.1-5
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 9.0.1-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 9.0.1-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 9.0.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Thu Jul 25 2019 Peter Robinson <pbrobinson@fedoraproject.org> 9.0.1-1
- libGLU 9.0.1
* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 9.0.0-17
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 9.0.0-16
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Fri Jun 29 2018 Adam Jackson <ajax@redhat.com> - 9.0.0-15 * Fri Jun 29 2018 Adam Jackson <ajax@redhat.com> - 9.0.0-15
- Use ldconfig scriptlet macros - Use ldconfig scriptlet macros

Loading…
Cancel
Save