diff options
| author |   Alexis Ballier <aballier@gentoo.org> | 2017-12-28 19:49:23 +0100 |
|---|---|---|
| committer | Alexis Ballier <aballier@gentoo.org> | 2017-12-28 20:10:47 +0100 |
| commit | 18d8b2632f61bf72b14e74b5770b9fdabb0d37b5 (patch) | |
| tree | 18af566bf372c3ca6769bca2581b5883a1014f67 /dev-ros/rosbag_storage | |
| parent | dev-ros/rotate_recovery: add missing console bridge dep (diff) | |
| download | gentoo-18d8b2632f61bf72b14e74b5770b9fdabb0d37b5.tar.gz gentoo-18d8b2632f61bf72b14e74b5770b9fdabb0d37b5.tar.bz2 gentoo-18d8b2632f61bf72b14e74b5770b9fdabb0d37b5.zip | |
dev-ros/rosbag_storage: fix build with console bridge 0.4
Package-Manager: Portage-2.3.19, Repoman-2.3.6
Diffstat (limited to 'dev-ros/rosbag_storage')
| -rw-r--r-- | dev-ros/rosbag_storage/files/logging.patch | 32 | ||||
| -rw-r--r-- | dev-ros/rosbag_storage/rosbag_storage-1.13.5-r1.ebuild | 1 |
2 files changed, 33 insertions, 0 deletions
diff --git a/dev-ros/rosbag_storage/files/logging.patch b/dev-ros/rosbag_storage/files/logging.patch new file mode 100644 index 000000000000..300367a28ab4 --- /dev/null +++ b/dev-ros/rosbag_storage/files/logging.patch @@ -0,0 +1,32 @@ +commit f7c7b3c28a09feeee643c10c6a8c4aff7684dda7 +Author: Mikael Arguedas <mikael@osrfoundation.org> +Date: Sat Nov 18 19:13:56 2017 -0800 + + use namespaced macros instead of deprecated macros (#1239) + +diff --git a/tools/rosbag_storage/src/bz2_stream.cpp b/tools/rosbag_storage/src/bz2_stream.cpp +index 78e17538..53bc9d52 100644 +--- a/tools/rosbag_storage/src/bz2_stream.cpp ++++ b/tools/rosbag_storage/src/bz2_stream.cpp +@@ -127,7 +127,7 @@ void BZ2Stream::read(void* ptr, size_t size) { + case BZ_OK: return; + case BZ_STREAM_END: + if (getUnused() || getUnusedLength() > 0) +- logError("unused data already available"); ++ CONSOLE_BRIDGE_logError("unused data already available"); + else { + char* unused; + int nUnused; +diff --git a/tools/rosbag_storage/src/lz4_stream.cpp b/tools/rosbag_storage/src/lz4_stream.cpp +index 297bcf7b..d13f241b 100644 +--- a/tools/rosbag_storage/src/lz4_stream.cpp ++++ b/tools/rosbag_storage/src/lz4_stream.cpp +@@ -176,7 +176,7 @@ void LZ4Stream::read(void* ptr, size_t size) { + case ROSLZ4_OK: break; + case ROSLZ4_STREAM_END: + if (getUnused() || getUnusedLength() > 0) +- logError("unused data already available"); ++ CONSOLE_BRIDGE_logError("unused data already available"); + else { + setUnused(lz4s_.input_next); + setUnusedLength(lz4s_.input_left); diff --git a/dev-ros/rosbag_storage/rosbag_storage-1.13.5-r1.ebuild b/dev-ros/rosbag_storage/rosbag_storage-1.13.5-r1.ebuild index 8bdd40b1ae4e..b7be0886b40a 100644 --- a/dev-ros/rosbag_storage/rosbag_storage-1.13.5-r1.ebuild +++ b/dev-ros/rosbag_storage/rosbag_storage-1.13.5-r1.ebuild @@ -26,3 +26,4 @@ RDEPEND=" dev-libs/console_bridge:= " DEPEND="${RDEPEND}" +PATCHES=( "${FILESDIR}/logging.patch" ) |