diff options
Diffstat (limited to 'dev-ros/visp_auto_tracker')
-rw-r--r-- | dev-ros/visp_auto_tracker/Manifest | 8 | ||||
-rw-r--r-- | dev-ros/visp_auto_tracker/files/boost170.patch | 13 | ||||
-rw-r--r-- | dev-ros/visp_auto_tracker/files/ocv4.patch | 25 | ||||
-rw-r--r-- | dev-ros/visp_auto_tracker/visp_auto_tracker-0.12.1.ebuild (renamed from dev-ros/visp_auto_tracker/visp_auto_tracker-0.11.1-r2.ebuild) | 6 | ||||
-rw-r--r-- | dev-ros/visp_auto_tracker/visp_auto_tracker-9999.ebuild | 6 |
5 files changed, 7 insertions, 51 deletions
diff --git a/dev-ros/visp_auto_tracker/Manifest b/dev-ros/visp_auto_tracker/Manifest index 14a419f9517e..0b87d9edd6c4 100644 --- a/dev-ros/visp_auto_tracker/Manifest +++ b/dev-ros/visp_auto_tracker/Manifest @@ -1,6 +1,4 @@ -AUX boost170.patch 497 BLAKE2B 3ff7f23fe562d9597bd379123721a24a6b949d38ceddce49c4dd0a12d4e6597704511c31fc133ce4d3bb8897c725c6ab207d9330482287ecb44830fb16765e65 SHA512 489454810cb6fa313ac24668c655e59e9a520c32548f9df3b7d0529f0e6a7fc83691a0f2b48d9b1f3f74fc77738e79e06fb0f32fce427c3aff3fa76886b71be7 -AUX ocv4.patch 980 BLAKE2B 9e2ab8f0bb49c3f18191ecba66853ac23de278069c0493b74db0d1f368959d91499a57a36cd8ccac85fd7c86ed0a828da4f857785c9ea9951ac23b54e9739aab SHA512 f9f5b2060e0a780dc4ef09a79685c0698c097b248cfa0bd651572f7446f3e382913a9040ec3209991fc5b641cb1c482597ad8cd84ab7f4d88d42c14e78bf11c2 -DIST vision_visp-0.11.1.tar.gz 1014349 BLAKE2B 63148bef65a8361be7cb4a3d27bae4e6440feeeca3ab7183c6c345d4d1a2e0e4f7bc52b265455636ae8e07ddbed0e182c8d0b326b7686cdeda97500203fe3183 SHA512 cb1a09fea7ed2bb74c0c3f5a525d35ef7304dc2c569c6c808cd3751e500b7e32f226436ec4150f63a8280bc3f0c53dfd64757aa09da7344b1ec998130006253c -EBUILD visp_auto_tracker-0.11.1-r2.ebuild 912 BLAKE2B 232d7b2d964c93d85aaa5c5fca83aa2cd44153adc20197ab5f2f1960307cf4940290d1ba87463ac129982237eae84a81c1a5aadfe971c2091dcd56864be5ba3f SHA512 d374ed710dae20e546cfac6165c53bf3c8be86b8dc8a8eb0e30adecfaa48c764106936fdf1061e9f33858dad7c604b0174c5cfd5702577a951dd66e7f0405708 -EBUILD visp_auto_tracker-9999.ebuild 912 BLAKE2B 232d7b2d964c93d85aaa5c5fca83aa2cd44153adc20197ab5f2f1960307cf4940290d1ba87463ac129982237eae84a81c1a5aadfe971c2091dcd56864be5ba3f SHA512 d374ed710dae20e546cfac6165c53bf3c8be86b8dc8a8eb0e30adecfaa48c764106936fdf1061e9f33858dad7c604b0174c5cfd5702577a951dd66e7f0405708 +DIST vision_visp-0.12.1.tar.gz 1014707 BLAKE2B 0c482268761f75e4e36260bb8a98c32677e500f322b3807eda7e24c35681d5fee628e422b67ab9ae73c6a27b467d600ca5ba72220a09e93b146b97273b5d0d54 SHA512 9e050009a335bd8d7f3c024e460087139b43e5b4c44c2048409176b8503aa81193916e767ce06df48fa5d0f0ca23ac551df7201e92e7de65967b9f2df5a1bf7c +EBUILD visp_auto_tracker-0.12.1.ebuild 843 BLAKE2B 8c8e24c40f9f2864ded53828a0df224c9f29597fab03376dca06bba79499ff1d30b261fd605c8ceb7511d53e75ee43ec790775730ddb9673a169303afd4c4a8e SHA512 f3fcf0ff36688fae58d28c16262221f158011e0a9a172d2e49de3466d9b485b5aa01d161ec98ff005204a44f2bc3928a47655d9c3f87f9faf96852ecfd30ec14 +EBUILD visp_auto_tracker-9999.ebuild 843 BLAKE2B 8c8e24c40f9f2864ded53828a0df224c9f29597fab03376dca06bba79499ff1d30b261fd605c8ceb7511d53e75ee43ec790775730ddb9673a169303afd4c4a8e SHA512 f3fcf0ff36688fae58d28c16262221f158011e0a9a172d2e49de3466d9b485b5aa01d161ec98ff005204a44f2bc3928a47655d9c3f87f9faf96852ecfd30ec14 MISC metadata.xml 333 BLAKE2B 107f301bea0dd9adee5e472d36be074cc6a57d8a49fa14cb28b5aca166e99c73f3aaf19ce77acd1040bddcd86c3961f1411e994cd1ce9c0a636cff7d11e4ea66 SHA512 ddf6afe9a48cd4b3a1387aa6e7f0a46260ee2aaeb99d93e96aecac0ba5c36d59b578cc40c0337d40c5ecb9e485a3506138932897c0d9b5a8972d6ad479fa64a3 diff --git a/dev-ros/visp_auto_tracker/files/boost170.patch b/dev-ros/visp_auto_tracker/files/boost170.patch deleted file mode 100644 index 47f04d4989a3..000000000000 --- a/dev-ros/visp_auto_tracker/files/boost170.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: visp_auto_tracker/CMakeLists.txt -=================================================================== ---- visp_auto_tracker.orig/CMakeLists.txt -+++ visp_auto_tracker/CMakeLists.txt -@@ -36,7 +36,7 @@ find_package(catkin REQUIRED COMPONENTS - find_package(VISP) - - find_package(Boost REQUIRED -- COMPONENTS filesystem system signals regex date_time program_options thread) -+ COMPONENTS filesystem system regex date_time program_options thread) - - include_directories( - ${Boost_INCLUDE_DIRS} diff --git a/dev-ros/visp_auto_tracker/files/ocv4.patch b/dev-ros/visp_auto_tracker/files/ocv4.patch deleted file mode 100644 index 79a6970af9f7..000000000000 --- a/dev-ros/visp_auto_tracker/files/ocv4.patch +++ /dev/null @@ -1,25 +0,0 @@ -Index: visp_auto_tracker/flashcode_mbt/libauto_tracker/states.hpp -=================================================================== ---- visp_auto_tracker.orig/flashcode_mbt/libauto_tracker/states.hpp -+++ visp_auto_tracker/flashcode_mbt/libauto_tracker/states.hpp -@@ -1,6 +1,6 @@ - #ifndef __EVENTS_H__ - #define __EVENTS_H__ --#include "cv.h" -+#include <opencv2/core/core_c.h> - // back-end - #include <boost/msm/back/state_machine.hpp> - //front-end -Index: visp_auto_tracker/flashcode_mbt/libauto_tracker/tracking.cpp -=================================================================== ---- visp_auto_tracker.orig/flashcode_mbt/libauto_tracker/tracking.cpp -+++ visp_auto_tracker/flashcode_mbt/libauto_tracker/tracking.cpp -@@ -1,6 +1,6 @@ - #include "ros/ros.h" --#include "cv.h" --#include "highgui.h" -+#include <opencv2/core/core_c.h> -+#include <opencv2/highgui/highgui_c.h> - #include "tracking.h" - #include <visp3/core/vpImageConvert.h> - #include <visp3/core/vpPixelMeterConversion.h> diff --git a/dev-ros/visp_auto_tracker/visp_auto_tracker-0.11.1-r2.ebuild b/dev-ros/visp_auto_tracker/visp_auto_tracker-0.12.1.ebuild index 8867c1fe5284..5932c11a16e9 100644 --- a/dev-ros/visp_auto_tracker/visp_auto_tracker-0.11.1-r2.ebuild +++ b/dev-ros/visp_auto_tracker/visp_auto_tracker-0.12.1.ebuild @@ -4,7 +4,7 @@ EAPI=7 ROS_REPO_URI="https://github.com/lagadic/vision_visp" KEYWORDS="~amd64 ~arm" -VER_PREFIX="kinetic-" +VER_PREFIX="noetic-" ROS_SUBDIR=${PN} inherit ros-catkin @@ -30,7 +30,5 @@ DEPEND="${RDEPEND} dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}] " if [ "${PV#9999}" = "${PV}" ] ; then - S="${WORKDIR}/vision_visp-kinetic-${PV}/${ROS_SUBDIR}" + S="${WORKDIR}/vision_visp-noetic-${PV}/${ROS_SUBDIR}" fi - -PATCHES=( "${FILESDIR}/boost170.patch" "${FILESDIR}/ocv4.patch" ) diff --git a/dev-ros/visp_auto_tracker/visp_auto_tracker-9999.ebuild b/dev-ros/visp_auto_tracker/visp_auto_tracker-9999.ebuild index 8867c1fe5284..5932c11a16e9 100644 --- a/dev-ros/visp_auto_tracker/visp_auto_tracker-9999.ebuild +++ b/dev-ros/visp_auto_tracker/visp_auto_tracker-9999.ebuild @@ -4,7 +4,7 @@ EAPI=7 ROS_REPO_URI="https://github.com/lagadic/vision_visp" KEYWORDS="~amd64 ~arm" -VER_PREFIX="kinetic-" +VER_PREFIX="noetic-" ROS_SUBDIR=${PN} inherit ros-catkin @@ -30,7 +30,5 @@ DEPEND="${RDEPEND} dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}] " if [ "${PV#9999}" = "${PV}" ] ; then - S="${WORKDIR}/vision_visp-kinetic-${PV}/${ROS_SUBDIR}" + S="${WORKDIR}/vision_visp-noetic-${PV}/${ROS_SUBDIR}" fi - -PATCHES=( "${FILESDIR}/boost170.patch" "${FILESDIR}/ocv4.patch" ) |