Skip to content

Commit 91f089e

Browse files
asenyaevasenyaev
committed
Updated dependecies for the next release
1 parent 056f900 commit 91f089e

File tree

6 files changed

+79
-24
lines changed

6 files changed

+79
-24
lines changed

‎.github/workflows/build_wheels_linux.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
MB_ML_VER: 2014
4040
TRAVIS_BUILD_DIR: ${{ github.workspace }}
4141
CONFIG_PATH: travis_config.sh
42-
DOCKER_IMAGE: quay.io/asenyaev/manylinux2014_${PLAT}
42+
DOCKER_IMAGE: quay.io/opencv-ci/opencv-python-manylinux2014:${PLAT}
4343
USE_CCACHE: 1
4444
UNICODE_WIDTH: 32
4545
PLAT: x86_64
@@ -145,7 +145,7 @@ jobs:
145145
NP_TEST_DEP: numpy==1.19.4
146146
TRAVIS_BUILD_DIR: ${{ github.workspace }}
147147
CONFIG_PATH: travis_config.sh
148-
DOCKER_IMAGE: quay.io/asenyaev/manylinux2014_${PLAT}
148+
DOCKER_IMAGE: quay.io/opencv-ci/opencv-python-manylinux2014:${PLAT}
149149
USE_CCACHE: 1
150150
UNICODE_WIDTH: 32
151151
SDIST: ${{ matrix.build_sdist || 0 }}

‎.github/workflows/build_wheels_linux_arm.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
MB_ML_VER: 2014
4141
TRAVIS_BUILD_DIR: ${{ github.workspace }}
4242
CONFIG_PATH: travis_config.sh
43-
DOCKER_IMAGE: quay.io/asenyaev/manylinux2014_${PLAT}
43+
DOCKER_IMAGE: quay.io/opencv-ci/opencv-python-manylinux2014:${PLAT}
4444
USE_CCACHE: 0
4545
UNICODE_WIDTH: 32
4646
SDIST: ${{ matrix.build_sdist || 0 }}

‎docker/manylinux2014/Dockerfile_aarch64

+38-8
Original file line numberDiff line numberDiff line change
@@ -2,29 +2,54 @@ FROM quay.io/pypa/manylinux2014_aarch64:latest
22

33
ARG CCACHE_VERSION=3.7.9
44
ARG FFMPEG_VERSION=4.4.1
5+
ARG FREETYPE_VERSION=2.12.1
6+
ARG LIBPNG_VERSION=1.6.37
57
ARG NASM_VERSION=2.15.04
6-
ARG OPENSSL_VERSION=1_1_1m
8+
ARG OPENSSL_VERSION=1_1_1o
79
ARG QT_VERSION=5.15.0
810
ARG YASM_VERSION=1.3.0
911

10-
RUN yum install bzip2-devel curl-devel zlib-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 freetype-devel -y
12+
ENV LD_LIBRARY_PATH /usr/local/lib:$LD_LIBRARY_PATH
13+
14+
# epel-release need for aarch64 to get openblas packages
15+
RUN yum install bzip2-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 && \
16+
yum install openblas-devel -y && \
17+
cp /usr/include/lapacke/lapacke*.h /usr/include/ && \
18+
curl https://raw.githubusercontent.com/xianyi/OpenBLAS/v0.3.3/cblas.h -o /usr/include/cblas.h && \
19+
# libpng will be built from source
20+
yum remove libpng -y
21+
22+
RUN mkdir ~/ffmpeg_sources && \
23+
cd ~/ffmpeg_sources && \
24+
curl -O -L https://download.sourceforge.net/libpng/libpng-${LIBPNG_VERSION}.tar.gz && \
25+
tar -xf libpng-${LIBPNG_VERSION}.tar.gz && \
26+
cd libpng-${LIBPNG_VERSION} && \
27+
./configure --prefix=/usr/local && \
28+
make && \
29+
make install
30+
31+
RUN cd ~/ffmpeg_sources && \
32+
curl -O -L https://download.savannah.gnu.org/releases/freetype/freetype-${FREETYPE_VERSION}.tar.gz && \
33+
tar -xf freetype-${FREETYPE_VERSION}.tar.gz && \
34+
cd freetype-${FREETYPE_VERSION} && \
35+
./configure --prefix="$HOME/ffmpeg_build" --enable-freetype-config && \
36+
make && \
37+
make install
1138

