Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions .github/workflows/build_wheels_manylinux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,16 +33,16 @@ jobs:
include:
- platform: aarch64
manylinux: 2014
DOCKER_IMAGE: quay.io/opencv-ci/opencv-python-manylinux2014-aarch64:20261110
DOCKER_IMAGE: quay.io/opencv-ci/opencv-python-manylinux2014-aarch64:20261111
- platform: x86_64
manylinux: 2014
DOCKER_IMAGE: quay.io/opencv-ci/opencv-python-manylinux2014-x86-64:20261110
DOCKER_IMAGE: quay.io/opencv-ci/opencv-python-manylinux2014-x86-64:20261111
- platform: x86_64
manylinux: 2_28
DOCKER_IMAGE: quay.io/opencv-ci/opencv-python-manylinux_2_28-x86-64:20261110
DOCKER_IMAGE: quay.io/opencv-ci/opencv-python-manylinux_2_28-x86-64:20261111
- platform: aarch64
manylinux: 2_28
DOCKER_IMAGE: quay.io/opencv-ci/opencv-python-manylinux_2_28-aarch64:20261110
DOCKER_IMAGE: quay.io/opencv-ci/opencv-python-manylinux_2_28-aarch64:20261111

env:
ACTIONS_ALLOW_UNSECURE_COMMANDS: true
Expand Down Expand Up @@ -165,7 +165,7 @@ jobs:
NP_TEST_DEP: numpy==1.19.4
TRAVIS_BUILD_DIR: ${{ github.workspace }}
CONFIG_PATH: travis_config.sh
DOCKER_IMAGE: quay.io/opencv-ci/opencv-python-manylinux2014-x86-64:20261110
DOCKER_IMAGE: quay.io/opencv-ci/opencv-python-manylinux2014-x86-64:20261111
USE_CCACHE: 1
UNICODE_WIDTH: 32
SDIST: ${{ matrix.build_sdist || 0 }}
Expand Down
4 changes: 2 additions & 2 deletions docker/manylinux2014/Dockerfile_aarch64
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
# Version: 20261110
# Version: 20261111
# Image name: quay.io/opencv-ci/opencv-python-manylinux2014-aarch64

FROM quay.io/pypa/manylinux2014_aarch64:latest

ARG CCACHE_VERSION=4.14.3
ARG FFMPEG_VERSION=8.1.3
ARG FFMPEG_VERSION=9.0.2
ARG FREETYPE_VERSION=2.15.0
ARG LIBPNG_VERSION=1.6.59
ARG VPX_VERSION=v1.15.2
Expand Down
4 changes: 2 additions & 2 deletions docker/manylinux2014/Dockerfile_x86_64
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
# Version: 20261110
# Version: 20261111
# Image name: quay.io/opencv-ci/opencv-python-manylinux2014-x86-64

FROM quay.io/pypa/manylinux2014_x86_64:latest

ARG CCACHE_VERSION=4.14.3
ARG FFMPEG_VERSION=8.1.3
ARG FFMPEG_VERSION=9.0.2
ARG FREETYPE_VERSION=2.15.0
ARG LIBPNG_VERSION=1.6.59
ARG VPX_VERSION=v1.15.2
Expand Down
23 changes: 19 additions & 4 deletions docker/manylinux_2_28/Dockerfile_aarch64
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
# Version: 20261110
# Version: 20261111
# 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.3
ARG FFMPEG_VERSION=9.0.2
ARG FREETYPE_VERSION=2.15.0
ARG LIBPNG_VERSION=1.6.59
ARG VPX_VERSION=v1.15.2
ARG OPENSSL_VERSION=1_1_1w
ARG QT_VERSION=5.15.19
ARG AOM_VERSION=v3.15.3
ARG AVIF_VERSION=v1.4.2
Expand All @@ -16,7 +17,7 @@ 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 meson -y && \
yum install openblas-devel dejavu-sans-fonts ccache yasm nasm ninja-build openssl openssl-devel -y && \
yum install openblas-devel dejavu-sans-fonts ccache yasm nasm ninja-build -y && \
yum mark install dejavu-sans-fonts && \
# libpng will be built from source
yum remove libpng -y
Expand Down Expand Up @@ -56,6 +57,20 @@ RUN curl -O -L https://download.qt.io/archive/qt/5.15/${QT_VERSION}/single/qt-ev
ENV QTDIR /opt/Qt${QT_VERSION}
ENV PATH "$QTDIR/bin:$PATH"

