[mesa-libGLU] Sync with git (#1011823)

Adam Jackson ajax at fedoraproject.org
Mon Dec 9 16:25:24 UTC 2013


commit 2b34d369743d03337d84f4c72f226ead0e716ac8
Author: Adam Jackson <ajax at redhat.com>
Date:   Mon Dec 9 11:25:25 2013 -0500

    Sync with git (#1011823)

 ...ize-PriorityQ-order-field-to-NULL-in-pqNe.patch |   33 ++++++++++++++++++
 ...DEBUG-to-CFLAGS-dependent-on-enable-debug.patch |   35 ++++++++++++++++++++
 mesa-libGLU.spec                                   |   10 +++++-
 3 files changed, 77 insertions(+), 1 deletions(-)
---
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 <mike.gorchak.qnx at 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 at 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
+
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 <mattst88 at 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 at 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
+
diff --git a/mesa-libGLU.spec b/mesa-libGLU.spec
index 5738c41..e3ae103 100644
--- a/mesa-libGLU.spec
+++ b/mesa-libGLU.spec
@@ -2,7 +2,7 @@
 
 Name:           mesa-libGLU
 Version:        9.0.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Mesa libGLU library
 
 License:        MIT
@@ -10,6 +10,9 @@ URL:            http://mesa3d.org/
 Source0:        ftp://ftp.freedesktop.org/pub/mesa/glu/glu-%{version}.tar.bz2
 Source2:        make-git-snapshot.sh
 
+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
+
 %if 0%{?gitdate}
 BuildRequires:  autoconf automake libtool
 %endif
@@ -32,6 +35,8 @@ developing applications that use %{name}.
 
 %prep
 %setup -q -n glu-%{?gitdate:%{gitdate}}%{?!gitdate:%{version}}
+%patch1 -p1
+%patch2 -p1
 
 %build
 %if 0%{?gitdate}
@@ -60,6 +65,9 @@ rm -rf $RPM_BUILD_ROOT%{_datadir}/man/man3/gl[A-Z]*
 %{_libdir}/pkgconfig/glu.pc
 
 %changelog
+* Mon Dec 09 2013 Adam Jackson <ajax at redhat.com> 9.0.0-4
+- Sync with git (#1011823)
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 9.0.0-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 


More information about the scm-commits mailing list