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: Drop "oom" patch to resolve multiple definition error and fix FTBFS (rhbz#1992893)
Date: Thu, 25 Jun 2026 05:50:08 GMT	[thread overview]
Message-ID: <178236660803.1.3837863041741442692.rpms-pcl-7db1d6947f11@fedoraproject.org> (raw)

            A new commit has been pushed.

            Repo   : rpms/pcl
            Branch : f44
            Commit : 7db1d6947f11799de613368c3f7b83d26098e9a6
            Author : Rich Mattes <richmattes@gmail.com>
            Date   : 2021-08-17T18:06:23-04:00
            Stats  : +25/-7 in 4 file(s)
            URL    : https://src.fedoraproject.org/rpms/pcl/c/7db1d6947f11799de613368c3f7b83d26098e9a6?branch=f44

            Log:
            Drop "oom" patch to resolve multiple definition error and fix FTBFS (rhbz#1992893)
Enable LTO and add library versions in files section

---
diff --git a/.gitignore b/.gitignore
index 7c54789..da03ab8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,3 +15,4 @@
 /pcl-1.9.1-fedora.tar.xz
 /pcl-1.11.0-fedora.tar.xz
 /pcl-1.11.1-fedora.tar.xz
+/pcl-1.12.0-fedora.tar.xz

diff --git a/pcl-1.12.0-boost176.patch b/pcl-1.12.0-boost176.patch
new file mode 100644
index 0000000..bb35d1e
--- /dev/null
+++ b/pcl-1.12.0-boost176.patch
@@ -0,0 +1,12 @@
+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)

diff --git a/pcl.spec b/pcl.spec
index f1e58fa..a05375e 100644
--- a/pcl.spec
+++ b/pcl.spec
@@ -1,7 +1,6 @@
 %undefine __cmake_in_source_build
-# LTO fails with /usr/bin/ld: error: lto-wrapper failed
-%undefine _lto_cflags
-%global apiversion 1.11
+%global apiversion 1.12
+%global soversion 1.12
 
 Name:           pcl
 Version:        1.12.0
@@ -27,6 +26,7 @@ Patch3:         %{name}-1.11.0-doxyfix.patch
 Patch4:         %{name}-1.11.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
 
 # For plain building
 BuildRequires:  cmake, gcc-c++, boost-devel
@@ -89,7 +89,7 @@ Library.
 %patch1 -p1 -b .metslib
 %patch2 -p0 -b .fedora
 %patch3 -p0 -b .doxyfix
-%patch4 -p1 -b .oom
+#%patch4 -p1 -b .oom
 %patch5 -p1 -b .sphinx
 %patch6 -p1 -b .boost176
 
@@ -107,7 +107,7 @@ sed -i 's|@PCL_SOURCE_DIR@/build|@PCL_SOURCE_DIR@/%{_vpath_builddir}|' doc/doxyg
 %global optflags %(echo %{optflags} | sed -e 's/-g /-g1 /' -e 's/-pipe //')
 
 %cmake \
-  -DCMAKE_BUILD_TYPE=Release \
+  -DCMAKE_BUILD_TYPE=None \
   -DWITH_DOCS=ON \
   -DWITH_CUDA=OFF \
   -DWITH_TUTORIALS=ON \
@@ -170,7 +170,8 @@ mv $RPM_BUILD_ROOT%{_datadir}/%{name}-*/Modules $RPM_BUILD_ROOT%{_libdir}/cmake/
 %files
 %license LICENSE.txt
 %doc AUTHORS.txt
-%{_libdir}/*.so.*
+%{_libdir}/*.so.%{version}
+%{_libdir}/*.so.%{soversion}
 %{_datadir}/%{name}-%{apiversion}
 
 %files devel
@@ -190,6 +191,10 @@ mv $RPM_BUILD_ROOT%{_datadir}/%{name}-*/Modules $RPM_BUILD_ROOT%{_libdir}/cmake/
 %doc %{_vpath_builddir}/doc/advanced/advanced
 
 %changelog
+* Mon Aug 17 2021 Rich Mattes <richmattes@gmail.com> - 1.12.0-1
+- Drop "oom" patch to resolve multiple definition error and fix FTBFS (rhbz#1992893)
+- Enable LTO and add library versions in files section
+
 * Fri Aug 13 2021 Adam Williamson <awilliam@redhat.com> - 1.12.0-1
 - Update to 1.12.0 (see if it builds with Boost 1.76)
 

diff --git a/sources b/sources
index 56b6fc1..a3e23c6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (pcl-1.11.1-fedora.tar.xz) = 0c7637df4718854eed19771bcd6227f01b51552bd858d9cccc62963a06707e1c3b80c5c31e1288f7313d34e17b9723e601c9b21324de916fb9c8b19d442160b8
+SHA512 (pcl-1.12.0-fedora.tar.xz) = 0aa4bec392c304f6f8086c9c316383da90fe2d7ae5c095d51f9ac8ce680c3addd27c61a8e6240c8367b5e57eb20b608b9e146c1b0ba3ce232be3e31b259b0c1d

                 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=178236660803.1.3837863041741442692.rpms-pcl-7db1d6947f11@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