diff options
| author | Martin Müllenhaupt <mm@netlair.de> | 2014-08-25 12:17:33 (GMT) |
|---|---|---|
| committer | MXE <mxe@mxe.cc> | 2014-09-03 03:40:55 (GMT) |
| commit | 5459134799e06074560e4f7905db7ddcab818391 (patch) | |
| tree | 2aaec4791b822dc95e1278b7c0047e1a8c4e1929 /src | |
| parent | 9938f9bbfebd387b531ba93bb6eaac4248882d7d (diff) | |
| download | mxe-5459134799e06074560e4f7905db7ddcab818391.zip mxe-5459134799e06074560e4f7905db7ddcab818391.tar.gz mxe-5459134799e06074560e4f7905db7ddcab818391.tar.bz2 | |
package vtk6: update
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/vtk6-3-config-compiletools.patch | 9 | ||||
| -rw-r--r-- | src/vtk6.mk | 12 |
2 files changed, 5 insertions, 16 deletions
diff --git a/src/vtk6-3-config-compiletools.patch b/src/vtk6-3-config-compiletools.patch index 7e56e3a..f7afefc 100644 --- a/src/vtk6-3-config-compiletools.patch +++ b/src/vtk6-3-config-compiletools.patch @@ -20,15 +20,6 @@ See index.html for further information. DEPENDS vtksys EXCLUDE_FROM_WRAPPING ---- VTK6.0.0/Utilities/MaterialLibrary/module.cmake 2013-06-12 21:47:10.000000000 +0200 -+++ VTK6.0.0/Utilities/MaterialLibrary/module.cmake 2013-08-29 09:58:54.939480759 +0200 -@@ -1,4 +1,6 @@ - vtk_module(vtkUtilitiesMaterialLibrary -+ GROUPS -+ CompileTools - DEPENDS - vtksys - EXCLUDE_FROM_WRAPPING --- VTK6.0.0/Utilities/ParseOGLExt/module.cmake 2013-06-12 21:47:10.000000000 +0200 +++ VTK6.0.0/Utilities/ParseOGLExt/module.cmake 2013-08-29 09:58:54.939480759 +0200 @@ -1,4 +1,6 @@ diff --git a/src/vtk6.mk b/src/vtk6.mk index 3b9c581..69f6ac7 100644 --- a/src/vtk6.mk +++ b/src/vtk6.mk @@ -3,10 +3,10 @@ PKG := vtk6 $(PKG)_IGNORE := -$(PKG)_VERSION := 6.0.0 -$(PKG)_CHECKSUM := 51dd3b4a779d5442dd74375363f0f0c2d6eaf3fa -$(PKG)_SUBDIR := VTK$($(PKG)_VERSION) -$(PKG)_FILE := vtk-$($(PKG)_VERSION).tar.gz +$(PKG)_VERSION := 6.1.0 +$(PKG)_CHECKSUM := 91d1303558c7276f031f8ffeb47b4233f2fd2cd9 +$(PKG)_SUBDIR := VTK-$($(PKG)_VERSION) +$(PKG)_FILE := $($(PKG)_SUBDIR).tar.gz $(PKG)_URL := http://www.vtk.org/files/release/$(call SHORT_PKG_VERSION,$(PKG))/$($(PKG)_FILE) $(PKG)_DEPS := gcc hdf5 qt @@ -42,7 +42,7 @@ define $(PKG)_BUILD -C '$(1)/TryRunResults.cmake' \ -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \ -DVTKCompileTools_DIR='$(1).native_build' \ - -DBUILD_SHARED_LIBS=FALSE \ + -DBUILD_SHARED_LIBS=$(if $(BUILD_STATIC),FALSE,TRUE) \ -DModule_vtkGUISupportQt=TRUE \ -DModule_vtkGUISupportQtOpenGL=TRUE \ -DQT_QMAKE_EXECUTABLE=$(PREFIX)/$(TARGET)/qt/bin/qmake \ @@ -54,5 +54,3 @@ define $(PKG)_BUILD $(MAKE) -C '$(1).cross_build' -j '$(JOBS)' VERBOSE=1 || $(MAKE) -C '$(1).cross_build' -j 1 VERBOSE=1 $(MAKE) -C '$(1).cross_build' -j 1 install VERBOSE=1 endef - -$(PKG)_BUILD_SHARED = |