# OpenSSL is linked statically into FFmpeg: a shared libcrypto.so.1.1 in /ffmpeg_build/lib
# would shadow the system one (Red Hat build) for system tools like git/curl via ldconfig
RUN mkdir ~/openssl_sources && \
cd ~/openssl_sources && \
curl -O -L https://github.com/openssl/openssl/archive/OpenSSL_${OPENSSL_VERSION}.tar.gz && \
tar -xf OpenSSL_${OPENSSL_VERSION}.tar.gz && \
cd openssl-OpenSSL_${OPENSSL_VERSION} && \
./config --prefix="/ffmpeg_build" --openssldir="/ffmpeg_build" no-shared zlib -fPIC && \
make -j$(getconf _NPROCESSORS_ONLN) && \
# skip installing documentation
make install_sw && \
cd .. && \
rm -rf ~/openssl_build ~/openssl_sources

RUN mkdir ~/libvpx_sources && \
cd ~/libvpx_sources && \
git clone --depth 1 -b ${VPX_VERSION} https://chromium.googlesource.com/webm/libvpx.git && \
Expand Down Expand Up @@ -98,7 +113,7 @@ RUN mkdir ~/ffmpeg_sources && \
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 --enable-libdav1d --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" --pkg-config-flags="--static" --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 && \
Expand Down
23 changes: 19 additions & 4 deletions docker/manylinux_2_28/Dockerfile_x86_64
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
# Version: 20261110
# Version: 20261111
# 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.3
ARG FFMPEG_VERSION=9.0.2
ARG FREETYPE_VERSION=2.15.0
ARG LIBPNG_VERSION=1.6.59
ARG VPX_VERSION=v1.15.2
ARG OPENSSL_VERSION=1_1_1w
ARG QT_VERSION=5.15.19
ARG AOM_VERSION=v3.15.3
ARG AVIF_VERSION=v1.4.2
Expand All @@ -16,7 +17,7 @@ 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 meson -y && \
yum install openblas-devel dejavu-sans-fonts ccache yasm nasm ninja-build openssl openssl-devel -y && \
yum install openblas-devel dejavu-sans-fonts ccache yasm nasm ninja-build -y && \
yum mark install dejavu-sans-fonts && \
# libpng will be built from source
yum remove libpng -y
Expand Down Expand Up @@ -56,6 +57,20 @@ RUN curl -O -L https://download.qt.io/archive/qt/5.15/${QT_VERSION}/single/qt-ev
ENV QTDIR /opt/Qt${QT_VERSION}
ENV PATH "$QTDIR/bin:$PATH"

# OpenSSL is linked statically into FFmpeg: a shared libcrypto.so.1.1 in /ffmpeg_build/lib
# would shadow the system one (Red Hat build) for system tools like git/curl via ldconfig
RUN mkdir ~/openssl_sources && \
cd ~/openssl_sources && \
curl -O -L https://github.com/openssl/openssl/archive/OpenSSL_${OPENSSL_VERSION}.tar.gz && \
tar -xf OpenSSL_${OPENSSL_VERSION}.tar.gz && \
cd openssl-OpenSSL_${OPENSSL_VERSION} && \
./config --prefix="/ffmpeg_build" --openssldir="/ffmpeg_build" no-shared zlib -fPIC && \
make -j$(getconf _NPROCESSORS_ONLN) && \
# skip installing documentation
make install_sw && \
cd .. && \
rm -rf ~/openssl_build ~/openssl_sources

