Package init
This commit is contained in:
commit
79d02d8c14
@ -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
|
||||||
|
|
||||||
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
|
||||||
|
|
||||||
BIN
glu-9.0.0.tar.bz2
Normal file
BIN
glu-9.0.0.tar.bz2
Normal file
Binary file not shown.
22
make-git-snapshot.sh
Executable file
22
make-git-snapshot.sh
Executable file
@ -0,0 +1,22 @@
|
|||||||
|
#!/bin/sh
|
||||||
|
|
||||||
|
# Usage: ./make-git-snapshot.sh [COMMIT]
|
||||||
|
#
|
||||||
|
# to make a snapshot of the given tag/branch. Defaults to HEAD.
|
||||||
|
# Point env var REF to a local mesa repo to reduce clone time.
|
||||||
|
|
||||||
|
DIRNAME=glu-$( date +%Y%m%d )
|
||||||
|
|
||||||
|
echo REF ${REF:+--reference $REF}
|
||||||
|
echo DIRNAME $DIRNAME
|
||||||
|
echo HEAD ${1:-HEAD}
|
||||||
|
|
||||||
|
rm -rf $DIRNAME
|
||||||
|
|
||||||
|
git clone ${REF:+--reference $REF} \
|
||||||
|
git://git.freedesktop.org/git/mesa/glu $DIRNAME
|
||||||
|
|
||||||
|
GIT_DIR=$DIRNAME/.git git archive --format=tar --prefix=$DIRNAME/ ${1:-HEAD} \
|
||||||
|
| xz > $DIRNAME.tar.xz
|
||||||
|
|
||||||
|
# rm -rf $DIRNAME
|
||||||
65
mesa-libGLU.spec
Normal file
65
mesa-libGLU.spec
Normal file
@ -0,0 +1,65 @@
|
|||||||
|
Name: mesa-libGLU
|
||||||
|
Version: 9.0.0
|
||||||
|
Release: 19
|
||||||
|
Summary: Mesa libGLU library
|
||||||
|
License: MIT
|
||||||
|
URL: https://mesa3d.org/
|
||||||
|
Source0: https://mesa.freedesktop.org/archive/glu/glu-%{version}.tar.bz2
|
||||||
|
# source1 comes from fedora 29
|
||||||
|
Source1: make-git-snapshot.sh
|
||||||
|
|
||||||
|
# patch0-1 comes from fedora 29
|
||||||
|
Patch0: 0001-glu-initialize-PriorityQ-order-field-to-NULL-in-pqNe.patch
|
||||||
|
Patch1: 0002-Add-D-N-DEBUG-to-CFLAGS-dependent-on-enable-debug.patch
|
||||||
|
|
||||||
|
BuildRequires: autoconf automake gcc-c++ libtool mesa-libGL-devel
|
||||||
|
Provides: libGLU
|
||||||
|
|
||||||
|
%description
|
||||||
|
Mesa implementation of the standard GLU OpenGL utility API.
|
||||||
|
|
||||||
|
%package devel
|
||||||
|
Summary: Development package for %{name}
|
||||||
|
Requires: %{name}%{?_isa} = %{version}-%{release} gl-manpages
|
||||||
|
Provides: libGLU-devel
|
||||||
|
|
||||||
|
%description devel
|
||||||
|
The development package for %{name}.
|
||||||
|
|
||||||
|
%prep
|
||||||
|
%autosetup -n glu-%{version} -p1
|
||||||
|
|
||||||
|
%build
|
||||||
|
autoreconf -vif
|
||||||
|
%configure
|
||||||
|
%make_build
|
||||||
|
|
||||||
|
%install
|
||||||
|
%make_install
|
||||||
|
%delete_la
|
||||||
|
|
||||||
|
%ldconfig_scriptlets
|
||||||
|
|
||||||
|
%files
|
||||||
|
%{_libdir}/libGLU.so.*
|
||||||
|
|
||||||
|
%files devel
|
||||||
|
%{_includedir}/GL/glu*.h
|
||||||
|
%{_libdir}/{libGLU.so,libGLU.a}
|
||||||
|
%{_libdir}/pkgconfig/glu.pc
|
||||||
|
|
||||||
|
%changelog
|
||||||
|
* Fri Sep 13 2019 openEuler Buildteam <buildteam@openeuler.org> - 9.0.0-19
|
||||||
|
- Type: enhancement
|
||||||
|
- ID: NA
|
||||||
|
- SUG: NA
|
||||||
|
- DESC: Rebuilt spec.
|
||||||
|
|
||||||
|
* Thu Sep 05 2019 openEuler Buildteam <buildteam@openeuler.org> - 9.0.0-18
|
||||||
|
- Type: enhancement
|
||||||
|
- ID: NA
|
||||||
|
- SUG: NA
|
||||||
|
- DESC: Rebuilt spec.
|
||||||
|
|
||||||
|
* Mon Aug 12 2019 openEuler Buildteam <buildteam@openeuler.org> - 9.0.0-17
|
||||||
|
- Package init
|
||||||
Loading…
x
Reference in New Issue
Block a user