Skip to content

Commit a7ca41e

Browse files
authored
Merge pull request #1173 from asmorkalov:as/dependencies_update_4.13.0
Dependencies update for 4.13.0 release.
2 parents 1a2d0f6 + d098302 commit a7ca41e

File tree

7 files changed

+35
-35
lines changed

7 files changed

+35
-35
lines changed

.github/workflows/build_wheels_manylinux.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,16 +33,16 @@ jobs:
3333
include:
3434
- platform: aarch64
3535
manylinux: 2014
36-
DOCKER_IMAGE: quay.io/opencv-ci/opencv-python-manylinux2014-aarch64:20250630
36+
DOCKER_IMAGE: quay.io/opencv-ci/opencv-python-manylinux2014-aarch64:20260102
3737
- platform: x86_64
3838
manylinux: 2014
39-
DOCKER_IMAGE: quay.io/opencv-ci/opencv-python-manylinux2014-x86-64:20250630
39+
DOCKER_IMAGE: quay.io/opencv-ci/opencv-python-manylinux2014-x86-64:20260102
4040
- platform: x86_64
4141
manylinux: 2_28
42-
DOCKER_IMAGE: quay.io/opencv-ci/opencv-python-manylinux_2_28-x86-64:20251013
42+
DOCKER_IMAGE: quay.io/opencv-ci/opencv-python-manylinux_2_28-x86-64:20260102
4343
- platform: aarch64
4444
manylinux: 2_28
45-
DOCKER_IMAGE: quay.io/opencv-ci/opencv-python-manylinux_2_28-aarch64:20251013
45+
DOCKER_IMAGE: quay.io/opencv-ci/opencv-python-manylinux_2_28-aarch64:20260102
4646

4747
env:
4848
ACTIONS_ALLOW_UNSECURE_COMMANDS: true
@@ -155,7 +155,7 @@ jobs:
155155
NP_TEST_DEP: numpy==1.19.4
156156
TRAVIS_BUILD_DIR: ${{ github.workspace }}
157157
CONFIG_PATH: travis_config.sh
158-
DOCKER_IMAGE: quay.io/opencv-ci/opencv-python-manylinux2014-x86-64:20250630
158+
DOCKER_IMAGE: quay.io/opencv-ci/opencv-python-manylinux2014-x86-64:20260102
159159
USE_CCACHE: 1
160160
UNICODE_WIDTH: 32
161161
SDIST: ${{ matrix.build_sdist || 0 }}

docker/manylinux2014/Dockerfile_aarch64

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
1-
# Version: 20250630
1+
# Version: 20260102
22
# Image name: quay.io/opencv-ci/opencv-python-manylinux2014-aarch64
33

44
FROM quay.io/pypa/manylinux2014_aarch64:latest
55

66
ARG CCACHE_VERSION=3.7.9
7-
ARG FFMPEG_VERSION=5.1.6
8-
ARG FREETYPE_VERSION=2.13.3
9-
ARG LIBPNG_VERSION=1.6.48
10-
ARG VPX_VERSION=v1.15.1
7+
ARG FFMPEG_VERSION=8.0.1
8+
ARG FREETYPE_VERSION=2.14.1
9+
ARG LIBPNG_VERSION=1.6.53
10+
ARG VPX_VERSION=v1.15.2
1111
ARG NASM_VERSION=2.15.04
1212
ARG OPENSSL_VERSION=1_1_1w
13-
ARG QT_VERSION=5.15.16
13+
ARG QT_VERSION=5.15.18
1414
ARG YASM_VERSION=1.3.0
15-
ARG AOM_VERSION=v3.12.1
15+
ARG AOM_VERSION=v3.13.1
1616
ARG AVIF_VERSION=v1.3.0
1717

1818
ENV LD_LIBRARY_PATH /usr/local/lib:$LD_LIBRARY_PATH

docker/manylinux2014/Dockerfile_x86_64

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
1-
# Version: 20250630
1+
# Version: 20260102
22
# Image name: quay.io/opencv-ci/opencv-python-manylinux2014-x86-64
33

44
FROM quay.io/pypa/manylinux2014_x86_64:latest
55

