From 4cbcc855382a06088e2f016f62cafdbcb7e40665 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 20 Mar 2022 00:40:44 +0000 Subject: gentoo resync : 20.03.2022 --- dev-ros/rviz/Manifest | 7 ++-- dev-ros/rviz/files/assimp.patch | 13 +++++++ dev-ros/rviz/rviz-1.14.14.ebuild | 78 ++++++++++++++++++++++++++++++++++++++ dev-ros/rviz/rviz-1.14.8-r1.ebuild | 76 ------------------------------------- dev-ros/rviz/rviz-9999.ebuild | 10 +++-- 5 files changed, 101 insertions(+), 83 deletions(-) create mode 100644 dev-ros/rviz/files/assimp.patch create mode 100644 dev-ros/rviz/rviz-1.14.14.ebuild delete mode 100644 dev-ros/rviz/rviz-1.14.8-r1.ebuild (limited to 'dev-ros/rviz') diff --git a/dev-ros/rviz/Manifest b/dev-ros/rviz/Manifest index b6f62cac447b..5efb6e791355 100644 --- a/dev-ros/rviz/Manifest +++ b/dev-ros/rviz/Manifest @@ -1,5 +1,6 @@ +AUX assimp.patch 408 BLAKE2B 7bad0cf1d305c2db8e246a23399b941edffe813284ad9479149c4eaed88ae61b46d50db212d9e3c2f9504a150e314bd825438dfec6f0a36f61ad9542d628f8c4 SHA512 f7f3ca0ae3556735fa85497eb23c3406c3ae21c6db16df2bd323bcc23673bb2a6ea353103e0c9653337269d89b71bbbc62368261709c2485ac7891f8d23c21ab AUX yamlcpp.patch 435 BLAKE2B de34251a6eac3d860ce42defab5a157294b7f541fd508e6ce400f3c4c6d8ffacbb3f131dff7b453e09c6e6d03b10d7f0ecd8c665759d1f6c1195fae59919fa21 SHA512 f9da2a7cf56aa5b19648bdbe7b40ca5947f6dd140ef7bd65b860b8fea0dd16e42ad92b0b04a28276a6c053fde46ba6865846402e89d64dedc2ac6083b4036c2a -DIST rviz-1.14.8.tar.gz 5127738 BLAKE2B 317d38e73f078e043984aac465bc3284f92febe2693f80871e9bf3ec55c800b42fbc87f0adedd888c3c62f526157846fe61ad6a33d97314b36fb89d8e305fe0b SHA512 a6e5d08be925f7df1f11eed72905447f30f829ddc4e9f39b957c1af284f0533814f29affa5105bafd2a31aa894c3700687401cef8bc36d31b28923f95da53904 -EBUILD rviz-1.14.8-r1.ebuild 1845 BLAKE2B 377ea5a9d1717f2c50bb0b3a2d322b0f5607212f45bd498e2e8d56c8f2b3275c09596ecee09465fc88412d95f08e0de126df751f5368ca59c99180af9373069a SHA512 bb161f9069d4a8b6a5de0325362c2523154bbcf599ef29e4448adcdaafe309242ace14ea80f03ffbfea5682e502ac48f7d94d9f7628e42d242655cb1e6b51dce -EBUILD rviz-9999.ebuild 1845 BLAKE2B 377ea5a9d1717f2c50bb0b3a2d322b0f5607212f45bd498e2e8d56c8f2b3275c09596ecee09465fc88412d95f08e0de126df751f5368ca59c99180af9373069a SHA512 bb161f9069d4a8b6a5de0325362c2523154bbcf599ef29e4448adcdaafe309242ace14ea80f03ffbfea5682e502ac48f7d94d9f7628e42d242655cb1e6b51dce +DIST rviz-1.14.14.tar.gz 5128499 BLAKE2B 64caed22b512b19c73a579f6d89c8a509b6b3fdf836d43a8a59255d25c1b5eb17fd9675db20739bb9c8025122ac4bd1ce558ac6fc58543fbf26f42306450fd67 SHA512 b02967af7339d50f02c8bdb90d11e872c9b293da72bf7524fba2e395ca1e55c28d274620ffdbb688ab2acc17ce0d37254fffcd52e9d3deff4efc25b4c0509b15 +EBUILD rviz-1.14.14.ebuild 1827 BLAKE2B d90772464cdbf41b665273a03ac80cf67df748331bf56970ffe807f6df267ae665a3e8d57d838f82a3b4ad9f43cbf1cf540c23299f5ffb9721b2e432253918c2 SHA512 d62e6bdddcb2a175e97058dac7e9709d05eb8fc487cd530dbe7586591b195fadf08b46b787a77791b4a406eb377180f21fd5c0904a8e134e7aeb70aabf5b5a8c +EBUILD rviz-9999.ebuild 1827 BLAKE2B d90772464cdbf41b665273a03ac80cf67df748331bf56970ffe807f6df267ae665a3e8d57d838f82a3b4ad9f43cbf1cf540c23299f5ffb9721b2e432253918c2 SHA512 d62e6bdddcb2a175e97058dac7e9709d05eb8fc487cd530dbe7586591b195fadf08b46b787a77791b4a406eb377180f21fd5c0904a8e134e7aeb70aabf5b5a8c MISC metadata.xml 337 BLAKE2B 7a8932b503a69c523ed91eac0b3f286c0aeb9883709af787a8dbf16862056484e97928a94fbc238fc9cec781402cc639f1d963302418e5a09dbe80209ecb5ab6 SHA512 de7dc3480eef9fa198e8d6e9f8f722fb42c8984ca877cf05a890ead1450b0f39aa90b69a82876b1a1958d930b09bef8b20ef7e5a24d8777b9ccd1b6c49d01932 diff --git a/dev-ros/rviz/files/assimp.patch b/dev-ros/rviz/files/assimp.patch new file mode 100644 index 000000000000..0e0eb3ed3384 --- /dev/null +++ b/dev-ros/rviz/files/assimp.patch @@ -0,0 +1,13 @@ +Index: rviz-1.14.14/src/rviz/CMakeLists.txt +=================================================================== +--- rviz-1.14.14.orig/src/rviz/CMakeLists.txt ++++ rviz-1.14.14/src/rviz/CMakeLists.txt +@@ -145,7 +145,7 @@ target_link_libraries(${PROJECT_NAME} + ${rviz_ADDITIONAL_LIBRARIES} + ${TinyXML2_LIBRARIES} + ${X11_X11_LIB} +- ${ASSIMP_LIBRARIES} ++ ${assimp_LIBRARIES} + ${YAML_CPP_LIBRARIES} + ) + diff --git a/dev-ros/rviz/rviz-1.14.14.ebuild b/dev-ros/rviz/rviz-1.14.14.ebuild new file mode 100644 index 000000000000..3772a4e7299a --- /dev/null +++ b/dev-ros/rviz/rviz-1.14.14.ebuild @@ -0,0 +1,78 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +ROS_REPO_URI="https://github.com/ros-visualization/rviz" +KEYWORDS="~amd64" +CATKIN_HAS_MESSAGES=yes + +CMAKE_MAKEFILE_GENERATOR=emake + +inherit ros-catkin virtualx + +DESCRIPTION="3D visualization tool for ROS" +LICENSE="BSD" +SLOT="0" +IUSE="" + +RDEPEND=" + dev-libs/boost:=[threads(+)] + media-libs/assimp + dev-games/ogre:=[-double-precision] + virtual/opengl + dev-qt/qtwidgets:5 + dev-qt/qtcore:5 + dev-qt/qtopengl:5 + dev-cpp/eigen:3 + dev-cpp/yaml-cpp:= + dev-libs/urdfdom:= + dev-libs/tinyxml2:= + + dev-ros/angles:0 + dev-ros/image_geometry + dev-ros/image_transport + dev-ros/interactive_markers + dev-ros/laser_geometry + dev-ros/message_filters + dev-ros/pluginlib + >=dev-ros/python_qt_binding-0.3.0[${PYTHON_SINGLE_USEDEP}] + dev-ros/resource_retriever + dev-ros/rosconsole + dev-libs/console_bridge:= + dev-ros/roscpp + dev-ros/roslib[${PYTHON_SINGLE_USEDEP}] + dev-ros/rospy[${PYTHON_SINGLE_USEDEP}] + dev-ros/tf + dev-ros/urdf + dev-ros/media_export + + dev-ros/geometry_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}] + dev-ros/nav_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}] + dev-ros/sensor_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}] +" +DEPEND="${RDEPEND} + dev-ros/map_msgs[${CATKIN_MESSAGES_CXX_USEDEP}] + dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}] + dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}] + dev-ros/visualization_msgs[${CATKIN_MESSAGES_CXX_USEDEP}] + dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}] + dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}] + dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}] + test? ( + dev-ros/rostest[${PYTHON_SINGLE_USEDEP}] + dev-cpp/gtest + )" +BDEPEND=" + dev-ros/cmake_modules + virtual/pkgconfig +" + +PATCHES=( + "${FILESDIR}/yamlcpp.patch" + "${FILESDIR}/assimp.patch" +) + +src_test() { + virtx ros-catkin_src_test +} diff --git a/dev-ros/rviz/rviz-1.14.8-r1.ebuild b/dev-ros/rviz/rviz-1.14.8-r1.ebuild deleted file mode 100644 index 1f16a85d3c4b..000000000000 --- a/dev-ros/rviz/rviz-1.14.8-r1.ebuild +++ /dev/null @@ -1,76 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -ROS_REPO_URI="https://github.com/ros-visualization/rviz" -KEYWORDS="~amd64" -CATKIN_HAS_MESSAGES=yes - -CMAKE_MAKEFILE_GENERATOR=emake - -inherit ros-catkin virtualx - -DESCRIPTION="3D visualization tool for ROS" -LICENSE="BSD" -SLOT="0" -IUSE="" - -RDEPEND=" - dev-libs/boost:=[threads(+)] - media-libs/assimp - =dev-ros/python_qt_binding-0.3.0[${PYTHON_SINGLE_USEDEP}] - dev-ros/resource_retriever - dev-ros/rosbag[${PYTHON_SINGLE_USEDEP}] - dev-ros/rosconsole - dev-libs/console_bridge:= - dev-ros/roscpp - dev-ros/roslib[${PYTHON_SINGLE_USEDEP}] - dev-ros/rospy[${PYTHON_SINGLE_USEDEP}] - dev-ros/tf - dev-ros/urdf - dev-ros/media_export - - dev-ros/geometry_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}] - dev-ros/nav_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}] - dev-ros/sensor_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}] -" -DEPEND="${RDEPEND} - dev-ros/map_msgs[${CATKIN_MESSAGES_CXX_USEDEP}] - dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}] - dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}] - dev-ros/visualization_msgs[${CATKIN_MESSAGES_CXX_USEDEP}] - dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}] - dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}] - dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}] - test? ( - dev-ros/rostest[${PYTHON_SINGLE_USEDEP}] - dev-cpp/gtest - )" -BDEPEND=" - dev-ros/cmake_modules - virtual/pkgconfig -" - -PATCHES=( "${FILESDIR}/yamlcpp.patch" ) - -src_test() { - virtx ros-catkin_src_test -} diff --git a/dev-ros/rviz/rviz-9999.ebuild b/dev-ros/rviz/rviz-9999.ebuild index 1f16a85d3c4b..3772a4e7299a 100644 --- a/dev-ros/rviz/rviz-9999.ebuild +++ b/dev-ros/rviz/rviz-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -19,7 +19,7 @@ IUSE="" RDEPEND=" dev-libs/boost:=[threads(+)] media-libs/assimp -