diff options
| author | Benjamin Chrétien | 2016-03-16 17:46:19 +0900 |
|---|---|---|
| committer | Benjamin Chrétien | 2016-03-16 17:48:38 +0900 |
| commit | 603c84009f75a94bc5de8d8b0679a1481d77fb3f (patch) | |
| tree | 6f163a76b01471f423186b87796f047785aab6b8 | |
| parent | 4178563f0f57502449efac2cff128625158ba0d3 (diff) | |
| download | aur-603c84009f75a94bc5de8d8b0679a1481d77fb3f.tar.gz | |
Add patch for dynamic reconfigure
See: https://github.com/ros-perception/image_pipeline/issues/185
| -rw-r--r-- | .SRCINFO | 6 | ||||
| -rw-r--r-- | PKGBUILD | 8 | ||||
| -rw-r--r-- | dynamic_reconfigure.patch | 29 |
3 files changed, 39 insertions, 4 deletions
@@ -1,5 +1,5 @@ # Generated by mksrcinfo v8 -# Wed Jan 20 01:27:52 UTC 2016 +# Wed Mar 16 08:48:29 UTC 2016 pkgbase = ros-indigo-image-view pkgdesc = ROS - A simple viewer for ROS image topics. pkgver = 1.12.15 @@ -37,7 +37,9 @@ pkgbase = ros-indigo-image-view depends = python2-numpy depends = gtk2 source = image_view::git+https://github.com/ros-gbp/image_pipeline-release.git#tag=release/indigo/image_view/1.12.15-0 - md5sums = SKIP + source = dynamic_reconfigure.patch + sha256sums = SKIP + sha256sums = f8c49fe1e62ec86ba46a0bdce1ced50aec74b4c4e495865534a2959fea0444f3 pkgname = ros-indigo-image-view @@ -43,14 +43,18 @@ depends=(${ros_depends[@]} _tag=release/indigo/image_view/${pkgver}-${_pkgver_patch} _dir=image_view -source=("${_dir}"::"git+https://github.com/ros-gbp/image_pipeline-release.git"#tag=${_tag}) -md5sums=('SKIP') +source=("${_dir}"::"git+https://github.com/ros-gbp/image_pipeline-release.git"#tag=${_tag} + "dynamic_reconfigure.patch") +sha256sums=('SKIP' + 'f8c49fe1e62ec86ba46a0bdce1ced50aec74b4c4e495865534a2959fea0444f3') build() { # Use ROS environment variables source /usr/share/ros-build-tools/clear-ros-env.sh [ -f /opt/ros/indigo/setup.bash ] && source /opt/ros/indigo/setup.bash + git -C "${srcdir}/${_dir}" apply "${srcdir}/dynamic_reconfigure.patch" + # Create build directory [ -d ${srcdir}/build ] || mkdir ${srcdir}/build cd ${srcdir}/build diff --git a/dynamic_reconfigure.patch b/dynamic_reconfigure.patch new file mode 100644 index 000000000000..0f552f5131d5 --- /dev/null +++ b/dynamic_reconfigure.patch @@ -0,0 +1,29 @@ +From 3ad75a15430ce46b25341233665bcce40e3afa70 Mon Sep 17 00:00:00 2001 +From: Kentaro Wada <www.kentaro.wada@gmail.com> +Date: Mon, 14 Mar 2016 00:56:57 +0900 +Subject: [PATCH] Remove code for roslib on .cfg files + +Closes #185 +--- + image_view/cfg/ImageView.cfg | 8 +------- + 1 file changed, 1 insertion(+), 7 deletions(-) + +diff --git a/cfg/ImageView.cfg b/cfg/ImageView.cfg +index 8441c17..5eb3116 100755 +--- a/cfg/ImageView.cfg ++++ b/cfg/ImageView.cfg +@@ -1,13 +1,7 @@ + #! /usr/bin/env python + + PACKAGE='image_view' +-try: +- import imp +- imp.find_module(PACKAGE) +- from dynamic_reconfigure.parameter_generator_catkin import * +-except: +- import roslib; roslib.load_manifest(PACKAGE) +- from dynamic_reconfigure.parameter_generator import * ++from dynamic_reconfigure.parameter_generator_catkin import * + + gen = ParameterGenerator() + |