Compare commits
No commits in common. "c10s" and "c8s" have entirely different histories.
3
.gitignore
vendored
3
.gitignore
vendored
@ -1 +1,2 @@
|
||||
/glu-9*.tar.xz
|
||||
SOURCES/glu-9.0.0.tar.bz2
|
||||
/glu-9.0.0.tar.bz2
|
||||
|
@ -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
|
||||
|
27
0001-libutil-Include-stddef.h-for-NULL.patch
Normal file
27
0001-libutil-Include-stddef.h-for-NULL.patch
Normal file
@ -0,0 +1,27 @@
|
||||
From b293e7e843cff28c4b925fb0db988395c040d0ef Mon Sep 17 00:00:00 2001
|
||||
From: Matt Turner <mattst88@gmail.com>
|
||||
Date: Tue, 23 Jul 2019 10:42:41 -0700
|
||||
Subject: [PATCH] libutil: Include stddef.h for NULL
|
||||
|
||||
Fixes: #5
|
||||
|
||||
Reviewed-by: Eric Engestrom <eric@engestrom.ch>
|
||||
---
|
||||
src/libutil/error.c | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/src/libutil/error.c b/src/libutil/error.c
|
||||
index 7212748..d3b2666 100644
|
||||
--- a/src/libutil/error.c
|
||||
+++ b/src/libutil/error.c
|
||||
@@ -30,6 +30,7 @@
|
||||
|
||||
#include "gluos.h"
|
||||
#include "gluint.h"
|
||||
+#include <stddef.h>
|
||||
#include <GL/glu.h>
|
||||
|
||||
|
||||
--
|
||||
2.45.2
|
||||
|
35
0002-Add-D-N-DEBUG-to-CFLAGS-dependent-on-enable-debug.patch
Normal file
35
0002-Add-D-N-DEBUG-to-CFLAGS-dependent-on-enable-debug.patch
Normal file
@ -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,6 +1,8 @@
|
||||
--- !Policy
|
||||
product_versions:
|
||||
- rhel-10
|
||||
- rhel-8
|
||||
decision_context: osci_compose_gate
|
||||
rules:
|
||||
- !PassingTestCaseRule {test_case_name: desktop-qe.desktop-ci.tier1-gating.functional}
|
||||
#- !PassingTestCaseRule {test_case_name: desktop-qe.desktop-ci.tier1-gating.functional}
|
||||
- !PassingTestCaseRule {test_case_name: manual.sst_graphics_infrastructure.mesa.sanity}
|
||||
|
||||
|
@ -1,17 +1,22 @@
|
||||
#define gitdate 20120904
|
||||
|
||||
Name: mesa-libGLU
|
||||
Version: 9.0.3
|
||||
Release: 7%{?dist}
|
||||
Version: 9.0.0
|
||||
Release: 15%{?dist}
|
||||
Summary: Mesa libGLU library
|
||||
|
||||
License: X11
|
||||
License: MIT
|
||||
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
|
||||
|
||||
BuildRequires: gcc-c++
|
||||
BuildRequires: libglvnd-devel
|
||||
Patch1: 0001-glu-initialize-PriorityQ-order-field-to-NULL-in-pqNe.patch
|
||||
Patch2: 0002-Add-D-N-DEBUG-to-CFLAGS-dependent-on-enable-debug.patch
|
||||
Patch3: 0001-libutil-Include-stddef.h-for-NULL.patch
|
||||
|
||||
BuildRequires: autoconf automake libtool
|
||||
BuildRequires: mesa-libGL-devel
|
||||
BuildRequires: meson
|
||||
#Requires:
|
||||
Provides: libGLU
|
||||
|
||||
%description
|
||||
@ -20,6 +25,7 @@ Mesa implementation of the standard GLU OpenGL utility API.
|
||||
%package devel
|
||||
Summary: Development files for %{name}
|
||||
Requires: %{name}%{?_isa} = %{version}-%{release}
|
||||
Requires: gl-manpages
|
||||
Provides: libGLU-devel
|
||||
|
||||
%description devel
|
||||
@ -27,17 +33,25 @@ The %{name}-devel package contains libraries and header files for
|
||||
developing applications that use %{name}.
|
||||
|
||||
%prep
|
||||
%autosetup -p1 -n glu-%{version}
|
||||
%setup -q -n glu-%{?gitdate:%{gitdate}}%{?!gitdate:%{version}}
|
||||
%patch1 -p1
|
||||
%patch2 -p1
|
||||
%patch3 -p1
|
||||
|
||||
%build
|
||||
%meson -Dgl_provider=glvnd
|
||||
%meson_build
|
||||
autoreconf -v -i -f
|
||||
%configure --disable-static
|
||||
make %{?_smp_mflags}
|
||||
|
||||
%install
|
||||
%meson_install
|
||||
find $RPM_BUILD_ROOT -name '*.a' -delete
|
||||
rm -rf $RPM_BUILD_ROOT
|
||||
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]*
|
||||
|
||||
%ldconfig_scriptlets
|
||||
%ldconfig_post
|
||||
|
||||
%ldconfig_postun
|
||||
|
||||
%files
|
||||
%{_libdir}/libGLU.so.1
|
||||
@ -49,63 +63,6 @@ find $RPM_BUILD_ROOT -name '*.a' -delete
|
||||
%{_libdir}/pkgconfig/glu.pc
|
||||
|
||||
%changelog
|
||||
* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 9.0.3-7
|
||||
- Bump release for October 2024 mass rebuild:
|
||||
Resolves: RHEL-64018
|
||||
|
||||
* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 9.0.3-6
|
||||
- Bump release for June 2024 mass rebuild
|
||||
|
||||
* Tue May 21 2024 José Expósito <jexposit@redhat.com> - 9.0.3-5
|
||||
- Rebuilt without gl-manpages
|
||||
|
||||
* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 9.0.3-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
|
||||
|
||||
* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 9.0.3-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
|
||||
|
||||
* Thu Sep 07 2023 José Expósito <jexposit@redhat.com> - 9.0.3-2
|
||||
- SPDX Migration
|
||||
|
||||
* Sun Jul 23 2023 Peter Robinson <pbrobinson@fedoraproject.org> - 9.0.3-1
|
||||
- Update to 9.0.3
|
||||
- Move to meson build
|
||||
- Set gl_provider to libglvnd
|
||||
|
||||
* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 9.0.1-9
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
|
||||
|
||||
* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 9.0.1-8
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
|
||||
|
||||
* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 9.0.1-7
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
|
||||
|
||||
* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 9.0.1-6
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
|
||||
|
||||
* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 9.0.1-5
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
|
||||
|
||||
* 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
|
||||
- Use ldconfig scriptlet macros
|
||||
|
||||
|
2
sources
2
sources
@ -1 +1 @@
|
||||
SHA512 (glu-9.0.3.tar.xz) = b2781059c0e176192c3fc0d7244645020937a463311171efddb9f35fb94ee43faabcf627fa7f429d48fceaf6dd9c5adb69c86c7a21ec4ea490f4ab143d52e3ba
|
||||
SHA512 (glu-9.0.0.tar.bz2) = ff920e3fbca739794e1432a92fdd8517aa732110fea71ed724185425042f83ce18e9866c16f95c6e10f6993f0814a90fac9636e2b3d8ca2084d1ac0a860f61c8
|
||||
|
Loading…
Reference in New Issue
Block a user