From 3cf7c3ef441822c889356fd1812ebf2944a59851 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 25 Aug 2020 10:45:55 +0100 Subject: gentoo resync : 25.08.2020 --- dev-ros/image_view/Manifest | 9 ++---- dev-ros/image_view/files/boost170.patch | 13 --------- dev-ros/image_view/image_view-1.12.23.ebuild | 35 ----------------------- dev-ros/image_view/image_view-1.13.0.ebuild | 34 ---------------------- dev-ros/image_view/image_view-1.15.2-r1.ebuild | 39 ++++++++++++++++++++++++++ dev-ros/image_view/image_view-9999.ebuild | 21 ++++++++------ 6 files changed, 55 insertions(+), 96 deletions(-) delete mode 100644 dev-ros/image_view/files/boost170.patch delete mode 100644 dev-ros/image_view/image_view-1.12.23.ebuild delete mode 100644 dev-ros/image_view/image_view-1.13.0.ebuild create mode 100644 dev-ros/image_view/image_view-1.15.2-r1.ebuild (limited to 'dev-ros/image_view') diff --git a/dev-ros/image_view/Manifest b/dev-ros/image_view/Manifest index ed5c883da3bf..81c9ce4cbde1 100644 --- a/dev-ros/image_view/Manifest +++ b/dev-ros/image_view/Manifest @@ -1,7 +1,4 @@ -AUX boost170.patch 513 BLAKE2B c78a511ebf9ec506d75ba5ad639932321ff5542d5812db3e7b448765aff92c9b3e75f299c0ef15626cd5bbd6a34acee9efe202dc2f38dc20478b3f8e2f6b2577 SHA512 15c4024d4de848e06b47d845dd33758cac44c1e2c07982749a523a7d8d852921fff1306aa105f65df6d5152a09e974a0cfb8c1f70859cc415f51b1e1ec9e2b79 -DIST image_pipeline-1.12.23.tar.gz 139986 BLAKE2B 22349762d6119a2246cb812cce310ebe98b046881ea1192425c4a0ebd7717b8e2768cd4f357ebf905f81e2be9816b7b864ee1040e570d156f9377f51386274a1 SHA512 cb9df1845ae3e7a08788e8f401b8e1b5354cc06f9a4b1aa62d2729c5d84033adbc0049a837236644a0b89951a172b230d4c074bc403bb265ba6cf0ad8016dbdd -DIST image_pipeline-1.13.0.tar.gz 143194 BLAKE2B 618f95271196e37126f158e3454ffb81b1543af1fd87db281f6b8ec00bcf37a812139063318b576c7d39cde7828fc45e3caec24fcbb3e6b4a047d16907427ad2 SHA512 91aeb8e7a14090679e639a65de434c51e8d67f9a9c53bde69f9a5b4f3ae64e5fb1470baf5d2ba33debd2f46cd1699cf69bec53ef2160ea405c46c0e19bb3c3af -EBUILD image_view-1.12.23.ebuild 879 BLAKE2B fa54faf98131e0639ebfb8b375c3e6d09b7765ec108cdba4a91adfbc20a74a6dc9053d4b09f306329d0f97a675c347ef2363480508bee8e84869221b3c60d002 SHA512 f5ae3c9cdd3297cdea49c0a9ad6083e547bfc4327360e362001a044e26b9fed332465ececc8a3f2ff6c1b63092a65b17b6267274db7c55cbdc10bd5ec182754e -EBUILD image_view-1.13.0.ebuild 838 BLAKE2B bea07f7d3bd91a3065f787a854916581e51fd718d33138828ed33a774e80b7c488deafd64899ce56ad69bd631ebdd3b6abdbb018dbc2ada14c7eaefd6b472032 SHA512 2673f92cba702ef2c199f873d64c3e38bc7f0a957e7988fdd4a32bb83cb2fc05ec34313b03ae194ee44975d782b4f93c9eeb6c2cfdeaa03e14583b982a4d0a83 -EBUILD image_view-9999.ebuild 838 BLAKE2B bea07f7d3bd91a3065f787a854916581e51fd718d33138828ed33a774e80b7c488deafd64899ce56ad69bd631ebdd3b6abdbb018dbc2ada14c7eaefd6b472032 SHA512 2673f92cba702ef2c199f873d64c3e38bc7f0a957e7988fdd4a32bb83cb2fc05ec34313b03ae194ee44975d782b4f93c9eeb6c2cfdeaa03e14583b982a4d0a83 +DIST image_pipeline-1.15.2.tar.gz 147570 BLAKE2B 7e6ecad344e38426148017c4bdd109cdb505201256b811d7479b2fa5f2b6a94f94708ffd0e2a3c273f09fb8db0afdedb6955320bc142e4b48fbf94eeef45b453 SHA512 8fe9fa7759d83b2585589c6667c82b154c6ab748aa1644e8a58c75550e4c581fdea1b42f91a8c64df4eb7a06b33a76e55325268f314f3ec1f06ee38ee7b06bfc +EBUILD image_view-1.15.2-r1.ebuild 873 BLAKE2B ec5a77c58a5f77cfaa22b285f00d265e882c3f7d375101500951d14f2fce40136714e7ceeeb2a6f2a93d67a7dfec35ed363e61f10c4f27b76d6a02f29b98a336 SHA512 3bf82c2f933fb1538dd7230acb73e96ba80ef395af065555bd6f98208b5f0844afe6a4c384eb2e55b32b1cd661f42e2c582059f3d9850777b97fbdd23cadcbb5 +EBUILD image_view-9999.ebuild 873 BLAKE2B ec5a77c58a5f77cfaa22b285f00d265e882c3f7d375101500951d14f2fce40136714e7ceeeb2a6f2a93d67a7dfec35ed363e61f10c4f27b76d6a02f29b98a336 SHA512 3bf82c2f933fb1538dd7230acb73e96ba80ef395af065555bd6f98208b5f0844afe6a4c384eb2e55b32b1cd661f42e2c582059f3d9850777b97fbdd23cadcbb5 MISC metadata.xml 343 BLAKE2B 338674597d8027dfe18c53c2322f9f1ad7cb177c988a820dfbacbb45cf25ed32fbb65fc0fe08de174b20933d2cbfb7118e1d01b5e9d852f226cbd581da046bb4 SHA512 c16dd878a20c747d32f8445c8eb454b51ffaf8543c1f722cca0e6508d849107e89a2cda92b0d206ef618ae1075d51e542c4178e903f3cb35efd285a5fff0cfcb diff --git a/dev-ros/image_view/files/boost170.patch b/dev-ros/image_view/files/boost170.patch deleted file mode 100644 index ab52d89c5fad..000000000000 --- a/dev-ros/image_view/files/boost170.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: image_view/CMakeLists.txt -=================================================================== ---- image_view.orig/CMakeLists.txt -+++ image_view/CMakeLists.txt -@@ -5,7 +5,7 @@ find_package(catkin REQUIRED COMPONENTS - generate_dynamic_reconfigure_options(cfg/ImageView.cfg) - - catkin_package(CATKIN_DEPENDS dynamic_reconfigure) --find_package(Boost REQUIRED COMPONENTS signals thread) -+find_package(Boost REQUIRED COMPONENTS thread) - find_package(OpenCV REQUIRED) - - include_directories(${Boost_INCLUDE_DIRS} diff --git a/dev-ros/image_view/image_view-1.12.23.ebuild b/dev-ros/image_view/image_view-1.12.23.ebuild deleted file mode 100644 index b7c4e715c9e9..000000000000 --- a/dev-ros/image_view/image_view-1.12.23.ebuild +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -ROS_REPO_URI="https://github.com/ros-perception/image_pipeline" -KEYWORDS="~amd64 ~arm" -PYTHON_COMPAT=( python2_7 ) -ROS_SUBDIR=${PN} - -inherit ros-catkin - -DESCRIPTION="Simple viewer for ROS image topics" -LICENSE="BSD" -SLOT="0" -IUSE="" - -RDEPEND=" - dev-libs/boost:=[threads] - media-libs/opencv:= - x11-libs/gtk+:2 - dev-ros/camera_calibration_parsers - >=dev-ros/cv_bridge-1.11.10 - dev-ros/image_transport - dev-ros/message_filters - dev-ros/nodelet - dev-ros/rosconsole - dev-libs/console_bridge:= - dev-ros/roscpp - dev-ros/stereo_msgs[${CATKIN_MESSAGES_CXX_USEDEP}] - dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}] - dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}] - dev-ros/dynamic_reconfigure[${PYTHON_USEDEP}] -" -DEPEND="${RDEPEND}" -PATCHES=( "${FILESDIR}/boost170.patch" ) diff --git a/dev-ros/image_view/image_view-1.13.0.ebuild b/dev-ros/image_view/image_view-1.13.0.ebuild deleted file mode 100644 index b9c0dff05bac..000000000000 --- a/dev-ros/image_view/image_view-1.13.0.ebuild +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -ROS_REPO_URI="https://github.com/ros-perception/image_pipeline" -KEYWORDS="~amd64 ~arm" -PYTHON_COMPAT=( python2_7 ) -ROS_SUBDIR=${PN} - -inherit ros-catkin - -DESCRIPTION="Simple viewer for ROS image topics" -LICENSE="BSD" -SLOT="0" -IUSE="" - -RDEPEND=" - dev-libs/boost:=[threads] - media-libs/opencv:= - x11-libs/gtk+:2 - dev-ros/camera_calibration_parsers - >=dev-ros/cv_bridge-1.11.10 - dev-ros/image_transport - dev-ros/message_filters - dev-ros/nodelet - dev-ros/rosconsole - dev-libs/console_bridge:= - dev-ros/roscpp - dev-ros/stereo_msgs[${CATKIN_MESSAGES_CXX_USEDEP}] - dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}] - dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}] - dev-ros/dynamic_reconfigure[${PYTHON_USEDEP}] -" -DEPEND="${RDEPEND}" diff --git a/dev-ros/image_view/image_view-1.15.2-r1.ebuild b/dev-ros/image_view/image_view-1.15.2-r1.ebuild new file mode 100644 index 000000000000..59e53eacf1de --- /dev/null +++ b/dev-ros/image_view/image_view-1.15.2-r1.ebuild @@ -0,0 +1,39 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +ROS_REPO_URI="https://github.com/ros-perception/image_pipeline" +KEYWORDS="~amd64 ~arm" +ROS_SUBDIR=${PN} + +inherit ros-catkin + +DESCRIPTION="Simple viewer for ROS image topics" +LICENSE="BSD" +SLOT="0" +IUSE="" + +RDEPEND=" + dev-ros/camera_calibration_parsers + >=dev-ros/cv_bridge-1.11.10 + dev-ros/image_transport + dev-ros/message_filters + dev-ros/nodelet + dev-ros/rosconsole + dev-libs/console_bridge:= + dev-ros/roscpp + dev-ros/dynamic_reconfigure[${PYTHON_SINGLE_USEDEP}] + + dev-libs/boost:=[threads] + media-libs/opencv:= + x11-libs/gtk+:3 + media-libs/harfbuzz:= +" +DEPEND="${RDEPEND} + dev-ros/stereo_msgs[${CATKIN_MESSAGES_CXX_USEDEP}] + dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}] + dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}] +" +BDEPEND=" + virtual/pkgconfig +" diff --git a/dev-ros/image_view/image_view-9999.ebuild b/dev-ros/image_view/image_view-9999.ebuild index b9c0dff05bac..59e53eacf1de 100644 --- a/dev-ros/image_view/image_view-9999.ebuild +++ b/dev-ros/image_view/image_view-9999.ebuild @@ -1,10 +1,9 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 ROS_REPO_URI="https://github.com/ros-perception/image_pipeline" KEYWORDS="~amd64 ~arm" -PYTHON_COMPAT=( python2_7 ) ROS_SUBDIR=${PN} inherit ros-catkin @@ -15,9 +14,6 @@ SLOT="0" IUSE="" RDEPEND=" - dev-libs/boost:=[threads] - media-libs/opencv:= - x11-libs/gtk+:2 dev-ros/camera_calibration_parsers >=dev-ros/cv_bridge-1.11.10 dev-ros/image_transport @@ -26,9 +22,18 @@ RDEPEND=" dev-ros/rosconsole dev-libs/console_bridge:= dev-ros/roscpp + dev-ros/dynamic_reconfigure[${PYTHON_SINGLE_USEDEP}] + + dev-libs/boost:=[threads] + media-libs/opencv:= + x11-libs/gtk+:3 + media-libs/harfbuzz:= +" +DEPEND="${RDEPEND} dev-ros/stereo_msgs[${CATKIN_MESSAGES_CXX_USEDEP}] dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}] dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}] - dev-ros/dynamic_reconfigure[${PYTHON_USEDEP}] " -DEPEND="${RDEPEND}" +BDEPEND=" + virtual/pkgconfig +" -- cgit v1.2.3