diff --git a/.github/workflows/build_wheels_manylinux.yml b/.github/workflows/build_wheels_manylinux.yml index 5790ba950..1e795174c 100644 --- a/.github/workflows/build_wheels_manylinux.yml +++ b/.github/workflows/build_wheels_manylinux.yml @@ -33,16 +33,16 @@ jobs: include: - platform: aarch64 manylinux: 2014 - DOCKER_IMAGE: quay.io/opencv-ci/opencv-python-manylinux2014-aarch64:20260531 + DOCKER_IMAGE: quay.io/opencv-ci/opencv-python-manylinux2014-aarch64:20260725 - platform: x86_64 manylinux: 2014 - DOCKER_IMAGE: quay.io/opencv-ci/opencv-python-manylinux2014-x86-64:20260531 + DOCKER_IMAGE: quay.io/opencv-ci/opencv-python-manylinux2014-x86-64:20260725 - platform: x86_64 manylinux: 2_28 - DOCKER_IMAGE: quay.io/opencv-ci/opencv-python-manylinux_2_28-x86-64:20260531 + DOCKER_IMAGE: quay.io/opencv-ci/opencv-python-manylinux_2_28-x86-64:20260725 - platform: aarch64 manylinux: 2_28 - DOCKER_IMAGE: quay.io/opencv-ci/opencv-python-manylinux_2_28-aarch64:20260531 + DOCKER_IMAGE: quay.io/opencv-ci/opencv-python-manylinux_2_28-aarch64:20260725 env: ACTIONS_ALLOW_UNSECURE_COMMANDS: true @@ -272,16 +272,16 @@ jobs: - name: Upload wheels for opencv_python run: | python -m pip install twine - python -m twine upload -u ${{ secrets.OPENCV_PYTHON_USERNAME }} -p ${{ secrets.OPENCV_PYTHON_PASSWORD }} --skip-existing wheelhouse/wheel-*/opencv_python-* wheelhouse/wheel-*/opencv-python-[^h]* + python -m twine upload -u ${{ secrets.OPENCV_PYTHON_USERNAME }} -p ${{ secrets.OPENCV_PYTHON_PASSWORD }} --skip-existing wheelhouse/opencv_python-* wheelhouse/opencv-python-[^h]* - name: Upload wheels for opencv_contrib_python run: | python -m pip install twine - python -m twine upload -u ${{ secrets.OPENCV_CONTRIB_PYTHON_USERNAME }} -p ${{ secrets.OPENCV_CONTRIB_PYTHON_PASSWORD }} --skip-existing wheelhouse/wheel-*/opencv_contrib_python-* wheelhouse/wheel-*/opencv-contrib-python-[^h]* + python -m twine upload -u ${{ secrets.OPENCV_CONTRIB_PYTHON_USERNAME }} -p ${{ secrets.OPENCV_CONTRIB_PYTHON_PASSWORD }} --skip-existing wheelhouse/opencv_contrib_python-* wheelhouse/opencv-contrib-python-[^h]* - name: Upload wheels for opencv_python_headless run: | python -m pip install twine - python -m twine upload -u ${{ secrets.OPENCV_PYTHON_HEADLESS_USERNAME }} -p ${{ secrets.OPENCV_PYTHON_HEADLESS_PASSWORD }} --skip-existing wheelhouse/wheel-*/opencv_python_headless-* wheelhouse/wheel-*/opencv-python-headless-* + python -m twine upload -u ${{ secrets.OPENCV_PYTHON_HEADLESS_USERNAME }} -p ${{ secrets.OPENCV_PYTHON_HEADLESS_PASSWORD }} --skip-existing wheelhouse/opencv_python_headless-* wheelhouse/opencv-python-headless-* - name: Upload wheels for opencv_contrib_python_headless run: | python -m pip install twine - python -m twine upload -u ${{ secrets.OPENCV_CONTRIB_PYTHON_HEADLESS_USERNAME }} -p ${{ secrets.OPENCV_CONTRIB_PYTHON_HEADLESS_PASSWORD }} --skip-existing wheelhouse/wheel-*/opencv_contrib_python_headless-* wheelhouse/wheel-*/opencv-contrib-python-headless-* + python -m twine upload -u ${{ secrets.OPENCV_CONTRIB_PYTHON_HEADLESS_USERNAME }} -p ${{ secrets.OPENCV_CONTRIB_PYTHON_HEADLESS_PASSWORD }} --skip-existing wheelhouse/opencv_contrib_python_headless-* wheelhouse/opencv-contrib-python-headless-* diff --git a/LICENSE-3RD-PARTY.txt b/LICENSE-3RD-PARTY.txt index 1f06ebe01..03eb26b96 100644 --- a/LICENSE-3RD-PARTY.txt +++ b/LICENSE-3RD-PARTY.txt @@ -3539,6 +3539,34 @@ WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH ------------------------------------------------------------------------------ +dav1d library is redistributed within all opencv-python Linux packages. + +Copyright © 2018-2025, VideoLAN and dav1d authors +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + +1. Redistributions of source code must retain the above copyright notice, this + list of conditions and the following disclaimer. + +2. Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR +ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND +ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +------------------------------------------------------------------------------ + MLAS library is redistributed within all opencv-python packages. MIT License diff --git a/docker/manylinux2014/Dockerfile_aarch64 b/docker/manylinux2014/Dockerfile_aarch64 index 09812ddbc..b8dc69ed6 100644 --- a/docker/manylinux2014/Dockerfile_aarch64 +++ b/docker/manylinux2014/Dockerfile_aarch64 @@ -1,10 +1,10 @@ -# Version: 20260531 +# Version: 20260725 # Image name: quay.io/opencv-ci/opencv-python-manylinux2014-aarch64 FROM quay.io/pypa/manylinux2014_aarch64:latest ARG CCACHE_VERSION=4.13.6 -ARG FFMPEG_VERSION=8.1.1 +ARG FFMPEG_VERSION=8.1.2 ARG FREETYPE_VERSION=2.14.3 ARG LIBPNG_VERSION=1.6.58 ARG VPX_VERSION=v1.15.2 @@ -14,6 +14,7 @@ ARG QT_VERSION=5.15.19 ARG YASM_VERSION=1.3.0 ARG AOM_VERSION=v3.14.1 ARG AVIF_VERSION=v1.4.2 +ARG LIBDAV1D_VERSION=1.5.3 ENV LD_LIBRARY_PATH /usr/local/lib:$LD_LIBRARY_PATH @@ -122,13 +123,23 @@ RUN mkdir ~/avif_sources && \ make install && \ cd / && rm -rf ~/avif_sources +RUN python3.10 -m pip install meson ninja && \ + export PATH=/opt/python/cp310-cp310/bin:$PATH && \ + mkdir ~/libdav1d_sources && \ + cd ~/libdav1d_sources && \ + git clone -b ${LIBDAV1D_VERSION} https://code.videolan.org/videolan/dav1d.git && \ + mkdir build && cd build && \ + PATH=$HOME/bin:$PATH meson setup --prefix="/ffmpeg_build" --libdir lib ../dav1d && \ + meson install && \ + cd / && rm -rf ~/libdav1d_sources + RUN mkdir ~/ffmpeg_sources && \ cd ~/ffmpeg_sources && \ curl -O -L https://ffmpeg.org/releases/ffmpeg-${FFMPEG_VERSION}.tar.gz && \ tar -xf ffmpeg-${FFMPEG_VERSION}.tar.gz && \ cd ffmpeg-${FFMPEG_VERSION} && \ PATH=~/bin:$PATH && \ - 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" && \ + 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" && \ make -j$(getconf _NPROCESSORS_ONLN) && \ make install && \ echo "/ffmpeg_build/lib/" >> /etc/ld.so.conf && \ diff --git a/docker/manylinux2014/Dockerfile_i686 b/docker/manylinux2014/Dockerfile_i686 index 1c94b1fcd..9a56d6424 100644 --- a/docker/manylinux2014/Dockerfile_i686 +++ b/docker/manylinux2014/Dockerfile_i686 @@ -2,7 +2,7 @@ FROM quay.io/pypa/manylinux2014_i686:latest ARG CCACHE_VERSION=3.7.9 ARG CMAKE_VERSION=3.17.0 -ARG FFMPEG_VERSION=5.1.4 +ARG FFMPEG_VERSION=8.1.2 ARG NASM_VERSION=2.15.04 ARG OPENSSL_VERSION=1_1_1w ARG QT_VERSION=5.15.0 diff --git a/docker/manylinux2014/Dockerfile_x86_64 b/docker/manylinux2014/Dockerfile_x86_64 index c75f28fda..ab42b5c45 100644 --- a/docker/manylinux2014/Dockerfile_x86_64 +++ b/docker/manylinux2014/Dockerfile_x86_64 @@ -1,10 +1,10 @@ -# Version: 20260531 +# Version: 20260725 # Image name: quay.io/opencv-ci/opencv-python-manylinux2014-x86-64 FROM quay.io/pypa/manylinux2014_x86_64:latest ARG CCACHE_VERSION=4.13.6 -ARG FFMPEG_VERSION=8.1.1 +ARG FFMPEG_VERSION=8.1.2 ARG FREETYPE_VERSION=2.14.3 ARG LIBPNG_VERSION=1.6.58 ARG VPX_VERSION=v1.15.2 @@ -14,11 +14,12 @@ ARG QT_VERSION=5.15.19 ARG YASM_VERSION=1.3.0 ARG AOM_VERSION=v3.14.1 ARG AVIF_VERSION=v1.4.2 +ARG LIBDAV1D_VERSION=1.5.3 ENV LD_LIBRARY_PATH /usr/local/lib:$LD_LIBRARY_PATH # epel-release need for aarch64 to get openblas packages -RUN yum install cmake 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 && \ +RUN yum install cmake 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 && \ yum install openblas-devel dejavu-sans-fonts -y && \ cp /usr/include/openblas/*.h /usr/include/ && \ cp /usr/include/lapacke/lapacke*.h /usr/include/ && \ @@ -121,13 +122,21 @@ RUN mkdir ~/avif_sources && \ make install && \ cd / && rm -rf ~/avif_sources +RUN mkdir ~/libdav1d_sources && \ + cd ~/libdav1d_sources && \ + git clone -b ${LIBDAV1D_VERSION} https://code.videolan.org/videolan/dav1d.git && \ + mkdir build && cd build && \ + PATH=$HOME/bin:$PATH meson setup --prefix="/ffmpeg_build" --libdir lib ../dav1d && \ + meson install && \ + cd / && rm -rf ~/libdav1d_sources + RUN mkdir ~/ffmpeg_sources && \ cd ~/ffmpeg_sources && \ curl -O -L https://ffmpeg.org/releases/ffmpeg-${FFMPEG_VERSION}.tar.gz && \ tar -xf ffmpeg-${FFMPEG_VERSION}.tar.gz && \ cd ffmpeg-${FFMPEG_VERSION} && \ PATH=~/bin:$PATH && \ - 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" && \ + 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" && \ make -j$(getconf _NPROCESSORS_ONLN) && \ make install && \ echo "/ffmpeg_build/lib/" >> /etc/ld.so.conf && \ diff --git a/docker/manylinux_2_28/Dockerfile_aarch64 b/docker/manylinux_2_28/Dockerfile_aarch64 index b8af36412..fba959c13 100644 --- a/docker/manylinux_2_28/Dockerfile_aarch64 +++ b/docker/manylinux_2_28/Dockerfile_aarch64 @@ -1,21 +1,23 @@ -# Version: 20260531 +# Version: 20260725 # Image name: quay.io/opencv-ci/opencv-python-manylinux_2_28-aarch64 FROM quay.io/pypa/manylinux_2_28_aarch64:latest -ARG FFMPEG_VERSION=8.1.1 +ARG FFMPEG_VERSION=8.1.2 ARG FREETYPE_VERSION=2.14.3 ARG LIBPNG_VERSION=1.6.58 ARG VPX_VERSION=v1.15.2 ARG QT_VERSION=5.15.19 ARG AOM_VERSION=v3.14.1 ARG AVIF_VERSION=v1.4.2 +ARG LIBDAV1D_VERSION=1.5.3 ENV LD_LIBRARY_PATH /usr/local/lib:$LD_LIBRARY_PATH # epel-release need for aarch64 to get openblas packages -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 && \ +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 && \ yum install openblas-devel dejavu-sans-fonts ccache yasm nasm ninja-build openssl openssl-devel -y && \ + yum mark install dejavu-sans-fonts && \ # libpng will be built from source yum remove libpng -y @@ -82,13 +84,21 @@ RUN mkdir ~/avif_sources && \ make install && \ cd / && rm -rf ~/avif_sources +RUN mkdir ~/libdav1d_sources && \ + cd ~/libdav1d_sources && \ + git clone -b ${LIBDAV1D_VERSION} https://code.videolan.org/videolan/dav1d.git && \ + mkdir build && cd build && \ + meson setup --prefix="/ffmpeg_build" --libdir lib ../dav1d && \ + meson install && \ + cd / && rm -rf ~/libdav1d_sources + RUN mkdir ~/ffmpeg_sources && \ cd ~/ffmpeg_sources && \ curl -O -L https://ffmpeg.org/releases/ffmpeg-${FFMPEG_VERSION}.tar.gz && \ tar -xf ffmpeg-${FFMPEG_VERSION}.tar.gz && \ cd ffmpeg-${FFMPEG_VERSION} && \ PATH=~/bin:$PATH && \ - 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" && \ + 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" && \ make -j$(getconf _NPROCESSORS_ONLN) && \ make install && \ echo "/ffmpeg_build/lib/" >> /etc/ld.so.conf && \ diff --git a/docker/manylinux_2_28/Dockerfile_x86_64 b/docker/manylinux_2_28/Dockerfile_x86_64 index 4deeddf61..8bec5deea 100644 --- a/docker/manylinux_2_28/Dockerfile_x86_64 +++ b/docker/manylinux_2_28/Dockerfile_x86_64 @@ -1,21 +1,23 @@ -# Version: 20260531 +# Version: 20260725 # Image name: quay.io/opencv-ci/opencv-python-manylinux_2_28-x86-64 FROM quay.io/pypa/manylinux_2_28_x86_64:latest -ARG FFMPEG_VERSION=8.1.1 +ARG FFMPEG_VERSION=8.1.2 ARG FREETYPE_VERSION=2.14.3 ARG LIBPNG_VERSION=1.6.58 ARG VPX_VERSION=v1.15.2 ARG QT_VERSION=5.15.19 ARG AOM_VERSION=v3.14.1 ARG AVIF_VERSION=v1.4.2 +ARG LIBDAV1D_VERSION=1.5.3 ENV LD_LIBRARY_PATH /usr/local/lib:$LD_LIBRARY_PATH # epel-release need for aarch64 to get openblas packages -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 && \ +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 && \ yum install openblas-devel dejavu-sans-fonts ccache yasm nasm ninja-build openssl openssl-devel -y && \ + yum mark install dejavu-sans-fonts && \ # libpng will be built from source yum remove libpng -y @@ -82,13 +84,21 @@ RUN mkdir ~/avif_sources && \ make install && \ cd / && rm -rf ~/avif_sources +RUN mkdir ~/libdav1d_sources && \ + cd ~/libdav1d_sources && \ + git clone -b ${LIBDAV1D_VERSION} https://code.videolan.org/videolan/dav1d.git && \ + mkdir build && cd build && \ + meson setup --prefix="/ffmpeg_build" --libdir lib ../dav1d && \ + meson install && \ + cd / && rm -rf ~/libdav1d_sources + RUN mkdir ~/ffmpeg_sources && \ cd ~/ffmpeg_sources && \ curl -O -L https://ffmpeg.org/releases/ffmpeg-${FFMPEG_VERSION}.tar.gz && \ tar -xf ffmpeg-${FFMPEG_VERSION}.tar.gz && \ cd ffmpeg-${FFMPEG_VERSION} && \ PATH=~/bin:$PATH && \ - 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" && \ + 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" && \ make -j$(getconf _NPROCESSORS_ONLN) && \ make install && \ echo "/ffmpeg_build/lib/" >> /etc/ld.so.conf && \ diff --git a/docker/musllinux_1_2/Dockerfile_aarch64 b/docker/musllinux_1_2/Dockerfile_aarch64 index 6f425f042..fc4ef7c59 100644 --- a/docker/musllinux_1_2/Dockerfile_aarch64 +++ b/docker/musllinux_1_2/Dockerfile_aarch64 @@ -1,9 +1,9 @@ -# version: 20260531 +# version: 20260725 # Image name: quay.io/opencv-ci/opencv-python-musllinux_1_2-aarch64 FROM quay.io/pypa/musllinux_1_2_aarch64:latest ARG CCACHE_VERSION=4.13.6 -ARG FFMPEG_VERSION=8.1.1 +ARG FFMPEG_VERSION=8.1.2 ARG FREETYPE_VERSION=2.14.3 ARG LIBPNG_VERSION=1.6.58 ARG VPX_VERSION=v1.15.1 @@ -12,6 +12,7 @@ ARG OPENSSL_VERSION=1_1_1w ARG YASM_VERSION=1.3.0 ARG AOM_VERSION=v3.14.1 ARG AVIF_VERSION=v1.4.2 +ARG LIBDAV1D_VERSION=1.5.3 ENV LD_LIBRARY_PATH=/usr/local/lib:$LD_LIBRARY_PATH @@ -19,6 +20,8 @@ RUN apk add --no-cache \ build-base \ diffutils \ cmake \ + meson \ + ninja \ bash \ git \ curl \ @@ -91,7 +94,6 @@ RUN mkdir ~/libvpx_sources && \ cd .. && \ rm -rf ~/libvpx_sources - ### aom RUN mkdir -p /tmp/aom_sources && \ cd /tmp/aom_sources && \ @@ -106,6 +108,7 @@ RUN mkdir -p /tmp/aom_sources && \ ../aom && \ make -j$(getconf _NPROCESSORS_ONLN) && \ make install + ### avif RUN mkdir ~/avif_sources && \ cd ~/avif_sources && \ @@ -117,6 +120,15 @@ RUN mkdir ~/avif_sources && \ cd .. && \ rm -rf ~/avif_sources +### av1d +RUN mkdir ~/libdav1d_sources && \ + cd ~/libdav1d_sources && \ + git clone -b ${LIBDAV1D_VERSION} https://code.videolan.org/videolan/dav1d.git && \ + mkdir build && cd build && \ + meson setup --prefix="/usr" --libdir lib ../dav1d && \ + meson install && \ + cd / && rm -rf ~/libdav1d_sources + ### ffmpeg RUN mkdir -p /ffmpeg_sources && \ cd /ffmpeg_sources && \ diff --git a/docker/musllinux_1_2/Dockerfile_x86_64 b/docker/musllinux_1_2/Dockerfile_x86_64 index 48c76cfcb..2761baea0 100644 --- a/docker/musllinux_1_2/Dockerfile_x86_64 +++ b/docker/musllinux_1_2/Dockerfile_x86_64 @@ -1,9 +1,9 @@ -# version: 20260531 +# version: 20260725 # Image name: quay.io/opencv-ci/opencv-python-musllinux_1_2-x86-64 FROM quay.io/pypa/musllinux_1_2_x86_64:latest ARG CCACHE_VERSION=4.13.6 -ARG FFMPEG_VERSION=8.1.1 +ARG FFMPEG_VERSION=8.1.2 ARG FREETYPE_VERSION=2.14.3 ARG LIBPNG_VERSION=1.6.58 ARG VPX_VERSION=v1.15.1 @@ -12,6 +12,7 @@ ARG OPENSSL_VERSION=1_1_1w ARG YASM_VERSION=1.3.0 ARG AOM_VERSION=v3.14.1 ARG AVIF_VERSION=v1.4.2 +ARG LIBDAV1D_VERSION=1.5.3 ENV LD_LIBRARY_PATH=/usr/local/lib:$LD_LIBRARY_PATH @@ -19,6 +20,8 @@ RUN apk add --no-cache \ build-base \ diffutils \ cmake \ + meson \ + ninja \ bash \ git \ curl \ @@ -91,7 +94,6 @@ RUN mkdir ~/libvpx_sources && \ cd .. && \ rm -rf ~/libvpx_sources - ### aom RUN mkdir -p /tmp/aom_sources && \ cd /tmp/aom_sources && \ @@ -106,6 +108,7 @@ RUN mkdir -p /tmp/aom_sources && \ ../aom && \ make -j$(getconf _NPROCESSORS_ONLN) && \ make install + ### avif RUN mkdir ~/avif_sources && \ cd ~/avif_sources && \ @@ -117,6 +120,15 @@ RUN mkdir ~/avif_sources && \ cd .. && \ rm -rf ~/avif_sources +### av1d +RUN mkdir ~/libdav1d_sources && \ + cd ~/libdav1d_sources && \ + git clone -b ${LIBDAV1D_VERSION} https://code.videolan.org/videolan/dav1d.git && \ + mkdir build && cd build && \ + meson setup --prefix="/usr" --libdir lib ../dav1d && \ + meson install && \ + cd / && rm -rf ~/libdav1d_sources + ### ffmpeg RUN mkdir -p /ffmpeg_sources && \ cd /ffmpeg_sources && \