Merge pull request #932 from asmorkalov/as/pre-4.9.0_linux_upgrade

Linux environment update for release 4.9.0
opencv · Dec 26, 2023 · ea3538a · ea3538a
2 parents c886152 + f5c47b3
commit ea3538a
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 11 deletions.
diff --git 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:20231006
+      DOCKER_IMAGE: quay.io/opencv-ci/opencv-python-manylinux2014-x86-64:20231225
       USE_CCACHE: 0
       UNICODE_WIDTH: 32
       PLAT: x86_64
@@ -139,7 +139,7 @@ jobs:
       NP_TEST_DEP: numpy==1.19.4
       TRAVIS_BUILD_DIR: ${{ github.workspace }}
       CONFIG_PATH: travis_config.sh
-      DOCKER_IMAGE: quay.io/opencv-ci/opencv-python-manylinux2014-x86-64:20231006
+      DOCKER_IMAGE: quay.io/opencv-ci/opencv-python-manylinux2014-x86-64:20231225
       USE_CCACHE: 1
       UNICODE_WIDTH: 32
       SDIST: ${{ matrix.build_sdist || 0 }}

diff --git 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:20231109
+      DOCKER_IMAGE: quay.io/opencv-ci/opencv-python-manylinux2014-aarch64:20231225
       USE_CCACHE: 0
       UNICODE_WIDTH: 32
       SDIST: ${{ matrix.build_sdist || 0 }}

diff --git a/docker/manylinux2014/Dockerfile_aarch64 b/docker/manylinux2014/Dockerfile_aarch64
@@ -1,12 +1,13 @@
-# Version: 20231006
+# Version: 20231225
 # Image name: quay.io/opencv-ci/opencv-python-manylinux2014-aarch64
 
 FROM quay.io/pypa/manylinux2014_aarch64:latest
 
 ARG CCACHE_VERSION=3.7.9
-ARG FFMPEG_VERSION=5.1.3
+ARG FFMPEG_VERSION=5.1.4
 ARG FREETYPE_VERSION=2.13.2
 ARG LIBPNG_VERSION=1.6.40
+ARG VPX_VERSION=v1.13.1
 ARG NASM_VERSION=2.15.04
 ARG OPENSSL_VERSION=1_1_1w
 ARG QT_VERSION=5.15.0
@@ -93,7 +94,7 @@ RUN mkdir ~/yasm_sources && \
 
 RUN mkdir ~/libvpx_sources && \
     cd ~/libvpx_sources && \
-    git clone --depth 1 https://github.com/webmproject/libvpx.git && \
+    git clone --depth 1 -b ${VPX_VERSION} https://github.com/webmproject/libvpx.git && \
     cd libvpx && \
     ./configure --prefix="/ffmpeg_build" --disable-examples --disable-unit-tests --enable-vp9-highbitdepth --as=yasm --enable-pic --enable-shared && \
     make -j$(getconf _NPROCESSORS_ONLN) && \

diff --git a/docker/manylinux2014/Dockerfile_i686 b/docker/manylinux2014/Dockerfile_i686
@@ -2,9 +2,9 @@ FROM quay.io/pypa/manylinux2014_i686:latest
 
 ARG CCACHE_VERSION=3.7.9
 ARG CMAKE_VERSION=3.17.0
-ARG FFMPEG_VERSION=5.1.2
+ARG FFMPEG_VERSION=5.1.4
 ARG NASM_VERSION=2.15.04
-ARG OPENSSL_VERSION=1_1_1s
+ARG OPENSSL_VERSION=1_1_1w
 ARG QT_VERSION=5.15.0
 ARG YASM_VERSION=1.3.0
 

diff --git a/docker/manylinux2014/Dockerfile_x86_64 b/docker/manylinux2014/Dockerfile_x86_64
@@ -1,12 +1,13 @@
-# Version: 20231109
+# Version: 20231225
 # Image name: quay.io/opencv-ci/opencv-python-manylinux2014-x86-64
 
 FROM quay.io/pypa/manylinux2014_x86_64:latest
 
 ARG CCACHE_VERSION=3.7.9
-ARG FFMPEG_VERSION=5.1.3
+ARG FFMPEG_VERSION=5.1.4
 ARG FREETYPE_VERSION=2.13.2
 ARG LIBPNG_VERSION=1.6.40
+ARG VPX_VERSION=v1.13.1
 ARG NASM_VERSION=2.15.04
 ARG OPENSSL_VERSION=1_1_1w
 ARG QT_VERSION=5.15.0
@@ -92,7 +93,7 @@ RUN mkdir ~/yasm_sources && \
 
 RUN mkdir ~/libvpx_sources && \
     cd ~/libvpx_sources && \
-    git clone --depth 1 https://chromium.googlesource.com/webm/libvpx.git && \
+    git clone --depth 1 -b ${VPX_VERSION} https://chromium.googlesource.com/webm/libvpx.git && \
     cd libvpx && \
     ./configure --prefix="/ffmpeg_build" --disable-examples --disable-unit-tests --enable-vp9-highbitdepth --as=yasm --enable-pic --enable-shared && \
     make -j$(getconf _NPROCESSORS_ONLN) && \