* Upgrade presets for FlyCapture 2.13.3.31 (pull #613)

CHANGELOG.md

@@ -1,4 +1,5 @@
 
+ * Add `FlyCapture2Video.h` and `FlyCapture2VideoDef.h`, and remove `AVIRecorder.h` in presets for FlyCapture
  * Switch to Clang for Android builds with recent versions of the NDK ([issue #562](https://github.com/bytedeco/javacpp-presets/issues/562))
  * Include `sys/sysinfo.h` for system API of Linux
  * Include `ucrtbase.dll` when bundling the runtime for Visual Studio 2015 on Windows ([issue bytedeco/javacv#1098](https://github.com/bytedeco/javacv/issues/1098))
@@ -14,7 +15,7 @@
  * Add builds for `linux-mips64el` to presets for ARToolKitPlus, Chilitags, flandmark, OpenBLAS, and FFTW ([pull #637](https://github.com/bytedeco/javacpp-presets/pull/637))
  * Update sample code for GSL with a more complex example ([issue #636](https://github.com/bytedeco/javacpp-presets/issues/636))
  * Fix CUDA build for OpenCV on Mac OS X missing `libopencv_cudev.dylib` ([issue #626](https://github.com/bytedeco/javacpp-presets/issues/626))
- * Upgrade presets for OpenCV 4.0.0, and FFmpeg 4.1, HDF5 1.10.4, MKL 2019.1, MKL-DNN 0.17.1, OpenBLAS 0.3.4, Leptonica 1.77.0, Tesseract 4.0.0, cuDNN 7.4, MXNet 1.3.1, TensorFlow 1.12.0, and their dependencies
+ * Upgrade presets for OpenCV 4.0.0, and FFmpeg 4.1, FlyCapture 2.13.3.31, HDF5 1.10.4, MKL 2019.1, MKL-DNN 0.17.1, OpenBLAS 0.3.4, Leptonica 1.77.0, Tesseract 4.0.0, cuDNN 7.4, MXNet 1.3.1, TensorFlow 1.12.0, and their dependencies
 
 ### October 15, 2018 version 1.4.3
  * Keep globally shared dummy deallocator for `TF_Tensor` out of `PointerScope`

ci/install-travis.sh

@@ -79,23 +79,27 @@ if [[ "$OS" == "linux-x86" ]] || [[ "$OS" == "linux-x86_64" ]] || [[ "$OS" =~ an
 
   if [[ "$PROJ" =~ flycapture ]]; then
     if [ "$OS" == "linux-x86_64" ]; then
-        if [[ $(find $HOME/downloads/flycap.tar.gz -type f -size +1000000c 2>/dev/null) ]]; then
+        if [[ $(find $HOME/downloads/flycapture2-2.13.3.31-amd64-pkg_xenial.tgz -type f -size +1000000c 2>/dev/null) ]]; then
           echo "Found flycap64 in cache and size seems ok" 
         else
           echo "Downloading flycap64 as not found in cache or too small" 
-          python $TRAVIS_BUILD_DIR/ci/gDownload.py 0B2xpvMUzviShS1I1MzN0SmQ1MHc $HOME/downloads/flycap.tar.gz 
+          python $TRAVIS_BUILD_DIR/ci/gDownload.py 1YtVjdnbQLZHX_ocQ6xAmiq6pjftuPOPd $HOME/downloads/flycapture2-2.13.3.31-amd64-pkg_xenial.tgz
         fi
-        tar xzvf $HOME/downloads/flycap.tar.gz -C $TRAVIS_BUILD_DIR/../
-        docker exec -ti $DOCKER_CONTAINER_ID /bin/bash -xec "cp -R $HOME/build/include/* /usr/include; cp -R $HOME/build/lib/* /usr/lib" 
+        tar xzvf $HOME/downloads/flycapture2-2.13.3.31-amd64-pkg_xenial.tgz -C $TRAVIS_BUILD_DIR/../
+	ls $TRAVIS_BUILD_DIR/../flycapture2-2.13.3.31-amd64/*.deb | while read fName; do ar vx $fName; tar -xvf data.tar.xz; done;
+	mv usr $TRAVIS_BUILD_DIR/../
+	docker exec -ti $DOCKER_CONTAINER_ID /bin/bash -xec "cp -pr $HOME/build/usr/* /usr/"
     elif [ "$OS" == "linux-x86" ]; then
-        if [[ $(find $HOME/downloads/flycaplinux32.tar.gz -type f -size +1000000c 2>/dev/null) ]]; then
+        if [[ $(find $HOME/downloads/flycapture2-2.13.3.31-i386-pkg_xenial.tgz -type f -size +1000000c 2>/dev/null) ]]; then
           echo "Found flycap32 in cache and size seems ok" 
         else
           echo "Downloading flycap32 as not found in cache or too small" 
-          python $TRAVIS_BUILD_DIR/ci/gDownload.py 0B2xpvMUzviShaDhTN1FOUTE3UkE $HOME/downloads/flycaplinux32.tar.gz 
+          python $TRAVIS_BUILD_DIR/ci/gDownload.py 1BOpSik1Fndagzjf4ykwzermt2qlTzsWI $HOME/downloads/flycapture2-2.13.3.31-i386-pkg_xenial.tgz
         fi
-        tar xzvf $HOME/downloads/flycaplinux32.tar.gz -C $TRAVIS_BUILD_DIR/../
-        docker exec -ti $DOCKER_CONTAINER_ID /bin/bash -xec "cp -R $HOME/build/include/* /usr/include; cp -R $HOME/build/lib/* /usr/lib" 
+        tar xzvf $HOME/downloads/flycapture2-2.13.3.31-i386-pkg_xenial.tgz -C $TRAVIS_BUILD_DIR/../
+	ls $TRAVIS_BUILD_DIR/../flycapture2-2.13.3.31-i386/*.deb | while read fName; do ar vx $fName; tar -xvf data.tar.xz; done;
+	mv usr $TRAVIS_BUILD_DIR/../
+	docker exec -ti $DOCKER_CONTAINER_ID /bin/bash -xec "cp -pr $HOME/build/usr/* /usr/"
     fi 
   fi 
   if [[ "$PROJ" =~ spinnaker ]]; then
@@ -147,14 +151,15 @@ if [ "$OS" == "linux-armhf" ]; then
 	pushd $HOME/userland
 	bash buildme
 	popd
+
 	if [[ "$PROJ" =~ flycapture ]]; then
-          if [[ $(find $HOME/downloads/flycapture.2.11.3.121_armhf.tar.gz -type f -size +1000000c 2>/dev/null) ]]; then
+          if [[ $(find $HOME/downloads/flycapture.2.13.3.31_armhf.tar.gz -type f -size +1000000c 2>/dev/null) ]]; then
             echo "Found flycap-armhf in cache and size seems ok" 
           else
             echo "Downloading flycap-armhf as not found in cache or too small" 
-            python $TRAVIS_BUILD_DIR/ci/gDownload.py 0B2xpvMUzviShMjVXZFlveXpyWE0 $HOME/downloads/flycapture.2.11.3.121_armhf.tar.gz
+            python $TRAVIS_BUILD_DIR/ci/gDownload.py 16NuUBs2MXQpVYqzDCEr9KdMng-6rHuDI $HOME/downloads/flycapture.2.13.3.31_armhf.tar.gz
           fi
-	  cp $HOME/downloads/flycapture.2.11.3.121_armhf.tar.gz $TRAVIS_BUILD_DIR/downloads/ 
+	  cp $HOME/downloads/flycapture.2.13.3.31_armhf.tar.gz $TRAVIS_BUILD_DIR/downloads/
         fi
 
 fi

ci/install-windows.sh

@@ -54,25 +54,21 @@ cd ..
 if [[ "$PROJ" =~ flycapture ]]; then
        echo Flycapture install
        if [ "$OS" == "windows-x86_64" ]; then
-           if [[ $(find /c/Downloads/pgr.zip -type f -size +1000000c 2>/dev/null) ]]; then
+           if [[ $(find /c/Downloads/FlyCapture_2.13.3.31_x64.msi -type f -size +1000000c 2>/dev/null) ]]; then
              echo "Found flycap in cache and size seems ok"
            else
-             echo "Downloading pgr.zip to cache as not found"
-             /c/python27/python $APPVEYOR_BUILD_FOLDER/ci/gDownload.py 0B2xpvMUzviShRFl3aWVWOVFPYlU /c/Downloads/pgr.zip 
+             echo "Downloading flycap to cache as not found"
+             /c/python27/python $APPVEYOR_BUILD_FOLDER/ci/gDownload.py 14QM7W5RHhvZanF1UBobgEIvwdy6VwTht /c/Downloads/FlyCapture_2.13.3.31_x64.msi
            fi
-           unzip /c/Downloads/pgr.zip
-           mkdir -p /c/Program\ Files/Point\ Grey\ Research
-           mv Point\ Grey\ Research/* /c/Program\ Files/Point\ Grey\ Research
+           msiexec //quiet //i c:\\Downloads\\FlyCapture_2.13.3.31_x64.msi ADDLOCAL=ALL
        elif [ "$OS" == "windows-x86" ]; then
-           if [[ $(find /c/Downloads/pgr32.zip -type f -size +1000000c 2>/dev/null) ]]; then
+           if [[ $(find /c/Downloads/FlyCapture_2.13.3.31_x86.msi -type f -size +1000000c 2>/dev/null) ]]; then
              echo "Found flycap32 in cache and size seems ok"
            else
-             echo "Downloading pgr32.zip to cache as not found"
-             /c/python27/python $APPVEYOR_BUILD_FOLDER/ci/gDownload.py 0B2xpvMUzviShQlpQSEFhZkUwc0U /c/Downloads/pgr32.zip 
+             echo "Downloading flycap32 to cache as not found"
+             /c/python27/python $APPVEYOR_BUILD_FOLDER/ci/gDownload.py 1ctSSAMF5IkxTKWiiLtID-ltmm27pHFdr /c/Downloads/FlyCapture_2.13.3.31_x86.msi
            fi
-           unzip /c/Downloads/pgr32.zip
-           mkdir -p /c/Program\ Files/Point\ Grey\ Research
-           mv Point\ Grey\ Research/* /c/Program\ Files/Point\ Grey\ Research
+           msiexec //quiet //i c:\\Downloads\\FlyCapture_2.13.3.31_x86.msi ADDLOCAL=ALL
        fi
        echo "Finished flycapture install"
 fi

flycapture/README.md

@@ -5,7 +5,7 @@ Introduction
 ------------
 This directory contains the JavaCPP Presets module for:
 
- * FlyCapture 2.11.3.121  http://www.ptgrey.com/flycapture-sdk
+ * FlyCapture 2.13.3.31  http://www.ptgrey.com/flycapture-sdk
 
 Please refer to the parent README.md file for more detailed information about the JavaCPP Presets.
 
@@ -42,7 +42,7 @@ We can use [Maven 3](http://maven.apache.org/) to download and install automatic
         <dependency>
             <groupId>org.bytedeco.javacpp-presets</groupId>
             <artifactId>flycapture-platform</artifactId>
-            <version>2.11.3.121-1.4.3</version>
+            <version>2.13.3.31-1.4.3</version>
         </dependency>
     </dependencies>
 </project>

flycapture/cppbuild.sh

@@ -7,7 +7,7 @@ if [[ -z "$PLATFORM" ]]; then
     exit
 fi
 
-FLYCAPTURE_VERSION=2.11.3.121
+FLYCAPTURE_VERSION=2.13.3.31
 
 case $PLATFORM in
     linux-arm*)

flycapture/platform/pom.xml

@@ -12,7 +12,7 @@
 
   <groupId>org.bytedeco.javacpp-presets</groupId>
   <artifactId>flycapture-platform</artifactId>
-  <version>2.11.3.121-${project.parent.version}</version>
+  <version>2.13.3.31-${project.parent.version}</version>
   <name>JavaCPP Presets Platform for FlyCapture</name>
 
   <properties>

flycapture/pom.xml

@@ -11,7 +11,7 @@
 
   <groupId>org.bytedeco.javacpp-presets</groupId>
   <artifactId>flycapture</artifactId>
-  <version>2.11.3.121-${project.parent.version}</version>
+  <version>2.13.3.31-${project.parent.version}</version>
   <name>JavaCPP Presets for FlyCapture</name>
 
   <dependencies>