From 8d93d810c6bc952eec76f59286907646f1ab09e3 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Jan 24 2014 05:18:07 +0000 Subject: Update to 6.1.0 - Rebase patches, drop vtkpython patch - Disable BUILD_TESTING for now until we can provide test data --- diff --git a/.gitignore b/.gitignore index 528f940..4cf8376 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ vtk-5.6.0.tar.gz /vtk-5.10.0.tar.gz /vtk-5.10.1.tar.gz /vtk-6.0.0.tar.gz +/VTK-6.1.0.tar.gz diff --git a/sources b/sources index e4c58d6..29ca26c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -72ede4812c90bdc55172702f0cad02bb vtk-6.0.0.tar.gz +25e4dfb3bad778722dcaec80cd5dab7d VTK-6.1.0.tar.gz diff --git a/vtk-6.0.0-netcdf.patch b/vtk-6.0.0-netcdf.patch deleted file mode 100644 index df0ef94..0000000 --- a/vtk-6.0.0-netcdf.patch +++ /dev/null @@ -1,75 +0,0 @@ -diff -up VTK/IO/NetCDF/CMakeLists.txt.netcdf VTK/IO/NetCDF/CMakeLists.txt ---- VTK/IO/NetCDF/CMakeLists.txt.netcdf 2013-01-28 14:44:35.000000000 -0700 -+++ VTK/IO/NetCDF/CMakeLists.txt 2013-01-28 15:40:00.825176295 -0700 -@@ -10,5 +10,5 @@ set(Module_SRCS - - vtk_module_library(vtkIONetCDF ${Module_SRCS}) - --target_link_libraries(vtkIONetCDF vtkNetCDF_cxx) -+target_link_libraries(vtkIONetCDF netcdf_c++ netcdf) - set_target_properties(vtkIONetCDF PROPERTIES LINK_INTERFACE_LIBRARIES "") -diff -up VTK/IO/ParallelNetCDF/CMakeLists.txt.netcdf VTK/IO/ParallelNetCDF/CMakeLists.txt ---- VTK/IO/ParallelNetCDF/CMakeLists.txt.netcdf 2013-01-28 14:44:35.000000000 -0700 -+++ VTK/IO/ParallelNetCDF/CMakeLists.txt 2013-01-28 15:40:00.825176295 -0700 -@@ -8,4 +8,4 @@ set(Module_SRCS - - vtk_module_library(vtkIOParallelNetCDF ${Module_SRCS}) - --target_link_libraries(vtkIOParallelNetCDF vtkNetCDF_cxx) -+target_link_libraries(vtkIOParallelNetCDF netcdf) -diff -up VTK/ThirdParty/exodusII/vtkexodusII/CMakeLists.txt.netcdf VTK/ThirdParty/exodusII/vtkexodusII/CMakeLists.txt ---- VTK/ThirdParty/exodusII/vtkexodusII/CMakeLists.txt.netcdf 2013-01-28 14:44:36.000000000 -0700 -+++ VTK/ThirdParty/exodusII/vtkexodusII/CMakeLists.txt 2013-01-28 15:40:27.534030910 -0700 -@@ -241,7 +241,7 @@ ENDIF(APPLE) - - - VTK_ADD_LIBRARY(vtkexoIIc ${cbind_SRCS}) --TARGET_LINK_LIBRARIES(vtkexoIIc vtkNetCDF) -+TARGET_LINK_LIBRARIES(vtkexoIIc netcdf) - - #INCLUDE (${CMAKE_ROOT}/Modules/Dart.cmake) - -diff -up VTK/ThirdParty/netcdf/CMakeLists.txt.netcdf VTK/ThirdParty/netcdf/CMakeLists.txt ---- VTK/ThirdParty/netcdf/CMakeLists.txt.netcdf 2013-01-28 14:44:36.000000000 -0700 -+++ VTK/ThirdParty/netcdf/CMakeLists.txt 2013-01-28 15:40:00.825176295 -0700 -@@ -1,8 +1,12 @@ - set(vtknetcdf_THIRD_PARTY 1) --set(vtknetcdf_LIBRARIES vtkNetCDF vtkNetCDF_cxx) --set(vtknetcdf_INCLUDE_DIRS -- ${vtknetcdf_SOURCE_DIR}/vtknetcdf/include -- ${vtknetcdf_BINARY_DIR}/vtknetcdf -- ) -+if(NOT VTK_USE_SYSTEM_NETCDF) -+ set(vtknetcdf_LIBRARIES vtkNetCDF vtkNetCDF_cxx) -+ set(vtknetcdf_INCLUDE_DIRS -+ ${vtknetcdf_SOURCE_DIR}/vtknetcdf/include -+ ${vtknetcdf_BINARY_DIR}/vtknetcdf -+ ) -+ add_subdirectory(vtknetcdf) -+else(NOT VTK_USE_SYSTEM_NETCDF) -+ set(vtknetcdf_LIBRARIES netcdf) -+endif() - vtk_module_export_info() --add_subdirectory(vtknetcdf) -diff -up VTK/ThirdParty/netcdf/vtk_netcdfcpp.h.netcdf VTK/ThirdParty/netcdf/vtk_netcdfcpp.h ---- VTK/ThirdParty/netcdf/vtk_netcdfcpp.h.netcdf 2013-01-28 14:44:36.000000000 -0700 -+++ VTK/ThirdParty/netcdf/vtk_netcdfcpp.h 2013-01-28 15:40:00.826176289 -0700 -@@ -16,6 +16,6 @@ - #define __vtk_netcdfcpp_h - - /* Use the netcdf library configured for VTK. */ --#include -+#include - - #endif -diff -up VTK/ThirdParty/netcdf/vtk_netcdf.h.netcdf VTK/ThirdParty/netcdf/vtk_netcdf.h ---- VTK/ThirdParty/netcdf/vtk_netcdf.h.netcdf 2013-01-28 14:44:36.000000000 -0700 -+++ VTK/ThirdParty/netcdf/vtk_netcdf.h 2013-01-28 15:40:00.826176289 -0700 -@@ -16,6 +16,6 @@ - #define __vtk_netcdf_h - - /* Use the netcdf library configured for VTK. */ --#include -+#include - - #endif diff --git a/vtk-6.0.0-system.patch b/vtk-6.0.0-system.patch deleted file mode 100644 index 3e5762f..0000000 --- a/vtk-6.0.0-system.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff -up VTK6.0.0/CMake/vtkModuleMacros.cmake.system VTK6.0.0/CMake/vtkModuleMacros.cmake ---- VTK6.0.0/CMake/vtkModuleMacros.cmake.system 2013-06-12 13:47:10.000000000 -0600 -+++ VTK6.0.0/CMake/vtkModuleMacros.cmake 2013-12-27 20:59:39.548152746 -0700 -@@ -613,7 +613,7 @@ macro(vtk_module_third_party _pkg) - message(FATAL_ERROR "Cannot specify both LIBRARIES and NO_LIBRARIES") - endif() - -- option(VTK_USE_SYSTEM_${_upper} "Use system-installed ${_pkg}" OFF) -+ option(VTK_USE_SYSTEM_${_upper} "Use system-installed ${_pkg}" ${VTK_USE_SYSTEM_LIBRARIES}) - mark_as_advanced(VTK_USE_SYSTEM_${_upper}) - - if(VTK_USE_SYSTEM_${_upper}) -diff -up VTK6.0.0/CMakeLists.txt.system VTK6.0.0/CMakeLists.txt ---- VTK6.0.0/CMakeLists.txt.system 2013-06-12 13:47:10.000000000 -0600 -+++ VTK6.0.0/CMakeLists.txt 2013-12-27 20:59:39.548152746 -0700 -@@ -107,6 +107,11 @@ set(VTK_INSTALL_INCLUDE_DIR_CM24 ${VTK_I - set(VTK_INSTALL_DOXYGEN_DIR_CM24 ${VTK_INSTALL_DATA_DIR}/doxygen) - - #----------------------------------------------------------------------------- -+# Do we try to use system libraries by default? -+OPTION(VTK_USE_SYSTEM_LIBRARIES "Use the system's libraries by default." OFF) -+MARK_AS_ADVANCED(VTK_USE_SYSTEM_LIBRARIES) -+ -+#----------------------------------------------------------------------------- - # The third party macros are still used in one or two third party builds. - include(vtkThirdParty) - diff --git a/vtk-6.1.0-netcdf.patch b/vtk-6.1.0-netcdf.patch new file mode 100644 index 0000000..e6f8b64 --- /dev/null +++ b/vtk-6.1.0-netcdf.patch @@ -0,0 +1,29 @@ +diff -up VTK/ThirdParty/netcdf/CMakeLists.txt.netcdf VTK/ThirdParty/netcdf/CMakeLists.txt +--- VTK/ThirdParty/netcdf/CMakeLists.txt.netcdf 2013-12-27 20:29:11.644289659 -0700 ++++ VTK/ThirdParty/netcdf/CMakeLists.txt 2013-12-27 20:33:48.071895769 -0700 +@@ -1,10 +1,18 @@ +-vtk_module_third_party(NetCDF +- LIBRARIES vtkNetCDF vtkNetCDF_cxx +- INCLUDE_DIRS +- ${CMAKE_CURRENT_SOURCE_DIR}/vtknetcdf/include +- ${CMAKE_CURRENT_BINARY_DIR}/vtknetcdf +- COMPONENTS C CXX +- ) ++if(NOT VTK_USE_SYSTEM_NETCDF) ++ vtk_module_third_party(NetCDF ++ LIBRARIES vtkNetCDF vtkNetCDF_cxx ++ INCLUDE_DIRS ++ ${CMAKE_CURRENT_SOURCE_DIR}/vtknetcdf/include ++ ${CMAKE_CURRENT_BINARY_DIR}/vtknetcdf ++ COMPONENTS C CXX ++ ) ++else(NOT VTK_USE_SYSTEM_NETCDF) ++ vtk_module_third_party(NetCDF ++ LIBRARIES vtkNetCDF netcdf ++ COMPONENTS C CXX ++ ) ++endif() ++ + + #Configure the top cpp header to switch between system and internal + #netcdf just like vtk_module_third_party does for the c header. diff --git a/vtk-6.1.0-system.patch b/vtk-6.1.0-system.patch new file mode 100644 index 0000000..c75d544 --- /dev/null +++ b/vtk-6.1.0-system.patch @@ -0,0 +1,27 @@ +diff -up VTK/CMake/vtkModuleMacros.cmake.system VTK/CMake/vtkModuleMacros.cmake +--- VTK/CMake/vtkModuleMacros.cmake.system 2013-12-24 19:17:43.000000000 -0700 ++++ VTK/CMake/vtkModuleMacros.cmake 2013-12-27 20:28:22.375573277 -0700 +@@ -682,7 +682,7 @@ macro(vtk_module_third_party _pkg) + message(FATAL_ERROR "Cannot specify both LIBRARIES and NO_LIBRARIES") + endif() + +- option(VTK_USE_SYSTEM_${_upper} "Use system-installed ${_pkg}" OFF) ++ option(VTK_USE_SYSTEM_${_upper} "Use system-installed ${_pkg}" ${VTK_USE_SYSTEM_LIBRARIES}) + mark_as_advanced(VTK_USE_SYSTEM_${_upper}) + + if(VTK_USE_SYSTEM_${_upper}) +diff -up VTK/CMakeLists.txt.system VTK/CMakeLists.txt +--- VTK/CMakeLists.txt.system 2013-12-27 20:28:22.374573241 -0700 ++++ VTK/CMakeLists.txt 2013-12-27 20:28:48.118669708 -0700 +@@ -132,6 +132,11 @@ if (CMAKE_CROSSCOMPILING AND NOT COMPILE + endif() + + #----------------------------------------------------------------------------- ++# Do we try to use system libraries by default? ++OPTION(VTK_USE_SYSTEM_LIBRARIES "Use the system's libraries by default." OFF) ++MARK_AS_ADVANCED(VTK_USE_SYSTEM_LIBRARIES) ++ ++#----------------------------------------------------------------------------- + # The third party macros are still used in one or two third party builds. + include(vtkThirdParty) + diff --git a/vtk-install.patch b/vtk-install.patch index a97755a..27c6c3a 100644 --- a/vtk-install.patch +++ b/vtk-install.patch @@ -1,17 +1,17 @@ -diff -up VTK6.0.0/CMake/vtkModuleTop.cmake.install VTK6.0.0/CMake/vtkModuleTop.cmake ---- VTK6.0.0/CMake/vtkModuleTop.cmake.install 2013-06-12 13:47:10.000000000 -0600 -+++ VTK6.0.0/CMake/vtkModuleTop.cmake 2013-07-12 16:15:15.706008475 -0600 -@@ -330,10 +330,15 @@ if (NOT VTK_INSTALL_NO_DEVELOPMENT) +diff -up VTK-6.1.0/CMake/vtkModuleTop.cmake.install VTK-6.1.0/CMake/vtkModuleTop.cmake +--- VTK-6.1.0/CMake/vtkModuleTop.cmake.install 2014-01-23 19:12:04.922871103 -0700 ++++ VTK-6.1.0/CMake/vtkModuleTop.cmake 2014-01-23 19:14:33.002645155 -0700 +@@ -330,11 +330,15 @@ if (NOT VTK_INSTALL_NO_DEVELOPMENT) CMake/pythonmodules.h.in CMake/UseVTK.cmake CMake/FindTCL.cmake + CMake/TopologicalSort.cmake CMake/vtkTclTkMacros.cmake CMake/vtk-forward.c.in - CMake/vtkForwardingExecutable.cmake + CMake/vtkGroups.cmake + CMake/vtkForwardingExecutable.cmake CMake/vtkJavaWrapping.cmake -+ CMake/vtkMakeInstantiator.cmake + CMake/vtkMakeInstantiator.cmake + CMake/vtkMakeInstantiator.cxx.in + CMake/vtkMakeInstantiator.h.in CMake/vtkModuleAPI.cmake diff --git a/vtk.spec b/vtk.spec index 14ea93a..2cc300f 100644 --- a/vtk.spec +++ b/vtk.spec @@ -13,24 +13,22 @@ Summary: The Visualization Toolkit - A high level 3D visualization library Name: vtk -Version: 6.0.0 -Release: 10%{?dist} +Version: 6.1.0 +Release: 1%{?dist} # This is a variant BSD license, a cross between BSD and ZLIB. # For all intents, it has the same rights and restrictions as BSD. # http://fedoraproject.org/wiki/Licensing/BSD#VTKBSDVariant License: BSD Group: System Environment/Libraries -Source: http://www.vtk.org/files/release/6.0/%{name}-%{version}.tar.gz +Source: http://www.vtk.org/files/release/6.1/VTK-%{version}.tar.gz # Use system libraries # http://public.kitware.com/Bug/view.php?id=11823 -Patch0: vtk-6.0.0-system.patch +Patch0: vtk-6.1.0-system.patch # Install some more needed cmake files to try to support paraview build # http://www.vtk.org/Bug/view.php?id=14157 Patch1: vtk-install.patch -# Upsream patch to install vtkpython -Patch2: vtk-vtkpython.patch #Patch to vtk to use system netcdf library -Patch3: vtk-6.0.0-netcdf.patch +Patch2: vtk-6.1.0-netcdf.patch URL: http://vtk.org/ @@ -58,6 +56,7 @@ BuildRequires: doxygen, graphviz BuildRequires: gnuplot BuildRequires: boost-devel BuildRequires: hdf5-devel +BuildRequires: jsoncpp-devel BuildRequires: libtheora-devel BuildRequires: mysql-devel BuildRequires: netcdf-cxx-devel @@ -172,15 +171,15 @@ programming languages. %prep -%setup -q -n VTK%{version} +%setup -q -n VTK-%{version} %patch0 -p1 -b .system %patch1 -p1 -b .install -%patch2 -p1 -b .vtkpython -%patch3 -p1 -b .netcdf +%patch2 -p1 -b .netcdf # Remove included thirdparty sources just to be sure -for x in expat freetype gl2ps hdf5 jpeg libxml2 netcdf oggtheora png tiff zlib +# TODO - vtksqlite +for x in autobahn vtkexpat vtkfreetype vtkgl2ps vtkhdf5 vtkjpeg vtklibxml2 vtknetcdf vtkoggtheora vtkpng vtktiff twisted vtkzlib zope do - rm -r ThirdParty/${x}/vtk${x} + rm -r ThirdParty/*/${x} done # Replace relative path ../../../VTKData with %{_datadir}/vtkdata-%{version} @@ -211,9 +210,10 @@ pushd build %endif -DBUILD_DOCUMENTATION:BOOL=ON \ -DBUILD_EXAMPLES:BOOL=ON \ - -DBUILD_TESTING:BOOL=ON \ + -DBUILD_TESTING:BOOL=OFF \ -DVTK_CUSTOM_LIBRARY_SUFFIX="" \ -DVTK_INSTALL_ARCHIVE_DIR:PATH=%{_lib}/vtk \ + -DVTK_INSTALL_DATA_DIR=share/paraview \ -DVTK_INSTALL_INCLUDE_DIR:PATH=include/vtk \ -DVTK_INSTALL_LIBRARY_DIR:PATH=%{_lib}/vtk \ -DVTK_INSTALL_PACKAGE_DIR:PATH=%{_lib}/cmake/vtk \ @@ -231,7 +231,6 @@ pushd build %else -DVTK_WRAP_JAVA:BOOL=OFF \ %endif - -DVTK_PYTHON_SETUP_ARGS="--prefix=/usr --root=%{buildroot}" \ -DVTK_WRAP_PYTHON:BOOL=ON \ -DVTK_WRAP_PYTHON_SIP:BOOL=ON \ -DSIP_INCLUDE_DIR:PATH=/usr/include/python2.7 \ @@ -243,11 +242,13 @@ pushd build -DVTK_Group_Tk:BOOL=ON \ -DVTK_Group_Views:BOOL=ON \ -DModule_vtkFiltersStatisticsGnuR:BOOL=ON \ + -DModule_vtkTestingCore:BOOL=ON \ + -DModule_vtkTestingRendering:BOOL=ON \ -DVTK_USE_OGGTHEORA_ENCODER=ON \ -DVTK_USE_SYSTEM_LIBRARIES=ON \ - -DVTK_USE_SYSTEM_LIBPROJ4=OFF \ - -DVTK_USE_SYSTEM_NETCDF=ON \ - -DVTK_USE_SYSTEM_SQLITE=ON + -DVTK_USE_SYSTEM_HDF5:BOOL=ON \ + -DVTK_USE_SYSTEM_LIBPROJ4:BOOL=OFF \ + -DVTK_USE_SYSTEM_NETCDF:BOOL=ON # TODO - MPI #-DVTK_Group_MPI:BOOL=ON \ @@ -453,6 +454,11 @@ cp -pr --parents Wrapping/*/README* _docs/ %doc vtk-examples/Examples %changelog +* Thu Jan 23 2014 Orion Poplawski - 6.1.0-1 +- Update to 6.1.0 +- Rebase patches, drop vtkpython patch +- Disable BUILD_TESTING for now until we can provide test data + * Fri Dec 27 2013 Orion Poplawski - 6.0.0-10 - Add patch to use system netcdf