File tree Expand file tree Collapse file tree 5 files changed +13
-11
lines changed Expand file tree Collapse file tree 5 files changed +13
-11
lines changed Original file line number Diff line number Diff line change 4141 MB_ML_VER : 2014
4242 TRAVIS_BUILD_DIR : ${{ github.workspace }}
4343 CONFIG_PATH : travis_config.sh
44- DOCKER_IMAGE : quay.io/opencv-ci/opencv-python-manylinux2014-x86-64:20231006
44+ DOCKER_IMAGE : quay.io/opencv-ci/opencv-python-manylinux2014-x86-64:20231225
4545 USE_CCACHE : 0
4646 UNICODE_WIDTH : 32
4747 PLAT : x86_64
@@ -139,7 +139,7 @@ jobs:
139139 NP_TEST_DEP : numpy==1.19.4
140140 TRAVIS_BUILD_DIR : ${{ github.workspace }}
141141 CONFIG_PATH : travis_config.sh
142- DOCKER_IMAGE : quay.io/opencv-ci/opencv-python-manylinux2014-x86-64:20231006
142+ DOCKER_IMAGE : quay.io/opencv-ci/opencv-python-manylinux2014-x86-64:20231225
143143 USE_CCACHE : 1
144144 UNICODE_WIDTH : 32
145145 SDIST : ${{ matrix.build_sdist || 0 }}
Original file line number Diff line number Diff line change 4242 MB_ML_VER : 2014
4343 TRAVIS_BUILD_DIR : ${{ github.workspace }}
4444 CONFIG_PATH : travis_config.sh
45- DOCKER_IMAGE : quay.io/opencv-ci/opencv-python-manylinux2014-aarch64:20231109
45+ DOCKER_IMAGE : quay.io/opencv-ci/opencv-python-manylinux2014-aarch64:20231225
4646 USE_CCACHE : 0
4747 UNICODE_WIDTH : 32
4848 SDIST : ${{ matrix.build_sdist || 0 }}
Original file line number Diff line number Diff line change 1- # Version: 20231006
1+ # Version: 20231225
22# Image name: quay.io/opencv-ci/opencv-python-manylinux2014-aarch64
33
44FROM quay.io/pypa/manylinux2014_aarch64:latest
55
66ARG CCACHE_VERSION=3.7.9
7- ARG FFMPEG_VERSION=5.1.3
7+ ARG FFMPEG_VERSION=5.1.4
88ARG FREETYPE_VERSION=2.13.2
99ARG LIBPNG_VERSION=1.6.40
10+ ARG VPX_VERSION=v1.13.1
1011ARG NASM_VERSION=2.15.04
1112ARG OPENSSL_VERSION=1_1_1w
1213ARG QT_VERSION=5.15.0
@@ -93,7 +94,7 @@ RUN mkdir ~/yasm_sources && \
9394
9495RUN mkdir ~/libvpx_sources && \
9596 cd ~/libvpx_sources && \
96- git clone --depth 1 https://github.com/webmproject/libvpx.git && \
97+ git clone --depth 1 -b ${VPX_VERSION} https://github.com/webmproject/libvpx.git && \
9798 cd libvpx && \
9899 ./configure --prefix="/ffmpeg_build" --disable-examples --disable-unit-tests --enable-vp9-highbitdepth --as=yasm --enable-pic --enable-shared && \
99100 make -j$(getconf _NPROCESSORS_ONLN) && \
Original file line number Diff line number Diff line change @@ -2,9 +2,9 @@ FROM quay.io/pypa/manylinux2014_i686:latest
22
33ARG CCACHE_VERSION=3.7.9
44ARG CMAKE_VERSION=3.17.0
5- ARG FFMPEG_VERSION=5.1.2
5+ ARG FFMPEG_VERSION=5.1.4
66ARG NASM_VERSION=2.15.04
7- ARG OPENSSL_VERSION=1_1_1s
7+ ARG OPENSSL_VERSION=1_1_1w
88ARG QT_VERSION=5.15.0
99ARG YASM_VERSION=1.3.0
1010
Original file line number Diff line number Diff line change 1- # Version: 20231109
1+ # Version: 20231225
22# Image name: quay.io/opencv-ci/opencv-python-manylinux2014-x86-64
33
44FROM quay.io/pypa/manylinux2014_x86_64:latest
55
66ARG CCACHE_VERSION=3.7.9
7- ARG FFMPEG_VERSION=5.1.3
7+ ARG FFMPEG_VERSION=5.1.4
88ARG FREETYPE_VERSION=2.13.2
99ARG LIBPNG_VERSION=1.6.40
10+ ARG VPX_VERSION=v1.13.1
1011ARG NASM_VERSION=2.15.04
1112ARG OPENSSL_VERSION=1_1_1w
1213ARG QT_VERSION=5.15.0
@@ -92,7 +93,7 @@ RUN mkdir ~/yasm_sources && \
9293
9394RUN mkdir ~/libvpx_sources && \
9495 cd ~/libvpx_sources && \
95- git clone --depth 1 https://chromium.googlesource.com/webm/libvpx.git && \
96+ git clone --depth 1 -b ${VPX_VERSION} https://chromium.googlesource.com/webm/libvpx.git && \
9697 cd libvpx && \
9798 ./configure --prefix="/ffmpeg_build" --disable-examples --disable-unit-tests --enable-vp9-highbitdepth --as=yasm --enable-pic --enable-shared && \
9899 make -j$(getconf _NPROCESSORS_ONLN) && \
You can’t perform that action at this time.
0 commit comments