commit 79d02d8c14056771ee724fb5c989d75d39a024d9 Author: overweight <5324761+overweight@user.noreply.gitee.com> Date: Mon Sep 30 11:04:35 2019 -0400 Package init diff --git a/0001-glu-initialize-PriorityQ-order-field-to-NULL-in-pqNe.patch b/0001-glu-initialize-PriorityQ-order-field-to-NULL-in-pqNe.patch new file mode 100644 index 0000000..aa43a7f --- /dev/null +++ b/0001-glu-initialize-PriorityQ-order-field-to-NULL-in-pqNe.patch @@ -0,0 +1,33 @@ +From bfdf99d6ff64b9c2d840e8a5767eaa57e4363c79 Mon Sep 17 00:00:00 2001 +From: Mike Gorchak +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 +--- + 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 + diff --git a/0002-Add-D-N-DEBUG-to-CFLAGS-dependent-on-enable-debug.patch b/0002-Add-D-N-DEBUG-to-CFLAGS-dependent-on-enable-debug.patch new file mode 100644 index 0000000..0c73f39 --- /dev/null +++ b/0002-Add-D-N-DEBUG-to-CFLAGS-dependent-on-enable-debug.patch @@ -0,0 +1,35 @@ +From 069211570c32a8d5848e127975a2943e9d8fc6b9 Mon Sep 17 00:00:00 2001 +From: Matt Turner +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 +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 + diff --git a/glu-9.0.0.tar.bz2 b/glu-9.0.0.tar.bz2 new file mode 100644 index 0000000..d22d15c Binary files /dev/null and b/glu-9.0.0.tar.bz2 differ diff --git a/make-git-snapshot.sh b/make-git-snapshot.sh new file mode 100755 index 0000000..bfdfc6f --- /dev/null +++ b/make-git-snapshot.sh @@ -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 diff --git a/mesa-libGLU.spec b/mesa-libGLU.spec new file mode 100644 index 0000000..efac645 --- /dev/null +++ b/mesa-libGLU.spec @@ -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 - 9.0.0-19 +- Type: enhancement +- ID: NA +- SUG: NA +- DESC: Rebuilt spec. + +* Thu Sep 05 2019 openEuler Buildteam - 9.0.0-18 +- Type: enhancement +- ID: NA +- SUG: NA +- DESC: Rebuilt spec. + +* Mon Aug 12 2019 openEuler Buildteam - 9.0.0-17 +- Package init