Skip to content

Commit f62cf5a

Browse files
asmorkalovasmorkalov
committed
Extend fixes for aarch64.
1 parent 4c956b6 commit f62cf5a

File tree

2 files changed

+25
-6
lines changed

2 files changed

+25
-6
lines changed

‎docker/manylinux2014/Dockerfile_aarch64‎

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

44
FROM quay.io/pypa/manylinux2014_aarch64:latest
@@ -14,11 +14,12 @@ ARG QT_VERSION=5.15.18
1414
ARG YASM_VERSION=1.3.0
1515
ARG AOM_VERSION=v3.13.1
1616
ARG AVIF_VERSION=v1.3.0
17+
ARG LIBDAV1D_VERSION=1.5.3
1718

1819
ENV LD_LIBRARY_PATH /usr/local/lib:$LD_LIBRARY_PATH
1920

2021
# epel-release need for aarch64 to get openblas packages
21-
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 && \
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 && \
2223
yum install openblas-devel dejavu-sans-fonts -y && \
2324
cp /usr/include/lapacke/lapacke*.h /usr/include/ && \
2425
cp /usr/include/openblas/*.h /usr/include/ && \
@@ -122,13 +123,21 @@ RUN mkdir ~/avif_sources && \
122123
make install && \
123124
cd / && rm -rf ~/avif_sources
124125

126+
RUN mkdir ~/libdav1d_sources && \
127+
cd ~/libdav1d_sources && \
128+
git clone -b ${LIBDAV1D_VERSION} https://code.videolan.org/videolan/dav1d.git && \
129+
mkdir build && cd build && \
130+
PATH=$HOME/bin:$PATH meson setup --prefix="/ffmpeg_build" --libdir lib ../dav1d && \
131+
meson install && \
132+
cd / && rm -rf ~/libdav1d_sources
133+
125134
RUN mkdir ~/ffmpeg_sources && \
126135
cd ~/ffmpeg_sources && \
127136
curl -O -L https://ffmpeg.org/releases/ffmpeg-${FFMPEG_VERSION}.tar.gz && \
128137
tar -xf ffmpeg-${FFMPEG_VERSION}.tar.gz && \
129138
cd ffmpeg-${FFMPEG_VERSION} && \
130139
PATH=~/bin:$PATH && \
131-
PKG_CONFIG_PATH="/ffmpeg_build/lib/pkgconfig" ./configure --prefix="/ffmpeg_build" --extra-cflags="-I/ffmpeg_build/include" --extra-ldflags="-L/ffmpeg_build/lib" --enable-openssl --enable-libvpx --enable-shared --enable-pic --bindir="$HOME/bin" && \
140+
PKG_CONFIG_PATH="/ffmpeg_build/lib/pkgconfig" ./configure --prefix="/ffmpeg_build" --extra-cflags="-I/ffmpeg_build/include" --extra-ldflags="-L/ffmpeg_build/lib" --enable-openssl --enable-libvpx --enable-shared --enable-pic --enable-libdav1d --bindir="$HOME/bin" && \
132141
make -j$(getconf _NPROCESSORS_ONLN) && \
133142
make install && \
134143
echo "/ffmpeg_build/lib/" >> /etc/ld.so.conf && \

‎docker/manylinux_2_28/Dockerfile_aarch64‎

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

44
FROM quay.io/pypa/manylinux_2_28_aarch64:latest
@@ -10,12 +10,14 @@ ARG VPX_VERSION=v1.15.2
1010
ARG QT_VERSION=5.15.18
1111
ARG AOM_VERSION=v3.13.1
1212
ARG AVIF_VERSION=v1.3.0
13+
ARG LIBDAV1D_VERSION=1.5.3
1314

1415
ENV LD_LIBRARY_PATH /usr/local/lib:$LD_LIBRARY_PATH
1516

1617
# epel-release need for aarch64 to get openblas packages
17-
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 && \
18+
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 && \
1819
yum install openblas-devel dejavu-sans-fonts ccache yasm nasm ninja-build openssl openssl-devel -y && \
20+
yum mark install dejavu-sans-fonts && \
1921
# libpng will be built from source
2022
yum remove libpng -y
2123

@@ -82,13 +84,21 @@ RUN mkdir ~/avif_sources && \
8284
make install && \
8385
cd / && rm -rf ~/avif_sources
8486

87+
RUN mkdir ~/libdav1d_sources && \
88+
cd ~/libdav1d_sources && \
89+
git clone -b ${LIBDAV1D_VERSION} https://code.videolan.org/videolan/dav1d.git && \
90+
mkdir build && cd build && \
91+
meson setup --prefix="/ffmpeg_build" --libdir lib ../dav1d && \
92+
meson install && \
93+
cd / && rm -rf ~/libdav1d_sources
94+
8595
RUN mkdir ~/ffmpeg_sources && \
8696
cd ~/ffmpeg_sources && \
8797
curl -O -L https://ffmpeg.org/releases/ffmpeg-${FFMPEG_VERSION}.tar.gz && \
8898
tar -xf ffmpeg-${FFMPEG_VERSION}.tar.gz && \
8999
cd ffmpeg-${FFMPEG_VERSION} && \
90100
PATH=~/bin:$PATH && \
91-
PKG_CONFIG_PATH="/ffmpeg_build/lib/pkgconfig" ./configure --prefix="/ffmpeg_build" --extra-cflags="-I/ffmpeg_build/include" --extra-ldflags="-L/ffmpeg_build/lib" --enable-openssl --enable-libvpx --enable-shared --enable-pic --bindir="$HOME/bin" && \
101+
PKG_CONFIG_PATH="/ffmpeg_build/lib/pkgconfig" ./configure --prefix="/ffmpeg_build" --extra-cflags="-I/ffmpeg_build/include" --extra-ldflags="-L/ffmpeg_build/lib" --enable-openssl --enable-libvpx --enable-shared --enable-pic --enable-libdav1d --bindir="$HOME/bin" && \
92102
make -j$(getconf _NPROCESSORS_ONLN) && \
93103
make install && \
94104
echo "/ffmpeg_build/lib/" >> /etc/ld.so.conf && \

0 commit comments

Comments
 (0)