Skip to content

Commit 209d32e

Browse files
authored
Merge pull request opencv#617 from asenyaev/asen/update_dockerfile
Updated openssl and ffmpeg in a dockerfile, turned on building libpng
2 parents 569acce + 0066feb commit 209d32e

File tree

4 files changed

+83
-61
lines changed

4 files changed

+83
-61
lines changed

docker/manylinux2014/Dockerfile_aarch64

+27-20
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,50 @@
11
FROM quay.io/pypa/manylinux2014_aarch64:latest
22

3+
ARG CCACHE_VERSION=3.7.9
4+
ARG FFMPEG_VERSION=4.4.1
5+
ARG NASM_VERSION=2.15.04
6+
ARG OPENSSL_VERSION=1_1_1m
7+
ARG QT_VERSION=5.15.0
8+
ARG YASM_VERSION=1.3.0
9+
310
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
411

5-
RUN curl -O -L https://download.qt.io/official_releases/qt/5.15/5.15.0/single/qt-everywhere-src-5.15.0.tar.xz && \
6-
tar -xf qt-everywhere-src-5.15.0.tar.xz && \
12+
RUN curl -O -L https://download.qt.io/official_releases/qt/5.15/${QT_VERSION}/single/qt-everywhere-src-${QT_VERSION}.tar.xz && \
13+
tar -xf qt-everywhere-src-${QT_VERSION}.tar.xz && \
714
cd qt-everywhere* && \
815
export MAKEFLAGS=-j$(nproc) && \
9-
./configure -prefix /opt/Qt5.15.0 -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 && \
16+
./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 && \
1017
make && \
1118
make install && \
1219
cd .. && \
13-
rm -rf qt-everywhere-src-5.15.0 && \
14-
rm qt-everywhere-src-5.15.0.tar.xz
20+
rm -rf qt-everywhere-src-${QT_VERSION} && \
21+
rm qt-everywhere-src-${QT_VERSION}.tar.xz
1522

16-
ENV QTDIR /opt/Qt5.15.0
23+
ENV QTDIR /opt/Qt${QT_VERSION}
1724
ENV PATH "$QTDIR/bin:$PATH"
1825

1926
RUN mkdir ~/ffmpeg_sources && \
2027
cd ~/ffmpeg_sources && \
21-
curl -O -L https://github.com/openssl/openssl/archive/OpenSSL_1_1_1g.tar.gz && \
22-
tar -xf OpenSSL_1_1_1g.tar.gz && \
23-
cd openssl-OpenSSL_1_1_1g && \
28+
curl -O -L https://github.com/openssl/openssl/archive/OpenSSL_${OPENSSL_VERSION}.tar.gz && \
29+
tar -xf OpenSSL_${OPENSSL_VERSION}.tar.gz && \
30+
cd openssl-OpenSSL_${OPENSSL_VERSION} && \
2431
./config --prefix="$HOME/ffmpeg_build" --openssldir="$HOME/ffmpeg_build" no-pinshared shared zlib && \
2532
make -j$(getconf _NPROCESSORS_ONLN) && \
2633
# skip installing documentation
2734
make install_sw && \
2835
rm -rf ~/openssl_build
2936

3037
RUN cd ~/ffmpeg_sources && \
31-
curl -O -L http://www.nasm.us/pub/nasm/releasebuilds/2.15.04/nasm-2.15.04.tar.bz2 && \
32-
tar -xf nasm-2.15.04.tar.bz2 && cd nasm-2.15.04 && ./autogen.sh && \
38+
curl -O -L http://www.nasm.us/pub/nasm/releasebuilds/${NASM_VERSION}/nasm-${NASM_VERSION}.tar.bz2 && \
39+
tar -xf nasm-${NASM_VERSION}.tar.bz2 && cd nasm-${NASM_VERSION} && ./autogen.sh && \
3340
./configure --prefix="$HOME/ffmpeg_build" --bindir="$HOME/bin" && \
3441
make -j$(getconf _NPROCESSORS_ONLN) && \
3542
make install
3643

