Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitf2f924c

Browse files
authored
Merge pull request#666 from asenyaev/asen/update_all_dependencies
Updated dependecies for the next release
2 parents5de8d66 +4f8289d commitf2f924c

File tree

6 files changed

+133
-43
lines changed

6 files changed

+133
-43
lines changed

‎.github/workflows/build_wheels_linux.yml

Lines changed: 2 additions & 2 deletions
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 67 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -2,61 +2,103 @@ 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 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 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 ~/libpng_sources && \
23+
cd ~/libpng_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+
cd .. && \
31+
rm -rf ~/libpng_sources
32+
33+
RUN mkdir ~/freetype_sources && \
34+
cd ~/freetype_sources && \
35+
curl -O -L https://download.savannah.gnu.org/releases/freetype/freetype-${FREETYPE_VERSION}.tar.gz && \
36+
tar -xf freetype-${FREETYPE_VERSION}.tar.gz && \
37+
cd freetype-${FREETYPE_VERSION} && \
38+
./configure --prefix="$HOME/ffmpeg_build" --enable-freetype-config && \
39+
make && \
40+
make install && \
41+
cd .. && \
42+
rm -rf ~/freetype_sources
1143

1244
RUN curl -O -L https://download.qt.io/official_releases/qt/5.15/${QT_VERSION}/single/qt-everywhere-src-${QT_VERSION}.tar.xz && \
1345
tar -xf qt-everywhere-src-${QT_VERSION}.tar.xz && \
14-
cd qt-everywhere* && \
46+
cd qt-everywhere-src-${QT_VERSION} && \
1547
export MAKEFLAGS=-j$(nproc) && \
1648
./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 && \
1749
make && \
1850
make install && \
1951
cd .. && \
20-
rm -rf qt-everywhere-src-${QT_VERSION} && \
21-
rm qt-everywhere-src-${QT_VERSION}.tar.xz
52+
rm -rf qt-everywhere*
2253

2354
ENV QTDIR /opt/Qt${QT_VERSION}
2455
ENV PATH "$QTDIR/bin:$PATH"
2556

26-
RUN mkdir ~/ffmpeg_sources && \
27-
cd ~/ffmpeg_sources && \
57+
RUN mkdir ~/openssl_sources && \
58+
cd ~/openssl_sources && \
2859
curl -O -L https://github.com/openssl/openssl/archive/OpenSSL_${OPENSSL_VERSION}.tar.gz && \
2960
tar -xf OpenSSL_${OPENSSL_VERSION}.tar.gz && \
3061
cd openssl-OpenSSL_${OPENSSL_VERSION} && \
3162
./config --prefix="$HOME/ffmpeg_build" --openssldir="$HOME/ffmpeg_build" no-pinshared shared zlib && \
3263
make -j$(getconf _NPROCESSORS_ONLN) && \
3364
# skip installing documentation
3465
make install_sw && \
35-
rm -rf ~/openssl_build
66+
cd .. && \
67+
rm -rf ~/openssl_build ~/openssl_sources
3668

37-
RUN cd ~/ffmpeg_sources && \
69+
RUN mkdir ~/nasm_sources && \
70+
cd ~/nasm_sources && \
3871
curl -O -L http://www.nasm.us/pub/nasm/releasebuilds/${NASM_VERSION}/nasm-${NASM_VERSION}.tar.bz2 && \
3972
tar -xf nasm-${NASM_VERSION}.tar.bz2 && cd nasm-${NASM_VERSION} && ./autogen.sh && \
4073
./configure --prefix="$HOME/ffmpeg_build" --bindir="$HOME/bin" && \
4174
make -j$(getconf _NPROCESSORS_ONLN) && \
42-
make install
75+
make install && \
76+
cd .. && \
77+
rm -rf ~/nasm_sources
4378

44-
RUN cd ~/ffmpeg_sources && \
79+
RUN mkdir ~/yasm_sources && \
80+
cd ~/yasm_sources && \
4581
curl -O -L http://www.tortall.net/projects/yasm/releases/yasm-${YASM_VERSION}.tar.gz && \
4682
tar -xf yasm-${YASM_VERSION}.tar.gz && \
4783
cd yasm-${YASM_VERSION} && \
4884
./configure --prefix="$HOME/ffmpeg_build" --bindir="$HOME/bin" && \
4985
make -j$(getconf _NPROCESSORS_ONLN) && \
50-
make install
86+
make install && \
87+
cd .. && \
88+
rm -rf ~/yasm_sources
5189

