Merge pull request #367 from bulwahn/indigo-updates

Updates in ROS indigo until mid of December
This commit is contained in:
KristofRobot 2015-12-11 20:49:50 +01:00
commit 0e7122c958
13 changed files with 46 additions and 9 deletions

View File

@ -1,13 +1,13 @@
DESCRIPTION = "This package is a ROS wrapper for Alvar, an open source AR tag tracking library." DESCRIPTION = "This package is a ROS wrapper for Alvar, an open source AR tag tracking library."
SECTION = "devel" SECTION = "devel"
LICENSE = "LGPL-2.1" LICENSE = "LGPL-2.1"
LIC_FILES_CHKSUM = "file://package.xml;beginline=8;endline=8;md5=f62de161dc7a8f859a0502707b17209e" LIC_FILES_CHKSUM = "file://package.xml;beginline=8;endline=8;md5=061abe8dc89f326789675967c8760541"
DEPENDS = "ar-track-alvar-msgs cmake-modules cv-bridge image-transport libtinyxml pcl-ros resource-retriever roscpp tf visualization-msgs" DEPENDS = "ar-track-alvar-msgs cmake-modules cv-bridge image-transport libtinyxml pcl-ros resource-retriever roscpp tf visualization-msgs"
SRC_URI = "https://github.com/sniekum/${ROS_SPN}/archive/${PV}.tar.gz;downloadfilename=${ROS_SP}.tar.gz" SRC_URI = "https://github.com/sniekum/${ROS_SPN}/archive/${PV}.tar.gz;downloadfilename=${ROS_SP}.tar.gz"
SRC_URI[md5sum] = "5d55aaf9098c1b803f9ed93e3c5fbacd" SRC_URI[md5sum] = "ec5f631e3fee60f27488f38831cd7fd1"
SRC_URI[sha256sum] = "b8c1c28afaf16c03f37067ae2653f5df7d0a15fdb75a27c0a2f4da9c2f89d92e" SRC_URI[sha256sum] = "4bad373e08d31aaafa903138a6cb3e2e81887cca75aacc1f50b4a973a9e13ff9"
S = "${WORKDIR}/${ROS_SP}" S = "${WORKDIR}/${ROS_SP}"

View File

@ -1,6 +1,6 @@
SRC_URI = "https://github.com/ros-drivers/${ROS_SPN}/archive/${PV}.tar.gz;downloadfilename=${ROS_SP}.tar.gz" SRC_URI = "https://github.com/ros-drivers/${ROS_SPN}/archive/${PV}.tar.gz;downloadfilename=${ROS_SP}.tar.gz"
SRC_URI[md5sum] = "e66d263bef1cd36b89f739b8937fd009" SRC_URI[md5sum] = "1bf6135fae371901db1afea03186fa9a"
SRC_URI[sha256sum] = "459ce6d834026969b3bec3fc9d59c446d8bd433661138464b90b9f2df38e6f1c" SRC_URI[sha256sum] = "7b0ee18352a251aea212a701881f59841741272cd9bb62970a32c726dd69d54f"
S = "${WORKDIR}/${ROS_SP}/${ROS_BPN}" S = "${WORKDIR}/${ROS_SP}/${ROS_BPN}"

View File

@ -0,0 +1,35 @@
From ecdde483c81fb89e35f025ee3aacba7cd45528ab Mon Sep 17 00:00:00 2001
From: Alexis Ballier <aballier@gentoo.org>
Date: Fri, 4 Dec 2015 12:38:42 +0100
Subject: [PATCH 2/2] sound_play: Fix build with -DCATKIN_ENABLE_TESTING=OFF.
https://bugs.gentoo.org/show_bug.cgi?id=567466
Upstream-Status: Backport [commit ecdde483c81fb89e35f025ee3aacba7cd45528ab]
Signed-off-by: Lukas Bulwahn <lukas.bulwahn@oss.bmw-carit.de>
---
sound_play/CMakeLists.txt | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/sound_play/CMakeLists.txt b/sound_play/CMakeLists.txt
index ada0b07..3f9604c 100644
--- a/sound_play/CMakeLists.txt
+++ b/sound_play/CMakeLists.txt
@@ -16,9 +16,11 @@ generate_messages(DEPENDENCIES actionlib_msgs)
catkin_package(CATKIN_DEPENDS message_runtime actionlib_msgs
INCLUDE_DIRS include)
-catkin_add_nosetests(scripts/test)
+if(CATKIN_ENABLE_TESTING)
+ catkin_add_nosetests(scripts/test)
-add_subdirectory(test)
+ add_subdirectory(test)
+endif()
install(PROGRAMS
scripts/playbuiltin.py
--
2.4.3

View File

@ -11,4 +11,6 @@ DEPENDS += "roscpp roslib audio-common-msgs diagnostic-msgs"
require audio-common.inc require audio-common.inc
SRC_URI += "file://0002-sound_play-Fix-build-with-DCATKIN_ENABLE_TESTING-OFF.patch;striplevel=2"
RRECOMMENDS_${PN} += "roscpp roslib audio-common-msgs diagnostic-msgs gst-plugins-base gst-plugins-ugly gst-plugins-good rospy festival python-gst gst-meta-audio" RRECOMMENDS_${PN} += "roscpp roslib audio-common-msgs diagnostic-msgs gst-plugins-base gst-plugins-ugly gst-plugins-good rospy festival python-gst gst-meta-audio"

View File

@ -1,6 +1,6 @@
SRC_URI = "https://github.com/ros-perception/${ROS_SPN}/archive/${PV}.tar.gz;downloadfilename=${ROS_SP}.tar.gz" SRC_URI = "https://github.com/ros-perception/${ROS_SPN}/archive/${PV}.tar.gz;downloadfilename=${ROS_SP}.tar.gz"
SRC_URI[md5sum] = "334669348ec228aefac50b83bd5e5af1" SRC_URI[md5sum] = "a3f7456d092577b97f1bb1dfe86197e7"
SRC_URI[sha256sum] = "1a739aef8ea597f6e7eaad26c031ad90e797efcb9cae764cd352bb124e9744ca" SRC_URI[sha256sum] = "14b5a067791c74d922ab39fbf773a08fc98b3ca3d6f920c8798713e4e551711c"
S = "${WORKDIR}/${ROS_SP}/${ROS_BPN}" S = "${WORKDIR}/${ROS_SP}/${ROS_BPN}"

View File

@ -1,6 +1,6 @@
SRC_URI = "https://github.com/ros-perception/${ROS_SPN}/archive/${PV}.tar.gz;downloadfilename=${ROS_SP}.tar.gz" SRC_URI = "https://github.com/ros-perception/${ROS_SPN}/archive/${PV}.tar.gz;downloadfilename=${ROS_SP}.tar.gz"
SRC_URI[md5sum] = "64ead6f8535b38eada57366ae9e08021" SRC_URI[md5sum] = "4cd45df1c6ffa9fea705560e11a51290"
SRC_URI[sha256sum] = "0cf0934d4d9bd91e966afc2f25a4e54646016b6628f4fe58e81faee0c58c88c2" SRC_URI[sha256sum] = "3ce781847f5f855083cfae94a8d89defbe4cc83e086b4c796653561aee08b826"
S = "${WORKDIR}/${ROS_SP}/${ROS_BPN}" S = "${WORKDIR}/${ROS_SP}/${ROS_BPN}"