d0s3t3ch
/
mxe
mirror of https://git.wownero.com/dsc/mxe.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

vtk6: update 6.1.0 --> 6.3.0

This commit is contained in:
Martin Müllenhaupt 2015-09-15 14:08:29 +02:00
parent 6dda14dd0b
commit 120e275753
3 changed files with 8 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/vtk6-3-config-compiletools.patch → src/vtk6-2-config-compiletools.patch
View File

@ -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

28
src/vtk6-2-mingw-w64.patch
View File

@ -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() << ")");

4
src/vtk6.mk
View File

@ -3,8 +3,8 @@
PKG := vtk6
$(PKG)_IGNORE :=
$(PKG)_VERSION := 6.1.0
$(PKG)_CHECKSUM := 91d1303558c7276f031f8ffeb47b4233f2fd2cd9
$(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)