Skip to content

Commit f7f329a

Browse files
asmorkalovasmorkalov
committed
Added libavif to the build environment.
1 parent dccecfa commit f7f329a

File tree

4 files changed

+49
-9
lines changed

4 files changed

+49
-9
lines changed

‎.github/workflows/build_wheels_linux.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
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:20241202
44+
DOCKER_IMAGE: quay.io/opencv-ci/opencv-python-manylinux2014-x86-64:20250611
4545
USE_CCACHE: 0
4646
UNICODE_WIDTH: 32
4747
PLAT: x86_64
@@ -134,7 +134,7 @@ jobs:
134134
NP_TEST_DEP: numpy==1.19.4
135135
TRAVIS_BUILD_DIR: ${{ github.workspace }}
136136
CONFIG_PATH: travis_config.sh
137-
DOCKER_IMAGE: quay.io/opencv-ci/opencv-python-manylinux2014-x86-64:20241202
137+
DOCKER_IMAGE: quay.io/opencv-ci/opencv-python-manylinux2014-x86-64:20250611
138138
USE_CCACHE: 1
139139
UNICODE_WIDTH: 32
140140
SDIST: ${{ matrix.build_sdist || 0 }}

‎.github/workflows/build_wheels_linux_arm.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
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:20241202
45+
DOCKER_IMAGE: quay.io/opencv-ci/opencv-python-manylinux2014-aarch64:20250611
4646
USE_CCACHE: 0
4747
UNICODE_WIDTH: 32
4848
SDIST: ${{ matrix.build_sdist || 0 }}

‎docker/manylinux2014/Dockerfile_aarch64

Lines changed: 23 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,19 @@
1-
# Version: 20241202
1+
# Version: 20250611
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
77
ARG FFMPEG_VERSION=5.1.6
88
ARG FREETYPE_VERSION=2.13.3
9-
ARG LIBPNG_VERSION=1.6.44
10-
ARG VPX_VERSION=v1.15.0
9+
ARG LIBPNG_VERSION=1.6.48
10+
ARG VPX_VERSION=v1.15.1
1111
ARG NASM_VERSION=2.15.04
1212
ARG OPENSSL_VERSION=1_1_1w
1313
ARG QT_VERSION=5.15.16
1414
ARG YASM_VERSION=1.3.0
15+
ARG AOM_VERSION=v3.12.1
16+
ARG AVIF_VERSION=v1.3.0
1517

1618
ENV LD_LIBRARY_PATH /usr/local/lib:$LD_LIBRARY_PATH
1719

@@ -102,6 +104,24 @@ RUN mkdir ~/libvpx_sources && \
102104
cd .. && \
103105
rm -rf ~/libvpx_sources
104106

107+
RUN mkdir ~/aom_sources && \
108+
cd ~/aom_sources && \
109+
git clone --depth 1 -b ${AOM_VERSION} https://aomedia.googlesource.com/aom && \
110+
mkdir build && cd build && \
111+
cmake -DCMAKE_C_COMPILER=$(dirname $(which g++))/gcc -DCMAKE_INSTALL_PREFIX=/usr -DBUILD_SHARED_LIBS=ON -DENABLE_TESTS=OFF ../aom/ && \
112+
make -j$(getconf _NPROCESSORS_ONLN) && \
113+
make install && \
114+
cd / && rm -rf ~/aom_sources
115+
116+
RUN mkdir ~/avif_sources && \
117+
cd ~/avif_sources && \
118+
git clone -b ${AVIF_VERSION} https://github.com/AOMediaCodec/libavif.git && \
119+
mkdir build && cd build && \
120+
cmake -DCMAKE_INSTALL_PREFIX=/usr -DAVIF_CODEC_AOM=SYSTEM -DAVIF_LIBYUV=LOCAL -DAVIF_BUILD_APPS=OFF ../libavif && \
121+
make -j$(getconf _NPROCESSORS_ONLN) && \
122+
make install && \
123+
cd / && rm -rf ~/avif_sources
124+
105125
RUN mkdir ~/ffmpeg_sources && \
106126
cd ~/ffmpeg_sources && \
107127
curl -O -L https://ffmpeg.org/releases/ffmpeg-${FFMPEG_VERSION}.tar.gz && \

‎docker/manylinux2014/Dockerfile_x86_64

Lines changed: 23 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,19 @@
1-
# Version: 20241202
1+
# Version: 20250611
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
77
ARG FFMPEG_VERSION=5.1.6
88
ARG FREETYPE_VERSION=2.13.3
9-
ARG LIBPNG_VERSION=1.6.44
10-
ARG VPX_VERSION=v1.15.0
9+
ARG LIBPNG_VERSION=1.6.48
10+
ARG VPX_VERSION=v1.15.1
1111
ARG NASM_VERSION=2.15.04
1212
ARG OPENSSL_VERSION=1_1_1w
1313
ARG QT_VERSION=5.15.16
1414
ARG YASM_VERSION=1.3.0
15+
ARG AOM_VERSION=v3.12.1
16+
ARG AVIF_VERSION=v1.3.0
1517

1618
ENV LD_LIBRARY_PATH /usr/local/lib:$LD_LIBRARY_PATH
1719

@@ -101,6 +103,24 @@ RUN mkdir ~/libvpx_sources && \
101103
cd .. && \
102104
rm -rf ~/libvpx_sources
103105

106+
RUN mkdir ~/aom_sources && \
107+
cd ~/aom_sources && \
108+
git clone --depth 1 -b ${AOM_VERSION} https://aomedia.googlesource.com/aom && \
109+
mkdir build && cd build && \
110+
cmake -DCMAKE_C_COMPILER=$(dirname $(which g++))/gcc -DCMAKE_INSTALL_PREFIX=/usr -DBUILD_SHARED_LIBS=ON -DENABLE_TESTS=OFF ../aom/ && \
111+
make -j$(getconf _NPROCESSORS_ONLN) && \
112+
make install && \
113+
cd / && rm -rf ~/aom_sources
114+
115+
RUN mkdir ~/avif_sources && \
116+
cd ~/avif_sources && \
117+
git clone -b ${AVIF_VERSION} https://github.com/AOMediaCodec/libavif.git && \
118+
mkdir build && cd build && \
119+
cmake -DCMAKE_INSTALL_PREFIX=/usr -DAVIF_CODEC_AOM=SYSTEM -DAVIF_LIBYUV=LOCAL -DAVIF_BUILD_APPS=OFF ../libavif && \
120+
make -j$(getconf _NPROCESSORS_ONLN) && \
121+
make install && \
122+
cd / && rm -rf ~/avif_sources
123+
104124
RUN mkdir ~/ffmpeg_sources && \
105125
cd ~/ffmpeg_sources && \
106126
curl -O -L https://ffmpeg.org/releases/ffmpeg-${FFMPEG_VERSION}.tar.gz && \

0 commit comments

Comments
 (0)