[packages/vtk] - added doc patch, fixed DoxygenDoc build
qboosh
qboosh at pld-linux.org
Sun Jan 10 21:34:00 CET 2021
commit bc12798a116fe2989d18a6b47ccb150830a8e5a3
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Sun Jan 10 21:34:03 2021 +0100
- added doc patch, fixed DoxygenDoc build
vtk-doc.patch | 110 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
vtk.spec | 12 +++++--
2 files changed, 119 insertions(+), 3 deletions(-)
---
diff --git a/vtk.spec b/vtk.spec
index 2501896..41dc63b 100644
--- a/vtk.spec
+++ b/vtk.spec
@@ -11,7 +11,7 @@
# Conditional build
%bcond_without java # Java wrappers
%bcond_without ffmpeg # FFMPEG .avi saving support
-%bcond_with doc # do not build and package doxygen documentation
+%bcond_without doc # doxygen documentation
%bcond_with OSMesa # build with OSMesa (https://bugzilla.redhat.com/show_bug.cgi?id=744434)
%bcond_with system_gl2ps # use system gl2ps (VTK currently is carrying local modifications to gl2ps, incl. gl2psTextOptColorBL function)
@@ -35,6 +35,7 @@ Patch4: python-3.8.patch
Patch5: link.patch
Patch6: system-pugixml.patch
Patch7: freetype.patch
+Patch8: %{name}-doc.patch
URL: https://vtk.org/
%{?with_OSMesa:BuildRequires: Mesa-libOSMesa-devel}
BuildRequires: OpenGL-GLX-devel
@@ -313,6 +314,7 @@ potrzebne do uruchamiania różnych przykładów z pakietu vtk-examples.
%patch5 -p1
%patch6 -p1
%patch7 -p1
+%patch8 -p1
# Replace relative path ../../../VTKData with destination filesystem path
grep -Erl '(\.\./)+VTKData' Examples | xargs \
@@ -364,11 +366,12 @@ cd build
%cmake .. \
$ccache \
-Wno-dev \
- %{cmake_on_off doc DBUILD_DOCUMENTATION} \
+ %{cmake_on_off doc BUILD_DOCUMENTATION} \
-DBUILD_EXAMPLES:BOOL=ON \
-DBUILD_SHARED_LIBS:BOOL=ON \
-DBUILD_TESTING:BOOL=ON \
-DCMAKE_SKIP_RPATH:BOOL=ON \
+ -DDOXYGEN_GENERATE_HTMLHELP=OFF \
-DOPENGL_INCLUDE_PATH:PATH=%{_includedir}/GL \
-DPYTHON_INCLUDE_PATH:PATH=%{py3_incdir} \
-DPYTHON_LIBRARY:FILEPATH=%{_libdir}/libpython%{py3_ver}.so \
@@ -434,7 +437,10 @@ cd build
# TODO: -DModule_vtkRenderingParallelLIC:BOOL=ON (BR: MPI)
%{__make}
-%{?with_doc:%{__make} DoxygenDoc}
+
+%if %{with doc}
+%{__make} DoxygenDoc
+%endif
%install
rm -rf $RPM_BUILD_ROOT
diff --git a/vtk-doc.patch b/vtk-doc.patch
new file mode 100644
index 0000000..04e87a1
--- /dev/null
+++ b/vtk-doc.patch
@@ -0,0 +1,110 @@
+--- VTK-8.2.0/Utilities/Doxygen/doc_version.pl.orig 2019-01-30 18:15:13.000000000 +0100
++++ VTK-8.2.0/Utilities/Doxygen/doc_version.pl 2021-01-08 17:01:33.913860627 +0100
+@@ -152,24 +152,24 @@
+ if exists $args{"logo"} && -f $args{"logo"};
+
+ print DEST_FILE
+- " \@par VTK:\n"
+- " VTK is an open-source software system for image processing, 3D \n"
+- " graphics, volume rendering and visualization. VTK includes many \n"
+- " advanced algorithms (e.g., surface reconstruction, implicit modelling, \n"
+- " decimation) and rendering techniques (e.g., hardware-accelerated \n"
+- " volume rendering, LOD control).\n"
+- " \@par \n"
+- " VTK is used by academicians for teaching and research; by government \n"
+- " research institutions such as Los Alamos National Lab in the US or \n"
+- " CINECA in Italy; and by many commercial firms who use VTK to build or \n"
+- " extend products. \n"
+- " \@par \n"
+- " The origin of VTK is with the textbook \"The Visualization Toolkit, an \n"
+- " Object-Oriented Approach to 3D Graphics\" originally published by \n"
+- " Prentice Hall and now published by Kitware, Inc. (Third Edition ISBN \n"
+- " 1-930934-07-6). VTK has grown (since its initial release in 1994) to a \n"
+- " world-wide user base in the commercial, academic, and research \n"
+- " communities. \n"
++ " \@par VTK:\n",
++ " VTK is an open-source software system for image processing, 3D \n",
++ " graphics, volume rendering and visualization. VTK includes many \n",
++ " advanced algorithms (e.g., surface reconstruction, implicit modelling, \n",
++ " decimation) and rendering techniques (e.g., hardware-accelerated \n",
++ " volume rendering, LOD control).\n",
++ " \@par \n",
++ " VTK is used by academicians for teaching and research; by government \n",
++ " research institutions such as Los Alamos National Lab in the US or \n",
++ " CINECA in Italy; and by many commercial firms who use VTK to build or \n",
++ " extend products. \n",
++ " \@par \n",
++ " The origin of VTK is with the textbook \"The Visualization Toolkit, an \n",
++ " Object-Oriented Approach to 3D Graphics\" originally published by \n",
++ " Prentice Hall and now published by Kitware, Inc. (Third Edition ISBN \n",
++ " 1-930934-07-6). VTK has grown (since its initial release in 1994) to a \n",
++ " world-wide user base in the commercial, academic, and research \n",
++ " communities. \n",
+ " \@par Useful links:\n",
+ " \@li VTK Home: http://www.vtk.org\n",
+ " \@li VTK Source: https://gitlab.kitware.com/vtk/vtk\n",
+@@ -178,8 +178,8 @@
+ " \@li VTK FAQ: http://www.vtk.org/Wiki/VTK_FAQ\n",
+ " \@li VTK Wiki: http://www.vtk.org/Wiki/\n",
+ " \@li VTK Dashboard: http://www.cdash.org/CDash/index.php?project=VTK\n",
+- " \@li Commercial <a href=\"https://www.kitware.com/products/support.html\">support</a> "
+- " and <a href=\"http://www.kitware.com/products/protraining.php\">training<\a> "
++ " \@li Commercial <a href=\"https://www.kitware.com/products/support.html\">support</a> ",
++ " and <a href=\"http://www.kitware.com/products/protraining.php\">training<\a> ",
+ " are available from Kitware\n",
+ " ",
+ "*/\n\n";
+--- VTK-8.2.0/Utilities/Doxygen/doxyfile.in.orig 2019-01-30 18:15:13.000000000 +0100
++++ VTK-8.2.0/Utilities/Doxygen/doxyfile.in 2021-01-09 21:30:25.895589327 +0100
+@@ -102,6 +102,7 @@
+ COLS_IN_ALPHA_INDEX = 3
+ IGNORE_PREFIX = vtk
+
++EXTRA_PACKAGES = amstext
+ ENABLE_PREPROCESSING = YES
+ MACRO_EXPANSION = YES
+ SEARCH_INCLUDES = YES
+--- VTK-8.2.0/Filters/General/vtkCurvatures.h.orig 2019-01-30 18:15:13.000000000 +0100
++++ VTK-8.2.0/Filters/General/vtkCurvatures.h 2021-01-10 16:44:11.212483671 +0100
+@@ -21,7 +21,7 @@
+ *
+ * Gauss Curvature
+ * discrete Gauss curvature (K) computation,
+- * \f$K(\text{vertex v}) = 2*\pi - \sum_{\text{facet neighbs f of v}} (\text{angle_f at v})\f$.
++ * \f$K(\text{vertex v}) = 2*\pi - \sum_{\text{facet neighbs f of v}} (\text{angle\_f at v})\f$.
+ * The contribution of every facet is for the moment weighted by \f$Area(facet)/3\f$.
+ * The units of Gaussian Curvature are \f$[1/m^2]\f$.
+ *
+@@ -34,13 +34,13 @@
+ * the computation creates the orientation.
+ * The units of Mean Curvature are [1/m].
+ *
+- * Maximum (\f$k_\max\f$) and Minimum (\f$k_\min\f$) Principal Curvatures
+- * \f$k_\max = H + \sqrt{H^2 - K}\f$,
+- * \f$k_\min = H - \sqrt{H^2 - K}\f$
++ * Maximum (\f$k_{max}\f$) and Minimum (\f$k_{min}\f$) Principal Curvatures
++ * \f$k_{max} = H + \sqrt{H^2 - K}\f$,
++ * \f$k_{min} = H - \sqrt{H^2 - K}\f$
+ * Excepting spherical and planar surfaces which have equal principal
+ * curvatures, the curvature at a point on a surface varies with the direction
+ * one "sets off" from the point. For all directions, the curvature will pass
+- * through two extrema: a minimum (\f$k_\min\f$) and a maximum (\f$k_\max\f$)
++ * through two extrema: a minimum (\f$k_{min}\f$) and a maximum (\f$k_{max}\f$)
+ * which occur at mutually orthogonal directions to each other.
+ *
+ * NB. The sign of the Gauss curvature is a geometric invariant, it should be
+@@ -130,12 +130,12 @@
+ void GetMeanCurvature(vtkPolyData *output);
+
+ /**
+- * Maximum principal curvature \f$k_max = H + sqrt(H^2 -K)\f$
++ * Maximum principal curvature \f$k_{max} = H + sqrt(H^2 -K)\f$
+ */
+ void GetMaximumCurvature(vtkPolyData *input, vtkPolyData *output);
+
+ /**
+- * Minimum principal curvature \f$k_min = H - sqrt(H^2 -K)\f$
++ * Minimum principal curvature \f$k_{min} = H - sqrt(H^2 -K)\f$
+ */
+ void GetMinimumCurvature(vtkPolyData *input, vtkPolyData *output);
+
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/vtk.git/commitdiff/bc12798a116fe2989d18a6b47ccb150830a8e5a3
More information about the pld-cvs-commit
mailing list