diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2021-08-14 10:30:13 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2021-08-14 10:30:13 +0100 |
| commit | 616579b5d773c50af31ee56f00105d96ce641ca2 (patch) | |
| tree | 2ad4d3ba1429bd93a36ab99a2f5ec3490412115e /dev-ros/rviz | |
| parent | 068424b26532f3551a81421a9be67ed206e5c11a (diff) | |
gentoo resync : 14.08.2021
Diffstat (limited to 'dev-ros/rviz')
| -rw-r--r-- | dev-ros/rviz/Manifest | 5 | ||||
| -rw-r--r-- | dev-ros/rviz/files/yamlcpp.patch | 14 | ||||
| -rw-r--r-- | dev-ros/rviz/rviz-1.14.8-r1.ebuild (renamed from dev-ros/rviz/rviz-1.14.8.ebuild) | 4 | ||||
| -rw-r--r-- | dev-ros/rviz/rviz-9999.ebuild | 4 |
4 files changed, 23 insertions, 4 deletions
diff --git a/dev-ros/rviz/Manifest b/dev-ros/rviz/Manifest index b89580b90e8b..3f79cb58019a 100644 --- a/dev-ros/rviz/Manifest +++ b/dev-ros/rviz/Manifest @@ -1,4 +1,5 @@ +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.ebuild 1802 BLAKE2B 0b191ec76e3d8d02a18b12b8a306041cdab9a2a3c0f20acad89945a81fdfb275d15f6829a9fbe895cff765e0639be7f9d2ebcd6c6977d7a311e206e92dca0085 SHA512 a05fd274e14b2fd5e6a9a09ca5f86ebb14d4712d433c92c8b305735ea76a3d4a2399ee692ba206c387bcc173b893ed6188d8ed8901a5d95a7c44f05af1368107 -EBUILD rviz-9999.ebuild 1802 BLAKE2B 0b191ec76e3d8d02a18b12b8a306041cdab9a2a3c0f20acad89945a81fdfb275d15f6829a9fbe895cff765e0639be7f9d2ebcd6c6977d7a311e206e92dca0085 SHA512 a05fd274e14b2fd5e6a9a09ca5f86ebb14d4712d433c92c8b305735ea76a3d4a2399ee692ba206c387bcc173b893ed6188d8ed8901a5d95a7c44f05af1368107 +EBUILD rviz-1.14.8-r1.ebuild 1845 BLAKE2B 377ea5a9d1717f2c50bb0b3a2d322b0f5607212f45bd498e2e8d56c8f2b3275c09596ecee09465fc88412d95f08e0de126df751f5368ca59c99180af9373069a SHA512 bb161f9069d4a8b6a5de0325362c2523154bbcf599ef29e4448adcdaafe309242ace14ea80f03ffbfea5682e502ac48f7d94d9f7628e42d242655cb1e6b51dce +EBUILD rviz-9999.ebuild 1845 BLAKE2B 377ea5a9d1717f2c50bb0b3a2d322b0f5607212f45bd498e2e8d56c8f2b3275c09596ecee09465fc88412d95f08e0de126df751f5368ca59c99180af9373069a SHA512 bb161f9069d4a8b6a5de0325362c2523154bbcf599ef29e4448adcdaafe309242ace14ea80f03ffbfea5682e502ac48f7d94d9f7628e42d242655cb1e6b51dce MISC metadata.xml 336 BLAKE2B 8cba61f66f05c578aa056805cff5c5f9b79f4cc9a36001a5c332b048958039e049e8003b4c6a6cbe44a10973b5094daf880f25f9a124a2967069687762a492d0 SHA512 5621623b90d64245ec73b1ff7cace103dd809ac9da8b4614cd8b5931854ed159e8b5de867f1a6e83949376b99e41c181def0569f90f128c4c85e97cd42659120 diff --git a/dev-ros/rviz/files/yamlcpp.patch b/dev-ros/rviz/files/yamlcpp.patch new file mode 100644 index 000000000000..a0c9151d0cd0 --- /dev/null +++ b/dev-ros/rviz/files/yamlcpp.patch @@ -0,0 +1,14 @@ +Index: rviz-1.14.8/src/rviz/CMakeLists.txt +=================================================================== +--- rviz-1.14.8.orig/src/rviz/CMakeLists.txt ++++ rviz-1.14.8/src/rviz/CMakeLists.txt +@@ -1,4 +1,8 @@ +-find_package(yaml-cpp REQUIRED) ++find_package(PkgConfig REQUIRED) ++pkg_check_modules(YAML_CPP yaml-cpp) ++if(NOT YAML_CPP_FOUND) ++ find_package(yaml-cpp REQUIRED) ++endif() + + include_directories(${YAML_CPP_INCLUDE_DIR}) + diff --git a/dev-ros/rviz/rviz-1.14.8.ebuild b/dev-ros/rviz/rviz-1.14.8-r1.ebuild index e25c75bee058..1f16a85d3c4b 100644 --- a/dev-ros/rviz/rviz-1.14.8.ebuild +++ b/dev-ros/rviz/rviz-1.14.8-r1.ebuild @@ -29,7 +29,7 @@ RDEPEND=" dev-libs/urdfdom:= dev-libs/tinyxml2:= - dev-ros/angles + dev-ros/angles:0 dev-ros/image_geometry dev-ros/image_transport dev-ros/interactive_markers @@ -69,6 +69,8 @@ BDEPEND=" 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 e25c75bee058..1f16a85d3c4b 100644 --- a/dev-ros/rviz/rviz-9999.ebuild +++ b/dev-ros/rviz/rviz-9999.ebuild @@ -29,7 +29,7 @@ RDEPEND=" dev-libs/urdfdom:= dev-libs/tinyxml2:= - dev-ros/angles + dev-ros/angles:0 dev-ros/image_geometry dev-ros/image_transport dev-ros/interactive_markers @@ -69,6 +69,8 @@ BDEPEND=" virtual/pkgconfig " +PATCHES=( "${FILESDIR}/yamlcpp.patch" ) + src_test() { virtx ros-catkin_src_test } |