diff --git a/recipes-ros/gscam/gscam/0001-gscam_nodelet.h-include-scoped_ptr.hpp-to-compile-wi.patch b/recipes-ros/gscam/gscam/0001-gscam_nodelet.h-include-scoped_ptr.hpp-to-compile-wi.patch deleted file mode 100644 index 0165930..0000000 --- a/recipes-ros/gscam/gscam/0001-gscam_nodelet.h-include-scoped_ptr.hpp-to-compile-wi.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 40e8f29f5ef9024bf048b48b0e51b906f9f5aa2a Mon Sep 17 00:00:00 2001 -From: Lukas Bulwahn -Date: Tue, 20 Jan 2015 08:41:49 +0100 -Subject: [PATCH] gscam_nodelet.h: include scoped_ptr.hpp to compile with boost - 1.57 - -When compiling gscam with the currently latest boost version 1.57, -it fails with: -In file included from [...]/src/gscam_nodelet.cpp:5:0: -[...]/include/gscam/gscam_nodelet.h:20:12: error: 'scoped_ptr' in namespace 'boost' does not name a template type - boost::scoped_ptr gscam_driver_; - ^ -[...]/include/gscam/gscam_nodelet.h:21:12: error: 'scoped_ptr' in namespace 'boost' does not name a template type - boost::scoped_ptr stream_thread_; - ^ - -It seems that the dependencies of boost/thread.hpp have changed -and boost/scoped_ptr.hpp is not included anymore with -boost/thread.hpp. Hence, the scoped_ptr is not defined in the -gscam_nodelet header. After scanning quickly through the release -notes of version 1.57, the boost bug tracker and a few changesets, -I could not find not a hint what has changed in the thread library -that gscam must include scoped_ptr itself. - -This commit simply addresses the compiler error by explicitly -adding boost's scoped_ptr header in the gscam_nodelet header. -As this commit also compiles with boost version 1.56, the commit -is not expected to cause any problems with other build -configurations. - -Signed-off-by: Lukas Bulwahn - -Upstream-Status: Accepted ---- - include/gscam/gscam_nodelet.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/include/gscam/gscam_nodelet.h b/include/gscam/gscam_nodelet.h -index 60fc25f..c450dab 100644 ---- a/include/gscam/gscam_nodelet.h -+++ b/include/gscam/gscam_nodelet.h -@@ -6,6 +6,7 @@ - #include - - #include -+#include - - namespace gscam { - class GSCamNodelet : public nodelet::Nodelet --- -1.9.3 - diff --git a/recipes-ros/gscam/gscam_0.1.3.bb b/recipes-ros/gscam/gscam_0.2.0.bb similarity index 69% rename from recipes-ros/gscam/gscam_0.1.3.bb rename to recipes-ros/gscam/gscam_0.2.0.bb index 0df56dc..87654a3 100644 --- a/recipes-ros/gscam/gscam_0.1.3.bb +++ b/recipes-ros/gscam/gscam_0.2.0.bb @@ -7,9 +7,7 @@ DEPENDS = "gstreamer gst-plugins-base gst-plugins-good nodelet opencv roscpp ima camera-calibration-parsers camera-info-manager" SRC_URI = "https://github.com/ros-drivers/${ROS_SPN}/archive/${PV}.tar.gz;downloadfilename=${ROS_SP}.tar.gz" -SRC_URI[md5sum] = "c20617a0db24124168fe968365ecb990" -SRC_URI[sha256sum] = "56fbb0c31d32cf4ff1a1b702732c3e8373e6d541c431329bcd931bd705991a35" - -SRC_URI += "file://0001-gscam_nodelet.h-include-scoped_ptr.hpp-to-compile-wi.patch" +SRC_URI[md5sum] = "b0512882e06f5cdd4c6015f16dceb346" +SRC_URI[sha256sum] = "84d02ed9a0bed769bebddfb67d27085ae779aaf9ab1311aaad94e9d17aa0fbc6" inherit catkin