summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorSean Greenslade2017-09-12 15:30:32 -0700
committerSean Greenslade2017-09-12 15:30:32 -0700
commitfd80881260755481cc23b2fba8af17c96679a1bf (patch)
treed608bcfa54d9af6b53dbeb969e5c59591d1632b2
parent4d31f31d7950f9d8480acecdd7cbcc5302502531 (diff)
downloadaur-fd80881260755481cc23b2fba8af17c96679a1bf.tar.gz
Version bump.
-rw-r--r--.SRCINFO8
-rw-r--r--PKGBUILD13
-rw-r--r--buildfix.patch10
3 files changed, 25 insertions, 6 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 843320cfe450..c87b95b11e18 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
# Generated by mksrcinfo v8
-# Mon Feb 13 00:22:41 UTC 2017
+# Tue Sep 12 22:30:32 UTC 2017
pkgbase = ros-kinetic-librealsense
pkgdesc = ROS - Library for capturing data from the Intel(R) RealSense(TM) F200, SR300, R200, LR200 and ZR300 cameras.
pkgver = 1.12.1
- pkgrel = 1
+ pkgrel = 2
url = http://www.ros.org/wiki/RealSense
arch = any
license = Apache License, Version 2.0
@@ -20,7 +20,9 @@ pkgbase = ros-kinetic-librealsense
depends = openssl
depends = dkms
source = ros-kinetic-librealsense-1.12.1-0.tar.gz::https://github.com/intel-ros/librealsense-release/archive/release/kinetic/librealsense/1.12.1-0.tar.gz
- sha256sums = f8bf5872257008e910cc38d0c896b32547e2f4842a8e4a6afd501e83291aadfe
+ source = buildfix.patch
+ sha256sums = 5a25f39bc13940211cec4fae8d377da4117fa07033d73226a588bce4a9e34129
+ sha256sums = 549344d120f3841cef5e41e742715ee480094f9c99e4ba53f8e22b992421de92
pkgname = ros-kinetic-librealsense
diff --git a/PKGBUILD b/PKGBUILD
index c3466458086c..a25097fcde2e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,7 +7,7 @@ pkgname='ros-kinetic-librealsense'
pkgver='1.12.1'
_pkgver_patch=0
arch=('any')
-pkgrel=1
+pkgrel=2
license=('Apache License, Version 2.0')
ros_makedepends=(ros-kinetic-catkin)
@@ -34,8 +34,15 @@ depends=(${ros_depends[@]}
# Tarball version (faster download)
_dir="librealsense-release-release-kinetic-librealsense-${pkgver}-${_pkgver_patch}"
-source=("${pkgname}-${pkgver}-${_pkgver_patch}.tar.gz"::"https://github.com/intel-ros/librealsense-release/archive/release/kinetic/librealsense/${pkgver}-${_pkgver_patch}.tar.gz")
-sha256sums=('f8bf5872257008e910cc38d0c896b32547e2f4842a8e4a6afd501e83291aadfe')
+source=("${pkgname}-${pkgver}-${_pkgver_patch}.tar.gz"::"https://github.com/intel-ros/librealsense-release/archive/release/kinetic/librealsense/${pkgver}-${_pkgver_patch}.tar.gz"
+ buildfix.patch)
+sha256sums=('5a25f39bc13940211cec4fae8d377da4117fa07033d73226a588bce4a9e34129'
+ '549344d120f3841cef5e41e742715ee480094f9c99e4ba53f8e22b992421de92')
+
+prepare() {
+ cd ${srcdir}
+ patch -p1 < buildfix.patch
+}
build() {
# Use ROS environment variables
diff --git a/buildfix.patch b/buildfix.patch
new file mode 100644
index 000000000000..e77dabd4fd9b
--- /dev/null
+++ b/buildfix.patch
@@ -0,0 +1,10 @@
+--- a/librealsense-release-release-kinetic-librealsense-1.12.1-0/src/types.h 2017-09-12 15:24:19.753012660 -0700
++++ b/librealsense-release-release-kinetic-librealsense-1.12.1-0/src/types.h 2017-09-12 15:24:31.249513509 -0700
+@@ -22,6 +22,7 @@
+ #include <atomic>
+ #include <map>
+ #include <algorithm>
++#include <functional>
+
+ const uint8_t RS_STREAM_NATIVE_COUNT = 5;
+ const int RS_USER_QUEUE_SIZE = 20;