diff options
Diffstat (limited to 'dev-ros/rosserial_server')
| -rw-r--r-- | dev-ros/rosserial_server/Manifest | 7 | ||||
| -rw-r--r-- | dev-ros/rosserial_server/files/boost170.patch | 71 | ||||
| -rw-r--r-- | dev-ros/rosserial_server/rosserial_server-0.9.1.ebuild (renamed from dev-ros/rosserial_server/rosserial_server-0.8.0.ebuild) | 1 | ||||
| -rw-r--r-- | dev-ros/rosserial_server/rosserial_server-9999.ebuild | 1 |
4 files changed, 3 insertions, 77 deletions
diff --git a/dev-ros/rosserial_server/Manifest b/dev-ros/rosserial_server/Manifest index e96618f0021a..3037133e437b 100644 --- a/dev-ros/rosserial_server/Manifest +++ b/dev-ros/rosserial_server/Manifest @@ -1,5 +1,4 @@ -AUX boost170.patch 2996 BLAKE2B d34ed939d222fa4d9528e8e6a7f3aaa90ebea944e651f7f25d4f254fec3e3b2c655f242fba7e00e315f54f8eb518309ea8f52de2a29c14d2dcdd5ec5c70c1a56 SHA512 4f0742061fdee931c5a934d5816e801bff30664e3a28e3970bf9e3636c2d8a562ff283a246b83bbabf7e4dfa755964e03c6a5b07d7d667583831cd3b6ed67fcc -DIST rosserial-0.8.0.tar.gz 312494 BLAKE2B f65d42ebdc47125a7dfb9b3a999f53640812bc9741f43a5b451fbe449d6d23537face7ca148b2b952c401bb439cee05693f5663e423e70d9df3bbde0d07fbb0a SHA512 ee2f4b3b39fd3be47cbaaed7bfbe08057b1525a12f31dd685d80683ec1ddc89ff43157cc0f09583e68ccc6e35009fda73efa8a74dad6c5bba4b46f4ad6a155d0 -EBUILD rosserial_server-0.8.0.ebuild 516 BLAKE2B 6884398136dd1046a8a9f1b8af328e8749daf29e85d58d28ace77860891e48913a13b71ca4ef989b577eb0afd05548c1562ef2cf360179b579fdc634152fc67e SHA512 cbdffd7e79726db8730296d421ef81129633f20278edfe828363737d7c55bba6013da79f939bd70fe060f1e7525b6eedba3913259f2abab2623ee3112680d16e -EBUILD rosserial_server-9999.ebuild 516 BLAKE2B 6884398136dd1046a8a9f1b8af328e8749daf29e85d58d28ace77860891e48913a13b71ca4ef989b577eb0afd05548c1562ef2cf360179b579fdc634152fc67e SHA512 cbdffd7e79726db8730296d421ef81129633f20278edfe828363737d7c55bba6013da79f939bd70fe060f1e7525b6eedba3913259f2abab2623ee3112680d16e +DIST rosserial-0.9.1.tar.gz 318452 BLAKE2B 3901c9fb8813cc93b31a4286272508fb2e8026a540becc1f58d674195cc90354ba43aa7307891d8d2fc9b7ef594fa5597d49f2209f4862dc5467f57e49e0c5b4 SHA512 a484983e1e4c3f86b311b07bc402d5984f9161dc025bb7017fd936e3551368b6af00484724ebaed16777a45b40ab2323ea25309fe7f313ee52a7245b035ccf17 +EBUILD rosserial_server-0.9.1.ebuild 475 BLAKE2B e85d9a372f4f728d998257b020e61f9256632fba6cd7df6dc52922ebda8d668d0085f318c120bb567ee1df69686306d29e69589cce39308d64fdad699de7f969 SHA512 337997a50e283871e8077cd3c0c8ecf4b6afbb3a34610f9d35ec6f9ffaff28525e7a19ac2072feef7692c7438f3626d3bc0a72131c234371257fa2ea86839fdf +EBUILD rosserial_server-9999.ebuild 475 BLAKE2B e85d9a372f4f728d998257b020e61f9256632fba6cd7df6dc52922ebda8d668d0085f318c120bb567ee1df69686306d29e69589cce39308d64fdad699de7f969 SHA512 337997a50e283871e8077cd3c0c8ecf4b6afbb3a34610f9d35ec6f9ffaff28525e7a19ac2072feef7692c7438f3626d3bc0a72131c234371257fa2ea86839fdf MISC metadata.xml 335 BLAKE2B c530aa8362e5262e649a12c8f598c97e4d7fe2c29d49204e96981c3832ed9ce1ec633099712c5f7deafaf423bd7864e83ad8309b176e857c6a3b7d18b1efa700 SHA512 be8c98254064526415c9b16ad1a2192ab48e924560cbf93576316d21e09b76abcf3be61bdb00f69953f111ac427cc8d05a813e9d0a49955ea65799d8e250a8db diff --git a/dev-ros/rosserial_server/files/boost170.patch b/dev-ros/rosserial_server/files/boost170.patch deleted file mode 100644 index cbf106fc9acd..000000000000 --- a/dev-ros/rosserial_server/files/boost170.patch +++ /dev/null @@ -1,71 +0,0 @@ -Index: rosserial_server/include/rosserial_server/async_read_buffer.h -=================================================================== ---- rosserial_server.orig/include/rosserial_server/async_read_buffer.h -+++ rosserial_server/include/rosserial_server/async_read_buffer.h -@@ -166,7 +166,7 @@ private: - - // Post the callback rather than executing it here so, so that we have a chance to do the cleanup - // below prior to it actually getting run, in the event that the callback queues up another read. -- stream_.get_io_service().post(boost::bind(read_success_callback_, stream)); -+ static_cast<boost::asio::io_service&>(stream_.get_executor().context()).post(boost::bind(read_success_callback_, stream)); - - // Resetting these values clears our state so that we know there isn't a callback pending. - read_requested_bytes_ = 0; -Index: rosserial_server/include/rosserial_server/udp_stream.h -=================================================================== ---- rosserial_server.orig/include/rosserial_server/udp_stream.h -+++ rosserial_server/include/rosserial_server/udp_stream.h -@@ -48,7 +48,6 @@ namespace rosserial_server - { - - using boost::asio::ip::udp; --using boost::asio::handler_type; - - - class UdpStream : public udp::socket -@@ -62,9 +61,9 @@ public: - { - boost::system::error_code ec; - const protocol_type protocol = server_endpoint.protocol(); -- this->get_service().open(this->get_implementation(), protocol, ec); -+ udp::socket::open(protocol, ec); - boost::asio::detail::throw_error(ec, "open"); -- this->get_service().bind(this->get_implementation(), server_endpoint, ec); -+ bind(server_endpoint, ec); - boost::asio::detail::throw_error(ec, "bind"); - - client_endpoint_ = client_endpoint; -@@ -76,6 +75,8 @@ public: - async_write_some(const ConstBufferSequence& buffers, - BOOST_ASIO_MOVE_ARG(WriteHandler) handler) - { -+ return async_send(buffers, handler); -+#if 0 - // If you get an error on the following line it means that your handler does - // not meet the documented type requirements for a WriteHandler. - BOOST_ASIO_WRITE_HANDLER_CHECK(WriteHandler, handler) type_check; -@@ -94,6 +95,7 @@ public: - this->get_implementation(), buffers, client_endpoint_, 0, - BOOST_ASIO_MOVE_CAST(WriteHandler)(handler)); - #endif -+#endif - } - - template <typename MutableBufferSequence, typename ReadHandler> -@@ -102,6 +104,8 @@ public: - async_read_some(const MutableBufferSequence& buffers, - BOOST_ASIO_MOVE_ARG(ReadHandler) handler) - { -+ return async_receive(buffers, handler); -+#if 0 - // If you get an error on the following line it means that your handler does - // not meet the documented type requirements for a ReadHandler. - BOOST_ASIO_READ_HANDLER_CHECK(ReadHandler, handler) type_check; -@@ -119,6 +123,7 @@ public: - this->get_implementation(), buffers, client_endpoint_, 0, - BOOST_ASIO_MOVE_CAST(ReadHandler)(handler)); - #endif -+#endif - } - - private: diff --git a/dev-ros/rosserial_server/rosserial_server-0.8.0.ebuild b/dev-ros/rosserial_server/rosserial_server-0.9.1.ebuild index c3d3ee32e16b..dff517382a90 100644 --- a/dev-ros/rosserial_server/rosserial_server-0.8.0.ebuild +++ b/dev-ros/rosserial_server/rosserial_server-0.9.1.ebuild @@ -21,4 +21,3 @@ RDEPEND=" DEPEND="${RDEPEND} dev-ros/rosserial_msgs[${CATKIN_MESSAGES_CXX_USEDEP}] " -PATCHES=( "${FILESDIR}/boost170.patch" ) diff --git a/dev-ros/rosserial_server/rosserial_server-9999.ebuild b/dev-ros/rosserial_server/rosserial_server-9999.ebuild index c3d3ee32e16b..dff517382a90 100644 --- a/dev-ros/rosserial_server/rosserial_server-9999.ebuild +++ b/dev-ros/rosserial_server/rosserial_server-9999.ebuild @@ -21,4 +21,3 @@ RDEPEND=" DEPEND="${RDEPEND} dev-ros/rosserial_msgs[${CATKIN_MESSAGES_CXX_USEDEP}] " -PATCHES=( "${FILESDIR}/boost170.patch" ) |