[packages/pcl] - up to 1.14.1

baggins baggins at pld-linux.org
Fri Dec 20 11:03:24 CET 2024


commit 93dafdc17f692117bff55de13fad31f820d93265
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Fri Dec 20 10:57:20 2024 +0100

    - up to 1.14.1

 boost-1.87.patch | 176 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 boost-hash.patch |  31 ++++++++++
 pcl.spec         | 120 +++++++++++++++++++------------------
 sphinx.patch     |   4 +-
 4 files changed, 272 insertions(+), 59 deletions(-)
---
diff --git a/pcl.spec b/pcl.spec
index beef83c..97d30e1 100644
--- a/pcl.spec
+++ b/pcl.spec
@@ -10,15 +10,17 @@
 Summary:	Point Cloud Library - library for point cloud processing
 Summary(pl.UTF-8):	Point Cloud Library - biblioteka do operacji na chmurze punktów
 Name:		pcl
-Version:	1.11.0
-Release:	7
+Version:	1.14.1
+Release:	1
 License:	BSD
 Group:		Libraries
 #Source0Download: http://pointclouds.org/downloads/
 Source0:	https://github.com/PointCloudLibrary/pcl/archive/%{name}-%{version}.tar.gz
-# Source0-md5:	3352d2d78a129c24ec27b863eed8a175
+# Source0-md5:	cba2020adeb705ea178ee6365bd84368
 Patch0:		oom.patch
 Patch1:		sphinx.patch
+Patch2:		boost-1.87.patch
+Patch3:		boost-hash.patch
 URL:		http://pointclouds.org/
 BuildRequires:	OpenGL-devel
 BuildRequires:	OpenGL-GLU-devel
@@ -36,8 +38,13 @@ BuildRequires:	libpcap-devel
 BuildRequires:	libpng-devel
 BuildRequires:	libstdc++-devel
 BuildRequires:	libusb-devel >= 1.0
-BuildRequires:	netcdf-cxx-devel
+BuildRequires:	netcdf-cxx4-devel
 BuildRequires:	qhull-devel
+# because qhull cmake is broken
+BuildRequires:	qhull-static
+BuildRequires:	qhull-c++-devel
+# because qhull-c++ cmake is broken
+BuildRequires:	qhull-c++-static
 BuildRequires:	qt4-build >= 4
 BuildRequires:	python
 BuildRequires:	rpm-build >= 4.6
@@ -108,8 +115,10 @@ Dokumentacja API oraz wprowadzenie do biblioteki PCL.
 
 %prep
 %setup -q -n pcl-pcl-%{version}
-%patch0 -p1
-%patch1 -p1
+%patch -P 0 -p1
+%patch -P 1 -p1
+%patch -P 2 -p1
+%patch -P 3 -p1
 
 %build
 mkdir -p build
@@ -168,9 +177,6 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/pcl_obj2pcd
 %attr(755,root,root) %{_bindir}/pcl_obj2ply
 %attr(755,root,root) %{_bindir}/pcl_openni2_viewer
-%attr(755,root,root) %{_bindir}/pcl_outofcore_print
-%attr(755,root,root) %{_bindir}/pcl_outofcore_process
-%attr(755,root,root) %{_bindir}/pcl_outofcore_viewer
 %attr(755,root,root) %{_bindir}/pcl_pcd_change_viewpoint
 %attr(755,root,root) %{_bindir}/pcl_pcd_convert_NaN_nan
 %attr(755,root,root) %{_bindir}/pcl_pcd_introduce_nan
@@ -245,46 +251,46 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/pcl_vtk2ply
 %endif
 %attr(755,root,root) %{_libdir}/libpcl_common.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libpcl_common.so.1.11
+%attr(755,root,root) %ghost %{_libdir}/libpcl_common.so.1.14
 %attr(755,root,root) %{_libdir}/libpcl_features.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libpcl_features.so.1.11
+%attr(755,root,root) %ghost %{_libdir}/libpcl_features.so.1.14
 %attr(755,root,root) %{_libdir}/libpcl_filters.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libpcl_filters.so.1.11
