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: Fix patch to PCLConfig.cmake
Date: Thu, 25 Jun 2026 05:49:32 GMT [thread overview]
Message-ID: <178236657215.1.4731613219074487627.rpms-pcl-d608a77f4d36@fedoraproject.org> (raw)
A new commit has been pushed.
Repo : rpms/pcl
Branch : f44
Commit : d608a77f4d3604d805384cf1dc6a20cc870d6bcc
Author : Rich Mattes <richmattes@gmail.com>
Date : 2016-02-06T11:55:05-05:00
Stats : +17/-63 in 3 file(s)
URL : https://src.fedoraproject.org/rpms/pcl/c/d608a77f4d3604d805384cf1dc6a20cc870d6bcc?branch=f44
Log:
Fix patch to PCLConfig.cmake
---
diff --git a/pcl-1.7.2-fedora.patch b/pcl-1.7.2-fedora.patch
deleted file mode 100644
index 9eb4142..0000000
--- a/pcl-1.7.2-fedora.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-diff -up ./cmake/Modules/FindOpenNI.cmake.fedora ./cmake/Modules/FindOpenNI.cmake
---- ./cmake/Modules/FindOpenNI.cmake.fedora 2014-12-29 18:12:59.205739334 -0500
-+++ ./cmake/Modules/FindOpenNI.cmake 2014-12-29 18:16:37.424909703 -0500
-@@ -35,9 +35,9 @@ if(NOT WIN32)
- endif(NOT WIN32)
-
- if(${CMAKE_VERSION} VERSION_LESS 2.8.2)
-- pkg_check_modules(PC_OPENNI openni-dev)
-+ pkg_check_modules(PC_OPENNI libopenni)
- else()
-- pkg_check_modules(PC_OPENNI QUIET openni-dev)
-+ pkg_check_modules(PC_OPENNI QUIET libopenni)
- endif()
-
- set(OPENNI_DEFINITIONS ${PC_OPENNI_CFLAGS_OTHER})
-diff -up ./io/CMakeLists.txt.fedora ./io/CMakeLists.txt
---- ./io/CMakeLists.txt.fedora 2014-12-29 18:14:25.433288473 -0500
-+++ ./io/CMakeLists.txt 2014-12-29 18:15:03.963664909 -0500
-@@ -329,7 +329,7 @@ if(build)
- set(EXT_DEPS eigen3)
-
- if(OPENNI_FOUND)
-- list(APPEND EXT_DEPS openni-dev)
-+ list(APPEND EXT_DEPS libopenni)
- endif(OPENNI_FOUND)
- if(OPENNI2_FOUND)
- list(APPEND EXT_DEPS openni2-dev)
-diff -up ./PCLConfig.cmake.in.fedora ./PCLConfig.cmake.in
---- ./PCLConfig.cmake.in.fedora 2014-09-10 17:22:57.000000000 -0400
-+++ ./PCLConfig.cmake.in 2014-12-29 18:14:06.106814594 -0500
-@@ -182,7 +182,7 @@ macro(find_openni)
- endif(NOT OPENNI_ROOT AND ("@HAVE_OPENNI@" STREQUAL "ON"))
-
- if(PKG_CONFIG_FOUND)
-- pkg_check_modules(PC_OPENNI openni-dev)
-+ pkg_check_modules(PC_OPENNI libopenni)
- endif(PKG_CONFIG_FOUND)
- find_path(OPENNI_INCLUDE_DIRS XnStatus.h
- HINTS ${PC_OPENNI_INCLUDEDIR} ${PC_OPENNI_INCLUDE_DIRS}
-@@ -531,8 +531,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 -up ./pcl_config.h.in.fedora ./pcl_config.h.in
-diff -up ./visualization/CMakeLists.txt.fedora ./visualization/CMakeLists.txt
---- ./visualization/CMakeLists.txt.fedora 2014-12-29 18:15:14.229022646 -0500
-+++ ./visualization/CMakeLists.txt 2014-12-29 18:15:24.876393695 -0500
-@@ -154,7 +154,7 @@ if(build)
-
- set(EXT_DEPS "")
- if(OPENNI_FOUND)
-- list(APPEND EXT_DEPS openni-dev)
-+ list(APPEND EXT_DEPS libopenni)
- endif(OPENNI_FOUND)
- if(OPENNI2_FOUND)
- list(APPEND EXT_DEPS openni2-dev)
diff --git a/pcl-1.8.0-fedora.patch b/pcl-1.8.0-fedora.patch
new file mode 100644
index 0000000..a7a63d3
--- /dev/null
+++ b/pcl-1.8.0-fedora.patch
@@ -0,0 +1,15 @@
+diff -up ./io/CMakeLists.txt.fedora ./io/CMakeLists.txt
+diff -up ./PCLConfig.cmake.in.fedora ./PCLConfig.cmake.in
+--- ./PCLConfig.cmake.in.fedora 2016-01-26 03:33:57.000000000 -0500
++++ ./PCLConfig.cmake.in 2016-02-06 11:51:14.741824126 -0500
+@@ -710,8 +710,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 -up ./visualization/CMakeLists.txt.fedora ./visualization/CMakeLists.txt
diff --git a/pcl.spec b/pcl.spec
index 2c89ed3..f5eadff 100644
--- a/pcl.spec
+++ b/pcl.spec
@@ -20,7 +20,7 @@ Patch0: %{name}-1.7.2-sse2.patch
# Look for external metslib, not upstream
Patch1: %{name}-1.8.0-metslib.patch
# Patch for PCLConfig.cmake to find pcl
-Patch2: %{name}-1.7.2-fedora.patch
+Patch2: %{name}-1.8.0-fedora.patch
# Exclude the "build" directory from doxygen processing.
Patch3: %{name}-1.7.2-doxyfix.patch
# Pass -DBOOST_NEXT_PRIOR_HPP_INCLUDED to moc.
@@ -87,6 +87,7 @@ Library.
%setup -qn %{name}-%{version}rc1
%patch0 -p1 -b .sse2
%patch1 -p1 -b .metslib
+%patch2 -p0 -b .fedora
%patch3 -p0 -b .doxyfix
%patch4 -p1 -b .boost157
# Just to make it obvious we're not using any of these
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=178236657215.1.4731613219074487627.rpms-pcl-d608a77f4d36@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