66
ARG CCACHE_VERSION=3.7.9
7-
ARG FFMPEG_VERSION=5.1.6
8-
ARG FREETYPE_VERSION=2.13.3
9-
ARG LIBPNG_VERSION=1.6.48
10-
ARG VPX_VERSION=v1.15.1
7+
ARG FFMPEG_VERSION=8.0.1
8+
ARG FREETYPE_VERSION=2.14.1
9+
ARG LIBPNG_VERSION=1.6.53
10+
ARG VPX_VERSION=v1.15.2
1111
ARG NASM_VERSION=2.15.04
1212
ARG OPENSSL_VERSION=1_1_1w
13-
ARG QT_VERSION=5.15.16
13+
ARG QT_VERSION=5.15.18
1414
ARG YASM_VERSION=1.3.0
15-
ARG AOM_VERSION=v3.12.1
15+
ARG AOM_VERSION=v3.13.1
1616
ARG AVIF_VERSION=v1.3.0
1717

1818
ENV LD_LIBRARY_PATH /usr/local/lib:$LD_LIBRARY_PATH

docker/manylinux_2_28/Dockerfile_aarch64

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
# Version: 20251013
1+
# Version: 20260102
22
# Image name: quay.io/opencv-ci/opencv-python-manylinux_2_28-aarch64
33

44
FROM quay.io/pypa/manylinux_2_28_aarch64:latest
55

6-
ARG FFMPEG_VERSION=5.1.6
7-
ARG FREETYPE_VERSION=2.13.3
8-
ARG LIBPNG_VERSION=1.6.48
9-
ARG VPX_VERSION=v1.15.1
10-
ARG QT_VERSION=5.15.16
11-
ARG AOM_VERSION=v3.12.1
6+
ARG FFMPEG_VERSION=8.0.1
7+
ARG FREETYPE_VERSION=2.14.1
8+
ARG LIBPNG_VERSION=1.6.53
9+
ARG VPX_VERSION=v1.15.2
10+
ARG QT_VERSION=5.15.18
11+
ARG AOM_VERSION=v3.13.1
1212
ARG AVIF_VERSION=v1.3.0
1313

1414
ENV LD_LIBRARY_PATH /usr/local/lib:$LD_LIBRARY_PATH

docker/manylinux_2_28/Dockerfile_x86_64

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
# Version: 20251013
1+
# Version: 20260102
22
# Image name: quay.io/opencv-ci/opencv-python-manylinux_2_28-x86-64
33

44
FROM quay.io/pypa/manylinux_2_28_x86_64:latest
55

6-
ARG FFMPEG_VERSION=5.1.6
7-
ARG FREETYPE_VERSION=2.13.3
8-
ARG LIBPNG_VERSION=1.6.48
9-
ARG VPX_VERSION=v1.15.1
10-
ARG QT_VERSION=5.15.16
11-
ARG AOM_VERSION=v3.12.1
6+
ARG FFMPEG_VERSION=8.0.1
7+
ARG FREETYPE_VERSION=2.14.1
8+
ARG LIBPNG_VERSION=1.6.53
9+
ARG VPX_VERSION=v1.15.2
10+
ARG QT_VERSION=5.15.18
11+
ARG AOM_VERSION=v3.13.1
1212
ARG AVIF_VERSION=v1.3.0
1313

1414
ENV LD_LIBRARY_PATH /usr/local/lib:$LD_LIBRARY_PATH

patches/patchQtPlugins

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff 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.16/plugins DESTINATION lib/qt)
12+
+ install(DIRECTORY /opt/Qt5.15.18/plugins DESTINATION lib/qt)
1313
+ install(DIRECTORY /usr/share/fonts DESTINATION lib/qt)
1414
+ endif()
1515
if(HAVE_QT_OPENGL)

travis_config.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ if [ -n "$IS_OSX" ]; then
3434
export MAKEFLAGS="-j$(sysctl -n hw.ncpu)"
3535
else
3636
echo " > Linux environment "
37-
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/opt/Qt5.15.16/lib
37+
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/opt/Qt5.15.18/lib
3838
export MAKEFLAGS="-j$(grep -E '^processor[[:space:]]*:' /proc/cpuinfo | wc -l)"
3939
CURRENT_ARCH=$(uname -m)
4040
if [[ $CURRENT_ARCH == 'aarch64' ]]; then

0 commit comments

Comments
 (0)