[vtk6] 04/04: Use system xdmf. (Closes: #750182)

[Anton Gladky]

This is an automated email from the git hooks/post-receive script.

gladk pushed a commit to branch master
in repository vtk6.

commit ece06b2b85290073ce011764608a16b0f4486dd0
Author: Anton Gladky <gladk at debian.org>
Date:   Mon Jun 2 23:12:53 2014 +0200

    Use system xdmf. (Closes: #750182)
---
 debian/control                       |  3 +-
 debian/patches/series                |  1 +
 debian/patches/use_system_xdmf.patch | 66 ++++++++++++++++++++++++++++++++++++
 3 files changed, 69 insertions(+), 1 deletion(-)

diff --git a/debian/control b/debian/control
index 56a6ecc..9743a49 100644
--- a/debian/control
+++ b/debian/control
@@ -27,7 +27,7 @@ Build-Depends:
  libgl1-mesa-dev | libgl-dev,
  libgl2ps-dev,
  libglu1-mesa-dev | libglu-dev,
- libhdf5-dev,
+ libhdf5-openmpi-dev | libhdf5-mpich-dev,
  libjpeg-dev,
  libjsoncpp-dev,
  libmrmpi-dev,
@@ -46,6 +46,7 @@ Build-Depends:
  libtiff-dev,
  libx11-dev,
  libxml2-dev,
+ libxdmf-dev,
  libxpm-dev,
  libxt-dev,
  mpi-default-dev,
diff --git a/debian/patches/series b/debian/patches/series
index 609e310..7f6d950 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -8,3 +8,4 @@ fix_libav10.patch
 10_Java_Target.patch
 fix_FTBFS_KWSys.patch
 fix_ftbfs_gcc49.patch
+use_system_xdmf.patch
diff --git a/debian/patches/use_system_xdmf.patch b/debian/patches/use_system_xdmf.patch
new file mode 100644
index 0000000..afce4c7
--- /dev/null
+++ b/debian/patches/use_system_xdmf.patch
@@ -0,0 +1,66 @@
+Description: Use system xdmf
+Author: Anton Gladky <gladk at debian.org>
+Bug-Debian: http://bugs.debian.org/750182
+Last-Update: 2014-06-02
+
+Index: vtk6-6.1.0+dfsg/ThirdParty/xdmf2/CMakeLists.txt
+===================================================================
+--- vtk6-6.1.0+dfsg.orig/ThirdParty/xdmf2/CMakeLists.txt
++++ vtk6-6.1.0+dfsg/ThirdParty/xdmf2/CMakeLists.txt
+@@ -1,44 +1,7 @@
+ vtk_module_third_party(xdmf2
+-  LIBRARIES vtkxdmf2
++  LIBRARIES Xdmf
+   INCLUDE_DIRS
+    ${CMAKE_CURRENT_SOURCE_DIR}/vtkxdmf2/libsrc
+    ${CMAKE_CURRENT_BINARY_DIR}/vtkxdmf2/libsrc
+   NO_ADD_SUBDIRECTORY
+ )
+-
+-if(VTK_USE_SYSTEM_XDMF2)
+-  return()
+-endif()
+-
+-#########################################################################
+-# Set Xdmf build environment options the way VTK wants them
+-
+-# build options
+-option(VTK_XDMF_USE_MPI "Build Xdmf with MPI" OFF)
+-mark_as_advanced(VTK_XDMF_USE_MPI)
+-set (XDMF_BUILD_MPI ${VTK_XDMF_USE_MPI})
+-
+-# wrapping
+-# VTK doesn't wrap libxdmf itself (either with vtk's wrapping or swig)
+-set(XDMF_WRAP_TCL OFF CACHE INTERNAL "")
+-set(XDMF_WRAP_PYTHON OFF CACHE INTERNAL "")
+-set(XDMF_WRAP_PYTHON_INSTALL_DIR ${VTK_INSTALL_LIBRARY_DIR}/site-packages/Xdmf)
+-set(XDMF_WRAP_CSHARP OFF CACHE INTERNAL "")
+-set(XDMF_REGENERATE_WRAPPERS OFF CACHE INTERNAL "")
+-set(XDMF_REGENERATE_YACCLEX OFF CACHE INTERNAL "")
+-
+-# packaging
+-set(XDMF_INSTALL_LIB_DIR ${VTK_INSTALL_LIBRARY_DIR})
+-set(XDMF_INSTALL_BIN_DIR ${VTK_INSTALL_RUNTIME_DIR})
+-set(XDMF_INSTALL_INCLUDE_DIR "${VTK_INSTALL_INCLUDE_DIR}/vtkxdmf2")
+-set(XDMF_INSTALL_EXPORT_NAME ${VTK_INSTALL_EXPORT_NAME})
+-set(XDMF_INSTALL_NO_DEVELOPMENT ${VTK_INSTALL_NO_DEVELOPMENT})
+-set(XDMF_INSTALL_NO_RUNTIME ${VTK_INSTALL_NO_RUNTIME})
+-
+-vtk_module_export_info()
+-
+-#now configure the libxdmf build per the above settings
+-set(XDMF_BUILT_INVTK 1)
+-add_subdirectory(vtkxdmf2)
+-
+-vtk_target(vtkxdmf2 NO_INSTALL)
+Index: vtk6-6.1.0+dfsg/ThirdParty/xdmf2/vtk_xdmf2.h.in
+===================================================================
+--- vtk6-6.1.0+dfsg.orig/ThirdParty/xdmf2/vtk_xdmf2.h.in
++++ vtk6-6.1.0+dfsg/ThirdParty/xdmf2/vtk_xdmf2.h.in
+@@ -15,5 +15,6 @@
+ #ifndef __vtk_xdmf2_h
+ #define __vtk_xdmf2_h
+ 
++# include <Xdmf.h>
+ 
+ #endif

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/vtk6.git