diff options
| author | Tony Theodore <tonyt@logyst.com> | 2013-08-27 12:36:45 (GMT) |
|---|---|---|
| committer | Tony Theodore <tonyt@logyst.com> | 2013-08-27 12:36:45 (GMT) |
| commit | af557d1009beaad4592bd7bd61a2c8ed2d2df477 (patch) | |
| tree | 6ed479bdea5f3146c3428a50c3bfbb3b988b4518 | |
| parent | 77f6c4415b2a58b958e2c3f5dfbbcef10266912a (diff) | |
| parent | a193c1b7ae97b0b3c1dcba10d8dbc806585c6e62 (diff) | |
| download | mxe-af557d1009beaad4592bd7bd61a2c8ed2d2df477.zip mxe-af557d1009beaad4592bd7bd61a2c8ed2d2df477.tar.gz mxe-af557d1009beaad4592bd7bd61a2c8ed2d2df477.tar.bz2 | |
Merge pull request #235 from sikoragmbh/vtk6-fix-native-conf
package vtk6: fix configure of native build for missing X11/OSMesa libraries
| -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 |