head	1.2;
access;
symbols;
locks; strict;
comment	@# @;


1.2
date	2011.12.21.08.02.57;	author beat;	state dead;
branches;
next	1.1;

1.1
date	2011.08.24.23.34.00;	author flo;	state Exp;
branches;
next	;


desc
@@


1.2
log
@- Update Firefox to 9.0

In collaboration with:	cognet, flo, Jan Beich
Approved by:		portmgr (erwin, implicit)
Security:		http://www.vuxml.org/freebsd/e3ff776b-2ba6-11e1-93c6-0011856a6e37.html
@
text
@--- 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<PFNGLXQUERYEXTENSION>(dlsym(libgl, "glXQueryExtension"));
 
+  typedef GLXFBConfig* (* PFNGLXQUERYVERSION) (Display *, int *, int *);
+  PFNGLXQUERYVERSION glXQueryVersion = cast<PFNGLXQUERYVERSION>(dlsym(libgl, "glXQueryVersion"));
+
   typedef GLXFBConfig* (* PFNGLXCHOOSEFBCONFIG) (Display *, int, const int *, int *);
   PFNGLXCHOOSEFBCONFIG glXChooseFBConfig = cast<PFNGLXCHOOSEFBCONFIG>(dlsym(libgl, "glXChooseFBConfig"));
 
@@@@ -139,6 +142,7 @@@@
   PFNGLGETSTRING glGetString = cast<PFNGLGETSTRING>(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);
 
@


1.1
log
@- commit remaining part of ports/159709 [1]
- register build conflict with spidermonkey until the firefox build failure
  can be fixed [2]

PR:		ports/159709 [1]
		ports/159831 [2]
Submitted by:	Ruslan Mahmatkhanov <cvs-src@@yandex.ru> [1]
@
text
@@

