diff --git a/CHANGELOG.md b/CHANGELOG.md index 032ae074..2785b038 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,5 @@ - * Make all dependencies from the JavaCPP Presets optional to let users select what they need ([issue #10](https://github.com/bytedeco/javacv/issues/10)) + * Remove `platform` property from `pom.xml`, replaced with the `platform.dependency` one in JavaCPP Presets ([issue #10](https://github.com/bytedeco/javacv/issues/10)) * Add new `RLSA` sample, thanks to Nicholas Woodward ([issue #469](http://code.google.com/p/javacv/issues/detail?id=469)) * Fix a timestamp rounding issue in `FFmpegFrameGrabber` that causes `setFrameNumber()` to sometimes pick the wrong frame if FPS is not a proper divisor of 1000000 ([issue #5](https://github.com/bytedeco/javacv/issues/5)) * Increase the flexibility of the `pom.xml` file by making it possible to specify a custom version of JavaCPP diff --git a/pom.xml b/pom.xml index 02b3df70..68234258 100644 --- a/pom.xml +++ b/pom.xml @@ -49,7 +49,6 @@ UTF-8 yyyyMMddhhmm ${project.version} - ${os.name}-${os.arch} **/Mark*.java @@ -75,93 +74,36 @@ org.bytedeco.javacpp-presets opencv 2.4.9-${javacpp.version} - true org.bytedeco.javacpp-presets ffmpeg 2.2.1-${javacpp.version} - true org.bytedeco.javacpp-presets flycapture 1.7.17-${javacpp.version} - true org.bytedeco.javacpp-presets libdc1394 2.2.2-${javacpp.version} - true org.bytedeco.javacpp-presets libfreenect 0.4-${javacpp.version} - true org.bytedeco.javacpp-presets videoinput 0.200-${javacpp.version} - true org.bytedeco.javacpp-presets artoolkitplus 2.3.0-${javacpp.version} - true - - - - org.bytedeco.javacpp-presets - opencv - 2.4.9-${javacpp.version} - ${platform} - true - - - org.bytedeco.javacpp-presets - ffmpeg - 2.2.1-${javacpp.version} - ${platform} - true - - - org.bytedeco.javacpp-presets - flycapture - 1.7.17-${javacpp.version} - ${platform} - true - - - org.bytedeco.javacpp-presets - libdc1394 - 2.2.2-${javacpp.version} - ${platform} - true - - - org.bytedeco.javacpp-presets - libfreenect - 0.4-${javacpp.version} - ${platform} - true - - - org.bytedeco.javacpp-presets - videoinput - 0.200-${javacpp.version} - ${platform} - true - - - org.bytedeco.javacpp-presets - artoolkitplus - 2.3.0-${javacpp.version} - ${platform} - true @@ -362,20 +304,14 @@ - all - none none none - none - none - none none none none - none none none none @@ -386,7 +322,6 @@ markers - none none none @@ -394,9 +329,6 @@ ffmpeg - none - none - none none @@ -415,7 +347,6 @@ openkinect - none none @@ -438,88 +369,6 @@ none - - - linux - - linux - - - linux - - - - macosx - - mac os x - - - macosx - - - - windows - - windows - - - windows - - - - i386 - - i386 - - - x86 - - - - i486 - - i486 - - - x86 - - - - i586 - - i586 - - - x86 - - - - i686 - - i686 - - - x86 - - - - amd64 - - amd64 - - - x86_64 - - - - x86-64 - - x86-64 - - - x86_64 - -