Merge branch 'master' of https://github.com/muellni/mxe into muellni-master

4 files changed, 20 insertions, 36 deletions

diff --git a/src/qt.mk b/src/qt.mk
index 9ff60bd..89ab27e 100644
--- a/src/qt.mk
+++ b/src/qt.mk
@@ -122,6 +122,9 @@ define $(PKG)_BUILD
 
     # setup cmake toolchain
     echo 'set(QT_QMAKE_EXECUTABLE $(PREFIX)/$(TARGET)/qt/bin/qmake)' > '$(CMAKE_TOOLCHAIN_DIR)/$(PKG).cmake'
+    # fix static linking errors of QtGui to missing lcms2 and lzma 
+    # introduced by poor libmng linking
+    echo 'set(MNG_LIBRARY mng lcms2 lzma)' >> '$(CMAKE_TOOLCHAIN_DIR)/$(PKG).cmake' 
 
 endef
 
diff --git a/src/vtk6-3-config-compiletools.patch b/src/vtk6-2-config-compiletools.patch
index f7afefc..253eb12 100644
--- a/src/vtk6-3-config-compiletools.patch
+++ b/src/vtk6-2-config-compiletools.patch
@@ -1,8 +1,8 @@
 This file is part of MXE.
 See index.html for further information.
 
---- VTK6.0.0/Utilities/EncodeString/module.cmake	2013-06-12 21:47:10.000000000 +0200
-+++ VTK6.0.0/Utilities/EncodeString/module.cmake	2013-08-29 10:06:51.327921851 +0200
+--- VTK6.3.0/Utilities/EncodeString/module.cmake	2013-06-12 21:47:10.000000000 +0200
++++ VTK6.3.0/Utilities/EncodeString/module.cmake	2013-08-29 10:06:51.327921851 +0200
 @@ -1,4 +1,7 @@
  vtk_module(vtkUtilitiesEncodeString
 +  GROUPS
@@ -11,8 +11,8 @@ See index.html for further information.
      vtksys
 +    vtkCommonCore
    EXCLUDE_FROM_WRAPPING)
---- VTK6.0.0/Utilities/HashSource/module.cmake	2013-06-12 21:47:10.000000000 +0200
-+++ VTK6.0.0/Utilities/HashSource/module.cmake	2013-08-29 09:58:48.055272752 +0200
+--- VTK6.3.0/Utilities/HashSource/module.cmake	2013-06-12 21:47:10.000000000 +0200
++++ VTK6.3.0/Utilities/HashSource/module.cmake	2013-08-29 09:58:48.055272752 +0200
 @@ -1,4 +1,6 @@
  vtk_module(vtkUtilitiesHashSource
 +  GROUPS
@@ -20,8 +20,8 @@ See index.html for further information.
    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
+--- VTK6.3.0/Utilities/ParseOGLExt/module.cmake	2013-06-12 21:47:10.000000000 +0200
++++ VTK6.3.0/Utilities/ParseOGLExt/module.cmake	2013-08-29 09:58:54.939480759 +0200
 @@ -1,4 +1,6 @@
  vtk_module(vtkParseOGLExt
 +  GROUPS
diff --git a/src/vtk6-2-mingw-w64.patch b/src/vtk6-2-mingw-w64.patch
deleted file mode 100644
index 864cdd8..0000000
--- a/src/vtk6-2-mingw-w64.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-This file is part of MXE.
-See index.html for further information.
-
-This patch has been taken from:
-http://vtk.org/Bug/print_bug_page.php?bug_id=11742
-
-diff -ur VTK6.0.0.rc3/IO/Video/vtkWin32VideoSource.cxx VTK6.0.0.rc3.new/IO/Video/vtkWin32VideoSource.cxx
---- VTK6.0.0.rc3/IO/Video/vtkWin32VideoSource.cxx	2013-06-13 05:47:10.000000000 +1000
-+++ VTK6.0.0.rc3.new/IO/Video/vtkWin32VideoSource.cxx	2013-06-22 16:06:01.000000000 +1000
-@@ -274,7 +274,7 @@
-     }
- 
-   // set the user data to 'this'
--  vtkSetWindowLong(this->Internal->ParentWnd,vtkGWL_USERDATA,(vtkLONG)this);
-+  vtkSetWindowLong(this->Internal->ParentWnd,vtkGWL_USERDATA,(intptr_t)this);
- 
-   // Create the capture window
-   this->Internal->CapWnd = capCreateCaptureWindow("Capture",
-@@ -339,7 +339,7 @@
-     }
- 
-   // set user data for callbacks
--  if (!capSetUserData(this->Internal->CapWnd,(long)this))
-+  if (!capSetUserData(this->Internal->CapWnd,(intptr_t)this))
-     {
-     vtkErrorMacro(<< "Initialize: couldn't set user data for callback"\
-                     << " (" << GetLastError() << ")");
-
diff --git a/src/vtk6.mk b/src/vtk6.mk
index 9bf1dd5..ba4c102 100644
--- a/src/vtk6.mk
+++ b/src/vtk6.mk
@@ -3,8 +3,8 @@
 
 PKG             := vtk6
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 6.1.0
-$(PKG)_CHECKSUM := bd7df10a479606d529a8b71f466c44a2bdd11fd534c62ce0aa44fad91883fa34
+$(PKG)_VERSION  := 6.3.0
+$(PKG)_CHECKSUM := 452efab1eedf6202f2d9a3362b5f69adfc44edda
 $(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)
@@ -45,6 +45,8 @@ define $(PKG)_BUILD
         -DBUILD_SHARED_LIBS=$(if $(BUILD_STATIC),FALSE,TRUE) \
         -DModule_vtkGUISupportQt=TRUE \
         -DModule_vtkGUISupportQtOpenGL=TRUE \
+        -DModule_vtkViewsQt=TRUE \
+        -DModule_vtkRenderingQt=TRUE \
         -DQT_QMAKE_EXECUTABLE=$(PREFIX)/$(TARGET)/qt/bin/qmake \
         -DVTK_USE_SYSTEM_HDF5=TRUE \
         -DBUILD_EXAMPLES=OFF \
@@ -53,4 +55,11 @@ define $(PKG)_BUILD
         '$(1)'
     $(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
+
+    #now build the GUI -> Qt -> SimpleView Example
+    mkdir '$(1).test'
+    cd '$(1).test' && cmake \
+        -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \
+        '$(1)/Examples/GUI/Qt/SimpleView'
+    $(MAKE) -C '$(1).test' -j '$(JOBS)' VERBOSE=1
 endef