From c296ef55d2aca0266f8f8b5dca2ee35bf4a80d31 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jan=20R=C4=99korajski?= Date: Sun, 6 Dec 2015 21:25:12 +0100 Subject: [PATCH 1/1] - up to 6.3.0 --- conflicting-types.patch | 22 ---------------------- vtk-install.patch | 15 --------------- vtk-system-libs.patch | 29 ----------------------------- vtk.spec | 36 +++++++++++++++--------------------- 4 files changed, 15 insertions(+), 87 deletions(-) delete mode 100644 conflicting-types.patch delete mode 100644 vtk-install.patch delete mode 100644 vtk-system-libs.patch diff --git a/conflicting-types.patch b/conflicting-types.patch deleted file mode 100644 index 050f711..0000000 --- a/conflicting-types.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- VTK-6.1.0/Rendering/FreeType/vtkFreeTypeTools.cxx.orig 2015-02-18 19:39:39.428358188 +0100 -+++ VTK-6.1.0/Rendering/FreeType/vtkFreeTypeTools.cxx 2015-02-18 19:40:48.241691988 +0100 -@@ -1186,7 +1186,7 @@ - if (bitmap) - { - metaData.ascent = std::max(bitmapGlyph->top - 1, metaData.ascent); -- metaData.descent = std::min(-(bitmap->rows - (bitmapGlyph->top - 1)), -+ metaData.descent = std::min(-((int)bitmap->rows - ((int)bitmapGlyph->top - 1)), - metaData.descent); - } - ++heightString; -@@ -1951,8 +1951,8 @@ - if (bitmap) - { - bbox[0] = std::min(bbox[0], pen[0] + bitmapGlyph->left); -- bbox[1] = std::max(bbox[1], pen[0] + bitmapGlyph->left + bitmap->width); -- bbox[2] = std::min(bbox[2], pen[1] + bitmapGlyph->top - 1 - bitmap->rows); -+ bbox[1] = std::max(bbox[1], pen[0] + bitmapGlyph->left + (int)bitmap->width); -+ bbox[2] = std::min(bbox[2], pen[1] + bitmapGlyph->top - 1 - (int)bitmap->rows); - bbox[3] = std::max(bbox[3], pen[1] + bitmapGlyph->top - 1); - } - else diff --git a/vtk-install.patch b/vtk-install.patch deleted file mode 100644 index e455575..0000000 --- a/vtk-install.patch +++ /dev/null @@ -1,15 +0,0 @@ -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-06-28 16:12:02.837198769 -0600 -@@ -330,9 +330,11 @@ 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/vtkJavaWrapping.cmake - CMake/vtkModuleAPI.cmake - CMake/vtkModuleHeaders.cmake.in diff --git a/vtk-system-libs.patch b/vtk-system-libs.patch deleted file mode 100644 index 5246ece..0000000 --- a/vtk-system-libs.patch +++ /dev/null @@ -1,29 +0,0 @@ -diff --git a/CMake/vtkModuleMacros.cmake b/CMake/vtkModuleMacros.cmake -index 3e746a6..9ef38fd 100644 ---- a/CMake/vtkModuleMacros.cmake -+++ b/CMake/vtkModuleMacros.cmake -@@ -563,7 +563,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 --git a/CMakeLists.txt b/CMakeLists.txt -index 0d1dda8..b3e1801 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -97,6 +97,11 @@ set(VTK_INSTALL_INCLUDE_DIR_CM24 ${VTK_INSTALL_INCLUDE_DIR}) - 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.spec b/vtk.spec index 76ef4e1..14ca3d4 100644 --- a/vtk.spec +++ b/vtk.spec @@ -15,18 +15,15 @@ Summary: Toolkit for 3D computer graphics, image processing, and visualization Summary(pl.UTF-8): Zestaw narzędzi do trójwymiarowej grafiki, przetwarzania obrazu i wizualizacji Name: vtk -Version: 6.1.0 -Release: 15 +Version: 6.3.0 +Release: 1 License: BSD Group: Libraries -Source0: http://www.vtk.org/files/release/6.1/VTK-%{version}.tar.gz -# Source0-md5: 25e4dfb3bad778722dcaec80cd5dab7d -Source1: http://www.vtk.org/files/release/6.1/VTKData-%{version}.tar.gz -# Source1-md5: f82c8fe151279c0422ab8a6cfe991c94 -Patch0: %{name}-system-libs.patch -Patch1: %{name}-install.patch -Patch2: %{name}-chemistry.patch -Patch3: conflicting-types.patch +Source0: http://www.vtk.org/files/release/6.3/VTK-%{version}.tar.gz +# Source0-md5: 0231ca4840408e9dd60af48b314c5b6d +Source1: http://www.vtk.org/files/release/6.3/VTKData-%{version}.tar.gz +# Source1-md5: b164200226805aeb741703a8168afdda +Patch0: %{name}-chemistry.patch URL: http://www.vtk.org/ %{?with_OSMesa:BuildRequires: Mesa-libOSMesa-devel} BuildRequires: OpenGL-GLX-devel @@ -314,13 +311,10 @@ potrzebne do uruchamiania różnych przykładów z pakietu vtk-examples. %prep %setup -q -n VTK-%{version} -b 1 %patch0 -p1 -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 # Replace relative path ../../../VTKData with destination filesystem path grep -Erl '(\.\./)+VTKData' Examples | xargs \ - perl -pi -e 's,(\.\./)+VTKData,%{_datadir}/vtk-6.1,g' + perl -pi -e 's,(\.\./)+VTKData,%{_datadir}/vtk-6.3,g' # Save an unbuilt copy of the Example's sources for %doc mkdir vtk-examples @@ -355,7 +349,7 @@ cd build -DTCL_LIBRARY:PATH=%{_libdir}/libtcl.so \ -DTK_INCLUDE_PATH:PATH=%{_includedir} \ -DTK_LIBRARY:PATH=%{_libdir}/libtk.so \ - -DVTK_DATA_ROOT:PATH=%{_datadir}/vtk-6.1 \ + -DVTK_DATA_ROOT:PATH=%{_datadir}/vtk-6.3 \ -DVTK_CUSTOM_LIBRARY_SUFFIX="" \ -DVTK_INSTALL_ARCHIVE_DIR:PATH=%{_lib}/vtk \ -DVTK_INSTALL_INCLUDE_DIR:PATH=include/vtk \ @@ -428,7 +422,7 @@ install -d $RPM_BUILD_ROOT{%{_sysconfdir}/ld.so.conf.d,%{_examplesdir}/%{name}-% echo %{_libdir}/vtk > $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/vtk-%{_arch}.conf for f in $(cd build/ExternalData/Testing ; find Data -type l); do - install -Dp build/ExternalData/Testing/$f $RPM_BUILD_ROOT%{_datadir}/vtk-6.1/$f + install -Dp build/ExternalData/Testing/$f $RPM_BUILD_ROOT%{_datadir}/vtk-6.3/$f done # Install utilities @@ -493,7 +487,7 @@ install build/bin/VTKJavaExecutable $RPM_BUILD_ROOT%{_bindir} install build/bin/vtkpython $RPM_BUILD_ROOT%{_bindir} # unwanted doxygen files and misplaced verdict docs -%{__rm} -r $RPM_BUILD_ROOT%{_docdir}/vtk-6.1/{doxygen,verdict} +%{__rm} -r $RPM_BUILD_ROOT%{_docdir}/vtk-6.3/{doxygen,verdict} # only *.pyc are built by default, add *.pyo %py_ocomp $RPM_BUILD_ROOT%{py_sitedir}/vtk @@ -723,7 +717,7 @@ rm -rf $RPM_BUILD_ROOT %attr(755,root,root) %{_libdir}/vtk/libvtkPythonInterpreter.so.1 # RenderingMatplotlib requires PythonInterpreter %attr(755,root,root) %{_libdir}/vtk/libvtkRenderingMatplotlib.so.1 -%attr(755,root,root) %{_libdir}/vtk/libvtkRenderingPythonTkWidgets-6.1.so +%attr(755,root,root) %{_libdir}/vtk/libvtkRenderingPythonTkWidgets-6.3.so %attr(755,root,root) %{_libdir}/vtk/libvtkWrappingPython2?Core.so.1 %dir %{py_sitedir}/vtk %{py_sitedir}/vtk/*.py[co] @@ -822,6 +816,6 @@ rm -rf $RPM_BUILD_ROOT %files data %defattr(644,root,root,755) -%dir %{_datadir}/vtk-6.1 -%{_datadir}/vtk-6.1/Data -%{_datadir}/vtk-6.1/vtkDomainsChemistry +%dir %{_datadir}/vtk-6.3 +%{_datadir}/vtk-6.3/Data +%{_datadir}/vtk-6.3/vtkDomainsChemistry -- 2.44.0