Skip to content

Commit

Permalink
* Upgrade presets for FFmpeg 4.4.1, OpenSSL 1.1.1l
Browse files Browse the repository at this point in the history
  • Loading branch information
saudet committed Oct 31, 2021
1 parent 44e938f commit fbe1e52
Show file tree
Hide file tree
Showing 195 changed files with 326 additions and 257 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
* Map C++ JIT classes and functions of TorchScript in presets for PyTorch ([issue #1068](https://github.com/bytedeco/javacpp-presets/issues/1068))
* Synchronize `cachePackage()` and prevent repeated package caching in all presets ([pull #1071](https://github.com/bytedeco/javacpp-presets/pull/1071))
* Build FFmpeg with VA-API enabled and bundle its libraries to avoid loading issues ([issue bytedeco/javacv#1188](https://github.com/bytedeco/javacv/issues/1188))
* Upgrade presets for OpenCV 4.5.4, Arrow 5.0.0, MKL 2021.4, DNNL 2.4.2, OpenBLAS 0.3.18, FFTW 3.3.10, CPython 3.10.0, NumPy 1.21.3, SciPy 1.7.1, Gym 0.21.0, LLVM 13.0.0, Leptonica 1.82.0, CUDA 11.4.2, cuDNN 8.2.4, NCCL 2.11.4, PyTorch 1.10.0, TensorFlow Lite 2.6.0, ALE 0.7.2, DepthAI 2.11.1, ONNX 1.10.2, ONNX Runtime 1.9.1, and their dependencies
* Upgrade presets for OpenCV 4.5.4, FFmpeg 4.4.1, Arrow 5.0.0, MKL 2021.4, DNNL 2.4.2, OpenBLAS 0.3.18, FFTW 3.3.10, CPython 3.10.0, NumPy 1.21.3, SciPy 1.7.1, Gym 0.21.0, LLVM 13.0.0, Leptonica 1.82.0, CUDA 11.4.2, cuDNN 8.2.4, NCCL 2.11.4, PyTorch 1.10.0, TensorFlow Lite 2.6.0, ALE 0.7.2, DepthAI 2.11.1, ONNX 1.10.2, ONNX Runtime 1.9.1, and their dependencies

### August 2, 2021 version 1.5.6
* Change `opencv_core.Mat` constructors to create column vectors out of arrays for consistency ([issue #1064](https://github.com/bytedeco/javacpp-presets/issues/1064))
Expand Down
2 changes: 1 addition & 1 deletion arrow/cppbuild.sh
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ if [[ $PLATFORM == windows* ]]; then
fi

LLVM_VERSION=13.0.0
OPENSSL_VERSION=1.1.1k
OPENSSL_VERSION=1.1.1l
ZLIB_VERSION=1.2.11
PROTO_VERSION=3.13.0
ARROW_VERSION=5.0.0
Expand Down
2 changes: 1 addition & 1 deletion cpython/cppbuild.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ if [[ -z "$PLATFORM" ]]; then
exit
fi

OPENSSL=openssl-1.1.1k
OPENSSL=openssl-1.1.1l
CPYTHON_VERSION=3.10.0
download https://www.openssl.org/source/$OPENSSL.tar.gz $OPENSSL.tar.gz
download https://www.python.org/ftp/python/$CPYTHON_VERSION/Python-$CPYTHON_VERSION.tgz Python-$CPYTHON_VERSION.tgz
Expand Down
2 changes: 1 addition & 1 deletion cpython/samples/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,6 @@
</dependency>
</dependencies>
<build>
<sourceDirectory>${basedir}</sourceDirectory>
<sourceDirectory>.</sourceDirectory>
</build>
</project>
8 changes: 4 additions & 4 deletions ffmpeg/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ Introduction
------------
This directory contains the JavaCPP Presets module for:

* FFmpeg 4.4 http://ffmpeg.org/
* FFmpeg 4.4.1 http://ffmpeg.org/

Please refer to the parent README.md file for more detailed information about the JavaCPP Presets.

Expand Down Expand Up @@ -38,22 +38,22 @@ We can use [Maven 3](http://maven.apache.org/) to download and install automatic
<modelVersion>4.0.0</modelVersion>
<groupId>org.bytedeco.ffmpeg</groupId>
<artifactId>readfewframe</artifactId>
<version>1.5.6</version>
<version>1.5.7-SNAPSHOT</version>
<properties>
<exec.mainClass>ReadFewFrame</exec.mainClass>
</properties>
<dependencies>
<dependency>
<groupId>org.bytedeco</groupId>
<artifactId>ffmpeg-platform</artifactId>
<version>4.4-1.5.6</version>
<version>4.4.1-1.5.7-SNAPSHOT</version>
</dependency>

<!-- Optional GPL builds with (almost) everything enabled -->
<dependency>
<groupId>org.bytedeco</groupId>
<artifactId>ffmpeg-platform-gpl</artifactId>
<version>4.4-1.5.6</version>
<version>4.4.1-1.5.7-SNAPSHOT</version>
</dependency>
</dependencies>
<build>
Expand Down
26 changes: 13 additions & 13 deletions ffmpeg/cppbuild.sh
Original file line number Diff line number Diff line change
Expand Up @@ -29,18 +29,18 @@ SPEEX=speex-1.2.0
OPUS=opus-1.3.1
OPENCORE_AMR=opencore-amr-0.1.5
VO_AMRWBENC=vo-amrwbenc-0.1.3
OPENSSL=openssl-1.1.1k
OPENSSL=openssl-1.1.1l
OPENH264_VERSION=2.1.1
X264=x264-stable
X265=3.4
VPX_VERSION=1.10.0
ALSA_VERSION=1.2.4
FREETYPE_VERSION=2.10.4
MFX_VERSION=1.34
NVCODEC_VERSION=11.0.10.0
XML2=libxml2-2.9.10
LIBSRT_VERSION=1.4.2
FFMPEG_VERSION=4.4
VPX_VERSION=1.11.0
ALSA_VERSION=1.2.5.1
FREETYPE_VERSION=2.11.0
MFX_VERSION=1.35.1
NVCODEC_VERSION=11.1.5.0
XML2=libxml2-2.9.12
LIBSRT_VERSION=1.4.4
FFMPEG_VERSION=4.4.1
download https://download.videolan.org/contrib/nasm/nasm-$NASM_VERSION.tar.gz nasm-$NASM_VERSION.tar.gz
download http://zlib.net/$ZLIB.tar.gz $ZLIB.tar.gz
download http://downloads.sourceforge.net/project/lame/lame/3.100/$LAME.tar.gz $LAME.tar.gz
Expand Down Expand Up @@ -227,7 +227,7 @@ EOF
make install
cd ../ffmpeg-$FFMPEG_VERSION
sedinplace 's/unsigned long int/unsigned int/g' libavdevice/v4l2.c
LDEXEFLAGS='-Wl,-rpath,\$$ORIGIN/' ./configure --prefix=.. $DISABLE $ENABLE --enable-jni --enable-mediacodec --enable-pthreads --enable-cross-compile --cross-prefix="$ANDROID_PREFIX-" --ar="$AR" --ranlib="$RANLIB" --cc="$CC" --strip="$STRIP" --sysroot="$ANDROID_ROOT" --target-os=android --arch=arm --extra-cflags="-I../include/ -I../include/libxml2 $ANDROID_FLAGS" --extra-ldflags="-L../lib/ $ANDROID_FLAGS" --extra-libs="$ANDROID_LIBS -lz" --disable-symver
LDEXEFLAGS='-Wl,-rpath,\$$ORIGIN/' ./configure --prefix=.. $DISABLE $ENABLE --enable-jni --enable-mediacodec --enable-pthreads --enable-cross-compile --cross-prefix="$ANDROID_PREFIX-" --ar="$AR" --ranlib="$RANLIB" --cc="$CC" --strip="$STRIP" --sysroot="$ANDROID_ROOT" --target-os=android --arch=arm --extra-cflags="-I../include/ -I../include/libxml2 $ANDROID_FLAGS" --extra-ldflags="-L../lib/ $ANDROID_FLAGS" --extra-libs="$ANDROID_LIBS -lz -latomic" --disable-symver
make -j $MAKEJ
make install
;;
Expand Down Expand Up @@ -354,7 +354,7 @@ EOF
make install
cd ../ffmpeg-$FFMPEG_VERSION
sedinplace 's/unsigned long int/unsigned int/g' libavdevice/v4l2.c
LDEXEFLAGS='-Wl,-rpath,\$$ORIGIN/' ./configure --prefix=.. $DISABLE $ENABLE --enable-jni --enable-mediacodec --enable-pthreads --enable-cross-compile --cross-prefix="$ANDROID_PREFIX-" --ar="$AR" --ranlib="$RANLIB" --cc="$CC" --strip="$STRIP" --sysroot="$ANDROID_ROOT" --target-os=android --arch=aarch64 --extra-cflags="-I../include/ -I../include/libxml2 $ANDROID_FLAGS" --extra-ldflags="-L../lib/ $ANDROID_FLAGS" --extra-libs="$ANDROID_LIBS -lz" --disable-symver
LDEXEFLAGS='-Wl,-rpath,\$$ORIGIN/' ./configure --prefix=.. $DISABLE $ENABLE --enable-jni --enable-mediacodec --enable-pthreads --enable-cross-compile --cross-prefix="$ANDROID_PREFIX-" --ar="$AR" --ranlib="$RANLIB" --cc="$CC" --strip="$STRIP" --sysroot="$ANDROID_ROOT" --target-os=android --arch=aarch64 --extra-cflags="-I../include/ -I../include/libxml2 $ANDROID_FLAGS" --extra-ldflags="-L../lib/ $ANDROID_FLAGS" --extra-libs="$ANDROID_LIBS -lz -latomic" --disable-symver
make -j $MAKEJ
make install
;;
Expand Down Expand Up @@ -478,7 +478,7 @@ EOF
make install
cd ../ffmpeg-$FFMPEG_VERSION
sedinplace 's/unsigned long int/unsigned int/g' libavdevice/v4l2.c
LDEXEFLAGS='-Wl,-rpath,\$$ORIGIN/' ./configure --prefix=.. $DISABLE $ENABLE --enable-jni --enable-mediacodec --enable-pthreads --enable-cross-compile --cross-prefix="$ANDROID_PREFIX-" --ar="$AR" --ranlib="$RANLIB" --cc="$CC" --strip="$STRIP" --sysroot="$ANDROID_ROOT" --target-os=android --arch=atom --extra-cflags="-I../include/ -I../include/libxml2 $ANDROID_FLAGS" --extra-ldflags="-L../lib/ $ANDROID_FLAGS" --extra-libs="$ANDROID_LIBS -lz" --disable-symver
LDEXEFLAGS='-Wl,-rpath,\$$ORIGIN/' ./configure --prefix=.. $DISABLE $ENABLE --enable-jni --enable-mediacodec --enable-pthreads --enable-cross-compile --cross-prefix="$ANDROID_PREFIX-" --ar="$AR" --ranlib="$RANLIB" --cc="$CC" --strip="$STRIP" --sysroot="$ANDROID_ROOT" --target-os=android --arch=atom --extra-cflags="-I../include/ -I../include/libxml2 $ANDROID_FLAGS" --extra-ldflags="-L../lib/ $ANDROID_FLAGS" --extra-libs="$ANDROID_LIBS -lz -latomic" --disable-symver
make -j $MAKEJ
make install
;;
Expand Down Expand Up @@ -601,7 +601,7 @@ EOF
make install
cd ../ffmpeg-$FFMPEG_VERSION
sedinplace 's/unsigned long int/unsigned int/g' libavdevice/v4l2.c
LDEXEFLAGS='-Wl,-rpath,\$$ORIGIN/' ./configure --prefix=.. $DISABLE $ENABLE --enable-jni --enable-mediacodec --enable-pthreads --enable-cross-compile --cross-prefix="$ANDROID_PREFIX-" --ar="$AR" --ranlib="$RANLIB" --cc="$CC" --strip="$STRIP" --sysroot="$ANDROID_ROOT" --target-os=android --arch=atom --extra-cflags="-I../include/ -I../include/libxml2 $ANDROID_FLAGS" --extra-ldflags="-L../lib/ $ANDROID_FLAGS" --extra-libs="$ANDROID_LIBS -lz" --disable-symver
LDEXEFLAGS='-Wl,-rpath,\$$ORIGIN/' ./configure --prefix=.. $DISABLE $ENABLE --enable-jni --enable-mediacodec --enable-pthreads --enable-cross-compile --cross-prefix="$ANDROID_PREFIX-" --ar="$AR" --ranlib="$RANLIB" --cc="$CC" --strip="$STRIP" --sysroot="$ANDROID_ROOT" --target-os=android --arch=atom --extra-cflags="-I../include/ -I../include/libxml2 $ANDROID_FLAGS" --extra-ldflags="-L../lib/ $ANDROID_FLAGS" --extra-libs="$ANDROID_LIBS -lz -latomic" --disable-symver
make -j $MAKEJ
make install
;;
Expand Down
124 changes: 90 additions & 34 deletions ffmpeg/openssl-android.patch
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
diff -ruN openssl-1.1.1b/Configurations/15-android.conf openssl-1.1.1b-android/Configurations/15-android.conf
--- openssl-1.1.1b/Configurations/15-android.conf 2019-02-26 23:15:30.000000000 +0900
+++ openssl-1.1.1b-android/Configurations/15-android.conf 2019-03-24 22:36:52.544514506 +0900
@@ -22,20 +22,9 @@
diff -ruN openssl-1.1.1l/Configurations/15-android.conf openssl-1.1.1l-android/Configurations/15-android.conf
--- openssl-1.1.1l/Configurations/15-android.conf 2021-08-24 22:38:47.000000000 +0900
+++ openssl-1.1.1l-android/Configurations/15-android.conf 2021-10-30 18:23:15.840592056 +0900
@@ -22,25 +22,14 @@
return $android_ndk = { bn_ops => "BN_AUTO" };
}

Expand All @@ -12,11 +12,11 @@ diff -ruN openssl-1.1.1b/Configurations/15-android.conf openssl-1.1.1b-android/C
- $ndk = $ENV{$ndk_var};
- last if defined $ndk;
- }
- die "\$ANDROID_NDK_HOME is not defined" if (!$ndk);
- if (!-d "$ndk/platforms" && !-f "$ndk/AndroidVersion.txt") {
- # $ndk/platforms is traditional "all-inclusive" NDK, while
- # $ndk/AndroidVersion.txt is so-called standalone toolchain
- # tailored for specific target down to API level.
- die "\$ANDROID_NDK_HOME is not defined" if (!$ndk);
- my $is_standalone_toolchain = -f "$ndk/AndroidVersion.txt";
- my $ndk_src_props = "$ndk/source.properties";
- my $is_ndk = -f $ndk_src_props;
- if ($is_ndk == $is_standalone_toolchain) {
- die "\$ANDROID_NDK_HOME=$ndk is invalid";
- }
+ my $ndk = $ENV{ANDROID_NDK};
Expand All @@ -25,6 +25,12 @@ diff -ruN openssl-1.1.1b/Configurations/15-android.conf openssl-1.1.1b-android/C
$ndk = canonpath($ndk);

my $ndkver = undef;

- if (open my $fh, "<$ndk_src_props") {
+ if (open my $fh, "<$ndk/source.properties") {
local $_;
while(<$fh>) {
if (m|Pkg\.Revision\s*=\s*([0-9]+)|) {
@@ -51,18 +40,10 @@
close $fh;
}
Expand All @@ -38,7 +44,7 @@ diff -ruN openssl-1.1.1b/Configurations/15-android.conf openssl-1.1.1b-android/C
- if ($sysroot = $ENV{CROSS_SYSROOT}) {
- $sysroot =~ m|/android-([0-9]+)/arch-(\w+)/?$|;
- ($api, $arch) = ($1, $2);
- } elsif (-f "$ndk/AndroidVersion.txt") {
- } elsif ($is_standalone_toolchain) {
- $sysroot = "$ndk/sysroot";
- } else {
- $api = "*";
Expand All @@ -47,21 +53,48 @@ diff -ruN openssl-1.1.1b/Configurations/15-android.conf openssl-1.1.1b-android/C

# see if user passed -D__ANDROID_API__=N
foreach (@{$useradd{CPPDEFINES}}, @{$user{CPPFLAGS}}) {
@@ -78,17 +59,19 @@
} glob("$ndk/platforms/android-$api");
die "no $ndk/platforms/android-$api" if ($#platforms < 0);
@@ -72,69 +53,36 @@
}
}

- $sysroot = "@platforms[$#platforms]/arch-$arch";
- $sysroot =~ m|/android-([0-9]+)/arch-$arch|;
- $api = $1;
- if (-d "$ndk/platforms") {
- # list available platforms (numerically)
- my @platforms = sort { $a =~ m/-([0-9]+)$/; my $aa = $1;
- $b =~ m/-([0-9]+)$/; $aa <=> $1;
- } glob("$ndk/platforms/android-$api");
- die "no $ndk/platforms/android-$api" if ($#platforms < 0);
-
- $sysroot = "@platforms[$#platforms]/arch-$arch";
- $sysroot =~ m|/android-([0-9]+)/arch-$arch|;
- $api = $1;
- } elsif ($api eq "*") {
- # r22 Removed platforms dir, use this JSON file
- my $path = "$ndk/meta/platforms.json";
- open my $fh, $path or die "Could not open '$path' $!";
- while (<$fh>) {
- if (/"max": (\d+),/) {
- $api = $1;
- last;
- }
- }
- close $fh;
- }
- die "Could not get default API Level" if ($api eq "*");
+ # list available platforms (numerically)
+ my @platforms = sort { $a =~ m/-([0-9]+)$/; my $aa = $1;
+ $b =~ m/-([0-9]+)$/; $aa <=> $1;
+ } glob("$ndk/platforms/android-$api");
+ die "no $ndk/platforms/android-$api" if ($#platforms < 0);
+
+ $config{target} =~ m|[^-]+-([^-]+)$|; # split on dash
+ $sysroot = "@platforms[$#platforms]/arch-$1";
}
die "no sysroot=$sysroot" if (!-d $sysroot);

- die "no sysroot=$sysroot" if (length $sysroot && !-d $sysroot);
+ die "no sysroot=$sysroot" if (!-d $sysroot);
+
+ $sysroot =~ m|/android-([0-9]+)/arch-(\w+)/?$|;
+ my ($api, $arch) = ($1, $2);
+
my $triarch = $triplet{$arch};
my $cflags;
my $cppflags;
Expand All @@ -71,21 +104,28 @@ diff -ruN openssl-1.1.1b/Configurations/15-android.conf openssl-1.1.1b-android/C
if (which("clang") =~ m|^$ndk/.*/prebuilt/([^/]+)/|) {
my $host=$1;
# harmonize with gcc default
@@ -96,27 +79,10 @@
my $arm = $ndkver > 16 ? "armv7a" : "armv5te";
(my $tridefault = $triarch) =~ s/^arm-/$arm-/;
(my $tritools = $triarch) =~ s/(?:x|i6)86(_64)?-.*/x86$1/;
$cflags .= " -target $tridefault "
- . "-gcc-toolchain \$($ndk_var)/toolchains"
- if (length $sysroot) {
- $cflags .= " -target $tridefault "
- . "-gcc-toolchain \$($ndk_var)/toolchains"
- . "/$tritools-4.9/prebuilt/$host";
- $user{CC} = "clang" if ($user{CC} !~ m|clang|);
- } else {
- $user{CC} = "$tridefault$api-clang";
- }
+ $cflags .= " -target $tridefault "
+ . "-gcc-toolchain \$(ANDROID_NDK)/toolchains"
. "/$tritools-4.9/prebuilt/$host";
$user{CC} = "clang" if ($user{CC} !~ m|clang|);
+ . "/$tritools-4.9/prebuilt/$host";
+ $user{CC} = "clang" if ($user{CC} !~ m|clang|);
$user{CROSS_COMPILE} = undef;
- if (which("llvm-ar") =~ m|^$ndk/.*/prebuilt/([^/]+)/|) {
- $user{AR} = "llvm-ar";
- $user{ARFLAGS} = [ "rs" ];
- $user{RANLIB} = ":";
- }
- } elsif (-f "$ndk/AndroidVersion.txt") { #"standalone toolchain"
- } elsif ($is_standalone_toolchain) {
- my $cc = $user{CC} // "clang";
- # One can probably argue that both clang and gcc should be
- # probed, but support for "standalone toolchain" was added
Expand All @@ -100,19 +140,35 @@ diff -ruN openssl-1.1.1b/Configurations/15-android.conf openssl-1.1.1b-android/C
} elsif ($user{CC} eq "clang") {
die "no NDK clang on \$PATH";
} else {
@@ -133,13 +99,13 @@
die "no $incroot/$triarch" if (!-d "$incroot/$triarch");
$incroot =~ s|^$ndk/||;
$cppflags = "-D__ANDROID_API__=$api";
- $cppflags .= " -isystem \$($ndk_var)/$incroot/$triarch";
- $cppflags .= " -isystem \$($ndk_var)/$incroot";
@@ -145,21 +93,19 @@
$user{CROSS_COMPILE} = "$triarch-";
}

- if (length $sysroot) {
- if (!-d "$sysroot/usr/include") {
- my $incroot = "$ndk/sysroot/usr/include";
- die "no $incroot" if (!-d $incroot);
- die "no $incroot/$triarch" if (!-d "$incroot/$triarch");
- $incroot =~ s|^$ndk/||;
- $cppflags = "-D__ANDROID_API__=$api";
- $cppflags .= " -isystem \$($ndk_var)/$incroot/$triarch";
- $cppflags .= " -isystem \$($ndk_var)/$incroot";
- }
- $sysroot =~ s|^$ndk/||;
- $sysroot = " --sysroot=\$($ndk_var)/$sysroot";
+ if (!-d "$sysroot/usr/include") {
+ my $incroot = "$ndk/sysroot/usr/include";
+ die "no $incroot" if (!-d $incroot);
+ die "no $incroot/$triarch" if (!-d "$incroot/$triarch");
+ $incroot =~ s|^$ndk/||;
+ $cppflags = "-D__ANDROID_API__=$api";
+ $cppflags .= " -isystem \$(ANDROID_NDK)/$incroot/$triarch";
+ $cppflags .= " -isystem \$(ANDROID_NDK)/$incroot";
}
$sysroot =~ s|^$ndk/||;
+
+ $sysroot =~ s|^$ndk/||;
$android_ndk = {
- cflags => "$cflags --sysroot=\$($ndk_var)/$sysroot",
- cflags => $cflags . $sysroot,
+ cflags => "$cflags --sysroot=\$(ANDROID_NDK)/$sysroot",
cppflags => $cppflags,
bn_ops => $arch =~ m/64$/ ? "SIXTY_FOUR_BIT_LONG"
Expand Down
2 changes: 1 addition & 1 deletion ffmpeg/platform/gpl/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

<groupId>org.bytedeco</groupId>
<artifactId>ffmpeg-platform-gpl</artifactId>
<version>4.4-${project.parent.version}</version>
<version>4.4.1-${project.parent.version}</version>
<name>JavaCPP Presets Platform for FFmpeg (GPL enabled)</name>

<properties>
Expand Down
2 changes: 1 addition & 1 deletion ffmpeg/platform/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

<groupId>org.bytedeco</groupId>
<artifactId>ffmpeg-platform</artifactId>
<version>4.4-${project.parent.version}</version>
<version>4.4.1-${project.parent.version}</version>
<name>JavaCPP Presets Platform for FFmpeg</name>

<properties>
Expand Down
2 changes: 1 addition & 1 deletion ffmpeg/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

<groupId>org.bytedeco</groupId>
<artifactId>ffmpeg</artifactId>
<version>4.4-${project.parent.version}</version>
<version>4.4.1-${project.parent.version}</version>
<name>JavaCPP Presets for FFmpeg</name>

<dependencies>
Expand Down
6 changes: 3 additions & 3 deletions ffmpeg/samples/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.bytedeco.ffmpeg</groupId>
<artifactId>readfewframe</artifactId>
<version>1.5.6</version>
<version>1.5.7-SNAPSHOT</version>
<properties>
<exec.mainClass>ReadFewFrame</exec.mainClass>
<maven.compiler.source>1.7</maven.compiler.source>
Expand All @@ -12,14 +12,14 @@
<dependency>
<groupId>org.bytedeco</groupId>
<artifactId>ffmpeg-platform</artifactId>
<version>4.4-1.5.6</version>
<version>4.4.1-1.5.7-SNAPSHOT</version>
</dependency>

<!-- Optional GPL builds with (almost) everything enabled -->
<dependency>
<groupId>org.bytedeco</groupId>
<artifactId>ffmpeg-platform-gpl</artifactId>
<version>4.4-1.5.6</version>
<version>4.4.1-1.5.7-SNAPSHOT</version>
</dependency>
</dependencies>
<build>
Expand Down
Loading

0 comments on commit fbe1e52

Please sign in to comment.