+%attr(755,root,root) %ghost %{_libdir}/libpcl_filters.so.1.14
 %attr(755,root,root) %{_libdir}/libpcl_io.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libpcl_io.so.1.11
+%attr(755,root,root) %ghost %{_libdir}/libpcl_io.so.1.14
 %attr(755,root,root) %{_libdir}/libpcl_io_ply.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libpcl_io_ply.so.1.11
+%attr(755,root,root) %ghost %{_libdir}/libpcl_io_ply.so.1.14
 %attr(755,root,root) %{_libdir}/libpcl_kdtree.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libpcl_kdtree.so.1.11
+%attr(755,root,root) %ghost %{_libdir}/libpcl_kdtree.so.1.14
 %attr(755,root,root) %{_libdir}/libpcl_keypoints.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libpcl_keypoints.so.1.11
+%attr(755,root,root) %ghost %{_libdir}/libpcl_keypoints.so.1.14
 %attr(755,root,root) %{_libdir}/libpcl_octree.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libpcl_octree.so.1.11
+%attr(755,root,root) %ghost %{_libdir}/libpcl_octree.so.1.14
 %attr(755,root,root) %{_libdir}/libpcl_outofcore.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libpcl_outofcore.so.1.11
+%attr(755,root,root) %ghost %{_libdir}/libpcl_outofcore.so.1.14
 %attr(755,root,root) %{_libdir}/libpcl_recognition.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libpcl_recognition.so.1.11
+%attr(755,root,root) %ghost %{_libdir}/libpcl_recognition.so.1.14
 %attr(755,root,root) %{_libdir}/libpcl_registration.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libpcl_registration.so.1.11
+%attr(755,root,root) %ghost %{_libdir}/libpcl_registration.so.1.14
 %attr(755,root,root) %{_libdir}/libpcl_sample_consensus.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libpcl_sample_consensus.so.1.11
+%attr(755,root,root) %ghost %{_libdir}/libpcl_sample_consensus.so.1.14
 %attr(755,root,root) %{_libdir}/libpcl_search.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libpcl_search.so.1.11
+%attr(755,root,root) %ghost %{_libdir}/libpcl_search.so.1.14
 %attr(755,root,root) %{_libdir}/libpcl_segmentation.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libpcl_segmentation.so.1.11
+%attr(755,root,root) %ghost %{_libdir}/libpcl_segmentation.so.1.14
 %attr(755,root,root) %{_libdir}/libpcl_surface.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libpcl_surface.so.1.11
+%attr(755,root,root) %ghost %{_libdir}/libpcl_surface.so.1.14
 %attr(755,root,root) %{_libdir}/libpcl_tracking.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libpcl_tracking.so.1.11
+%attr(755,root,root) %ghost %{_libdir}/libpcl_tracking.so.1.14
 %attr(755,root,root) %{_libdir}/libpcl_ml.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libpcl_ml.so.1.11
+%attr(755,root,root) %ghost %{_libdir}/libpcl_ml.so.1.14
 %attr(755,root,root) %{_libdir}/libpcl_stereo.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libpcl_stereo.so.1.11
+%attr(755,root,root) %ghost %{_libdir}/libpcl_stereo.so.1.14
 %if %{with vtk}
 %attr(755,root,root) %{_libdir}/libpcl_people.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libpcl_people.so.1.11
+%attr(755,root,root) %ghost %{_libdir}/libpcl_people.so.1.14
 %attr(755,root,root) %{_libdir}/libpcl_visualization.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libpcl_visualization.so.1.11
+%attr(755,root,root) %ghost %{_libdir}/libpcl_visualization.so.1.14
 %endif
 
 %files devel
@@ -311,38 +317,38 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/libpcl_people.so
 %attr(755,root,root) %{_libdir}/libpcl_visualization.so
 %endif
