File tree Expand file tree Collapse file tree 6 files changed +17
-17
lines changed Expand file tree Collapse file tree 6 files changed +17
-17
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:20231225
44+ DOCKER_IMAGE : quay.io/opencv-ci/opencv-python-manylinux2014-x86-64:20240524
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:20231225
142+ DOCKER_IMAGE : quay.io/opencv-ci/opencv-python-manylinux2014-x86-64:20240524
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:20231225
45+ DOCKER_IMAGE : quay.io/opencv-ci/opencv-python-manylinux2014-aarch64:20240524
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: 20231225
1+ # Version: 20240524
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
77ARG FFMPEG_VERSION=5.1.4
88ARG FREETYPE_VERSION=2.13.2
9- ARG LIBPNG_VERSION=1.6.40
10- ARG VPX_VERSION=v1.13.1
9+ ARG LIBPNG_VERSION=1.6.43
10+ ARG VPX_VERSION=v1.14.0
1111ARG NASM_VERSION=2.15.04
1212ARG OPENSSL_VERSION=1_1_1w
13- ARG QT_VERSION=5.15.0
13+ ARG QT_VERSION=5.15.13
1414ARG YASM_VERSION=1.3.0
1515
1616ENV LD_LIBRARY_PATH /usr/local/lib:$LD_LIBRARY_PATH
@@ -46,8 +46,8 @@ RUN mkdir ~/freetype_sources && \
4646 cd .. && \
4747 rm -rf ~/freetype_sources
4848
49- RUN curl -C - -O -L https://download.qt.io/official_releases /qt/5.15/${QT_VERSION}/single/qt-everywhere-src-${QT_VERSION}.tar.xz && \
50- tar -xf qt-everywhere-src-${QT_VERSION}.tar.xz && \
49+ RUN curl -C - -O -L https://download.qt.io/archive /qt/5.15/${QT_VERSION}/single/qt-everywhere-opensource -src-${QT_VERSION}.tar.xz && \
50+ tar -xf qt-everywhere-opensource- src-${QT_VERSION}.tar.xz && \
5151 cd qt-everywhere-src-${QT_VERSION} && \
5252 export MAKEFLAGS=-j$(nproc) && \
5353 ./configure -prefix /opt/Qt${QT_VERSION} -release -opensource -confirm-license -qtnamespace QtOpenCVPython -xcb -xcb-xlib -bundled-xcb-xinput -no-openssl -no-dbus -skip qt3d -skip qtactiveqt -skip qtcanvas3d -skip qtconnectivity -skip qtdatavis3d -skip qtdoc -skip qtgamepad -skip qtgraphicaleffects -skip qtimageformats -skip qtlocation -skip qtmultimedia -skip qtpurchasing -skip qtqa -skip qtremoteobjects -skip qtrepotools -skip qtscript -skip qtscxml -skip qtsensors -skip qtserialbus -skip qtserialport -skip qtspeech -skip qttranslations -skip qtwayland -skip qtwebchannel -skip qtwebengine -skip qtwebsockets -skip qtwebview -skip xmlpatterns -skip declarative -make libs && \
Original file line number Diff line number Diff line change 1- # Version: 20231225
1+ # Version: 20240524
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
77ARG FFMPEG_VERSION=5.1.4
88ARG FREETYPE_VERSION=2.13.2
9- ARG LIBPNG_VERSION=1.6.40
10- ARG VPX_VERSION=v1.13.1
9+ ARG LIBPNG_VERSION=1.6.43
10+ ARG VPX_VERSION=v1.14.0
1111ARG NASM_VERSION=2.15.04
1212ARG OPENSSL_VERSION=1_1_1w
13- ARG QT_VERSION=5.15.0
13+ ARG QT_VERSION=5.15.13
1414ARG YASM_VERSION=1.3.0
1515
1616ENV LD_LIBRARY_PATH /usr/local/lib:$LD_LIBRARY_PATH
@@ -45,8 +45,8 @@ RUN mkdir ~/freetype_sources && \
4545 cd .. && \
4646 rm -rf ~/freetype_sources
4747
48- RUN curl -O -L https://download.qt.io/official_releases /qt/5.15/${QT_VERSION}/single/qt-everywhere-src-${QT_VERSION}.tar.xz && \
49- tar -xf qt-everywhere-src-${QT_VERSION}.tar.xz && \
48+ RUN curl -O -L https://download.qt.io/archive /qt/5.15/${QT_VERSION}/single/qt-everywhere-opensource -src-${QT_VERSION}.tar.xz && \
49+ tar -xf qt-everywhere-opensource- src-${QT_VERSION}.tar.xz && \
5050 cd qt-everywhere-src-${QT_VERSION} && \
5151 export MAKEFLAGS=-j$(nproc) && \
5252 ./configure -prefix /opt/Qt${QT_VERSION} -release -opensource -confirm-license -qtnamespace QtOpenCVPython -xcb -xcb-xlib -bundled-xcb-xinput -no-openssl -no-dbus -skip qt3d -skip qtactiveqt -skip qtcanvas3d -skip qtconnectivity -skip qtdatavis3d -skip qtdoc -skip qtgamepad -skip qtgraphicaleffects -skip qtimageformats -skip qtlocation -skip qtmultimedia -skip qtpurchasing -skip qtqa -skip qtremoteobjects -skip qtrepotools -skip qtscript -skip qtscxml -skip qtsensors -skip qtserialbus -skip qtserialport -skip qtspeech -skip qttranslations -skip qtwayland -skip qtwebchannel -skip qtwebengine -skip qtwebsockets -skip qtwebview -skip xmlpatterns -skip declarative -make libs && \
Original file line number Diff line number Diff line change @@ -9,7 +9,7 @@ index 4c0b3880fc..dffa0a4caa 100644
99+ install(DIRECTORY ${Qt5_DIR}/../../../plugins DESTINATION lib/qt)
1010+ endif()
1111+ if(UNIX AND NOT APPLE)
12- + install(DIRECTORY /opt/Qt5.15.0 /plugins DESTINATION lib/qt)
12+ + install(DIRECTORY /opt/Qt5.15.13 /plugins DESTINATION lib/qt)
1313+ install(DIRECTORY /usr/share/fonts DESTINATION lib/qt)
1414+ endif()
1515 if(HAVE_QT_OPENGL)
Original file line number Diff line number Diff line change @@ -34,7 +34,7 @@ if [ -n "$IS_OSX" ]; then
3434 export MAKEFLAGS=" -j$( sysctl -n hw.ncpu) "
3535else
3636 echo " > Linux environment "
37- export LD_LIBRARY_PATH=$LD_LIBRARY_PATH :/opt/Qt5.15.0 /lib
37+ export LD_LIBRARY_PATH=$LD_LIBRARY_PATH :/opt/Qt5.15.13 /lib
3838 export MAKEFLAGS=" -j$( grep -E ' ^processor[[:space:]]*:' /proc/cpuinfo | wc -l) "
3939 CURRENT_ARCH=$( uname -m)
4040 if [[ $CURRENT_ARCH == ' aarch64' ]]; then
You can’t perform that action at this time.
0 commit comments