summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authormajor major2019-03-19 17:05:26 +0100
committermajor major2019-03-19 17:05:26 +0100
commitc9a726c1425df74df008266683d430d0b0e7a9aa (patch)
tree7edf57c41a1ff16a325cddcc5e60c67ab13b4220
parent5039c64beea6c4f269be8cbb3e8538653302a6e8 (diff)
downloadaur-c9a726c1425df74df008266683d430d0b0e7a9aa.tar.gz
updated to version 0.9.15 and added patch for boost signals
-rw-r--r--.SRCINFO10
-rw-r--r--PKGBUILD10
-rw-r--r--moveit_ros_perception_boost.patch19
3 files changed, 31 insertions, 8 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 7f12eda79515..1b339d4ce78b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,6 @@
-# Generated by mksrcinfo v8
-# Fri Feb 2 00:34:22 UTC 2018
pkgbase = ros-kinetic-moveit-ros-perception
pkgdesc = ROS - Components of MoveIt connecting to perception.
- pkgver = 0.9.11
+ pkgver = 0.9.15
pkgrel = 1
url = http://moveit.ros.org
arch = any
@@ -43,8 +41,10 @@ pkgbase = ros-kinetic-moveit-ros-perception
depends = glut
depends = glew
depends = mesa-libgl
- source = ros-kinetic-moveit-ros-perception-0.9.11-0.tar.gz::https://github.com/ros-gbp/moveit-release/archive/release/kinetic/moveit_ros_perception/0.9.11-0.tar.gz
- sha256sums = a198270fca359a2d4fb0bdfaed0abcd345f5953de0640d4f55f54b47a8593d92
+ source = ros-kinetic-moveit-ros-perception-0.9.15-0.tar.gz::https://github.com/ros-gbp/moveit-release/archive/release/kinetic/moveit_ros_perception/0.9.15-0.tar.gz
+ source = moveit_ros_perception_boost.patch
+ sha256sums = ac7f565766ee1c96434711462dd6b82235b3668c2cec91724aa8b745081c46cb
+ sha256sums = 69d478cedc9f31464063ace7ea346f2ac218def046154a0b8bb84fcb1b1a94a8
pkgname = ros-kinetic-moveit-ros-perception
diff --git a/PKGBUILD b/PKGBUILD
index 37318ed58e77..7148e3e11b63 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@ pkgdesc="ROS - Components of MoveIt connecting to perception."
url='http://moveit.ros.org'
pkgname='ros-kinetic-moveit-ros-perception'
-pkgver='0.9.11'
+pkgver='0.9.15'
_pkgver_patch=0
arch=('any')
pkgrel=1
@@ -57,8 +57,10 @@ depends=(${ros_depends[@]}
# Tarball version (faster download)
_dir="moveit-release-release-kinetic-moveit_ros_perception-${pkgver}-${_pkgver_patch}"
-source=("${pkgname}-${pkgver}-${_pkgver_patch}.tar.gz"::"https://github.com/ros-gbp/moveit-release/archive/release/kinetic/moveit_ros_perception/${pkgver}-${_pkgver_patch}.tar.gz")
-sha256sums=('a198270fca359a2d4fb0bdfaed0abcd345f5953de0640d4f55f54b47a8593d92')
+source=("${pkgname}-${pkgver}-${_pkgver_patch}.tar.gz"::"https://github.com/ros-gbp/moveit-release/archive/release/kinetic/moveit_ros_perception/${pkgver}-${_pkgver_patch}.tar.gz"
+ 'moveit_ros_perception_boost.patch')
+sha256sums=('ac7f565766ee1c96434711462dd6b82235b3668c2cec91724aa8b745081c46cb'
+ '69d478cedc9f31464063ace7ea346f2ac218def046154a0b8bb84fcb1b1a94a8')
prepare() {
cd ${srcdir}
@@ -67,6 +69,8 @@ prepare() {
-exec sed -r -i "s/[^_]logWarn/CONSOLE_BRIDGE_logWarn/" {} \; \
-exec sed -r -i "s/[^_]logDebug/CONSOLE_BRIDGE_logDebug/" {} \; \
-exec sed -r -i "s/[^_]logInform/CONSOLE_BRIDGE_logInform/" {} \;
+ cd ${srcdir}/${_dir}
+ patch -Np1 -i ${srcdir}/moveit_ros_perception_boost.patch
}
build() {
diff --git a/moveit_ros_perception_boost.patch b/moveit_ros_perception_boost.patch
new file mode 100644
index 000000000000..12c0148282d0
--- /dev/null
+++ b/moveit_ros_perception_boost.patch
@@ -0,0 +1,19 @@
+*** a/CMakeLists.txt 2019-03-19 16:52:44.964645874 +0100
+--- b/CMakeLists.txt 2019-03-19 16:52:26.581383809 +0100
+***************
+*** 9,15 ****
+ set(CMAKE_BUILD_TYPE Release)
+ endif()
+
+! find_package(Boost REQUIRED thread signals)
+
+ if(WITH_OPENGL)
+ find_package(OpenGL REQUIRED)
+--- 9,15 ----
+ set(CMAKE_BUILD_TYPE Release)
+ endif()
+
+! find_package(Boost REQUIRED thread)
+
+ if(WITH_OPENGL)
+ find_package(OpenGL REQUIRED)