3744
RUN cd ~/ffmpeg_sources && \
38-
curl -O -L http://www.tortall.net/projects/yasm/releases/yasm-1.3.0.tar.gz && \
39-
tar -xf yasm-1.3.0.tar.gz && \
40-
cd yasm-1.3.0 && \
45+
curl -O -L http://www.tortall.net/projects/yasm/releases/yasm-${YASM_VERSION}.tar.gz && \
46+
tar -xf yasm-${YASM_VERSION}.tar.gz && \
47+
cd yasm-${YASM_VERSION} && \
4148
./configure --prefix="$HOME/ffmpeg_build" --bindir="$HOME/bin" && \
4249
make -j$(getconf _NPROCESSORS_ONLN) && \
4350
make install
@@ -50,9 +57,9 @@ RUN cd ~/ffmpeg_sources && \
5057
make install
5158

5259
RUN cd ~/ffmpeg_sources && \
53-
curl -O -L https://ffmpeg.org/releases/ffmpeg-4.3.2.tar.bz2 && \
54-
tar -xf ffmpeg-4.3.2.tar.bz2 && \
55-
cd ffmpeg-4.3.2 && \
60+
curl -O -L https://ffmpeg.org/releases/ffmpeg-${FFMPEG_VERSION}.tar.bz2 && \
61+
tar -xf ffmpeg-${FFMPEG_VERSION}.tar.bz2 && \
62+
cd ffmpeg-${FFMPEG_VERSION} && \
5663
PATH=~/bin:$PATH && \
5764
PKG_CONFIG_PATH="$HOME/ffmpeg_build/lib/pkgconfig" ./configure --prefix="$HOME/ffmpeg_build" --extra-cflags="-I$HOME/ffmpeg_build/include" --extra-ldflags="-L$HOME/ffmpeg_build/lib" --enable-openssl --enable-libvpx --enable-shared --enable-pic --bindir="$HOME/bin" && \
5865
make -j$(getconf _NPROCESSORS_ONLN) && \
@@ -61,9 +68,9 @@ RUN cd ~/ffmpeg_sources && \
6168
ldconfig && \
6269
rm -rf ~/ffmpeg_sources
6370

64-
RUN curl -O -L https://github.com/ccache/ccache/releases/download/v3.7.9/ccache-3.7.9.tar.gz && \
65-
tar -xf ccache-3.7.9.tar.gz && \
66-
cd ccache-3.7.9 && \
71+
RUN curl -O -L https://github.com/ccache/ccache/releases/download/v${CCACHE_VERSION}/ccache-${CCACHE_VERSION}.tar.gz && \
72+
tar -xf ccache-${CCACHE_VERSION}.tar.gz && \
73+
cd ccache-${CCACHE_VERSION} && \
6774
linux32 ./configure && \
6875
make -j$(getconf _NPROCESSORS_ONLN) && \
6976
make install

docker/manylinux2014/Dockerfile_i686

+32-24
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,34 @@
11
FROM quay.io/pypa/manylinux2014_i686:latest
22

3+
ARG CCACHE_VERSION=3.7.9
4+
ARG CMAKE_VERSION=3.17.0
5+
ARG FFMPEG_VERSION=4.4.1
6+
ARG NASM_VERSION=2.15.04
7+
ARG OPENSSL_VERSION=1_1_1m
8+
ARG QT_VERSION=5.15.0
9+
ARG YASM_VERSION=1.3.0
10+
311
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
412

5-
RUN curl -O -L https://download.qt.io/official_releases/qt/5.15/5.15.0/single/qt-everywhere-src-5.15.0.tar.xz && \
6-
tar -xf qt-everywhere-src-5.15.0.tar.xz && \
13+
RUN curl -O -L https://download.qt.io/official_releases/qt/5.15/${QT_VERSION}/single/qt-everywhere-src-${QT_VERSION}.tar.xz && \
14+
tar -xf qt-everywhere-src-${QT_VERSION}.tar.xz && \
715
cd qt-everywhere* && \
816
export MAKEFLAGS=-j$(nproc) && \
9-
./configure -prefix /opt/Qt5.15.0 -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 && \
17+
./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 && \
1018
make && \
1119
make install && \
1220
cd .. && \
13-
rm -rf qt-everywhere-src-5.15.0 && \
14-
rm qt-everywhere-src-5.15.0.tar.xz
21+
rm -rf qt-everywhere-src-${QT_VERSION} && \
22+
rm qt-everywhere-src-${QT_VERSION}.tar.xz
1523

