Skip to content

Commit ca6a7bc

Browse files
committed
Fix manylinux2014 aarch64 build and extend patch coverage.
1 parent 6c8012c commit ca6a7bc

3 files changed

Lines changed: 32 additions & 6 deletions

File tree

docker/manylinux2014/Dockerfile_aarch64

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ ARG LIBDAV1D_VERSION=1.5.3
1919
ENV LD_LIBRARY_PATH /usr/local/lib:$LD_LIBRARY_PATH
2020

2121
# epel-release need for aarch64 to get openblas packages
22-
RUN yum install zlib-devel curl-devel xcb-util-renderutil-devel xcb-util-devel xcb-util-image-devel xcb-util-keysyms-devel xcb-util-wm-devel mesa-libGL-devel libxkbcommon-devel libxkbcommon-x11-devel libXi-devel lapack-devel epel-release meson -y && \
22+
RUN yum install zlib-devel curl-devel xcb-util-renderutil-devel xcb-util-devel xcb-util-image-devel xcb-util-keysyms-devel xcb-util-wm-devel mesa-libGL-devel libxkbcommon-devel libxkbcommon-x11-devel libXi-devel lapack-devel epel-release -y && \
2323
yum install openblas-devel dejavu-sans-fonts -y && \
2424
cp /usr/include/lapacke/lapacke*.h /usr/include/ && \
2525
cp /usr/include/openblas/*.h /usr/include/ && \
@@ -123,7 +123,9 @@ RUN mkdir ~/avif_sources && \
123123
make install && \
124124
cd / && rm -rf ~/avif_sources
125125

126-
RUN mkdir ~/libdav1d_sources && \
126+
RUN python3.10 -m pip install meson ninja && \
127+
export PATH=/opt/python/cp310-cp310/bin:$PATH && \
128+
mkdir ~/libdav1d_sources && \
127129
cd ~/libdav1d_sources && \
128130
git clone -b ${LIBDAV1D_VERSION} https://code.videolan.org/videolan/dav1d.git && \
129131
mkdir build && cd build && \

docker/musllinux_1_2/Dockerfile_aarch64

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# version: 20260723
1+
# version: 20260725
22
# Image name: quay.io/opencv-ci/opencv-python-musllinux_1_2-aarch64
33
FROM quay.io/pypa/musllinux_1_2_aarch64:latest
44

@@ -12,13 +12,16 @@ ARG OPENSSL_VERSION=1_1_1w
1212
ARG YASM_VERSION=1.3.0
1313
ARG AOM_VERSION=v3.14.1
1414
ARG AVIF_VERSION=v1.4.2
15+
ARG LIBDAV1D_VERSION=1.5.3
1516

1617
ENV LD_LIBRARY_PATH=/usr/local/lib:$LD_LIBRARY_PATH
1718

1819
RUN apk add --no-cache \
1920
build-base \
2021
diffutils \
2122
cmake \
23+
meson \
24+
ninja \
2225
bash \
2326
git \
2427
curl \
@@ -91,7 +94,6 @@ RUN mkdir ~/libvpx_sources && \
9194
cd .. && \
9295
rm -rf ~/libvpx_sources
9396

94-
9597
### aom
9698
RUN mkdir -p /tmp/aom_sources && \
9799
cd /tmp/aom_sources && \
@@ -106,6 +108,7 @@ RUN mkdir -p /tmp/aom_sources && \
106108
../aom && \
107109
make -j$(getconf _NPROCESSORS_ONLN) && \
108110
make install
111+
109112
### avif
110113
RUN mkdir ~/avif_sources && \
111114
cd ~/avif_sources && \
@@ -117,6 +120,15 @@ RUN mkdir ~/avif_sources && \
117120
cd .. && \
118121
rm -rf ~/avif_sources
119122

123+
### av1d
124+
RUN mkdir ~/libdav1d_sources && \
125+
cd ~/libdav1d_sources && \
126+
git clone -b ${LIBDAV1D_VERSION} https://code.videolan.org/videolan/dav1d.git && \
127+
mkdir build && cd build && \
128+
meson setup --prefix="/usr" --libdir lib ../dav1d && \
129+
meson install && \
130+
cd / && rm -rf ~/libdav1d_sources
131+
120132
### ffmpeg
121133
RUN mkdir -p /ffmpeg_sources && \
122134
cd /ffmpeg_sources && \

docker/musllinux_1_2/Dockerfile_x86_64

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# version: 20260723
1+
# version: 20260725
22
# Image name: quay.io/opencv-ci/opencv-python-musllinux_1_2-x86-64
33
FROM quay.io/pypa/musllinux_1_2_x86_64:latest
44

@@ -12,13 +12,16 @@ ARG OPENSSL_VERSION=1_1_1w
1212
ARG YASM_VERSION=1.3.0
1313
ARG AOM_VERSION=v3.14.1
1414
ARG AVIF_VERSION=v1.4.2
15+
ARG LIBDAV1D_VERSION=1.5.3
1516

1617
ENV LD_LIBRARY_PATH=/usr/local/lib:$LD_LIBRARY_PATH
1718

1819
RUN apk add --no-cache \
1920
build-base \
2021
diffutils \
2122
cmake \
23+
meson \
24+
ninja \
2225
bash \
2326
git \
2427
curl \
@@ -91,7 +94,6 @@ RUN mkdir ~/libvpx_sources && \
9194
cd .. && \
9295
rm -rf ~/libvpx_sources
9396

94-
9597
### aom
9698
RUN mkdir -p /tmp/aom_sources && \
9799
cd /tmp/aom_sources && \
@@ -106,6 +108,7 @@ RUN mkdir -p /tmp/aom_sources && \
106108
../aom && \
107109
make -j$(getconf _NPROCESSORS_ONLN) && \
108110
make install
111+
109112
### avif
110113
RUN mkdir ~/avif_sources && \
111114
cd ~/avif_sources && \
@@ -117,6 +120,15 @@ RUN mkdir ~/avif_sources && \
117120
cd .. && \
118121
rm -rf ~/avif_sources
119122

123+
### av1d
124+
RUN mkdir ~/libdav1d_sources && \
125+
cd ~/libdav1d_sources && \
126+
git clone -b ${LIBDAV1D_VERSION} https://code.videolan.org/videolan/dav1d.git && \
127+
mkdir build && cd build && \
128+
meson setup --prefix="/usr" --libdir lib ../dav1d && \
129+
meson install && \
130+
cd / && rm -rf ~/libdav1d_sources
131+
120132
### ffmpeg
121133
RUN mkdir -p /ffmpeg_sources && \
122134
cd /ffmpeg_sources && \

0 commit comments

Comments
 (0)