-%{_includedir}/pcl-1.11
-%{_pkgconfigdir}/pcl_common-1.11.pc
-%{_pkgconfigdir}/pcl_features-1.11.pc
-%{_pkgconfigdir}/pcl_filters-1.11.pc
-%{_pkgconfigdir}/pcl_geometry-1.11.pc
-%{_pkgconfigdir}/pcl_io-1.11.pc
-%{_pkgconfigdir}/pcl_kdtree-1.11.pc
-%{_pkgconfigdir}/pcl_keypoints-1.11.pc
-%{_pkgconfigdir}/pcl_octree-1.11.pc
-%{_pkgconfigdir}/pcl_outofcore-1.11.pc
-%{_pkgconfigdir}/pcl_recognition-1.11.pc
-%{_pkgconfigdir}/pcl_registration-1.11.pc
-%{_pkgconfigdir}/pcl_sample_consensus-1.11.pc
-%{_pkgconfigdir}/pcl_search-1.11.pc
-%{_pkgconfigdir}/pcl_segmentation-1.11.pc
-%{_pkgconfigdir}/pcl_surface-1.11.pc
-%{_pkgconfigdir}/pcl_tracking-1.11.pc
-%{_pkgconfigdir}/pcl_2d-1.11.pc
-%{_pkgconfigdir}/pcl_ml-1.11.pc
-%{_pkgconfigdir}/pcl_stereo-1.11.pc
+%{_includedir}/pcl-1.14
+%{_pkgconfigdir}/pcl_common.pc
+%{_pkgconfigdir}/pcl_features.pc
+%{_pkgconfigdir}/pcl_filters.pc
+%{_pkgconfigdir}/pcl_geometry.pc
+%{_pkgconfigdir}/pcl_io.pc
+%{_pkgconfigdir}/pcl_kdtree.pc
+%{_pkgconfigdir}/pcl_keypoints.pc
+%{_pkgconfigdir}/pcl_octree.pc
+%{_pkgconfigdir}/pcl_outofcore.pc
+%{_pkgconfigdir}/pcl_recognition.pc
+%{_pkgconfigdir}/pcl_registration.pc
+%{_pkgconfigdir}/pcl_sample_consensus.pc
+%{_pkgconfigdir}/pcl_search.pc
+%{_pkgconfigdir}/pcl_segmentation.pc
+%{_pkgconfigdir}/pcl_surface.pc
+%{_pkgconfigdir}/pcl_tracking.pc
+%{_pkgconfigdir}/pcl_2d.pc
+%{_pkgconfigdir}/pcl_ml.pc
+%{_pkgconfigdir}/pcl_stereo.pc
 %if %{with vtk}
-%{_pkgconfigdir}/pcl_people-1.11.pc
-%{_pkgconfigdir}/pcl_visualization-1.11.pc
+%{_pkgconfigdir}/pcl_people.pc
+%{_pkgconfigdir}/pcl_visualization.pc
 %endif
-%dir %{_datadir}/pcl-1.11
-%{_datadir}/pcl-1.11/PCLConfig*.cmake
+%dir %{_datadir}/pcl-1.14
+%{_datadir}/pcl-1.14/PCLConfig*.cmake
 
 %if %{with apidocs}
 %files apidocs
 %defattr(644,root,root,755)
-%dir %{_docdir}/pcl-1.11
-%{_docdir}/pcl-1.11/advanced
-%{_docdir}/pcl-1.11/html
-%{_docdir}/pcl-1.11/tutorials
+%dir %{_docdir}/pcl-1.14
+%{_docdir}/pcl-1.14/advanced
+%{_docdir}/pcl-1.14/html
+%{_docdir}/pcl-1.14/tutorials
 %endif
