rpms/mesa/F-12 mesa-7.6-glx13-app-warning.patch, NONE, 1.1 mesa.spec, 1.256, 1.257

[Adam Jackson]

Author: ajax

Update of /cvs/pkgs/rpms/mesa/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30895

Modified Files:
	mesa.spec 
Added Files:
	mesa-7.6-glx13-app-warning.patch 
Log Message:
* Tue Nov 17 2009 Adam Jackson <ajax at redhat.com> 7.6-0.15
- mesa-7.6-glx13-app-warning.patch: Make the glXCreatePixmap warning a bit
  more useful. (#529769)


mesa-7.6-glx13-app-warning.patch:
 glx_pbuffer.c |    9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

--- NEW FILE mesa-7.6-glx13-app-warning.patch ---
diff -up mesa-20091030/src/glx/x11/glx_pbuffer.c.jx mesa-20091030/src/glx/x11/glx_pbuffer.c
--- mesa-20091030/src/glx/x11/glx_pbuffer.c.jx	2009-10-29 21:12:50.000000000 -0400
+++ mesa-20091030/src/glx/x11/glx_pbuffer.c	2009-11-17 14:56:07.000000000 -0500
@@ -35,6 +35,8 @@
 #include <X11/extensions/Xext.h>
 #include <assert.h>
 #include <string.h>
+#include <unistd.h>
+#include <limits.h>
 #include "glapi.h"
 #include "glxextensions.h"
 #include "glcontextmodes.h"
@@ -56,10 +58,13 @@ warn_GLX_1_3(Display *dpy, const char *f
    __GLXdisplayPrivate *priv = __glXInitialize(dpy);
 
    if (priv->minorVersion < 3) {
+      char buf[PATH_MAX];
+      if (readlink("/proc/self/exe", buf, PATH_MAX) == -1)
+	  buf[0] = '\0';
       fprintf(stderr, 
-	      "WARNING: Application calling GLX 1.3 function \"%s\" "
+	      "WARNING: Application %s calling GLX 1.3 function \"%s\" "
 	      "when GLX 1.3 is not supported!  This is an application bug!\n",
-	      function_name);
+	      buf, function_name);
    }
 }
 


Index: mesa.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mesa/F-12/mesa.spec,v
retrieving revision 1.256
retrieving revision 1.257
diff -u -p -r1.256 -r1.257
--- mesa.spec	4 Nov 2009 22:41:45 -0000	1.256
+++ mesa.spec	17 Nov 2009 20:08:38 -0000	1.257
@@ -21,7 +21,7 @@
 Summary: Mesa graphics libraries
 Name: mesa
 Version: 7.6
-Release: 0.14%{?dist}
+Release: 0.15%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.mesa3d.org
@@ -48,6 +48,7 @@ Patch10: r600-fix-tfp.patch
 Patch13: mesa-7.5-sparc64.patch
 
 Patch30: mesa-7.6-hush-vblank-warning.patch
+Patch31: mesa-7.6-glx13-app-warning.patch
 
 BuildRequires: pkgconfig autoconf automake
 %if %{with_hardware}
@@ -181,6 +182,7 @@ This package provides some demo applicat
 %patch10 -p1 -b .r600_tfp
 %patch13 -p1 -b .sparc64
 %patch30 -p1 -b .vblank-warning
+%patch31 -p1 -b .glx13-warning
 
 # Hack the demos to use installed data files
 sed -i 's,../images,%{_libdir}/mesa,' progs/demos/*.c
@@ -387,6 +389,10 @@ rm -rf $RPM_BUILD_ROOT
 %{demodir}
 
 %changelog
+* Tue Nov 17 2009 Adam Jackson <ajax at redhat.com> 7.6-0.15
+- mesa-7.6-glx13-app-warning.patch: Make the glXCreatePixmap warning a bit
+  more useful. (#529769)
+
 * Thu Nov 05 2009 Dave Airlie <airlied at redhat.com> 7.6-0.14
 - update to git snapshot - makes gnome-shell on r600 work better