diff options
| author | Adam Jackson <ajax@fedoraproject.org> | 2009-11-17 20:08:38 +0000 |
|---|---|---|
| committer | Adam Jackson <ajax@fedoraproject.org> | 2009-11-17 20:08:38 +0000 |
| commit | d6b7a9c35175e7baaaacec8b352fe6d597592e45 (patch) | |
| tree | 49f340d154037d595e3bb9cc12732116b4023126 | |
| parent | 8ed92609dffa6d89eafae2a8a6602786f349c599 (diff) | |
| download | mesa-d6b7a9c35175e7baaaacec8b352fe6d597592e45.tar.gz mesa-d6b7a9c35175e7baaaacec8b352fe6d597592e45.tar.xz mesa-d6b7a9c35175e7baaaacec8b352fe6d597592e45.zip | |
- mesa-7.6-glx13-app-warning.patch: Make the glXCreatePixmap warning a bitmesa-7_6-0_15_fc12
more useful. (#529769)
| -rw-r--r-- | mesa-7.6-glx13-app-warning.patch | 28 | ||||
| -rw-r--r-- | mesa.spec | 8 |
2 files changed, 35 insertions, 1 deletions
diff --git a/mesa-7.6-glx13-app-warning.patch b/mesa-7.6-glx13-app-warning.patch new file mode 100644 index 0000000..c23bc0e --- /dev/null +++ b/mesa-7.6-glx13-app-warning.patch @@ -0,0 +1,28 @@ +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); + } + } + @@ -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 applications for testing Mesa. %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@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@redhat.com> 7.6-0.14 - update to git snapshot - makes gnome-shell on r600 work better |