File tree Expand file tree Collapse file tree 4 files changed +19
-18
lines changed Expand file tree Collapse file tree 4 files changed +19
-18
lines changed Original file line number Diff line number Diff line change @@ -18,9 +18,9 @@ ENV PATH "$QTDIR/bin:$PATH"
1818
1919RUN mkdir ~/ffmpeg_sources && \
2020 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 && \
21+ curl -O -L https://github.com/openssl/openssl/archive/OpenSSL_1_1_1m .tar.gz && \
22+ tar -xf OpenSSL_1_1_1m .tar.gz && \
23+ cd openssl-OpenSSL_1_1_1m && \
2424 ./config --prefix="$HOME/ffmpeg_build" --openssldir="$HOME/ffmpeg_build" no-pinshared shared zlib && \
2525 make -j$(getconf _NPROCESSORS_ONLN) && \
2626 # skip installing documentation
@@ -50,9 +50,9 @@ RUN cd ~/ffmpeg_sources && \
5050 make install
5151
5252RUN 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 && \
53+ curl -O -L https://ffmpeg.org/releases/ffmpeg-4.4.1 .tar.bz2 && \
54+ tar -xf ffmpeg-4.4.1 .tar.bz2 && \
55+ cd ffmpeg-4.4.1 && \
5656 PATH=~/bin:$PATH && \
5757 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" && \
5858 make -j$(getconf _NPROCESSORS_ONLN) && \
Original file line number Diff line number Diff line change @@ -18,9 +18,9 @@ ENV PATH "$QTDIR/bin:$PATH"
1818
1919RUN mkdir ~/ffmpeg_sources && \
2020 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 && \
21+ curl -O -L https://github.com/openssl/openssl/archive/OpenSSL_1_1_1m .tar.gz && \
22+ tar -xf OpenSSL_1_1_1m .tar.gz && \
23+ cd openssl-OpenSSL_1_1_1m && \
2424 # in i686, ./config detects x64 in i686 container without linux32
2525 # when run from "docker build"
2626 linux32 ./config --prefix="$HOME/ffmpeg_build" no-pinshared shared zlib && \
@@ -52,9 +52,9 @@ RUN cd ~/ffmpeg_sources && \
5252 make install
5353
5454RUN 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 && \
55+ curl -O -L https://ffmpeg.org/releases/ffmpeg-4.4.1 .tar.bz2 && \
56+ tar -xf ffmpeg-4.4.1 .tar.bz2 && \
57+ cd ffmpeg-4.4.1 && \
5858 PATH=~/bin:$PATH && \
5959 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" && \
6060 make -j$(getconf _NPROCESSORS_ONLN) && \
Original file line number Diff line number Diff line change @@ -18,9 +18,9 @@ ENV PATH "$QTDIR/bin:$PATH"
1818
1919RUN mkdir ~/ffmpeg_sources && \
2020 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 && \
21+ curl -O -L https://github.com/openssl/openssl/archive/OpenSSL_1_1_1m .tar.gz && \
22+ tar -xf OpenSSL_1_1_1m .tar.gz && \
23+ cd openssl-OpenSSL_1_1_1m && \
2424 ./config --prefix="$HOME/ffmpeg_build" --openssldir="$HOME/ffmpeg_build" no-pinshared shared zlib && \
2525 make -j$(getconf _NPROCESSORS_ONLN) && \
2626 # skip installing documentation
@@ -50,9 +50,9 @@ RUN cd ~/ffmpeg_sources && \
5050 make install
5151
5252RUN 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 && \
53+ curl -O -L https://ffmpeg.org/releases/ffmpeg-4.4.1 .tar.bz2 && \
54+ tar -xf ffmpeg-4.4.1 .tar.bz2 && \
55+ cd ffmpeg-4.4.1 && \
5656 PATH=~/bin:$PATH && \
5757 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" && \
5858 make -j$(getconf _NPROCESSORS_ONLN) && \
Original file line number Diff line number Diff 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
You can’t perform that action at this time.
0 commit comments