Skip to content

Commit b7a1da7

Browse files
authored
Merge pull request opencv#751 from asmorkalov/as/dependencies_update
OpenCV dependnecies update.
2 parents 3725898 + f6be1c8 commit b7a1da7

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

docker/manylinux2014/Dockerfile_aarch64

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44
FROM quay.io/pypa/manylinux2014_aarch64:latest
55

66
ARG CCACHE_VERSION=3.7.9
7-
ARG FFMPEG_VERSION=4.4.1
7+
ARG FFMPEG_VERSION=5.1.2
88
ARG FREETYPE_VERSION=2.12.1
99
ARG LIBPNG_VERSION=1.6.37
1010
ARG NASM_VERSION=2.15.04
11-
ARG OPENSSL_VERSION=1_1_1o
11+
ARG OPENSSL_VERSION=1_1_1s
1212
ARG QT_VERSION=5.15.0
1313
ARG YASM_VERSION=1.3.0
1414
ARG ZLIB_VERSION=1.2.12

docker/manylinux2014/Dockerfile_i686

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ FROM quay.io/pypa/manylinux2014_i686:latest
22

33
ARG CCACHE_VERSION=3.7.9
44
ARG CMAKE_VERSION=3.17.0
5-
ARG FFMPEG_VERSION=4.4.1
5+
ARG FFMPEG_VERSION=5.1.2
66
ARG NASM_VERSION=2.15.04
7-
ARG OPENSSL_VERSION=1_1_1m
7+
ARG OPENSSL_VERSION=1_1_1s
88
ARG QT_VERSION=5.15.0
99
ARG YASM_VERSION=1.3.0
1010

docker/manylinux2014/Dockerfile_x86_64

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44
FROM quay.io/pypa/manylinux2014_x86_64:latest
55

66
ARG CCACHE_VERSION=3.7.9
7-
ARG FFMPEG_VERSION=4.4.1
7+
ARG FFMPEG_VERSION=5.1.2
88
ARG FREETYPE_VERSION=2.12.1
99
ARG LIBPNG_VERSION=1.6.37
1010
ARG NASM_VERSION=2.15.04
11-
ARG OPENSSL_VERSION=1_1_1o
11+
ARG OPENSSL_VERSION=1_1_1s
1212
ARG QT_VERSION=5.15.0
1313
ARG YASM_VERSION=1.3.0
1414
ARG ZLIB_VERSION=1.2.12

0 commit comments

Comments
 (0)