RUN mkdir ~/libvpx_sources && \
cd ~/libvpx_sources && \
git clone --depth 1 -b ${VPX_VERSION} https://chromium.googlesource.com/webm/libvpx.git && \
Expand Down Expand Up @@ -98,7 +113,7 @@ RUN mkdir ~/ffmpeg_sources && \
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 --enable-libdav1d --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" --pkg-config-flags="--static" --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 && \
Expand Down
4 changes: 2 additions & 2 deletions docker/musllinux_1_2/Dockerfile_aarch64
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
# version: 20261110
# version: 20261111
# 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.14.3
ARG FFMPEG_VERSION=8.1.3
ARG FFMPEG_VERSION=9.0.2
ARG FREETYPE_VERSION=2.15.0
ARG LIBPNG_VERSION=1.6.59
ARG VPX_VERSION=v1.15.2
Expand Down
4 changes: 2 additions & 2 deletions docker/musllinux_1_2/Dockerfile_x86_64
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
# version: 20261110
# version: 20261111
# 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.14.3
ARG FFMPEG_VERSION=8.1.3
ARG FFMPEG_VERSION=9.0.2
ARG FREETYPE_VERSION=2.15.0
ARG LIBPNG_VERSION=1.6.59
ARG VPX_VERSION=v1.15.2
Expand Down
2 changes: 1 addition & 1 deletion opencv
Submodule opencv updated 344 files
2 changes: 1 addition & 1 deletion opencv_extra
Submodule opencv_extra updated 34 files
+164 −0 testdata/dnn/onnx/generate_onnx_concat_axis_models.py
+ − testdata/dnn/onnx/models/concat_axis_control-mixed-rank.onnx
+ − testdata/dnn/onnx/models/concat_axis_control-negative-axis.onnx
+ − testdata/dnn/onnx/models/concat_axis_invalid-axis-range.onnx
+ − testdata/dnn/onnx/models/concat_axis_invalid-source-rank.onnx
+24 −0 testdata/dnn/onnx/models/concat_axis_padding-control-same-rank.onnx
+22 −0 testdata/dnn/onnx/models/concat_axis_padding-crafted-mixed-rank.onnx
+ − testdata/dnn/onnx/models/concat_axis_plain-control-mixed-rank-axis0.onnx
+ − testdata/dnn/onnx/models/concat_axis_plain-control-same-rank-axis15.onnx
+ − testdata/dnn/onnx/models/concat_axis_plain-invalid-mixed-rank-axis15.onnx
+115 −0 testdata/dnn/tflite/generate_tflite_tensor_bounds_models.py
+ − testdata/dnn/tflite/tfliteControl.tflite
+ − testdata/dnn/tflite/tfliteEmptyDataControl.tflite
+ − testdata/dnn/tflite/tfliteHugeBufferIndex.tflite
+ − testdata/dnn/tflite/tfliteInt8Control.tflite
+ − testdata/dnn/tflite/tfliteInvalidBufferIndex.tflite
+ − testdata/dnn/tflite/tfliteNegativeShape.tflite
+ − testdata/dnn/tflite/tfliteOverflowShape.tflite
+ − testdata/dnn/tflite/tfliteScalarControl.tflite
+ − testdata/dnn/tflite/tfliteShortBuffer.tflite
+ − testdata/dnn/tflite/tfliteShortElementWidth.tflite
+ − testdata/dnn/tflite/tfliteShortInt8Buffer.tflite
+ − testdata/dnn/tflite/tfliteSparseTensor.tflite
+ − testdata/dnn/tflite/tfliteZeroElementControl.tflite
+ − testdata/dnn/tflite/tfliteZeroFirstOverflow.tflite
+ − testdata/dnn/tflite/tfliteZeroLastOverflow.tflite
+ − testdata/highgui/readwrite/sunraster/byte_encoded_8bpp.ras
+ − testdata/highgui/readwrite/sunraster/rgb_format_24bpp.ras
+ − testdata/highgui/readwrite/sunraster/rgb_format_32bpp.ras
+ − testdata/highgui/video/interlaced_tff_8x8_gray.mkv
+7,296 −0 testdata/perf/core.xml
+18,680 −0 testdata/perf/imgproc.xml
+2 −2 testdata/perf/optflow.xml
+261 −0 testdata/perf/video.xml
Loading