Update version to 1.12.1-1. Fix missing headers.

3 files changed, 43 insertions, 10 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f20063ec279e..03d842f0d66c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,7 @@
-# Generated by mksrcinfo v8
-# Thu Nov 24 01:35:19 UTC 2016
 pkgbase = ros-indigo-librealsense
 	pkgdesc = ROS - Library for capturing data from the Intel(R) RealSense(TM) F200, SR300, R200, LR200 and ZR300 cameras.
-	pkgver = 1.11.1
-	pkgrel = 2
+	pkgver = 1.12.1
+	pkgrel = 1
 	url = http://www.ros.org/wiki/RealSense
 	arch = any
 	license = Apache License, Version 2.0
@@ -19,8 +17,10 @@ pkgbase = ros-indigo-librealsense
 	depends = linux-headers
 	depends = openssl
 	depends = dkms
-	source = ros-indigo-librealsense-1.11.1-1.tar.gz::https://github.com/intel-ros/librealsense-release/archive/release/indigo/librealsense/1.11.1-1.tar.gz
-	sha256sums = afc7521ccdb1dd760603264ccbcf3b952f8ecbdfef6a8443887e4bcb1a2193b9
+	source = ros-indigo-librealsense-1.12.1-1.tar.gz::https://github.com/intel-ros/librealsense-release/archive/release/indigo/librealsense/1.12.1-1.tar.gz
+	source = missing-headers.patch
+	sha256sums = 589c58d96e07262d9f032bf3710106c0a384a56daf1db478c359f9652a38eabc
+	sha256sums = c477b3c6eb99eb973d1a2f49dc00ba1bd0a1756a208e12030610c6e0fefea941
 
 pkgname = ros-indigo-librealsense
 
diff --git a/PKGBUILD b/PKGBUILD
index eef27e080159..39cdd91baedd 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,10 +4,10 @@ pkgdesc="ROS - Library for capturing data from the Intel(R) RealSense(TM) F200,
 url='http://www.ros.org/wiki/RealSense'
 
 pkgname='ros-indigo-librealsense'
-pkgver='1.11.1'
+pkgver='1.12.1'
 _pkgver_patch=1
 arch=('any')
-pkgrel=2
+pkgrel=1
 license=('Apache License, Version 2.0')
 
 ros_makedepends=(ros-indigo-catkin)
@@ -34,8 +34,17 @@ depends=(${ros_depends[@]}
 
 # Tarball version (faster download)
 _dir="librealsense-release-release-indigo-librealsense-${pkgver}-${_pkgver_patch}"
-source=("${pkgname}-${pkgver}-${_pkgver_patch}.tar.gz"::"https://github.com/intel-ros/librealsense-release/archive/release/indigo/librealsense/${pkgver}-${_pkgver_patch}.tar.gz")
-sha256sums=('afc7521ccdb1dd760603264ccbcf3b952f8ecbdfef6a8443887e4bcb1a2193b9')
+source=(
+  "${pkgname}-${pkgver}-${_pkgver_patch}.tar.gz"::"https://github.com/intel-ros/librealsense-release/archive/release/indigo/librealsense/${pkgver}-${_pkgver_patch}.tar.gz"
+  'missing-headers.patch'
+)
+sha256sums=('589c58d96e07262d9f032bf3710106c0a384a56daf1db478c359f9652a38eabc'
+            'c477b3c6eb99eb973d1a2f49dc00ba1bd0a1756a208e12030610c6e0fefea941')
+
+prepare () {
+  cd ${srcdir}/${_dir}
+  patch -Np1 -i ${srcdir}/missing-headers.patch
+}
 
 build() {
   # Use ROS environment variables
diff --git a/missing-headers.patch b/missing-headers.patch
new file mode 100644
index 000000000000..a111b801d6d5
--- /dev/null
+++ b/missing-headers.patch
@@ -0,0 +1,24 @@
+diff --git a/src/types.h b/src/types.h
+index 0455c83..bff27f9 100644
+--- a/src/types.h
++++ b/src/types.h
+@@ -19,6 +19,7 @@
+ #include <mutex>                            // For mutex, unique_lock
+ #include <condition_variable>               // For condition_variable
+ #include <memory>                           // For unique_ptr
++#include <functional>                       // For std::function
+ #include <atomic>
+ #include <map>          
+ #include <algorithm>
+diff --git a/src/uvc-v4l2.cpp b/src/uvc-v4l2.cpp
+index e97dfda..1b04966 100644
+--- a/src/uvc-v4l2.cpp
++++ b/src/uvc-v4l2.cpp
+@@ -30,6 +30,7 @@
+ #include <sys/stat.h>
+ #include <sys/mman.h>
+ #include <sys/ioctl.h>
++#include <sys/sysmacros.h>
+ #include <linux/usb/video.h>
+ #include <linux/uvcvideo.h>
+ #include <linux/videodev2.h>