From 8edc83f6dcbe607c292417c9edbeff606263ebaa Mon Sep 17 00:00:00 2001
From: Andrey Senyaev <andrey.senyaev@gmail.com>
Date: Mon, 24 Jan 2022 19:55:15 +0300
Subject: [PATCH] Updated dependencies to the latest releases (openssl and
 ffmpeg) in a dockerfile, turned on building libpng

---
 docker/manylinux2014/Dockerfile_aarch64 | 12 ++++++------
 docker/manylinux2014/Dockerfile_i686    | 12 ++++++------
 docker/manylinux2014/Dockerfile_x86_64  | 12 ++++++------
 setup.py                                |  1 +
 4 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/docker/manylinux2014/Dockerfile_aarch64 b/docker/manylinux2014/Dockerfile_aarch64
index c76ccec4..9a5b0a48 100644
--- a/docker/manylinux2014/Dockerfile_aarch64
+++ b/docker/manylinux2014/Dockerfile_aarch64
@@ -18,9 +18,9 @@ ENV PATH "$QTDIR/bin:$PATH"
 
 RUN mkdir ~/ffmpeg_sources && \
     cd ~/ffmpeg_sources && \
-    curl -O -L https://github.com/openssl/openssl/archive/OpenSSL_1_1_1g.tar.gz && \
-    tar -xf OpenSSL_1_1_1g.tar.gz && \
-    cd openssl-OpenSSL_1_1_1g && \
+    curl -O -L https://github.com/openssl/openssl/archive/OpenSSL_1_1_1m.tar.gz && \
+    tar -xf OpenSSL_1_1_1m.tar.gz && \
+    cd openssl-OpenSSL_1_1_1m && \
     ./config --prefix="$HOME/ffmpeg_build" --openssldir="$HOME/ffmpeg_build" no-pinshared shared zlib && \
     make -j$(getconf _NPROCESSORS_ONLN) && \
     # skip installing documentation
@@ -50,9 +50,9 @@ RUN cd ~/ffmpeg_sources && \
     make install
 
 RUN cd ~/ffmpeg_sources && \
-    curl -O -L https://ffmpeg.org/releases/ffmpeg-4.3.2.tar.bz2 && \
-    tar -xf ffmpeg-4.3.2.tar.bz2 && \
-    cd ffmpeg-4.3.2 && \
+    curl -O -L https://ffmpeg.org/releases/ffmpeg-4.4.1.tar.bz2 && \
+    tar -xf ffmpeg-4.4.1.tar.bz2 && \
+    cd ffmpeg-4.4.1 && \
     PATH=~/bin:$PATH && \
     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" && \
     make -j$(getconf _NPROCESSORS_ONLN) && \
diff --git a/docker/manylinux2014/Dockerfile_i686 b/docker/manylinux2014/Dockerfile_i686
index 6a60a073..b434f5c0 100644
--- a/docker/manylinux2014/Dockerfile_i686
+++ b/docker/manylinux2014/Dockerfile_i686
@@ -18,9 +18,9 @@ ENV PATH "$QTDIR/bin:$PATH"
 
 RUN mkdir ~/ffmpeg_sources && \
     cd ~/ffmpeg_sources && \
-    curl -O -L https://github.com/openssl/openssl/archive/OpenSSL_1_1_1g.tar.gz && \
-    tar -xf OpenSSL_1_1_1g.tar.gz && \
-    cd openssl-OpenSSL_1_1_1g && \
+    curl -O -L https://github.com/openssl/openssl/archive/OpenSSL_1_1_1m.tar.gz && \
+    tar -xf OpenSSL_1_1_1m.tar.gz && \
+    cd openssl-OpenSSL_1_1_1m && \
     # in i686, ./config detects x64 in i686 container without linux32
     # when run from "docker build"
     linux32 ./config --prefix="$HOME/ffmpeg_build" no-pinshared shared zlib && \
@@ -52,9 +52,9 @@ RUN cd ~/ffmpeg_sources && \
     make install
 
 RUN cd ~/ffmpeg_sources && \
-    curl -O -L https://ffmpeg.org/releases/ffmpeg-4.3.2.tar.bz2 && \
-    tar -xf ffmpeg-4.3.2.tar.bz2 && \
-    cd ffmpeg-4.3.2 && \
+    curl -O -L https://ffmpeg.org/releases/ffmpeg-4.4.1.tar.bz2 && \
+    tar -xf ffmpeg-4.4.1.tar.bz2 && \
+    cd ffmpeg-4.4.1 && \
     PATH=~/bin:$PATH && \
     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" && \
     make -j$(getconf _NPROCESSORS_ONLN) && \
diff --git a/docker/manylinux2014/Dockerfile_x86_64 b/docker/manylinux2014/Dockerfile_x86_64
index 49622378..cfa55409 100644
--- a/docker/manylinux2014/Dockerfile_x86_64
+++ b/docker/manylinux2014/Dockerfile_x86_64
@@ -18,9 +18,9 @@ ENV PATH "$QTDIR/bin:$PATH"
 
 RUN mkdir ~/ffmpeg_sources && \
     cd ~/ffmpeg_sources && \
-    curl -O -L https://github.com/openssl/openssl/archive/OpenSSL_1_1_1g.tar.gz && \
-    tar -xf OpenSSL_1_1_1g.tar.gz && \
-    cd openssl-OpenSSL_1_1_1g && \
+    curl -O -L https://github.com/openssl/openssl/archive/OpenSSL_1_1_1m.tar.gz && \
+    tar -xf OpenSSL_1_1_1m.tar.gz && \
+    cd openssl-OpenSSL_1_1_1m && \
     ./config --prefix="$HOME/ffmpeg_build" --openssldir="$HOME/ffmpeg_build" no-pinshared shared zlib && \
     make -j$(getconf _NPROCESSORS_ONLN) && \
     # skip installing documentation
@@ -50,9 +50,9 @@ RUN cd ~/ffmpeg_sources && \
     make install
 
 RUN cd ~/ffmpeg_sources && \
-    curl -O -L https://ffmpeg.org/releases/ffmpeg-4.3.2.tar.bz2 && \
-    tar -xf ffmpeg-4.3.2.tar.bz2 && \
-    cd ffmpeg-4.3.2 && \
+    curl -O -L https://ffmpeg.org/releases/fffmpeg-4.4.1.tar.bz2 && \
+    tar -xf fffmpeg-4.4.1.tar.bz2 && \
+    cd fffmpeg-4.4.1 && \
     PATH=~/bin:$PATH && \
     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" && \
     make -j$(getconf _NPROCESSORS_ONLN) && \
diff --git a/setup.py b/setup.py
index 63c66320..5b79e389 100644
--- a/setup.py
+++ b/setup.py
@@ -161,6 +161,7 @@ def main():
             "-DBUILD_DOCS=OFF",
             "-DPYTHON3_LIMITED_API=ON",
             "-DBUILD_OPENEXR=ON",
+            "-DBUILD_PNG=ON",
         ]
         + (
             # If it is not defined 'linker flags: /machine:X86' on Windows x64