public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: Adam Williamson <awilliam@redhat.com>
To: git-commits@fedoraproject.org
Subject: [rpms/pcl] f44: Update patches from last commit
Date: Thu, 25 Jun 2026 05:50:07 GMT [thread overview]
Message-ID: <178236660744.1.9404343670789245742.rpms-pcl-9fbf5da0a159@fedoraproject.org> (raw)
A new commit has been pushed.
Repo : rpms/pcl
Branch : f44
Commit : 9fbf5da0a15982e30d364c726d7648fdb3fbe9f4
Author : Adam Williamson <awilliam@redhat.com>
Date : 2021-08-17T12:38:36-07:00
Stats : +83/-81 in 6 file(s)
URL : https://src.fedoraproject.org/rpms/pcl/c/9fbf5da0a15982e30d364c726d7648fdb3fbe9f4?branch=f44
Log:
Update patches from last commit
---
diff --git a/pcl-1.11.0-fedora.patch b/pcl-1.11.0-fedora.patch
deleted file mode 100644
index 32e4b6c..0000000
--- a/pcl-1.11.0-fedora.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up ./PCLConfig.cmake.in.fedora ./PCLConfig.cmake.in
---- ./PCLConfig.cmake.in.fedora 2020-05-29 17:48:55.884924391 -0400
-+++ ./PCLConfig.cmake.in 2020-05-29 17:50:25.211139677 -0400
-@@ -398,7 +398,7 @@ if(WIN32 AND NOT MINGW)
- get_filename_component(PCL_ROOT "${PCL_DIR}" PATH)
- else()
- # PCLConfig.cmake is installed to PCL_ROOT/share/pcl-x.y
-- get_filename_component(PCL_ROOT "${CMAKE_CURRENT_LIST_DIR}/../.." ABSOLUTE)
-+ set(PCL_ROOT "@CMAKE_INSTALL_PREFIX@")
- endif()
-
- # check whether PCLConfig.cmake is found into a PCL installation or in a build tree
diff --git a/pcl-1.11.0-metslib.patch b/pcl-1.11.0-metslib.patch
deleted file mode 100644
index e0b491e..0000000
--- a/pcl-1.11.0-metslib.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -up ./recognition/include/pcl/recognition/hv/hv_go.h.metslib ./recognition/include/pcl/recognition/hv/hv_go.h
---- ./recognition/include/pcl/recognition/hv/hv_go.h.metslib 2020-05-29 17:47:21.343600510 -0400
-+++ ./recognition/include/pcl/recognition/hv/hv_go.h 2020-05-29 17:48:12.185237506 -0400
-@@ -20,7 +20,7 @@
- #include <pcl/pcl_macros.h>
- #include <pcl/recognition/hv/hypotheses_verification.h>
- #include <pcl/common/common.h>
--#include <pcl/recognition/3rdparty/metslib/mets.hh>
-+#include <metslib/mets.hh>
- #include <pcl/features/normal_3d.h>
-
- #include <memory>
-diff -up ./recognition/include/pcl/recognition/impl/hv/hv_go.hpp.metslib ./recognition/include/pcl/recognition/impl/hv/hv_go.hpp
---- ./recognition/include/pcl/recognition/impl/hv/hv_go.hpp.metslib 2020-05-11 04:59:26.000000000 -0400
-+++ ./recognition/include/pcl/recognition/impl/hv/hv_go.hpp 2020-05-29 17:47:21.343600510 -0400
-@@ -453,7 +453,7 @@ void pcl::GlobalHypothesesVerification<M
- mets::noimprove_termination_criteria noimprove (max_iterations_);
- mets::linear_cooling linear_cooling;
- mets::simulated_annealing<move_manager> sa (model, best_recorder, neigh, noimprove, linear_cooling, initial_temp_, 1e-7, 2);
-- sa.setApplyAndEvaluate(true);
-+ //sa.setApplyAndEvaluate(true);
-
- {
- pcl::ScopeTime t ("SA search...");
diff --git a/pcl-1.11.0-sse2.patch b/pcl-1.11.0-sse2.patch
deleted file mode 100644
index 7825130..0000000
--- a/pcl-1.11.0-sse2.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-diff -up ./cmake/pcl_find_sse.cmake.sse2 ./cmake/pcl_find_sse.cmake
---- ./cmake/pcl_find_sse.cmake.sse2 2020-05-11 04:59:26.000000000 -0400
-+++ ./cmake/pcl_find_sse.cmake 2020-05-29 17:53:00.504657076 -0400
-@@ -4,20 +4,6 @@ macro(PCL_CHECK_FOR_SSE)
- 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
-@@ -170,18 +156,9 @@ macro(PCL_CHECK_FOR_SSE)
- set(CMAKE_REQUIRED_FLAGS)
-
- if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX OR CMAKE_COMPILER_IS_CLANG)
-- if(HAVE_SSE4_2_EXTENSIONS)
-- list(APPEND SSE_FLAGS "-msse4.2" "-mfpmath=sse")
-- elseif(HAVE_SSE4_1_EXTENSIONS)
-- list(APPEND SSE_FLAGS "-msse4.1" "-mfpmath=sse")
-- elseif(HAVE_SSSE3_EXTENSIONS)
-- list(APPEND SSE_FLAGS "-mssse3" "-mfpmath=sse")
-- elseif(HAVE_SSE3_EXTENSIONS)
-- list(APPEND SSE_FLAGS "-msse3" "-mfpmath=sse")
-- elseif(HAVE_SSE2_EXTENSIONS)
-+ if("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "x86_64" AND "${CMAKE_SIZEOF_VOID_P}" STREQUAL "8")
-+ MESSAGE(STATUS "Enabling SSE Support (${CMAKE_SYSTEM_PROCESSOR}, ${CMAKE_SIZEOF_VOID_P})")
- list(APPEND SSE_FLAGS "-msse2" "-mfpmath=sse")
-- elseif(HAVE_SSE_EXTENSIONS)
-- list(APPEND SSE_FLAGS "-msse" "-mfpmath=sse")
- else()
- # Setting -ffloat-store to alleviate 32bit vs 64bit discrepancies on non-SSE
- # platforms.
diff --git a/pcl-1.12.0-fedora.patch b/pcl-1.12.0-fedora.patch
new file mode 100644
index 0000000..7433e26
--- /dev/null
+++ b/pcl-1.12.0-fedora.patch
@@ -0,0 +1,12 @@
+diff -up ./PCLConfig.cmake.in.fedora ./PCLConfig.cmake.in
+--- ./PCLConfig.cmake.in.fedora 2020-05-29 17:48:55.884924391 -0400
++++ ./PCLConfig.cmake.in 2020-05-29 17:50:25.211139677 -0400
+@@ -398,7 +398,7 @@ if(WIN32 AND NOT MINGW)
+ endif()
+ else()
+ # PCLConfig.cmake is installed to PCL_ROOT/share/pcl-x.y
+- get_filename_component(PCL_ROOT "${CMAKE_CURRENT_LIST_DIR}/../.." ABSOLUTE)
++ set(PCL_ROOT "@CMAKE_INSTALL_PREFIX@")
+ endif()
+
+ # check whether PCLConfig.cmake is found into a PCL installation or in a build tree
diff --git a/pcl-1.12.0-metslib.patch b/pcl-1.12.0-metslib.patch
new file mode 100644
index 0000000..5f95d1c
--- /dev/null
+++ b/pcl-1.12.0-metslib.patch
@@ -0,0 +1,23 @@
+diff -up ./recognition/include/pcl/recognition/hv/hv_go.h.metslib ./recognition/include/pcl/recognition/hv/hv_go.h
+--- ./recognition/include/pcl/recognition/hv/hv_go.h.metslib 2020-05-29 17:47:21.343600510 -0400
++++ ./recognition/include/pcl/recognition/hv/hv_go.h 2020-05-29 17:48:12.185237506 -0400
+@@ -20,6 +20,6 @@
+ #include <pcl/pcl_macros.h>
+ #include <pcl/recognition/hv/hypotheses_verification.h>
+-#include <pcl/recognition/3rdparty/metslib/mets.hh>
++#include <metslib/mets.hh>
+ #include <pcl/features/normal_3d.h>
+
+ #include <memory>
+diff -up ./recognition/include/pcl/recognition/impl/hv/hv_go.hpp.metslib ./recognition/include/pcl/recognition/impl/hv/hv_go.hpp
+--- ./recognition/include/pcl/recognition/impl/hv/hv_go.hpp.metslib 2020-05-11 04:59:26.000000000 -0400
++++ ./recognition/include/pcl/recognition/impl/hv/hv_go.hpp 2020-05-29 17:47:21.343600510 -0400
+@@ -453,7 +453,7 @@ void pcl::GlobalHypothesesVerification<M
+ mets::noimprove_termination_criteria noimprove (max_iterations_);
+ mets::linear_cooling linear_cooling;
+ mets::simulated_annealing<move_manager> sa (model, best_recorder, neigh, noimprove, linear_cooling, initial_temp_, 1e-7, 2);
+- sa.setApplyAndEvaluate(true);
++ //sa.setApplyAndEvaluate(true);
+
+ {
+ pcl::ScopeTime t ("SA search...");
diff --git a/pcl-1.12.0-sse2.patch b/pcl-1.12.0-sse2.patch
new file mode 100644
index 0000000..f8a1e83
--- /dev/null
+++ b/pcl-1.12.0-sse2.patch
@@ -0,0 +1,48 @@
+--- 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()
+
+ if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX OR CMAKE_COMPILER_IS_CLANG)
+- if(SSE_LEVEL GREATER_EQUAL 1.0)
+- if(SSE_LEVEL GREATER_EQUAL 4.2)
+- set(SSE_FLAGS "-msse4.2")
+- elseif(SSE_LEVEL GREATER_EQUAL 4.1)
+- set(SSE_FLAGS "-msse4.1")
+- elseif(SSE_LEVEL GREATER_EQUAL 3.1)
+- set(SSE_FLAGS "-msse3")
+- elseif(SSE_LEVEL GREATER_EQUAL 3.0)
+- set(SSE_FLAGS "-msse3")
+- elseif(SSE_LEVEL GREATER_EQUAL 2.0)
+- set(SSE_FLAGS "-msse2")
+- else()
+- set(SSE_FLAGS "-msse")
+- endif()
+- string(APPEND SSE_FLAGS " -mfpmath=sse")
++ if("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "x86_64" AND "${CMAKE_SIZEOF_VOID_P}" STREQUAL "8")
++ MESSAGE(STATUS "Enabling SSE Support (${CMAKE_SYSTEM_PROCESSOR}, ${CMAKE_SIZEOF_VOID_P})")
++ set(SSE_FLAGS "-msse2")
+ else()
+ # Setting -ffloat-store to alleviate 32bit vs 64bit discrepancies on non-SSE
+ # platforms.
reply other threads:[~2026-06-25 5:50 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=178236660744.1.9404343670789245742.rpms-pcl-9fbf5da0a159@fedoraproject.org \
--to=awilliam@redhat.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