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

package vtk6: fixes for OSX, whitespace, external hdf5, and mingw-w64

This commit is contained in:
Tony Theodore 2013-06-23 00:00:53 +10:00
parent eb31637d17
commit feec65f32d
3 changed files with 64 additions and 98 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

89
src/vtk6-1-tryrun.patch
View File

@ -3,7 +3,7 @@
--- blubb 1970-01-01 01:00:00.000000000 +0100
+++ VTK/TryRunResults.cmake 2011-09-27 08:44:04.563613261 +0200
@@ -0,0 +1,97 @@
@@ -0,0 +1,30 @@
+SET( VTK_TYPE_CHAR_IS_SIGNED
+ "1"
+ CACHE STRING "Result from TRY_RUN" FORCE)
@ -17,87 +17,20 @@
+SET( KWSYS_CHAR_IS_SIGNED__TRYRUN_OUTPUT
+ ""
+ CACHE STRING "Output from TRY_RUN" FORCE)
+SET( HDF5_PRINTF_LL_TEST_RUN
+ "0"
+ CACHE STRING "Result from TRY_RUN" FORCE)
+
+SET( HDF5_PRINTF_LL_TEST_RUN__TRYRUN_OUTPUT
+ "PRINTF_LL_WIDTH=[ll]"
+ CACHE STRING "Output from TRY_RUN" FORCE)
+SET( H5_LDOUBLE_TO_INTEGER_WORKS_RUN
+ "0"
+ CACHE STRING "Result from TRY_RUN" FORCE)
+
+SET( H5_LDOUBLE_TO_INTEGER_WORKS_RUN__TRYRUN_OUTPUT
+SET( CMAKE_REQUIRE_LARGE_FILE_SUPPORT
+ ""
+ CACHE STRING "Output from TRY_RUN" FORCE)
+SET( H5_ULONG_TO_FLOAT_ACCURATE_RUN
+ "0"
+ CACHE STRING "Result from TRY_RUN" FORCE)
+
+SET( H5_ULONG_TO_FLOAT_ACCURATE_RUN__TRYRUN_OUTPUT
+ ""
+ CACHE STRING "Output from TRY_RUN" FORCE)
+SET( H5_ULONG_TO_FP_BOTTOM_BIT_ACCURATE_RUN
+ "1"
+ CACHE STRING "Result from TRY_RUN" FORCE)
+
+SET( H5_ULONG_TO_FP_BOTTOM_BIT_ACCURATE_RUN__TRYRUN_OUTPUT
+ ""
+ CACHE STRING "Output from TRY_RUN" FORCE)
+SET( H5_FP_TO_ULLONG_ACCURATE_RUN
+ "0"
+ CACHE STRING "Result from TRY_RUN" FORCE)
+
+SET( H5_FP_TO_ULLONG_ACCURATE_RUN__TRYRUN_OUTPUT
+ ""
+ CACHE STRING "Output from TRY_RUN" FORCE)
+SET( H5_FP_TO_ULLONG_RIGHT_MAXIMUM_RUN
+ "0"
+ CACHE STRING "Result from TRY_RUN" FORCE)
+
+SET( H5_FP_TO_ULLONG_RIGHT_MAXIMUM_RUN__TRYRUN_OUTPUT
+ ""
+ CACHE STRING "Output from TRY_RUN" FORCE)
+SET( H5_LDOUBLE_TO_UINT_ACCURATE_RUN
+ "0"
+ CACHE STRING "Result from TRY_RUN" FORCE)
+
+SET( H5_LDOUBLE_TO_UINT_ACCURATE_RUN__TRYRUN_OUTPUT
+ ""
+ CACHE STRING "Output from TRY_RUN" FORCE)
+SET( H5_ULLONG_TO_LDOUBLE_PRECISION_RUN
+ "0"
+ CACHE STRING "Result from TRY_RUN" FORCE)
+
+SET( H5_ULLONG_TO_LDOUBLE_PRECISION_RUN__TRYRUN_OUTPUT
+ ""
+ CACHE STRING "Output from TRY_RUN" FORCE)
+SET( H5_FP_TO_INTEGER_OVERFLOW_WORKS_RUN
+ "0"
+ CACHE STRING "Result from TRY_RUN" FORCE)
+
+SET( H5_FP_TO_INTEGER_OVERFLOW_WORKS_RUN__TRYRUN_OUTPUT
+ ""
+ CACHE STRING "Output from TRY_RUN" FORCE)
+SET( H5_LDOUBLE_TO_LLONG_ACCURATE_RUN
+ "0"
+ CACHE STRING "Result from TRY_RUN" FORCE)
+
+SET( H5_LDOUBLE_TO_LLONG_ACCURATE_RUN__TRYRUN_OUTPUT
+ ""
+ CACHE STRING "Output from TRY_RUN" FORCE)
+SET( H5_LLONG_TO_LDOUBLE_CORRECT_RUN
+ "0"
+ CACHE STRING "Result from TRY_RUN" FORCE)
+
+SET( H5_LLONG_TO_LDOUBLE_CORRECT_RUN__TRYRUN_OUTPUT
+ ""
+ CACHE STRING "Output from TRY_RUN" FORCE)
+SET( H5_NO_ALIGNMENT_RESTRICTIONS_RUN
+ "0"
+ CACHE STRING "Result from TRY_RUN" FORCE)
+SET( H5_NO_ALIGNMENT_RESTRICTIONS_RUN__TRYRUN_OUTPUT
+SET( CMAKE_REQUIRE_LARGE_FILE_SUPPORT__TRYRUN_OUTPUT
+ ""
+ CACHE STRING "Output from TRY_RUN" FORCE)
+
+SET( KWSYS_LFS_WORKS
+ "0"
+ CACHE STRING "Result from TRY_RUN" FORCE)
+
+SET( KWSYS_LFS_WORKS__TRYRUN_OUTPUT
+ ""
+ CACHE STRING "Output from TRY_RUN" FORCE)
+

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

@ -0,0 +1,28 @@
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() << ")");

45
src/vtk6.mk
View File

@ -7,35 +7,40 @@ $(PKG)_CHECKSUM := 6d62715dee16d34d7d9bd9a3edc4d32a39d7c2d0
$(PKG)_SUBDIR := VTK$($(PKG)_VERSION)
$(PKG)_FILE := vtk-$($(PKG)_VERSION).tar.gz
$(PKG)_URL := http://www.vtk.org/files/release/$(call SHORT_PKG_VERSION,$(PKG))/$($(PKG)_FILE)
$(PKG)_DEPS := gcc qt
$(PKG)_DEPS := gcc hdf5 qt
define $(PKG)_UPDATE
echo 'TODO: Updates for package vtk6 need to be written.' >&2;
echo $(vtk6_VERSION)
endef
define $(PKG)_BUILD
# first we need a native build to create the compile tools
mkdir '$(1)/native_build'
cd '$(1)/native_build' && cmake \
mkdir '$(1).native_build'
cd '$(1).native_build' && cmake \
-DBUILD_TESTING=FALSE \
-DVTK_USE_RENDERING=FALSE \
..
$(MAKE) -C '$(1)/native_build' -j '$(JOBS)' VERBOSE=1 vtkCompileTools
'$(1)'
$(MAKE) -C '$(1).native_build' -j '$(JOBS)' VERBOSE=1 vtkCompileTools
# DirectX is detected on Mac OSX but we use OpenGL
$(SED) -i 's,d3d9,nod3d9,g' '$(1)/CMake/FindDirectX.cmake'
# now the cross compilation
mkdir '$(1)/cross_build'
cd '$(1)/cross_build' && cmake \
-C '$(1)/TryRunResults.cmake'\
-DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)'\
-DVTKCompileTools_DIR='$(1)/native_build'\
-DBUILD_SHARED_LIBS=FALSE\
-DModule_vtkGUISupportQt=TRUE\
-DModule_vtkGUISupportQtOpenGL=TRUE\
-DQT_QMAKE_EXECUTABLE=$(PREFIX)/$(TARGET)/qt/bin/qmake\
-DBUILD_EXAMPLES=FALSE\
-DCMAKE_VERBOSE_MAKEFILE=TRUE\
-DBUILD_TESTING=FALSE\
..
$(MAKE) -C '$(1)/cross_build' -j '$(JOBS)' install VERBOSE=1
mkdir '$(1).cross_build'
cd '$(1).cross_build' && cmake \
-C '$(1)/TryRunResults.cmake' \
-DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \
-DVTKCompileTools_DIR='$(1).native_build' \
-DBUILD_SHARED_LIBS=FALSE \
-DModule_vtkGUISupportQt=TRUE \
-DModule_vtkGUISupportQtOpenGL=TRUE \
-DQT_QMAKE_EXECUTABLE=$(PREFIX)/$(TARGET)/qt/bin/qmake \
-DVTK_USE_SYSTEM_HDF5=TRUE \
-DBUILD_EXAMPLES=OFF \
-DCMAKE_VERBOSE_MAKEFILE=TRUE \
-DBUILD_TESTING=FALSE \
'$(1)'
$(MAKE) -C '$(1).cross_build' -j '$(JOBS)' install VERBOSE=1
endef