rpms / pcl

Clone
Source Code
GIT

#9 Update to 1.13.1
Opened 6 months ago by orion. Modified 5 months ago
rpms/ orion/pcl 1.13  into  rawhide

Merge
file modified
+1 
@@ -16,3 +16,4 @@ 
 

  /pcl-1.11.0-fedora.tar.xz
 

  /pcl-1.11.1-fedora.tar.xz
 

  /pcl-1.12.0-fedora.tar.xz
 

+ /pcl-1.13.1-fedora.tar.xz

file removed
-12 
@@ -1,12 +0,0 @@ 
 

- diff -up ./cmake/pcl_find_boost.cmake.boost176 ./cmake/pcl_find_boost.cmake
 

- --- ./cmake/pcl_find_boost.cmake.boost176	2021-08-17 16:31:49.409431064 -0400
 

- +++ ./cmake/pcl_find_boost.cmake	2021-08-17 16:32:59.617234098 -0400
 

- @@ -28,7 +28,7 @@ if(Boost_SERIALIZATION_FOUND)
 

-  endif()
 

-  

-  # Required boost modules
 

- -set(BOOST_REQUIRED_MODULES filesystem date_time iostreams system)
 

- +set(BOOST_REQUIRED_MODULES filesystem date_time iostreams serialization system)
 

-  find_package(Boost 1.65.0 REQUIRED COMPONENTS ${BOOST_REQUIRED_MODULES})
 

-  

-  if(Boost_FOUND)

file modified
-43 
@@ -365,49 +365,6 @@ 
 

  +  //PCL_INSTANTIATE_PRODUCT(MovingLeastSquares, (PCL_XYZ_POINT_TYPES)(PCL_XYZ_POINT_TYPES))
 

  +#endif
 

  +#endif    // PCL_NO_PRECOMPILE
 

- Index: pcl-1.12.0/surface/include/pcl/surface/impl/mls.hpp
 

- ===================================================================
 

- --- pcl-1.12.0.orig/surface/include/pcl/surface/impl/mls.hpp
 

- +++ pcl-1.12.0/surface/include/pcl/surface/impl/mls.hpp
 

- @@ -533,38 +533,6 @@ pcl::MLSResult::getPolynomialPartialDeri
 

-    return (d);
 

-  }
 

-  

- -Eigen::Vector2f
 

- -pcl::MLSResult::calculatePrincipalCurvatures (const double u, const double v) const
 

- -{
 

- -  Eigen::Vector2f k (1e-5, 1e-5);
 

- -
 

- -  // Note: this use the Monge Patch to derive the Gaussian curvature and Mean Curvature found here http://mathworld.wolfram.com/MongePatch.html
 

- -  // Then:
 

- -  //      k1 = H + sqrt(H^2 - K)
 

- -  //      k2 = H - sqrt(H^2 - K)
 

- -  if (order > 1 && c_vec.size () >= (order + 1) * (order + 2) / 2 && std::isfinite (c_vec[0]))
 

- -  {
 

- -    const PolynomialPartialDerivative d = getPolynomialPartialDerivative (u, v);
 

- -    const double Z = 1 + d.z_u * d.z_u + d.z_v * d.z_v;
 

- -    const double Zlen = std::sqrt (Z);
 

- -    const double K = (d.z_uu * d.z_vv - d.z_uv * d.z_uv) / (Z * Z);
 

- -    const double H = ((1.0 + d.z_v * d.z_v) * d.z_uu - 2.0 * d.z_u * d.z_v * d.z_uv + (1.0 + d.z_u * d.z_u) * d.z_vv) / (2.0 * Zlen * Zlen * Zlen);
 

- -    const double disc2 = H * H - K;
 

- -    assert (disc2 >= 0.0);
 

- -    const double disc = std::sqrt (disc2);
 

- -    k[0] = H + disc;
 

- -    k[1] = H - disc;
 

- -
 

- -    if (std::abs (k[0]) > std::abs (k[1])) std::swap (k[0], k[1]);
 

- -  }
 

- -  else
 

- -  {
 

- -    PCL_ERROR ("No Polynomial fit data, unable to calculate the principal curvatures!\n");
 

- -  }
 

- -
 

- -  return (k);
 

- -}
 