diff --git a/boost-1.87.patch b/boost-1.87.patch
new file mode 100644
index 0000000..90b798d
--- /dev/null
+++ b/boost-1.87.patch
@@ -0,0 +1,176 @@
+From 6f64495840c4e5674d542ccf20df96ed12665687 Mon Sep 17 00:00:00 2001
+From: Markus Vieth <mvieth at techfak.uni-bielefeld.de>
+Date: Tue, 5 Nov 2024 20:07:13 +0100
+Subject: [PATCH] Prepare for Boost 1.87 Some stuff from Boost's asio library
+ has been removed after Boost 1.86. The documentation says that it has been
+ deprecated, but no compiler warnings are shown. This page explains what is
+ considered "old" and what should be used instead: 
+ https://www.boost.org/doc/libs/1_86_0/doc/html/boost_asio/net_ts.html -
+ io_service was simply an alias (typedef) for io_context - make_address
+ replaces from_string - resolver.resolve and connect work a bit different now,
+ see also
+ https://www.boost.org/doc/libs/1_86_0/doc/html/boost_asio/tutorial/tutdaytime1/src.html
+
+---
+ apps/src/openni_mobile_server.cpp         | 2 +-
+ apps/src/openni_octree_compression.cpp    | 4 ++--
+ apps/src/openni_organized_compression.cpp | 4 ++--
+ io/include/pcl/io/hdl_grabber.h           | 2 +-
+ io/include/pcl/io/robot_eye_grabber.h     | 2 +-
+ io/include/pcl/io/tim_grabber.h           | 2 +-
+ io/src/hdl_grabber.cpp                    | 2 +-
+ io/src/robot_eye_grabber.cpp              | 2 +-
+ io/src/tim_grabber.cpp                    | 4 ++--
+ io/src/vlp_grabber.cpp                    | 2 +-
+ 10 files changed, 13 insertions(+), 13 deletions(-)
+
+diff --git a/apps/src/openni_mobile_server.cpp b/apps/src/openni_mobile_server.cpp
+index bf6778d1ff5..aee1892abf6 100644
+--- a/apps/src/openni_mobile_server.cpp
++++ b/apps/src/openni_mobile_server.cpp
+@@ -157,7 +157,7 @@ class PCLMobileServer {
+ 
+     viewer_.showCloud(getLatestPointCloud());
+ 
+-    boost::asio::io_service io_service;
++    boost::asio::io_context io_service;
+     tcp::endpoint endpoint(tcp::v4(), static_cast<unsigned short>(port_));
+     tcp::acceptor acceptor(io_service, endpoint);
+     tcp::socket socket(io_service);
+diff --git a/apps/src/openni_octree_compression.cpp b/apps/src/openni_octree_compression.cpp
+index 0a056054f34..4592cbd3407 100644
+--- a/apps/src/openni_octree_compression.cpp
++++ b/apps/src/openni_octree_compression.cpp
+@@ -415,7 +415,7 @@ main(int argc, char** argv)
+     if (bEnDecode) {
+       // ENCODING
+       try {
+-        boost::asio::io_service io_service;
++        boost::asio::io_context io_service;
+         tcp::endpoint endpoint(tcp::v4(), 6666);
+         tcp::acceptor acceptor(io_service, endpoint);
+ 
+@@ -423,7 +423,7 @@ main(int argc, char** argv)
+ 
+         std::cout << "Waiting for connection.." << std::endl;
+ 
+-        acceptor.accept(*socketStream.rdbuf());
++        acceptor.accept(socketStream.rdbuf()->socket());
+ 
+         std::cout << "Connected!" << std::endl;
+ 
+diff --git a/apps/src/openni_organized_compression.cpp b/apps/src/openni_organized_compression.cpp
+index c0448bde55d..f68314f4bf7 100644
+--- a/apps/src/openni_organized_compression.cpp
++++ b/apps/src/openni_organized_compression.cpp
+@@ -438,7 +438,7 @@ main(int argc, char** argv)
+     if (bEnDecode) {
+       // ENCODING
+       try {
+-        boost::asio::io_service io_service;
++        boost::asio::io_context io_service;
+         tcp::endpoint endpoint(tcp::v4(), 6666);
+         tcp::acceptor acceptor(io_service, endpoint);
+ 
+@@ -446,7 +446,7 @@ main(int argc, char** argv)
+ 
+         std::cout << "Waiting for connection.." << std::endl;
+ 
+-        acceptor.accept(*socketStream.rdbuf());
++        acceptor.accept(socketStream.rdbuf()->socket());
+ 
+         std::cout << "Connected!" << std::endl;
+ 
+diff --git a/io/include/pcl/io/hdl_grabber.h b/io/include/pcl/io/hdl_grabber.h
+index f149346b4a3..233ff2642be 100644
+--- a/io/include/pcl/io/hdl_grabber.h
++++ b/io/include/pcl/io/hdl_grabber.h
+@@ -274,7 +274,7 @@ namespace pcl
+       boost::asio::ip::udp::endpoint udp_listener_endpoint_;
+       boost::asio::ip::address source_address_filter_;
+       std::uint16_t source_port_filter_;
+-      boost::asio::io_service hdl_read_socket_service_;
++      boost::asio::io_context hdl_read_socket_service_;
+       boost::asio::ip::udp::socket *hdl_read_socket_;
+       std::string pcap_file_name_;
+       std::thread *queue_consumer_thread_;
+diff --git a/io/include/pcl/io/robot_eye_grabber.h b/io/include/pcl/io/robot_eye_grabber.h
+index 52485049d02..4ed975d50e6 100644
+--- a/io/include/pcl/io/robot_eye_grabber.h
++++ b/io/include/pcl/io/robot_eye_grabber.h
+@@ -131,7 +131,7 @@ namespace pcl
+ 
+       boost::asio::ip::address sensor_address_;
+       boost::asio::ip::udp::endpoint sender_endpoint_;
+-      boost::asio::io_service io_service_;
++      boost::asio::io_context io_service_;
+       std::shared_ptr<boost::asio::ip::udp::socket> socket_;
+       std::shared_ptr<std::thread> socket_thread_;
+       std::shared_ptr<std::thread> consumer_thread_;
+diff --git a/io/include/pcl/io/tim_grabber.h b/io/include/pcl/io/tim_grabber.h
+index 786e501b967..91d8148c9a8 100644
+--- a/io/include/pcl/io/tim_grabber.h
++++ b/io/include/pcl/io/tim_grabber.h
+@@ -128,7 +128,7 @@ class PCL_EXPORTS TimGrabber : public Grabber
+     std::vector<float> distances_;
+ 
+     boost::asio::ip::tcp::endpoint tcp_endpoint_;
+-    boost::asio::io_service tim_io_service_;
++    boost::asio::io_context tim_io_service_;
+     boost::asio::ip::tcp::socket tim_socket_;
+     //// wait time for receiving data (on the order of milliseconds)
+     unsigned int wait_time_milliseconds_ = 0;
+diff --git a/io/src/hdl_grabber.cpp b/io/src/hdl_grabber.cpp
+index c54f68edf37..adce104ad0a 100644
+--- a/io/src/hdl_grabber.cpp
++++ b/io/src/hdl_grabber.cpp
+@@ -287,7 +287,7 @@ pcl::HDLGrabber::loadHDL32Corrections ()
+ boost::asio::ip::address
+ pcl::HDLGrabber::getDefaultNetworkAddress ()
+ {
+-  return (boost::asio::ip::address::from_string ("192.168.3.255"));
++  return (boost::asio::ip::make_address ("192.168.3.255"));
+ }
+ 
+ /////////////////////////////////////////////////////////////////////////////
+diff --git a/io/src/robot_eye_grabber.cpp b/io/src/robot_eye_grabber.cpp
+index 2db6da17906..22574a2bd23 100644
+--- a/io/src/robot_eye_grabber.cpp
++++ b/io/src/robot_eye_grabber.cpp
+@@ -269,7 +269,7 @@ void
+ pcl::RobotEyeGrabber::socketThreadLoop ()
+ {
+   asyncSocketReceive();
+-  io_service_.reset();
++  io_service_.restart();
+   io_service_.run();
+ }
+ 
+diff --git a/io/src/tim_grabber.cpp b/io/src/tim_grabber.cpp
+index a97b9e374da..953f7bc3e9a 100644
+--- a/io/src/tim_grabber.cpp
++++ b/io/src/tim_grabber.cpp
+@@ -184,8 +184,8 @@ pcl::TimGrabber::start ()
+ 
+   try {
+     boost::asio::ip::tcp::resolver resolver (tim_io_service_);
+-    tcp_endpoint_ = *resolver.resolve (tcp_endpoint_);
+-    tim_socket_.connect (tcp_endpoint_);
++    boost::asio::ip::tcp::resolver::results_type endpoints = resolver.resolve (tcp_endpoint_);
++    boost::asio::connect(tim_socket_, endpoints);
+   }
+   catch (std::exception& e)
+   {
+diff --git a/io/src/vlp_grabber.cpp b/io/src/vlp_grabber.cpp
+index b35087b74b9..8e95b98189d 100644
+--- a/io/src/vlp_grabber.cpp
++++ b/io/src/vlp_grabber.cpp
+@@ -92,7 +92,7 @@ pcl::VLPGrabber::loadVLP16Corrections ()
+ boost::asio::ip::address
+ pcl::VLPGrabber::getDefaultNetworkAddress ()
+ {
+-  return (boost::asio::ip::address::from_string ("255.255.255.255"));
++  return (boost::asio::ip::make_address ("255.255.255.255"));
+ }
+ 
+ /////////////////////////////////////////////////////////////////////////////
diff --git a/boost-hash.patch b/boost-hash.patch
new file mode 100644
index 0000000..8f99023
--- /dev/null
+++ b/boost-hash.patch
@@ -0,0 +1,31 @@
+From c6bbf02a084a39a02d9e2fc318a59fe2f1ff55c1 Mon Sep 17 00:00:00 2001
+From: Transporter <OgreTransporter at users.noreply.github.com>
+Date: Sun, 26 May 2024 10:37:57 +0200
+Subject: [PATCH] Fix boost hash data type (#6053)
+
+* Fix boost hash data type
+
+* Change file name generation.
+---
+ visualization/src/pcl_visualizer.cpp | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/visualization/src/pcl_visualizer.cpp b/visualization/src/pcl_visualizer.cpp
+index 5f073646ac1..bc9b959c246 100644
+--- a/visualization/src/pcl_visualizer.cpp
++++ b/visualization/src/pcl_visualizer.cpp
+@@ -4591,10 +4591,12 @@ pcl::visualization::PCLVisualizer::getUniqueCameraFile (int argc, char **argv)
+     // Build camera filename
+     if (valid)
+     {
+-      unsigned int digest[5];
++      boost::uuids::detail::sha1::digest_type digest;
+       sha1.get_digest (digest);
+       sstream << ".";
+-      sstream << std::hex << digest[0] << digest[1] << digest[2] << digest[3] << digest[4];
++      for (int i = 0; i < 5; ++i) {
++        sstream << std::hex << *(reinterpret_cast<unsigned int*>(&digest[0]) + i);
++      }
+       sstream << ".cam";
+     }
+   }
diff --git a/sphinx.patch b/sphinx.patch
index f942ac4..bd2fa4e 100644
--- a/sphinx.patch
+++ b/sphinx.patch
@@ -5,7 +5,7 @@ diff -up ./doc/advanced/content/conf.py.sphinx ./doc/advanced/content/conf.py
  # -- General configuration -----------------------------------------------------
  # Add any Sphinx extension module names here, as strings. They can be extensions
  # coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
--extensions = ['sphinx.ext.imgmath', 'sphinxcontrib.doxylink.doxylink']
+-extensions = ['sphinx.ext.imgmath', 'sphinxcontrib.doxylink']
 +extensions = ['sphinx.ext.imgmath']
  
  # Add any paths that contain templates here, relative to this directory.
@@ -26,7 +26,7 @@ diff -up ./doc/tutorials/content/conf.py.sphinx ./doc/tutorials/content/conf.py
  # -- General configuration -----------------------------------------------------
  # Add any Sphinx extension module names here, as strings. They can be extensions
  # coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
--extensions = ['sphinx.ext.imgmath', 'sphinxcontrib.doxylink.doxylink']
+-extensions = ['sphinx.ext.imgmath', 'sphinxcontrib.doxylink']
 +extensions = ['sphinx.ext.imgmath']
  imgmath_dvipng_args = ['-gamma', '1.5', '-D', '110', '-bg', 'Transparent']
  
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/pcl.git/commitdiff/93dafdc17f692117bff55de13fad31f820d93265



More information about the pld-cvs-commit mailing list