16-
ENV QTDIR /opt/Qt5.15.0
24+
ENV QTDIR /opt/Qt${QT_VERSION}
1725
ENV PATH "$QTDIR/bin:$PATH"
1826

1927
RUN mkdir ~/ffmpeg_sources && \
2028
cd ~/ffmpeg_sources && \
21-
curl -O -L https://github.com/openssl/openssl/archive/OpenSSL_1_1_1g.tar.gz && \
22-
tar -xf OpenSSL_1_1_1g.tar.gz && \
23-
cd openssl-OpenSSL_1_1_1g && \
29+
curl -O -L https://github.com/openssl/openssl/archive/OpenSSL_${OPENSSL_VERSION}.tar.gz && \
30+
tar -xf OpenSSL_${OPENSSL_VERSION}.tar.gz && \
31+
cd openssl-OpenSSL_${OPENSSL_VERSION} && \
2432
# in i686, ./config detects x64 in i686 container without linux32
2533
# when run from "docker build"
2634
linux32 ./config --prefix="$HOME/ffmpeg_build" no-pinshared shared zlib && \
@@ -30,16 +38,16 @@ RUN mkdir ~/ffmpeg_sources && \
3038
rm -rf ~/openssl_build
3139

3240
RUN cd ~/ffmpeg_sources && \
33-
curl -O -L http://www.nasm.us/pub/nasm/releasebuilds/2.15.04/nasm-2.15.04.tar.bz2 && \
34-
tar -xf nasm-2.15.04.tar.bz2 && cd nasm-2.15.04 && ./autogen.sh && \
41+
curl -O -L http://www.nasm.us/pub/nasm/releasebuilds/${NASM_VERSION}/nasm-${NASM_VERSION}.tar.bz2 && \
42+
tar -xf nasm-${NASM_VERSION}.tar.bz2 && cd nasm-${NASM_VERSION} && ./autogen.sh && \
3543
linux32 ./configure && \
3644
make -j$(getconf _NPROCESSORS_ONLN) && \
3745
make install
3846

3947
RUN cd ~/ffmpeg_sources && \
40-
curl -O -L http://www.tortall.net/projects/yasm/releases/yasm-1.3.0.tar.gz && \
41-
tar -xf yasm-1.3.0.tar.gz && \
42-
cd yasm-1.3.0 && \
48+
curl -O -L http://www.tortall.net/projects/yasm/releases/yasm-${YASM_VERSION}.tar.gz && \
49+
tar -xf yasm-${YASM_VERSION}.tar.gz && \
50+
cd yasm-${YASM_VERSION} && \
4351
linux32 ./configure && \
4452
make -j$(getconf _NPROCESSORS_ONLN) && \
4553
make install
@@ -52,9 +60,9 @@ RUN cd ~/ffmpeg_sources && \
5260
make install
5361

5462
RUN cd ~/ffmpeg_sources && \
55-
curl -O -L https://ffmpeg.org/releases/ffmpeg-4.3.2.tar.bz2 && \
56-
tar -xf ffmpeg-4.3.2.tar.bz2 && \
57-
cd ffmpeg-4.3.2 && \
63+
curl -O -L https://ffmpeg.org/releases/ffmpeg-${FFMPEG_VERSION}.tar.bz2 && \
64+
tar -xf ffmpeg-${FFMPEG_VERSION}.tar.bz2 && \
65+
cd ffmpeg-${FFMPEG_VERSION} && \
5866
PATH=~/bin:$PATH && \
5967
PKG_CONFIG_PATH="$HOME/ffmpeg_build/lib/pkgconfig" linux32 ./configure --prefix="$HOME/ffmpeg_build" --extra-cflags="-I$HOME/ffmpeg_build/include" --extra-ldflags="-L$HOME/ffmpeg_build/lib" --enable-openssl --enable-libvpx --enable-shared --enable-pic --bindir="$HOME/bin" && \
6068
make -j$(getconf _NPROCESSORS_ONLN) && \
@@ -63,22 +71,22 @@ RUN cd ~/ffmpeg_sources && \
6371
ldconfig && \
6472
rm -rf ~/ffmpeg_sources
6573

