From 0e04574296ab1bfa1fd978da2162dd0cb6321815 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20M=C3=BCllenhaupt?= Date: Tue, 27 Aug 2013 13:58:44 +0200 Subject: [PATCH 1/8] package vtk: fix configure of native build for missing X11/OSMesa libraries --- src/vtk6-3-optional-osmesa.patch | 14 ++++++++++++++ src/vtk6.mk | 4 ++++ 2 files changed, 18 insertions(+) create mode 100644 src/vtk6-3-optional-osmesa.patch diff --git a/src/vtk6-3-optional-osmesa.patch b/src/vtk6-3-optional-osmesa.patch new file mode 100644 index 00000000..37625b32 --- /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 4c1cf2f6..174fae57 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 From 7fb1541606f62b552f912e369aa0489b246b629c Mon Sep 17 00:00:00 2001 From: Tony Theodore Date: Tue, 27 Aug 2013 23:47:22 +1000 Subject: [PATCH 2/8] package vtk6: fix for standalone native build without rendering --- src/vtk6-3-fix-standalone.patch | 25 +++++++++++++++++++++++++ src/vtk6-3-optional-osmesa.patch | 14 -------------- src/vtk6.mk | 3 --- 3 files changed, 25 insertions(+), 17 deletions(-) create mode 100644 src/vtk6-3-fix-standalone.patch delete mode 100644 src/vtk6-3-optional-osmesa.patch diff --git a/src/vtk6-3-fix-standalone.patch b/src/vtk6-3-fix-standalone.patch new file mode 100644 index 00000000..4fcc592c --- /dev/null +++ b/src/vtk6-3-fix-standalone.patch @@ -0,0 +1,25 @@ +# This file is part of MXE. +# See index.html for further information. + +diff -ur VTK6.0.0/Charts/Core/module.cmake VTK6.0.0.new/Charts/Core/module.cmake +--- VTK6.0.0/Charts/Core/module.cmake 2013-06-13 05:47:10.000000000 +1000 ++++ VTK6.0.0.new/Charts/Core/module.cmake 2013-08-27 23:35:08.000000000 +1000 +@@ -1,6 +1,6 @@ + vtk_module(vtkChartsCore + GROUPS +- StandAlone ++ Rendering + DEPENDS + vtkCommonColor + vtkRenderingContext2D +diff -ur VTK6.0.0/IO/Export/module.cmake VTK6.0.0.new/IO/Export/module.cmake +--- VTK6.0.0/IO/Export/module.cmake 2013-06-13 05:47:10.000000000 +1000 ++++ VTK6.0.0.new/IO/Export/module.cmake 2013-08-27 23:34:58.000000000 +1000 +@@ -1,6 +1,6 @@ + vtk_module(vtkIOExport + GROUPS +- StandAlone ++ Rendering + DEPENDS + vtkCommonCore + vtkRenderingContext2D diff --git a/src/vtk6-3-optional-osmesa.patch b/src/vtk6-3-optional-osmesa.patch deleted file mode 100644 index 37625b32..00000000 --- a/src/vtk6-3-optional-osmesa.patch +++ /dev/null @@ -1,14 +0,0 @@ -# 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 174fae57..37769340 100644 --- a/src/vtk6.mk +++ b/src/vtk6.mk @@ -25,11 +25,8 @@ define $(PKG)_BUILD mkdir '$(1).native_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 From ada330375a31709a15c629fecc25298286879a95 Mon Sep 17 00:00:00 2001 From: Tony Theodore Date: Wed, 28 Aug 2013 00:15:15 +1000 Subject: [PATCH 3/8] package vtk6: reverse standalone patch for cross build --- src/vtk6.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/vtk6.mk b/src/vtk6.mk index 37769340..9100ec7e 100644 --- a/src/vtk6.mk +++ b/src/vtk6.mk @@ -33,6 +33,9 @@ define $(PKG)_BUILD # DirectX is detected on Mac OSX but we use OpenGL $(SED) -i 's,d3d9,nod3d9,g' '$(1)/CMake/FindDirectX.cmake' + # reverse the fix-standalone patch as it upsets the cross build + cd '$(1)' && patch -p1 -u -R < '$(PWD)/src/vtk6-3-fix-standalone.patch' + # now the cross compilation mkdir '$(1).cross_build' cd '$(1).cross_build' && cmake \ From bc5347fb69fe2205af0c85ecef4abce13ca8cda4 Mon Sep 17 00:00:00 2001 From: Tony Theodore Date: Wed, 28 Aug 2013 20:23:06 +1000 Subject: [PATCH 4/8] Revert "package vtk6: reverse standalone patch for cross build" This reverts commit 76a176ba178d72440fb6504bcf89f5129a7808ed. --- src/vtk6.mk | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/vtk6.mk b/src/vtk6.mk index 9100ec7e..37769340 100644 --- a/src/vtk6.mk +++ b/src/vtk6.mk @@ -33,9 +33,6 @@ define $(PKG)_BUILD # DirectX is detected on Mac OSX but we use OpenGL $(SED) -i 's,d3d9,nod3d9,g' '$(1)/CMake/FindDirectX.cmake' - # reverse the fix-standalone patch as it upsets the cross build - cd '$(1)' && patch -p1 -u -R < '$(PWD)/src/vtk6-3-fix-standalone.patch' - # now the cross compilation mkdir '$(1).cross_build' cd '$(1).cross_build' && cmake \ From e51b0379aa76fb428282b65f09c1f56ccb476090 Mon Sep 17 00:00:00 2001 From: Tony Theodore Date: Wed, 28 Aug 2013 20:23:28 +1000 Subject: [PATCH 5/8] Revert "package vtk6: fix for standalone native build without rendering" This reverts commit b7a8dc442fb51e156827e26c03c52a99b09912ed. --- src/vtk6-3-fix-standalone.patch | 25 ------------------------- src/vtk6-3-optional-osmesa.patch | 14 ++++++++++++++ src/vtk6.mk | 3 +++ 3 files changed, 17 insertions(+), 25 deletions(-) delete mode 100644 src/vtk6-3-fix-standalone.patch create mode 100644 src/vtk6-3-optional-osmesa.patch diff --git a/src/vtk6-3-fix-standalone.patch b/src/vtk6-3-fix-standalone.patch deleted file mode 100644 index 4fcc592c..00000000 --- a/src/vtk6-3-fix-standalone.patch +++ /dev/null @@ -1,25 +0,0 @@ -# This file is part of MXE. -# See index.html for further information. - -diff -ur VTK6.0.0/Charts/Core/module.cmake VTK6.0.0.new/Charts/Core/module.cmake ---- VTK6.0.0/Charts/Core/module.cmake 2013-06-13 05:47:10.000000000 +1000 -+++ VTK6.0.0.new/Charts/Core/module.cmake 2013-08-27 23:35:08.000000000 +1000 -@@ -1,6 +1,6 @@ - vtk_module(vtkChartsCore - GROUPS -- StandAlone -+ Rendering - DEPENDS - vtkCommonColor - vtkRenderingContext2D -diff -ur VTK6.0.0/IO/Export/module.cmake VTK6.0.0.new/IO/Export/module.cmake ---- VTK6.0.0/IO/Export/module.cmake 2013-06-13 05:47:10.000000000 +1000 -+++ VTK6.0.0.new/IO/Export/module.cmake 2013-08-27 23:34:58.000000000 +1000 -@@ -1,6 +1,6 @@ - vtk_module(vtkIOExport - GROUPS -- StandAlone -+ Rendering - DEPENDS - vtkCommonCore - vtkRenderingContext2D diff --git a/src/vtk6-3-optional-osmesa.patch b/src/vtk6-3-optional-osmesa.patch new file mode 100644 index 00000000..37625b32 --- /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 37769340..174fae57 100644 --- a/src/vtk6.mk +++ b/src/vtk6.mk @@ -25,8 +25,11 @@ define $(PKG)_BUILD mkdir '$(1).native_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 From 901d2a987b471fbeb13531a5b4021fa717496a58 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20M=C3=BCllenhaupt?= Date: Wed, 28 Aug 2013 14:15:46 +0200 Subject: [PATCH 6/8] package vtk6: drop native OpenGL dependency --- src/vtk6-3-optional-osmesa.patch | 33 ++++++++++++++++++++++++++++++++ src/vtk6.mk | 4 +--- 2 files changed, 34 insertions(+), 3 deletions(-) diff --git a/src/vtk6-3-optional-osmesa.patch b/src/vtk6-3-optional-osmesa.patch index 37625b32..3767f3db 100644 --- a/src/vtk6-3-optional-osmesa.patch +++ b/src/vtk6-3-optional-osmesa.patch @@ -12,3 +12,36 @@ endif() # FIXME: The TDx support needs some refactoring before we can build it in a +@@ -136,7 +136,7 @@ + + if(VTK_USE_OSMESA) + find_package(OpenGL) +-else() ++elseif(VTK_USE_X) + find_package(OpenGL REQUIRED) + endif() + +--- VTK6.0.0/ThirdParty/gl2ps/vtkgl2ps/CMakeLists.txt 2013-06-12 21:47:10.000000000 +0200 ++++ VTK6.0.0/ThirdParty/gl2ps/vtkgl2ps/CMakeLists.txt 2013-08-28 13:45:16.297181334 +0200 +@@ -4,16 +4,16 @@ + include_regular_expression(".*") + + # Depend on OpenGL +-if(NOT VTK_OPENGL_HAS_OSMESA) +- find_package(OpenGL REQUIRED) +- set(GL2PS_GL_LIBRARIES ${OPENGL_LIBRARIES}) +- set(GL2PS_GL_INCLUDE_DIR ${OPENGL_INCLUDE_DIR}) +-else() ++if(VTK_OPENGL_HAS_OSMESA) + set(GL2PS_GL_LIBRARIES ${OSMESA_LIBRARY}) + set(GL2PS_GL_INCLUDE_DIR ${OSMESA_INCLUDE_DIR}) + if(OPENGL_gl_LIBRARY) + list(APPEND GL2PS_GL_LIBRARIES ${OPENGL_gl_LIBRARY}) + endif() ++elseif(VTK_USE_X) ++ find_package(OpenGL REQUIRED) ++ set(GL2PS_GL_LIBRARIES ${OPENGL_LIBRARIES}) ++ set(GL2PS_GL_INCLUDE_DIR ${OPENGL_INCLUDE_DIR}) + endif() + + # Need math on UNIX diff --git a/src/vtk6.mk b/src/vtk6.mk index 174fae57..e1ff0112 100644 --- a/src/vtk6.mk +++ b/src/vtk6.mk @@ -25,11 +25,9 @@ define $(PKG)_BUILD mkdir '$(1).native_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 \ + -DCMAKE_BUILD_TYPE="Release" \ '$(1)' $(MAKE) -C '$(1).native_build' -j '$(JOBS)' VERBOSE=1 vtkCompileTools From b668dacadaaa22e2c71d2881059bca7a6072d49f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20M=C3=BCllenhaupt?= Date: Thu, 29 Aug 2013 10:19:49 +0200 Subject: [PATCH 7/8] package vtk6: strip down native configure to required compile tools --- src/vtk6-3-config-compiletools.patch | 28 +++++++++++++++++ src/vtk6-3-optional-osmesa.patch | 47 ---------------------------- src/vtk6.mk | 6 ++-- 3 files changed, 32 insertions(+), 49 deletions(-) create mode 100644 src/vtk6-3-config-compiletools.patch delete mode 100644 src/vtk6-3-optional-osmesa.patch diff --git a/src/vtk6-3-config-compiletools.patch b/src/vtk6-3-config-compiletools.patch new file mode 100644 index 00000000..5b49247e --- /dev/null +++ b/src/vtk6-3-config-compiletools.patch @@ -0,0 +1,28 @@ +--- 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 +@@ -1,4 +1,7 @@ + vtk_module(vtkUtilitiesEncodeString ++ GROUPS ++ CompileTools + DEPENDS + 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 +@@ -1,4 +1,6 @@ + vtk_module(vtkUtilitiesHashSource ++ GROUPS ++ CompileTools + 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 diff --git a/src/vtk6-3-optional-osmesa.patch b/src/vtk6-3-optional-osmesa.patch deleted file mode 100644 index 3767f3db..00000000 --- a/src/vtk6-3-optional-osmesa.patch +++ /dev/null @@ -1,47 +0,0 @@ -# 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 -@@ -136,7 +136,7 @@ - - if(VTK_USE_OSMESA) - find_package(OpenGL) --else() -+elseif(VTK_USE_X) - find_package(OpenGL REQUIRED) - endif() - ---- VTK6.0.0/ThirdParty/gl2ps/vtkgl2ps/CMakeLists.txt 2013-06-12 21:47:10.000000000 +0200 -+++ VTK6.0.0/ThirdParty/gl2ps/vtkgl2ps/CMakeLists.txt 2013-08-28 13:45:16.297181334 +0200 -@@ -4,16 +4,16 @@ - include_regular_expression(".*") - - # Depend on OpenGL --if(NOT VTK_OPENGL_HAS_OSMESA) -- find_package(OpenGL REQUIRED) -- set(GL2PS_GL_LIBRARIES ${OPENGL_LIBRARIES}) -- set(GL2PS_GL_INCLUDE_DIR ${OPENGL_INCLUDE_DIR}) --else() -+if(VTK_OPENGL_HAS_OSMESA) - set(GL2PS_GL_LIBRARIES ${OSMESA_LIBRARY}) - set(GL2PS_GL_INCLUDE_DIR ${OSMESA_INCLUDE_DIR}) - if(OPENGL_gl_LIBRARY) - list(APPEND GL2PS_GL_LIBRARIES ${OPENGL_gl_LIBRARY}) - endif() -+elseif(VTK_USE_X) -+ find_package(OpenGL REQUIRED) -+ set(GL2PS_GL_LIBRARIES ${OPENGL_LIBRARIES}) -+ set(GL2PS_GL_INCLUDE_DIR ${OPENGL_INCLUDE_DIR}) - endif() - - # Need math on UNIX diff --git a/src/vtk6.mk b/src/vtk6.mk index e1ff0112..a651d4c7 100644 --- a/src/vtk6.mk +++ b/src/vtk6.mk @@ -24,9 +24,11 @@ define $(PKG)_BUILD # first we need a native build to create the compile tools mkdir '$(1).native_build' cd '$(1).native_build' && cmake \ + -DVTK_BUILD_ALL_MODULES=FALSE \ + -DVTK_Group_Rendering=FALSE \ + -DVTK_Group_StandAlone=FALSE \ + -DVTK_Group_CompileTools=TRUE \ -DBUILD_TESTING=FALSE \ - -DVTK_USE_X=FALSE \ - -DVTK_USE_OSMESA=FALSE \ -DCMAKE_BUILD_TYPE="Release" \ '$(1)' $(MAKE) -C '$(1).native_build' -j '$(JOBS)' VERBOSE=1 vtkCompileTools From 7409456a6d1ca2e83aa8861ccac321cd2ef49661 Mon Sep 17 00:00:00 2001 From: Tony Theodore Date: Fri, 30 Aug 2013 16:58:31 +1000 Subject: [PATCH 8/8] package vtk6: add vtkParseOGLExt to CompileTools group --- src/vtk6-3-config-compiletools.patch | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/vtk6-3-config-compiletools.patch b/src/vtk6-3-config-compiletools.patch index 5b49247e..28e7ab97 100644 --- a/src/vtk6-3-config-compiletools.patch +++ b/src/vtk6-3-config-compiletools.patch @@ -26,3 +26,10 @@ 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 @@ + vtk_module(vtkParseOGLExt ++ GROUPS ++ CompileTools + EXCLUDE_FROM_WRAPPING)