From 91677839a26a2f7f7fbd3cf61e91e2983492b226 Mon Sep 17 00:00:00 2001 From: cvs2svn Date: Tue, 27 Dec 2011 22:11:01 +0000 Subject: This commit was manufactured by cvs2svn to create tag 'RELEASE_9_0_0'. --- www/firefox/files/patch-bugzilla-659932 | 35 --------------------------------- 1 file changed, 35 deletions(-) delete mode 100644 www/firefox/files/patch-bugzilla-659932 (limited to 'www/firefox/files/patch-bugzilla-659932') diff --git a/www/firefox/files/patch-bugzilla-659932 b/www/firefox/files/patch-bugzilla-659932 deleted file mode 100644 index d0698cb253c5..000000000000 --- a/www/firefox/files/patch-bugzilla-659932 +++ /dev/null @@ -1,35 +0,0 @@ ---- toolkit/xre/glxtest.cpp.orig 2011-08-11 17:41:31.000000000 -0400 -+++ toolkit/xre/glxtest.cpp 2011-08-23 15:09:48.000000000 -0400 -@@ -114,6 +114,9 @@ - typedef GLXFBConfig* (* PFNGLXQUERYEXTENSION) (Display *, int *, int *); - PFNGLXQUERYEXTENSION glXQueryExtension = cast(dlsym(libgl, "glXQueryExtension")); - -+ typedef GLXFBConfig* (* PFNGLXQUERYVERSION) (Display *, int *, int *); -+ PFNGLXQUERYVERSION glXQueryVersion = cast(dlsym(libgl, "glXQueryVersion")); -+ - typedef GLXFBConfig* (* PFNGLXCHOOSEFBCONFIG) (Display *, int, const int *, int *); - PFNGLXCHOOSEFBCONFIG glXChooseFBConfig = cast(dlsym(libgl, "glXChooseFBConfig")); - -@@ -139,6 +142,7 @@ - PFNGLGETSTRING glGetString = cast(dlsym(libgl, "glGetString")); - - if (!glXQueryExtension || -+ !glXQueryVersion || - !glXChooseFBConfig || - !glXGetVisualFromFBConfig || - !glXCreatePixmap || -@@ -158,6 +162,14 @@ - ///// Check that the GLX extension is present ///// - if (!glXQueryExtension(dpy, NULL, NULL)) - fatal_error("GLX extension missing"); -+ -+ ///// Check that the GLX version is >= 1.3, needed for glXCreatePixmap, bug 659932 ///// -+ int majorVersion, minorVersion; -+ if (!glXQueryVersion(dpy, &majorVersion, &minorVersion)) -+ fatal_error("Unable to query GLX version"); -+ -+ if (majorVersion < 1 || (majorVersion == 1 && minorVersion < 3)) -+ fatal_error("GLX version older than the required 1.3"); - - XSetErrorHandler(x_error_handler); - -- cgit v1.2.3