diff --git a/.github/workflows/build_wheels_linux.yml b/.github/workflows/build_wheels_linux.yml index ab377325521b43e96f07cedcf4a3790d477d53a0..ce656ac0858281fe2faf4c54704d58c2615b250a 100644 --- a/.github/workflows/build_wheels_linux.yml +++ b/.github/workflows/build_wheels_linux.yml @@ -41,7 +41,7 @@ jobs: MB_ML_VER: 2014 TRAVIS_BUILD_DIR: ${{ github.workspace }} CONFIG_PATH: travis_config.sh - DOCKER_IMAGE: quay.io/opencv-ci/opencv-python-manylinux2014-x86-64:20220824 + DOCKER_IMAGE: quay.io/opencv-ci/opencv-python-manylinux2014-x86-64:20221205 USE_CCACHE: 0 UNICODE_WIDTH: 32 PLAT: x86_64 diff --git a/.github/workflows/build_wheels_linux_arm.yml b/.github/workflows/build_wheels_linux_arm.yml index 079efbe10bd226a967f60820b3763fbb51fc8f30..3f62a213451b3a398b8242628e9bab23f1fd877b 100644 --- a/.github/workflows/build_wheels_linux_arm.yml +++ b/.github/workflows/build_wheels_linux_arm.yml @@ -42,7 +42,7 @@ jobs: MB_ML_VER: 2014 TRAVIS_BUILD_DIR: ${{ github.workspace }} CONFIG_PATH: travis_config.sh - DOCKER_IMAGE: quay.io/opencv-ci/opencv-python-manylinux2014-aarch64:20220824 + DOCKER_IMAGE: quay.io/opencv-ci/opencv-python-manylinux2014-aarch64:20221205 USE_CCACHE: 0 UNICODE_WIDTH: 32 SDIST: ${{ matrix.build_sdist || 0 }} diff --git a/.github/workflows/build_wheels_macos.yml b/.github/workflows/build_wheels_macos.yml index 584520b2ca63fe8b1e06129aae08feae086ee94f..579002cf946c0fee7aed857d20f85bd104372904 100644 --- a/.github/workflows/build_wheels_macos.yml +++ b/.github/workflows/build_wheels_macos.yml @@ -45,7 +45,7 @@ jobs: USE_CCACHE: 1 UNICODE_WIDTH: 32 PLAT: x86_64 - FFMPEG_FORMULA_VERSION: '@4' + FFMPEG_FORMULA_VERSION: '@5' SDIST: ${{ matrix.build_sdist || 0 }} ENABLE_HEADLESS: ${{ matrix.without_gui }} ENABLE_CONTRIB: ${{ matrix.with_contrib }} diff --git a/docker/manylinux2014/Dockerfile_aarch64 b/docker/manylinux2014/Dockerfile_aarch64 index 38a7764da968ae19a26ae1a330bdfd4da074fbd3..7e02bd602a9db0ea30fa5b430779bd4b5126ac16 100644 --- a/docker/manylinux2014/Dockerfile_aarch64 +++ b/docker/manylinux2014/Dockerfile_aarch64 @@ -1,4 +1,4 @@ -# Version: 20220824 +# Version: 20221205 # Image name: quay.io/opencv-ci/opencv-python-manylinux2014-aarch64 FROM quay.io/pypa/manylinux2014_aarch64:latest @@ -11,7 +11,7 @@ ARG NASM_VERSION=2.15.04 ARG OPENSSL_VERSION=1_1_1s ARG QT_VERSION=5.15.0 ARG YASM_VERSION=1.3.0 -ARG ZLIB_VERSION=1.2.12 +ARG ZLIB_VERSION=1.2.13 ENV LD_LIBRARY_PATH /usr/local/lib:$LD_LIBRARY_PATH diff --git a/docker/manylinux2014/Dockerfile_x86_64 b/docker/manylinux2014/Dockerfile_x86_64 index 1302e8aa7e370b1436f9d970e43905a58a1b1faf..a6e6b5cc1380ae878ea846565d1aedf8b34218ba 100644 --- a/docker/manylinux2014/Dockerfile_x86_64 +++ b/docker/manylinux2014/Dockerfile_x86_64 @@ -1,4 +1,4 @@ -# Version: 20220824 +# Version: 20221205 # Image name: quay.io/opencv-ci/opencv-python-manylinux2014-x86-64 FROM quay.io/pypa/manylinux2014_x86_64:latest @@ -11,7 +11,7 @@ ARG NASM_VERSION=2.15.04 ARG OPENSSL_VERSION=1_1_1s ARG QT_VERSION=5.15.0 ARG YASM_VERSION=1.3.0 -ARG ZLIB_VERSION=1.2.12 +ARG ZLIB_VERSION=1.2.13 ENV LD_LIBRARY_PATH /usr/local/lib:$LD_LIBRARY_PATH