66-
RUN curl -O -L https://github.com/ccache/ccache/releases/download/v3.7.9/ccache-3.7.9.tar.gz && \
67-
tar -xf ccache-3.7.9.tar.gz && \
68-
cd ccache-3.7.9 && \
74+
RUN curl -O -L https://github.com/ccache/ccache/releases/download/v${CCACHE_VERSION}/ccache-${CCACHE_VERSION}.tar.gz && \
75+
tar -xf ccache-${CCACHE_VERSION}.tar.gz && \
76+
cd ccache-${CCACHE_VERSION} && \
6977
linux32 ./configure && \
7078
make -j$(getconf _NPROCESSORS_ONLN) && \
7179
make install
7280

73-
RUN curl -O -L https://github.com/Kitware/CMake/releases/download/v3.17.0/cmake-3.17.0.tar.gz && \
74-
tar -xf cmake-3.17.0.tar.gz && \
75-
cd cmake-3.17.0 && \
81+
RUN curl -O -L https://github.com/Kitware/CMake/releases/download/v${CMAKE_VERSION}/cmake-${CMAKE_VERSION}.tar.gz && \
82+
tar -xf cmake-${CMAKE_VERSION}.tar.gz && \
83+
cd cmake-${CMAKE_VERSION} && \
7684
export MAKEFLAGS=-j$(getconf _NPROCESSORS_ONLN) && \
7785
./configure --system-curl && \
7886
make && \
7987
make install && \
8088
cd .. && \
81-
rm -rf cmake-3.17.0*
89+
rm -rf cmake-${CMAKE_VERSION}*
8290

8391
ENV PKG_CONFIG_PATH /usr/local/lib/pkgconfig:/root/ffmpeg_build/lib/pkgconfig
8492
ENV LDFLAGS -L/root/ffmpeg_build/lib

docker/manylinux2014/Dockerfile_x86_64

+23-17
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,49 @@
11
FROM quay.io/pypa/manylinux2014_x86_64:latest
22

3+
ARG FFMPEG_VERSION=4.4.1
4+
ARG NASM_VERSION=2.15.04
5+
ARG OPENSSL_VERSION=1_1_1m
6+
ARG QT_VERSION=5.15.0
7+
ARG YASM_VERSION=1.3.0
8+
39
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
410

5-
RUN curl -O -L https://download.qt.io/official_releases/qt/5.15/5.15.0/single/qt-everywhere-src-5.15.0.tar.xz && \
6-
tar -xf qt-everywhere-src-5.15.0.tar.xz && \
11+
RUN curl -O -L https://download.qt.io/official_releases/qt/5.15/${QT_VERSION}/single/qt-everywhere-src-${QT_VERSION}.tar.xz && \
12+
tar -xf qt-everywhere-src-${QT_VERSION}.tar.xz && \
713
cd qt-everywhere* && \
814
export MAKEFLAGS=-j$(nproc) && \
9-
./configure -prefix /opt/Qt5.15.0 -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 && \
15+
./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 && \
1016
make && \
1117
make install && \
1218
cd .. && \
13-
rm -rf qt-everywhere-src-5.15.0 && \
14-
rm qt-everywhere-src-5.15.0.tar.xz
19+
rm -rf qt-everywhere-src-${QT_VERSION} && \
20+
rm qt-everywhere-src-${QT_VERSION}.tar.xz
1521

