Compare commits

..

No commits in common. "a8" and "c8s" have entirely different histories.
a8 ... c8s

10 changed files with 40 additions and 29 deletions

1
.gitignore vendored
View File

@ -1 +1,2 @@
SOURCES/glu-9.0.0.tar.bz2 SOURCES/glu-9.0.0.tar.bz2
/glu-9.0.0.tar.bz2

View File

@ -1 +0,0 @@
c2814bbaf1e60e28a75ec80f4646047c0da742bd SOURCES/glu-9.0.0.tar.bz2

View 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

View File

@ -1,19 +0,0 @@
diff --git a/glu.pc.in b/glu.pc.in
index 939740d..8bb957a 100644
--- a/glu.pc.in
+++ b/glu.pc.in
@@ -9,3 +9,4 @@ Requires: @GLU_REQUIRES@
Version: @VERSION@
Libs: -L${libdir} -lGLU
Libs.private: -lm
+Cflags: -I${includedir}
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>

8
gating.yaml Normal file
View File

@ -0,0 +1,8 @@
--- !Policy
product_versions:
- rhel-8
decision_context: osci_compose_gate
rules:
#- !PassingTestCaseRule {test_case_name: desktop-qe.desktop-ci.tier1-gating.functional}
- !PassingTestCaseRule {test_case_name: manual.sst_graphics_infrastructure.mesa.sanity}

View File

@ -2,7 +2,7 @@
Name: mesa-libGLU Name: mesa-libGLU
Version: 9.0.0 Version: 9.0.0
Release: 15%{?dist}.alma Release: 15%{?dist}
Summary: Mesa libGLU library Summary: Mesa libGLU library
License: MIT License: MIT
@ -12,9 +12,7 @@ Source2: make-git-snapshot.sh
Patch1: 0001-glu-initialize-PriorityQ-order-field-to-NULL-in-pqNe.patch 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 Patch2: 0002-Add-D-N-DEBUG-to-CFLAGS-dependent-on-enable-debug.patch
Patch3: 0001-libutil-Include-stddef.h-for-NULL.patch
# Fixed in the 9.0.1 version
Patch9999: include_stddef.patch
BuildRequires: autoconf automake libtool BuildRequires: autoconf automake libtool
BuildRequires: mesa-libGL-devel BuildRequires: mesa-libGL-devel
@ -38,8 +36,7 @@ developing applications that use %{name}.
%setup -q -n glu-%{?gitdate:%{gitdate}}%{?!gitdate:%{version}} %setup -q -n glu-%{?gitdate:%{gitdate}}%{?!gitdate:%{version}}
%patch1 -p1 %patch1 -p1
%patch2 -p1 %patch2 -p1
%patch3 -p1
%patch9999 -p1
%build %build
autoreconf -v -i -f autoreconf -v -i -f
@ -66,9 +63,6 @@ rm -rf $RPM_BUILD_ROOT%{_datadir}/man/man3/gl[A-Z]*
%{_libdir}/pkgconfig/glu.pc %{_libdir}/pkgconfig/glu.pc
%changelog %changelog
* Tue Nov 02 2021 Eduard Abdullin <eabdullin@almalinux.org> - 9.0.0-15.alma
- Add patch: Include stddef.h for NULL
* 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

1
sources Normal file
View File

@ -0,0 +1 @@
SHA512 (glu-9.0.0.tar.bz2) = ff920e3fbca739794e1432a92fdd8517aa732110fea71ed724185425042f83ce18e9866c16f95c6e10f6993f0814a90fac9636e2b3d8ca2084d1ac0a860f61c8