diff --git a/docker/Dockerfile_i686 b/docker/Dockerfile_i686 index d6f17615..4f92c30f 100644 --- a/docker/Dockerfile_i686 +++ b/docker/Dockerfile_i686 @@ -13,18 +13,28 @@ RUN curl -O -L https://download.qt.io/archive/qt/4.8/4.8.7/qt-everywhere-opensou ENV QTDIR /opt/Qt4.8.7 ENV PATH "$QTDIR/bin:$PATH" -RUN curl -O -L https://cmake.org/files/v3.9/cmake-3.9.0.tar.gz && \ - tar -zxf cmake-3.9.0.tar.gz && \ - cd cmake-3.9.0 && \ - yum -y install curl-devel zlib-devel && \ - ./configure --system-curl && \ - make && \ - make install && \ - cd .. && \ +RUN curl -O -L https://cmake.org/files/v3.9/cmake-3.9.0.tar.gz && \ + tar -zxf cmake-3.9.0.tar.gz && \ + cd cmake-3.9.0 && \ + yum -y install curl-devel zlib-devel && \ + ./configure --system-curl && \ + make -j4 && \ + make install && \ + cd .. && \ rm -rf cmake-3.9.0* -RUN yum install autoconf automake bzip2 cmake freetype-devel gcc gcc-c++ libtool make mercurial pkgconfig perl-core zlib-devel -y && \ - yum remove nasm -y && \ +RUN curl -O -L https://www.cpan.org/src/5.0/perl-5.10.1.tar.gz && \ + tar -xzf perl-5.10.1.tar.gz && \ + yum install autoconf automake bzip2 git freetype-devel gcc gcc-c++ libtool make pkgconfig -y && \ + cd perl-5.10.1 && \ + ./Configure -des -Dprefix=$HOME/ffmpeg_build && \ + make -j4 && \ + make install && \ + cd .. && \ + rm -rf perl-5.10.1* && \ + PATH=$HOME/ffmpeg_build/bin:$PATH #otherwise perl not detected at runtime + +RUN yum remove nasm -y && \ mkdir ~/ffmpeg_sources && \ cd ~/ffmpeg_sources && \ curl -O -L http://www.nasm.us/pub/nasm/releasebuilds/2.13.02/nasm-2.13.02.tar.bz2 && \ @@ -45,19 +55,19 @@ RUN yum install autoconf automake bzip2 cmake freetype-devel gcc gcc-c++ libtool ./configure --prefix="$HOME/ffmpeg_build" --disable-examples --disable-unit-tests --enable-vp9-highbitdepth --as=yasm --enable-pic --enable-shared && \ make -j4 && \ make install && \ - cd ~/ffmpeg_sources && \ + cd ~/ffmpeg_sources && \ curl -O -L https://github.com/openssl/openssl/archive/OpenSSL_1_1_1c.tar.gz && \ tar -zxvf OpenSSL_1_1_1c.tar.gz && \ cd openssl-OpenSSL_1_1_1c && \ - ./Configure --prefix="$HOME/ffmpeg_build" --openssldir="$HOME/ffmpeg_build" shared zlib && \ + ./config --prefix="$HOME/ffmpeg_build" --openssldir="$HOME/ffmpeg_build" shared zlib && \ make -j4 && \ - make install && \ + make install_sw && \ #skip building man-pages cd ~/ffmpeg_sources && \ curl -O -L https://ffmpeg.org/releases/ffmpeg-snapshot.tar.bz2 && \ tar xjvf ffmpeg-snapshot.tar.bz2 && \ cd ffmpeg && \ 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-libvpx --enable-openssl --enable-shared --enable-pic --bindir="$HOME/bin" && \ + 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 -j4 && \ make install && \ echo "/root/ffmpeg_build/lib/" >> /etc/ld.so.conf && \ diff --git a/docker/Dockerfile_x86_64 b/docker/Dockerfile_x86_64 index 23521eb8..0ff3ec2f 100644 --- a/docker/Dockerfile_x86_64 +++ b/docker/Dockerfile_x86_64 @@ -13,18 +13,28 @@ RUN curl -O -L https://download.qt.io/archive/qt/4.8/4.8.7/qt-everywhere-opensou ENV QTDIR /opt/Qt4.8.7 ENV PATH "$QTDIR/bin:$PATH" -RUN curl -O -L https://cmake.org/files/v3.9/cmake-3.9.0.tar.gz && \ - tar -zxf cmake-3.9.0.tar.gz && \ - cd cmake-3.9.0 && \ - yum -y install curl-devel zlib-devel && \ - ./configure --system-curl && \ - make && \ - make install && \ - cd .. && \ +RUN curl -O -L https://cmake.org/files/v3.9/cmake-3.9.0.tar.gz && \ + tar -zxf cmake-3.9.0.tar.gz && \ + cd cmake-3.9.0 && \ + yum -y install curl-devel zlib-devel && \ + ./configure --system-curl && \ + make -j4 && \ + make install && \ + cd .. && \ rm -rf cmake-3.9.0* -RUN yum install autoconf automake bzip2 cmake freetype-devel gcc gcc-c++ libtool make mercurial pkgconfig perl-core zlib-devel -y && \ - yum remove nasm -y && \ +RUN curl -O -L https://www.cpan.org/src/5.0/perl-5.10.1.tar.gz && \ + tar -xzf perl-5.10.1.tar.gz && \ + yum install autoconf automake bzip2 git freetype-devel gcc gcc-c++ libtool make pkgconfig -y && \ + cd perl-5.10.1 && \ + ./Configure -des -Dprefix=$HOME/ffmpeg_build && \ + make -j4 && \ + make install && \ + cd .. && \ + rm -rf perl-5.10.1* && \ + PATH=$HOME/ffmpeg_build/bin:$PATH + +RUN yum remove nasm -y && \ mkdir ~/ffmpeg_sources && \ cd ~/ffmpeg_sources && \ curl -O -L http://www.nasm.us/pub/nasm/releasebuilds/2.13.02/nasm-2.13.02.tar.bz2 && \ @@ -49,9 +59,9 @@ RUN yum install autoconf automake bzip2 cmake freetype-devel gcc gcc-c++ libtool curl -O -L https://github.com/openssl/openssl/archive/OpenSSL_1_1_1c.tar.gz && \ tar -zxvf OpenSSL_1_1_1c.tar.gz && \ cd openssl-OpenSSL_1_1_1c && \ - ./Configure --prefix="$HOME/ffmpeg_build" --openssldir="$HOME/ffmpeg_build" shared zlib && \ + ./config --prefix="$HOME/ffmpeg_build" --openssldir="$HOME/ffmpeg_build" shared zlib && \ make -j4 && \ - make install && \ + make install_sw && \ cd ~/ffmpeg_sources && \ curl -O -L https://ffmpeg.org/releases/ffmpeg-snapshot.tar.bz2 && \ tar xjvf ffmpeg-snapshot.tar.bz2 && \