public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: Rich Mattes <richmattes@gmail.com>
To: git-commits@fedoraproject.org
Subject: [rpms/pcl] f44: Rebuild for new eigen3
Date: Thu, 25 Jun 2026 05:49:21 GMT [thread overview]
Message-ID: <178236656142.1.4172406486135896743.rpms-pcl-61f4ac6c26d8@fedoraproject.org> (raw)
A new commit has been pushed.
Repo : rpms/pcl
Branch : f44
Commit : 61f4ac6c26d81a4fef767a1c53b0960ad40e4094
Author : Rich Mattes <richmattes@gmail.com>
Date : 2014-03-21T18:45:22-04:00
Stats : +41/-22 in 3 file(s)
URL : https://src.fedoraproject.org/rpms/pcl/c/61f4ac6c26d81a4fef767a1c53b0960ad40e4094?branch=f44
Log:
Rebuild for new eigen3
- Set PCL_ROOT to the CMAKE_INSTALL_PREFIX
- Fix usage of VTK_DEFINITIONS (rhbz#1079531)
---
diff --git a/pcl-1.7.0-fedora.patch b/pcl-1.7.0-fedora.patch
deleted file mode 100644
index b233d5a..0000000
--- a/pcl-1.7.0-fedora.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -up ./PCLConfig.cmake.in.fedora ./PCLConfig.cmake.in
---- ./PCLConfig.cmake.in.fedora 2013-07-23 13:21:02.000000000 -0400
-+++ ./PCLConfig.cmake.in 2013-09-08 13:16:48.445021650 -0400
-@@ -267,7 +267,7 @@ macro(find_VTK)
- endif(PCL_ALL_IN_ONE_INSTALLER)
- find_package(VTK ${QUIET_})
- if (VTK_FOUND AND NOT ANDROID)
-- set(VTK_LIBRARIES vtkCommon vtkRendering vtkHybrid vtkCharts)
-+ set(VTK_LIBRARIES vtkCommonCore vtkRenderingCore)
- endif(VTK_FOUND AND NOT ANDROID)
- endmacro(find_VTK)
-
-@@ -492,6 +492,7 @@ else(WIN32 AND NOT MINGW)
- # PCLConfig.cmake is installed to PCL_ROOT/share/pcl-x.y
- get_filename_component(PCL_ROOT "${PCL_DIR}" PATH)
- get_filename_component(PCL_ROOT "${PCL_ROOT}" PATH)
-+ get_filename_component(PCL_ROOT "${PCL_ROOT}" PATH)
- endif(WIN32 AND NOT MINGW)
-
- # check whether PCLConfig.cmake is found into a PCL installation or in a build tree
diff --git a/pcl-1.7.1-fedora.patch b/pcl-1.7.1-fedora.patch
new file mode 100644
index 0000000..275f843
--- /dev/null
+++ b/pcl-1.7.1-fedora.patch
@@ -0,0 +1,34 @@
+diff -up ./PCLConfig.cmake.in.fedora ./PCLConfig.cmake.in
+--- ./PCLConfig.cmake.in.fedora 2013-10-07 09:09:35.000000000 -0400
++++ ./PCLConfig.cmake.in 2014-03-21 16:40:01.057216627 -0400
+@@ -267,7 +267,7 @@ macro(find_VTK)
+ endif(PCL_ALL_IN_ONE_INSTALLER)
+ find_package(VTK ${QUIET_})
+ if (VTK_FOUND AND NOT ANDROID)
+- set(VTK_LIBRARIES vtkCommon vtkRendering vtkHybrid vtkCharts)
++ set(VTK_LIBRARIES vtkCommonCore vtkRenderingCore)
+ endif(VTK_FOUND AND NOT ANDROID)
+ endmacro(find_VTK)
+
+@@ -423,9 +423,9 @@ macro(find_external_library _component _
+ if(${LIB}_LIBRARIES)
+ list(APPEND PCL_${COMPONENT}_LIBRARIES "${${LIB}_LIBRARIES}")
+ endif(${LIB}_LIBRARIES)
+- if(${LIB}_DEFINITIONS)
++ if(${LIB}_DEFINITIONS AND NOT ${LIB} STREQUAL "VTK")
+ list(APPEND PCL_${COMPONENT}_DEFINITIONS ${${LIB}_DEFINITIONS})
+- endif(${LIB}_DEFINITIONS)
++ endif(${LIB}_DEFINITIONS AND NOT ${LIB} STREQUAL "VTK")
+ else(${LIB}_FOUND)
+ if("${_is_optional}" STREQUAL "OPTIONAL")
+ add_definitions("-DDISABLE_${LIB}")
+@@ -490,8 +490,7 @@ if(WIN32 AND NOT MINGW)
+ get_filename_component(PCL_ROOT "${PCL_DIR}" PATH)
+ else(WIN32 AND NOT MINGW)
+ # PCLConfig.cmake is installed to PCL_ROOT/share/pcl-x.y
+- get_filename_component(PCL_ROOT "${PCL_DIR}" PATH)
+- get_filename_component(PCL_ROOT "${PCL_ROOT}" PATH)
++ set(PCL_ROOT "@CMAKE_INSTALL_PREFIX@")
+ endif(WIN32 AND NOT MINGW)
+
+ # check whether PCLConfig.cmake is found into a PCL installation or in a build tree
diff --git a/pcl.spec b/pcl.spec
index 17915ca..b3e08b3 100644
--- a/pcl.spec
+++ b/pcl.spec
@@ -2,7 +2,7 @@
Name: pcl
Version: 1.7.1
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Library for point cloud processing
Group: System Environment/Libraries
@@ -14,7 +14,7 @@ Patch0: %{name}-vtk6.patch
# Patch to compile against system metslib
Patch1: %{name}-1.7.1-metslib.patch
# Patch for PCLConfig.cmake to find pcl
-Patch2: %{name}-1.7.0-fedora.patch
+Patch2: %{name}-1.7.1-fedora.patch
# For plain building
BuildRequires: cmake, gcc-c++, boost-devel
# Documentation
@@ -194,6 +194,11 @@ rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/%{name}-%{apiversion}
%changelog
+* Fri Mar 21 2014 Rich Mattes <richmattes@gmail.com> - 1.7.1-2
+- Rebuild for new eigen3
+- Set PCL_ROOT to the CMAKE_INSTALL_PREFIX
+- Fix usage of VTK_DEFINITIONS (rhbz#1079531)
+
* Sat Oct 26 2013 Rich Mattes <richmattes@gmail.com> - 1.7.1-1
- Update to release 1.7.1
reply other threads:[~2026-06-25 5:49 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=178236656142.1.4172406486135896743.rpms-pcl-61f4ac6c26d8@fedoraproject.org \
--to=richmattes@gmail.com \
--cc=git-commits@fedoraproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox