Commit f6f28d86 authored by kgriffin's avatar kgriffin

Merge from 2.9RC

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@25590 18c085ea-50e0-402c-830e-de6fd14e8384
parent c189ccd8
......@@ -169,6 +169,39 @@ EOF
return 0;
}
function apply_vtk_610_patch
{
patch -p0 << \EOF
diff -c Rendering/OpenGL/vtkXOpenGLRenderWindow.cxx.orig Rendering/OpenGL/vtkXOpenGLRenderWindow.cxx
*** Rendering/OpenGL/vtkXOpenGLRenderWindow.cxx.orig 2015-01-29 15:59:05.000000000 -0800
--- Rendering/OpenGL/vtkXOpenGLRenderWindow.cxx 2015-01-29 16:00:02.000000000 -0800
***************
*** 27,33 ****
// define GLX_GLXEXT_LEGACY to prevent glx.h to include glxext.h provided by
// the system
! //#define GLX_GLXEXT_LEGACY
#include "GL/glx.h"
#include "vtkgl.h"
--- 27,33 ----
// define GLX_GLXEXT_LEGACY to prevent glx.h to include glxext.h provided by
// the system
! #define GLX_GLXEXT_LEGACY
#include "GL/glx.h"
#include "vtkgl.h"
EOF
if [[ $? != 0 ]] ; then
warn "vtk6 patch failed."
return 1
fi
return 0;
}
function apply_vtk_patch
{
if [[ ${VTK_VERSION} == 6.0.0 ]] ; then
......@@ -182,6 +215,9 @@ function apply_vtk_patch
if [[ ${VTK_VERSION} == 6.1.0 ]] ; then
apply_vtk_600_patch
if [[ "$OPSYS" == "Linux" ]] ; then
apply_vtk_610_patch
fi
if [[ $? != 0 ]] ; then
return 1
fi
......
......@@ -16,7 +16,8 @@
#include <vtkUnsignedCharArray.h>
#ifdef __linux__
# include <GL/glx.h>
#define GLX_GLXEXT_LEGACY
#include <GL/glx.h>
#endif
// ****************************************************************************
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment