Skip to content

Commit f2c53bd

Browse files
abhiTronixabhiTronix
committed
Additional Fixes
- updates to OpenSSL build from scratch - removed specific protocol - Added neccessary dependency
1 parent a577c57 commit f2c53bd

File tree

2 files changed

+18
-4
lines changed

2 files changed

+18
-4
lines changed

‎docker/Dockerfile_i686

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ RUN curl -O -L https://cmake.org/files/v3.9/cmake-3.9.0.tar.gz && \
2323
cd .. && \
2424
rm -rf cmake-3.9.0*
2525

26-
RUN yum install autoconf automake bzip2 cmake freetype-devel gcc gcc-c++ libtool make mercurial pkgconfig openssl-devel zlib-devel -y && \
26+
RUN yum install autoconf automake bzip2 cmake freetype-devel gcc gcc-c++ libtool make mercurial pkgconfig perl-core zlib-devel -y && \
2727
yum remove nasm -y && \
2828
mkdir ~/ffmpeg_sources && \
2929
cd ~/ffmpeg_sources && \
@@ -45,12 +45,19 @@ RUN yum install autoconf automake bzip2 cmake freetype-devel gcc gcc-c++ libtool
4545
./configure --prefix="$HOME/ffmpeg_build" --disable-examples --disable-unit-tests --enable-vp9-highbitdepth --as=yasm --enable-pic --enable-shared && \
4646
make -j4 && \
4747
make install && \
48+
cd ~/ffmpeg_sources && \
49+
curl -O -L https://github.com/openssl/openssl/archive/OpenSSL_1_1_1c.tar.gz && \
50+
tar -zxvf OpenSSL_1_1_1c.tar.gz && \
51+
cd openssl-OpenSSL_1_1_1c && \
52+
./configure --prefix="$HOME/ffmpeg_build" --openssldir="$HOME/ffmpeg_build" shared zlib && \
53+
make -j4 && \
54+
make install && \
4855
cd ~/ffmpeg_sources && \
4956
curl -O -L https://ffmpeg.org/releases/ffmpeg-snapshot.tar.bz2 && \
5057
tar xjvf ffmpeg-snapshot.tar.bz2 && \
5158
cd ffmpeg && \
5259
PATH=~/bin:$PATH && \
53-
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-libvpx --enable-openssl --enable-protocol=file,ftp,http,https,httpproxy,hls,mmsh,mmst,pipe,rtmp,rtmps,rtmpt,rtmpts,rtp,sctp,srtp,tcp,udp --enable-shared --enable-pic --bindir="$HOME/bin" && \
60+
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-libvpx --enable-openssl --enable-shared --enable-pic --bindir="$HOME/bin" && \
5461
make -j4 && \
5562
make install && \
5663
echo "/root/ffmpeg_build/lib/" >> /etc/ld.so.conf && \

‎docker/Dockerfile_x86_64

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ RUN curl -O -L https://cmake.org/files/v3.9/cmake-3.9.0.tar.gz && \
2323
cd .. && \
2424
rm -rf cmake-3.9.0*
2525

26-
RUN yum install autoconf automake bzip2 cmake freetype-devel gcc gcc-c++ libtool make mercurial pkgconfig openssl-devel zlib-devel -y && \
26+
RUN yum install autoconf automake bzip2 cmake freetype-devel gcc gcc-c++ libtool make mercurial pkgconfig perl-core zlib-devel -y && \
2727
yum remove nasm -y && \
2828
mkdir ~/ffmpeg_sources && \
2929
cd ~/ffmpeg_sources && \
@@ -46,11 +46,18 @@ RUN yum install autoconf automake bzip2 cmake freetype-devel gcc gcc-c++ libtool
4646
make -j4 && \
4747
make install && \
4848
cd ~/ffmpeg_sources && \
49+
curl -O -L https://github.com/openssl/openssl/archive/OpenSSL_1_1_1c.tar.gz && \
50+
tar -zxvf OpenSSL_1_1_1c.tar.gz && \
51+
cd openssl-OpenSSL_1_1_1c && \
52+
./configure --prefix="$HOME/ffmpeg_build" --openssldir="$HOME/ffmpeg_build" shared zlib && \
53+
make -j4 && \
54+
make install && \
55+
cd ~/ffmpeg_sources && \
4956
curl -O -L https://ffmpeg.org/releases/ffmpeg-snapshot.tar.bz2 && \
5057
tar xjvf ffmpeg-snapshot.tar.bz2 && \
5158
cd ffmpeg && \
5259
PATH=~/bin:$PATH && \
53-
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-protocol=file,ftp,http,https,httpproxy,hls,mmsh,mmst,pipe,rtmp,rtmps,rtmpt,rtmpts,rtp,sctp,srtp,tcp,udp --enable-shared --enable-pic --bindir="$HOME/bin" && \
60+
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" && \
5461
make -j4 && \
5562
make install && \
5663
echo "/root/ffmpeg_build/lib/" >> /etc/ld.so.conf && \

0 commit comments

Comments
 (0)