1239
RUN curl -O -L https://download.qt.io/official_releases/qt/5.15/${QT_VERSION}/single/qt-everywhere-src-${QT_VERSION}.tar.xz && \
1340
tar -xf qt-everywhere-src-${QT_VERSION}.tar.xz && \
14-
cd qt-everywhere* && \
41+
cd qt-everywhere-src-${QT_VERSION} && \
1542
export MAKEFLAGS=-j$(nproc) && \
1643
./configure -prefix /opt/Qt${QT_VERSION} -release -opensource -confirm-license -qtnamespace QtOpenCVPython -xcb -xcb-xlib -bundled-xcb-xinput -no-openssl -no-dbus -skip qt3d -skip qtactiveqt -skip qtcanvas3d -skip qtconnectivity -skip qtdatavis3d -skip qtdoc -skip qtgamepad -skip qtgraphicaleffects -skip qtimageformats -skip qtlocation -skip qtmultimedia -skip qtpurchasing -skip qtqa -skip qtremoteobjects -skip qtrepotools -skip qtscript -skip qtscxml -skip qtsensors -skip qtserialbus -skip qtserialport -skip qtspeech -skip qttranslations -skip qtwayland -skip qtwebchannel -skip qtwebengine -skip qtwebsockets -skip qtwebview -skip xmlpatterns -skip declarative -make libs && \
1744
make && \
1845
make install && \
1946
cd .. && \
20-
rm -rf qt-everywhere-src-${QT_VERSION} && \
21-
rm qt-everywhere-src-${QT_VERSION}.tar.xz
47+
rm -rf qt-everywhere*
2248

2349
ENV QTDIR /opt/Qt${QT_VERSION}
2450
ENV PATH "$QTDIR/bin:$PATH"
2551

26-
RUN mkdir ~/ffmpeg_sources && \
27-
cd ~/ffmpeg_sources && \
52+
RUN cd ~/ffmpeg_sources && \
2853
curl -O -L https://github.com/openssl/openssl/archive/OpenSSL_${OPENSSL_VERSION}.tar.gz && \
2954
tar -xf OpenSSL_${OPENSSL_VERSION}.tar.gz && \
3055
cd openssl-OpenSSL_${OPENSSL_VERSION} && \
@@ -50,7 +75,7 @@ RUN cd ~/ffmpeg_sources && \
5075
make install
5176

5277
RUN cd ~/ffmpeg_sources && \
53-
git clone --depth 1 https://chromium.googlesource.com/webm/libvpx.git && \
78+
git clone --depth 1 https://github.com/webmproject/libvpx.git && \
5479
cd libvpx && \
5580
./configure --prefix="$HOME/ffmpeg_build" --disable-examples --disable-unit-tests --enable-vp9-highbitdepth --as=yasm --enable-pic --enable-shared && \
5681
make -j$(getconf _NPROCESSORS_ONLN) && \
@@ -66,6 +91,7 @@ RUN cd ~/ffmpeg_sources && \
6691
make install && \
6792
echo "/root/ffmpeg_build/lib/" >> /etc/ld.so.conf && \
6893
ldconfig && \
94+
yum remove bzip2-devel -y && \
6995
rm -rf ~/ffmpeg_sources
7096

7197
RUN curl -O -L https://github.com/ccache/ccache/releases/download/v${CCACHE_VERSION}/ccache-${CCACHE_VERSION}.tar.gz && \
@@ -75,6 +101,10 @@ RUN curl -O -L https://github.com/ccache/ccache/releases/download/v${CCACHE_VERS
75101
make -j$(getconf _NPROCESSORS_ONLN) && \
76102
make install
77103

104+
# Git security vulnerability: https://github.blog/2022-04-12-git-security-vulnerability-announced
105+
RUN mkdir /io && \
106+
git config --global --add safe.directory /io
107+
78108
ENV PKG_CONFIG_PATH /usr/local/lib/pkgconfig:/root/ffmpeg_build/lib/pkgconfig
79109
ENV LDFLAGS -L/root/ffmpeg_build/lib
80110
ENV PATH "$HOME/bin:$PATH"

‎docker/manylinux2014/Dockerfile_x86_64

+37-7
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,54 @@
11
FROM quay.io/pypa/manylinux2014_x86_64:latest
22

33
ARG FFMPEG_VERSION=4.4.1
4+
ARG FREETYPE_VERSION=2.12.1
5+
ARG LIBPNG_VERSION=1.6.37
46
ARG NASM_VERSION=2.15.04
5-
ARG OPENSSL_VERSION=1_1_1m
7+
ARG OPENSSL_VERSION=1_1_1o
68
ARG QT_VERSION=5.15.0
79
ARG YASM_VERSION=1.3.0
810

9-
RUN yum install bzip2-devel curl-devel zlib-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 freetype-devel -y
11+
ENV LD_LIBRARY_PATH /usr/local/lib:$LD_LIBRARY_PATH
12+
13+
# epel-release need for aarch64 to get openblas packages
14+
RUN yum install bzip2-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 && \
15+
yum install openblas-devel -y && \
16+
cp /usr/include/lapacke/lapacke*.h /usr/include/ && \
17+
curl https://raw.githubusercontent.com/xianyi/OpenBLAS/v0.3.3/cblas.h -o /usr/include/cblas.h && \
18+
# libpng will be built from source
19+
yum remove libpng -y
20+
21+
RUN mkdir ~/ffmpeg_sources && \
22+
cd ~/ffmpeg_sources && \
23+
curl -O -L https://download.sourceforge.net/libpng/libpng-${LIBPNG_VERSION}.tar.gz && \
24+
tar -xf libpng-${LIBPNG_VERSION}.tar.gz && \
25+
cd libpng-${LIBPNG_VERSION} && \
26+
./configure --prefix=/usr/local && \
27+
make && \
28+
make install
29+
30+
RUN cd ~/ffmpeg_sources && \
31+
curl -O -L https://download.savannah.gnu.org/releases/freetype/freetype-${FREETYPE_VERSION}.tar.gz && \
32+
tar -xf freetype-${FREETYPE_VERSION}.tar.gz && \
33+
cd freetype-${FREETYPE_VERSION} && \
34+
./configure --prefix="$HOME/ffmpeg_build" --enable-freetype-config && \
35+
make && \
36+
make install
1037