- -
 

-  pcl::MLSResult::MLSProjectionResults
 

-  pcl::MLSResult::projectPointOrthogonalToPolynomialSurface (const double u, const double v, const double w) const
 

-  {
 

  Index: pcl-1.12.0/surface/src/mls_calculatePrincipalCurvatures.hpp
 

  ===================================================================
 

  --- /dev/null

file modified
-21 
@@ -1,26 +1,5 @@ 
 

  --- pcl-pcl-1.12.0/cmake/pcl_find_sse.cmake	2021-08-13 13:31:26.035282081 -0700
 

  +++ pcl-pcl-1.12.0/cmake/pcl_find_sse.cmake.new	2021-08-13 13:31:31.965314984 -0700
 

- @@ -4,20 +4,6 @@
 

-    set(SSE_FLAGS)
 

-    set(SSE_DEFINITIONS)
 

-  

- -  if(NOT CMAKE_CROSSCOMPILING)
 

- -    # Test GCC/G++ and CLANG
 

- -    if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX OR CMAKE_COMPILER_IS_CLANG)
 

- -      include(CheckCXXCompilerFlag)
 

- -      check_cxx_compiler_flag("-march=native" HAVE_MARCH)
 

- -      if(HAVE_MARCH)
 

- -          list(APPEND SSE_FLAGS "-march=native")
 

- -      else()
 

- -          list(APPEND SSE_FLAGS "-mtune=native")
 

- -      endif()
 

- -      message(STATUS "Using CPU native flags for SSE optimization: ${SSE_FLAGS}")
 

- -    endif()
 

- -  endif()
 

- -
 

-    # Unfortunately we need to check for SSE to enable "-mfpmath=sse" alongside
 

-    # "-march=native". The reason for this is that by default, 32bit architectures
 

-    # tend to use the x87 FPU (which has 80 bit internal precision), thus leading
 

  @@ -203,21 +189,9 @@
 

     endif()

pcl-sphinx.patch pcl-1.11.0-sphinx.patch
file renamed
+8 -8 
@@ -1,11 +1,11 @@ 
 

- diff -up ./doc/advanced/content/conf.py.sphinx ./doc/advanced/content/conf.py
 

- --- ./doc/advanced/content/conf.py.sphinx	2020-05-11 04:59:26.000000000 -0400
 

- +++ ./doc/advanced/content/conf.py	2020-06-07 16:11:04.398144850 -0400
 

+ diff -up pcl-1.13.1/doc/advanced/content/conf.py.sphinx pcl-1.13.1/doc/advanced/content/conf.py
 

+ --- pcl-1.13.1/doc/advanced/content/conf.py.sphinx	2023-05-10 00:44:47.000000000 -0600
 

+ +++ pcl-1.13.1/doc/advanced/content/conf.py	2023-11-05 11:36:09.007034163 -0700
 

  @@ -4,7 +4,7 @@
 

   # -- 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.
 
@@ -19,14 +19,14 @@ 
 

   

   # Theme options are theme-specific and customize the look and feel of a theme
 

   # further.  For a list of options available for each theme, see the
 

- diff -up ./doc/tutorials/content/conf.py.sphinx ./doc/tutorials/content/conf.py
 

- --- ./doc/tutorials/content/conf.py.sphinx	2020-05-11 04:59:26.000000000 -0400
 

- +++ ./doc/tutorials/content/conf.py	2020-06-07 16:10:46.555225064 -0400
 

+ diff -up pcl-1.13.1/doc/tutorials/content/conf.py.sphinx pcl-1.13.1/doc/tutorials/content/conf.py
 

+ --- pcl-1.13.1/doc/tutorials/content/conf.py.sphinx	2023-05-10 00:44:47.000000000 -0600
 

+ +++ pcl-1.13.1/doc/tutorials/content/conf.py	2023-11-05 11:35:37.774757630 -0700
 

  @@ -4,7 +4,7 @@
 

   # -- 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']

file modified
+17 -14 
@@ -1,9 +1,9 @@ 
 

  %undefine __cmake_in_source_build
 

- %global apiversion 1.12
 

