public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: Petr Machata <pmachata@redhat.com>
To: git-commits@fedoraproject.org
Subject: [rpms/pcl] f44: Fix build failures
Date: Thu, 25 Jun 2026 05:49:26 GMT [thread overview]
Message-ID: <178236656654.1.7232269073581186695.rpms-pcl-867798152af6@fedoraproject.org> (raw)
A new commit has been pushed.
Repo : rpms/pcl
Branch : f44
Commit : 867798152af6c01678e6c72a9584820983bbbfa2
Author : Petr Machata <pmachata@redhat.com>
Date : 2015-01-28T21:29:58+01:00
Stats : +43/-1 in 2 file(s)
URL : https://src.fedoraproject.org/rpms/pcl/c/867798152af6c01678e6c72a9584820983bbbfa2?branch=f44
Log:
Fix build failures
- Pass -DBOOST_NEXT_PRIOR_HPP_INCLUDED to qt4-moc in apps/CMakeLists.txt
- BR: python-sphinx-latex
---
diff --git a/pcl-0ddf-boost157.patch b/pcl-0ddf-boost157.patch
new file mode 100644
index 0000000..1f7513e
--- /dev/null
+++ b/pcl-0ddf-boost157.patch
@@ -0,0 +1,36 @@
+diff -up pcl-0ddf11a6ad1175b6f1c253da003de20c1295cde0/apps/CMakeLists.txt\~ pcl-0ddf11a6ad1175b6f1c253da003de20c1295cde0/apps/CMakeLists.txt
+--- pcl-0ddf11a6ad1175b6f1c253da003de20c1295cde0/apps/CMakeLists.txt~ 2014-09-10 23:22:57.000000000 +0200
++++ pcl-0ddf11a6ad1175b6f1c253da003de20c1295cde0/apps/CMakeLists.txt 2015-01-28 20:07:04.092952946 +0100
+@@ -77,12 +77,12 @@ if(build)
+
+ # Manual registration demo
+ QT4_WRAP_UI(manual_registration_ui src/manual_registration/manual_registration.ui)
+- QT4_WRAP_CPP(manual_registration_moc include/pcl/apps/manual_registration.h OPTIONS -DBOOST_TT_HAS_OPERATOR_HPP_INCLUDED -DBOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION)
++ QT4_WRAP_CPP(manual_registration_moc include/pcl/apps/manual_registration.h OPTIONS -DBOOST_TT_HAS_OPERATOR_HPP_INCLUDED -DBOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION -DBOOST_NEXT_PRIOR_HPP_INCLUDED)
+ PCL_ADD_EXECUTABLE_OPT_BUNDLE(pcl_manual_registration "${SUBSYS_NAME}" ${manual_registration_ui} ${manual_registration_moc} src/manual_registration/manual_registration.cpp)
+ target_link_libraries(pcl_manual_registration pcl_common pcl_io pcl_visualization pcl_segmentation pcl_features pcl_surface ${QVTK_LIBRARY} ${QT_LIBRARIES})
+
+ QT4_WRAP_UI(pcd_video_player_ui src/pcd_video_player/pcd_video_player.ui)
+- QT4_WRAP_CPP(pcd_video_player_moc include/pcl/apps/pcd_video_player.h OPTIONS -DBOOST_TT_HAS_OPERATOR_HPP_INCLUDED -DBOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION)
++ QT4_WRAP_CPP(pcd_video_player_moc include/pcl/apps/pcd_video_player.h OPTIONS -DBOOST_TT_HAS_OPERATOR_HPP_INCLUDED -DBOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION -DBOOST_NEXT_PRIOR_HPP_INCLUDED)
+ PCL_ADD_EXECUTABLE_OPT_BUNDLE(pcl_pcd_video_player "${SUBSYS_NAME}" ${pcd_video_player_ui} ${pcd_video_player_moc} src/pcd_video_player/pcd_video_player.cpp)
+ target_link_libraries(pcl_pcd_video_player pcl_common pcl_io pcl_visualization pcl_segmentation pcl_features pcl_surface ${QVTK_LIBRARY} ${QT_LIBRARIES})
+
+@@ -144,13 +144,13 @@ if(build)
+ if (QT4_FOUND AND VTK_USE_QVTK)
+ # OpenNI Passthrough application demo
+ QT4_WRAP_UI(openni_passthrough_ui src/openni_passthrough.ui)
+- QT4_WRAP_CPP(openni_passthrough_moc include/pcl/apps/openni_passthrough.h OPTIONS -DBOOST_TT_HAS_OPERATOR_HPP_INCLUDED -DBOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION)
++ QT4_WRAP_CPP(openni_passthrough_moc include/pcl/apps/openni_passthrough.h OPTIONS -DBOOST_TT_HAS_OPERATOR_HPP_INCLUDED -DBOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION -DBOOST_NEXT_PRIOR_HPP_INCLUDED)
+ PCL_ADD_EXECUTABLE(pcl_openni_passthrough "${SUBSYS_NAME}" ${openni_passthrough_ui} ${openni_passthrough_moc} src/openni_passthrough.cpp)
+ target_link_libraries(pcl_openni_passthrough pcl_common pcl_io pcl_filters pcl_visualization ${QVTK_LIBRARY} ${QT_LIBRARIES})
+
+ # OpenNI Organized Connected Component application demo
+ QT4_WRAP_UI(organized_segmentation_demo_ui src/organized_segmentation_demo.ui)
+- QT4_WRAP_CPP(organized_segmentation_demo_moc include/pcl/apps/organized_segmentation_demo.h OPTIONS -DBOOST_TT_HAS_OPERATOR_HPP_INCLUDED -DBOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION)
++ QT4_WRAP_CPP(organized_segmentation_demo_moc include/pcl/apps/organized_segmentation_demo.h OPTIONS -DBOOST_TT_HAS_OPERATOR_HPP_INCLUDED -DBOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION -DBOOST_NEXT_PRIOR_HPP_INCLUDED)
+ PCL_ADD_EXECUTABLE_OPT_BUNDLE(pcl_organized_segmentation_demo "${SUBSYS_NAME}" ${organized_segmentation_demo_ui} ${organized_segmentation_demo_moc} src/organized_segmentation_demo.cpp)
+ target_link_libraries(pcl_organized_segmentation_demo pcl_common pcl_io pcl_visualization pcl_segmentation pcl_features pcl_surface ${QVTK_LIBRARY} ${QT_LIBRARIES})
+
+
+Diff finished. Wed Jan 28 20:07:55 2015
diff --git a/pcl.spec b/pcl.spec
index a148391..7a3eaf4 100644
--- a/pcl.spec
+++ b/pcl.spec
@@ -19,11 +19,13 @@ Patch1: %{name}-1.7.2-metslib.patch
Patch2: %{name}-1.7.2-fedora.patch
# Exclude the "build" directory from doxygen processing.
Patch3: %{name}-1.7.2-doxyfix.patch
+# Pass -DBOOST_NEXT_PRIOR_HPP_INCLUDED to moc.
+Patch4: %{name}-0ddf-boost157.patch
# For plain building
BuildRequires: cmake, gcc-c++, boost-devel
# Documentation
-BuildRequires: doxygen, graphviz, python-sphinx
+BuildRequires: doxygen, graphviz, python-sphinx, python-sphinx-latex
# mandatory
BuildRequires: eigen3-static, flann-devel, cminpack-devel, vtk-devel, gl2ps-devel, hdf5-devel, python-devel, libxml2-devel, metslib-static, netcdf-cxx-devel, jsoncpp-devel
@@ -84,6 +86,7 @@ Library.
%patch1 -p0 -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
rm -fr recognition/include/pcl/recognition/3rdparty/metslib
rm -fr surface/src/3rdparty/opennurbs
@@ -182,6 +185,9 @@ mv $RPM_BUILD_ROOT%{_datadir}/%{name}-*/*.cmake $RPM_BUILD_ROOT%{_libdir}/cmake/
%changelog
* Mon Jan 26 2015 Petr Machata <pmachata@redhat.com> - 1.7.2-3
- Rebuild for boost 1.57.0
+- Pass -DBOOST_NEXT_PRIOR_HPP_INCLUDED to qt4-moc in apps/CMakeLists.txt
+ (pcl-0ddf-boost157.patch)
+- BR: python-sphinx-latex
* Mon Dec 29 2014 Rich Mattes <richmattes@gmail.com> - 1.7.2-2
- Fix pkgconfig to require libopenni (rhbz#1177244)
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=178236656654.1.7232269073581186695.rpms-pcl-867798152af6@fedoraproject.org \
--to=pmachata@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