diff --git a/CHANGELOG.md b/CHANGELOG.md
index 931aaa4e86e..154478980ff 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,6 @@
+### October 25, 2015 version 1.1
+ * Build the Maven artifacts for Linux in a CentOS 6 Docker container, for maximum compatibility ([issue #22](https://github.com/bytedeco/javacpp-presets/issues/22))
* Cache files downloaded by `cppbuild.sh` in the `downloads` subdirectory to prevent having to redownload everything after a clean
* Add the `clang` module to the presets for LLVM
* Propose for FFmpeg in the `cppbuild.sh` file a minimal configuration to support MPEG-4 streams with H.264 and AAC
diff --git a/README.md b/README.md
index 800bd68ff76..caec72e66bb 100644
--- a/README.md
+++ b/README.md
@@ -12,8 +12,8 @@ Downloads
---------
To install manually the JAR files, obtain the following archives and follow the instructions in the [Manual Installation](#manual-installation) section below.
- * JavaCPP Presets 1.0 binary archive [javacpp-presets-1.0-bin.zip](http://search.maven.org/remotecontent?filepath=org/bytedeco/javacpp-presets/1.0/javacpp-presets-1.0-bin.zip) (232 MB)
- * JavaCPP Presets 1.0 source archive [javacpp-presets-1.0-src.zip](http://search.maven.org/remotecontent?filepath=org/bytedeco/javacpp-presets/1.0/javacpp-presets-1.0-src.zip) (1.9 MB)
+ * JavaCPP Presets 1.1 binary archive [javacpp-presets-1.1-bin.zip](http://search.maven.org/remotecontent?filepath=org/bytedeco/javacpp-presets/1.1/javacpp-presets-1.1-bin.zip) (278 MB)
+ * JavaCPP Presets 1.1 source archive [javacpp-presets-1.1-src.zip](http://search.maven.org/remotecontent?filepath=org/bytedeco/javacpp-presets/1.1/javacpp-presets-1.1-src.zip) (2.0 MB)
The binary archive contains builds for Android, Linux, Mac OS X, and Windows. The JAR files for specific child modules or platforms can also be obtained individually from the [Maven Central Repository](http://search.maven.org/#search|ga|1|bytedeco).
@@ -25,21 +25,21 @@ We can also have everything downloaded and installed automatically with:
org.bytedeco.javacpp-presets
${moduleName}
- ${moduleVersion}-1.0
+ ${moduleVersion}-1.1
```
* Gradle (inside the `build.gradle` file)
```groovy
dependencies {
- compile group: 'org.bytedeco.javacpp-presets', name: moduleName, version: moduleVersion + '-1.0'
+ compile group: 'org.bytedeco.javacpp-presets', name: moduleName, version: moduleVersion + '-1.1'
}
```
* sbt (inside the `build.sbt` file)
```scala
classpathTypes += "maven-plugin"
- libraryDependencies += "org.bytedeco.javacpp-presets" % moduleName % moduleVersion + "-1.0"
+ libraryDependencies += "org.bytedeco.javacpp-presets" % moduleName % moduleVersion + "-1.1"
```
where the `moduleName` and `moduleVersion` variables correspond to the desired module. Additionally, we need to either set the `platform` system property (via the `-D` command line option) to something like `android-arm`, or set the `platform.dependencies` one to `true` to get all the binaries for Android, Linux, Mac OS X, and Windows. **On build systems where this does not work, we need to add the platform-specific artifacts manually.**
@@ -49,32 +49,31 @@ Required Software
-----------------
To use the JavaCPP Presets, you will need to download and install the following software:
- * An implementation of Java SE 6 or newer
+ * An implementation of Java SE 7 or newer:
* OpenJDK http://openjdk.java.net/install/ or
* Sun JDK http://www.oracle.com/technetwork/java/javase/downloads/ or
- * IBM JDK http://www.ibm.com/developerworks/java/jdk/ or
- * Java SE for Mac OS X http://developer.apple.com/java/ etc.
+ * IBM JDK http://www.ibm.com/developerworks/java/jdk/
Further, in the case of Android, the JavaCPP Presets also rely on:
- * Android SDK API 8 or newer http://developer.android.com/sdk/
+ * Android SDK API 14 or newer http://developer.android.com/sdk/
Manual Installation
-------------------
-Simply put all the desired JAR files (`opencv*.jar`, `ffmpeg*.jar`, etc.), in addition to `javacpp.jar`, somewhere in your class path. The JAR files available as pre-built artifacts are meant to be used with [JavaCPP](https://github.com/bytedeco/javacpp). They were built on Fedora 21, so they may not work on all distributions of Linux, especially older ones. The binaries for Android were compiled for ARMv7 processors featuring an FPU, so they will not work on ancient devices such as the HTC Magic or some others with an ARMv6 CPU. Here are some more specific instructions for common cases:
+Simply put all the desired JAR files (`opencv*.jar`, `ffmpeg*.jar`, etc.), in addition to `javacpp.jar`, somewhere in your class path. The JAR files available as pre-built artifacts are meant to be used with [JavaCPP](https://github.com/bytedeco/javacpp). The binaries for Linux were built for CentOS 6, so they should work on most distributions currently in use. The ones for Android were compiled for ARMv7 processors featuring an FPU, so they will not work on ancient devices such as the HTC Magic or some others with an ARMv6 CPU. Here are some more specific instructions for common cases:
-NetBeans (Java SE 6 or newer):
+NetBeans (Java SE 7 or newer):
1. In the Projects window, right-click the Libraries node of your project, and select "Add JAR/Folder...".
2. Locate the JAR files, select them, and click OK.
-Eclipse (Java SE 6 or newer):
+Eclipse (Java SE 7 or newer):
1. Navigate to Project > Properties > Java Build Path > Libraries and click "Add External JARs...".
2. Locate the JAR files, select them, and click OK.
-IntelliJ IDEA (Android 2.2 or newer):
+IntelliJ IDEA (Android 4.0 or newer):
1. Follow the instructions on this page: http://developer.android.com/training/basics/firstapp/
2. Copy all the JAR files into the `app/libs` subdirectory.
@@ -83,35 +82,41 @@ IntelliJ IDEA (Android 2.2 or newer):
After that, we can access almost transparently the corresponding C/C++ APIs through the interface classes found in the `org.bytedeco.javacpp` package. Indeed, the `Parser` translates the code comments from the C/C++ header files into the Java interface files, (almost) ready to be consumed by Javadoc. However, since their translation still leaves to be desired, one may wish to refer to the original documentation pages. For instance, the ones for OpenCV and FFmpeg can be found online at:
- * [OpenCV documentation](http://docs.opencv.org/)
- * [FFmpeg documentation](http://ffmpeg.org/doxygen/)
+ * [OpenCV documentation](http://docs.opencv.org/master/)
+ * [FFmpeg documentation](http://ffmpeg.org/doxygen/trunk/)
Build Instructions
------------------
-If the binary files available above are not enough for your needs, you might need to rebuild them from the source code. To this end, the project files on the Java side were created for:
+If the binary files available above are not enough for your needs, you might need to rebuild them from the source code. To this end, project files on the Java side were created as [Maven modules](#the-maven-modules). Before running the Maven build, however, we recommend to install the native libraries on the native C/C++ side with the [`cppbuild.sh` scripts](#the-cppbuildsh-scripts), but they can also be installed by other means.
- * Maven 2 or 3 http://maven.apache.org/download.html
- * JavaCPP 1.0 https://github.com/bytedeco/javacpp
+Additionally, one can find on the wiki page additional information about the recommended [build environments](https://github.com/bytedeco/javacpp-presets/wiki/Build-Environments) for the major platforms.
-Each child module in turn relies on its corresponding native libraries being already installed in the `cppbuild` subdirectory created by a prior execution of the included [CPPBuild Scripts](#cppbuild-scripts), explained below. To use native libraries already installed somewhere else on the system, other installation directories than `cppbuild` can also be specified either in the `pom.xml` files or in the `.java` configuration files. The following versions are supported:
+
+### The Maven modules
+The JavaCPP Presets depend on Maven, a powerful build system for Java, so before attempting a build, be sure to install and read up on:
+
+ * Maven 3.x http://maven.apache.org/download.html
+ * JavaCPP 1.1 https://github.com/bytedeco/javacpp
+
+Each child module in turn relies on its corresponding native libraries being already installed in the `cppbuild` subdirectory created by a prior execution of the included [`cppbuild.sh` scripts](#the-cppbuildsh-scripts), explained below. To use native libraries already installed somewhere else on the system, other installation directories than `cppbuild` can also be specified either in the `pom.xml` files or in the `.java` configuration files. The following versions are supported:
* OpenCV 3.0.0 http://opencv.org/downloads.html
- * FFmpeg 2.7.x http://ffmpeg.org/download.html
- * FlyCapture 2.7.x http://www.ptgrey.com/flycapture-sdk
+ * FFmpeg 2.8.x http://ffmpeg.org/download.html
+ * FlyCapture 2.7.x or 2.8.x http://www.ptgrey.com/flycapture-sdk
* libdc1394 2.1.x or 2.2.x http://sourceforge.net/projects/libdc1394/files/
- * libfreenect 0.5.2 https://github.com/OpenKinect/libfreenect
+ * libfreenect 0.5.3 https://github.com/OpenKinect/libfreenect
* videoInput 0.200 https://github.com/ofTheo/videoInput/
* ARToolKitPlus 2.3.1 https://launchpad.net/artoolkitplus
* Chilitags https://github.com/chili-epfl/chilitags
* flandmark 1.07 http://cmp.felk.cvut.cz/~uricamic/flandmark/#download
* FFTW 3.3.4 http://www.fftw.org/download.html
* GSL 1.16 http://www.gnu.org/software/gsl/#downloading
- * LLVM 3.6.1 http://llvm.org/releases/download.html
+ * LLVM 3.7.0 http://llvm.org/releases/download.html
* Leptonica 1.72 http://www.leptonica.org/download.html
- * Tesseract 3.03-rc1 https://code.google.com/p/tesseract-ocr/
+ * Tesseract 3.04 https://code.google.com/p/tesseract-ocr/
* Caffe https://github.com/BVLC/caffe
- * CUDA 7.0 https://developer.nvidia.com/cuda-downloads
+ * CUDA 7.5 https://developer.nvidia.com/cuda-downloads
Once everything installed and configured, simply execute
```bash
@@ -120,12 +125,11 @@ $ mvn install --projects .,opencv,ffmpeg,flycapture,libdc1394,libfreenect,videoi
inside the directory containing the parent `pom.xml` file, by specifying only the desired child modules in the command, but **without the leading period "." in the comma-separated list of projects, the parent `poml.xml` file itself might not get installed.** Please refer to the comments inside the `pom.xml` file for further details.
-CPPBuild Scripts
-----------------
-Before running the Maven build, however, we recommend to install the native libraries on the native C/C++ side with the `cppbuild.sh` scripts. In this case, additional software is required:
+### The `cppbuild.sh` scripts
+Running the scripts allows us to install easily the native libraries on multiple platforms, but additional software is required:
* A recent version of Linux, Mac OS X, or Windows with MSYS and Visual Studio
- * Android NDK r7 or newer http://developer.android.com/sdk/ndk/ (required only for Android builds)
+ * Android NDK r7 or newer http://developer.android.com/ndk/downloads/ (required only for Android builds)
With the above in working order, simply execute
```bash
@@ -152,11 +156,12 @@ Thanks to Jose Gómez for testing this out!
How Can I Help?
---------------
-Contributions of any kind are highly welcome! At the moment, the `Parser` has limited capabilities, so I plan to improve it gradually to the point where it can successfully parse large C++ header files that are even more convoluted than the ones from OpenCV, but the build system could also be improved. Consequently, I am looking for help especially with the four following tasks, in no particular order:
+Contributions of any kind are highly welcome! At the moment, the `Parser` has limited capabilities, so I plan to improve it gradually to the point where it can successfully parse large C++ header files that are even more convoluted than the ones from OpenCV or Caffe, but the build system could also be improved. Consequently, I am looking for help especially with the five following tasks, in no particular order:
- * Improving the `Parser`
- * Providing builds for more platforms, most notably `linux-arm`
- * Replacing the Bash/Maven build combo by something better (Gradle?)
+ * Setting up continuous integration, preferably free on the cloud ([Travis CI](https://travis-ci.org/)?)
+ * Improving the `Parser` (by using the [presets for Clang](llvm/src/main/java/org/bytedeco/javacpp/clang.java)?)
+ * Providing builds for more platforms, most notably `linux-arm` for [Raspberry Pi](https://www.raspberrypi.org/), etc.
+ * Replacing the Bash/Maven build combo by something easier to use ([Gradle](http://gradle.org/)?)
* Adding new presets as child modules for other C/C++ libraries (OpenNI, OpenMesh, PCL, etc.)
To contribute, please fork and create pull requests, or post your suggestions [as a new "issue"](https://github.com/bytedeco/javacpp-presets/issues). Thank you very much in advance for your contribution!
diff --git a/artoolkitplus/README.md b/artoolkitplus/README.md
index 262a7df1aa5..1a63aa4e3e5 100644
--- a/artoolkitplus/README.md
+++ b/artoolkitplus/README.md
@@ -35,12 +35,12 @@ We can use [Maven 3](http://maven.apache.org/) to download and install automatic
4.0.0
org.bytedeco.javacpp-presets.artoolkitplus
multimain
- 1.0
+ 1.1
org.bytedeco.javacpp-presets
artoolkitplus
- 2.3.1-1.0
+ 2.3.1-1.1
diff --git a/artoolkitplus/pom.xml b/artoolkitplus/pom.xml
index 15e044775ac..748cb3ff652 100644
--- a/artoolkitplus/pom.xml
+++ b/artoolkitplus/pom.xml
@@ -6,7 +6,7 @@
org.bytedeco
javacpp-presets
- 1.1-SNAPSHOT
+ 1.1
org.bytedeco.javacpp-presets
diff --git a/artoolkitplus/src/main/java/org/bytedeco/javacpp/ARToolKitPlus.java b/artoolkitplus/src/main/java/org/bytedeco/javacpp/ARToolKitPlus.java
index 7de377fd730..3d7c8c0008c 100644
--- a/artoolkitplus/src/main/java/org/bytedeco/javacpp/ARToolKitPlus.java
+++ b/artoolkitplus/src/main/java/org/bytedeco/javacpp/ARToolKitPlus.java
@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.1-SNAPSHOT
+// Targeted by JavaCPP version 1.1
package org.bytedeco.javacpp;
diff --git a/caffe/README.md b/caffe/README.md
index c90682c95e1..1ee2c19c94d 100644
--- a/caffe/README.md
+++ b/caffe/README.md
@@ -34,12 +34,12 @@ We can use [Maven 3](http://maven.apache.org/) to download and install automatic
4.0.0
org.bytedeco.javacpp-presets.caffe
caffe
- 1.0
+ 1.1
org.bytedeco.javacpp-presets
caffe
- master-1.0
+ master-1.1
diff --git a/caffe/pom.xml b/caffe/pom.xml
index cf966bb9e56..7aeb6047b46 100644
--- a/caffe/pom.xml
+++ b/caffe/pom.xml
@@ -6,7 +6,7 @@
org.bytedeco
javacpp-presets
- 1.1-SNAPSHOT
+ 1.1
org.bytedeco.javacpp-presets
diff --git a/caffe/src/main/java/org/bytedeco/javacpp/caffe.java b/caffe/src/main/java/org/bytedeco/javacpp/caffe.java
index 76178d4cef8..8414c45c78a 100644
--- a/caffe/src/main/java/org/bytedeco/javacpp/caffe.java
+++ b/caffe/src/main/java/org/bytedeco/javacpp/caffe.java
@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.1-SNAPSHOT
+// Targeted by JavaCPP version 1.1
package org.bytedeco.javacpp;
diff --git a/chilitags/README.md b/chilitags/README.md
index 9a30363bc48..782cb170437 100644
--- a/chilitags/README.md
+++ b/chilitags/README.md
@@ -34,12 +34,12 @@ We can use [Maven 3](http://maven.apache.org/) to download and install automatic
4.0.0
org.bytedeco.javacpp-presets.chilitags
detectlive
- 1.0
+ 1.1
org.bytedeco.javacpp-presets
chilitags
- master-1.0
+ master-1.1
diff --git a/chilitags/pom.xml b/chilitags/pom.xml
index bcc6e082693..13663cc5013 100644
--- a/chilitags/pom.xml
+++ b/chilitags/pom.xml
@@ -6,7 +6,7 @@
org.bytedeco
javacpp-presets
- 1.1-SNAPSHOT
+ 1.1
org.bytedeco.javacpp-presets
diff --git a/chilitags/src/main/java/org/bytedeco/javacpp/chilitags.java b/chilitags/src/main/java/org/bytedeco/javacpp/chilitags.java
index 87202428b14..b5c55099f5d 100644
--- a/chilitags/src/main/java/org/bytedeco/javacpp/chilitags.java
+++ b/chilitags/src/main/java/org/bytedeco/javacpp/chilitags.java
@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.1-SNAPSHOT
+// Targeted by JavaCPP version 1.1
package org.bytedeco.javacpp;
diff --git a/cuda/README.md b/cuda/README.md
index 1065d0369e5..0e9844b8bcb 100644
--- a/cuda/README.md
+++ b/cuda/README.md
@@ -5,7 +5,7 @@ Introduction
------------
This directory contains the JavaCPP Presets module for:
- * CUDA 7.0 https://developer.nvidia.com/cuda-zone
+ * CUDA 7.5 https://developer.nvidia.com/cuda-zone
Please refer to the parent README.md file for more detailed information about the JavaCPP Presets.
@@ -35,12 +35,12 @@ We can use [Maven 3](http://maven.apache.org/) to download and install automatic
4.0.0
org.bytedeco.javacpp-presets.cuda
mnistcudnn
- 1.0
+ 1.1
org.bytedeco.javacpp-presets
cuda
- 7.0-1.0
+ 7.5-1.1
diff --git a/cuda/pom.xml b/cuda/pom.xml
index b11cfec2ea1..4225b16095a 100644
--- a/cuda/pom.xml
+++ b/cuda/pom.xml
@@ -6,7 +6,7 @@
org.bytedeco
javacpp-presets
- 1.1-SNAPSHOT
+ 1.1
org.bytedeco.javacpp-presets
diff --git a/cuda/src/main/java/org/bytedeco/javacpp/cublas.java b/cuda/src/main/java/org/bytedeco/javacpp/cublas.java
index 5c93a4b5d8b..9074ac6cc44 100644
--- a/cuda/src/main/java/org/bytedeco/javacpp/cublas.java
+++ b/cuda/src/main/java/org/bytedeco/javacpp/cublas.java
@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.1-SNAPSHOT
+// Targeted by JavaCPP version 1.1
package org.bytedeco.javacpp;
diff --git a/cuda/src/main/java/org/bytedeco/javacpp/cuda.java b/cuda/src/main/java/org/bytedeco/javacpp/cuda.java
index 786fe796457..b8281d14b5d 100644
--- a/cuda/src/main/java/org/bytedeco/javacpp/cuda.java
+++ b/cuda/src/main/java/org/bytedeco/javacpp/cuda.java
@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.1-SNAPSHOT
+// Targeted by JavaCPP version 1.1
package org.bytedeco.javacpp;
diff --git a/cuda/src/main/java/org/bytedeco/javacpp/cudnn.java b/cuda/src/main/java/org/bytedeco/javacpp/cudnn.java
index e977ce723eb..07c69e9b8d1 100644
--- a/cuda/src/main/java/org/bytedeco/javacpp/cudnn.java
+++ b/cuda/src/main/java/org/bytedeco/javacpp/cudnn.java
@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.1-SNAPSHOT
+// Targeted by JavaCPP version 1.1
package org.bytedeco.javacpp;
diff --git a/cuda/src/main/java/org/bytedeco/javacpp/cufft.java b/cuda/src/main/java/org/bytedeco/javacpp/cufft.java
index 54d279438c4..2070f560849 100644
--- a/cuda/src/main/java/org/bytedeco/javacpp/cufft.java
+++ b/cuda/src/main/java/org/bytedeco/javacpp/cufft.java
@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.1-SNAPSHOT
+// Targeted by JavaCPP version 1.1
package org.bytedeco.javacpp;
diff --git a/cuda/src/main/java/org/bytedeco/javacpp/cufftw.java b/cuda/src/main/java/org/bytedeco/javacpp/cufftw.java
index 24bad91fdc7..b8799769223 100644
--- a/cuda/src/main/java/org/bytedeco/javacpp/cufftw.java
+++ b/cuda/src/main/java/org/bytedeco/javacpp/cufftw.java
@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.1-SNAPSHOT
+// Targeted by JavaCPP version 1.1
package org.bytedeco.javacpp;
diff --git a/cuda/src/main/java/org/bytedeco/javacpp/curand.java b/cuda/src/main/java/org/bytedeco/javacpp/curand.java
index 7b4bb158470..cee1224e8ed 100644
--- a/cuda/src/main/java/org/bytedeco/javacpp/curand.java
+++ b/cuda/src/main/java/org/bytedeco/javacpp/curand.java
@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.1-SNAPSHOT
+// Targeted by JavaCPP version 1.1
package org.bytedeco.javacpp;
diff --git a/cuda/src/main/java/org/bytedeco/javacpp/cusolver.java b/cuda/src/main/java/org/bytedeco/javacpp/cusolver.java
index dc2087cf96e..8d8a07ae118 100644
--- a/cuda/src/main/java/org/bytedeco/javacpp/cusolver.java
+++ b/cuda/src/main/java/org/bytedeco/javacpp/cusolver.java
@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.1-SNAPSHOT
+// Targeted by JavaCPP version 1.1
package org.bytedeco.javacpp;
diff --git a/cuda/src/main/java/org/bytedeco/javacpp/cusparse.java b/cuda/src/main/java/org/bytedeco/javacpp/cusparse.java
index 1de1865eee0..ff6143debaf 100644
--- a/cuda/src/main/java/org/bytedeco/javacpp/cusparse.java
+++ b/cuda/src/main/java/org/bytedeco/javacpp/cusparse.java
@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.1-SNAPSHOT
+// Targeted by JavaCPP version 1.1
package org.bytedeco.javacpp;
diff --git a/cuda/src/main/java/org/bytedeco/javacpp/nppc.java b/cuda/src/main/java/org/bytedeco/javacpp/nppc.java
index b86a4959dd7..37573eab53b 100644
--- a/cuda/src/main/java/org/bytedeco/javacpp/nppc.java
+++ b/cuda/src/main/java/org/bytedeco/javacpp/nppc.java
@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.1-SNAPSHOT
+// Targeted by JavaCPP version 1.1
package org.bytedeco.javacpp;
diff --git a/cuda/src/main/java/org/bytedeco/javacpp/nppi.java b/cuda/src/main/java/org/bytedeco/javacpp/nppi.java
index 9f2a50996a6..438b39324a8 100644
--- a/cuda/src/main/java/org/bytedeco/javacpp/nppi.java
+++ b/cuda/src/main/java/org/bytedeco/javacpp/nppi.java
@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.1-SNAPSHOT
+// Targeted by JavaCPP version 1.1
package org.bytedeco.javacpp;
diff --git a/cuda/src/main/java/org/bytedeco/javacpp/npps.java b/cuda/src/main/java/org/bytedeco/javacpp/npps.java
index fe3ea9dd45a..2ee22a7e50d 100644
--- a/cuda/src/main/java/org/bytedeco/javacpp/npps.java
+++ b/cuda/src/main/java/org/bytedeco/javacpp/npps.java
@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.1-SNAPSHOT
+// Targeted by JavaCPP version 1.1
package org.bytedeco.javacpp;
diff --git a/ffmpeg/LICENSE.openh264 b/ffmpeg/LICENSE.openh264
new file mode 100644
index 00000000000..8e730c4e2c6
--- /dev/null
+++ b/ffmpeg/LICENSE.openh264
@@ -0,0 +1,23 @@
+Copyright (c) 2013, Cisco Systems
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+* Redistributions of source code must retain the above copyright notice, this
+ list of conditions and the following disclaimer.
+
+* Redistributions in binary form must reproduce the above copyright notice, this
+ list of conditions and the following disclaimer in the documentation and/or
+ other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
\ No newline at end of file
diff --git a/ffmpeg/README.md b/ffmpeg/README.md
index 703cd793e5f..316c4442f01 100644
--- a/ffmpeg/README.md
+++ b/ffmpeg/README.md
@@ -5,7 +5,7 @@ Introduction
------------
This directory contains the JavaCPP Presets module for:
- * FFmpeg 2.7.1 http://ffmpeg.org/
+ * FFmpeg 2.8.1 http://ffmpeg.org/
Please refer to the parent README.md file for more detailed information about the JavaCPP Presets.
@@ -34,12 +34,12 @@ We can use [Maven 3](http://maven.apache.org/) to download and install automatic
4.0.0
org.bytedeco.javacpp-presets.ffmpeg
tutorial01
- 1.0
+ 1.1
org.bytedeco.javacpp-presets
ffmpeg
- 2.7.1-1.0
+ 2.8.1-1.1
diff --git a/ffmpeg/pom.xml b/ffmpeg/pom.xml
index 2b5ce850276..605e55669d8 100644
--- a/ffmpeg/pom.xml
+++ b/ffmpeg/pom.xml
@@ -6,7 +6,7 @@
org.bytedeco
javacpp-presets
- 1.1-SNAPSHOT
+ 1.1
org.bytedeco.javacpp-presets
diff --git a/ffmpeg/src/main/java/org/bytedeco/javacpp/avcodec.java b/ffmpeg/src/main/java/org/bytedeco/javacpp/avcodec.java
index 21ecfb48f02..22c8e8bde05 100644
--- a/ffmpeg/src/main/java/org/bytedeco/javacpp/avcodec.java
+++ b/ffmpeg/src/main/java/org/bytedeco/javacpp/avcodec.java
@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.1-SNAPSHOT
+// Targeted by JavaCPP version 1.1
package org.bytedeco.javacpp;
diff --git a/ffmpeg/src/main/java/org/bytedeco/javacpp/avdevice.java b/ffmpeg/src/main/java/org/bytedeco/javacpp/avdevice.java
index e567fda1164..75d229cae83 100644
--- a/ffmpeg/src/main/java/org/bytedeco/javacpp/avdevice.java
+++ b/ffmpeg/src/main/java/org/bytedeco/javacpp/avdevice.java
@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.1-SNAPSHOT
+// Targeted by JavaCPP version 1.1
package org.bytedeco.javacpp;
diff --git a/ffmpeg/src/main/java/org/bytedeco/javacpp/avfilter.java b/ffmpeg/src/main/java/org/bytedeco/javacpp/avfilter.java
index 396a2a4b788..4c736bbdb6f 100644
--- a/ffmpeg/src/main/java/org/bytedeco/javacpp/avfilter.java
+++ b/ffmpeg/src/main/java/org/bytedeco/javacpp/avfilter.java
@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.1-SNAPSHOT
+// Targeted by JavaCPP version 1.1
package org.bytedeco.javacpp;
diff --git a/ffmpeg/src/main/java/org/bytedeco/javacpp/avformat.java b/ffmpeg/src/main/java/org/bytedeco/javacpp/avformat.java
index 3bae9f0af46..4f7437b8ae4 100644
--- a/ffmpeg/src/main/java/org/bytedeco/javacpp/avformat.java
+++ b/ffmpeg/src/main/java/org/bytedeco/javacpp/avformat.java
@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.1-SNAPSHOT
+// Targeted by JavaCPP version 1.1
package org.bytedeco.javacpp;
diff --git a/ffmpeg/src/main/java/org/bytedeco/javacpp/avutil.java b/ffmpeg/src/main/java/org/bytedeco/javacpp/avutil.java
index 212c52d8059..b9045ce2ef1 100644
--- a/ffmpeg/src/main/java/org/bytedeco/javacpp/avutil.java
+++ b/ffmpeg/src/main/java/org/bytedeco/javacpp/avutil.java
@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.1-SNAPSHOT
+// Targeted by JavaCPP version 1.1
package org.bytedeco.javacpp;
diff --git a/ffmpeg/src/main/java/org/bytedeco/javacpp/postproc.java b/ffmpeg/src/main/java/org/bytedeco/javacpp/postproc.java
index 8b728acf927..156d4d15ad2 100644
--- a/ffmpeg/src/main/java/org/bytedeco/javacpp/postproc.java
+++ b/ffmpeg/src/main/java/org/bytedeco/javacpp/postproc.java
@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.1-SNAPSHOT
+// Targeted by JavaCPP version 1.1
package org.bytedeco.javacpp;
diff --git a/ffmpeg/src/main/java/org/bytedeco/javacpp/swresample.java b/ffmpeg/src/main/java/org/bytedeco/javacpp/swresample.java
index 4ca8e37f950..2840a9e0aee 100644
--- a/ffmpeg/src/main/java/org/bytedeco/javacpp/swresample.java
+++ b/ffmpeg/src/main/java/org/bytedeco/javacpp/swresample.java
@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.1-SNAPSHOT
+// Targeted by JavaCPP version 1.1
package org.bytedeco.javacpp;
diff --git a/ffmpeg/src/main/java/org/bytedeco/javacpp/swscale.java b/ffmpeg/src/main/java/org/bytedeco/javacpp/swscale.java
index 681228f5c9a..52db2cbf6fa 100644
--- a/ffmpeg/src/main/java/org/bytedeco/javacpp/swscale.java
+++ b/ffmpeg/src/main/java/org/bytedeco/javacpp/swscale.java
@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.1-SNAPSHOT
+// Targeted by JavaCPP version 1.1
package org.bytedeco.javacpp;
diff --git a/fftw/README.md b/fftw/README.md
index 7f82207d3c8..e5a6df4c187 100644
--- a/fftw/README.md
+++ b/fftw/README.md
@@ -34,12 +34,12 @@ We can use [Maven 3](http://maven.apache.org/) to download and install automatic
4.0.0
org.bytedeco.javacpp-presets.fftw
example
- 1.0
+ 1.1
org.bytedeco.javacpp-presets
fftw
- 3.3.4-1.0
+ 3.3.4-1.1
diff --git a/fftw/pom.xml b/fftw/pom.xml
index 1994c731fc1..57332e5d164 100644
--- a/fftw/pom.xml
+++ b/fftw/pom.xml
@@ -6,7 +6,7 @@
org.bytedeco
javacpp-presets
- 1.1-SNAPSHOT
+ 1.1
org.bytedeco.javacpp-presets
diff --git a/fftw/src/main/java/org/bytedeco/javacpp/fftw3.java b/fftw/src/main/java/org/bytedeco/javacpp/fftw3.java
index b29020dfb53..5d3b9eb2fdc 100644
--- a/fftw/src/main/java/org/bytedeco/javacpp/fftw3.java
+++ b/fftw/src/main/java/org/bytedeco/javacpp/fftw3.java
@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.1-SNAPSHOT
+// Targeted by JavaCPP version 1.1
package org.bytedeco.javacpp;
diff --git a/flandmark/README.md b/flandmark/README.md
index 51bc1127672..25a6cc31678 100644
--- a/flandmark/README.md
+++ b/flandmark/README.md
@@ -35,12 +35,12 @@ We can use [Maven 3](http://maven.apache.org/) to download and install automatic
4.0.0
org.bytedeco.javacpp-presets.flandmark
simpleexample
- 1.0
+ 1.1
org.bytedeco.javacpp-presets
flandmark
- 1.07-1.0
+ 1.07-1.1
diff --git a/flandmark/pom.xml b/flandmark/pom.xml
index 685066da2c2..b1ef5e88009 100644
--- a/flandmark/pom.xml
+++ b/flandmark/pom.xml
@@ -6,7 +6,7 @@
org.bytedeco
javacpp-presets
- 1.1-SNAPSHOT
+ 1.1
org.bytedeco.javacpp-presets
diff --git a/flandmark/src/main/java/org/bytedeco/javacpp/flandmark.java b/flandmark/src/main/java/org/bytedeco/javacpp/flandmark.java
index 6178c025d46..9d45a1d08f4 100644
--- a/flandmark/src/main/java/org/bytedeco/javacpp/flandmark.java
+++ b/flandmark/src/main/java/org/bytedeco/javacpp/flandmark.java
@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.1-SNAPSHOT
+// Targeted by JavaCPP version 1.1
package org.bytedeco.javacpp;
diff --git a/flycapture/README.md b/flycapture/README.md
index 453b94e8565..632a1d979ce 100644
--- a/flycapture/README.md
+++ b/flycapture/README.md
@@ -5,7 +5,7 @@ Introduction
------------
This directory contains the JavaCPP Presets module for:
- * FlyCapture 2.7.3.19 http://www.ptgrey.com/flycapture-sdk
+ * FlyCapture 2.8.3.1 http://www.ptgrey.com/flycapture-sdk
Please refer to the parent README.md file for more detailed information about the JavaCPP Presets.
@@ -34,12 +34,12 @@ We can use [Maven 3](http://maven.apache.org/) to download and install automatic
4.0.0
org.bytedeco.javacpp-presets.flycapture
flycapture2test
- 1.0
+ 1.1
org.bytedeco.javacpp-presets
flycapture
- 2.7.3.19-1.0
+ 2.8.3.1-1.1
diff --git a/flycapture/pom.xml b/flycapture/pom.xml
index ebf1eefdb52..58003e6cfee 100644
--- a/flycapture/pom.xml
+++ b/flycapture/pom.xml
@@ -6,7 +6,7 @@
org.bytedeco
javacpp-presets
- 1.1-SNAPSHOT
+ 1.1
org.bytedeco.javacpp-presets
diff --git a/flycapture/src/main/java/org/bytedeco/javacpp/FlyCapture2.java b/flycapture/src/main/java/org/bytedeco/javacpp/FlyCapture2.java
index 47546f12d49..20b9514713b 100644
--- a/flycapture/src/main/java/org/bytedeco/javacpp/FlyCapture2.java
+++ b/flycapture/src/main/java/org/bytedeco/javacpp/FlyCapture2.java
@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.1-SNAPSHOT
+// Targeted by JavaCPP version 1.1
package org.bytedeco.javacpp;
diff --git a/flycapture/src/main/java/org/bytedeco/javacpp/FlyCapture2_C.java b/flycapture/src/main/java/org/bytedeco/javacpp/FlyCapture2_C.java
index fb6a14d6ae2..dc33b1f0183 100644
--- a/flycapture/src/main/java/org/bytedeco/javacpp/FlyCapture2_C.java
+++ b/flycapture/src/main/java/org/bytedeco/javacpp/FlyCapture2_C.java
@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.1-SNAPSHOT
+// Targeted by JavaCPP version 1.1
package org.bytedeco.javacpp;
diff --git a/flycapture/src/main/java/org/bytedeco/javacpp/PGRFlyCapture.java b/flycapture/src/main/java/org/bytedeco/javacpp/PGRFlyCapture.java
index f4b8149ac56..68d829d7884 100644
--- a/flycapture/src/main/java/org/bytedeco/javacpp/PGRFlyCapture.java
+++ b/flycapture/src/main/java/org/bytedeco/javacpp/PGRFlyCapture.java
@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.1-SNAPSHOT
+// Targeted by JavaCPP version 1.1
package org.bytedeco.javacpp;
diff --git a/gsl/README.md b/gsl/README.md
index eb946becdc9..2cc7b8be332 100644
--- a/gsl/README.md
+++ b/gsl/README.md
@@ -34,12 +34,12 @@ We can use [Maven 3](http://maven.apache.org/) to download and install automatic
4.0.0
org.bytedeco.javacpp-presets.gsl
example
- 1.0
+ 1.1
org.bytedeco.javacpp-presets
gsl
- 1.16-1.0
+ 1.16-1.1
diff --git a/gsl/pom.xml b/gsl/pom.xml
index d247496af9d..09b6757ea49 100644
--- a/gsl/pom.xml
+++ b/gsl/pom.xml
@@ -6,12 +6,12 @@
org.bytedeco
javacpp-presets
- 1.1-SNAPSHOT
+ 1.1
org.bytedeco.javacpp-presets
gsl
- 1.16-1.0.1-SNAPSHOT
+ 1.16-${project.parent.version}
jar
JavaCPP Presets for GSL
diff --git a/gsl/src/main/java/org/bytedeco/javacpp/gsl.java b/gsl/src/main/java/org/bytedeco/javacpp/gsl.java
index 41112de71e9..8bc58548110 100644
--- a/gsl/src/main/java/org/bytedeco/javacpp/gsl.java
+++ b/gsl/src/main/java/org/bytedeco/javacpp/gsl.java
@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.1-SNAPSHOT
+// Targeted by JavaCPP version 1.1
package org.bytedeco.javacpp;
diff --git a/leptonica/README.md b/leptonica/README.md
index 9c5df87ab6b..66a4335813a 100644
--- a/leptonica/README.md
+++ b/leptonica/README.md
@@ -34,12 +34,12 @@ We can use [Maven 3](http://maven.apache.org/) to download and install automatic
4.0.0
org.bytedeco.javacpp-presets.leptonica
sudokutest
- 1.0
+ 1.1
org.bytedeco.javacpp-presets
leptonica
- 1.72-1.0
+ 1.72-1.1
diff --git a/leptonica/pom.xml b/leptonica/pom.xml
index bb3cefa27a0..548b3b4727d 100644
--- a/leptonica/pom.xml
+++ b/leptonica/pom.xml
@@ -6,7 +6,7 @@
org.bytedeco
javacpp-presets
- 1.1-SNAPSHOT
+ 1.1
org.bytedeco.javacpp-presets
diff --git a/leptonica/src/main/java/org/bytedeco/javacpp/lept.java b/leptonica/src/main/java/org/bytedeco/javacpp/lept.java
index 08ee70fc86d..0322fc16499 100644
--- a/leptonica/src/main/java/org/bytedeco/javacpp/lept.java
+++ b/leptonica/src/main/java/org/bytedeco/javacpp/lept.java
@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.1-SNAPSHOT
+// Targeted by JavaCPP version 1.1
package org.bytedeco.javacpp;
diff --git a/libdc1394/README.md b/libdc1394/README.md
index d5e07e015e2..844c7a35b0c 100644
--- a/libdc1394/README.md
+++ b/libdc1394/README.md
@@ -34,12 +34,12 @@ We can use [Maven 3](http://maven.apache.org/) to download and install automatic
4.0.0
org.bytedeco.javacpp-presets.libdc1394
grabcolorimage
- 1.0
+ 1.1
org.bytedeco.javacpp-presets
libdc1394
- 2.2.3-1.0
+ 2.2.3-1.1
diff --git a/libdc1394/pom.xml b/libdc1394/pom.xml
index 63371495cb3..b2073b5ce14 100644
--- a/libdc1394/pom.xml
+++ b/libdc1394/pom.xml
@@ -6,7 +6,7 @@
org.bytedeco
javacpp-presets
- 1.1-SNAPSHOT
+ 1.1
org.bytedeco.javacpp-presets
diff --git a/libdc1394/src/main/java/org/bytedeco/javacpp/dc1394.java b/libdc1394/src/main/java/org/bytedeco/javacpp/dc1394.java
index a8f593f3c1e..ef6a14e3f94 100644
--- a/libdc1394/src/main/java/org/bytedeco/javacpp/dc1394.java
+++ b/libdc1394/src/main/java/org/bytedeco/javacpp/dc1394.java
@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.1-SNAPSHOT
+// Targeted by JavaCPP version 1.1
package org.bytedeco.javacpp;
diff --git a/libfreenect/README.md b/libfreenect/README.md
index 5dc9c974b43..b9ece3870ab 100644
--- a/libfreenect/README.md
+++ b/libfreenect/README.md
@@ -5,7 +5,7 @@ Introduction
------------
This directory contains the JavaCPP Presets module for:
- * libfreenect 0.5.2 http://openkinect.org/
+ * libfreenect 0.5.3 http://openkinect.org/
Please refer to the parent README.md file for more detailed information about the JavaCPP Presets.
@@ -21,7 +21,7 @@ Sample Usage
------------
Here is a simple example of libfreenect ported to Java from this C source file:
- * https://github.com/OpenKinect/libfreenect/blob/v0.5.0/examples/glpclview.c
+ * https://github.com/OpenKinect/libfreenect/blob/v0.5.3/examples/glpclview.c
We can use [Maven 3](http://maven.apache.org/) to download and install automatically all the class files as well as the native binaries. To run this sample code, after creating the `pom.xml` and `src/main/java/GLPCLView.java` source files below, simply execute on the command line:
```bash
@@ -34,23 +34,23 @@ We can use [Maven 3](http://maven.apache.org/) to download and install automatic
4.0.0
org.bytedeco.javacpp-presets.libfreenect
glpclview
- 1.0
+ 1.1
org.bytedeco.javacpp-presets
libfreenect
- 0.5.2-1.0
+ 0.5.3-1.1
org.jogamp.gluegen
gluegen-rt-main
- 2.0.2
+ 2.3.1
true
org.jogamp.jogl
jogl-all-main
- 2.0.2
+ 2.3.1
true
@@ -87,14 +87,14 @@ We can use [Maven 3](http://maven.apache.org/) to download and install automatic
* either License.
*/
+import com.jogamp.opengl.*;
+import com.jogamp.opengl.awt.*;
+import com.jogamp.opengl.glu.*;
+import com.jogamp.opengl.util.*;
import java.awt.*;
import java.awt.event.*;
import java.nio.*;
-import javax.media.opengl.*;
-import javax.media.opengl.awt.*;
-import javax.media.opengl.glu.*;
import javax.swing.*;
-import com.jogamp.opengl.util.*;
import org.bytedeco.javacpp.*;
import static java.lang.Math.*;
import static org.bytedeco.javacpp.freenect.*;
@@ -273,7 +273,7 @@ public class GLPCLView {
canvas = new GLCanvas();
canvas.addGLEventListener(new GLEventListener() {
@Override public void init(GLAutoDrawable glautodrawable) {
- InitGL(glautodrawable.getGL().getGL2(), glautodrawable.getWidth(), glautodrawable.getHeight());
+ InitGL(glautodrawable.getGL().getGL2(), glautodrawable.getSurfaceWidth(), glautodrawable.getSurfaceHeight());
}
@Override public void display(GLAutoDrawable glautodrawable) {
diff --git a/libfreenect/pom.xml b/libfreenect/pom.xml
index 5a1231948e3..ca69393f4a5 100644
--- a/libfreenect/pom.xml
+++ b/libfreenect/pom.xml
@@ -6,7 +6,7 @@
org.bytedeco
javacpp-presets
- 1.1-SNAPSHOT
+ 1.1
org.bytedeco.javacpp-presets
diff --git a/libfreenect/src/main/java/org/bytedeco/javacpp/freenect.java b/libfreenect/src/main/java/org/bytedeco/javacpp/freenect.java
index 0faaaa43c5e..6cb97fb0a0d 100644
--- a/libfreenect/src/main/java/org/bytedeco/javacpp/freenect.java
+++ b/libfreenect/src/main/java/org/bytedeco/javacpp/freenect.java
@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.1-SNAPSHOT
+// Targeted by JavaCPP version 1.1
package org.bytedeco.javacpp;
diff --git a/llvm/README.md b/llvm/README.md
index a301a206758..73737d0098b 100644
--- a/llvm/README.md
+++ b/llvm/README.md
@@ -5,7 +5,7 @@ Introduction
------------
This directory contains the JavaCPP Presets module for:
- * LLVM 3.6.1 http://llvm.org/
+ * LLVM 3.7.0 http://llvm.org/
Please refer to the parent README.md file for more detailed information about the JavaCPP Presets.
@@ -35,12 +35,12 @@ We can use [Maven 3](http://maven.apache.org/) to download and install automatic
4.0.0
org.bytedeco.javacpp-presets.llvm
fac
- 1.0
+ 1.1
org.bytedeco.javacpp-presets
llvm
- 3.6.1-1.0
+ 3.7.0-1.1
diff --git a/llvm/pom.xml b/llvm/pom.xml
index 1014140ebd0..6957756762b 100644
--- a/llvm/pom.xml
+++ b/llvm/pom.xml
@@ -6,7 +6,7 @@
org.bytedeco
javacpp-presets
- 1.1-SNAPSHOT
+ 1.1
org.bytedeco.javacpp-presets
diff --git a/llvm/src/main/java/org/bytedeco/javacpp/LLVM.java b/llvm/src/main/java/org/bytedeco/javacpp/LLVM.java
index 6935afea683..5ecd2a21257 100644
--- a/llvm/src/main/java/org/bytedeco/javacpp/LLVM.java
+++ b/llvm/src/main/java/org/bytedeco/javacpp/LLVM.java
@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.1-SNAPSHOT
+// Targeted by JavaCPP version 1.1
package org.bytedeco.javacpp;
diff --git a/llvm/src/main/java/org/bytedeco/javacpp/clang.java b/llvm/src/main/java/org/bytedeco/javacpp/clang.java
index 8f458bad14d..ab1d0f0183b 100644
--- a/llvm/src/main/java/org/bytedeco/javacpp/clang.java
+++ b/llvm/src/main/java/org/bytedeco/javacpp/clang.java
@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.1-SNAPSHOT
+// Targeted by JavaCPP version 1.1
package org.bytedeco.javacpp;
diff --git a/opencv/README.md b/opencv/README.md
index 13a2e851d02..96abb9d5ded 100644
--- a/opencv/README.md
+++ b/opencv/README.md
@@ -34,12 +34,12 @@ We can use [Maven 3](http://maven.apache.org/) to download and install automatic
4.0.0
org.bytedeco.javacpp-presets.opencv
stitching
- 1.0
+ 1.1
org.bytedeco.javacpp-presets
opencv
- 3.0.0-1.0
+ 3.0.0-1.1
diff --git a/opencv/pom.xml b/opencv/pom.xml
index ebc17dd6b5a..8308aafa035 100644
--- a/opencv/pom.xml
+++ b/opencv/pom.xml
@@ -6,7 +6,7 @@
org.bytedeco
javacpp-presets
- 1.1-SNAPSHOT
+ 1.1
org.bytedeco.javacpp-presets
diff --git a/opencv/src/main/java/org/bytedeco/javacpp/opencv_calib3d.java b/opencv/src/main/java/org/bytedeco/javacpp/opencv_calib3d.java
index 6f41d09974e..bb62ebf4013 100644
--- a/opencv/src/main/java/org/bytedeco/javacpp/opencv_calib3d.java
+++ b/opencv/src/main/java/org/bytedeco/javacpp/opencv_calib3d.java
@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.1-SNAPSHOT
+// Targeted by JavaCPP version 1.1
package org.bytedeco.javacpp;
diff --git a/opencv/src/main/java/org/bytedeco/javacpp/opencv_core.java b/opencv/src/main/java/org/bytedeco/javacpp/opencv_core.java
index 1dd48bff291..6b7495faca5 100644
--- a/opencv/src/main/java/org/bytedeco/javacpp/opencv_core.java
+++ b/opencv/src/main/java/org/bytedeco/javacpp/opencv_core.java
@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.1-SNAPSHOT
+// Targeted by JavaCPP version 1.1
package org.bytedeco.javacpp;
diff --git a/opencv/src/main/java/org/bytedeco/javacpp/opencv_face.java b/opencv/src/main/java/org/bytedeco/javacpp/opencv_face.java
index 4724bb684e0..d548ff12f80 100644
--- a/opencv/src/main/java/org/bytedeco/javacpp/opencv_face.java
+++ b/opencv/src/main/java/org/bytedeco/javacpp/opencv_face.java
@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.1-SNAPSHOT
+// Targeted by JavaCPP version 1.1
package org.bytedeco.javacpp;
diff --git a/opencv/src/main/java/org/bytedeco/javacpp/opencv_features2d.java b/opencv/src/main/java/org/bytedeco/javacpp/opencv_features2d.java
index f3ee2496671..b054fc85383 100644
--- a/opencv/src/main/java/org/bytedeco/javacpp/opencv_features2d.java
+++ b/opencv/src/main/java/org/bytedeco/javacpp/opencv_features2d.java
@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.1-SNAPSHOT
+// Targeted by JavaCPP version 1.1
package org.bytedeco.javacpp;
diff --git a/opencv/src/main/java/org/bytedeco/javacpp/opencv_flann.java b/opencv/src/main/java/org/bytedeco/javacpp/opencv_flann.java
index 88b7fe7bc3b..c1428417c80 100644
--- a/opencv/src/main/java/org/bytedeco/javacpp/opencv_flann.java
+++ b/opencv/src/main/java/org/bytedeco/javacpp/opencv_flann.java
@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.1-SNAPSHOT
+// Targeted by JavaCPP version 1.1
package org.bytedeco.javacpp;
diff --git a/opencv/src/main/java/org/bytedeco/javacpp/opencv_highgui.java b/opencv/src/main/java/org/bytedeco/javacpp/opencv_highgui.java
index 4a8bc40e614..91a4bb8cc4b 100644
--- a/opencv/src/main/java/org/bytedeco/javacpp/opencv_highgui.java
+++ b/opencv/src/main/java/org/bytedeco/javacpp/opencv_highgui.java
@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.1-SNAPSHOT
+// Targeted by JavaCPP version 1.1
package org.bytedeco.javacpp;
diff --git a/opencv/src/main/java/org/bytedeco/javacpp/opencv_imgcodecs.java b/opencv/src/main/java/org/bytedeco/javacpp/opencv_imgcodecs.java
index 713fa9bbef2..751cc157bdb 100644
--- a/opencv/src/main/java/org/bytedeco/javacpp/opencv_imgcodecs.java
+++ b/opencv/src/main/java/org/bytedeco/javacpp/opencv_imgcodecs.java
@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.1-SNAPSHOT
+// Targeted by JavaCPP version 1.1
package org.bytedeco.javacpp;
diff --git a/opencv/src/main/java/org/bytedeco/javacpp/opencv_imgproc.java b/opencv/src/main/java/org/bytedeco/javacpp/opencv_imgproc.java
index 1b5d9f9ea50..8684210419d 100644
--- a/opencv/src/main/java/org/bytedeco/javacpp/opencv_imgproc.java
+++ b/opencv/src/main/java/org/bytedeco/javacpp/opencv_imgproc.java
@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.1-SNAPSHOT
+// Targeted by JavaCPP version 1.1
package org.bytedeco.javacpp;
diff --git a/opencv/src/main/java/org/bytedeco/javacpp/opencv_ml.java b/opencv/src/main/java/org/bytedeco/javacpp/opencv_ml.java
index 3cba4fa98d3..18d8672b3d4 100644
--- a/opencv/src/main/java/org/bytedeco/javacpp/opencv_ml.java
+++ b/opencv/src/main/java/org/bytedeco/javacpp/opencv_ml.java
@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.1-SNAPSHOT
+// Targeted by JavaCPP version 1.1
package org.bytedeco.javacpp;
diff --git a/opencv/src/main/java/org/bytedeco/javacpp/opencv_objdetect.java b/opencv/src/main/java/org/bytedeco/javacpp/opencv_objdetect.java
index 2d66a0e2818..0dfe0c2746f 100644
--- a/opencv/src/main/java/org/bytedeco/javacpp/opencv_objdetect.java
+++ b/opencv/src/main/java/org/bytedeco/javacpp/opencv_objdetect.java
@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.1-SNAPSHOT
+// Targeted by JavaCPP version 1.1
package org.bytedeco.javacpp;
diff --git a/opencv/src/main/java/org/bytedeco/javacpp/opencv_optflow.java b/opencv/src/main/java/org/bytedeco/javacpp/opencv_optflow.java
index db0838c7199..868c949b132 100644
--- a/opencv/src/main/java/org/bytedeco/javacpp/opencv_optflow.java
+++ b/opencv/src/main/java/org/bytedeco/javacpp/opencv_optflow.java
@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.1-SNAPSHOT
+// Targeted by JavaCPP version 1.1
package org.bytedeco.javacpp;
diff --git a/opencv/src/main/java/org/bytedeco/javacpp/opencv_photo.java b/opencv/src/main/java/org/bytedeco/javacpp/opencv_photo.java
index ebd73a64ec4..e4532718562 100644
--- a/opencv/src/main/java/org/bytedeco/javacpp/opencv_photo.java
+++ b/opencv/src/main/java/org/bytedeco/javacpp/opencv_photo.java
@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.1-SNAPSHOT
+// Targeted by JavaCPP version 1.1
package org.bytedeco.javacpp;
diff --git a/opencv/src/main/java/org/bytedeco/javacpp/opencv_shape.java b/opencv/src/main/java/org/bytedeco/javacpp/opencv_shape.java
index ac436bbc8bc..58ff2f0a3a4 100644
--- a/opencv/src/main/java/org/bytedeco/javacpp/opencv_shape.java
+++ b/opencv/src/main/java/org/bytedeco/javacpp/opencv_shape.java
@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.1-SNAPSHOT
+// Targeted by JavaCPP version 1.1
package org.bytedeco.javacpp;
diff --git a/opencv/src/main/java/org/bytedeco/javacpp/opencv_stitching.java b/opencv/src/main/java/org/bytedeco/javacpp/opencv_stitching.java
index dfc45d60905..7a2f0fbceb3 100644
--- a/opencv/src/main/java/org/bytedeco/javacpp/opencv_stitching.java
+++ b/opencv/src/main/java/org/bytedeco/javacpp/opencv_stitching.java
@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.1-SNAPSHOT
+// Targeted by JavaCPP version 1.1
package org.bytedeco.javacpp;
diff --git a/opencv/src/main/java/org/bytedeco/javacpp/opencv_superres.java b/opencv/src/main/java/org/bytedeco/javacpp/opencv_superres.java
index 7578d0b12b2..25c3f2f4bd0 100644
--- a/opencv/src/main/java/org/bytedeco/javacpp/opencv_superres.java
+++ b/opencv/src/main/java/org/bytedeco/javacpp/opencv_superres.java
@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.1-SNAPSHOT
+// Targeted by JavaCPP version 1.1
package org.bytedeco.javacpp;
diff --git a/opencv/src/main/java/org/bytedeco/javacpp/opencv_video.java b/opencv/src/main/java/org/bytedeco/javacpp/opencv_video.java
index 04375c41882..d5b029b78f5 100644
--- a/opencv/src/main/java/org/bytedeco/javacpp/opencv_video.java
+++ b/opencv/src/main/java/org/bytedeco/javacpp/opencv_video.java
@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.1-SNAPSHOT
+// Targeted by JavaCPP version 1.1
package org.bytedeco.javacpp;
diff --git a/opencv/src/main/java/org/bytedeco/javacpp/opencv_videoio.java b/opencv/src/main/java/org/bytedeco/javacpp/opencv_videoio.java
index b9b4f9561ae..84fc5e8035e 100644
--- a/opencv/src/main/java/org/bytedeco/javacpp/opencv_videoio.java
+++ b/opencv/src/main/java/org/bytedeco/javacpp/opencv_videoio.java
@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.1-SNAPSHOT
+// Targeted by JavaCPP version 1.1
package org.bytedeco.javacpp;
diff --git a/opencv/src/main/java/org/bytedeco/javacpp/opencv_videostab.java b/opencv/src/main/java/org/bytedeco/javacpp/opencv_videostab.java
index 96c16e19044..2f5b29a997e 100644
--- a/opencv/src/main/java/org/bytedeco/javacpp/opencv_videostab.java
+++ b/opencv/src/main/java/org/bytedeco/javacpp/opencv_videostab.java
@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.1-SNAPSHOT
+// Targeted by JavaCPP version 1.1
package org.bytedeco.javacpp;
diff --git a/opencv/src/main/java/org/bytedeco/javacpp/opencv_xfeatures2d.java b/opencv/src/main/java/org/bytedeco/javacpp/opencv_xfeatures2d.java
index 6307ccebd41..67564dde62b 100644
--- a/opencv/src/main/java/org/bytedeco/javacpp/opencv_xfeatures2d.java
+++ b/opencv/src/main/java/org/bytedeco/javacpp/opencv_xfeatures2d.java
@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.1-SNAPSHOT
+// Targeted by JavaCPP version 1.1
package org.bytedeco.javacpp;
diff --git a/pom.xml b/pom.xml
index 807f66c1118..4d447f09ad9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
4.0.0
org.bytedeco
javacpp-presets
- 1.1-SNAPSHOT
+ 1.1
pom
JavaCPP Presets
@@ -422,6 +422,9 @@
+
+ false
+
diff --git a/src/main/assembly/bin.xml b/src/main/assembly/bin.xml
index 06fb36c56f3..6ba168aa177 100644
--- a/src/main/assembly/bin.xml
+++ b/src/main/assembly/bin.xml
@@ -14,7 +14,10 @@
**/README*
**/APACHE*
**/COPYING*
+ **/gpl*
**/GPL*
+ **/lgpl*
+ **/LGPL*
**/LICENSE*
**/*license*
NOTICE*
diff --git a/src/main/assembly/src.xml b/src/main/assembly/src.xml
index f6e4f98dee6..157cbe05be5 100644
--- a/src/main/assembly/src.xml
+++ b/src/main/assembly/src.xml
@@ -10,6 +10,7 @@
true
+ downloads/**
**/target/**
**/cppbuild/**
diff --git a/tesseract/README.md b/tesseract/README.md
index 535568a0db3..27670063ba8 100644
--- a/tesseract/README.md
+++ b/tesseract/README.md
@@ -5,7 +5,7 @@ Introduction
------------
This directory contains the JavaCPP Presets module for:
- * Tesseract 3.0.3-rc1 https://code.google.com/p/tesseract-ocr/
+ * Tesseract 3.0.4 https://github.com/tesseract-ocr
Please refer to the parent README.md file for more detailed information about the JavaCPP Presets.
@@ -21,8 +21,8 @@ Sample Usage
------------
Here is a simple example of Tesseract ported to Java from this C++ source file and for this data:
- * https://code.google.com/p/tesseract-ocr/wiki/APIExample
- * https://code.google.com/p/tesseract-ocr/downloads/list
+ * https://github.com/tesseract-ocr/tesseract/wiki/APIExample
+ * https://github.com/tesseract-ocr/tessdata
We can use [Maven 3](http://maven.apache.org/) to download and install automatically all the class files as well as the native binaries. To run this sample code, after creating the `pom.xml` and `src/main/java/BasicExample.java` source files below, simply execute on the command line:
```bash
@@ -35,12 +35,12 @@ We can use [Maven 3](http://maven.apache.org/) to download and install automatic
4.0.0
org.bytedeco.javacpp-presets.tesseract
BasicExample
- 1.0
+ 1.1
org.bytedeco.javacpp-presets
tesseract
- 3.03-rc1-1.0
+ 3.04-1.1
@@ -64,7 +64,7 @@ public class BasicExample {
}
// Open input image with leptonica library
- PIX image = pixRead(args.length > 0 ? args[0] : "/usr/src/tesseract-3.02/phototest.tif");
+ PIX image = pixRead(args.length > 0 ? args[0] : "/usr/src/tesseract/testing/phototest.tif");
api.SetImage(image);
// Get OCR result
outText = api.GetUTF8Text();
diff --git a/tesseract/pom.xml b/tesseract/pom.xml
index 742f1f0ad69..16fe9548a88 100644
--- a/tesseract/pom.xml
+++ b/tesseract/pom.xml
@@ -6,7 +6,7 @@
org.bytedeco
javacpp-presets
- 1.1-SNAPSHOT
+ 1.1
org.bytedeco.javacpp-presets
diff --git a/tesseract/src/main/java/org/bytedeco/javacpp/tesseract.java b/tesseract/src/main/java/org/bytedeco/javacpp/tesseract.java
index 16444b302df..3b2759c104b 100644
--- a/tesseract/src/main/java/org/bytedeco/javacpp/tesseract.java
+++ b/tesseract/src/main/java/org/bytedeco/javacpp/tesseract.java
@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.1-SNAPSHOT
+// Targeted by JavaCPP version 1.1
package org.bytedeco.javacpp;
diff --git a/videoinput/README.md b/videoinput/README.md
index 59f6b6673cf..7ab0f7c02d3 100644
--- a/videoinput/README.md
+++ b/videoinput/README.md
@@ -34,12 +34,12 @@ We can use [Maven 3](http://maven.apache.org/) to download and install automatic
4.0.0
org.bytedeco.javacpp-presets.videoinput
exampleusage
- 1.0
+ 1.1
org.bytedeco.javacpp-presets
videoinput
- 0.200-1.0
+ 0.200-1.1
diff --git a/videoinput/pom.xml b/videoinput/pom.xml
index 0b7692a5e90..3db2054fa1d 100644
--- a/videoinput/pom.xml
+++ b/videoinput/pom.xml
@@ -6,7 +6,7 @@
org.bytedeco
javacpp-presets
- 1.1-SNAPSHOT
+ 1.1
org.bytedeco.javacpp-presets
diff --git a/videoinput/src/main/java/org/bytedeco/javacpp/videoInputLib.java b/videoinput/src/main/java/org/bytedeco/javacpp/videoInputLib.java
index 5e0c816a242..45031fc5bfc 100644
--- a/videoinput/src/main/java/org/bytedeco/javacpp/videoInputLib.java
+++ b/videoinput/src/main/java/org/bytedeco/javacpp/videoInputLib.java
@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.1-SNAPSHOT
+// Targeted by JavaCPP version 1.1
package org.bytedeco.javacpp;