52-
RUN cd ~/ffmpeg_sources && \
53-
git clone --depth 1 https://chromium.googlesource.com/webm/libvpx.git && \
90+
RUN mkdir ~/libvpx_sources && \
91+
cd ~/libvpx_sources && \
92+
git clone --depth 1 https://github.com/webmproject/libvpx.git && \
5493
cd libvpx && \
5594
./configure --prefix="$HOME/ffmpeg_build" --disable-examples --disable-unit-tests --enable-vp9-highbitdepth --as=yasm --enable-pic --enable-shared && \
5695
make -j$(getconf _NPROCESSORS_ONLN) && \
57-
make install
96+
make install && \
97+
cd .. && \
98+
rm -rf ~/libvpx_sources
5899

59-
RUN cd ~/ffmpeg_sources && \
100+
RUN mkdir ~/ffmpeg_sources && \
101+
cd ~/ffmpeg_sources && \
60102
curl -O -L https://ffmpeg.org/releases/ffmpeg-${FFMPEG_VERSION}.tar.bz2 && \
61103
tar -xf ffmpeg-${FFMPEG_VERSION}.tar.bz2 && \
62104
cd ffmpeg-${FFMPEG_VERSION} && \
@@ -66,14 +108,21 @@ RUN cd ~/ffmpeg_sources && \
66108
make install && \
67109
echo "/root/ffmpeg_build/lib/" >> /etc/ld.so.conf && \
68110
ldconfig && \
69-
rm -rf ~/ffmpeg_sources
111+
rm -rf ~/ffmpeg_sources && \
112+
yum remove bzip2-devel -y
70113

71114
RUN curl -O -L https://github.com/ccache/ccache/releases/download/v${CCACHE_VERSION}/ccache-${CCACHE_VERSION}.tar.gz && \
72115
tar -xf ccache-${CCACHE_VERSION}.tar.gz && \
73116
cd ccache-${CCACHE_VERSION} && \
74117
linux32 ./configure && \
75118
make -j$(getconf _NPROCESSORS_ONLN) && \
76-
make install
119+
make install && \
120+
cd .. && \
121+
rm -rf ccache-${CCACHE_VERSION}.tar.gz
122+
123+
# Git security vulnerability: https://github.blog/2022-04-12-git-security-vulnerability-announced
124+
RUN mkdir /io && \
125+
git config --global --add safe.directory /io
77126

78127
ENV PKG_CONFIG_PATH /usr/local/lib/pkgconfig:/root/ffmpeg_build/lib/pkgconfig
79128
ENV LDFLAGS -L/root/ffmpeg_build/lib

‎docker/manylinux2014/Dockerfile_x86_64

Lines changed: 63 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,61 +1,103 @@
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 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 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 ~/libpng_sources && \
22+
cd ~/libpng_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+
cd .. && \
30+
rm -rf ~/libpng_sources
31+
32+
RUN mkdir ~/freetype_sources && \
33+
cd ~/freetype_sources && \
34+
curl -O -L https://download.savannah.gnu.org/releases/freetype/freetype-${FREETYPE_VERSION}.tar.gz && \
35+
tar -xf freetype-${FREETYPE_VERSION}.tar.gz && \
36+
cd freetype-${FREETYPE_VERSION} && \
37+
./configure --prefix="$HOME/ffmpeg_build" --enable-freetype-config && \
38+
make && \
39+
make install && \
40+
cd .. && \
41+
rm -rf ~/freetype_sources
1042

1143
RUN curl -O -L https://download.qt.io/official_releases/qt/5.15/${QT_VERSION}/single/qt-everywhere-src-${QT_VERSION}.tar.xz && \
1244
tar -xf qt-everywhere-src-${QT_VERSION}.tar.xz && \
13-
cd qt-everywhere* && \
45+
cd qt-everywhere-src-${QT_VERSION} && \
1446
export MAKEFLAGS=-j$(nproc) && \
1547
./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 && \
1648
make && \
1749
make install && \
1850
cd .. && \
19-
rm -rf qt-everywhere-src-${QT_VERSION} && \
20-
rm qt-everywhere-src-${QT_VERSION}.tar.xz
51+
rm -rf qt-everywhere*
2152

2253
ENV QTDIR /opt/Qt${QT_VERSION}
2354
ENV PATH "$QTDIR/bin:$PATH"
2455