1138
RUN curl -O -L https://download.qt.io/official_releases/qt/5.15/${QT_VERSION}/single/qt-everywhere-src-${QT_VERSION}.tar.xz && \
1239
tar -xf qt-everywhere-src-${QT_VERSION}.tar.xz && \
13-
cd qt-everywhere* && \
40+
cd qt-everywhere-src-${QT_VERSION} && \
1441
export MAKEFLAGS=-j$(nproc) && \
1542
./configure -prefix /opt/Qt${QT_VERSION} -release -opensource -confirm-license -qtnamespace QtOpenCVPython -xcb -xcb-xlib -bundled-xcb-xinput -no-openssl -no-dbus -skip qt3d -skip qtactiveqt -skip qtcanvas3d -skip qtconnectivity -skip qtdatavis3d -skip qtdoc -skip qtgamepad -skip qtgraphicaleffects -skip qtimageformats -skip qtlocation -skip qtmultimedia -skip qtpurchasing -skip qtqa -skip qtremoteobjects -skip qtrepotools -skip qtscript -skip qtscxml -skip qtsensors -skip qtserialbus -skip qtserialport -skip qtspeech -skip qttranslations -skip qtwayland -skip qtwebchannel -skip qtwebengine -skip qtwebsockets -skip qtwebview -skip xmlpatterns -skip declarative -make libs && \
1643
make && \
1744
make install && \
1845
cd .. && \
19-
rm -rf qt-everywhere-src-${QT_VERSION} && \
20-
rm qt-everywhere-src-${QT_VERSION}.tar.xz
46+
rm -rf qt-everywhere*
2147

2248
ENV QTDIR /opt/Qt${QT_VERSION}
2349
ENV PATH "$QTDIR/bin:$PATH"
2450

25-
RUN mkdir ~/ffmpeg_sources && \
26-
cd ~/ffmpeg_sources && \
51+
RUN cd ~/ffmpeg_sources && \
2752
curl -O -L https://github.com/openssl/openssl/archive/OpenSSL_${OPENSSL_VERSION}.tar.gz && \
2853
tar -xf OpenSSL_${OPENSSL_VERSION}.tar.gz && \
2954
cd openssl-OpenSSL_${OPENSSL_VERSION} && \
@@ -65,8 +90,13 @@ RUN cd ~/ffmpeg_sources && \
6590
make install && \
6691
echo "/root/ffmpeg_build/lib/" >> /etc/ld.so.conf && \
6792
ldconfig && \
93+
yum remove bzip2-devel -y && \
6894
rm -rf ~/ffmpeg_sources
6995

96+
# Git security vulnerability: https://github.blog/2022-04-12-git-security-vulnerability-announced
97+
RUN mkdir /io && \
98+
git config --global --add safe.directory /io
99+
70100
ENV PKG_CONFIG_PATH /usr/local/lib/pkgconfig:/root/ffmpeg_build/lib/pkgconfig
71101
ENV LDFLAGS -L/root/ffmpeg_build/lib
72102
ENV PATH "$HOME/bin:$PATH"

‎setup.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ def main():
161161
"-DBUILD_DOCS=OFF",
162162
"-DPYTHON3_LIMITED_API=ON",
163163
"-DBUILD_OPENEXR=ON",
164-
"-DBUILD_PNG=ON",
164+
"-DBUILD_ZLIB=ON",
165165
]
166166
+ (
167167
# If it is not defined 'linker flags: /machine:X86' on Windows x64

‎travis_config.sh

-5
Original file line numberDiff line numberDiff line change
@@ -98,11 +98,6 @@ function pre_build {
9898

9999
if [ -n "$IS_OSX" ]; then
100100
brew install lapack
101-
else
102-
# epel-release need for aarch64 to get openblas packages
103-
yum install -y lapack-devel epel-release && yum install -y openblas-devel
104-
cp /usr/include/lapacke/lapacke*.h /usr/include/
105-
curl https://raw.githubusercontent.com/xianyi/OpenBLAS/v0.3.3/cblas.h -o /usr/include/cblas.h
106101
fi
107102

108103
if [ -n "$IS_OSX" ]; then

0 commit comments

Comments
 (0)