diff options
| author | Martin Müllenhaupt <mm@netlair.de> | 2013-08-27 11:58:44 (GMT) |
|---|---|---|
| committer | Tony Theodore <tonyt@logyst.com> | 2014-02-17 03:32:52 (GMT) |
| commit | 0e04574296ab1bfa1fd978da2162dd0cb6321815 (patch) | |
| tree | 83ac700c285e43f541f1e18dfb4537944e751ec7 /src | |
| parent | 17863a04f636f4e24639995823b35befc213a96e (diff) | |
| download | mxe-0e04574296ab1bfa1fd978da2162dd0cb6321815.zip mxe-0e04574296ab1bfa1fd978da2162dd0cb6321815.tar.gz mxe-0e04574296ab1bfa1fd978da2162dd0cb6321815.tar.bz2 | |
package vtk: fix configure of native build for missing X11/OSMesa libraries
Diffstat (limited to 'src')
| -rw-r--r-- | src/vtk6-3-optional-osmesa.patch | 14 | ||||
| -rw-r--r-- | src/vtk6.mk | 4 |
2 files changed, 18 insertions, 0 deletions
diff --git a/src/vtk6-3-optional-osmesa.patch b/src/vtk6-3-optional-osmesa.patch new file mode 100644 index 0000000..37625b3 --- /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 4c1cf2f..174fae5 100644 --- a/src/vtk6.mk +++ b/src/vtk6.mk @@ -26,6 +26,10 @@ define $(PKG)_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 |