From 901d2a987b471fbeb13531a5b4021fa717496a58 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20M=C3=BCllenhaupt?= <mm@netlair.de>
Date: Wed, 28 Aug 2013 14:15:46 +0200
Subject: package vtk6: drop native OpenGL dependency

---
 src/vtk6-3-optional-osmesa.patch | 33 +++++++++++++++++++++++++++++++++
 src/vtk6.mk                      |  4 +---
 2 files changed, 34 insertions(+), 3 deletions(-)

diff --git a/src/vtk6-3-optional-osmesa.patch b/src/vtk6-3-optional-osmesa.patch
index 37625b3..3767f3d 100644
--- a/src/vtk6-3-optional-osmesa.patch
+++ b/src/vtk6-3-optional-osmesa.patch
@@ -12,3 +12,36 @@
  endif()
  
  # FIXME: The TDx support needs some refactoring before we can build it in a
+@@ -136,7 +136,7 @@
+ 
+ if(VTK_USE_OSMESA)
+   find_package(OpenGL)
+-else()
++elseif(VTK_USE_X)
+   find_package(OpenGL REQUIRED)
+ endif()
+ 
+--- VTK6.0.0/ThirdParty/gl2ps/vtkgl2ps/CMakeLists.txt	2013-06-12 21:47:10.000000000 +0200
++++ VTK6.0.0/ThirdParty/gl2ps/vtkgl2ps/CMakeLists.txt	2013-08-28 13:45:16.297181334 +0200
+@@ -4,16 +4,16 @@
+ include_regular_expression(".*")
+ 
+ # Depend on OpenGL
+-if(NOT VTK_OPENGL_HAS_OSMESA)
+-  find_package(OpenGL REQUIRED)
+-  set(GL2PS_GL_LIBRARIES ${OPENGL_LIBRARIES})
+-  set(GL2PS_GL_INCLUDE_DIR ${OPENGL_INCLUDE_DIR})
+-else()
++if(VTK_OPENGL_HAS_OSMESA)
+   set(GL2PS_GL_LIBRARIES ${OSMESA_LIBRARY})
+   set(GL2PS_GL_INCLUDE_DIR ${OSMESA_INCLUDE_DIR})
+   if(OPENGL_gl_LIBRARY)
+     list(APPEND GL2PS_GL_LIBRARIES ${OPENGL_gl_LIBRARY})
+   endif()
++elseif(VTK_USE_X)
++  find_package(OpenGL REQUIRED)
++  set(GL2PS_GL_LIBRARIES ${OPENGL_LIBRARIES})
++  set(GL2PS_GL_INCLUDE_DIR ${OPENGL_INCLUDE_DIR})
+ endif()
+ 
+ # Need math on UNIX
diff --git a/src/vtk6.mk b/src/vtk6.mk
index 174fae5..e1ff011 100644
--- a/src/vtk6.mk
+++ b/src/vtk6.mk
@@ -25,11 +25,9 @@ define $(PKG)_BUILD
     mkdir '$(1).native_build'
     cd '$(1).native_build' && cmake \
         -DBUILD_TESTING=FALSE \
-        -DVTK_USE_RENDERING=FALSE \
         -DVTK_USE_X=FALSE \
-        -DVTK_Group_Rendering=FALSE \
-        -DCMAKE_BUILD_TYPE="Release" \
         -DVTK_USE_OSMESA=FALSE \
+        -DCMAKE_BUILD_TYPE="Release" \
         '$(1)'
     $(MAKE) -C '$(1).native_build' -j '$(JOBS)' VERBOSE=1 vtkCompileTools
 
-- 
cgit v0.12