16-
ENV QTDIR /opt/Qt5.15.0
22+
ENV QTDIR /opt/Qt${QT_VERSION}
1723
ENV PATH "$QTDIR/bin:$PATH"
1824

1925
RUN mkdir ~/ffmpeg_sources && \
2026
cd ~/ffmpeg_sources && \
21-
curl -O -L https://github.com/openssl/openssl/archive/OpenSSL_1_1_1g.tar.gz && \
22-
tar -xf OpenSSL_1_1_1g.tar.gz && \
23-
cd openssl-OpenSSL_1_1_1g && \
27+
curl -O -L https://github.com/openssl/openssl/archive/OpenSSL_${OPENSSL_VERSION}.tar.gz && \
28+
tar -xf OpenSSL_${OPENSSL_VERSION}.tar.gz && \
29+
cd openssl-OpenSSL_${OPENSSL_VERSION} && \
2430
./config --prefix="$HOME/ffmpeg_build" --openssldir="$HOME/ffmpeg_build" no-pinshared shared zlib && \
2531
make -j$(getconf _NPROCESSORS_ONLN) && \
2632
# skip installing documentation
2733
make install_sw && \
2834
rm -rf ~/openssl_build
2935

3036
RUN cd ~/ffmpeg_sources && \
31-
curl -O -L http://www.nasm.us/pub/nasm/releasebuilds/2.15.04/nasm-2.15.04.tar.bz2 && \
32-
tar -xf nasm-2.15.04.tar.bz2 && cd nasm-2.15.04 && ./autogen.sh && \
37+
curl -O -L http://www.nasm.us/pub/nasm/releasebuilds/${NASM_VERSION}/nasm-${NASM_VERSION}.tar.bz2 && \
38+
tar -xf nasm-${NASM_VERSION}.tar.bz2 && cd nasm-${NASM_VERSION} && ./autogen.sh && \
3339
./configure --prefix="$HOME/ffmpeg_build" --bindir="$HOME/bin" && \
3440
make -j$(getconf _NPROCESSORS_ONLN) && \
3541
make install
3642

3743
RUN cd ~/ffmpeg_sources && \
38-
curl -O -L http://www.tortall.net/projects/yasm/releases/yasm-1.3.0.tar.gz && \
39-
tar -xf yasm-1.3.0.tar.gz && \
40-
cd yasm-1.3.0 && \
44+
curl -O -L http://www.tortall.net/projects/yasm/releases/yasm-${YASM_VERSION}.tar.gz && \
45+
tar -xf yasm-${YASM_VERSION}.tar.gz && \
46+
cd yasm-${YASM_VERSION} && \
4147
./configure --prefix="$HOME/ffmpeg_build" --bindir="$HOME/bin" && \
4248
make -j$(getconf _NPROCESSORS_ONLN) && \
4349
make install
@@ -50,9 +56,9 @@ RUN cd ~/ffmpeg_sources && \
5056
make install
5157

5258
RUN cd ~/ffmpeg_sources && \
53-
curl -O -L https://ffmpeg.org/releases/ffmpeg-4.3.2.tar.bz2 && \
54-
tar -xf ffmpeg-4.3.2.tar.bz2 && \
55-
cd ffmpeg-4.3.2 && \
59+
curl -O -L https://ffmpeg.org/releases/ffmpeg-${FFMPEG_VERSION}.tar.bz2 && \
60+
tar -xf ffmpeg-${FFMPEG_VERSION}.tar.bz2 && \
61+
cd ffmpeg-${FFMPEG_VERSION} && \
5662
PATH=~/bin:$PATH && \
5763
PKG_CONFIG_PATH="$HOME/ffmpeg_build/lib/pkgconfig" ./configure --prefix="$HOME/ffmpeg_build" --extra-cflags="-I$HOME/ffmpeg_build/include" --extra-ldflags="-L$HOME/ffmpeg_build/lib" --enable-openssl --enable-libvpx --enable-shared --enable-pic --bindir="$HOME/bin" && \
5864
make -j$(getconf _NPROCESSORS_ONLN) && \

setup.py

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

0 commit comments

Comments
 (0)