| 1 |
commit: e87f8f5cbda5afd7f123a0b9a52ecb162258f7d9 |
| 2 |
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Jan 28 10:40:38 2018 +0000 |
| 4 |
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Jan 28 12:54:33 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e87f8f5c |
| 7 |
|
| 8 |
net-libs/ignition-transport: bump to 4.0.0 |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.20, Repoman-2.3.6 |
| 11 |
|
| 12 |
net-libs/ignition-transport/Manifest | 1 + |
| 13 |
net-libs/ignition-transport/files/zmq.patch | 31 ++++++++++++++++++++++ |
| 14 |
.../ignition-transport-4.0.0.ebuild | 30 +++++++++++++++++++++ |
| 15 |
3 files changed, 62 insertions(+) |
| 16 |
|
| 17 |
diff --git a/net-libs/ignition-transport/Manifest b/net-libs/ignition-transport/Manifest |
| 18 |
index 3c0b0411f41..60280941d26 100644 |
| 19 |
--- a/net-libs/ignition-transport/Manifest |
| 20 |
+++ b/net-libs/ignition-transport/Manifest |
| 21 |
@@ -1 +1,2 @@ |
| 22 |
DIST ignition-transport3-3.1.0.tar.bz2 385946 BLAKE2B 0ae44f0e1cd17369de9ee39f0d128ee5edbc68c1be672be5476d7cf8c161f59c069af63cec1966f6e0ba1c9e56ade0563b6546f7f285bdc49b6941939e2a4379 SHA512 438ab49f1c506e098c00becccf1856b3e0129d60f9aca32f713a74b38aefb178833353ff479c8512e7ffec812bdc0a06eb7f28f09766dc0cc5a9707184151555 |
| 23 |
+DIST ignition-transport4-4.0.0.tar.bz2 396662 BLAKE2B cb4c56954ddcd863d60941c43e38624747ca07e6cb5c7404309012dc9d22fb8a053e1113b117a0ee8447e32b6b52318b5b4844a050e4b8c1feccc2de391c46bf SHA512 90facd527e953d3319b4b3b7c5efa610d6c965fcaaf053b8b32039825fccca89c17f153ffec5c0562d4d3d534741f3d6c1a603eb2c75fd5cb217bf22a6d6e503 |
| 24 |
|
| 25 |
diff --git a/net-libs/ignition-transport/files/zmq.patch b/net-libs/ignition-transport/files/zmq.patch |
| 26 |
new file mode 100644 |
| 27 |
index 00000000000..ddbf8f11306 |
| 28 |
--- /dev/null |
| 29 |
+++ b/net-libs/ignition-transport/files/zmq.patch |
| 30 |
@@ -0,0 +1,31 @@ |
| 31 |
+Index: ignition-transport4-4.0.0/src/NodeShared.cc |
| 32 |
+=================================================================== |
| 33 |
+--- ignition-transport4-4.0.0.orig/src/NodeShared.cc |
| 34 |
++++ ignition-transport4-4.0.0/src/NodeShared.cc |
| 35 |
+@@ -92,7 +92,8 @@ bool userPass(std::string &_user, std::s |
| 36 |
+ // Helper to send messages |
| 37 |
+ int sendHelper(zmq::socket_t &_pub, const std::string &_data, int _type) |
| 38 |
+ { |
| 39 |
+- zmq::message_t msg(_data.data(), _data.size()); |
| 40 |
++ zmq::message_t msg(_data.size()); |
| 41 |
++ memcpy(msg.data(), _data.data(), _data.size()); |
| 42 |
+ return _pub.send(msg, _type); |
| 43 |
+ } |
| 44 |
+ |
| 45 |
+@@ -278,10 +279,13 @@ bool NodeShared::Publish( |
| 46 |
+ { |
| 47 |
+ // Create the messages. |
| 48 |
+ // Note that we use zero copy for passing the message data (msg2). |
| 49 |
+- zmq::message_t msg0(_topic.data(), _topic.size()), |
| 50 |
+- msg1(this->myAddress.data(), this->myAddress.size()), |
| 51 |
++ zmq::message_t msg0(_topic.size()), |
| 52 |
++ msg1(this->myAddress.size()), |
| 53 |
+ msg2(_data, _dataSize, _ffn, nullptr), |
| 54 |
+- msg3(_msgType.data(), _msgType.size()); |
| 55 |
++ msg3(_msgType.size()); |
| 56 |
++ memcpy(msg0.data(), _topic.data(), _topic.size()); |
| 57 |
++ memcpy(msg1.data(), this->myAddress.data(), this->myAddress.size()); |
| 58 |
++ memcpy(msg3.data(), _msgType.data(), _msgType.size()); |
| 59 |
+ |
| 60 |
+ // Send the messages |
| 61 |
+ std::lock_guard<std::recursive_mutex> lock(this->mutex); |
| 62 |
|
| 63 |
diff --git a/net-libs/ignition-transport/ignition-transport-4.0.0.ebuild b/net-libs/ignition-transport/ignition-transport-4.0.0.ebuild |
| 64 |
new file mode 100644 |
| 65 |
index 00000000000..7fc18b97a88 |
| 66 |
--- /dev/null |
| 67 |
+++ b/net-libs/ignition-transport/ignition-transport-4.0.0.ebuild |
| 68 |
@@ -0,0 +1,30 @@ |
| 69 |
+# Copyright 1999-2018 Gentoo Foundation |
| 70 |
+# Distributed under the terms of the GNU General Public License v2 |
| 71 |
+ |
| 72 |
+EAPI=5 |
| 73 |
+ |
| 74 |
+inherit cmake-utils vcs-snapshot flag-o-matic |
| 75 |
+ |
| 76 |
+DESCRIPTION="Combines ZeroMQ with Protobufs to create a fast and efficient message passing system" |
| 77 |
+HOMEPAGE="http://ignitionrobotics.org/libraries/transport" |
| 78 |
+SRC_URI="http://gazebosim.org/distributions/ign-transport/releases/${PN}4-${PV}.tar.bz2" |
| 79 |
+ |
| 80 |
+LICENSE="Apache-2.0" |
| 81 |
+SLOT="4/4" |
| 82 |
+KEYWORDS="~amd64" |
| 83 |
+IUSE="" |
| 84 |
+ |
| 85 |
+DEPEND=" |
| 86 |
+ net-libs/ignition-msgs:1= |
| 87 |
+ dev-libs/protobuf:= |
| 88 |
+ >=net-libs/zeromq-3.2.0:= |
| 89 |
+ sys-apps/util-linux |
| 90 |
+ net-libs/cppzmq |
| 91 |
+" |
| 92 |
+RDEPEND="${DEPEND}" |
| 93 |
+DEPEND="${DEPEND} |
| 94 |
+ >=dev-util/ignition-cmake-0.4 |
| 95 |
+ virtual/pkgconfig" |
| 96 |
+CMAKE_BUILD_TYPE=RelWithDebInfo |
| 97 |
+S="${WORKDIR}/${PN}4-${PV}" |
| 98 |
+PATCHES=( "${FILESDIR}/zmq.patch" ) |
Archives