Commitb7a1da7

authored

Merge pull request#751 from asmorkalov/as/dependencies_update

OpenCV dependnecies update.

2 parents3725898 +f6be1c8 commitb7a1da7Copy full SHA for b7a1da7

File tree

-6

lines changed

-6

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -4,11 +4,11 @@`
`4`	`4`	`FROM quay.io/pypa/manylinux2014_aarch64:latest`
`5`	`5`
`6`	`6`	`ARG CCACHE_VERSION=3.7.9`
`7`		`-ARG FFMPEG_VERSION=4.4.1`
	`7`	`+ARG FFMPEG_VERSION=5.1.2`
`8`	`8`	`ARG FREETYPE_VERSION=2.12.1`
`9`	`9`	`ARG LIBPNG_VERSION=1.6.37`
`10`	`10`	`ARG NASM_VERSION=2.15.04`
`11`		`-ARG OPENSSL_VERSION=1_1_1o`
	`11`	`+ARG OPENSSL_VERSION=1_1_1s`
`12`	`12`	`ARG QT_VERSION=5.15.0`
`13`	`13`	`ARG YASM_VERSION=1.3.0`
`14`	`14`	`ARG ZLIB_VERSION=1.2.12`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -2,9 +2,9 @@ FROM quay.io/pypa/manylinux2014_i686:latest`
`2`	`2`
`3`	`3`	`ARG CCACHE_VERSION=3.7.9`
`4`	`4`	`ARG CMAKE_VERSION=3.17.0`
`5`		`-ARG FFMPEG_VERSION=4.4.1`
	`5`	`+ARG FFMPEG_VERSION=5.1.2`
`6`	`6`	`ARG NASM_VERSION=2.15.04`
`7`		`-ARG OPENSSL_VERSION=1_1_1m`
	`7`	`+ARG OPENSSL_VERSION=1_1_1s`
`8`	`8`	`ARG QT_VERSION=5.15.0`
`9`	`9`	`ARG YASM_VERSION=1.3.0`
`10`	`10`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -4,11 +4,11 @@`
`4`	`4`	`FROM quay.io/pypa/manylinux2014_x86_64:latest`
`5`	`5`
`6`	`6`	`ARG CCACHE_VERSION=3.7.9`
`7`		`-ARG FFMPEG_VERSION=4.4.1`
	`7`	`+ARG FFMPEG_VERSION=5.1.2`
`8`	`8`	`ARG FREETYPE_VERSION=2.12.1`
`9`	`9`	`ARG LIBPNG_VERSION=1.6.37`
`10`	`10`	`ARG NASM_VERSION=2.15.04`
`11`		`-ARG OPENSSL_VERSION=1_1_1o`
	`11`	`+ARG OPENSSL_VERSION=1_1_1s`
`12`	`12`	`ARG QT_VERSION=5.15.0`
`13`	`13`	`ARG YASM_VERSION=1.3.0`
`14`	`14`	`ARG ZLIB_VERSION=1.2.12`

Comments

(0)