* Upgrade presets for librealsense 1.12.1 and add support for Mac OS…

… X and Windows (issue #447)

CHANGELOG.md

@@ -1,4 +1,6 @@
 
+ * Add support for Mac OS X and Windows to presets for librealsense ([issue #447](https://github.com/bytedeco/javacpp-presets/issues/447))
+ * Enable MMAL and OpenMAX acceleration for FFmpeg on `linux-armhf` ([pull #388](https://github.com/bytedeco/javacpp-presets/pull/388))
  * Enable V4L2 for OpenCV on ARM platforms as well ([issue bytedeco/javacv#850](https://github.com/bytedeco/javacv/issues/850))
  * Enable Intel QSV acceleration via libmfx for FFmpeg ([pull #485](https://github.com/bytedeco/javacpp-presets/pull/485))
  * Add support for Mac OS X and Windows to presets for libfreenect2 ([issue bytedeco/javacv#837](https://github.com/bytedeco/javacv/issues/837))
@@ -20,7 +22,7 @@
  * Link TensorFlow statically with `cudart` to avoid dependency on CUDA ([issue #396](https://github.com/bytedeco/javacpp-presets/issues/396))
  * Add missing call to `Loader.load()` in helper class for `opencv_ml` ([issue bytedeco/javacv#638](https://github.com/bytedeco/javacv/issues/638))
  * Work around issues with TensorFlow on some versions of Mac OS X ([issue #335](https://github.com/bytedeco/javacpp-presets/issues/335))
- * Upgrade presets for OpenCV 3.3.1, FFmpeg 3.4, FlyCapture 2.11.3.121 ([pull #424](https://github.com/bytedeco/javacpp-presets/pull/424)), libdc1394 2.2.5, Chilitags, HDF5 1.10.1, OpenBLAS 0.2.20, FFTW 3.3.7, GSL 2.4, LLVM 4.0.0 ([pull #404](https://github.com/bytedeco/javacpp-presets/pull/404)), Leptonica 1.74.4, Tesseract 3.05.01, Caffe 1.0, CUDA 9.0, cuDNN 7.0, MXNet 1.0.0, TensorFlow 1.4.0, and their dependencies
+ * Upgrade presets for OpenCV 3.3.1, FFmpeg 3.4, FlyCapture 2.11.3.121 ([pull #424](https://github.com/bytedeco/javacpp-presets/pull/424)), libdc1394 2.2.5, librealsense 1.12.1, Chilitags, HDF5 1.10.1, OpenBLAS 0.2.20, FFTW 3.3.7, GSL 2.4, LLVM 4.0.0 ([pull #404](https://github.com/bytedeco/javacpp-presets/pull/404)), Leptonica 1.74.4, Tesseract 3.05.01, Caffe 1.0, CUDA 9.0, cuDNN 7.0, MXNet 1.0.0, TensorFlow 1.4.0, and their dependencies
  * Add presets for libfreenect2 ([pull #340](https://github.com/bytedeco/javacpp-presets/pull/340)), MKL 2018.1 ([issue #112](https://github.com/bytedeco/javacpp-presets/issues/112)), The Arcade Learning Environment, LiquidFun ([pull #356](https://github.com/bytedeco/javacpp-presets/pull/356)), Skia ([pull #418](https://github.com/bytedeco/javacpp-presets/pull/418)), and system APIs (Linux, Mac OS X, and Windows)
  * Fix the `FlyCapture2` module for some versions on Windows ([issue #337](https://github.com/bytedeco/javacpp-presets/issues/337))
  * Add functions missing from the presets of MXNet ([issue #332](https://github.com/bytedeco/javacpp-presets/issues/332))

README.md

@@ -109,7 +109,7 @@ Each child module in turn relies by default on the included [`cppbuild.sh` scrip
  * libdc1394 2.1.x or 2.2.x  http://sourceforge.net/projects/libdc1394/files/
  * libfreenect 0.5.3  https://github.com/OpenKinect/libfreenect
  * libfreenect2 0.2.0  https://github.com/OpenKinect/libfreenect2
- * librealsense 1.9.6  https://github.com/IntelRealSense/librealsense
+ * librealsense 1.12.1  https://github.com/IntelRealSense/librealsense
  * videoInput 0.200  https://github.com/ofTheo/videoInput/
  * ARToolKitPlus 2.3.1  https://launchpad.net/artoolkitplus
  * Chilitags  https://github.com/chili-epfl/chilitags

librealsense/README.md

@@ -5,7 +5,7 @@ Introduction
 ------------
 This directory contains the JavaCPP Presets module for:
 
- * librealsense 1.9.6  https://github.com/IntelRealSense/librealsense
+ * librealsense 1.12.1  https://github.com/IntelRealSense/librealsense
 
 Please refer to the parent README.md file for more detailed information about the JavaCPP Presets.
 
@@ -31,15 +31,15 @@ and connect to a camera.
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.bytedeco.javacpp-presets.librealsense</groupId>
     <artifactId>TestConnection</artifactId>
-    <version>1.3</version>
+    <version>1.3.4-SNAPSHOT</version>
     <properties>
         <exec.mainClass>TestConnection</exec.mainClass>
     </properties>
     <dependencies>
         <dependency>
             <groupId>org.bytedeco.javacpp-presets</groupId>
             <artifactId>librealsense-platform</artifactId>
-            <version>1.9.6-1.3</version>
+            <version>1.12.1-1.3.4-SNAPSHOT</version>
         </dependency>
     </dependencies>
 </project>

librealsense/cppbuild.sh

@@ -7,31 +7,46 @@ if [[ -z "$PLATFORM" ]]; then
     exit
 fi
 
-LIBREALSENSE_VERSION=1.9.6
-download https://github.com/IntelRealSense/librealsense/archive/v$LIBREALSENSE_VERSION.zip librealsense-$LIBREALSENSE_VERSION.zip
+LIBREALSENSE_VERSION=1.12.1
+download https://github.com/IntelRealSense/librealsense/archive/v$LIBREALSENSE_VERSION.tar.gz librealsense-$LIBREALSENSE_VERSION.tar.gz
 
 mkdir -p $PLATFORM
 cd $PLATFORM
 mkdir -p include lib bin
-unzip -o ../librealsense-$LIBREALSENSE_VERSION.zip
-
+INSTALL_PATH=`pwd`
+echo "Decompressing archives..."
+tar --totals -xzf ../librealsense-$LIBREALSENSE_VERSION.tar.gz
 
 cd librealsense-$LIBREALSENSE_VERSION
+patch -Np1 < ../../../librealsense.patch
 
 case $PLATFORM in
     linux-x86)
-        patch -Np1 < ../../../librealsense-$LIBREALSENSE_VERSION-linux.patch
-        CC="gcc -m32" CXX="gcc -m32" make -j $MAKEJ examples library
-        cp -R lib/* ../lib/
-        cp -R include/* ../include/
-        cp -R bin/* ../bin/
+        CC="$OLDCC -m32" CXX="$OLDCXX -m32" "$CMAKE" -DCMAKE_INSTALL_PREFIX="$INSTALL_PATH"
+        make -j $MAKEJ
+        make install/strip
         ;;
     linux-x86_64)
-        patch -Np1 < ../../../librealsense-$LIBREALSENSE_VERSION-linux.patch
-        CC="gcc -m64" CXX="gcc -m64" make -j $MAKEJ examples library
-        cp -R lib/* ../lib/
-        cp -R include/* ../include/
-        cp -R bin/* ../bin/
+        CC="$OLDCC -m64" CXX="$OLDCXX -m64" "$CMAKE" -DCMAKE_INSTALL_PREFIX="$INSTALL_PATH"
+        make -j $MAKEJ
+        make install/strip
+        ;;
+    macosx-x86_64)
+        "$CMAKE" -DCMAKE_INSTALL_PREFIX="$INSTALL_PATH" -DCMAKE_MACOSX_RPATH=ON
+        make -j $MAKEJ
+        make install/strip
+        ;;
+    windows-x86)
+        "$CMAKE" -G "Visual Studio 14 2015" -DCMAKE_INSTALL_PREFIX="$INSTALL_PATH"
+        MSBuild.exe INSTALL.vcxproj //p:Configuration=Release
+        cp -a include/* ../include/
+        cp -a Release/* ../lib/
+        ;;
+    windows-x86_64)
+        "$CMAKE" -G "Visual Studio 14 2015 Win64" -DCMAKE_INSTALL_PREFIX="$INSTALL_PATH"
+        MSBuild.exe INSTALL.vcxproj //p:Configuration=Release
+        cp -a include/* ../include/
+        cp -a Release/* ../lib/
         ;;
     *)
         echo "Error: Platform \"$PLATFORM\" is not supported"