From 9f9da43fb42e0cd93fb4d5d2e8b5c9b3d7d2bd26 Mon Sep 17 00:00:00 2001 From: aptalca Date: Thu, 17 Aug 2017 23:44:55 -0400 Subject: [PATCH 1/9] compile zlib --- Dockerfile | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 00bb3a4..5dc9340 100644 --- a/Dockerfile +++ b/Dockerfile @@ -41,8 +41,7 @@ RUN \ texi2html \ wget \ xz-utils \ - yasm \ - zlib1g-dev && \ + yasm && \ rm -rf \ /var/lib/apt/lists/* @@ -61,6 +60,7 @@ ARG VIDSTAB_VER="1.1.0" ARG VPX_VER="1.6.1" ARG X265_VER="2.5" ARG ZIMG_VER="2.5.1" +ARG ZLIB_VER="1.2.11" # environment variables ARG BUILD_ROOT="/tmp/build-root" @@ -123,7 +123,10 @@ RUN \ https://github.com/webmproject/libvpx/archive/v${VPX_VER}.tar.gz && \ curl -o \ ${SOURCE_FOLDER}/x265_${X265_VER}.tar.gz -L \ - https://bitbucket.org/multicoreware/x265/downloads/x265_${X265_VER}.tar.gz + https://bitbucket.org/multicoreware/x265/downloads/x265_${X265_VER}.tar.gz && \ +curl -o \ + ${SOURCE_FOLDER}/v${ZLIB_VER}.tar.gz -L \ + https://github.com/madler/zlib/archive/v${ZLIB_VER}.tar.gz # unpack source codes RUN \ @@ -240,6 +243,13 @@ RUN \ PATH="$HOME/bin:$PATH" make && \ make install +# compile zlib +RUN \ + cd ${BUILD_ROOT}/zlib-${ZLIB_VER} && \ + PATH="$HOME/bin:$PATH" ./configure --prefix="$HOME/ffmpeg_build" --static && \ + PATH="$HOME/bin:$PATH" make && \ + make install + # compile ffmpeg RUN \ cd ${BUILD_ROOT}/ffmpeg* && \ From fda9420434dcace88ec6cfbaddcf25c9f4757eae Mon Sep 17 00:00:00 2001 From: aptalca Date: Thu, 17 Aug 2017 23:51:53 -0400 Subject: [PATCH 2/9] fix order --- Dockerfile | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index 5dc9340..6b3eb88 100644 --- a/Dockerfile +++ b/Dockerfile @@ -140,6 +140,13 @@ RUN \ PATH="$HOME/bin:$PATH" make && \ make install +# compile zlib +RUN \ + cd ${BUILD_ROOT}/zlib-${ZLIB_VER} && \ + PATH="$HOME/bin:$PATH" ./configure --prefix="$HOME/ffmpeg_build" --static && \ + PATH="$HOME/bin:$PATH" make && \ + make install + # compile x264 RUN \ cd ${BUILD_ROOT}/x264-snapshot* && \ @@ -243,12 +250,6 @@ RUN \ PATH="$HOME/bin:$PATH" make && \ make install -# compile zlib -RUN \ - cd ${BUILD_ROOT}/zlib-${ZLIB_VER} && \ - PATH="$HOME/bin:$PATH" ./configure --prefix="$HOME/ffmpeg_build" --static && \ - PATH="$HOME/bin:$PATH" make && \ - make install # compile ffmpeg RUN \ From ef1bb8e29b038478c2397035f33f35a1269303e2 Mon Sep 17 00:00:00 2001 From: aptalca Date: Fri, 18 Aug 2017 00:09:16 -0400 Subject: [PATCH 3/9] compile openssl --- Dockerfile | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 6b3eb88..3e8cf46 100644 --- a/Dockerfile +++ b/Dockerfile @@ -21,7 +21,6 @@ RUN \ libopencore-amrwb-dev \ libsdl1.2-dev \ libspeex-dev \ - libssl-dev \ libtheora-dev \ libtool \ libva-dev \ @@ -53,6 +52,7 @@ ARG LAME_VER="3.99.5" ARG LIBASS_VER="0.13.7" ARG NASM_VER="2.13.01" ARG OPENJPEG_VER="2.1.2" +ARG OPENSSL_VER="1_0_2l" ARG OPUS_VER="1.2.1" ARG RTMP_COMMIT="fa8646daeb19dfd12c181f7d19de708d623704c0" ARG SOXR_VER="0.1.2" @@ -126,7 +126,11 @@ RUN \ https://bitbucket.org/multicoreware/x265/downloads/x265_${X265_VER}.tar.gz && \ curl -o \ ${SOURCE_FOLDER}/v${ZLIB_VER}.tar.gz -L \ - https://github.com/madler/zlib/archive/v${ZLIB_VER}.tar.gz + https://github.com/madler/zlib/archive/v${ZLIB_VER}.tar.gz && \ + +curl -o \ + ${SOURCE_FOLDER}/OpenSSL_${OPENSSL_VER}.tar.gz -L \ + https://github.com/openssl/openssl/archive/OpenSSL_${OPENSSL_VER}.tar.gz # unpack source codes RUN \ @@ -147,6 +151,13 @@ RUN \ PATH="$HOME/bin:$PATH" make && \ make install +# compile openssl +RUN \ + cd ${BUILD_ROOT}/openssl-OpenSSL_${OPENSSL_VER} && \ + PATH="$HOME/bin:$PATH" ./config no-shared no-idea no-mdc2 no-rc5 --prefix="$HOME/ffmpeg_build" && \ + PATH="$HOME/bin:$PATH" make depend && make && \ + make install_sw + # compile x264 RUN \ cd ${BUILD_ROOT}/x264-snapshot* && \ From 87516a8e1497881d411dee67f385222cddefc0dc Mon Sep 17 00:00:00 2001 From: aptalca Date: Fri, 18 Aug 2017 00:21:18 -0400 Subject: [PATCH 4/9] compile opencore-amr --- Dockerfile | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 3e8cf46..624eefe 100644 --- a/Dockerfile +++ b/Dockerfile @@ -17,8 +17,6 @@ RUN \ libass-dev \ libfontconfig-dev \ libfreetype6-dev \ - libopencore-amrnb-dev \ - libopencore-amrwb-dev \ libsdl1.2-dev \ libspeex-dev \ libtheora-dev \ @@ -51,6 +49,7 @@ ARG HARFBUZZ_VER="1.4.8" ARG LAME_VER="3.99.5" ARG LIBASS_VER="0.13.7" ARG NASM_VER="2.13.01" +ARG O_AMR_VER="0.1.5" ARG OPENJPEG_VER="2.1.2" ARG OPENSSL_VER="1_0_2l" ARG OPUS_VER="1.2.1" @@ -130,7 +129,11 @@ curl -o \ curl -o \ ${SOURCE_FOLDER}/OpenSSL_${OPENSSL_VER}.tar.gz -L \ - https://github.com/openssl/openssl/archive/OpenSSL_${OPENSSL_VER}.tar.gz + https://github.com/openssl/openssl/archive/OpenSSL_${OPENSSL_VER}.tar.gz && \ + +curl -o \ + ${SOURCE_FOLDER}/opencore-amr-${O_AMR_VER}.tar.gz -L \ + http://downloads.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${OPENSSL_VER}.tar.gz # unpack source codes RUN \ @@ -216,6 +219,13 @@ RUN \ PATH="$HOME/bin:$PATH" make && \ make install +# compile opencore-amr +RUN \ + cd ${BUILD_ROOT}/opencore-amr-${O_AMR_VER} && \ + PATH="$HOME/bin:$PATH" ./configure --prefix="$HOME/ffmpeg_build" --disable-shared && \ + PATH="$HOME/bin:$PATH" make && \ + make install + # compile libvpx RUN \ cd ${BUILD_ROOT}/libvpx-${VPX_VER} && \ From 8372b99dd152765d7a663f71bcd2966086e37efb Mon Sep 17 00:00:00 2001 From: aptalca Date: Fri, 18 Aug 2017 00:31:21 -0400 Subject: [PATCH 5/9] compile libogg --- Dockerfile | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index 624eefe..060af7e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -48,6 +48,7 @@ ARG FRIBIDI_VER="0.19.7" ARG HARFBUZZ_VER="1.4.8" ARG LAME_VER="3.99.5" ARG LIBASS_VER="0.13.7" +ARG LIBOGG_VER="1.3.2" ARG NASM_VER="2.13.01" ARG O_AMR_VER="0.1.5" ARG OPENJPEG_VER="2.1.2" @@ -96,6 +97,9 @@ RUN \ curl -o \ ${SOURCE_FOLDER}/${LIBASS_VER}.tar.gz -L \ https://github.com/libass/libass/archive/${LIBASS_VER}.tar.gz && \ + curl -o \ + ${SOURCE_FOLDER}/libogg-${LIBOGG_VER}.tar.gz -L \ + http://downloads.xiph.org/releases/ogg/libogg-${LIBASS_VER}.tar.gz && \ curl -o \ ${SOURCE_FOLDER}/nasm-${NASM_VER}.tar.bz2 -L \ http://www.nasm.us/pub/nasm/releasebuilds/${NASM_VER}/nasm-${NASM_VER}.tar.bz2 && \ @@ -123,15 +127,13 @@ RUN \ curl -o \ ${SOURCE_FOLDER}/x265_${X265_VER}.tar.gz -L \ https://bitbucket.org/multicoreware/x265/downloads/x265_${X265_VER}.tar.gz && \ -curl -o \ + curl -o \ ${SOURCE_FOLDER}/v${ZLIB_VER}.tar.gz -L \ https://github.com/madler/zlib/archive/v${ZLIB_VER}.tar.gz && \ - -curl -o \ + curl -o \ ${SOURCE_FOLDER}/OpenSSL_${OPENSSL_VER}.tar.gz -L \ https://github.com/openssl/openssl/archive/OpenSSL_${OPENSSL_VER}.tar.gz && \ - -curl -o \ + curl -o \ ${SOURCE_FOLDER}/opencore-amr-${O_AMR_VER}.tar.gz -L \ http://downloads.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${OPENSSL_VER}.tar.gz @@ -161,6 +163,13 @@ RUN \ PATH="$HOME/bin:$PATH" make depend && make && \ make install_sw +# compile libogg +RUN \ + cd ${BUILD_ROOT}/libogg-${LIBOGG_VER} && \ + PATH="$HOME/bin:$PATH" ./configure --prefix="$HOME/ffmpeg_build" --disable-shared && \ + PATH="$HOME/bin:$PATH" make && \ + make install + # compile x264 RUN \ cd ${BUILD_ROOT}/x264-snapshot* && \ From 1a61e93e305ebb1fe0af082ae43e8841afb74681 Mon Sep 17 00:00:00 2001 From: aptalca Date: Fri, 18 Aug 2017 00:47:39 -0400 Subject: [PATCH 6/9] typo --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 060af7e..c2e3d46 100644 --- a/Dockerfile +++ b/Dockerfile @@ -99,7 +99,7 @@ RUN \ https://github.com/libass/libass/archive/${LIBASS_VER}.tar.gz && \ curl -o \ ${SOURCE_FOLDER}/libogg-${LIBOGG_VER}.tar.gz -L \ - http://downloads.xiph.org/releases/ogg/libogg-${LIBASS_VER}.tar.gz && \ + http://downloads.xiph.org/releases/ogg/libogg-${LIBOGG_VER}.tar.gz && \ curl -o \ ${SOURCE_FOLDER}/nasm-${NASM_VER}.tar.bz2 -L \ http://www.nasm.us/pub/nasm/releasebuilds/${NASM_VER}/nasm-${NASM_VER}.tar.bz2 && \ From 91b0b643c851ac038ac4fef51ea76e0e7dd49d35 Mon Sep 17 00:00:00 2001 From: aptalca Date: Fri, 18 Aug 2017 00:49:49 -0400 Subject: [PATCH 7/9] typo --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index c2e3d46..94f2933 100644 --- a/Dockerfile +++ b/Dockerfile @@ -135,7 +135,7 @@ RUN \ https://github.com/openssl/openssl/archive/OpenSSL_${OPENSSL_VER}.tar.gz && \ curl -o \ ${SOURCE_FOLDER}/opencore-amr-${O_AMR_VER}.tar.gz -L \ - http://downloads.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${OPENSSL_VER}.tar.gz + http://downloads.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${O_AMR_VER}.tar.gz # unpack source codes RUN \ From dc3ed3ee7213c58a4171cd521d6e95f7ecf18826 Mon Sep 17 00:00:00 2001 From: aptalca Date: Fri, 18 Aug 2017 01:39:00 -0400 Subject: [PATCH 8/9] rtmp static options --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 94f2933..2b52ba3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -247,7 +247,7 @@ RUN \ RTMP_VER=$(printf "%.7s" $RTMP_COMMIT) && \ cd ${BUILD_ROOT}/rtmpdump-${RTMP_VER} && \ sed -i "s#prefix=.*#prefix=$HOME/ffmpeg_build#" ./Makefile && \ - PATH="$HOME/bin:$PATH" make && \ + PATH="$HOME/bin:$PATH" make SHARED= XCFLAGS=-I"$HOME/ffmpeg_build/include" XLDFLAGS=-L"$HOME/ffmpeg_build/lib" XLIBS=-ldl && \ make install # compile soxr From 212183d4d90288fabde6ea934544ada750ce338c Mon Sep 17 00:00:00 2001 From: sparklyballs Date: Fri, 18 Aug 2017 12:43:10 +0100 Subject: [PATCH 9/9] few little tweaks --- Dockerfile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 2b52ba3..0140d51 100644 --- a/Dockerfile +++ b/Dockerfile @@ -70,11 +70,12 @@ ARG SOURCE_FOLDER="/tmp/source-folder" RUN \ mkdir -p \ ${BUILD_ROOT} \ - ${SOURCE_FOLDER} + ${SOURCE_FOLDER} && \ + rm -rf ${BUILD_ROOT}/* \ + ${SOURCE_FOLDER}/* # fetch source codes RUN \ - LAME_BRANCH=${LAME_VER%.*} && \ RTMP_VER=$(printf "%.7s" $RTMP_COMMIT) && \ curl -o \ ${SOURCE_FOLDER}/fdk-aac.tar.gz -L \ @@ -90,7 +91,7 @@ RUN \ https://www.freedesktop.org/software/harfbuzz/release/harfbuzz-${HARFBUZZ_VER}.tar.bz2 && \ curl -o \ ${SOURCE_FOLDER}/lame-${LAME_VER}.tar.gz -L \ - http://downloads.sourceforge.net/project/lame/lame/${LAME_BRANCH}/lame-${LAME_VER}.tar.gz && \ + http://downloads.sourceforge.net/project/lame/lame/${LAME_VER%.*}/lame-${LAME_VER}.tar.gz && \ curl -o \ ${SOURCE_FOLDER}/last_x264.tar.bz2 -L \ http://download.videolan.org/pub/x264/snapshots/last_x264.tar.bz2 && \