From 7f0ccc917c7abe6223784c703d86cd14755691fb Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 3 Jul 2021 22:39:47 +0100 Subject: gentoo resync : 03.07.2021 --- sci-libs/octomap/Manifest | 5 +- sci-libs/octomap/files/qglqt5.patch | 231 ---------------------------------- sci-libs/octomap/octomap-1.9.5.ebuild | 84 ------------- sci-libs/octomap/octomap-1.9.7.ebuild | 81 ++++++++++++ 4 files changed, 83 insertions(+), 318 deletions(-) delete mode 100644 sci-libs/octomap/files/qglqt5.patch delete mode 100644 sci-libs/octomap/octomap-1.9.5.ebuild create mode 100644 sci-libs/octomap/octomap-1.9.7.ebuild (limited to 'sci-libs/octomap') diff --git a/sci-libs/octomap/Manifest b/sci-libs/octomap/Manifest index fec4b880e257..ac088ebd6401 100644 --- a/sci-libs/octomap/Manifest +++ b/sci-libs/octomap/Manifest @@ -1,4 +1,3 @@ -AUX qglqt5.patch 8456 BLAKE2B babaed86e83e1403668b9c3c8cc693775f87783ab11f1f2bd1e3304dce7087186bad406909718244e1c7fa99101e95401c663022e23156a56230d4f5efac67de SHA512 7a9cbcfd49a84ac79b18c183c8d6f6244a76fa0acefdf4adff5f3952e2ad33c1ff1b8227a906d58f40bdff3d83c168e8af2c812e90837b1f98893afd060227ea -DIST octomap-1.9.5.tar.gz 1682781 BLAKE2B 1ced023160d10c424d4bff76a0481ffe6c87c5bf8133480afe6c47ee0ee116304a811293cc0af0b303ebcad370b7ce433e85212f070ac921a9c5be41905a94ea SHA512 e58c6d33c351b14e9596e18a8702715d167c136fd029b1078ddd13a5926fe451d3b619231b5a8ccfb64b6e5fc6db8b57e6ef329099828d2f5195c0988700b581 -EBUILD octomap-1.9.5.ebuild 1689 BLAKE2B 169c1a5e542e61cf5a3c9dc0774cac2afd4dab5052d49058da0c6c8bc70be0a5a4d0165a2dc74d798b71d4eec60288cf884cb4df8e0585a973f335297e246d4f SHA512 9c6ed3429728027d951c4298aba8f6762a35efeba50575ab4dff6c5c49e752842f84ec71f66d1febbd506531c1f4ec96abe74bc17c58dad7f4066ea61b8f68e0 +DIST octomap-1.9.7.tar.gz 1684088 BLAKE2B 357b574f770d553a51c936c84772c729754a822e1c1e840a179a2cb3d3ef1b15f1c7173a4333b1262b10aa5d2f64d1b1c063ad90d4cc0edfcbaee9799ceb24a8 SHA512 639ff65cf020865d5302ba9785089782aec1e46496982c11bbf86919b6938c01c7921d84e60880091b89a949dd05f4d1151871f63503d19342462b74e6791ddd +EBUILD octomap-1.9.7.ebuild 1601 BLAKE2B b3e8132cf65668da2937c6d3d593a2249bb9b97eaef797bc92d52748595dfe2bf3d5fdacf0bdcfc47c5ef453016d246d0f71000487701443b3f384730abeaad1 SHA512 13bdaee3002f14d2467ed5a6a15f50c5183caee0c9e7bc5c31eb4683d416f076a47b30d63da4274db721054c0992c7db9c8e9d40ff6ccce8eb83621098ae53ea MISC metadata.xml 703 BLAKE2B 52e5edafca7a58ff0efddeea0eb60894c9bd26c5360fb77c41982edf0b27dec9517bb0470049d92dee05cc242effc7bb2e253a275f6e5d422e7e214676f7ffe8 SHA512 66b3c9143aea83a044a719031b4eb0d140e599048885ca6bb02e74ebebbbd2e9abccf11dc0af32e6ce94d3849dcf639ebaf34ff2c8d6e34f32767e08e465c6b0 diff --git a/sci-libs/octomap/files/qglqt5.patch b/sci-libs/octomap/files/qglqt5.patch deleted file mode 100644 index 3fad0a0fc63f..000000000000 --- a/sci-libs/octomap/files/qglqt5.patch +++ /dev/null @@ -1,231 +0,0 @@ -Index: octomap-1.9.0/octovis/src/ViewerGui.cpp -=================================================================== ---- octomap-1.9.0.orig/octovis/src/ViewerGui.cpp -+++ octomap-1.9.0/octovis/src/ViewerGui.cpp -@@ -286,7 +286,7 @@ void ViewerGui::showOcTree() { - m_mapSizeStatus->setText(size); - //} - -- m_glwidget->updateGL(); -+ m_glwidget->update(); - - // generate cubes -> display - // timeval start; -@@ -299,7 +299,7 @@ void ViewerGui::showOcTree() { - // gettimeofday(&stop, NULL); // stop timer - // double time_to_generate = (stop.tv_sec - start.tv_sec) + 1.0e-6 *(stop.tv_usec - start.tv_usec); - // fprintf(stderr, "setOcTree took %f sec\n", time_to_generate); -- m_glwidget->updateGL(); -+ m_glwidget->update(); - } - - -@@ -983,7 +983,7 @@ void ViewerGui::on_actionSelection_box_t - m_glwidget->enableSelectionBox(checked); - - -- m_glwidget->updateGL(); -+ m_glwidget->update(); - } - - void ViewerGui::on_actionHeight_map_toggled(bool checked){ -@@ -1040,7 +1040,7 @@ void ViewerGui::on_actionAxes_toggled(bo - it != m_octrees.end(); ++it) { - it->second.octree_drawer->enableAxes(checked); - } -- m_glwidget->updateGL(); -+ m_glwidget->update(); - } - - void ViewerGui::on_actionHideBackground_toggled(bool checked) { -@@ -1048,7 +1048,7 @@ void ViewerGui::on_actionHideBackground_ - if (getOctreeRecord(DEFAULT_OCTREE_ID, r)) { - if (checked) m_glwidget->removeSceneObject(r->octree_drawer); - else m_glwidget->addSceneObject(r->octree_drawer); -- m_glwidget->updateGL(); -+ m_glwidget->update(); - } - } - -@@ -1142,7 +1142,7 @@ void ViewerGui::on_actionOctree_cells_to - it != m_octrees.end(); ++it) { - it->second.octree_drawer->enableOcTreeCells(enabled); - } -- m_glwidget->updateGL(); -+ m_glwidget->update(); - } - - void ViewerGui::on_actionOctree_structure_toggled(bool enabled) { -@@ -1150,7 +1150,7 @@ void ViewerGui::on_actionOctree_structur - it != m_octrees.end(); ++it) { - it->second.octree_drawer->enableOcTree(enabled); - } -- m_glwidget->updateGL(); -+ m_glwidget->update(); - } - - void ViewerGui::on_actionFree_toggled(bool enabled) { -@@ -1158,7 +1158,7 @@ void ViewerGui::on_actionFree_toggled(bo - it != m_octrees.end(); ++it) { - it->second.octree_drawer->enableFreespace(enabled); - } -- m_glwidget->updateGL(); -+ m_glwidget->update(); - - } - -@@ -1176,24 +1176,21 @@ void ViewerGui::on_actionSelected_toggle - // } else{ - // m_octreeDrawer->clearOcTreeSelection(); - // } -- // m_glwidget->updateGL(); -+ // m_glwidget->update(); - // } - } - - - void ViewerGui::on_action_bg_black_triggered() { - m_glwidget->setBackgroundColor( QColor(0,0,0) ); -- m_glwidget->qglClearColor( m_glwidget->backgroundColor() ); - } - - void ViewerGui::on_action_bg_white_triggered() { - m_glwidget->setBackgroundColor( QColor(255,255,255) ); -- m_glwidget->qglClearColor( m_glwidget->backgroundColor() ); - } - - void ViewerGui::on_action_bg_gray_triggered() { - m_glwidget->setBackgroundColor( QColor(117,117,117) ); -- m_glwidget->qglClearColor( m_glwidget->backgroundColor() ); - } - - void ViewerGui::on_savecampose_triggered() { -Index: octomap-1.9.0/octovis/src/ViewerWidget.cpp -=================================================================== ---- octomap-1.9.0.orig/octovis/src/ViewerWidget.cpp -+++ octomap-1.9.0/octovis/src/ViewerWidget.cpp -@@ -67,13 +67,12 @@ void ViewerWidget::init() { - - // background color defaults to white - this->setBackgroundColor( QColor(255,255,255) ); -- this->qglClearColor( this->backgroundColor() ); - } - - void ViewerWidget::resetView(){ - this->camera()->setOrientation((float) -M_PI_2, (float) M_PI_2); - this->showEntireScene(); -- updateGL(); -+ update(); - } - - -@@ -98,7 +97,7 @@ void ViewerWidget::enableHeightColorMode - for(std::vector::iterator it = m_sceneObjects.begin(); it != m_sceneObjects.end(); it++) { - (*it)->enableHeightColorMode(enabled); - } -- updateGL(); -+ update(); - } - - void ViewerWidget::enablePrintoutMode(bool enabled) { -@@ -106,7 +105,7 @@ void ViewerWidget::enablePrintoutMode(bo - for(std::vector::iterator it = m_sceneObjects.begin(); it != m_sceneObjects.end(); it++) { - (*it)->enablePrintoutMode(enabled); - } -- updateGL(); -+ update(); - } - - void ViewerWidget::enableSemanticColoring (bool enabled) { -@@ -114,12 +113,12 @@ void ViewerWidget::enableSemanticColorin - for(std::vector::iterator it = m_sceneObjects.begin(); it != m_sceneObjects.end(); it++) { - (*it)->enableSemanticColoring(enabled); - } -- updateGL(); -+ update(); - } - - void ViewerWidget::enableSelectionBox(bool enabled) { - m_drawSelectionBox = enabled; -- updateGL(); -+ update(); - } - - -@@ -145,7 +144,7 @@ void ViewerWidget::setCamPosition(double - camera()->setPosition(qglviewer::Vec(x, y, z)); - camera()->lookAt(qglviewer::Vec(lookX, lookY, lookZ)); - camera()->setUpVector(qglviewer::Vec(0.0, 0.0, 1.0)); -- updateGL(); -+ update(); - } - - void ViewerWidget::setCamPose(const octomath::Pose6D& pose){ -@@ -161,12 +160,12 @@ void ViewerWidget::jumpToCamFrame(int id - } else { - std::cerr << "Error: Could not jump to frame " << frame << " of " << kfi->numberOfKeyFrames() << std::endl; - } -- updateGL(); -+ update(); - } - - void ViewerWidget::deleteCameraPath(int id) { - if(camera()->keyFrameInterpolator(id)) { -- disconnect(camera()->keyFrameInterpolator(id), SIGNAL(interpolated()), this, SLOT(updateGL())); -+ disconnect(camera()->keyFrameInterpolator(id), SIGNAL(interpolated()), this, SLOT(update())); - disconnect(camera()->keyFrameInterpolator(id), SIGNAL(interpolated()), this, SLOT(cameraPathInterpolated())); - disconnect(camera()->keyFrameInterpolator(id), SIGNAL(endReached()), this, SLOT(cameraPathFinished())); - camera()->deletePath(id); -@@ -243,7 +242,7 @@ void ViewerWidget::playCameraPath(int id - m_current_camera_frame = start_frame; - kfi->setInterpolationTime(kfi->keyFrameTime(start_frame)); - std::cout << "Playing path of length " << kfi->numberOfKeyFrames() << ", start time " << kfi->keyFrameTime(start_frame) << std::endl; -- connect(kfi, SIGNAL(interpolated()), this, SLOT(updateGL())); -+ connect(kfi, SIGNAL(interpolated()), this, SLOT(update())); - connect(kfi, SIGNAL(interpolated()), this, SLOT(cameraPathInterpolated())); - connect(kfi, SIGNAL(endReached()), this, SLOT(cameraPathFinished())); - kfi->startInterpolation(); -@@ -252,7 +251,7 @@ void ViewerWidget::playCameraPath(int id - - void ViewerWidget::stopCameraPath(int id) { - if(camera()->keyFrameInterpolator(id) && camera()->keyFrameInterpolator(id)->interpolationIsStarted()) { -- disconnect(camera()->keyFrameInterpolator(id), SIGNAL(interpolated()), this, SLOT(updateGL())); -+ disconnect(camera()->keyFrameInterpolator(id), SIGNAL(interpolated()), this, SLOT(update())); - disconnect(camera()->keyFrameInterpolator(id), SIGNAL(interpolated()), this, SLOT(cameraPathInterpolated())); - disconnect(camera()->keyFrameInterpolator(id), SIGNAL(endReached()), this, SLOT(cameraPathFinished())); - camera()->keyFrameInterpolator(id)->stopInterpolation(); -@@ -261,7 +260,7 @@ void ViewerWidget::stopCameraPath(int id - - void ViewerWidget::cameraPathFinished() { - if(camera()->keyFrameInterpolator(m_current_camera_path)) { -- disconnect(camera()->keyFrameInterpolator(m_current_camera_path), SIGNAL(interpolated()), this, SLOT(updateGL())); -+ disconnect(camera()->keyFrameInterpolator(m_current_camera_path), SIGNAL(interpolated()), this, SLOT(update())); - disconnect(camera()->keyFrameInterpolator(m_current_camera_path), SIGNAL(interpolated()), this, SLOT(cameraPathInterpolated())); - disconnect(camera()->keyFrameInterpolator(m_current_camera_path), SIGNAL(endReached()), this, SLOT(cameraPathFinished())); - emit cameraPathStopped(m_current_camera_path); -@@ -292,7 +291,7 @@ void ViewerWidget::setSceneBoundingBox(c - void ViewerWidget::addSceneObject(SceneObject* obj){ - assert (obj); - m_sceneObjects.push_back(obj); -- updateGL(); -+ update(); - } - - void ViewerWidget::removeSceneObject(SceneObject* obj){ -@@ -304,7 +303,7 @@ void ViewerWidget::removeSceneObject(Sce - else - ++it; - } -- updateGL(); -+ update(); - } - - void ViewerWidget::clearAll(){ -@@ -364,7 +363,6 @@ void ViewerWidget::postDraw(){ - glPushAttrib(GL_ALL_ATTRIB_BITS); - - glDisable(GL_COLOR_MATERIAL); -- qglColor(foregroundColor()); - - if (gridIsDrawn()){ - glLineWidth(1.0); diff --git a/sci-libs/octomap/octomap-1.9.5.ebuild b/sci-libs/octomap/octomap-1.9.5.ebuild deleted file mode 100644 index b38b3ab44bfe..000000000000 --- a/sci-libs/octomap/octomap-1.9.5.ebuild +++ /dev/null @@ -1,84 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake - -DESCRIPTION="An Efficient Probabilistic 3D Mapping Framework Based on Octrees" -HOMEPAGE="http://octomap.github.io/" -SRC_URI="https://github.com/OctoMap/octomap/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="BSD qt5? ( GPL-2 )" -SLOT="0/19" -KEYWORDS="~amd64 ~arm" -IUSE="qt5 dynamicEDT3D doc" - -RDEPEND=" - qt5? ( - virtual/opengl - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtwidgets:5 - x11-libs/libQGLViewer:= - ) -" -BDEPEND="${RDEPEND} - doc? ( - app-doc/doxygen - media-gfx/graphviz - ) -" - -# https://github.com/OctoMap/octomap/issues/194 -PATCHES=( "${FILESDIR}/qglqt5.patch" ) - -src_prepare() { - rm -r octovis/src/extern - - sed --in-place \ - --expression='s/DESTINATION lib/DESTINATION ${CMAKE_INSTALL_LIBDIR}/' \ - */CMakeLists.txt */CMakeModules/InstallPkgConfigFile.cmake || die - - cmake_src_prepare -} - -src_configure() { - local mycmakeargs=( - "-DBUILD_OCTOVIS_SUBPROJECT=$(usex qt5 ON OFF)" - "-DOCTOVIS_QT5=ON" - "-DBUILD_DYNAMICETD3D_SUBPROJECT=$(usex dynamicEDT3D ON OFF)" - ) - cmake_src_configure -} - -src_compile() { - cmake_src_compile - use doc && cmake_build docs docs_dynamicEDT3D -} - -src_install() { - cmake_src_install - - if use doc; then - docinto html/octomap - dodoc -r octomap/doc/html/* - - docinto html/dynamicEDT3D - dodoc -r dynamicEDT3D/doc/html/* - fi - - insinto /usr/share/ros_packages/${PN} - doins "${ED}/usr/share/${PN}/package.xml" - - if use qt5; then - insinto /usr/share/ros_packages/octovis - doins "${ED}/usr/share/octovis/package.xml" - fi -} - -src_test() { - # override parallel mode only for tests - local myctestargs=( "-j 1" ) - cmake_src_test -} diff --git a/sci-libs/octomap/octomap-1.9.7.ebuild b/sci-libs/octomap/octomap-1.9.7.ebuild new file mode 100644 index 000000000000..9d9bd32c85f7 --- /dev/null +++ b/sci-libs/octomap/octomap-1.9.7.ebuild @@ -0,0 +1,81 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake + +DESCRIPTION="An Efficient Probabilistic 3D Mapping Framework Based on Octrees" +HOMEPAGE="http://octomap.github.io/" +SRC_URI="https://github.com/OctoMap/octomap/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="BSD qt5? ( GPL-2 )" +SLOT="0/19" +KEYWORDS="~amd64 ~arm" +IUSE="qt5 dynamicEDT3D doc" + +RDEPEND=" + qt5? ( + virtual/opengl + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtwidgets:5 + x11-libs/libQGLViewer:= + ) +" +BDEPEND="${RDEPEND} + doc? ( + app-doc/doxygen + media-gfx/graphviz + ) +" + +src_prepare() { + rm -r octovis/src/extern + + sed --in-place \ + --expression='s/DESTINATION lib/DESTINATION ${CMAKE_INSTALL_LIBDIR}/' \ + */CMakeLists.txt */CMakeModules/InstallPkgConfigFile.cmake || die + + cmake_src_prepare +} + +src_configure() { + local mycmakeargs=( + "-DBUILD_OCTOVIS_SUBPROJECT=$(usex qt5 ON OFF)" + "-DOCTOVIS_QT5=ON" + "-DBUILD_DYNAMICETD3D_SUBPROJECT=$(usex dynamicEDT3D ON OFF)" + ) + cmake_src_configure +} + +src_compile() { + cmake_src_compile + use doc && cmake_build docs docs_dynamicEDT3D +} + +src_install() { + cmake_src_install + + if use doc; then + docinto html/octomap + dodoc -r octomap/doc/html/* + + docinto html/dynamicEDT3D + dodoc -r dynamicEDT3D/doc/html/* + fi + + insinto /usr/share/ros_packages/${PN} + doins "${ED}/usr/share/${PN}/package.xml" + + if use qt5; then + insinto /usr/share/ros_packages/octovis + doins "${ED}/usr/share/octovis/package.xml" + fi +} + +src_test() { + # override parallel mode only for tests + local myctestargs=( "-j 1" ) + cmake_src_test +} -- cgit v1.2.3