- %global soversion 1.12
 

+ %global apiversion 1.13
 

+ %global soversion 1.13
 

  

  Name:           pcl
 

- Version:        1.12.0
 

+ Version:        1.13.1
 

  Release:        %autorelease
 

  Summary:        Library for point cloud processing
 

  License:        BSD
 
@@ -25,8 +25,7 @@ 
 

  # Split up explicit template instantiations so that builders don't run out of memory
 

  Patch4:         %{name}-1.12.0-oom.patch
 

  # Use a built-in sphinx documentation theme and disable doxylink plugin
 

- Patch5:         %{name}-1.11.0-sphinx.patch
 

- Patch6:         %{name}-1.12.0-boost176.patch
 

+ Patch5:         %{name}-sphinx.patch
 

  

  # For plain building
 

  BuildRequires:  cmake, gcc-c++, boost-devel
 
@@ -35,14 +34,18 @@ 
 

  

  # mandatory
 

  BuildRequires:  eigen3-static, flann-devel, vtk-devel, gl2ps-devel, hdf5-devel, libxml2-devel, netcdf-cxx-devel, jsoncpp-devel, metslib-static, libXext-devel
 

+ BuildRequires:  libatomic
 

  

  # To fix Imported target "VTK::Java" includes non-existent path "/usr/lib/jvm/java/include" in its INTERFACE_INCLUDE_DIRECTORIES
 

  %ifarch %{java_arches}
 

  BuildRequires:  java-devel
 

  %endif
 

  

- # optional
 

- BuildRequires:  qt5-qtbase-devel, qhull-devel, libusbx-devel, gtest-devel, qt5-qtwebkit-devel
 

+ # docs
 

+ BuildRequires:  /usr/bin/latex
 

+ 

+ # optional - qt deps will be pulled in by vtk-devel
 

+ BuildRequires:  qhull-devel, libusbx-devel, gtest-devel
 

  %ifarch x86_64
 

  BuildRequires:  openni-devel
 

  %endif
 
@@ -89,13 +92,12 @@ 
 

  

  %prep
 

  %setup -qn %{name}-%{version}
 

- %patch0 -p1 -b .sse2
 

- %patch1 -p1 -b .metslib
 

- %patch2 -p0 -b .fedora
 

- %patch3 -p0 -b .doxyfix
 

- %patch4 -p1 -b .oom
 

- %patch5 -p1 -b .sphinx
 

- %patch6 -p1 -b .boost176
 

+ %patch -P0 -p1 -b .sse2
 

+ %patch -P1 -p1 -b .metslib
 

+ %patch -P2 -p0 -b .fedora
 

+ %patch -P3 -p0 -b .doxyfix
 

+ %patch -P4 -p1 -b .oom
 

+ %patch -P5 -p1 -b .sphinx
 

  

  # Just to make it obvious we're not using any of these
 

  rm -fr recognition/include/pcl/recognition/3rdparty/metslib
 
@@ -119,6 +121,7 @@ 
 

    -DBUILD_global_tests=OFF \
 

    -DOPENNI_INCLUDE_DIR:PATH=/usr/include/ni \
 

    -DLIB_INSTALL_DIR=%{_lib} \
 

+   -DPCL_ENABLE_MARCHNATIVE=OFF \
 

  %ifarch x86_64
 

    -DPCL_ENABLE_SSE=ON \
 

  %else

file modified
+1 -1 
@@ -1,1 +1,1 @@ 
 

- SHA512 (pcl-1.12.0-fedora.tar.xz) = 0aa4bec392c304f6f8086c9c316383da90fe2d7ae5c095d51f9ac8ce680c3addd27c61a8e6240c8367b5e57eb20b608b9e146c1b0ba3ce232be3e31b259b0c1d
 

+ SHA512 (pcl-1.13.1-fedora.tar.xz) = 775785623ce71af1075bd0c0e06342b87d5e386944203a77e7393ef495785ee612fbc01c4d8fee515bdf3f740ec4688079a0d2a382b37073a58e455b6be20fa3

Powered by Pagure 5.13.3
Documentation • File an Issue • About this Instance • SSH Hostkey/Fingerprint
© Red Hat, Inc. and others.