From 0f558761aa2dee1017b4751e4017205e015a9560 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 29 Jun 2022 12:04:12 +0100 Subject: gentoo resync : 29.12.2022 --- dev-ros/Manifest.gz | Bin 61168 -> 61171 bytes dev-ros/ament_cmake_core/Manifest | 4 +- .../ament_cmake_core-1.3.0-r1.ebuild | 47 +++++++++++++ .../ament_cmake_core/ament_cmake_core-9999.ebuild | 3 +- dev-ros/ament_cmake_core/files/findpython.patch | 15 ++++ dev-ros/collada_urdf/Manifest | 4 +- .../collada_urdf/collada_urdf-1.12.13-r1.ebuild | 35 --------- .../collada_urdf/collada_urdf-1.12.13-r2.ebuild | 35 +++++++++ dev-ros/collada_urdf/collada_urdf-9999.ebuild | 4 +- dev-ros/geometric_shapes/Manifest | 4 +- .../geometric_shapes-0.7.3-r1.ebuild | 38 ++++++++++ .../geometric_shapes/geometric_shapes-0.7.3.ebuild | 38 ---------- .../geometric_shapes/geometric_shapes-9999.ebuild | 4 +- dev-ros/rviz/Manifest | 5 +- dev-ros/rviz/files/assimp.patch | 13 ---- dev-ros/rviz/rviz-1.14.14-r1.ebuild | 77 ++++++++++++++++++++ dev-ros/rviz/rviz-1.14.14.ebuild | 78 --------------------- dev-ros/rviz/rviz-9999.ebuild | 3 +- 18 files changed, 228 insertions(+), 179 deletions(-) create mode 100644 dev-ros/ament_cmake_core/ament_cmake_core-1.3.0-r1.ebuild create mode 100644 dev-ros/ament_cmake_core/files/findpython.patch delete mode 100644 dev-ros/collada_urdf/collada_urdf-1.12.13-r1.ebuild create mode 100644 dev-ros/collada_urdf/collada_urdf-1.12.13-r2.ebuild create mode 100644 dev-ros/geometric_shapes/geometric_shapes-0.7.3-r1.ebuild delete mode 100644 dev-ros/geometric_shapes/geometric_shapes-0.7.3.ebuild delete mode 100644 dev-ros/rviz/files/assimp.patch create mode 100644 dev-ros/rviz/rviz-1.14.14-r1.ebuild delete mode 100644 dev-ros/rviz/rviz-1.14.14.ebuild (limited to 'dev-ros') diff --git a/dev-ros/Manifest.gz b/dev-ros/Manifest.gz index bf2f47748e7b..773a8c8432d7 100644 Binary files a/dev-ros/Manifest.gz and b/dev-ros/Manifest.gz differ diff --git a/dev-ros/ament_cmake_core/Manifest b/dev-ros/ament_cmake_core/Manifest index 59c672a2a9c1..a6810a65720c 100644 --- a/dev-ros/ament_cmake_core/Manifest +++ b/dev-ros/ament_cmake_core/Manifest @@ -1,6 +1,8 @@ +AUX findpython.patch 543 BLAKE2B b5124bbbfdd97548aaf61bc5c0693bbd230a253302054103b83ae3136c4152f1b692b92a275dcb64713e1baaa0478a65a78a3e3bab9b8668fb14bf5e2c55ffac SHA512 1bd15b358230d43e7556536550287fa3b1e1eaf73fc852986ae7cec82bb13d883f08ac08b89de327465a76a0acdb94a1b09b4a80c4285f85224a2411ab712799 DIST ament_cmake-1.1.4.tar.gz 94117 BLAKE2B 612bf25301b9794cf51b460819cf4a029547fbc97f7a428215a19f0a7747115de02d3f2cb5f5e524e73ba30813388ca7bff059ab7fe472916eaf2b23ecc76355 SHA512 56acd3d2a8d4b15a164dfdcaa2157fff2889a4c5c0b155ad65a815760f531cdf10226d158f40fc15660c52dd1585b85a2566e402f31881378351624f286efb3d DIST ament_cmake-1.3.0.tar.gz 103040 BLAKE2B 8220d380923a591667b3b4bbe785f30ac935ce10c4fd6bf8bd22149586373f353cd9e71723638dca503bd54ff709783ea1e133c5034901fe2d891fd6bbe7c560 SHA512 44f71102e22fe9f6cd8c3cc13960d63af377eec0a6f7fb7ae99c18f2afae07f3997c9f226f7db8cc8020acdf45561ad9eb1006c6834125d6da137e8638617df8 EBUILD ament_cmake_core-1.1.4.ebuild 1075 BLAKE2B ff884eddba246893586a32fd06e24bd72119d430d3191b1c3e88de924f8994dea0063299946e3a1ab3bf484e696f610f636833d67fe3db1abc0fad18c55d0367 SHA512 d9f881098dfbee87dd5c4c387641353856aa37a4de85019943b4f1dce4bd2e6e04e43fadc5ef9ad5f40c91b35a5ca7e9f8054b8911962541681519f2d7a363b4 +EBUILD ament_cmake_core-1.3.0-r1.ebuild 1118 BLAKE2B a52ebad923bd46201e5d03d6ed84d929c325fbb1abeb215dbe2bdf158144c69103a0f45b0a71026efc43eccb574b82c5c4af986ef02b069cee248f073ee14f95 SHA512 868413b27d322859a673f8bb6431b4110b302a49c10a2c34bd153f7945ea202335b78cc3603bed0186f7099609527fca30f53bb6d3b964c58bab3022e49eb5d9 EBUILD ament_cmake_core-1.3.0.ebuild 1075 BLAKE2B b316f88d4917bcd603d931c4dbf322910332d87a787e4eb004e3cac909ef0d9dbccc903a35d5b39534cf7b740c5da917d131ecaf80cac9a1702839b1d94d8eb3 SHA512 31c22b3cc6e68423f3f23aa3b0605fae6d6304c4fa194f621035fee473121a5df90eb7a29f6926a265174816dd67e88d556a54f2976c05d44e1287d84957e2ed -EBUILD ament_cmake_core-9999.ebuild 1075 BLAKE2B ff884eddba246893586a32fd06e24bd72119d430d3191b1c3e88de924f8994dea0063299946e3a1ab3bf484e696f610f636833d67fe3db1abc0fad18c55d0367 SHA512 d9f881098dfbee87dd5c4c387641353856aa37a4de85019943b4f1dce4bd2e6e04e43fadc5ef9ad5f40c91b35a5ca7e9f8054b8911962541681519f2d7a363b4 +EBUILD ament_cmake_core-9999.ebuild 1118 BLAKE2B a52ebad923bd46201e5d03d6ed84d929c325fbb1abeb215dbe2bdf158144c69103a0f45b0a71026efc43eccb574b82c5c4af986ef02b069cee248f073ee14f95 SHA512 868413b27d322859a673f8bb6431b4110b302a49c10a2c34bd153f7945ea202335b78cc3603bed0186f7099609527fca30f53bb6d3b964c58bab3022e49eb5d9 MISC metadata.xml 332 BLAKE2B 4cfb0cdd190fee00f82e219ca7ed55bcfcdf350b2a4abb5001133d0d577e95925c69b7e978aff53a9a9313f7bead35df2e325f878fde235ef28e3580c859b8b1 SHA512 09dca0eeafb32ae8219fa2b0a09b8fe6269ee620900f71ca5528879d961f1192d73584af07c9501a4b3a4c9ad9f2af2b0bd1a9bec0f4099cdc9dec7b177537aa diff --git a/dev-ros/ament_cmake_core/ament_cmake_core-1.3.0-r1.ebuild b/dev-ros/ament_cmake_core/ament_cmake_core-1.3.0-r1.ebuild new file mode 100644 index 000000000000..3e96c689fcb9 --- /dev/null +++ b/dev-ros/ament_cmake_core/ament_cmake_core-1.3.0-r1.ebuild @@ -0,0 +1,47 @@ +# Copyright 2019-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{8..10} ) + +inherit cmake python-any-r1 + +ROS_PN="ament_cmake" +if [ "${PV#9999}" != "${PV}" ] ; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/ament/ament_cmake" + SRC_URI="" + S=${WORKDIR}/${P}/${PN} +else + SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz" + S="${WORKDIR}/${ROS_PN}-${PV}/${PN}" +fi + +DESCRIPTION="The core of the ament buildsystem in CMake" +HOMEPAGE="https://github.com/ament/ament_cmake" + +LICENSE="Apache-2.0" +SLOT="0" +if [ "${PV#9999}" != "${PV}" ] ; then + PROPERTIES="live" +else + KEYWORDS="~amd64" +fi +IUSE="" +PATCHES=( "${FILESDIR}/findpython.patch" ) + +RDEPEND=" + dev-python/ament_package + dev-python/catkin_pkg +" +DEPEND="${RDEPEND}" +BDEPEND=" + $(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}]') + ${PYTHON_DEPS} +" + +python_check_deps() { + has_version "dev-python/ament_package[${PYTHON_USEDEP}]" && \ + has_version "dev-python/catkin_pkg[${PYTHON_USEDEP}]" +} diff --git a/dev-ros/ament_cmake_core/ament_cmake_core-9999.ebuild b/dev-ros/ament_cmake_core/ament_cmake_core-9999.ebuild index 0bc79bd3fd0c..3e96c689fcb9 100644 --- a/dev-ros/ament_cmake_core/ament_cmake_core-9999.ebuild +++ b/dev-ros/ament_cmake_core/ament_cmake_core-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 2019-2021 Gentoo Authors +# Copyright 2019-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -29,6 +29,7 @@ else KEYWORDS="~amd64" fi IUSE="" +PATCHES=( "${FILESDIR}/findpython.patch" ) RDEPEND=" dev-python/ament_package diff --git a/dev-ros/ament_cmake_core/files/findpython.patch b/dev-ros/ament_cmake_core/files/findpython.patch new file mode 100644 index 000000000000..790b0631b82c --- /dev/null +++ b/dev-ros/ament_cmake_core/files/findpython.patch @@ -0,0 +1,15 @@ +Index: ament_cmake_core/cmake/core/python.cmake +=================================================================== +--- ament_cmake_core.orig/cmake/core/python.cmake ++++ ament_cmake_core/cmake/core/python.cmake +@@ -17,6 +17,10 @@ + # Example: + # find_package(Python3 3.8 REQUIRED) + # find_package(ament_cmake REQUIRED) ++ ++if (CMAKE_GENTOO_BUILD OR CMAKE_BUILD_TYPE STREQUAL Gentoo) ++ set(Python3_FIND_UNVERSIONED_NAMES FIRST) ++endif() + if(NOT TARGET Python3::Interpreter) + find_package(Python3 REQUIRED COMPONENTS Interpreter) + endif() diff --git a/dev-ros/collada_urdf/Manifest b/dev-ros/collada_urdf/Manifest index f987b2901089..d7995e9dce64 100644 --- a/dev-ros/collada_urdf/Manifest +++ b/dev-ros/collada_urdf/Manifest @@ -1,4 +1,4 @@ DIST collada_urdf-1.12.13.tar.gz 73633 BLAKE2B 5c3458f9b245dc6b21dde8c78938712316dba25694847fa54e422cfc5b7802f4dd10a79f6fe62c7b9f553d215ddb0b9276e33651d7e75f3d11a78efa3f031a08 SHA512 ec1063b124727bb51d0ce6d19f5203ae8a1d368d3ab21b80fcb1f699022008a639638e9ebccf7d24587c7ff6b88c33e0c81cc9adc3e00334960f830248293e0b -EBUILD collada_urdf-1.12.13-r1.ebuild 655 BLAKE2B 8a701a04c97e98d6326414250c24b301d9399054930323b04b0f5b0c9a2babeb4be3e5218789efd8f83eee6f8f193982afe2d76ceed35eb4bd0fbc7cc14fec67 SHA512 ccc58b990662bac07a80dedca170e79faa318a783eaa76f5ab67110aa69786d1c855b675fad87a5e6d984af73281b6803c7a6d605188ec23d2314f63674278ed -EBUILD collada_urdf-9999.ebuild 655 BLAKE2B 8a701a04c97e98d6326414250c24b301d9399054930323b04b0f5b0c9a2babeb4be3e5218789efd8f83eee6f8f193982afe2d76ceed35eb4bd0fbc7cc14fec67 SHA512 ccc58b990662bac07a80dedca170e79faa318a783eaa76f5ab67110aa69786d1c855b675fad87a5e6d984af73281b6803c7a6d605188ec23d2314f63674278ed +EBUILD collada_urdf-1.12.13-r2.ebuild 657 BLAKE2B 196a55a892fc5bd7c03d7c1913579782b7cba6150ffaeca2693d2c1972e5e280e30d4b57acc4f8d01e5fe93829209027b61b2b7c8c508ca0f92176827ebbb1c2 SHA512 53cfe809ad0f5d036d5443a3569e875655a7a4961f1b5bd2c8ed926cefcaa1ad10a009b15aa1f7d4bba0e627d3a7c29d6aaf9c7d86c94170ad399a3dcb0c6a8b +EBUILD collada_urdf-9999.ebuild 657 BLAKE2B 196a55a892fc5bd7c03d7c1913579782b7cba6150ffaeca2693d2c1972e5e280e30d4b57acc4f8d01e5fe93829209027b61b2b7c8c508ca0f92176827ebbb1c2 SHA512 53cfe809ad0f5d036d5443a3569e875655a7a4961f1b5bd2c8ed926cefcaa1ad10a009b15aa1f7d4bba0e627d3a7c29d6aaf9c7d86c94170ad399a3dcb0c6a8b MISC metadata.xml 331 BLAKE2B b9ec6a01851ded686f7f0b06a6bf7de4da48f2129e027867203b1ab9f14899053a3aaedacd2bb77437c93829b3bc344fa7f050f0fb2ac9dea8a2f7d5462d9934 SHA512 ef026d0f4a5b29f8ac8a2bd1099abb9ac7050487a005289446ed058091746bba9cd54d764ef84c3b9d35adbdb124f6868339100ad4da0798fa7c856ce457987a diff --git a/dev-ros/collada_urdf/collada_urdf-1.12.13-r1.ebuild b/dev-ros/collada_urdf/collada_urdf-1.12.13-r1.ebuild deleted file mode 100644 index a88a7e5d80af..000000000000 --- a/dev-ros/collada_urdf/collada_urdf-1.12.13-r1.ebuild +++ /dev/null @@ -1,35 +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/collada_urdf" -KEYWORDS="~amd64 ~arm" -ROS_SUBDIR=${PN} - -inherit ros-catkin - -DESCRIPTION="Convert Unified Robot Description Format (URDF) documents into COLLADA documents" -LICENSE="BSD" -SLOT="0" -IUSE="" - -RDEPEND=" - dev-libs/boost:= - dev-ros/angles:0 - dev-ros/collada_parser - dev-ros/resource_retriever - dev-ros/rosconsole - dev-ros/urdf - dev-ros/geometric_shapes - media-libs/assimp - dev-libs/collada-dom:= -" -DEPEND="${RDEPEND} - dev-cpp/eigen:3 - test? ( - dev-cpp/gtest - ) -" -BDEPEND=" - dev-ros/cmake_modules -" diff --git a/dev-ros/collada_urdf/collada_urdf-1.12.13-r2.ebuild b/dev-ros/collada_urdf/collada_urdf-1.12.13-r2.ebuild new file mode 100644 index 000000000000..0c59340cadf6 --- /dev/null +++ b/dev-ros/collada_urdf/collada_urdf-1.12.13-r2.ebuild @@ -0,0 +1,35 @@ +# 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/collada_urdf" +KEYWORDS="~amd64 ~arm" +ROS_SUBDIR=${PN} + +inherit ros-catkin + +DESCRIPTION="Convert Unified Robot Description Format (URDF) documents into COLLADA documents" +LICENSE="BSD" +SLOT="0" +IUSE="" + +RDEPEND=" + dev-libs/boost:= + dev-ros/angles:0 + dev-ros/collada_parser + dev-ros/resource_retriever + dev-ros/rosconsole + dev-ros/urdf + dev-ros/geometric_shapes + media-libs/assimp:= + dev-libs/collada-dom:= +" +DEPEND="${RDEPEND} + dev-cpp/eigen:3 + test? ( + dev-cpp/gtest + ) +" +BDEPEND=" + dev-ros/cmake_modules +" diff --git a/dev-ros/collada_urdf/collada_urdf-9999.ebuild b/dev-ros/collada_urdf/collada_urdf-9999.ebuild index a88a7e5d80af..0c59340cadf6 100644 --- a/dev-ros/collada_urdf/collada_urdf-9999.ebuild +++ b/dev-ros/collada_urdf/collada_urdf-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 @@ -21,7 +21,7 @@ RDEPEND=" dev-ros/rosconsole dev-ros/urdf dev-ros/geometric_shapes - media-libs/assimp + media-libs/assimp:= dev-libs/collada-dom:= " DEPEND="${RDEPEND} diff --git a/dev-ros/geometric_shapes/Manifest b/dev-ros/geometric_shapes/Manifest index 26b2ca27e540..85147ed26833 100644 --- a/dev-ros/geometric_shapes/Manifest +++ b/dev-ros/geometric_shapes/Manifest @@ -1,4 +1,4 @@ DIST geometric_shapes-0.7.3.tar.gz 85830 BLAKE2B 2e5475a55e389ccd0cf2819c268efdf6e8764daadc7adae48d89d636b8155c49b892ec7204f2ecedc2e01948f6fa31fcaa88a14709d2ab63f850aee9352f5b1b SHA512 bd35a3aa23243d1bf85e7c9cc8b2263cbc1e5af626ae80950fd0867222bd5aaa29ac7fed6c1d5e28943916314ab941b182ba343114452b98c6f18b33a570123c -EBUILD geometric_shapes-0.7.3.ebuild 962 BLAKE2B 840e12d79c63939d8201411beeddcdbadccbd31e99dc22b73370fe2a3f3f9ceb22e41b42b839a19d6cf91c9c5f354bcc3ca8965393aac6984e3836cb95723496 SHA512 e3173b034363be24385dad27b04a894cced4b899972a86e333461cc6c5aaf0d451657bc6cd0fb99cdff31df3ae3ec31ac7012f4b1623ed7e8e388fdca83f826a -EBUILD geometric_shapes-9999.ebuild 962 BLAKE2B 0ff665f8bdd88170d8882ec6f747268db7bc7186443f4df47945e6bae598aa2c4fabbf666aadab7df5eb534d2c666dc9ff8dcc4466222bc84da8a7c77ec782fd SHA512 63443250aa14f3e756ebe334978fe6fee23f7c8de255ab76712f6d0c0b786beace93ffc8a96df5bcd0b5407c366754ad1792a564e191e81224a03804a8581cc6 +EBUILD geometric_shapes-0.7.3-r1.ebuild 964 BLAKE2B 692daf88a07d746d1934651f79c0dab356b9ccf111d921724bd62e6e362b2bad3acfddab93c48ab210098a089b63580546a2014fc064729c57a345b347b31453 SHA512 11f3cf878bc9bb28ce236af5d51e6bd6b628f8b42d9255a378a9362c26a75f4905cad160d100210bf1e4125c61e5aeba03a11327d3fcc4fa81bb1b4c8e459c3e +EBUILD geometric_shapes-9999.ebuild 964 BLAKE2B 692daf88a07d746d1934651f79c0dab356b9ccf111d921724bd62e6e362b2bad3acfddab93c48ab210098a089b63580546a2014fc064729c57a345b347b31453 SHA512 11f3cf878bc9bb28ce236af5d51e6bd6b628f8b42d9255a378a9362c26a75f4905cad160d100210bf1e4125c61e5aeba03a11327d3fcc4fa81bb1b4c8e459c3e MISC metadata.xml 344 BLAKE2B eb25f5d8d67b1c21474afb2d2b71998ded581ba296decbb6cb382b4e7e8c28ee88d5da3cfc45bcd4d4a8ae632d49f6108199a5bd13e284260849f5105b23cac4 SHA512 a595dfc3c8e08b85e4af946d85bc6a2684c028a247da10941aaa041236ac7a03276ca7322c4d45ec34d57305d87b611c283c116a602f15116f9613bc021092d3 diff --git a/dev-ros/geometric_shapes/geometric_shapes-0.7.3-r1.ebuild b/dev-ros/geometric_shapes/geometric_shapes-0.7.3-r1.ebuild new file mode 100644 index 000000000000..a27b5a9e338e --- /dev/null +++ b/dev-ros/geometric_shapes/geometric_shapes-0.7.3-r1.ebuild @@ -0,0 +1,38 @@ +# 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-planning/geometric_shapes" +KEYWORDS="~amd64 ~arm" + +inherit flag-o-matic ros-catkin + +DESCRIPTION="Generic definitions of geometric shapes and bodies" +LICENSE="BSD" +SLOT="0" +IUSE="" + +RDEPEND=" + dev-cpp/eigen:3 + dev-libs/boost:= + media-libs/qhull + media-libs/assimp:= + sci-libs/octomap + dev-ros/random_numbers + dev-ros/resource_retriever + dev-ros/eigen_stl_containers + dev-libs/console_bridge:= +" +DEPEND="${RDEPEND} + dev-ros/visualization_msgs[${CATKIN_MESSAGES_CXX_USEDEP}] + dev-ros/shape_msgs[${CATKIN_MESSAGES_CXX_USEDEP}] + test? ( dev-cpp/gtest dev-ros/rosunit ) +" + +src_prepare() { + ros-catkin_src_prepare + # https://bugs.gentoo.org/738556 + # http://eigen.tuxfamily.org/dox-devel/group__TopicUnalignedArrayAssert.html + append-cxxflags '-std=c++17' + sed -e 's/add_compile_options(/#\0/g' -i CMakeLists.txt || die +} diff --git a/dev-ros/geometric_shapes/geometric_shapes-0.7.3.ebuild b/dev-ros/geometric_shapes/geometric_shapes-0.7.3.ebuild deleted file mode 100644 index d7890463d7db..000000000000 --- a/dev-ros/geometric_shapes/geometric_shapes-0.7.3.ebuild +++ /dev/null @@ -1,38 +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-planning/geometric_shapes" -KEYWORDS="~amd64 ~arm" - -inherit flag-o-matic ros-catkin - -DESCRIPTION="Generic definitions of geometric shapes and bodies" -LICENSE="BSD" -SLOT="0" -IUSE="" - -RDEPEND=" - dev-cpp/eigen:3 - dev-libs/boost:= - media-libs/qhull - media-libs/assimp - sci-libs/octomap - dev-ros/random_numbers - dev-ros/resource_retriever - dev-ros/eigen_stl_containers - dev-libs/console_bridge:= -" -DEPEND="${RDEPEND} - dev-ros/visualization_msgs[${CATKIN_MESSAGES_CXX_USEDEP}] - dev-ros/shape_msgs[${CATKIN_MESSAGES_CXX_USEDEP}] - test? ( dev-cpp/gtest dev-ros/rosunit ) -" - -src_prepare() { - ros-catkin_src_prepare - # https://bugs.gentoo.org/738556 - # http://eigen.tuxfamily.org/dox-devel/group__TopicUnalignedArrayAssert.html - append-cxxflags '-std=c++17' - sed -e 's/add_compile_options(/#\0/g' -i CMakeLists.txt || die -} diff --git a/dev-ros/geometric_shapes/geometric_shapes-9999.ebuild b/dev-ros/geometric_shapes/geometric_shapes-9999.ebuild index 4e9add6e0660..a27b5a9e338e 100644 --- a/dev-ros/geometric_shapes/geometric_shapes-9999.ebuild +++ b/dev-ros/geometric_shapes/geometric_shapes-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -16,7 +16,7 @@ RDEPEND=" dev-cpp/eigen:3 dev-libs/boost:= media-libs/qhull - media-libs/assimp + media-libs/assimp:= sci-libs/octomap dev-ros/random_numbers dev-ros/resource_retriever diff --git a/dev-ros/rviz/Manifest b/dev-ros/rviz/Manifest index 5efb6e791355..baeda3e2012c 100644 --- a/dev-ros/rviz/Manifest +++ b/dev-ros/rviz/Manifest @@ -1,6 +1,5 @@ -AUX assimp.patch 408 BLAKE2B 7bad0cf1d305c2db8e246a23399b941edffe813284ad9479149c4eaed88ae61b46d50db212d9e3c2f9504a150e314bd825438dfec6f0a36f61ad9542d628f8c4 SHA512 f7f3ca0ae3556735fa85497eb23c3406c3ae21c6db16df2bd323bcc23673bb2a6ea353103e0c9653337269d89b71bbbc62368261709c2485ac7891f8d23c21ab AUX yamlcpp.patch 435 BLAKE2B de34251a6eac3d860ce42defab5a157294b7f541fd508e6ce400f3c4c6d8ffacbb3f131dff7b453e09c6e6d03b10d7f0ecd8c665759d1f6c1195fae59919fa21 SHA512 f9da2a7cf56aa5b19648bdbe7b40ca5947f6dd140ef7bd65b860b8fea0dd16e42ad92b0b04a28276a6c053fde46ba6865846402e89d64dedc2ac6083b4036c2a 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 +EBUILD rviz-1.14.14-r1.ebuild 1801 BLAKE2B 6fcd08671c34af73aea153399f2d30c7153f337abb1767c783779e2dc59c50de2d7e40c728db5dd6a285e95f220015eedd663d1efbda386747b92a8ec7f97aa3 SHA512 192a8b010e7c219a8f7deaf48bfe9cd302761dc30d0d8b2a01acceddb4298588004da0a8b744a66d45cf651a1e95966f494e9bebe7d5188661f347c18d360cc6 +EBUILD rviz-9999.ebuild 1801 BLAKE2B 6fcd08671c34af73aea153399f2d30c7153f337abb1767c783779e2dc59c50de2d7e40c728db5dd6a285e95f220015eedd663d1efbda386747b92a8ec7f97aa3 SHA512 192a8b010e7c219a8f7deaf48bfe9cd302761dc30d0d8b2a01acceddb4298588004da0a8b744a66d45cf651a1e95966f494e9bebe7d5188661f347c18d360cc6 MISC metadata.xml 337 BLAKE2B 7a8932b503a69c523ed91eac0b3f286c0aeb9883709af787a8dbf16862056484e97928a94fbc238fc9cec781402cc639f1d963302418e5a09dbe80209ecb5ab6 SHA512 de7dc3480eef9fa198e8d6e9f8f722fb42c8984ca877cf05a890ead1450b0f39aa90b69a82876b1a1958d930b09bef8b20ef7e5a24d8777b9ccd1b6c49d01932 diff --git a/dev-ros/rviz/files/assimp.patch b/dev-ros/rviz/files/assimp.patch deleted file mode 100644 index 0e0eb3ed3384..000000000000 --- a/dev-ros/rviz/files/assimp.patch +++ /dev/null @@ -1,13 +0,0 @@ -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-r1.ebuild b/dev-ros/rviz/rviz-1.14.14-r1.ebuild new file mode 100644 index 000000000000..95d1d0a86982 --- /dev/null +++ b/dev-ros/rviz/rviz-1.14.14-r1.ebuild @@ -0,0 +1,77 @@ +# 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" +) + +src_test() { + virtx ros-catkin_src_test +} diff --git a/dev-ros/rviz/rviz-1.14.14.ebuild b/dev-ros/rviz/rviz-1.14.14.ebuild deleted file mode 100644 index 3772a4e7299a..000000000000 --- a/dev-ros/rviz/rviz-1.14.14.ebuild +++ /dev/null @@ -1,78 +0,0 @@ -# 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-9999.ebuild b/dev-ros/rviz/rviz-9999.ebuild index 3772a4e7299a..95d1d0a86982 100644 --- a/dev-ros/rviz/rviz-9999.ebuild +++ b/dev-ros/rviz/rviz-9999.ebuild @@ -18,7 +18,7 @@ IUSE="" RDEPEND=" dev-libs/boost:=[threads(+)] - media-libs/assimp + media-libs/assimp:= dev-games/ogre:=[-double-precision] virtual/opengl dev-qt/qtwidgets:5 @@ -70,7 +70,6 @@ BDEPEND=" PATCHES=( "${FILESDIR}/yamlcpp.patch" - "${FILESDIR}/assimp.patch" ) src_test() { -- cgit v1.2.3