File tree 4 files changed +19
-18
lines changed
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"
18
18
19
19
RUN mkdir ~/ffmpeg_sources && \
20
20
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 && \
24
24
./config --prefix="$HOME/ffmpeg_build" --openssldir="$HOME/ffmpeg_build" no-pinshared shared zlib && \
25
25
make -j$(getconf _NPROCESSORS_ONLN) && \
26
26
# skip installing documentation
@@ -50,9 +50,9 @@ RUN cd ~/ffmpeg_sources && \
50
50
make install
51
51
52
52
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 && \
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 && \
56
56
PATH=~/bin:$PATH && \
57
57
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" && \
58
58
make -j$(getconf _NPROCESSORS_ONLN) && \
Original file line number Diff line number Diff line change @@ -18,9 +18,9 @@ ENV PATH "$QTDIR/bin:$PATH"
18
18
19
19
RUN mkdir ~/ffmpeg_sources && \
20
20
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 && \
24
24
# in i686, ./config detects x64 in i686 container without linux32
25
25
# when run from "docker build"
26
26
linux32 ./config --prefix="$HOME/ffmpeg_build" no-pinshared shared zlib && \
@@ -52,9 +52,9 @@ RUN cd ~/ffmpeg_sources && \
52
52
make install
53
53
54
54
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 && \
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 && \
58
58
PATH=~/bin:$PATH && \
59
59
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" && \
60
60
make -j$(getconf _NPROCESSORS_ONLN) && \
Original file line number Diff line number Diff line change @@ -18,9 +18,9 @@ ENV PATH "$QTDIR/bin:$PATH"
18
18
19
19
RUN mkdir ~/ffmpeg_sources && \
20
20
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 && \
24
24
./config --prefix="$HOME/ffmpeg_build" --openssldir="$HOME/ffmpeg_build" no-pinshared shared zlib && \
25
25
make -j$(getconf _NPROCESSORS_ONLN) && \
26
26
# skip installing documentation
@@ -50,9 +50,9 @@ RUN cd ~/ffmpeg_sources && \
50
50
make install
51
51
52
52
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 && \
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 && \
56
56
PATH=~/bin:$PATH && \
57
57
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" && \
58
58
make -j$(getconf _NPROCESSORS_ONLN) && \
Original file line number Diff line number Diff line change @@ -161,6 +161,7 @@ def main():
161
161
"-DBUILD_DOCS=OFF" ,
162
162
"-DPYTHON3_LIMITED_API=ON" ,
163
163
"-DBUILD_OPENEXR=ON" ,
164
+ "-DBUILD_PNG=ON" ,
164
165
]
165
166
+ (
166
167
# If it is not defined 'linker flags: /machine:X86' on Windows x64
You can’t perform that action at this time.
0 commit comments