From e51b0379aa76fb428282b65f09c1f56ccb476090 Mon Sep 17 00:00:00 2001
From: Tony Theodore <tonyt@logyst.com>
Date: Wed, 28 Aug 2013 20:23:28 +1000
Subject: [PATCH] Revert "package vtk6: fix for standalone native build without
 rendering"

This reverts commit b7a8dc442fb51e156827e26c03c52a99b09912ed.
---
 src/vtk6-3-fix-standalone.patch  | 25 -------------------------
 src/vtk6-3-optional-osmesa.patch | 14 ++++++++++++++
 src/vtk6.mk                      |  3 +++
 3 files changed, 17 insertions(+), 25 deletions(-)
 delete mode 100644 src/vtk6-3-fix-standalone.patch
 create mode 100644 src/vtk6-3-optional-osmesa.patch

diff --git a/src/vtk6-3-fix-standalone.patch b/src/vtk6-3-fix-standalone.patch
deleted file mode 100644
index 4fcc592c..00000000
--- a/src/vtk6-3-fix-standalone.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-# This file is part of MXE.
-# See index.html for further information.
-
-diff -ur VTK6.0.0/Charts/Core/module.cmake VTK6.0.0.new/Charts/Core/module.cmake
---- VTK6.0.0/Charts/Core/module.cmake	2013-06-13 05:47:10.000000000 +1000
-+++ VTK6.0.0.new/Charts/Core/module.cmake	2013-08-27 23:35:08.000000000 +1000
-@@ -1,6 +1,6 @@
- vtk_module(vtkChartsCore
-   GROUPS
--    StandAlone
-+    Rendering
-   DEPENDS
-     vtkCommonColor
-     vtkRenderingContext2D
-diff -ur VTK6.0.0/IO/Export/module.cmake VTK6.0.0.new/IO/Export/module.cmake
---- VTK6.0.0/IO/Export/module.cmake	2013-06-13 05:47:10.000000000 +1000
-+++ VTK6.0.0.new/IO/Export/module.cmake	2013-08-27 23:34:58.000000000 +1000
-@@ -1,6 +1,6 @@
- vtk_module(vtkIOExport
-   GROUPS
--    StandAlone
-+    Rendering
-   DEPENDS
-     vtkCommonCore
-     vtkRenderingContext2D
diff --git a/src/vtk6-3-optional-osmesa.patch b/src/vtk6-3-optional-osmesa.patch
new file mode 100644
index 00000000..37625b32
--- /dev/null
+++ b/src/vtk6-3-optional-osmesa.patch
@@ -0,0 +1,14 @@
+# This file is part of MXE.
+# See index.html for further information.
+
+--- VTK6.0.0/Rendering/OpenGL/CMakeLists.txt	2013-06-12 21:47:10.000000000 +0200
++++ VTK6.0.0/Rendering/OpenGL/CMakeLists.txt	2013-08-27 13:15:06.770690266 +0200
+@@ -29,7 +29,7 @@
+ if(VTK_USE_X OR VTK_USE_CARBON OR VTK_USE_COCOA OR WIN32)
+   set(VTK_USE_OSMESA FALSE)
+ else()
+-  set(VTK_USE_OSMESA TRUE)
++  option(VTK_USE_OSMESA "Use OSMesa for VTK render windows" ON)
+ endif()
+ 
+ # FIXME: The TDx support needs some refactoring before we can build it in a
diff --git a/src/vtk6.mk b/src/vtk6.mk
index 37769340..174fae57 100644
--- a/src/vtk6.mk
+++ b/src/vtk6.mk
@@ -25,8 +25,11 @@ 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 \
         '$(1)'
     $(MAKE) -C '$(1).native_build' -j '$(JOBS)' VERBOSE=1 vtkCompileTools