25-
RUN mkdir ~/ffmpeg_sources && \
26-
cd ~/ffmpeg_sources && \
56+
RUN mkdir ~/openssl_sources && \
57+
cd ~/openssl_sources && \
2758
curl -O -L https://github.com/openssl/openssl/archive/OpenSSL_${OPENSSL_VERSION}.tar.gz && \
2859
tar -xf OpenSSL_${OPENSSL_VERSION}.tar.gz && \
2960
cd openssl-OpenSSL_${OPENSSL_VERSION} && \
3061
./config --prefix="$HOME/ffmpeg_build" --openssldir="$HOME/ffmpeg_build" no-pinshared shared zlib && \
3162
make -j$(getconf _NPROCESSORS_ONLN) && \
3263
# skip installing documentation
3364
make install_sw && \
34-
rm -rf ~/openssl_build
65+
cd .. && \
66+
rm -rf ~/openssl_build ~/openssl_sources
3567

36-
RUN cd ~/ffmpeg_sources && \
68+
RUN mkdir ~/nasm_sources && \
69+
cd ~/nasm_sources && \
3770
curl -O -L http://www.nasm.us/pub/nasm/releasebuilds/${NASM_VERSION}/nasm-${NASM_VERSION}.tar.bz2 && \
3871
tar -xf nasm-${NASM_VERSION}.tar.bz2 && cd nasm-${NASM_VERSION} && ./autogen.sh && \
3972
./configure --prefix="$HOME/ffmpeg_build" --bindir="$HOME/bin" && \
4073
make -j$(getconf _NPROCESSORS_ONLN) && \
41-
make install
74+
make install && \
75+
cd .. && \
76+
rm -rf ~/nasm_sources
4277

43-
RUN cd ~/ffmpeg_sources && \
78+
RUN mkdir ~/yasm_sources && \
79+
cd ~/yasm_sources && \
4480
curl -O -L http://www.tortall.net/projects/yasm/releases/yasm-${YASM_VERSION}.tar.gz && \
4581
tar -xf yasm-${YASM_VERSION}.tar.gz && \
4682
cd yasm-${YASM_VERSION} && \
4783
./configure --prefix="$HOME/ffmpeg_build" --bindir="$HOME/bin" && \
4884
make -j$(getconf _NPROCESSORS_ONLN) && \
49-
make install
85+
make install && \
86+
cd .. && \
87+
rm -rf ~/yasm_sources
5088

51-
RUN cd ~/ffmpeg_sources && \
89+
RUN mkdir ~/libvpx_sources && \
90+
cd ~/libvpx_sources && \
5291
git clone --depth 1 https://chromium.googlesource.com/webm/libvpx.git && \
5392
cd libvpx && \
5493
./configure --prefix="$HOME/ffmpeg_build" --disable-examples --disable-unit-tests --enable-vp9-highbitdepth --as=yasm --enable-pic --enable-shared && \
5594
make -j$(getconf _NPROCESSORS_ONLN) && \
56-
make install
95+
make install && \
96+
cd .. && \
97+
rm -rf ~/libvpx_sources
5798

58-
RUN cd ~/ffmpeg_sources && \
99+
RUN mkdir ~/ffmpeg_sources && \
100+
cd ~/ffmpeg_sources && \
59101
curl -O -L https://ffmpeg.org/releases/ffmpeg-${FFMPEG_VERSION}.tar.bz2 && \
60102
tar -xf ffmpeg-${FFMPEG_VERSION}.tar.bz2 && \
61103
cd ffmpeg-${FFMPEG_VERSION} && \
@@ -65,7 +107,12 @@ RUN cd ~/ffmpeg_sources && \
65107
make install && \
66108
echo "/root/ffmpeg_build/lib/" >> /etc/ld.so.conf && \
67109
ldconfig && \
68-
rm -rf ~/ffmpeg_sources
110+
rm -rf ~/ffmpeg_sources && \
111+
yum remove bzip2-devel -y
112+
113+
# Git security vulnerability: https://github.blog/2022-04-12-git-security-vulnerability-announced
114+
RUN mkdir /io && \
115+
git config --global --add safe.directory /io
69116

70117
ENV PKG_CONFIG_PATH /usr/local/lib/pkgconfig:/root/ffmpeg_build/lib/pkgconfig
71118
ENV LDFLAGS -L/root/ffmpeg_build/lib

‎setup.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,6 @@ def main():
161161
"-DBUILD_DOCS=OFF",
162162
"-DPYTHON3_LIMITED_API=ON",
163163
"-DBUILD_OPENEXR=ON",
164-
"-DBUILD_PNG=ON",
165164
]
166165
+ (
167166
# CMake flags for windows/arm64 build

‎travis_config.sh

Lines changed: 0 additions & 5 deletions
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)
[8]ページ先頭
©2009-2025 Movatter.jp