Merge pull request #589 from shr-project/jansa/pr

Small fixes

recipes-extended/qhull/qhull/0001-testqset-fix-build-with-conf-distro-include-security.patch

@@ -0,0 +1,32 @@
+From d4489d05dadf025ac1f84b3a76a0979dcfbd2bec Mon Sep 17 00:00:00 2001
+From: Martin Jansa <Martin.Jansa@gmail.com>
+Date: Mon, 9 Apr 2018 21:45:24 +0000
+Subject: [PATCH] testqset: fix build with
+ conf/distro/include/security_flags.inc
+
+* fixes:
+  http://errors.yoctoproject.org/Errors/Details/174716/
+  qhull/2012.1-r0/qhull-2012.1/src/testqset/testqset.c:217:9: error: format not a string literal and no format arguments [-Werror=format-security]
+         printf(promptstr);
+         ^~~~~~
+
+Upstream-Status: Pending
+
+Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
+---
+ src/testqset/testqset.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/testqset/testqset.c b/src/testqset/testqset.c
+index 2bdcf17..309d3bf 100644
+--- a/src/testqset/testqset.c
++++ b/src/testqset/testqset.c
+@@ -214,7 +214,7 @@ void readOptions(int argc, char **argv, const char *promptstr, int *numInts, int
+     char *endp;
+ 
+     if (argc != 2 && argc != 3) {
+-        printf(promptstr);
++        printf("%s", promptstr);
+         exit(0);
+     }
+     numIntsArg= strtol(argv[1], &endp, 10);

recipes-extended/qhull/qhull_2012.1.bb

@@ -4,7 +4,9 @@ SECTION = "libs"
 LICENSE = "qhull"
 LIC_FILES_CHKSUM = "file://COPYING.txt;md5=4d4e8c0754b225e2c78cfdd911e8b09e"
 
-SRC_URI = "http://www.qhull.org/download/qhull-${PV}-src.tgz"
+SRC_URI = "http://www.qhull.org/download/qhull-${PV}-src.tgz \
+    file://0001-testqset-fix-build-with-conf-distro-include-security.patch \
+"
 SRC_URI[md5sum] = "d0f978c0d8dfb2e919caefa56ea2953c"
 SRC_URI[sha256sum] = "a35ecaa610550b7f05c3ce373d89c30cf74b059a69880f03080c556daebcff88"
 

recipes-ros/kdl-parser/kdl-parser/0001-add-explicit-dependency-on-libeigen.patch

@@ -1,4 +1,4 @@
-From 48eebb8144f326040c82ea37e8cf00291fbc1403 Mon Sep 17 00:00:00 2001
+From 473d1546f7bbc3bacce1c9b8ada28d591e4ff3f0 Mon Sep 17 00:00:00 2001
 From: Dmitry Rozhkov <dmitry.rozhkov@linux.intel.com>
 Date: Fri, 17 Feb 2017 10:49:30 +0200
 Subject: [PATCH] add explicit dependency on libeigen
@@ -20,14 +20,15 @@ been declarated as a dependency in kdl-parser's recipe.
 Upstream-Status: Inappropriate [It's not kdl-parser's problem, but orocos-kdl's one]
 
 Signed-off-by: Dmitry Rozhkov <dmitry.rozhkov@linux.intel.com>
+
 ---
- CMakeLists.txt | 3 ++-
+ kdl_parser/CMakeLists.txt | 3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
 
-diff --git a/CMakeLists.txt b/CMakeLists.txt
+diff --git a/kdl_parser/CMakeLists.txt b/kdl_parser/CMakeLists.txt
-index 43b96b7..5c96e55 100644
+index fe6eab9..2ad285e 100644
---- aCMakeLists.txt
+--- a/kdl_parser/CMakeLists.txt
-+++ bCMakeLists.txt
++++ b/kdl_parser/CMakeLists.txt
 @@ -9,9 +9,10 @@ find_package(catkin REQUIRED
    COMPONENTS roscpp rosconsole urdf cmake_modules
  )
@@ -39,7 +40,4 @@ index 43b96b7..5c96e55 100644
 +include_directories(include ${EIGEN3_INCLUDE_DIR} ${orocos_kdl_INCLUDE_DIRS} ${TinyXML_INCLUDE_DIRS} ${catkin_INCLUDE_DIRS})
  
  link_directories(${catkin_LIBRARY_DIRS})
- link_directories(${orocos_kdl_LIBRARY_DIRS})
+ link_directories(${Boost_LIBRARY_DIRS})
--- 
-2.7.4
-

recipes-ros/kdl-parser/kdl-parser_1.11.14.bb

@@ -7,4 +7,4 @@ DEPENDS = "libeigen orocos-kdl rosconsole roscpp urdf cmake-modules"
 
 require kdl-parser.inc
 
-SRC_URI += "file://0001-add-explicit-dependency-on-libeigen.patch"
+SRC_URI += "file://0001-add-explicit-dependency-on-libeigen.patch;patchdir=.."

recipes-ros/mavros/mavros/0001-CMake-explicitly-link-the-atomic-library-797.patch

@@ -1,4 +1,4 @@
-From 658347978fc97675dbdff480f4557eb772e915dc Mon Sep 17 00:00:00 2001
+From 06d862fcf3bdcd50fe726e5364200cc5e7b87fcd Mon Sep 17 00:00:00 2001
 From: Lukas Bulwahn <lukas.bulwahn@gmail.com>
 Date: Mon, 4 Sep 2017 16:17:12 +0100
 Subject: [PATCH] CMake: explicitly link the atomic library (#797)
@@ -35,22 +35,20 @@ This patch has been generated with:
 in the mavros repository.
 
 Signed-off-by: Lukas Bulwahn <lukas.bulwahn@gmail.com>
+
 ---
  mavros/CMakeLists.txt | 1 +
  1 file changed, 1 insertion(+)
 
 diff --git a/mavros/CMakeLists.txt b/mavros/CMakeLists.txt
-index a4ac3cb..5233e96 100644
+index 47a24a9..a0bec5d 100644
 --- a/mavros/CMakeLists.txt
 +++ b/mavros/CMakeLists.txt
-@@ -102,6 +102,7 @@ add_library(mavros
+@@ -90,6 +90,7 @@ add_library(mavros
    src/lib/rosconsole_bridge.cpp
  )
  target_link_libraries(mavros
 +  atomic
    ${catkin_LIBRARIES}
    ${Boost_LIBRARIES}
-   ${GeographicLib_LIBRARIES}
+ )
--- 
-1.9.1
-

recipes-ros/mavros/mavros/0001-always-find-Eigen-with-cmake_modules-mechanism.patch

@@ -1,15 +1,16 @@
-From d7b00940cb69d659d77bb08b1cbbf5aad4ea4617 Mon Sep 17 00:00:00 2001
+From 800775cf398c51db878524755fde3c29490f2f5d Mon Sep 17 00:00:00 2001
 From: Lukas Bulwahn <lukas.bulwahn@gmail.com>
 Date: Sun, 7 May 2017 06:14:18 +0200
 Subject: [PATCH] always find Eigen with cmake_modules mechanism
 
 Upstream-Status: Pending
+
 ---
  mavros/CMakeLists.txt | 12 ++++--------
  1 file changed, 4 insertions(+), 8 deletions(-)
 
 diff --git a/mavros/CMakeLists.txt b/mavros/CMakeLists.txt
-index 3b3a0bd..bcc7924 100644
+index 9c33dff..47a24a9 100644
 --- a/mavros/CMakeLists.txt
 +++ b/mavros/CMakeLists.txt
 @@ -26,14 +26,10 @@ find_package(catkin REQUIRED COMPONENTS
@@ -31,6 +32,3 @@ index 3b3a0bd..bcc7924 100644
  
  include(EnableCXX11)
  include(MavrosMavlink)
--- 
-1.9.1
-

recipes-ros/pluginlib/pluginlib_1.10.7.bb

@@ -11,3 +11,6 @@ SRC_URI[md5sum] = "e767bf812d74a115efb5855147e2899b"
 SRC_URI[sha256sum] = "88f7c45b6a27b8d890daa897974b0501458afcc253149c0523554c7f9b80be3b"
 
 inherit catkin
+
+# libclass_loader.so: error: undefined reference to 'pthread_mutexattr_destroy', 'pthread_mutexattr_settype', 'pthread_mutexattr_init'
+LDFLAGS_append = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}"

recipes-ros/ros-canopen/socketcan-interface/0001-compile-also-with-boost-1.66.0.patch

@@ -1,4 +1,4 @@
-From 89b29ca3a3c23ee07bb2df36b95ccfd60af98028 Mon Sep 17 00:00:00 2001
+From 430b5e4dbb1e047b016cb7a4e244aca73f8bafc8 Mon Sep 17 00:00:00 2001
 From: Lukas Bulwahn <lukas.bulwahn@gmail.com>
 Date: Sat, 17 Feb 2018 20:15:12 +0100
 Subject: [PATCH] compile also with boost >= 1.66.0
@@ -20,6 +20,7 @@ Signed-off-by: Lukas Bulwahn <lukas.bulwahn@gmail.com>
 Upstream-Status: Accepted [https://github.com/ros-industrial/ros_canopen/commit/89b29ca3a3c23ee07bb2df36b95ccfd60af98028]
 
 Signed-off-by: Lukas Bulwahn <lukas.bulwahn@gmail.com>
+
 ---
  socketcan_interface/include/socketcan_interface/asio_base.h | 4 ++++
  1 file changed, 4 insertions(+)
@@ -40,6 +41,3 @@ index c54ff12..1a14480 100644
      Socket socket_;
      Frame input_;
      
--- 
-2.7.4
-

recipes-ros/ros-canopen/socketcan-interface/0001-explicitly-include-iostream-to-compile-with-boost-1..patch

@@ -1,4 +1,4 @@
-From 3bf9d9726b278b000a829f639af21d423a38798a Mon Sep 17 00:00:00 2001
+From 221747309d445a38412c2bb97c4b06e301ea7136 Mon Sep 17 00:00:00 2001
 From: Lukas Bulwahn <lukas.bulwahn@gmail.com>
 Date: Sat, 2 Dec 2017 09:17:02 +0100
 Subject: [PATCH] explicitly include iostream to compile with boost >= 1.65.0
@@ -39,12 +39,13 @@ This patch has been generated with:
 in the ros_canopen repository.
 
 Signed-off-by: Lukas Bulwahn <lukas.bulwahn@gmail.com>
+
 ---
  socketcan_interface/include/socketcan_interface/interface.h | 1 +
  1 file changed, 1 insertion(+)
 
 diff --git a/socketcan_interface/include/socketcan_interface/interface.h b/socketcan_interface/include/socketcan_interface/interface.h
-index f60f308..33378de 100644
+index a78a392..0912bc7 100644
 --- a/socketcan_interface/include/socketcan_interface/interface.h
 +++ b/socketcan_interface/include/socketcan_interface/interface.h
 @@ -190,6 +190,7 @@ public:
@@ -55,6 +56,3 @@ index f60f308..33378de 100644
  #include <boost/thread/mutex.hpp>
  
  struct _cout_wrapper{
--- 
-2.7.4
-

recipes-ros/ros-canopen/socketcan-interface/0001-find-and-link-the-thread-library-properly.patch

@@ -1,4 +1,4 @@
-From 401544fa4aab80c0b511df6e629a90c439f5e067 Mon Sep 17 00:00:00 2001
+From 16469e41f490c96d01dd8d894b784baf3d20f340 Mon Sep 17 00:00:00 2001
 From: Lukas Bulwahn <lukas.bulwahn@gmail.com>
 Date: Tue, 16 Jan 2018 15:57:59 +0100
 Subject: [PATCH] find and link the thread library properly
@@ -38,12 +38,13 @@ Signed-off-by: Lukas Bulwahn <lukas.bulwahn@gmail.com>
 Upstream-Status: Submitted [https://github.com/ros-industrial/ros_canopen/pull/263]
 
 Signed-off-by: Lukas Bulwahn <lukas.bulwahn@gmail.com>
+
 ---
  socketcan_interface/CMakeLists.txt | 3 +++
  1 file changed, 3 insertions(+)
 
 diff --git a/socketcan_interface/CMakeLists.txt b/socketcan_interface/CMakeLists.txt
-index 97dc658..c1ee4e4 100644
+index 934451d..340872f 100644
 --- a/socketcan_interface/CMakeLists.txt
 +++ b/socketcan_interface/CMakeLists.txt
 @@ -13,6 +13,8 @@ find_package(Boost REQUIRED
@@ -56,13 +57,10 @@ index 97dc658..c1ee4e4 100644
    INCLUDE_DIRS
      include
 @@ -43,6 +45,7 @@ target_link_libraries(socketcan_dump
-    ${PROJECT_NAME}_string
+    socketcan_interface_string
     ${catkin_LIBRARIES}
     ${Boost_LIBRARIES}
 +   ${CMAKE_THREAD_LIBS_INIT}
  )
  
  # socketcan_bcm
--- 
-2.7.4
-

recipes-ros/ros-canopen/socketcan-interface_0.6.8.bb

@@ -10,3 +10,6 @@ require ros-canopen.inc
 SRC_URI += "file://0001-explicitly-include-iostream-to-compile-with-boost-1..patch;striplevel=2"
 SRC_URI += "file://0001-find-and-link-the-thread-library-properly.patch;striplevel=2"
 SRC_URI += "file://0001-compile-also-with-boost-1.66.0.patch;striplevel=2"
+
+# libclass_loader.so: error: undefined reference to 'pthread_mutexattr_destroy', 'pthread_mutexattr_settype', 'pthread_mutexattr_init'
+LDFLAGS_append = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}"

recipes-ros/ros-comm/roslaunch/0001-increase-rosmaster-timeout.patch

@@ -1,24 +1,25 @@
-From 3802a766efee8438c604b49507b15c17cf00982f Mon Sep 17 00:00:00 2001
+From 2455d52f41d886970d62f26e69849df29b3405b8 Mon Sep 17 00:00:00 2001
 From: Esteve Fernandez <esteve@osrfoundation.org>
 Date: Tue, 14 Jan 2014 17:53:29 +0100
-Subject: Increase start and stop timeouts for ROS master.
+Subject: [PATCH] Increase start and stop timeouts for ROS master.
 
 Certain boards are too slow to boot up the ROS master before roscore gives up.
 This patch increases the start and stop timeouts, giving the ROS master more
 time to start.
 
 Upstream-Status: Inappropriate [embedded specific]
+
 ---
- src/roslaunch/launch.py |    4 ++--
+ tools/roslaunch/src/roslaunch/launch.py | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
-diff --git a/src/roslaunch/launch.py b/src/roslaunch/launch.py
+diff --git a/tools/roslaunch/src/roslaunch/launch.py b/tools/roslaunch/src/roslaunch/launch.py
-index 1a2d3e4..a2d1fbd 100644
+index 758d6fe..25b4053 100644
---- a/src/roslaunch/launch.py
+--- a/tools/roslaunch/src/roslaunch/launch.py
-+++ b/src/roslaunch/launch.py
++++ b/tools/roslaunch/src/roslaunch/launch.py
-@@ -55,8 +55,8 @@ from roslaunch.pmon import start_process_monitor, ProcessListener
+@@ -59,8 +59,8 @@ from roslaunch.rlutil import update_terminal_name
  
- from roslaunch.rlutil import update_terminal_name
+ from rosmaster.master_api import NUM_WORKERS
  
 -_TIMEOUT_MASTER_START = 10.0 #seconds
 -_TIMEOUT_MASTER_STOP  = 10.0 #seconds
@@ -27,6 +28,3 @@ index 1a2d3e4..a2d1fbd 100644
  
  _ID = '/roslaunch'
  
--- 
-1.7.9.5
-

recipes-ros/ros-comm/roslaunch_1.11.21.bb

@@ -8,7 +8,7 @@ PR = "r1"
 
 require ros-comm.inc
 
-SRC_URI += "file://0001-increase-rosmaster-timeout.patch \
+SRC_URI += "file://0001-increase-rosmaster-timeout.patch;patchdir=../.. \
     file://roscore.service \
     file://roscore-default \
 "