From c3ce05a885bbb4a668ff414eb19b5434882966ec Mon Sep 17 00:00:00 2001 From: Julien Rottenberg Date: Thu, 16 May 2019 11:26:04 -0700 Subject: [PATCH 01/29] 3.2.14 --- docker-images/3.2/alpine/Dockerfile | 2 +- docker-images/3.2/centos/Dockerfile | 2 +- docker-images/3.2/nvidia/Dockerfile | 2 +- docker-images/3.2/scratch/Dockerfile | 2 +- docker-images/3.2/ubuntu/Dockerfile | 2 +- docker-images/3.2/vaapi/Dockerfile | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docker-images/3.2/alpine/Dockerfile b/docker-images/3.2/alpine/Dockerfile index 1442b1064..fcef21416 100644 --- a/docker-images/3.2/alpine/Dockerfile +++ b/docker-images/3.2/alpine/Dockerfile @@ -18,7 +18,7 @@ ARG LD_LIBRARY_PATH=/opt/ffmpeg/lib ARG PREFIX=/opt/ffmpeg ARG MAKEFLAGS="-j2" -ENV FFMPEG_VERSION=3.2.13 \ +ENV FFMPEG_VERSION=3.2.14 \ FDKAAC_VERSION=0.1.5 \ LAME_VERSION=3.100 \ LIBASS_VERSION=0.13.7 \ diff --git a/docker-images/3.2/centos/Dockerfile b/docker-images/3.2/centos/Dockerfile index abd10f2b7..a4105e4eb 100644 --- a/docker-images/3.2/centos/Dockerfile +++ b/docker-images/3.2/centos/Dockerfile @@ -20,7 +20,7 @@ ARG LD_LIBRARY_PATH=/opt/ffmpeg/lib ARG PREFIX=/opt/ffmpeg ARG MAKEFLAGS="-j2" -ENV FFMPEG_VERSION=3.2.13 \ +ENV FFMPEG_VERSION=3.2.14 \ FDKAAC_VERSION=0.1.5 \ LAME_VERSION=3.100 \ LIBASS_VERSION=0.13.7 \ diff --git a/docker-images/3.2/nvidia/Dockerfile b/docker-images/3.2/nvidia/Dockerfile index 14d706cca..810465092 100644 --- a/docker-images/3.2/nvidia/Dockerfile +++ b/docker-images/3.2/nvidia/Dockerfile @@ -35,7 +35,7 @@ ENV LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/opt/ffmpeg/lib" ARG PREFIX=/opt/ffmpeg ARG MAKEFLAGS="-j12" -ENV FFMPEG_VERSION=3.2.13 \ +ENV FFMPEG_VERSION=3.2.14 \ FDKAAC_VERSION=0.1.5 \ LAME_VERSION=3.100 \ LIBASS_VERSION=0.13.7 \ diff --git a/docker-images/3.2/scratch/Dockerfile b/docker-images/3.2/scratch/Dockerfile index 56e43a8ad..75932cf3a 100644 --- a/docker-images/3.2/scratch/Dockerfile +++ b/docker-images/3.2/scratch/Dockerfile @@ -13,7 +13,7 @@ ARG LD_LIBRARY_PATH=/opt/ffmpeg/lib ARG PREFIX=/opt/ffmpeg ARG MAKEFLAGS="-j2" -ENV FFMPEG_VERSION=3.2.13 \ +ENV FFMPEG_VERSION=3.2.14 \ FDKAAC_VERSION=0.1.5 \ LAME_VERSION=3.100 \ LIBASS_VERSION=0.13.7 \ diff --git a/docker-images/3.2/ubuntu/Dockerfile b/docker-images/3.2/ubuntu/Dockerfile index ec8744a61..d434734cb 100644 --- a/docker-images/3.2/ubuntu/Dockerfile +++ b/docker-images/3.2/ubuntu/Dockerfile @@ -21,7 +21,7 @@ ARG LD_LIBRARY_PATH=/opt/ffmpeg/lib ARG PREFIX=/opt/ffmpeg ARG MAKEFLAGS="-j2" -ENV FFMPEG_VERSION=3.2.13 \ +ENV FFMPEG_VERSION=3.2.14 \ FDKAAC_VERSION=0.1.5 \ LAME_VERSION=3.100 \ LIBASS_VERSION=0.13.7 \ diff --git a/docker-images/3.2/vaapi/Dockerfile b/docker-images/3.2/vaapi/Dockerfile index ac18d4df3..20a1aacfd 100644 --- a/docker-images/3.2/vaapi/Dockerfile +++ b/docker-images/3.2/vaapi/Dockerfile @@ -21,7 +21,7 @@ ARG LD_LIBRARY_PATH=/opt/ffmpeg/lib ARG PREFIX=/opt/ffmpeg ARG MAKEFLAGS="-j2" -ENV FFMPEG_VERSION=3.2.13 \ +ENV FFMPEG_VERSION=3.2.14 \ FDKAAC_VERSION=0.1.5 \ LAME_VERSION=3.100 \ LIBASS_VERSION=0.13.7 \ From 463961c66c2b0143c0490d80035f7df16320a8e6 Mon Sep 17 00:00:00 2001 From: Julien Rottenberg Date: Sat, 29 Jun 2019 10:45:27 -0700 Subject: [PATCH 02/29] let's do the push through azure-ci --- templates/azure.template | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/templates/azure.template b/templates/azure.template index 9f6991ba4..ec720bc8b 100644 --- a/templates/azure.template +++ b/templates/azure.template @@ -1,3 +1,6 @@ +variables: + DOCKER: 'jrottenberg/ffmpeg' + jobs: - job: Build pool: @@ -7,6 +10,12 @@ jobs: matrix: %%VERSIONS%% steps: - - script: | - docker build -t ffmpeg:${VERSION}-${VARIANT} --build-arg MAKEFLAGS="-j$(($(grep -c ^processor /proc/cpuinfo) + 1))" docker-images/${VERSION}/${VARIANT} - docker run --rm ffmpeg:${VERSION}-${VARIANT} -buildconf + - bash: | + docker build -t ${DOCKER}:${VERSION}-${VARIANT} --build-arg MAKEFLAGS="-j$(($(grep -c ^processor /proc/cpuinfo) + 1))" docker-images/${VERSION}/${VARIANT} + docker run --rm ${DOCKER}:${VERSION}-${VARIANT} -buildconf + displayName: Build docker image + - bash: | + docker login --username ${DOCKER_LOGIN} --password ${DOCKER_PASSWORD} + docker push ${DOCKER}:${VERSION}-${VARIANT} + condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/master')) + displayName: Push docker image From 0a3d12138dda244bb4adac4817c5ce66a956331f Mon Sep 17 00:00:00 2001 From: Julien Rottenberg Date: Sat, 29 Jun 2019 10:45:49 -0700 Subject: [PATCH 03/29] after update.py --- azure-pipelines.yml | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index f5a48d092..daa99df7c 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -1,3 +1,6 @@ +variables: + DOCKER: 'jrottenberg/ffmpeg' + jobs: - job: Build pool: @@ -168,6 +171,12 @@ jobs: VERSION: 2.8 VARIANT: nvidia steps: - - script: | - docker build -t ffmpeg:${VERSION}-${VARIANT} --build-arg MAKEFLAGS="-j$(($(nproc) + 1))" docker-images/${VERSION}/${VARIANT} - docker run --rm ffmpeg:${VERSION}-${VARIANT} -buildconf + - bash: | + docker build -t ${DOCKER}:${VERSION}-${VARIANT} --build-arg MAKEFLAGS="-j$(($(grep -c ^processor /proc/cpuinfo) + 1))" docker-images/${VERSION}/${VARIANT} + docker run --rm ${DOCKER}:${VERSION}-${VARIANT} -buildconf + displayName: Build docker image + - bash: | + docker login --username ${DOCKER_LOGIN} --password ${DOCKER_PASSWORD} + docker push ${DOCKER}:${VERSION}-${VARIANT} + condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/master')) + displayName: Push docker image From a23a23df667ece5d45f84f27d631ad7b1853b7c0 Mon Sep 17 00:00:00 2001 From: rubenrua Date: Wed, 3 Jul 2019 14:19:32 +0200 Subject: [PATCH 04/29] Add webp --- README.md | 4 +++- templates/Dockerfile-env | 1 + templates/Dockerfile-run | 12 ++++++++++++ 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index b7f8f602b..dcbbf6b5f 100644 --- a/README.md +++ b/README.md @@ -61,7 +61,7 @@ Test ``` ffmpeg version 3.3.4 Copyright (c) 2000-2017 the FFmpeg developers built with gcc 5.4.0 (Ubuntu 5.4.0-6ubuntu1~16.04.4) 20160609 - configuration: --disable-debug --disable-doc --disable-ffplay --enable-shared --enable-avresample --enable-libopencore-amrnb --enable-libopencore-amrwb --enable-gpl --enable-libass --enable-libfreetype --enable-libvidstab --enable-libmp3lame --enable-libopenjpeg --enable-libopus --enable-libtheora --enable-libvorbis --enable-libvpx --enable-libx265 --enable-libxvid --enable-libx264 --enable-nonfree --enable-openssl --enable-libfdk_aac --enable-postproc --enable-small --enable-version3 --extra-cflags=-I/opt/ffmpeg/include --extra-ldflags=-L/opt/ffmpeg/lib --extra-libs=-ldl --prefix=/opt/ffmpeg + configuration: --disable-debug --disable-doc --disable-ffplay --enable-shared --enable-avresample --enable-libopencore-amrnb --enable-libopencore-amrwb --enable-gpl --enable-libass --enable-libfreetype --enable-libvidstab --enable-libmp3lame --enable-libopenjpeg --enable-libopus --enable-libtheora --enable-libvorbis --enable-libvpx --enable-libwebp --enable-libx265 --enable-libxvid --enable-libx264 --enable-nonfree --enable-openssl --enable-libfdk_aac --enable-postproc --enable-small --enable-version3 --extra-cflags=-I/opt/ffmpeg/include --extra-ldflags=-L/opt/ffmpeg/lib --extra-libs=-ldl --prefix=/opt/ffmpeg libavutil 55. 58.100 / 55. 58.100 libavcodec 57. 89.100 / 57. 89.100 libavformat 57. 71.100 / 57. 71.100 @@ -90,6 +90,7 @@ ffmpeg version 3.3.4 Copyright (c) 2000-2017 the FFmpeg developers --enable-libtheora --enable-libvorbis --enable-libvpx + --enable-libwebp --enable-libx265 --enable-libxvid --enable-libx264 @@ -192,6 +193,7 @@ See Dockerfile-env to update a version - [LAME_VERSION](http://lame.sourceforge.net/download.php): [GNU Lesser General Public License (LGPL) version 2.1](http://lame.cvs.sourceforge.net/viewvc/lame/lame/LICENSE?revision=1.9) - [OPUS_VERSION](https://www.opus-codec.org/downloads/): [BSD-style license](https://www.opus-codec.org/license/) - [VPX_VERSION](https://github.com/webmproject/libvpx/releases): [BSD-style license](https://github.com/webmproject/libvpx/blob/master/LICENSE) +- [WEBP_VERSION](https://storage.googleapis.com/downloads.webmproject.org/releases/webp/index.html): [BSD-style license](https://github.com/webmproject/libvpx/blob/master/LICENSE) - [XVID_VERSION](https://labs.xvid.com/source/): [GNU General Public Licence (GPL) version 2](http://websvn.xvid.org/cvs/viewvc.cgi/trunk/xvidcore/LICENSE?revision=851) - [FDKAAC_VERSION](https://github.com/mstorsjo/fdk-aac/releases): [Liberal but not a license of patented technologies](https://github.com/mstorsjo/fdk-aac/blob/master/NOTICE) - [FREETYPE_VERSION](http://download.savannah.gnu.org/releases/freetype/): [GNU General Public License (GPL) version 2](https://www.freetype.org/license.html) diff --git a/templates/Dockerfile-env b/templates/Dockerfile-env index 4da6fa0bf..06639f31d 100644 --- a/templates/Dockerfile-env +++ b/templates/Dockerfile-env @@ -9,6 +9,7 @@ FFMPEG_VERSION=%%FFMPEG_VERSION%% \ THEORA_VERSION=1.1.1 \ VORBIS_VERSION=1.3.5 \ VPX_VERSION=1.8.0 \ + WEBP_VERSION=1.0.2 \ X264_VERSION=20170226-2245-stable \ X265_VERSION=2.3 \ XVID_VERSION=1.3.4 \ diff --git a/templates/Dockerfile-run b/templates/Dockerfile-run index 31fe08a6d..f346c34c6 100644 --- a/templates/Dockerfile-run +++ b/templates/Dockerfile-run @@ -94,6 +94,17 @@ RUN \ make && \ make install && \ rm -rf ${DIR} +### libwebp https://developers.google.com/speed/webp/ +RUN \ + DIR=/tmp/vebp && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-${WEBP_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} ### libmp3lame http://lame.sourceforge.net/ RUN \ DIR=/tmp/lame && \ @@ -257,6 +268,7 @@ RUN \ --enable-libtheora \ --enable-libvorbis \ --enable-libvpx \ + --enable-libwebp \ --enable-libx265 \ --enable-libxvid \ --enable-libx264 \ From 0f8e2d625d19c168d39de49adb6f4ff67b943476 Mon Sep 17 00:00:00 2001 From: rubenrua Date: Wed, 3 Jul 2019 14:19:54 +0200 Subject: [PATCH 05/29] New Dockerfiles with webp --- docker-images/2.8/alpine/Dockerfile | 13 +++++++++++++ docker-images/2.8/centos/Dockerfile | 13 +++++++++++++ docker-images/2.8/nvidia/Dockerfile | 13 +++++++++++++ docker-images/2.8/scratch/Dockerfile | 13 +++++++++++++ docker-images/2.8/ubuntu/Dockerfile | 13 +++++++++++++ docker-images/2.8/vaapi/Dockerfile | 13 +++++++++++++ docker-images/3.0/alpine/Dockerfile | 13 +++++++++++++ docker-images/3.0/centos/Dockerfile | 13 +++++++++++++ docker-images/3.0/nvidia/Dockerfile | 13 +++++++++++++ docker-images/3.0/scratch/Dockerfile | 13 +++++++++++++ docker-images/3.0/ubuntu/Dockerfile | 13 +++++++++++++ docker-images/3.0/vaapi/Dockerfile | 13 +++++++++++++ docker-images/3.1/alpine/Dockerfile | 13 +++++++++++++ docker-images/3.1/centos/Dockerfile | 13 +++++++++++++ docker-images/3.1/nvidia/Dockerfile | 13 +++++++++++++ docker-images/3.1/scratch/Dockerfile | 13 +++++++++++++ docker-images/3.1/ubuntu/Dockerfile | 13 +++++++++++++ docker-images/3.1/vaapi/Dockerfile | 13 +++++++++++++ docker-images/3.2/alpine/Dockerfile | 13 +++++++++++++ docker-images/3.2/centos/Dockerfile | 13 +++++++++++++ docker-images/3.2/nvidia/Dockerfile | 13 +++++++++++++ docker-images/3.2/scratch/Dockerfile | 13 +++++++++++++ docker-images/3.2/ubuntu/Dockerfile | 13 +++++++++++++ docker-images/3.2/vaapi/Dockerfile | 13 +++++++++++++ docker-images/3.3/alpine/Dockerfile | 13 +++++++++++++ docker-images/3.3/centos/Dockerfile | 13 +++++++++++++ docker-images/3.3/nvidia/Dockerfile | 13 +++++++++++++ docker-images/3.3/scratch/Dockerfile | 13 +++++++++++++ docker-images/3.3/ubuntu/Dockerfile | 13 +++++++++++++ docker-images/3.3/vaapi/Dockerfile | 13 +++++++++++++ docker-images/3.4/alpine/Dockerfile | 13 +++++++++++++ docker-images/3.4/centos/Dockerfile | 13 +++++++++++++ docker-images/3.4/nvidia/Dockerfile | 13 +++++++++++++ docker-images/3.4/scratch/Dockerfile | 13 +++++++++++++ docker-images/3.4/ubuntu/Dockerfile | 13 +++++++++++++ docker-images/3.4/vaapi/Dockerfile | 13 +++++++++++++ docker-images/4.0/alpine/Dockerfile | 13 +++++++++++++ docker-images/4.0/centos/Dockerfile | 13 +++++++++++++ docker-images/4.0/nvidia/Dockerfile | 13 +++++++++++++ docker-images/4.0/scratch/Dockerfile | 13 +++++++++++++ docker-images/4.0/ubuntu/Dockerfile | 13 +++++++++++++ docker-images/4.0/vaapi/Dockerfile | 13 +++++++++++++ docker-images/4.1/alpine/Dockerfile | 13 +++++++++++++ docker-images/4.1/centos/Dockerfile | 13 +++++++++++++ docker-images/4.1/nvidia/Dockerfile | 13 +++++++++++++ docker-images/4.1/scratch/Dockerfile | 13 +++++++++++++ docker-images/4.1/ubuntu/Dockerfile | 13 +++++++++++++ docker-images/4.1/vaapi/Dockerfile | 13 +++++++++++++ docker-images/snapshot/alpine/Dockerfile | 13 +++++++++++++ docker-images/snapshot/centos/Dockerfile | 13 +++++++++++++ docker-images/snapshot/nvidia/Dockerfile | 13 +++++++++++++ docker-images/snapshot/scratch/Dockerfile | 13 +++++++++++++ docker-images/snapshot/ubuntu/Dockerfile | 13 +++++++++++++ docker-images/snapshot/vaapi/Dockerfile | 13 +++++++++++++ 54 files changed, 702 insertions(+) diff --git a/docker-images/2.8/alpine/Dockerfile b/docker-images/2.8/alpine/Dockerfile index 0cb0a74c1..56bb80d44 100644 --- a/docker-images/2.8/alpine/Dockerfile +++ b/docker-images/2.8/alpine/Dockerfile @@ -29,6 +29,7 @@ ENV FFMPEG_VERSION=2.8.15 \ THEORA_VERSION=1.1.1 \ VORBIS_VERSION=1.3.5 \ VPX_VERSION=1.8.0 \ + WEBP_VERSION=1.0.2 \ X264_VERSION=20170226-2245-stable \ X265_VERSION=2.3 \ XVID_VERSION=1.3.4 \ @@ -169,6 +170,17 @@ RUN \ make && \ make install && \ rm -rf ${DIR} +### libwebp https://developers.google.com/speed/webp/ +RUN \ + DIR=/tmp/vebp && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-${WEBP_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} ### libmp3lame http://lame.sourceforge.net/ RUN \ DIR=/tmp/lame && \ @@ -332,6 +344,7 @@ RUN \ --enable-libtheora \ --enable-libvorbis \ --enable-libvpx \ + --enable-libwebp \ --enable-libx265 \ --enable-libxvid \ --enable-libx264 \ diff --git a/docker-images/2.8/centos/Dockerfile b/docker-images/2.8/centos/Dockerfile index 9fe8d1875..a39296e23 100644 --- a/docker-images/2.8/centos/Dockerfile +++ b/docker-images/2.8/centos/Dockerfile @@ -31,6 +31,7 @@ ENV FFMPEG_VERSION=2.8.15 \ THEORA_VERSION=1.1.1 \ VORBIS_VERSION=1.3.5 \ VPX_VERSION=1.8.0 \ + WEBP_VERSION=1.0.2 \ X264_VERSION=20170226-2245-stable \ X265_VERSION=2.3 \ XVID_VERSION=1.3.4 \ @@ -170,6 +171,17 @@ RUN \ make && \ make install && \ rm -rf ${DIR} +### libwebp https://developers.google.com/speed/webp/ +RUN \ + DIR=/tmp/vebp && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-${WEBP_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} ### libmp3lame http://lame.sourceforge.net/ RUN \ DIR=/tmp/lame && \ @@ -333,6 +345,7 @@ RUN \ --enable-libtheora \ --enable-libvorbis \ --enable-libvpx \ + --enable-libwebp \ --enable-libx265 \ --enable-libxvid \ --enable-libx264 \ diff --git a/docker-images/2.8/nvidia/Dockerfile b/docker-images/2.8/nvidia/Dockerfile index 767d2fb01..d6064a16b 100644 --- a/docker-images/2.8/nvidia/Dockerfile +++ b/docker-images/2.8/nvidia/Dockerfile @@ -46,6 +46,7 @@ ENV FFMPEG_VERSION=2.8.15 \ THEORA_VERSION=1.1.1 \ VORBIS_VERSION=1.3.5 \ VPX_VERSION=1.8.0 \ + WEBP_VERSION=1.0.2 \ X264_VERSION=20170226-2245-stable \ X265_VERSION=2.3 \ XVID_VERSION=1.3.4 \ @@ -196,6 +197,17 @@ RUN \ make && \ make install && \ rm -rf ${DIR} +### libwebp https://developers.google.com/speed/webp/ +RUN \ + DIR=/tmp/vebp && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-${WEBP_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} ### libmp3lame http://lame.sourceforge.net/ RUN \ DIR=/tmp/lame && \ @@ -360,6 +372,7 @@ RUN \ --enable-libtheora \ --enable-libvorbis \ --enable-libvpx \ + --enable-libwebp \ --enable-libx265 \ --enable-libxvid \ --enable-libx264 \ diff --git a/docker-images/2.8/scratch/Dockerfile b/docker-images/2.8/scratch/Dockerfile index 2c9aa8401..74cdaf36f 100644 --- a/docker-images/2.8/scratch/Dockerfile +++ b/docker-images/2.8/scratch/Dockerfile @@ -24,6 +24,7 @@ ENV FFMPEG_VERSION=2.8.15 \ THEORA_VERSION=1.1.1 \ VORBIS_VERSION=1.3.5 \ VPX_VERSION=1.8.0 \ + WEBP_VERSION=1.0.2 \ X264_VERSION=20170226-2245-stable \ X265_VERSION=2.3 \ XVID_VERSION=1.3.4 \ @@ -166,6 +167,17 @@ RUN \ make && \ make install && \ rm -rf ${DIR} +### libwebp https://developers.google.com/speed/webp/ +RUN \ + DIR=/tmp/vebp && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-${WEBP_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} ### libmp3lame http://lame.sourceforge.net/ RUN \ DIR=/tmp/lame && \ @@ -329,6 +341,7 @@ RUN \ --enable-libtheora \ --enable-libvorbis \ --enable-libvpx \ + --enable-libwebp \ --enable-libx265 \ --enable-libxvid \ --enable-libx264 \ diff --git a/docker-images/2.8/ubuntu/Dockerfile b/docker-images/2.8/ubuntu/Dockerfile index 1a4aa2aa5..b7ee1e7a5 100644 --- a/docker-images/2.8/ubuntu/Dockerfile +++ b/docker-images/2.8/ubuntu/Dockerfile @@ -32,6 +32,7 @@ ENV FFMPEG_VERSION=2.8.15 \ THEORA_VERSION=1.1.1 \ VORBIS_VERSION=1.3.5 \ VPX_VERSION=1.8.0 \ + WEBP_VERSION=1.0.2 \ X264_VERSION=20170226-2245-stable \ X265_VERSION=2.3 \ XVID_VERSION=1.3.4 \ @@ -171,6 +172,17 @@ RUN \ make && \ make install && \ rm -rf ${DIR} +### libwebp https://developers.google.com/speed/webp/ +RUN \ + DIR=/tmp/vebp && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-${WEBP_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} ### libmp3lame http://lame.sourceforge.net/ RUN \ DIR=/tmp/lame && \ @@ -334,6 +346,7 @@ RUN \ --enable-libtheora \ --enable-libvorbis \ --enable-libvpx \ + --enable-libwebp \ --enable-libx265 \ --enable-libxvid \ --enable-libx264 \ diff --git a/docker-images/2.8/vaapi/Dockerfile b/docker-images/2.8/vaapi/Dockerfile index d54e66186..78a6e9458 100644 --- a/docker-images/2.8/vaapi/Dockerfile +++ b/docker-images/2.8/vaapi/Dockerfile @@ -32,6 +32,7 @@ ENV FFMPEG_VERSION=2.8.15 \ THEORA_VERSION=1.1.1 \ VORBIS_VERSION=1.3.5 \ VPX_VERSION=1.8.0 \ + WEBP_VERSION=1.0.2 \ X264_VERSION=20170226-2245-stable \ X265_VERSION=2.3 \ XVID_VERSION=1.3.4 \ @@ -172,6 +173,17 @@ RUN \ make && \ make install && \ rm -rf ${DIR} +### libwebp https://developers.google.com/speed/webp/ +RUN \ + DIR=/tmp/vebp && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-${WEBP_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} ### libmp3lame http://lame.sourceforge.net/ RUN \ DIR=/tmp/lame && \ @@ -335,6 +347,7 @@ RUN \ --enable-libtheora \ --enable-libvorbis \ --enable-libvpx \ + --enable-libwebp \ --enable-libx265 \ --enable-libxvid \ --enable-libx264 \ diff --git a/docker-images/3.0/alpine/Dockerfile b/docker-images/3.0/alpine/Dockerfile index bc9749238..c17ce2eda 100644 --- a/docker-images/3.0/alpine/Dockerfile +++ b/docker-images/3.0/alpine/Dockerfile @@ -29,6 +29,7 @@ ENV FFMPEG_VERSION=3.0.12 \ THEORA_VERSION=1.1.1 \ VORBIS_VERSION=1.3.5 \ VPX_VERSION=1.8.0 \ + WEBP_VERSION=1.0.2 \ X264_VERSION=20170226-2245-stable \ X265_VERSION=2.3 \ XVID_VERSION=1.3.4 \ @@ -169,6 +170,17 @@ RUN \ make && \ make install && \ rm -rf ${DIR} +### libwebp https://developers.google.com/speed/webp/ +RUN \ + DIR=/tmp/vebp && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-${WEBP_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} ### libmp3lame http://lame.sourceforge.net/ RUN \ DIR=/tmp/lame && \ @@ -332,6 +344,7 @@ RUN \ --enable-libtheora \ --enable-libvorbis \ --enable-libvpx \ + --enable-libwebp \ --enable-libx265 \ --enable-libxvid \ --enable-libx264 \ diff --git a/docker-images/3.0/centos/Dockerfile b/docker-images/3.0/centos/Dockerfile index f75148a5f..a0d073bc0 100644 --- a/docker-images/3.0/centos/Dockerfile +++ b/docker-images/3.0/centos/Dockerfile @@ -31,6 +31,7 @@ ENV FFMPEG_VERSION=3.0.12 \ THEORA_VERSION=1.1.1 \ VORBIS_VERSION=1.3.5 \ VPX_VERSION=1.8.0 \ + WEBP_VERSION=1.0.2 \ X264_VERSION=20170226-2245-stable \ X265_VERSION=2.3 \ XVID_VERSION=1.3.4 \ @@ -170,6 +171,17 @@ RUN \ make && \ make install && \ rm -rf ${DIR} +### libwebp https://developers.google.com/speed/webp/ +RUN \ + DIR=/tmp/vebp && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-${WEBP_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} ### libmp3lame http://lame.sourceforge.net/ RUN \ DIR=/tmp/lame && \ @@ -333,6 +345,7 @@ RUN \ --enable-libtheora \ --enable-libvorbis \ --enable-libvpx \ + --enable-libwebp \ --enable-libx265 \ --enable-libxvid \ --enable-libx264 \ diff --git a/docker-images/3.0/nvidia/Dockerfile b/docker-images/3.0/nvidia/Dockerfile index 7862b0656..514106d7d 100644 --- a/docker-images/3.0/nvidia/Dockerfile +++ b/docker-images/3.0/nvidia/Dockerfile @@ -46,6 +46,7 @@ ENV FFMPEG_VERSION=3.0.12 \ THEORA_VERSION=1.1.1 \ VORBIS_VERSION=1.3.5 \ VPX_VERSION=1.8.0 \ + WEBP_VERSION=1.0.2 \ X264_VERSION=20170226-2245-stable \ X265_VERSION=2.3 \ XVID_VERSION=1.3.4 \ @@ -196,6 +197,17 @@ RUN \ make && \ make install && \ rm -rf ${DIR} +### libwebp https://developers.google.com/speed/webp/ +RUN \ + DIR=/tmp/vebp && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-${WEBP_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} ### libmp3lame http://lame.sourceforge.net/ RUN \ DIR=/tmp/lame && \ @@ -360,6 +372,7 @@ RUN \ --enable-libtheora \ --enable-libvorbis \ --enable-libvpx \ + --enable-libwebp \ --enable-libx265 \ --enable-libxvid \ --enable-libx264 \ diff --git a/docker-images/3.0/scratch/Dockerfile b/docker-images/3.0/scratch/Dockerfile index 7c6dd727b..919775bc3 100644 --- a/docker-images/3.0/scratch/Dockerfile +++ b/docker-images/3.0/scratch/Dockerfile @@ -24,6 +24,7 @@ ENV FFMPEG_VERSION=3.0.12 \ THEORA_VERSION=1.1.1 \ VORBIS_VERSION=1.3.5 \ VPX_VERSION=1.8.0 \ + WEBP_VERSION=1.0.2 \ X264_VERSION=20170226-2245-stable \ X265_VERSION=2.3 \ XVID_VERSION=1.3.4 \ @@ -166,6 +167,17 @@ RUN \ make && \ make install && \ rm -rf ${DIR} +### libwebp https://developers.google.com/speed/webp/ +RUN \ + DIR=/tmp/vebp && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-${WEBP_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} ### libmp3lame http://lame.sourceforge.net/ RUN \ DIR=/tmp/lame && \ @@ -329,6 +341,7 @@ RUN \ --enable-libtheora \ --enable-libvorbis \ --enable-libvpx \ + --enable-libwebp \ --enable-libx265 \ --enable-libxvid \ --enable-libx264 \ diff --git a/docker-images/3.0/ubuntu/Dockerfile b/docker-images/3.0/ubuntu/Dockerfile index 2264764b2..bc4c4f7e6 100644 --- a/docker-images/3.0/ubuntu/Dockerfile +++ b/docker-images/3.0/ubuntu/Dockerfile @@ -32,6 +32,7 @@ ENV FFMPEG_VERSION=3.0.12 \ THEORA_VERSION=1.1.1 \ VORBIS_VERSION=1.3.5 \ VPX_VERSION=1.8.0 \ + WEBP_VERSION=1.0.2 \ X264_VERSION=20170226-2245-stable \ X265_VERSION=2.3 \ XVID_VERSION=1.3.4 \ @@ -171,6 +172,17 @@ RUN \ make && \ make install && \ rm -rf ${DIR} +### libwebp https://developers.google.com/speed/webp/ +RUN \ + DIR=/tmp/vebp && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-${WEBP_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} ### libmp3lame http://lame.sourceforge.net/ RUN \ DIR=/tmp/lame && \ @@ -334,6 +346,7 @@ RUN \ --enable-libtheora \ --enable-libvorbis \ --enable-libvpx \ + --enable-libwebp \ --enable-libx265 \ --enable-libxvid \ --enable-libx264 \ diff --git a/docker-images/3.0/vaapi/Dockerfile b/docker-images/3.0/vaapi/Dockerfile index 07ca4d9a9..fa2fb1feb 100644 --- a/docker-images/3.0/vaapi/Dockerfile +++ b/docker-images/3.0/vaapi/Dockerfile @@ -32,6 +32,7 @@ ENV FFMPEG_VERSION=3.0.12 \ THEORA_VERSION=1.1.1 \ VORBIS_VERSION=1.3.5 \ VPX_VERSION=1.8.0 \ + WEBP_VERSION=1.0.2 \ X264_VERSION=20170226-2245-stable \ X265_VERSION=2.3 \ XVID_VERSION=1.3.4 \ @@ -172,6 +173,17 @@ RUN \ make && \ make install && \ rm -rf ${DIR} +### libwebp https://developers.google.com/speed/webp/ +RUN \ + DIR=/tmp/vebp && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-${WEBP_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} ### libmp3lame http://lame.sourceforge.net/ RUN \ DIR=/tmp/lame && \ @@ -336,6 +348,7 @@ RUN \ --enable-libtheora \ --enable-libvorbis \ --enable-libvpx \ + --enable-libwebp \ --enable-libx265 \ --enable-libxvid \ --enable-libx264 \ diff --git a/docker-images/3.1/alpine/Dockerfile b/docker-images/3.1/alpine/Dockerfile index a369299ce..51c979586 100644 --- a/docker-images/3.1/alpine/Dockerfile +++ b/docker-images/3.1/alpine/Dockerfile @@ -29,6 +29,7 @@ ENV FFMPEG_VERSION=3.1.11 \ THEORA_VERSION=1.1.1 \ VORBIS_VERSION=1.3.5 \ VPX_VERSION=1.8.0 \ + WEBP_VERSION=1.0.2 \ X264_VERSION=20170226-2245-stable \ X265_VERSION=2.3 \ XVID_VERSION=1.3.4 \ @@ -169,6 +170,17 @@ RUN \ make && \ make install && \ rm -rf ${DIR} +### libwebp https://developers.google.com/speed/webp/ +RUN \ + DIR=/tmp/vebp && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-${WEBP_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} ### libmp3lame http://lame.sourceforge.net/ RUN \ DIR=/tmp/lame && \ @@ -332,6 +344,7 @@ RUN \ --enable-libtheora \ --enable-libvorbis \ --enable-libvpx \ + --enable-libwebp \ --enable-libx265 \ --enable-libxvid \ --enable-libx264 \ diff --git a/docker-images/3.1/centos/Dockerfile b/docker-images/3.1/centos/Dockerfile index c79e08502..eb358d763 100644 --- a/docker-images/3.1/centos/Dockerfile +++ b/docker-images/3.1/centos/Dockerfile @@ -31,6 +31,7 @@ ENV FFMPEG_VERSION=3.1.11 \ THEORA_VERSION=1.1.1 \ VORBIS_VERSION=1.3.5 \ VPX_VERSION=1.8.0 \ + WEBP_VERSION=1.0.2 \ X264_VERSION=20170226-2245-stable \ X265_VERSION=2.3 \ XVID_VERSION=1.3.4 \ @@ -170,6 +171,17 @@ RUN \ make && \ make install && \ rm -rf ${DIR} +### libwebp https://developers.google.com/speed/webp/ +RUN \ + DIR=/tmp/vebp && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-${WEBP_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} ### libmp3lame http://lame.sourceforge.net/ RUN \ DIR=/tmp/lame && \ @@ -333,6 +345,7 @@ RUN \ --enable-libtheora \ --enable-libvorbis \ --enable-libvpx \ + --enable-libwebp \ --enable-libx265 \ --enable-libxvid \ --enable-libx264 \ diff --git a/docker-images/3.1/nvidia/Dockerfile b/docker-images/3.1/nvidia/Dockerfile index bbde61ffe..dfc06a59f 100644 --- a/docker-images/3.1/nvidia/Dockerfile +++ b/docker-images/3.1/nvidia/Dockerfile @@ -46,6 +46,7 @@ ENV FFMPEG_VERSION=3.1.11 \ THEORA_VERSION=1.1.1 \ VORBIS_VERSION=1.3.5 \ VPX_VERSION=1.8.0 \ + WEBP_VERSION=1.0.2 \ X264_VERSION=20170226-2245-stable \ X265_VERSION=2.3 \ XVID_VERSION=1.3.4 \ @@ -196,6 +197,17 @@ RUN \ make && \ make install && \ rm -rf ${DIR} +### libwebp https://developers.google.com/speed/webp/ +RUN \ + DIR=/tmp/vebp && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-${WEBP_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} ### libmp3lame http://lame.sourceforge.net/ RUN \ DIR=/tmp/lame && \ @@ -360,6 +372,7 @@ RUN \ --enable-libtheora \ --enable-libvorbis \ --enable-libvpx \ + --enable-libwebp \ --enable-libx265 \ --enable-libxvid \ --enable-libx264 \ diff --git a/docker-images/3.1/scratch/Dockerfile b/docker-images/3.1/scratch/Dockerfile index 72aaddfd1..bd8bec079 100644 --- a/docker-images/3.1/scratch/Dockerfile +++ b/docker-images/3.1/scratch/Dockerfile @@ -24,6 +24,7 @@ ENV FFMPEG_VERSION=3.1.11 \ THEORA_VERSION=1.1.1 \ VORBIS_VERSION=1.3.5 \ VPX_VERSION=1.8.0 \ + WEBP_VERSION=1.0.2 \ X264_VERSION=20170226-2245-stable \ X265_VERSION=2.3 \ XVID_VERSION=1.3.4 \ @@ -166,6 +167,17 @@ RUN \ make && \ make install && \ rm -rf ${DIR} +### libwebp https://developers.google.com/speed/webp/ +RUN \ + DIR=/tmp/vebp && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-${WEBP_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} ### libmp3lame http://lame.sourceforge.net/ RUN \ DIR=/tmp/lame && \ @@ -329,6 +341,7 @@ RUN \ --enable-libtheora \ --enable-libvorbis \ --enable-libvpx \ + --enable-libwebp \ --enable-libx265 \ --enable-libxvid \ --enable-libx264 \ diff --git a/docker-images/3.1/ubuntu/Dockerfile b/docker-images/3.1/ubuntu/Dockerfile index 626086b60..6c3975721 100644 --- a/docker-images/3.1/ubuntu/Dockerfile +++ b/docker-images/3.1/ubuntu/Dockerfile @@ -32,6 +32,7 @@ ENV FFMPEG_VERSION=3.1.11 \ THEORA_VERSION=1.1.1 \ VORBIS_VERSION=1.3.5 \ VPX_VERSION=1.8.0 \ + WEBP_VERSION=1.0.2 \ X264_VERSION=20170226-2245-stable \ X265_VERSION=2.3 \ XVID_VERSION=1.3.4 \ @@ -171,6 +172,17 @@ RUN \ make && \ make install && \ rm -rf ${DIR} +### libwebp https://developers.google.com/speed/webp/ +RUN \ + DIR=/tmp/vebp && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-${WEBP_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} ### libmp3lame http://lame.sourceforge.net/ RUN \ DIR=/tmp/lame && \ @@ -334,6 +346,7 @@ RUN \ --enable-libtheora \ --enable-libvorbis \ --enable-libvpx \ + --enable-libwebp \ --enable-libx265 \ --enable-libxvid \ --enable-libx264 \ diff --git a/docker-images/3.1/vaapi/Dockerfile b/docker-images/3.1/vaapi/Dockerfile index b4165dc01..52022b71f 100644 --- a/docker-images/3.1/vaapi/Dockerfile +++ b/docker-images/3.1/vaapi/Dockerfile @@ -32,6 +32,7 @@ ENV FFMPEG_VERSION=3.1.11 \ THEORA_VERSION=1.1.1 \ VORBIS_VERSION=1.3.5 \ VPX_VERSION=1.8.0 \ + WEBP_VERSION=1.0.2 \ X264_VERSION=20170226-2245-stable \ X265_VERSION=2.3 \ XVID_VERSION=1.3.4 \ @@ -172,6 +173,17 @@ RUN \ make && \ make install && \ rm -rf ${DIR} +### libwebp https://developers.google.com/speed/webp/ +RUN \ + DIR=/tmp/vebp && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-${WEBP_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} ### libmp3lame http://lame.sourceforge.net/ RUN \ DIR=/tmp/lame && \ @@ -336,6 +348,7 @@ RUN \ --enable-libtheora \ --enable-libvorbis \ --enable-libvpx \ + --enable-libwebp \ --enable-libx265 \ --enable-libxvid \ --enable-libx264 \ diff --git a/docker-images/3.2/alpine/Dockerfile b/docker-images/3.2/alpine/Dockerfile index fcef21416..0ccf26acf 100644 --- a/docker-images/3.2/alpine/Dockerfile +++ b/docker-images/3.2/alpine/Dockerfile @@ -29,6 +29,7 @@ ENV FFMPEG_VERSION=3.2.14 \ THEORA_VERSION=1.1.1 \ VORBIS_VERSION=1.3.5 \ VPX_VERSION=1.8.0 \ + WEBP_VERSION=1.0.2 \ X264_VERSION=20170226-2245-stable \ X265_VERSION=2.3 \ XVID_VERSION=1.3.4 \ @@ -169,6 +170,17 @@ RUN \ make && \ make install && \ rm -rf ${DIR} +### libwebp https://developers.google.com/speed/webp/ +RUN \ + DIR=/tmp/vebp && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-${WEBP_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} ### libmp3lame http://lame.sourceforge.net/ RUN \ DIR=/tmp/lame && \ @@ -332,6 +344,7 @@ RUN \ --enable-libtheora \ --enable-libvorbis \ --enable-libvpx \ + --enable-libwebp \ --enable-libx265 \ --enable-libxvid \ --enable-libx264 \ diff --git a/docker-images/3.2/centos/Dockerfile b/docker-images/3.2/centos/Dockerfile index a4105e4eb..97ebbfad7 100644 --- a/docker-images/3.2/centos/Dockerfile +++ b/docker-images/3.2/centos/Dockerfile @@ -31,6 +31,7 @@ ENV FFMPEG_VERSION=3.2.14 \ THEORA_VERSION=1.1.1 \ VORBIS_VERSION=1.3.5 \ VPX_VERSION=1.8.0 \ + WEBP_VERSION=1.0.2 \ X264_VERSION=20170226-2245-stable \ X265_VERSION=2.3 \ XVID_VERSION=1.3.4 \ @@ -170,6 +171,17 @@ RUN \ make && \ make install && \ rm -rf ${DIR} +### libwebp https://developers.google.com/speed/webp/ +RUN \ + DIR=/tmp/vebp && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-${WEBP_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} ### libmp3lame http://lame.sourceforge.net/ RUN \ DIR=/tmp/lame && \ @@ -333,6 +345,7 @@ RUN \ --enable-libtheora \ --enable-libvorbis \ --enable-libvpx \ + --enable-libwebp \ --enable-libx265 \ --enable-libxvid \ --enable-libx264 \ diff --git a/docker-images/3.2/nvidia/Dockerfile b/docker-images/3.2/nvidia/Dockerfile index 810465092..be2d264ee 100644 --- a/docker-images/3.2/nvidia/Dockerfile +++ b/docker-images/3.2/nvidia/Dockerfile @@ -46,6 +46,7 @@ ENV FFMPEG_VERSION=3.2.14 \ THEORA_VERSION=1.1.1 \ VORBIS_VERSION=1.3.5 \ VPX_VERSION=1.8.0 \ + WEBP_VERSION=1.0.2 \ X264_VERSION=20170226-2245-stable \ X265_VERSION=2.3 \ XVID_VERSION=1.3.4 \ @@ -196,6 +197,17 @@ RUN \ make && \ make install && \ rm -rf ${DIR} +### libwebp https://developers.google.com/speed/webp/ +RUN \ + DIR=/tmp/vebp && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-${WEBP_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} ### libmp3lame http://lame.sourceforge.net/ RUN \ DIR=/tmp/lame && \ @@ -360,6 +372,7 @@ RUN \ --enable-libtheora \ --enable-libvorbis \ --enable-libvpx \ + --enable-libwebp \ --enable-libx265 \ --enable-libxvid \ --enable-libx264 \ diff --git a/docker-images/3.2/scratch/Dockerfile b/docker-images/3.2/scratch/Dockerfile index 75932cf3a..8b694c695 100644 --- a/docker-images/3.2/scratch/Dockerfile +++ b/docker-images/3.2/scratch/Dockerfile @@ -24,6 +24,7 @@ ENV FFMPEG_VERSION=3.2.14 \ THEORA_VERSION=1.1.1 \ VORBIS_VERSION=1.3.5 \ VPX_VERSION=1.8.0 \ + WEBP_VERSION=1.0.2 \ X264_VERSION=20170226-2245-stable \ X265_VERSION=2.3 \ XVID_VERSION=1.3.4 \ @@ -166,6 +167,17 @@ RUN \ make && \ make install && \ rm -rf ${DIR} +### libwebp https://developers.google.com/speed/webp/ +RUN \ + DIR=/tmp/vebp && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-${WEBP_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} ### libmp3lame http://lame.sourceforge.net/ RUN \ DIR=/tmp/lame && \ @@ -329,6 +341,7 @@ RUN \ --enable-libtheora \ --enable-libvorbis \ --enable-libvpx \ + --enable-libwebp \ --enable-libx265 \ --enable-libxvid \ --enable-libx264 \ diff --git a/docker-images/3.2/ubuntu/Dockerfile b/docker-images/3.2/ubuntu/Dockerfile index d434734cb..023bbb177 100644 --- a/docker-images/3.2/ubuntu/Dockerfile +++ b/docker-images/3.2/ubuntu/Dockerfile @@ -32,6 +32,7 @@ ENV FFMPEG_VERSION=3.2.14 \ THEORA_VERSION=1.1.1 \ VORBIS_VERSION=1.3.5 \ VPX_VERSION=1.8.0 \ + WEBP_VERSION=1.0.2 \ X264_VERSION=20170226-2245-stable \ X265_VERSION=2.3 \ XVID_VERSION=1.3.4 \ @@ -171,6 +172,17 @@ RUN \ make && \ make install && \ rm -rf ${DIR} +### libwebp https://developers.google.com/speed/webp/ +RUN \ + DIR=/tmp/vebp && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-${WEBP_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} ### libmp3lame http://lame.sourceforge.net/ RUN \ DIR=/tmp/lame && \ @@ -334,6 +346,7 @@ RUN \ --enable-libtheora \ --enable-libvorbis \ --enable-libvpx \ + --enable-libwebp \ --enable-libx265 \ --enable-libxvid \ --enable-libx264 \ diff --git a/docker-images/3.2/vaapi/Dockerfile b/docker-images/3.2/vaapi/Dockerfile index 20a1aacfd..a161c293f 100644 --- a/docker-images/3.2/vaapi/Dockerfile +++ b/docker-images/3.2/vaapi/Dockerfile @@ -32,6 +32,7 @@ ENV FFMPEG_VERSION=3.2.14 \ THEORA_VERSION=1.1.1 \ VORBIS_VERSION=1.3.5 \ VPX_VERSION=1.8.0 \ + WEBP_VERSION=1.0.2 \ X264_VERSION=20170226-2245-stable \ X265_VERSION=2.3 \ XVID_VERSION=1.3.4 \ @@ -172,6 +173,17 @@ RUN \ make && \ make install && \ rm -rf ${DIR} +### libwebp https://developers.google.com/speed/webp/ +RUN \ + DIR=/tmp/vebp && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-${WEBP_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} ### libmp3lame http://lame.sourceforge.net/ RUN \ DIR=/tmp/lame && \ @@ -336,6 +348,7 @@ RUN \ --enable-libtheora \ --enable-libvorbis \ --enable-libvpx \ + --enable-libwebp \ --enable-libx265 \ --enable-libxvid \ --enable-libx264 \ diff --git a/docker-images/3.3/alpine/Dockerfile b/docker-images/3.3/alpine/Dockerfile index b15b3ba1e..13cd6e138 100644 --- a/docker-images/3.3/alpine/Dockerfile +++ b/docker-images/3.3/alpine/Dockerfile @@ -29,6 +29,7 @@ ENV FFMPEG_VERSION=3.3.9 \ THEORA_VERSION=1.1.1 \ VORBIS_VERSION=1.3.5 \ VPX_VERSION=1.8.0 \ + WEBP_VERSION=1.0.2 \ X264_VERSION=20170226-2245-stable \ X265_VERSION=2.3 \ XVID_VERSION=1.3.4 \ @@ -169,6 +170,17 @@ RUN \ make && \ make install && \ rm -rf ${DIR} +### libwebp https://developers.google.com/speed/webp/ +RUN \ + DIR=/tmp/vebp && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-${WEBP_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} ### libmp3lame http://lame.sourceforge.net/ RUN \ DIR=/tmp/lame && \ @@ -332,6 +344,7 @@ RUN \ --enable-libtheora \ --enable-libvorbis \ --enable-libvpx \ + --enable-libwebp \ --enable-libx265 \ --enable-libxvid \ --enable-libx264 \ diff --git a/docker-images/3.3/centos/Dockerfile b/docker-images/3.3/centos/Dockerfile index 61837b56f..f3f69c344 100644 --- a/docker-images/3.3/centos/Dockerfile +++ b/docker-images/3.3/centos/Dockerfile @@ -31,6 +31,7 @@ ENV FFMPEG_VERSION=3.3.9 \ THEORA_VERSION=1.1.1 \ VORBIS_VERSION=1.3.5 \ VPX_VERSION=1.8.0 \ + WEBP_VERSION=1.0.2 \ X264_VERSION=20170226-2245-stable \ X265_VERSION=2.3 \ XVID_VERSION=1.3.4 \ @@ -170,6 +171,17 @@ RUN \ make && \ make install && \ rm -rf ${DIR} +### libwebp https://developers.google.com/speed/webp/ +RUN \ + DIR=/tmp/vebp && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-${WEBP_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} ### libmp3lame http://lame.sourceforge.net/ RUN \ DIR=/tmp/lame && \ @@ -333,6 +345,7 @@ RUN \ --enable-libtheora \ --enable-libvorbis \ --enable-libvpx \ + --enable-libwebp \ --enable-libx265 \ --enable-libxvid \ --enable-libx264 \ diff --git a/docker-images/3.3/nvidia/Dockerfile b/docker-images/3.3/nvidia/Dockerfile index c3d65e545..923b8c9df 100644 --- a/docker-images/3.3/nvidia/Dockerfile +++ b/docker-images/3.3/nvidia/Dockerfile @@ -46,6 +46,7 @@ ENV FFMPEG_VERSION=3.3.9 \ THEORA_VERSION=1.1.1 \ VORBIS_VERSION=1.3.5 \ VPX_VERSION=1.8.0 \ + WEBP_VERSION=1.0.2 \ X264_VERSION=20170226-2245-stable \ X265_VERSION=2.3 \ XVID_VERSION=1.3.4 \ @@ -196,6 +197,17 @@ RUN \ make && \ make install && \ rm -rf ${DIR} +### libwebp https://developers.google.com/speed/webp/ +RUN \ + DIR=/tmp/vebp && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-${WEBP_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} ### libmp3lame http://lame.sourceforge.net/ RUN \ DIR=/tmp/lame && \ @@ -360,6 +372,7 @@ RUN \ --enable-libtheora \ --enable-libvorbis \ --enable-libvpx \ + --enable-libwebp \ --enable-libx265 \ --enable-libxvid \ --enable-libx264 \ diff --git a/docker-images/3.3/scratch/Dockerfile b/docker-images/3.3/scratch/Dockerfile index 3a47cfc76..2792a73bb 100644 --- a/docker-images/3.3/scratch/Dockerfile +++ b/docker-images/3.3/scratch/Dockerfile @@ -24,6 +24,7 @@ ENV FFMPEG_VERSION=3.3.9 \ THEORA_VERSION=1.1.1 \ VORBIS_VERSION=1.3.5 \ VPX_VERSION=1.8.0 \ + WEBP_VERSION=1.0.2 \ X264_VERSION=20170226-2245-stable \ X265_VERSION=2.3 \ XVID_VERSION=1.3.4 \ @@ -166,6 +167,17 @@ RUN \ make && \ make install && \ rm -rf ${DIR} +### libwebp https://developers.google.com/speed/webp/ +RUN \ + DIR=/tmp/vebp && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-${WEBP_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} ### libmp3lame http://lame.sourceforge.net/ RUN \ DIR=/tmp/lame && \ @@ -329,6 +341,7 @@ RUN \ --enable-libtheora \ --enable-libvorbis \ --enable-libvpx \ + --enable-libwebp \ --enable-libx265 \ --enable-libxvid \ --enable-libx264 \ diff --git a/docker-images/3.3/ubuntu/Dockerfile b/docker-images/3.3/ubuntu/Dockerfile index ab46603ee..d9afdec57 100644 --- a/docker-images/3.3/ubuntu/Dockerfile +++ b/docker-images/3.3/ubuntu/Dockerfile @@ -32,6 +32,7 @@ ENV FFMPEG_VERSION=3.3.9 \ THEORA_VERSION=1.1.1 \ VORBIS_VERSION=1.3.5 \ VPX_VERSION=1.8.0 \ + WEBP_VERSION=1.0.2 \ X264_VERSION=20170226-2245-stable \ X265_VERSION=2.3 \ XVID_VERSION=1.3.4 \ @@ -171,6 +172,17 @@ RUN \ make && \ make install && \ rm -rf ${DIR} +### libwebp https://developers.google.com/speed/webp/ +RUN \ + DIR=/tmp/vebp && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-${WEBP_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} ### libmp3lame http://lame.sourceforge.net/ RUN \ DIR=/tmp/lame && \ @@ -334,6 +346,7 @@ RUN \ --enable-libtheora \ --enable-libvorbis \ --enable-libvpx \ + --enable-libwebp \ --enable-libx265 \ --enable-libxvid \ --enable-libx264 \ diff --git a/docker-images/3.3/vaapi/Dockerfile b/docker-images/3.3/vaapi/Dockerfile index 6d4391838..f73dfb3ef 100644 --- a/docker-images/3.3/vaapi/Dockerfile +++ b/docker-images/3.3/vaapi/Dockerfile @@ -32,6 +32,7 @@ ENV FFMPEG_VERSION=3.3.9 \ THEORA_VERSION=1.1.1 \ VORBIS_VERSION=1.3.5 \ VPX_VERSION=1.8.0 \ + WEBP_VERSION=1.0.2 \ X264_VERSION=20170226-2245-stable \ X265_VERSION=2.3 \ XVID_VERSION=1.3.4 \ @@ -172,6 +173,17 @@ RUN \ make && \ make install && \ rm -rf ${DIR} +### libwebp https://developers.google.com/speed/webp/ +RUN \ + DIR=/tmp/vebp && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-${WEBP_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} ### libmp3lame http://lame.sourceforge.net/ RUN \ DIR=/tmp/lame && \ @@ -336,6 +348,7 @@ RUN \ --enable-libtheora \ --enable-libvorbis \ --enable-libvpx \ + --enable-libwebp \ --enable-libx265 \ --enable-libxvid \ --enable-libx264 \ diff --git a/docker-images/3.4/alpine/Dockerfile b/docker-images/3.4/alpine/Dockerfile index b4e669f8e..7f09bb53a 100644 --- a/docker-images/3.4/alpine/Dockerfile +++ b/docker-images/3.4/alpine/Dockerfile @@ -29,6 +29,7 @@ ENV FFMPEG_VERSION=3.4.6 \ THEORA_VERSION=1.1.1 \ VORBIS_VERSION=1.3.5 \ VPX_VERSION=1.8.0 \ + WEBP_VERSION=1.0.2 \ X264_VERSION=20170226-2245-stable \ X265_VERSION=2.3 \ XVID_VERSION=1.3.4 \ @@ -169,6 +170,17 @@ RUN \ make && \ make install && \ rm -rf ${DIR} +### libwebp https://developers.google.com/speed/webp/ +RUN \ + DIR=/tmp/vebp && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-${WEBP_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} ### libmp3lame http://lame.sourceforge.net/ RUN \ DIR=/tmp/lame && \ @@ -332,6 +344,7 @@ RUN \ --enable-libtheora \ --enable-libvorbis \ --enable-libvpx \ + --enable-libwebp \ --enable-libx265 \ --enable-libxvid \ --enable-libx264 \ diff --git a/docker-images/3.4/centos/Dockerfile b/docker-images/3.4/centos/Dockerfile index 1215bbf14..d15bbe405 100644 --- a/docker-images/3.4/centos/Dockerfile +++ b/docker-images/3.4/centos/Dockerfile @@ -31,6 +31,7 @@ ENV FFMPEG_VERSION=3.4.6 \ THEORA_VERSION=1.1.1 \ VORBIS_VERSION=1.3.5 \ VPX_VERSION=1.8.0 \ + WEBP_VERSION=1.0.2 \ X264_VERSION=20170226-2245-stable \ X265_VERSION=2.3 \ XVID_VERSION=1.3.4 \ @@ -170,6 +171,17 @@ RUN \ make && \ make install && \ rm -rf ${DIR} +### libwebp https://developers.google.com/speed/webp/ +RUN \ + DIR=/tmp/vebp && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-${WEBP_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} ### libmp3lame http://lame.sourceforge.net/ RUN \ DIR=/tmp/lame && \ @@ -333,6 +345,7 @@ RUN \ --enable-libtheora \ --enable-libvorbis \ --enable-libvpx \ + --enable-libwebp \ --enable-libx265 \ --enable-libxvid \ --enable-libx264 \ diff --git a/docker-images/3.4/nvidia/Dockerfile b/docker-images/3.4/nvidia/Dockerfile index 52e81e6e7..bd0ff4949 100644 --- a/docker-images/3.4/nvidia/Dockerfile +++ b/docker-images/3.4/nvidia/Dockerfile @@ -46,6 +46,7 @@ ENV FFMPEG_VERSION=3.4.6 \ THEORA_VERSION=1.1.1 \ VORBIS_VERSION=1.3.5 \ VPX_VERSION=1.8.0 \ + WEBP_VERSION=1.0.2 \ X264_VERSION=20170226-2245-stable \ X265_VERSION=2.3 \ XVID_VERSION=1.3.4 \ @@ -196,6 +197,17 @@ RUN \ make && \ make install && \ rm -rf ${DIR} +### libwebp https://developers.google.com/speed/webp/ +RUN \ + DIR=/tmp/vebp && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-${WEBP_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} ### libmp3lame http://lame.sourceforge.net/ RUN \ DIR=/tmp/lame && \ @@ -360,6 +372,7 @@ RUN \ --enable-libtheora \ --enable-libvorbis \ --enable-libvpx \ + --enable-libwebp \ --enable-libx265 \ --enable-libxvid \ --enable-libx264 \ diff --git a/docker-images/3.4/scratch/Dockerfile b/docker-images/3.4/scratch/Dockerfile index e52b2001a..d10f73583 100644 --- a/docker-images/3.4/scratch/Dockerfile +++ b/docker-images/3.4/scratch/Dockerfile @@ -24,6 +24,7 @@ ENV FFMPEG_VERSION=3.4.6 \ THEORA_VERSION=1.1.1 \ VORBIS_VERSION=1.3.5 \ VPX_VERSION=1.8.0 \ + WEBP_VERSION=1.0.2 \ X264_VERSION=20170226-2245-stable \ X265_VERSION=2.3 \ XVID_VERSION=1.3.4 \ @@ -166,6 +167,17 @@ RUN \ make && \ make install && \ rm -rf ${DIR} +### libwebp https://developers.google.com/speed/webp/ +RUN \ + DIR=/tmp/vebp && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-${WEBP_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} ### libmp3lame http://lame.sourceforge.net/ RUN \ DIR=/tmp/lame && \ @@ -329,6 +341,7 @@ RUN \ --enable-libtheora \ --enable-libvorbis \ --enable-libvpx \ + --enable-libwebp \ --enable-libx265 \ --enable-libxvid \ --enable-libx264 \ diff --git a/docker-images/3.4/ubuntu/Dockerfile b/docker-images/3.4/ubuntu/Dockerfile index 97aba403d..00caf17b9 100644 --- a/docker-images/3.4/ubuntu/Dockerfile +++ b/docker-images/3.4/ubuntu/Dockerfile @@ -32,6 +32,7 @@ ENV FFMPEG_VERSION=3.4.6 \ THEORA_VERSION=1.1.1 \ VORBIS_VERSION=1.3.5 \ VPX_VERSION=1.8.0 \ + WEBP_VERSION=1.0.2 \ X264_VERSION=20170226-2245-stable \ X265_VERSION=2.3 \ XVID_VERSION=1.3.4 \ @@ -171,6 +172,17 @@ RUN \ make && \ make install && \ rm -rf ${DIR} +### libwebp https://developers.google.com/speed/webp/ +RUN \ + DIR=/tmp/vebp && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-${WEBP_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} ### libmp3lame http://lame.sourceforge.net/ RUN \ DIR=/tmp/lame && \ @@ -334,6 +346,7 @@ RUN \ --enable-libtheora \ --enable-libvorbis \ --enable-libvpx \ + --enable-libwebp \ --enable-libx265 \ --enable-libxvid \ --enable-libx264 \ diff --git a/docker-images/3.4/vaapi/Dockerfile b/docker-images/3.4/vaapi/Dockerfile index 753376589..e3ffe97bf 100644 --- a/docker-images/3.4/vaapi/Dockerfile +++ b/docker-images/3.4/vaapi/Dockerfile @@ -32,6 +32,7 @@ ENV FFMPEG_VERSION=3.4.6 \ THEORA_VERSION=1.1.1 \ VORBIS_VERSION=1.3.5 \ VPX_VERSION=1.8.0 \ + WEBP_VERSION=1.0.2 \ X264_VERSION=20170226-2245-stable \ X265_VERSION=2.3 \ XVID_VERSION=1.3.4 \ @@ -172,6 +173,17 @@ RUN \ make && \ make install && \ rm -rf ${DIR} +### libwebp https://developers.google.com/speed/webp/ +RUN \ + DIR=/tmp/vebp && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-${WEBP_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} ### libmp3lame http://lame.sourceforge.net/ RUN \ DIR=/tmp/lame && \ @@ -336,6 +348,7 @@ RUN \ --enable-libtheora \ --enable-libvorbis \ --enable-libvpx \ + --enable-libwebp \ --enable-libx265 \ --enable-libxvid \ --enable-libx264 \ diff --git a/docker-images/4.0/alpine/Dockerfile b/docker-images/4.0/alpine/Dockerfile index d87c380bf..a058ac21f 100644 --- a/docker-images/4.0/alpine/Dockerfile +++ b/docker-images/4.0/alpine/Dockerfile @@ -29,6 +29,7 @@ ENV FFMPEG_VERSION=4.0.4 \ THEORA_VERSION=1.1.1 \ VORBIS_VERSION=1.3.5 \ VPX_VERSION=1.8.0 \ + WEBP_VERSION=1.0.2 \ X264_VERSION=20170226-2245-stable \ X265_VERSION=2.3 \ XVID_VERSION=1.3.4 \ @@ -169,6 +170,17 @@ RUN \ make && \ make install && \ rm -rf ${DIR} +### libwebp https://developers.google.com/speed/webp/ +RUN \ + DIR=/tmp/vebp && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-${WEBP_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} ### libmp3lame http://lame.sourceforge.net/ RUN \ DIR=/tmp/lame && \ @@ -332,6 +344,7 @@ RUN \ --enable-libtheora \ --enable-libvorbis \ --enable-libvpx \ + --enable-libwebp \ --enable-libx265 \ --enable-libxvid \ --enable-libx264 \ diff --git a/docker-images/4.0/centos/Dockerfile b/docker-images/4.0/centos/Dockerfile index f3c6cfc94..af833fc13 100644 --- a/docker-images/4.0/centos/Dockerfile +++ b/docker-images/4.0/centos/Dockerfile @@ -31,6 +31,7 @@ ENV FFMPEG_VERSION=4.0.4 \ THEORA_VERSION=1.1.1 \ VORBIS_VERSION=1.3.5 \ VPX_VERSION=1.8.0 \ + WEBP_VERSION=1.0.2 \ X264_VERSION=20170226-2245-stable \ X265_VERSION=2.3 \ XVID_VERSION=1.3.4 \ @@ -170,6 +171,17 @@ RUN \ make && \ make install && \ rm -rf ${DIR} +### libwebp https://developers.google.com/speed/webp/ +RUN \ + DIR=/tmp/vebp && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-${WEBP_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} ### libmp3lame http://lame.sourceforge.net/ RUN \ DIR=/tmp/lame && \ @@ -333,6 +345,7 @@ RUN \ --enable-libtheora \ --enable-libvorbis \ --enable-libvpx \ + --enable-libwebp \ --enable-libx265 \ --enable-libxvid \ --enable-libx264 \ diff --git a/docker-images/4.0/nvidia/Dockerfile b/docker-images/4.0/nvidia/Dockerfile index f5af37740..b445fea8c 100644 --- a/docker-images/4.0/nvidia/Dockerfile +++ b/docker-images/4.0/nvidia/Dockerfile @@ -46,6 +46,7 @@ ENV FFMPEG_VERSION=4.0.4 \ THEORA_VERSION=1.1.1 \ VORBIS_VERSION=1.3.5 \ VPX_VERSION=1.8.0 \ + WEBP_VERSION=1.0.2 \ X264_VERSION=20170226-2245-stable \ X265_VERSION=2.3 \ XVID_VERSION=1.3.4 \ @@ -196,6 +197,17 @@ RUN \ make && \ make install && \ rm -rf ${DIR} +### libwebp https://developers.google.com/speed/webp/ +RUN \ + DIR=/tmp/vebp && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-${WEBP_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} ### libmp3lame http://lame.sourceforge.net/ RUN \ DIR=/tmp/lame && \ @@ -363,6 +375,7 @@ RUN \ --enable-libtheora \ --enable-libvorbis \ --enable-libvpx \ + --enable-libwebp \ --enable-libx265 \ --enable-libxvid \ --enable-libx264 \ diff --git a/docker-images/4.0/scratch/Dockerfile b/docker-images/4.0/scratch/Dockerfile index 25c509a16..058752fd2 100644 --- a/docker-images/4.0/scratch/Dockerfile +++ b/docker-images/4.0/scratch/Dockerfile @@ -24,6 +24,7 @@ ENV FFMPEG_VERSION=4.0.4 \ THEORA_VERSION=1.1.1 \ VORBIS_VERSION=1.3.5 \ VPX_VERSION=1.8.0 \ + WEBP_VERSION=1.0.2 \ X264_VERSION=20170226-2245-stable \ X265_VERSION=2.3 \ XVID_VERSION=1.3.4 \ @@ -166,6 +167,17 @@ RUN \ make && \ make install && \ rm -rf ${DIR} +### libwebp https://developers.google.com/speed/webp/ +RUN \ + DIR=/tmp/vebp && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-${WEBP_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} ### libmp3lame http://lame.sourceforge.net/ RUN \ DIR=/tmp/lame && \ @@ -329,6 +341,7 @@ RUN \ --enable-libtheora \ --enable-libvorbis \ --enable-libvpx \ + --enable-libwebp \ --enable-libx265 \ --enable-libxvid \ --enable-libx264 \ diff --git a/docker-images/4.0/ubuntu/Dockerfile b/docker-images/4.0/ubuntu/Dockerfile index bbcaff765..6e182a431 100644 --- a/docker-images/4.0/ubuntu/Dockerfile +++ b/docker-images/4.0/ubuntu/Dockerfile @@ -32,6 +32,7 @@ ENV FFMPEG_VERSION=4.0.4 \ THEORA_VERSION=1.1.1 \ VORBIS_VERSION=1.3.5 \ VPX_VERSION=1.8.0 \ + WEBP_VERSION=1.0.2 \ X264_VERSION=20170226-2245-stable \ X265_VERSION=2.3 \ XVID_VERSION=1.3.4 \ @@ -171,6 +172,17 @@ RUN \ make && \ make install && \ rm -rf ${DIR} +### libwebp https://developers.google.com/speed/webp/ +RUN \ + DIR=/tmp/vebp && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-${WEBP_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} ### libmp3lame http://lame.sourceforge.net/ RUN \ DIR=/tmp/lame && \ @@ -334,6 +346,7 @@ RUN \ --enable-libtheora \ --enable-libvorbis \ --enable-libvpx \ + --enable-libwebp \ --enable-libx265 \ --enable-libxvid \ --enable-libx264 \ diff --git a/docker-images/4.0/vaapi/Dockerfile b/docker-images/4.0/vaapi/Dockerfile index d4fb83c13..2e6927c32 100644 --- a/docker-images/4.0/vaapi/Dockerfile +++ b/docker-images/4.0/vaapi/Dockerfile @@ -32,6 +32,7 @@ ENV FFMPEG_VERSION=4.0.4 \ THEORA_VERSION=1.1.1 \ VORBIS_VERSION=1.3.5 \ VPX_VERSION=1.8.0 \ + WEBP_VERSION=1.0.2 \ X264_VERSION=20170226-2245-stable \ X265_VERSION=2.3 \ XVID_VERSION=1.3.4 \ @@ -172,6 +173,17 @@ RUN \ make && \ make install && \ rm -rf ${DIR} +### libwebp https://developers.google.com/speed/webp/ +RUN \ + DIR=/tmp/vebp && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-${WEBP_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} ### libmp3lame http://lame.sourceforge.net/ RUN \ DIR=/tmp/lame && \ @@ -336,6 +348,7 @@ RUN \ --enable-libtheora \ --enable-libvorbis \ --enable-libvpx \ + --enable-libwebp \ --enable-libx265 \ --enable-libxvid \ --enable-libx264 \ diff --git a/docker-images/4.1/alpine/Dockerfile b/docker-images/4.1/alpine/Dockerfile index d8a1d5867..231808547 100644 --- a/docker-images/4.1/alpine/Dockerfile +++ b/docker-images/4.1/alpine/Dockerfile @@ -29,6 +29,7 @@ ENV FFMPEG_VERSION=4.1.3 \ THEORA_VERSION=1.1.1 \ VORBIS_VERSION=1.3.5 \ VPX_VERSION=1.8.0 \ + WEBP_VERSION=1.0.2 \ X264_VERSION=20170226-2245-stable \ X265_VERSION=2.3 \ XVID_VERSION=1.3.4 \ @@ -169,6 +170,17 @@ RUN \ make && \ make install && \ rm -rf ${DIR} +### libwebp https://developers.google.com/speed/webp/ +RUN \ + DIR=/tmp/vebp && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-${WEBP_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} ### libmp3lame http://lame.sourceforge.net/ RUN \ DIR=/tmp/lame && \ @@ -332,6 +344,7 @@ RUN \ --enable-libtheora \ --enable-libvorbis \ --enable-libvpx \ + --enable-libwebp \ --enable-libx265 \ --enable-libxvid \ --enable-libx264 \ diff --git a/docker-images/4.1/centos/Dockerfile b/docker-images/4.1/centos/Dockerfile index cb68df0f5..021d986ef 100644 --- a/docker-images/4.1/centos/Dockerfile +++ b/docker-images/4.1/centos/Dockerfile @@ -31,6 +31,7 @@ ENV FFMPEG_VERSION=4.1.3 \ THEORA_VERSION=1.1.1 \ VORBIS_VERSION=1.3.5 \ VPX_VERSION=1.8.0 \ + WEBP_VERSION=1.0.2 \ X264_VERSION=20170226-2245-stable \ X265_VERSION=2.3 \ XVID_VERSION=1.3.4 \ @@ -170,6 +171,17 @@ RUN \ make && \ make install && \ rm -rf ${DIR} +### libwebp https://developers.google.com/speed/webp/ +RUN \ + DIR=/tmp/vebp && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-${WEBP_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} ### libmp3lame http://lame.sourceforge.net/ RUN \ DIR=/tmp/lame && \ @@ -333,6 +345,7 @@ RUN \ --enable-libtheora \ --enable-libvorbis \ --enable-libvpx \ + --enable-libwebp \ --enable-libx265 \ --enable-libxvid \ --enable-libx264 \ diff --git a/docker-images/4.1/nvidia/Dockerfile b/docker-images/4.1/nvidia/Dockerfile index d0f9ae97f..2611dd489 100644 --- a/docker-images/4.1/nvidia/Dockerfile +++ b/docker-images/4.1/nvidia/Dockerfile @@ -46,6 +46,7 @@ ENV FFMPEG_VERSION=4.1.3 \ THEORA_VERSION=1.1.1 \ VORBIS_VERSION=1.3.5 \ VPX_VERSION=1.8.0 \ + WEBP_VERSION=1.0.2 \ X264_VERSION=20170226-2245-stable \ X265_VERSION=2.3 \ XVID_VERSION=1.3.4 \ @@ -196,6 +197,17 @@ RUN \ make && \ make install && \ rm -rf ${DIR} +### libwebp https://developers.google.com/speed/webp/ +RUN \ + DIR=/tmp/vebp && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-${WEBP_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} ### libmp3lame http://lame.sourceforge.net/ RUN \ DIR=/tmp/lame && \ @@ -363,6 +375,7 @@ RUN \ --enable-libtheora \ --enable-libvorbis \ --enable-libvpx \ + --enable-libwebp \ --enable-libx265 \ --enable-libxvid \ --enable-libx264 \ diff --git a/docker-images/4.1/scratch/Dockerfile b/docker-images/4.1/scratch/Dockerfile index 746860572..e62db1e48 100644 --- a/docker-images/4.1/scratch/Dockerfile +++ b/docker-images/4.1/scratch/Dockerfile @@ -24,6 +24,7 @@ ENV FFMPEG_VERSION=4.1.3 \ THEORA_VERSION=1.1.1 \ VORBIS_VERSION=1.3.5 \ VPX_VERSION=1.8.0 \ + WEBP_VERSION=1.0.2 \ X264_VERSION=20170226-2245-stable \ X265_VERSION=2.3 \ XVID_VERSION=1.3.4 \ @@ -166,6 +167,17 @@ RUN \ make && \ make install && \ rm -rf ${DIR} +### libwebp https://developers.google.com/speed/webp/ +RUN \ + DIR=/tmp/vebp && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-${WEBP_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} ### libmp3lame http://lame.sourceforge.net/ RUN \ DIR=/tmp/lame && \ @@ -329,6 +341,7 @@ RUN \ --enable-libtheora \ --enable-libvorbis \ --enable-libvpx \ + --enable-libwebp \ --enable-libx265 \ --enable-libxvid \ --enable-libx264 \ diff --git a/docker-images/4.1/ubuntu/Dockerfile b/docker-images/4.1/ubuntu/Dockerfile index 1c7e0ebed..cc5bf93d0 100644 --- a/docker-images/4.1/ubuntu/Dockerfile +++ b/docker-images/4.1/ubuntu/Dockerfile @@ -32,6 +32,7 @@ ENV FFMPEG_VERSION=4.1.3 \ THEORA_VERSION=1.1.1 \ VORBIS_VERSION=1.3.5 \ VPX_VERSION=1.8.0 \ + WEBP_VERSION=1.0.2 \ X264_VERSION=20170226-2245-stable \ X265_VERSION=2.3 \ XVID_VERSION=1.3.4 \ @@ -171,6 +172,17 @@ RUN \ make && \ make install && \ rm -rf ${DIR} +### libwebp https://developers.google.com/speed/webp/ +RUN \ + DIR=/tmp/vebp && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-${WEBP_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} ### libmp3lame http://lame.sourceforge.net/ RUN \ DIR=/tmp/lame && \ @@ -334,6 +346,7 @@ RUN \ --enable-libtheora \ --enable-libvorbis \ --enable-libvpx \ + --enable-libwebp \ --enable-libx265 \ --enable-libxvid \ --enable-libx264 \ diff --git a/docker-images/4.1/vaapi/Dockerfile b/docker-images/4.1/vaapi/Dockerfile index 29e0e8d9d..307844bdb 100644 --- a/docker-images/4.1/vaapi/Dockerfile +++ b/docker-images/4.1/vaapi/Dockerfile @@ -32,6 +32,7 @@ ENV FFMPEG_VERSION=4.1.3 \ THEORA_VERSION=1.1.1 \ VORBIS_VERSION=1.3.5 \ VPX_VERSION=1.8.0 \ + WEBP_VERSION=1.0.2 \ X264_VERSION=20170226-2245-stable \ X265_VERSION=2.3 \ XVID_VERSION=1.3.4 \ @@ -172,6 +173,17 @@ RUN \ make && \ make install && \ rm -rf ${DIR} +### libwebp https://developers.google.com/speed/webp/ +RUN \ + DIR=/tmp/vebp && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-${WEBP_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} ### libmp3lame http://lame.sourceforge.net/ RUN \ DIR=/tmp/lame && \ @@ -336,6 +348,7 @@ RUN \ --enable-libtheora \ --enable-libvorbis \ --enable-libvpx \ + --enable-libwebp \ --enable-libx265 \ --enable-libxvid \ --enable-libx264 \ diff --git a/docker-images/snapshot/alpine/Dockerfile b/docker-images/snapshot/alpine/Dockerfile index 9995c30d1..d60b14473 100644 --- a/docker-images/snapshot/alpine/Dockerfile +++ b/docker-images/snapshot/alpine/Dockerfile @@ -29,6 +29,7 @@ ENV FFMPEG_VERSION=snapshot \ THEORA_VERSION=1.1.1 \ VORBIS_VERSION=1.3.5 \ VPX_VERSION=1.8.0 \ + WEBP_VERSION=1.0.2 \ X264_VERSION=20170226-2245-stable \ X265_VERSION=2.3 \ XVID_VERSION=1.3.4 \ @@ -169,6 +170,17 @@ RUN \ make && \ make install && \ rm -rf ${DIR} +### libwebp https://developers.google.com/speed/webp/ +RUN \ + DIR=/tmp/vebp && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-${WEBP_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} ### libmp3lame http://lame.sourceforge.net/ RUN \ DIR=/tmp/lame && \ @@ -332,6 +344,7 @@ RUN \ --enable-libtheora \ --enable-libvorbis \ --enable-libvpx \ + --enable-libwebp \ --enable-libx265 \ --enable-libxvid \ --enable-libx264 \ diff --git a/docker-images/snapshot/centos/Dockerfile b/docker-images/snapshot/centos/Dockerfile index 231354327..e74228908 100644 --- a/docker-images/snapshot/centos/Dockerfile +++ b/docker-images/snapshot/centos/Dockerfile @@ -31,6 +31,7 @@ ENV FFMPEG_VERSION=snapshot \ THEORA_VERSION=1.1.1 \ VORBIS_VERSION=1.3.5 \ VPX_VERSION=1.8.0 \ + WEBP_VERSION=1.0.2 \ X264_VERSION=20170226-2245-stable \ X265_VERSION=2.3 \ XVID_VERSION=1.3.4 \ @@ -170,6 +171,17 @@ RUN \ make && \ make install && \ rm -rf ${DIR} +### libwebp https://developers.google.com/speed/webp/ +RUN \ + DIR=/tmp/vebp && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-${WEBP_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} ### libmp3lame http://lame.sourceforge.net/ RUN \ DIR=/tmp/lame && \ @@ -333,6 +345,7 @@ RUN \ --enable-libtheora \ --enable-libvorbis \ --enable-libvpx \ + --enable-libwebp \ --enable-libx265 \ --enable-libxvid \ --enable-libx264 \ diff --git a/docker-images/snapshot/nvidia/Dockerfile b/docker-images/snapshot/nvidia/Dockerfile index 84d8ad4d1..25a07fe3e 100644 --- a/docker-images/snapshot/nvidia/Dockerfile +++ b/docker-images/snapshot/nvidia/Dockerfile @@ -46,6 +46,7 @@ ENV FFMPEG_VERSION=snapshot \ THEORA_VERSION=1.1.1 \ VORBIS_VERSION=1.3.5 \ VPX_VERSION=1.8.0 \ + WEBP_VERSION=1.0.2 \ X264_VERSION=20170226-2245-stable \ X265_VERSION=2.3 \ XVID_VERSION=1.3.4 \ @@ -196,6 +197,17 @@ RUN \ make && \ make install && \ rm -rf ${DIR} +### libwebp https://developers.google.com/speed/webp/ +RUN \ + DIR=/tmp/vebp && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-${WEBP_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} ### libmp3lame http://lame.sourceforge.net/ RUN \ DIR=/tmp/lame && \ @@ -363,6 +375,7 @@ RUN \ --enable-libtheora \ --enable-libvorbis \ --enable-libvpx \ + --enable-libwebp \ --enable-libx265 \ --enable-libxvid \ --enable-libx264 \ diff --git a/docker-images/snapshot/scratch/Dockerfile b/docker-images/snapshot/scratch/Dockerfile index 0e70f0159..9d96a0bb8 100644 --- a/docker-images/snapshot/scratch/Dockerfile +++ b/docker-images/snapshot/scratch/Dockerfile @@ -24,6 +24,7 @@ ENV FFMPEG_VERSION=snapshot \ THEORA_VERSION=1.1.1 \ VORBIS_VERSION=1.3.5 \ VPX_VERSION=1.8.0 \ + WEBP_VERSION=1.0.2 \ X264_VERSION=20170226-2245-stable \ X265_VERSION=2.3 \ XVID_VERSION=1.3.4 \ @@ -166,6 +167,17 @@ RUN \ make && \ make install && \ rm -rf ${DIR} +### libwebp https://developers.google.com/speed/webp/ +RUN \ + DIR=/tmp/vebp && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-${WEBP_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} ### libmp3lame http://lame.sourceforge.net/ RUN \ DIR=/tmp/lame && \ @@ -329,6 +341,7 @@ RUN \ --enable-libtheora \ --enable-libvorbis \ --enable-libvpx \ + --enable-libwebp \ --enable-libx265 \ --enable-libxvid \ --enable-libx264 \ diff --git a/docker-images/snapshot/ubuntu/Dockerfile b/docker-images/snapshot/ubuntu/Dockerfile index 62e942a28..4ac5753cf 100644 --- a/docker-images/snapshot/ubuntu/Dockerfile +++ b/docker-images/snapshot/ubuntu/Dockerfile @@ -32,6 +32,7 @@ ENV FFMPEG_VERSION=snapshot \ THEORA_VERSION=1.1.1 \ VORBIS_VERSION=1.3.5 \ VPX_VERSION=1.8.0 \ + WEBP_VERSION=1.0.2 \ X264_VERSION=20170226-2245-stable \ X265_VERSION=2.3 \ XVID_VERSION=1.3.4 \ @@ -171,6 +172,17 @@ RUN \ make && \ make install && \ rm -rf ${DIR} +### libwebp https://developers.google.com/speed/webp/ +RUN \ + DIR=/tmp/vebp && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-${WEBP_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} ### libmp3lame http://lame.sourceforge.net/ RUN \ DIR=/tmp/lame && \ @@ -334,6 +346,7 @@ RUN \ --enable-libtheora \ --enable-libvorbis \ --enable-libvpx \ + --enable-libwebp \ --enable-libx265 \ --enable-libxvid \ --enable-libx264 \ diff --git a/docker-images/snapshot/vaapi/Dockerfile b/docker-images/snapshot/vaapi/Dockerfile index 6c0966c55..e687b453d 100644 --- a/docker-images/snapshot/vaapi/Dockerfile +++ b/docker-images/snapshot/vaapi/Dockerfile @@ -32,6 +32,7 @@ ENV FFMPEG_VERSION=snapshot \ THEORA_VERSION=1.1.1 \ VORBIS_VERSION=1.3.5 \ VPX_VERSION=1.8.0 \ + WEBP_VERSION=1.0.2 \ X264_VERSION=20170226-2245-stable \ X265_VERSION=2.3 \ XVID_VERSION=1.3.4 \ @@ -172,6 +173,17 @@ RUN \ make && \ make install && \ rm -rf ${DIR} +### libwebp https://developers.google.com/speed/webp/ +RUN \ + DIR=/tmp/vebp && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-${WEBP_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} ### libmp3lame http://lame.sourceforge.net/ RUN \ DIR=/tmp/lame && \ @@ -336,6 +348,7 @@ RUN \ --enable-libtheora \ --enable-libvorbis \ --enable-libvpx \ + --enable-libwebp \ --enable-libx265 \ --enable-libxvid \ --enable-libx264 \ From 43b896b5f1998486a5a500c6ba0ede6dc7c6b93c Mon Sep 17 00:00:00 2001 From: Julien Rottenberg Date: Thu, 4 Jul 2019 22:07:17 -0700 Subject: [PATCH 06/29] support for our secrets --- templates/azure.template | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/templates/azure.template b/templates/azure.template index ec720bc8b..8d146bc58 100644 --- a/templates/azure.template +++ b/templates/azure.template @@ -1,5 +1,7 @@ variables: - DOCKER: 'jrottenberg/ffmpeg' +- group: videotoolsbuild-dockerhub +- name: DOCKER + value: jrottenberg/ffmpeg jobs: - job: Build @@ -19,3 +21,5 @@ jobs: docker push ${DOCKER}:${VERSION}-${VARIANT} condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/master')) displayName: Push docker image + env: + DOCKER_PASSWORD: $(docker.password) \ No newline at end of file From 1a3f0fc02329204d9b634484ae32201294ec4485 Mon Sep 17 00:00:00 2001 From: Julien Rottenberg Date: Thu, 4 Jul 2019 22:08:22 -0700 Subject: [PATCH 07/29] config management --- azure-pipelines.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index daa99df7c..5dc534a41 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -1,5 +1,7 @@ variables: - DOCKER: 'jrottenberg/ffmpeg' +- group: videotoolsbuild-dockerhub +- name: DOCKER + value: jrottenberg/ffmpeg jobs: - job: Build @@ -180,3 +182,5 @@ jobs: docker push ${DOCKER}:${VERSION}-${VARIANT} condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/master')) displayName: Push docker image + env: + DOCKER_PASSWORD: $(docker.password) \ No newline at end of file From e8ce2c0ff06df9de6ddbf6de336ad050aed71604 Mon Sep 17 00:00:00 2001 From: Julien Rottenberg Date: Fri, 5 Jul 2019 07:54:17 -0700 Subject: [PATCH 08/29] refactor cleaner attribution, proper format for nvidia to close #177 --- README.md | 138 +++++++++++++++++++++++++++++++++++++++--------------- 1 file changed, 99 insertions(+), 39 deletions(-) diff --git a/README.md b/README.md index dcbbf6b5f..43b7b45f1 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ -FFmpeg Docker image -================== +# FFmpeg Docker image + [![Docker Stars](https://img.shields.io/docker/stars/jrottenberg/ffmpeg.svg?style=plastic)](https://registry.hub.docker.com/v2/repositories/jrottenberg/ffmpeg/stars/count/) [![Docker pulls](https://img.shields.io/docker/pulls/jrottenberg/ffmpeg.svg?style=plastic)](https://registry.hub.docker.com/v2/repositories/jrottenberg/ffmpeg/) [![Travis](https://img.shields.io/travis/jrottenberg/ffmpeg/master.svg?maxAge=300?style=plastic)](https://travis-ci.org/jrottenberg/ffmpeg) @@ -12,8 +12,7 @@ You can install the latest build of this image by running `docker pull jrottenbe This image can be used as a base for an encoding farm. -Ubuntu builds --------------- +## Builds You can use jrottenberg/ffmpeg or jrottenberg/ffmpeg:3.3 to get the latest build based on ubuntu. @@ -24,39 +23,99 @@ You'll find centos based image using `ffmpeg:X.Y-centos` or `ffmpeg:centos` to g alpine images `ffmpeg:X.Y-alpine` to get the latest. scratch images `ffmpeg:X.Y-scratch` to get the latest. (Scratch is an experimental image containing only FFmpeg and libraries) +Format is `ffmpeg:MAJOR.MINOR-VARIANT` with MAJOR.MINOR in : +- 2.8 +- 3.0 +- 3.1 +- 3.2 +- 3.3 +- 3.4 +- 4.0 +- 4.1 +- snapshot + +and VARIANT in : +- alpine +- centos +- nvidia +- scratch +- ubuntu +- vaapi + + Recent images: ``` -vaapi 86mb 2018-08-16 -snapshot-centos 95mb 2018-08-16 -snapshot-alpine 27mb 2018-08-16 -4.0-vaapi 86mb 2018-08-15 -4.0-ubuntu 94mb 2018-08-16 -4.0-scratch 20mb 2018-08-16 -4.0-centos 95mb 2018-08-16 -3.4-vaapi 84mb 2018-08-15 -3.4-scratch 18mb 2018-08-16 -3.4-alpine 24mb 2018-08-16 -3.4 92mb 2018-08-16 -3.3-scratch 17mb 2018-08-04 -3.2-scratch 17mb 2018-08-16 -3.2-alpine 24mb 2018-08-16 -3.0-scratch 17mb 2018-08-16 -3.0-centos 94mb 2018-08-16 -2.8-scratch 16mb 2018-08-16 -2.8 90mb 2018-08-16 +snapshot-vaapi 74mb +snapshot-ubuntu 86mb +snapshot-scratch 20mb +snapshot-nvidia 640mb +snapshot-centos 97mb +snapshot-alpine 35mb +4.1-vaapi 73mb +4.1-ubuntu 85mb +4.1-scratch 20mb +4.1-nvidia 640mb +4.1-centos 97mb +4.1-alpine 34mb +4.0-vaapi 73mb +4.0-ubuntu 83mb +4.0-scratch 20mb +4.0-nvidia 639mb +4.0-centos 97mb +4.0-alpine 34mb +3.4-vaapi 71mb +3.4-ubuntu 83mb +3.4-scratch 18mb +3.4-nvidia 637mb +3.4-centos 97mb +3.4-alpine 32mb +3.4 83mb +3.3-vaapi 71mb +3.3-ubuntu 83mb +3.3-scratch 18mb +3.3-nvidia 637mb +3.3-centos 96mb +3.3-alpine 31mb +3.3 82mb +3.2-vaapi 83mb +3.2-ubuntu 83mb +3.2-scratch 18mb +3.2-nvidia 623mb +3.2-centos 96mb +3.2-alpine 32mb +3.1-vaapi 83mb +3.1-ubuntu 82mb +3.1-scratch 17mb +3.1-nvidia 623mb +3.1-centos 96mb +3.1-alpine 32mb +3.1 81mb +3.0-ubuntu 82mb +3.0-scratch 17mb +3.0-nvidia 623mb +3.0-centos 96mb +3.0-alpine 31mb +2.8-vaapi 82mb +2.8-ubuntu 81mb +2.8-scratch 17mb +2.8-nvidia 622mb +2.8-centos 95mb +2.8-alpine 30mb ``` -
(How the 'recent images' was generated) +### How the 'recent images' was generated + ``` - $ curl --silent https://hub.docker.com/v2/repositories/jrottenberg/ffmpeg/tags/?page_size=500 | jq -cr ".results|sort_by(.name)|reverse[]|.sz=(.full_size/1048576|floor|tostring+\"mb\")|[.name,( (20-(.name|length))*\" \" ),.sz,( (8-(.sz|length))*\" \"),.last_updated[:10]]|@text|gsub(\"[,\\\"\\\]\\\[]\";null)" | grep 2018-08 +$ curl --silent https://hub.docker.com/v2/repositories/jrottenberg/ffmpeg/tags/?page_size=500 | jq -cr ".results|sort_by(.name)|reverse[]|.sz=(.full_size/1048576|floor|tostring+\"mb\")|[.name,( (20-(.name|length))*\" \" ),.sz,( (8-(.sz|length))*\" \"),.last_updated[:10]]|@text|gsub(\"[,\\\"\\\]\\\[]\";null)" + +# If you want to compare the one you have locally +$ docker images | grep ffmpeg | sort | awk '{print $1 ":" $2 "\t" $7 $8}' ``` -
Please use [Github issues](https://github.com/jrottenberg/ffmpeg/issues/new) to report any bug or missing feature. -Test ----- +## Test ``` ffmpeg version 3.3.4 Copyright (c) 2000-2017 the FFmpeg developers @@ -136,7 +195,7 @@ Capture output from the container to the host running the command The image has been compiled with [X265 Multilib](https://x265.readthedocs.io/en/default/api.html#multi-library-interface). Use the pixel format switch to change the number of bits per pixel by suffixing it with 10 for 10bits or 12 for 12bits. -#### Convert a local GIF into a mp4 +#### Convert a local GIF into a mp4 Let's assume ```original.gif``` is located in the current directory : ``` @@ -148,9 +207,9 @@ Let's assume ```original.gif``` is located in the current directory : #### Use hardware acceleration enabled build -Thanks to [qmfrederik](https://github.com/qmfrederik) for the vaapi ubuntu based variant +Thanks to [qmfrederik](https://github.com/qmfrederik) for the [vaapi ubuntu based variant](https://github.com/jrottenberg/ffmpeg/pull/106) - jrottenberg/ffmpeg:vaapi or jrottenberg/ffmpeg:vaapi-${VERSION} + jrottenberg/ffmpeg:vaapi or jrottenberg/ffmpeg:${VERSION}-vaapi - Run the container with the device attached /dev/dri from your host into the container : @@ -160,19 +219,22 @@ Thanks to [qmfrederik](https://github.com/qmfrederik) for the vaapi ubuntu based #### Use nvidia hardware acceleration enabled build + +Thanks to [ShaulMyplay](https://github.com/ShaulMyplay) for the [nvidia based variant](https://github.com/jrottenberg/ffmpeg/pull/168) + Supports nvenc only on all ffmpeg versions, and hardware decoding and scaling on ffmpeg >= 4.0 - Install nvidia latest drivers on host machine. - Install [nvidia-docker](https://github.com/NVIDIA/nvidia-docker) on host machine. -- Run container using "--runtime=nvidia" flag and use supported [ffmpeg hwaccel options](https://trac.ffmpeg.org/wiki/HWAccelIntro) +- Run container using "--runtime=nvidia" flag and use supported [ffmpeg hwaccel options](https://trac.ffmpeg.org/wiki/HWAccelIntro) Hardware encoding only example: -`docker run --runtime=nvidia jrottenberg/ffmpeg:nvidia-2.8 -i INPUT -c:v nvenc_h264 -preset hq OUTPUT` +`docker run --runtime=nvidia jrottenberg/ffmpeg:2.8-nvidia -i INPUT -c:v nvenc_h264 -preset hq OUTPUT` Full hardware acceleration example: -`docker run --runtime=nvidia jrottenberg/ffmpeg:nvidia-4.1 -hwaccel cuvid -c:v h264_cuvid -i INPUT -vf scale_npp=-1:720 -c:v h264_nvenc -preset slow OUTPUT` +`docker run --runtime=nvidia jrottenberg/ffmpeg:4.1-nvidia -hwaccel cuvid -c:v h264_cuvid -i INPUT -vf scale_npp=-1:720 -c:v h264_nvenc -preset slow OUTPUT` + -See what's inside the beast ---------------------------- +##### See what's inside the beast ``` docker run -it --entrypoint='bash' jrottenberg/ffmpeg @@ -180,8 +242,7 @@ docker run -it --entrypoint='bash' jrottenberg/ffmpeg for i in ogg amr vorbis theora mp3lame opus vpx xvid fdk x264 x265;do echo $i; find /usr/local/ -name *$i*;done ``` -Keep up to date ---------------- +## Keep up to date See Dockerfile-env to update a version @@ -203,8 +264,7 @@ See Dockerfile-env to update a version - [X265_VERSION](https://bitbucket.org/multicoreware/x265/downloads/):[GNU General Public License (GPL) version 2](https://bitbucket.org/multicoreware/x265/raw/f8ae7afc1f61ed0db3b2f23f5d581706fe6ed677/COPYING) -Contribute ------------ +## Contribute ``` From 2ace30b7db6ef6df1a2cfb946802ad327e30f62e Mon Sep 17 00:00:00 2001 From: Julien Rottenberg Date: Sat, 13 Jul 2019 20:21:04 -0700 Subject: [PATCH 09/29] Help for #178 --- README.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 43b7b45f1..d0eafc552 100644 --- a/README.md +++ b/README.md @@ -186,11 +186,11 @@ Capture output from the container to the host running the command #### Convert 10bits MKV into a 10Bits MP4 ``` - docker run -v $PWD:/tmp jrottenberg/ffmpeg:3.4-scratch \ + docker run -v $(pwd):$(pwd) -w $(pwd) jrottenberg/ffmpeg:3.4-scratch \ -stats \ -i http://www.jell.yfish.us/media/jellyfish-20-mbps-hd-hevc-10bit.mkv \ -c:v libx265 -pix_fmt yuv420p10 \ - -t 5 -f mp4 /tmp/test.mp4 + -t 5 -f mp4 test.mp4 ``` The image has been compiled with [X265 Multilib](https://x265.readthedocs.io/en/default/api.html#multi-library-interface). Use the pixel format switch to change the number of bits per pixel by suffixing it with 10 for 10bits or 12 for 12bits. @@ -199,10 +199,10 @@ Use the pixel format switch to change the number of bits per pixel by suffixing Let's assume ```original.gif``` is located in the current directory : ``` - docker run -v $PWD:/temp/ \ + docker run -v $(pwd):$(pwd) -w $(pwd)\ jrottenberg/ffmpeg:3.2-scratch -stats \ - -i /temp/original.gif \ - /temp/original-converted.mp4 + -i original.gif \ + original-converted.mp4 ``` #### Use hardware acceleration enabled build @@ -213,7 +213,7 @@ Thanks to [qmfrederik](https://github.com/qmfrederik) for the [vaapi ubuntu base - Run the container with the device attached /dev/dri from your host into the container : -`docker run --device /dev/dri:/dev/dri -v $(pwd):/mnt jrottenberg/ffmpeg:vaapi [...]` +`docker run --device /dev/dri:/dev/dri -v $(pwd):$(pwd) -w $(pwd) jrottenberg/ffmpeg:vaapi [...]` - Have the Intel drivers up and running on your host. You can run `vainfo` (part of vainfo package on Ubuntu) to determine whether your graphics card has been recognized correctly. - Run ffmpeg with the correct parameters, this is the same as when running [ffmpeg natively](https://trac.ffmpeg.org/wiki/Hardware/VAAPI). From 08a207187dd638254a85d16b7ba2323d42c2da57 Mon Sep 17 00:00:00 2001 From: Julien Rottenberg Date: Sat, 13 Jul 2019 20:21:11 -0700 Subject: [PATCH 10/29] KISS --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 820041a62..e56870420 100644 --- a/.travis.yml +++ b/.travis.yml @@ -74,7 +74,7 @@ before_script: - image="ffmpeg:${VERSION}-${VARIANT:-ubuntu}" script: - - docker build -t "${image}" --build-arg MAKEFLAGS="-j$(($(nproc) + 1))" docker-images/${VERSION}/${VARIANT} + - docker build -t "${image}" --build-arg MAKEFLAGS="-j$(($(grep -c ^processor /proc/cpuinfo) + 1))" docker-images/${VERSION}/${VARIANT} - docker run --rm ${image} -buildconf after_script: From 2905ad95eb7cc3587faa76afda68c4b8d25103c1 Mon Sep 17 00:00:00 2001 From: Julien Rottenberg Date: Sat, 13 Jul 2019 20:21:26 -0700 Subject: [PATCH 11/29] KISS template --- templates/travis.template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/travis.template b/templates/travis.template index 7b9e2620c..ecfa78aed 100644 --- a/templates/travis.template +++ b/templates/travis.template @@ -21,7 +21,7 @@ before_script: - image="ffmpeg:${VERSION}-${VARIANT:-ubuntu}" script: - - docker build -t "${image}" --build-arg MAKEFLAGS="-j$(($(grep -c ^processor /proc/cpuinfo) + 1))" docker-images/${VERSION}/${VARIANT} + - docker build -t "${image}" --build-arg MAKEFLAGS="-j$(($(nproc) + 1))" docker-images/${VERSION}/${VARIANT} - docker run --rm ${image} -buildconf after_script: From e53a41f1bd1964a5d7752aaf0633c908e621bbde Mon Sep 17 00:00:00 2001 From: Julien Rottenberg Date: Sat, 13 Jul 2019 20:21:40 -0700 Subject: [PATCH 12/29] after update.py 4.1.4 --- docker-images/4.1/alpine/Dockerfile | 2 +- docker-images/4.1/centos/Dockerfile | 2 +- docker-images/4.1/nvidia/Dockerfile | 2 +- docker-images/4.1/scratch/Dockerfile | 2 +- docker-images/4.1/ubuntu/Dockerfile | 2 +- docker-images/4.1/vaapi/Dockerfile | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docker-images/4.1/alpine/Dockerfile b/docker-images/4.1/alpine/Dockerfile index 231808547..9f0ecb377 100644 --- a/docker-images/4.1/alpine/Dockerfile +++ b/docker-images/4.1/alpine/Dockerfile @@ -18,7 +18,7 @@ ARG LD_LIBRARY_PATH=/opt/ffmpeg/lib ARG PREFIX=/opt/ffmpeg ARG MAKEFLAGS="-j2" -ENV FFMPEG_VERSION=4.1.3 \ +ENV FFMPEG_VERSION=4.1.4 \ FDKAAC_VERSION=0.1.5 \ LAME_VERSION=3.100 \ LIBASS_VERSION=0.13.7 \ diff --git a/docker-images/4.1/centos/Dockerfile b/docker-images/4.1/centos/Dockerfile index 021d986ef..01e901177 100644 --- a/docker-images/4.1/centos/Dockerfile +++ b/docker-images/4.1/centos/Dockerfile @@ -20,7 +20,7 @@ ARG LD_LIBRARY_PATH=/opt/ffmpeg/lib ARG PREFIX=/opt/ffmpeg ARG MAKEFLAGS="-j2" -ENV FFMPEG_VERSION=4.1.3 \ +ENV FFMPEG_VERSION=4.1.4 \ FDKAAC_VERSION=0.1.5 \ LAME_VERSION=3.100 \ LIBASS_VERSION=0.13.7 \ diff --git a/docker-images/4.1/nvidia/Dockerfile b/docker-images/4.1/nvidia/Dockerfile index 2611dd489..753540f34 100644 --- a/docker-images/4.1/nvidia/Dockerfile +++ b/docker-images/4.1/nvidia/Dockerfile @@ -35,7 +35,7 @@ ENV LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/opt/ffmpeg/lib" ARG PREFIX=/opt/ffmpeg ARG MAKEFLAGS="-j12" -ENV FFMPEG_VERSION=4.1.3 \ +ENV FFMPEG_VERSION=4.1.4 \ FDKAAC_VERSION=0.1.5 \ LAME_VERSION=3.100 \ LIBASS_VERSION=0.13.7 \ diff --git a/docker-images/4.1/scratch/Dockerfile b/docker-images/4.1/scratch/Dockerfile index e62db1e48..632f06950 100644 --- a/docker-images/4.1/scratch/Dockerfile +++ b/docker-images/4.1/scratch/Dockerfile @@ -13,7 +13,7 @@ ARG LD_LIBRARY_PATH=/opt/ffmpeg/lib ARG PREFIX=/opt/ffmpeg ARG MAKEFLAGS="-j2" -ENV FFMPEG_VERSION=4.1.3 \ +ENV FFMPEG_VERSION=4.1.4 \ FDKAAC_VERSION=0.1.5 \ LAME_VERSION=3.100 \ LIBASS_VERSION=0.13.7 \ diff --git a/docker-images/4.1/ubuntu/Dockerfile b/docker-images/4.1/ubuntu/Dockerfile index cc5bf93d0..2735bd738 100644 --- a/docker-images/4.1/ubuntu/Dockerfile +++ b/docker-images/4.1/ubuntu/Dockerfile @@ -21,7 +21,7 @@ ARG LD_LIBRARY_PATH=/opt/ffmpeg/lib ARG PREFIX=/opt/ffmpeg ARG MAKEFLAGS="-j2" -ENV FFMPEG_VERSION=4.1.3 \ +ENV FFMPEG_VERSION=4.1.4 \ FDKAAC_VERSION=0.1.5 \ LAME_VERSION=3.100 \ LIBASS_VERSION=0.13.7 \ diff --git a/docker-images/4.1/vaapi/Dockerfile b/docker-images/4.1/vaapi/Dockerfile index 307844bdb..2a50bde13 100644 --- a/docker-images/4.1/vaapi/Dockerfile +++ b/docker-images/4.1/vaapi/Dockerfile @@ -21,7 +21,7 @@ ARG LD_LIBRARY_PATH=/opt/ffmpeg/lib ARG PREFIX=/opt/ffmpeg ARG MAKEFLAGS="-j2" -ENV FFMPEG_VERSION=4.1.3 \ +ENV FFMPEG_VERSION=4.1.4 \ FDKAAC_VERSION=0.1.5 \ LAME_VERSION=3.100 \ LIBASS_VERSION=0.13.7 \ From 75fbd705686b44ec96d5fb4c0d482d0ff465b628 Mon Sep 17 00:00:00 2001 From: Julien Rottenberg Date: Wed, 17 Jul 2019 18:22:36 -0700 Subject: [PATCH 13/29] we were a bit behind... --- templates/Dockerfile-env | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/Dockerfile-env b/templates/Dockerfile-env index 06639f31d..63373130c 100644 --- a/templates/Dockerfile-env +++ b/templates/Dockerfile-env @@ -11,7 +11,7 @@ FFMPEG_VERSION=%%FFMPEG_VERSION%% \ VPX_VERSION=1.8.0 \ WEBP_VERSION=1.0.2 \ X264_VERSION=20170226-2245-stable \ - X265_VERSION=2.3 \ + X265_VERSION=3.1.1 \ XVID_VERSION=1.3.4 \ FREETYPE_VERSION=2.5.5 \ FRIBIDI_VERSION=0.19.7 \ From 7e0f95534be1d8c3f43252d616d50f89988d0b3d Mon Sep 17 00:00:00 2001 From: Julien Rottenberg Date: Wed, 17 Jul 2019 18:23:27 -0700 Subject: [PATCH 14/29] after ./update.py --- .travis.yml | 2 +- docker-images/2.8/alpine/Dockerfile | 2 +- docker-images/2.8/centos/Dockerfile | 2 +- docker-images/2.8/nvidia/Dockerfile | 2 +- docker-images/2.8/scratch/Dockerfile | 2 +- docker-images/2.8/ubuntu/Dockerfile | 2 +- docker-images/2.8/vaapi/Dockerfile | 2 +- docker-images/3.0/alpine/Dockerfile | 2 +- docker-images/3.0/centos/Dockerfile | 2 +- docker-images/3.0/nvidia/Dockerfile | 2 +- docker-images/3.0/scratch/Dockerfile | 2 +- docker-images/3.0/ubuntu/Dockerfile | 2 +- docker-images/3.0/vaapi/Dockerfile | 2 +- docker-images/3.1/alpine/Dockerfile | 2 +- docker-images/3.1/centos/Dockerfile | 2 +- docker-images/3.1/nvidia/Dockerfile | 2 +- docker-images/3.1/scratch/Dockerfile | 2 +- docker-images/3.1/ubuntu/Dockerfile | 2 +- docker-images/3.1/vaapi/Dockerfile | 2 +- docker-images/3.2/alpine/Dockerfile | 2 +- docker-images/3.2/centos/Dockerfile | 2 +- docker-images/3.2/nvidia/Dockerfile | 2 +- docker-images/3.2/scratch/Dockerfile | 2 +- docker-images/3.2/ubuntu/Dockerfile | 2 +- docker-images/3.2/vaapi/Dockerfile | 2 +- docker-images/3.3/alpine/Dockerfile | 2 +- docker-images/3.3/centos/Dockerfile | 2 +- docker-images/3.3/nvidia/Dockerfile | 2 +- docker-images/3.3/scratch/Dockerfile | 2 +- docker-images/3.3/ubuntu/Dockerfile | 2 +- docker-images/3.3/vaapi/Dockerfile | 2 +- docker-images/3.4/alpine/Dockerfile | 2 +- docker-images/3.4/centos/Dockerfile | 2 +- docker-images/3.4/nvidia/Dockerfile | 2 +- docker-images/3.4/scratch/Dockerfile | 2 +- docker-images/3.4/ubuntu/Dockerfile | 2 +- docker-images/3.4/vaapi/Dockerfile | 2 +- docker-images/4.0/alpine/Dockerfile | 2 +- docker-images/4.0/centos/Dockerfile | 2 +- docker-images/4.0/nvidia/Dockerfile | 2 +- docker-images/4.0/scratch/Dockerfile | 2 +- docker-images/4.0/ubuntu/Dockerfile | 2 +- docker-images/4.0/vaapi/Dockerfile | 2 +- docker-images/4.1/alpine/Dockerfile | 2 +- docker-images/4.1/centos/Dockerfile | 2 +- docker-images/4.1/nvidia/Dockerfile | 2 +- docker-images/4.1/scratch/Dockerfile | 2 +- docker-images/4.1/ubuntu/Dockerfile | 2 +- docker-images/4.1/vaapi/Dockerfile | 2 +- docker-images/snapshot/alpine/Dockerfile | 2 +- docker-images/snapshot/centos/Dockerfile | 2 +- docker-images/snapshot/nvidia/Dockerfile | 2 +- docker-images/snapshot/scratch/Dockerfile | 2 +- docker-images/snapshot/ubuntu/Dockerfile | 2 +- docker-images/snapshot/vaapi/Dockerfile | 2 +- 55 files changed, 55 insertions(+), 55 deletions(-) diff --git a/.travis.yml b/.travis.yml index e56870420..820041a62 100644 --- a/.travis.yml +++ b/.travis.yml @@ -74,7 +74,7 @@ before_script: - image="ffmpeg:${VERSION}-${VARIANT:-ubuntu}" script: - - docker build -t "${image}" --build-arg MAKEFLAGS="-j$(($(grep -c ^processor /proc/cpuinfo) + 1))" docker-images/${VERSION}/${VARIANT} + - docker build -t "${image}" --build-arg MAKEFLAGS="-j$(($(nproc) + 1))" docker-images/${VERSION}/${VARIANT} - docker run --rm ${image} -buildconf after_script: diff --git a/docker-images/2.8/alpine/Dockerfile b/docker-images/2.8/alpine/Dockerfile index 56bb80d44..5938416c4 100644 --- a/docker-images/2.8/alpine/Dockerfile +++ b/docker-images/2.8/alpine/Dockerfile @@ -31,7 +31,7 @@ ENV FFMPEG_VERSION=2.8.15 \ VPX_VERSION=1.8.0 \ WEBP_VERSION=1.0.2 \ X264_VERSION=20170226-2245-stable \ - X265_VERSION=2.3 \ + X265_VERSION=3.1.1 \ XVID_VERSION=1.3.4 \ FREETYPE_VERSION=2.5.5 \ FRIBIDI_VERSION=0.19.7 \ diff --git a/docker-images/2.8/centos/Dockerfile b/docker-images/2.8/centos/Dockerfile index a39296e23..bd479a030 100644 --- a/docker-images/2.8/centos/Dockerfile +++ b/docker-images/2.8/centos/Dockerfile @@ -33,7 +33,7 @@ ENV FFMPEG_VERSION=2.8.15 \ VPX_VERSION=1.8.0 \ WEBP_VERSION=1.0.2 \ X264_VERSION=20170226-2245-stable \ - X265_VERSION=2.3 \ + X265_VERSION=3.1.1 \ XVID_VERSION=1.3.4 \ FREETYPE_VERSION=2.5.5 \ FRIBIDI_VERSION=0.19.7 \ diff --git a/docker-images/2.8/nvidia/Dockerfile b/docker-images/2.8/nvidia/Dockerfile index d6064a16b..a2686960e 100644 --- a/docker-images/2.8/nvidia/Dockerfile +++ b/docker-images/2.8/nvidia/Dockerfile @@ -48,7 +48,7 @@ ENV FFMPEG_VERSION=2.8.15 \ VPX_VERSION=1.8.0 \ WEBP_VERSION=1.0.2 \ X264_VERSION=20170226-2245-stable \ - X265_VERSION=2.3 \ + X265_VERSION=3.1.1 \ XVID_VERSION=1.3.4 \ FREETYPE_VERSION=2.5.5 \ FRIBIDI_VERSION=0.19.7 \ diff --git a/docker-images/2.8/scratch/Dockerfile b/docker-images/2.8/scratch/Dockerfile index 74cdaf36f..10db081c8 100644 --- a/docker-images/2.8/scratch/Dockerfile +++ b/docker-images/2.8/scratch/Dockerfile @@ -26,7 +26,7 @@ ENV FFMPEG_VERSION=2.8.15 \ VPX_VERSION=1.8.0 \ WEBP_VERSION=1.0.2 \ X264_VERSION=20170226-2245-stable \ - X265_VERSION=2.3 \ + X265_VERSION=3.1.1 \ XVID_VERSION=1.3.4 \ FREETYPE_VERSION=2.5.5 \ FRIBIDI_VERSION=0.19.7 \ diff --git a/docker-images/2.8/ubuntu/Dockerfile b/docker-images/2.8/ubuntu/Dockerfile index b7ee1e7a5..6c02b4770 100644 --- a/docker-images/2.8/ubuntu/Dockerfile +++ b/docker-images/2.8/ubuntu/Dockerfile @@ -34,7 +34,7 @@ ENV FFMPEG_VERSION=2.8.15 \ VPX_VERSION=1.8.0 \ WEBP_VERSION=1.0.2 \ X264_VERSION=20170226-2245-stable \ - X265_VERSION=2.3 \ + X265_VERSION=3.1.1 \ XVID_VERSION=1.3.4 \ FREETYPE_VERSION=2.5.5 \ FRIBIDI_VERSION=0.19.7 \ diff --git a/docker-images/2.8/vaapi/Dockerfile b/docker-images/2.8/vaapi/Dockerfile index 78a6e9458..1effaf254 100644 --- a/docker-images/2.8/vaapi/Dockerfile +++ b/docker-images/2.8/vaapi/Dockerfile @@ -34,7 +34,7 @@ ENV FFMPEG_VERSION=2.8.15 \ VPX_VERSION=1.8.0 \ WEBP_VERSION=1.0.2 \ X264_VERSION=20170226-2245-stable \ - X265_VERSION=2.3 \ + X265_VERSION=3.1.1 \ XVID_VERSION=1.3.4 \ FREETYPE_VERSION=2.5.5 \ FRIBIDI_VERSION=0.19.7 \ diff --git a/docker-images/3.0/alpine/Dockerfile b/docker-images/3.0/alpine/Dockerfile index c17ce2eda..0fe9b9049 100644 --- a/docker-images/3.0/alpine/Dockerfile +++ b/docker-images/3.0/alpine/Dockerfile @@ -31,7 +31,7 @@ ENV FFMPEG_VERSION=3.0.12 \ VPX_VERSION=1.8.0 \ WEBP_VERSION=1.0.2 \ X264_VERSION=20170226-2245-stable \ - X265_VERSION=2.3 \ + X265_VERSION=3.1.1 \ XVID_VERSION=1.3.4 \ FREETYPE_VERSION=2.5.5 \ FRIBIDI_VERSION=0.19.7 \ diff --git a/docker-images/3.0/centos/Dockerfile b/docker-images/3.0/centos/Dockerfile index a0d073bc0..ab878b318 100644 --- a/docker-images/3.0/centos/Dockerfile +++ b/docker-images/3.0/centos/Dockerfile @@ -33,7 +33,7 @@ ENV FFMPEG_VERSION=3.0.12 \ VPX_VERSION=1.8.0 \ WEBP_VERSION=1.0.2 \ X264_VERSION=20170226-2245-stable \ - X265_VERSION=2.3 \ + X265_VERSION=3.1.1 \ XVID_VERSION=1.3.4 \ FREETYPE_VERSION=2.5.5 \ FRIBIDI_VERSION=0.19.7 \ diff --git a/docker-images/3.0/nvidia/Dockerfile b/docker-images/3.0/nvidia/Dockerfile index 514106d7d..9199ae374 100644 --- a/docker-images/3.0/nvidia/Dockerfile +++ b/docker-images/3.0/nvidia/Dockerfile @@ -48,7 +48,7 @@ ENV FFMPEG_VERSION=3.0.12 \ VPX_VERSION=1.8.0 \ WEBP_VERSION=1.0.2 \ X264_VERSION=20170226-2245-stable \ - X265_VERSION=2.3 \ + X265_VERSION=3.1.1 \ XVID_VERSION=1.3.4 \ FREETYPE_VERSION=2.5.5 \ FRIBIDI_VERSION=0.19.7 \ diff --git a/docker-images/3.0/scratch/Dockerfile b/docker-images/3.0/scratch/Dockerfile index 919775bc3..8a97a46fb 100644 --- a/docker-images/3.0/scratch/Dockerfile +++ b/docker-images/3.0/scratch/Dockerfile @@ -26,7 +26,7 @@ ENV FFMPEG_VERSION=3.0.12 \ VPX_VERSION=1.8.0 \ WEBP_VERSION=1.0.2 \ X264_VERSION=20170226-2245-stable \ - X265_VERSION=2.3 \ + X265_VERSION=3.1.1 \ XVID_VERSION=1.3.4 \ FREETYPE_VERSION=2.5.5 \ FRIBIDI_VERSION=0.19.7 \ diff --git a/docker-images/3.0/ubuntu/Dockerfile b/docker-images/3.0/ubuntu/Dockerfile index bc4c4f7e6..b7e3f6754 100644 --- a/docker-images/3.0/ubuntu/Dockerfile +++ b/docker-images/3.0/ubuntu/Dockerfile @@ -34,7 +34,7 @@ ENV FFMPEG_VERSION=3.0.12 \ VPX_VERSION=1.8.0 \ WEBP_VERSION=1.0.2 \ X264_VERSION=20170226-2245-stable \ - X265_VERSION=2.3 \ + X265_VERSION=3.1.1 \ XVID_VERSION=1.3.4 \ FREETYPE_VERSION=2.5.5 \ FRIBIDI_VERSION=0.19.7 \ diff --git a/docker-images/3.0/vaapi/Dockerfile b/docker-images/3.0/vaapi/Dockerfile index fa2fb1feb..9cfeaa974 100644 --- a/docker-images/3.0/vaapi/Dockerfile +++ b/docker-images/3.0/vaapi/Dockerfile @@ -34,7 +34,7 @@ ENV FFMPEG_VERSION=3.0.12 \ VPX_VERSION=1.8.0 \ WEBP_VERSION=1.0.2 \ X264_VERSION=20170226-2245-stable \ - X265_VERSION=2.3 \ + X265_VERSION=3.1.1 \ XVID_VERSION=1.3.4 \ FREETYPE_VERSION=2.5.5 \ FRIBIDI_VERSION=0.19.7 \ diff --git a/docker-images/3.1/alpine/Dockerfile b/docker-images/3.1/alpine/Dockerfile index 51c979586..e1f887d0a 100644 --- a/docker-images/3.1/alpine/Dockerfile +++ b/docker-images/3.1/alpine/Dockerfile @@ -31,7 +31,7 @@ ENV FFMPEG_VERSION=3.1.11 \ VPX_VERSION=1.8.0 \ WEBP_VERSION=1.0.2 \ X264_VERSION=20170226-2245-stable \ - X265_VERSION=2.3 \ + X265_VERSION=3.1.1 \ XVID_VERSION=1.3.4 \ FREETYPE_VERSION=2.5.5 \ FRIBIDI_VERSION=0.19.7 \ diff --git a/docker-images/3.1/centos/Dockerfile b/docker-images/3.1/centos/Dockerfile index eb358d763..1c7e1bdd7 100644 --- a/docker-images/3.1/centos/Dockerfile +++ b/docker-images/3.1/centos/Dockerfile @@ -33,7 +33,7 @@ ENV FFMPEG_VERSION=3.1.11 \ VPX_VERSION=1.8.0 \ WEBP_VERSION=1.0.2 \ X264_VERSION=20170226-2245-stable \ - X265_VERSION=2.3 \ + X265_VERSION=3.1.1 \ XVID_VERSION=1.3.4 \ FREETYPE_VERSION=2.5.5 \ FRIBIDI_VERSION=0.19.7 \ diff --git a/docker-images/3.1/nvidia/Dockerfile b/docker-images/3.1/nvidia/Dockerfile index dfc06a59f..1b6c05afd 100644 --- a/docker-images/3.1/nvidia/Dockerfile +++ b/docker-images/3.1/nvidia/Dockerfile @@ -48,7 +48,7 @@ ENV FFMPEG_VERSION=3.1.11 \ VPX_VERSION=1.8.0 \ WEBP_VERSION=1.0.2 \ X264_VERSION=20170226-2245-stable \ - X265_VERSION=2.3 \ + X265_VERSION=3.1.1 \ XVID_VERSION=1.3.4 \ FREETYPE_VERSION=2.5.5 \ FRIBIDI_VERSION=0.19.7 \ diff --git a/docker-images/3.1/scratch/Dockerfile b/docker-images/3.1/scratch/Dockerfile index bd8bec079..7c939feb5 100644 --- a/docker-images/3.1/scratch/Dockerfile +++ b/docker-images/3.1/scratch/Dockerfile @@ -26,7 +26,7 @@ ENV FFMPEG_VERSION=3.1.11 \ VPX_VERSION=1.8.0 \ WEBP_VERSION=1.0.2 \ X264_VERSION=20170226-2245-stable \ - X265_VERSION=2.3 \ + X265_VERSION=3.1.1 \ XVID_VERSION=1.3.4 \ FREETYPE_VERSION=2.5.5 \ FRIBIDI_VERSION=0.19.7 \ diff --git a/docker-images/3.1/ubuntu/Dockerfile b/docker-images/3.1/ubuntu/Dockerfile index 6c3975721..788a7fa1e 100644 --- a/docker-images/3.1/ubuntu/Dockerfile +++ b/docker-images/3.1/ubuntu/Dockerfile @@ -34,7 +34,7 @@ ENV FFMPEG_VERSION=3.1.11 \ VPX_VERSION=1.8.0 \ WEBP_VERSION=1.0.2 \ X264_VERSION=20170226-2245-stable \ - X265_VERSION=2.3 \ + X265_VERSION=3.1.1 \ XVID_VERSION=1.3.4 \ FREETYPE_VERSION=2.5.5 \ FRIBIDI_VERSION=0.19.7 \ diff --git a/docker-images/3.1/vaapi/Dockerfile b/docker-images/3.1/vaapi/Dockerfile index 52022b71f..3aad1029f 100644 --- a/docker-images/3.1/vaapi/Dockerfile +++ b/docker-images/3.1/vaapi/Dockerfile @@ -34,7 +34,7 @@ ENV FFMPEG_VERSION=3.1.11 \ VPX_VERSION=1.8.0 \ WEBP_VERSION=1.0.2 \ X264_VERSION=20170226-2245-stable \ - X265_VERSION=2.3 \ + X265_VERSION=3.1.1 \ XVID_VERSION=1.3.4 \ FREETYPE_VERSION=2.5.5 \ FRIBIDI_VERSION=0.19.7 \ diff --git a/docker-images/3.2/alpine/Dockerfile b/docker-images/3.2/alpine/Dockerfile index 0ccf26acf..0f95b7e55 100644 --- a/docker-images/3.2/alpine/Dockerfile +++ b/docker-images/3.2/alpine/Dockerfile @@ -31,7 +31,7 @@ ENV FFMPEG_VERSION=3.2.14 \ VPX_VERSION=1.8.0 \ WEBP_VERSION=1.0.2 \ X264_VERSION=20170226-2245-stable \ - X265_VERSION=2.3 \ + X265_VERSION=3.1.1 \ XVID_VERSION=1.3.4 \ FREETYPE_VERSION=2.5.5 \ FRIBIDI_VERSION=0.19.7 \ diff --git a/docker-images/3.2/centos/Dockerfile b/docker-images/3.2/centos/Dockerfile index 97ebbfad7..3faef4a3f 100644 --- a/docker-images/3.2/centos/Dockerfile +++ b/docker-images/3.2/centos/Dockerfile @@ -33,7 +33,7 @@ ENV FFMPEG_VERSION=3.2.14 \ VPX_VERSION=1.8.0 \ WEBP_VERSION=1.0.2 \ X264_VERSION=20170226-2245-stable \ - X265_VERSION=2.3 \ + X265_VERSION=3.1.1 \ XVID_VERSION=1.3.4 \ FREETYPE_VERSION=2.5.5 \ FRIBIDI_VERSION=0.19.7 \ diff --git a/docker-images/3.2/nvidia/Dockerfile b/docker-images/3.2/nvidia/Dockerfile index be2d264ee..e86e819f3 100644 --- a/docker-images/3.2/nvidia/Dockerfile +++ b/docker-images/3.2/nvidia/Dockerfile @@ -48,7 +48,7 @@ ENV FFMPEG_VERSION=3.2.14 \ VPX_VERSION=1.8.0 \ WEBP_VERSION=1.0.2 \ X264_VERSION=20170226-2245-stable \ - X265_VERSION=2.3 \ + X265_VERSION=3.1.1 \ XVID_VERSION=1.3.4 \ FREETYPE_VERSION=2.5.5 \ FRIBIDI_VERSION=0.19.7 \ diff --git a/docker-images/3.2/scratch/Dockerfile b/docker-images/3.2/scratch/Dockerfile index 8b694c695..587826b03 100644 --- a/docker-images/3.2/scratch/Dockerfile +++ b/docker-images/3.2/scratch/Dockerfile @@ -26,7 +26,7 @@ ENV FFMPEG_VERSION=3.2.14 \ VPX_VERSION=1.8.0 \ WEBP_VERSION=1.0.2 \ X264_VERSION=20170226-2245-stable \ - X265_VERSION=2.3 \ + X265_VERSION=3.1.1 \ XVID_VERSION=1.3.4 \ FREETYPE_VERSION=2.5.5 \ FRIBIDI_VERSION=0.19.7 \ diff --git a/docker-images/3.2/ubuntu/Dockerfile b/docker-images/3.2/ubuntu/Dockerfile index 023bbb177..29ef1ab95 100644 --- a/docker-images/3.2/ubuntu/Dockerfile +++ b/docker-images/3.2/ubuntu/Dockerfile @@ -34,7 +34,7 @@ ENV FFMPEG_VERSION=3.2.14 \ VPX_VERSION=1.8.0 \ WEBP_VERSION=1.0.2 \ X264_VERSION=20170226-2245-stable \ - X265_VERSION=2.3 \ + X265_VERSION=3.1.1 \ XVID_VERSION=1.3.4 \ FREETYPE_VERSION=2.5.5 \ FRIBIDI_VERSION=0.19.7 \ diff --git a/docker-images/3.2/vaapi/Dockerfile b/docker-images/3.2/vaapi/Dockerfile index a161c293f..eeb826e7a 100644 --- a/docker-images/3.2/vaapi/Dockerfile +++ b/docker-images/3.2/vaapi/Dockerfile @@ -34,7 +34,7 @@ ENV FFMPEG_VERSION=3.2.14 \ VPX_VERSION=1.8.0 \ WEBP_VERSION=1.0.2 \ X264_VERSION=20170226-2245-stable \ - X265_VERSION=2.3 \ + X265_VERSION=3.1.1 \ XVID_VERSION=1.3.4 \ FREETYPE_VERSION=2.5.5 \ FRIBIDI_VERSION=0.19.7 \ diff --git a/docker-images/3.3/alpine/Dockerfile b/docker-images/3.3/alpine/Dockerfile index 13cd6e138..8c7c09ff0 100644 --- a/docker-images/3.3/alpine/Dockerfile +++ b/docker-images/3.3/alpine/Dockerfile @@ -31,7 +31,7 @@ ENV FFMPEG_VERSION=3.3.9 \ VPX_VERSION=1.8.0 \ WEBP_VERSION=1.0.2 \ X264_VERSION=20170226-2245-stable \ - X265_VERSION=2.3 \ + X265_VERSION=3.1.1 \ XVID_VERSION=1.3.4 \ FREETYPE_VERSION=2.5.5 \ FRIBIDI_VERSION=0.19.7 \ diff --git a/docker-images/3.3/centos/Dockerfile b/docker-images/3.3/centos/Dockerfile index f3f69c344..7cce23f76 100644 --- a/docker-images/3.3/centos/Dockerfile +++ b/docker-images/3.3/centos/Dockerfile @@ -33,7 +33,7 @@ ENV FFMPEG_VERSION=3.3.9 \ VPX_VERSION=1.8.0 \ WEBP_VERSION=1.0.2 \ X264_VERSION=20170226-2245-stable \ - X265_VERSION=2.3 \ + X265_VERSION=3.1.1 \ XVID_VERSION=1.3.4 \ FREETYPE_VERSION=2.5.5 \ FRIBIDI_VERSION=0.19.7 \ diff --git a/docker-images/3.3/nvidia/Dockerfile b/docker-images/3.3/nvidia/Dockerfile index 923b8c9df..d6fa62934 100644 --- a/docker-images/3.3/nvidia/Dockerfile +++ b/docker-images/3.3/nvidia/Dockerfile @@ -48,7 +48,7 @@ ENV FFMPEG_VERSION=3.3.9 \ VPX_VERSION=1.8.0 \ WEBP_VERSION=1.0.2 \ X264_VERSION=20170226-2245-stable \ - X265_VERSION=2.3 \ + X265_VERSION=3.1.1 \ XVID_VERSION=1.3.4 \ FREETYPE_VERSION=2.5.5 \ FRIBIDI_VERSION=0.19.7 \ diff --git a/docker-images/3.3/scratch/Dockerfile b/docker-images/3.3/scratch/Dockerfile index 2792a73bb..5a18deced 100644 --- a/docker-images/3.3/scratch/Dockerfile +++ b/docker-images/3.3/scratch/Dockerfile @@ -26,7 +26,7 @@ ENV FFMPEG_VERSION=3.3.9 \ VPX_VERSION=1.8.0 \ WEBP_VERSION=1.0.2 \ X264_VERSION=20170226-2245-stable \ - X265_VERSION=2.3 \ + X265_VERSION=3.1.1 \ XVID_VERSION=1.3.4 \ FREETYPE_VERSION=2.5.5 \ FRIBIDI_VERSION=0.19.7 \ diff --git a/docker-images/3.3/ubuntu/Dockerfile b/docker-images/3.3/ubuntu/Dockerfile index d9afdec57..de7bbb68a 100644 --- a/docker-images/3.3/ubuntu/Dockerfile +++ b/docker-images/3.3/ubuntu/Dockerfile @@ -34,7 +34,7 @@ ENV FFMPEG_VERSION=3.3.9 \ VPX_VERSION=1.8.0 \ WEBP_VERSION=1.0.2 \ X264_VERSION=20170226-2245-stable \ - X265_VERSION=2.3 \ + X265_VERSION=3.1.1 \ XVID_VERSION=1.3.4 \ FREETYPE_VERSION=2.5.5 \ FRIBIDI_VERSION=0.19.7 \ diff --git a/docker-images/3.3/vaapi/Dockerfile b/docker-images/3.3/vaapi/Dockerfile index f73dfb3ef..e8f4043b6 100644 --- a/docker-images/3.3/vaapi/Dockerfile +++ b/docker-images/3.3/vaapi/Dockerfile @@ -34,7 +34,7 @@ ENV FFMPEG_VERSION=3.3.9 \ VPX_VERSION=1.8.0 \ WEBP_VERSION=1.0.2 \ X264_VERSION=20170226-2245-stable \ - X265_VERSION=2.3 \ + X265_VERSION=3.1.1 \ XVID_VERSION=1.3.4 \ FREETYPE_VERSION=2.5.5 \ FRIBIDI_VERSION=0.19.7 \ diff --git a/docker-images/3.4/alpine/Dockerfile b/docker-images/3.4/alpine/Dockerfile index 7f09bb53a..d4f22aa7f 100644 --- a/docker-images/3.4/alpine/Dockerfile +++ b/docker-images/3.4/alpine/Dockerfile @@ -31,7 +31,7 @@ ENV FFMPEG_VERSION=3.4.6 \ VPX_VERSION=1.8.0 \ WEBP_VERSION=1.0.2 \ X264_VERSION=20170226-2245-stable \ - X265_VERSION=2.3 \ + X265_VERSION=3.1.1 \ XVID_VERSION=1.3.4 \ FREETYPE_VERSION=2.5.5 \ FRIBIDI_VERSION=0.19.7 \ diff --git a/docker-images/3.4/centos/Dockerfile b/docker-images/3.4/centos/Dockerfile index d15bbe405..014b2a346 100644 --- a/docker-images/3.4/centos/Dockerfile +++ b/docker-images/3.4/centos/Dockerfile @@ -33,7 +33,7 @@ ENV FFMPEG_VERSION=3.4.6 \ VPX_VERSION=1.8.0 \ WEBP_VERSION=1.0.2 \ X264_VERSION=20170226-2245-stable \ - X265_VERSION=2.3 \ + X265_VERSION=3.1.1 \ XVID_VERSION=1.3.4 \ FREETYPE_VERSION=2.5.5 \ FRIBIDI_VERSION=0.19.7 \ diff --git a/docker-images/3.4/nvidia/Dockerfile b/docker-images/3.4/nvidia/Dockerfile index bd0ff4949..8b2f932b7 100644 --- a/docker-images/3.4/nvidia/Dockerfile +++ b/docker-images/3.4/nvidia/Dockerfile @@ -48,7 +48,7 @@ ENV FFMPEG_VERSION=3.4.6 \ VPX_VERSION=1.8.0 \ WEBP_VERSION=1.0.2 \ X264_VERSION=20170226-2245-stable \ - X265_VERSION=2.3 \ + X265_VERSION=3.1.1 \ XVID_VERSION=1.3.4 \ FREETYPE_VERSION=2.5.5 \ FRIBIDI_VERSION=0.19.7 \ diff --git a/docker-images/3.4/scratch/Dockerfile b/docker-images/3.4/scratch/Dockerfile index d10f73583..fcc1d8ae4 100644 --- a/docker-images/3.4/scratch/Dockerfile +++ b/docker-images/3.4/scratch/Dockerfile @@ -26,7 +26,7 @@ ENV FFMPEG_VERSION=3.4.6 \ VPX_VERSION=1.8.0 \ WEBP_VERSION=1.0.2 \ X264_VERSION=20170226-2245-stable \ - X265_VERSION=2.3 \ + X265_VERSION=3.1.1 \ XVID_VERSION=1.3.4 \ FREETYPE_VERSION=2.5.5 \ FRIBIDI_VERSION=0.19.7 \ diff --git a/docker-images/3.4/ubuntu/Dockerfile b/docker-images/3.4/ubuntu/Dockerfile index 00caf17b9..cd2bd51ec 100644 --- a/docker-images/3.4/ubuntu/Dockerfile +++ b/docker-images/3.4/ubuntu/Dockerfile @@ -34,7 +34,7 @@ ENV FFMPEG_VERSION=3.4.6 \ VPX_VERSION=1.8.0 \ WEBP_VERSION=1.0.2 \ X264_VERSION=20170226-2245-stable \ - X265_VERSION=2.3 \ + X265_VERSION=3.1.1 \ XVID_VERSION=1.3.4 \ FREETYPE_VERSION=2.5.5 \ FRIBIDI_VERSION=0.19.7 \ diff --git a/docker-images/3.4/vaapi/Dockerfile b/docker-images/3.4/vaapi/Dockerfile index e3ffe97bf..111240db9 100644 --- a/docker-images/3.4/vaapi/Dockerfile +++ b/docker-images/3.4/vaapi/Dockerfile @@ -34,7 +34,7 @@ ENV FFMPEG_VERSION=3.4.6 \ VPX_VERSION=1.8.0 \ WEBP_VERSION=1.0.2 \ X264_VERSION=20170226-2245-stable \ - X265_VERSION=2.3 \ + X265_VERSION=3.1.1 \ XVID_VERSION=1.3.4 \ FREETYPE_VERSION=2.5.5 \ FRIBIDI_VERSION=0.19.7 \ diff --git a/docker-images/4.0/alpine/Dockerfile b/docker-images/4.0/alpine/Dockerfile index a058ac21f..1cf850abc 100644 --- a/docker-images/4.0/alpine/Dockerfile +++ b/docker-images/4.0/alpine/Dockerfile @@ -31,7 +31,7 @@ ENV FFMPEG_VERSION=4.0.4 \ VPX_VERSION=1.8.0 \ WEBP_VERSION=1.0.2 \ X264_VERSION=20170226-2245-stable \ - X265_VERSION=2.3 \ + X265_VERSION=3.1.1 \ XVID_VERSION=1.3.4 \ FREETYPE_VERSION=2.5.5 \ FRIBIDI_VERSION=0.19.7 \ diff --git a/docker-images/4.0/centos/Dockerfile b/docker-images/4.0/centos/Dockerfile index af833fc13..413564dc0 100644 --- a/docker-images/4.0/centos/Dockerfile +++ b/docker-images/4.0/centos/Dockerfile @@ -33,7 +33,7 @@ ENV FFMPEG_VERSION=4.0.4 \ VPX_VERSION=1.8.0 \ WEBP_VERSION=1.0.2 \ X264_VERSION=20170226-2245-stable \ - X265_VERSION=2.3 \ + X265_VERSION=3.1.1 \ XVID_VERSION=1.3.4 \ FREETYPE_VERSION=2.5.5 \ FRIBIDI_VERSION=0.19.7 \ diff --git a/docker-images/4.0/nvidia/Dockerfile b/docker-images/4.0/nvidia/Dockerfile index b445fea8c..06e64c9f3 100644 --- a/docker-images/4.0/nvidia/Dockerfile +++ b/docker-images/4.0/nvidia/Dockerfile @@ -48,7 +48,7 @@ ENV FFMPEG_VERSION=4.0.4 \ VPX_VERSION=1.8.0 \ WEBP_VERSION=1.0.2 \ X264_VERSION=20170226-2245-stable \ - X265_VERSION=2.3 \ + X265_VERSION=3.1.1 \ XVID_VERSION=1.3.4 \ FREETYPE_VERSION=2.5.5 \ FRIBIDI_VERSION=0.19.7 \ diff --git a/docker-images/4.0/scratch/Dockerfile b/docker-images/4.0/scratch/Dockerfile index 058752fd2..97f1ea06a 100644 --- a/docker-images/4.0/scratch/Dockerfile +++ b/docker-images/4.0/scratch/Dockerfile @@ -26,7 +26,7 @@ ENV FFMPEG_VERSION=4.0.4 \ VPX_VERSION=1.8.0 \ WEBP_VERSION=1.0.2 \ X264_VERSION=20170226-2245-stable \ - X265_VERSION=2.3 \ + X265_VERSION=3.1.1 \ XVID_VERSION=1.3.4 \ FREETYPE_VERSION=2.5.5 \ FRIBIDI_VERSION=0.19.7 \ diff --git a/docker-images/4.0/ubuntu/Dockerfile b/docker-images/4.0/ubuntu/Dockerfile index 6e182a431..cb402d8a2 100644 --- a/docker-images/4.0/ubuntu/Dockerfile +++ b/docker-images/4.0/ubuntu/Dockerfile @@ -34,7 +34,7 @@ ENV FFMPEG_VERSION=4.0.4 \ VPX_VERSION=1.8.0 \ WEBP_VERSION=1.0.2 \ X264_VERSION=20170226-2245-stable \ - X265_VERSION=2.3 \ + X265_VERSION=3.1.1 \ XVID_VERSION=1.3.4 \ FREETYPE_VERSION=2.5.5 \ FRIBIDI_VERSION=0.19.7 \ diff --git a/docker-images/4.0/vaapi/Dockerfile b/docker-images/4.0/vaapi/Dockerfile index 2e6927c32..4b5453cf2 100644 --- a/docker-images/4.0/vaapi/Dockerfile +++ b/docker-images/4.0/vaapi/Dockerfile @@ -34,7 +34,7 @@ ENV FFMPEG_VERSION=4.0.4 \ VPX_VERSION=1.8.0 \ WEBP_VERSION=1.0.2 \ X264_VERSION=20170226-2245-stable \ - X265_VERSION=2.3 \ + X265_VERSION=3.1.1 \ XVID_VERSION=1.3.4 \ FREETYPE_VERSION=2.5.5 \ FRIBIDI_VERSION=0.19.7 \ diff --git a/docker-images/4.1/alpine/Dockerfile b/docker-images/4.1/alpine/Dockerfile index 9f0ecb377..ab3e2607d 100644 --- a/docker-images/4.1/alpine/Dockerfile +++ b/docker-images/4.1/alpine/Dockerfile @@ -31,7 +31,7 @@ ENV FFMPEG_VERSION=4.1.4 \ VPX_VERSION=1.8.0 \ WEBP_VERSION=1.0.2 \ X264_VERSION=20170226-2245-stable \ - X265_VERSION=2.3 \ + X265_VERSION=3.1.1 \ XVID_VERSION=1.3.4 \ FREETYPE_VERSION=2.5.5 \ FRIBIDI_VERSION=0.19.7 \ diff --git a/docker-images/4.1/centos/Dockerfile b/docker-images/4.1/centos/Dockerfile index 01e901177..ff9054dc4 100644 --- a/docker-images/4.1/centos/Dockerfile +++ b/docker-images/4.1/centos/Dockerfile @@ -33,7 +33,7 @@ ENV FFMPEG_VERSION=4.1.4 \ VPX_VERSION=1.8.0 \ WEBP_VERSION=1.0.2 \ X264_VERSION=20170226-2245-stable \ - X265_VERSION=2.3 \ + X265_VERSION=3.1.1 \ XVID_VERSION=1.3.4 \ FREETYPE_VERSION=2.5.5 \ FRIBIDI_VERSION=0.19.7 \ diff --git a/docker-images/4.1/nvidia/Dockerfile b/docker-images/4.1/nvidia/Dockerfile index 753540f34..d0b0ebadb 100644 --- a/docker-images/4.1/nvidia/Dockerfile +++ b/docker-images/4.1/nvidia/Dockerfile @@ -48,7 +48,7 @@ ENV FFMPEG_VERSION=4.1.4 \ VPX_VERSION=1.8.0 \ WEBP_VERSION=1.0.2 \ X264_VERSION=20170226-2245-stable \ - X265_VERSION=2.3 \ + X265_VERSION=3.1.1 \ XVID_VERSION=1.3.4 \ FREETYPE_VERSION=2.5.5 \ FRIBIDI_VERSION=0.19.7 \ diff --git a/docker-images/4.1/scratch/Dockerfile b/docker-images/4.1/scratch/Dockerfile index 632f06950..76df48baf 100644 --- a/docker-images/4.1/scratch/Dockerfile +++ b/docker-images/4.1/scratch/Dockerfile @@ -26,7 +26,7 @@ ENV FFMPEG_VERSION=4.1.4 \ VPX_VERSION=1.8.0 \ WEBP_VERSION=1.0.2 \ X264_VERSION=20170226-2245-stable \ - X265_VERSION=2.3 \ + X265_VERSION=3.1.1 \ XVID_VERSION=1.3.4 \ FREETYPE_VERSION=2.5.5 \ FRIBIDI_VERSION=0.19.7 \ diff --git a/docker-images/4.1/ubuntu/Dockerfile b/docker-images/4.1/ubuntu/Dockerfile index 2735bd738..cbc1c4db7 100644 --- a/docker-images/4.1/ubuntu/Dockerfile +++ b/docker-images/4.1/ubuntu/Dockerfile @@ -34,7 +34,7 @@ ENV FFMPEG_VERSION=4.1.4 \ VPX_VERSION=1.8.0 \ WEBP_VERSION=1.0.2 \ X264_VERSION=20170226-2245-stable \ - X265_VERSION=2.3 \ + X265_VERSION=3.1.1 \ XVID_VERSION=1.3.4 \ FREETYPE_VERSION=2.5.5 \ FRIBIDI_VERSION=0.19.7 \ diff --git a/docker-images/4.1/vaapi/Dockerfile b/docker-images/4.1/vaapi/Dockerfile index 2a50bde13..85699de5f 100644 --- a/docker-images/4.1/vaapi/Dockerfile +++ b/docker-images/4.1/vaapi/Dockerfile @@ -34,7 +34,7 @@ ENV FFMPEG_VERSION=4.1.4 \ VPX_VERSION=1.8.0 \ WEBP_VERSION=1.0.2 \ X264_VERSION=20170226-2245-stable \ - X265_VERSION=2.3 \ + X265_VERSION=3.1.1 \ XVID_VERSION=1.3.4 \ FREETYPE_VERSION=2.5.5 \ FRIBIDI_VERSION=0.19.7 \ diff --git a/docker-images/snapshot/alpine/Dockerfile b/docker-images/snapshot/alpine/Dockerfile index d60b14473..2e5202aa5 100644 --- a/docker-images/snapshot/alpine/Dockerfile +++ b/docker-images/snapshot/alpine/Dockerfile @@ -31,7 +31,7 @@ ENV FFMPEG_VERSION=snapshot \ VPX_VERSION=1.8.0 \ WEBP_VERSION=1.0.2 \ X264_VERSION=20170226-2245-stable \ - X265_VERSION=2.3 \ + X265_VERSION=3.1.1 \ XVID_VERSION=1.3.4 \ FREETYPE_VERSION=2.5.5 \ FRIBIDI_VERSION=0.19.7 \ diff --git a/docker-images/snapshot/centos/Dockerfile b/docker-images/snapshot/centos/Dockerfile index e74228908..f8da81a76 100644 --- a/docker-images/snapshot/centos/Dockerfile +++ b/docker-images/snapshot/centos/Dockerfile @@ -33,7 +33,7 @@ ENV FFMPEG_VERSION=snapshot \ VPX_VERSION=1.8.0 \ WEBP_VERSION=1.0.2 \ X264_VERSION=20170226-2245-stable \ - X265_VERSION=2.3 \ + X265_VERSION=3.1.1 \ XVID_VERSION=1.3.4 \ FREETYPE_VERSION=2.5.5 \ FRIBIDI_VERSION=0.19.7 \ diff --git a/docker-images/snapshot/nvidia/Dockerfile b/docker-images/snapshot/nvidia/Dockerfile index 25a07fe3e..68a398b4c 100644 --- a/docker-images/snapshot/nvidia/Dockerfile +++ b/docker-images/snapshot/nvidia/Dockerfile @@ -48,7 +48,7 @@ ENV FFMPEG_VERSION=snapshot \ VPX_VERSION=1.8.0 \ WEBP_VERSION=1.0.2 \ X264_VERSION=20170226-2245-stable \ - X265_VERSION=2.3 \ + X265_VERSION=3.1.1 \ XVID_VERSION=1.3.4 \ FREETYPE_VERSION=2.5.5 \ FRIBIDI_VERSION=0.19.7 \ diff --git a/docker-images/snapshot/scratch/Dockerfile b/docker-images/snapshot/scratch/Dockerfile index 9d96a0bb8..066235c61 100644 --- a/docker-images/snapshot/scratch/Dockerfile +++ b/docker-images/snapshot/scratch/Dockerfile @@ -26,7 +26,7 @@ ENV FFMPEG_VERSION=snapshot \ VPX_VERSION=1.8.0 \ WEBP_VERSION=1.0.2 \ X264_VERSION=20170226-2245-stable \ - X265_VERSION=2.3 \ + X265_VERSION=3.1.1 \ XVID_VERSION=1.3.4 \ FREETYPE_VERSION=2.5.5 \ FRIBIDI_VERSION=0.19.7 \ diff --git a/docker-images/snapshot/ubuntu/Dockerfile b/docker-images/snapshot/ubuntu/Dockerfile index 4ac5753cf..fee61296b 100644 --- a/docker-images/snapshot/ubuntu/Dockerfile +++ b/docker-images/snapshot/ubuntu/Dockerfile @@ -34,7 +34,7 @@ ENV FFMPEG_VERSION=snapshot \ VPX_VERSION=1.8.0 \ WEBP_VERSION=1.0.2 \ X264_VERSION=20170226-2245-stable \ - X265_VERSION=2.3 \ + X265_VERSION=3.1.1 \ XVID_VERSION=1.3.4 \ FREETYPE_VERSION=2.5.5 \ FRIBIDI_VERSION=0.19.7 \ diff --git a/docker-images/snapshot/vaapi/Dockerfile b/docker-images/snapshot/vaapi/Dockerfile index e687b453d..a2644777d 100644 --- a/docker-images/snapshot/vaapi/Dockerfile +++ b/docker-images/snapshot/vaapi/Dockerfile @@ -34,7 +34,7 @@ ENV FFMPEG_VERSION=snapshot \ VPX_VERSION=1.8.0 \ WEBP_VERSION=1.0.2 \ X264_VERSION=20170226-2245-stable \ - X265_VERSION=2.3 \ + X265_VERSION=3.1.1 \ XVID_VERSION=1.3.4 \ FREETYPE_VERSION=2.5.5 \ FRIBIDI_VERSION=0.19.7 \ From a8eb719eb8ce425b918c1e8b2ed96ca0ccde8e37 Mon Sep 17 00:00:00 2001 From: Julien Rottenberg Date: Mon, 12 Aug 2019 01:17:02 +0200 Subject: [PATCH 15/29] 4.2 http://ffmpeg.org/index.html#pr4.2 --- .travis.yml | 6 + azure-pipelines.yml | 18 ++ docker-images/4.2/alpine/Dockerfile | 388 ++++++++++++++++++++++++ docker-images/4.2/centos/Dockerfile | 389 ++++++++++++++++++++++++ docker-images/4.2/nvidia/Dockerfile | 424 +++++++++++++++++++++++++++ docker-images/4.2/scratch/Dockerfile | 388 ++++++++++++++++++++++++ docker-images/4.2/ubuntu/Dockerfile | 390 ++++++++++++++++++++++++ docker-images/4.2/vaapi/Dockerfile | 397 +++++++++++++++++++++++++ 8 files changed, 2400 insertions(+) create mode 100644 docker-images/4.2/alpine/Dockerfile create mode 100644 docker-images/4.2/centos/Dockerfile create mode 100644 docker-images/4.2/nvidia/Dockerfile create mode 100644 docker-images/4.2/scratch/Dockerfile create mode 100644 docker-images/4.2/ubuntu/Dockerfile create mode 100644 docker-images/4.2/vaapi/Dockerfile diff --git a/.travis.yml b/.travis.yml index 820041a62..d11edb288 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,6 +10,12 @@ env: - VERSION=snapshot VARIANT=scratch - VERSION=snapshot VARIANT=vaapi - VERSION=snapshot VARIANT=nvidia + - VERSION=4.2 VARIANT=ubuntu + - VERSION=4.2 VARIANT=alpine + - VERSION=4.2 VARIANT=centos + - VERSION=4.2 VARIANT=scratch + - VERSION=4.2 VARIANT=vaapi + - VERSION=4.2 VARIANT=nvidia - VERSION=4.1 VARIANT=ubuntu - VERSION=4.1 VARIANT=alpine - VERSION=4.1 VARIANT=centos diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 5dc534a41..267595563 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -28,6 +28,24 @@ jobs: snapshot_nvidia: VERSION: snapshot VARIANT: nvidia + 4_2_ubuntu: + VERSION: 4.2 + VARIANT: ubuntu + 4_2_alpine: + VERSION: 4.2 + VARIANT: alpine + 4_2_centos: + VERSION: 4.2 + VARIANT: centos + 4_2_scratch: + VERSION: 4.2 + VARIANT: scratch + 4_2_vaapi: + VERSION: 4.2 + VARIANT: vaapi + 4_2_nvidia: + VERSION: 4.2 + VARIANT: nvidia 4_1_ubuntu: VERSION: 4.1 VARIANT: ubuntu diff --git a/docker-images/4.2/alpine/Dockerfile b/docker-images/4.2/alpine/Dockerfile new file mode 100644 index 000000000..7f088defb --- /dev/null +++ b/docker-images/4.2/alpine/Dockerfile @@ -0,0 +1,388 @@ +# ffmpeg - http://ffmpeg.org/download.html +# +# https://hub.docker.com/r/jrottenberg/ffmpeg/ +# +# + +FROM alpine:3.8 AS base + +RUN apk add --no-cache --update libgcc libstdc++ ca-certificates libcrypto1.0 libssl1.0 libgomp expat git + + +FROM base AS build + +WORKDIR /tmp/workdir + +ARG PKG_CONFIG_PATH=/opt/ffmpeg/lib/pkgconfig +ARG LD_LIBRARY_PATH=/opt/ffmpeg/lib +ARG PREFIX=/opt/ffmpeg +ARG MAKEFLAGS="-j2" + +ENV FFMPEG_VERSION=4.2 \ + FDKAAC_VERSION=0.1.5 \ + LAME_VERSION=3.100 \ + LIBASS_VERSION=0.13.7 \ + OGG_VERSION=1.3.2 \ + OPENCOREAMR_VERSION=0.1.5 \ + OPUS_VERSION=1.2 \ + OPENJPEG_VERSION=2.1.2 \ + THEORA_VERSION=1.1.1 \ + VORBIS_VERSION=1.3.5 \ + VPX_VERSION=1.8.0 \ + WEBP_VERSION=1.0.2 \ + X264_VERSION=20170226-2245-stable \ + X265_VERSION=3.1.1 \ + XVID_VERSION=1.3.4 \ + FREETYPE_VERSION=2.5.5 \ + FRIBIDI_VERSION=0.19.7 \ + FONTCONFIG_VERSION=2.12.4 \ + LIBVIDSTAB_VERSION=1.1.0 \ + KVAZAAR_VERSION=1.2.0 \ + AOM_VERSION=v1.0.0 \ + SRC=/usr/local + +ARG OGG_SHA256SUM="e19ee34711d7af328cb26287f4137e70630e7261b17cbe3cd41011d73a654692 libogg-1.3.2.tar.gz" +ARG OPUS_SHA256SUM="77db45a87b51578fbc49555ef1b10926179861d854eb2613207dc79d9ec0a9a9 opus-1.2.tar.gz" +ARG VORBIS_SHA256SUM="6efbcecdd3e5dfbf090341b485da9d176eb250d893e3eb378c428a2db38301ce libvorbis-1.3.5.tar.gz" +ARG THEORA_SHA256SUM="40952956c47811928d1e7922cda3bc1f427eb75680c3c37249c91e949054916b libtheora-1.1.1.tar.gz" +ARG XVID_SHA256SUM="4e9fd62728885855bc5007fe1be58df42e5e274497591fec37249e1052ae316f xvidcore-1.3.4.tar.gz" +ARG FREETYPE_SHA256SUM="5d03dd76c2171a7601e9ce10551d52d4471cf92cd205948e60289251daddffa8 freetype-2.5.5.tar.gz" +ARG LIBVIDSTAB_SHA256SUM="14d2a053e56edad4f397be0cb3ef8eb1ec3150404ce99a426c4eb641861dc0bb v1.1.0.tar.gz" +ARG LIBASS_SHA256SUM="8fadf294bf701300d4605e6f1d92929304187fca4b8d8a47889315526adbafd7 0.13.7.tar.gz" +ARG FRIBIDI_SHA256SUM="3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 0.19.7.tar.gz" + + +RUN buildDeps="autoconf \ + automake \ + bash \ + binutils \ + bzip2 \ + cmake \ + curl \ + coreutils \ + diffutils \ + file \ + g++ \ + gcc \ + gperf \ + libtool \ + make \ + python \ + openssl-dev \ + tar \ + yasm \ + zlib-dev \ + expat-dev" && \ + apk add --no-cache --update ${buildDeps} +## opencore-amr https://sourceforge.net/projects/opencore-amr/ +RUN \ + DIR=/tmp/opencore-amr && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://kent.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${OPENCOREAMR_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +## x264 http://www.videolan.org/developers/x264.html +RUN \ + DIR=/tmp/x264 && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://download.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-${X264_VERSION}.tar.bz2 | \ + tar -jx --strip-components=1 && \ + ./configure --prefix="${PREFIX}" --enable-shared --enable-pic --disable-cli && \ + make && \ + make install && \ + rm -rf ${DIR} +### x265 http://x265.org/ +RUN \ + DIR=/tmp/x265 && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://download.videolan.org/pub/videolan/x265/x265_${X265_VERSION}.tar.gz | \ + tar -zx && \ + cd x265_${X265_VERSION}/build/linux && \ + sed -i "/-DEXTRA_LIB/ s/$/ -DCMAKE_INSTALL_PREFIX=\${PREFIX}/" multilib.sh && \ + sed -i "/^cmake/ s/$/ -DENABLE_CLI=OFF/" multilib.sh && \ + ./multilib.sh && \ + make -C 8bit install && \ + rm -rf ${DIR} +### libogg https://www.xiph.org/ogg/ +RUN \ + DIR=/tmp/ogg && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO http://downloads.xiph.org/releases/ogg/libogg-${OGG_VERSION}.tar.gz && \ + echo ${OGG_SHA256SUM} | sha256sum --check && \ + tar -zx --strip-components=1 -f libogg-${OGG_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +### libopus https://www.opus-codec.org/ +RUN \ + DIR=/tmp/opus && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://archive.mozilla.org/pub/opus/opus-${OPUS_VERSION}.tar.gz && \ + echo ${OPUS_SHA256SUM} | sha256sum --check && \ + tar -zx --strip-components=1 -f opus-${OPUS_VERSION}.tar.gz && \ + autoreconf -fiv && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +### libvorbis https://xiph.org/vorbis/ +RUN \ + DIR=/tmp/vorbis && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO http://downloads.xiph.org/releases/vorbis/libvorbis-${VORBIS_VERSION}.tar.gz && \ + echo ${VORBIS_SHA256SUM} | sha256sum --check && \ + tar -zx --strip-components=1 -f libvorbis-${VORBIS_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +### libtheora http://www.theora.org/ +RUN \ + DIR=/tmp/theora && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO http://downloads.xiph.org/releases/theora/libtheora-${THEORA_VERSION}.tar.gz && \ + echo ${THEORA_SHA256SUM} | sha256sum --check && \ + tar -zx --strip-components=1 -f libtheora-${THEORA_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +### libvpx https://www.webmproject.org/code/ +RUN \ + DIR=/tmp/vpx && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://codeload.github.com/webmproject/libvpx/tar.gz/v${VPX_VERSION} | \ + tar -zx --strip-components=1 && \ + ./configure --prefix="${PREFIX}" --enable-vp8 --enable-vp9 --enable-vp9-highbitdepth --enable-pic --enable-shared \ + --disable-debug --disable-examples --disable-docs --disable-install-bins && \ + make && \ + make install && \ + rm -rf ${DIR} +### libwebp https://developers.google.com/speed/webp/ +RUN \ + DIR=/tmp/vebp && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-${WEBP_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +### libmp3lame http://lame.sourceforge.net/ +RUN \ + DIR=/tmp/lame && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://kent.dl.sourceforge.net/project/lame/lame/$(echo ${LAME_VERSION} | sed -e 's/[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)/\1.\2/')/lame-${LAME_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" --enable-shared --enable-nasm --enable-pic --disable-frontend && \ + make && \ + make install && \ + rm -rf ${DIR} +### xvid https://www.xvid.com/ +RUN \ + DIR=/tmp/xvid && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO http://downloads.xvid.org/downloads/xvidcore-${XVID_VERSION}.tar.gz && \ + echo ${XVID_SHA256SUM} | sha256sum --check && \ + tar -zx -f xvidcore-${XVID_VERSION}.tar.gz && \ + cd xvidcore/build/generic && \ + ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" --datadir="${DIR}" --enable-shared --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +### fdk-aac https://github.com/mstorsjo/fdk-aac +RUN \ + DIR=/tmp/fdk-aac && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://github.com/mstorsjo/fdk-aac/archive/v${FDKAAC_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + autoreconf -fiv && \ + ./configure --prefix="${PREFIX}" --enable-shared --datadir="${DIR}" && \ + make && \ + make install && \ + rm -rf ${DIR} +## openjpeg https://github.com/uclouvain/openjpeg +RUN \ + DIR=/tmp/openjpeg && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://github.com/uclouvain/openjpeg/archive/v${OPENJPEG_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + cmake -DBUILD_THIRDPARTY:BOOL=ON -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ + make && \ + make install && \ + rm -rf ${DIR} +## freetype https://www.freetype.org/ +RUN \ + DIR=/tmp/freetype && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://download.savannah.gnu.org/releases/freetype/freetype-${FREETYPE_VERSION}.tar.gz && \ + echo ${FREETYPE_SHA256SUM} | sha256sum --check && \ + tar -zx --strip-components=1 -f freetype-${FREETYPE_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +## libvstab https://github.com/georgmartius/vid.stab +RUN \ + DIR=/tmp/vid.stab && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/georgmartius/vid.stab/archive/v${LIBVIDSTAB_VERSION}.tar.gz &&\ + echo ${LIBVIDSTAB_SHA256SUM} | sha256sum --check && \ + tar -zx --strip-components=1 -f v${LIBVIDSTAB_VERSION}.tar.gz && \ + cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ + make && \ + make install && \ + rm -rf ${DIR} +## fridibi https://www.fribidi.org/ +# + https://github.com/fribidi/fribidi/issues/8 +RUN \ + DIR=/tmp/fribidi && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/fribidi/fribidi/archive/${FRIBIDI_VERSION}.tar.gz && \ + echo ${FRIBIDI_SHA256SUM} | sha256sum --check && \ + tar -zx --strip-components=1 -f ${FRIBIDI_VERSION}.tar.gz && \ + sed -i 's/^SUBDIRS =.*/SUBDIRS=gen.tab charset lib/' Makefile.am && \ + ./bootstrap --no-config && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ + make -j 1 && \ + make install && \ + rm -rf ${DIR} +## fontconfig https://www.freedesktop.org/wiki/Software/fontconfig/ +RUN \ + DIR=/tmp/fontconfig && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://www.freedesktop.org/software/fontconfig/release/fontconfig-${FONTCONFIG_VERSION}.tar.bz2 &&\ + tar -jx --strip-components=1 -f fontconfig-${FONTCONFIG_VERSION}.tar.bz2 && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +## libass https://github.com/libass/libass +RUN \ + DIR=/tmp/libass && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/libass/libass/archive/${LIBASS_VERSION}.tar.gz &&\ + echo ${LIBASS_SHA256SUM} | sha256sum --check && \ + tar -zx --strip-components=1 -f ${LIBASS_VERSION}.tar.gz && \ + ./autogen.sh && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +## kvazaar https://github.com/ultravideo/kvazaar +RUN \ + DIR=/tmp/kvazaar && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/ultravideo/kvazaar/archive/v${KVAZAAR_VERSION}.tar.gz &&\ + tar -zx --strip-components=1 -f v${KVAZAAR_VERSION}.tar.gz && \ + ./autogen.sh && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} + +RUN \ + DIR=/tmp/aom && \ + git clone --branch ${AOM_VERSION} --depth 1 https://aomedia.googlesource.com/aom ${DIR} ; \ + cd ${DIR} ; \ + rm -rf CMakeCache.txt CMakeFiles ; \ + mkdir -p ./aom_build ; \ + cd ./aom_build ; \ + cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" -DBUILD_SHARED_LIBS=1 ..; \ + make ; \ + make install ; \ + rm -rf ${DIR} + +## ffmpeg https://ffmpeg.org/ +RUN \ + DIR=/tmp/ffmpeg && mkdir -p ${DIR} && cd ${DIR} && \ + curl -sLO https://ffmpeg.org/releases/ffmpeg-${FFMPEG_VERSION}.tar.bz2 && \ + tar -jx --strip-components=1 -f ffmpeg-${FFMPEG_VERSION}.tar.bz2 + + + +RUN \ + DIR=/tmp/ffmpeg && mkdir -p ${DIR} && cd ${DIR} && \ + ./configure \ + --disable-debug \ + --disable-doc \ + --disable-ffplay \ + --enable-shared \ + --enable-avresample \ + --enable-libopencore-amrnb \ + --enable-libopencore-amrwb \ + --enable-gpl \ + --enable-libass \ + --enable-libfreetype \ + --enable-libvidstab \ + --enable-libmp3lame \ + --enable-libopenjpeg \ + --enable-libopus \ + --enable-libtheora \ + --enable-libvorbis \ + --enable-libvpx \ + --enable-libwebp \ + --enable-libx265 \ + --enable-libxvid \ + --enable-libx264 \ + --enable-nonfree \ + --enable-openssl \ + --enable-libfdk_aac \ + --enable-libkvazaar \ + --enable-libaom --extra-libs=-lpthread \ + --enable-postproc \ + --enable-small \ + --enable-version3 \ + --extra-cflags="-I${PREFIX}/include" \ + --extra-ldflags="-L${PREFIX}/lib" \ + --extra-libs=-ldl \ + --prefix="${PREFIX}" && \ + make && \ + make install && \ + make distclean && \ + hash -r && \ + cd tools && \ + make qt-faststart && \ + cp qt-faststart ${PREFIX}/bin + + +RUN \ + ldd ${PREFIX}/bin/ffmpeg | grep opt/ffmpeg | cut -d ' ' -f 3 | xargs -i cp {} /usr/local/lib/ && \ + cp ${PREFIX}/bin/* /usr/local/bin/ && \ + cp -r ${PREFIX}/share/ffmpeg /usr/local/share/ && \ + LD_LIBRARY_PATH=/usr/local/lib ffmpeg -buildconf + +### Release Stage +FROM base AS release +MAINTAINER Julien Rottenberg + +CMD ["--help"] +ENTRYPOINT ["ffmpeg"] + +COPY --from=build /usr/local /usr/local + +# Let's make sure the app built correctly +# Convenient to verify on https://hub.docker.com/r/jrottenberg/ffmpeg/builds/ console output diff --git a/docker-images/4.2/centos/Dockerfile b/docker-images/4.2/centos/Dockerfile new file mode 100644 index 000000000..251d6013f --- /dev/null +++ b/docker-images/4.2/centos/Dockerfile @@ -0,0 +1,389 @@ +# ffmpeg - http://ffmpeg.org/download.html +# +# From https://trac.ffmpeg.org/wiki/CompilationGuide/Centos +# +# https://hub.docker.com/r/jrottenberg/ffmpeg/ +# +# +FROM centos:7 AS base + +RUN yum -y install libgomp && \ + yum clean all; + + +FROM base AS build + +WORKDIR /tmp/workdir + +ARG PKG_CONFIG_PATH=/opt/ffmpeg/lib/pkgconfig +ARG LD_LIBRARY_PATH=/opt/ffmpeg/lib +ARG PREFIX=/opt/ffmpeg +ARG MAKEFLAGS="-j2" + +ENV FFMPEG_VERSION=4.2 \ + FDKAAC_VERSION=0.1.5 \ + LAME_VERSION=3.100 \ + LIBASS_VERSION=0.13.7 \ + OGG_VERSION=1.3.2 \ + OPENCOREAMR_VERSION=0.1.5 \ + OPUS_VERSION=1.2 \ + OPENJPEG_VERSION=2.1.2 \ + THEORA_VERSION=1.1.1 \ + VORBIS_VERSION=1.3.5 \ + VPX_VERSION=1.8.0 \ + WEBP_VERSION=1.0.2 \ + X264_VERSION=20170226-2245-stable \ + X265_VERSION=3.1.1 \ + XVID_VERSION=1.3.4 \ + FREETYPE_VERSION=2.5.5 \ + FRIBIDI_VERSION=0.19.7 \ + FONTCONFIG_VERSION=2.12.4 \ + LIBVIDSTAB_VERSION=1.1.0 \ + KVAZAAR_VERSION=1.2.0 \ + AOM_VERSION=v1.0.0 \ + SRC=/usr/local + +ARG OGG_SHA256SUM="e19ee34711d7af328cb26287f4137e70630e7261b17cbe3cd41011d73a654692 libogg-1.3.2.tar.gz" +ARG OPUS_SHA256SUM="77db45a87b51578fbc49555ef1b10926179861d854eb2613207dc79d9ec0a9a9 opus-1.2.tar.gz" +ARG VORBIS_SHA256SUM="6efbcecdd3e5dfbf090341b485da9d176eb250d893e3eb378c428a2db38301ce libvorbis-1.3.5.tar.gz" +ARG THEORA_SHA256SUM="40952956c47811928d1e7922cda3bc1f427eb75680c3c37249c91e949054916b libtheora-1.1.1.tar.gz" +ARG XVID_SHA256SUM="4e9fd62728885855bc5007fe1be58df42e5e274497591fec37249e1052ae316f xvidcore-1.3.4.tar.gz" +ARG FREETYPE_SHA256SUM="5d03dd76c2171a7601e9ce10551d52d4471cf92cd205948e60289251daddffa8 freetype-2.5.5.tar.gz" +ARG LIBVIDSTAB_SHA256SUM="14d2a053e56edad4f397be0cb3ef8eb1ec3150404ce99a426c4eb641861dc0bb v1.1.0.tar.gz" +ARG LIBASS_SHA256SUM="8fadf294bf701300d4605e6f1d92929304187fca4b8d8a47889315526adbafd7 0.13.7.tar.gz" +ARG FRIBIDI_SHA256SUM="3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 0.19.7.tar.gz" + + +RUN buildDeps="autoconf \ + automake \ + bzip2 \ + cmake \ + expat-devel \ + gcc \ + gcc-c++ \ + git \ + gperf \ + libtool \ + make \ + nasm \ + perl \ + openssl-devel \ + tar \ + yasm \ + which \ + zlib-devel" && \ + echo "${SRC}/lib" > /etc/ld.so.conf.d/libc.conf && \ + yum --enablerepo=extras install -y epel-release && \ + yum install -y ${buildDeps} +## opencore-amr https://sourceforge.net/projects/opencore-amr/ +RUN \ + DIR=/tmp/opencore-amr && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://kent.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${OPENCOREAMR_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +## x264 http://www.videolan.org/developers/x264.html +RUN \ + DIR=/tmp/x264 && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://download.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-${X264_VERSION}.tar.bz2 | \ + tar -jx --strip-components=1 && \ + ./configure --prefix="${PREFIX}" --enable-shared --enable-pic --disable-cli && \ + make && \ + make install && \ + rm -rf ${DIR} +### x265 http://x265.org/ +RUN \ + DIR=/tmp/x265 && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://download.videolan.org/pub/videolan/x265/x265_${X265_VERSION}.tar.gz | \ + tar -zx && \ + cd x265_${X265_VERSION}/build/linux && \ + sed -i "/-DEXTRA_LIB/ s/$/ -DCMAKE_INSTALL_PREFIX=\${PREFIX}/" multilib.sh && \ + sed -i "/^cmake/ s/$/ -DENABLE_CLI=OFF/" multilib.sh && \ + ./multilib.sh && \ + make -C 8bit install && \ + rm -rf ${DIR} +### libogg https://www.xiph.org/ogg/ +RUN \ + DIR=/tmp/ogg && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO http://downloads.xiph.org/releases/ogg/libogg-${OGG_VERSION}.tar.gz && \ + echo ${OGG_SHA256SUM} | sha256sum --check && \ + tar -zx --strip-components=1 -f libogg-${OGG_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +### libopus https://www.opus-codec.org/ +RUN \ + DIR=/tmp/opus && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://archive.mozilla.org/pub/opus/opus-${OPUS_VERSION}.tar.gz && \ + echo ${OPUS_SHA256SUM} | sha256sum --check && \ + tar -zx --strip-components=1 -f opus-${OPUS_VERSION}.tar.gz && \ + autoreconf -fiv && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +### libvorbis https://xiph.org/vorbis/ +RUN \ + DIR=/tmp/vorbis && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO http://downloads.xiph.org/releases/vorbis/libvorbis-${VORBIS_VERSION}.tar.gz && \ + echo ${VORBIS_SHA256SUM} | sha256sum --check && \ + tar -zx --strip-components=1 -f libvorbis-${VORBIS_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +### libtheora http://www.theora.org/ +RUN \ + DIR=/tmp/theora && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO http://downloads.xiph.org/releases/theora/libtheora-${THEORA_VERSION}.tar.gz && \ + echo ${THEORA_SHA256SUM} | sha256sum --check && \ + tar -zx --strip-components=1 -f libtheora-${THEORA_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +### libvpx https://www.webmproject.org/code/ +RUN \ + DIR=/tmp/vpx && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://codeload.github.com/webmproject/libvpx/tar.gz/v${VPX_VERSION} | \ + tar -zx --strip-components=1 && \ + ./configure --prefix="${PREFIX}" --enable-vp8 --enable-vp9 --enable-vp9-highbitdepth --enable-pic --enable-shared \ + --disable-debug --disable-examples --disable-docs --disable-install-bins && \ + make && \ + make install && \ + rm -rf ${DIR} +### libwebp https://developers.google.com/speed/webp/ +RUN \ + DIR=/tmp/vebp && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-${WEBP_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +### libmp3lame http://lame.sourceforge.net/ +RUN \ + DIR=/tmp/lame && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://kent.dl.sourceforge.net/project/lame/lame/$(echo ${LAME_VERSION} | sed -e 's/[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)/\1.\2/')/lame-${LAME_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" --enable-shared --enable-nasm --enable-pic --disable-frontend && \ + make && \ + make install && \ + rm -rf ${DIR} +### xvid https://www.xvid.com/ +RUN \ + DIR=/tmp/xvid && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO http://downloads.xvid.org/downloads/xvidcore-${XVID_VERSION}.tar.gz && \ + echo ${XVID_SHA256SUM} | sha256sum --check && \ + tar -zx -f xvidcore-${XVID_VERSION}.tar.gz && \ + cd xvidcore/build/generic && \ + ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" --datadir="${DIR}" --enable-shared --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +### fdk-aac https://github.com/mstorsjo/fdk-aac +RUN \ + DIR=/tmp/fdk-aac && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://github.com/mstorsjo/fdk-aac/archive/v${FDKAAC_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + autoreconf -fiv && \ + ./configure --prefix="${PREFIX}" --enable-shared --datadir="${DIR}" && \ + make && \ + make install && \ + rm -rf ${DIR} +## openjpeg https://github.com/uclouvain/openjpeg +RUN \ + DIR=/tmp/openjpeg && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://github.com/uclouvain/openjpeg/archive/v${OPENJPEG_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + cmake -DBUILD_THIRDPARTY:BOOL=ON -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ + make && \ + make install && \ + rm -rf ${DIR} +## freetype https://www.freetype.org/ +RUN \ + DIR=/tmp/freetype && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://download.savannah.gnu.org/releases/freetype/freetype-${FREETYPE_VERSION}.tar.gz && \ + echo ${FREETYPE_SHA256SUM} | sha256sum --check && \ + tar -zx --strip-components=1 -f freetype-${FREETYPE_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +## libvstab https://github.com/georgmartius/vid.stab +RUN \ + DIR=/tmp/vid.stab && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/georgmartius/vid.stab/archive/v${LIBVIDSTAB_VERSION}.tar.gz &&\ + echo ${LIBVIDSTAB_SHA256SUM} | sha256sum --check && \ + tar -zx --strip-components=1 -f v${LIBVIDSTAB_VERSION}.tar.gz && \ + cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ + make && \ + make install && \ + rm -rf ${DIR} +## fridibi https://www.fribidi.org/ +# + https://github.com/fribidi/fribidi/issues/8 +RUN \ + DIR=/tmp/fribidi && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/fribidi/fribidi/archive/${FRIBIDI_VERSION}.tar.gz && \ + echo ${FRIBIDI_SHA256SUM} | sha256sum --check && \ + tar -zx --strip-components=1 -f ${FRIBIDI_VERSION}.tar.gz && \ + sed -i 's/^SUBDIRS =.*/SUBDIRS=gen.tab charset lib/' Makefile.am && \ + ./bootstrap --no-config && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ + make -j 1 && \ + make install && \ + rm -rf ${DIR} +## fontconfig https://www.freedesktop.org/wiki/Software/fontconfig/ +RUN \ + DIR=/tmp/fontconfig && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://www.freedesktop.org/software/fontconfig/release/fontconfig-${FONTCONFIG_VERSION}.tar.bz2 &&\ + tar -jx --strip-components=1 -f fontconfig-${FONTCONFIG_VERSION}.tar.bz2 && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +## libass https://github.com/libass/libass +RUN \ + DIR=/tmp/libass && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/libass/libass/archive/${LIBASS_VERSION}.tar.gz &&\ + echo ${LIBASS_SHA256SUM} | sha256sum --check && \ + tar -zx --strip-components=1 -f ${LIBASS_VERSION}.tar.gz && \ + ./autogen.sh && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +## kvazaar https://github.com/ultravideo/kvazaar +RUN \ + DIR=/tmp/kvazaar && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/ultravideo/kvazaar/archive/v${KVAZAAR_VERSION}.tar.gz &&\ + tar -zx --strip-components=1 -f v${KVAZAAR_VERSION}.tar.gz && \ + ./autogen.sh && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} + +RUN \ + DIR=/tmp/aom && \ + git clone --branch ${AOM_VERSION} --depth 1 https://aomedia.googlesource.com/aom ${DIR} ; \ + cd ${DIR} ; \ + rm -rf CMakeCache.txt CMakeFiles ; \ + mkdir -p ./aom_build ; \ + cd ./aom_build ; \ + cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" -DBUILD_SHARED_LIBS=1 ..; \ + make ; \ + make install ; \ + rm -rf ${DIR} + +## ffmpeg https://ffmpeg.org/ +RUN \ + DIR=/tmp/ffmpeg && mkdir -p ${DIR} && cd ${DIR} && \ + curl -sLO https://ffmpeg.org/releases/ffmpeg-${FFMPEG_VERSION}.tar.bz2 && \ + tar -jx --strip-components=1 -f ffmpeg-${FFMPEG_VERSION}.tar.bz2 + + + +RUN \ + DIR=/tmp/ffmpeg && mkdir -p ${DIR} && cd ${DIR} && \ + ./configure \ + --disable-debug \ + --disable-doc \ + --disable-ffplay \ + --enable-shared \ + --enable-avresample \ + --enable-libopencore-amrnb \ + --enable-libopencore-amrwb \ + --enable-gpl \ + --enable-libass \ + --enable-libfreetype \ + --enable-libvidstab \ + --enable-libmp3lame \ + --enable-libopenjpeg \ + --enable-libopus \ + --enable-libtheora \ + --enable-libvorbis \ + --enable-libvpx \ + --enable-libwebp \ + --enable-libx265 \ + --enable-libxvid \ + --enable-libx264 \ + --enable-nonfree \ + --enable-openssl \ + --enable-libfdk_aac \ + --enable-libkvazaar \ + \ + --enable-postproc \ + --enable-small \ + --enable-version3 \ + --extra-cflags="-I${PREFIX}/include" \ + --extra-ldflags="-L${PREFIX}/lib" \ + --extra-libs=-ldl \ + --prefix="${PREFIX}" && \ + make && \ + make install && \ + make distclean && \ + hash -r && \ + cd tools && \ + make qt-faststart && \ + cp qt-faststart ${PREFIX}/bin + +RUN \ + ldd ${PREFIX}/bin/ffmpeg | grep opt/ffmpeg | cut -d ' ' -f 3 | xargs -i cp {} /usr/local/lib64/ && \ + cp ${PREFIX}/bin/* /usr/local/bin/ && \ + cp -r ${PREFIX}/share/ffmpeg /usr/local/share/ && \ + LD_LIBRARY_PATH=/usr/local/lib64 ffmpeg -buildconf + +FROM base +MAINTAINER Julien Rottenberg + +CMD ["--help"] +ENTRYPOINT ["ffmpeg"] + +ENV LD_LIBRARY_PATH=/usr/local/lib64 + +COPY --from=build /usr/local/ /usr/local/ + +# Let's make sure the app built correctly +# Convenient to verify on https://hub.docker.com/r/jrottenberg/ffmpeg/builds/ console output \ No newline at end of file diff --git a/docker-images/4.2/nvidia/Dockerfile b/docker-images/4.2/nvidia/Dockerfile new file mode 100644 index 000000000..f8efdcc53 --- /dev/null +++ b/docker-images/4.2/nvidia/Dockerfile @@ -0,0 +1,424 @@ +# ffmpeg - http://ffmpeg.org/download.html +# +# From https://trac.ffmpeg.org/wiki/CompilationGuide/Ubuntu +# +# https://hub.docker.com/r/jrottenberg/ffmpeg/ +# +# + +FROM nvidia/cudagl:9.2-devel-ubuntu18.04 AS devel-base + +ENV NVIDIA_DRIVER_CAPABILITIES compat32,compute,video +WORKDIR /tmp/workdir + +RUN apt-get -yqq update && \ + apt-get install -yq --no-install-recommends ca-certificates expat libgomp1 && \ + apt-get autoremove -y && \ + apt-get clean -y + +FROM nvidia/cudagl:9.2-runtime-ubuntu18.04 AS runtime-base + +ENV NVIDIA_DRIVER_CAPABILITIES compat32,compute,video +WORKDIR /tmp/workdir + +RUN apt-get -yqq update && \ + apt-get install -yq --no-install-recommends ca-certificates expat libgomp1 libxcb-shape0-dev && \ + apt-get autoremove -y && \ + apt-get clean -y + + +FROM devel-base as build + +ENV NVIDIA_HEADERS_VERSION=8.1.24.9 +ARG PKG_CONFIG_PATH=/opt/ffmpeg/lib/pkgconfig +ENV LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/opt/ffmpeg/lib" +ARG PREFIX=/opt/ffmpeg +ARG MAKEFLAGS="-j12" + +ENV FFMPEG_VERSION=4.2 \ + FDKAAC_VERSION=0.1.5 \ + LAME_VERSION=3.100 \ + LIBASS_VERSION=0.13.7 \ + OGG_VERSION=1.3.2 \ + OPENCOREAMR_VERSION=0.1.5 \ + OPUS_VERSION=1.2 \ + OPENJPEG_VERSION=2.1.2 \ + THEORA_VERSION=1.1.1 \ + VORBIS_VERSION=1.3.5 \ + VPX_VERSION=1.8.0 \ + WEBP_VERSION=1.0.2 \ + X264_VERSION=20170226-2245-stable \ + X265_VERSION=3.1.1 \ + XVID_VERSION=1.3.4 \ + FREETYPE_VERSION=2.5.5 \ + FRIBIDI_VERSION=0.19.7 \ + FONTCONFIG_VERSION=2.12.4 \ + LIBVIDSTAB_VERSION=1.1.0 \ + KVAZAAR_VERSION=1.2.0 \ + AOM_VERSION=v1.0.0 \ + SRC=/usr/local + +ARG OGG_SHA256SUM="e19ee34711d7af328cb26287f4137e70630e7261b17cbe3cd41011d73a654692 libogg-1.3.2.tar.gz" +ARG OPUS_SHA256SUM="77db45a87b51578fbc49555ef1b10926179861d854eb2613207dc79d9ec0a9a9 opus-1.2.tar.gz" +ARG VORBIS_SHA256SUM="6efbcecdd3e5dfbf090341b485da9d176eb250d893e3eb378c428a2db38301ce libvorbis-1.3.5.tar.gz" +ARG THEORA_SHA256SUM="40952956c47811928d1e7922cda3bc1f427eb75680c3c37249c91e949054916b libtheora-1.1.1.tar.gz" +ARG XVID_SHA256SUM="4e9fd62728885855bc5007fe1be58df42e5e274497591fec37249e1052ae316f xvidcore-1.3.4.tar.gz" +ARG FREETYPE_SHA256SUM="5d03dd76c2171a7601e9ce10551d52d4471cf92cd205948e60289251daddffa8 freetype-2.5.5.tar.gz" +ARG LIBVIDSTAB_SHA256SUM="14d2a053e56edad4f397be0cb3ef8eb1ec3150404ce99a426c4eb641861dc0bb v1.1.0.tar.gz" +ARG LIBASS_SHA256SUM="8fadf294bf701300d4605e6f1d92929304187fca4b8d8a47889315526adbafd7 0.13.7.tar.gz" +ARG FRIBIDI_SHA256SUM="3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 0.19.7.tar.gz" + + +RUN buildDeps="autoconf \ + automake \ + cmake \ + curl \ + bzip2 \ + libexpat1-dev \ + g++ \ + gcc \ + git \ + gperf \ + libtool \ + make \ + nasm \ + perl \ + pkg-config \ + python \ + libssl-dev \ + yasm \ + zlib1g-dev" && \ + apt-get -yqq update && \ + apt-get install -yq --no-install-recommends ${buildDeps} + +RUN \ + DIR=/tmp/nv-codec-headers && \ + git clone https://git.videolan.org/git/ffmpeg/nv-codec-headers.git ${DIR} && \ + cd ${DIR} && \ + git checkout n${NVIDIA_HEADERS_VERSION} && \ + sed -i 's@/usr/local@'"$PREFIX"'@' Makefile && \ + make && \ + make install && \ + rm -rf ${DIR} + +## opencore-amr https://sourceforge.net/projects/opencore-amr/ +RUN \ + DIR=/tmp/opencore-amr && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://kent.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${OPENCOREAMR_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +## x264 http://www.videolan.org/developers/x264.html +RUN \ + DIR=/tmp/x264 && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://download.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-${X264_VERSION}.tar.bz2 | \ + tar -jx --strip-components=1 && \ + ./configure --prefix="${PREFIX}" --enable-shared --enable-pic --disable-cli && \ + make && \ + make install && \ + rm -rf ${DIR} +### x265 http://x265.org/ +RUN \ + DIR=/tmp/x265 && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://download.videolan.org/pub/videolan/x265/x265_${X265_VERSION}.tar.gz | \ + tar -zx && \ + cd x265_${X265_VERSION}/build/linux && \ + sed -i "/-DEXTRA_LIB/ s/$/ -DCMAKE_INSTALL_PREFIX=\${PREFIX}/" multilib.sh && \ + sed -i "/^cmake/ s/$/ -DENABLE_CLI=OFF/" multilib.sh && \ + ./multilib.sh && \ + make -C 8bit install && \ + rm -rf ${DIR} +### libogg https://www.xiph.org/ogg/ +RUN \ + DIR=/tmp/ogg && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO http://downloads.xiph.org/releases/ogg/libogg-${OGG_VERSION}.tar.gz && \ + echo ${OGG_SHA256SUM} | sha256sum --check && \ + tar -zx --strip-components=1 -f libogg-${OGG_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +### libopus https://www.opus-codec.org/ +RUN \ + DIR=/tmp/opus && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://archive.mozilla.org/pub/opus/opus-${OPUS_VERSION}.tar.gz && \ + echo ${OPUS_SHA256SUM} | sha256sum --check && \ + tar -zx --strip-components=1 -f opus-${OPUS_VERSION}.tar.gz && \ + autoreconf -fiv && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +### libvorbis https://xiph.org/vorbis/ +RUN \ + DIR=/tmp/vorbis && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO http://downloads.xiph.org/releases/vorbis/libvorbis-${VORBIS_VERSION}.tar.gz && \ + echo ${VORBIS_SHA256SUM} | sha256sum --check && \ + tar -zx --strip-components=1 -f libvorbis-${VORBIS_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +### libtheora http://www.theora.org/ +RUN \ + DIR=/tmp/theora && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO http://downloads.xiph.org/releases/theora/libtheora-${THEORA_VERSION}.tar.gz && \ + echo ${THEORA_SHA256SUM} | sha256sum --check && \ + tar -zx --strip-components=1 -f libtheora-${THEORA_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +### libvpx https://www.webmproject.org/code/ +RUN \ + DIR=/tmp/vpx && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://codeload.github.com/webmproject/libvpx/tar.gz/v${VPX_VERSION} | \ + tar -zx --strip-components=1 && \ + ./configure --prefix="${PREFIX}" --enable-vp8 --enable-vp9 --enable-vp9-highbitdepth --enable-pic --enable-shared \ + --disable-debug --disable-examples --disable-docs --disable-install-bins && \ + make && \ + make install && \ + rm -rf ${DIR} +### libwebp https://developers.google.com/speed/webp/ +RUN \ + DIR=/tmp/vebp && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-${WEBP_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +### libmp3lame http://lame.sourceforge.net/ +RUN \ + DIR=/tmp/lame && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://kent.dl.sourceforge.net/project/lame/lame/$(echo ${LAME_VERSION} | sed -e 's/[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)/\1.\2/')/lame-${LAME_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" --enable-shared --enable-nasm --enable-pic --disable-frontend && \ + make && \ + make install && \ + rm -rf ${DIR} +### xvid https://www.xvid.com/ +RUN \ + DIR=/tmp/xvid && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO http://downloads.xvid.org/downloads/xvidcore-${XVID_VERSION}.tar.gz && \ + echo ${XVID_SHA256SUM} | sha256sum --check && \ + tar -zx -f xvidcore-${XVID_VERSION}.tar.gz && \ + cd xvidcore/build/generic && \ + ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" --datadir="${DIR}" --enable-shared --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +### fdk-aac https://github.com/mstorsjo/fdk-aac +RUN \ + DIR=/tmp/fdk-aac && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://github.com/mstorsjo/fdk-aac/archive/v${FDKAAC_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + autoreconf -fiv && \ + ./configure --prefix="${PREFIX}" --enable-shared --datadir="${DIR}" && \ + make && \ + make install && \ + rm -rf ${DIR} +## openjpeg https://github.com/uclouvain/openjpeg +RUN \ + DIR=/tmp/openjpeg && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://github.com/uclouvain/openjpeg/archive/v${OPENJPEG_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + cmake -DBUILD_THIRDPARTY:BOOL=ON -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ + make && \ + make install && \ + rm -rf ${DIR} +## freetype https://www.freetype.org/ +RUN \ + DIR=/tmp/freetype && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://download.savannah.gnu.org/releases/freetype/freetype-${FREETYPE_VERSION}.tar.gz && \ + echo ${FREETYPE_SHA256SUM} | sha256sum --check && \ + tar -zx --strip-components=1 -f freetype-${FREETYPE_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +## libvstab https://github.com/georgmartius/vid.stab +RUN \ + DIR=/tmp/vid.stab && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/georgmartius/vid.stab/archive/v${LIBVIDSTAB_VERSION}.tar.gz &&\ + echo ${LIBVIDSTAB_SHA256SUM} | sha256sum --check && \ + tar -zx --strip-components=1 -f v${LIBVIDSTAB_VERSION}.tar.gz && \ + cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ + make && \ + make install && \ + rm -rf ${DIR} +## fridibi https://www.fribidi.org/ +# + https://github.com/fribidi/fribidi/issues/8 +RUN \ + DIR=/tmp/fribidi && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/fribidi/fribidi/archive/${FRIBIDI_VERSION}.tar.gz && \ + echo ${FRIBIDI_SHA256SUM} | sha256sum --check && \ + tar -zx --strip-components=1 -f ${FRIBIDI_VERSION}.tar.gz && \ + sed -i 's/^SUBDIRS =.*/SUBDIRS=gen.tab charset lib/' Makefile.am && \ + ./bootstrap --no-config && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ + make -j 1 && \ + make install && \ + rm -rf ${DIR} +## fontconfig https://www.freedesktop.org/wiki/Software/fontconfig/ +RUN \ + DIR=/tmp/fontconfig && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://www.freedesktop.org/software/fontconfig/release/fontconfig-${FONTCONFIG_VERSION}.tar.bz2 &&\ + tar -jx --strip-components=1 -f fontconfig-${FONTCONFIG_VERSION}.tar.bz2 && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +## libass https://github.com/libass/libass +RUN \ + DIR=/tmp/libass && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/libass/libass/archive/${LIBASS_VERSION}.tar.gz &&\ + echo ${LIBASS_SHA256SUM} | sha256sum --check && \ + tar -zx --strip-components=1 -f ${LIBASS_VERSION}.tar.gz && \ + ./autogen.sh && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +## kvazaar https://github.com/ultravideo/kvazaar +RUN \ + DIR=/tmp/kvazaar && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/ultravideo/kvazaar/archive/v${KVAZAAR_VERSION}.tar.gz &&\ + tar -zx --strip-components=1 -f v${KVAZAAR_VERSION}.tar.gz && \ + ./autogen.sh && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} + +RUN \ + DIR=/tmp/aom && \ + git clone --branch ${AOM_VERSION} --depth 1 https://aomedia.googlesource.com/aom ${DIR} ; \ + cd ${DIR} ; \ + rm -rf CMakeCache.txt CMakeFiles ; \ + mkdir -p ./aom_build ; \ + cd ./aom_build ; \ + cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" -DBUILD_SHARED_LIBS=1 ..; \ + make ; \ + make install ; \ + rm -rf ${DIR} + +## ffmpeg https://ffmpeg.org/ +RUN \ + DIR=/tmp/ffmpeg && mkdir -p ${DIR} && cd ${DIR} && \ + curl -sLO https://ffmpeg.org/releases/ffmpeg-${FFMPEG_VERSION}.tar.bz2 && \ + tar -jx --strip-components=1 -f ffmpeg-${FFMPEG_VERSION}.tar.bz2 + + + +RUN \ + DIR=/tmp/ffmpeg && mkdir -p ${DIR} && cd ${DIR} && \ + ./configure \ + --disable-debug \ + --disable-doc \ + --disable-ffplay \ + --enable-cuda \ + --enable-nvenc \ + --enable-cuvid \ + --enable-libnpp \ + --enable-shared \ + --enable-avresample \ + --enable-libopencore-amrnb \ + --enable-libopencore-amrwb \ + --enable-gpl \ + --enable-libass \ + --enable-libfreetype \ + --enable-libvidstab \ + --enable-libmp3lame \ + --enable-libopenjpeg \ + --enable-libopus \ + --enable-libtheora \ + --enable-libvorbis \ + --enable-libvpx \ + --enable-libwebp \ + --enable-libx265 \ + --enable-libxvid \ + --enable-libx264 \ + --enable-nonfree \ + --enable-openssl \ + --enable-libfdk_aac \ + --enable-libkvazaar \ + --enable-libaom --extra-libs=-lpthread \ + --enable-postproc \ + --enable-small \ + --enable-version3 \ + --extra-cflags="-I${PREFIX}/include -I${PREFIX}/include/ffnvcodec -I/usr/local/cuda/include/" \ + --extra-ldflags="-L${PREFIX}/lib -L/usr/local/cuda/lib64/ -L/usr/local/cuda/lib32/" \ + --extra-libs=-ldl \ + --prefix="${PREFIX}" && \ + make && \ + make install && \ + make distclean && \ + hash -r && \ + cd tools && \ + make qt-faststart && \ + cp qt-faststart ${PREFIX}/bin + +## cleanup +RUN \ + ldd ${PREFIX}/bin/ffmpeg | grep opt/ffmpeg | cut -d ' ' -f 3 | xargs -i cp {} /usr/local/lib/ && \ + cp ${PREFIX}/bin/* /usr/local/bin/ && \ + cp -r ${PREFIX}/share/ffmpeg /usr/local/share/ && \ + LD_LIBRARY_PATH=/usr/local/lib ffmpeg -buildconf + + + +FROM runtime-base AS release +MAINTAINER Julien Rottenberg + +CMD ["--help"] +ENTRYPOINT ["ffmpeg"] +ENV LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/usr/local/lib" + +COPY --from=build /usr/local/bin /usr/local/bin/ +COPY --from=build /usr/local/share /usr/local/share/ +COPY --from=build /usr/local/lib /usr/local/lib/ + +# Let's make sure the app built correctly +# Convenient to verify on https://hub.docker.com/r/jrottenberg/ffmpeg/builds/ console output + diff --git a/docker-images/4.2/scratch/Dockerfile b/docker-images/4.2/scratch/Dockerfile new file mode 100644 index 000000000..03b1006fd --- /dev/null +++ b/docker-images/4.2/scratch/Dockerfile @@ -0,0 +1,388 @@ +# ffmpeg - http://ffmpeg.org/download.html +# +# https://hub.docker.com/r/jrottenberg/ffmpeg/ +# +# + +FROM alpine:3.8 AS build + +WORKDIR /tmp/workdir + +ARG PKG_CONFIG_PATH=/opt/ffmpeg/lib/pkgconfig +ARG LD_LIBRARY_PATH=/opt/ffmpeg/lib +ARG PREFIX=/opt/ffmpeg +ARG MAKEFLAGS="-j2" + +ENV FFMPEG_VERSION=4.2 \ + FDKAAC_VERSION=0.1.5 \ + LAME_VERSION=3.100 \ + LIBASS_VERSION=0.13.7 \ + OGG_VERSION=1.3.2 \ + OPENCOREAMR_VERSION=0.1.5 \ + OPUS_VERSION=1.2 \ + OPENJPEG_VERSION=2.1.2 \ + THEORA_VERSION=1.1.1 \ + VORBIS_VERSION=1.3.5 \ + VPX_VERSION=1.8.0 \ + WEBP_VERSION=1.0.2 \ + X264_VERSION=20170226-2245-stable \ + X265_VERSION=3.1.1 \ + XVID_VERSION=1.3.4 \ + FREETYPE_VERSION=2.5.5 \ + FRIBIDI_VERSION=0.19.7 \ + FONTCONFIG_VERSION=2.12.4 \ + LIBVIDSTAB_VERSION=1.1.0 \ + KVAZAAR_VERSION=1.2.0 \ + AOM_VERSION=v1.0.0 \ + SRC=/usr/local + +ARG OGG_SHA256SUM="e19ee34711d7af328cb26287f4137e70630e7261b17cbe3cd41011d73a654692 libogg-1.3.2.tar.gz" +ARG OPUS_SHA256SUM="77db45a87b51578fbc49555ef1b10926179861d854eb2613207dc79d9ec0a9a9 opus-1.2.tar.gz" +ARG VORBIS_SHA256SUM="6efbcecdd3e5dfbf090341b485da9d176eb250d893e3eb378c428a2db38301ce libvorbis-1.3.5.tar.gz" +ARG THEORA_SHA256SUM="40952956c47811928d1e7922cda3bc1f427eb75680c3c37249c91e949054916b libtheora-1.1.1.tar.gz" +ARG XVID_SHA256SUM="4e9fd62728885855bc5007fe1be58df42e5e274497591fec37249e1052ae316f xvidcore-1.3.4.tar.gz" +ARG FREETYPE_SHA256SUM="5d03dd76c2171a7601e9ce10551d52d4471cf92cd205948e60289251daddffa8 freetype-2.5.5.tar.gz" +ARG LIBVIDSTAB_SHA256SUM="14d2a053e56edad4f397be0cb3ef8eb1ec3150404ce99a426c4eb641861dc0bb v1.1.0.tar.gz" +ARG LIBASS_SHA256SUM="8fadf294bf701300d4605e6f1d92929304187fca4b8d8a47889315526adbafd7 0.13.7.tar.gz" +ARG FRIBIDI_SHA256SUM="3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 0.19.7.tar.gz" + + +RUN buildDeps="autoconf \ + automake \ + bash \ + binutils \ + bzip2 \ + cmake \ + curl \ + coreutils \ + diffutils \ + expat-dev \ + file \ + g++ \ + gcc \ + gperf \ + libtool \ + make \ + python \ + openssl-dev \ + tar \ + yasm \ + zlib-dev \ + git" && \ + apk add --update ${buildDeps} libgcc libstdc++ ca-certificates libcrypto1.0 libssl1.0 + +## opencore-amr https://sourceforge.net/projects/opencore-amr/ +RUN \ + DIR=/tmp/opencore-amr && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://kent.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${OPENCOREAMR_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +## x264 http://www.videolan.org/developers/x264.html +RUN \ + DIR=/tmp/x264 && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://download.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-${X264_VERSION}.tar.bz2 | \ + tar -jx --strip-components=1 && \ + ./configure --prefix="${PREFIX}" --enable-shared --enable-pic --disable-cli && \ + make && \ + make install && \ + rm -rf ${DIR} +### x265 http://x265.org/ +RUN \ + DIR=/tmp/x265 && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://download.videolan.org/pub/videolan/x265/x265_${X265_VERSION}.tar.gz | \ + tar -zx && \ + cd x265_${X265_VERSION}/build/linux && \ + sed -i "/-DEXTRA_LIB/ s/$/ -DCMAKE_INSTALL_PREFIX=\${PREFIX}/" multilib.sh && \ + sed -i "/^cmake/ s/$/ -DENABLE_CLI=OFF/" multilib.sh && \ + ./multilib.sh && \ + make -C 8bit install && \ + rm -rf ${DIR} +### libogg https://www.xiph.org/ogg/ +RUN \ + DIR=/tmp/ogg && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO http://downloads.xiph.org/releases/ogg/libogg-${OGG_VERSION}.tar.gz && \ + echo ${OGG_SHA256SUM} | sha256sum --check && \ + tar -zx --strip-components=1 -f libogg-${OGG_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +### libopus https://www.opus-codec.org/ +RUN \ + DIR=/tmp/opus && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://archive.mozilla.org/pub/opus/opus-${OPUS_VERSION}.tar.gz && \ + echo ${OPUS_SHA256SUM} | sha256sum --check && \ + tar -zx --strip-components=1 -f opus-${OPUS_VERSION}.tar.gz && \ + autoreconf -fiv && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +### libvorbis https://xiph.org/vorbis/ +RUN \ + DIR=/tmp/vorbis && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO http://downloads.xiph.org/releases/vorbis/libvorbis-${VORBIS_VERSION}.tar.gz && \ + echo ${VORBIS_SHA256SUM} | sha256sum --check && \ + tar -zx --strip-components=1 -f libvorbis-${VORBIS_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +### libtheora http://www.theora.org/ +RUN \ + DIR=/tmp/theora && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO http://downloads.xiph.org/releases/theora/libtheora-${THEORA_VERSION}.tar.gz && \ + echo ${THEORA_SHA256SUM} | sha256sum --check && \ + tar -zx --strip-components=1 -f libtheora-${THEORA_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +### libvpx https://www.webmproject.org/code/ +RUN \ + DIR=/tmp/vpx && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://codeload.github.com/webmproject/libvpx/tar.gz/v${VPX_VERSION} | \ + tar -zx --strip-components=1 && \ + ./configure --prefix="${PREFIX}" --enable-vp8 --enable-vp9 --enable-vp9-highbitdepth --enable-pic --enable-shared \ + --disable-debug --disable-examples --disable-docs --disable-install-bins && \ + make && \ + make install && \ + rm -rf ${DIR} +### libwebp https://developers.google.com/speed/webp/ +RUN \ + DIR=/tmp/vebp && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-${WEBP_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +### libmp3lame http://lame.sourceforge.net/ +RUN \ + DIR=/tmp/lame && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://kent.dl.sourceforge.net/project/lame/lame/$(echo ${LAME_VERSION} | sed -e 's/[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)/\1.\2/')/lame-${LAME_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" --enable-shared --enable-nasm --enable-pic --disable-frontend && \ + make && \ + make install && \ + rm -rf ${DIR} +### xvid https://www.xvid.com/ +RUN \ + DIR=/tmp/xvid && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO http://downloads.xvid.org/downloads/xvidcore-${XVID_VERSION}.tar.gz && \ + echo ${XVID_SHA256SUM} | sha256sum --check && \ + tar -zx -f xvidcore-${XVID_VERSION}.tar.gz && \ + cd xvidcore/build/generic && \ + ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" --datadir="${DIR}" --enable-shared --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +### fdk-aac https://github.com/mstorsjo/fdk-aac +RUN \ + DIR=/tmp/fdk-aac && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://github.com/mstorsjo/fdk-aac/archive/v${FDKAAC_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + autoreconf -fiv && \ + ./configure --prefix="${PREFIX}" --enable-shared --datadir="${DIR}" && \ + make && \ + make install && \ + rm -rf ${DIR} +## openjpeg https://github.com/uclouvain/openjpeg +RUN \ + DIR=/tmp/openjpeg && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://github.com/uclouvain/openjpeg/archive/v${OPENJPEG_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + cmake -DBUILD_THIRDPARTY:BOOL=ON -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ + make && \ + make install && \ + rm -rf ${DIR} +## freetype https://www.freetype.org/ +RUN \ + DIR=/tmp/freetype && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://download.savannah.gnu.org/releases/freetype/freetype-${FREETYPE_VERSION}.tar.gz && \ + echo ${FREETYPE_SHA256SUM} | sha256sum --check && \ + tar -zx --strip-components=1 -f freetype-${FREETYPE_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +## libvstab https://github.com/georgmartius/vid.stab +RUN \ + DIR=/tmp/vid.stab && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/georgmartius/vid.stab/archive/v${LIBVIDSTAB_VERSION}.tar.gz &&\ + echo ${LIBVIDSTAB_SHA256SUM} | sha256sum --check && \ + tar -zx --strip-components=1 -f v${LIBVIDSTAB_VERSION}.tar.gz && \ + cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ + make && \ + make install && \ + rm -rf ${DIR} +## fridibi https://www.fribidi.org/ +# + https://github.com/fribidi/fribidi/issues/8 +RUN \ + DIR=/tmp/fribidi && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/fribidi/fribidi/archive/${FRIBIDI_VERSION}.tar.gz && \ + echo ${FRIBIDI_SHA256SUM} | sha256sum --check && \ + tar -zx --strip-components=1 -f ${FRIBIDI_VERSION}.tar.gz && \ + sed -i 's/^SUBDIRS =.*/SUBDIRS=gen.tab charset lib/' Makefile.am && \ + ./bootstrap --no-config && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ + make -j 1 && \ + make install && \ + rm -rf ${DIR} +## fontconfig https://www.freedesktop.org/wiki/Software/fontconfig/ +RUN \ + DIR=/tmp/fontconfig && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://www.freedesktop.org/software/fontconfig/release/fontconfig-${FONTCONFIG_VERSION}.tar.bz2 &&\ + tar -jx --strip-components=1 -f fontconfig-${FONTCONFIG_VERSION}.tar.bz2 && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +## libass https://github.com/libass/libass +RUN \ + DIR=/tmp/libass && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/libass/libass/archive/${LIBASS_VERSION}.tar.gz &&\ + echo ${LIBASS_SHA256SUM} | sha256sum --check && \ + tar -zx --strip-components=1 -f ${LIBASS_VERSION}.tar.gz && \ + ./autogen.sh && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +## kvazaar https://github.com/ultravideo/kvazaar +RUN \ + DIR=/tmp/kvazaar && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/ultravideo/kvazaar/archive/v${KVAZAAR_VERSION}.tar.gz &&\ + tar -zx --strip-components=1 -f v${KVAZAAR_VERSION}.tar.gz && \ + ./autogen.sh && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} + +RUN \ + DIR=/tmp/aom && \ + git clone --branch ${AOM_VERSION} --depth 1 https://aomedia.googlesource.com/aom ${DIR} ; \ + cd ${DIR} ; \ + rm -rf CMakeCache.txt CMakeFiles ; \ + mkdir -p ./aom_build ; \ + cd ./aom_build ; \ + cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" -DBUILD_SHARED_LIBS=1 ..; \ + make ; \ + make install ; \ + rm -rf ${DIR} + +## ffmpeg https://ffmpeg.org/ +RUN \ + DIR=/tmp/ffmpeg && mkdir -p ${DIR} && cd ${DIR} && \ + curl -sLO https://ffmpeg.org/releases/ffmpeg-${FFMPEG_VERSION}.tar.bz2 && \ + tar -jx --strip-components=1 -f ffmpeg-${FFMPEG_VERSION}.tar.bz2 + + + +RUN \ + DIR=/tmp/ffmpeg && mkdir -p ${DIR} && cd ${DIR} && \ + ./configure \ + --disable-debug \ + --disable-doc \ + --disable-ffplay \ + --enable-shared \ + --enable-avresample \ + --enable-libopencore-amrnb \ + --enable-libopencore-amrwb \ + --enable-gpl \ + --enable-libass \ + --enable-libfreetype \ + --enable-libvidstab \ + --enable-libmp3lame \ + --enable-libopenjpeg \ + --enable-libopus \ + --enable-libtheora \ + --enable-libvorbis \ + --enable-libvpx \ + --enable-libwebp \ + --enable-libx265 \ + --enable-libxvid \ + --enable-libx264 \ + --enable-nonfree \ + --enable-openssl \ + --enable-libfdk_aac \ + --enable-libkvazaar \ + --enable-libaom --extra-libs=-lpthread \ + --enable-postproc \ + --enable-small \ + --enable-version3 \ + --extra-cflags="-I${PREFIX}/include" \ + --extra-ldflags="-L${PREFIX}/lib" \ + --extra-libs=-ldl \ + --prefix="${PREFIX}" && \ + make && \ + make install && \ + make distclean && \ + hash -r && \ + cd tools && \ + make qt-faststart && \ + cp qt-faststart ${PREFIX}/bin + + +RUN \ + mkdir -p /tmp/fakeroot/lib && \ + ldd ${PREFIX}/bin/ffmpeg | cut -d ' ' -f 3 | strings | xargs -I R cp R /tmp/fakeroot/lib/ && \ + for lib in /tmp/fakeroot/lib/*; do strip --strip-all $lib; done && \ + cp -r ${PREFIX}/bin /tmp/fakeroot/bin/ && \ + cp -r ${PREFIX}/share/ffmpeg /tmp/fakeroot/share/ && \ + LD_LIBRARY_PATH=/tmp/fakeroot/lib /tmp/fakeroot/bin/ffmpeg -buildconf + +### Release Stage +FROM scratch AS release +MAINTAINER Julien Rottenberg + +CMD ["--help"] +ENTRYPOINT ["/bin/ffmpeg"] + +COPY --from=build /tmp/fakeroot/ / + + +# Let's make sure the app built correctly +# Convenient to verify on https://hub.docker.com/r/jrottenberg/ffmpeg/builds/ console output diff --git a/docker-images/4.2/ubuntu/Dockerfile b/docker-images/4.2/ubuntu/Dockerfile new file mode 100644 index 000000000..23f445aa0 --- /dev/null +++ b/docker-images/4.2/ubuntu/Dockerfile @@ -0,0 +1,390 @@ +# ffmpeg - http://ffmpeg.org/download.html +# +# From https://trac.ffmpeg.org/wiki/CompilationGuide/Ubuntu +# +# https://hub.docker.com/r/jrottenberg/ffmpeg/ +# +# +FROM ubuntu:16.04 AS base + +WORKDIR /tmp/workdir + +RUN apt-get -yqq update && \ + apt-get install -yq --no-install-recommends ca-certificates expat libgomp1 && \ + apt-get autoremove -y && \ + apt-get clean -y + +FROM base as build + +ARG PKG_CONFIG_PATH=/opt/ffmpeg/lib/pkgconfig +ARG LD_LIBRARY_PATH=/opt/ffmpeg/lib +ARG PREFIX=/opt/ffmpeg +ARG MAKEFLAGS="-j2" + +ENV FFMPEG_VERSION=4.2 \ + FDKAAC_VERSION=0.1.5 \ + LAME_VERSION=3.100 \ + LIBASS_VERSION=0.13.7 \ + OGG_VERSION=1.3.2 \ + OPENCOREAMR_VERSION=0.1.5 \ + OPUS_VERSION=1.2 \ + OPENJPEG_VERSION=2.1.2 \ + THEORA_VERSION=1.1.1 \ + VORBIS_VERSION=1.3.5 \ + VPX_VERSION=1.8.0 \ + WEBP_VERSION=1.0.2 \ + X264_VERSION=20170226-2245-stable \ + X265_VERSION=3.1.1 \ + XVID_VERSION=1.3.4 \ + FREETYPE_VERSION=2.5.5 \ + FRIBIDI_VERSION=0.19.7 \ + FONTCONFIG_VERSION=2.12.4 \ + LIBVIDSTAB_VERSION=1.1.0 \ + KVAZAAR_VERSION=1.2.0 \ + AOM_VERSION=v1.0.0 \ + SRC=/usr/local + +ARG OGG_SHA256SUM="e19ee34711d7af328cb26287f4137e70630e7261b17cbe3cd41011d73a654692 libogg-1.3.2.tar.gz" +ARG OPUS_SHA256SUM="77db45a87b51578fbc49555ef1b10926179861d854eb2613207dc79d9ec0a9a9 opus-1.2.tar.gz" +ARG VORBIS_SHA256SUM="6efbcecdd3e5dfbf090341b485da9d176eb250d893e3eb378c428a2db38301ce libvorbis-1.3.5.tar.gz" +ARG THEORA_SHA256SUM="40952956c47811928d1e7922cda3bc1f427eb75680c3c37249c91e949054916b libtheora-1.1.1.tar.gz" +ARG XVID_SHA256SUM="4e9fd62728885855bc5007fe1be58df42e5e274497591fec37249e1052ae316f xvidcore-1.3.4.tar.gz" +ARG FREETYPE_SHA256SUM="5d03dd76c2171a7601e9ce10551d52d4471cf92cd205948e60289251daddffa8 freetype-2.5.5.tar.gz" +ARG LIBVIDSTAB_SHA256SUM="14d2a053e56edad4f397be0cb3ef8eb1ec3150404ce99a426c4eb641861dc0bb v1.1.0.tar.gz" +ARG LIBASS_SHA256SUM="8fadf294bf701300d4605e6f1d92929304187fca4b8d8a47889315526adbafd7 0.13.7.tar.gz" +ARG FRIBIDI_SHA256SUM="3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 0.19.7.tar.gz" + + +RUN buildDeps="autoconf \ + automake \ + cmake \ + curl \ + bzip2 \ + libexpat1-dev \ + g++ \ + gcc \ + git \ + gperf \ + libtool \ + make \ + nasm \ + perl \ + pkg-config \ + python \ + libssl-dev \ + yasm \ + zlib1g-dev" && \ + apt-get -yqq update && \ + apt-get install -yq --no-install-recommends ${buildDeps} +## opencore-amr https://sourceforge.net/projects/opencore-amr/ +RUN \ + DIR=/tmp/opencore-amr && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://kent.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${OPENCOREAMR_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +## x264 http://www.videolan.org/developers/x264.html +RUN \ + DIR=/tmp/x264 && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://download.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-${X264_VERSION}.tar.bz2 | \ + tar -jx --strip-components=1 && \ + ./configure --prefix="${PREFIX}" --enable-shared --enable-pic --disable-cli && \ + make && \ + make install && \ + rm -rf ${DIR} +### x265 http://x265.org/ +RUN \ + DIR=/tmp/x265 && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://download.videolan.org/pub/videolan/x265/x265_${X265_VERSION}.tar.gz | \ + tar -zx && \ + cd x265_${X265_VERSION}/build/linux && \ + sed -i "/-DEXTRA_LIB/ s/$/ -DCMAKE_INSTALL_PREFIX=\${PREFIX}/" multilib.sh && \ + sed -i "/^cmake/ s/$/ -DENABLE_CLI=OFF/" multilib.sh && \ + ./multilib.sh && \ + make -C 8bit install && \ + rm -rf ${DIR} +### libogg https://www.xiph.org/ogg/ +RUN \ + DIR=/tmp/ogg && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO http://downloads.xiph.org/releases/ogg/libogg-${OGG_VERSION}.tar.gz && \ + echo ${OGG_SHA256SUM} | sha256sum --check && \ + tar -zx --strip-components=1 -f libogg-${OGG_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +### libopus https://www.opus-codec.org/ +RUN \ + DIR=/tmp/opus && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://archive.mozilla.org/pub/opus/opus-${OPUS_VERSION}.tar.gz && \ + echo ${OPUS_SHA256SUM} | sha256sum --check && \ + tar -zx --strip-components=1 -f opus-${OPUS_VERSION}.tar.gz && \ + autoreconf -fiv && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +### libvorbis https://xiph.org/vorbis/ +RUN \ + DIR=/tmp/vorbis && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO http://downloads.xiph.org/releases/vorbis/libvorbis-${VORBIS_VERSION}.tar.gz && \ + echo ${VORBIS_SHA256SUM} | sha256sum --check && \ + tar -zx --strip-components=1 -f libvorbis-${VORBIS_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +### libtheora http://www.theora.org/ +RUN \ + DIR=/tmp/theora && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO http://downloads.xiph.org/releases/theora/libtheora-${THEORA_VERSION}.tar.gz && \ + echo ${THEORA_SHA256SUM} | sha256sum --check && \ + tar -zx --strip-components=1 -f libtheora-${THEORA_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +### libvpx https://www.webmproject.org/code/ +RUN \ + DIR=/tmp/vpx && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://codeload.github.com/webmproject/libvpx/tar.gz/v${VPX_VERSION} | \ + tar -zx --strip-components=1 && \ + ./configure --prefix="${PREFIX}" --enable-vp8 --enable-vp9 --enable-vp9-highbitdepth --enable-pic --enable-shared \ + --disable-debug --disable-examples --disable-docs --disable-install-bins && \ + make && \ + make install && \ + rm -rf ${DIR} +### libwebp https://developers.google.com/speed/webp/ +RUN \ + DIR=/tmp/vebp && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-${WEBP_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +### libmp3lame http://lame.sourceforge.net/ +RUN \ + DIR=/tmp/lame && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://kent.dl.sourceforge.net/project/lame/lame/$(echo ${LAME_VERSION} | sed -e 's/[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)/\1.\2/')/lame-${LAME_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" --enable-shared --enable-nasm --enable-pic --disable-frontend && \ + make && \ + make install && \ + rm -rf ${DIR} +### xvid https://www.xvid.com/ +RUN \ + DIR=/tmp/xvid && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO http://downloads.xvid.org/downloads/xvidcore-${XVID_VERSION}.tar.gz && \ + echo ${XVID_SHA256SUM} | sha256sum --check && \ + tar -zx -f xvidcore-${XVID_VERSION}.tar.gz && \ + cd xvidcore/build/generic && \ + ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" --datadir="${DIR}" --enable-shared --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +### fdk-aac https://github.com/mstorsjo/fdk-aac +RUN \ + DIR=/tmp/fdk-aac && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://github.com/mstorsjo/fdk-aac/archive/v${FDKAAC_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + autoreconf -fiv && \ + ./configure --prefix="${PREFIX}" --enable-shared --datadir="${DIR}" && \ + make && \ + make install && \ + rm -rf ${DIR} +## openjpeg https://github.com/uclouvain/openjpeg +RUN \ + DIR=/tmp/openjpeg && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://github.com/uclouvain/openjpeg/archive/v${OPENJPEG_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + cmake -DBUILD_THIRDPARTY:BOOL=ON -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ + make && \ + make install && \ + rm -rf ${DIR} +## freetype https://www.freetype.org/ +RUN \ + DIR=/tmp/freetype && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://download.savannah.gnu.org/releases/freetype/freetype-${FREETYPE_VERSION}.tar.gz && \ + echo ${FREETYPE_SHA256SUM} | sha256sum --check && \ + tar -zx --strip-components=1 -f freetype-${FREETYPE_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +## libvstab https://github.com/georgmartius/vid.stab +RUN \ + DIR=/tmp/vid.stab && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/georgmartius/vid.stab/archive/v${LIBVIDSTAB_VERSION}.tar.gz &&\ + echo ${LIBVIDSTAB_SHA256SUM} | sha256sum --check && \ + tar -zx --strip-components=1 -f v${LIBVIDSTAB_VERSION}.tar.gz && \ + cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ + make && \ + make install && \ + rm -rf ${DIR} +## fridibi https://www.fribidi.org/ +# + https://github.com/fribidi/fribidi/issues/8 +RUN \ + DIR=/tmp/fribidi && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/fribidi/fribidi/archive/${FRIBIDI_VERSION}.tar.gz && \ + echo ${FRIBIDI_SHA256SUM} | sha256sum --check && \ + tar -zx --strip-components=1 -f ${FRIBIDI_VERSION}.tar.gz && \ + sed -i 's/^SUBDIRS =.*/SUBDIRS=gen.tab charset lib/' Makefile.am && \ + ./bootstrap --no-config && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ + make -j 1 && \ + make install && \ + rm -rf ${DIR} +## fontconfig https://www.freedesktop.org/wiki/Software/fontconfig/ +RUN \ + DIR=/tmp/fontconfig && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://www.freedesktop.org/software/fontconfig/release/fontconfig-${FONTCONFIG_VERSION}.tar.bz2 &&\ + tar -jx --strip-components=1 -f fontconfig-${FONTCONFIG_VERSION}.tar.bz2 && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +## libass https://github.com/libass/libass +RUN \ + DIR=/tmp/libass && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/libass/libass/archive/${LIBASS_VERSION}.tar.gz &&\ + echo ${LIBASS_SHA256SUM} | sha256sum --check && \ + tar -zx --strip-components=1 -f ${LIBASS_VERSION}.tar.gz && \ + ./autogen.sh && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +## kvazaar https://github.com/ultravideo/kvazaar +RUN \ + DIR=/tmp/kvazaar && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/ultravideo/kvazaar/archive/v${KVAZAAR_VERSION}.tar.gz &&\ + tar -zx --strip-components=1 -f v${KVAZAAR_VERSION}.tar.gz && \ + ./autogen.sh && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} + +RUN \ + DIR=/tmp/aom && \ + git clone --branch ${AOM_VERSION} --depth 1 https://aomedia.googlesource.com/aom ${DIR} ; \ + cd ${DIR} ; \ + rm -rf CMakeCache.txt CMakeFiles ; \ + mkdir -p ./aom_build ; \ + cd ./aom_build ; \ + cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" -DBUILD_SHARED_LIBS=1 ..; \ + make ; \ + make install ; \ + rm -rf ${DIR} + +## ffmpeg https://ffmpeg.org/ +RUN \ + DIR=/tmp/ffmpeg && mkdir -p ${DIR} && cd ${DIR} && \ + curl -sLO https://ffmpeg.org/releases/ffmpeg-${FFMPEG_VERSION}.tar.bz2 && \ + tar -jx --strip-components=1 -f ffmpeg-${FFMPEG_VERSION}.tar.bz2 + + + +RUN \ + DIR=/tmp/ffmpeg && mkdir -p ${DIR} && cd ${DIR} && \ + ./configure \ + --disable-debug \ + --disable-doc \ + --disable-ffplay \ + --enable-shared \ + --enable-avresample \ + --enable-libopencore-amrnb \ + --enable-libopencore-amrwb \ + --enable-gpl \ + --enable-libass \ + --enable-libfreetype \ + --enable-libvidstab \ + --enable-libmp3lame \ + --enable-libopenjpeg \ + --enable-libopus \ + --enable-libtheora \ + --enable-libvorbis \ + --enable-libvpx \ + --enable-libwebp \ + --enable-libx265 \ + --enable-libxvid \ + --enable-libx264 \ + --enable-nonfree \ + --enable-openssl \ + --enable-libfdk_aac \ + --enable-libkvazaar \ + --enable-libaom --extra-libs=-lpthread \ + --enable-postproc \ + --enable-small \ + --enable-version3 \ + --extra-cflags="-I${PREFIX}/include" \ + --extra-ldflags="-L${PREFIX}/lib" \ + --extra-libs=-ldl \ + --prefix="${PREFIX}" && \ + make && \ + make install && \ + make distclean && \ + hash -r && \ + cd tools && \ + make qt-faststart && \ + cp qt-faststart ${PREFIX}/bin + +## cleanup +RUN \ + ldd ${PREFIX}/bin/ffmpeg | grep opt/ffmpeg | cut -d ' ' -f 3 | xargs -i cp {} /usr/local/lib/ && \ + cp ${PREFIX}/bin/* /usr/local/bin/ && \ + cp -r ${PREFIX}/share/ffmpeg /usr/local/share/ && \ + LD_LIBRARY_PATH=/usr/local/lib ffmpeg -buildconf + +FROM base AS release +MAINTAINER Julien Rottenberg + +CMD ["--help"] +ENTRYPOINT ["ffmpeg"] +ENV LD_LIBRARY_PATH=/usr/local/lib + +COPY --from=build /usr/local /usr/local/ + +# Let's make sure the app built correctly +# Convenient to verify on https://hub.docker.com/r/jrottenberg/ffmpeg/builds/ console output \ No newline at end of file diff --git a/docker-images/4.2/vaapi/Dockerfile b/docker-images/4.2/vaapi/Dockerfile new file mode 100644 index 000000000..a6e6aca2c --- /dev/null +++ b/docker-images/4.2/vaapi/Dockerfile @@ -0,0 +1,397 @@ +# ffmpeg - http://ffmpeg.org/download.html +# +# From https://trac.ffmpeg.org/wiki/CompilationGuide/Ubuntu +# +# https://hub.docker.com/r/jrottenberg/ffmpeg/ +# +# +FROM ubuntu:18.04 AS base + +WORKDIR /tmp/workdir + +RUN apt-get -yqq update && \ + apt-get install -yq --no-install-recommends ca-certificates expat libgomp1 && \ + apt-get autoremove -y && \ + apt-get clean -y + +FROM base as build + +ARG PKG_CONFIG_PATH=/opt/ffmpeg/lib/pkgconfig +ARG LD_LIBRARY_PATH=/opt/ffmpeg/lib +ARG PREFIX=/opt/ffmpeg +ARG MAKEFLAGS="-j2" + +ENV FFMPEG_VERSION=4.2 \ + FDKAAC_VERSION=0.1.5 \ + LAME_VERSION=3.100 \ + LIBASS_VERSION=0.13.7 \ + OGG_VERSION=1.3.2 \ + OPENCOREAMR_VERSION=0.1.5 \ + OPUS_VERSION=1.2 \ + OPENJPEG_VERSION=2.1.2 \ + THEORA_VERSION=1.1.1 \ + VORBIS_VERSION=1.3.5 \ + VPX_VERSION=1.8.0 \ + WEBP_VERSION=1.0.2 \ + X264_VERSION=20170226-2245-stable \ + X265_VERSION=3.1.1 \ + XVID_VERSION=1.3.4 \ + FREETYPE_VERSION=2.5.5 \ + FRIBIDI_VERSION=0.19.7 \ + FONTCONFIG_VERSION=2.12.4 \ + LIBVIDSTAB_VERSION=1.1.0 \ + KVAZAAR_VERSION=1.2.0 \ + AOM_VERSION=v1.0.0 \ + SRC=/usr/local + +ARG OGG_SHA256SUM="e19ee34711d7af328cb26287f4137e70630e7261b17cbe3cd41011d73a654692 libogg-1.3.2.tar.gz" +ARG OPUS_SHA256SUM="77db45a87b51578fbc49555ef1b10926179861d854eb2613207dc79d9ec0a9a9 opus-1.2.tar.gz" +ARG VORBIS_SHA256SUM="6efbcecdd3e5dfbf090341b485da9d176eb250d893e3eb378c428a2db38301ce libvorbis-1.3.5.tar.gz" +ARG THEORA_SHA256SUM="40952956c47811928d1e7922cda3bc1f427eb75680c3c37249c91e949054916b libtheora-1.1.1.tar.gz" +ARG XVID_SHA256SUM="4e9fd62728885855bc5007fe1be58df42e5e274497591fec37249e1052ae316f xvidcore-1.3.4.tar.gz" +ARG FREETYPE_SHA256SUM="5d03dd76c2171a7601e9ce10551d52d4471cf92cd205948e60289251daddffa8 freetype-2.5.5.tar.gz" +ARG LIBVIDSTAB_SHA256SUM="14d2a053e56edad4f397be0cb3ef8eb1ec3150404ce99a426c4eb641861dc0bb v1.1.0.tar.gz" +ARG LIBASS_SHA256SUM="8fadf294bf701300d4605e6f1d92929304187fca4b8d8a47889315526adbafd7 0.13.7.tar.gz" +ARG FRIBIDI_SHA256SUM="3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 0.19.7.tar.gz" + + +RUN buildDeps="autoconf \ + automake \ + cmake \ + curl \ + bzip2 \ + libexpat1-dev \ + g++ \ + gcc \ + git \ + gperf \ + libtool \ + make \ + nasm \ + perl \ + pkg-config \ + python \ + libssl-dev \ + yasm \ + libva-dev \ + zlib1g-dev" && \ + apt-get -yqq update && \ + apt-get install -yq --no-install-recommends ${buildDeps} +## opencore-amr https://sourceforge.net/projects/opencore-amr/ +RUN \ + DIR=/tmp/opencore-amr && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://kent.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${OPENCOREAMR_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +## x264 http://www.videolan.org/developers/x264.html +RUN \ + DIR=/tmp/x264 && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://download.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-${X264_VERSION}.tar.bz2 | \ + tar -jx --strip-components=1 && \ + ./configure --prefix="${PREFIX}" --enable-shared --enable-pic --disable-cli && \ + make && \ + make install && \ + rm -rf ${DIR} +### x265 http://x265.org/ +RUN \ + DIR=/tmp/x265 && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://download.videolan.org/pub/videolan/x265/x265_${X265_VERSION}.tar.gz | \ + tar -zx && \ + cd x265_${X265_VERSION}/build/linux && \ + sed -i "/-DEXTRA_LIB/ s/$/ -DCMAKE_INSTALL_PREFIX=\${PREFIX}/" multilib.sh && \ + sed -i "/^cmake/ s/$/ -DENABLE_CLI=OFF/" multilib.sh && \ + ./multilib.sh && \ + make -C 8bit install && \ + rm -rf ${DIR} +### libogg https://www.xiph.org/ogg/ +RUN \ + DIR=/tmp/ogg && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO http://downloads.xiph.org/releases/ogg/libogg-${OGG_VERSION}.tar.gz && \ + echo ${OGG_SHA256SUM} | sha256sum --check && \ + tar -zx --strip-components=1 -f libogg-${OGG_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +### libopus https://www.opus-codec.org/ +RUN \ + DIR=/tmp/opus && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://archive.mozilla.org/pub/opus/opus-${OPUS_VERSION}.tar.gz && \ + echo ${OPUS_SHA256SUM} | sha256sum --check && \ + tar -zx --strip-components=1 -f opus-${OPUS_VERSION}.tar.gz && \ + autoreconf -fiv && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +### libvorbis https://xiph.org/vorbis/ +RUN \ + DIR=/tmp/vorbis && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO http://downloads.xiph.org/releases/vorbis/libvorbis-${VORBIS_VERSION}.tar.gz && \ + echo ${VORBIS_SHA256SUM} | sha256sum --check && \ + tar -zx --strip-components=1 -f libvorbis-${VORBIS_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +### libtheora http://www.theora.org/ +RUN \ + DIR=/tmp/theora && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO http://downloads.xiph.org/releases/theora/libtheora-${THEORA_VERSION}.tar.gz && \ + echo ${THEORA_SHA256SUM} | sha256sum --check && \ + tar -zx --strip-components=1 -f libtheora-${THEORA_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +### libvpx https://www.webmproject.org/code/ +RUN \ + DIR=/tmp/vpx && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://codeload.github.com/webmproject/libvpx/tar.gz/v${VPX_VERSION} | \ + tar -zx --strip-components=1 && \ + ./configure --prefix="${PREFIX}" --enable-vp8 --enable-vp9 --enable-vp9-highbitdepth --enable-pic --enable-shared \ + --disable-debug --disable-examples --disable-docs --disable-install-bins && \ + make && \ + make install && \ + rm -rf ${DIR} +### libwebp https://developers.google.com/speed/webp/ +RUN \ + DIR=/tmp/vebp && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-${WEBP_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +### libmp3lame http://lame.sourceforge.net/ +RUN \ + DIR=/tmp/lame && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://kent.dl.sourceforge.net/project/lame/lame/$(echo ${LAME_VERSION} | sed -e 's/[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)/\1.\2/')/lame-${LAME_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" --enable-shared --enable-nasm --enable-pic --disable-frontend && \ + make && \ + make install && \ + rm -rf ${DIR} +### xvid https://www.xvid.com/ +RUN \ + DIR=/tmp/xvid && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO http://downloads.xvid.org/downloads/xvidcore-${XVID_VERSION}.tar.gz && \ + echo ${XVID_SHA256SUM} | sha256sum --check && \ + tar -zx -f xvidcore-${XVID_VERSION}.tar.gz && \ + cd xvidcore/build/generic && \ + ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" --datadir="${DIR}" --enable-shared --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +### fdk-aac https://github.com/mstorsjo/fdk-aac +RUN \ + DIR=/tmp/fdk-aac && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://github.com/mstorsjo/fdk-aac/archive/v${FDKAAC_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + autoreconf -fiv && \ + ./configure --prefix="${PREFIX}" --enable-shared --datadir="${DIR}" && \ + make && \ + make install && \ + rm -rf ${DIR} +## openjpeg https://github.com/uclouvain/openjpeg +RUN \ + DIR=/tmp/openjpeg && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://github.com/uclouvain/openjpeg/archive/v${OPENJPEG_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + cmake -DBUILD_THIRDPARTY:BOOL=ON -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ + make && \ + make install && \ + rm -rf ${DIR} +## freetype https://www.freetype.org/ +RUN \ + DIR=/tmp/freetype && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://download.savannah.gnu.org/releases/freetype/freetype-${FREETYPE_VERSION}.tar.gz && \ + echo ${FREETYPE_SHA256SUM} | sha256sum --check && \ + tar -zx --strip-components=1 -f freetype-${FREETYPE_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +## libvstab https://github.com/georgmartius/vid.stab +RUN \ + DIR=/tmp/vid.stab && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/georgmartius/vid.stab/archive/v${LIBVIDSTAB_VERSION}.tar.gz &&\ + echo ${LIBVIDSTAB_SHA256SUM} | sha256sum --check && \ + tar -zx --strip-components=1 -f v${LIBVIDSTAB_VERSION}.tar.gz && \ + cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ + make && \ + make install && \ + rm -rf ${DIR} +## fridibi https://www.fribidi.org/ +# + https://github.com/fribidi/fribidi/issues/8 +RUN \ + DIR=/tmp/fribidi && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/fribidi/fribidi/archive/${FRIBIDI_VERSION}.tar.gz && \ + echo ${FRIBIDI_SHA256SUM} | sha256sum --check && \ + tar -zx --strip-components=1 -f ${FRIBIDI_VERSION}.tar.gz && \ + sed -i 's/^SUBDIRS =.*/SUBDIRS=gen.tab charset lib/' Makefile.am && \ + ./bootstrap --no-config && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ + make -j 1 && \ + make install && \ + rm -rf ${DIR} +## fontconfig https://www.freedesktop.org/wiki/Software/fontconfig/ +RUN \ + DIR=/tmp/fontconfig && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://www.freedesktop.org/software/fontconfig/release/fontconfig-${FONTCONFIG_VERSION}.tar.bz2 &&\ + tar -jx --strip-components=1 -f fontconfig-${FONTCONFIG_VERSION}.tar.bz2 && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +## libass https://github.com/libass/libass +RUN \ + DIR=/tmp/libass && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/libass/libass/archive/${LIBASS_VERSION}.tar.gz &&\ + echo ${LIBASS_SHA256SUM} | sha256sum --check && \ + tar -zx --strip-components=1 -f ${LIBASS_VERSION}.tar.gz && \ + ./autogen.sh && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +## kvazaar https://github.com/ultravideo/kvazaar +RUN \ + DIR=/tmp/kvazaar && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/ultravideo/kvazaar/archive/v${KVAZAAR_VERSION}.tar.gz &&\ + tar -zx --strip-components=1 -f v${KVAZAAR_VERSION}.tar.gz && \ + ./autogen.sh && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} + +RUN \ + DIR=/tmp/aom && \ + git clone --branch ${AOM_VERSION} --depth 1 https://aomedia.googlesource.com/aom ${DIR} ; \ + cd ${DIR} ; \ + rm -rf CMakeCache.txt CMakeFiles ; \ + mkdir -p ./aom_build ; \ + cd ./aom_build ; \ + cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" -DBUILD_SHARED_LIBS=1 ..; \ + make ; \ + make install ; \ + rm -rf ${DIR} + +## ffmpeg https://ffmpeg.org/ +RUN \ + DIR=/tmp/ffmpeg && mkdir -p ${DIR} && cd ${DIR} && \ + curl -sLO https://ffmpeg.org/releases/ffmpeg-${FFMPEG_VERSION}.tar.bz2 && \ + tar -jx --strip-components=1 -f ffmpeg-${FFMPEG_VERSION}.tar.bz2 + + + +RUN \ + DIR=/tmp/ffmpeg && mkdir -p ${DIR} && cd ${DIR} && \ + ./configure \ + --disable-debug \ + --disable-doc \ + --disable-ffplay \ + --enable-vaapi \ + --enable-shared \ + --enable-avresample \ + --enable-libopencore-amrnb \ + --enable-libopencore-amrwb \ + --enable-gpl \ + --enable-libass \ + --enable-libfreetype \ + --enable-libvidstab \ + --enable-libmp3lame \ + --enable-libopenjpeg \ + --enable-libopus \ + --enable-libtheora \ + --enable-libvorbis \ + --enable-libvpx \ + --enable-libwebp \ + --enable-libx265 \ + --enable-libxvid \ + --enable-libx264 \ + --enable-nonfree \ + --enable-openssl \ + --enable-libfdk_aac \ + --enable-libkvazaar \ + --enable-libaom --extra-libs=-lpthread \ + --enable-postproc \ + --enable-small \ + --enable-version3 \ + --extra-cflags="-I${PREFIX}/include" \ + --extra-ldflags="-L${PREFIX}/lib" \ + --extra-libs=-ldl \ + --prefix="${PREFIX}" && \ + make && \ + make install && \ + make distclean && \ + hash -r && \ + cd tools && \ + make qt-faststart && \ + cp qt-faststart ${PREFIX}/bin + +## cleanup +RUN \ + ldd ${PREFIX}/bin/ffmpeg | grep opt/ffmpeg | cut -d ' ' -f 3 | xargs -i cp {} /usr/local/lib/ && \ + cp ${PREFIX}/bin/* /usr/local/bin/ && \ + cp -r ${PREFIX}/share/ffmpeg /usr/local/share/ && \ + LD_LIBRARY_PATH=/usr/local/lib ffmpeg -buildconf + +FROM base AS release +MAINTAINER Julien Rottenberg + +CMD ["--help"] +ENTRYPOINT ["ffmpeg"] +ENV LD_LIBRARY_PATH=/usr/local/lib + +COPY --from=build /usr/local /usr/local/ + +RUN \ + apt-get update -y && \ + apt-get install -y --no-install-recommends libva-drm2 libva2 i965-va-driver && \ + rm -rf /var/lib/apt/lists/* + +# Let's make sure the app built correctly +# Convenient to verify on https://hub.docker.com/r/jrottenberg/ffmpeg/builds/ console output From 56b1e4f89b08bc5b6b52709f1ca8b73ee635bfef Mon Sep 17 00:00:00 2001 From: Julien Rottenberg Date: Mon, 12 Aug 2019 11:52:49 +0200 Subject: [PATCH 16/29] aligned --- templates/Dockerfile-env | 42 ++++++++++++++++++++-------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/templates/Dockerfile-env b/templates/Dockerfile-env index 63373130c..bd76e6492 100644 --- a/templates/Dockerfile-env +++ b/templates/Dockerfile-env @@ -1,24 +1,24 @@ -FFMPEG_VERSION=%%FFMPEG_VERSION%% \ - FDKAAC_VERSION=0.1.5 \ - LAME_VERSION=3.100 \ - LIBASS_VERSION=0.13.7 \ - OGG_VERSION=1.3.2 \ - OPENCOREAMR_VERSION=0.1.5 \ - OPUS_VERSION=1.2 \ - OPENJPEG_VERSION=2.1.2 \ - THEORA_VERSION=1.1.1 \ - VORBIS_VERSION=1.3.5 \ - VPX_VERSION=1.8.0 \ - WEBP_VERSION=1.0.2 \ - X264_VERSION=20170226-2245-stable \ - X265_VERSION=3.1.1 \ - XVID_VERSION=1.3.4 \ - FREETYPE_VERSION=2.5.5 \ - FRIBIDI_VERSION=0.19.7 \ - FONTCONFIG_VERSION=2.12.4 \ - LIBVIDSTAB_VERSION=1.1.0 \ - KVAZAAR_VERSION=1.2.0 \ - AOM_VERSION=v1.0.0 \ +FFMPEG_VERSION=%%FFMPEG_VERSION%% \ + FDKAAC_VERSION=0.1.5 \ + LAME_VERSION=3.100 \ + LIBASS_VERSION=0.13.7 \ + OGG_VERSION=1.3.2 \ + OPENCOREAMR_VERSION=0.1.5 \ + OPUS_VERSION=1.2 \ + OPENJPEG_VERSION=2.1.2 \ + THEORA_VERSION=1.1.1 \ + VORBIS_VERSION=1.3.5 \ + VPX_VERSION=1.8.0 \ + WEBP_VERSION=1.0.2 \ + X264_VERSION=20170226-2245-stable \ + X265_VERSION=3.1.1 \ + XVID_VERSION=1.3.4 \ + FREETYPE_VERSION=2.5.5 \ + FRIBIDI_VERSION=0.19.7 \ + FONTCONFIG_VERSION=2.12.4 \ + LIBVIDSTAB_VERSION=1.1.0 \ + KVAZAAR_VERSION=1.2.0 \ + AOM_VERSION=v1.0.0 \ SRC=/usr/local ARG OGG_SHA256SUM="e19ee34711d7af328cb26287f4137e70630e7261b17cbe3cd41011d73a654692 libogg-1.3.2.tar.gz" From 2940025bfaf952ad9af272d357203f792c17b199 Mon Sep 17 00:00:00 2001 From: Julien Rottenberg Date: Mon, 12 Aug 2019 12:02:09 +0200 Subject: [PATCH 17/29] sorting --- templates/Dockerfile-env | 61 ++++++++++++++++++++-------------------- 1 file changed, 31 insertions(+), 30 deletions(-) diff --git a/templates/Dockerfile-env b/templates/Dockerfile-env index bd76e6492..5771e5d89 100644 --- a/templates/Dockerfile-env +++ b/templates/Dockerfile-env @@ -1,32 +1,33 @@ -FFMPEG_VERSION=%%FFMPEG_VERSION%% \ - FDKAAC_VERSION=0.1.5 \ - LAME_VERSION=3.100 \ - LIBASS_VERSION=0.13.7 \ - OGG_VERSION=1.3.2 \ - OPENCOREAMR_VERSION=0.1.5 \ - OPUS_VERSION=1.2 \ - OPENJPEG_VERSION=2.1.2 \ - THEORA_VERSION=1.1.1 \ - VORBIS_VERSION=1.3.5 \ - VPX_VERSION=1.8.0 \ - WEBP_VERSION=1.0.2 \ - X264_VERSION=20170226-2245-stable \ - X265_VERSION=3.1.1 \ - XVID_VERSION=1.3.4 \ - FREETYPE_VERSION=2.5.5 \ - FRIBIDI_VERSION=0.19.7 \ - FONTCONFIG_VERSION=2.12.4 \ - LIBVIDSTAB_VERSION=1.1.0 \ - KVAZAAR_VERSION=1.2.0 \ - AOM_VERSION=v1.0.0 \ +FFMPEG_VERSION=%%FFMPEG_VERSION%% \ + AOM_VERSION=v1.0.0 \ + FDKAAC_VERSION=0.1.5 \ + FONTCONFIG_VERSION=2.12.4 \ + FREETYPE_VERSION=2.5.5 \ + FRIBIDI_VERSION=0.19.7 \ + KVAZAAR_VERSION=1.2.0 \ + LAME_VERSION=3.100 \ + LIBASS_VERSION=0.13.7 \ + LIBVIDSTAB_VERSION=1.1.0 \ + OGG_VERSION=1.3.2 \ + OPENCOREAMR_VERSION=0.1.5 \ + OPUS_VERSION=1.2 \ + OPENJPEG_VERSION=2.1.2 \ + THEORA_VERSION=1.1.1 \ + VORBIS_VERSION=1.3.5 \ + VPX_VERSION=1.8.0 \ + WEBP_VERSION=1.0.2 \ + X264_VERSION=20170226-2245-stable \ + X265_VERSION=3.1.1 \ + XVID_VERSION=1.3.4 \ SRC=/usr/local -ARG OGG_SHA256SUM="e19ee34711d7af328cb26287f4137e70630e7261b17cbe3cd41011d73a654692 libogg-1.3.2.tar.gz" -ARG OPUS_SHA256SUM="77db45a87b51578fbc49555ef1b10926179861d854eb2613207dc79d9ec0a9a9 opus-1.2.tar.gz" -ARG VORBIS_SHA256SUM="6efbcecdd3e5dfbf090341b485da9d176eb250d893e3eb378c428a2db38301ce libvorbis-1.3.5.tar.gz" -ARG THEORA_SHA256SUM="40952956c47811928d1e7922cda3bc1f427eb75680c3c37249c91e949054916b libtheora-1.1.1.tar.gz" -ARG XVID_SHA256SUM="4e9fd62728885855bc5007fe1be58df42e5e274497591fec37249e1052ae316f xvidcore-1.3.4.tar.gz" -ARG FREETYPE_SHA256SUM="5d03dd76c2171a7601e9ce10551d52d4471cf92cd205948e60289251daddffa8 freetype-2.5.5.tar.gz" -ARG LIBVIDSTAB_SHA256SUM="14d2a053e56edad4f397be0cb3ef8eb1ec3150404ce99a426c4eb641861dc0bb v1.1.0.tar.gz" -ARG LIBASS_SHA256SUM="8fadf294bf701300d4605e6f1d92929304187fca4b8d8a47889315526adbafd7 0.13.7.tar.gz" -ARG FRIBIDI_SHA256SUM="3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 0.19.7.tar.gz" +ARG FREETYPE_SHA256SUM="5d03dd76c2171a7601e9ce10551d52d4471cf92cd205948e60289251daddffa8 freetype-2.5.5.tar.gz" +ARG FRIBIDI_SHA256SUM="3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 0.19.7.tar.gz" +ARG LIBASS_SHA256SUM="8fadf294bf701300d4605e6f1d92929304187fca4b8d8a47889315526adbafd7 0.13.7.tar.gz" +ARG LIBVIDSTAB_SHA256SUM="14d2a053e56edad4f397be0cb3ef8eb1ec3150404ce99a426c4eb641861dc0bb v1.1.0.tar.gz" +ARG OGG_SHA256SUM="e19ee34711d7af328cb26287f4137e70630e7261b17cbe3cd41011d73a654692 libogg-1.3.2.tar.gz" +ARG OPUS_SHA256SUM="77db45a87b51578fbc49555ef1b10926179861d854eb2613207dc79d9ec0a9a9 opus-1.2.tar.gz" +ARG THEORA_SHA256SUM="40952956c47811928d1e7922cda3bc1f427eb75680c3c37249c91e949054916b libtheora-1.1.1.tar.gz" +ARG VORBIS_SHA256SUM="6efbcecdd3e5dfbf090341b485da9d176eb250d893e3eb378c428a2db38301ce libvorbis-1.3.5.tar.gz" +ARG XVID_SHA256SUM="4e9fd62728885855bc5007fe1be58df42e5e274497591fec37249e1052ae316f xvidcore-1.3.4.tar.gz" + From ef0635444d378c5a96cea736ce1567c3b4db3179 Mon Sep 17 00:00:00 2001 From: Julien Rottenberg Date: Mon, 12 Aug 2019 12:02:59 +0200 Subject: [PATCH 18/29] after ./update.py --- docker-images/2.8/alpine/Dockerfile | 57 ++++++++++++----------- docker-images/2.8/centos/Dockerfile | 57 ++++++++++++----------- docker-images/2.8/nvidia/Dockerfile | 57 ++++++++++++----------- docker-images/2.8/scratch/Dockerfile | 57 ++++++++++++----------- docker-images/2.8/ubuntu/Dockerfile | 57 ++++++++++++----------- docker-images/2.8/vaapi/Dockerfile | 57 ++++++++++++----------- docker-images/3.0/alpine/Dockerfile | 57 ++++++++++++----------- docker-images/3.0/centos/Dockerfile | 57 ++++++++++++----------- docker-images/3.0/nvidia/Dockerfile | 57 ++++++++++++----------- docker-images/3.0/scratch/Dockerfile | 57 ++++++++++++----------- docker-images/3.0/ubuntu/Dockerfile | 57 ++++++++++++----------- docker-images/3.0/vaapi/Dockerfile | 57 ++++++++++++----------- docker-images/3.1/alpine/Dockerfile | 57 ++++++++++++----------- docker-images/3.1/centos/Dockerfile | 57 ++++++++++++----------- docker-images/3.1/nvidia/Dockerfile | 57 ++++++++++++----------- docker-images/3.1/scratch/Dockerfile | 57 ++++++++++++----------- docker-images/3.1/ubuntu/Dockerfile | 57 ++++++++++++----------- docker-images/3.1/vaapi/Dockerfile | 57 ++++++++++++----------- docker-images/3.2/alpine/Dockerfile | 57 ++++++++++++----------- docker-images/3.2/centos/Dockerfile | 57 ++++++++++++----------- docker-images/3.2/nvidia/Dockerfile | 57 ++++++++++++----------- docker-images/3.2/scratch/Dockerfile | 57 ++++++++++++----------- docker-images/3.2/ubuntu/Dockerfile | 57 ++++++++++++----------- docker-images/3.2/vaapi/Dockerfile | 57 ++++++++++++----------- docker-images/3.3/alpine/Dockerfile | 57 ++++++++++++----------- docker-images/3.3/centos/Dockerfile | 57 ++++++++++++----------- docker-images/3.3/nvidia/Dockerfile | 57 ++++++++++++----------- docker-images/3.3/scratch/Dockerfile | 57 ++++++++++++----------- docker-images/3.3/ubuntu/Dockerfile | 57 ++++++++++++----------- docker-images/3.3/vaapi/Dockerfile | 57 ++++++++++++----------- docker-images/3.4/alpine/Dockerfile | 57 ++++++++++++----------- docker-images/3.4/centos/Dockerfile | 57 ++++++++++++----------- docker-images/3.4/nvidia/Dockerfile | 57 ++++++++++++----------- docker-images/3.4/scratch/Dockerfile | 57 ++++++++++++----------- docker-images/3.4/ubuntu/Dockerfile | 57 ++++++++++++----------- docker-images/3.4/vaapi/Dockerfile | 57 ++++++++++++----------- docker-images/4.0/alpine/Dockerfile | 57 ++++++++++++----------- docker-images/4.0/centos/Dockerfile | 57 ++++++++++++----------- docker-images/4.0/nvidia/Dockerfile | 57 ++++++++++++----------- docker-images/4.0/scratch/Dockerfile | 57 ++++++++++++----------- docker-images/4.0/ubuntu/Dockerfile | 57 ++++++++++++----------- docker-images/4.0/vaapi/Dockerfile | 57 ++++++++++++----------- docker-images/4.1/alpine/Dockerfile | 57 ++++++++++++----------- docker-images/4.1/centos/Dockerfile | 57 ++++++++++++----------- docker-images/4.1/nvidia/Dockerfile | 57 ++++++++++++----------- docker-images/4.1/scratch/Dockerfile | 57 ++++++++++++----------- docker-images/4.1/ubuntu/Dockerfile | 57 ++++++++++++----------- docker-images/4.1/vaapi/Dockerfile | 57 ++++++++++++----------- docker-images/4.2/alpine/Dockerfile | 57 ++++++++++++----------- docker-images/4.2/centos/Dockerfile | 57 ++++++++++++----------- docker-images/4.2/nvidia/Dockerfile | 57 ++++++++++++----------- docker-images/4.2/scratch/Dockerfile | 57 ++++++++++++----------- docker-images/4.2/ubuntu/Dockerfile | 57 ++++++++++++----------- docker-images/4.2/vaapi/Dockerfile | 57 ++++++++++++----------- docker-images/snapshot/alpine/Dockerfile | 57 ++++++++++++----------- docker-images/snapshot/centos/Dockerfile | 57 ++++++++++++----------- docker-images/snapshot/nvidia/Dockerfile | 57 ++++++++++++----------- docker-images/snapshot/scratch/Dockerfile | 57 ++++++++++++----------- docker-images/snapshot/ubuntu/Dockerfile | 57 ++++++++++++----------- docker-images/snapshot/vaapi/Dockerfile | 57 ++++++++++++----------- 60 files changed, 1740 insertions(+), 1680 deletions(-) diff --git a/docker-images/2.8/alpine/Dockerfile b/docker-images/2.8/alpine/Dockerfile index 5938416c4..a853ec883 100644 --- a/docker-images/2.8/alpine/Dockerfile +++ b/docker-images/2.8/alpine/Dockerfile @@ -18,38 +18,39 @@ ARG LD_LIBRARY_PATH=/opt/ffmpeg/lib ARG PREFIX=/opt/ffmpeg ARG MAKEFLAGS="-j2" -ENV FFMPEG_VERSION=2.8.15 \ - FDKAAC_VERSION=0.1.5 \ - LAME_VERSION=3.100 \ - LIBASS_VERSION=0.13.7 \ - OGG_VERSION=1.3.2 \ +ENV FFMPEG_VERSION=2.8.15 \ + AOM_VERSION=v1.0.0 \ + FDKAAC_VERSION=0.1.5 \ + FONTCONFIG_VERSION=2.12.4 \ + FREETYPE_VERSION=2.5.5 \ + FRIBIDI_VERSION=0.19.7 \ + KVAZAAR_VERSION=1.2.0 \ + LAME_VERSION=3.100 \ + LIBASS_VERSION=0.13.7 \ + LIBVIDSTAB_VERSION=1.1.0 \ + OGG_VERSION=1.3.2 \ OPENCOREAMR_VERSION=0.1.5 \ - OPUS_VERSION=1.2 \ - OPENJPEG_VERSION=2.1.2 \ - THEORA_VERSION=1.1.1 \ - VORBIS_VERSION=1.3.5 \ - VPX_VERSION=1.8.0 \ - WEBP_VERSION=1.0.2 \ + OPUS_VERSION=1.2 \ + OPENJPEG_VERSION=2.1.2 \ + THEORA_VERSION=1.1.1 \ + VORBIS_VERSION=1.3.5 \ + VPX_VERSION=1.8.0 \ + WEBP_VERSION=1.0.2 \ X264_VERSION=20170226-2245-stable \ - X265_VERSION=3.1.1 \ - XVID_VERSION=1.3.4 \ - FREETYPE_VERSION=2.5.5 \ - FRIBIDI_VERSION=0.19.7 \ - FONTCONFIG_VERSION=2.12.4 \ - LIBVIDSTAB_VERSION=1.1.0 \ - KVAZAAR_VERSION=1.2.0 \ - AOM_VERSION=v1.0.0 \ + X265_VERSION=3.1.1 \ + XVID_VERSION=1.3.4 \ SRC=/usr/local -ARG OGG_SHA256SUM="e19ee34711d7af328cb26287f4137e70630e7261b17cbe3cd41011d73a654692 libogg-1.3.2.tar.gz" -ARG OPUS_SHA256SUM="77db45a87b51578fbc49555ef1b10926179861d854eb2613207dc79d9ec0a9a9 opus-1.2.tar.gz" -ARG VORBIS_SHA256SUM="6efbcecdd3e5dfbf090341b485da9d176eb250d893e3eb378c428a2db38301ce libvorbis-1.3.5.tar.gz" -ARG THEORA_SHA256SUM="40952956c47811928d1e7922cda3bc1f427eb75680c3c37249c91e949054916b libtheora-1.1.1.tar.gz" -ARG XVID_SHA256SUM="4e9fd62728885855bc5007fe1be58df42e5e274497591fec37249e1052ae316f xvidcore-1.3.4.tar.gz" -ARG FREETYPE_SHA256SUM="5d03dd76c2171a7601e9ce10551d52d4471cf92cd205948e60289251daddffa8 freetype-2.5.5.tar.gz" -ARG LIBVIDSTAB_SHA256SUM="14d2a053e56edad4f397be0cb3ef8eb1ec3150404ce99a426c4eb641861dc0bb v1.1.0.tar.gz" -ARG LIBASS_SHA256SUM="8fadf294bf701300d4605e6f1d92929304187fca4b8d8a47889315526adbafd7 0.13.7.tar.gz" -ARG FRIBIDI_SHA256SUM="3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 0.19.7.tar.gz" +ARG FREETYPE_SHA256SUM="5d03dd76c2171a7601e9ce10551d52d4471cf92cd205948e60289251daddffa8 freetype-2.5.5.tar.gz" +ARG FRIBIDI_SHA256SUM="3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 0.19.7.tar.gz" +ARG LIBASS_SHA256SUM="8fadf294bf701300d4605e6f1d92929304187fca4b8d8a47889315526adbafd7 0.13.7.tar.gz" +ARG LIBVIDSTAB_SHA256SUM="14d2a053e56edad4f397be0cb3ef8eb1ec3150404ce99a426c4eb641861dc0bb v1.1.0.tar.gz" +ARG OGG_SHA256SUM="e19ee34711d7af328cb26287f4137e70630e7261b17cbe3cd41011d73a654692 libogg-1.3.2.tar.gz" +ARG OPUS_SHA256SUM="77db45a87b51578fbc49555ef1b10926179861d854eb2613207dc79d9ec0a9a9 opus-1.2.tar.gz" +ARG THEORA_SHA256SUM="40952956c47811928d1e7922cda3bc1f427eb75680c3c37249c91e949054916b libtheora-1.1.1.tar.gz" +ARG VORBIS_SHA256SUM="6efbcecdd3e5dfbf090341b485da9d176eb250d893e3eb378c428a2db38301ce libvorbis-1.3.5.tar.gz" +ARG XVID_SHA256SUM="4e9fd62728885855bc5007fe1be58df42e5e274497591fec37249e1052ae316f xvidcore-1.3.4.tar.gz" + RUN buildDeps="autoconf \ diff --git a/docker-images/2.8/centos/Dockerfile b/docker-images/2.8/centos/Dockerfile index bd479a030..2fa1ddc6b 100644 --- a/docker-images/2.8/centos/Dockerfile +++ b/docker-images/2.8/centos/Dockerfile @@ -20,38 +20,39 @@ ARG LD_LIBRARY_PATH=/opt/ffmpeg/lib ARG PREFIX=/opt/ffmpeg ARG MAKEFLAGS="-j2" -ENV FFMPEG_VERSION=2.8.15 \ - FDKAAC_VERSION=0.1.5 \ - LAME_VERSION=3.100 \ - LIBASS_VERSION=0.13.7 \ - OGG_VERSION=1.3.2 \ +ENV FFMPEG_VERSION=2.8.15 \ + AOM_VERSION=v1.0.0 \ + FDKAAC_VERSION=0.1.5 \ + FONTCONFIG_VERSION=2.12.4 \ + FREETYPE_VERSION=2.5.5 \ + FRIBIDI_VERSION=0.19.7 \ + KVAZAAR_VERSION=1.2.0 \ + LAME_VERSION=3.100 \ + LIBASS_VERSION=0.13.7 \ + LIBVIDSTAB_VERSION=1.1.0 \ + OGG_VERSION=1.3.2 \ OPENCOREAMR_VERSION=0.1.5 \ - OPUS_VERSION=1.2 \ - OPENJPEG_VERSION=2.1.2 \ - THEORA_VERSION=1.1.1 \ - VORBIS_VERSION=1.3.5 \ - VPX_VERSION=1.8.0 \ - WEBP_VERSION=1.0.2 \ + OPUS_VERSION=1.2 \ + OPENJPEG_VERSION=2.1.2 \ + THEORA_VERSION=1.1.1 \ + VORBIS_VERSION=1.3.5 \ + VPX_VERSION=1.8.0 \ + WEBP_VERSION=1.0.2 \ X264_VERSION=20170226-2245-stable \ - X265_VERSION=3.1.1 \ - XVID_VERSION=1.3.4 \ - FREETYPE_VERSION=2.5.5 \ - FRIBIDI_VERSION=0.19.7 \ - FONTCONFIG_VERSION=2.12.4 \ - LIBVIDSTAB_VERSION=1.1.0 \ - KVAZAAR_VERSION=1.2.0 \ - AOM_VERSION=v1.0.0 \ + X265_VERSION=3.1.1 \ + XVID_VERSION=1.3.4 \ SRC=/usr/local -ARG OGG_SHA256SUM="e19ee34711d7af328cb26287f4137e70630e7261b17cbe3cd41011d73a654692 libogg-1.3.2.tar.gz" -ARG OPUS_SHA256SUM="77db45a87b51578fbc49555ef1b10926179861d854eb2613207dc79d9ec0a9a9 opus-1.2.tar.gz" -ARG VORBIS_SHA256SUM="6efbcecdd3e5dfbf090341b485da9d176eb250d893e3eb378c428a2db38301ce libvorbis-1.3.5.tar.gz" -ARG THEORA_SHA256SUM="40952956c47811928d1e7922cda3bc1f427eb75680c3c37249c91e949054916b libtheora-1.1.1.tar.gz" -ARG XVID_SHA256SUM="4e9fd62728885855bc5007fe1be58df42e5e274497591fec37249e1052ae316f xvidcore-1.3.4.tar.gz" -ARG FREETYPE_SHA256SUM="5d03dd76c2171a7601e9ce10551d52d4471cf92cd205948e60289251daddffa8 freetype-2.5.5.tar.gz" -ARG LIBVIDSTAB_SHA256SUM="14d2a053e56edad4f397be0cb3ef8eb1ec3150404ce99a426c4eb641861dc0bb v1.1.0.tar.gz" -ARG LIBASS_SHA256SUM="8fadf294bf701300d4605e6f1d92929304187fca4b8d8a47889315526adbafd7 0.13.7.tar.gz" -ARG FRIBIDI_SHA256SUM="3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 0.19.7.tar.gz" +ARG FREETYPE_SHA256SUM="5d03dd76c2171a7601e9ce10551d52d4471cf92cd205948e60289251daddffa8 freetype-2.5.5.tar.gz" +ARG FRIBIDI_SHA256SUM="3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 0.19.7.tar.gz" +ARG LIBASS_SHA256SUM="8fadf294bf701300d4605e6f1d92929304187fca4b8d8a47889315526adbafd7 0.13.7.tar.gz" +ARG LIBVIDSTAB_SHA256SUM="14d2a053e56edad4f397be0cb3ef8eb1ec3150404ce99a426c4eb641861dc0bb v1.1.0.tar.gz" +ARG OGG_SHA256SUM="e19ee34711d7af328cb26287f4137e70630e7261b17cbe3cd41011d73a654692 libogg-1.3.2.tar.gz" +ARG OPUS_SHA256SUM="77db45a87b51578fbc49555ef1b10926179861d854eb2613207dc79d9ec0a9a9 opus-1.2.tar.gz" +ARG THEORA_SHA256SUM="40952956c47811928d1e7922cda3bc1f427eb75680c3c37249c91e949054916b libtheora-1.1.1.tar.gz" +ARG VORBIS_SHA256SUM="6efbcecdd3e5dfbf090341b485da9d176eb250d893e3eb378c428a2db38301ce libvorbis-1.3.5.tar.gz" +ARG XVID_SHA256SUM="4e9fd62728885855bc5007fe1be58df42e5e274497591fec37249e1052ae316f xvidcore-1.3.4.tar.gz" + RUN buildDeps="autoconf \ diff --git a/docker-images/2.8/nvidia/Dockerfile b/docker-images/2.8/nvidia/Dockerfile index a2686960e..193938068 100644 --- a/docker-images/2.8/nvidia/Dockerfile +++ b/docker-images/2.8/nvidia/Dockerfile @@ -35,38 +35,39 @@ ENV LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/opt/ffmpeg/lib" ARG PREFIX=/opt/ffmpeg ARG MAKEFLAGS="-j12" -ENV FFMPEG_VERSION=2.8.15 \ - FDKAAC_VERSION=0.1.5 \ - LAME_VERSION=3.100 \ - LIBASS_VERSION=0.13.7 \ - OGG_VERSION=1.3.2 \ +ENV FFMPEG_VERSION=2.8.15 \ + AOM_VERSION=v1.0.0 \ + FDKAAC_VERSION=0.1.5 \ + FONTCONFIG_VERSION=2.12.4 \ + FREETYPE_VERSION=2.5.5 \ + FRIBIDI_VERSION=0.19.7 \ + KVAZAAR_VERSION=1.2.0 \ + LAME_VERSION=3.100 \ + LIBASS_VERSION=0.13.7 \ + LIBVIDSTAB_VERSION=1.1.0 \ + OGG_VERSION=1.3.2 \ OPENCOREAMR_VERSION=0.1.5 \ - OPUS_VERSION=1.2 \ - OPENJPEG_VERSION=2.1.2 \ - THEORA_VERSION=1.1.1 \ - VORBIS_VERSION=1.3.5 \ - VPX_VERSION=1.8.0 \ - WEBP_VERSION=1.0.2 \ + OPUS_VERSION=1.2 \ + OPENJPEG_VERSION=2.1.2 \ + THEORA_VERSION=1.1.1 \ + VORBIS_VERSION=1.3.5 \ + VPX_VERSION=1.8.0 \ + WEBP_VERSION=1.0.2 \ X264_VERSION=20170226-2245-stable \ - X265_VERSION=3.1.1 \ - XVID_VERSION=1.3.4 \ - FREETYPE_VERSION=2.5.5 \ - FRIBIDI_VERSION=0.19.7 \ - FONTCONFIG_VERSION=2.12.4 \ - LIBVIDSTAB_VERSION=1.1.0 \ - KVAZAAR_VERSION=1.2.0 \ - AOM_VERSION=v1.0.0 \ + X265_VERSION=3.1.1 \ + XVID_VERSION=1.3.4 \ SRC=/usr/local -ARG OGG_SHA256SUM="e19ee34711d7af328cb26287f4137e70630e7261b17cbe3cd41011d73a654692 libogg-1.3.2.tar.gz" -ARG OPUS_SHA256SUM="77db45a87b51578fbc49555ef1b10926179861d854eb2613207dc79d9ec0a9a9 opus-1.2.tar.gz" -ARG VORBIS_SHA256SUM="6efbcecdd3e5dfbf090341b485da9d176eb250d893e3eb378c428a2db38301ce libvorbis-1.3.5.tar.gz" -ARG THEORA_SHA256SUM="40952956c47811928d1e7922cda3bc1f427eb75680c3c37249c91e949054916b libtheora-1.1.1.tar.gz" -ARG XVID_SHA256SUM="4e9fd62728885855bc5007fe1be58df42e5e274497591fec37249e1052ae316f xvidcore-1.3.4.tar.gz" -ARG FREETYPE_SHA256SUM="5d03dd76c2171a7601e9ce10551d52d4471cf92cd205948e60289251daddffa8 freetype-2.5.5.tar.gz" -ARG LIBVIDSTAB_SHA256SUM="14d2a053e56edad4f397be0cb3ef8eb1ec3150404ce99a426c4eb641861dc0bb v1.1.0.tar.gz" -ARG LIBASS_SHA256SUM="8fadf294bf701300d4605e6f1d92929304187fca4b8d8a47889315526adbafd7 0.13.7.tar.gz" -ARG FRIBIDI_SHA256SUM="3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 0.19.7.tar.gz" +ARG FREETYPE_SHA256SUM="5d03dd76c2171a7601e9ce10551d52d4471cf92cd205948e60289251daddffa8 freetype-2.5.5.tar.gz" +ARG FRIBIDI_SHA256SUM="3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 0.19.7.tar.gz" +ARG LIBASS_SHA256SUM="8fadf294bf701300d4605e6f1d92929304187fca4b8d8a47889315526adbafd7 0.13.7.tar.gz" +ARG LIBVIDSTAB_SHA256SUM="14d2a053e56edad4f397be0cb3ef8eb1ec3150404ce99a426c4eb641861dc0bb v1.1.0.tar.gz" +ARG OGG_SHA256SUM="e19ee34711d7af328cb26287f4137e70630e7261b17cbe3cd41011d73a654692 libogg-1.3.2.tar.gz" +ARG OPUS_SHA256SUM="77db45a87b51578fbc49555ef1b10926179861d854eb2613207dc79d9ec0a9a9 opus-1.2.tar.gz" +ARG THEORA_SHA256SUM="40952956c47811928d1e7922cda3bc1f427eb75680c3c37249c91e949054916b libtheora-1.1.1.tar.gz" +ARG VORBIS_SHA256SUM="6efbcecdd3e5dfbf090341b485da9d176eb250d893e3eb378c428a2db38301ce libvorbis-1.3.5.tar.gz" +ARG XVID_SHA256SUM="4e9fd62728885855bc5007fe1be58df42e5e274497591fec37249e1052ae316f xvidcore-1.3.4.tar.gz" + RUN buildDeps="autoconf \ diff --git a/docker-images/2.8/scratch/Dockerfile b/docker-images/2.8/scratch/Dockerfile index 10db081c8..fa3810c19 100644 --- a/docker-images/2.8/scratch/Dockerfile +++ b/docker-images/2.8/scratch/Dockerfile @@ -13,38 +13,39 @@ ARG LD_LIBRARY_PATH=/opt/ffmpeg/lib ARG PREFIX=/opt/ffmpeg ARG MAKEFLAGS="-j2" -ENV FFMPEG_VERSION=2.8.15 \ - FDKAAC_VERSION=0.1.5 \ - LAME_VERSION=3.100 \ - LIBASS_VERSION=0.13.7 \ - OGG_VERSION=1.3.2 \ +ENV FFMPEG_VERSION=2.8.15 \ + AOM_VERSION=v1.0.0 \ + FDKAAC_VERSION=0.1.5 \ + FONTCONFIG_VERSION=2.12.4 \ + FREETYPE_VERSION=2.5.5 \ + FRIBIDI_VERSION=0.19.7 \ + KVAZAAR_VERSION=1.2.0 \ + LAME_VERSION=3.100 \ + LIBASS_VERSION=0.13.7 \ + LIBVIDSTAB_VERSION=1.1.0 \ + OGG_VERSION=1.3.2 \ OPENCOREAMR_VERSION=0.1.5 \ - OPUS_VERSION=1.2 \ - OPENJPEG_VERSION=2.1.2 \ - THEORA_VERSION=1.1.1 \ - VORBIS_VERSION=1.3.5 \ - VPX_VERSION=1.8.0 \ - WEBP_VERSION=1.0.2 \ + OPUS_VERSION=1.2 \ + OPENJPEG_VERSION=2.1.2 \ + THEORA_VERSION=1.1.1 \ + VORBIS_VERSION=1.3.5 \ + VPX_VERSION=1.8.0 \ + WEBP_VERSION=1.0.2 \ X264_VERSION=20170226-2245-stable \ - X265_VERSION=3.1.1 \ - XVID_VERSION=1.3.4 \ - FREETYPE_VERSION=2.5.5 \ - FRIBIDI_VERSION=0.19.7 \ - FONTCONFIG_VERSION=2.12.4 \ - LIBVIDSTAB_VERSION=1.1.0 \ - KVAZAAR_VERSION=1.2.0 \ - AOM_VERSION=v1.0.0 \ + X265_VERSION=3.1.1 \ + XVID_VERSION=1.3.4 \ SRC=/usr/local -ARG OGG_SHA256SUM="e19ee34711d7af328cb26287f4137e70630e7261b17cbe3cd41011d73a654692 libogg-1.3.2.tar.gz" -ARG OPUS_SHA256SUM="77db45a87b51578fbc49555ef1b10926179861d854eb2613207dc79d9ec0a9a9 opus-1.2.tar.gz" -ARG VORBIS_SHA256SUM="6efbcecdd3e5dfbf090341b485da9d176eb250d893e3eb378c428a2db38301ce libvorbis-1.3.5.tar.gz" -ARG THEORA_SHA256SUM="40952956c47811928d1e7922cda3bc1f427eb75680c3c37249c91e949054916b libtheora-1.1.1.tar.gz" -ARG XVID_SHA256SUM="4e9fd62728885855bc5007fe1be58df42e5e274497591fec37249e1052ae316f xvidcore-1.3.4.tar.gz" -ARG FREETYPE_SHA256SUM="5d03dd76c2171a7601e9ce10551d52d4471cf92cd205948e60289251daddffa8 freetype-2.5.5.tar.gz" -ARG LIBVIDSTAB_SHA256SUM="14d2a053e56edad4f397be0cb3ef8eb1ec3150404ce99a426c4eb641861dc0bb v1.1.0.tar.gz" -ARG LIBASS_SHA256SUM="8fadf294bf701300d4605e6f1d92929304187fca4b8d8a47889315526adbafd7 0.13.7.tar.gz" -ARG FRIBIDI_SHA256SUM="3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 0.19.7.tar.gz" +ARG FREETYPE_SHA256SUM="5d03dd76c2171a7601e9ce10551d52d4471cf92cd205948e60289251daddffa8 freetype-2.5.5.tar.gz" +ARG FRIBIDI_SHA256SUM="3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 0.19.7.tar.gz" +ARG LIBASS_SHA256SUM="8fadf294bf701300d4605e6f1d92929304187fca4b8d8a47889315526adbafd7 0.13.7.tar.gz" +ARG LIBVIDSTAB_SHA256SUM="14d2a053e56edad4f397be0cb3ef8eb1ec3150404ce99a426c4eb641861dc0bb v1.1.0.tar.gz" +ARG OGG_SHA256SUM="e19ee34711d7af328cb26287f4137e70630e7261b17cbe3cd41011d73a654692 libogg-1.3.2.tar.gz" +ARG OPUS_SHA256SUM="77db45a87b51578fbc49555ef1b10926179861d854eb2613207dc79d9ec0a9a9 opus-1.2.tar.gz" +ARG THEORA_SHA256SUM="40952956c47811928d1e7922cda3bc1f427eb75680c3c37249c91e949054916b libtheora-1.1.1.tar.gz" +ARG VORBIS_SHA256SUM="6efbcecdd3e5dfbf090341b485da9d176eb250d893e3eb378c428a2db38301ce libvorbis-1.3.5.tar.gz" +ARG XVID_SHA256SUM="4e9fd62728885855bc5007fe1be58df42e5e274497591fec37249e1052ae316f xvidcore-1.3.4.tar.gz" + RUN buildDeps="autoconf \ diff --git a/docker-images/2.8/ubuntu/Dockerfile b/docker-images/2.8/ubuntu/Dockerfile index 6c02b4770..523aef41c 100644 --- a/docker-images/2.8/ubuntu/Dockerfile +++ b/docker-images/2.8/ubuntu/Dockerfile @@ -21,38 +21,39 @@ ARG LD_LIBRARY_PATH=/opt/ffmpeg/lib ARG PREFIX=/opt/ffmpeg ARG MAKEFLAGS="-j2" -ENV FFMPEG_VERSION=2.8.15 \ - FDKAAC_VERSION=0.1.5 \ - LAME_VERSION=3.100 \ - LIBASS_VERSION=0.13.7 \ - OGG_VERSION=1.3.2 \ +ENV FFMPEG_VERSION=2.8.15 \ + AOM_VERSION=v1.0.0 \ + FDKAAC_VERSION=0.1.5 \ + FONTCONFIG_VERSION=2.12.4 \ + FREETYPE_VERSION=2.5.5 \ + FRIBIDI_VERSION=0.19.7 \ + KVAZAAR_VERSION=1.2.0 \ + LAME_VERSION=3.100 \ + LIBASS_VERSION=0.13.7 \ + LIBVIDSTAB_VERSION=1.1.0 \ + OGG_VERSION=1.3.2 \ OPENCOREAMR_VERSION=0.1.5 \ - OPUS_VERSION=1.2 \ - OPENJPEG_VERSION=2.1.2 \ - THEORA_VERSION=1.1.1 \ - VORBIS_VERSION=1.3.5 \ - VPX_VERSION=1.8.0 \ - WEBP_VERSION=1.0.2 \ + OPUS_VERSION=1.2 \ + OPENJPEG_VERSION=2.1.2 \ + THEORA_VERSION=1.1.1 \ + VORBIS_VERSION=1.3.5 \ + VPX_VERSION=1.8.0 \ + WEBP_VERSION=1.0.2 \ X264_VERSION=20170226-2245-stable \ - X265_VERSION=3.1.1 \ - XVID_VERSION=1.3.4 \ - FREETYPE_VERSION=2.5.5 \ - FRIBIDI_VERSION=0.19.7 \ - FONTCONFIG_VERSION=2.12.4 \ - LIBVIDSTAB_VERSION=1.1.0 \ - KVAZAAR_VERSION=1.2.0 \ - AOM_VERSION=v1.0.0 \ + X265_VERSION=3.1.1 \ + XVID_VERSION=1.3.4 \ SRC=/usr/local -ARG OGG_SHA256SUM="e19ee34711d7af328cb26287f4137e70630e7261b17cbe3cd41011d73a654692 libogg-1.3.2.tar.gz" -ARG OPUS_SHA256SUM="77db45a87b51578fbc49555ef1b10926179861d854eb2613207dc79d9ec0a9a9 opus-1.2.tar.gz" -ARG VORBIS_SHA256SUM="6efbcecdd3e5dfbf090341b485da9d176eb250d893e3eb378c428a2db38301ce libvorbis-1.3.5.tar.gz" -ARG THEORA_SHA256SUM="40952956c47811928d1e7922cda3bc1f427eb75680c3c37249c91e949054916b libtheora-1.1.1.tar.gz" -ARG XVID_SHA256SUM="4e9fd62728885855bc5007fe1be58df42e5e274497591fec37249e1052ae316f xvidcore-1.3.4.tar.gz" -ARG FREETYPE_SHA256SUM="5d03dd76c2171a7601e9ce10551d52d4471cf92cd205948e60289251daddffa8 freetype-2.5.5.tar.gz" -ARG LIBVIDSTAB_SHA256SUM="14d2a053e56edad4f397be0cb3ef8eb1ec3150404ce99a426c4eb641861dc0bb v1.1.0.tar.gz" -ARG LIBASS_SHA256SUM="8fadf294bf701300d4605e6f1d92929304187fca4b8d8a47889315526adbafd7 0.13.7.tar.gz" -ARG FRIBIDI_SHA256SUM="3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 0.19.7.tar.gz" +ARG FREETYPE_SHA256SUM="5d03dd76c2171a7601e9ce10551d52d4471cf92cd205948e60289251daddffa8 freetype-2.5.5.tar.gz" +ARG FRIBIDI_SHA256SUM="3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 0.19.7.tar.gz" +ARG LIBASS_SHA256SUM="8fadf294bf701300d4605e6f1d92929304187fca4b8d8a47889315526adbafd7 0.13.7.tar.gz" +ARG LIBVIDSTAB_SHA256SUM="14d2a053e56edad4f397be0cb3ef8eb1ec3150404ce99a426c4eb641861dc0bb v1.1.0.tar.gz" +ARG OGG_SHA256SUM="e19ee34711d7af328cb26287f4137e70630e7261b17cbe3cd41011d73a654692 libogg-1.3.2.tar.gz" +ARG OPUS_SHA256SUM="77db45a87b51578fbc49555ef1b10926179861d854eb2613207dc79d9ec0a9a9 opus-1.2.tar.gz" +ARG THEORA_SHA256SUM="40952956c47811928d1e7922cda3bc1f427eb75680c3c37249c91e949054916b libtheora-1.1.1.tar.gz" +ARG VORBIS_SHA256SUM="6efbcecdd3e5dfbf090341b485da9d176eb250d893e3eb378c428a2db38301ce libvorbis-1.3.5.tar.gz" +ARG XVID_SHA256SUM="4e9fd62728885855bc5007fe1be58df42e5e274497591fec37249e1052ae316f xvidcore-1.3.4.tar.gz" + RUN buildDeps="autoconf \ diff --git a/docker-images/2.8/vaapi/Dockerfile b/docker-images/2.8/vaapi/Dockerfile index 1effaf254..dd9af0842 100644 --- a/docker-images/2.8/vaapi/Dockerfile +++ b/docker-images/2.8/vaapi/Dockerfile @@ -21,38 +21,39 @@ ARG LD_LIBRARY_PATH=/opt/ffmpeg/lib ARG PREFIX=/opt/ffmpeg ARG MAKEFLAGS="-j2" -ENV FFMPEG_VERSION=2.8.15 \ - FDKAAC_VERSION=0.1.5 \ - LAME_VERSION=3.100 \ - LIBASS_VERSION=0.13.7 \ - OGG_VERSION=1.3.2 \ +ENV FFMPEG_VERSION=2.8.15 \ + AOM_VERSION=v1.0.0 \ + FDKAAC_VERSION=0.1.5 \ + FONTCONFIG_VERSION=2.12.4 \ + FREETYPE_VERSION=2.5.5 \ + FRIBIDI_VERSION=0.19.7 \ + KVAZAAR_VERSION=1.2.0 \ + LAME_VERSION=3.100 \ + LIBASS_VERSION=0.13.7 \ + LIBVIDSTAB_VERSION=1.1.0 \ + OGG_VERSION=1.3.2 \ OPENCOREAMR_VERSION=0.1.5 \ - OPUS_VERSION=1.2 \ - OPENJPEG_VERSION=2.1.2 \ - THEORA_VERSION=1.1.1 \ - VORBIS_VERSION=1.3.5 \ - VPX_VERSION=1.8.0 \ - WEBP_VERSION=1.0.2 \ + OPUS_VERSION=1.2 \ + OPENJPEG_VERSION=2.1.2 \ + THEORA_VERSION=1.1.1 \ + VORBIS_VERSION=1.3.5 \ + VPX_VERSION=1.8.0 \ + WEBP_VERSION=1.0.2 \ X264_VERSION=20170226-2245-stable \ - X265_VERSION=3.1.1 \ - XVID_VERSION=1.3.4 \ - FREETYPE_VERSION=2.5.5 \ - FRIBIDI_VERSION=0.19.7 \ - FONTCONFIG_VERSION=2.12.4 \ - LIBVIDSTAB_VERSION=1.1.0 \ - KVAZAAR_VERSION=1.2.0 \ - AOM_VERSION=v1.0.0 \ + X265_VERSION=3.1.1 \ + XVID_VERSION=1.3.4 \ SRC=/usr/local -ARG OGG_SHA256SUM="e19ee34711d7af328cb26287f4137e70630e7261b17cbe3cd41011d73a654692 libogg-1.3.2.tar.gz" -ARG OPUS_SHA256SUM="77db45a87b51578fbc49555ef1b10926179861d854eb2613207dc79d9ec0a9a9 opus-1.2.tar.gz" -ARG VORBIS_SHA256SUM="6efbcecdd3e5dfbf090341b485da9d176eb250d893e3eb378c428a2db38301ce libvorbis-1.3.5.tar.gz" -ARG THEORA_SHA256SUM="40952956c47811928d1e7922cda3bc1f427eb75680c3c37249c91e949054916b libtheora-1.1.1.tar.gz" -ARG XVID_SHA256SUM="4e9fd62728885855bc5007fe1be58df42e5e274497591fec37249e1052ae316f xvidcore-1.3.4.tar.gz" -ARG FREETYPE_SHA256SUM="5d03dd76c2171a7601e9ce10551d52d4471cf92cd205948e60289251daddffa8 freetype-2.5.5.tar.gz" -ARG LIBVIDSTAB_SHA256SUM="14d2a053e56edad4f397be0cb3ef8eb1ec3150404ce99a426c4eb641861dc0bb v1.1.0.tar.gz" -ARG LIBASS_SHA256SUM="8fadf294bf701300d4605e6f1d92929304187fca4b8d8a47889315526adbafd7 0.13.7.tar.gz" -ARG FRIBIDI_SHA256SUM="3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 0.19.7.tar.gz" +ARG FREETYPE_SHA256SUM="5d03dd76c2171a7601e9ce10551d52d4471cf92cd205948e60289251daddffa8 freetype-2.5.5.tar.gz" +ARG FRIBIDI_SHA256SUM="3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 0.19.7.tar.gz" +ARG LIBASS_SHA256SUM="8fadf294bf701300d4605e6f1d92929304187fca4b8d8a47889315526adbafd7 0.13.7.tar.gz" +ARG LIBVIDSTAB_SHA256SUM="14d2a053e56edad4f397be0cb3ef8eb1ec3150404ce99a426c4eb641861dc0bb v1.1.0.tar.gz" +ARG OGG_SHA256SUM="e19ee34711d7af328cb26287f4137e70630e7261b17cbe3cd41011d73a654692 libogg-1.3.2.tar.gz" +ARG OPUS_SHA256SUM="77db45a87b51578fbc49555ef1b10926179861d854eb2613207dc79d9ec0a9a9 opus-1.2.tar.gz" +ARG THEORA_SHA256SUM="40952956c47811928d1e7922cda3bc1f427eb75680c3c37249c91e949054916b libtheora-1.1.1.tar.gz" +ARG VORBIS_SHA256SUM="6efbcecdd3e5dfbf090341b485da9d176eb250d893e3eb378c428a2db38301ce libvorbis-1.3.5.tar.gz" +ARG XVID_SHA256SUM="4e9fd62728885855bc5007fe1be58df42e5e274497591fec37249e1052ae316f xvidcore-1.3.4.tar.gz" + RUN buildDeps="autoconf \ diff --git a/docker-images/3.0/alpine/Dockerfile b/docker-images/3.0/alpine/Dockerfile index 0fe9b9049..30087e378 100644 --- a/docker-images/3.0/alpine/Dockerfile +++ b/docker-images/3.0/alpine/Dockerfile @@ -18,38 +18,39 @@ ARG LD_LIBRARY_PATH=/opt/ffmpeg/lib ARG PREFIX=/opt/ffmpeg ARG MAKEFLAGS="-j2" -ENV FFMPEG_VERSION=3.0.12 \ - FDKAAC_VERSION=0.1.5 \ - LAME_VERSION=3.100 \ - LIBASS_VERSION=0.13.7 \ - OGG_VERSION=1.3.2 \ +ENV FFMPEG_VERSION=3.0.12 \ + AOM_VERSION=v1.0.0 \ + FDKAAC_VERSION=0.1.5 \ + FONTCONFIG_VERSION=2.12.4 \ + FREETYPE_VERSION=2.5.5 \ + FRIBIDI_VERSION=0.19.7 \ + KVAZAAR_VERSION=1.2.0 \ + LAME_VERSION=3.100 \ + LIBASS_VERSION=0.13.7 \ + LIBVIDSTAB_VERSION=1.1.0 \ + OGG_VERSION=1.3.2 \ OPENCOREAMR_VERSION=0.1.5 \ - OPUS_VERSION=1.2 \ - OPENJPEG_VERSION=2.1.2 \ - THEORA_VERSION=1.1.1 \ - VORBIS_VERSION=1.3.5 \ - VPX_VERSION=1.8.0 \ - WEBP_VERSION=1.0.2 \ + OPUS_VERSION=1.2 \ + OPENJPEG_VERSION=2.1.2 \ + THEORA_VERSION=1.1.1 \ + VORBIS_VERSION=1.3.5 \ + VPX_VERSION=1.8.0 \ + WEBP_VERSION=1.0.2 \ X264_VERSION=20170226-2245-stable \ - X265_VERSION=3.1.1 \ - XVID_VERSION=1.3.4 \ - FREETYPE_VERSION=2.5.5 \ - FRIBIDI_VERSION=0.19.7 \ - FONTCONFIG_VERSION=2.12.4 \ - LIBVIDSTAB_VERSION=1.1.0 \ - KVAZAAR_VERSION=1.2.0 \ - AOM_VERSION=v1.0.0 \ + X265_VERSION=3.1.1 \ + XVID_VERSION=1.3.4 \ SRC=/usr/local -ARG OGG_SHA256SUM="e19ee34711d7af328cb26287f4137e70630e7261b17cbe3cd41011d73a654692 libogg-1.3.2.tar.gz" -ARG OPUS_SHA256SUM="77db45a87b51578fbc49555ef1b10926179861d854eb2613207dc79d9ec0a9a9 opus-1.2.tar.gz" -ARG VORBIS_SHA256SUM="6efbcecdd3e5dfbf090341b485da9d176eb250d893e3eb378c428a2db38301ce libvorbis-1.3.5.tar.gz" -ARG THEORA_SHA256SUM="40952956c47811928d1e7922cda3bc1f427eb75680c3c37249c91e949054916b libtheora-1.1.1.tar.gz" -ARG XVID_SHA256SUM="4e9fd62728885855bc5007fe1be58df42e5e274497591fec37249e1052ae316f xvidcore-1.3.4.tar.gz" -ARG FREETYPE_SHA256SUM="5d03dd76c2171a7601e9ce10551d52d4471cf92cd205948e60289251daddffa8 freetype-2.5.5.tar.gz" -ARG LIBVIDSTAB_SHA256SUM="14d2a053e56edad4f397be0cb3ef8eb1ec3150404ce99a426c4eb641861dc0bb v1.1.0.tar.gz" -ARG LIBASS_SHA256SUM="8fadf294bf701300d4605e6f1d92929304187fca4b8d8a47889315526adbafd7 0.13.7.tar.gz" -ARG FRIBIDI_SHA256SUM="3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 0.19.7.tar.gz" +ARG FREETYPE_SHA256SUM="5d03dd76c2171a7601e9ce10551d52d4471cf92cd205948e60289251daddffa8 freetype-2.5.5.tar.gz" +ARG FRIBIDI_SHA256SUM="3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 0.19.7.tar.gz" +ARG LIBASS_SHA256SUM="8fadf294bf701300d4605e6f1d92929304187fca4b8d8a47889315526adbafd7 0.13.7.tar.gz" +ARG LIBVIDSTAB_SHA256SUM="14d2a053e56edad4f397be0cb3ef8eb1ec3150404ce99a426c4eb641861dc0bb v1.1.0.tar.gz" +ARG OGG_SHA256SUM="e19ee34711d7af328cb26287f4137e70630e7261b17cbe3cd41011d73a654692 libogg-1.3.2.tar.gz" +ARG OPUS_SHA256SUM="77db45a87b51578fbc49555ef1b10926179861d854eb2613207dc79d9ec0a9a9 opus-1.2.tar.gz" +ARG THEORA_SHA256SUM="40952956c47811928d1e7922cda3bc1f427eb75680c3c37249c91e949054916b libtheora-1.1.1.tar.gz" +ARG VORBIS_SHA256SUM="6efbcecdd3e5dfbf090341b485da9d176eb250d893e3eb378c428a2db38301ce libvorbis-1.3.5.tar.gz" +ARG XVID_SHA256SUM="4e9fd62728885855bc5007fe1be58df42e5e274497591fec37249e1052ae316f xvidcore-1.3.4.tar.gz" + RUN buildDeps="autoconf \ diff --git a/docker-images/3.0/centos/Dockerfile b/docker-images/3.0/centos/Dockerfile index ab878b318..44464f1e8 100644 --- a/docker-images/3.0/centos/Dockerfile +++ b/docker-images/3.0/centos/Dockerfile @@ -20,38 +20,39 @@ ARG LD_LIBRARY_PATH=/opt/ffmpeg/lib ARG PREFIX=/opt/ffmpeg ARG MAKEFLAGS="-j2" -ENV FFMPEG_VERSION=3.0.12 \ - FDKAAC_VERSION=0.1.5 \ - LAME_VERSION=3.100 \ - LIBASS_VERSION=0.13.7 \ - OGG_VERSION=1.3.2 \ +ENV FFMPEG_VERSION=3.0.12 \ + AOM_VERSION=v1.0.0 \ + FDKAAC_VERSION=0.1.5 \ + FONTCONFIG_VERSION=2.12.4 \ + FREETYPE_VERSION=2.5.5 \ + FRIBIDI_VERSION=0.19.7 \ + KVAZAAR_VERSION=1.2.0 \ + LAME_VERSION=3.100 \ + LIBASS_VERSION=0.13.7 \ + LIBVIDSTAB_VERSION=1.1.0 \ + OGG_VERSION=1.3.2 \ OPENCOREAMR_VERSION=0.1.5 \ - OPUS_VERSION=1.2 \ - OPENJPEG_VERSION=2.1.2 \ - THEORA_VERSION=1.1.1 \ - VORBIS_VERSION=1.3.5 \ - VPX_VERSION=1.8.0 \ - WEBP_VERSION=1.0.2 \ + OPUS_VERSION=1.2 \ + OPENJPEG_VERSION=2.1.2 \ + THEORA_VERSION=1.1.1 \ + VORBIS_VERSION=1.3.5 \ + VPX_VERSION=1.8.0 \ + WEBP_VERSION=1.0.2 \ X264_VERSION=20170226-2245-stable \ - X265_VERSION=3.1.1 \ - XVID_VERSION=1.3.4 \ - FREETYPE_VERSION=2.5.5 \ - FRIBIDI_VERSION=0.19.7 \ - FONTCONFIG_VERSION=2.12.4 \ - LIBVIDSTAB_VERSION=1.1.0 \ - KVAZAAR_VERSION=1.2.0 \ - AOM_VERSION=v1.0.0 \ + X265_VERSION=3.1.1 \ + XVID_VERSION=1.3.4 \ SRC=/usr/local -ARG OGG_SHA256SUM="e19ee34711d7af328cb26287f4137e70630e7261b17cbe3cd41011d73a654692 libogg-1.3.2.tar.gz" -ARG OPUS_SHA256SUM="77db45a87b51578fbc49555ef1b10926179861d854eb2613207dc79d9ec0a9a9 opus-1.2.tar.gz" -ARG VORBIS_SHA256SUM="6efbcecdd3e5dfbf090341b485da9d176eb250d893e3eb378c428a2db38301ce libvorbis-1.3.5.tar.gz" -ARG THEORA_SHA256SUM="40952956c47811928d1e7922cda3bc1f427eb75680c3c37249c91e949054916b libtheora-1.1.1.tar.gz" -ARG XVID_SHA256SUM="4e9fd62728885855bc5007fe1be58df42e5e274497591fec37249e1052ae316f xvidcore-1.3.4.tar.gz" -ARG FREETYPE_SHA256SUM="5d03dd76c2171a7601e9ce10551d52d4471cf92cd205948e60289251daddffa8 freetype-2.5.5.tar.gz" -ARG LIBVIDSTAB_SHA256SUM="14d2a053e56edad4f397be0cb3ef8eb1ec3150404ce99a426c4eb641861dc0bb v1.1.0.tar.gz" -ARG LIBASS_SHA256SUM="8fadf294bf701300d4605e6f1d92929304187fca4b8d8a47889315526adbafd7 0.13.7.tar.gz" -ARG FRIBIDI_SHA256SUM="3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 0.19.7.tar.gz" +ARG FREETYPE_SHA256SUM="5d03dd76c2171a7601e9ce10551d52d4471cf92cd205948e60289251daddffa8 freetype-2.5.5.tar.gz" +ARG FRIBIDI_SHA256SUM="3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 0.19.7.tar.gz" +ARG LIBASS_SHA256SUM="8fadf294bf701300d4605e6f1d92929304187fca4b8d8a47889315526adbafd7 0.13.7.tar.gz" +ARG LIBVIDSTAB_SHA256SUM="14d2a053e56edad4f397be0cb3ef8eb1ec3150404ce99a426c4eb641861dc0bb v1.1.0.tar.gz" +ARG OGG_SHA256SUM="e19ee34711d7af328cb26287f4137e70630e7261b17cbe3cd41011d73a654692 libogg-1.3.2.tar.gz" +ARG OPUS_SHA256SUM="77db45a87b51578fbc49555ef1b10926179861d854eb2613207dc79d9ec0a9a9 opus-1.2.tar.gz" +ARG THEORA_SHA256SUM="40952956c47811928d1e7922cda3bc1f427eb75680c3c37249c91e949054916b libtheora-1.1.1.tar.gz" +ARG VORBIS_SHA256SUM="6efbcecdd3e5dfbf090341b485da9d176eb250d893e3eb378c428a2db38301ce libvorbis-1.3.5.tar.gz" +ARG XVID_SHA256SUM="4e9fd62728885855bc5007fe1be58df42e5e274497591fec37249e1052ae316f xvidcore-1.3.4.tar.gz" + RUN buildDeps="autoconf \ diff --git a/docker-images/3.0/nvidia/Dockerfile b/docker-images/3.0/nvidia/Dockerfile index 9199ae374..033698ccf 100644 --- a/docker-images/3.0/nvidia/Dockerfile +++ b/docker-images/3.0/nvidia/Dockerfile @@ -35,38 +35,39 @@ ENV LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/opt/ffmpeg/lib" ARG PREFIX=/opt/ffmpeg ARG MAKEFLAGS="-j12" -ENV FFMPEG_VERSION=3.0.12 \ - FDKAAC_VERSION=0.1.5 \ - LAME_VERSION=3.100 \ - LIBASS_VERSION=0.13.7 \ - OGG_VERSION=1.3.2 \ +ENV FFMPEG_VERSION=3.0.12 \ + AOM_VERSION=v1.0.0 \ + FDKAAC_VERSION=0.1.5 \ + FONTCONFIG_VERSION=2.12.4 \ + FREETYPE_VERSION=2.5.5 \ + FRIBIDI_VERSION=0.19.7 \ + KVAZAAR_VERSION=1.2.0 \ + LAME_VERSION=3.100 \ + LIBASS_VERSION=0.13.7 \ + LIBVIDSTAB_VERSION=1.1.0 \ + OGG_VERSION=1.3.2 \ OPENCOREAMR_VERSION=0.1.5 \ - OPUS_VERSION=1.2 \ - OPENJPEG_VERSION=2.1.2 \ - THEORA_VERSION=1.1.1 \ - VORBIS_VERSION=1.3.5 \ - VPX_VERSION=1.8.0 \ - WEBP_VERSION=1.0.2 \ + OPUS_VERSION=1.2 \ + OPENJPEG_VERSION=2.1.2 \ + THEORA_VERSION=1.1.1 \ + VORBIS_VERSION=1.3.5 \ + VPX_VERSION=1.8.0 \ + WEBP_VERSION=1.0.2 \ X264_VERSION=20170226-2245-stable \ - X265_VERSION=3.1.1 \ - XVID_VERSION=1.3.4 \ - FREETYPE_VERSION=2.5.5 \ - FRIBIDI_VERSION=0.19.7 \ - FONTCONFIG_VERSION=2.12.4 \ - LIBVIDSTAB_VERSION=1.1.0 \ - KVAZAAR_VERSION=1.2.0 \ - AOM_VERSION=v1.0.0 \ + X265_VERSION=3.1.1 \ + XVID_VERSION=1.3.4 \ SRC=/usr/local -ARG OGG_SHA256SUM="e19ee34711d7af328cb26287f4137e70630e7261b17cbe3cd41011d73a654692 libogg-1.3.2.tar.gz" -ARG OPUS_SHA256SUM="77db45a87b51578fbc49555ef1b10926179861d854eb2613207dc79d9ec0a9a9 opus-1.2.tar.gz" -ARG VORBIS_SHA256SUM="6efbcecdd3e5dfbf090341b485da9d176eb250d893e3eb378c428a2db38301ce libvorbis-1.3.5.tar.gz" -ARG THEORA_SHA256SUM="40952956c47811928d1e7922cda3bc1f427eb75680c3c37249c91e949054916b libtheora-1.1.1.tar.gz" -ARG XVID_SHA256SUM="4e9fd62728885855bc5007fe1be58df42e5e274497591fec37249e1052ae316f xvidcore-1.3.4.tar.gz" -ARG FREETYPE_SHA256SUM="5d03dd76c2171a7601e9ce10551d52d4471cf92cd205948e60289251daddffa8 freetype-2.5.5.tar.gz" -ARG LIBVIDSTAB_SHA256SUM="14d2a053e56edad4f397be0cb3ef8eb1ec3150404ce99a426c4eb641861dc0bb v1.1.0.tar.gz" -ARG LIBASS_SHA256SUM="8fadf294bf701300d4605e6f1d92929304187fca4b8d8a47889315526adbafd7 0.13.7.tar.gz" -ARG FRIBIDI_SHA256SUM="3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 0.19.7.tar.gz" +ARG FREETYPE_SHA256SUM="5d03dd76c2171a7601e9ce10551d52d4471cf92cd205948e60289251daddffa8 freetype-2.5.5.tar.gz" +ARG FRIBIDI_SHA256SUM="3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 0.19.7.tar.gz" +ARG LIBASS_SHA256SUM="8fadf294bf701300d4605e6f1d92929304187fca4b8d8a47889315526adbafd7 0.13.7.tar.gz" +ARG LIBVIDSTAB_SHA256SUM="14d2a053e56edad4f397be0cb3ef8eb1ec3150404ce99a426c4eb641861dc0bb v1.1.0.tar.gz" +ARG OGG_SHA256SUM="e19ee34711d7af328cb26287f4137e70630e7261b17cbe3cd41011d73a654692 libogg-1.3.2.tar.gz" +ARG OPUS_SHA256SUM="77db45a87b51578fbc49555ef1b10926179861d854eb2613207dc79d9ec0a9a9 opus-1.2.tar.gz" +ARG THEORA_SHA256SUM="40952956c47811928d1e7922cda3bc1f427eb75680c3c37249c91e949054916b libtheora-1.1.1.tar.gz" +ARG VORBIS_SHA256SUM="6efbcecdd3e5dfbf090341b485da9d176eb250d893e3eb378c428a2db38301ce libvorbis-1.3.5.tar.gz" +ARG XVID_SHA256SUM="4e9fd62728885855bc5007fe1be58df42e5e274497591fec37249e1052ae316f xvidcore-1.3.4.tar.gz" + RUN buildDeps="autoconf \ diff --git a/docker-images/3.0/scratch/Dockerfile b/docker-images/3.0/scratch/Dockerfile index 8a97a46fb..f8bf3efce 100644 --- a/docker-images/3.0/scratch/Dockerfile +++ b/docker-images/3.0/scratch/Dockerfile @@ -13,38 +13,39 @@ ARG LD_LIBRARY_PATH=/opt/ffmpeg/lib ARG PREFIX=/opt/ffmpeg ARG MAKEFLAGS="-j2" -ENV FFMPEG_VERSION=3.0.12 \ - FDKAAC_VERSION=0.1.5 \ - LAME_VERSION=3.100 \ - LIBASS_VERSION=0.13.7 \ - OGG_VERSION=1.3.2 \ +ENV FFMPEG_VERSION=3.0.12 \ + AOM_VERSION=v1.0.0 \ + FDKAAC_VERSION=0.1.5 \ + FONTCONFIG_VERSION=2.12.4 \ + FREETYPE_VERSION=2.5.5 \ + FRIBIDI_VERSION=0.19.7 \ + KVAZAAR_VERSION=1.2.0 \ + LAME_VERSION=3.100 \ + LIBASS_VERSION=0.13.7 \ + LIBVIDSTAB_VERSION=1.1.0 \ + OGG_VERSION=1.3.2 \ OPENCOREAMR_VERSION=0.1.5 \ - OPUS_VERSION=1.2 \ - OPENJPEG_VERSION=2.1.2 \ - THEORA_VERSION=1.1.1 \ - VORBIS_VERSION=1.3.5 \ - VPX_VERSION=1.8.0 \ - WEBP_VERSION=1.0.2 \ + OPUS_VERSION=1.2 \ + OPENJPEG_VERSION=2.1.2 \ + THEORA_VERSION=1.1.1 \ + VORBIS_VERSION=1.3.5 \ + VPX_VERSION=1.8.0 \ + WEBP_VERSION=1.0.2 \ X264_VERSION=20170226-2245-stable \ - X265_VERSION=3.1.1 \ - XVID_VERSION=1.3.4 \ - FREETYPE_VERSION=2.5.5 \ - FRIBIDI_VERSION=0.19.7 \ - FONTCONFIG_VERSION=2.12.4 \ - LIBVIDSTAB_VERSION=1.1.0 \ - KVAZAAR_VERSION=1.2.0 \ - AOM_VERSION=v1.0.0 \ + X265_VERSION=3.1.1 \ + XVID_VERSION=1.3.4 \ SRC=/usr/local -ARG OGG_SHA256SUM="e19ee34711d7af328cb26287f4137e70630e7261b17cbe3cd41011d73a654692 libogg-1.3.2.tar.gz" -ARG OPUS_SHA256SUM="77db45a87b51578fbc49555ef1b10926179861d854eb2613207dc79d9ec0a9a9 opus-1.2.tar.gz" -ARG VORBIS_SHA256SUM="6efbcecdd3e5dfbf090341b485da9d176eb250d893e3eb378c428a2db38301ce libvorbis-1.3.5.tar.gz" -ARG THEORA_SHA256SUM="40952956c47811928d1e7922cda3bc1f427eb75680c3c37249c91e949054916b libtheora-1.1.1.tar.gz" -ARG XVID_SHA256SUM="4e9fd62728885855bc5007fe1be58df42e5e274497591fec37249e1052ae316f xvidcore-1.3.4.tar.gz" -ARG FREETYPE_SHA256SUM="5d03dd76c2171a7601e9ce10551d52d4471cf92cd205948e60289251daddffa8 freetype-2.5.5.tar.gz" -ARG LIBVIDSTAB_SHA256SUM="14d2a053e56edad4f397be0cb3ef8eb1ec3150404ce99a426c4eb641861dc0bb v1.1.0.tar.gz" -ARG LIBASS_SHA256SUM="8fadf294bf701300d4605e6f1d92929304187fca4b8d8a47889315526adbafd7 0.13.7.tar.gz" -ARG FRIBIDI_SHA256SUM="3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 0.19.7.tar.gz" +ARG FREETYPE_SHA256SUM="5d03dd76c2171a7601e9ce10551d52d4471cf92cd205948e60289251daddffa8 freetype-2.5.5.tar.gz" +ARG FRIBIDI_SHA256SUM="3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 0.19.7.tar.gz" +ARG LIBASS_SHA256SUM="8fadf294bf701300d4605e6f1d92929304187fca4b8d8a47889315526adbafd7 0.13.7.tar.gz" +ARG LIBVIDSTAB_SHA256SUM="14d2a053e56edad4f397be0cb3ef8eb1ec3150404ce99a426c4eb641861dc0bb v1.1.0.tar.gz" +ARG OGG_SHA256SUM="e19ee34711d7af328cb26287f4137e70630e7261b17cbe3cd41011d73a654692 libogg-1.3.2.tar.gz" +ARG OPUS_SHA256SUM="77db45a87b51578fbc49555ef1b10926179861d854eb2613207dc79d9ec0a9a9 opus-1.2.tar.gz" +ARG THEORA_SHA256SUM="40952956c47811928d1e7922cda3bc1f427eb75680c3c37249c91e949054916b libtheora-1.1.1.tar.gz" +ARG VORBIS_SHA256SUM="6efbcecdd3e5dfbf090341b485da9d176eb250d893e3eb378c428a2db38301ce libvorbis-1.3.5.tar.gz" +ARG XVID_SHA256SUM="4e9fd62728885855bc5007fe1be58df42e5e274497591fec37249e1052ae316f xvidcore-1.3.4.tar.gz" + RUN buildDeps="autoconf \ diff --git a/docker-images/3.0/ubuntu/Dockerfile b/docker-images/3.0/ubuntu/Dockerfile index b7e3f6754..c1a3f62a2 100644 --- a/docker-images/3.0/ubuntu/Dockerfile +++ b/docker-images/3.0/ubuntu/Dockerfile @@ -21,38 +21,39 @@ ARG LD_LIBRARY_PATH=/opt/ffmpeg/lib ARG PREFIX=/opt/ffmpeg ARG MAKEFLAGS="-j2" -ENV FFMPEG_VERSION=3.0.12 \ - FDKAAC_VERSION=0.1.5 \ - LAME_VERSION=3.100 \ - LIBASS_VERSION=0.13.7 \ - OGG_VERSION=1.3.2 \ +ENV FFMPEG_VERSION=3.0.12 \ + AOM_VERSION=v1.0.0 \ + FDKAAC_VERSION=0.1.5 \ + FONTCONFIG_VERSION=2.12.4 \ + FREETYPE_VERSION=2.5.5 \ + FRIBIDI_VERSION=0.19.7 \ + KVAZAAR_VERSION=1.2.0 \ + LAME_VERSION=3.100 \ + LIBASS_VERSION=0.13.7 \ + LIBVIDSTAB_VERSION=1.1.0 \ + OGG_VERSION=1.3.2 \ OPENCOREAMR_VERSION=0.1.5 \ - OPUS_VERSION=1.2 \ - OPENJPEG_VERSION=2.1.2 \ - THEORA_VERSION=1.1.1 \ - VORBIS_VERSION=1.3.5 \ - VPX_VERSION=1.8.0 \ - WEBP_VERSION=1.0.2 \ + OPUS_VERSION=1.2 \ + OPENJPEG_VERSION=2.1.2 \ + THEORA_VERSION=1.1.1 \ + VORBIS_VERSION=1.3.5 \ + VPX_VERSION=1.8.0 \ + WEBP_VERSION=1.0.2 \ X264_VERSION=20170226-2245-stable \ - X265_VERSION=3.1.1 \ - XVID_VERSION=1.3.4 \ - FREETYPE_VERSION=2.5.5 \ - FRIBIDI_VERSION=0.19.7 \ - FONTCONFIG_VERSION=2.12.4 \ - LIBVIDSTAB_VERSION=1.1.0 \ - KVAZAAR_VERSION=1.2.0 \ - AOM_VERSION=v1.0.0 \ + X265_VERSION=3.1.1 \ + XVID_VERSION=1.3.4 \ SRC=/usr/local -ARG OGG_SHA256SUM="e19ee34711d7af328cb26287f4137e70630e7261b17cbe3cd41011d73a654692 libogg-1.3.2.tar.gz" -ARG OPUS_SHA256SUM="77db45a87b51578fbc49555ef1b10926179861d854eb2613207dc79d9ec0a9a9 opus-1.2.tar.gz" -ARG VORBIS_SHA256SUM="6efbcecdd3e5dfbf090341b485da9d176eb250d893e3eb378c428a2db38301ce libvorbis-1.3.5.tar.gz" -ARG THEORA_SHA256SUM="40952956c47811928d1e7922cda3bc1f427eb75680c3c37249c91e949054916b libtheora-1.1.1.tar.gz" -ARG XVID_SHA256SUM="4e9fd62728885855bc5007fe1be58df42e5e274497591fec37249e1052ae316f xvidcore-1.3.4.tar.gz" -ARG FREETYPE_SHA256SUM="5d03dd76c2171a7601e9ce10551d52d4471cf92cd205948e60289251daddffa8 freetype-2.5.5.tar.gz" -ARG LIBVIDSTAB_SHA256SUM="14d2a053e56edad4f397be0cb3ef8eb1ec3150404ce99a426c4eb641861dc0bb v1.1.0.tar.gz" -ARG LIBASS_SHA256SUM="8fadf294bf701300d4605e6f1d92929304187fca4b8d8a47889315526adbafd7 0.13.7.tar.gz" -ARG FRIBIDI_SHA256SUM="3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 0.19.7.tar.gz" +ARG FREETYPE_SHA256SUM="5d03dd76c2171a7601e9ce10551d52d4471cf92cd205948e60289251daddffa8 freetype-2.5.5.tar.gz" +ARG FRIBIDI_SHA256SUM="3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 0.19.7.tar.gz" +ARG LIBASS_SHA256SUM="8fadf294bf701300d4605e6f1d92929304187fca4b8d8a47889315526adbafd7 0.13.7.tar.gz" +ARG LIBVIDSTAB_SHA256SUM="14d2a053e56edad4f397be0cb3ef8eb1ec3150404ce99a426c4eb641861dc0bb v1.1.0.tar.gz" +ARG OGG_SHA256SUM="e19ee34711d7af328cb26287f4137e70630e7261b17cbe3cd41011d73a654692 libogg-1.3.2.tar.gz" +ARG OPUS_SHA256SUM="77db45a87b51578fbc49555ef1b10926179861d854eb2613207dc79d9ec0a9a9 opus-1.2.tar.gz" +ARG THEORA_SHA256SUM="40952956c47811928d1e7922cda3bc1f427eb75680c3c37249c91e949054916b libtheora-1.1.1.tar.gz" +ARG VORBIS_SHA256SUM="6efbcecdd3e5dfbf090341b485da9d176eb250d893e3eb378c428a2db38301ce libvorbis-1.3.5.tar.gz" +ARG XVID_SHA256SUM="4e9fd62728885855bc5007fe1be58df42e5e274497591fec37249e1052ae316f xvidcore-1.3.4.tar.gz" + RUN buildDeps="autoconf \ diff --git a/docker-images/3.0/vaapi/Dockerfile b/docker-images/3.0/vaapi/Dockerfile index 9cfeaa974..ebeefc5db 100644 --- a/docker-images/3.0/vaapi/Dockerfile +++ b/docker-images/3.0/vaapi/Dockerfile @@ -21,38 +21,39 @@ ARG LD_LIBRARY_PATH=/opt/ffmpeg/lib ARG PREFIX=/opt/ffmpeg ARG MAKEFLAGS="-j2" -ENV FFMPEG_VERSION=3.0.12 \ - FDKAAC_VERSION=0.1.5 \ - LAME_VERSION=3.100 \ - LIBASS_VERSION=0.13.7 \ - OGG_VERSION=1.3.2 \ +ENV FFMPEG_VERSION=3.0.12 \ + AOM_VERSION=v1.0.0 \ + FDKAAC_VERSION=0.1.5 \ + FONTCONFIG_VERSION=2.12.4 \ + FREETYPE_VERSION=2.5.5 \ + FRIBIDI_VERSION=0.19.7 \ + KVAZAAR_VERSION=1.2.0 \ + LAME_VERSION=3.100 \ + LIBASS_VERSION=0.13.7 \ + LIBVIDSTAB_VERSION=1.1.0 \ + OGG_VERSION=1.3.2 \ OPENCOREAMR_VERSION=0.1.5 \ - OPUS_VERSION=1.2 \ - OPENJPEG_VERSION=2.1.2 \ - THEORA_VERSION=1.1.1 \ - VORBIS_VERSION=1.3.5 \ - VPX_VERSION=1.8.0 \ - WEBP_VERSION=1.0.2 \ + OPUS_VERSION=1.2 \ + OPENJPEG_VERSION=2.1.2 \ + THEORA_VERSION=1.1.1 \ + VORBIS_VERSION=1.3.5 \ + VPX_VERSION=1.8.0 \ + WEBP_VERSION=1.0.2 \ X264_VERSION=20170226-2245-stable \ - X265_VERSION=3.1.1 \ - XVID_VERSION=1.3.4 \ - FREETYPE_VERSION=2.5.5 \ - FRIBIDI_VERSION=0.19.7 \ - FONTCONFIG_VERSION=2.12.4 \ - LIBVIDSTAB_VERSION=1.1.0 \ - KVAZAAR_VERSION=1.2.0 \ - AOM_VERSION=v1.0.0 \ + X265_VERSION=3.1.1 \ + XVID_VERSION=1.3.4 \ SRC=/usr/local -ARG OGG_SHA256SUM="e19ee34711d7af328cb26287f4137e70630e7261b17cbe3cd41011d73a654692 libogg-1.3.2.tar.gz" -ARG OPUS_SHA256SUM="77db45a87b51578fbc49555ef1b10926179861d854eb2613207dc79d9ec0a9a9 opus-1.2.tar.gz" -ARG VORBIS_SHA256SUM="6efbcecdd3e5dfbf090341b485da9d176eb250d893e3eb378c428a2db38301ce libvorbis-1.3.5.tar.gz" -ARG THEORA_SHA256SUM="40952956c47811928d1e7922cda3bc1f427eb75680c3c37249c91e949054916b libtheora-1.1.1.tar.gz" -ARG XVID_SHA256SUM="4e9fd62728885855bc5007fe1be58df42e5e274497591fec37249e1052ae316f xvidcore-1.3.4.tar.gz" -ARG FREETYPE_SHA256SUM="5d03dd76c2171a7601e9ce10551d52d4471cf92cd205948e60289251daddffa8 freetype-2.5.5.tar.gz" -ARG LIBVIDSTAB_SHA256SUM="14d2a053e56edad4f397be0cb3ef8eb1ec3150404ce99a426c4eb641861dc0bb v1.1.0.tar.gz" -ARG LIBASS_SHA256SUM="8fadf294bf701300d4605e6f1d92929304187fca4b8d8a47889315526adbafd7 0.13.7.tar.gz" -ARG FRIBIDI_SHA256SUM="3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 0.19.7.tar.gz" +ARG FREETYPE_SHA256SUM="5d03dd76c2171a7601e9ce10551d52d4471cf92cd205948e60289251daddffa8 freetype-2.5.5.tar.gz" +ARG FRIBIDI_SHA256SUM="3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 0.19.7.tar.gz" +ARG LIBASS_SHA256SUM="8fadf294bf701300d4605e6f1d92929304187fca4b8d8a47889315526adbafd7 0.13.7.tar.gz" +ARG LIBVIDSTAB_SHA256SUM="14d2a053e56edad4f397be0cb3ef8eb1ec3150404ce99a426c4eb641861dc0bb v1.1.0.tar.gz" +ARG OGG_SHA256SUM="e19ee34711d7af328cb26287f4137e70630e7261b17cbe3cd41011d73a654692 libogg-1.3.2.tar.gz" +ARG OPUS_SHA256SUM="77db45a87b51578fbc49555ef1b10926179861d854eb2613207dc79d9ec0a9a9 opus-1.2.tar.gz" +ARG THEORA_SHA256SUM="40952956c47811928d1e7922cda3bc1f427eb75680c3c37249c91e949054916b libtheora-1.1.1.tar.gz" +ARG VORBIS_SHA256SUM="6efbcecdd3e5dfbf090341b485da9d176eb250d893e3eb378c428a2db38301ce libvorbis-1.3.5.tar.gz" +ARG XVID_SHA256SUM="4e9fd62728885855bc5007fe1be58df42e5e274497591fec37249e1052ae316f xvidcore-1.3.4.tar.gz" + RUN buildDeps="autoconf \ diff --git a/docker-images/3.1/alpine/Dockerfile b/docker-images/3.1/alpine/Dockerfile index e1f887d0a..3274355c7 100644 --- a/docker-images/3.1/alpine/Dockerfile +++ b/docker-images/3.1/alpine/Dockerfile @@ -18,38 +18,39 @@ ARG LD_LIBRARY_PATH=/opt/ffmpeg/lib ARG PREFIX=/opt/ffmpeg ARG MAKEFLAGS="-j2" -ENV FFMPEG_VERSION=3.1.11 \ - FDKAAC_VERSION=0.1.5 \ - LAME_VERSION=3.100 \ - LIBASS_VERSION=0.13.7 \ - OGG_VERSION=1.3.2 \ +ENV FFMPEG_VERSION=3.1.11 \ + AOM_VERSION=v1.0.0 \ + FDKAAC_VERSION=0.1.5 \ + FONTCONFIG_VERSION=2.12.4 \ + FREETYPE_VERSION=2.5.5 \ + FRIBIDI_VERSION=0.19.7 \ + KVAZAAR_VERSION=1.2.0 \ + LAME_VERSION=3.100 \ + LIBASS_VERSION=0.13.7 \ + LIBVIDSTAB_VERSION=1.1.0 \ + OGG_VERSION=1.3.2 \ OPENCOREAMR_VERSION=0.1.5 \ - OPUS_VERSION=1.2 \ - OPENJPEG_VERSION=2.1.2 \ - THEORA_VERSION=1.1.1 \ - VORBIS_VERSION=1.3.5 \ - VPX_VERSION=1.8.0 \ - WEBP_VERSION=1.0.2 \ + OPUS_VERSION=1.2 \ + OPENJPEG_VERSION=2.1.2 \ + THEORA_VERSION=1.1.1 \ + VORBIS_VERSION=1.3.5 \ + VPX_VERSION=1.8.0 \ + WEBP_VERSION=1.0.2 \ X264_VERSION=20170226-2245-stable \ - X265_VERSION=3.1.1 \ - XVID_VERSION=1.3.4 \ - FREETYPE_VERSION=2.5.5 \ - FRIBIDI_VERSION=0.19.7 \ - FONTCONFIG_VERSION=2.12.4 \ - LIBVIDSTAB_VERSION=1.1.0 \ - KVAZAAR_VERSION=1.2.0 \ - AOM_VERSION=v1.0.0 \ + X265_VERSION=3.1.1 \ + XVID_VERSION=1.3.4 \ SRC=/usr/local -ARG OGG_SHA256SUM="e19ee34711d7af328cb26287f4137e70630e7261b17cbe3cd41011d73a654692 libogg-1.3.2.tar.gz" -ARG OPUS_SHA256SUM="77db45a87b51578fbc49555ef1b10926179861d854eb2613207dc79d9ec0a9a9 opus-1.2.tar.gz" -ARG VORBIS_SHA256SUM="6efbcecdd3e5dfbf090341b485da9d176eb250d893e3eb378c428a2db38301ce libvorbis-1.3.5.tar.gz" -ARG THEORA_SHA256SUM="40952956c47811928d1e7922cda3bc1f427eb75680c3c37249c91e949054916b libtheora-1.1.1.tar.gz" -ARG XVID_SHA256SUM="4e9fd62728885855bc5007fe1be58df42e5e274497591fec37249e1052ae316f xvidcore-1.3.4.tar.gz" -ARG FREETYPE_SHA256SUM="5d03dd76c2171a7601e9ce10551d52d4471cf92cd205948e60289251daddffa8 freetype-2.5.5.tar.gz" -ARG LIBVIDSTAB_SHA256SUM="14d2a053e56edad4f397be0cb3ef8eb1ec3150404ce99a426c4eb641861dc0bb v1.1.0.tar.gz" -ARG LIBASS_SHA256SUM="8fadf294bf701300d4605e6f1d92929304187fca4b8d8a47889315526adbafd7 0.13.7.tar.gz" -ARG FRIBIDI_SHA256SUM="3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 0.19.7.tar.gz" +ARG FREETYPE_SHA256SUM="5d03dd76c2171a7601e9ce10551d52d4471cf92cd205948e60289251daddffa8 freetype-2.5.5.tar.gz" +ARG FRIBIDI_SHA256SUM="3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 0.19.7.tar.gz" +ARG LIBASS_SHA256SUM="8fadf294bf701300d4605e6f1d92929304187fca4b8d8a47889315526adbafd7 0.13.7.tar.gz" +ARG LIBVIDSTAB_SHA256SUM="14d2a053e56edad4f397be0cb3ef8eb1ec3150404ce99a426c4eb641861dc0bb v1.1.0.tar.gz" +ARG OGG_SHA256SUM="e19ee34711d7af328cb26287f4137e70630e7261b17cbe3cd41011d73a654692 libogg-1.3.2.tar.gz" +ARG OPUS_SHA256SUM="77db45a87b51578fbc49555ef1b10926179861d854eb2613207dc79d9ec0a9a9 opus-1.2.tar.gz" +ARG THEORA_SHA256SUM="40952956c47811928d1e7922cda3bc1f427eb75680c3c37249c91e949054916b libtheora-1.1.1.tar.gz" +ARG VORBIS_SHA256SUM="6efbcecdd3e5dfbf090341b485da9d176eb250d893e3eb378c428a2db38301ce libvorbis-1.3.5.tar.gz" +ARG XVID_SHA256SUM="4e9fd62728885855bc5007fe1be58df42e5e274497591fec37249e1052ae316f xvidcore-1.3.4.tar.gz" + RUN buildDeps="autoconf \ diff --git a/docker-images/3.1/centos/Dockerfile b/docker-images/3.1/centos/Dockerfile index 1c7e1bdd7..247b637be 100644 --- a/docker-images/3.1/centos/Dockerfile +++ b/docker-images/3.1/centos/Dockerfile @@ -20,38 +20,39 @@ ARG LD_LIBRARY_PATH=/opt/ffmpeg/lib ARG PREFIX=/opt/ffmpeg ARG MAKEFLAGS="-j2" -ENV FFMPEG_VERSION=3.1.11 \ - FDKAAC_VERSION=0.1.5 \ - LAME_VERSION=3.100 \ - LIBASS_VERSION=0.13.7 \ - OGG_VERSION=1.3.2 \ +ENV FFMPEG_VERSION=3.1.11 \ + AOM_VERSION=v1.0.0 \ + FDKAAC_VERSION=0.1.5 \ + FONTCONFIG_VERSION=2.12.4 \ + FREETYPE_VERSION=2.5.5 \ + FRIBIDI_VERSION=0.19.7 \ + KVAZAAR_VERSION=1.2.0 \ + LAME_VERSION=3.100 \ + LIBASS_VERSION=0.13.7 \ + LIBVIDSTAB_VERSION=1.1.0 \ + OGG_VERSION=1.3.2 \ OPENCOREAMR_VERSION=0.1.5 \ - OPUS_VERSION=1.2 \ - OPENJPEG_VERSION=2.1.2 \ - THEORA_VERSION=1.1.1 \ - VORBIS_VERSION=1.3.5 \ - VPX_VERSION=1.8.0 \ - WEBP_VERSION=1.0.2 \ + OPUS_VERSION=1.2 \ + OPENJPEG_VERSION=2.1.2 \ + THEORA_VERSION=1.1.1 \ + VORBIS_VERSION=1.3.5 \ + VPX_VERSION=1.8.0 \ + WEBP_VERSION=1.0.2 \ X264_VERSION=20170226-2245-stable \ - X265_VERSION=3.1.1 \ - XVID_VERSION=1.3.4 \ - FREETYPE_VERSION=2.5.5 \ - FRIBIDI_VERSION=0.19.7 \ - FONTCONFIG_VERSION=2.12.4 \ - LIBVIDSTAB_VERSION=1.1.0 \ - KVAZAAR_VERSION=1.2.0 \ - AOM_VERSION=v1.0.0 \ + X265_VERSION=3.1.1 \ + XVID_VERSION=1.3.4 \ SRC=/usr/local -ARG OGG_SHA256SUM="e19ee34711d7af328cb26287f4137e70630e7261b17cbe3cd41011d73a654692 libogg-1.3.2.tar.gz" -ARG OPUS_SHA256SUM="77db45a87b51578fbc49555ef1b10926179861d854eb2613207dc79d9ec0a9a9 opus-1.2.tar.gz" -ARG VORBIS_SHA256SUM="6efbcecdd3e5dfbf090341b485da9d176eb250d893e3eb378c428a2db38301ce libvorbis-1.3.5.tar.gz" -ARG THEORA_SHA256SUM="40952956c47811928d1e7922cda3bc1f427eb75680c3c37249c91e949054916b libtheora-1.1.1.tar.gz" -ARG XVID_SHA256SUM="4e9fd62728885855bc5007fe1be58df42e5e274497591fec37249e1052ae316f xvidcore-1.3.4.tar.gz" -ARG FREETYPE_SHA256SUM="5d03dd76c2171a7601e9ce10551d52d4471cf92cd205948e60289251daddffa8 freetype-2.5.5.tar.gz" -ARG LIBVIDSTAB_SHA256SUM="14d2a053e56edad4f397be0cb3ef8eb1ec3150404ce99a426c4eb641861dc0bb v1.1.0.tar.gz" -ARG LIBASS_SHA256SUM="8fadf294bf701300d4605e6f1d92929304187fca4b8d8a47889315526adbafd7 0.13.7.tar.gz" -ARG FRIBIDI_SHA256SUM="3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 0.19.7.tar.gz" +ARG FREETYPE_SHA256SUM="5d03dd76c2171a7601e9ce10551d52d4471cf92cd205948e60289251daddffa8 freetype-2.5.5.tar.gz" +ARG FRIBIDI_SHA256SUM="3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 0.19.7.tar.gz" +ARG LIBASS_SHA256SUM="8fadf294bf701300d4605e6f1d92929304187fca4b8d8a47889315526adbafd7 0.13.7.tar.gz" +ARG LIBVIDSTAB_SHA256SUM="14d2a053e56edad4f397be0cb3ef8eb1ec3150404ce99a426c4eb641861dc0bb v1.1.0.tar.gz" +ARG OGG_SHA256SUM="e19ee34711d7af328cb26287f4137e70630e7261b17cbe3cd41011d73a654692 libogg-1.3.2.tar.gz" +ARG OPUS_SHA256SUM="77db45a87b51578fbc49555ef1b10926179861d854eb2613207dc79d9ec0a9a9 opus-1.2.tar.gz" +ARG THEORA_SHA256SUM="40952956c47811928d1e7922cda3bc1f427eb75680c3c37249c91e949054916b libtheora-1.1.1.tar.gz" +ARG VORBIS_SHA256SUM="6efbcecdd3e5dfbf090341b485da9d176eb250d893e3eb378c428a2db38301ce libvorbis-1.3.5.tar.gz" +ARG XVID_SHA256SUM="4e9fd62728885855bc5007fe1be58df42e5e274497591fec37249e1052ae316f xvidcore-1.3.4.tar.gz" + RUN buildDeps="autoconf \ diff --git a/docker-images/3.1/nvidia/Dockerfile b/docker-images/3.1/nvidia/Dockerfile index 1b6c05afd..991c66e50 100644 --- a/docker-images/3.1/nvidia/Dockerfile +++ b/docker-images/3.1/nvidia/Dockerfile @@ -35,38 +35,39 @@ ENV LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/opt/ffmpeg/lib" ARG PREFIX=/opt/ffmpeg ARG MAKEFLAGS="-j12" -ENV FFMPEG_VERSION=3.1.11 \ - FDKAAC_VERSION=0.1.5 \ - LAME_VERSION=3.100 \ - LIBASS_VERSION=0.13.7 \ - OGG_VERSION=1.3.2 \ +ENV FFMPEG_VERSION=3.1.11 \ + AOM_VERSION=v1.0.0 \ + FDKAAC_VERSION=0.1.5 \ + FONTCONFIG_VERSION=2.12.4 \ + FREETYPE_VERSION=2.5.5 \ + FRIBIDI_VERSION=0.19.7 \ + KVAZAAR_VERSION=1.2.0 \ + LAME_VERSION=3.100 \ + LIBASS_VERSION=0.13.7 \ + LIBVIDSTAB_VERSION=1.1.0 \ + OGG_VERSION=1.3.2 \ OPENCOREAMR_VERSION=0.1.5 \ - OPUS_VERSION=1.2 \ - OPENJPEG_VERSION=2.1.2 \ - THEORA_VERSION=1.1.1 \ - VORBIS_VERSION=1.3.5 \ - VPX_VERSION=1.8.0 \ - WEBP_VERSION=1.0.2 \ + OPUS_VERSION=1.2 \ + OPENJPEG_VERSION=2.1.2 \ + THEORA_VERSION=1.1.1 \ + VORBIS_VERSION=1.3.5 \ + VPX_VERSION=1.8.0 \ + WEBP_VERSION=1.0.2 \ X264_VERSION=20170226-2245-stable \ - X265_VERSION=3.1.1 \ - XVID_VERSION=1.3.4 \ - FREETYPE_VERSION=2.5.5 \ - FRIBIDI_VERSION=0.19.7 \ - FONTCONFIG_VERSION=2.12.4 \ - LIBVIDSTAB_VERSION=1.1.0 \ - KVAZAAR_VERSION=1.2.0 \ - AOM_VERSION=v1.0.0 \ + X265_VERSION=3.1.1 \ + XVID_VERSION=1.3.4 \ SRC=/usr/local -ARG OGG_SHA256SUM="e19ee34711d7af328cb26287f4137e70630e7261b17cbe3cd41011d73a654692 libogg-1.3.2.tar.gz" -ARG OPUS_SHA256SUM="77db45a87b51578fbc49555ef1b10926179861d854eb2613207dc79d9ec0a9a9 opus-1.2.tar.gz" -ARG VORBIS_SHA256SUM="6efbcecdd3e5dfbf090341b485da9d176eb250d893e3eb378c428a2db38301ce libvorbis-1.3.5.tar.gz" -ARG THEORA_SHA256SUM="40952956c47811928d1e7922cda3bc1f427eb75680c3c37249c91e949054916b libtheora-1.1.1.tar.gz" -ARG XVID_SHA256SUM="4e9fd62728885855bc5007fe1be58df42e5e274497591fec37249e1052ae316f xvidcore-1.3.4.tar.gz" -ARG FREETYPE_SHA256SUM="5d03dd76c2171a7601e9ce10551d52d4471cf92cd205948e60289251daddffa8 freetype-2.5.5.tar.gz" -ARG LIBVIDSTAB_SHA256SUM="14d2a053e56edad4f397be0cb3ef8eb1ec3150404ce99a426c4eb641861dc0bb v1.1.0.tar.gz" -ARG LIBASS_SHA256SUM="8fadf294bf701300d4605e6f1d92929304187fca4b8d8a47889315526adbafd7 0.13.7.tar.gz" -ARG FRIBIDI_SHA256SUM="3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 0.19.7.tar.gz" +ARG FREETYPE_SHA256SUM="5d03dd76c2171a7601e9ce10551d52d4471cf92cd205948e60289251daddffa8 freetype-2.5.5.tar.gz" +ARG FRIBIDI_SHA256SUM="3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 0.19.7.tar.gz" +ARG LIBASS_SHA256SUM="8fadf294bf701300d4605e6f1d92929304187fca4b8d8a47889315526adbafd7 0.13.7.tar.gz" +ARG LIBVIDSTAB_SHA256SUM="14d2a053e56edad4f397be0cb3ef8eb1ec3150404ce99a426c4eb641861dc0bb v1.1.0.tar.gz" +ARG OGG_SHA256SUM="e19ee34711d7af328cb26287f4137e70630e7261b17cbe3cd41011d73a654692 libogg-1.3.2.tar.gz" +ARG OPUS_SHA256SUM="77db45a87b51578fbc49555ef1b10926179861d854eb2613207dc79d9ec0a9a9 opus-1.2.tar.gz" +ARG THEORA_SHA256SUM="40952956c47811928d1e7922cda3bc1f427eb75680c3c37249c91e949054916b libtheora-1.1.1.tar.gz" +ARG VORBIS_SHA256SUM="6efbcecdd3e5dfbf090341b485da9d176eb250d893e3eb378c428a2db38301ce libvorbis-1.3.5.tar.gz" +ARG XVID_SHA256SUM="4e9fd62728885855bc5007fe1be58df42e5e274497591fec37249e1052ae316f xvidcore-1.3.4.tar.gz" + RUN buildDeps="autoconf \ diff --git a/docker-images/3.1/scratch/Dockerfile b/docker-images/3.1/scratch/Dockerfile index 7c939feb5..f18462dce 100644 --- a/docker-images/3.1/scratch/Dockerfile +++ b/docker-images/3.1/scratch/Dockerfile @@ -13,38 +13,39 @@ ARG LD_LIBRARY_PATH=/opt/ffmpeg/lib ARG PREFIX=/opt/ffmpeg ARG MAKEFLAGS="-j2" -ENV FFMPEG_VERSION=3.1.11 \ - FDKAAC_VERSION=0.1.5 \ - LAME_VERSION=3.100 \ - LIBASS_VERSION=0.13.7 \ - OGG_VERSION=1.3.2 \ +ENV FFMPEG_VERSION=3.1.11 \ + AOM_VERSION=v1.0.0 \ + FDKAAC_VERSION=0.1.5 \ + FONTCONFIG_VERSION=2.12.4 \ + FREETYPE_VERSION=2.5.5 \ + FRIBIDI_VERSION=0.19.7 \ + KVAZAAR_VERSION=1.2.0 \ + LAME_VERSION=3.100 \ + LIBASS_VERSION=0.13.7 \ + LIBVIDSTAB_VERSION=1.1.0 \ + OGG_VERSION=1.3.2 \ OPENCOREAMR_VERSION=0.1.5 \ - OPUS_VERSION=1.2 \ - OPENJPEG_VERSION=2.1.2 \ - THEORA_VERSION=1.1.1 \ - VORBIS_VERSION=1.3.5 \ - VPX_VERSION=1.8.0 \ - WEBP_VERSION=1.0.2 \ + OPUS_VERSION=1.2 \ + OPENJPEG_VERSION=2.1.2 \ + THEORA_VERSION=1.1.1 \ + VORBIS_VERSION=1.3.5 \ + VPX_VERSION=1.8.0 \ + WEBP_VERSION=1.0.2 \ X264_VERSION=20170226-2245-stable \ - X265_VERSION=3.1.1 \ - XVID_VERSION=1.3.4 \ - FREETYPE_VERSION=2.5.5 \ - FRIBIDI_VERSION=0.19.7 \ - FONTCONFIG_VERSION=2.12.4 \ - LIBVIDSTAB_VERSION=1.1.0 \ - KVAZAAR_VERSION=1.2.0 \ - AOM_VERSION=v1.0.0 \ + X265_VERSION=3.1.1 \ + XVID_VERSION=1.3.4 \ SRC=/usr/local -ARG OGG_SHA256SUM="e19ee34711d7af328cb26287f4137e70630e7261b17cbe3cd41011d73a654692 libogg-1.3.2.tar.gz" -ARG OPUS_SHA256SUM="77db45a87b51578fbc49555ef1b10926179861d854eb2613207dc79d9ec0a9a9 opus-1.2.tar.gz" -ARG VORBIS_SHA256SUM="6efbcecdd3e5dfbf090341b485da9d176eb250d893e3eb378c428a2db38301ce libvorbis-1.3.5.tar.gz" -ARG THEORA_SHA256SUM="40952956c47811928d1e7922cda3bc1f427eb75680c3c37249c91e949054916b libtheora-1.1.1.tar.gz" -ARG XVID_SHA256SUM="4e9fd62728885855bc5007fe1be58df42e5e274497591fec37249e1052ae316f xvidcore-1.3.4.tar.gz" -ARG FREETYPE_SHA256SUM="5d03dd76c2171a7601e9ce10551d52d4471cf92cd205948e60289251daddffa8 freetype-2.5.5.tar.gz" -ARG LIBVIDSTAB_SHA256SUM="14d2a053e56edad4f397be0cb3ef8eb1ec3150404ce99a426c4eb641861dc0bb v1.1.0.tar.gz" -ARG LIBASS_SHA256SUM="8fadf294bf701300d4605e6f1d92929304187fca4b8d8a47889315526adbafd7 0.13.7.tar.gz" -ARG FRIBIDI_SHA256SUM="3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 0.19.7.tar.gz" +ARG FREETYPE_SHA256SUM="5d03dd76c2171a7601e9ce10551d52d4471cf92cd205948e60289251daddffa8 freetype-2.5.5.tar.gz" +ARG FRIBIDI_SHA256SUM="3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 0.19.7.tar.gz" +ARG LIBASS_SHA256SUM="8fadf294bf701300d4605e6f1d92929304187fca4b8d8a47889315526adbafd7 0.13.7.tar.gz" +ARG LIBVIDSTAB_SHA256SUM="14d2a053e56edad4f397be0cb3ef8eb1ec3150404ce99a426c4eb641861dc0bb v1.1.0.tar.gz" +ARG OGG_SHA256SUM="e19ee34711d7af328cb26287f4137e70630e7261b17cbe3cd41011d73a654692 libogg-1.3.2.tar.gz" +ARG OPUS_SHA256SUM="77db45a87b51578fbc49555ef1b10926179861d854eb2613207dc79d9ec0a9a9 opus-1.2.tar.gz" +ARG THEORA_SHA256SUM="40952956c47811928d1e7922cda3bc1f427eb75680c3c37249c91e949054916b libtheora-1.1.1.tar.gz" +ARG VORBIS_SHA256SUM="6efbcecdd3e5dfbf090341b485da9d176eb250d893e3eb378c428a2db38301ce libvorbis-1.3.5.tar.gz" +ARG XVID_SHA256SUM="4e9fd62728885855bc5007fe1be58df42e5e274497591fec37249e1052ae316f xvidcore-1.3.4.tar.gz" + RUN buildDeps="autoconf \ diff --git a/docker-images/3.1/ubuntu/Dockerfile b/docker-images/3.1/ubuntu/Dockerfile index 788a7fa1e..99a57c970 100644 --- a/docker-images/3.1/ubuntu/Dockerfile +++ b/docker-images/3.1/ubuntu/Dockerfile @@ -21,38 +21,39 @@ ARG LD_LIBRARY_PATH=/opt/ffmpeg/lib ARG PREFIX=/opt/ffmpeg ARG MAKEFLAGS="-j2" -ENV FFMPEG_VERSION=3.1.11 \ - FDKAAC_VERSION=0.1.5 \ - LAME_VERSION=3.100 \ - LIBASS_VERSION=0.13.7 \ - OGG_VERSION=1.3.2 \ +ENV FFMPEG_VERSION=3.1.11 \ + AOM_VERSION=v1.0.0 \ + FDKAAC_VERSION=0.1.5 \ + FONTCONFIG_VERSION=2.12.4 \ + FREETYPE_VERSION=2.5.5 \ + FRIBIDI_VERSION=0.19.7 \ + KVAZAAR_VERSION=1.2.0 \ + LAME_VERSION=3.100 \ + LIBASS_VERSION=0.13.7 \ + LIBVIDSTAB_VERSION=1.1.0 \ + OGG_VERSION=1.3.2 \ OPENCOREAMR_VERSION=0.1.5 \ - OPUS_VERSION=1.2 \ - OPENJPEG_VERSION=2.1.2 \ - THEORA_VERSION=1.1.1 \ - VORBIS_VERSION=1.3.5 \ - VPX_VERSION=1.8.0 \ - WEBP_VERSION=1.0.2 \ + OPUS_VERSION=1.2 \ + OPENJPEG_VERSION=2.1.2 \ + THEORA_VERSION=1.1.1 \ + VORBIS_VERSION=1.3.5 \ + VPX_VERSION=1.8.0 \ + WEBP_VERSION=1.0.2 \ X264_VERSION=20170226-2245-stable \ - X265_VERSION=3.1.1 \ - XVID_VERSION=1.3.4 \ - FREETYPE_VERSION=2.5.5 \ - FRIBIDI_VERSION=0.19.7 \ - FONTCONFIG_VERSION=2.12.4 \ - LIBVIDSTAB_VERSION=1.1.0 \ - KVAZAAR_VERSION=1.2.0 \ - AOM_VERSION=v1.0.0 \ + X265_VERSION=3.1.1 \ + XVID_VERSION=1.3.4 \ SRC=/usr/local -ARG OGG_SHA256SUM="e19ee34711d7af328cb26287f4137e70630e7261b17cbe3cd41011d73a654692 libogg-1.3.2.tar.gz" -ARG OPUS_SHA256SUM="77db45a87b51578fbc49555ef1b10926179861d854eb2613207dc79d9ec0a9a9 opus-1.2.tar.gz" -ARG VORBIS_SHA256SUM="6efbcecdd3e5dfbf090341b485da9d176eb250d893e3eb378c428a2db38301ce libvorbis-1.3.5.tar.gz" -ARG THEORA_SHA256SUM="40952956c47811928d1e7922cda3bc1f427eb75680c3c37249c91e949054916b libtheora-1.1.1.tar.gz" -ARG XVID_SHA256SUM="4e9fd62728885855bc5007fe1be58df42e5e274497591fec37249e1052ae316f xvidcore-1.3.4.tar.gz" -ARG FREETYPE_SHA256SUM="5d03dd76c2171a7601e9ce10551d52d4471cf92cd205948e60289251daddffa8 freetype-2.5.5.tar.gz" -ARG LIBVIDSTAB_SHA256SUM="14d2a053e56edad4f397be0cb3ef8eb1ec3150404ce99a426c4eb641861dc0bb v1.1.0.tar.gz" -ARG LIBASS_SHA256SUM="8fadf294bf701300d4605e6f1d92929304187fca4b8d8a47889315526adbafd7 0.13.7.tar.gz" -ARG FRIBIDI_SHA256SUM="3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 0.19.7.tar.gz" +ARG FREETYPE_SHA256SUM="5d03dd76c2171a7601e9ce10551d52d4471cf92cd205948e60289251daddffa8 freetype-2.5.5.tar.gz" +ARG FRIBIDI_SHA256SUM="3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 0.19.7.tar.gz" +ARG LIBASS_SHA256SUM="8fadf294bf701300d4605e6f1d92929304187fca4b8d8a47889315526adbafd7 0.13.7.tar.gz" +ARG LIBVIDSTAB_SHA256SUM="14d2a053e56edad4f397be0cb3ef8eb1ec3150404ce99a426c4eb641861dc0bb v1.1.0.tar.gz" +ARG OGG_SHA256SUM="e19ee34711d7af328cb26287f4137e70630e7261b17cbe3cd41011d73a654692 libogg-1.3.2.tar.gz" +ARG OPUS_SHA256SUM="77db45a87b51578fbc49555ef1b10926179861d854eb2613207dc79d9ec0a9a9 opus-1.2.tar.gz" +ARG THEORA_SHA256SUM="40952956c47811928d1e7922cda3bc1f427eb75680c3c37249c91e949054916b libtheora-1.1.1.tar.gz" +ARG VORBIS_SHA256SUM="6efbcecdd3e5dfbf090341b485da9d176eb250d893e3eb378c428a2db38301ce libvorbis-1.3.5.tar.gz" +ARG XVID_SHA256SUM="4e9fd62728885855bc5007fe1be58df42e5e274497591fec37249e1052ae316f xvidcore-1.3.4.tar.gz" + RUN buildDeps="autoconf \ diff --git a/docker-images/3.1/vaapi/Dockerfile b/docker-images/3.1/vaapi/Dockerfile index 3aad1029f..383ff1135 100644 --- a/docker-images/3.1/vaapi/Dockerfile +++ b/docker-images/3.1/vaapi/Dockerfile @@ -21,38 +21,39 @@ ARG LD_LIBRARY_PATH=/opt/ffmpeg/lib ARG PREFIX=/opt/ffmpeg ARG MAKEFLAGS="-j2" -ENV FFMPEG_VERSION=3.1.11 \ - FDKAAC_VERSION=0.1.5 \ - LAME_VERSION=3.100 \ - LIBASS_VERSION=0.13.7 \ - OGG_VERSION=1.3.2 \ +ENV FFMPEG_VERSION=3.1.11 \ + AOM_VERSION=v1.0.0 \ + FDKAAC_VERSION=0.1.5 \ + FONTCONFIG_VERSION=2.12.4 \ + FREETYPE_VERSION=2.5.5 \ + FRIBIDI_VERSION=0.19.7 \ + KVAZAAR_VERSION=1.2.0 \ + LAME_VERSION=3.100 \ + LIBASS_VERSION=0.13.7 \ + LIBVIDSTAB_VERSION=1.1.0 \ + OGG_VERSION=1.3.2 \ OPENCOREAMR_VERSION=0.1.5 \ - OPUS_VERSION=1.2 \ - OPENJPEG_VERSION=2.1.2 \ - THEORA_VERSION=1.1.1 \ - VORBIS_VERSION=1.3.5 \ - VPX_VERSION=1.8.0 \ - WEBP_VERSION=1.0.2 \ + OPUS_VERSION=1.2 \ + OPENJPEG_VERSION=2.1.2 \ + THEORA_VERSION=1.1.1 \ + VORBIS_VERSION=1.3.5 \ + VPX_VERSION=1.8.0 \ + WEBP_VERSION=1.0.2 \ X264_VERSION=20170226-2245-stable \ - X265_VERSION=3.1.1 \ - XVID_VERSION=1.3.4 \ - FREETYPE_VERSION=2.5.5 \ - FRIBIDI_VERSION=0.19.7 \ - FONTCONFIG_VERSION=2.12.4 \ - LIBVIDSTAB_VERSION=1.1.0 \ - KVAZAAR_VERSION=1.2.0 \ - AOM_VERSION=v1.0.0 \ + X265_VERSION=3.1.1 \ + XVID_VERSION=1.3.4 \ SRC=/usr/local -ARG OGG_SHA256SUM="e19ee34711d7af328cb26287f4137e70630e7261b17cbe3cd41011d73a654692 libogg-1.3.2.tar.gz" -ARG OPUS_SHA256SUM="77db45a87b51578fbc49555ef1b10926179861d854eb2613207dc79d9ec0a9a9 opus-1.2.tar.gz" -ARG VORBIS_SHA256SUM="6efbcecdd3e5dfbf090341b485da9d176eb250d893e3eb378c428a2db38301ce libvorbis-1.3.5.tar.gz" -ARG THEORA_SHA256SUM="40952956c47811928d1e7922cda3bc1f427eb75680c3c37249c91e949054916b libtheora-1.1.1.tar.gz" -ARG XVID_SHA256SUM="4e9fd62728885855bc5007fe1be58df42e5e274497591fec37249e1052ae316f xvidcore-1.3.4.tar.gz" -ARG FREETYPE_SHA256SUM="5d03dd76c2171a7601e9ce10551d52d4471cf92cd205948e60289251daddffa8 freetype-2.5.5.tar.gz" -ARG LIBVIDSTAB_SHA256SUM="14d2a053e56edad4f397be0cb3ef8eb1ec3150404ce99a426c4eb641861dc0bb v1.1.0.tar.gz" -ARG LIBASS_SHA256SUM="8fadf294bf701300d4605e6f1d92929304187fca4b8d8a47889315526adbafd7 0.13.7.tar.gz" -ARG FRIBIDI_SHA256SUM="3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 0.19.7.tar.gz" +ARG FREETYPE_SHA256SUM="5d03dd76c2171a7601e9ce10551d52d4471cf92cd205948e60289251daddffa8 freetype-2.5.5.tar.gz" +ARG FRIBIDI_SHA256SUM="3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 0.19.7.tar.gz" +ARG LIBASS_SHA256SUM="8fadf294bf701300d4605e6f1d92929304187fca4b8d8a47889315526adbafd7 0.13.7.tar.gz" +ARG LIBVIDSTAB_SHA256SUM="14d2a053e56edad4f397be0cb3ef8eb1ec3150404ce99a426c4eb641861dc0bb v1.1.0.tar.gz" +ARG OGG_SHA256SUM="e19ee34711d7af328cb26287f4137e70630e7261b17cbe3cd41011d73a654692 libogg-1.3.2.tar.gz" +ARG OPUS_SHA256SUM="77db45a87b51578fbc49555ef1b10926179861d854eb2613207dc79d9ec0a9a9 opus-1.2.tar.gz" +ARG THEORA_SHA256SUM="40952956c47811928d1e7922cda3bc1f427eb75680c3c37249c91e949054916b libtheora-1.1.1.tar.gz" +ARG VORBIS_SHA256SUM="6efbcecdd3e5dfbf090341b485da9d176eb250d893e3eb378c428a2db38301ce libvorbis-1.3.5.tar.gz" +ARG XVID_SHA256SUM="4e9fd62728885855bc5007fe1be58df42e5e274497591fec37249e1052ae316f xvidcore-1.3.4.tar.gz" + RUN buildDeps="autoconf \ diff --git a/docker-images/3.2/alpine/Dockerfile b/docker-images/3.2/alpine/Dockerfile index 0f95b7e55..25be92720 100644 --- a/docker-images/3.2/alpine/Dockerfile +++ b/docker-images/3.2/alpine/Dockerfile @@ -18,38 +18,39 @@ ARG LD_LIBRARY_PATH=/opt/ffmpeg/lib ARG PREFIX=/opt/ffmpeg ARG MAKEFLAGS="-j2" -ENV FFMPEG_VERSION=3.2.14 \ - FDKAAC_VERSION=0.1.5 \ - LAME_VERSION=3.100 \ - LIBASS_VERSION=0.13.7 \ - OGG_VERSION=1.3.2 \ +ENV FFMPEG_VERSION=3.2.14 \ + AOM_VERSION=v1.0.0 \ + FDKAAC_VERSION=0.1.5 \ + FONTCONFIG_VERSION=2.12.4 \ + FREETYPE_VERSION=2.5.5 \ + FRIBIDI_VERSION=0.19.7 \ + KVAZAAR_VERSION=1.2.0 \ + LAME_VERSION=3.100 \ + LIBASS_VERSION=0.13.7 \ + LIBVIDSTAB_VERSION=1.1.0 \ + OGG_VERSION=1.3.2 \ OPENCOREAMR_VERSION=0.1.5 \ - OPUS_VERSION=1.2 \ - OPENJPEG_VERSION=2.1.2 \ - THEORA_VERSION=1.1.1 \ - VORBIS_VERSION=1.3.5 \ - VPX_VERSION=1.8.0 \ - WEBP_VERSION=1.0.2 \ + OPUS_VERSION=1.2 \ + OPENJPEG_VERSION=2.1.2 \ + THEORA_VERSION=1.1.1 \ + VORBIS_VERSION=1.3.5 \ + VPX_VERSION=1.8.0 \ + WEBP_VERSION=1.0.2 \ X264_VERSION=20170226-2245-stable \ - X265_VERSION=3.1.1 \ - XVID_VERSION=1.3.4 \ - FREETYPE_VERSION=2.5.5 \ - FRIBIDI_VERSION=0.19.7 \ - FONTCONFIG_VERSION=2.12.4 \ - LIBVIDSTAB_VERSION=1.1.0 \ - KVAZAAR_VERSION=1.2.0 \ - AOM_VERSION=v1.0.0 \ + X265_VERSION=3.1.1 \ + XVID_VERSION=1.3.4 \ SRC=/usr/local -ARG OGG_SHA256SUM="e19ee34711d7af328cb26287f4137e70630e7261b17cbe3cd41011d73a654692 libogg-1.3.2.tar.gz" -ARG OPUS_SHA256SUM="77db45a87b51578fbc49555ef1b10926179861d854eb2613207dc79d9ec0a9a9 opus-1.2.tar.gz" -ARG VORBIS_SHA256SUM="6efbcecdd3e5dfbf090341b485da9d176eb250d893e3eb378c428a2db38301ce libvorbis-1.3.5.tar.gz" -ARG THEORA_SHA256SUM="40952956c47811928d1e7922cda3bc1f427eb75680c3c37249c91e949054916b libtheora-1.1.1.tar.gz" -ARG XVID_SHA256SUM="4e9fd62728885855bc5007fe1be58df42e5e274497591fec37249e1052ae316f xvidcore-1.3.4.tar.gz" -ARG FREETYPE_SHA256SUM="5d03dd76c2171a7601e9ce10551d52d4471cf92cd205948e60289251daddffa8 freetype-2.5.5.tar.gz" -ARG LIBVIDSTAB_SHA256SUM="14d2a053e56edad4f397be0cb3ef8eb1ec3150404ce99a426c4eb641861dc0bb v1.1.0.tar.gz" -ARG LIBASS_SHA256SUM="8fadf294bf701300d4605e6f1d92929304187fca4b8d8a47889315526adbafd7 0.13.7.tar.gz" -ARG FRIBIDI_SHA256SUM="3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 0.19.7.tar.gz" +ARG FREETYPE_SHA256SUM="5d03dd76c2171a7601e9ce10551d52d4471cf92cd205948e60289251daddffa8 freetype-2.5.5.tar.gz" +ARG FRIBIDI_SHA256SUM="3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 0.19.7.tar.gz" +ARG LIBASS_SHA256SUM="8fadf294bf701300d4605e6f1d92929304187fca4b8d8a47889315526adbafd7 0.13.7.tar.gz" +ARG LIBVIDSTAB_SHA256SUM="14d2a053e56edad4f397be0cb3ef8eb1ec3150404ce99a426c4eb641861dc0bb v1.1.0.tar.gz" +ARG OGG_SHA256SUM="e19ee34711d7af328cb26287f4137e70630e7261b17cbe3cd41011d73a654692 libogg-1.3.2.tar.gz" +ARG OPUS_SHA256SUM="77db45a87b51578fbc49555ef1b10926179861d854eb2613207dc79d9ec0a9a9 opus-1.2.tar.gz" +ARG THEORA_SHA256SUM="40952956c47811928d1e7922cda3bc1f427eb75680c3c37249c91e949054916b libtheora-1.1.1.tar.gz" +ARG VORBIS_SHA256SUM="6efbcecdd3e5dfbf090341b485da9d176eb250d893e3eb378c428a2db38301ce libvorbis-1.3.5.tar.gz" +ARG XVID_SHA256SUM="4e9fd62728885855bc5007fe1be58df42e5e274497591fec37249e1052ae316f xvidcore-1.3.4.tar.gz" + RUN buildDeps="autoconf \ diff --git a/docker-images/3.2/centos/Dockerfile b/docker-images/3.2/centos/Dockerfile index 3faef4a3f..4dc6acf1b 100644 --- a/docker-images/3.2/centos/Dockerfile +++ b/docker-images/3.2/centos/Dockerfile @@ -20,38 +20,39 @@ ARG LD_LIBRARY_PATH=/opt/ffmpeg/lib ARG PREFIX=/opt/ffmpeg ARG MAKEFLAGS="-j2" -ENV FFMPEG_VERSION=3.2.14 \ - FDKAAC_VERSION=0.1.5 \ - LAME_VERSION=3.100 \ - LIBASS_VERSION=0.13.7 \ - OGG_VERSION=1.3.2 \ +ENV FFMPEG_VERSION=3.2.14 \ + AOM_VERSION=v1.0.0 \ + FDKAAC_VERSION=0.1.5 \ + FONTCONFIG_VERSION=2.12.4 \ + FREETYPE_VERSION=2.5.5 \ + FRIBIDI_VERSION=0.19.7 \ + KVAZAAR_VERSION=1.2.0 \ + LAME_VERSION=3.100 \ + LIBASS_VERSION=0.13.7 \ + LIBVIDSTAB_VERSION=1.1.0 \ + OGG_VERSION=1.3.2 \ OPENCOREAMR_VERSION=0.1.5 \ - OPUS_VERSION=1.2 \ - OPENJPEG_VERSION=2.1.2 \ - THEORA_VERSION=1.1.1 \ - VORBIS_VERSION=1.3.5 \ - VPX_VERSION=1.8.0 \ - WEBP_VERSION=1.0.2 \ + OPUS_VERSION=1.2 \ + OPENJPEG_VERSION=2.1.2 \ + THEORA_VERSION=1.1.1 \ + VORBIS_VERSION=1.3.5 \ + VPX_VERSION=1.8.0 \ + WEBP_VERSION=1.0.2 \ X264_VERSION=20170226-2245-stable \ - X265_VERSION=3.1.1 \ - XVID_VERSION=1.3.4 \ - FREETYPE_VERSION=2.5.5 \ - FRIBIDI_VERSION=0.19.7 \ - FONTCONFIG_VERSION=2.12.4 \ - LIBVIDSTAB_VERSION=1.1.0 \ - KVAZAAR_VERSION=1.2.0 \ - AOM_VERSION=v1.0.0 \ + X265_VERSION=3.1.1 \ + XVID_VERSION=1.3.4 \ SRC=/usr/local -ARG OGG_SHA256SUM="e19ee34711d7af328cb26287f4137e70630e7261b17cbe3cd41011d73a654692 libogg-1.3.2.tar.gz" -ARG OPUS_SHA256SUM="77db45a87b51578fbc49555ef1b10926179861d854eb2613207dc79d9ec0a9a9 opus-1.2.tar.gz" -ARG VORBIS_SHA256SUM="6efbcecdd3e5dfbf090341b485da9d176eb250d893e3eb378c428a2db38301ce libvorbis-1.3.5.tar.gz" -ARG THEORA_SHA256SUM="40952956c47811928d1e7922cda3bc1f427eb75680c3c37249c91e949054916b libtheora-1.1.1.tar.gz" -ARG XVID_SHA256SUM="4e9fd62728885855bc5007fe1be58df42e5e274497591fec37249e1052ae316f xvidcore-1.3.4.tar.gz" -ARG FREETYPE_SHA256SUM="5d03dd76c2171a7601e9ce10551d52d4471cf92cd205948e60289251daddffa8 freetype-2.5.5.tar.gz" -ARG LIBVIDSTAB_SHA256SUM="14d2a053e56edad4f397be0cb3ef8eb1ec3150404ce99a426c4eb641861dc0bb v1.1.0.tar.gz" -ARG LIBASS_SHA256SUM="8fadf294bf701300d4605e6f1d92929304187fca4b8d8a47889315526adbafd7 0.13.7.tar.gz" -ARG FRIBIDI_SHA256SUM="3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 0.19.7.tar.gz" +ARG FREETYPE_SHA256SUM="5d03dd76c2171a7601e9ce10551d52d4471cf92cd205948e60289251daddffa8 freetype-2.5.5.tar.gz" +ARG FRIBIDI_SHA256SUM="3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 0.19.7.tar.gz" +ARG LIBASS_SHA256SUM="8fadf294bf701300d4605e6f1d92929304187fca4b8d8a47889315526adbafd7 0.13.7.tar.gz" +ARG LIBVIDSTAB_SHA256SUM="14d2a053e56edad4f397be0cb3ef8eb1ec3150404ce99a426c4eb641861dc0bb v1.1.0.tar.gz" +ARG OGG_SHA256SUM="e19ee34711d7af328cb26287f4137e70630e7261b17cbe3cd41011d73a654692 libogg-1.3.2.tar.gz" +ARG OPUS_SHA256SUM="77db45a87b51578fbc49555ef1b10926179861d854eb2613207dc79d9ec0a9a9 opus-1.2.tar.gz" +ARG THEORA_SHA256SUM="40952956c47811928d1e7922cda3bc1f427eb75680c3c37249c91e949054916b libtheora-1.1.1.tar.gz" +ARG VORBIS_SHA256SUM="6efbcecdd3e5dfbf090341b485da9d176eb250d893e3eb378c428a2db38301ce libvorbis-1.3.5.tar.gz" +ARG XVID_SHA256SUM="4e9fd62728885855bc5007fe1be58df42e5e274497591fec37249e1052ae316f xvidcore-1.3.4.tar.gz" + RUN buildDeps="autoconf \ diff --git a/docker-images/3.2/nvidia/Dockerfile b/docker-images/3.2/nvidia/Dockerfile index e86e819f3..c66509ca6 100644 --- a/docker-images/3.2/nvidia/Dockerfile +++ b/docker-images/3.2/nvidia/Dockerfile @@ -35,38 +35,39 @@ ENV LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/opt/ffmpeg/lib" ARG PREFIX=/opt/ffmpeg ARG MAKEFLAGS="-j12" -ENV FFMPEG_VERSION=3.2.14 \ - FDKAAC_VERSION=0.1.5 \ - LAME_VERSION=3.100 \ - LIBASS_VERSION=0.13.7 \ - OGG_VERSION=1.3.2 \ +ENV FFMPEG_VERSION=3.2.14 \ + AOM_VERSION=v1.0.0 \ + FDKAAC_VERSION=0.1.5 \ + FONTCONFIG_VERSION=2.12.4 \ + FREETYPE_VERSION=2.5.5 \ + FRIBIDI_VERSION=0.19.7 \ + KVAZAAR_VERSION=1.2.0 \ + LAME_VERSION=3.100 \ + LIBASS_VERSION=0.13.7 \ + LIBVIDSTAB_VERSION=1.1.0 \ + OGG_VERSION=1.3.2 \ OPENCOREAMR_VERSION=0.1.5 \ - OPUS_VERSION=1.2 \ - OPENJPEG_VERSION=2.1.2 \ - THEORA_VERSION=1.1.1 \ - VORBIS_VERSION=1.3.5 \ - VPX_VERSION=1.8.0 \ - WEBP_VERSION=1.0.2 \ + OPUS_VERSION=1.2 \ + OPENJPEG_VERSION=2.1.2 \ + THEORA_VERSION=1.1.1 \ + VORBIS_VERSION=1.3.5 \ + VPX_VERSION=1.8.0 \ + WEBP_VERSION=1.0.2 \ X264_VERSION=20170226-2245-stable \ - X265_VERSION=3.1.1 \ - XVID_VERSION=1.3.4 \ - FREETYPE_VERSION=2.5.5 \ - FRIBIDI_VERSION=0.19.7 \ - FONTCONFIG_VERSION=2.12.4 \ - LIBVIDSTAB_VERSION=1.1.0 \ - KVAZAAR_VERSION=1.2.0 \ - AOM_VERSION=v1.0.0 \ + X265_VERSION=3.1.1 \ + XVID_VERSION=1.3.4 \ SRC=/usr/local -ARG OGG_SHA256SUM="e19ee34711d7af328cb26287f4137e70630e7261b17cbe3cd41011d73a654692 libogg-1.3.2.tar.gz" -ARG OPUS_SHA256SUM="77db45a87b51578fbc49555ef1b10926179861d854eb2613207dc79d9ec0a9a9 opus-1.2.tar.gz" -ARG VORBIS_SHA256SUM="6efbcecdd3e5dfbf090341b485da9d176eb250d893e3eb378c428a2db38301ce libvorbis-1.3.5.tar.gz" -ARG THEORA_SHA256SUM="40952956c47811928d1e7922cda3bc1f427eb75680c3c37249c91e949054916b libtheora-1.1.1.tar.gz" -ARG XVID_SHA256SUM="4e9fd62728885855bc5007fe1be58df42e5e274497591fec37249e1052ae316f xvidcore-1.3.4.tar.gz" -ARG FREETYPE_SHA256SUM="5d03dd76c2171a7601e9ce10551d52d4471cf92cd205948e60289251daddffa8 freetype-2.5.5.tar.gz" -ARG LIBVIDSTAB_SHA256SUM="14d2a053e56edad4f397be0cb3ef8eb1ec3150404ce99a426c4eb641861dc0bb v1.1.0.tar.gz" -ARG LIBASS_SHA256SUM="8fadf294bf701300d4605e6f1d92929304187fca4b8d8a47889315526adbafd7 0.13.7.tar.gz" -ARG FRIBIDI_SHA256SUM="3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 0.19.7.tar.gz" +ARG FREETYPE_SHA256SUM="5d03dd76c2171a7601e9ce10551d52d4471cf92cd205948e60289251daddffa8 freetype-2.5.5.tar.gz" +ARG FRIBIDI_SHA256SUM="3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 0.19.7.tar.gz" +ARG LIBASS_SHA256SUM="8fadf294bf701300d4605e6f1d92929304187fca4b8d8a47889315526adbafd7 0.13.7.tar.gz" +ARG LIBVIDSTAB_SHA256SUM="14d2a053e56edad4f397be0cb3ef8eb1ec3150404ce99a426c4eb641861dc0bb v1.1.0.tar.gz" +ARG OGG_SHA256SUM="e19ee34711d7af328cb26287f4137e70630e7261b17cbe3cd41011d73a654692 libogg-1.3.2.tar.gz" +ARG OPUS_SHA256SUM="77db45a87b51578fbc49555ef1b10926179861d854eb2613207dc79d9ec0a9a9 opus-1.2.tar.gz" +ARG THEORA_SHA256SUM="40952956c47811928d1e7922cda3bc1f427eb75680c3c37249c91e949054916b libtheora-1.1.1.tar.gz" +ARG VORBIS_SHA256SUM="6efbcecdd3e5dfbf090341b485da9d176eb250d893e3eb378c428a2db38301ce libvorbis-1.3.5.tar.gz" +ARG XVID_SHA256SUM="4e9fd62728885855bc5007fe1be58df42e5e274497591fec37249e1052ae316f xvidcore-1.3.4.tar.gz" + RUN buildDeps="autoconf \ diff --git a/docker-images/3.2/scratch/Dockerfile b/docker-images/3.2/scratch/Dockerfile index 587826b03..b67168102 100644 --- a/docker-images/3.2/scratch/Dockerfile +++ b/docker-images/3.2/scratch/Dockerfile @@ -13,38 +13,39 @@ ARG LD_LIBRARY_PATH=/opt/ffmpeg/lib ARG PREFIX=/opt/ffmpeg ARG MAKEFLAGS="-j2" -ENV FFMPEG_VERSION=3.2.14 \ - FDKAAC_VERSION=0.1.5 \ - LAME_VERSION=3.100 \ - LIBASS_VERSION=0.13.7 \ - OGG_VERSION=1.3.2 \ +ENV FFMPEG_VERSION=3.2.14 \ + AOM_VERSION=v1.0.0 \ + FDKAAC_VERSION=0.1.5 \ + FONTCONFIG_VERSION=2.12.4 \ + FREETYPE_VERSION=2.5.5 \ + FRIBIDI_VERSION=0.19.7 \ + KVAZAAR_VERSION=1.2.0 \ + LAME_VERSION=3.100 \ + LIBASS_VERSION=0.13.7 \ + LIBVIDSTAB_VERSION=1.1.0 \ + OGG_VERSION=1.3.2 \ OPENCOREAMR_VERSION=0.1.5 \ - OPUS_VERSION=1.2 \ - OPENJPEG_VERSION=2.1.2 \ - THEORA_VERSION=1.1.1 \ - VORBIS_VERSION=1.3.5 \ - VPX_VERSION=1.8.0 \ - WEBP_VERSION=1.0.2 \ + OPUS_VERSION=1.2 \ + OPENJPEG_VERSION=2.1.2 \ + THEORA_VERSION=1.1.1 \ + VORBIS_VERSION=1.3.5 \ + VPX_VERSION=1.8.0 \ + WEBP_VERSION=1.0.2 \ X264_VERSION=20170226-2245-stable \ - X265_VERSION=3.1.1 \ - XVID_VERSION=1.3.4 \ - FREETYPE_VERSION=2.5.5 \ - FRIBIDI_VERSION=0.19.7 \ - FONTCONFIG_VERSION=2.12.4 \ - LIBVIDSTAB_VERSION=1.1.0 \ - KVAZAAR_VERSION=1.2.0 \ - AOM_VERSION=v1.0.0 \ + X265_VERSION=3.1.1 \ + XVID_VERSION=1.3.4 \ SRC=/usr/local -ARG OGG_SHA256SUM="e19ee34711d7af328cb26287f4137e70630e7261b17cbe3cd41011d73a654692 libogg-1.3.2.tar.gz" -ARG OPUS_SHA256SUM="77db45a87b51578fbc49555ef1b10926179861d854eb2613207dc79d9ec0a9a9 opus-1.2.tar.gz" -ARG VORBIS_SHA256SUM="6efbcecdd3e5dfbf090341b485da9d176eb250d893e3eb378c428a2db38301ce libvorbis-1.3.5.tar.gz" -ARG THEORA_SHA256SUM="40952956c47811928d1e7922cda3bc1f427eb75680c3c37249c91e949054916b libtheora-1.1.1.tar.gz" -ARG XVID_SHA256SUM="4e9fd62728885855bc5007fe1be58df42e5e274497591fec37249e1052ae316f xvidcore-1.3.4.tar.gz" -ARG FREETYPE_SHA256SUM="5d03dd76c2171a7601e9ce10551d52d4471cf92cd205948e60289251daddffa8 freetype-2.5.5.tar.gz" -ARG LIBVIDSTAB_SHA256SUM="14d2a053e56edad4f397be0cb3ef8eb1ec3150404ce99a426c4eb641861dc0bb v1.1.0.tar.gz" -ARG LIBASS_SHA256SUM="8fadf294bf701300d4605e6f1d92929304187fca4b8d8a47889315526adbafd7 0.13.7.tar.gz" -ARG FRIBIDI_SHA256SUM="3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 0.19.7.tar.gz" +ARG FREETYPE_SHA256SUM="5d03dd76c2171a7601e9ce10551d52d4471cf92cd205948e60289251daddffa8 freetype-2.5.5.tar.gz" +ARG FRIBIDI_SHA256SUM="3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 0.19.7.tar.gz" +ARG LIBASS_SHA256SUM="8fadf294bf701300d4605e6f1d92929304187fca4b8d8a47889315526adbafd7 0.13.7.tar.gz" +ARG LIBVIDSTAB_SHA256SUM="14d2a053e56edad4f397be0cb3ef8eb1ec3150404ce99a426c4eb641861dc0bb v1.1.0.tar.gz" +ARG OGG_SHA256SUM="e19ee34711d7af328cb26287f4137e70630e7261b17cbe3cd41011d73a654692 libogg-1.3.2.tar.gz" +ARG OPUS_SHA256SUM="77db45a87b51578fbc49555ef1b10926179861d854eb2613207dc79d9ec0a9a9 opus-1.2.tar.gz" +ARG THEORA_SHA256SUM="40952956c47811928d1e7922cda3bc1f427eb75680c3c37249c91e949054916b libtheora-1.1.1.tar.gz" +ARG VORBIS_SHA256SUM="6efbcecdd3e5dfbf090341b485da9d176eb250d893e3eb378c428a2db38301ce libvorbis-1.3.5.tar.gz" +ARG XVID_SHA256SUM="4e9fd62728885855bc5007fe1be58df42e5e274497591fec37249e1052ae316f xvidcore-1.3.4.tar.gz" + RUN buildDeps="autoconf \ diff --git a/docker-images/3.2/ubuntu/Dockerfile b/docker-images/3.2/ubuntu/Dockerfile index 29ef1ab95..c4208f66d 100644 --- a/docker-images/3.2/ubuntu/Dockerfile +++ b/docker-images/3.2/ubuntu/Dockerfile @@ -21,38 +21,39 @@ ARG LD_LIBRARY_PATH=/opt/ffmpeg/lib ARG PREFIX=/opt/ffmpeg ARG MAKEFLAGS="-j2" -ENV FFMPEG_VERSION=3.2.14 \ - FDKAAC_VERSION=0.1.5 \ - LAME_VERSION=3.100 \ - LIBASS_VERSION=0.13.7 \ - OGG_VERSION=1.3.2 \ +ENV FFMPEG_VERSION=3.2.14 \ + AOM_VERSION=v1.0.0 \ + FDKAAC_VERSION=0.1.5 \ + FONTCONFIG_VERSION=2.12.4 \ + FREETYPE_VERSION=2.5.5 \ + FRIBIDI_VERSION=0.19.7 \ + KVAZAAR_VERSION=1.2.0 \ + LAME_VERSION=3.100 \ + LIBASS_VERSION=0.13.7 \ + LIBVIDSTAB_VERSION=1.1.0 \ + OGG_VERSION=1.3.2 \ OPENCOREAMR_VERSION=0.1.5 \ - OPUS_VERSION=1.2 \ - OPENJPEG_VERSION=2.1.2 \ - THEORA_VERSION=1.1.1 \ - VORBIS_VERSION=1.3.5 \ - VPX_VERSION=1.8.0 \ - WEBP_VERSION=1.0.2 \ + OPUS_VERSION=1.2 \ + OPENJPEG_VERSION=2.1.2 \ + THEORA_VERSION=1.1.1 \ + VORBIS_VERSION=1.3.5 \ + VPX_VERSION=1.8.0 \ + WEBP_VERSION=1.0.2 \ X264_VERSION=20170226-2245-stable \ - X265_VERSION=3.1.1 \ - XVID_VERSION=1.3.4 \ - FREETYPE_VERSION=2.5.5 \ - FRIBIDI_VERSION=0.19.7 \ - FONTCONFIG_VERSION=2.12.4 \ - LIBVIDSTAB_VERSION=1.1.0 \ - KVAZAAR_VERSION=1.2.0 \ - AOM_VERSION=v1.0.0 \ + X265_VERSION=3.1.1 \ + XVID_VERSION=1.3.4 \ SRC=/usr/local -ARG OGG_SHA256SUM="e19ee34711d7af328cb26287f4137e70630e7261b17cbe3cd41011d73a654692 libogg-1.3.2.tar.gz" -ARG OPUS_SHA256SUM="77db45a87b51578fbc49555ef1b10926179861d854eb2613207dc79d9ec0a9a9 opus-1.2.tar.gz" -ARG VORBIS_SHA256SUM="6efbcecdd3e5dfbf090341b485da9d176eb250d893e3eb378c428a2db38301ce libvorbis-1.3.5.tar.gz" -ARG THEORA_SHA256SUM="40952956c47811928d1e7922cda3bc1f427eb75680c3c37249c91e949054916b libtheora-1.1.1.tar.gz" -ARG XVID_SHA256SUM="4e9fd62728885855bc5007fe1be58df42e5e274497591fec37249e1052ae316f xvidcore-1.3.4.tar.gz" -ARG FREETYPE_SHA256SUM="5d03dd76c2171a7601e9ce10551d52d4471cf92cd205948e60289251daddffa8 freetype-2.5.5.tar.gz" -ARG LIBVIDSTAB_SHA256SUM="14d2a053e56edad4f397be0cb3ef8eb1ec3150404ce99a426c4eb641861dc0bb v1.1.0.tar.gz" -ARG LIBASS_SHA256SUM="8fadf294bf701300d4605e6f1d92929304187fca4b8d8a47889315526adbafd7 0.13.7.tar.gz" -ARG FRIBIDI_SHA256SUM="3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 0.19.7.tar.gz" +ARG FREETYPE_SHA256SUM="5d03dd76c2171a7601e9ce10551d52d4471cf92cd205948e60289251daddffa8 freetype-2.5.5.tar.gz" +ARG FRIBIDI_SHA256SUM="3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 0.19.7.tar.gz" +ARG LIBASS_SHA256SUM="8fadf294bf701300d4605e6f1d92929304187fca4b8d8a47889315526adbafd7 0.13.7.tar.gz" +ARG LIBVIDSTAB_SHA256SUM="14d2a053e56edad4f397be0cb3ef8eb1ec3150404ce99a426c4eb641861dc0bb v1.1.0.tar.gz" +ARG OGG_SHA256SUM="e19ee34711d7af328cb26287f4137e70630e7261b17cbe3cd41011d73a654692 libogg-1.3.2.tar.gz" +ARG OPUS_SHA256SUM="77db45a87b51578fbc49555ef1b10926179861d854eb2613207dc79d9ec0a9a9 opus-1.2.tar.gz" +ARG THEORA_SHA256SUM="40952956c47811928d1e7922cda3bc1f427eb75680c3c37249c91e949054916b libtheora-1.1.1.tar.gz" +ARG VORBIS_SHA256SUM="6efbcecdd3e5dfbf090341b485da9d176eb250d893e3eb378c428a2db38301ce libvorbis-1.3.5.tar.gz" +ARG XVID_SHA256SUM="4e9fd62728885855bc5007fe1be58df42e5e274497591fec37249e1052ae316f xvidcore-1.3.4.tar.gz" + RUN buildDeps="autoconf \ diff --git a/docker-images/3.2/vaapi/Dockerfile b/docker-images/3.2/vaapi/Dockerfile index eeb826e7a..a32542437 100644 --- a/docker-images/3.2/vaapi/Dockerfile +++ b/docker-images/3.2/vaapi/Dockerfile @@ -21,38 +21,39 @@ ARG LD_LIBRARY_PATH=/opt/ffmpeg/lib ARG PREFIX=/opt/ffmpeg ARG MAKEFLAGS="-j2" -ENV FFMPEG_VERSION=3.2.14 \ - FDKAAC_VERSION=0.1.5 \ - LAME_VERSION=3.100 \ - LIBASS_VERSION=0.13.7 \ - OGG_VERSION=1.3.2 \ +ENV FFMPEG_VERSION=3.2.14 \ + AOM_VERSION=v1.0.0 \ + FDKAAC_VERSION=0.1.5 \ + FONTCONFIG_VERSION=2.12.4 \ + FREETYPE_VERSION=2.5.5 \ + FRIBIDI_VERSION=0.19.7 \ + KVAZAAR_VERSION=1.2.0 \ + LAME_VERSION=3.100 \ + LIBASS_VERSION=0.13.7 \ + LIBVIDSTAB_VERSION=1.1.0 \ + OGG_VERSION=1.3.2 \ OPENCOREAMR_VERSION=0.1.5 \ - OPUS_VERSION=1.2 \ - OPENJPEG_VERSION=2.1.2 \ - THEORA_VERSION=1.1.1 \ - VORBIS_VERSION=1.3.5 \ - VPX_VERSION=1.8.0 \ - WEBP_VERSION=1.0.2 \ + OPUS_VERSION=1.2 \ + OPENJPEG_VERSION=2.1.2 \ + THEORA_VERSION=1.1.1 \ + VORBIS_VERSION=1.3.5 \ + VPX_VERSION=1.8.0 \ + WEBP_VERSION=1.0.2 \ X264_VERSION=20170226-2245-stable \ - X265_VERSION=3.1.1 \ - XVID_VERSION=1.3.4 \ - FREETYPE_VERSION=2.5.5 \ - FRIBIDI_VERSION=0.19.7 \ - FONTCONFIG_VERSION=2.12.4 \ - LIBVIDSTAB_VERSION=1.1.0 \ - KVAZAAR_VERSION=1.2.0 \ - AOM_VERSION=v1.0.0 \ + X265_VERSION=3.1.1 \ + XVID_VERSION=1.3.4 \ SRC=/usr/local -ARG OGG_SHA256SUM="e19ee34711d7af328cb26287f4137e70630e7261b17cbe3cd41011d73a654692 libogg-1.3.2.tar.gz" -ARG OPUS_SHA256SUM="77db45a87b51578fbc49555ef1b10926179861d854eb2613207dc79d9ec0a9a9 opus-1.2.tar.gz" -ARG VORBIS_SHA256SUM="6efbcecdd3e5dfbf090341b485da9d176eb250d893e3eb378c428a2db38301ce libvorbis-1.3.5.tar.gz" -ARG THEORA_SHA256SUM="40952956c47811928d1e7922cda3bc1f427eb75680c3c37249c91e949054916b libtheora-1.1.1.tar.gz" -ARG XVID_SHA256SUM="4e9fd62728885855bc5007fe1be58df42e5e274497591fec37249e1052ae316f xvidcore-1.3.4.tar.gz" -ARG FREETYPE_SHA256SUM="5d03dd76c2171a7601e9ce10551d52d4471cf92cd205948e60289251daddffa8 freetype-2.5.5.tar.gz" -ARG LIBVIDSTAB_SHA256SUM="14d2a053e56edad4f397be0cb3ef8eb1ec3150404ce99a426c4eb641861dc0bb v1.1.0.tar.gz" -ARG LIBASS_SHA256SUM="8fadf294bf701300d4605e6f1d92929304187fca4b8d8a47889315526adbafd7 0.13.7.tar.gz" -ARG FRIBIDI_SHA256SUM="3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 0.19.7.tar.gz" +ARG FREETYPE_SHA256SUM="5d03dd76c2171a7601e9ce10551d52d4471cf92cd205948e60289251daddffa8 freetype-2.5.5.tar.gz" +ARG FRIBIDI_SHA256SUM="3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 0.19.7.tar.gz" +ARG LIBASS_SHA256SUM="8fadf294bf701300d4605e6f1d92929304187fca4b8d8a47889315526adbafd7 0.13.7.tar.gz" +ARG LIBVIDSTAB_SHA256SUM="14d2a053e56edad4f397be0cb3ef8eb1ec3150404ce99a426c4eb641861dc0bb v1.1.0.tar.gz" +ARG OGG_SHA256SUM="e19ee34711d7af328cb26287f4137e70630e7261b17cbe3cd41011d73a654692 libogg-1.3.2.tar.gz" +ARG OPUS_SHA256SUM="77db45a87b51578fbc49555ef1b10926179861d854eb2613207dc79d9ec0a9a9 opus-1.2.tar.gz" +ARG THEORA_SHA256SUM="40952956c47811928d1e7922cda3bc1f427eb75680c3c37249c91e949054916b libtheora-1.1.1.tar.gz" +ARG VORBIS_SHA256SUM="6efbcecdd3e5dfbf090341b485da9d176eb250d893e3eb378c428a2db38301ce libvorbis-1.3.5.tar.gz" +ARG XVID_SHA256SUM="4e9fd62728885855bc5007fe1be58df42e5e274497591fec37249e1052ae316f xvidcore-1.3.4.tar.gz" + RUN buildDeps="autoconf \ diff --git a/docker-images/3.3/alpine/Dockerfile b/docker-images/3.3/alpine/Dockerfile index 8c7c09ff0..ea4f6b9d0 100644 --- a/docker-images/3.3/alpine/Dockerfile +++ b/docker-images/3.3/alpine/Dockerfile @@ -18,38 +18,39 @@ ARG LD_LIBRARY_PATH=/opt/ffmpeg/lib ARG PREFIX=/opt/ffmpeg ARG MAKEFLAGS="-j2" -ENV FFMPEG_VERSION=3.3.9 \ - FDKAAC_VERSION=0.1.5 \ - LAME_VERSION=3.100 \ - LIBASS_VERSION=0.13.7 \ - OGG_VERSION=1.3.2 \ +ENV FFMPEG_VERSION=3.3.9 \ + AOM_VERSION=v1.0.0 \ + FDKAAC_VERSION=0.1.5 \ + FONTCONFIG_VERSION=2.12.4 \ + FREETYPE_VERSION=2.5.5 \ + FRIBIDI_VERSION=0.19.7 \ + KVAZAAR_VERSION=1.2.0 \ + LAME_VERSION=3.100 \ + LIBASS_VERSION=0.13.7 \ + LIBVIDSTAB_VERSION=1.1.0 \ + OGG_VERSION=1.3.2 \ OPENCOREAMR_VERSION=0.1.5 \ - OPUS_VERSION=1.2 \ - OPENJPEG_VERSION=2.1.2 \ - THEORA_VERSION=1.1.1 \ - VORBIS_VERSION=1.3.5 \ - VPX_VERSION=1.8.0 \ - WEBP_VERSION=1.0.2 \ + OPUS_VERSION=1.2 \ + OPENJPEG_VERSION=2.1.2 \ + THEORA_VERSION=1.1.1 \ + VORBIS_VERSION=1.3.5 \ + VPX_VERSION=1.8.0 \ + WEBP_VERSION=1.0.2 \ X264_VERSION=20170226-2245-stable \ - X265_VERSION=3.1.1 \ - XVID_VERSION=1.3.4 \ - FREETYPE_VERSION=2.5.5 \ - FRIBIDI_VERSION=0.19.7 \ - FONTCONFIG_VERSION=2.12.4 \ - LIBVIDSTAB_VERSION=1.1.0 \ - KVAZAAR_VERSION=1.2.0 \ - AOM_VERSION=v1.0.0 \ + X265_VERSION=3.1.1 \ + XVID_VERSION=1.3.4 \ SRC=/usr/local -ARG OGG_SHA256SUM="e19ee34711d7af328cb26287f4137e70630e7261b17cbe3cd41011d73a654692 libogg-1.3.2.tar.gz" -ARG OPUS_SHA256SUM="77db45a87b51578fbc49555ef1b10926179861d854eb2613207dc79d9ec0a9a9 opus-1.2.tar.gz" -ARG VORBIS_SHA256SUM="6efbcecdd3e5dfbf090341b485da9d176eb250d893e3eb378c428a2db38301ce libvorbis-1.3.5.tar.gz" -ARG THEORA_SHA256SUM="40952956c47811928d1e7922cda3bc1f427eb75680c3c37249c91e949054916b libtheora-1.1.1.tar.gz" -ARG XVID_SHA256SUM="4e9fd62728885855bc5007fe1be58df42e5e274497591fec37249e1052ae316f xvidcore-1.3.4.tar.gz" -ARG FREETYPE_SHA256SUM="5d03dd76c2171a7601e9ce10551d52d4471cf92cd205948e60289251daddffa8 freetype-2.5.5.tar.gz" -ARG LIBVIDSTAB_SHA256SUM="14d2a053e56edad4f397be0cb3ef8eb1ec3150404ce99a426c4eb641861dc0bb v1.1.0.tar.gz" -ARG LIBASS_SHA256SUM="8fadf294bf701300d4605e6f1d92929304187fca4b8d8a47889315526adbafd7 0.13.7.tar.gz" -ARG FRIBIDI_SHA256SUM="3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 0.19.7.tar.gz" +ARG FREETYPE_SHA256SUM="5d03dd76c2171a7601e9ce10551d52d4471cf92cd205948e60289251daddffa8 freetype-2.5.5.tar.gz" +ARG FRIBIDI_SHA256SUM="3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 0.19.7.tar.gz" +ARG LIBASS_SHA256SUM="8fadf294bf701300d4605e6f1d92929304187fca4b8d8a47889315526adbafd7 0.13.7.tar.gz" +ARG LIBVIDSTAB_SHA256SUM="14d2a053e56edad4f397be0cb3ef8eb1ec3150404ce99a426c4eb641861dc0bb v1.1.0.tar.gz" +ARG OGG_SHA256SUM="e19ee34711d7af328cb26287f4137e70630e7261b17cbe3cd41011d73a654692 libogg-1.3.2.tar.gz" +ARG OPUS_SHA256SUM="77db45a87b51578fbc49555ef1b10926179861d854eb2613207dc79d9ec0a9a9 opus-1.2.tar.gz" +ARG THEORA_SHA256SUM="40952956c47811928d1e7922cda3bc1f427eb75680c3c37249c91e949054916b libtheora-1.1.1.tar.gz" +ARG VORBIS_SHA256SUM="6efbcecdd3e5dfbf090341b485da9d176eb250d893e3eb378c428a2db38301ce libvorbis-1.3.5.tar.gz" +ARG XVID_SHA256SUM="4e9fd62728885855bc5007fe1be58df42e5e274497591fec37249e1052ae316f xvidcore-1.3.4.tar.gz" + RUN buildDeps="autoconf \ diff --git a/docker-images/3.3/centos/Dockerfile b/docker-images/3.3/centos/Dockerfile index 7cce23f76..e1d0cc662 100644 --- a/docker-images/3.3/centos/Dockerfile +++ b/docker-images/3.3/centos/Dockerfile @@ -20,38 +20,39 @@ ARG LD_LIBRARY_PATH=/opt/ffmpeg/lib ARG PREFIX=/opt/ffmpeg ARG MAKEFLAGS="-j2" -ENV FFMPEG_VERSION=3.3.9 \ - FDKAAC_VERSION=0.1.5 \ - LAME_VERSION=3.100 \ - LIBASS_VERSION=0.13.7 \ - OGG_VERSION=1.3.2 \ +ENV FFMPEG_VERSION=3.3.9 \ + AOM_VERSION=v1.0.0 \ + FDKAAC_VERSION=0.1.5 \ + FONTCONFIG_VERSION=2.12.4 \ + FREETYPE_VERSION=2.5.5 \ + FRIBIDI_VERSION=0.19.7 \ + KVAZAAR_VERSION=1.2.0 \ + LAME_VERSION=3.100 \ + LIBASS_VERSION=0.13.7 \ + LIBVIDSTAB_VERSION=1.1.0 \ + OGG_VERSION=1.3.2 \ OPENCOREAMR_VERSION=0.1.5 \ - OPUS_VERSION=1.2 \ - OPENJPEG_VERSION=2.1.2 \ - THEORA_VERSION=1.1.1 \ - VORBIS_VERSION=1.3.5 \ - VPX_VERSION=1.8.0 \ - WEBP_VERSION=1.0.2 \ + OPUS_VERSION=1.2 \ + OPENJPEG_VERSION=2.1.2 \ + THEORA_VERSION=1.1.1 \ + VORBIS_VERSION=1.3.5 \ + VPX_VERSION=1.8.0 \ + WEBP_VERSION=1.0.2 \ X264_VERSION=20170226-2245-stable \ - X265_VERSION=3.1.1 \ - XVID_VERSION=1.3.4 \ - FREETYPE_VERSION=2.5.5 \ - FRIBIDI_VERSION=0.19.7 \ - FONTCONFIG_VERSION=2.12.4 \ - LIBVIDSTAB_VERSION=1.1.0 \ - KVAZAAR_VERSION=1.2.0 \ - AOM_VERSION=v1.0.0 \ + X265_VERSION=3.1.1 \ + XVID_VERSION=1.3.4 \ SRC=/usr/local -ARG OGG_SHA256SUM="e19ee34711d7af328cb26287f4137e70630e7261b17cbe3cd41011d73a654692 libogg-1.3.2.tar.gz" -ARG OPUS_SHA256SUM="77db45a87b51578fbc49555ef1b10926179861d854eb2613207dc79d9ec0a9a9 opus-1.2.tar.gz" -ARG VORBIS_SHA256SUM="6efbcecdd3e5dfbf090341b485da9d176eb250d893e3eb378c428a2db38301ce libvorbis-1.3.5.tar.gz" -ARG THEORA_SHA256SUM="40952956c47811928d1e7922cda3bc1f427eb75680c3c37249c91e949054916b libtheora-1.1.1.tar.gz" -ARG XVID_SHA256SUM="4e9fd62728885855bc5007fe1be58df42e5e274497591fec37249e1052ae316f xvidcore-1.3.4.tar.gz" -ARG FREETYPE_SHA256SUM="5d03dd76c2171a7601e9ce10551d52d4471cf92cd205948e60289251daddffa8 freetype-2.5.5.tar.gz" -ARG LIBVIDSTAB_SHA256SUM="14d2a053e56edad4f397be0cb3ef8eb1ec3150404ce99a426c4eb641861dc0bb v1.1.0.tar.gz" -ARG LIBASS_SHA256SUM="8fadf294bf701300d4605e6f1d92929304187fca4b8d8a47889315526adbafd7 0.13.7.tar.gz" -ARG FRIBIDI_SHA256SUM="3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 0.19.7.tar.gz" +ARG FREETYPE_SHA256SUM="5d03dd76c2171a7601e9ce10551d52d4471cf92cd205948e60289251daddffa8 freetype-2.5.5.tar.gz" +ARG FRIBIDI_SHA256SUM="3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 0.19.7.tar.gz" +ARG LIBASS_SHA256SUM="8fadf294bf701300d4605e6f1d92929304187fca4b8d8a47889315526adbafd7 0.13.7.tar.gz" +ARG LIBVIDSTAB_SHA256SUM="14d2a053e56edad4f397be0cb3ef8eb1ec3150404ce99a426c4eb641861dc0bb v1.1.0.tar.gz" +ARG OGG_SHA256SUM="e19ee34711d7af328cb26287f4137e70630e7261b17cbe3cd41011d73a654692 libogg-1.3.2.tar.gz" +ARG OPUS_SHA256SUM="77db45a87b51578fbc49555ef1b10926179861d854eb2613207dc79d9ec0a9a9 opus-1.2.tar.gz" +ARG THEORA_SHA256SUM="40952956c47811928d1e7922cda3bc1f427eb75680c3c37249c91e949054916b libtheora-1.1.1.tar.gz" +ARG VORBIS_SHA256SUM="6efbcecdd3e5dfbf090341b485da9d176eb250d893e3eb378c428a2db38301ce libvorbis-1.3.5.tar.gz" +ARG XVID_SHA256SUM="4e9fd62728885855bc5007fe1be58df42e5e274497591fec37249e1052ae316f xvidcore-1.3.4.tar.gz" + RUN buildDeps="autoconf \ diff --git a/docker-images/3.3/nvidia/Dockerfile b/docker-images/3.3/nvidia/Dockerfile index d6fa62934..ee0c794b0 100644 --- a/docker-images/3.3/nvidia/Dockerfile +++ b/docker-images/3.3/nvidia/Dockerfile @@ -35,38 +35,39 @@ ENV LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/opt/ffmpeg/lib" ARG PREFIX=/opt/ffmpeg ARG MAKEFLAGS="-j12" -ENV FFMPEG_VERSION=3.3.9 \ - FDKAAC_VERSION=0.1.5 \ - LAME_VERSION=3.100 \ - LIBASS_VERSION=0.13.7 \ - OGG_VERSION=1.3.2 \ +ENV FFMPEG_VERSION=3.3.9 \ + AOM_VERSION=v1.0.0 \ + FDKAAC_VERSION=0.1.5 \ + FONTCONFIG_VERSION=2.12.4 \ + FREETYPE_VERSION=2.5.5 \ + FRIBIDI_VERSION=0.19.7 \ + KVAZAAR_VERSION=1.2.0 \ + LAME_VERSION=3.100 \ + LIBASS_VERSION=0.13.7 \ + LIBVIDSTAB_VERSION=1.1.0 \ + OGG_VERSION=1.3.2 \ OPENCOREAMR_VERSION=0.1.5 \ - OPUS_VERSION=1.2 \ - OPENJPEG_VERSION=2.1.2 \ - THEORA_VERSION=1.1.1 \ - VORBIS_VERSION=1.3.5 \ - VPX_VERSION=1.8.0 \ - WEBP_VERSION=1.0.2 \ + OPUS_VERSION=1.2 \ + OPENJPEG_VERSION=2.1.2 \ + THEORA_VERSION=1.1.1 \ + VORBIS_VERSION=1.3.5 \ + VPX_VERSION=1.8.0 \ + WEBP_VERSION=1.0.2 \ X264_VERSION=20170226-2245-stable \ - X265_VERSION=3.1.1 \ - XVID_VERSION=1.3.4 \ - FREETYPE_VERSION=2.5.5 \ - FRIBIDI_VERSION=0.19.7 \ - FONTCONFIG_VERSION=2.12.4 \ - LIBVIDSTAB_VERSION=1.1.0 \ - KVAZAAR_VERSION=1.2.0 \ - AOM_VERSION=v1.0.0 \ + X265_VERSION=3.1.1 \ + XVID_VERSION=1.3.4 \ SRC=/usr/local -ARG OGG_SHA256SUM="e19ee34711d7af328cb26287f4137e70630e7261b17cbe3cd41011d73a654692 libogg-1.3.2.tar.gz" -ARG OPUS_SHA256SUM="77db45a87b51578fbc49555ef1b10926179861d854eb2613207dc79d9ec0a9a9 opus-1.2.tar.gz" -ARG VORBIS_SHA256SUM="6efbcecdd3e5dfbf090341b485da9d176eb250d893e3eb378c428a2db38301ce libvorbis-1.3.5.tar.gz" -ARG THEORA_SHA256SUM="40952956c47811928d1e7922cda3bc1f427eb75680c3c37249c91e949054916b libtheora-1.1.1.tar.gz" -ARG XVID_SHA256SUM="4e9fd62728885855bc5007fe1be58df42e5e274497591fec37249e1052ae316f xvidcore-1.3.4.tar.gz" -ARG FREETYPE_SHA256SUM="5d03dd76c2171a7601e9ce10551d52d4471cf92cd205948e60289251daddffa8 freetype-2.5.5.tar.gz" -ARG LIBVIDSTAB_SHA256SUM="14d2a053e56edad4f397be0cb3ef8eb1ec3150404ce99a426c4eb641861dc0bb v1.1.0.tar.gz" -ARG LIBASS_SHA256SUM="8fadf294bf701300d4605e6f1d92929304187fca4b8d8a47889315526adbafd7 0.13.7.tar.gz" -ARG FRIBIDI_SHA256SUM="3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 0.19.7.tar.gz" +ARG FREETYPE_SHA256SUM="5d03dd76c2171a7601e9ce10551d52d4471cf92cd205948e60289251daddffa8 freetype-2.5.5.tar.gz" +ARG FRIBIDI_SHA256SUM="3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 0.19.7.tar.gz" +ARG LIBASS_SHA256SUM="8fadf294bf701300d4605e6f1d92929304187fca4b8d8a47889315526adbafd7 0.13.7.tar.gz" +ARG LIBVIDSTAB_SHA256SUM="14d2a053e56edad4f397be0cb3ef8eb1ec3150404ce99a426c4eb641861dc0bb v1.1.0.tar.gz" +ARG OGG_SHA256SUM="e19ee34711d7af328cb26287f4137e70630e7261b17cbe3cd41011d73a654692 libogg-1.3.2.tar.gz" +ARG OPUS_SHA256SUM="77db45a87b51578fbc49555ef1b10926179861d854eb2613207dc79d9ec0a9a9 opus-1.2.tar.gz" +ARG THEORA_SHA256SUM="40952956c47811928d1e7922cda3bc1f427eb75680c3c37249c91e949054916b libtheora-1.1.1.tar.gz" +ARG VORBIS_SHA256SUM="6efbcecdd3e5dfbf090341b485da9d176eb250d893e3eb378c428a2db38301ce libvorbis-1.3.5.tar.gz" +ARG XVID_SHA256SUM="4e9fd62728885855bc5007fe1be58df42e5e274497591fec37249e1052ae316f xvidcore-1.3.4.tar.gz" + RUN buildDeps="autoconf \ diff --git a/docker-images/3.3/scratch/Dockerfile b/docker-images/3.3/scratch/Dockerfile index 5a18deced..e499b6073 100644 --- a/docker-images/3.3/scratch/Dockerfile +++ b/docker-images/3.3/scratch/Dockerfile @@ -13,38 +13,39 @@ ARG LD_LIBRARY_PATH=/opt/ffmpeg/lib ARG PREFIX=/opt/ffmpeg ARG MAKEFLAGS="-j2" -ENV FFMPEG_VERSION=3.3.9 \ - FDKAAC_VERSION=0.1.5 \ - LAME_VERSION=3.100 \ - LIBASS_VERSION=0.13.7 \ - OGG_VERSION=1.3.2 \ +ENV FFMPEG_VERSION=3.3.9 \ + AOM_VERSION=v1.0.0 \ + FDKAAC_VERSION=0.1.5 \ + FONTCONFIG_VERSION=2.12.4 \ + FREETYPE_VERSION=2.5.5 \ + FRIBIDI_VERSION=0.19.7 \ + KVAZAAR_VERSION=1.2.0 \ + LAME_VERSION=3.100 \ + LIBASS_VERSION=0.13.7 \ + LIBVIDSTAB_VERSION=1.1.0 \ + OGG_VERSION=1.3.2 \ OPENCOREAMR_VERSION=0.1.5 \ - OPUS_VERSION=1.2 \ - OPENJPEG_VERSION=2.1.2 \ - THEORA_VERSION=1.1.1 \ - VORBIS_VERSION=1.3.5 \ - VPX_VERSION=1.8.0 \ - WEBP_VERSION=1.0.2 \ + OPUS_VERSION=1.2 \ + OPENJPEG_VERSION=2.1.2 \ + THEORA_VERSION=1.1.1 \ + VORBIS_VERSION=1.3.5 \ + VPX_VERSION=1.8.0 \ + WEBP_VERSION=1.0.2 \ X264_VERSION=20170226-2245-stable \ - X265_VERSION=3.1.1 \ - XVID_VERSION=1.3.4 \ - FREETYPE_VERSION=2.5.5 \ - FRIBIDI_VERSION=0.19.7 \ - FONTCONFIG_VERSION=2.12.4 \ - LIBVIDSTAB_VERSION=1.1.0 \ - KVAZAAR_VERSION=1.2.0 \ - AOM_VERSION=v1.0.0 \ + X265_VERSION=3.1.1 \ + XVID_VERSION=1.3.4 \ SRC=/usr/local -ARG OGG_SHA256SUM="e19ee34711d7af328cb26287f4137e70630e7261b17cbe3cd41011d73a654692 libogg-1.3.2.tar.gz" -ARG OPUS_SHA256SUM="77db45a87b51578fbc49555ef1b10926179861d854eb2613207dc79d9ec0a9a9 opus-1.2.tar.gz" -ARG VORBIS_SHA256SUM="6efbcecdd3e5dfbf090341b485da9d176eb250d893e3eb378c428a2db38301ce libvorbis-1.3.5.tar.gz" -ARG THEORA_SHA256SUM="40952956c47811928d1e7922cda3bc1f427eb75680c3c37249c91e949054916b libtheora-1.1.1.tar.gz" -ARG XVID_SHA256SUM="4e9fd62728885855bc5007fe1be58df42e5e274497591fec37249e1052ae316f xvidcore-1.3.4.tar.gz" -ARG FREETYPE_SHA256SUM="5d03dd76c2171a7601e9ce10551d52d4471cf92cd205948e60289251daddffa8 freetype-2.5.5.tar.gz" -ARG LIBVIDSTAB_SHA256SUM="14d2a053e56edad4f397be0cb3ef8eb1ec3150404ce99a426c4eb641861dc0bb v1.1.0.tar.gz" -ARG LIBASS_SHA256SUM="8fadf294bf701300d4605e6f1d92929304187fca4b8d8a47889315526adbafd7 0.13.7.tar.gz" -ARG FRIBIDI_SHA256SUM="3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 0.19.7.tar.gz" +ARG FREETYPE_SHA256SUM="5d03dd76c2171a7601e9ce10551d52d4471cf92cd205948e60289251daddffa8 freetype-2.5.5.tar.gz" +ARG FRIBIDI_SHA256SUM="3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 0.19.7.tar.gz" +ARG LIBASS_SHA256SUM="8fadf294bf701300d4605e6f1d92929304187fca4b8d8a47889315526adbafd7 0.13.7.tar.gz" +ARG LIBVIDSTAB_SHA256SUM="14d2a053e56edad4f397be0cb3ef8eb1ec3150404ce99a426c4eb641861dc0bb v1.1.0.tar.gz" +ARG OGG_SHA256SUM="e19ee34711d7af328cb26287f4137e70630e7261b17cbe3cd41011d73a654692 libogg-1.3.2.tar.gz" +ARG OPUS_SHA256SUM="77db45a87b51578fbc49555ef1b10926179861d854eb2613207dc79d9ec0a9a9 opus-1.2.tar.gz" +ARG THEORA_SHA256SUM="40952956c47811928d1e7922cda3bc1f427eb75680c3c37249c91e949054916b libtheora-1.1.1.tar.gz" +ARG VORBIS_SHA256SUM="6efbcecdd3e5dfbf090341b485da9d176eb250d893e3eb378c428a2db38301ce libvorbis-1.3.5.tar.gz" +ARG XVID_SHA256SUM="4e9fd62728885855bc5007fe1be58df42e5e274497591fec37249e1052ae316f xvidcore-1.3.4.tar.gz" + RUN buildDeps="autoconf \ diff --git a/docker-images/3.3/ubuntu/Dockerfile b/docker-images/3.3/ubuntu/Dockerfile index de7bbb68a..219e3176f 100644 --- a/docker-images/3.3/ubuntu/Dockerfile +++ b/docker-images/3.3/ubuntu/Dockerfile @@ -21,38 +21,39 @@ ARG LD_LIBRARY_PATH=/opt/ffmpeg/lib ARG PREFIX=/opt/ffmpeg ARG MAKEFLAGS="-j2" -ENV FFMPEG_VERSION=3.3.9 \ - FDKAAC_VERSION=0.1.5 \ - LAME_VERSION=3.100 \ - LIBASS_VERSION=0.13.7 \ - OGG_VERSION=1.3.2 \ +ENV FFMPEG_VERSION=3.3.9 \ + AOM_VERSION=v1.0.0 \ + FDKAAC_VERSION=0.1.5 \ + FONTCONFIG_VERSION=2.12.4 \ + FREETYPE_VERSION=2.5.5 \ + FRIBIDI_VERSION=0.19.7 \ + KVAZAAR_VERSION=1.2.0 \ + LAME_VERSION=3.100 \ + LIBASS_VERSION=0.13.7 \ + LIBVIDSTAB_VERSION=1.1.0 \ + OGG_VERSION=1.3.2 \ OPENCOREAMR_VERSION=0.1.5 \ - OPUS_VERSION=1.2 \ - OPENJPEG_VERSION=2.1.2 \ - THEORA_VERSION=1.1.1 \ - VORBIS_VERSION=1.3.5 \ - VPX_VERSION=1.8.0 \ - WEBP_VERSION=1.0.2 \ + OPUS_VERSION=1.2 \ + OPENJPEG_VERSION=2.1.2 \ + THEORA_VERSION=1.1.1 \ + VORBIS_VERSION=1.3.5 \ + VPX_VERSION=1.8.0 \ + WEBP_VERSION=1.0.2 \ X264_VERSION=20170226-2245-stable \ - X265_VERSION=3.1.1 \ - XVID_VERSION=1.3.4 \ - FREETYPE_VERSION=2.5.5 \ - FRIBIDI_VERSION=0.19.7 \ - FONTCONFIG_VERSION=2.12.4 \ - LIBVIDSTAB_VERSION=1.1.0 \ - KVAZAAR_VERSION=1.2.0 \ - AOM_VERSION=v1.0.0 \ + X265_VERSION=3.1.1 \ + XVID_VERSION=1.3.4 \ SRC=/usr/local -ARG OGG_SHA256SUM="e19ee34711d7af328cb26287f4137e70630e7261b17cbe3cd41011d73a654692 libogg-1.3.2.tar.gz" -ARG OPUS_SHA256SUM="77db45a87b51578fbc49555ef1b10926179861d854eb2613207dc79d9ec0a9a9 opus-1.2.tar.gz" -ARG VORBIS_SHA256SUM="6efbcecdd3e5dfbf090341b485da9d176eb250d893e3eb378c428a2db38301ce libvorbis-1.3.5.tar.gz" -ARG THEORA_SHA256SUM="40952956c47811928d1e7922cda3bc1f427eb75680c3c37249c91e949054916b libtheora-1.1.1.tar.gz" -ARG XVID_SHA256SUM="4e9fd62728885855bc5007fe1be58df42e5e274497591fec37249e1052ae316f xvidcore-1.3.4.tar.gz" -ARG FREETYPE_SHA256SUM="5d03dd76c2171a7601e9ce10551d52d4471cf92cd205948e60289251daddffa8 freetype-2.5.5.tar.gz" -ARG LIBVIDSTAB_SHA256SUM="14d2a053e56edad4f397be0cb3ef8eb1ec3150404ce99a426c4eb641861dc0bb v1.1.0.tar.gz" -ARG LIBASS_SHA256SUM="8fadf294bf701300d4605e6f1d92929304187fca4b8d8a47889315526adbafd7 0.13.7.tar.gz" -ARG FRIBIDI_SHA256SUM="3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 0.19.7.tar.gz" +ARG FREETYPE_SHA256SUM="5d03dd76c2171a7601e9ce10551d52d4471cf92cd205948e60289251daddffa8 freetype-2.5.5.tar.gz" +ARG FRIBIDI_SHA256SUM="3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 0.19.7.tar.gz" +ARG LIBASS_SHA256SUM="8fadf294bf701300d4605e6f1d92929304187fca4b8d8a47889315526adbafd7 0.13.7.tar.gz" +ARG LIBVIDSTAB_SHA256SUM="14d2a053e56edad4f397be0cb3ef8eb1ec3150404ce99a426c4eb641861dc0bb v1.1.0.tar.gz" +ARG OGG_SHA256SUM="e19ee34711d7af328cb26287f4137e70630e7261b17cbe3cd41011d73a654692 libogg-1.3.2.tar.gz" +ARG OPUS_SHA256SUM="77db45a87b51578fbc49555ef1b10926179861d854eb2613207dc79d9ec0a9a9 opus-1.2.tar.gz" +ARG THEORA_SHA256SUM="40952956c47811928d1e7922cda3bc1f427eb75680c3c37249c91e949054916b libtheora-1.1.1.tar.gz" +ARG VORBIS_SHA256SUM="6efbcecdd3e5dfbf090341b485da9d176eb250d893e3eb378c428a2db38301ce libvorbis-1.3.5.tar.gz" +ARG XVID_SHA256SUM="4e9fd62728885855bc5007fe1be58df42e5e274497591fec37249e1052ae316f xvidcore-1.3.4.tar.gz" + RUN buildDeps="autoconf \ diff --git a/docker-images/3.3/vaapi/Dockerfile b/docker-images/3.3/vaapi/Dockerfile index e8f4043b6..e94ea2ab1 100644 --- a/docker-images/3.3/vaapi/Dockerfile +++ b/docker-images/3.3/vaapi/Dockerfile @@ -21,38 +21,39 @@ ARG LD_LIBRARY_PATH=/opt/ffmpeg/lib ARG PREFIX=/opt/ffmpeg ARG MAKEFLAGS="-j2" -ENV FFMPEG_VERSION=3.3.9 \ - FDKAAC_VERSION=0.1.5 \ - LAME_VERSION=3.100 \ - LIBASS_VERSION=0.13.7 \ - OGG_VERSION=1.3.2 \ +ENV FFMPEG_VERSION=3.3.9 \ + AOM_VERSION=v1.0.0 \ + FDKAAC_VERSION=0.1.5 \ + FONTCONFIG_VERSION=2.12.4 \ + FREETYPE_VERSION=2.5.5 \ + FRIBIDI_VERSION=0.19.7 \ + KVAZAAR_VERSION=1.2.0 \ + LAME_VERSION=3.100 \ + LIBASS_VERSION=0.13.7 \ + LIBVIDSTAB_VERSION=1.1.0 \ + OGG_VERSION=1.3.2 \ OPENCOREAMR_VERSION=0.1.5 \ - OPUS_VERSION=1.2 \ - OPENJPEG_VERSION=2.1.2 \ - THEORA_VERSION=1.1.1 \ - VORBIS_VERSION=1.3.5 \ - VPX_VERSION=1.8.0 \ - WEBP_VERSION=1.0.2 \ + OPUS_VERSION=1.2 \ + OPENJPEG_VERSION=2.1.2 \ + THEORA_VERSION=1.1.1 \ + VORBIS_VERSION=1.3.5 \ + VPX_VERSION=1.8.0 \ + WEBP_VERSION=1.0.2 \ X264_VERSION=20170226-2245-stable \ - X265_VERSION=3.1.1 \ - XVID_VERSION=1.3.4 \ - FREETYPE_VERSION=2.5.5 \ - FRIBIDI_VERSION=0.19.7 \ - FONTCONFIG_VERSION=2.12.4 \ - LIBVIDSTAB_VERSION=1.1.0 \ - KVAZAAR_VERSION=1.2.0 \ - AOM_VERSION=v1.0.0 \ + X265_VERSION=3.1.1 \ + XVID_VERSION=1.3.4 \ SRC=/usr/local -ARG OGG_SHA256SUM="e19ee34711d7af328cb26287f4137e70630e7261b17cbe3cd41011d73a654692 libogg-1.3.2.tar.gz" -ARG OPUS_SHA256SUM="77db45a87b51578fbc49555ef1b10926179861d854eb2613207dc79d9ec0a9a9 opus-1.2.tar.gz" -ARG VORBIS_SHA256SUM="6efbcecdd3e5dfbf090341b485da9d176eb250d893e3eb378c428a2db38301ce libvorbis-1.3.5.tar.gz" -ARG THEORA_SHA256SUM="40952956c47811928d1e7922cda3bc1f427eb75680c3c37249c91e949054916b libtheora-1.1.1.tar.gz" -ARG XVID_SHA256SUM="4e9fd62728885855bc5007fe1be58df42e5e274497591fec37249e1052ae316f xvidcore-1.3.4.tar.gz" -ARG FREETYPE_SHA256SUM="5d03dd76c2171a7601e9ce10551d52d4471cf92cd205948e60289251daddffa8 freetype-2.5.5.tar.gz" -ARG LIBVIDSTAB_SHA256SUM="14d2a053e56edad4f397be0cb3ef8eb1ec3150404ce99a426c4eb641861dc0bb v1.1.0.tar.gz" -ARG LIBASS_SHA256SUM="8fadf294bf701300d4605e6f1d92929304187fca4b8d8a47889315526adbafd7 0.13.7.tar.gz" -ARG FRIBIDI_SHA256SUM="3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 0.19.7.tar.gz" +ARG FREETYPE_SHA256SUM="5d03dd76c2171a7601e9ce10551d52d4471cf92cd205948e60289251daddffa8 freetype-2.5.5.tar.gz" +ARG FRIBIDI_SHA256SUM="3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 0.19.7.tar.gz" +ARG LIBASS_SHA256SUM="8fadf294bf701300d4605e6f1d92929304187fca4b8d8a47889315526adbafd7 0.13.7.tar.gz" +ARG LIBVIDSTAB_SHA256SUM="14d2a053e56edad4f397be0cb3ef8eb1ec3150404ce99a426c4eb641861dc0bb v1.1.0.tar.gz" +ARG OGG_SHA256SUM="e19ee34711d7af328cb26287f4137e70630e7261b17cbe3cd41011d73a654692 libogg-1.3.2.tar.gz" +ARG OPUS_SHA256SUM="77db45a87b51578fbc49555ef1b10926179861d854eb2613207dc79d9ec0a9a9 opus-1.2.tar.gz" +ARG THEORA_SHA256SUM="40952956c47811928d1e7922cda3bc1f427eb75680c3c37249c91e949054916b libtheora-1.1.1.tar.gz" +ARG VORBIS_SHA256SUM="6efbcecdd3e5dfbf090341b485da9d176eb250d893e3eb378c428a2db38301ce libvorbis-1.3.5.tar.gz" +ARG XVID_SHA256SUM="4e9fd62728885855bc5007fe1be58df42e5e274497591fec37249e1052ae316f xvidcore-1.3.4.tar.gz" + RUN buildDeps="autoconf \ diff --git a/docker-images/3.4/alpine/Dockerfile b/docker-images/3.4/alpine/Dockerfile index d4f22aa7f..7b5f1a769 100644 --- a/docker-images/3.4/alpine/Dockerfile +++ b/docker-images/3.4/alpine/Dockerfile @@ -18,38 +18,39 @@ ARG LD_LIBRARY_PATH=/opt/ffmpeg/lib ARG PREFIX=/opt/ffmpeg ARG MAKEFLAGS="-j2" -ENV FFMPEG_VERSION=3.4.6 \ - FDKAAC_VERSION=0.1.5 \ - LAME_VERSION=3.100 \ - LIBASS_VERSION=0.13.7 \ - OGG_VERSION=1.3.2 \ +ENV FFMPEG_VERSION=3.4.6 \ + AOM_VERSION=v1.0.0 \ + FDKAAC_VERSION=0.1.5 \ + FONTCONFIG_VERSION=2.12.4 \ + FREETYPE_VERSION=2.5.5 \ + FRIBIDI_VERSION=0.19.7 \ + KVAZAAR_VERSION=1.2.0 \ + LAME_VERSION=3.100 \ + LIBASS_VERSION=0.13.7 \ + LIBVIDSTAB_VERSION=1.1.0 \ + OGG_VERSION=1.3.2 \ OPENCOREAMR_VERSION=0.1.5 \ - OPUS_VERSION=1.2 \ - OPENJPEG_VERSION=2.1.2 \ - THEORA_VERSION=1.1.1 \ - VORBIS_VERSION=1.3.5 \ - VPX_VERSION=1.8.0 \ - WEBP_VERSION=1.0.2 \ + OPUS_VERSION=1.2 \ + OPENJPEG_VERSION=2.1.2 \ + THEORA_VERSION=1.1.1 \ + VORBIS_VERSION=1.3.5 \ + VPX_VERSION=1.8.0 \ + WEBP_VERSION=1.0.2 \ X264_VERSION=20170226-2245-stable \ - X265_VERSION=3.1.1 \ - XVID_VERSION=1.3.4 \ - FREETYPE_VERSION=2.5.5 \ - FRIBIDI_VERSION=0.19.7 \ - FONTCONFIG_VERSION=2.12.4 \ - LIBVIDSTAB_VERSION=1.1.0 \ - KVAZAAR_VERSION=1.2.0 \ - AOM_VERSION=v1.0.0 \ + X265_VERSION=3.1.1 \ + XVID_VERSION=1.3.4 \ SRC=/usr/local -ARG OGG_SHA256SUM="e19ee34711d7af328cb26287f4137e70630e7261b17cbe3cd41011d73a654692 libogg-1.3.2.tar.gz" -ARG OPUS_SHA256SUM="77db45a87b51578fbc49555ef1b10926179861d854eb2613207dc79d9ec0a9a9 opus-1.2.tar.gz" -ARG VORBIS_SHA256SUM="6efbcecdd3e5dfbf090341b485da9d176eb250d893e3eb378c428a2db38301ce libvorbis-1.3.5.tar.gz" -ARG THEORA_SHA256SUM="40952956c47811928d1e7922cda3bc1f427eb75680c3c37249c91e949054916b libtheora-1.1.1.tar.gz" -ARG XVID_SHA256SUM="4e9fd62728885855bc5007fe1be58df42e5e274497591fec37249e1052ae316f xvidcore-1.3.4.tar.gz" -ARG FREETYPE_SHA256SUM="5d03dd76c2171a7601e9ce10551d52d4471cf92cd205948e60289251daddffa8 freetype-2.5.5.tar.gz" -ARG LIBVIDSTAB_SHA256SUM="14d2a053e56edad4f397be0cb3ef8eb1ec3150404ce99a426c4eb641861dc0bb v1.1.0.tar.gz" -ARG LIBASS_SHA256SUM="8fadf294bf701300d4605e6f1d92929304187fca4b8d8a47889315526adbafd7 0.13.7.tar.gz" -ARG FRIBIDI_SHA256SUM="3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 0.19.7.tar.gz" +ARG FREETYPE_SHA256SUM="5d03dd76c2171a7601e9ce10551d52d4471cf92cd205948e60289251daddffa8 freetype-2.5.5.tar.gz" +ARG FRIBIDI_SHA256SUM="3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 0.19.7.tar.gz" +ARG LIBASS_SHA256SUM="8fadf294bf701300d4605e6f1d92929304187fca4b8d8a47889315526adbafd7 0.13.7.tar.gz" +ARG LIBVIDSTAB_SHA256SUM="14d2a053e56edad4f397be0cb3ef8eb1ec3150404ce99a426c4eb641861dc0bb v1.1.0.tar.gz" +ARG OGG_SHA256SUM="e19ee34711d7af328cb26287f4137e70630e7261b17cbe3cd41011d73a654692 libogg-1.3.2.tar.gz" +ARG OPUS_SHA256SUM="77db45a87b51578fbc49555ef1b10926179861d854eb2613207dc79d9ec0a9a9 opus-1.2.tar.gz" +ARG THEORA_SHA256SUM="40952956c47811928d1e7922cda3bc1f427eb75680c3c37249c91e949054916b libtheora-1.1.1.tar.gz" +ARG VORBIS_SHA256SUM="6efbcecdd3e5dfbf090341b485da9d176eb250d893e3eb378c428a2db38301ce libvorbis-1.3.5.tar.gz" +ARG XVID_SHA256SUM="4e9fd62728885855bc5007fe1be58df42e5e274497591fec37249e1052ae316f xvidcore-1.3.4.tar.gz" + RUN buildDeps="autoconf \ diff --git a/docker-images/3.4/centos/Dockerfile b/docker-images/3.4/centos/Dockerfile index 014b2a346..2b168981b 100644 --- a/docker-images/3.4/centos/Dockerfile +++ b/docker-images/3.4/centos/Dockerfile @@ -20,38 +20,39 @@ ARG LD_LIBRARY_PATH=/opt/ffmpeg/lib ARG PREFIX=/opt/ffmpeg ARG MAKEFLAGS="-j2" -ENV FFMPEG_VERSION=3.4.6 \ - FDKAAC_VERSION=0.1.5 \ - LAME_VERSION=3.100 \ - LIBASS_VERSION=0.13.7 \ - OGG_VERSION=1.3.2 \ +ENV FFMPEG_VERSION=3.4.6 \ + AOM_VERSION=v1.0.0 \ + FDKAAC_VERSION=0.1.5 \ + FONTCONFIG_VERSION=2.12.4 \ + FREETYPE_VERSION=2.5.5 \ + FRIBIDI_VERSION=0.19.7 \ + KVAZAAR_VERSION=1.2.0 \ + LAME_VERSION=3.100 \ + LIBASS_VERSION=0.13.7 \ + LIBVIDSTAB_VERSION=1.1.0 \ + OGG_VERSION=1.3.2 \ OPENCOREAMR_VERSION=0.1.5 \ - OPUS_VERSION=1.2 \ - OPENJPEG_VERSION=2.1.2 \ - THEORA_VERSION=1.1.1 \ - VORBIS_VERSION=1.3.5 \ - VPX_VERSION=1.8.0 \ - WEBP_VERSION=1.0.2 \ + OPUS_VERSION=1.2 \ + OPENJPEG_VERSION=2.1.2 \ + THEORA_VERSION=1.1.1 \ + VORBIS_VERSION=1.3.5 \ + VPX_VERSION=1.8.0 \ + WEBP_VERSION=1.0.2 \ X264_VERSION=20170226-2245-stable \ - X265_VERSION=3.1.1 \ - XVID_VERSION=1.3.4 \ - FREETYPE_VERSION=2.5.5 \ - FRIBIDI_VERSION=0.19.7 \ - FONTCONFIG_VERSION=2.12.4 \ - LIBVIDSTAB_VERSION=1.1.0 \ - KVAZAAR_VERSION=1.2.0 \ - AOM_VERSION=v1.0.0 \ + X265_VERSION=3.1.1 \ + XVID_VERSION=1.3.4 \ SRC=/usr/local -ARG OGG_SHA256SUM="e19ee34711d7af328cb26287f4137e70630e7261b17cbe3cd41011d73a654692 libogg-1.3.2.tar.gz" -ARG OPUS_SHA256SUM="77db45a87b51578fbc49555ef1b10926179861d854eb2613207dc79d9ec0a9a9 opus-1.2.tar.gz" -ARG VORBIS_SHA256SUM="6efbcecdd3e5dfbf090341b485da9d176eb250d893e3eb378c428a2db38301ce libvorbis-1.3.5.tar.gz" -ARG THEORA_SHA256SUM="40952956c47811928d1e7922cda3bc1f427eb75680c3c37249c91e949054916b libtheora-1.1.1.tar.gz" -ARG XVID_SHA256SUM="4e9fd62728885855bc5007fe1be58df42e5e274497591fec37249e1052ae316f xvidcore-1.3.4.tar.gz" -ARG FREETYPE_SHA256SUM="5d03dd76c2171a7601e9ce10551d52d4471cf92cd205948e60289251daddffa8 freetype-2.5.5.tar.gz" -ARG LIBVIDSTAB_SHA256SUM="14d2a053e56edad4f397be0cb3ef8eb1ec3150404ce99a426c4eb641861dc0bb v1.1.0.tar.gz" -ARG LIBASS_SHA256SUM="8fadf294bf701300d4605e6f1d92929304187fca4b8d8a47889315526adbafd7 0.13.7.tar.gz" -ARG FRIBIDI_SHA256SUM="3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 0.19.7.tar.gz" +ARG FREETYPE_SHA256SUM="5d03dd76c2171a7601e9ce10551d52d4471cf92cd205948e60289251daddffa8 freetype-2.5.5.tar.gz" +ARG FRIBIDI_SHA256SUM="3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 0.19.7.tar.gz" +ARG LIBASS_SHA256SUM="8fadf294bf701300d4605e6f1d92929304187fca4b8d8a47889315526adbafd7 0.13.7.tar.gz" +ARG LIBVIDSTAB_SHA256SUM="14d2a053e56edad4f397be0cb3ef8eb1ec3150404ce99a426c4eb641861dc0bb v1.1.0.tar.gz" +ARG OGG_SHA256SUM="e19ee34711d7af328cb26287f4137e70630e7261b17cbe3cd41011d73a654692 libogg-1.3.2.tar.gz" +ARG OPUS_SHA256SUM="77db45a87b51578fbc49555ef1b10926179861d854eb2613207dc79d9ec0a9a9 opus-1.2.tar.gz" +ARG THEORA_SHA256SUM="40952956c47811928d1e7922cda3bc1f427eb75680c3c37249c91e949054916b libtheora-1.1.1.tar.gz" +ARG VORBIS_SHA256SUM="6efbcecdd3e5dfbf090341b485da9d176eb250d893e3eb378c428a2db38301ce libvorbis-1.3.5.tar.gz" +ARG XVID_SHA256SUM="4e9fd62728885855bc5007fe1be58df42e5e274497591fec37249e1052ae316f xvidcore-1.3.4.tar.gz" + RUN buildDeps="autoconf \ diff --git a/docker-images/3.4/nvidia/Dockerfile b/docker-images/3.4/nvidia/Dockerfile index 8b2f932b7..4fa0ffb15 100644 --- a/docker-images/3.4/nvidia/Dockerfile +++ b/docker-images/3.4/nvidia/Dockerfile @@ -35,38 +35,39 @@ ENV LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/opt/ffmpeg/lib" ARG PREFIX=/opt/ffmpeg ARG MAKEFLAGS="-j12" -ENV FFMPEG_VERSION=3.4.6 \ - FDKAAC_VERSION=0.1.5 \ - LAME_VERSION=3.100 \ - LIBASS_VERSION=0.13.7 \ - OGG_VERSION=1.3.2 \ +ENV FFMPEG_VERSION=3.4.6 \ + AOM_VERSION=v1.0.0 \ + FDKAAC_VERSION=0.1.5 \ + FONTCONFIG_VERSION=2.12.4 \ + FREETYPE_VERSION=2.5.5 \ + FRIBIDI_VERSION=0.19.7 \ + KVAZAAR_VERSION=1.2.0 \ + LAME_VERSION=3.100 \ + LIBASS_VERSION=0.13.7 \ + LIBVIDSTAB_VERSION=1.1.0 \ + OGG_VERSION=1.3.2 \ OPENCOREAMR_VERSION=0.1.5 \ - OPUS_VERSION=1.2 \ - OPENJPEG_VERSION=2.1.2 \ - THEORA_VERSION=1.1.1 \ - VORBIS_VERSION=1.3.5 \ - VPX_VERSION=1.8.0 \ - WEBP_VERSION=1.0.2 \ + OPUS_VERSION=1.2 \ + OPENJPEG_VERSION=2.1.2 \ + THEORA_VERSION=1.1.1 \ + VORBIS_VERSION=1.3.5 \ + VPX_VERSION=1.8.0 \ + WEBP_VERSION=1.0.2 \ X264_VERSION=20170226-2245-stable \ - X265_VERSION=3.1.1 \ - XVID_VERSION=1.3.4 \ - FREETYPE_VERSION=2.5.5 \ - FRIBIDI_VERSION=0.19.7 \ - FONTCONFIG_VERSION=2.12.4 \ - LIBVIDSTAB_VERSION=1.1.0 \ - KVAZAAR_VERSION=1.2.0 \ - AOM_VERSION=v1.0.0 \ + X265_VERSION=3.1.1 \ + XVID_VERSION=1.3.4 \ SRC=/usr/local -ARG OGG_SHA256SUM="e19ee34711d7af328cb26287f4137e70630e7261b17cbe3cd41011d73a654692 libogg-1.3.2.tar.gz" -ARG OPUS_SHA256SUM="77db45a87b51578fbc49555ef1b10926179861d854eb2613207dc79d9ec0a9a9 opus-1.2.tar.gz" -ARG VORBIS_SHA256SUM="6efbcecdd3e5dfbf090341b485da9d176eb250d893e3eb378c428a2db38301ce libvorbis-1.3.5.tar.gz" -ARG THEORA_SHA256SUM="40952956c47811928d1e7922cda3bc1f427eb75680c3c37249c91e949054916b libtheora-1.1.1.tar.gz" -ARG XVID_SHA256SUM="4e9fd62728885855bc5007fe1be58df42e5e274497591fec37249e1052ae316f xvidcore-1.3.4.tar.gz" -ARG FREETYPE_SHA256SUM="5d03dd76c2171a7601e9ce10551d52d4471cf92cd205948e60289251daddffa8 freetype-2.5.5.tar.gz" -ARG LIBVIDSTAB_SHA256SUM="14d2a053e56edad4f397be0cb3ef8eb1ec3150404ce99a426c4eb641861dc0bb v1.1.0.tar.gz" -ARG LIBASS_SHA256SUM="8fadf294bf701300d4605e6f1d92929304187fca4b8d8a47889315526adbafd7 0.13.7.tar.gz" -ARG FRIBIDI_SHA256SUM="3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 0.19.7.tar.gz" +ARG FREETYPE_SHA256SUM="5d03dd76c2171a7601e9ce10551d52d4471cf92cd205948e60289251daddffa8 freetype-2.5.5.tar.gz" +ARG FRIBIDI_SHA256SUM="3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 0.19.7.tar.gz" +ARG LIBASS_SHA256SUM="8fadf294bf701300d4605e6f1d92929304187fca4b8d8a47889315526adbafd7 0.13.7.tar.gz" +ARG LIBVIDSTAB_SHA256SUM="14d2a053e56edad4f397be0cb3ef8eb1ec3150404ce99a426c4eb641861dc0bb v1.1.0.tar.gz" +ARG OGG_SHA256SUM="e19ee34711d7af328cb26287f4137e70630e7261b17cbe3cd41011d73a654692 libogg-1.3.2.tar.gz" +ARG OPUS_SHA256SUM="77db45a87b51578fbc49555ef1b10926179861d854eb2613207dc79d9ec0a9a9 opus-1.2.tar.gz" +ARG THEORA_SHA256SUM="40952956c47811928d1e7922cda3bc1f427eb75680c3c37249c91e949054916b libtheora-1.1.1.tar.gz" +ARG VORBIS_SHA256SUM="6efbcecdd3e5dfbf090341b485da9d176eb250d893e3eb378c428a2db38301ce libvorbis-1.3.5.tar.gz" +ARG XVID_SHA256SUM="4e9fd62728885855bc5007fe1be58df42e5e274497591fec37249e1052ae316f xvidcore-1.3.4.tar.gz" + RUN buildDeps="autoconf \ diff --git a/docker-images/3.4/scratch/Dockerfile b/docker-images/3.4/scratch/Dockerfile index fcc1d8ae4..63389c972 100644 --- a/docker-images/3.4/scratch/Dockerfile +++ b/docker-images/3.4/scratch/Dockerfile @@ -13,38 +13,39 @@ ARG LD_LIBRARY_PATH=/opt/ffmpeg/lib ARG PREFIX=/opt/ffmpeg ARG MAKEFLAGS="-j2" -ENV FFMPEG_VERSION=3.4.6 \ - FDKAAC_VERSION=0.1.5 \ - LAME_VERSION=3.100 \ - LIBASS_VERSION=0.13.7 \ - OGG_VERSION=1.3.2 \ +ENV FFMPEG_VERSION=3.4.6 \ + AOM_VERSION=v1.0.0 \ + FDKAAC_VERSION=0.1.5 \ + FONTCONFIG_VERSION=2.12.4 \ + FREETYPE_VERSION=2.5.5 \ + FRIBIDI_VERSION=0.19.7 \ + KVAZAAR_VERSION=1.2.0 \ + LAME_VERSION=3.100 \ + LIBASS_VERSION=0.13.7 \ + LIBVIDSTAB_VERSION=1.1.0 \ + OGG_VERSION=1.3.2 \ OPENCOREAMR_VERSION=0.1.5 \ - OPUS_VERSION=1.2 \ - OPENJPEG_VERSION=2.1.2 \ - THEORA_VERSION=1.1.1 \ - VORBIS_VERSION=1.3.5 \ - VPX_VERSION=1.8.0 \ - WEBP_VERSION=1.0.2 \ + OPUS_VERSION=1.2 \ + OPENJPEG_VERSION=2.1.2 \ + THEORA_VERSION=1.1.1 \ + VORBIS_VERSION=1.3.5 \ + VPX_VERSION=1.8.0 \ + WEBP_VERSION=1.0.2 \ X264_VERSION=20170226-2245-stable \ - X265_VERSION=3.1.1 \ - XVID_VERSION=1.3.4 \ - FREETYPE_VERSION=2.5.5 \ - FRIBIDI_VERSION=0.19.7 \ - FONTCONFIG_VERSION=2.12.4 \ - LIBVIDSTAB_VERSION=1.1.0 \ - KVAZAAR_VERSION=1.2.0 \ - AOM_VERSION=v1.0.0 \ + X265_VERSION=3.1.1 \ + XVID_VERSION=1.3.4 \ SRC=/usr/local -ARG OGG_SHA256SUM="e19ee34711d7af328cb26287f4137e70630e7261b17cbe3cd41011d73a654692 libogg-1.3.2.tar.gz" -ARG OPUS_SHA256SUM="77db45a87b51578fbc49555ef1b10926179861d854eb2613207dc79d9ec0a9a9 opus-1.2.tar.gz" -ARG VORBIS_SHA256SUM="6efbcecdd3e5dfbf090341b485da9d176eb250d893e3eb378c428a2db38301ce libvorbis-1.3.5.tar.gz" -ARG THEORA_SHA256SUM="40952956c47811928d1e7922cda3bc1f427eb75680c3c37249c91e949054916b libtheora-1.1.1.tar.gz" -ARG XVID_SHA256SUM="4e9fd62728885855bc5007fe1be58df42e5e274497591fec37249e1052ae316f xvidcore-1.3.4.tar.gz" -ARG FREETYPE_SHA256SUM="5d03dd76c2171a7601e9ce10551d52d4471cf92cd205948e60289251daddffa8 freetype-2.5.5.tar.gz" -ARG LIBVIDSTAB_SHA256SUM="14d2a053e56edad4f397be0cb3ef8eb1ec3150404ce99a426c4eb641861dc0bb v1.1.0.tar.gz" -ARG LIBASS_SHA256SUM="8fadf294bf701300d4605e6f1d92929304187fca4b8d8a47889315526adbafd7 0.13.7.tar.gz" -ARG FRIBIDI_SHA256SUM="3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 0.19.7.tar.gz" +ARG FREETYPE_SHA256SUM="5d03dd76c2171a7601e9ce10551d52d4471cf92cd205948e60289251daddffa8 freetype-2.5.5.tar.gz" +ARG FRIBIDI_SHA256SUM="3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 0.19.7.tar.gz" +ARG LIBASS_SHA256SUM="8fadf294bf701300d4605e6f1d92929304187fca4b8d8a47889315526adbafd7 0.13.7.tar.gz" +ARG LIBVIDSTAB_SHA256SUM="14d2a053e56edad4f397be0cb3ef8eb1ec3150404ce99a426c4eb641861dc0bb v1.1.0.tar.gz" +ARG OGG_SHA256SUM="e19ee34711d7af328cb26287f4137e70630e7261b17cbe3cd41011d73a654692 libogg-1.3.2.tar.gz" +ARG OPUS_SHA256SUM="77db45a87b51578fbc49555ef1b10926179861d854eb2613207dc79d9ec0a9a9 opus-1.2.tar.gz" +ARG THEORA_SHA256SUM="40952956c47811928d1e7922cda3bc1f427eb75680c3c37249c91e949054916b libtheora-1.1.1.tar.gz" +ARG VORBIS_SHA256SUM="6efbcecdd3e5dfbf090341b485da9d176eb250d893e3eb378c428a2db38301ce libvorbis-1.3.5.tar.gz" +ARG XVID_SHA256SUM="4e9fd62728885855bc5007fe1be58df42e5e274497591fec37249e1052ae316f xvidcore-1.3.4.tar.gz" + RUN buildDeps="autoconf \ diff --git a/docker-images/3.4/ubuntu/Dockerfile b/docker-images/3.4/ubuntu/Dockerfile index cd2bd51ec..9ecab592a 100644 --- a/docker-images/3.4/ubuntu/Dockerfile +++ b/docker-images/3.4/ubuntu/Dockerfile @@ -21,38 +21,39 @@ ARG LD_LIBRARY_PATH=/opt/ffmpeg/lib ARG PREFIX=/opt/ffmpeg ARG MAKEFLAGS="-j2" -ENV FFMPEG_VERSION=3.4.6 \ - FDKAAC_VERSION=0.1.5 \ - LAME_VERSION=3.100 \ - LIBASS_VERSION=0.13.7 \ - OGG_VERSION=1.3.2 \ +ENV FFMPEG_VERSION=3.4.6 \ + AOM_VERSION=v1.0.0 \ + FDKAAC_VERSION=0.1.5 \ + FONTCONFIG_VERSION=2.12.4 \ + FREETYPE_VERSION=2.5.5 \ + FRIBIDI_VERSION=0.19.7 \ + KVAZAAR_VERSION=1.2.0 \ + LAME_VERSION=3.100 \ + LIBASS_VERSION=0.13.7 \ + LIBVIDSTAB_VERSION=1.1.0 \ + OGG_VERSION=1.3.2 \ OPENCOREAMR_VERSION=0.1.5 \ - OPUS_VERSION=1.2 \ - OPENJPEG_VERSION=2.1.2 \ - THEORA_VERSION=1.1.1 \ - VORBIS_VERSION=1.3.5 \ - VPX_VERSION=1.8.0 \ - WEBP_VERSION=1.0.2 \ + OPUS_VERSION=1.2 \ + OPENJPEG_VERSION=2.1.2 \ + THEORA_VERSION=1.1.1 \ + VORBIS_VERSION=1.3.5 \ + VPX_VERSION=1.8.0 \ + WEBP_VERSION=1.0.2 \ X264_VERSION=20170226-2245-stable \ - X265_VERSION=3.1.1 \ - XVID_VERSION=1.3.4 \ - FREETYPE_VERSION=2.5.5 \ - FRIBIDI_VERSION=0.19.7 \ - FONTCONFIG_VERSION=2.12.4 \ - LIBVIDSTAB_VERSION=1.1.0 \ - KVAZAAR_VERSION=1.2.0 \ - AOM_VERSION=v1.0.0 \ + X265_VERSION=3.1.1 \ + XVID_VERSION=1.3.4 \ SRC=/usr/local -ARG OGG_SHA256SUM="e19ee34711d7af328cb26287f4137e70630e7261b17cbe3cd41011d73a654692 libogg-1.3.2.tar.gz" -ARG OPUS_SHA256SUM="77db45a87b51578fbc49555ef1b10926179861d854eb2613207dc79d9ec0a9a9 opus-1.2.tar.gz" -ARG VORBIS_SHA256SUM="6efbcecdd3e5dfbf090341b485da9d176eb250d893e3eb378c428a2db38301ce libvorbis-1.3.5.tar.gz" -ARG THEORA_SHA256SUM="40952956c47811928d1e7922cda3bc1f427eb75680c3c37249c91e949054916b libtheora-1.1.1.tar.gz" -ARG XVID_SHA256SUM="4e9fd62728885855bc5007fe1be58df42e5e274497591fec37249e1052ae316f xvidcore-1.3.4.tar.gz" -ARG FREETYPE_SHA256SUM="5d03dd76c2171a7601e9ce10551d52d4471cf92cd205948e60289251daddffa8 freetype-2.5.5.tar.gz" -ARG LIBVIDSTAB_SHA256SUM="14d2a053e56edad4f397be0cb3ef8eb1ec3150404ce99a426c4eb641861dc0bb v1.1.0.tar.gz" -ARG LIBASS_SHA256SUM="8fadf294bf701300d4605e6f1d92929304187fca4b8d8a47889315526adbafd7 0.13.7.tar.gz" -ARG FRIBIDI_SHA256SUM="3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 0.19.7.tar.gz" +ARG FREETYPE_SHA256SUM="5d03dd76c2171a7601e9ce10551d52d4471cf92cd205948e60289251daddffa8 freetype-2.5.5.tar.gz" +ARG FRIBIDI_SHA256SUM="3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 0.19.7.tar.gz" +ARG LIBASS_SHA256SUM="8fadf294bf701300d4605e6f1d92929304187fca4b8d8a47889315526adbafd7 0.13.7.tar.gz" +ARG LIBVIDSTAB_SHA256SUM="14d2a053e56edad4f397be0cb3ef8eb1ec3150404ce99a426c4eb641861dc0bb v1.1.0.tar.gz" +ARG OGG_SHA256SUM="e19ee34711d7af328cb26287f4137e70630e7261b17cbe3cd41011d73a654692 libogg-1.3.2.tar.gz" +ARG OPUS_SHA256SUM="77db45a87b51578fbc49555ef1b10926179861d854eb2613207dc79d9ec0a9a9 opus-1.2.tar.gz" +ARG THEORA_SHA256SUM="40952956c47811928d1e7922cda3bc1f427eb75680c3c37249c91e949054916b libtheora-1.1.1.tar.gz" +ARG VORBIS_SHA256SUM="6efbcecdd3e5dfbf090341b485da9d176eb250d893e3eb378c428a2db38301ce libvorbis-1.3.5.tar.gz" +ARG XVID_SHA256SUM="4e9fd62728885855bc5007fe1be58df42e5e274497591fec37249e1052ae316f xvidcore-1.3.4.tar.gz" + RUN buildDeps="autoconf \ diff --git a/docker-images/3.4/vaapi/Dockerfile b/docker-images/3.4/vaapi/Dockerfile index 111240db9..fd9bcf9ea 100644 --- a/docker-images/3.4/vaapi/Dockerfile +++ b/docker-images/3.4/vaapi/Dockerfile @@ -21,38 +21,39 @@ ARG LD_LIBRARY_PATH=/opt/ffmpeg/lib ARG PREFIX=/opt/ffmpeg ARG MAKEFLAGS="-j2" -ENV FFMPEG_VERSION=3.4.6 \ - FDKAAC_VERSION=0.1.5 \ - LAME_VERSION=3.100 \ - LIBASS_VERSION=0.13.7 \ - OGG_VERSION=1.3.2 \ +ENV FFMPEG_VERSION=3.4.6 \ + AOM_VERSION=v1.0.0 \ + FDKAAC_VERSION=0.1.5 \ + FONTCONFIG_VERSION=2.12.4 \ + FREETYPE_VERSION=2.5.5 \ + FRIBIDI_VERSION=0.19.7 \ + KVAZAAR_VERSION=1.2.0 \ + LAME_VERSION=3.100 \ + LIBASS_VERSION=0.13.7 \ + LIBVIDSTAB_VERSION=1.1.0 \ + OGG_VERSION=1.3.2 \ OPENCOREAMR_VERSION=0.1.5 \ - OPUS_VERSION=1.2 \ - OPENJPEG_VERSION=2.1.2 \ - THEORA_VERSION=1.1.1 \ - VORBIS_VERSION=1.3.5 \ - VPX_VERSION=1.8.0 \ - WEBP_VERSION=1.0.2 \ + OPUS_VERSION=1.2 \ + OPENJPEG_VERSION=2.1.2 \ + THEORA_VERSION=1.1.1 \ + VORBIS_VERSION=1.3.5 \ + VPX_VERSION=1.8.0 \ + WEBP_VERSION=1.0.2 \ X264_VERSION=20170226-2245-stable \ - X265_VERSION=3.1.1 \ - XVID_VERSION=1.3.4 \ - FREETYPE_VERSION=2.5.5 \ - FRIBIDI_VERSION=0.19.7 \ - FONTCONFIG_VERSION=2.12.4 \ - LIBVIDSTAB_VERSION=1.1.0 \ - KVAZAAR_VERSION=1.2.0 \ - AOM_VERSION=v1.0.0 \ + X265_VERSION=3.1.1 \ + XVID_VERSION=1.3.4 \ SRC=/usr/local -ARG OGG_SHA256SUM="e19ee34711d7af328cb26287f4137e70630e7261b17cbe3cd41011d73a654692 libogg-1.3.2.tar.gz" -ARG OPUS_SHA256SUM="77db45a87b51578fbc49555ef1b10926179861d854eb2613207dc79d9ec0a9a9 opus-1.2.tar.gz" -ARG VORBIS_SHA256SUM="6efbcecdd3e5dfbf090341b485da9d176eb250d893e3eb378c428a2db38301ce libvorbis-1.3.5.tar.gz" -ARG THEORA_SHA256SUM="40952956c47811928d1e7922cda3bc1f427eb75680c3c37249c91e949054916b libtheora-1.1.1.tar.gz" -ARG XVID_SHA256SUM="4e9fd62728885855bc5007fe1be58df42e5e274497591fec37249e1052ae316f xvidcore-1.3.4.tar.gz" -ARG FREETYPE_SHA256SUM="5d03dd76c2171a7601e9ce10551d52d4471cf92cd205948e60289251daddffa8 freetype-2.5.5.tar.gz" -ARG LIBVIDSTAB_SHA256SUM="14d2a053e56edad4f397be0cb3ef8eb1ec3150404ce99a426c4eb641861dc0bb v1.1.0.tar.gz" -ARG LIBASS_SHA256SUM="8fadf294bf701300d4605e6f1d92929304187fca4b8d8a47889315526adbafd7 0.13.7.tar.gz" -ARG FRIBIDI_SHA256SUM="3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 0.19.7.tar.gz" +ARG FREETYPE_SHA256SUM="5d03dd76c2171a7601e9ce10551d52d4471cf92cd205948e60289251daddffa8 freetype-2.5.5.tar.gz" +ARG FRIBIDI_SHA256SUM="3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 0.19.7.tar.gz" +ARG LIBASS_SHA256SUM="8fadf294bf701300d4605e6f1d92929304187fca4b8d8a47889315526adbafd7 0.13.7.tar.gz" +ARG LIBVIDSTAB_SHA256SUM="14d2a053e56edad4f397be0cb3ef8eb1ec3150404ce99a426c4eb641861dc0bb v1.1.0.tar.gz" +ARG OGG_SHA256SUM="e19ee34711d7af328cb26287f4137e70630e7261b17cbe3cd41011d73a654692 libogg-1.3.2.tar.gz" +ARG OPUS_SHA256SUM="77db45a87b51578fbc49555ef1b10926179861d854eb2613207dc79d9ec0a9a9 opus-1.2.tar.gz" +ARG THEORA_SHA256SUM="40952956c47811928d1e7922cda3bc1f427eb75680c3c37249c91e949054916b libtheora-1.1.1.tar.gz" +ARG VORBIS_SHA256SUM="6efbcecdd3e5dfbf090341b485da9d176eb250d893e3eb378c428a2db38301ce libvorbis-1.3.5.tar.gz" +ARG XVID_SHA256SUM="4e9fd62728885855bc5007fe1be58df42e5e274497591fec37249e1052ae316f xvidcore-1.3.4.tar.gz" + RUN buildDeps="autoconf \ diff --git a/docker-images/4.0/alpine/Dockerfile b/docker-images/4.0/alpine/Dockerfile index 1cf850abc..fd389eeb4 100644 --- a/docker-images/4.0/alpine/Dockerfile +++ b/docker-images/4.0/alpine/Dockerfile @@ -18,38 +18,39 @@ ARG LD_LIBRARY_PATH=/opt/ffmpeg/lib ARG PREFIX=/opt/ffmpeg ARG MAKEFLAGS="-j2" -ENV FFMPEG_VERSION=4.0.4 \ - FDKAAC_VERSION=0.1.5 \ - LAME_VERSION=3.100 \ - LIBASS_VERSION=0.13.7 \ - OGG_VERSION=1.3.2 \ +ENV FFMPEG_VERSION=4.0.4 \ + AOM_VERSION=v1.0.0 \ + FDKAAC_VERSION=0.1.5 \ + FONTCONFIG_VERSION=2.12.4 \ + FREETYPE_VERSION=2.5.5 \ + FRIBIDI_VERSION=0.19.7 \ + KVAZAAR_VERSION=1.2.0 \ + LAME_VERSION=3.100 \ + LIBASS_VERSION=0.13.7 \ + LIBVIDSTAB_VERSION=1.1.0 \ + OGG_VERSION=1.3.2 \ OPENCOREAMR_VERSION=0.1.5 \ - OPUS_VERSION=1.2 \ - OPENJPEG_VERSION=2.1.2 \ - THEORA_VERSION=1.1.1 \ - VORBIS_VERSION=1.3.5 \ - VPX_VERSION=1.8.0 \ - WEBP_VERSION=1.0.2 \ + OPUS_VERSION=1.2 \ + OPENJPEG_VERSION=2.1.2 \ + THEORA_VERSION=1.1.1 \ + VORBIS_VERSION=1.3.5 \ + VPX_VERSION=1.8.0 \ + WEBP_VERSION=1.0.2 \ X264_VERSION=20170226-2245-stable \ - X265_VERSION=3.1.1 \ - XVID_VERSION=1.3.4 \ - FREETYPE_VERSION=2.5.5 \ - FRIBIDI_VERSION=0.19.7 \ - FONTCONFIG_VERSION=2.12.4 \ - LIBVIDSTAB_VERSION=1.1.0 \ - KVAZAAR_VERSION=1.2.0 \ - AOM_VERSION=v1.0.0 \ + X265_VERSION=3.1.1 \ + XVID_VERSION=1.3.4 \ SRC=/usr/local -ARG OGG_SHA256SUM="e19ee34711d7af328cb26287f4137e70630e7261b17cbe3cd41011d73a654692 libogg-1.3.2.tar.gz" -ARG OPUS_SHA256SUM="77db45a87b51578fbc49555ef1b10926179861d854eb2613207dc79d9ec0a9a9 opus-1.2.tar.gz" -ARG VORBIS_SHA256SUM="6efbcecdd3e5dfbf090341b485da9d176eb250d893e3eb378c428a2db38301ce libvorbis-1.3.5.tar.gz" -ARG THEORA_SHA256SUM="40952956c47811928d1e7922cda3bc1f427eb75680c3c37249c91e949054916b libtheora-1.1.1.tar.gz" -ARG XVID_SHA256SUM="4e9fd62728885855bc5007fe1be58df42e5e274497591fec37249e1052ae316f xvidcore-1.3.4.tar.gz" -ARG FREETYPE_SHA256SUM="5d03dd76c2171a7601e9ce10551d52d4471cf92cd205948e60289251daddffa8 freetype-2.5.5.tar.gz" -ARG LIBVIDSTAB_SHA256SUM="14d2a053e56edad4f397be0cb3ef8eb1ec3150404ce99a426c4eb641861dc0bb v1.1.0.tar.gz" -ARG LIBASS_SHA256SUM="8fadf294bf701300d4605e6f1d92929304187fca4b8d8a47889315526adbafd7 0.13.7.tar.gz" -ARG FRIBIDI_SHA256SUM="3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 0.19.7.tar.gz" +ARG FREETYPE_SHA256SUM="5d03dd76c2171a7601e9ce10551d52d4471cf92cd205948e60289251daddffa8 freetype-2.5.5.tar.gz" +ARG FRIBIDI_SHA256SUM="3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 0.19.7.tar.gz" +ARG LIBASS_SHA256SUM="8fadf294bf701300d4605e6f1d92929304187fca4b8d8a47889315526adbafd7 0.13.7.tar.gz" +ARG LIBVIDSTAB_SHA256SUM="14d2a053e56edad4f397be0cb3ef8eb1ec3150404ce99a426c4eb641861dc0bb v1.1.0.tar.gz" +ARG OGG_SHA256SUM="e19ee34711d7af328cb26287f4137e70630e7261b17cbe3cd41011d73a654692 libogg-1.3.2.tar.gz" +ARG OPUS_SHA256SUM="77db45a87b51578fbc49555ef1b10926179861d854eb2613207dc79d9ec0a9a9 opus-1.2.tar.gz" +ARG THEORA_SHA256SUM="40952956c47811928d1e7922cda3bc1f427eb75680c3c37249c91e949054916b libtheora-1.1.1.tar.gz" +ARG VORBIS_SHA256SUM="6efbcecdd3e5dfbf090341b485da9d176eb250d893e3eb378c428a2db38301ce libvorbis-1.3.5.tar.gz" +ARG XVID_SHA256SUM="4e9fd62728885855bc5007fe1be58df42e5e274497591fec37249e1052ae316f xvidcore-1.3.4.tar.gz" + RUN buildDeps="autoconf \ diff --git a/docker-images/4.0/centos/Dockerfile b/docker-images/4.0/centos/Dockerfile index 413564dc0..1c03651e6 100644 --- a/docker-images/4.0/centos/Dockerfile +++ b/docker-images/4.0/centos/Dockerfile @@ -20,38 +20,39 @@ ARG LD_LIBRARY_PATH=/opt/ffmpeg/lib ARG PREFIX=/opt/ffmpeg ARG MAKEFLAGS="-j2" -ENV FFMPEG_VERSION=4.0.4 \ - FDKAAC_VERSION=0.1.5 \ - LAME_VERSION=3.100 \ - LIBASS_VERSION=0.13.7 \ - OGG_VERSION=1.3.2 \ +ENV FFMPEG_VERSION=4.0.4 \ + AOM_VERSION=v1.0.0 \ + FDKAAC_VERSION=0.1.5 \ + FONTCONFIG_VERSION=2.12.4 \ + FREETYPE_VERSION=2.5.5 \ + FRIBIDI_VERSION=0.19.7 \ + KVAZAAR_VERSION=1.2.0 \ + LAME_VERSION=3.100 \ + LIBASS_VERSION=0.13.7 \ + LIBVIDSTAB_VERSION=1.1.0 \ + OGG_VERSION=1.3.2 \ OPENCOREAMR_VERSION=0.1.5 \ - OPUS_VERSION=1.2 \ - OPENJPEG_VERSION=2.1.2 \ - THEORA_VERSION=1.1.1 \ - VORBIS_VERSION=1.3.5 \ - VPX_VERSION=1.8.0 \ - WEBP_VERSION=1.0.2 \ + OPUS_VERSION=1.2 \ + OPENJPEG_VERSION=2.1.2 \ + THEORA_VERSION=1.1.1 \ + VORBIS_VERSION=1.3.5 \ + VPX_VERSION=1.8.0 \ + WEBP_VERSION=1.0.2 \ X264_VERSION=20170226-2245-stable \ - X265_VERSION=3.1.1 \ - XVID_VERSION=1.3.4 \ - FREETYPE_VERSION=2.5.5 \ - FRIBIDI_VERSION=0.19.7 \ - FONTCONFIG_VERSION=2.12.4 \ - LIBVIDSTAB_VERSION=1.1.0 \ - KVAZAAR_VERSION=1.2.0 \ - AOM_VERSION=v1.0.0 \ + X265_VERSION=3.1.1 \ + XVID_VERSION=1.3.4 \ SRC=/usr/local -ARG OGG_SHA256SUM="e19ee34711d7af328cb26287f4137e70630e7261b17cbe3cd41011d73a654692 libogg-1.3.2.tar.gz" -ARG OPUS_SHA256SUM="77db45a87b51578fbc49555ef1b10926179861d854eb2613207dc79d9ec0a9a9 opus-1.2.tar.gz" -ARG VORBIS_SHA256SUM="6efbcecdd3e5dfbf090341b485da9d176eb250d893e3eb378c428a2db38301ce libvorbis-1.3.5.tar.gz" -ARG THEORA_SHA256SUM="40952956c47811928d1e7922cda3bc1f427eb75680c3c37249c91e949054916b libtheora-1.1.1.tar.gz" -ARG XVID_SHA256SUM="4e9fd62728885855bc5007fe1be58df42e5e274497591fec37249e1052ae316f xvidcore-1.3.4.tar.gz" -ARG FREETYPE_SHA256SUM="5d03dd76c2171a7601e9ce10551d52d4471cf92cd205948e60289251daddffa8 freetype-2.5.5.tar.gz" -ARG LIBVIDSTAB_SHA256SUM="14d2a053e56edad4f397be0cb3ef8eb1ec3150404ce99a426c4eb641861dc0bb v1.1.0.tar.gz" -ARG LIBASS_SHA256SUM="8fadf294bf701300d4605e6f1d92929304187fca4b8d8a47889315526adbafd7 0.13.7.tar.gz" -ARG FRIBIDI_SHA256SUM="3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 0.19.7.tar.gz" +ARG FREETYPE_SHA256SUM="5d03dd76c2171a7601e9ce10551d52d4471cf92cd205948e60289251daddffa8 freetype-2.5.5.tar.gz" +ARG FRIBIDI_SHA256SUM="3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 0.19.7.tar.gz" +ARG LIBASS_SHA256SUM="8fadf294bf701300d4605e6f1d92929304187fca4b8d8a47889315526adbafd7 0.13.7.tar.gz" +ARG LIBVIDSTAB_SHA256SUM="14d2a053e56edad4f397be0cb3ef8eb1ec3150404ce99a426c4eb641861dc0bb v1.1.0.tar.gz" +ARG OGG_SHA256SUM="e19ee34711d7af328cb26287f4137e70630e7261b17cbe3cd41011d73a654692 libogg-1.3.2.tar.gz" +ARG OPUS_SHA256SUM="77db45a87b51578fbc49555ef1b10926179861d854eb2613207dc79d9ec0a9a9 opus-1.2.tar.gz" +ARG THEORA_SHA256SUM="40952956c47811928d1e7922cda3bc1f427eb75680c3c37249c91e949054916b libtheora-1.1.1.tar.gz" +ARG VORBIS_SHA256SUM="6efbcecdd3e5dfbf090341b485da9d176eb250d893e3eb378c428a2db38301ce libvorbis-1.3.5.tar.gz" +ARG XVID_SHA256SUM="4e9fd62728885855bc5007fe1be58df42e5e274497591fec37249e1052ae316f xvidcore-1.3.4.tar.gz" + RUN buildDeps="autoconf \ diff --git a/docker-images/4.0/nvidia/Dockerfile b/docker-images/4.0/nvidia/Dockerfile index 06e64c9f3..f86647d8a 100644 --- a/docker-images/4.0/nvidia/Dockerfile +++ b/docker-images/4.0/nvidia/Dockerfile @@ -35,38 +35,39 @@ ENV LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/opt/ffmpeg/lib" ARG PREFIX=/opt/ffmpeg ARG MAKEFLAGS="-j12" -ENV FFMPEG_VERSION=4.0.4 \ - FDKAAC_VERSION=0.1.5 \ - LAME_VERSION=3.100 \ - LIBASS_VERSION=0.13.7 \ - OGG_VERSION=1.3.2 \ +ENV FFMPEG_VERSION=4.0.4 \ + AOM_VERSION=v1.0.0 \ + FDKAAC_VERSION=0.1.5 \ + FONTCONFIG_VERSION=2.12.4 \ + FREETYPE_VERSION=2.5.5 \ + FRIBIDI_VERSION=0.19.7 \ + KVAZAAR_VERSION=1.2.0 \ + LAME_VERSION=3.100 \ + LIBASS_VERSION=0.13.7 \ + LIBVIDSTAB_VERSION=1.1.0 \ + OGG_VERSION=1.3.2 \ OPENCOREAMR_VERSION=0.1.5 \ - OPUS_VERSION=1.2 \ - OPENJPEG_VERSION=2.1.2 \ - THEORA_VERSION=1.1.1 \ - VORBIS_VERSION=1.3.5 \ - VPX_VERSION=1.8.0 \ - WEBP_VERSION=1.0.2 \ + OPUS_VERSION=1.2 \ + OPENJPEG_VERSION=2.1.2 \ + THEORA_VERSION=1.1.1 \ + VORBIS_VERSION=1.3.5 \ + VPX_VERSION=1.8.0 \ + WEBP_VERSION=1.0.2 \ X264_VERSION=20170226-2245-stable \ - X265_VERSION=3.1.1 \ - XVID_VERSION=1.3.4 \ - FREETYPE_VERSION=2.5.5 \ - FRIBIDI_VERSION=0.19.7 \ - FONTCONFIG_VERSION=2.12.4 \ - LIBVIDSTAB_VERSION=1.1.0 \ - KVAZAAR_VERSION=1.2.0 \ - AOM_VERSION=v1.0.0 \ + X265_VERSION=3.1.1 \ + XVID_VERSION=1.3.4 \ SRC=/usr/local -ARG OGG_SHA256SUM="e19ee34711d7af328cb26287f4137e70630e7261b17cbe3cd41011d73a654692 libogg-1.3.2.tar.gz" -ARG OPUS_SHA256SUM="77db45a87b51578fbc49555ef1b10926179861d854eb2613207dc79d9ec0a9a9 opus-1.2.tar.gz" -ARG VORBIS_SHA256SUM="6efbcecdd3e5dfbf090341b485da9d176eb250d893e3eb378c428a2db38301ce libvorbis-1.3.5.tar.gz" -ARG THEORA_SHA256SUM="40952956c47811928d1e7922cda3bc1f427eb75680c3c37249c91e949054916b libtheora-1.1.1.tar.gz" -ARG XVID_SHA256SUM="4e9fd62728885855bc5007fe1be58df42e5e274497591fec37249e1052ae316f xvidcore-1.3.4.tar.gz" -ARG FREETYPE_SHA256SUM="5d03dd76c2171a7601e9ce10551d52d4471cf92cd205948e60289251daddffa8 freetype-2.5.5.tar.gz" -ARG LIBVIDSTAB_SHA256SUM="14d2a053e56edad4f397be0cb3ef8eb1ec3150404ce99a426c4eb641861dc0bb v1.1.0.tar.gz" -ARG LIBASS_SHA256SUM="8fadf294bf701300d4605e6f1d92929304187fca4b8d8a47889315526adbafd7 0.13.7.tar.gz" -ARG FRIBIDI_SHA256SUM="3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 0.19.7.tar.gz" +ARG FREETYPE_SHA256SUM="5d03dd76c2171a7601e9ce10551d52d4471cf92cd205948e60289251daddffa8 freetype-2.5.5.tar.gz" +ARG FRIBIDI_SHA256SUM="3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 0.19.7.tar.gz" +ARG LIBASS_SHA256SUM="8fadf294bf701300d4605e6f1d92929304187fca4b8d8a47889315526adbafd7 0.13.7.tar.gz" +ARG LIBVIDSTAB_SHA256SUM="14d2a053e56edad4f397be0cb3ef8eb1ec3150404ce99a426c4eb641861dc0bb v1.1.0.tar.gz" +ARG OGG_SHA256SUM="e19ee34711d7af328cb26287f4137e70630e7261b17cbe3cd41011d73a654692 libogg-1.3.2.tar.gz" +ARG OPUS_SHA256SUM="77db45a87b51578fbc49555ef1b10926179861d854eb2613207dc79d9ec0a9a9 opus-1.2.tar.gz" +ARG THEORA_SHA256SUM="40952956c47811928d1e7922cda3bc1f427eb75680c3c37249c91e949054916b libtheora-1.1.1.tar.gz" +ARG VORBIS_SHA256SUM="6efbcecdd3e5dfbf090341b485da9d176eb250d893e3eb378c428a2db38301ce libvorbis-1.3.5.tar.gz" +ARG XVID_SHA256SUM="4e9fd62728885855bc5007fe1be58df42e5e274497591fec37249e1052ae316f xvidcore-1.3.4.tar.gz" + RUN buildDeps="autoconf \ diff --git a/docker-images/4.0/scratch/Dockerfile b/docker-images/4.0/scratch/Dockerfile index 97f1ea06a..0ca2f86ed 100644 --- a/docker-images/4.0/scratch/Dockerfile +++ b/docker-images/4.0/scratch/Dockerfile @@ -13,38 +13,39 @@ ARG LD_LIBRARY_PATH=/opt/ffmpeg/lib ARG PREFIX=/opt/ffmpeg ARG MAKEFLAGS="-j2" -ENV FFMPEG_VERSION=4.0.4 \ - FDKAAC_VERSION=0.1.5 \ - LAME_VERSION=3.100 \ - LIBASS_VERSION=0.13.7 \ - OGG_VERSION=1.3.2 \ +ENV FFMPEG_VERSION=4.0.4 \ + AOM_VERSION=v1.0.0 \ + FDKAAC_VERSION=0.1.5 \ + FONTCONFIG_VERSION=2.12.4 \ + FREETYPE_VERSION=2.5.5 \ + FRIBIDI_VERSION=0.19.7 \ + KVAZAAR_VERSION=1.2.0 \ + LAME_VERSION=3.100 \ + LIBASS_VERSION=0.13.7 \ + LIBVIDSTAB_VERSION=1.1.0 \ + OGG_VERSION=1.3.2 \ OPENCOREAMR_VERSION=0.1.5 \ - OPUS_VERSION=1.2 \ - OPENJPEG_VERSION=2.1.2 \ - THEORA_VERSION=1.1.1 \ - VORBIS_VERSION=1.3.5 \ - VPX_VERSION=1.8.0 \ - WEBP_VERSION=1.0.2 \ + OPUS_VERSION=1.2 \ + OPENJPEG_VERSION=2.1.2 \ + THEORA_VERSION=1.1.1 \ + VORBIS_VERSION=1.3.5 \ + VPX_VERSION=1.8.0 \ + WEBP_VERSION=1.0.2 \ X264_VERSION=20170226-2245-stable \ - X265_VERSION=3.1.1 \ - XVID_VERSION=1.3.4 \ - FREETYPE_VERSION=2.5.5 \ - FRIBIDI_VERSION=0.19.7 \ - FONTCONFIG_VERSION=2.12.4 \ - LIBVIDSTAB_VERSION=1.1.0 \ - KVAZAAR_VERSION=1.2.0 \ - AOM_VERSION=v1.0.0 \ + X265_VERSION=3.1.1 \ + XVID_VERSION=1.3.4 \ SRC=/usr/local -ARG OGG_SHA256SUM="e19ee34711d7af328cb26287f4137e70630e7261b17cbe3cd41011d73a654692 libogg-1.3.2.tar.gz" -ARG OPUS_SHA256SUM="77db45a87b51578fbc49555ef1b10926179861d854eb2613207dc79d9ec0a9a9 opus-1.2.tar.gz" -ARG VORBIS_SHA256SUM="6efbcecdd3e5dfbf090341b485da9d176eb250d893e3eb378c428a2db38301ce libvorbis-1.3.5.tar.gz" -ARG THEORA_SHA256SUM="40952956c47811928d1e7922cda3bc1f427eb75680c3c37249c91e949054916b libtheora-1.1.1.tar.gz" -ARG XVID_SHA256SUM="4e9fd62728885855bc5007fe1be58df42e5e274497591fec37249e1052ae316f xvidcore-1.3.4.tar.gz" -ARG FREETYPE_SHA256SUM="5d03dd76c2171a7601e9ce10551d52d4471cf92cd205948e60289251daddffa8 freetype-2.5.5.tar.gz" -ARG LIBVIDSTAB_SHA256SUM="14d2a053e56edad4f397be0cb3ef8eb1ec3150404ce99a426c4eb641861dc0bb v1.1.0.tar.gz" -ARG LIBASS_SHA256SUM="8fadf294bf701300d4605e6f1d92929304187fca4b8d8a47889315526adbafd7 0.13.7.tar.gz" -ARG FRIBIDI_SHA256SUM="3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 0.19.7.tar.gz" +ARG FREETYPE_SHA256SUM="5d03dd76c2171a7601e9ce10551d52d4471cf92cd205948e60289251daddffa8 freetype-2.5.5.tar.gz" +ARG FRIBIDI_SHA256SUM="3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 0.19.7.tar.gz" +ARG LIBASS_SHA256SUM="8fadf294bf701300d4605e6f1d92929304187fca4b8d8a47889315526adbafd7 0.13.7.tar.gz" +ARG LIBVIDSTAB_SHA256SUM="14d2a053e56edad4f397be0cb3ef8eb1ec3150404ce99a426c4eb641861dc0bb v1.1.0.tar.gz" +ARG OGG_SHA256SUM="e19ee34711d7af328cb26287f4137e70630e7261b17cbe3cd41011d73a654692 libogg-1.3.2.tar.gz" +ARG OPUS_SHA256SUM="77db45a87b51578fbc49555ef1b10926179861d854eb2613207dc79d9ec0a9a9 opus-1.2.tar.gz" +ARG THEORA_SHA256SUM="40952956c47811928d1e7922cda3bc1f427eb75680c3c37249c91e949054916b libtheora-1.1.1.tar.gz" +ARG VORBIS_SHA256SUM="6efbcecdd3e5dfbf090341b485da9d176eb250d893e3eb378c428a2db38301ce libvorbis-1.3.5.tar.gz" +ARG XVID_SHA256SUM="4e9fd62728885855bc5007fe1be58df42e5e274497591fec37249e1052ae316f xvidcore-1.3.4.tar.gz" + RUN buildDeps="autoconf \ diff --git a/docker-images/4.0/ubuntu/Dockerfile b/docker-images/4.0/ubuntu/Dockerfile index cb402d8a2..e1ce519ab 100644 --- a/docker-images/4.0/ubuntu/Dockerfile +++ b/docker-images/4.0/ubuntu/Dockerfile @@ -21,38 +21,39 @@ ARG LD_LIBRARY_PATH=/opt/ffmpeg/lib ARG PREFIX=/opt/ffmpeg ARG MAKEFLAGS="-j2" -ENV FFMPEG_VERSION=4.0.4 \ - FDKAAC_VERSION=0.1.5 \ - LAME_VERSION=3.100 \ - LIBASS_VERSION=0.13.7 \ - OGG_VERSION=1.3.2 \ +ENV FFMPEG_VERSION=4.0.4 \ + AOM_VERSION=v1.0.0 \ + FDKAAC_VERSION=0.1.5 \ + FONTCONFIG_VERSION=2.12.4 \ + FREETYPE_VERSION=2.5.5 \ + FRIBIDI_VERSION=0.19.7 \ + KVAZAAR_VERSION=1.2.0 \ + LAME_VERSION=3.100 \ + LIBASS_VERSION=0.13.7 \ + LIBVIDSTAB_VERSION=1.1.0 \ + OGG_VERSION=1.3.2 \ OPENCOREAMR_VERSION=0.1.5 \ - OPUS_VERSION=1.2 \ - OPENJPEG_VERSION=2.1.2 \ - THEORA_VERSION=1.1.1 \ - VORBIS_VERSION=1.3.5 \ - VPX_VERSION=1.8.0 \ - WEBP_VERSION=1.0.2 \ + OPUS_VERSION=1.2 \ + OPENJPEG_VERSION=2.1.2 \ + THEORA_VERSION=1.1.1 \ + VORBIS_VERSION=1.3.5 \ + VPX_VERSION=1.8.0 \ + WEBP_VERSION=1.0.2 \ X264_VERSION=20170226-2245-stable \ - X265_VERSION=3.1.1 \ - XVID_VERSION=1.3.4 \ - FREETYPE_VERSION=2.5.5 \ - FRIBIDI_VERSION=0.19.7 \ - FONTCONFIG_VERSION=2.12.4 \ - LIBVIDSTAB_VERSION=1.1.0 \ - KVAZAAR_VERSION=1.2.0 \ - AOM_VERSION=v1.0.0 \ + X265_VERSION=3.1.1 \ + XVID_VERSION=1.3.4 \ SRC=/usr/local -ARG OGG_SHA256SUM="e19ee34711d7af328cb26287f4137e70630e7261b17cbe3cd41011d73a654692 libogg-1.3.2.tar.gz" -ARG OPUS_SHA256SUM="77db45a87b51578fbc49555ef1b10926179861d854eb2613207dc79d9ec0a9a9 opus-1.2.tar.gz" -ARG VORBIS_SHA256SUM="6efbcecdd3e5dfbf090341b485da9d176eb250d893e3eb378c428a2db38301ce libvorbis-1.3.5.tar.gz" -ARG THEORA_SHA256SUM="40952956c47811928d1e7922cda3bc1f427eb75680c3c37249c91e949054916b libtheora-1.1.1.tar.gz" -ARG XVID_SHA256SUM="4e9fd62728885855bc5007fe1be58df42e5e274497591fec37249e1052ae316f xvidcore-1.3.4.tar.gz" -ARG FREETYPE_SHA256SUM="5d03dd76c2171a7601e9ce10551d52d4471cf92cd205948e60289251daddffa8 freetype-2.5.5.tar.gz" -ARG LIBVIDSTAB_SHA256SUM="14d2a053e56edad4f397be0cb3ef8eb1ec3150404ce99a426c4eb641861dc0bb v1.1.0.tar.gz" -ARG LIBASS_SHA256SUM="8fadf294bf701300d4605e6f1d92929304187fca4b8d8a47889315526adbafd7 0.13.7.tar.gz" -ARG FRIBIDI_SHA256SUM="3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 0.19.7.tar.gz" +ARG FREETYPE_SHA256SUM="5d03dd76c2171a7601e9ce10551d52d4471cf92cd205948e60289251daddffa8 freetype-2.5.5.tar.gz" +ARG FRIBIDI_SHA256SUM="3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 0.19.7.tar.gz" +ARG LIBASS_SHA256SUM="8fadf294bf701300d4605e6f1d92929304187fca4b8d8a47889315526adbafd7 0.13.7.tar.gz" +ARG LIBVIDSTAB_SHA256SUM="14d2a053e56edad4f397be0cb3ef8eb1ec3150404ce99a426c4eb641861dc0bb v1.1.0.tar.gz" +ARG OGG_SHA256SUM="e19ee34711d7af328cb26287f4137e70630e7261b17cbe3cd41011d73a654692 libogg-1.3.2.tar.gz" +ARG OPUS_SHA256SUM="77db45a87b51578fbc49555ef1b10926179861d854eb2613207dc79d9ec0a9a9 opus-1.2.tar.gz" +ARG THEORA_SHA256SUM="40952956c47811928d1e7922cda3bc1f427eb75680c3c37249c91e949054916b libtheora-1.1.1.tar.gz" +ARG VORBIS_SHA256SUM="6efbcecdd3e5dfbf090341b485da9d176eb250d893e3eb378c428a2db38301ce libvorbis-1.3.5.tar.gz" +ARG XVID_SHA256SUM="4e9fd62728885855bc5007fe1be58df42e5e274497591fec37249e1052ae316f xvidcore-1.3.4.tar.gz" + RUN buildDeps="autoconf \ diff --git a/docker-images/4.0/vaapi/Dockerfile b/docker-images/4.0/vaapi/Dockerfile index 4b5453cf2..594c855d8 100644 --- a/docker-images/4.0/vaapi/Dockerfile +++ b/docker-images/4.0/vaapi/Dockerfile @@ -21,38 +21,39 @@ ARG LD_LIBRARY_PATH=/opt/ffmpeg/lib ARG PREFIX=/opt/ffmpeg ARG MAKEFLAGS="-j2" -ENV FFMPEG_VERSION=4.0.4 \ - FDKAAC_VERSION=0.1.5 \ - LAME_VERSION=3.100 \ - LIBASS_VERSION=0.13.7 \ - OGG_VERSION=1.3.2 \ +ENV FFMPEG_VERSION=4.0.4 \ + AOM_VERSION=v1.0.0 \ + FDKAAC_VERSION=0.1.5 \ + FONTCONFIG_VERSION=2.12.4 \ + FREETYPE_VERSION=2.5.5 \ + FRIBIDI_VERSION=0.19.7 \ + KVAZAAR_VERSION=1.2.0 \ + LAME_VERSION=3.100 \ + LIBASS_VERSION=0.13.7 \ + LIBVIDSTAB_VERSION=1.1.0 \ + OGG_VERSION=1.3.2 \ OPENCOREAMR_VERSION=0.1.5 \ - OPUS_VERSION=1.2 \ - OPENJPEG_VERSION=2.1.2 \ - THEORA_VERSION=1.1.1 \ - VORBIS_VERSION=1.3.5 \ - VPX_VERSION=1.8.0 \ - WEBP_VERSION=1.0.2 \ + OPUS_VERSION=1.2 \ + OPENJPEG_VERSION=2.1.2 \ + THEORA_VERSION=1.1.1 \ + VORBIS_VERSION=1.3.5 \ + VPX_VERSION=1.8.0 \ + WEBP_VERSION=1.0.2 \ X264_VERSION=20170226-2245-stable \ - X265_VERSION=3.1.1 \ - XVID_VERSION=1.3.4 \ - FREETYPE_VERSION=2.5.5 \ - FRIBIDI_VERSION=0.19.7 \ - FONTCONFIG_VERSION=2.12.4 \ - LIBVIDSTAB_VERSION=1.1.0 \ - KVAZAAR_VERSION=1.2.0 \ - AOM_VERSION=v1.0.0 \ + X265_VERSION=3.1.1 \ + XVID_VERSION=1.3.4 \ SRC=/usr/local -ARG OGG_SHA256SUM="e19ee34711d7af328cb26287f4137e70630e7261b17cbe3cd41011d73a654692 libogg-1.3.2.tar.gz" -ARG OPUS_SHA256SUM="77db45a87b51578fbc49555ef1b10926179861d854eb2613207dc79d9ec0a9a9 opus-1.2.tar.gz" -ARG VORBIS_SHA256SUM="6efbcecdd3e5dfbf090341b485da9d176eb250d893e3eb378c428a2db38301ce libvorbis-1.3.5.tar.gz" -ARG THEORA_SHA256SUM="40952956c47811928d1e7922cda3bc1f427eb75680c3c37249c91e949054916b libtheora-1.1.1.tar.gz" -ARG XVID_SHA256SUM="4e9fd62728885855bc5007fe1be58df42e5e274497591fec37249e1052ae316f xvidcore-1.3.4.tar.gz" -ARG FREETYPE_SHA256SUM="5d03dd76c2171a7601e9ce10551d52d4471cf92cd205948e60289251daddffa8 freetype-2.5.5.tar.gz" -ARG LIBVIDSTAB_SHA256SUM="14d2a053e56edad4f397be0cb3ef8eb1ec3150404ce99a426c4eb641861dc0bb v1.1.0.tar.gz" -ARG LIBASS_SHA256SUM="8fadf294bf701300d4605e6f1d92929304187fca4b8d8a47889315526adbafd7 0.13.7.tar.gz" -ARG FRIBIDI_SHA256SUM="3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 0.19.7.tar.gz" +ARG FREETYPE_SHA256SUM="5d03dd76c2171a7601e9ce10551d52d4471cf92cd205948e60289251daddffa8 freetype-2.5.5.tar.gz" +ARG FRIBIDI_SHA256SUM="3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 0.19.7.tar.gz" +ARG LIBASS_SHA256SUM="8fadf294bf701300d4605e6f1d92929304187fca4b8d8a47889315526adbafd7 0.13.7.tar.gz" +ARG LIBVIDSTAB_SHA256SUM="14d2a053e56edad4f397be0cb3ef8eb1ec3150404ce99a426c4eb641861dc0bb v1.1.0.tar.gz" +ARG OGG_SHA256SUM="e19ee34711d7af328cb26287f4137e70630e7261b17cbe3cd41011d73a654692 libogg-1.3.2.tar.gz" +ARG OPUS_SHA256SUM="77db45a87b51578fbc49555ef1b10926179861d854eb2613207dc79d9ec0a9a9 opus-1.2.tar.gz" +ARG THEORA_SHA256SUM="40952956c47811928d1e7922cda3bc1f427eb75680c3c37249c91e949054916b libtheora-1.1.1.tar.gz" +ARG VORBIS_SHA256SUM="6efbcecdd3e5dfbf090341b485da9d176eb250d893e3eb378c428a2db38301ce libvorbis-1.3.5.tar.gz" +ARG XVID_SHA256SUM="4e9fd62728885855bc5007fe1be58df42e5e274497591fec37249e1052ae316f xvidcore-1.3.4.tar.gz" + RUN buildDeps="autoconf \ diff --git a/docker-images/4.1/alpine/Dockerfile b/docker-images/4.1/alpine/Dockerfile index ab3e2607d..de8d26e34 100644 --- a/docker-images/4.1/alpine/Dockerfile +++ b/docker-images/4.1/alpine/Dockerfile @@ -18,38 +18,39 @@ ARG LD_LIBRARY_PATH=/opt/ffmpeg/lib ARG PREFIX=/opt/ffmpeg ARG MAKEFLAGS="-j2" -ENV FFMPEG_VERSION=4.1.4 \ - FDKAAC_VERSION=0.1.5 \ - LAME_VERSION=3.100 \ - LIBASS_VERSION=0.13.7 \ - OGG_VERSION=1.3.2 \ +ENV FFMPEG_VERSION=4.1.4 \ + AOM_VERSION=v1.0.0 \ + FDKAAC_VERSION=0.1.5 \ + FONTCONFIG_VERSION=2.12.4 \ + FREETYPE_VERSION=2.5.5 \ + FRIBIDI_VERSION=0.19.7 \ + KVAZAAR_VERSION=1.2.0 \ + LAME_VERSION=3.100 \ + LIBASS_VERSION=0.13.7 \ + LIBVIDSTAB_VERSION=1.1.0 \ + OGG_VERSION=1.3.2 \ OPENCOREAMR_VERSION=0.1.5 \ - OPUS_VERSION=1.2 \ - OPENJPEG_VERSION=2.1.2 \ - THEORA_VERSION=1.1.1 \ - VORBIS_VERSION=1.3.5 \ - VPX_VERSION=1.8.0 \ - WEBP_VERSION=1.0.2 \ + OPUS_VERSION=1.2 \ + OPENJPEG_VERSION=2.1.2 \ + THEORA_VERSION=1.1.1 \ + VORBIS_VERSION=1.3.5 \ + VPX_VERSION=1.8.0 \ + WEBP_VERSION=1.0.2 \ X264_VERSION=20170226-2245-stable \ - X265_VERSION=3.1.1 \ - XVID_VERSION=1.3.4 \ - FREETYPE_VERSION=2.5.5 \ - FRIBIDI_VERSION=0.19.7 \ - FONTCONFIG_VERSION=2.12.4 \ - LIBVIDSTAB_VERSION=1.1.0 \ - KVAZAAR_VERSION=1.2.0 \ - AOM_VERSION=v1.0.0 \ + X265_VERSION=3.1.1 \ + XVID_VERSION=1.3.4 \ SRC=/usr/local -ARG OGG_SHA256SUM="e19ee34711d7af328cb26287f4137e70630e7261b17cbe3cd41011d73a654692 libogg-1.3.2.tar.gz" -ARG OPUS_SHA256SUM="77db45a87b51578fbc49555ef1b10926179861d854eb2613207dc79d9ec0a9a9 opus-1.2.tar.gz" -ARG VORBIS_SHA256SUM="6efbcecdd3e5dfbf090341b485da9d176eb250d893e3eb378c428a2db38301ce libvorbis-1.3.5.tar.gz" -ARG THEORA_SHA256SUM="40952956c47811928d1e7922cda3bc1f427eb75680c3c37249c91e949054916b libtheora-1.1.1.tar.gz" -ARG XVID_SHA256SUM="4e9fd62728885855bc5007fe1be58df42e5e274497591fec37249e1052ae316f xvidcore-1.3.4.tar.gz" -ARG FREETYPE_SHA256SUM="5d03dd76c2171a7601e9ce10551d52d4471cf92cd205948e60289251daddffa8 freetype-2.5.5.tar.gz" -ARG LIBVIDSTAB_SHA256SUM="14d2a053e56edad4f397be0cb3ef8eb1ec3150404ce99a426c4eb641861dc0bb v1.1.0.tar.gz" -ARG LIBASS_SHA256SUM="8fadf294bf701300d4605e6f1d92929304187fca4b8d8a47889315526adbafd7 0.13.7.tar.gz" -ARG FRIBIDI_SHA256SUM="3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 0.19.7.tar.gz" +ARG FREETYPE_SHA256SUM="5d03dd76c2171a7601e9ce10551d52d4471cf92cd205948e60289251daddffa8 freetype-2.5.5.tar.gz" +ARG FRIBIDI_SHA256SUM="3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 0.19.7.tar.gz" +ARG LIBASS_SHA256SUM="8fadf294bf701300d4605e6f1d92929304187fca4b8d8a47889315526adbafd7 0.13.7.tar.gz" +ARG LIBVIDSTAB_SHA256SUM="14d2a053e56edad4f397be0cb3ef8eb1ec3150404ce99a426c4eb641861dc0bb v1.1.0.tar.gz" +ARG OGG_SHA256SUM="e19ee34711d7af328cb26287f4137e70630e7261b17cbe3cd41011d73a654692 libogg-1.3.2.tar.gz" +ARG OPUS_SHA256SUM="77db45a87b51578fbc49555ef1b10926179861d854eb2613207dc79d9ec0a9a9 opus-1.2.tar.gz" +ARG THEORA_SHA256SUM="40952956c47811928d1e7922cda3bc1f427eb75680c3c37249c91e949054916b libtheora-1.1.1.tar.gz" +ARG VORBIS_SHA256SUM="6efbcecdd3e5dfbf090341b485da9d176eb250d893e3eb378c428a2db38301ce libvorbis-1.3.5.tar.gz" +ARG XVID_SHA256SUM="4e9fd62728885855bc5007fe1be58df42e5e274497591fec37249e1052ae316f xvidcore-1.3.4.tar.gz" + RUN buildDeps="autoconf \ diff --git a/docker-images/4.1/centos/Dockerfile b/docker-images/4.1/centos/Dockerfile index ff9054dc4..b0c24184b 100644 --- a/docker-images/4.1/centos/Dockerfile +++ b/docker-images/4.1/centos/Dockerfile @@ -20,38 +20,39 @@ ARG LD_LIBRARY_PATH=/opt/ffmpeg/lib ARG PREFIX=/opt/ffmpeg ARG MAKEFLAGS="-j2" -ENV FFMPEG_VERSION=4.1.4 \ - FDKAAC_VERSION=0.1.5 \ - LAME_VERSION=3.100 \ - LIBASS_VERSION=0.13.7 \ - OGG_VERSION=1.3.2 \ +ENV FFMPEG_VERSION=4.1.4 \ + AOM_VERSION=v1.0.0 \ + FDKAAC_VERSION=0.1.5 \ + FONTCONFIG_VERSION=2.12.4 \ + FREETYPE_VERSION=2.5.5 \ + FRIBIDI_VERSION=0.19.7 \ + KVAZAAR_VERSION=1.2.0 \ + LAME_VERSION=3.100 \ + LIBASS_VERSION=0.13.7 \ + LIBVIDSTAB_VERSION=1.1.0 \ + OGG_VERSION=1.3.2 \ OPENCOREAMR_VERSION=0.1.5 \ - OPUS_VERSION=1.2 \ - OPENJPEG_VERSION=2.1.2 \ - THEORA_VERSION=1.1.1 \ - VORBIS_VERSION=1.3.5 \ - VPX_VERSION=1.8.0 \ - WEBP_VERSION=1.0.2 \ + OPUS_VERSION=1.2 \ + OPENJPEG_VERSION=2.1.2 \ + THEORA_VERSION=1.1.1 \ + VORBIS_VERSION=1.3.5 \ + VPX_VERSION=1.8.0 \ + WEBP_VERSION=1.0.2 \ X264_VERSION=20170226-2245-stable \ - X265_VERSION=3.1.1 \ - XVID_VERSION=1.3.4 \ - FREETYPE_VERSION=2.5.5 \ - FRIBIDI_VERSION=0.19.7 \ - FONTCONFIG_VERSION=2.12.4 \ - LIBVIDSTAB_VERSION=1.1.0 \ - KVAZAAR_VERSION=1.2.0 \ - AOM_VERSION=v1.0.0 \ + X265_VERSION=3.1.1 \ + XVID_VERSION=1.3.4 \ SRC=/usr/local -ARG OGG_SHA256SUM="e19ee34711d7af328cb26287f4137e70630e7261b17cbe3cd41011d73a654692 libogg-1.3.2.tar.gz" -ARG OPUS_SHA256SUM="77db45a87b51578fbc49555ef1b10926179861d854eb2613207dc79d9ec0a9a9 opus-1.2.tar.gz" -ARG VORBIS_SHA256SUM="6efbcecdd3e5dfbf090341b485da9d176eb250d893e3eb378c428a2db38301ce libvorbis-1.3.5.tar.gz" -ARG THEORA_SHA256SUM="40952956c47811928d1e7922cda3bc1f427eb75680c3c37249c91e949054916b libtheora-1.1.1.tar.gz" -ARG XVID_SHA256SUM="4e9fd62728885855bc5007fe1be58df42e5e274497591fec37249e1052ae316f xvidcore-1.3.4.tar.gz" -ARG FREETYPE_SHA256SUM="5d03dd76c2171a7601e9ce10551d52d4471cf92cd205948e60289251daddffa8 freetype-2.5.5.tar.gz" -ARG LIBVIDSTAB_SHA256SUM="14d2a053e56edad4f397be0cb3ef8eb1ec3150404ce99a426c4eb641861dc0bb v1.1.0.tar.gz" -ARG LIBASS_SHA256SUM="8fadf294bf701300d4605e6f1d92929304187fca4b8d8a47889315526adbafd7 0.13.7.tar.gz" -ARG FRIBIDI_SHA256SUM="3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 0.19.7.tar.gz" +ARG FREETYPE_SHA256SUM="5d03dd76c2171a7601e9ce10551d52d4471cf92cd205948e60289251daddffa8 freetype-2.5.5.tar.gz" +ARG FRIBIDI_SHA256SUM="3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 0.19.7.tar.gz" +ARG LIBASS_SHA256SUM="8fadf294bf701300d4605e6f1d92929304187fca4b8d8a47889315526adbafd7 0.13.7.tar.gz" +ARG LIBVIDSTAB_SHA256SUM="14d2a053e56edad4f397be0cb3ef8eb1ec3150404ce99a426c4eb641861dc0bb v1.1.0.tar.gz" +ARG OGG_SHA256SUM="e19ee34711d7af328cb26287f4137e70630e7261b17cbe3cd41011d73a654692 libogg-1.3.2.tar.gz" +ARG OPUS_SHA256SUM="77db45a87b51578fbc49555ef1b10926179861d854eb2613207dc79d9ec0a9a9 opus-1.2.tar.gz" +ARG THEORA_SHA256SUM="40952956c47811928d1e7922cda3bc1f427eb75680c3c37249c91e949054916b libtheora-1.1.1.tar.gz" +ARG VORBIS_SHA256SUM="6efbcecdd3e5dfbf090341b485da9d176eb250d893e3eb378c428a2db38301ce libvorbis-1.3.5.tar.gz" +ARG XVID_SHA256SUM="4e9fd62728885855bc5007fe1be58df42e5e274497591fec37249e1052ae316f xvidcore-1.3.4.tar.gz" + RUN buildDeps="autoconf \ diff --git a/docker-images/4.1/nvidia/Dockerfile b/docker-images/4.1/nvidia/Dockerfile index d0b0ebadb..4999bc434 100644 --- a/docker-images/4.1/nvidia/Dockerfile +++ b/docker-images/4.1/nvidia/Dockerfile @@ -35,38 +35,39 @@ ENV LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/opt/ffmpeg/lib" ARG PREFIX=/opt/ffmpeg ARG MAKEFLAGS="-j12" -ENV FFMPEG_VERSION=4.1.4 \ - FDKAAC_VERSION=0.1.5 \ - LAME_VERSION=3.100 \ - LIBASS_VERSION=0.13.7 \ - OGG_VERSION=1.3.2 \ +ENV FFMPEG_VERSION=4.1.4 \ + AOM_VERSION=v1.0.0 \ + FDKAAC_VERSION=0.1.5 \ + FONTCONFIG_VERSION=2.12.4 \ + FREETYPE_VERSION=2.5.5 \ + FRIBIDI_VERSION=0.19.7 \ + KVAZAAR_VERSION=1.2.0 \ + LAME_VERSION=3.100 \ + LIBASS_VERSION=0.13.7 \ + LIBVIDSTAB_VERSION=1.1.0 \ + OGG_VERSION=1.3.2 \ OPENCOREAMR_VERSION=0.1.5 \ - OPUS_VERSION=1.2 \ - OPENJPEG_VERSION=2.1.2 \ - THEORA_VERSION=1.1.1 \ - VORBIS_VERSION=1.3.5 \ - VPX_VERSION=1.8.0 \ - WEBP_VERSION=1.0.2 \ + OPUS_VERSION=1.2 \ + OPENJPEG_VERSION=2.1.2 \ + THEORA_VERSION=1.1.1 \ + VORBIS_VERSION=1.3.5 \ + VPX_VERSION=1.8.0 \ + WEBP_VERSION=1.0.2 \ X264_VERSION=20170226-2245-stable \ - X265_VERSION=3.1.1 \ - XVID_VERSION=1.3.4 \ - FREETYPE_VERSION=2.5.5 \ - FRIBIDI_VERSION=0.19.7 \ - FONTCONFIG_VERSION=2.12.4 \ - LIBVIDSTAB_VERSION=1.1.0 \ - KVAZAAR_VERSION=1.2.0 \ - AOM_VERSION=v1.0.0 \ + X265_VERSION=3.1.1 \ + XVID_VERSION=1.3.4 \ SRC=/usr/local -ARG OGG_SHA256SUM="e19ee34711d7af328cb26287f4137e70630e7261b17cbe3cd41011d73a654692 libogg-1.3.2.tar.gz" -ARG OPUS_SHA256SUM="77db45a87b51578fbc49555ef1b10926179861d854eb2613207dc79d9ec0a9a9 opus-1.2.tar.gz" -ARG VORBIS_SHA256SUM="6efbcecdd3e5dfbf090341b485da9d176eb250d893e3eb378c428a2db38301ce libvorbis-1.3.5.tar.gz" -ARG THEORA_SHA256SUM="40952956c47811928d1e7922cda3bc1f427eb75680c3c37249c91e949054916b libtheora-1.1.1.tar.gz" -ARG XVID_SHA256SUM="4e9fd62728885855bc5007fe1be58df42e5e274497591fec37249e1052ae316f xvidcore-1.3.4.tar.gz" -ARG FREETYPE_SHA256SUM="5d03dd76c2171a7601e9ce10551d52d4471cf92cd205948e60289251daddffa8 freetype-2.5.5.tar.gz" -ARG LIBVIDSTAB_SHA256SUM="14d2a053e56edad4f397be0cb3ef8eb1ec3150404ce99a426c4eb641861dc0bb v1.1.0.tar.gz" -ARG LIBASS_SHA256SUM="8fadf294bf701300d4605e6f1d92929304187fca4b8d8a47889315526adbafd7 0.13.7.tar.gz" -ARG FRIBIDI_SHA256SUM="3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 0.19.7.tar.gz" +ARG FREETYPE_SHA256SUM="5d03dd76c2171a7601e9ce10551d52d4471cf92cd205948e60289251daddffa8 freetype-2.5.5.tar.gz" +ARG FRIBIDI_SHA256SUM="3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 0.19.7.tar.gz" +ARG LIBASS_SHA256SUM="8fadf294bf701300d4605e6f1d92929304187fca4b8d8a47889315526adbafd7 0.13.7.tar.gz" +ARG LIBVIDSTAB_SHA256SUM="14d2a053e56edad4f397be0cb3ef8eb1ec3150404ce99a426c4eb641861dc0bb v1.1.0.tar.gz" +ARG OGG_SHA256SUM="e19ee34711d7af328cb26287f4137e70630e7261b17cbe3cd41011d73a654692 libogg-1.3.2.tar.gz" +ARG OPUS_SHA256SUM="77db45a87b51578fbc49555ef1b10926179861d854eb2613207dc79d9ec0a9a9 opus-1.2.tar.gz" +ARG THEORA_SHA256SUM="40952956c47811928d1e7922cda3bc1f427eb75680c3c37249c91e949054916b libtheora-1.1.1.tar.gz" +ARG VORBIS_SHA256SUM="6efbcecdd3e5dfbf090341b485da9d176eb250d893e3eb378c428a2db38301ce libvorbis-1.3.5.tar.gz" +ARG XVID_SHA256SUM="4e9fd62728885855bc5007fe1be58df42e5e274497591fec37249e1052ae316f xvidcore-1.3.4.tar.gz" + RUN buildDeps="autoconf \ diff --git a/docker-images/4.1/scratch/Dockerfile b/docker-images/4.1/scratch/Dockerfile index 76df48baf..46f98edf7 100644 --- a/docker-images/4.1/scratch/Dockerfile +++ b/docker-images/4.1/scratch/Dockerfile @@ -13,38 +13,39 @@ ARG LD_LIBRARY_PATH=/opt/ffmpeg/lib ARG PREFIX=/opt/ffmpeg ARG MAKEFLAGS="-j2" -ENV FFMPEG_VERSION=4.1.4 \ - FDKAAC_VERSION=0.1.5 \ - LAME_VERSION=3.100 \ - LIBASS_VERSION=0.13.7 \ - OGG_VERSION=1.3.2 \ +ENV FFMPEG_VERSION=4.1.4 \ + AOM_VERSION=v1.0.0 \ + FDKAAC_VERSION=0.1.5 \ + FONTCONFIG_VERSION=2.12.4 \ + FREETYPE_VERSION=2.5.5 \ + FRIBIDI_VERSION=0.19.7 \ + KVAZAAR_VERSION=1.2.0 \ + LAME_VERSION=3.100 \ + LIBASS_VERSION=0.13.7 \ + LIBVIDSTAB_VERSION=1.1.0 \ + OGG_VERSION=1.3.2 \ OPENCOREAMR_VERSION=0.1.5 \ - OPUS_VERSION=1.2 \ - OPENJPEG_VERSION=2.1.2 \ - THEORA_VERSION=1.1.1 \ - VORBIS_VERSION=1.3.5 \ - VPX_VERSION=1.8.0 \ - WEBP_VERSION=1.0.2 \ + OPUS_VERSION=1.2 \ + OPENJPEG_VERSION=2.1.2 \ + THEORA_VERSION=1.1.1 \ + VORBIS_VERSION=1.3.5 \ + VPX_VERSION=1.8.0 \ + WEBP_VERSION=1.0.2 \ X264_VERSION=20170226-2245-stable \ - X265_VERSION=3.1.1 \ - XVID_VERSION=1.3.4 \ - FREETYPE_VERSION=2.5.5 \ - FRIBIDI_VERSION=0.19.7 \ - FONTCONFIG_VERSION=2.12.4 \ - LIBVIDSTAB_VERSION=1.1.0 \ - KVAZAAR_VERSION=1.2.0 \ - AOM_VERSION=v1.0.0 \ + X265_VERSION=3.1.1 \ + XVID_VERSION=1.3.4 \ SRC=/usr/local -ARG OGG_SHA256SUM="e19ee34711d7af328cb26287f4137e70630e7261b17cbe3cd41011d73a654692 libogg-1.3.2.tar.gz" -ARG OPUS_SHA256SUM="77db45a87b51578fbc49555ef1b10926179861d854eb2613207dc79d9ec0a9a9 opus-1.2.tar.gz" -ARG VORBIS_SHA256SUM="6efbcecdd3e5dfbf090341b485da9d176eb250d893e3eb378c428a2db38301ce libvorbis-1.3.5.tar.gz" -ARG THEORA_SHA256SUM="40952956c47811928d1e7922cda3bc1f427eb75680c3c37249c91e949054916b libtheora-1.1.1.tar.gz" -ARG XVID_SHA256SUM="4e9fd62728885855bc5007fe1be58df42e5e274497591fec37249e1052ae316f xvidcore-1.3.4.tar.gz" -ARG FREETYPE_SHA256SUM="5d03dd76c2171a7601e9ce10551d52d4471cf92cd205948e60289251daddffa8 freetype-2.5.5.tar.gz" -ARG LIBVIDSTAB_SHA256SUM="14d2a053e56edad4f397be0cb3ef8eb1ec3150404ce99a426c4eb641861dc0bb v1.1.0.tar.gz" -ARG LIBASS_SHA256SUM="8fadf294bf701300d4605e6f1d92929304187fca4b8d8a47889315526adbafd7 0.13.7.tar.gz" -ARG FRIBIDI_SHA256SUM="3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 0.19.7.tar.gz" +ARG FREETYPE_SHA256SUM="5d03dd76c2171a7601e9ce10551d52d4471cf92cd205948e60289251daddffa8 freetype-2.5.5.tar.gz" +ARG FRIBIDI_SHA256SUM="3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 0.19.7.tar.gz" +ARG LIBASS_SHA256SUM="8fadf294bf701300d4605e6f1d92929304187fca4b8d8a47889315526adbafd7 0.13.7.tar.gz" +ARG LIBVIDSTAB_SHA256SUM="14d2a053e56edad4f397be0cb3ef8eb1ec3150404ce99a426c4eb641861dc0bb v1.1.0.tar.gz" +ARG OGG_SHA256SUM="e19ee34711d7af328cb26287f4137e70630e7261b17cbe3cd41011d73a654692 libogg-1.3.2.tar.gz" +ARG OPUS_SHA256SUM="77db45a87b51578fbc49555ef1b10926179861d854eb2613207dc79d9ec0a9a9 opus-1.2.tar.gz" +ARG THEORA_SHA256SUM="40952956c47811928d1e7922cda3bc1f427eb75680c3c37249c91e949054916b libtheora-1.1.1.tar.gz" +ARG VORBIS_SHA256SUM="6efbcecdd3e5dfbf090341b485da9d176eb250d893e3eb378c428a2db38301ce libvorbis-1.3.5.tar.gz" +ARG XVID_SHA256SUM="4e9fd62728885855bc5007fe1be58df42e5e274497591fec37249e1052ae316f xvidcore-1.3.4.tar.gz" + RUN buildDeps="autoconf \ diff --git a/docker-images/4.1/ubuntu/Dockerfile b/docker-images/4.1/ubuntu/Dockerfile index cbc1c4db7..253caca90 100644 --- a/docker-images/4.1/ubuntu/Dockerfile +++ b/docker-images/4.1/ubuntu/Dockerfile @@ -21,38 +21,39 @@ ARG LD_LIBRARY_PATH=/opt/ffmpeg/lib ARG PREFIX=/opt/ffmpeg ARG MAKEFLAGS="-j2" -ENV FFMPEG_VERSION=4.1.4 \ - FDKAAC_VERSION=0.1.5 \ - LAME_VERSION=3.100 \ - LIBASS_VERSION=0.13.7 \ - OGG_VERSION=1.3.2 \ +ENV FFMPEG_VERSION=4.1.4 \ + AOM_VERSION=v1.0.0 \ + FDKAAC_VERSION=0.1.5 \ + FONTCONFIG_VERSION=2.12.4 \ + FREETYPE_VERSION=2.5.5 \ + FRIBIDI_VERSION=0.19.7 \ + KVAZAAR_VERSION=1.2.0 \ + LAME_VERSION=3.100 \ + LIBASS_VERSION=0.13.7 \ + LIBVIDSTAB_VERSION=1.1.0 \ + OGG_VERSION=1.3.2 \ OPENCOREAMR_VERSION=0.1.5 \ - OPUS_VERSION=1.2 \ - OPENJPEG_VERSION=2.1.2 \ - THEORA_VERSION=1.1.1 \ - VORBIS_VERSION=1.3.5 \ - VPX_VERSION=1.8.0 \ - WEBP_VERSION=1.0.2 \ + OPUS_VERSION=1.2 \ + OPENJPEG_VERSION=2.1.2 \ + THEORA_VERSION=1.1.1 \ + VORBIS_VERSION=1.3.5 \ + VPX_VERSION=1.8.0 \ + WEBP_VERSION=1.0.2 \ X264_VERSION=20170226-2245-stable \ - X265_VERSION=3.1.1 \ - XVID_VERSION=1.3.4 \ - FREETYPE_VERSION=2.5.5 \ - FRIBIDI_VERSION=0.19.7 \ - FONTCONFIG_VERSION=2.12.4 \ - LIBVIDSTAB_VERSION=1.1.0 \ - KVAZAAR_VERSION=1.2.0 \ - AOM_VERSION=v1.0.0 \ + X265_VERSION=3.1.1 \ + XVID_VERSION=1.3.4 \ SRC=/usr/local -ARG OGG_SHA256SUM="e19ee34711d7af328cb26287f4137e70630e7261b17cbe3cd41011d73a654692 libogg-1.3.2.tar.gz" -ARG OPUS_SHA256SUM="77db45a87b51578fbc49555ef1b10926179861d854eb2613207dc79d9ec0a9a9 opus-1.2.tar.gz" -ARG VORBIS_SHA256SUM="6efbcecdd3e5dfbf090341b485da9d176eb250d893e3eb378c428a2db38301ce libvorbis-1.3.5.tar.gz" -ARG THEORA_SHA256SUM="40952956c47811928d1e7922cda3bc1f427eb75680c3c37249c91e949054916b libtheora-1.1.1.tar.gz" -ARG XVID_SHA256SUM="4e9fd62728885855bc5007fe1be58df42e5e274497591fec37249e1052ae316f xvidcore-1.3.4.tar.gz" -ARG FREETYPE_SHA256SUM="5d03dd76c2171a7601e9ce10551d52d4471cf92cd205948e60289251daddffa8 freetype-2.5.5.tar.gz" -ARG LIBVIDSTAB_SHA256SUM="14d2a053e56edad4f397be0cb3ef8eb1ec3150404ce99a426c4eb641861dc0bb v1.1.0.tar.gz" -ARG LIBASS_SHA256SUM="8fadf294bf701300d4605e6f1d92929304187fca4b8d8a47889315526adbafd7 0.13.7.tar.gz" -ARG FRIBIDI_SHA256SUM="3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 0.19.7.tar.gz" +ARG FREETYPE_SHA256SUM="5d03dd76c2171a7601e9ce10551d52d4471cf92cd205948e60289251daddffa8 freetype-2.5.5.tar.gz" +ARG FRIBIDI_SHA256SUM="3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 0.19.7.tar.gz" +ARG LIBASS_SHA256SUM="8fadf294bf701300d4605e6f1d92929304187fca4b8d8a47889315526adbafd7 0.13.7.tar.gz" +ARG LIBVIDSTAB_SHA256SUM="14d2a053e56edad4f397be0cb3ef8eb1ec3150404ce99a426c4eb641861dc0bb v1.1.0.tar.gz" +ARG OGG_SHA256SUM="e19ee34711d7af328cb26287f4137e70630e7261b17cbe3cd41011d73a654692 libogg-1.3.2.tar.gz" +ARG OPUS_SHA256SUM="77db45a87b51578fbc49555ef1b10926179861d854eb2613207dc79d9ec0a9a9 opus-1.2.tar.gz" +ARG THEORA_SHA256SUM="40952956c47811928d1e7922cda3bc1f427eb75680c3c37249c91e949054916b libtheora-1.1.1.tar.gz" +ARG VORBIS_SHA256SUM="6efbcecdd3e5dfbf090341b485da9d176eb250d893e3eb378c428a2db38301ce libvorbis-1.3.5.tar.gz" +ARG XVID_SHA256SUM="4e9fd62728885855bc5007fe1be58df42e5e274497591fec37249e1052ae316f xvidcore-1.3.4.tar.gz" + RUN buildDeps="autoconf \ diff --git a/docker-images/4.1/vaapi/Dockerfile b/docker-images/4.1/vaapi/Dockerfile index 85699de5f..ff7ff0dfe 100644 --- a/docker-images/4.1/vaapi/Dockerfile +++ b/docker-images/4.1/vaapi/Dockerfile @@ -21,38 +21,39 @@ ARG LD_LIBRARY_PATH=/opt/ffmpeg/lib ARG PREFIX=/opt/ffmpeg ARG MAKEFLAGS="-j2" -ENV FFMPEG_VERSION=4.1.4 \ - FDKAAC_VERSION=0.1.5 \ - LAME_VERSION=3.100 \ - LIBASS_VERSION=0.13.7 \ - OGG_VERSION=1.3.2 \ +ENV FFMPEG_VERSION=4.1.4 \ + AOM_VERSION=v1.0.0 \ + FDKAAC_VERSION=0.1.5 \ + FONTCONFIG_VERSION=2.12.4 \ + FREETYPE_VERSION=2.5.5 \ + FRIBIDI_VERSION=0.19.7 \ + KVAZAAR_VERSION=1.2.0 \ + LAME_VERSION=3.100 \ + LIBASS_VERSION=0.13.7 \ + LIBVIDSTAB_VERSION=1.1.0 \ + OGG_VERSION=1.3.2 \ OPENCOREAMR_VERSION=0.1.5 \ - OPUS_VERSION=1.2 \ - OPENJPEG_VERSION=2.1.2 \ - THEORA_VERSION=1.1.1 \ - VORBIS_VERSION=1.3.5 \ - VPX_VERSION=1.8.0 \ - WEBP_VERSION=1.0.2 \ + OPUS_VERSION=1.2 \ + OPENJPEG_VERSION=2.1.2 \ + THEORA_VERSION=1.1.1 \ + VORBIS_VERSION=1.3.5 \ + VPX_VERSION=1.8.0 \ + WEBP_VERSION=1.0.2 \ X264_VERSION=20170226-2245-stable \ - X265_VERSION=3.1.1 \ - XVID_VERSION=1.3.4 \ - FREETYPE_VERSION=2.5.5 \ - FRIBIDI_VERSION=0.19.7 \ - FONTCONFIG_VERSION=2.12.4 \ - LIBVIDSTAB_VERSION=1.1.0 \ - KVAZAAR_VERSION=1.2.0 \ - AOM_VERSION=v1.0.0 \ + X265_VERSION=3.1.1 \ + XVID_VERSION=1.3.4 \ SRC=/usr/local -ARG OGG_SHA256SUM="e19ee34711d7af328cb26287f4137e70630e7261b17cbe3cd41011d73a654692 libogg-1.3.2.tar.gz" -ARG OPUS_SHA256SUM="77db45a87b51578fbc49555ef1b10926179861d854eb2613207dc79d9ec0a9a9 opus-1.2.tar.gz" -ARG VORBIS_SHA256SUM="6efbcecdd3e5dfbf090341b485da9d176eb250d893e3eb378c428a2db38301ce libvorbis-1.3.5.tar.gz" -ARG THEORA_SHA256SUM="40952956c47811928d1e7922cda3bc1f427eb75680c3c37249c91e949054916b libtheora-1.1.1.tar.gz" -ARG XVID_SHA256SUM="4e9fd62728885855bc5007fe1be58df42e5e274497591fec37249e1052ae316f xvidcore-1.3.4.tar.gz" -ARG FREETYPE_SHA256SUM="5d03dd76c2171a7601e9ce10551d52d4471cf92cd205948e60289251daddffa8 freetype-2.5.5.tar.gz" -ARG LIBVIDSTAB_SHA256SUM="14d2a053e56edad4f397be0cb3ef8eb1ec3150404ce99a426c4eb641861dc0bb v1.1.0.tar.gz" -ARG LIBASS_SHA256SUM="8fadf294bf701300d4605e6f1d92929304187fca4b8d8a47889315526adbafd7 0.13.7.tar.gz" -ARG FRIBIDI_SHA256SUM="3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 0.19.7.tar.gz" +ARG FREETYPE_SHA256SUM="5d03dd76c2171a7601e9ce10551d52d4471cf92cd205948e60289251daddffa8 freetype-2.5.5.tar.gz" +ARG FRIBIDI_SHA256SUM="3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 0.19.7.tar.gz" +ARG LIBASS_SHA256SUM="8fadf294bf701300d4605e6f1d92929304187fca4b8d8a47889315526adbafd7 0.13.7.tar.gz" +ARG LIBVIDSTAB_SHA256SUM="14d2a053e56edad4f397be0cb3ef8eb1ec3150404ce99a426c4eb641861dc0bb v1.1.0.tar.gz" +ARG OGG_SHA256SUM="e19ee34711d7af328cb26287f4137e70630e7261b17cbe3cd41011d73a654692 libogg-1.3.2.tar.gz" +ARG OPUS_SHA256SUM="77db45a87b51578fbc49555ef1b10926179861d854eb2613207dc79d9ec0a9a9 opus-1.2.tar.gz" +ARG THEORA_SHA256SUM="40952956c47811928d1e7922cda3bc1f427eb75680c3c37249c91e949054916b libtheora-1.1.1.tar.gz" +ARG VORBIS_SHA256SUM="6efbcecdd3e5dfbf090341b485da9d176eb250d893e3eb378c428a2db38301ce libvorbis-1.3.5.tar.gz" +ARG XVID_SHA256SUM="4e9fd62728885855bc5007fe1be58df42e5e274497591fec37249e1052ae316f xvidcore-1.3.4.tar.gz" + RUN buildDeps="autoconf \ diff --git a/docker-images/4.2/alpine/Dockerfile b/docker-images/4.2/alpine/Dockerfile index 7f088defb..27751218e 100644 --- a/docker-images/4.2/alpine/Dockerfile +++ b/docker-images/4.2/alpine/Dockerfile @@ -18,38 +18,39 @@ ARG LD_LIBRARY_PATH=/opt/ffmpeg/lib ARG PREFIX=/opt/ffmpeg ARG MAKEFLAGS="-j2" -ENV FFMPEG_VERSION=4.2 \ - FDKAAC_VERSION=0.1.5 \ - LAME_VERSION=3.100 \ - LIBASS_VERSION=0.13.7 \ - OGG_VERSION=1.3.2 \ +ENV FFMPEG_VERSION=4.2 \ + AOM_VERSION=v1.0.0 \ + FDKAAC_VERSION=0.1.5 \ + FONTCONFIG_VERSION=2.12.4 \ + FREETYPE_VERSION=2.5.5 \ + FRIBIDI_VERSION=0.19.7 \ + KVAZAAR_VERSION=1.2.0 \ + LAME_VERSION=3.100 \ + LIBASS_VERSION=0.13.7 \ + LIBVIDSTAB_VERSION=1.1.0 \ + OGG_VERSION=1.3.2 \ OPENCOREAMR_VERSION=0.1.5 \ - OPUS_VERSION=1.2 \ - OPENJPEG_VERSION=2.1.2 \ - THEORA_VERSION=1.1.1 \ - VORBIS_VERSION=1.3.5 \ - VPX_VERSION=1.8.0 \ - WEBP_VERSION=1.0.2 \ + OPUS_VERSION=1.2 \ + OPENJPEG_VERSION=2.1.2 \ + THEORA_VERSION=1.1.1 \ + VORBIS_VERSION=1.3.5 \ + VPX_VERSION=1.8.0 \ + WEBP_VERSION=1.0.2 \ X264_VERSION=20170226-2245-stable \ - X265_VERSION=3.1.1 \ - XVID_VERSION=1.3.4 \ - FREETYPE_VERSION=2.5.5 \ - FRIBIDI_VERSION=0.19.7 \ - FONTCONFIG_VERSION=2.12.4 \ - LIBVIDSTAB_VERSION=1.1.0 \ - KVAZAAR_VERSION=1.2.0 \ - AOM_VERSION=v1.0.0 \ + X265_VERSION=3.1.1 \ + XVID_VERSION=1.3.4 \ SRC=/usr/local -ARG OGG_SHA256SUM="e19ee34711d7af328cb26287f4137e70630e7261b17cbe3cd41011d73a654692 libogg-1.3.2.tar.gz" -ARG OPUS_SHA256SUM="77db45a87b51578fbc49555ef1b10926179861d854eb2613207dc79d9ec0a9a9 opus-1.2.tar.gz" -ARG VORBIS_SHA256SUM="6efbcecdd3e5dfbf090341b485da9d176eb250d893e3eb378c428a2db38301ce libvorbis-1.3.5.tar.gz" -ARG THEORA_SHA256SUM="40952956c47811928d1e7922cda3bc1f427eb75680c3c37249c91e949054916b libtheora-1.1.1.tar.gz" -ARG XVID_SHA256SUM="4e9fd62728885855bc5007fe1be58df42e5e274497591fec37249e1052ae316f xvidcore-1.3.4.tar.gz" -ARG FREETYPE_SHA256SUM="5d03dd76c2171a7601e9ce10551d52d4471cf92cd205948e60289251daddffa8 freetype-2.5.5.tar.gz" -ARG LIBVIDSTAB_SHA256SUM="14d2a053e56edad4f397be0cb3ef8eb1ec3150404ce99a426c4eb641861dc0bb v1.1.0.tar.gz" -ARG LIBASS_SHA256SUM="8fadf294bf701300d4605e6f1d92929304187fca4b8d8a47889315526adbafd7 0.13.7.tar.gz" -ARG FRIBIDI_SHA256SUM="3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 0.19.7.tar.gz" +ARG FREETYPE_SHA256SUM="5d03dd76c2171a7601e9ce10551d52d4471cf92cd205948e60289251daddffa8 freetype-2.5.5.tar.gz" +ARG FRIBIDI_SHA256SUM="3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 0.19.7.tar.gz" +ARG LIBASS_SHA256SUM="8fadf294bf701300d4605e6f1d92929304187fca4b8d8a47889315526adbafd7 0.13.7.tar.gz" +ARG LIBVIDSTAB_SHA256SUM="14d2a053e56edad4f397be0cb3ef8eb1ec3150404ce99a426c4eb641861dc0bb v1.1.0.tar.gz" +ARG OGG_SHA256SUM="e19ee34711d7af328cb26287f4137e70630e7261b17cbe3cd41011d73a654692 libogg-1.3.2.tar.gz" +ARG OPUS_SHA256SUM="77db45a87b51578fbc49555ef1b10926179861d854eb2613207dc79d9ec0a9a9 opus-1.2.tar.gz" +ARG THEORA_SHA256SUM="40952956c47811928d1e7922cda3bc1f427eb75680c3c37249c91e949054916b libtheora-1.1.1.tar.gz" +ARG VORBIS_SHA256SUM="6efbcecdd3e5dfbf090341b485da9d176eb250d893e3eb378c428a2db38301ce libvorbis-1.3.5.tar.gz" +ARG XVID_SHA256SUM="4e9fd62728885855bc5007fe1be58df42e5e274497591fec37249e1052ae316f xvidcore-1.3.4.tar.gz" + RUN buildDeps="autoconf \ diff --git a/docker-images/4.2/centos/Dockerfile b/docker-images/4.2/centos/Dockerfile index 251d6013f..7f7cddd63 100644 --- a/docker-images/4.2/centos/Dockerfile +++ b/docker-images/4.2/centos/Dockerfile @@ -20,38 +20,39 @@ ARG LD_LIBRARY_PATH=/opt/ffmpeg/lib ARG PREFIX=/opt/ffmpeg ARG MAKEFLAGS="-j2" -ENV FFMPEG_VERSION=4.2 \ - FDKAAC_VERSION=0.1.5 \ - LAME_VERSION=3.100 \ - LIBASS_VERSION=0.13.7 \ - OGG_VERSION=1.3.2 \ +ENV FFMPEG_VERSION=4.2 \ + AOM_VERSION=v1.0.0 \ + FDKAAC_VERSION=0.1.5 \ + FONTCONFIG_VERSION=2.12.4 \ + FREETYPE_VERSION=2.5.5 \ + FRIBIDI_VERSION=0.19.7 \ + KVAZAAR_VERSION=1.2.0 \ + LAME_VERSION=3.100 \ + LIBASS_VERSION=0.13.7 \ + LIBVIDSTAB_VERSION=1.1.0 \ + OGG_VERSION=1.3.2 \ OPENCOREAMR_VERSION=0.1.5 \ - OPUS_VERSION=1.2 \ - OPENJPEG_VERSION=2.1.2 \ - THEORA_VERSION=1.1.1 \ - VORBIS_VERSION=1.3.5 \ - VPX_VERSION=1.8.0 \ - WEBP_VERSION=1.0.2 \ + OPUS_VERSION=1.2 \ + OPENJPEG_VERSION=2.1.2 \ + THEORA_VERSION=1.1.1 \ + VORBIS_VERSION=1.3.5 \ + VPX_VERSION=1.8.0 \ + WEBP_VERSION=1.0.2 \ X264_VERSION=20170226-2245-stable \ - X265_VERSION=3.1.1 \ - XVID_VERSION=1.3.4 \ - FREETYPE_VERSION=2.5.5 \ - FRIBIDI_VERSION=0.19.7 \ - FONTCONFIG_VERSION=2.12.4 \ - LIBVIDSTAB_VERSION=1.1.0 \ - KVAZAAR_VERSION=1.2.0 \ - AOM_VERSION=v1.0.0 \ + X265_VERSION=3.1.1 \ + XVID_VERSION=1.3.4 \ SRC=/usr/local -ARG OGG_SHA256SUM="e19ee34711d7af328cb26287f4137e70630e7261b17cbe3cd41011d73a654692 libogg-1.3.2.tar.gz" -ARG OPUS_SHA256SUM="77db45a87b51578fbc49555ef1b10926179861d854eb2613207dc79d9ec0a9a9 opus-1.2.tar.gz" -ARG VORBIS_SHA256SUM="6efbcecdd3e5dfbf090341b485da9d176eb250d893e3eb378c428a2db38301ce libvorbis-1.3.5.tar.gz" -ARG THEORA_SHA256SUM="40952956c47811928d1e7922cda3bc1f427eb75680c3c37249c91e949054916b libtheora-1.1.1.tar.gz" -ARG XVID_SHA256SUM="4e9fd62728885855bc5007fe1be58df42e5e274497591fec37249e1052ae316f xvidcore-1.3.4.tar.gz" -ARG FREETYPE_SHA256SUM="5d03dd76c2171a7601e9ce10551d52d4471cf92cd205948e60289251daddffa8 freetype-2.5.5.tar.gz" -ARG LIBVIDSTAB_SHA256SUM="14d2a053e56edad4f397be0cb3ef8eb1ec3150404ce99a426c4eb641861dc0bb v1.1.0.tar.gz" -ARG LIBASS_SHA256SUM="8fadf294bf701300d4605e6f1d92929304187fca4b8d8a47889315526adbafd7 0.13.7.tar.gz" -ARG FRIBIDI_SHA256SUM="3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 0.19.7.tar.gz" +ARG FREETYPE_SHA256SUM="5d03dd76c2171a7601e9ce10551d52d4471cf92cd205948e60289251daddffa8 freetype-2.5.5.tar.gz" +ARG FRIBIDI_SHA256SUM="3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 0.19.7.tar.gz" +ARG LIBASS_SHA256SUM="8fadf294bf701300d4605e6f1d92929304187fca4b8d8a47889315526adbafd7 0.13.7.tar.gz" +ARG LIBVIDSTAB_SHA256SUM="14d2a053e56edad4f397be0cb3ef8eb1ec3150404ce99a426c4eb641861dc0bb v1.1.0.tar.gz" +ARG OGG_SHA256SUM="e19ee34711d7af328cb26287f4137e70630e7261b17cbe3cd41011d73a654692 libogg-1.3.2.tar.gz" +ARG OPUS_SHA256SUM="77db45a87b51578fbc49555ef1b10926179861d854eb2613207dc79d9ec0a9a9 opus-1.2.tar.gz" +ARG THEORA_SHA256SUM="40952956c47811928d1e7922cda3bc1f427eb75680c3c37249c91e949054916b libtheora-1.1.1.tar.gz" +ARG VORBIS_SHA256SUM="6efbcecdd3e5dfbf090341b485da9d176eb250d893e3eb378c428a2db38301ce libvorbis-1.3.5.tar.gz" +ARG XVID_SHA256SUM="4e9fd62728885855bc5007fe1be58df42e5e274497591fec37249e1052ae316f xvidcore-1.3.4.tar.gz" + RUN buildDeps="autoconf \ diff --git a/docker-images/4.2/nvidia/Dockerfile b/docker-images/4.2/nvidia/Dockerfile index f8efdcc53..a306b2cfe 100644 --- a/docker-images/4.2/nvidia/Dockerfile +++ b/docker-images/4.2/nvidia/Dockerfile @@ -35,38 +35,39 @@ ENV LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/opt/ffmpeg/lib" ARG PREFIX=/opt/ffmpeg ARG MAKEFLAGS="-j12" -ENV FFMPEG_VERSION=4.2 \ - FDKAAC_VERSION=0.1.5 \ - LAME_VERSION=3.100 \ - LIBASS_VERSION=0.13.7 \ - OGG_VERSION=1.3.2 \ +ENV FFMPEG_VERSION=4.2 \ + AOM_VERSION=v1.0.0 \ + FDKAAC_VERSION=0.1.5 \ + FONTCONFIG_VERSION=2.12.4 \ + FREETYPE_VERSION=2.5.5 \ + FRIBIDI_VERSION=0.19.7 \ + KVAZAAR_VERSION=1.2.0 \ + LAME_VERSION=3.100 \ + LIBASS_VERSION=0.13.7 \ + LIBVIDSTAB_VERSION=1.1.0 \ + OGG_VERSION=1.3.2 \ OPENCOREAMR_VERSION=0.1.5 \ - OPUS_VERSION=1.2 \ - OPENJPEG_VERSION=2.1.2 \ - THEORA_VERSION=1.1.1 \ - VORBIS_VERSION=1.3.5 \ - VPX_VERSION=1.8.0 \ - WEBP_VERSION=1.0.2 \ + OPUS_VERSION=1.2 \ + OPENJPEG_VERSION=2.1.2 \ + THEORA_VERSION=1.1.1 \ + VORBIS_VERSION=1.3.5 \ + VPX_VERSION=1.8.0 \ + WEBP_VERSION=1.0.2 \ X264_VERSION=20170226-2245-stable \ - X265_VERSION=3.1.1 \ - XVID_VERSION=1.3.4 \ - FREETYPE_VERSION=2.5.5 \ - FRIBIDI_VERSION=0.19.7 \ - FONTCONFIG_VERSION=2.12.4 \ - LIBVIDSTAB_VERSION=1.1.0 \ - KVAZAAR_VERSION=1.2.0 \ - AOM_VERSION=v1.0.0 \ + X265_VERSION=3.1.1 \ + XVID_VERSION=1.3.4 \ SRC=/usr/local -ARG OGG_SHA256SUM="e19ee34711d7af328cb26287f4137e70630e7261b17cbe3cd41011d73a654692 libogg-1.3.2.tar.gz" -ARG OPUS_SHA256SUM="77db45a87b51578fbc49555ef1b10926179861d854eb2613207dc79d9ec0a9a9 opus-1.2.tar.gz" -ARG VORBIS_SHA256SUM="6efbcecdd3e5dfbf090341b485da9d176eb250d893e3eb378c428a2db38301ce libvorbis-1.3.5.tar.gz" -ARG THEORA_SHA256SUM="40952956c47811928d1e7922cda3bc1f427eb75680c3c37249c91e949054916b libtheora-1.1.1.tar.gz" -ARG XVID_SHA256SUM="4e9fd62728885855bc5007fe1be58df42e5e274497591fec37249e1052ae316f xvidcore-1.3.4.tar.gz" -ARG FREETYPE_SHA256SUM="5d03dd76c2171a7601e9ce10551d52d4471cf92cd205948e60289251daddffa8 freetype-2.5.5.tar.gz" -ARG LIBVIDSTAB_SHA256SUM="14d2a053e56edad4f397be0cb3ef8eb1ec3150404ce99a426c4eb641861dc0bb v1.1.0.tar.gz" -ARG LIBASS_SHA256SUM="8fadf294bf701300d4605e6f1d92929304187fca4b8d8a47889315526adbafd7 0.13.7.tar.gz" -ARG FRIBIDI_SHA256SUM="3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 0.19.7.tar.gz" +ARG FREETYPE_SHA256SUM="5d03dd76c2171a7601e9ce10551d52d4471cf92cd205948e60289251daddffa8 freetype-2.5.5.tar.gz" +ARG FRIBIDI_SHA256SUM="3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 0.19.7.tar.gz" +ARG LIBASS_SHA256SUM="8fadf294bf701300d4605e6f1d92929304187fca4b8d8a47889315526adbafd7 0.13.7.tar.gz" +ARG LIBVIDSTAB_SHA256SUM="14d2a053e56edad4f397be0cb3ef8eb1ec3150404ce99a426c4eb641861dc0bb v1.1.0.tar.gz" +ARG OGG_SHA256SUM="e19ee34711d7af328cb26287f4137e70630e7261b17cbe3cd41011d73a654692 libogg-1.3.2.tar.gz" +ARG OPUS_SHA256SUM="77db45a87b51578fbc49555ef1b10926179861d854eb2613207dc79d9ec0a9a9 opus-1.2.tar.gz" +ARG THEORA_SHA256SUM="40952956c47811928d1e7922cda3bc1f427eb75680c3c37249c91e949054916b libtheora-1.1.1.tar.gz" +ARG VORBIS_SHA256SUM="6efbcecdd3e5dfbf090341b485da9d176eb250d893e3eb378c428a2db38301ce libvorbis-1.3.5.tar.gz" +ARG XVID_SHA256SUM="4e9fd62728885855bc5007fe1be58df42e5e274497591fec37249e1052ae316f xvidcore-1.3.4.tar.gz" + RUN buildDeps="autoconf \ diff --git a/docker-images/4.2/scratch/Dockerfile b/docker-images/4.2/scratch/Dockerfile index 03b1006fd..b4ac7f6cb 100644 --- a/docker-images/4.2/scratch/Dockerfile +++ b/docker-images/4.2/scratch/Dockerfile @@ -13,38 +13,39 @@ ARG LD_LIBRARY_PATH=/opt/ffmpeg/lib ARG PREFIX=/opt/ffmpeg ARG MAKEFLAGS="-j2" -ENV FFMPEG_VERSION=4.2 \ - FDKAAC_VERSION=0.1.5 \ - LAME_VERSION=3.100 \ - LIBASS_VERSION=0.13.7 \ - OGG_VERSION=1.3.2 \ +ENV FFMPEG_VERSION=4.2 \ + AOM_VERSION=v1.0.0 \ + FDKAAC_VERSION=0.1.5 \ + FONTCONFIG_VERSION=2.12.4 \ + FREETYPE_VERSION=2.5.5 \ + FRIBIDI_VERSION=0.19.7 \ + KVAZAAR_VERSION=1.2.0 \ + LAME_VERSION=3.100 \ + LIBASS_VERSION=0.13.7 \ + LIBVIDSTAB_VERSION=1.1.0 \ + OGG_VERSION=1.3.2 \ OPENCOREAMR_VERSION=0.1.5 \ - OPUS_VERSION=1.2 \ - OPENJPEG_VERSION=2.1.2 \ - THEORA_VERSION=1.1.1 \ - VORBIS_VERSION=1.3.5 \ - VPX_VERSION=1.8.0 \ - WEBP_VERSION=1.0.2 \ + OPUS_VERSION=1.2 \ + OPENJPEG_VERSION=2.1.2 \ + THEORA_VERSION=1.1.1 \ + VORBIS_VERSION=1.3.5 \ + VPX_VERSION=1.8.0 \ + WEBP_VERSION=1.0.2 \ X264_VERSION=20170226-2245-stable \ - X265_VERSION=3.1.1 \ - XVID_VERSION=1.3.4 \ - FREETYPE_VERSION=2.5.5 \ - FRIBIDI_VERSION=0.19.7 \ - FONTCONFIG_VERSION=2.12.4 \ - LIBVIDSTAB_VERSION=1.1.0 \ - KVAZAAR_VERSION=1.2.0 \ - AOM_VERSION=v1.0.0 \ + X265_VERSION=3.1.1 \ + XVID_VERSION=1.3.4 \ SRC=/usr/local -ARG OGG_SHA256SUM="e19ee34711d7af328cb26287f4137e70630e7261b17cbe3cd41011d73a654692 libogg-1.3.2.tar.gz" -ARG OPUS_SHA256SUM="77db45a87b51578fbc49555ef1b10926179861d854eb2613207dc79d9ec0a9a9 opus-1.2.tar.gz" -ARG VORBIS_SHA256SUM="6efbcecdd3e5dfbf090341b485da9d176eb250d893e3eb378c428a2db38301ce libvorbis-1.3.5.tar.gz" -ARG THEORA_SHA256SUM="40952956c47811928d1e7922cda3bc1f427eb75680c3c37249c91e949054916b libtheora-1.1.1.tar.gz" -ARG XVID_SHA256SUM="4e9fd62728885855bc5007fe1be58df42e5e274497591fec37249e1052ae316f xvidcore-1.3.4.tar.gz" -ARG FREETYPE_SHA256SUM="5d03dd76c2171a7601e9ce10551d52d4471cf92cd205948e60289251daddffa8 freetype-2.5.5.tar.gz" -ARG LIBVIDSTAB_SHA256SUM="14d2a053e56edad4f397be0cb3ef8eb1ec3150404ce99a426c4eb641861dc0bb v1.1.0.tar.gz" -ARG LIBASS_SHA256SUM="8fadf294bf701300d4605e6f1d92929304187fca4b8d8a47889315526adbafd7 0.13.7.tar.gz" -ARG FRIBIDI_SHA256SUM="3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 0.19.7.tar.gz" +ARG FREETYPE_SHA256SUM="5d03dd76c2171a7601e9ce10551d52d4471cf92cd205948e60289251daddffa8 freetype-2.5.5.tar.gz" +ARG FRIBIDI_SHA256SUM="3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 0.19.7.tar.gz" +ARG LIBASS_SHA256SUM="8fadf294bf701300d4605e6f1d92929304187fca4b8d8a47889315526adbafd7 0.13.7.tar.gz" +ARG LIBVIDSTAB_SHA256SUM="14d2a053e56edad4f397be0cb3ef8eb1ec3150404ce99a426c4eb641861dc0bb v1.1.0.tar.gz" +ARG OGG_SHA256SUM="e19ee34711d7af328cb26287f4137e70630e7261b17cbe3cd41011d73a654692 libogg-1.3.2.tar.gz" +ARG OPUS_SHA256SUM="77db45a87b51578fbc49555ef1b10926179861d854eb2613207dc79d9ec0a9a9 opus-1.2.tar.gz" +ARG THEORA_SHA256SUM="40952956c47811928d1e7922cda3bc1f427eb75680c3c37249c91e949054916b libtheora-1.1.1.tar.gz" +ARG VORBIS_SHA256SUM="6efbcecdd3e5dfbf090341b485da9d176eb250d893e3eb378c428a2db38301ce libvorbis-1.3.5.tar.gz" +ARG XVID_SHA256SUM="4e9fd62728885855bc5007fe1be58df42e5e274497591fec37249e1052ae316f xvidcore-1.3.4.tar.gz" + RUN buildDeps="autoconf \ diff --git a/docker-images/4.2/ubuntu/Dockerfile b/docker-images/4.2/ubuntu/Dockerfile index 23f445aa0..926866a8a 100644 --- a/docker-images/4.2/ubuntu/Dockerfile +++ b/docker-images/4.2/ubuntu/Dockerfile @@ -21,38 +21,39 @@ ARG LD_LIBRARY_PATH=/opt/ffmpeg/lib ARG PREFIX=/opt/ffmpeg ARG MAKEFLAGS="-j2" -ENV FFMPEG_VERSION=4.2 \ - FDKAAC_VERSION=0.1.5 \ - LAME_VERSION=3.100 \ - LIBASS_VERSION=0.13.7 \ - OGG_VERSION=1.3.2 \ +ENV FFMPEG_VERSION=4.2 \ + AOM_VERSION=v1.0.0 \ + FDKAAC_VERSION=0.1.5 \ + FONTCONFIG_VERSION=2.12.4 \ + FREETYPE_VERSION=2.5.5 \ + FRIBIDI_VERSION=0.19.7 \ + KVAZAAR_VERSION=1.2.0 \ + LAME_VERSION=3.100 \ + LIBASS_VERSION=0.13.7 \ + LIBVIDSTAB_VERSION=1.1.0 \ + OGG_VERSION=1.3.2 \ OPENCOREAMR_VERSION=0.1.5 \ - OPUS_VERSION=1.2 \ - OPENJPEG_VERSION=2.1.2 \ - THEORA_VERSION=1.1.1 \ - VORBIS_VERSION=1.3.5 \ - VPX_VERSION=1.8.0 \ - WEBP_VERSION=1.0.2 \ + OPUS_VERSION=1.2 \ + OPENJPEG_VERSION=2.1.2 \ + THEORA_VERSION=1.1.1 \ + VORBIS_VERSION=1.3.5 \ + VPX_VERSION=1.8.0 \ + WEBP_VERSION=1.0.2 \ X264_VERSION=20170226-2245-stable \ - X265_VERSION=3.1.1 \ - XVID_VERSION=1.3.4 \ - FREETYPE_VERSION=2.5.5 \ - FRIBIDI_VERSION=0.19.7 \ - FONTCONFIG_VERSION=2.12.4 \ - LIBVIDSTAB_VERSION=1.1.0 \ - KVAZAAR_VERSION=1.2.0 \ - AOM_VERSION=v1.0.0 \ + X265_VERSION=3.1.1 \ + XVID_VERSION=1.3.4 \ SRC=/usr/local -ARG OGG_SHA256SUM="e19ee34711d7af328cb26287f4137e70630e7261b17cbe3cd41011d73a654692 libogg-1.3.2.tar.gz" -ARG OPUS_SHA256SUM="77db45a87b51578fbc49555ef1b10926179861d854eb2613207dc79d9ec0a9a9 opus-1.2.tar.gz" -ARG VORBIS_SHA256SUM="6efbcecdd3e5dfbf090341b485da9d176eb250d893e3eb378c428a2db38301ce libvorbis-1.3.5.tar.gz" -ARG THEORA_SHA256SUM="40952956c47811928d1e7922cda3bc1f427eb75680c3c37249c91e949054916b libtheora-1.1.1.tar.gz" -ARG XVID_SHA256SUM="4e9fd62728885855bc5007fe1be58df42e5e274497591fec37249e1052ae316f xvidcore-1.3.4.tar.gz" -ARG FREETYPE_SHA256SUM="5d03dd76c2171a7601e9ce10551d52d4471cf92cd205948e60289251daddffa8 freetype-2.5.5.tar.gz" -ARG LIBVIDSTAB_SHA256SUM="14d2a053e56edad4f397be0cb3ef8eb1ec3150404ce99a426c4eb641861dc0bb v1.1.0.tar.gz" -ARG LIBASS_SHA256SUM="8fadf294bf701300d4605e6f1d92929304187fca4b8d8a47889315526adbafd7 0.13.7.tar.gz" -ARG FRIBIDI_SHA256SUM="3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 0.19.7.tar.gz" +ARG FREETYPE_SHA256SUM="5d03dd76c2171a7601e9ce10551d52d4471cf92cd205948e60289251daddffa8 freetype-2.5.5.tar.gz" +ARG FRIBIDI_SHA256SUM="3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 0.19.7.tar.gz" +ARG LIBASS_SHA256SUM="8fadf294bf701300d4605e6f1d92929304187fca4b8d8a47889315526adbafd7 0.13.7.tar.gz" +ARG LIBVIDSTAB_SHA256SUM="14d2a053e56edad4f397be0cb3ef8eb1ec3150404ce99a426c4eb641861dc0bb v1.1.0.tar.gz" +ARG OGG_SHA256SUM="e19ee34711d7af328cb26287f4137e70630e7261b17cbe3cd41011d73a654692 libogg-1.3.2.tar.gz" +ARG OPUS_SHA256SUM="77db45a87b51578fbc49555ef1b10926179861d854eb2613207dc79d9ec0a9a9 opus-1.2.tar.gz" +ARG THEORA_SHA256SUM="40952956c47811928d1e7922cda3bc1f427eb75680c3c37249c91e949054916b libtheora-1.1.1.tar.gz" +ARG VORBIS_SHA256SUM="6efbcecdd3e5dfbf090341b485da9d176eb250d893e3eb378c428a2db38301ce libvorbis-1.3.5.tar.gz" +ARG XVID_SHA256SUM="4e9fd62728885855bc5007fe1be58df42e5e274497591fec37249e1052ae316f xvidcore-1.3.4.tar.gz" + RUN buildDeps="autoconf \ diff --git a/docker-images/4.2/vaapi/Dockerfile b/docker-images/4.2/vaapi/Dockerfile index a6e6aca2c..cfff23ff4 100644 --- a/docker-images/4.2/vaapi/Dockerfile +++ b/docker-images/4.2/vaapi/Dockerfile @@ -21,38 +21,39 @@ ARG LD_LIBRARY_PATH=/opt/ffmpeg/lib ARG PREFIX=/opt/ffmpeg ARG MAKEFLAGS="-j2" -ENV FFMPEG_VERSION=4.2 \ - FDKAAC_VERSION=0.1.5 \ - LAME_VERSION=3.100 \ - LIBASS_VERSION=0.13.7 \ - OGG_VERSION=1.3.2 \ +ENV FFMPEG_VERSION=4.2 \ + AOM_VERSION=v1.0.0 \ + FDKAAC_VERSION=0.1.5 \ + FONTCONFIG_VERSION=2.12.4 \ + FREETYPE_VERSION=2.5.5 \ + FRIBIDI_VERSION=0.19.7 \ + KVAZAAR_VERSION=1.2.0 \ + LAME_VERSION=3.100 \ + LIBASS_VERSION=0.13.7 \ + LIBVIDSTAB_VERSION=1.1.0 \ + OGG_VERSION=1.3.2 \ OPENCOREAMR_VERSION=0.1.5 \ - OPUS_VERSION=1.2 \ - OPENJPEG_VERSION=2.1.2 \ - THEORA_VERSION=1.1.1 \ - VORBIS_VERSION=1.3.5 \ - VPX_VERSION=1.8.0 \ - WEBP_VERSION=1.0.2 \ + OPUS_VERSION=1.2 \ + OPENJPEG_VERSION=2.1.2 \ + THEORA_VERSION=1.1.1 \ + VORBIS_VERSION=1.3.5 \ + VPX_VERSION=1.8.0 \ + WEBP_VERSION=1.0.2 \ X264_VERSION=20170226-2245-stable \ - X265_VERSION=3.1.1 \ - XVID_VERSION=1.3.4 \ - FREETYPE_VERSION=2.5.5 \ - FRIBIDI_VERSION=0.19.7 \ - FONTCONFIG_VERSION=2.12.4 \ - LIBVIDSTAB_VERSION=1.1.0 \ - KVAZAAR_VERSION=1.2.0 \ - AOM_VERSION=v1.0.0 \ + X265_VERSION=3.1.1 \ + XVID_VERSION=1.3.4 \ SRC=/usr/local -ARG OGG_SHA256SUM="e19ee34711d7af328cb26287f4137e70630e7261b17cbe3cd41011d73a654692 libogg-1.3.2.tar.gz" -ARG OPUS_SHA256SUM="77db45a87b51578fbc49555ef1b10926179861d854eb2613207dc79d9ec0a9a9 opus-1.2.tar.gz" -ARG VORBIS_SHA256SUM="6efbcecdd3e5dfbf090341b485da9d176eb250d893e3eb378c428a2db38301ce libvorbis-1.3.5.tar.gz" -ARG THEORA_SHA256SUM="40952956c47811928d1e7922cda3bc1f427eb75680c3c37249c91e949054916b libtheora-1.1.1.tar.gz" -ARG XVID_SHA256SUM="4e9fd62728885855bc5007fe1be58df42e5e274497591fec37249e1052ae316f xvidcore-1.3.4.tar.gz" -ARG FREETYPE_SHA256SUM="5d03dd76c2171a7601e9ce10551d52d4471cf92cd205948e60289251daddffa8 freetype-2.5.5.tar.gz" -ARG LIBVIDSTAB_SHA256SUM="14d2a053e56edad4f397be0cb3ef8eb1ec3150404ce99a426c4eb641861dc0bb v1.1.0.tar.gz" -ARG LIBASS_SHA256SUM="8fadf294bf701300d4605e6f1d92929304187fca4b8d8a47889315526adbafd7 0.13.7.tar.gz" -ARG FRIBIDI_SHA256SUM="3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 0.19.7.tar.gz" +ARG FREETYPE_SHA256SUM="5d03dd76c2171a7601e9ce10551d52d4471cf92cd205948e60289251daddffa8 freetype-2.5.5.tar.gz" +ARG FRIBIDI_SHA256SUM="3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 0.19.7.tar.gz" +ARG LIBASS_SHA256SUM="8fadf294bf701300d4605e6f1d92929304187fca4b8d8a47889315526adbafd7 0.13.7.tar.gz" +ARG LIBVIDSTAB_SHA256SUM="14d2a053e56edad4f397be0cb3ef8eb1ec3150404ce99a426c4eb641861dc0bb v1.1.0.tar.gz" +ARG OGG_SHA256SUM="e19ee34711d7af328cb26287f4137e70630e7261b17cbe3cd41011d73a654692 libogg-1.3.2.tar.gz" +ARG OPUS_SHA256SUM="77db45a87b51578fbc49555ef1b10926179861d854eb2613207dc79d9ec0a9a9 opus-1.2.tar.gz" +ARG THEORA_SHA256SUM="40952956c47811928d1e7922cda3bc1f427eb75680c3c37249c91e949054916b libtheora-1.1.1.tar.gz" +ARG VORBIS_SHA256SUM="6efbcecdd3e5dfbf090341b485da9d176eb250d893e3eb378c428a2db38301ce libvorbis-1.3.5.tar.gz" +ARG XVID_SHA256SUM="4e9fd62728885855bc5007fe1be58df42e5e274497591fec37249e1052ae316f xvidcore-1.3.4.tar.gz" + RUN buildDeps="autoconf \ diff --git a/docker-images/snapshot/alpine/Dockerfile b/docker-images/snapshot/alpine/Dockerfile index 2e5202aa5..542af9582 100644 --- a/docker-images/snapshot/alpine/Dockerfile +++ b/docker-images/snapshot/alpine/Dockerfile @@ -18,38 +18,39 @@ ARG LD_LIBRARY_PATH=/opt/ffmpeg/lib ARG PREFIX=/opt/ffmpeg ARG MAKEFLAGS="-j2" -ENV FFMPEG_VERSION=snapshot \ - FDKAAC_VERSION=0.1.5 \ - LAME_VERSION=3.100 \ - LIBASS_VERSION=0.13.7 \ - OGG_VERSION=1.3.2 \ +ENV FFMPEG_VERSION=snapshot \ + AOM_VERSION=v1.0.0 \ + FDKAAC_VERSION=0.1.5 \ + FONTCONFIG_VERSION=2.12.4 \ + FREETYPE_VERSION=2.5.5 \ + FRIBIDI_VERSION=0.19.7 \ + KVAZAAR_VERSION=1.2.0 \ + LAME_VERSION=3.100 \ + LIBASS_VERSION=0.13.7 \ + LIBVIDSTAB_VERSION=1.1.0 \ + OGG_VERSION=1.3.2 \ OPENCOREAMR_VERSION=0.1.5 \ - OPUS_VERSION=1.2 \ - OPENJPEG_VERSION=2.1.2 \ - THEORA_VERSION=1.1.1 \ - VORBIS_VERSION=1.3.5 \ - VPX_VERSION=1.8.0 \ - WEBP_VERSION=1.0.2 \ + OPUS_VERSION=1.2 \ + OPENJPEG_VERSION=2.1.2 \ + THEORA_VERSION=1.1.1 \ + VORBIS_VERSION=1.3.5 \ + VPX_VERSION=1.8.0 \ + WEBP_VERSION=1.0.2 \ X264_VERSION=20170226-2245-stable \ - X265_VERSION=3.1.1 \ - XVID_VERSION=1.3.4 \ - FREETYPE_VERSION=2.5.5 \ - FRIBIDI_VERSION=0.19.7 \ - FONTCONFIG_VERSION=2.12.4 \ - LIBVIDSTAB_VERSION=1.1.0 \ - KVAZAAR_VERSION=1.2.0 \ - AOM_VERSION=v1.0.0 \ + X265_VERSION=3.1.1 \ + XVID_VERSION=1.3.4 \ SRC=/usr/local -ARG OGG_SHA256SUM="e19ee34711d7af328cb26287f4137e70630e7261b17cbe3cd41011d73a654692 libogg-1.3.2.tar.gz" -ARG OPUS_SHA256SUM="77db45a87b51578fbc49555ef1b10926179861d854eb2613207dc79d9ec0a9a9 opus-1.2.tar.gz" -ARG VORBIS_SHA256SUM="6efbcecdd3e5dfbf090341b485da9d176eb250d893e3eb378c428a2db38301ce libvorbis-1.3.5.tar.gz" -ARG THEORA_SHA256SUM="40952956c47811928d1e7922cda3bc1f427eb75680c3c37249c91e949054916b libtheora-1.1.1.tar.gz" -ARG XVID_SHA256SUM="4e9fd62728885855bc5007fe1be58df42e5e274497591fec37249e1052ae316f xvidcore-1.3.4.tar.gz" -ARG FREETYPE_SHA256SUM="5d03dd76c2171a7601e9ce10551d52d4471cf92cd205948e60289251daddffa8 freetype-2.5.5.tar.gz" -ARG LIBVIDSTAB_SHA256SUM="14d2a053e56edad4f397be0cb3ef8eb1ec3150404ce99a426c4eb641861dc0bb v1.1.0.tar.gz" -ARG LIBASS_SHA256SUM="8fadf294bf701300d4605e6f1d92929304187fca4b8d8a47889315526adbafd7 0.13.7.tar.gz" -ARG FRIBIDI_SHA256SUM="3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 0.19.7.tar.gz" +ARG FREETYPE_SHA256SUM="5d03dd76c2171a7601e9ce10551d52d4471cf92cd205948e60289251daddffa8 freetype-2.5.5.tar.gz" +ARG FRIBIDI_SHA256SUM="3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 0.19.7.tar.gz" +ARG LIBASS_SHA256SUM="8fadf294bf701300d4605e6f1d92929304187fca4b8d8a47889315526adbafd7 0.13.7.tar.gz" +ARG LIBVIDSTAB_SHA256SUM="14d2a053e56edad4f397be0cb3ef8eb1ec3150404ce99a426c4eb641861dc0bb v1.1.0.tar.gz" +ARG OGG_SHA256SUM="e19ee34711d7af328cb26287f4137e70630e7261b17cbe3cd41011d73a654692 libogg-1.3.2.tar.gz" +ARG OPUS_SHA256SUM="77db45a87b51578fbc49555ef1b10926179861d854eb2613207dc79d9ec0a9a9 opus-1.2.tar.gz" +ARG THEORA_SHA256SUM="40952956c47811928d1e7922cda3bc1f427eb75680c3c37249c91e949054916b libtheora-1.1.1.tar.gz" +ARG VORBIS_SHA256SUM="6efbcecdd3e5dfbf090341b485da9d176eb250d893e3eb378c428a2db38301ce libvorbis-1.3.5.tar.gz" +ARG XVID_SHA256SUM="4e9fd62728885855bc5007fe1be58df42e5e274497591fec37249e1052ae316f xvidcore-1.3.4.tar.gz" + RUN buildDeps="autoconf \ diff --git a/docker-images/snapshot/centos/Dockerfile b/docker-images/snapshot/centos/Dockerfile index f8da81a76..7f3c5567c 100644 --- a/docker-images/snapshot/centos/Dockerfile +++ b/docker-images/snapshot/centos/Dockerfile @@ -20,38 +20,39 @@ ARG LD_LIBRARY_PATH=/opt/ffmpeg/lib ARG PREFIX=/opt/ffmpeg ARG MAKEFLAGS="-j2" -ENV FFMPEG_VERSION=snapshot \ - FDKAAC_VERSION=0.1.5 \ - LAME_VERSION=3.100 \ - LIBASS_VERSION=0.13.7 \ - OGG_VERSION=1.3.2 \ +ENV FFMPEG_VERSION=snapshot \ + AOM_VERSION=v1.0.0 \ + FDKAAC_VERSION=0.1.5 \ + FONTCONFIG_VERSION=2.12.4 \ + FREETYPE_VERSION=2.5.5 \ + FRIBIDI_VERSION=0.19.7 \ + KVAZAAR_VERSION=1.2.0 \ + LAME_VERSION=3.100 \ + LIBASS_VERSION=0.13.7 \ + LIBVIDSTAB_VERSION=1.1.0 \ + OGG_VERSION=1.3.2 \ OPENCOREAMR_VERSION=0.1.5 \ - OPUS_VERSION=1.2 \ - OPENJPEG_VERSION=2.1.2 \ - THEORA_VERSION=1.1.1 \ - VORBIS_VERSION=1.3.5 \ - VPX_VERSION=1.8.0 \ - WEBP_VERSION=1.0.2 \ + OPUS_VERSION=1.2 \ + OPENJPEG_VERSION=2.1.2 \ + THEORA_VERSION=1.1.1 \ + VORBIS_VERSION=1.3.5 \ + VPX_VERSION=1.8.0 \ + WEBP_VERSION=1.0.2 \ X264_VERSION=20170226-2245-stable \ - X265_VERSION=3.1.1 \ - XVID_VERSION=1.3.4 \ - FREETYPE_VERSION=2.5.5 \ - FRIBIDI_VERSION=0.19.7 \ - FONTCONFIG_VERSION=2.12.4 \ - LIBVIDSTAB_VERSION=1.1.0 \ - KVAZAAR_VERSION=1.2.0 \ - AOM_VERSION=v1.0.0 \ + X265_VERSION=3.1.1 \ + XVID_VERSION=1.3.4 \ SRC=/usr/local -ARG OGG_SHA256SUM="e19ee34711d7af328cb26287f4137e70630e7261b17cbe3cd41011d73a654692 libogg-1.3.2.tar.gz" -ARG OPUS_SHA256SUM="77db45a87b51578fbc49555ef1b10926179861d854eb2613207dc79d9ec0a9a9 opus-1.2.tar.gz" -ARG VORBIS_SHA256SUM="6efbcecdd3e5dfbf090341b485da9d176eb250d893e3eb378c428a2db38301ce libvorbis-1.3.5.tar.gz" -ARG THEORA_SHA256SUM="40952956c47811928d1e7922cda3bc1f427eb75680c3c37249c91e949054916b libtheora-1.1.1.tar.gz" -ARG XVID_SHA256SUM="4e9fd62728885855bc5007fe1be58df42e5e274497591fec37249e1052ae316f xvidcore-1.3.4.tar.gz" -ARG FREETYPE_SHA256SUM="5d03dd76c2171a7601e9ce10551d52d4471cf92cd205948e60289251daddffa8 freetype-2.5.5.tar.gz" -ARG LIBVIDSTAB_SHA256SUM="14d2a053e56edad4f397be0cb3ef8eb1ec3150404ce99a426c4eb641861dc0bb v1.1.0.tar.gz" -ARG LIBASS_SHA256SUM="8fadf294bf701300d4605e6f1d92929304187fca4b8d8a47889315526adbafd7 0.13.7.tar.gz" -ARG FRIBIDI_SHA256SUM="3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 0.19.7.tar.gz" +ARG FREETYPE_SHA256SUM="5d03dd76c2171a7601e9ce10551d52d4471cf92cd205948e60289251daddffa8 freetype-2.5.5.tar.gz" +ARG FRIBIDI_SHA256SUM="3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 0.19.7.tar.gz" +ARG LIBASS_SHA256SUM="8fadf294bf701300d4605e6f1d92929304187fca4b8d8a47889315526adbafd7 0.13.7.tar.gz" +ARG LIBVIDSTAB_SHA256SUM="14d2a053e56edad4f397be0cb3ef8eb1ec3150404ce99a426c4eb641861dc0bb v1.1.0.tar.gz" +ARG OGG_SHA256SUM="e19ee34711d7af328cb26287f4137e70630e7261b17cbe3cd41011d73a654692 libogg-1.3.2.tar.gz" +ARG OPUS_SHA256SUM="77db45a87b51578fbc49555ef1b10926179861d854eb2613207dc79d9ec0a9a9 opus-1.2.tar.gz" +ARG THEORA_SHA256SUM="40952956c47811928d1e7922cda3bc1f427eb75680c3c37249c91e949054916b libtheora-1.1.1.tar.gz" +ARG VORBIS_SHA256SUM="6efbcecdd3e5dfbf090341b485da9d176eb250d893e3eb378c428a2db38301ce libvorbis-1.3.5.tar.gz" +ARG XVID_SHA256SUM="4e9fd62728885855bc5007fe1be58df42e5e274497591fec37249e1052ae316f xvidcore-1.3.4.tar.gz" + RUN buildDeps="autoconf \ diff --git a/docker-images/snapshot/nvidia/Dockerfile b/docker-images/snapshot/nvidia/Dockerfile index 68a398b4c..cf7e18de0 100644 --- a/docker-images/snapshot/nvidia/Dockerfile +++ b/docker-images/snapshot/nvidia/Dockerfile @@ -35,38 +35,39 @@ ENV LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/opt/ffmpeg/lib" ARG PREFIX=/opt/ffmpeg ARG MAKEFLAGS="-j12" -ENV FFMPEG_VERSION=snapshot \ - FDKAAC_VERSION=0.1.5 \ - LAME_VERSION=3.100 \ - LIBASS_VERSION=0.13.7 \ - OGG_VERSION=1.3.2 \ +ENV FFMPEG_VERSION=snapshot \ + AOM_VERSION=v1.0.0 \ + FDKAAC_VERSION=0.1.5 \ + FONTCONFIG_VERSION=2.12.4 \ + FREETYPE_VERSION=2.5.5 \ + FRIBIDI_VERSION=0.19.7 \ + KVAZAAR_VERSION=1.2.0 \ + LAME_VERSION=3.100 \ + LIBASS_VERSION=0.13.7 \ + LIBVIDSTAB_VERSION=1.1.0 \ + OGG_VERSION=1.3.2 \ OPENCOREAMR_VERSION=0.1.5 \ - OPUS_VERSION=1.2 \ - OPENJPEG_VERSION=2.1.2 \ - THEORA_VERSION=1.1.1 \ - VORBIS_VERSION=1.3.5 \ - VPX_VERSION=1.8.0 \ - WEBP_VERSION=1.0.2 \ + OPUS_VERSION=1.2 \ + OPENJPEG_VERSION=2.1.2 \ + THEORA_VERSION=1.1.1 \ + VORBIS_VERSION=1.3.5 \ + VPX_VERSION=1.8.0 \ + WEBP_VERSION=1.0.2 \ X264_VERSION=20170226-2245-stable \ - X265_VERSION=3.1.1 \ - XVID_VERSION=1.3.4 \ - FREETYPE_VERSION=2.5.5 \ - FRIBIDI_VERSION=0.19.7 \ - FONTCONFIG_VERSION=2.12.4 \ - LIBVIDSTAB_VERSION=1.1.0 \ - KVAZAAR_VERSION=1.2.0 \ - AOM_VERSION=v1.0.0 \ + X265_VERSION=3.1.1 \ + XVID_VERSION=1.3.4 \ SRC=/usr/local -ARG OGG_SHA256SUM="e19ee34711d7af328cb26287f4137e70630e7261b17cbe3cd41011d73a654692 libogg-1.3.2.tar.gz" -ARG OPUS_SHA256SUM="77db45a87b51578fbc49555ef1b10926179861d854eb2613207dc79d9ec0a9a9 opus-1.2.tar.gz" -ARG VORBIS_SHA256SUM="6efbcecdd3e5dfbf090341b485da9d176eb250d893e3eb378c428a2db38301ce libvorbis-1.3.5.tar.gz" -ARG THEORA_SHA256SUM="40952956c47811928d1e7922cda3bc1f427eb75680c3c37249c91e949054916b libtheora-1.1.1.tar.gz" -ARG XVID_SHA256SUM="4e9fd62728885855bc5007fe1be58df42e5e274497591fec37249e1052ae316f xvidcore-1.3.4.tar.gz" -ARG FREETYPE_SHA256SUM="5d03dd76c2171a7601e9ce10551d52d4471cf92cd205948e60289251daddffa8 freetype-2.5.5.tar.gz" -ARG LIBVIDSTAB_SHA256SUM="14d2a053e56edad4f397be0cb3ef8eb1ec3150404ce99a426c4eb641861dc0bb v1.1.0.tar.gz" -ARG LIBASS_SHA256SUM="8fadf294bf701300d4605e6f1d92929304187fca4b8d8a47889315526adbafd7 0.13.7.tar.gz" -ARG FRIBIDI_SHA256SUM="3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 0.19.7.tar.gz" +ARG FREETYPE_SHA256SUM="5d03dd76c2171a7601e9ce10551d52d4471cf92cd205948e60289251daddffa8 freetype-2.5.5.tar.gz" +ARG FRIBIDI_SHA256SUM="3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 0.19.7.tar.gz" +ARG LIBASS_SHA256SUM="8fadf294bf701300d4605e6f1d92929304187fca4b8d8a47889315526adbafd7 0.13.7.tar.gz" +ARG LIBVIDSTAB_SHA256SUM="14d2a053e56edad4f397be0cb3ef8eb1ec3150404ce99a426c4eb641861dc0bb v1.1.0.tar.gz" +ARG OGG_SHA256SUM="e19ee34711d7af328cb26287f4137e70630e7261b17cbe3cd41011d73a654692 libogg-1.3.2.tar.gz" +ARG OPUS_SHA256SUM="77db45a87b51578fbc49555ef1b10926179861d854eb2613207dc79d9ec0a9a9 opus-1.2.tar.gz" +ARG THEORA_SHA256SUM="40952956c47811928d1e7922cda3bc1f427eb75680c3c37249c91e949054916b libtheora-1.1.1.tar.gz" +ARG VORBIS_SHA256SUM="6efbcecdd3e5dfbf090341b485da9d176eb250d893e3eb378c428a2db38301ce libvorbis-1.3.5.tar.gz" +ARG XVID_SHA256SUM="4e9fd62728885855bc5007fe1be58df42e5e274497591fec37249e1052ae316f xvidcore-1.3.4.tar.gz" + RUN buildDeps="autoconf \ diff --git a/docker-images/snapshot/scratch/Dockerfile b/docker-images/snapshot/scratch/Dockerfile index 066235c61..a8f98ff86 100644 --- a/docker-images/snapshot/scratch/Dockerfile +++ b/docker-images/snapshot/scratch/Dockerfile @@ -13,38 +13,39 @@ ARG LD_LIBRARY_PATH=/opt/ffmpeg/lib ARG PREFIX=/opt/ffmpeg ARG MAKEFLAGS="-j2" -ENV FFMPEG_VERSION=snapshot \ - FDKAAC_VERSION=0.1.5 \ - LAME_VERSION=3.100 \ - LIBASS_VERSION=0.13.7 \ - OGG_VERSION=1.3.2 \ +ENV FFMPEG_VERSION=snapshot \ + AOM_VERSION=v1.0.0 \ + FDKAAC_VERSION=0.1.5 \ + FONTCONFIG_VERSION=2.12.4 \ + FREETYPE_VERSION=2.5.5 \ + FRIBIDI_VERSION=0.19.7 \ + KVAZAAR_VERSION=1.2.0 \ + LAME_VERSION=3.100 \ + LIBASS_VERSION=0.13.7 \ + LIBVIDSTAB_VERSION=1.1.0 \ + OGG_VERSION=1.3.2 \ OPENCOREAMR_VERSION=0.1.5 \ - OPUS_VERSION=1.2 \ - OPENJPEG_VERSION=2.1.2 \ - THEORA_VERSION=1.1.1 \ - VORBIS_VERSION=1.3.5 \ - VPX_VERSION=1.8.0 \ - WEBP_VERSION=1.0.2 \ + OPUS_VERSION=1.2 \ + OPENJPEG_VERSION=2.1.2 \ + THEORA_VERSION=1.1.1 \ + VORBIS_VERSION=1.3.5 \ + VPX_VERSION=1.8.0 \ + WEBP_VERSION=1.0.2 \ X264_VERSION=20170226-2245-stable \ - X265_VERSION=3.1.1 \ - XVID_VERSION=1.3.4 \ - FREETYPE_VERSION=2.5.5 \ - FRIBIDI_VERSION=0.19.7 \ - FONTCONFIG_VERSION=2.12.4 \ - LIBVIDSTAB_VERSION=1.1.0 \ - KVAZAAR_VERSION=1.2.0 \ - AOM_VERSION=v1.0.0 \ + X265_VERSION=3.1.1 \ + XVID_VERSION=1.3.4 \ SRC=/usr/local -ARG OGG_SHA256SUM="e19ee34711d7af328cb26287f4137e70630e7261b17cbe3cd41011d73a654692 libogg-1.3.2.tar.gz" -ARG OPUS_SHA256SUM="77db45a87b51578fbc49555ef1b10926179861d854eb2613207dc79d9ec0a9a9 opus-1.2.tar.gz" -ARG VORBIS_SHA256SUM="6efbcecdd3e5dfbf090341b485da9d176eb250d893e3eb378c428a2db38301ce libvorbis-1.3.5.tar.gz" -ARG THEORA_SHA256SUM="40952956c47811928d1e7922cda3bc1f427eb75680c3c37249c91e949054916b libtheora-1.1.1.tar.gz" -ARG XVID_SHA256SUM="4e9fd62728885855bc5007fe1be58df42e5e274497591fec37249e1052ae316f xvidcore-1.3.4.tar.gz" -ARG FREETYPE_SHA256SUM="5d03dd76c2171a7601e9ce10551d52d4471cf92cd205948e60289251daddffa8 freetype-2.5.5.tar.gz" -ARG LIBVIDSTAB_SHA256SUM="14d2a053e56edad4f397be0cb3ef8eb1ec3150404ce99a426c4eb641861dc0bb v1.1.0.tar.gz" -ARG LIBASS_SHA256SUM="8fadf294bf701300d4605e6f1d92929304187fca4b8d8a47889315526adbafd7 0.13.7.tar.gz" -ARG FRIBIDI_SHA256SUM="3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 0.19.7.tar.gz" +ARG FREETYPE_SHA256SUM="5d03dd76c2171a7601e9ce10551d52d4471cf92cd205948e60289251daddffa8 freetype-2.5.5.tar.gz" +ARG FRIBIDI_SHA256SUM="3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 0.19.7.tar.gz" +ARG LIBASS_SHA256SUM="8fadf294bf701300d4605e6f1d92929304187fca4b8d8a47889315526adbafd7 0.13.7.tar.gz" +ARG LIBVIDSTAB_SHA256SUM="14d2a053e56edad4f397be0cb3ef8eb1ec3150404ce99a426c4eb641861dc0bb v1.1.0.tar.gz" +ARG OGG_SHA256SUM="e19ee34711d7af328cb26287f4137e70630e7261b17cbe3cd41011d73a654692 libogg-1.3.2.tar.gz" +ARG OPUS_SHA256SUM="77db45a87b51578fbc49555ef1b10926179861d854eb2613207dc79d9ec0a9a9 opus-1.2.tar.gz" +ARG THEORA_SHA256SUM="40952956c47811928d1e7922cda3bc1f427eb75680c3c37249c91e949054916b libtheora-1.1.1.tar.gz" +ARG VORBIS_SHA256SUM="6efbcecdd3e5dfbf090341b485da9d176eb250d893e3eb378c428a2db38301ce libvorbis-1.3.5.tar.gz" +ARG XVID_SHA256SUM="4e9fd62728885855bc5007fe1be58df42e5e274497591fec37249e1052ae316f xvidcore-1.3.4.tar.gz" + RUN buildDeps="autoconf \ diff --git a/docker-images/snapshot/ubuntu/Dockerfile b/docker-images/snapshot/ubuntu/Dockerfile index fee61296b..05d93664e 100644 --- a/docker-images/snapshot/ubuntu/Dockerfile +++ b/docker-images/snapshot/ubuntu/Dockerfile @@ -21,38 +21,39 @@ ARG LD_LIBRARY_PATH=/opt/ffmpeg/lib ARG PREFIX=/opt/ffmpeg ARG MAKEFLAGS="-j2" -ENV FFMPEG_VERSION=snapshot \ - FDKAAC_VERSION=0.1.5 \ - LAME_VERSION=3.100 \ - LIBASS_VERSION=0.13.7 \ - OGG_VERSION=1.3.2 \ +ENV FFMPEG_VERSION=snapshot \ + AOM_VERSION=v1.0.0 \ + FDKAAC_VERSION=0.1.5 \ + FONTCONFIG_VERSION=2.12.4 \ + FREETYPE_VERSION=2.5.5 \ + FRIBIDI_VERSION=0.19.7 \ + KVAZAAR_VERSION=1.2.0 \ + LAME_VERSION=3.100 \ + LIBASS_VERSION=0.13.7 \ + LIBVIDSTAB_VERSION=1.1.0 \ + OGG_VERSION=1.3.2 \ OPENCOREAMR_VERSION=0.1.5 \ - OPUS_VERSION=1.2 \ - OPENJPEG_VERSION=2.1.2 \ - THEORA_VERSION=1.1.1 \ - VORBIS_VERSION=1.3.5 \ - VPX_VERSION=1.8.0 \ - WEBP_VERSION=1.0.2 \ + OPUS_VERSION=1.2 \ + OPENJPEG_VERSION=2.1.2 \ + THEORA_VERSION=1.1.1 \ + VORBIS_VERSION=1.3.5 \ + VPX_VERSION=1.8.0 \ + WEBP_VERSION=1.0.2 \ X264_VERSION=20170226-2245-stable \ - X265_VERSION=3.1.1 \ - XVID_VERSION=1.3.4 \ - FREETYPE_VERSION=2.5.5 \ - FRIBIDI_VERSION=0.19.7 \ - FONTCONFIG_VERSION=2.12.4 \ - LIBVIDSTAB_VERSION=1.1.0 \ - KVAZAAR_VERSION=1.2.0 \ - AOM_VERSION=v1.0.0 \ + X265_VERSION=3.1.1 \ + XVID_VERSION=1.3.4 \ SRC=/usr/local -ARG OGG_SHA256SUM="e19ee34711d7af328cb26287f4137e70630e7261b17cbe3cd41011d73a654692 libogg-1.3.2.tar.gz" -ARG OPUS_SHA256SUM="77db45a87b51578fbc49555ef1b10926179861d854eb2613207dc79d9ec0a9a9 opus-1.2.tar.gz" -ARG VORBIS_SHA256SUM="6efbcecdd3e5dfbf090341b485da9d176eb250d893e3eb378c428a2db38301ce libvorbis-1.3.5.tar.gz" -ARG THEORA_SHA256SUM="40952956c47811928d1e7922cda3bc1f427eb75680c3c37249c91e949054916b libtheora-1.1.1.tar.gz" -ARG XVID_SHA256SUM="4e9fd62728885855bc5007fe1be58df42e5e274497591fec37249e1052ae316f xvidcore-1.3.4.tar.gz" -ARG FREETYPE_SHA256SUM="5d03dd76c2171a7601e9ce10551d52d4471cf92cd205948e60289251daddffa8 freetype-2.5.5.tar.gz" -ARG LIBVIDSTAB_SHA256SUM="14d2a053e56edad4f397be0cb3ef8eb1ec3150404ce99a426c4eb641861dc0bb v1.1.0.tar.gz" -ARG LIBASS_SHA256SUM="8fadf294bf701300d4605e6f1d92929304187fca4b8d8a47889315526adbafd7 0.13.7.tar.gz" -ARG FRIBIDI_SHA256SUM="3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 0.19.7.tar.gz" +ARG FREETYPE_SHA256SUM="5d03dd76c2171a7601e9ce10551d52d4471cf92cd205948e60289251daddffa8 freetype-2.5.5.tar.gz" +ARG FRIBIDI_SHA256SUM="3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 0.19.7.tar.gz" +ARG LIBASS_SHA256SUM="8fadf294bf701300d4605e6f1d92929304187fca4b8d8a47889315526adbafd7 0.13.7.tar.gz" +ARG LIBVIDSTAB_SHA256SUM="14d2a053e56edad4f397be0cb3ef8eb1ec3150404ce99a426c4eb641861dc0bb v1.1.0.tar.gz" +ARG OGG_SHA256SUM="e19ee34711d7af328cb26287f4137e70630e7261b17cbe3cd41011d73a654692 libogg-1.3.2.tar.gz" +ARG OPUS_SHA256SUM="77db45a87b51578fbc49555ef1b10926179861d854eb2613207dc79d9ec0a9a9 opus-1.2.tar.gz" +ARG THEORA_SHA256SUM="40952956c47811928d1e7922cda3bc1f427eb75680c3c37249c91e949054916b libtheora-1.1.1.tar.gz" +ARG VORBIS_SHA256SUM="6efbcecdd3e5dfbf090341b485da9d176eb250d893e3eb378c428a2db38301ce libvorbis-1.3.5.tar.gz" +ARG XVID_SHA256SUM="4e9fd62728885855bc5007fe1be58df42e5e274497591fec37249e1052ae316f xvidcore-1.3.4.tar.gz" + RUN buildDeps="autoconf \ diff --git a/docker-images/snapshot/vaapi/Dockerfile b/docker-images/snapshot/vaapi/Dockerfile index a2644777d..bd16f7b85 100644 --- a/docker-images/snapshot/vaapi/Dockerfile +++ b/docker-images/snapshot/vaapi/Dockerfile @@ -21,38 +21,39 @@ ARG LD_LIBRARY_PATH=/opt/ffmpeg/lib ARG PREFIX=/opt/ffmpeg ARG MAKEFLAGS="-j2" -ENV FFMPEG_VERSION=snapshot \ - FDKAAC_VERSION=0.1.5 \ - LAME_VERSION=3.100 \ - LIBASS_VERSION=0.13.7 \ - OGG_VERSION=1.3.2 \ +ENV FFMPEG_VERSION=snapshot \ + AOM_VERSION=v1.0.0 \ + FDKAAC_VERSION=0.1.5 \ + FONTCONFIG_VERSION=2.12.4 \ + FREETYPE_VERSION=2.5.5 \ + FRIBIDI_VERSION=0.19.7 \ + KVAZAAR_VERSION=1.2.0 \ + LAME_VERSION=3.100 \ + LIBASS_VERSION=0.13.7 \ + LIBVIDSTAB_VERSION=1.1.0 \ + OGG_VERSION=1.3.2 \ OPENCOREAMR_VERSION=0.1.5 \ - OPUS_VERSION=1.2 \ - OPENJPEG_VERSION=2.1.2 \ - THEORA_VERSION=1.1.1 \ - VORBIS_VERSION=1.3.5 \ - VPX_VERSION=1.8.0 \ - WEBP_VERSION=1.0.2 \ + OPUS_VERSION=1.2 \ + OPENJPEG_VERSION=2.1.2 \ + THEORA_VERSION=1.1.1 \ + VORBIS_VERSION=1.3.5 \ + VPX_VERSION=1.8.0 \ + WEBP_VERSION=1.0.2 \ X264_VERSION=20170226-2245-stable \ - X265_VERSION=3.1.1 \ - XVID_VERSION=1.3.4 \ - FREETYPE_VERSION=2.5.5 \ - FRIBIDI_VERSION=0.19.7 \ - FONTCONFIG_VERSION=2.12.4 \ - LIBVIDSTAB_VERSION=1.1.0 \ - KVAZAAR_VERSION=1.2.0 \ - AOM_VERSION=v1.0.0 \ + X265_VERSION=3.1.1 \ + XVID_VERSION=1.3.4 \ SRC=/usr/local -ARG OGG_SHA256SUM="e19ee34711d7af328cb26287f4137e70630e7261b17cbe3cd41011d73a654692 libogg-1.3.2.tar.gz" -ARG OPUS_SHA256SUM="77db45a87b51578fbc49555ef1b10926179861d854eb2613207dc79d9ec0a9a9 opus-1.2.tar.gz" -ARG VORBIS_SHA256SUM="6efbcecdd3e5dfbf090341b485da9d176eb250d893e3eb378c428a2db38301ce libvorbis-1.3.5.tar.gz" -ARG THEORA_SHA256SUM="40952956c47811928d1e7922cda3bc1f427eb75680c3c37249c91e949054916b libtheora-1.1.1.tar.gz" -ARG XVID_SHA256SUM="4e9fd62728885855bc5007fe1be58df42e5e274497591fec37249e1052ae316f xvidcore-1.3.4.tar.gz" -ARG FREETYPE_SHA256SUM="5d03dd76c2171a7601e9ce10551d52d4471cf92cd205948e60289251daddffa8 freetype-2.5.5.tar.gz" -ARG LIBVIDSTAB_SHA256SUM="14d2a053e56edad4f397be0cb3ef8eb1ec3150404ce99a426c4eb641861dc0bb v1.1.0.tar.gz" -ARG LIBASS_SHA256SUM="8fadf294bf701300d4605e6f1d92929304187fca4b8d8a47889315526adbafd7 0.13.7.tar.gz" -ARG FRIBIDI_SHA256SUM="3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 0.19.7.tar.gz" +ARG FREETYPE_SHA256SUM="5d03dd76c2171a7601e9ce10551d52d4471cf92cd205948e60289251daddffa8 freetype-2.5.5.tar.gz" +ARG FRIBIDI_SHA256SUM="3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 0.19.7.tar.gz" +ARG LIBASS_SHA256SUM="8fadf294bf701300d4605e6f1d92929304187fca4b8d8a47889315526adbafd7 0.13.7.tar.gz" +ARG LIBVIDSTAB_SHA256SUM="14d2a053e56edad4f397be0cb3ef8eb1ec3150404ce99a426c4eb641861dc0bb v1.1.0.tar.gz" +ARG OGG_SHA256SUM="e19ee34711d7af328cb26287f4137e70630e7261b17cbe3cd41011d73a654692 libogg-1.3.2.tar.gz" +ARG OPUS_SHA256SUM="77db45a87b51578fbc49555ef1b10926179861d854eb2613207dc79d9ec0a9a9 opus-1.2.tar.gz" +ARG THEORA_SHA256SUM="40952956c47811928d1e7922cda3bc1f427eb75680c3c37249c91e949054916b libtheora-1.1.1.tar.gz" +ARG VORBIS_SHA256SUM="6efbcecdd3e5dfbf090341b485da9d176eb250d893e3eb378c428a2db38301ce libvorbis-1.3.5.tar.gz" +ARG XVID_SHA256SUM="4e9fd62728885855bc5007fe1be58df42e5e274497591fec37249e1052ae316f xvidcore-1.3.4.tar.gz" + RUN buildDeps="autoconf \ From 64b5037d60fe62e2b5a77158afa2dd1697d29e85 Mon Sep 17 00:00:00 2001 From: Julien Rottenberg Date: Wed, 21 Aug 2019 21:32:06 -0700 Subject: [PATCH 19/29] Mirror with valid cert --- templates/Dockerfile-run | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/Dockerfile-run b/templates/Dockerfile-run index f346c34c6..6ba368990 100644 --- a/templates/Dockerfile-run +++ b/templates/Dockerfile-run @@ -3,7 +3,7 @@ RUN \ DIR=/tmp/opencore-amr && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sL https://kent.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${OPENCOREAMR_VERSION}.tar.gz | \ + curl -sL https://versaweb.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${OPENCOREAMR_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared && \ make && \ @@ -110,7 +110,7 @@ RUN \ DIR=/tmp/lame && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sL https://kent.dl.sourceforge.net/project/lame/lame/$(echo ${LAME_VERSION} | sed -e 's/[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)/\1.\2/')/lame-${LAME_VERSION}.tar.gz | \ + curl -sL https://versaweb.dl.sourceforge.net/project/lame/lame/$(echo ${LAME_VERSION} | sed -e 's/[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)/\1.\2/')/lame-${LAME_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" --enable-shared --enable-nasm --enable-pic --disable-frontend && \ make && \ From 9e30a5db88cfebf0aab807e911cd26215a224abe Mon Sep 17 00:00:00 2001 From: Julien Rottenberg Date: Wed, 21 Aug 2019 21:32:26 -0700 Subject: [PATCH 20/29] after update.py --- docker-images/2.8/alpine/Dockerfile | 4 ++-- docker-images/2.8/centos/Dockerfile | 4 ++-- docker-images/2.8/nvidia/Dockerfile | 4 ++-- docker-images/2.8/scratch/Dockerfile | 4 ++-- docker-images/2.8/ubuntu/Dockerfile | 4 ++-- docker-images/2.8/vaapi/Dockerfile | 4 ++-- docker-images/3.0/alpine/Dockerfile | 4 ++-- docker-images/3.0/centos/Dockerfile | 4 ++-- docker-images/3.0/nvidia/Dockerfile | 4 ++-- docker-images/3.0/scratch/Dockerfile | 4 ++-- docker-images/3.0/ubuntu/Dockerfile | 4 ++-- docker-images/3.0/vaapi/Dockerfile | 4 ++-- docker-images/3.1/alpine/Dockerfile | 4 ++-- docker-images/3.1/centos/Dockerfile | 4 ++-- docker-images/3.1/nvidia/Dockerfile | 4 ++-- docker-images/3.1/scratch/Dockerfile | 4 ++-- docker-images/3.1/ubuntu/Dockerfile | 4 ++-- docker-images/3.1/vaapi/Dockerfile | 4 ++-- docker-images/3.2/alpine/Dockerfile | 4 ++-- docker-images/3.2/centos/Dockerfile | 4 ++-- docker-images/3.2/nvidia/Dockerfile | 4 ++-- docker-images/3.2/scratch/Dockerfile | 4 ++-- docker-images/3.2/ubuntu/Dockerfile | 4 ++-- docker-images/3.2/vaapi/Dockerfile | 4 ++-- docker-images/3.3/alpine/Dockerfile | 4 ++-- docker-images/3.3/centos/Dockerfile | 4 ++-- docker-images/3.3/nvidia/Dockerfile | 4 ++-- docker-images/3.3/scratch/Dockerfile | 4 ++-- docker-images/3.3/ubuntu/Dockerfile | 4 ++-- docker-images/3.3/vaapi/Dockerfile | 4 ++-- docker-images/3.4/alpine/Dockerfile | 4 ++-- docker-images/3.4/centos/Dockerfile | 4 ++-- docker-images/3.4/nvidia/Dockerfile | 4 ++-- docker-images/3.4/scratch/Dockerfile | 4 ++-- docker-images/3.4/ubuntu/Dockerfile | 4 ++-- docker-images/3.4/vaapi/Dockerfile | 4 ++-- docker-images/4.0/alpine/Dockerfile | 4 ++-- docker-images/4.0/centos/Dockerfile | 4 ++-- docker-images/4.0/nvidia/Dockerfile | 4 ++-- docker-images/4.0/scratch/Dockerfile | 4 ++-- docker-images/4.0/ubuntu/Dockerfile | 4 ++-- docker-images/4.0/vaapi/Dockerfile | 4 ++-- docker-images/4.1/alpine/Dockerfile | 4 ++-- docker-images/4.1/centos/Dockerfile | 4 ++-- docker-images/4.1/nvidia/Dockerfile | 4 ++-- docker-images/4.1/scratch/Dockerfile | 4 ++-- docker-images/4.1/ubuntu/Dockerfile | 4 ++-- docker-images/4.1/vaapi/Dockerfile | 4 ++-- docker-images/4.2/alpine/Dockerfile | 4 ++-- docker-images/4.2/centos/Dockerfile | 4 ++-- docker-images/4.2/nvidia/Dockerfile | 4 ++-- docker-images/4.2/scratch/Dockerfile | 4 ++-- docker-images/4.2/ubuntu/Dockerfile | 4 ++-- docker-images/4.2/vaapi/Dockerfile | 4 ++-- docker-images/snapshot/alpine/Dockerfile | 4 ++-- docker-images/snapshot/centos/Dockerfile | 4 ++-- docker-images/snapshot/nvidia/Dockerfile | 4 ++-- docker-images/snapshot/scratch/Dockerfile | 4 ++-- docker-images/snapshot/ubuntu/Dockerfile | 4 ++-- docker-images/snapshot/vaapi/Dockerfile | 4 ++-- 60 files changed, 120 insertions(+), 120 deletions(-) diff --git a/docker-images/2.8/alpine/Dockerfile b/docker-images/2.8/alpine/Dockerfile index a853ec883..322b02307 100644 --- a/docker-images/2.8/alpine/Dockerfile +++ b/docker-images/2.8/alpine/Dockerfile @@ -80,7 +80,7 @@ RUN \ DIR=/tmp/opencore-amr && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sL https://kent.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${OPENCOREAMR_VERSION}.tar.gz | \ + curl -sL https://versaweb.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${OPENCOREAMR_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared && \ make && \ @@ -187,7 +187,7 @@ RUN \ DIR=/tmp/lame && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sL https://kent.dl.sourceforge.net/project/lame/lame/$(echo ${LAME_VERSION} | sed -e 's/[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)/\1.\2/')/lame-${LAME_VERSION}.tar.gz | \ + curl -sL https://versaweb.dl.sourceforge.net/project/lame/lame/$(echo ${LAME_VERSION} | sed -e 's/[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)/\1.\2/')/lame-${LAME_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" --enable-shared --enable-nasm --enable-pic --disable-frontend && \ make && \ diff --git a/docker-images/2.8/centos/Dockerfile b/docker-images/2.8/centos/Dockerfile index 2fa1ddc6b..d3f36c8ad 100644 --- a/docker-images/2.8/centos/Dockerfile +++ b/docker-images/2.8/centos/Dockerfile @@ -81,7 +81,7 @@ RUN \ DIR=/tmp/opencore-amr && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sL https://kent.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${OPENCOREAMR_VERSION}.tar.gz | \ + curl -sL https://versaweb.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${OPENCOREAMR_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared && \ make && \ @@ -188,7 +188,7 @@ RUN \ DIR=/tmp/lame && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sL https://kent.dl.sourceforge.net/project/lame/lame/$(echo ${LAME_VERSION} | sed -e 's/[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)/\1.\2/')/lame-${LAME_VERSION}.tar.gz | \ + curl -sL https://versaweb.dl.sourceforge.net/project/lame/lame/$(echo ${LAME_VERSION} | sed -e 's/[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)/\1.\2/')/lame-${LAME_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" --enable-shared --enable-nasm --enable-pic --disable-frontend && \ make && \ diff --git a/docker-images/2.8/nvidia/Dockerfile b/docker-images/2.8/nvidia/Dockerfile index 193938068..71a097a4c 100644 --- a/docker-images/2.8/nvidia/Dockerfile +++ b/docker-images/2.8/nvidia/Dockerfile @@ -107,7 +107,7 @@ RUN \ DIR=/tmp/opencore-amr && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sL https://kent.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${OPENCOREAMR_VERSION}.tar.gz | \ + curl -sL https://versaweb.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${OPENCOREAMR_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared && \ make && \ @@ -214,7 +214,7 @@ RUN \ DIR=/tmp/lame && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sL https://kent.dl.sourceforge.net/project/lame/lame/$(echo ${LAME_VERSION} | sed -e 's/[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)/\1.\2/')/lame-${LAME_VERSION}.tar.gz | \ + curl -sL https://versaweb.dl.sourceforge.net/project/lame/lame/$(echo ${LAME_VERSION} | sed -e 's/[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)/\1.\2/')/lame-${LAME_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" --enable-shared --enable-nasm --enable-pic --disable-frontend && \ make && \ diff --git a/docker-images/2.8/scratch/Dockerfile b/docker-images/2.8/scratch/Dockerfile index fa3810c19..91664f25c 100644 --- a/docker-images/2.8/scratch/Dockerfile +++ b/docker-images/2.8/scratch/Dockerfile @@ -77,7 +77,7 @@ RUN \ DIR=/tmp/opencore-amr && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sL https://kent.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${OPENCOREAMR_VERSION}.tar.gz | \ + curl -sL https://versaweb.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${OPENCOREAMR_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared && \ make && \ @@ -184,7 +184,7 @@ RUN \ DIR=/tmp/lame && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sL https://kent.dl.sourceforge.net/project/lame/lame/$(echo ${LAME_VERSION} | sed -e 's/[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)/\1.\2/')/lame-${LAME_VERSION}.tar.gz | \ + curl -sL https://versaweb.dl.sourceforge.net/project/lame/lame/$(echo ${LAME_VERSION} | sed -e 's/[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)/\1.\2/')/lame-${LAME_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" --enable-shared --enable-nasm --enable-pic --disable-frontend && \ make && \ diff --git a/docker-images/2.8/ubuntu/Dockerfile b/docker-images/2.8/ubuntu/Dockerfile index 523aef41c..c3d4ffcac 100644 --- a/docker-images/2.8/ubuntu/Dockerfile +++ b/docker-images/2.8/ubuntu/Dockerfile @@ -82,7 +82,7 @@ RUN \ DIR=/tmp/opencore-amr && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sL https://kent.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${OPENCOREAMR_VERSION}.tar.gz | \ + curl -sL https://versaweb.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${OPENCOREAMR_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared && \ make && \ @@ -189,7 +189,7 @@ RUN \ DIR=/tmp/lame && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sL https://kent.dl.sourceforge.net/project/lame/lame/$(echo ${LAME_VERSION} | sed -e 's/[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)/\1.\2/')/lame-${LAME_VERSION}.tar.gz | \ + curl -sL https://versaweb.dl.sourceforge.net/project/lame/lame/$(echo ${LAME_VERSION} | sed -e 's/[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)/\1.\2/')/lame-${LAME_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" --enable-shared --enable-nasm --enable-pic --disable-frontend && \ make && \ diff --git a/docker-images/2.8/vaapi/Dockerfile b/docker-images/2.8/vaapi/Dockerfile index dd9af0842..60447f949 100644 --- a/docker-images/2.8/vaapi/Dockerfile +++ b/docker-images/2.8/vaapi/Dockerfile @@ -83,7 +83,7 @@ RUN \ DIR=/tmp/opencore-amr && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sL https://kent.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${OPENCOREAMR_VERSION}.tar.gz | \ + curl -sL https://versaweb.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${OPENCOREAMR_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared && \ make && \ @@ -190,7 +190,7 @@ RUN \ DIR=/tmp/lame && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sL https://kent.dl.sourceforge.net/project/lame/lame/$(echo ${LAME_VERSION} | sed -e 's/[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)/\1.\2/')/lame-${LAME_VERSION}.tar.gz | \ + curl -sL https://versaweb.dl.sourceforge.net/project/lame/lame/$(echo ${LAME_VERSION} | sed -e 's/[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)/\1.\2/')/lame-${LAME_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" --enable-shared --enable-nasm --enable-pic --disable-frontend && \ make && \ diff --git a/docker-images/3.0/alpine/Dockerfile b/docker-images/3.0/alpine/Dockerfile index 30087e378..ff61ca8c3 100644 --- a/docker-images/3.0/alpine/Dockerfile +++ b/docker-images/3.0/alpine/Dockerfile @@ -80,7 +80,7 @@ RUN \ DIR=/tmp/opencore-amr && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sL https://kent.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${OPENCOREAMR_VERSION}.tar.gz | \ + curl -sL https://versaweb.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${OPENCOREAMR_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared && \ make && \ @@ -187,7 +187,7 @@ RUN \ DIR=/tmp/lame && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sL https://kent.dl.sourceforge.net/project/lame/lame/$(echo ${LAME_VERSION} | sed -e 's/[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)/\1.\2/')/lame-${LAME_VERSION}.tar.gz | \ + curl -sL https://versaweb.dl.sourceforge.net/project/lame/lame/$(echo ${LAME_VERSION} | sed -e 's/[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)/\1.\2/')/lame-${LAME_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" --enable-shared --enable-nasm --enable-pic --disable-frontend && \ make && \ diff --git a/docker-images/3.0/centos/Dockerfile b/docker-images/3.0/centos/Dockerfile index 44464f1e8..7739d0eff 100644 --- a/docker-images/3.0/centos/Dockerfile +++ b/docker-images/3.0/centos/Dockerfile @@ -81,7 +81,7 @@ RUN \ DIR=/tmp/opencore-amr && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sL https://kent.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${OPENCOREAMR_VERSION}.tar.gz | \ + curl -sL https://versaweb.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${OPENCOREAMR_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared && \ make && \ @@ -188,7 +188,7 @@ RUN \ DIR=/tmp/lame && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sL https://kent.dl.sourceforge.net/project/lame/lame/$(echo ${LAME_VERSION} | sed -e 's/[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)/\1.\2/')/lame-${LAME_VERSION}.tar.gz | \ + curl -sL https://versaweb.dl.sourceforge.net/project/lame/lame/$(echo ${LAME_VERSION} | sed -e 's/[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)/\1.\2/')/lame-${LAME_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" --enable-shared --enable-nasm --enable-pic --disable-frontend && \ make && \ diff --git a/docker-images/3.0/nvidia/Dockerfile b/docker-images/3.0/nvidia/Dockerfile index 033698ccf..c6822b901 100644 --- a/docker-images/3.0/nvidia/Dockerfile +++ b/docker-images/3.0/nvidia/Dockerfile @@ -107,7 +107,7 @@ RUN \ DIR=/tmp/opencore-amr && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sL https://kent.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${OPENCOREAMR_VERSION}.tar.gz | \ + curl -sL https://versaweb.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${OPENCOREAMR_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared && \ make && \ @@ -214,7 +214,7 @@ RUN \ DIR=/tmp/lame && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sL https://kent.dl.sourceforge.net/project/lame/lame/$(echo ${LAME_VERSION} | sed -e 's/[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)/\1.\2/')/lame-${LAME_VERSION}.tar.gz | \ + curl -sL https://versaweb.dl.sourceforge.net/project/lame/lame/$(echo ${LAME_VERSION} | sed -e 's/[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)/\1.\2/')/lame-${LAME_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" --enable-shared --enable-nasm --enable-pic --disable-frontend && \ make && \ diff --git a/docker-images/3.0/scratch/Dockerfile b/docker-images/3.0/scratch/Dockerfile index f8bf3efce..362db7367 100644 --- a/docker-images/3.0/scratch/Dockerfile +++ b/docker-images/3.0/scratch/Dockerfile @@ -77,7 +77,7 @@ RUN \ DIR=/tmp/opencore-amr && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sL https://kent.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${OPENCOREAMR_VERSION}.tar.gz | \ + curl -sL https://versaweb.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${OPENCOREAMR_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared && \ make && \ @@ -184,7 +184,7 @@ RUN \ DIR=/tmp/lame && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sL https://kent.dl.sourceforge.net/project/lame/lame/$(echo ${LAME_VERSION} | sed -e 's/[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)/\1.\2/')/lame-${LAME_VERSION}.tar.gz | \ + curl -sL https://versaweb.dl.sourceforge.net/project/lame/lame/$(echo ${LAME_VERSION} | sed -e 's/[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)/\1.\2/')/lame-${LAME_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" --enable-shared --enable-nasm --enable-pic --disable-frontend && \ make && \ diff --git a/docker-images/3.0/ubuntu/Dockerfile b/docker-images/3.0/ubuntu/Dockerfile index c1a3f62a2..6483a16ca 100644 --- a/docker-images/3.0/ubuntu/Dockerfile +++ b/docker-images/3.0/ubuntu/Dockerfile @@ -82,7 +82,7 @@ RUN \ DIR=/tmp/opencore-amr && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sL https://kent.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${OPENCOREAMR_VERSION}.tar.gz | \ + curl -sL https://versaweb.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${OPENCOREAMR_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared && \ make && \ @@ -189,7 +189,7 @@ RUN \ DIR=/tmp/lame && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sL https://kent.dl.sourceforge.net/project/lame/lame/$(echo ${LAME_VERSION} | sed -e 's/[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)/\1.\2/')/lame-${LAME_VERSION}.tar.gz | \ + curl -sL https://versaweb.dl.sourceforge.net/project/lame/lame/$(echo ${LAME_VERSION} | sed -e 's/[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)/\1.\2/')/lame-${LAME_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" --enable-shared --enable-nasm --enable-pic --disable-frontend && \ make && \ diff --git a/docker-images/3.0/vaapi/Dockerfile b/docker-images/3.0/vaapi/Dockerfile index ebeefc5db..5b424af79 100644 --- a/docker-images/3.0/vaapi/Dockerfile +++ b/docker-images/3.0/vaapi/Dockerfile @@ -83,7 +83,7 @@ RUN \ DIR=/tmp/opencore-amr && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sL https://kent.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${OPENCOREAMR_VERSION}.tar.gz | \ + curl -sL https://versaweb.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${OPENCOREAMR_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared && \ make && \ @@ -190,7 +190,7 @@ RUN \ DIR=/tmp/lame && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sL https://kent.dl.sourceforge.net/project/lame/lame/$(echo ${LAME_VERSION} | sed -e 's/[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)/\1.\2/')/lame-${LAME_VERSION}.tar.gz | \ + curl -sL https://versaweb.dl.sourceforge.net/project/lame/lame/$(echo ${LAME_VERSION} | sed -e 's/[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)/\1.\2/')/lame-${LAME_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" --enable-shared --enable-nasm --enable-pic --disable-frontend && \ make && \ diff --git a/docker-images/3.1/alpine/Dockerfile b/docker-images/3.1/alpine/Dockerfile index 3274355c7..d781fca60 100644 --- a/docker-images/3.1/alpine/Dockerfile +++ b/docker-images/3.1/alpine/Dockerfile @@ -80,7 +80,7 @@ RUN \ DIR=/tmp/opencore-amr && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sL https://kent.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${OPENCOREAMR_VERSION}.tar.gz | \ + curl -sL https://versaweb.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${OPENCOREAMR_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared && \ make && \ @@ -187,7 +187,7 @@ RUN \ DIR=/tmp/lame && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sL https://kent.dl.sourceforge.net/project/lame/lame/$(echo ${LAME_VERSION} | sed -e 's/[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)/\1.\2/')/lame-${LAME_VERSION}.tar.gz | \ + curl -sL https://versaweb.dl.sourceforge.net/project/lame/lame/$(echo ${LAME_VERSION} | sed -e 's/[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)/\1.\2/')/lame-${LAME_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" --enable-shared --enable-nasm --enable-pic --disable-frontend && \ make && \ diff --git a/docker-images/3.1/centos/Dockerfile b/docker-images/3.1/centos/Dockerfile index 247b637be..8bcad0787 100644 --- a/docker-images/3.1/centos/Dockerfile +++ b/docker-images/3.1/centos/Dockerfile @@ -81,7 +81,7 @@ RUN \ DIR=/tmp/opencore-amr && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sL https://kent.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${OPENCOREAMR_VERSION}.tar.gz | \ + curl -sL https://versaweb.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${OPENCOREAMR_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared && \ make && \ @@ -188,7 +188,7 @@ RUN \ DIR=/tmp/lame && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sL https://kent.dl.sourceforge.net/project/lame/lame/$(echo ${LAME_VERSION} | sed -e 's/[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)/\1.\2/')/lame-${LAME_VERSION}.tar.gz | \ + curl -sL https://versaweb.dl.sourceforge.net/project/lame/lame/$(echo ${LAME_VERSION} | sed -e 's/[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)/\1.\2/')/lame-${LAME_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" --enable-shared --enable-nasm --enable-pic --disable-frontend && \ make && \ diff --git a/docker-images/3.1/nvidia/Dockerfile b/docker-images/3.1/nvidia/Dockerfile index 991c66e50..ed2c219af 100644 --- a/docker-images/3.1/nvidia/Dockerfile +++ b/docker-images/3.1/nvidia/Dockerfile @@ -107,7 +107,7 @@ RUN \ DIR=/tmp/opencore-amr && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sL https://kent.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${OPENCOREAMR_VERSION}.tar.gz | \ + curl -sL https://versaweb.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${OPENCOREAMR_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared && \ make && \ @@ -214,7 +214,7 @@ RUN \ DIR=/tmp/lame && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sL https://kent.dl.sourceforge.net/project/lame/lame/$(echo ${LAME_VERSION} | sed -e 's/[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)/\1.\2/')/lame-${LAME_VERSION}.tar.gz | \ + curl -sL https://versaweb.dl.sourceforge.net/project/lame/lame/$(echo ${LAME_VERSION} | sed -e 's/[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)/\1.\2/')/lame-${LAME_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" --enable-shared --enable-nasm --enable-pic --disable-frontend && \ make && \ diff --git a/docker-images/3.1/scratch/Dockerfile b/docker-images/3.1/scratch/Dockerfile index f18462dce..6f8468d85 100644 --- a/docker-images/3.1/scratch/Dockerfile +++ b/docker-images/3.1/scratch/Dockerfile @@ -77,7 +77,7 @@ RUN \ DIR=/tmp/opencore-amr && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sL https://kent.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${OPENCOREAMR_VERSION}.tar.gz | \ + curl -sL https://versaweb.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${OPENCOREAMR_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared && \ make && \ @@ -184,7 +184,7 @@ RUN \ DIR=/tmp/lame && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sL https://kent.dl.sourceforge.net/project/lame/lame/$(echo ${LAME_VERSION} | sed -e 's/[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)/\1.\2/')/lame-${LAME_VERSION}.tar.gz | \ + curl -sL https://versaweb.dl.sourceforge.net/project/lame/lame/$(echo ${LAME_VERSION} | sed -e 's/[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)/\1.\2/')/lame-${LAME_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" --enable-shared --enable-nasm --enable-pic --disable-frontend && \ make && \ diff --git a/docker-images/3.1/ubuntu/Dockerfile b/docker-images/3.1/ubuntu/Dockerfile index 99a57c970..8ae660ea6 100644 --- a/docker-images/3.1/ubuntu/Dockerfile +++ b/docker-images/3.1/ubuntu/Dockerfile @@ -82,7 +82,7 @@ RUN \ DIR=/tmp/opencore-amr && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sL https://kent.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${OPENCOREAMR_VERSION}.tar.gz | \ + curl -sL https://versaweb.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${OPENCOREAMR_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared && \ make && \ @@ -189,7 +189,7 @@ RUN \ DIR=/tmp/lame && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sL https://kent.dl.sourceforge.net/project/lame/lame/$(echo ${LAME_VERSION} | sed -e 's/[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)/\1.\2/')/lame-${LAME_VERSION}.tar.gz | \ + curl -sL https://versaweb.dl.sourceforge.net/project/lame/lame/$(echo ${LAME_VERSION} | sed -e 's/[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)/\1.\2/')/lame-${LAME_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" --enable-shared --enable-nasm --enable-pic --disable-frontend && \ make && \ diff --git a/docker-images/3.1/vaapi/Dockerfile b/docker-images/3.1/vaapi/Dockerfile index 383ff1135..214e1a0de 100644 --- a/docker-images/3.1/vaapi/Dockerfile +++ b/docker-images/3.1/vaapi/Dockerfile @@ -83,7 +83,7 @@ RUN \ DIR=/tmp/opencore-amr && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sL https://kent.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${OPENCOREAMR_VERSION}.tar.gz | \ + curl -sL https://versaweb.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${OPENCOREAMR_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared && \ make && \ @@ -190,7 +190,7 @@ RUN \ DIR=/tmp/lame && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sL https://kent.dl.sourceforge.net/project/lame/lame/$(echo ${LAME_VERSION} | sed -e 's/[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)/\1.\2/')/lame-${LAME_VERSION}.tar.gz | \ + curl -sL https://versaweb.dl.sourceforge.net/project/lame/lame/$(echo ${LAME_VERSION} | sed -e 's/[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)/\1.\2/')/lame-${LAME_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" --enable-shared --enable-nasm --enable-pic --disable-frontend && \ make && \ diff --git a/docker-images/3.2/alpine/Dockerfile b/docker-images/3.2/alpine/Dockerfile index 25be92720..711a68091 100644 --- a/docker-images/3.2/alpine/Dockerfile +++ b/docker-images/3.2/alpine/Dockerfile @@ -80,7 +80,7 @@ RUN \ DIR=/tmp/opencore-amr && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sL https://kent.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${OPENCOREAMR_VERSION}.tar.gz | \ + curl -sL https://versaweb.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${OPENCOREAMR_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared && \ make && \ @@ -187,7 +187,7 @@ RUN \ DIR=/tmp/lame && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sL https://kent.dl.sourceforge.net/project/lame/lame/$(echo ${LAME_VERSION} | sed -e 's/[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)/\1.\2/')/lame-${LAME_VERSION}.tar.gz | \ + curl -sL https://versaweb.dl.sourceforge.net/project/lame/lame/$(echo ${LAME_VERSION} | sed -e 's/[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)/\1.\2/')/lame-${LAME_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" --enable-shared --enable-nasm --enable-pic --disable-frontend && \ make && \ diff --git a/docker-images/3.2/centos/Dockerfile b/docker-images/3.2/centos/Dockerfile index 4dc6acf1b..ff1e808f3 100644 --- a/docker-images/3.2/centos/Dockerfile +++ b/docker-images/3.2/centos/Dockerfile @@ -81,7 +81,7 @@ RUN \ DIR=/tmp/opencore-amr && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sL https://kent.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${OPENCOREAMR_VERSION}.tar.gz | \ + curl -sL https://versaweb.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${OPENCOREAMR_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared && \ make && \ @@ -188,7 +188,7 @@ RUN \ DIR=/tmp/lame && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sL https://kent.dl.sourceforge.net/project/lame/lame/$(echo ${LAME_VERSION} | sed -e 's/[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)/\1.\2/')/lame-${LAME_VERSION}.tar.gz | \ + curl -sL https://versaweb.dl.sourceforge.net/project/lame/lame/$(echo ${LAME_VERSION} | sed -e 's/[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)/\1.\2/')/lame-${LAME_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" --enable-shared --enable-nasm --enable-pic --disable-frontend && \ make && \ diff --git a/docker-images/3.2/nvidia/Dockerfile b/docker-images/3.2/nvidia/Dockerfile index c66509ca6..c5a2951ee 100644 --- a/docker-images/3.2/nvidia/Dockerfile +++ b/docker-images/3.2/nvidia/Dockerfile @@ -107,7 +107,7 @@ RUN \ DIR=/tmp/opencore-amr && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sL https://kent.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${OPENCOREAMR_VERSION}.tar.gz | \ + curl -sL https://versaweb.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${OPENCOREAMR_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared && \ make && \ @@ -214,7 +214,7 @@ RUN \ DIR=/tmp/lame && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sL https://kent.dl.sourceforge.net/project/lame/lame/$(echo ${LAME_VERSION} | sed -e 's/[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)/\1.\2/')/lame-${LAME_VERSION}.tar.gz | \ + curl -sL https://versaweb.dl.sourceforge.net/project/lame/lame/$(echo ${LAME_VERSION} | sed -e 's/[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)/\1.\2/')/lame-${LAME_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" --enable-shared --enable-nasm --enable-pic --disable-frontend && \ make && \ diff --git a/docker-images/3.2/scratch/Dockerfile b/docker-images/3.2/scratch/Dockerfile index b67168102..f84951367 100644 --- a/docker-images/3.2/scratch/Dockerfile +++ b/docker-images/3.2/scratch/Dockerfile @@ -77,7 +77,7 @@ RUN \ DIR=/tmp/opencore-amr && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sL https://kent.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${OPENCOREAMR_VERSION}.tar.gz | \ + curl -sL https://versaweb.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${OPENCOREAMR_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared && \ make && \ @@ -184,7 +184,7 @@ RUN \ DIR=/tmp/lame && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sL https://kent.dl.sourceforge.net/project/lame/lame/$(echo ${LAME_VERSION} | sed -e 's/[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)/\1.\2/')/lame-${LAME_VERSION}.tar.gz | \ + curl -sL https://versaweb.dl.sourceforge.net/project/lame/lame/$(echo ${LAME_VERSION} | sed -e 's/[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)/\1.\2/')/lame-${LAME_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" --enable-shared --enable-nasm --enable-pic --disable-frontend && \ make && \ diff --git a/docker-images/3.2/ubuntu/Dockerfile b/docker-images/3.2/ubuntu/Dockerfile index c4208f66d..7625d34b4 100644 --- a/docker-images/3.2/ubuntu/Dockerfile +++ b/docker-images/3.2/ubuntu/Dockerfile @@ -82,7 +82,7 @@ RUN \ DIR=/tmp/opencore-amr && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sL https://kent.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${OPENCOREAMR_VERSION}.tar.gz | \ + curl -sL https://versaweb.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${OPENCOREAMR_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared && \ make && \ @@ -189,7 +189,7 @@ RUN \ DIR=/tmp/lame && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sL https://kent.dl.sourceforge.net/project/lame/lame/$(echo ${LAME_VERSION} | sed -e 's/[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)/\1.\2/')/lame-${LAME_VERSION}.tar.gz | \ + curl -sL https://versaweb.dl.sourceforge.net/project/lame/lame/$(echo ${LAME_VERSION} | sed -e 's/[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)/\1.\2/')/lame-${LAME_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" --enable-shared --enable-nasm --enable-pic --disable-frontend && \ make && \ diff --git a/docker-images/3.2/vaapi/Dockerfile b/docker-images/3.2/vaapi/Dockerfile index a32542437..6c54d3c50 100644 --- a/docker-images/3.2/vaapi/Dockerfile +++ b/docker-images/3.2/vaapi/Dockerfile @@ -83,7 +83,7 @@ RUN \ DIR=/tmp/opencore-amr && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sL https://kent.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${OPENCOREAMR_VERSION}.tar.gz | \ + curl -sL https://versaweb.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${OPENCOREAMR_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared && \ make && \ @@ -190,7 +190,7 @@ RUN \ DIR=/tmp/lame && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sL https://kent.dl.sourceforge.net/project/lame/lame/$(echo ${LAME_VERSION} | sed -e 's/[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)/\1.\2/')/lame-${LAME_VERSION}.tar.gz | \ + curl -sL https://versaweb.dl.sourceforge.net/project/lame/lame/$(echo ${LAME_VERSION} | sed -e 's/[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)/\1.\2/')/lame-${LAME_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" --enable-shared --enable-nasm --enable-pic --disable-frontend && \ make && \ diff --git a/docker-images/3.3/alpine/Dockerfile b/docker-images/3.3/alpine/Dockerfile index ea4f6b9d0..1a2713465 100644 --- a/docker-images/3.3/alpine/Dockerfile +++ b/docker-images/3.3/alpine/Dockerfile @@ -80,7 +80,7 @@ RUN \ DIR=/tmp/opencore-amr && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sL https://kent.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${OPENCOREAMR_VERSION}.tar.gz | \ + curl -sL https://versaweb.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${OPENCOREAMR_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared && \ make && \ @@ -187,7 +187,7 @@ RUN \ DIR=/tmp/lame && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sL https://kent.dl.sourceforge.net/project/lame/lame/$(echo ${LAME_VERSION} | sed -e 's/[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)/\1.\2/')/lame-${LAME_VERSION}.tar.gz | \ + curl -sL https://versaweb.dl.sourceforge.net/project/lame/lame/$(echo ${LAME_VERSION} | sed -e 's/[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)/\1.\2/')/lame-${LAME_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" --enable-shared --enable-nasm --enable-pic --disable-frontend && \ make && \ diff --git a/docker-images/3.3/centos/Dockerfile b/docker-images/3.3/centos/Dockerfile index e1d0cc662..55895b55a 100644 --- a/docker-images/3.3/centos/Dockerfile +++ b/docker-images/3.3/centos/Dockerfile @@ -81,7 +81,7 @@ RUN \ DIR=/tmp/opencore-amr && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sL https://kent.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${OPENCOREAMR_VERSION}.tar.gz | \ + curl -sL https://versaweb.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${OPENCOREAMR_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared && \ make && \ @@ -188,7 +188,7 @@ RUN \ DIR=/tmp/lame && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sL https://kent.dl.sourceforge.net/project/lame/lame/$(echo ${LAME_VERSION} | sed -e 's/[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)/\1.\2/')/lame-${LAME_VERSION}.tar.gz | \ + curl -sL https://versaweb.dl.sourceforge.net/project/lame/lame/$(echo ${LAME_VERSION} | sed -e 's/[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)/\1.\2/')/lame-${LAME_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" --enable-shared --enable-nasm --enable-pic --disable-frontend && \ make && \ diff --git a/docker-images/3.3/nvidia/Dockerfile b/docker-images/3.3/nvidia/Dockerfile index ee0c794b0..5b8394427 100644 --- a/docker-images/3.3/nvidia/Dockerfile +++ b/docker-images/3.3/nvidia/Dockerfile @@ -107,7 +107,7 @@ RUN \ DIR=/tmp/opencore-amr && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sL https://kent.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${OPENCOREAMR_VERSION}.tar.gz | \ + curl -sL https://versaweb.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${OPENCOREAMR_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared && \ make && \ @@ -214,7 +214,7 @@ RUN \ DIR=/tmp/lame && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sL https://kent.dl.sourceforge.net/project/lame/lame/$(echo ${LAME_VERSION} | sed -e 's/[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)/\1.\2/')/lame-${LAME_VERSION}.tar.gz | \ + curl -sL https://versaweb.dl.sourceforge.net/project/lame/lame/$(echo ${LAME_VERSION} | sed -e 's/[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)/\1.\2/')/lame-${LAME_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" --enable-shared --enable-nasm --enable-pic --disable-frontend && \ make && \ diff --git a/docker-images/3.3/scratch/Dockerfile b/docker-images/3.3/scratch/Dockerfile index e499b6073..2a3c48f10 100644 --- a/docker-images/3.3/scratch/Dockerfile +++ b/docker-images/3.3/scratch/Dockerfile @@ -77,7 +77,7 @@ RUN \ DIR=/tmp/opencore-amr && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sL https://kent.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${OPENCOREAMR_VERSION}.tar.gz | \ + curl -sL https://versaweb.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${OPENCOREAMR_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared && \ make && \ @@ -184,7 +184,7 @@ RUN \ DIR=/tmp/lame && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sL https://kent.dl.sourceforge.net/project/lame/lame/$(echo ${LAME_VERSION} | sed -e 's/[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)/\1.\2/')/lame-${LAME_VERSION}.tar.gz | \ + curl -sL https://versaweb.dl.sourceforge.net/project/lame/lame/$(echo ${LAME_VERSION} | sed -e 's/[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)/\1.\2/')/lame-${LAME_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" --enable-shared --enable-nasm --enable-pic --disable-frontend && \ make && \ diff --git a/docker-images/3.3/ubuntu/Dockerfile b/docker-images/3.3/ubuntu/Dockerfile index 219e3176f..1e6f2f905 100644 --- a/docker-images/3.3/ubuntu/Dockerfile +++ b/docker-images/3.3/ubuntu/Dockerfile @@ -82,7 +82,7 @@ RUN \ DIR=/tmp/opencore-amr && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sL https://kent.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${OPENCOREAMR_VERSION}.tar.gz | \ + curl -sL https://versaweb.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${OPENCOREAMR_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared && \ make && \ @@ -189,7 +189,7 @@ RUN \ DIR=/tmp/lame && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sL https://kent.dl.sourceforge.net/project/lame/lame/$(echo ${LAME_VERSION} | sed -e 's/[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)/\1.\2/')/lame-${LAME_VERSION}.tar.gz | \ + curl -sL https://versaweb.dl.sourceforge.net/project/lame/lame/$(echo ${LAME_VERSION} | sed -e 's/[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)/\1.\2/')/lame-${LAME_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" --enable-shared --enable-nasm --enable-pic --disable-frontend && \ make && \ diff --git a/docker-images/3.3/vaapi/Dockerfile b/docker-images/3.3/vaapi/Dockerfile index e94ea2ab1..6fdf51ad2 100644 --- a/docker-images/3.3/vaapi/Dockerfile +++ b/docker-images/3.3/vaapi/Dockerfile @@ -83,7 +83,7 @@ RUN \ DIR=/tmp/opencore-amr && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sL https://kent.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${OPENCOREAMR_VERSION}.tar.gz | \ + curl -sL https://versaweb.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${OPENCOREAMR_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared && \ make && \ @@ -190,7 +190,7 @@ RUN \ DIR=/tmp/lame && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sL https://kent.dl.sourceforge.net/project/lame/lame/$(echo ${LAME_VERSION} | sed -e 's/[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)/\1.\2/')/lame-${LAME_VERSION}.tar.gz | \ + curl -sL https://versaweb.dl.sourceforge.net/project/lame/lame/$(echo ${LAME_VERSION} | sed -e 's/[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)/\1.\2/')/lame-${LAME_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" --enable-shared --enable-nasm --enable-pic --disable-frontend && \ make && \ diff --git a/docker-images/3.4/alpine/Dockerfile b/docker-images/3.4/alpine/Dockerfile index 7b5f1a769..66b3461f3 100644 --- a/docker-images/3.4/alpine/Dockerfile +++ b/docker-images/3.4/alpine/Dockerfile @@ -80,7 +80,7 @@ RUN \ DIR=/tmp/opencore-amr && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sL https://kent.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${OPENCOREAMR_VERSION}.tar.gz | \ + curl -sL https://versaweb.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${OPENCOREAMR_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared && \ make && \ @@ -187,7 +187,7 @@ RUN \ DIR=/tmp/lame && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sL https://kent.dl.sourceforge.net/project/lame/lame/$(echo ${LAME_VERSION} | sed -e 's/[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)/\1.\2/')/lame-${LAME_VERSION}.tar.gz | \ + curl -sL https://versaweb.dl.sourceforge.net/project/lame/lame/$(echo ${LAME_VERSION} | sed -e 's/[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)/\1.\2/')/lame-${LAME_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" --enable-shared --enable-nasm --enable-pic --disable-frontend && \ make && \ diff --git a/docker-images/3.4/centos/Dockerfile b/docker-images/3.4/centos/Dockerfile index 2b168981b..ec42f0897 100644 --- a/docker-images/3.4/centos/Dockerfile +++ b/docker-images/3.4/centos/Dockerfile @@ -81,7 +81,7 @@ RUN \ DIR=/tmp/opencore-amr && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sL https://kent.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${OPENCOREAMR_VERSION}.tar.gz | \ + curl -sL https://versaweb.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${OPENCOREAMR_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared && \ make && \ @@ -188,7 +188,7 @@ RUN \ DIR=/tmp/lame && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sL https://kent.dl.sourceforge.net/project/lame/lame/$(echo ${LAME_VERSION} | sed -e 's/[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)/\1.\2/')/lame-${LAME_VERSION}.tar.gz | \ + curl -sL https://versaweb.dl.sourceforge.net/project/lame/lame/$(echo ${LAME_VERSION} | sed -e 's/[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)/\1.\2/')/lame-${LAME_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" --enable-shared --enable-nasm --enable-pic --disable-frontend && \ make && \ diff --git a/docker-images/3.4/nvidia/Dockerfile b/docker-images/3.4/nvidia/Dockerfile index 4fa0ffb15..aba12de02 100644 --- a/docker-images/3.4/nvidia/Dockerfile +++ b/docker-images/3.4/nvidia/Dockerfile @@ -107,7 +107,7 @@ RUN \ DIR=/tmp/opencore-amr && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sL https://kent.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${OPENCOREAMR_VERSION}.tar.gz | \ + curl -sL https://versaweb.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${OPENCOREAMR_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared && \ make && \ @@ -214,7 +214,7 @@ RUN \ DIR=/tmp/lame && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sL https://kent.dl.sourceforge.net/project/lame/lame/$(echo ${LAME_VERSION} | sed -e 's/[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)/\1.\2/')/lame-${LAME_VERSION}.tar.gz | \ + curl -sL https://versaweb.dl.sourceforge.net/project/lame/lame/$(echo ${LAME_VERSION} | sed -e 's/[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)/\1.\2/')/lame-${LAME_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" --enable-shared --enable-nasm --enable-pic --disable-frontend && \ make && \ diff --git a/docker-images/3.4/scratch/Dockerfile b/docker-images/3.4/scratch/Dockerfile index 63389c972..8846cc772 100644 --- a/docker-images/3.4/scratch/Dockerfile +++ b/docker-images/3.4/scratch/Dockerfile @@ -77,7 +77,7 @@ RUN \ DIR=/tmp/opencore-amr && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sL https://kent.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${OPENCOREAMR_VERSION}.tar.gz | \ + curl -sL https://versaweb.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${OPENCOREAMR_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared && \ make && \ @@ -184,7 +184,7 @@ RUN \ DIR=/tmp/lame && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sL https://kent.dl.sourceforge.net/project/lame/lame/$(echo ${LAME_VERSION} | sed -e 's/[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)/\1.\2/')/lame-${LAME_VERSION}.tar.gz | \ + curl -sL https://versaweb.dl.sourceforge.net/project/lame/lame/$(echo ${LAME_VERSION} | sed -e 's/[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)/\1.\2/')/lame-${LAME_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" --enable-shared --enable-nasm --enable-pic --disable-frontend && \ make && \ diff --git a/docker-images/3.4/ubuntu/Dockerfile b/docker-images/3.4/ubuntu/Dockerfile index 9ecab592a..b5eb91fe2 100644 --- a/docker-images/3.4/ubuntu/Dockerfile +++ b/docker-images/3.4/ubuntu/Dockerfile @@ -82,7 +82,7 @@ RUN \ DIR=/tmp/opencore-amr && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sL https://kent.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${OPENCOREAMR_VERSION}.tar.gz | \ + curl -sL https://versaweb.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${OPENCOREAMR_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared && \ make && \ @@ -189,7 +189,7 @@ RUN \ DIR=/tmp/lame && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sL https://kent.dl.sourceforge.net/project/lame/lame/$(echo ${LAME_VERSION} | sed -e 's/[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)/\1.\2/')/lame-${LAME_VERSION}.tar.gz | \ + curl -sL https://versaweb.dl.sourceforge.net/project/lame/lame/$(echo ${LAME_VERSION} | sed -e 's/[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)/\1.\2/')/lame-${LAME_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" --enable-shared --enable-nasm --enable-pic --disable-frontend && \ make && \ diff --git a/docker-images/3.4/vaapi/Dockerfile b/docker-images/3.4/vaapi/Dockerfile index fd9bcf9ea..b99490743 100644 --- a/docker-images/3.4/vaapi/Dockerfile +++ b/docker-images/3.4/vaapi/Dockerfile @@ -83,7 +83,7 @@ RUN \ DIR=/tmp/opencore-amr && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sL https://kent.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${OPENCOREAMR_VERSION}.tar.gz | \ + curl -sL https://versaweb.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${OPENCOREAMR_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared && \ make && \ @@ -190,7 +190,7 @@ RUN \ DIR=/tmp/lame && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sL https://kent.dl.sourceforge.net/project/lame/lame/$(echo ${LAME_VERSION} | sed -e 's/[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)/\1.\2/')/lame-${LAME_VERSION}.tar.gz | \ + curl -sL https://versaweb.dl.sourceforge.net/project/lame/lame/$(echo ${LAME_VERSION} | sed -e 's/[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)/\1.\2/')/lame-${LAME_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" --enable-shared --enable-nasm --enable-pic --disable-frontend && \ make && \ diff --git a/docker-images/4.0/alpine/Dockerfile b/docker-images/4.0/alpine/Dockerfile index fd389eeb4..7fe527842 100644 --- a/docker-images/4.0/alpine/Dockerfile +++ b/docker-images/4.0/alpine/Dockerfile @@ -80,7 +80,7 @@ RUN \ DIR=/tmp/opencore-amr && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sL https://kent.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${OPENCOREAMR_VERSION}.tar.gz | \ + curl -sL https://versaweb.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${OPENCOREAMR_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared && \ make && \ @@ -187,7 +187,7 @@ RUN \ DIR=/tmp/lame && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sL https://kent.dl.sourceforge.net/project/lame/lame/$(echo ${LAME_VERSION} | sed -e 's/[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)/\1.\2/')/lame-${LAME_VERSION}.tar.gz | \ + curl -sL https://versaweb.dl.sourceforge.net/project/lame/lame/$(echo ${LAME_VERSION} | sed -e 's/[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)/\1.\2/')/lame-${LAME_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" --enable-shared --enable-nasm --enable-pic --disable-frontend && \ make && \ diff --git a/docker-images/4.0/centos/Dockerfile b/docker-images/4.0/centos/Dockerfile index 1c03651e6..f9a6422e8 100644 --- a/docker-images/4.0/centos/Dockerfile +++ b/docker-images/4.0/centos/Dockerfile @@ -81,7 +81,7 @@ RUN \ DIR=/tmp/opencore-amr && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sL https://kent.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${OPENCOREAMR_VERSION}.tar.gz | \ + curl -sL https://versaweb.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${OPENCOREAMR_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared && \ make && \ @@ -188,7 +188,7 @@ RUN \ DIR=/tmp/lame && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sL https://kent.dl.sourceforge.net/project/lame/lame/$(echo ${LAME_VERSION} | sed -e 's/[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)/\1.\2/')/lame-${LAME_VERSION}.tar.gz | \ + curl -sL https://versaweb.dl.sourceforge.net/project/lame/lame/$(echo ${LAME_VERSION} | sed -e 's/[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)/\1.\2/')/lame-${LAME_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" --enable-shared --enable-nasm --enable-pic --disable-frontend && \ make && \ diff --git a/docker-images/4.0/nvidia/Dockerfile b/docker-images/4.0/nvidia/Dockerfile index f86647d8a..40350a59d 100644 --- a/docker-images/4.0/nvidia/Dockerfile +++ b/docker-images/4.0/nvidia/Dockerfile @@ -107,7 +107,7 @@ RUN \ DIR=/tmp/opencore-amr && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sL https://kent.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${OPENCOREAMR_VERSION}.tar.gz | \ + curl -sL https://versaweb.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${OPENCOREAMR_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared && \ make && \ @@ -214,7 +214,7 @@ RUN \ DIR=/tmp/lame && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sL https://kent.dl.sourceforge.net/project/lame/lame/$(echo ${LAME_VERSION} | sed -e 's/[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)/\1.\2/')/lame-${LAME_VERSION}.tar.gz | \ + curl -sL https://versaweb.dl.sourceforge.net/project/lame/lame/$(echo ${LAME_VERSION} | sed -e 's/[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)/\1.\2/')/lame-${LAME_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" --enable-shared --enable-nasm --enable-pic --disable-frontend && \ make && \ diff --git a/docker-images/4.0/scratch/Dockerfile b/docker-images/4.0/scratch/Dockerfile index 0ca2f86ed..ced0b1fd0 100644 --- a/docker-images/4.0/scratch/Dockerfile +++ b/docker-images/4.0/scratch/Dockerfile @@ -77,7 +77,7 @@ RUN \ DIR=/tmp/opencore-amr && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sL https://kent.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${OPENCOREAMR_VERSION}.tar.gz | \ + curl -sL https://versaweb.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${OPENCOREAMR_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared && \ make && \ @@ -184,7 +184,7 @@ RUN \ DIR=/tmp/lame && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sL https://kent.dl.sourceforge.net/project/lame/lame/$(echo ${LAME_VERSION} | sed -e 's/[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)/\1.\2/')/lame-${LAME_VERSION}.tar.gz | \ + curl -sL https://versaweb.dl.sourceforge.net/project/lame/lame/$(echo ${LAME_VERSION} | sed -e 's/[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)/\1.\2/')/lame-${LAME_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" --enable-shared --enable-nasm --enable-pic --disable-frontend && \ make && \ diff --git a/docker-images/4.0/ubuntu/Dockerfile b/docker-images/4.0/ubuntu/Dockerfile index e1ce519ab..284e3ee58 100644 --- a/docker-images/4.0/ubuntu/Dockerfile +++ b/docker-images/4.0/ubuntu/Dockerfile @@ -82,7 +82,7 @@ RUN \ DIR=/tmp/opencore-amr && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sL https://kent.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${OPENCOREAMR_VERSION}.tar.gz | \ + curl -sL https://versaweb.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${OPENCOREAMR_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared && \ make && \ @@ -189,7 +189,7 @@ RUN \ DIR=/tmp/lame && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sL https://kent.dl.sourceforge.net/project/lame/lame/$(echo ${LAME_VERSION} | sed -e 's/[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)/\1.\2/')/lame-${LAME_VERSION}.tar.gz | \ + curl -sL https://versaweb.dl.sourceforge.net/project/lame/lame/$(echo ${LAME_VERSION} | sed -e 's/[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)/\1.\2/')/lame-${LAME_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" --enable-shared --enable-nasm --enable-pic --disable-frontend && \ make && \ diff --git a/docker-images/4.0/vaapi/Dockerfile b/docker-images/4.0/vaapi/Dockerfile index 594c855d8..36333b0f5 100644 --- a/docker-images/4.0/vaapi/Dockerfile +++ b/docker-images/4.0/vaapi/Dockerfile @@ -83,7 +83,7 @@ RUN \ DIR=/tmp/opencore-amr && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sL https://kent.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${OPENCOREAMR_VERSION}.tar.gz | \ + curl -sL https://versaweb.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${OPENCOREAMR_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared && \ make && \ @@ -190,7 +190,7 @@ RUN \ DIR=/tmp/lame && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sL https://kent.dl.sourceforge.net/project/lame/lame/$(echo ${LAME_VERSION} | sed -e 's/[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)/\1.\2/')/lame-${LAME_VERSION}.tar.gz | \ + curl -sL https://versaweb.dl.sourceforge.net/project/lame/lame/$(echo ${LAME_VERSION} | sed -e 's/[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)/\1.\2/')/lame-${LAME_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" --enable-shared --enable-nasm --enable-pic --disable-frontend && \ make && \ diff --git a/docker-images/4.1/alpine/Dockerfile b/docker-images/4.1/alpine/Dockerfile index de8d26e34..dc7f3588f 100644 --- a/docker-images/4.1/alpine/Dockerfile +++ b/docker-images/4.1/alpine/Dockerfile @@ -80,7 +80,7 @@ RUN \ DIR=/tmp/opencore-amr && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sL https://kent.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${OPENCOREAMR_VERSION}.tar.gz | \ + curl -sL https://versaweb.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${OPENCOREAMR_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared && \ make && \ @@ -187,7 +187,7 @@ RUN \ DIR=/tmp/lame && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sL https://kent.dl.sourceforge.net/project/lame/lame/$(echo ${LAME_VERSION} | sed -e 's/[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)/\1.\2/')/lame-${LAME_VERSION}.tar.gz | \ + curl -sL https://versaweb.dl.sourceforge.net/project/lame/lame/$(echo ${LAME_VERSION} | sed -e 's/[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)/\1.\2/')/lame-${LAME_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" --enable-shared --enable-nasm --enable-pic --disable-frontend && \ make && \ diff --git a/docker-images/4.1/centos/Dockerfile b/docker-images/4.1/centos/Dockerfile index b0c24184b..0dc0b8719 100644 --- a/docker-images/4.1/centos/Dockerfile +++ b/docker-images/4.1/centos/Dockerfile @@ -81,7 +81,7 @@ RUN \ DIR=/tmp/opencore-amr && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sL https://kent.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${OPENCOREAMR_VERSION}.tar.gz | \ + curl -sL https://versaweb.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${OPENCOREAMR_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared && \ make && \ @@ -188,7 +188,7 @@ RUN \ DIR=/tmp/lame && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sL https://kent.dl.sourceforge.net/project/lame/lame/$(echo ${LAME_VERSION} | sed -e 's/[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)/\1.\2/')/lame-${LAME_VERSION}.tar.gz | \ + curl -sL https://versaweb.dl.sourceforge.net/project/lame/lame/$(echo ${LAME_VERSION} | sed -e 's/[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)/\1.\2/')/lame-${LAME_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" --enable-shared --enable-nasm --enable-pic --disable-frontend && \ make && \ diff --git a/docker-images/4.1/nvidia/Dockerfile b/docker-images/4.1/nvidia/Dockerfile index 4999bc434..9ed961542 100644 --- a/docker-images/4.1/nvidia/Dockerfile +++ b/docker-images/4.1/nvidia/Dockerfile @@ -107,7 +107,7 @@ RUN \ DIR=/tmp/opencore-amr && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sL https://kent.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${OPENCOREAMR_VERSION}.tar.gz | \ + curl -sL https://versaweb.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${OPENCOREAMR_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared && \ make && \ @@ -214,7 +214,7 @@ RUN \ DIR=/tmp/lame && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sL https://kent.dl.sourceforge.net/project/lame/lame/$(echo ${LAME_VERSION} | sed -e 's/[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)/\1.\2/')/lame-${LAME_VERSION}.tar.gz | \ + curl -sL https://versaweb.dl.sourceforge.net/project/lame/lame/$(echo ${LAME_VERSION} | sed -e 's/[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)/\1.\2/')/lame-${LAME_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" --enable-shared --enable-nasm --enable-pic --disable-frontend && \ make && \ diff --git a/docker-images/4.1/scratch/Dockerfile b/docker-images/4.1/scratch/Dockerfile index 46f98edf7..bb6ffdfba 100644 --- a/docker-images/4.1/scratch/Dockerfile +++ b/docker-images/4.1/scratch/Dockerfile @@ -77,7 +77,7 @@ RUN \ DIR=/tmp/opencore-amr && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sL https://kent.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${OPENCOREAMR_VERSION}.tar.gz | \ + curl -sL https://versaweb.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${OPENCOREAMR_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared && \ make && \ @@ -184,7 +184,7 @@ RUN \ DIR=/tmp/lame && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sL https://kent.dl.sourceforge.net/project/lame/lame/$(echo ${LAME_VERSION} | sed -e 's/[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)/\1.\2/')/lame-${LAME_VERSION}.tar.gz | \ + curl -sL https://versaweb.dl.sourceforge.net/project/lame/lame/$(echo ${LAME_VERSION} | sed -e 's/[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)/\1.\2/')/lame-${LAME_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" --enable-shared --enable-nasm --enable-pic --disable-frontend && \ make && \ diff --git a/docker-images/4.1/ubuntu/Dockerfile b/docker-images/4.1/ubuntu/Dockerfile index 253caca90..702637d4e 100644 --- a/docker-images/4.1/ubuntu/Dockerfile +++ b/docker-images/4.1/ubuntu/Dockerfile @@ -82,7 +82,7 @@ RUN \ DIR=/tmp/opencore-amr && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sL https://kent.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${OPENCOREAMR_VERSION}.tar.gz | \ + curl -sL https://versaweb.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${OPENCOREAMR_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared && \ make && \ @@ -189,7 +189,7 @@ RUN \ DIR=/tmp/lame && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sL https://kent.dl.sourceforge.net/project/lame/lame/$(echo ${LAME_VERSION} | sed -e 's/[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)/\1.\2/')/lame-${LAME_VERSION}.tar.gz | \ + curl -sL https://versaweb.dl.sourceforge.net/project/lame/lame/$(echo ${LAME_VERSION} | sed -e 's/[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)/\1.\2/')/lame-${LAME_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" --enable-shared --enable-nasm --enable-pic --disable-frontend && \ make && \ diff --git a/docker-images/4.1/vaapi/Dockerfile b/docker-images/4.1/vaapi/Dockerfile index ff7ff0dfe..d18059815 100644 --- a/docker-images/4.1/vaapi/Dockerfile +++ b/docker-images/4.1/vaapi/Dockerfile @@ -83,7 +83,7 @@ RUN \ DIR=/tmp/opencore-amr && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sL https://kent.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${OPENCOREAMR_VERSION}.tar.gz | \ + curl -sL https://versaweb.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${OPENCOREAMR_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared && \ make && \ @@ -190,7 +190,7 @@ RUN \ DIR=/tmp/lame && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sL https://kent.dl.sourceforge.net/project/lame/lame/$(echo ${LAME_VERSION} | sed -e 's/[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)/\1.\2/')/lame-${LAME_VERSION}.tar.gz | \ + curl -sL https://versaweb.dl.sourceforge.net/project/lame/lame/$(echo ${LAME_VERSION} | sed -e 's/[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)/\1.\2/')/lame-${LAME_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" --enable-shared --enable-nasm --enable-pic --disable-frontend && \ make && \ diff --git a/docker-images/4.2/alpine/Dockerfile b/docker-images/4.2/alpine/Dockerfile index 27751218e..4a0a816c2 100644 --- a/docker-images/4.2/alpine/Dockerfile +++ b/docker-images/4.2/alpine/Dockerfile @@ -80,7 +80,7 @@ RUN \ DIR=/tmp/opencore-amr && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sL https://kent.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${OPENCOREAMR_VERSION}.tar.gz | \ + curl -sL https://versaweb.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${OPENCOREAMR_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared && \ make && \ @@ -187,7 +187,7 @@ RUN \ DIR=/tmp/lame && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sL https://kent.dl.sourceforge.net/project/lame/lame/$(echo ${LAME_VERSION} | sed -e 's/[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)/\1.\2/')/lame-${LAME_VERSION}.tar.gz | \ + curl -sL https://versaweb.dl.sourceforge.net/project/lame/lame/$(echo ${LAME_VERSION} | sed -e 's/[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)/\1.\2/')/lame-${LAME_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" --enable-shared --enable-nasm --enable-pic --disable-frontend && \ make && \ diff --git a/docker-images/4.2/centos/Dockerfile b/docker-images/4.2/centos/Dockerfile index 7f7cddd63..37eb2b2d2 100644 --- a/docker-images/4.2/centos/Dockerfile +++ b/docker-images/4.2/centos/Dockerfile @@ -81,7 +81,7 @@ RUN \ DIR=/tmp/opencore-amr && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sL https://kent.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${OPENCOREAMR_VERSION}.tar.gz | \ + curl -sL https://versaweb.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${OPENCOREAMR_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared && \ make && \ @@ -188,7 +188,7 @@ RUN \ DIR=/tmp/lame && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sL https://kent.dl.sourceforge.net/project/lame/lame/$(echo ${LAME_VERSION} | sed -e 's/[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)/\1.\2/')/lame-${LAME_VERSION}.tar.gz | \ + curl -sL https://versaweb.dl.sourceforge.net/project/lame/lame/$(echo ${LAME_VERSION} | sed -e 's/[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)/\1.\2/')/lame-${LAME_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" --enable-shared --enable-nasm --enable-pic --disable-frontend && \ make && \ diff --git a/docker-images/4.2/nvidia/Dockerfile b/docker-images/4.2/nvidia/Dockerfile index a306b2cfe..a2cbb28a6 100644 --- a/docker-images/4.2/nvidia/Dockerfile +++ b/docker-images/4.2/nvidia/Dockerfile @@ -107,7 +107,7 @@ RUN \ DIR=/tmp/opencore-amr && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sL https://kent.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${OPENCOREAMR_VERSION}.tar.gz | \ + curl -sL https://versaweb.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${OPENCOREAMR_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared && \ make && \ @@ -214,7 +214,7 @@ RUN \ DIR=/tmp/lame && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sL https://kent.dl.sourceforge.net/project/lame/lame/$(echo ${LAME_VERSION} | sed -e 's/[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)/\1.\2/')/lame-${LAME_VERSION}.tar.gz | \ + curl -sL https://versaweb.dl.sourceforge.net/project/lame/lame/$(echo ${LAME_VERSION} | sed -e 's/[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)/\1.\2/')/lame-${LAME_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" --enable-shared --enable-nasm --enable-pic --disable-frontend && \ make && \ diff --git a/docker-images/4.2/scratch/Dockerfile b/docker-images/4.2/scratch/Dockerfile index b4ac7f6cb..d8fba634a 100644 --- a/docker-images/4.2/scratch/Dockerfile +++ b/docker-images/4.2/scratch/Dockerfile @@ -77,7 +77,7 @@ RUN \ DIR=/tmp/opencore-amr && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sL https://kent.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${OPENCOREAMR_VERSION}.tar.gz | \ + curl -sL https://versaweb.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${OPENCOREAMR_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared && \ make && \ @@ -184,7 +184,7 @@ RUN \ DIR=/tmp/lame && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sL https://kent.dl.sourceforge.net/project/lame/lame/$(echo ${LAME_VERSION} | sed -e 's/[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)/\1.\2/')/lame-${LAME_VERSION}.tar.gz | \ + curl -sL https://versaweb.dl.sourceforge.net/project/lame/lame/$(echo ${LAME_VERSION} | sed -e 's/[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)/\1.\2/')/lame-${LAME_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" --enable-shared --enable-nasm --enable-pic --disable-frontend && \ make && \ diff --git a/docker-images/4.2/ubuntu/Dockerfile b/docker-images/4.2/ubuntu/Dockerfile index 926866a8a..58c2d2575 100644 --- a/docker-images/4.2/ubuntu/Dockerfile +++ b/docker-images/4.2/ubuntu/Dockerfile @@ -82,7 +82,7 @@ RUN \ DIR=/tmp/opencore-amr && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sL https://kent.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${OPENCOREAMR_VERSION}.tar.gz | \ + curl -sL https://versaweb.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${OPENCOREAMR_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared && \ make && \ @@ -189,7 +189,7 @@ RUN \ DIR=/tmp/lame && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sL https://kent.dl.sourceforge.net/project/lame/lame/$(echo ${LAME_VERSION} | sed -e 's/[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)/\1.\2/')/lame-${LAME_VERSION}.tar.gz | \ + curl -sL https://versaweb.dl.sourceforge.net/project/lame/lame/$(echo ${LAME_VERSION} | sed -e 's/[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)/\1.\2/')/lame-${LAME_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" --enable-shared --enable-nasm --enable-pic --disable-frontend && \ make && \ diff --git a/docker-images/4.2/vaapi/Dockerfile b/docker-images/4.2/vaapi/Dockerfile index cfff23ff4..d48681d6f 100644 --- a/docker-images/4.2/vaapi/Dockerfile +++ b/docker-images/4.2/vaapi/Dockerfile @@ -83,7 +83,7 @@ RUN \ DIR=/tmp/opencore-amr && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sL https://kent.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${OPENCOREAMR_VERSION}.tar.gz | \ + curl -sL https://versaweb.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${OPENCOREAMR_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared && \ make && \ @@ -190,7 +190,7 @@ RUN \ DIR=/tmp/lame && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sL https://kent.dl.sourceforge.net/project/lame/lame/$(echo ${LAME_VERSION} | sed -e 's/[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)/\1.\2/')/lame-${LAME_VERSION}.tar.gz | \ + curl -sL https://versaweb.dl.sourceforge.net/project/lame/lame/$(echo ${LAME_VERSION} | sed -e 's/[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)/\1.\2/')/lame-${LAME_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" --enable-shared --enable-nasm --enable-pic --disable-frontend && \ make && \ diff --git a/docker-images/snapshot/alpine/Dockerfile b/docker-images/snapshot/alpine/Dockerfile index 542af9582..d4568f7d4 100644 --- a/docker-images/snapshot/alpine/Dockerfile +++ b/docker-images/snapshot/alpine/Dockerfile @@ -80,7 +80,7 @@ RUN \ DIR=/tmp/opencore-amr && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sL https://kent.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${OPENCOREAMR_VERSION}.tar.gz | \ + curl -sL https://versaweb.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${OPENCOREAMR_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared && \ make && \ @@ -187,7 +187,7 @@ RUN \ DIR=/tmp/lame && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sL https://kent.dl.sourceforge.net/project/lame/lame/$(echo ${LAME_VERSION} | sed -e 's/[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)/\1.\2/')/lame-${LAME_VERSION}.tar.gz | \ + curl -sL https://versaweb.dl.sourceforge.net/project/lame/lame/$(echo ${LAME_VERSION} | sed -e 's/[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)/\1.\2/')/lame-${LAME_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" --enable-shared --enable-nasm --enable-pic --disable-frontend && \ make && \ diff --git a/docker-images/snapshot/centos/Dockerfile b/docker-images/snapshot/centos/Dockerfile index 7f3c5567c..808164186 100644 --- a/docker-images/snapshot/centos/Dockerfile +++ b/docker-images/snapshot/centos/Dockerfile @@ -81,7 +81,7 @@ RUN \ DIR=/tmp/opencore-amr && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sL https://kent.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${OPENCOREAMR_VERSION}.tar.gz | \ + curl -sL https://versaweb.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${OPENCOREAMR_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared && \ make && \ @@ -188,7 +188,7 @@ RUN \ DIR=/tmp/lame && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sL https://kent.dl.sourceforge.net/project/lame/lame/$(echo ${LAME_VERSION} | sed -e 's/[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)/\1.\2/')/lame-${LAME_VERSION}.tar.gz | \ + curl -sL https://versaweb.dl.sourceforge.net/project/lame/lame/$(echo ${LAME_VERSION} | sed -e 's/[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)/\1.\2/')/lame-${LAME_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" --enable-shared --enable-nasm --enable-pic --disable-frontend && \ make && \ diff --git a/docker-images/snapshot/nvidia/Dockerfile b/docker-images/snapshot/nvidia/Dockerfile index cf7e18de0..489f481ac 100644 --- a/docker-images/snapshot/nvidia/Dockerfile +++ b/docker-images/snapshot/nvidia/Dockerfile @@ -107,7 +107,7 @@ RUN \ DIR=/tmp/opencore-amr && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sL https://kent.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${OPENCOREAMR_VERSION}.tar.gz | \ + curl -sL https://versaweb.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${OPENCOREAMR_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared && \ make && \ @@ -214,7 +214,7 @@ RUN \ DIR=/tmp/lame && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sL https://kent.dl.sourceforge.net/project/lame/lame/$(echo ${LAME_VERSION} | sed -e 's/[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)/\1.\2/')/lame-${LAME_VERSION}.tar.gz | \ + curl -sL https://versaweb.dl.sourceforge.net/project/lame/lame/$(echo ${LAME_VERSION} | sed -e 's/[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)/\1.\2/')/lame-${LAME_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" --enable-shared --enable-nasm --enable-pic --disable-frontend && \ make && \ diff --git a/docker-images/snapshot/scratch/Dockerfile b/docker-images/snapshot/scratch/Dockerfile index a8f98ff86..cbe4bfd5f 100644 --- a/docker-images/snapshot/scratch/Dockerfile +++ b/docker-images/snapshot/scratch/Dockerfile @@ -77,7 +77,7 @@ RUN \ DIR=/tmp/opencore-amr && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sL https://kent.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${OPENCOREAMR_VERSION}.tar.gz | \ + curl -sL https://versaweb.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${OPENCOREAMR_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared && \ make && \ @@ -184,7 +184,7 @@ RUN \ DIR=/tmp/lame && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sL https://kent.dl.sourceforge.net/project/lame/lame/$(echo ${LAME_VERSION} | sed -e 's/[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)/\1.\2/')/lame-${LAME_VERSION}.tar.gz | \ + curl -sL https://versaweb.dl.sourceforge.net/project/lame/lame/$(echo ${LAME_VERSION} | sed -e 's/[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)/\1.\2/')/lame-${LAME_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" --enable-shared --enable-nasm --enable-pic --disable-frontend && \ make && \ diff --git a/docker-images/snapshot/ubuntu/Dockerfile b/docker-images/snapshot/ubuntu/Dockerfile index 05d93664e..8cedc8308 100644 --- a/docker-images/snapshot/ubuntu/Dockerfile +++ b/docker-images/snapshot/ubuntu/Dockerfile @@ -82,7 +82,7 @@ RUN \ DIR=/tmp/opencore-amr && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sL https://kent.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${OPENCOREAMR_VERSION}.tar.gz | \ + curl -sL https://versaweb.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${OPENCOREAMR_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared && \ make && \ @@ -189,7 +189,7 @@ RUN \ DIR=/tmp/lame && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sL https://kent.dl.sourceforge.net/project/lame/lame/$(echo ${LAME_VERSION} | sed -e 's/[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)/\1.\2/')/lame-${LAME_VERSION}.tar.gz | \ + curl -sL https://versaweb.dl.sourceforge.net/project/lame/lame/$(echo ${LAME_VERSION} | sed -e 's/[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)/\1.\2/')/lame-${LAME_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" --enable-shared --enable-nasm --enable-pic --disable-frontend && \ make && \ diff --git a/docker-images/snapshot/vaapi/Dockerfile b/docker-images/snapshot/vaapi/Dockerfile index bd16f7b85..58d5ca86f 100644 --- a/docker-images/snapshot/vaapi/Dockerfile +++ b/docker-images/snapshot/vaapi/Dockerfile @@ -83,7 +83,7 @@ RUN \ DIR=/tmp/opencore-amr && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sL https://kent.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${OPENCOREAMR_VERSION}.tar.gz | \ + curl -sL https://versaweb.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${OPENCOREAMR_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared && \ make && \ @@ -190,7 +190,7 @@ RUN \ DIR=/tmp/lame && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sL https://kent.dl.sourceforge.net/project/lame/lame/$(echo ${LAME_VERSION} | sed -e 's/[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)/\1.\2/')/lame-${LAME_VERSION}.tar.gz | \ + curl -sL https://versaweb.dl.sourceforge.net/project/lame/lame/$(echo ${LAME_VERSION} | sed -e 's/[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)/\1.\2/')/lame-${LAME_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" --enable-shared --enable-nasm --enable-pic --disable-frontend && \ make && \ From 01c9a88b7e74b12bb19f1c588b1c01a2b4f34d40 Mon Sep 17 00:00:00 2001 From: "olivier.janin" Date: Tue, 27 Aug 2019 15:56:50 +0200 Subject: [PATCH 21/29] fix nasm unavailable or outdated for libx265 > 2.6 Add nasm as buildDeps on alpine images Use ubuntu 18.04 for ubuntu --- docker-images/4.2/alpine/Dockerfile | 1 + docker-images/4.2/scratch/Dockerfile | 1 + docker-images/4.2/ubuntu/Dockerfile | 4 ++-- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/docker-images/4.2/alpine/Dockerfile b/docker-images/4.2/alpine/Dockerfile index 4a0a816c2..bc6ba978e 100644 --- a/docker-images/4.2/alpine/Dockerfile +++ b/docker-images/4.2/alpine/Dockerfile @@ -72,6 +72,7 @@ RUN buildDeps="autoconf \ openssl-dev \ tar \ yasm \ + nasm \ zlib-dev \ expat-dev" && \ apk add --no-cache --update ${buildDeps} diff --git a/docker-images/4.2/scratch/Dockerfile b/docker-images/4.2/scratch/Dockerfile index d8fba634a..639872cc6 100644 --- a/docker-images/4.2/scratch/Dockerfile +++ b/docker-images/4.2/scratch/Dockerfile @@ -68,6 +68,7 @@ RUN buildDeps="autoconf \ openssl-dev \ tar \ yasm \ + nasm \ zlib-dev \ git" && \ apk add --update ${buildDeps} libgcc libstdc++ ca-certificates libcrypto1.0 libssl1.0 diff --git a/docker-images/4.2/ubuntu/Dockerfile b/docker-images/4.2/ubuntu/Dockerfile index 58c2d2575..0f1592747 100644 --- a/docker-images/4.2/ubuntu/Dockerfile +++ b/docker-images/4.2/ubuntu/Dockerfile @@ -5,7 +5,7 @@ # https://hub.docker.com/r/jrottenberg/ffmpeg/ # # -FROM ubuntu:16.04 AS base +FROM ubuntu:18.04 AS base WORKDIR /tmp/workdir @@ -388,4 +388,4 @@ ENV LD_LIBRARY_PATH=/usr/local/lib COPY --from=build /usr/local /usr/local/ # Let's make sure the app built correctly -# Convenient to verify on https://hub.docker.com/r/jrottenberg/ffmpeg/builds/ console output \ No newline at end of file +# Convenient to verify on https://hub.docker.com/r/jrottenberg/ffmpeg/builds/ console output From ec598adf7ec7e30d4959d370e2e588f841ee1be8 Mon Sep 17 00:00:00 2001 From: "olivier.janin" Date: Wed, 28 Aug 2019 09:44:37 +0200 Subject: [PATCH 22/29] update templates and all versions --- docker-images/2.8/alpine/Dockerfile | 1 + docker-images/2.8/scratch/Dockerfile | 1 + docker-images/2.8/ubuntu/Dockerfile | 4 ++-- docker-images/3.0/alpine/Dockerfile | 1 + docker-images/3.0/scratch/Dockerfile | 1 + docker-images/3.0/ubuntu/Dockerfile | 4 ++-- docker-images/3.1/alpine/Dockerfile | 1 + docker-images/3.1/scratch/Dockerfile | 1 + docker-images/3.1/ubuntu/Dockerfile | 4 ++-- docker-images/3.2/alpine/Dockerfile | 1 + docker-images/3.2/scratch/Dockerfile | 1 + docker-images/3.2/ubuntu/Dockerfile | 4 ++-- docker-images/3.3/alpine/Dockerfile | 1 + docker-images/3.3/scratch/Dockerfile | 1 + docker-images/3.3/ubuntu/Dockerfile | 4 ++-- docker-images/3.4/alpine/Dockerfile | 1 + docker-images/3.4/scratch/Dockerfile | 1 + docker-images/3.4/ubuntu/Dockerfile | 4 ++-- docker-images/4.0/alpine/Dockerfile | 1 + docker-images/4.0/scratch/Dockerfile | 1 + docker-images/4.0/ubuntu/Dockerfile | 4 ++-- docker-images/4.1/alpine/Dockerfile | 1 + docker-images/4.1/scratch/Dockerfile | 1 + docker-images/4.1/ubuntu/Dockerfile | 4 ++-- docker-images/snapshot/alpine/Dockerfile | 1 + docker-images/snapshot/scratch/Dockerfile | 1 + docker-images/snapshot/ubuntu/Dockerfile | 4 ++-- templates/Dockerfile-template.alpine | 1 + templates/Dockerfile-template.scratch | 1 + templates/Dockerfile-template.ubuntu | 4 ++-- 30 files changed, 40 insertions(+), 20 deletions(-) diff --git a/docker-images/2.8/alpine/Dockerfile b/docker-images/2.8/alpine/Dockerfile index 322b02307..d866bbefb 100644 --- a/docker-images/2.8/alpine/Dockerfile +++ b/docker-images/2.8/alpine/Dockerfile @@ -72,6 +72,7 @@ RUN buildDeps="autoconf \ openssl-dev \ tar \ yasm \ + nasm \ zlib-dev \ expat-dev" && \ apk add --no-cache --update ${buildDeps} diff --git a/docker-images/2.8/scratch/Dockerfile b/docker-images/2.8/scratch/Dockerfile index 91664f25c..fca5b23c7 100644 --- a/docker-images/2.8/scratch/Dockerfile +++ b/docker-images/2.8/scratch/Dockerfile @@ -68,6 +68,7 @@ RUN buildDeps="autoconf \ openssl-dev \ tar \ yasm \ + nasm \ zlib-dev \ git" && \ apk add --update ${buildDeps} libgcc libstdc++ ca-certificates libcrypto1.0 libssl1.0 diff --git a/docker-images/2.8/ubuntu/Dockerfile b/docker-images/2.8/ubuntu/Dockerfile index c3d4ffcac..9010b7a66 100644 --- a/docker-images/2.8/ubuntu/Dockerfile +++ b/docker-images/2.8/ubuntu/Dockerfile @@ -5,7 +5,7 @@ # https://hub.docker.com/r/jrottenberg/ffmpeg/ # # -FROM ubuntu:16.04 AS base +FROM ubuntu:18.04 AS base WORKDIR /tmp/workdir @@ -388,4 +388,4 @@ ENV LD_LIBRARY_PATH=/usr/local/lib COPY --from=build /usr/local /usr/local/ # Let's make sure the app built correctly -# Convenient to verify on https://hub.docker.com/r/jrottenberg/ffmpeg/builds/ console output \ No newline at end of file +# Convenient to verify on https://hub.docker.com/r/jrottenberg/ffmpeg/builds/ console output diff --git a/docker-images/3.0/alpine/Dockerfile b/docker-images/3.0/alpine/Dockerfile index ff61ca8c3..9ce6dbf9a 100644 --- a/docker-images/3.0/alpine/Dockerfile +++ b/docker-images/3.0/alpine/Dockerfile @@ -72,6 +72,7 @@ RUN buildDeps="autoconf \ openssl-dev \ tar \ yasm \ + nasm \ zlib-dev \ expat-dev" && \ apk add --no-cache --update ${buildDeps} diff --git a/docker-images/3.0/scratch/Dockerfile b/docker-images/3.0/scratch/Dockerfile index 362db7367..3fce423b8 100644 --- a/docker-images/3.0/scratch/Dockerfile +++ b/docker-images/3.0/scratch/Dockerfile @@ -68,6 +68,7 @@ RUN buildDeps="autoconf \ openssl-dev \ tar \ yasm \ + nasm \ zlib-dev \ git" && \ apk add --update ${buildDeps} libgcc libstdc++ ca-certificates libcrypto1.0 libssl1.0 diff --git a/docker-images/3.0/ubuntu/Dockerfile b/docker-images/3.0/ubuntu/Dockerfile index 6483a16ca..8a9433ca9 100644 --- a/docker-images/3.0/ubuntu/Dockerfile +++ b/docker-images/3.0/ubuntu/Dockerfile @@ -5,7 +5,7 @@ # https://hub.docker.com/r/jrottenberg/ffmpeg/ # # -FROM ubuntu:16.04 AS base +FROM ubuntu:18.04 AS base WORKDIR /tmp/workdir @@ -388,4 +388,4 @@ ENV LD_LIBRARY_PATH=/usr/local/lib COPY --from=build /usr/local /usr/local/ # Let's make sure the app built correctly -# Convenient to verify on https://hub.docker.com/r/jrottenberg/ffmpeg/builds/ console output \ No newline at end of file +# Convenient to verify on https://hub.docker.com/r/jrottenberg/ffmpeg/builds/ console output diff --git a/docker-images/3.1/alpine/Dockerfile b/docker-images/3.1/alpine/Dockerfile index d781fca60..7ba2d7ee3 100644 --- a/docker-images/3.1/alpine/Dockerfile +++ b/docker-images/3.1/alpine/Dockerfile @@ -72,6 +72,7 @@ RUN buildDeps="autoconf \ openssl-dev \ tar \ yasm \ + nasm \ zlib-dev \ expat-dev" && \ apk add --no-cache --update ${buildDeps} diff --git a/docker-images/3.1/scratch/Dockerfile b/docker-images/3.1/scratch/Dockerfile index 6f8468d85..ff7b6fcd8 100644 --- a/docker-images/3.1/scratch/Dockerfile +++ b/docker-images/3.1/scratch/Dockerfile @@ -68,6 +68,7 @@ RUN buildDeps="autoconf \ openssl-dev \ tar \ yasm \ + nasm \ zlib-dev \ git" && \ apk add --update ${buildDeps} libgcc libstdc++ ca-certificates libcrypto1.0 libssl1.0 diff --git a/docker-images/3.1/ubuntu/Dockerfile b/docker-images/3.1/ubuntu/Dockerfile index 8ae660ea6..62e7e0d0e 100644 --- a/docker-images/3.1/ubuntu/Dockerfile +++ b/docker-images/3.1/ubuntu/Dockerfile @@ -5,7 +5,7 @@ # https://hub.docker.com/r/jrottenberg/ffmpeg/ # # -FROM ubuntu:16.04 AS base +FROM ubuntu:18.04 AS base WORKDIR /tmp/workdir @@ -388,4 +388,4 @@ ENV LD_LIBRARY_PATH=/usr/local/lib COPY --from=build /usr/local /usr/local/ # Let's make sure the app built correctly -# Convenient to verify on https://hub.docker.com/r/jrottenberg/ffmpeg/builds/ console output \ No newline at end of file +# Convenient to verify on https://hub.docker.com/r/jrottenberg/ffmpeg/builds/ console output diff --git a/docker-images/3.2/alpine/Dockerfile b/docker-images/3.2/alpine/Dockerfile index 711a68091..41573ffc0 100644 --- a/docker-images/3.2/alpine/Dockerfile +++ b/docker-images/3.2/alpine/Dockerfile @@ -72,6 +72,7 @@ RUN buildDeps="autoconf \ openssl-dev \ tar \ yasm \ + nasm \ zlib-dev \ expat-dev" && \ apk add --no-cache --update ${buildDeps} diff --git a/docker-images/3.2/scratch/Dockerfile b/docker-images/3.2/scratch/Dockerfile index f84951367..7bccdd747 100644 --- a/docker-images/3.2/scratch/Dockerfile +++ b/docker-images/3.2/scratch/Dockerfile @@ -68,6 +68,7 @@ RUN buildDeps="autoconf \ openssl-dev \ tar \ yasm \ + nasm \ zlib-dev \ git" && \ apk add --update ${buildDeps} libgcc libstdc++ ca-certificates libcrypto1.0 libssl1.0 diff --git a/docker-images/3.2/ubuntu/Dockerfile b/docker-images/3.2/ubuntu/Dockerfile index 7625d34b4..704d41c1d 100644 --- a/docker-images/3.2/ubuntu/Dockerfile +++ b/docker-images/3.2/ubuntu/Dockerfile @@ -5,7 +5,7 @@ # https://hub.docker.com/r/jrottenberg/ffmpeg/ # # -FROM ubuntu:16.04 AS base +FROM ubuntu:18.04 AS base WORKDIR /tmp/workdir @@ -388,4 +388,4 @@ ENV LD_LIBRARY_PATH=/usr/local/lib COPY --from=build /usr/local /usr/local/ # Let's make sure the app built correctly -# Convenient to verify on https://hub.docker.com/r/jrottenberg/ffmpeg/builds/ console output \ No newline at end of file +# Convenient to verify on https://hub.docker.com/r/jrottenberg/ffmpeg/builds/ console output diff --git a/docker-images/3.3/alpine/Dockerfile b/docker-images/3.3/alpine/Dockerfile index 1a2713465..75c792756 100644 --- a/docker-images/3.3/alpine/Dockerfile +++ b/docker-images/3.3/alpine/Dockerfile @@ -72,6 +72,7 @@ RUN buildDeps="autoconf \ openssl-dev \ tar \ yasm \ + nasm \ zlib-dev \ expat-dev" && \ apk add --no-cache --update ${buildDeps} diff --git a/docker-images/3.3/scratch/Dockerfile b/docker-images/3.3/scratch/Dockerfile index 2a3c48f10..7412da7f4 100644 --- a/docker-images/3.3/scratch/Dockerfile +++ b/docker-images/3.3/scratch/Dockerfile @@ -68,6 +68,7 @@ RUN buildDeps="autoconf \ openssl-dev \ tar \ yasm \ + nasm \ zlib-dev \ git" && \ apk add --update ${buildDeps} libgcc libstdc++ ca-certificates libcrypto1.0 libssl1.0 diff --git a/docker-images/3.3/ubuntu/Dockerfile b/docker-images/3.3/ubuntu/Dockerfile index 1e6f2f905..4d191c1b4 100644 --- a/docker-images/3.3/ubuntu/Dockerfile +++ b/docker-images/3.3/ubuntu/Dockerfile @@ -5,7 +5,7 @@ # https://hub.docker.com/r/jrottenberg/ffmpeg/ # # -FROM ubuntu:16.04 AS base +FROM ubuntu:18.04 AS base WORKDIR /tmp/workdir @@ -388,4 +388,4 @@ ENV LD_LIBRARY_PATH=/usr/local/lib COPY --from=build /usr/local /usr/local/ # Let's make sure the app built correctly -# Convenient to verify on https://hub.docker.com/r/jrottenberg/ffmpeg/builds/ console output \ No newline at end of file +# Convenient to verify on https://hub.docker.com/r/jrottenberg/ffmpeg/builds/ console output diff --git a/docker-images/3.4/alpine/Dockerfile b/docker-images/3.4/alpine/Dockerfile index 66b3461f3..3a75494a2 100644 --- a/docker-images/3.4/alpine/Dockerfile +++ b/docker-images/3.4/alpine/Dockerfile @@ -72,6 +72,7 @@ RUN buildDeps="autoconf \ openssl-dev \ tar \ yasm \ + nasm \ zlib-dev \ expat-dev" && \ apk add --no-cache --update ${buildDeps} diff --git a/docker-images/3.4/scratch/Dockerfile b/docker-images/3.4/scratch/Dockerfile index 8846cc772..bdfda6855 100644 --- a/docker-images/3.4/scratch/Dockerfile +++ b/docker-images/3.4/scratch/Dockerfile @@ -68,6 +68,7 @@ RUN buildDeps="autoconf \ openssl-dev \ tar \ yasm \ + nasm \ zlib-dev \ git" && \ apk add --update ${buildDeps} libgcc libstdc++ ca-certificates libcrypto1.0 libssl1.0 diff --git a/docker-images/3.4/ubuntu/Dockerfile b/docker-images/3.4/ubuntu/Dockerfile index b5eb91fe2..44a124591 100644 --- a/docker-images/3.4/ubuntu/Dockerfile +++ b/docker-images/3.4/ubuntu/Dockerfile @@ -5,7 +5,7 @@ # https://hub.docker.com/r/jrottenberg/ffmpeg/ # # -FROM ubuntu:16.04 AS base +FROM ubuntu:18.04 AS base WORKDIR /tmp/workdir @@ -388,4 +388,4 @@ ENV LD_LIBRARY_PATH=/usr/local/lib COPY --from=build /usr/local /usr/local/ # Let's make sure the app built correctly -# Convenient to verify on https://hub.docker.com/r/jrottenberg/ffmpeg/builds/ console output \ No newline at end of file +# Convenient to verify on https://hub.docker.com/r/jrottenberg/ffmpeg/builds/ console output diff --git a/docker-images/4.0/alpine/Dockerfile b/docker-images/4.0/alpine/Dockerfile index 7fe527842..96ce81dec 100644 --- a/docker-images/4.0/alpine/Dockerfile +++ b/docker-images/4.0/alpine/Dockerfile @@ -72,6 +72,7 @@ RUN buildDeps="autoconf \ openssl-dev \ tar \ yasm \ + nasm \ zlib-dev \ expat-dev" && \ apk add --no-cache --update ${buildDeps} diff --git a/docker-images/4.0/scratch/Dockerfile b/docker-images/4.0/scratch/Dockerfile index ced0b1fd0..9ffda5cfb 100644 --- a/docker-images/4.0/scratch/Dockerfile +++ b/docker-images/4.0/scratch/Dockerfile @@ -68,6 +68,7 @@ RUN buildDeps="autoconf \ openssl-dev \ tar \ yasm \ + nasm \ zlib-dev \ git" && \ apk add --update ${buildDeps} libgcc libstdc++ ca-certificates libcrypto1.0 libssl1.0 diff --git a/docker-images/4.0/ubuntu/Dockerfile b/docker-images/4.0/ubuntu/Dockerfile index 284e3ee58..852df286a 100644 --- a/docker-images/4.0/ubuntu/Dockerfile +++ b/docker-images/4.0/ubuntu/Dockerfile @@ -5,7 +5,7 @@ # https://hub.docker.com/r/jrottenberg/ffmpeg/ # # -FROM ubuntu:16.04 AS base +FROM ubuntu:18.04 AS base WORKDIR /tmp/workdir @@ -388,4 +388,4 @@ ENV LD_LIBRARY_PATH=/usr/local/lib COPY --from=build /usr/local /usr/local/ # Let's make sure the app built correctly -# Convenient to verify on https://hub.docker.com/r/jrottenberg/ffmpeg/builds/ console output \ No newline at end of file +# Convenient to verify on https://hub.docker.com/r/jrottenberg/ffmpeg/builds/ console output diff --git a/docker-images/4.1/alpine/Dockerfile b/docker-images/4.1/alpine/Dockerfile index dc7f3588f..9e7c74a51 100644 --- a/docker-images/4.1/alpine/Dockerfile +++ b/docker-images/4.1/alpine/Dockerfile @@ -72,6 +72,7 @@ RUN buildDeps="autoconf \ openssl-dev \ tar \ yasm \ + nasm \ zlib-dev \ expat-dev" && \ apk add --no-cache --update ${buildDeps} diff --git a/docker-images/4.1/scratch/Dockerfile b/docker-images/4.1/scratch/Dockerfile index bb6ffdfba..c88708917 100644 --- a/docker-images/4.1/scratch/Dockerfile +++ b/docker-images/4.1/scratch/Dockerfile @@ -68,6 +68,7 @@ RUN buildDeps="autoconf \ openssl-dev \ tar \ yasm \ + nasm \ zlib-dev \ git" && \ apk add --update ${buildDeps} libgcc libstdc++ ca-certificates libcrypto1.0 libssl1.0 diff --git a/docker-images/4.1/ubuntu/Dockerfile b/docker-images/4.1/ubuntu/Dockerfile index 702637d4e..9360b6216 100644 --- a/docker-images/4.1/ubuntu/Dockerfile +++ b/docker-images/4.1/ubuntu/Dockerfile @@ -5,7 +5,7 @@ # https://hub.docker.com/r/jrottenberg/ffmpeg/ # # -FROM ubuntu:16.04 AS base +FROM ubuntu:18.04 AS base WORKDIR /tmp/workdir @@ -388,4 +388,4 @@ ENV LD_LIBRARY_PATH=/usr/local/lib COPY --from=build /usr/local /usr/local/ # Let's make sure the app built correctly -# Convenient to verify on https://hub.docker.com/r/jrottenberg/ffmpeg/builds/ console output \ No newline at end of file +# Convenient to verify on https://hub.docker.com/r/jrottenberg/ffmpeg/builds/ console output diff --git a/docker-images/snapshot/alpine/Dockerfile b/docker-images/snapshot/alpine/Dockerfile index d4568f7d4..ebded30f5 100644 --- a/docker-images/snapshot/alpine/Dockerfile +++ b/docker-images/snapshot/alpine/Dockerfile @@ -72,6 +72,7 @@ RUN buildDeps="autoconf \ openssl-dev \ tar \ yasm \ + nasm \ zlib-dev \ expat-dev" && \ apk add --no-cache --update ${buildDeps} diff --git a/docker-images/snapshot/scratch/Dockerfile b/docker-images/snapshot/scratch/Dockerfile index cbe4bfd5f..85d963184 100644 --- a/docker-images/snapshot/scratch/Dockerfile +++ b/docker-images/snapshot/scratch/Dockerfile @@ -68,6 +68,7 @@ RUN buildDeps="autoconf \ openssl-dev \ tar \ yasm \ + nasm \ zlib-dev \ git" && \ apk add --update ${buildDeps} libgcc libstdc++ ca-certificates libcrypto1.0 libssl1.0 diff --git a/docker-images/snapshot/ubuntu/Dockerfile b/docker-images/snapshot/ubuntu/Dockerfile index 8cedc8308..0f34da5b7 100644 --- a/docker-images/snapshot/ubuntu/Dockerfile +++ b/docker-images/snapshot/ubuntu/Dockerfile @@ -5,7 +5,7 @@ # https://hub.docker.com/r/jrottenberg/ffmpeg/ # # -FROM ubuntu:16.04 AS base +FROM ubuntu:18.04 AS base WORKDIR /tmp/workdir @@ -388,4 +388,4 @@ ENV LD_LIBRARY_PATH=/usr/local/lib COPY --from=build /usr/local /usr/local/ # Let's make sure the app built correctly -# Convenient to verify on https://hub.docker.com/r/jrottenberg/ffmpeg/builds/ console output \ No newline at end of file +# Convenient to verify on https://hub.docker.com/r/jrottenberg/ffmpeg/builds/ console output diff --git a/templates/Dockerfile-template.alpine b/templates/Dockerfile-template.alpine index 6b309db3f..a28e57125 100644 --- a/templates/Dockerfile-template.alpine +++ b/templates/Dockerfile-template.alpine @@ -39,6 +39,7 @@ RUN buildDeps="autoconf \ openssl-dev \ tar \ yasm \ + nasm \ zlib-dev \ expat-dev" && \ apk add --no-cache --update ${buildDeps} diff --git a/templates/Dockerfile-template.scratch b/templates/Dockerfile-template.scratch index 494237f12..676d5e9b0 100644 --- a/templates/Dockerfile-template.scratch +++ b/templates/Dockerfile-template.scratch @@ -35,6 +35,7 @@ RUN buildDeps="autoconf \ openssl-dev \ tar \ yasm \ + nasm \ zlib-dev \ git" && \ apk add --update ${buildDeps} libgcc libstdc++ ca-certificates libcrypto1.0 libssl1.0 diff --git a/templates/Dockerfile-template.ubuntu b/templates/Dockerfile-template.ubuntu index 3aa59439e..5b99fe043 100644 --- a/templates/Dockerfile-template.ubuntu +++ b/templates/Dockerfile-template.ubuntu @@ -5,7 +5,7 @@ # https://hub.docker.com/r/jrottenberg/ffmpeg/ # # -FROM ubuntu:16.04 AS base +FROM ubuntu:18.04 AS base WORKDIR /tmp/workdir @@ -62,4 +62,4 @@ ENV LD_LIBRARY_PATH=/usr/local/lib COPY --from=build /usr/local /usr/local/ # Let's make sure the app built correctly -# Convenient to verify on https://hub.docker.com/r/jrottenberg/ffmpeg/builds/ console output \ No newline at end of file +# Convenient to verify on https://hub.docker.com/r/jrottenberg/ffmpeg/builds/ console output From 20e12d96f3dc0e9d919aa13fe64f2db4deb8a560 Mon Sep 17 00:00:00 2001 From: Julien Rottenberg Date: Sat, 7 Sep 2019 09:50:56 -0700 Subject: [PATCH 23/29] 4.2.1 --- docker-images/4.2/alpine/Dockerfile | 2 +- docker-images/4.2/centos/Dockerfile | 2 +- docker-images/4.2/nvidia/Dockerfile | 2 +- docker-images/4.2/scratch/Dockerfile | 2 +- docker-images/4.2/ubuntu/Dockerfile | 2 +- docker-images/4.2/vaapi/Dockerfile | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docker-images/4.2/alpine/Dockerfile b/docker-images/4.2/alpine/Dockerfile index bc6ba978e..cab0d57c1 100644 --- a/docker-images/4.2/alpine/Dockerfile +++ b/docker-images/4.2/alpine/Dockerfile @@ -18,7 +18,7 @@ ARG LD_LIBRARY_PATH=/opt/ffmpeg/lib ARG PREFIX=/opt/ffmpeg ARG MAKEFLAGS="-j2" -ENV FFMPEG_VERSION=4.2 \ +ENV FFMPEG_VERSION=4.2.1 \ AOM_VERSION=v1.0.0 \ FDKAAC_VERSION=0.1.5 \ FONTCONFIG_VERSION=2.12.4 \ diff --git a/docker-images/4.2/centos/Dockerfile b/docker-images/4.2/centos/Dockerfile index 37eb2b2d2..4274bdeb2 100644 --- a/docker-images/4.2/centos/Dockerfile +++ b/docker-images/4.2/centos/Dockerfile @@ -20,7 +20,7 @@ ARG LD_LIBRARY_PATH=/opt/ffmpeg/lib ARG PREFIX=/opt/ffmpeg ARG MAKEFLAGS="-j2" -ENV FFMPEG_VERSION=4.2 \ +ENV FFMPEG_VERSION=4.2.1 \ AOM_VERSION=v1.0.0 \ FDKAAC_VERSION=0.1.5 \ FONTCONFIG_VERSION=2.12.4 \ diff --git a/docker-images/4.2/nvidia/Dockerfile b/docker-images/4.2/nvidia/Dockerfile index a2cbb28a6..758fc1f08 100644 --- a/docker-images/4.2/nvidia/Dockerfile +++ b/docker-images/4.2/nvidia/Dockerfile @@ -35,7 +35,7 @@ ENV LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/opt/ffmpeg/lib" ARG PREFIX=/opt/ffmpeg ARG MAKEFLAGS="-j12" -ENV FFMPEG_VERSION=4.2 \ +ENV FFMPEG_VERSION=4.2.1 \ AOM_VERSION=v1.0.0 \ FDKAAC_VERSION=0.1.5 \ FONTCONFIG_VERSION=2.12.4 \ diff --git a/docker-images/4.2/scratch/Dockerfile b/docker-images/4.2/scratch/Dockerfile index 639872cc6..08328c117 100644 --- a/docker-images/4.2/scratch/Dockerfile +++ b/docker-images/4.2/scratch/Dockerfile @@ -13,7 +13,7 @@ ARG LD_LIBRARY_PATH=/opt/ffmpeg/lib ARG PREFIX=/opt/ffmpeg ARG MAKEFLAGS="-j2" -ENV FFMPEG_VERSION=4.2 \ +ENV FFMPEG_VERSION=4.2.1 \ AOM_VERSION=v1.0.0 \ FDKAAC_VERSION=0.1.5 \ FONTCONFIG_VERSION=2.12.4 \ diff --git a/docker-images/4.2/ubuntu/Dockerfile b/docker-images/4.2/ubuntu/Dockerfile index 0f1592747..32013d6ac 100644 --- a/docker-images/4.2/ubuntu/Dockerfile +++ b/docker-images/4.2/ubuntu/Dockerfile @@ -21,7 +21,7 @@ ARG LD_LIBRARY_PATH=/opt/ffmpeg/lib ARG PREFIX=/opt/ffmpeg ARG MAKEFLAGS="-j2" -ENV FFMPEG_VERSION=4.2 \ +ENV FFMPEG_VERSION=4.2.1 \ AOM_VERSION=v1.0.0 \ FDKAAC_VERSION=0.1.5 \ FONTCONFIG_VERSION=2.12.4 \ diff --git a/docker-images/4.2/vaapi/Dockerfile b/docker-images/4.2/vaapi/Dockerfile index d48681d6f..72f755690 100644 --- a/docker-images/4.2/vaapi/Dockerfile +++ b/docker-images/4.2/vaapi/Dockerfile @@ -21,7 +21,7 @@ ARG LD_LIBRARY_PATH=/opt/ffmpeg/lib ARG PREFIX=/opt/ffmpeg ARG MAKEFLAGS="-j2" -ENV FFMPEG_VERSION=4.2 \ +ENV FFMPEG_VERSION=4.2.1 \ AOM_VERSION=v1.0.0 \ FDKAAC_VERSION=0.1.5 \ FONTCONFIG_VERSION=2.12.4 \ From dceb3ed543f5438cfebe280d60d7c63687ddd483 Mon Sep 17 00:00:00 2001 From: Julien Rottenberg Date: Thu, 16 May 2019 11:26:04 -0700 Subject: [PATCH 24/29] 3.2.14 --- .update.py.swp | Bin 0 -> 16384 bytes docker-images/3.2/alpine/Dockerfile | 8 ++++++++ docker-images/3.2/centos/Dockerfile | 8 ++++++++ docker-images/3.2/nvidia/Dockerfile | 8 ++++++++ docker-images/3.2/scratch/Dockerfile | 8 ++++++++ docker-images/3.2/ubuntu/Dockerfile | 8 ++++++++ docker-images/3.2/vaapi/Dockerfile | 8 ++++++++ update.py | 2 +- 8 files changed, 49 insertions(+), 1 deletion(-) create mode 100644 .update.py.swp diff --git a/.update.py.swp b/.update.py.swp new file mode 100644 index 0000000000000000000000000000000000000000..9e41acf4b5b312330105e1d86cacee2ee19b0683 GIT binary patch literal 16384 zcmeHOO>87b6|N)@2(Z}@Bu+u9wKM7&cBk88FTsrBMN48whF$N<-nBq$$CSHkJZ<-M zH(lMc@op9li-fpw01^pAI3xlIkvkDLxbmYABp@6k@uTFx5l(zn-924B<24xzq##vm zzn!kXSMPoGy1HIfdv|Vg^)g+wI|SDwg#74R-`xJ*13xA!HX(Z<~wt;-R#U6`msl^PbI=sHVhaB3GHFkl!k3>XIfzZpp5`^nc}!u^FA z>&5SVW4{j+>6zkpW30SLnjgb}VZbn87%&VN1`Gp+0mFb{z%XDKFbo(5-h&J$eX}#fL{VH0z)7JJ`Fqw z{O%MXuLCavF93G{27DQK3iuq*0!{<>0R;HVM+o^n@Esrp7;pu67O}E>mMRy1y}_B^$_|8?gH<8kdU{5p8{V8J_Vcxe)|D@{{TD-JO;e+AR(^+ zcYy`qt@ji1ZQvsCkM|LB3pfP61biPGByVFAWGzvVP&|Ys4 z^F3O~6*XZ}uot-pJlS!hFy&!Nm&P*egvSAMdDCjQJzuchfVX=+WF1=P=tLgf+S&@0 zx(~J6JXE#a%wttP3P&a3kcaNkMQ%3qy`zf)e>aR{t3^~l#eW)gbZLoN0$;0$ew11? zN=n-$rx#E*N$M0F@aNKmwF9pgusyLf)4ufh?W^m{E303;<3O>QoRs4$(e@=L6NwW< z7%NB8Bbz>P-Z{EpVcwY;vvz8I-BR7vN?kv6gUsVKm5-@M+mmgbUN0QN`M8VHahnSH zHRUl(LzehVIvPeI#31|3>XO=6PGQ|N9tlqwdESt**w;v%#(fs>Ov)!sHzb!=e^MvR zNVqMs-DWZ~QUk-zq5-|}?AF%yCuh#l8KB;*@^W3pGc^xa%1lff((g5@T|C^80M*3< zqkigr9sBGT4>L4A7_wW8CDPM12Bo|ciHl+$?qh};lP5i;w5hwWt=whaUepYjrB~4O z^Kx>Vw>#7q6km^(^CI`CA0mH|C_|@FuF+V(zSd|!pCk**d9fOY2_sWJz;uYu)J8L9 zqp`fUsU+}lI4MEP1m#*vm$0&O`RejBJDbbv8>?4xbqYQzRitT}ju4g(;+`K!RhZYT zD&F+dK9xi_tx{XzJgp{vS-lM*lKw<`wkU{zXHmEF2?kFs0UkVzfzrWyL8Qmb9+u+$KAGw&I<6CK}6o|JiXzeE<5SMK4`F+jSN zr`rC2?Q!8W)W6DgRNtg*$pgXbZu8$J_T6xLFY`}8=eB&i~X1@AL zCMUM1&Fh%q3NP5`5>=4Tm~!en;5^ zMT=gb9rfx%0*fiz7oNZ8r_KC*m}g?uD*HfjuJ0^;s?Xg6dYSD<$*9k1)u<`4MCV6Z zbdJ)ZBiGJKi_W+fepqM$ZNUTVv_%}i2Fu3FY^2{VCeQn-rWBm1}B^Tutu`?e!!WKUdG_bhi;AY3kVm5kvEU zA1-aA_)0t7%-sbqIxc(QOV^T&w`xt$Nz72RgXyv7haSW=^N0dD0cV1X7Ab3>GOD@J zAjaI$wDNlG<_&wU{h95vEjwk2y?blkX2N}P%V8I`#92xDm^>v##8D_l@3DmEX%uBi zfHlaxjbHUbE8dgq%a@ifZY*y=dpVV(;*D*RKk)fI8LNm~tDmN^=sH-%$`Hwpl0Bz1 z%CSiKXvy|gwwr}%CZ};0#D2)-U9qIXopABNyW5wU`AQHs#oBh8XpSR0m5UhIoM7FD z)oYriejw~(fT=%FL0xTlNRgRaUZxUW-ibp|-bRAV(r0)I=TA8v^uijddaJBN1Uh?0 zE!TJb(82qW#)tB|dm`iipCBf_f*4uG|K<7qHxSc54!nW5{dwRv@EGtKV)7pFap2d8 z!G8t30^9}qz#h;A9tA!MJOcayvG{9%jLn}1ZUbvT2bcr?iN4uipXjMq#8^mLEDXxQX^px*a7$aL^Qo>{|j-q+|EU5%+kKipF^x9D^%M{ z9;hmd(K=)U-mE&+f_bI;yFKMXa5-f2k_>g%Iq4R+YTfpdK_yG3PAo4EK)anqd+xl{ zu1r56(>2=kUH?29Rl6l)CyNW}WK7SL2QtXjPZQ?VAtVkwG}>qB%8EKsT(I+P7|xQw z$3df~&LxZJpSn?!;E%e4LwOQ;T}97SDNntO(=<}s(Lw~+w-*`5pNh*-(yzLQVXW&J z)ka`Dr((oRnI2>>>>>> 3.2.14 OPENCOREAMR_VERSION=0.1.5 \ OPUS_VERSION=1.2 \ OPENJPEG_VERSION=2.1.2 \ diff --git a/docker-images/3.2/centos/Dockerfile b/docker-images/3.2/centos/Dockerfile index ff1e808f3..dc1918f6a 100644 --- a/docker-images/3.2/centos/Dockerfile +++ b/docker-images/3.2/centos/Dockerfile @@ -20,6 +20,7 @@ ARG LD_LIBRARY_PATH=/opt/ffmpeg/lib ARG PREFIX=/opt/ffmpeg ARG MAKEFLAGS="-j2" +<<<<<<< HEAD ENV FFMPEG_VERSION=3.2.14 \ AOM_VERSION=v1.0.0 \ FDKAAC_VERSION=0.1.5 \ @@ -31,6 +32,13 @@ ENV FFMPEG_VERSION=3.2.14 \ LIBASS_VERSION=0.13.7 \ LIBVIDSTAB_VERSION=1.1.0 \ OGG_VERSION=1.3.2 \ +======= +ENV FFMPEG_VERSION=3.2.14 \ + FDKAAC_VERSION=0.1.5 \ + LAME_VERSION=3.100 \ + LIBASS_VERSION=0.13.7 \ + OGG_VERSION=1.3.2 \ +>>>>>>> 3.2.14 OPENCOREAMR_VERSION=0.1.5 \ OPUS_VERSION=1.2 \ OPENJPEG_VERSION=2.1.2 \ diff --git a/docker-images/3.2/nvidia/Dockerfile b/docker-images/3.2/nvidia/Dockerfile index c5a2951ee..668231675 100644 --- a/docker-images/3.2/nvidia/Dockerfile +++ b/docker-images/3.2/nvidia/Dockerfile @@ -35,6 +35,7 @@ ENV LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/opt/ffmpeg/lib" ARG PREFIX=/opt/ffmpeg ARG MAKEFLAGS="-j12" +<<<<<<< HEAD ENV FFMPEG_VERSION=3.2.14 \ AOM_VERSION=v1.0.0 \ FDKAAC_VERSION=0.1.5 \ @@ -46,6 +47,13 @@ ENV FFMPEG_VERSION=3.2.14 \ LIBASS_VERSION=0.13.7 \ LIBVIDSTAB_VERSION=1.1.0 \ OGG_VERSION=1.3.2 \ +======= +ENV FFMPEG_VERSION=3.2.14 \ + FDKAAC_VERSION=0.1.5 \ + LAME_VERSION=3.100 \ + LIBASS_VERSION=0.13.7 \ + OGG_VERSION=1.3.2 \ +>>>>>>> 3.2.14 OPENCOREAMR_VERSION=0.1.5 \ OPUS_VERSION=1.2 \ OPENJPEG_VERSION=2.1.2 \ diff --git a/docker-images/3.2/scratch/Dockerfile b/docker-images/3.2/scratch/Dockerfile index 7bccdd747..261911b78 100644 --- a/docker-images/3.2/scratch/Dockerfile +++ b/docker-images/3.2/scratch/Dockerfile @@ -13,6 +13,7 @@ ARG LD_LIBRARY_PATH=/opt/ffmpeg/lib ARG PREFIX=/opt/ffmpeg ARG MAKEFLAGS="-j2" +<<<<<<< HEAD ENV FFMPEG_VERSION=3.2.14 \ AOM_VERSION=v1.0.0 \ FDKAAC_VERSION=0.1.5 \ @@ -24,6 +25,13 @@ ENV FFMPEG_VERSION=3.2.14 \ LIBASS_VERSION=0.13.7 \ LIBVIDSTAB_VERSION=1.1.0 \ OGG_VERSION=1.3.2 \ +======= +ENV FFMPEG_VERSION=3.2.14 \ + FDKAAC_VERSION=0.1.5 \ + LAME_VERSION=3.100 \ + LIBASS_VERSION=0.13.7 \ + OGG_VERSION=1.3.2 \ +>>>>>>> 3.2.14 OPENCOREAMR_VERSION=0.1.5 \ OPUS_VERSION=1.2 \ OPENJPEG_VERSION=2.1.2 \ diff --git a/docker-images/3.2/ubuntu/Dockerfile b/docker-images/3.2/ubuntu/Dockerfile index 704d41c1d..b843b7d83 100644 --- a/docker-images/3.2/ubuntu/Dockerfile +++ b/docker-images/3.2/ubuntu/Dockerfile @@ -21,6 +21,7 @@ ARG LD_LIBRARY_PATH=/opt/ffmpeg/lib ARG PREFIX=/opt/ffmpeg ARG MAKEFLAGS="-j2" +<<<<<<< HEAD ENV FFMPEG_VERSION=3.2.14 \ AOM_VERSION=v1.0.0 \ FDKAAC_VERSION=0.1.5 \ @@ -32,6 +33,13 @@ ENV FFMPEG_VERSION=3.2.14 \ LIBASS_VERSION=0.13.7 \ LIBVIDSTAB_VERSION=1.1.0 \ OGG_VERSION=1.3.2 \ +======= +ENV FFMPEG_VERSION=3.2.14 \ + FDKAAC_VERSION=0.1.5 \ + LAME_VERSION=3.100 \ + LIBASS_VERSION=0.13.7 \ + OGG_VERSION=1.3.2 \ +>>>>>>> 3.2.14 OPENCOREAMR_VERSION=0.1.5 \ OPUS_VERSION=1.2 \ OPENJPEG_VERSION=2.1.2 \ diff --git a/docker-images/3.2/vaapi/Dockerfile b/docker-images/3.2/vaapi/Dockerfile index 6c54d3c50..79e26ab6b 100644 --- a/docker-images/3.2/vaapi/Dockerfile +++ b/docker-images/3.2/vaapi/Dockerfile @@ -21,6 +21,7 @@ ARG LD_LIBRARY_PATH=/opt/ffmpeg/lib ARG PREFIX=/opt/ffmpeg ARG MAKEFLAGS="-j2" +<<<<<<< HEAD ENV FFMPEG_VERSION=3.2.14 \ AOM_VERSION=v1.0.0 \ FDKAAC_VERSION=0.1.5 \ @@ -32,6 +33,13 @@ ENV FFMPEG_VERSION=3.2.14 \ LIBASS_VERSION=0.13.7 \ LIBVIDSTAB_VERSION=1.1.0 \ OGG_VERSION=1.3.2 \ +======= +ENV FFMPEG_VERSION=3.2.14 \ + FDKAAC_VERSION=0.1.5 \ + LAME_VERSION=3.100 \ + LIBASS_VERSION=0.13.7 \ + OGG_VERSION=1.3.2 \ +>>>>>>> 3.2.14 OPENCOREAMR_VERSION=0.1.5 \ OPUS_VERSION=1.2 \ OPENJPEG_VERSION=2.1.2 \ diff --git a/update.py b/update.py index 3d252192b..7e929578c 100755 --- a/update.py +++ b/update.py @@ -5,7 +5,7 @@ import os import sys import re -import urllib2 +import urllib from distutils.version import StrictVersion MIN_VERSION = '2.8' From a6b1640688a69acbf622dc2468dccd542205cb0a Mon Sep 17 00:00:00 2001 From: GnaphronG Date: Wed, 12 Jun 2019 23:06:12 -0700 Subject: [PATCH 25/29] rewrite the dockerfile generation + vdapu + armv7 + dav1d --- docker-images/2.8/alpine,/Dockerfile | 14 + docker-images/2.8/arm32v7/Dockerfile | 426 +++++++++++++++++++ docker-images/2.8/centos/Dockerfile | 464 +++++++++++++++++++- docker-images/2.8/nvidia,/Dockerfile | 14 + docker-images/2.8/ubuntu/Dockerfile | 419 ++++++++++++++++++ docker-images/3.2/alpine,/Dockerfile | 14 + docker-images/3.2/arm32v7/Dockerfile | 426 +++++++++++++++++++ docker-images/3.2/centos/Dockerfile | 464 +++++++++++++++++++- docker-images/3.2/nvidia,/Dockerfile | 14 + docker-images/3.2/ubuntu/Dockerfile | 419 ++++++++++++++++++ docker-images/3.3/alpine,/Dockerfile | 14 + docker-images/3.3/arm32v7/Dockerfile | 427 +++++++++++++++++++ docker-images/3.3/centos/Dockerfile | 465 +++++++++++++++++++- docker-images/3.3/nvidia,/Dockerfile | 14 + docker-images/3.3/ubuntu/Dockerfile | 420 ++++++++++++++++++ docker-images/3.4/alpine,/Dockerfile | 14 + docker-images/3.4/arm32v7/Dockerfile | 427 +++++++++++++++++++ docker-images/3.4/centos/Dockerfile | 465 +++++++++++++++++++- docker-images/3.4/nvidia,/Dockerfile | 14 + docker-images/3.4/ubuntu/Dockerfile | 420 ++++++++++++++++++ docker-images/4.0/alpine,/Dockerfile | 14 + docker-images/4.0/arm32v7/Dockerfile | 441 +++++++++++++++++++ docker-images/4.0/centos/Dockerfile | 479 ++++++++++++++++++++- docker-images/4.0/nvidia,/Dockerfile | 14 + docker-images/4.0/ubuntu/Dockerfile | 434 +++++++++++++++++++ docker-images/4.1/alpine,/Dockerfile | 14 + docker-images/4.1/arm32v7/Dockerfile | 443 +++++++++++++++++++ docker-images/4.1/centos/Dockerfile | 481 ++++++++++++++++++++- docker-images/4.1/nvidia,/Dockerfile | 14 + docker-images/4.1/ubuntu/Dockerfile | 436 +++++++++++++++++++ docker-images/snapshot/alpine,/Dockerfile | 14 + docker-images/snapshot/arm32v7/Dockerfile | 453 ++++++++++++++++++++ docker-images/snapshot/centos/Dockerfile | 491 +++++++++++++++++++++- docker-images/snapshot/nvidia,/Dockerfile | 14 + docker-images/snapshot/ubuntu/Dockerfile | 446 ++++++++++++++++++++ docker_gen.sh | 28 ++ 36 files changed, 9563 insertions(+), 7 deletions(-) create mode 100644 docker-images/2.8/alpine,/Dockerfile create mode 100644 docker-images/2.8/arm32v7/Dockerfile create mode 100644 docker-images/2.8/nvidia,/Dockerfile create mode 100644 docker-images/3.2/alpine,/Dockerfile create mode 100644 docker-images/3.2/arm32v7/Dockerfile create mode 100644 docker-images/3.2/nvidia,/Dockerfile create mode 100644 docker-images/3.3/alpine,/Dockerfile create mode 100644 docker-images/3.3/arm32v7/Dockerfile create mode 100644 docker-images/3.3/nvidia,/Dockerfile create mode 100644 docker-images/3.4/alpine,/Dockerfile create mode 100644 docker-images/3.4/arm32v7/Dockerfile create mode 100644 docker-images/3.4/nvidia,/Dockerfile create mode 100644 docker-images/4.0/alpine,/Dockerfile create mode 100644 docker-images/4.0/arm32v7/Dockerfile create mode 100644 docker-images/4.0/nvidia,/Dockerfile create mode 100644 docker-images/4.1/alpine,/Dockerfile create mode 100644 docker-images/4.1/arm32v7/Dockerfile create mode 100644 docker-images/4.1/nvidia,/Dockerfile create mode 100644 docker-images/snapshot/alpine,/Dockerfile create mode 100644 docker-images/snapshot/arm32v7/Dockerfile create mode 100644 docker-images/snapshot/nvidia,/Dockerfile create mode 100644 docker_gen.sh diff --git a/docker-images/2.8/alpine,/Dockerfile b/docker-images/2.8/alpine,/Dockerfile new file mode 100644 index 000000000..a0b97723e --- /dev/null +++ b/docker-images/2.8/alpine,/Dockerfile @@ -0,0 +1,14 @@ +usage: update.py [-h] [--enable-libopencore-amr] [--enable-libx264] + [--enable-libx265] [--enable-libogg] [--enable-libopus] + [--enable-libvorbis] [--enable-libtheora] [--enable-libvpx] + [--enable-libmp3lame] [--enable-libxvid] + [--enable-libfdk-aac] [--enable-libopenjpeg] + [--enable-libfreetype] [--enable-libvidstab] + [--enable-libfribidi] [--enable-libfontconfig] + [--enable-libass] [--enable-libkvazaar] [--enable-libaom] + [--enable-vaapi] [--enable-nvenc] [--enable-libdav1d] + [--enable-vdpau] [--enable-all] [--with-bins] [--no-strip] + [--fat | --slim | --scratch] + {alpine,centos,ubuntu,nvidia,armv7} + {snapshot,4.1,4.0,3.4,3.3,3.2,2.8} +update.py: error: argument variant: invalid choice: 'alpine,' (choose from 'alpine', 'centos', 'ubuntu', 'nvidia', 'armv7') diff --git a/docker-images/2.8/arm32v7/Dockerfile b/docker-images/2.8/arm32v7/Dockerfile new file mode 100644 index 000000000..94446c7b7 --- /dev/null +++ b/docker-images/2.8/arm32v7/Dockerfile @@ -0,0 +1,426 @@ +FROM alpine:3.9 as base + +RUN apk add --no-cache --update libva \ + libgcc \ + libstdc++ \ + ca-certificates \ + libcrypto1.1 \ + libssl1.1 \ + libgomp \ + expat \ + libuuid + +FROM base as build + +WORKDIR /tmp/workdir + +ARG PREFIX=/tmp/build +ARG MAKEFLAGS=-j6 +ARG PKG_CONFIG_PATH=/tmp/build/lib/pkgconfig + +RUN apk add --no-cache --update libva-dev \ + autoconf \ + automake \ + bash \ + binutils \ + bzip2 \ + cmake \ + curl \ + coreutils \ + diffutils \ + file \ + g++ \ + git \ + gcc \ + gperf \ + libtool \ + make \ + python \ + openssl-dev \ + tar \ + yasm \ + nasm \ + zlib-dev \ + expat-dev \ + util-linux-dev \ + meson \ + ninja + +ARG FFMPEG_VERSION=2.8.15 +ARG LIBOPENCORE_AMR_VERSION=0.1.5 +ARG LIBX264_VERSION=20190526-2245-stable +ARG LIBX265_VERSION=3.0 +ARG LIBOGG_VERSION=1.3.3 +ARG LIBOPUS_VERSION=1.3.1 +ARG LIBVORBIS_VERSION=1.3.6 +ARG LIBTHEORA_VERSION=1.1.1 +ARG LIBVPX_VERSION=1.8.0 +ARG LIBMP3LAME_VERSION=3.100 +ARG LIBXVID_VERSION=1.3.5 +ARG LIBFDK_AAC_VERSION=0.1.6 +ARG LIBOPENJPEG_VERSION=1.5.2 +ARG LIBFREETYPE_VERSION=2.10.0 +ARG LIBVIDSTAB_VERSION=1.1.0 +ARG LIBFRIBIDI_VERSION=0.19.7 +ARG LIBFONTCONFIG_VERSION=2.13.1 +ARG LIBFREETYPE_VERSION=2.10.0 +ARG LIBFRIBIDI_VERSION=0.19.7 +ARG LIBFONTCONFIG_VERSION=2.13.1 +ARG LIBASS_VERSION=0.14.0 +ARG LIBKVAZAAR_VERSION=0.6.1 +ARG NVENC_VERSION=8.2.15.8 + +ARG LIBOGG_SHA256SUM=c2e8a485110b97550f453226ec644ebac6cb29d1caef2902c007edab4308d985 +ARG LIBOPUS_SHA256SUM=65b58e1e25b2a114157014736a3d9dfeaad8d41be1c8179866f144a2fb44ff9d +ARG LIBVORBIS_SHA256SUM=6ed40e0241089a42c48604dc00e362beee00036af2d8b3f46338031c9e0351cb +ARG LIBTHEORA_SHA256SUM=40952956c47811928d1e7922cda3bc1f427eb75680c3c37249c91e949054916b +ARG LIBVIDSTAB_SHA256SUM=14d2a053e56edad4f397be0cb3ef8eb1ec3150404ce99a426c4eb641861dc0bb +ARG LIBFRIBIDI_SHA256SUM=3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 +ARG LIBFRIBIDI_SHA256SUM=3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 + +## opencore-amr https://sourceforge.net/projects/opencore-amr/ +RUN \ + DIR=opencore-amr && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://kent.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${LIBOPENCORE_AMR_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +## x264 http://www.videolan.org/developers/x264.html +RUN \ + DIR=x264 && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://download.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-${LIBX264_VERSION}.tar.bz2 | \ + tar -jx --strip-components=1 && \ + ./configure --prefix="${PREFIX}" --enable-shared --enable-pic && \ + make && \ + make install && \ + rm -rf ${DIR} +### x265 http://x265.org/ +RUN \ + DIR=x265 && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://download.videolan.org/pub/videolan/x265/x265_${LIBX265_VERSION}.tar.gz | \ + tar -zx && \ + cd x265_${LIBX265_VERSION}/build/linux && \ + sed -i "/-DEXTRA_LIB/ s/$/ -DCMAKE_INSTALL_PREFIX=\${PREFIX}/" multilib.sh && \ + sed -i "/^cmake/ s/$/ -DENABLE_CLI=ON/" multilib.sh && \ + ./multilib.sh && \ + make -C 8bit install && \ + rm -rf ${DIR} +## libogg https://www.xiph.org/ogg/ +RUN \ + DIR=ogg && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO http://downloads.xiph.org/releases/ogg/libogg-${LIBOGG_VERSION}.tar.gz && \ + echo "${LIBOGG_SHA256SUM} libogg-${LIBOGG_VERSION}.tar.gz" | sha256sum --check && \ + tar -zx --strip-components=1 -f libogg-${LIBOGG_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +RUN \ + DIR=opus && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://archive.mozilla.org/pub/opus/opus-${LIBOPUS_VERSION}.tar.gz && \ + echo "${LIBOPUS_SHA256SUM} opus-${LIBOPUS_VERSION}.tar.gz"| sha256sum --check && \ + tar -zx --strip-components=1 -f opus-${LIBOPUS_VERSION}.tar.gz && \ + autoreconf -fiv && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +### libvorbis https://xiph.org/vorbis/ +RUN \ + DIR=vorbis && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO http://downloads.xiph.org/releases/vorbis/libvorbis-${LIBVORBIS_VERSION}.tar.gz && \ + echo "${LIBVORBIS_SHA256SUM} libvorbis-${LIBVORBIS_VERSION}.tar.gz" | sha256sum --check && \ + tar -zx --strip-components=1 -f libvorbis-${LIBVORBIS_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +### libtheora http://www.theora.org/ +RUN \ + DIR=theora && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO http://downloads.xiph.org/releases/theora/libtheora-${LIBTHEORA_VERSION}.tar.gz && \ + echo "${LIBTHEORA_SHA256SUM} libtheora-${LIBTHEORA_VERSION}.tar.gz" | sha256sum --check && \ + tar -zx --strip-components=1 -f libtheora-${LIBTHEORA_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +### libvpx https://www.webmproject.org/code/ +RUN \ + DIR=vpx && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://codeload.github.com/webmproject/libvpx/tar.gz/v${LIBVPX_VERSION} | \ + tar -zx --strip-components=1 && \ + ./configure --prefix="${PREFIX}" --enable-vp8 --enable-vp9 --enable-vp9-highbitdepth --enable-pic --enable-shared \ + --disable-debug --disable-examples --disable-docs && \ + make && \ + make install && \ + rm -rf ${DIR} + +### libmp3lame http://lame.sourceforge.net/ +RUN \ + DIR=lame && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://kent.dl.sourceforge.net/project/lame/lame/$(echo ${LIBMP3LAME_VERSION} | sed -e 's/[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)/\1.\2/')/lame-${LIBMP3LAME_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" --enable-shared --enable-nasm --enable-pic && \ + make && \ + make install && \ + rm -rf ${DIR} +### xvid https://www.xvid.com/ +RUN \ + DIR=xvid && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO http://downloads.xvid.org/downloads/xvidcore-${LIBXVID_VERSION}.tar.gz && \ + tar -zx -f xvidcore-${LIBXVID_VERSION}.tar.gz && \ + cd xvidcore/build/generic && \ + ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" --datadir="${DIR}" --enable-shared --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +### fdk-aac https://github.com/mstorsjo/fdk-aac +RUN \ + DIR=fdk-aac && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://github.com/mstorsjo/fdk-aac/archive/v${LIBFDK_AAC_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + autoreconf -fiv && \ + ./configure --prefix="${PREFIX}" --enable-shared --datadir="${DIR}" && \ + make && \ + make install && \ + rm -rf ${DIR} +## openjpeg https://github.com/uclouvain/openjpeg +RUN \ + DIR=openjpeg && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + if test `echo ${LIBOPENJPEG_VERSION} | tr -d '.'` -ge '210'; then \ + version_prefix='v'; \ + else \ + version_prefix='version.' ;\ + fi && \ + curl -sL https://github.com/uclouvain/openjpeg/archive/${version_prefix}${LIBOPENJPEG_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + cmake -DBUILD_THIRDPARTY:BOOL=ON -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ + make && \ + make install && \ + rm -rf ${DIR} +## freetype https://www.freetype.org/ +RUN \ + DIR=freetype && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://download.savannah.gnu.org/releases/freetype/freetype-${LIBFREETYPE_VERSION}.tar.gz && \ + tar -zx --strip-components=1 -f freetype-${LIBFREETYPE_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +## libvstab https://github.com/georgmartius/vid.stab +RUN \ + DIR=vid.stab && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/georgmartius/vid.stab/archive/v${LIBVIDSTAB_VERSION}.tar.gz &&\ + echo "${LIBVIDSTAB_SHA256SUM} v${LIBVIDSTAB_VERSION}.tar.gz" | sha256sum --check && \ + tar -zx --strip-components=1 -f v${LIBVIDSTAB_VERSION}.tar.gz && \ + cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ + make && \ + make install && \ + rm -rf ${DIR} +## fridibi https://www.fribidi.org/ +# + https://github.com/fribidi/fribidi/issues/8 +RUN \ + DIR=fribidi && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/fribidi/fribidi/archive/${LIBFRIBIDI_VERSION}.tar.gz && \ + echo "${LIBFRIBIDI_SHA256SUM} ${LIBFRIBIDI_VERSION}.tar.gz" | sha256sum --check && \ + tar -zx --strip-components=1 -f ${LIBFRIBIDI_VERSION}.tar.gz && \ + sed -i 's/^SUBDIRS =.*/SUBDIRS=gen.tab charset lib/' Makefile.am && \ + ./bootstrap --no-config && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ + make -j 1 && \ + make install && \ + rm -rf ${DIR} +## fontconfig https://www.freedesktop.org/wiki/Software/fontconfig/ +RUN \ + DIR=fontconfig && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://www.freedesktop.org/software/fontconfig/release/fontconfig-${LIBFONTCONFIG_VERSION}.tar.bz2 &&\ + tar -jx --strip-components=1 -f fontconfig-${LIBFONTCONFIG_VERSION}.tar.bz2 && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +## freetype https://www.freetype.org/ +RUN \ + DIR=freetype && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://download.savannah.gnu.org/releases/freetype/freetype-${LIBFREETYPE_VERSION}.tar.gz && \ + tar -zx --strip-components=1 -f freetype-${LIBFREETYPE_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +## fridibi https://www.fribidi.org/ +# + https://github.com/fribidi/fribidi/issues/8 +RUN \ + DIR=fribidi && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/fribidi/fribidi/archive/${LIBFRIBIDI_VERSION}.tar.gz && \ + echo "${LIBFRIBIDI_SHA256SUM} ${LIBFRIBIDI_VERSION}.tar.gz" | sha256sum --check && \ + tar -zx --strip-components=1 -f ${LIBFRIBIDI_VERSION}.tar.gz && \ + sed -i 's/^SUBDIRS =.*/SUBDIRS=gen.tab charset lib/' Makefile.am && \ + ./bootstrap --no-config && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ + make -j 1 && \ + make install && \ + rm -rf ${DIR} +## fontconfig https://www.freedesktop.org/wiki/Software/fontconfig/ +RUN \ + DIR=fontconfig && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://www.freedesktop.org/software/fontconfig/release/fontconfig-${LIBFONTCONFIG_VERSION}.tar.bz2 &&\ + tar -jx --strip-components=1 -f fontconfig-${LIBFONTCONFIG_VERSION}.tar.bz2 && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +RUN \ + DIR=libass && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/libass/libass/archive/${LIBASS_VERSION}.tar.gz &&\ + tar -zx --strip-components=1 -f ${LIBASS_VERSION}.tar.gz && \ + ./autogen.sh && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +## kvazaar https://github.com/ultravideo/kvazaar +RUN \ + DIR=kvazaar && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/ultravideo/kvazaar/archive/v${LIBKVAZAAR_VERSION}.tar.gz &&\ + tar -zx --strip-components=1 -f v${LIBKVAZAAR_VERSION}.tar.gz && \ + if [ -e ./autogen.sh ]; then \ + ./autogen.sh && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared ; \ + else \ + cd src ; \ + fi && \ + make && \ + make install && \ + rm -rf ${DIR} + +RUN \ + DIR=nv-codec-headers && \ + git clone --branch n${NVENC_VERSION} --depth=1 https://git.videolan.org/git/ffmpeg/nv-codec-headers.git ${DIR} && \ + cd ${DIR} && \ + sed -i 's@/usr/local@'"$PREFIX"'@' Makefile && \ + make && \ + make install && \ + rm -rf ${DIR} +RUN \ + DIR=ffmpeg && mkdir -p ${DIR} && cd ${DIR} && \ + curl -sLO https://ffmpeg.org/releases/ffmpeg-${FFMPEG_VERSION}.tar.bz2 && \ + tar -jx --strip-components=1 -f ffmpeg-${FFMPEG_VERSION}.tar.bz2 && \ + ./configure \ + --disable-debug \ + --disable-doc \ + --disable-ffplay \ + --enable-shared \ + --enable-avresample \ + --enable-openssl \ + --enable-postproc \ + --enable-small \ + --extra-cflags="-I${PREFIX}/include -I/usr/local/include" \ + --extra-ldflags="-L${PREFIX}/lib -L/usr/local/lib" \ + --enable-libopencore-amrnb \ + --enable-libopencore-amrwb \ + --enable-version3 \ + --enable-libx264 \ + --enable-libx265 \ + --enable-libopus \ + --enable-libvorbis \ + --enable-libtheora \ + --enable-libvpx \ + --enable-libmp3lame \ + --enable-libxvid \ + --enable-libfdk_aac \ + --enable-nonfree \ + --enable-libopenjpeg \ + --enable-libfreetype \ + --enable-libvidstab \ + --enable-gpl \ + --enable-libass \ + --enable-libkvazaar \ + --enable-vaapi \ + --enable-nvenc \ + --enable-nonfree \ + --prefix="${PREFIX}" && \ + make && \ + make install && \ + make distclean && \ + hash -r && \ + cd tools && \ + make qt-faststart && \ + cp qt-faststart ${PREFIX}/bin + +RUN \ + if false; then \ + LD_LIBRARY_PATH=${PREFIX}/lib ldd ${PREFIX}/bin/* | \ + cut -d ' ' -f 3 | \ + strings | \ + xargs -i cp {} /usr/local/lib/ && \ + cp ${PREFIX}/bin/ff* /usr/local/bin/ ; \ + else \ + LD_LIBRARY_PATH=${PREFIX}/lib ldd ${PREFIX}/bin/ffmpeg | \ + cut -d ' ' -f 3 | \ + strings | \ + xargs -i cp {} /usr/local/lib/ && \ + cp ${PREFIX}/bin/ff* /usr/local/bin/ ; \ + fi && \ + if true; then \ + for lib in /usr/local/lib/*.so* /usr/local/bin/*; do strip --strip-all $lib; done ; \ + fi && \ + LD_LIBRARY_PATH=/usr/local/lib ffmpeg -buildconf + + +FROM scratch AS release +MAINTAINER Julien Rottenberg + +CMD ["--help"] +ENTRYPOINT ["/bin/ffmpeg"] + +COPY --from=build /usr/local / +RUN test "scratch" = "base" && ldconfig /usr/local/lib /usr/local/lib64 + +# Let's make sure the app built correctly +# Convenient to verify on https://hub.docker.com/r/jrottenberg/ffmpeg/builds/ console output diff --git a/docker-images/2.8/centos/Dockerfile b/docker-images/2.8/centos/Dockerfile index d3f36c8ad..0054d2590 100644 --- a/docker-images/2.8/centos/Dockerfile +++ b/docker-images/2.8/centos/Dockerfile @@ -1,3 +1,4 @@ +<<<<<<< HEAD # ffmpeg - http://ffmpeg.org/download.html # # From https://trac.ffmpeg.org/wiki/CompilationGuide/Centos @@ -387,4 +388,465 @@ ENV LD_LIBRARY_PATH=/usr/local/lib64 COPY --from=build /usr/local/ /usr/local/ # Let's make sure the app built correctly -# Convenient to verify on https://hub.docker.com/r/jrottenberg/ffmpeg/builds/ console output \ No newline at end of file +# Convenient to verify on https://hub.docker.com/r/jrottenberg/ffmpeg/builds/ console output +======= +FROM centos:7 as base + +RUN yum -y install libva libgomp libuuid && \ + echo "/usr/local/lib" > /etc/ld.so.conf.d/local.conf && \ + echo "/usr/local/lib64" >> /etc/ld.so.conf.d/local.conf + +FROM base as build + +WORKDIR /tmp/workdir + +ARG PREFIX=/tmp/build +ARG MAKEFLAGS=-j6 +ARG PKG_CONFIG_PATH=/tmp/build/lib/pkgconfig:/tmp/build/lib64/pkgconfig + +RUN yum --enablerepo=extras install -y epel-release && \ + yum install -y \ + libva-devel \ + autoconf \ + automake \ + bzip2 \ + cmake \ + expat-devel \ + gcc \ + gcc-c++ \ + git \ + gperf \ + libtool \ + make \ + nasm \ + perl \ + openssl-devel \ + tar \ + yasm \ + which \ + zlib-devel \ + libuuid-devel \ + libcurl-devel \ + xz-devel \ + libarchive-devel \ + python36 \ + python36-pip + +#Centos is missing recent version of CMake (>= 3.5) +RUN \ + DIR=/tmp/cmake && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://cmake.org/files/v3.5/cmake-3.5.2.tar.gz | \ + tar -zx --strip-components=1 && \ + ./bootstrap --system-libs --no-system-jsoncpp && \ + make && \ + make install && \ + rm -rf ${DIR} + +#Centos is missing recent version of nasm (>= 2.13) +RUN \ + DIR=/tmp/nasm && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://www.nasm.us/pub/nasm/releasebuilds/2.13.03/nasm-2.13.03.tar.gz | \ + tar -zx --strip-components=1 && \ + ./configure --prefix="/usr" && \ + make && \ + make install && \ + rm -rf ${DIR} + +#Centos is missing ninja +RUN \ + DIR=/tmp/ninja && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://github.com/ninja-build/ninja/archive/v1.9.0.tar.gz | \ + tar -zx --strip-components=1 && \ + python configure.py --bootstrap && \ + cp ./ninja /usr/bin/ && \ + rm -rf ${DIR} + +RUN \ + DIR=/tmp/meson && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + pip3 install meson && \ + rm -rf ${DIR} + +ARG FFMPEG_VERSION=2.8.15 +ARG LIBOPENCORE_AMR_VERSION=0.1.5 +ARG LIBX264_VERSION=20190526-2245-stable +ARG LIBX265_VERSION=3.0 +ARG LIBOGG_VERSION=1.3.3 +ARG LIBOPUS_VERSION=1.3.1 +ARG LIBVORBIS_VERSION=1.3.6 +ARG LIBTHEORA_VERSION=1.1.1 +ARG LIBVPX_VERSION=1.8.0 +ARG LIBMP3LAME_VERSION=3.100 +ARG LIBXVID_VERSION=1.3.5 +ARG LIBFDK_AAC_VERSION=0.1.6 +ARG LIBOPENJPEG_VERSION=1.5.2 +ARG LIBFREETYPE_VERSION=2.10.0 +ARG LIBVIDSTAB_VERSION=1.1.0 +ARG LIBFRIBIDI_VERSION=0.19.7 +ARG LIBFONTCONFIG_VERSION=2.13.1 +ARG LIBFREETYPE_VERSION=2.10.0 +ARG LIBFRIBIDI_VERSION=0.19.7 +ARG LIBFONTCONFIG_VERSION=2.13.1 +ARG LIBASS_VERSION=0.14.0 +ARG LIBKVAZAAR_VERSION=0.6.1 +ARG NVENC_VERSION=8.2.15.8 + +ARG LIBOGG_SHA256SUM=c2e8a485110b97550f453226ec644ebac6cb29d1caef2902c007edab4308d985 +ARG LIBOPUS_SHA256SUM=65b58e1e25b2a114157014736a3d9dfeaad8d41be1c8179866f144a2fb44ff9d +ARG LIBVORBIS_SHA256SUM=6ed40e0241089a42c48604dc00e362beee00036af2d8b3f46338031c9e0351cb +ARG LIBTHEORA_SHA256SUM=40952956c47811928d1e7922cda3bc1f427eb75680c3c37249c91e949054916b +ARG LIBVIDSTAB_SHA256SUM=14d2a053e56edad4f397be0cb3ef8eb1ec3150404ce99a426c4eb641861dc0bb +ARG LIBFRIBIDI_SHA256SUM=3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 +ARG LIBFRIBIDI_SHA256SUM=3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 + +## opencore-amr https://sourceforge.net/projects/opencore-amr/ +RUN \ + DIR=opencore-amr && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://kent.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${LIBOPENCORE_AMR_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +## x264 http://www.videolan.org/developers/x264.html +RUN \ + DIR=x264 && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://download.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-${LIBX264_VERSION}.tar.bz2 | \ + tar -jx --strip-components=1 && \ + ./configure --prefix="${PREFIX}" --enable-shared --enable-pic && \ + make && \ + make install && \ + rm -rf ${DIR} +### x265 http://x265.org/ +RUN \ + DIR=x265 && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://download.videolan.org/pub/videolan/x265/x265_${LIBX265_VERSION}.tar.gz | \ + tar -zx && \ + cd x265_${LIBX265_VERSION}/build/linux && \ + sed -i "/-DEXTRA_LIB/ s/$/ -DCMAKE_INSTALL_PREFIX=\${PREFIX}/" multilib.sh && \ + sed -i "/^cmake/ s/$/ -DENABLE_CLI=ON/" multilib.sh && \ + ./multilib.sh && \ + make -C 8bit install && \ + rm -rf ${DIR} +## libogg https://www.xiph.org/ogg/ +RUN \ + DIR=ogg && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO http://downloads.xiph.org/releases/ogg/libogg-${LIBOGG_VERSION}.tar.gz && \ + echo "${LIBOGG_SHA256SUM} libogg-${LIBOGG_VERSION}.tar.gz" | sha256sum --check && \ + tar -zx --strip-components=1 -f libogg-${LIBOGG_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +RUN \ + DIR=opus && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://archive.mozilla.org/pub/opus/opus-${LIBOPUS_VERSION}.tar.gz && \ + echo "${LIBOPUS_SHA256SUM} opus-${LIBOPUS_VERSION}.tar.gz"| sha256sum --check && \ + tar -zx --strip-components=1 -f opus-${LIBOPUS_VERSION}.tar.gz && \ + autoreconf -fiv && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +### libvorbis https://xiph.org/vorbis/ +RUN \ + DIR=vorbis && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO http://downloads.xiph.org/releases/vorbis/libvorbis-${LIBVORBIS_VERSION}.tar.gz && \ + echo "${LIBVORBIS_SHA256SUM} libvorbis-${LIBVORBIS_VERSION}.tar.gz" | sha256sum --check && \ + tar -zx --strip-components=1 -f libvorbis-${LIBVORBIS_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +### libtheora http://www.theora.org/ +RUN \ + DIR=theora && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO http://downloads.xiph.org/releases/theora/libtheora-${LIBTHEORA_VERSION}.tar.gz && \ + echo "${LIBTHEORA_SHA256SUM} libtheora-${LIBTHEORA_VERSION}.tar.gz" | sha256sum --check && \ + tar -zx --strip-components=1 -f libtheora-${LIBTHEORA_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +### libvpx https://www.webmproject.org/code/ +RUN \ + DIR=vpx && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://codeload.github.com/webmproject/libvpx/tar.gz/v${LIBVPX_VERSION} | \ + tar -zx --strip-components=1 && \ + ./configure --prefix="${PREFIX}" --enable-vp8 --enable-vp9 --enable-vp9-highbitdepth --enable-pic --enable-shared \ + --disable-debug --disable-examples --disable-docs && \ + make && \ + make install && \ + rm -rf ${DIR} + +### libmp3lame http://lame.sourceforge.net/ +RUN \ + DIR=lame && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://kent.dl.sourceforge.net/project/lame/lame/$(echo ${LIBMP3LAME_VERSION} | sed -e 's/[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)/\1.\2/')/lame-${LIBMP3LAME_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" --enable-shared --enable-nasm --enable-pic && \ + make && \ + make install && \ + rm -rf ${DIR} +### xvid https://www.xvid.com/ +RUN \ + DIR=xvid && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO http://downloads.xvid.org/downloads/xvidcore-${LIBXVID_VERSION}.tar.gz && \ + tar -zx -f xvidcore-${LIBXVID_VERSION}.tar.gz && \ + cd xvidcore/build/generic && \ + ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" --datadir="${DIR}" --enable-shared --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +### fdk-aac https://github.com/mstorsjo/fdk-aac +RUN \ + DIR=fdk-aac && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://github.com/mstorsjo/fdk-aac/archive/v${LIBFDK_AAC_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + autoreconf -fiv && \ + ./configure --prefix="${PREFIX}" --enable-shared --datadir="${DIR}" && \ + make && \ + make install && \ + rm -rf ${DIR} +## openjpeg https://github.com/uclouvain/openjpeg +RUN \ + DIR=openjpeg && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + if test `echo ${LIBOPENJPEG_VERSION} | tr -d '.'` -ge '210'; then \ + version_prefix='v'; \ + else \ + version_prefix='version.' ;\ + fi && \ + curl -sL https://github.com/uclouvain/openjpeg/archive/${version_prefix}${LIBOPENJPEG_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + cmake -DBUILD_THIRDPARTY:BOOL=ON -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ + make && \ + make install && \ + rm -rf ${DIR} +## freetype https://www.freetype.org/ +RUN \ + DIR=freetype && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://download.savannah.gnu.org/releases/freetype/freetype-${LIBFREETYPE_VERSION}.tar.gz && \ + tar -zx --strip-components=1 -f freetype-${LIBFREETYPE_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +## libvstab https://github.com/georgmartius/vid.stab +RUN \ + DIR=vid.stab && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/georgmartius/vid.stab/archive/v${LIBVIDSTAB_VERSION}.tar.gz &&\ + echo "${LIBVIDSTAB_SHA256SUM} v${LIBVIDSTAB_VERSION}.tar.gz" | sha256sum --check && \ + tar -zx --strip-components=1 -f v${LIBVIDSTAB_VERSION}.tar.gz && \ + cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ + make && \ + make install && \ + rm -rf ${DIR} +## fridibi https://www.fribidi.org/ +# + https://github.com/fribidi/fribidi/issues/8 +RUN \ + DIR=fribidi && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/fribidi/fribidi/archive/${LIBFRIBIDI_VERSION}.tar.gz && \ + echo "${LIBFRIBIDI_SHA256SUM} ${LIBFRIBIDI_VERSION}.tar.gz" | sha256sum --check && \ + tar -zx --strip-components=1 -f ${LIBFRIBIDI_VERSION}.tar.gz && \ + sed -i 's/^SUBDIRS =.*/SUBDIRS=gen.tab charset lib/' Makefile.am && \ + ./bootstrap --no-config && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ + make -j 1 && \ + make install && \ + rm -rf ${DIR} +## fontconfig https://www.freedesktop.org/wiki/Software/fontconfig/ +RUN \ + DIR=fontconfig && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://www.freedesktop.org/software/fontconfig/release/fontconfig-${LIBFONTCONFIG_VERSION}.tar.bz2 &&\ + tar -jx --strip-components=1 -f fontconfig-${LIBFONTCONFIG_VERSION}.tar.bz2 && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +## freetype https://www.freetype.org/ +RUN \ + DIR=freetype && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://download.savannah.gnu.org/releases/freetype/freetype-${LIBFREETYPE_VERSION}.tar.gz && \ + tar -zx --strip-components=1 -f freetype-${LIBFREETYPE_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +## fridibi https://www.fribidi.org/ +# + https://github.com/fribidi/fribidi/issues/8 +RUN \ + DIR=fribidi && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/fribidi/fribidi/archive/${LIBFRIBIDI_VERSION}.tar.gz && \ + echo "${LIBFRIBIDI_SHA256SUM} ${LIBFRIBIDI_VERSION}.tar.gz" | sha256sum --check && \ + tar -zx --strip-components=1 -f ${LIBFRIBIDI_VERSION}.tar.gz && \ + sed -i 's/^SUBDIRS =.*/SUBDIRS=gen.tab charset lib/' Makefile.am && \ + ./bootstrap --no-config && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ + make -j 1 && \ + make install && \ + rm -rf ${DIR} +## fontconfig https://www.freedesktop.org/wiki/Software/fontconfig/ +RUN \ + DIR=fontconfig && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://www.freedesktop.org/software/fontconfig/release/fontconfig-${LIBFONTCONFIG_VERSION}.tar.bz2 &&\ + tar -jx --strip-components=1 -f fontconfig-${LIBFONTCONFIG_VERSION}.tar.bz2 && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +RUN \ + DIR=libass && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/libass/libass/archive/${LIBASS_VERSION}.tar.gz &&\ + tar -zx --strip-components=1 -f ${LIBASS_VERSION}.tar.gz && \ + ./autogen.sh && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +## kvazaar https://github.com/ultravideo/kvazaar +RUN \ + DIR=kvazaar && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/ultravideo/kvazaar/archive/v${LIBKVAZAAR_VERSION}.tar.gz &&\ + tar -zx --strip-components=1 -f v${LIBKVAZAAR_VERSION}.tar.gz && \ + if [ -e ./autogen.sh ]; then \ + ./autogen.sh && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared ; \ + else \ + cd src ; \ + fi && \ + make && \ + make install && \ + rm -rf ${DIR} + +RUN \ + DIR=nv-codec-headers && \ + git clone --branch n${NVENC_VERSION} --depth=1 https://git.videolan.org/git/ffmpeg/nv-codec-headers.git ${DIR} && \ + cd ${DIR} && \ + sed -i 's@/usr/local@'"$PREFIX"'@' Makefile && \ + make && \ + make install && \ + rm -rf ${DIR} +RUN \ + DIR=ffmpeg && mkdir -p ${DIR} && cd ${DIR} && \ + curl -sLO https://ffmpeg.org/releases/ffmpeg-${FFMPEG_VERSION}.tar.bz2 && \ + tar -jx --strip-components=1 -f ffmpeg-${FFMPEG_VERSION}.tar.bz2 && \ + ./configure \ + --disable-debug \ + --disable-doc \ + --disable-ffplay \ + --enable-shared \ + --enable-avresample \ + --enable-openssl \ + --enable-postproc \ + --enable-small \ + --extra-cflags="-I${PREFIX}/include -I/usr/local/include" \ + --extra-ldflags="-L${PREFIX}/lib -L/usr/local/lib" \ + --enable-libopencore-amrnb \ + --enable-libopencore-amrwb \ + --enable-version3 \ + --enable-libx264 \ + --enable-libx265 \ + --enable-libopus \ + --enable-libvorbis \ + --enable-libtheora \ + --enable-libvpx \ + --enable-libmp3lame \ + --enable-libxvid \ + --enable-libfdk_aac \ + --enable-nonfree \ + --enable-libopenjpeg \ + --enable-libfreetype \ + --enable-libvidstab \ + --enable-gpl \ + --enable-libass \ + --enable-libkvazaar \ + --enable-vaapi \ + --enable-nvenc \ + --enable-nonfree \ + --prefix="${PREFIX}" && \ + make && \ + make install && \ + make distclean && \ + hash -r && \ + cd tools && \ + make qt-faststart && \ + cp qt-faststart ${PREFIX}/bin + +RUN \ + if false; then \ + cp -r ${PREFIX}/lib/*so* /usr/local/lib/ && \ + cp ${PREFIX}/bin/* /usr/local/bin/ ; \ + else \ + LD_LIBRARY_PATH=${PREFIX}/lib ldd ${PREFIX}/bin/ffmpeg | \ + grep ${PREFIX} | \ + cut -d ' ' -f 3 | \ + xargs -i cp {} /usr/local/lib/ && \ + cp ${PREFIX}/bin/ff* /usr/local/bin/ ; \ + fi && \ + if true; then \ + for lib in /usr/local/lib/*.so* /usr/local/bin/*; do strip --strip-all $lib; done ; \ + fi && \ + cp -r ${PREFIX}/share/ffmpeg /usr/local/share/ && \ + LD_LIBRARY_PATH=/usr/local/lib ffmpeg -buildconf + +FROM base AS release +MAINTAINER Julien Rottenberg + +CMD ["--help"] +ENTRYPOINT ["ffmpeg"] + +COPY --from=build /usr/local /usr/local +RUN test "base" = "base" && ldconfig /usr/local/lib /usr/local/lib64 + +# Let's make sure the app built correctly +# Convenient to verify on https://hub.docker.com/r/jrottenberg/ffmpeg/builds/ console output +>>>>>>> rewrite the dockerfile generation + vdapu + armv7 + dav1d diff --git a/docker-images/2.8/nvidia,/Dockerfile b/docker-images/2.8/nvidia,/Dockerfile new file mode 100644 index 000000000..452b62c02 --- /dev/null +++ b/docker-images/2.8/nvidia,/Dockerfile @@ -0,0 +1,14 @@ +usage: update.py [-h] [--enable-libopencore-amr] [--enable-libx264] + [--enable-libx265] [--enable-libogg] [--enable-libopus] + [--enable-libvorbis] [--enable-libtheora] [--enable-libvpx] + [--enable-libmp3lame] [--enable-libxvid] + [--enable-libfdk-aac] [--enable-libopenjpeg] + [--enable-libfreetype] [--enable-libvidstab] + [--enable-libfribidi] [--enable-libfontconfig] + [--enable-libass] [--enable-libkvazaar] [--enable-libaom] + [--enable-vaapi] [--enable-nvenc] [--enable-libdav1d] + [--enable-vdpau] [--enable-all] [--with-bins] [--no-strip] + [--fat | --slim | --scratch] + {alpine,centos,ubuntu,nvidia,armv7} + {snapshot,4.1,4.0,3.4,3.3,3.2,2.8} +update.py: error: argument variant: invalid choice: 'nvidia,' (choose from 'alpine', 'centos', 'ubuntu', 'nvidia', 'armv7') diff --git a/docker-images/2.8/ubuntu/Dockerfile b/docker-images/2.8/ubuntu/Dockerfile index 9010b7a66..52a400d5f 100644 --- a/docker-images/2.8/ubuntu/Dockerfile +++ b/docker-images/2.8/ubuntu/Dockerfile @@ -1,3 +1,4 @@ +<<<<<<< HEAD # ffmpeg - http://ffmpeg.org/download.html # # From https://trac.ffmpeg.org/wiki/CompilationGuide/Ubuntu @@ -389,3 +390,421 @@ COPY --from=build /usr/local /usr/local/ # Let's make sure the app built correctly # Convenient to verify on https://hub.docker.com/r/jrottenberg/ffmpeg/builds/ console output +======= +FROM ubuntu:18.04 AS base + +RUN apt-get -yqq update && \ + apt-get install -yq --no-install-recommends libva2 libva-drm2 i965-va-driver ca-certificates expat libgomp1 libuuid1 libssl1.0 && \ + apt-get autoremove -y && \ + apt-get clean -y + +FROM base as build + +WORKDIR /tmp/workdir + +ARG PREFIX=/tmp/build +ARG MAKEFLAGS=-j6 +ARG PKG_CONFIG_PATH=/tmp/build/lib/pkgconfig + +RUN apt-get -yqq update && \ + apt-get install -yq --no-install-recommends \ + libva-dev \ + autoconf \ + automake \ + cmake \ + curl \ + bzip2 \ + libexpat1-dev \ + g++ \ + gcc \ + git \ + gperf \ + libtool \ + make \ + nasm \ + perl \ + pkg-config \ + python \ + libssl1.0-dev \ + yasm \ + zlib1g-dev \ + uuid-dev \ + ninja-build \ + meson + +ARG FFMPEG_VERSION=2.8.15 +ARG LIBOPENCORE_AMR_VERSION=0.1.5 +ARG LIBX264_VERSION=20190526-2245-stable +ARG LIBX265_VERSION=3.0 +ARG LIBOGG_VERSION=1.3.3 +ARG LIBOPUS_VERSION=1.3.1 +ARG LIBVORBIS_VERSION=1.3.6 +ARG LIBTHEORA_VERSION=1.1.1 +ARG LIBVPX_VERSION=1.8.0 +ARG LIBMP3LAME_VERSION=3.100 +ARG LIBXVID_VERSION=1.3.5 +ARG LIBFDK_AAC_VERSION=0.1.6 +ARG LIBOPENJPEG_VERSION=1.5.2 +ARG LIBFREETYPE_VERSION=2.10.0 +ARG LIBVIDSTAB_VERSION=1.1.0 +ARG LIBFRIBIDI_VERSION=0.19.7 +ARG LIBFONTCONFIG_VERSION=2.13.1 +ARG LIBFREETYPE_VERSION=2.10.0 +ARG LIBFRIBIDI_VERSION=0.19.7 +ARG LIBFONTCONFIG_VERSION=2.13.1 +ARG LIBASS_VERSION=0.14.0 +ARG LIBKVAZAAR_VERSION=0.6.1 +ARG NVENC_VERSION=8.2.15.8 + +ARG LIBOGG_SHA256SUM=c2e8a485110b97550f453226ec644ebac6cb29d1caef2902c007edab4308d985 +ARG LIBOPUS_SHA256SUM=65b58e1e25b2a114157014736a3d9dfeaad8d41be1c8179866f144a2fb44ff9d +ARG LIBVORBIS_SHA256SUM=6ed40e0241089a42c48604dc00e362beee00036af2d8b3f46338031c9e0351cb +ARG LIBTHEORA_SHA256SUM=40952956c47811928d1e7922cda3bc1f427eb75680c3c37249c91e949054916b +ARG LIBVIDSTAB_SHA256SUM=14d2a053e56edad4f397be0cb3ef8eb1ec3150404ce99a426c4eb641861dc0bb +ARG LIBFRIBIDI_SHA256SUM=3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 +ARG LIBFRIBIDI_SHA256SUM=3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 + +## opencore-amr https://sourceforge.net/projects/opencore-amr/ +RUN \ + DIR=opencore-amr && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://kent.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${LIBOPENCORE_AMR_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +## x264 http://www.videolan.org/developers/x264.html +RUN \ + DIR=x264 && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://download.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-${LIBX264_VERSION}.tar.bz2 | \ + tar -jx --strip-components=1 && \ + ./configure --prefix="${PREFIX}" --enable-shared --enable-pic && \ + make && \ + make install && \ + rm -rf ${DIR} +### x265 http://x265.org/ +RUN \ + DIR=x265 && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://download.videolan.org/pub/videolan/x265/x265_${LIBX265_VERSION}.tar.gz | \ + tar -zx && \ + cd x265_${LIBX265_VERSION}/build/linux && \ + sed -i "/-DEXTRA_LIB/ s/$/ -DCMAKE_INSTALL_PREFIX=\${PREFIX}/" multilib.sh && \ + sed -i "/^cmake/ s/$/ -DENABLE_CLI=ON/" multilib.sh && \ + ./multilib.sh && \ + make -C 8bit install && \ + rm -rf ${DIR} +## libogg https://www.xiph.org/ogg/ +RUN \ + DIR=ogg && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO http://downloads.xiph.org/releases/ogg/libogg-${LIBOGG_VERSION}.tar.gz && \ + echo "${LIBOGG_SHA256SUM} libogg-${LIBOGG_VERSION}.tar.gz" | sha256sum --check && \ + tar -zx --strip-components=1 -f libogg-${LIBOGG_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +RUN \ + DIR=opus && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://archive.mozilla.org/pub/opus/opus-${LIBOPUS_VERSION}.tar.gz && \ + echo "${LIBOPUS_SHA256SUM} opus-${LIBOPUS_VERSION}.tar.gz"| sha256sum --check && \ + tar -zx --strip-components=1 -f opus-${LIBOPUS_VERSION}.tar.gz && \ + autoreconf -fiv && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +### libvorbis https://xiph.org/vorbis/ +RUN \ + DIR=vorbis && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO http://downloads.xiph.org/releases/vorbis/libvorbis-${LIBVORBIS_VERSION}.tar.gz && \ + echo "${LIBVORBIS_SHA256SUM} libvorbis-${LIBVORBIS_VERSION}.tar.gz" | sha256sum --check && \ + tar -zx --strip-components=1 -f libvorbis-${LIBVORBIS_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +### libtheora http://www.theora.org/ +RUN \ + DIR=theora && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO http://downloads.xiph.org/releases/theora/libtheora-${LIBTHEORA_VERSION}.tar.gz && \ + echo "${LIBTHEORA_SHA256SUM} libtheora-${LIBTHEORA_VERSION}.tar.gz" | sha256sum --check && \ + tar -zx --strip-components=1 -f libtheora-${LIBTHEORA_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +### libvpx https://www.webmproject.org/code/ +RUN \ + DIR=vpx && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://codeload.github.com/webmproject/libvpx/tar.gz/v${LIBVPX_VERSION} | \ + tar -zx --strip-components=1 && \ + ./configure --prefix="${PREFIX}" --enable-vp8 --enable-vp9 --enable-vp9-highbitdepth --enable-pic --enable-shared \ + --disable-debug --disable-examples --disable-docs && \ + make && \ + make install && \ + rm -rf ${DIR} + +### libmp3lame http://lame.sourceforge.net/ +RUN \ + DIR=lame && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://kent.dl.sourceforge.net/project/lame/lame/$(echo ${LIBMP3LAME_VERSION} | sed -e 's/[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)/\1.\2/')/lame-${LIBMP3LAME_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" --enable-shared --enable-nasm --enable-pic && \ + make && \ + make install && \ + rm -rf ${DIR} +### xvid https://www.xvid.com/ +RUN \ + DIR=xvid && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO http://downloads.xvid.org/downloads/xvidcore-${LIBXVID_VERSION}.tar.gz && \ + tar -zx -f xvidcore-${LIBXVID_VERSION}.tar.gz && \ + cd xvidcore/build/generic && \ + ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" --datadir="${DIR}" --enable-shared --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +### fdk-aac https://github.com/mstorsjo/fdk-aac +RUN \ + DIR=fdk-aac && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://github.com/mstorsjo/fdk-aac/archive/v${LIBFDK_AAC_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + autoreconf -fiv && \ + ./configure --prefix="${PREFIX}" --enable-shared --datadir="${DIR}" && \ + make && \ + make install && \ + rm -rf ${DIR} +## openjpeg https://github.com/uclouvain/openjpeg +RUN \ + DIR=openjpeg && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + if test `echo ${LIBOPENJPEG_VERSION} | tr -d '.'` -ge '210'; then \ + version_prefix='v'; \ + else \ + version_prefix='version.' ;\ + fi && \ + curl -sL https://github.com/uclouvain/openjpeg/archive/${version_prefix}${LIBOPENJPEG_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + cmake -DBUILD_THIRDPARTY:BOOL=ON -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ + make && \ + make install && \ + rm -rf ${DIR} +## freetype https://www.freetype.org/ +RUN \ + DIR=freetype && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://download.savannah.gnu.org/releases/freetype/freetype-${LIBFREETYPE_VERSION}.tar.gz && \ + tar -zx --strip-components=1 -f freetype-${LIBFREETYPE_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +## libvstab https://github.com/georgmartius/vid.stab +RUN \ + DIR=vid.stab && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/georgmartius/vid.stab/archive/v${LIBVIDSTAB_VERSION}.tar.gz &&\ + echo "${LIBVIDSTAB_SHA256SUM} v${LIBVIDSTAB_VERSION}.tar.gz" | sha256sum --check && \ + tar -zx --strip-components=1 -f v${LIBVIDSTAB_VERSION}.tar.gz && \ + cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ + make && \ + make install && \ + rm -rf ${DIR} +## fridibi https://www.fribidi.org/ +# + https://github.com/fribidi/fribidi/issues/8 +RUN \ + DIR=fribidi && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/fribidi/fribidi/archive/${LIBFRIBIDI_VERSION}.tar.gz && \ + echo "${LIBFRIBIDI_SHA256SUM} ${LIBFRIBIDI_VERSION}.tar.gz" | sha256sum --check && \ + tar -zx --strip-components=1 -f ${LIBFRIBIDI_VERSION}.tar.gz && \ + sed -i 's/^SUBDIRS =.*/SUBDIRS=gen.tab charset lib/' Makefile.am && \ + ./bootstrap --no-config && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ + make -j 1 && \ + make install && \ + rm -rf ${DIR} +## fontconfig https://www.freedesktop.org/wiki/Software/fontconfig/ +RUN \ + DIR=fontconfig && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://www.freedesktop.org/software/fontconfig/release/fontconfig-${LIBFONTCONFIG_VERSION}.tar.bz2 &&\ + tar -jx --strip-components=1 -f fontconfig-${LIBFONTCONFIG_VERSION}.tar.bz2 && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +## freetype https://www.freetype.org/ +RUN \ + DIR=freetype && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://download.savannah.gnu.org/releases/freetype/freetype-${LIBFREETYPE_VERSION}.tar.gz && \ + tar -zx --strip-components=1 -f freetype-${LIBFREETYPE_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +## fridibi https://www.fribidi.org/ +# + https://github.com/fribidi/fribidi/issues/8 +RUN \ + DIR=fribidi && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/fribidi/fribidi/archive/${LIBFRIBIDI_VERSION}.tar.gz && \ + echo "${LIBFRIBIDI_SHA256SUM} ${LIBFRIBIDI_VERSION}.tar.gz" | sha256sum --check && \ + tar -zx --strip-components=1 -f ${LIBFRIBIDI_VERSION}.tar.gz && \ + sed -i 's/^SUBDIRS =.*/SUBDIRS=gen.tab charset lib/' Makefile.am && \ + ./bootstrap --no-config && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ + make -j 1 && \ + make install && \ + rm -rf ${DIR} +## fontconfig https://www.freedesktop.org/wiki/Software/fontconfig/ +RUN \ + DIR=fontconfig && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://www.freedesktop.org/software/fontconfig/release/fontconfig-${LIBFONTCONFIG_VERSION}.tar.bz2 &&\ + tar -jx --strip-components=1 -f fontconfig-${LIBFONTCONFIG_VERSION}.tar.bz2 && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +RUN \ + DIR=libass && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/libass/libass/archive/${LIBASS_VERSION}.tar.gz &&\ + tar -zx --strip-components=1 -f ${LIBASS_VERSION}.tar.gz && \ + ./autogen.sh && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +## kvazaar https://github.com/ultravideo/kvazaar +RUN \ + DIR=kvazaar && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/ultravideo/kvazaar/archive/v${LIBKVAZAAR_VERSION}.tar.gz &&\ + tar -zx --strip-components=1 -f v${LIBKVAZAAR_VERSION}.tar.gz && \ + if [ -e ./autogen.sh ]; then \ + ./autogen.sh && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared ; \ + else \ + cd src ; \ + fi && \ + make && \ + make install && \ + rm -rf ${DIR} + +RUN \ + DIR=nv-codec-headers && \ + git clone --branch n${NVENC_VERSION} --depth=1 https://git.videolan.org/git/ffmpeg/nv-codec-headers.git ${DIR} && \ + cd ${DIR} && \ + sed -i 's@/usr/local@'"$PREFIX"'@' Makefile && \ + make && \ + make install && \ + rm -rf ${DIR} +RUN \ + DIR=ffmpeg && mkdir -p ${DIR} && cd ${DIR} && \ + curl -sLO https://ffmpeg.org/releases/ffmpeg-${FFMPEG_VERSION}.tar.bz2 && \ + tar -jx --strip-components=1 -f ffmpeg-${FFMPEG_VERSION}.tar.bz2 && \ + ./configure \ + --disable-debug \ + --disable-doc \ + --disable-ffplay \ + --enable-shared \ + --enable-avresample \ + --enable-openssl \ + --enable-postproc \ + --enable-small \ + --extra-cflags="-I${PREFIX}/include -I/usr/local/include" \ + --extra-ldflags="-L${PREFIX}/lib -L/usr/local/lib" \ + --enable-libopencore-amrnb \ + --enable-libopencore-amrwb \ + --enable-version3 \ + --enable-libx264 \ + --enable-libx265 \ + --enable-libopus \ + --enable-libvorbis \ + --enable-libtheora \ + --enable-libvpx \ + --enable-libmp3lame \ + --enable-libxvid \ + --enable-libfdk_aac \ + --enable-nonfree \ + --enable-libopenjpeg \ + --enable-libfreetype \ + --enable-libvidstab \ + --enable-gpl \ + --enable-libass \ + --enable-libkvazaar \ + --enable-vaapi \ + --enable-nvenc \ + --enable-nonfree \ + --prefix="${PREFIX}" && \ + make && \ + make install && \ + make distclean && \ + hash -r && \ + cd tools && \ + make qt-faststart && \ + cp qt-faststart ${PREFIX}/bin + +RUN \ + if false; then \ + cp -r ${PREFIX}/lib/*so* /usr/local/lib/ && \ + cp ${PREFIX}/bin/* /usr/local/bin/ ; \ + else \ + LD_LIBRARY_PATH=${PREFIX}/lib ldd ${PREFIX}/bin/ffmpeg | \ + grep ${PREFIX} | \ + cut -d ' ' -f 3 | \ + xargs -i cp {} /usr/local/lib/ && \ + cp ${PREFIX}/bin/ff* /usr/local/bin/ ; \ + fi && \ + if true; then \ + for lib in /usr/local/lib/*.so* /usr/local/bin/*; do strip --strip-all $lib; done ; \ + fi && \ + cp -r ${PREFIX}/share/ffmpeg /usr/local/share/ && \ + LD_LIBRARY_PATH=/usr/local/lib ffmpeg -buildconf + +FROM base AS release +MAINTAINER Julien Rottenberg + +CMD ["--help"] +ENTRYPOINT ["ffmpeg"] + +COPY --from=build /usr/local /usr/local +RUN test "base" = "base" && ldconfig /usr/local/lib /usr/local/lib64 + +# Let's make sure the app built correctly +# Convenient to verify on https://hub.docker.com/r/jrottenberg/ffmpeg/builds/ console output +>>>>>>> rewrite the dockerfile generation + vdapu + armv7 + dav1d diff --git a/docker-images/3.2/alpine,/Dockerfile b/docker-images/3.2/alpine,/Dockerfile new file mode 100644 index 000000000..a0b97723e --- /dev/null +++ b/docker-images/3.2/alpine,/Dockerfile @@ -0,0 +1,14 @@ +usage: update.py [-h] [--enable-libopencore-amr] [--enable-libx264] + [--enable-libx265] [--enable-libogg] [--enable-libopus] + [--enable-libvorbis] [--enable-libtheora] [--enable-libvpx] + [--enable-libmp3lame] [--enable-libxvid] + [--enable-libfdk-aac] [--enable-libopenjpeg] + [--enable-libfreetype] [--enable-libvidstab] + [--enable-libfribidi] [--enable-libfontconfig] + [--enable-libass] [--enable-libkvazaar] [--enable-libaom] + [--enable-vaapi] [--enable-nvenc] [--enable-libdav1d] + [--enable-vdpau] [--enable-all] [--with-bins] [--no-strip] + [--fat | --slim | --scratch] + {alpine,centos,ubuntu,nvidia,armv7} + {snapshot,4.1,4.0,3.4,3.3,3.2,2.8} +update.py: error: argument variant: invalid choice: 'alpine,' (choose from 'alpine', 'centos', 'ubuntu', 'nvidia', 'armv7') diff --git a/docker-images/3.2/arm32v7/Dockerfile b/docker-images/3.2/arm32v7/Dockerfile new file mode 100644 index 000000000..e5824abb0 --- /dev/null +++ b/docker-images/3.2/arm32v7/Dockerfile @@ -0,0 +1,426 @@ +FROM alpine:3.9 as base + +RUN apk add --no-cache --update libva \ + libgcc \ + libstdc++ \ + ca-certificates \ + libcrypto1.1 \ + libssl1.1 \ + libgomp \ + expat \ + libuuid + +FROM base as build + +WORKDIR /tmp/workdir + +ARG PREFIX=/tmp/build +ARG MAKEFLAGS=-j6 +ARG PKG_CONFIG_PATH=/tmp/build/lib/pkgconfig + +RUN apk add --no-cache --update libva-dev \ + autoconf \ + automake \ + bash \ + binutils \ + bzip2 \ + cmake \ + curl \ + coreutils \ + diffutils \ + file \ + g++ \ + git \ + gcc \ + gperf \ + libtool \ + make \ + python \ + openssl-dev \ + tar \ + yasm \ + nasm \ + zlib-dev \ + expat-dev \ + util-linux-dev \ + meson \ + ninja + +ARG FFMPEG_VERSION=3.2.14 +ARG LIBOPENCORE_AMR_VERSION=0.1.5 +ARG LIBX264_VERSION=20190526-2245-stable +ARG LIBX265_VERSION=3.0 +ARG LIBOGG_VERSION=1.3.3 +ARG LIBOPUS_VERSION=1.3.1 +ARG LIBVORBIS_VERSION=1.3.6 +ARG LIBTHEORA_VERSION=1.1.1 +ARG LIBVPX_VERSION=1.8.0 +ARG LIBMP3LAME_VERSION=3.100 +ARG LIBXVID_VERSION=1.3.5 +ARG LIBFDK_AAC_VERSION=0.1.6 +ARG LIBOPENJPEG_VERSION=2.1.2 +ARG LIBFREETYPE_VERSION=2.10.0 +ARG LIBVIDSTAB_VERSION=1.1.0 +ARG LIBFRIBIDI_VERSION=0.19.7 +ARG LIBFONTCONFIG_VERSION=2.13.1 +ARG LIBFREETYPE_VERSION=2.10.0 +ARG LIBFRIBIDI_VERSION=0.19.7 +ARG LIBFONTCONFIG_VERSION=2.13.1 +ARG LIBASS_VERSION=0.14.0 +ARG LIBKVAZAAR_VERSION=1.2.0 +ARG NVENC_VERSION=9.0.18.1 + +ARG LIBOGG_SHA256SUM=c2e8a485110b97550f453226ec644ebac6cb29d1caef2902c007edab4308d985 +ARG LIBOPUS_SHA256SUM=65b58e1e25b2a114157014736a3d9dfeaad8d41be1c8179866f144a2fb44ff9d +ARG LIBVORBIS_SHA256SUM=6ed40e0241089a42c48604dc00e362beee00036af2d8b3f46338031c9e0351cb +ARG LIBTHEORA_SHA256SUM=40952956c47811928d1e7922cda3bc1f427eb75680c3c37249c91e949054916b +ARG LIBVIDSTAB_SHA256SUM=14d2a053e56edad4f397be0cb3ef8eb1ec3150404ce99a426c4eb641861dc0bb +ARG LIBFRIBIDI_SHA256SUM=3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 +ARG LIBFRIBIDI_SHA256SUM=3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 + +## opencore-amr https://sourceforge.net/projects/opencore-amr/ +RUN \ + DIR=opencore-amr && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://kent.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${LIBOPENCORE_AMR_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +## x264 http://www.videolan.org/developers/x264.html +RUN \ + DIR=x264 && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://download.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-${LIBX264_VERSION}.tar.bz2 | \ + tar -jx --strip-components=1 && \ + ./configure --prefix="${PREFIX}" --enable-shared --enable-pic && \ + make && \ + make install && \ + rm -rf ${DIR} +### x265 http://x265.org/ +RUN \ + DIR=x265 && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://download.videolan.org/pub/videolan/x265/x265_${LIBX265_VERSION}.tar.gz | \ + tar -zx && \ + cd x265_${LIBX265_VERSION}/build/linux && \ + sed -i "/-DEXTRA_LIB/ s/$/ -DCMAKE_INSTALL_PREFIX=\${PREFIX}/" multilib.sh && \ + sed -i "/^cmake/ s/$/ -DENABLE_CLI=ON/" multilib.sh && \ + ./multilib.sh && \ + make -C 8bit install && \ + rm -rf ${DIR} +## libogg https://www.xiph.org/ogg/ +RUN \ + DIR=ogg && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO http://downloads.xiph.org/releases/ogg/libogg-${LIBOGG_VERSION}.tar.gz && \ + echo "${LIBOGG_SHA256SUM} libogg-${LIBOGG_VERSION}.tar.gz" | sha256sum --check && \ + tar -zx --strip-components=1 -f libogg-${LIBOGG_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +RUN \ + DIR=opus && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://archive.mozilla.org/pub/opus/opus-${LIBOPUS_VERSION}.tar.gz && \ + echo "${LIBOPUS_SHA256SUM} opus-${LIBOPUS_VERSION}.tar.gz"| sha256sum --check && \ + tar -zx --strip-components=1 -f opus-${LIBOPUS_VERSION}.tar.gz && \ + autoreconf -fiv && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +### libvorbis https://xiph.org/vorbis/ +RUN \ + DIR=vorbis && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO http://downloads.xiph.org/releases/vorbis/libvorbis-${LIBVORBIS_VERSION}.tar.gz && \ + echo "${LIBVORBIS_SHA256SUM} libvorbis-${LIBVORBIS_VERSION}.tar.gz" | sha256sum --check && \ + tar -zx --strip-components=1 -f libvorbis-${LIBVORBIS_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +### libtheora http://www.theora.org/ +RUN \ + DIR=theora && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO http://downloads.xiph.org/releases/theora/libtheora-${LIBTHEORA_VERSION}.tar.gz && \ + echo "${LIBTHEORA_SHA256SUM} libtheora-${LIBTHEORA_VERSION}.tar.gz" | sha256sum --check && \ + tar -zx --strip-components=1 -f libtheora-${LIBTHEORA_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +### libvpx https://www.webmproject.org/code/ +RUN \ + DIR=vpx && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://codeload.github.com/webmproject/libvpx/tar.gz/v${LIBVPX_VERSION} | \ + tar -zx --strip-components=1 && \ + ./configure --prefix="${PREFIX}" --enable-vp8 --enable-vp9 --enable-vp9-highbitdepth --enable-pic --enable-shared \ + --disable-debug --disable-examples --disable-docs && \ + make && \ + make install && \ + rm -rf ${DIR} + +### libmp3lame http://lame.sourceforge.net/ +RUN \ + DIR=lame && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://kent.dl.sourceforge.net/project/lame/lame/$(echo ${LIBMP3LAME_VERSION} | sed -e 's/[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)/\1.\2/')/lame-${LIBMP3LAME_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" --enable-shared --enable-nasm --enable-pic && \ + make && \ + make install && \ + rm -rf ${DIR} +### xvid https://www.xvid.com/ +RUN \ + DIR=xvid && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO http://downloads.xvid.org/downloads/xvidcore-${LIBXVID_VERSION}.tar.gz && \ + tar -zx -f xvidcore-${LIBXVID_VERSION}.tar.gz && \ + cd xvidcore/build/generic && \ + ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" --datadir="${DIR}" --enable-shared --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +### fdk-aac https://github.com/mstorsjo/fdk-aac +RUN \ + DIR=fdk-aac && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://github.com/mstorsjo/fdk-aac/archive/v${LIBFDK_AAC_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + autoreconf -fiv && \ + ./configure --prefix="${PREFIX}" --enable-shared --datadir="${DIR}" && \ + make && \ + make install && \ + rm -rf ${DIR} +## openjpeg https://github.com/uclouvain/openjpeg +RUN \ + DIR=openjpeg && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + if test `echo ${LIBOPENJPEG_VERSION} | tr -d '.'` -ge '210'; then \ + version_prefix='v'; \ + else \ + version_prefix='version.' ;\ + fi && \ + curl -sL https://github.com/uclouvain/openjpeg/archive/${version_prefix}${LIBOPENJPEG_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + cmake -DBUILD_THIRDPARTY:BOOL=ON -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ + make && \ + make install && \ + rm -rf ${DIR} +## freetype https://www.freetype.org/ +RUN \ + DIR=freetype && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://download.savannah.gnu.org/releases/freetype/freetype-${LIBFREETYPE_VERSION}.tar.gz && \ + tar -zx --strip-components=1 -f freetype-${LIBFREETYPE_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +## libvstab https://github.com/georgmartius/vid.stab +RUN \ + DIR=vid.stab && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/georgmartius/vid.stab/archive/v${LIBVIDSTAB_VERSION}.tar.gz &&\ + echo "${LIBVIDSTAB_SHA256SUM} v${LIBVIDSTAB_VERSION}.tar.gz" | sha256sum --check && \ + tar -zx --strip-components=1 -f v${LIBVIDSTAB_VERSION}.tar.gz && \ + cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ + make && \ + make install && \ + rm -rf ${DIR} +## fridibi https://www.fribidi.org/ +# + https://github.com/fribidi/fribidi/issues/8 +RUN \ + DIR=fribidi && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/fribidi/fribidi/archive/${LIBFRIBIDI_VERSION}.tar.gz && \ + echo "${LIBFRIBIDI_SHA256SUM} ${LIBFRIBIDI_VERSION}.tar.gz" | sha256sum --check && \ + tar -zx --strip-components=1 -f ${LIBFRIBIDI_VERSION}.tar.gz && \ + sed -i 's/^SUBDIRS =.*/SUBDIRS=gen.tab charset lib/' Makefile.am && \ + ./bootstrap --no-config && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ + make -j 1 && \ + make install && \ + rm -rf ${DIR} +## fontconfig https://www.freedesktop.org/wiki/Software/fontconfig/ +RUN \ + DIR=fontconfig && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://www.freedesktop.org/software/fontconfig/release/fontconfig-${LIBFONTCONFIG_VERSION}.tar.bz2 &&\ + tar -jx --strip-components=1 -f fontconfig-${LIBFONTCONFIG_VERSION}.tar.bz2 && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +## freetype https://www.freetype.org/ +RUN \ + DIR=freetype && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://download.savannah.gnu.org/releases/freetype/freetype-${LIBFREETYPE_VERSION}.tar.gz && \ + tar -zx --strip-components=1 -f freetype-${LIBFREETYPE_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +## fridibi https://www.fribidi.org/ +# + https://github.com/fribidi/fribidi/issues/8 +RUN \ + DIR=fribidi && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/fribidi/fribidi/archive/${LIBFRIBIDI_VERSION}.tar.gz && \ + echo "${LIBFRIBIDI_SHA256SUM} ${LIBFRIBIDI_VERSION}.tar.gz" | sha256sum --check && \ + tar -zx --strip-components=1 -f ${LIBFRIBIDI_VERSION}.tar.gz && \ + sed -i 's/^SUBDIRS =.*/SUBDIRS=gen.tab charset lib/' Makefile.am && \ + ./bootstrap --no-config && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ + make -j 1 && \ + make install && \ + rm -rf ${DIR} +## fontconfig https://www.freedesktop.org/wiki/Software/fontconfig/ +RUN \ + DIR=fontconfig && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://www.freedesktop.org/software/fontconfig/release/fontconfig-${LIBFONTCONFIG_VERSION}.tar.bz2 &&\ + tar -jx --strip-components=1 -f fontconfig-${LIBFONTCONFIG_VERSION}.tar.bz2 && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +RUN \ + DIR=libass && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/libass/libass/archive/${LIBASS_VERSION}.tar.gz &&\ + tar -zx --strip-components=1 -f ${LIBASS_VERSION}.tar.gz && \ + ./autogen.sh && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +## kvazaar https://github.com/ultravideo/kvazaar +RUN \ + DIR=kvazaar && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/ultravideo/kvazaar/archive/v${LIBKVAZAAR_VERSION}.tar.gz &&\ + tar -zx --strip-components=1 -f v${LIBKVAZAAR_VERSION}.tar.gz && \ + if [ -e ./autogen.sh ]; then \ + ./autogen.sh && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared ; \ + else \ + cd src ; \ + fi && \ + make && \ + make install && \ + rm -rf ${DIR} + +RUN \ + DIR=nv-codec-headers && \ + git clone --branch n${NVENC_VERSION} --depth=1 https://git.videolan.org/git/ffmpeg/nv-codec-headers.git ${DIR} && \ + cd ${DIR} && \ + sed -i 's@/usr/local@'"$PREFIX"'@' Makefile && \ + make && \ + make install && \ + rm -rf ${DIR} +RUN \ + DIR=ffmpeg && mkdir -p ${DIR} && cd ${DIR} && \ + curl -sLO https://ffmpeg.org/releases/ffmpeg-${FFMPEG_VERSION}.tar.bz2 && \ + tar -jx --strip-components=1 -f ffmpeg-${FFMPEG_VERSION}.tar.bz2 && \ + ./configure \ + --disable-debug \ + --disable-doc \ + --disable-ffplay \ + --enable-shared \ + --enable-avresample \ + --enable-openssl \ + --enable-postproc \ + --enable-small \ + --extra-cflags="-I${PREFIX}/include -I/usr/local/include" \ + --extra-ldflags="-L${PREFIX}/lib -L/usr/local/lib" \ + --enable-libopencore-amrnb \ + --enable-libopencore-amrwb \ + --enable-version3 \ + --enable-libx264 \ + --enable-libx265 \ + --enable-libopus \ + --enable-libvorbis \ + --enable-libtheora \ + --enable-libvpx \ + --enable-libmp3lame \ + --enable-libxvid \ + --enable-libfdk_aac \ + --enable-nonfree \ + --enable-libopenjpeg \ + --enable-libfreetype \ + --enable-libvidstab \ + --enable-gpl \ + --enable-libass \ + --enable-libkvazaar \ + --enable-vaapi \ + --enable-nvenc \ + --enable-nonfree \ + --prefix="${PREFIX}" && \ + make && \ + make install && \ + make distclean && \ + hash -r && \ + cd tools && \ + make qt-faststart && \ + cp qt-faststart ${PREFIX}/bin + +RUN \ + if false; then \ + LD_LIBRARY_PATH=${PREFIX}/lib ldd ${PREFIX}/bin/* | \ + cut -d ' ' -f 3 | \ + strings | \ + xargs -i cp {} /usr/local/lib/ && \ + cp ${PREFIX}/bin/ff* /usr/local/bin/ ; \ + else \ + LD_LIBRARY_PATH=${PREFIX}/lib ldd ${PREFIX}/bin/ffmpeg | \ + cut -d ' ' -f 3 | \ + strings | \ + xargs -i cp {} /usr/local/lib/ && \ + cp ${PREFIX}/bin/ff* /usr/local/bin/ ; \ + fi && \ + if true; then \ + for lib in /usr/local/lib/*.so* /usr/local/bin/*; do strip --strip-all $lib; done ; \ + fi && \ + LD_LIBRARY_PATH=/usr/local/lib ffmpeg -buildconf + + +FROM scratch AS release +MAINTAINER Julien Rottenberg + +CMD ["--help"] +ENTRYPOINT ["/bin/ffmpeg"] + +COPY --from=build /usr/local / +RUN test "scratch" = "base" && ldconfig /usr/local/lib /usr/local/lib64 + +# Let's make sure the app built correctly +# Convenient to verify on https://hub.docker.com/r/jrottenberg/ffmpeg/builds/ console output diff --git a/docker-images/3.2/centos/Dockerfile b/docker-images/3.2/centos/Dockerfile index dc1918f6a..7148d0482 100644 --- a/docker-images/3.2/centos/Dockerfile +++ b/docker-images/3.2/centos/Dockerfile @@ -1,3 +1,4 @@ +<<<<<<< HEAD # ffmpeg - http://ffmpeg.org/download.html # # From https://trac.ffmpeg.org/wiki/CompilationGuide/Centos @@ -395,4 +396,465 @@ ENV LD_LIBRARY_PATH=/usr/local/lib64 COPY --from=build /usr/local/ /usr/local/ # Let's make sure the app built correctly -# Convenient to verify on https://hub.docker.com/r/jrottenberg/ffmpeg/builds/ console output \ No newline at end of file +# Convenient to verify on https://hub.docker.com/r/jrottenberg/ffmpeg/builds/ console output +======= +FROM centos:7 as base + +RUN yum -y install libva libgomp libuuid && \ + echo "/usr/local/lib" > /etc/ld.so.conf.d/local.conf && \ + echo "/usr/local/lib64" >> /etc/ld.so.conf.d/local.conf + +FROM base as build + +WORKDIR /tmp/workdir + +ARG PREFIX=/tmp/build +ARG MAKEFLAGS=-j6 +ARG PKG_CONFIG_PATH=/tmp/build/lib/pkgconfig:/tmp/build/lib64/pkgconfig + +RUN yum --enablerepo=extras install -y epel-release && \ + yum install -y \ + libva-devel \ + autoconf \ + automake \ + bzip2 \ + cmake \ + expat-devel \ + gcc \ + gcc-c++ \ + git \ + gperf \ + libtool \ + make \ + nasm \ + perl \ + openssl-devel \ + tar \ + yasm \ + which \ + zlib-devel \ + libuuid-devel \ + libcurl-devel \ + xz-devel \ + libarchive-devel \ + python36 \ + python36-pip + +#Centos is missing recent version of CMake (>= 3.5) +RUN \ + DIR=/tmp/cmake && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://cmake.org/files/v3.5/cmake-3.5.2.tar.gz | \ + tar -zx --strip-components=1 && \ + ./bootstrap --system-libs --no-system-jsoncpp && \ + make && \ + make install && \ + rm -rf ${DIR} + +#Centos is missing recent version of nasm (>= 2.13) +RUN \ + DIR=/tmp/nasm && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://www.nasm.us/pub/nasm/releasebuilds/2.13.03/nasm-2.13.03.tar.gz | \ + tar -zx --strip-components=1 && \ + ./configure --prefix="/usr" && \ + make && \ + make install && \ + rm -rf ${DIR} + +#Centos is missing ninja +RUN \ + DIR=/tmp/ninja && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://github.com/ninja-build/ninja/archive/v1.9.0.tar.gz | \ + tar -zx --strip-components=1 && \ + python configure.py --bootstrap && \ + cp ./ninja /usr/bin/ && \ + rm -rf ${DIR} + +RUN \ + DIR=/tmp/meson && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + pip3 install meson && \ + rm -rf ${DIR} + +ARG FFMPEG_VERSION=3.2.14 +ARG LIBOPENCORE_AMR_VERSION=0.1.5 +ARG LIBX264_VERSION=20190526-2245-stable +ARG LIBX265_VERSION=3.0 +ARG LIBOGG_VERSION=1.3.3 +ARG LIBOPUS_VERSION=1.3.1 +ARG LIBVORBIS_VERSION=1.3.6 +ARG LIBTHEORA_VERSION=1.1.1 +ARG LIBVPX_VERSION=1.8.0 +ARG LIBMP3LAME_VERSION=3.100 +ARG LIBXVID_VERSION=1.3.5 +ARG LIBFDK_AAC_VERSION=0.1.6 +ARG LIBOPENJPEG_VERSION=2.1.2 +ARG LIBFREETYPE_VERSION=2.10.0 +ARG LIBVIDSTAB_VERSION=1.1.0 +ARG LIBFRIBIDI_VERSION=0.19.7 +ARG LIBFONTCONFIG_VERSION=2.13.1 +ARG LIBFREETYPE_VERSION=2.10.0 +ARG LIBFRIBIDI_VERSION=0.19.7 +ARG LIBFONTCONFIG_VERSION=2.13.1 +ARG LIBASS_VERSION=0.14.0 +ARG LIBKVAZAAR_VERSION=1.2.0 +ARG NVENC_VERSION=9.0.18.1 + +ARG LIBOGG_SHA256SUM=c2e8a485110b97550f453226ec644ebac6cb29d1caef2902c007edab4308d985 +ARG LIBOPUS_SHA256SUM=65b58e1e25b2a114157014736a3d9dfeaad8d41be1c8179866f144a2fb44ff9d +ARG LIBVORBIS_SHA256SUM=6ed40e0241089a42c48604dc00e362beee00036af2d8b3f46338031c9e0351cb +ARG LIBTHEORA_SHA256SUM=40952956c47811928d1e7922cda3bc1f427eb75680c3c37249c91e949054916b +ARG LIBVIDSTAB_SHA256SUM=14d2a053e56edad4f397be0cb3ef8eb1ec3150404ce99a426c4eb641861dc0bb +ARG LIBFRIBIDI_SHA256SUM=3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 +ARG LIBFRIBIDI_SHA256SUM=3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 + +## opencore-amr https://sourceforge.net/projects/opencore-amr/ +RUN \ + DIR=opencore-amr && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://kent.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${LIBOPENCORE_AMR_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +## x264 http://www.videolan.org/developers/x264.html +RUN \ + DIR=x264 && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://download.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-${LIBX264_VERSION}.tar.bz2 | \ + tar -jx --strip-components=1 && \ + ./configure --prefix="${PREFIX}" --enable-shared --enable-pic && \ + make && \ + make install && \ + rm -rf ${DIR} +### x265 http://x265.org/ +RUN \ + DIR=x265 && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://download.videolan.org/pub/videolan/x265/x265_${LIBX265_VERSION}.tar.gz | \ + tar -zx && \ + cd x265_${LIBX265_VERSION}/build/linux && \ + sed -i "/-DEXTRA_LIB/ s/$/ -DCMAKE_INSTALL_PREFIX=\${PREFIX}/" multilib.sh && \ + sed -i "/^cmake/ s/$/ -DENABLE_CLI=ON/" multilib.sh && \ + ./multilib.sh && \ + make -C 8bit install && \ + rm -rf ${DIR} +## libogg https://www.xiph.org/ogg/ +RUN \ + DIR=ogg && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO http://downloads.xiph.org/releases/ogg/libogg-${LIBOGG_VERSION}.tar.gz && \ + echo "${LIBOGG_SHA256SUM} libogg-${LIBOGG_VERSION}.tar.gz" | sha256sum --check && \ + tar -zx --strip-components=1 -f libogg-${LIBOGG_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +RUN \ + DIR=opus && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://archive.mozilla.org/pub/opus/opus-${LIBOPUS_VERSION}.tar.gz && \ + echo "${LIBOPUS_SHA256SUM} opus-${LIBOPUS_VERSION}.tar.gz"| sha256sum --check && \ + tar -zx --strip-components=1 -f opus-${LIBOPUS_VERSION}.tar.gz && \ + autoreconf -fiv && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +### libvorbis https://xiph.org/vorbis/ +RUN \ + DIR=vorbis && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO http://downloads.xiph.org/releases/vorbis/libvorbis-${LIBVORBIS_VERSION}.tar.gz && \ + echo "${LIBVORBIS_SHA256SUM} libvorbis-${LIBVORBIS_VERSION}.tar.gz" | sha256sum --check && \ + tar -zx --strip-components=1 -f libvorbis-${LIBVORBIS_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +### libtheora http://www.theora.org/ +RUN \ + DIR=theora && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO http://downloads.xiph.org/releases/theora/libtheora-${LIBTHEORA_VERSION}.tar.gz && \ + echo "${LIBTHEORA_SHA256SUM} libtheora-${LIBTHEORA_VERSION}.tar.gz" | sha256sum --check && \ + tar -zx --strip-components=1 -f libtheora-${LIBTHEORA_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +### libvpx https://www.webmproject.org/code/ +RUN \ + DIR=vpx && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://codeload.github.com/webmproject/libvpx/tar.gz/v${LIBVPX_VERSION} | \ + tar -zx --strip-components=1 && \ + ./configure --prefix="${PREFIX}" --enable-vp8 --enable-vp9 --enable-vp9-highbitdepth --enable-pic --enable-shared \ + --disable-debug --disable-examples --disable-docs && \ + make && \ + make install && \ + rm -rf ${DIR} + +### libmp3lame http://lame.sourceforge.net/ +RUN \ + DIR=lame && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://kent.dl.sourceforge.net/project/lame/lame/$(echo ${LIBMP3LAME_VERSION} | sed -e 's/[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)/\1.\2/')/lame-${LIBMP3LAME_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" --enable-shared --enable-nasm --enable-pic && \ + make && \ + make install && \ + rm -rf ${DIR} +### xvid https://www.xvid.com/ +RUN \ + DIR=xvid && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO http://downloads.xvid.org/downloads/xvidcore-${LIBXVID_VERSION}.tar.gz && \ + tar -zx -f xvidcore-${LIBXVID_VERSION}.tar.gz && \ + cd xvidcore/build/generic && \ + ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" --datadir="${DIR}" --enable-shared --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +### fdk-aac https://github.com/mstorsjo/fdk-aac +RUN \ + DIR=fdk-aac && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://github.com/mstorsjo/fdk-aac/archive/v${LIBFDK_AAC_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + autoreconf -fiv && \ + ./configure --prefix="${PREFIX}" --enable-shared --datadir="${DIR}" && \ + make && \ + make install && \ + rm -rf ${DIR} +## openjpeg https://github.com/uclouvain/openjpeg +RUN \ + DIR=openjpeg && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + if test `echo ${LIBOPENJPEG_VERSION} | tr -d '.'` -ge '210'; then \ + version_prefix='v'; \ + else \ + version_prefix='version.' ;\ + fi && \ + curl -sL https://github.com/uclouvain/openjpeg/archive/${version_prefix}${LIBOPENJPEG_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + cmake -DBUILD_THIRDPARTY:BOOL=ON -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ + make && \ + make install && \ + rm -rf ${DIR} +## freetype https://www.freetype.org/ +RUN \ + DIR=freetype && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://download.savannah.gnu.org/releases/freetype/freetype-${LIBFREETYPE_VERSION}.tar.gz && \ + tar -zx --strip-components=1 -f freetype-${LIBFREETYPE_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +## libvstab https://github.com/georgmartius/vid.stab +RUN \ + DIR=vid.stab && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/georgmartius/vid.stab/archive/v${LIBVIDSTAB_VERSION}.tar.gz &&\ + echo "${LIBVIDSTAB_SHA256SUM} v${LIBVIDSTAB_VERSION}.tar.gz" | sha256sum --check && \ + tar -zx --strip-components=1 -f v${LIBVIDSTAB_VERSION}.tar.gz && \ + cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ + make && \ + make install && \ + rm -rf ${DIR} +## fridibi https://www.fribidi.org/ +# + https://github.com/fribidi/fribidi/issues/8 +RUN \ + DIR=fribidi && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/fribidi/fribidi/archive/${LIBFRIBIDI_VERSION}.tar.gz && \ + echo "${LIBFRIBIDI_SHA256SUM} ${LIBFRIBIDI_VERSION}.tar.gz" | sha256sum --check && \ + tar -zx --strip-components=1 -f ${LIBFRIBIDI_VERSION}.tar.gz && \ + sed -i 's/^SUBDIRS =.*/SUBDIRS=gen.tab charset lib/' Makefile.am && \ + ./bootstrap --no-config && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ + make -j 1 && \ + make install && \ + rm -rf ${DIR} +## fontconfig https://www.freedesktop.org/wiki/Software/fontconfig/ +RUN \ + DIR=fontconfig && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://www.freedesktop.org/software/fontconfig/release/fontconfig-${LIBFONTCONFIG_VERSION}.tar.bz2 &&\ + tar -jx --strip-components=1 -f fontconfig-${LIBFONTCONFIG_VERSION}.tar.bz2 && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +## freetype https://www.freetype.org/ +RUN \ + DIR=freetype && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://download.savannah.gnu.org/releases/freetype/freetype-${LIBFREETYPE_VERSION}.tar.gz && \ + tar -zx --strip-components=1 -f freetype-${LIBFREETYPE_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +## fridibi https://www.fribidi.org/ +# + https://github.com/fribidi/fribidi/issues/8 +RUN \ + DIR=fribidi && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/fribidi/fribidi/archive/${LIBFRIBIDI_VERSION}.tar.gz && \ + echo "${LIBFRIBIDI_SHA256SUM} ${LIBFRIBIDI_VERSION}.tar.gz" | sha256sum --check && \ + tar -zx --strip-components=1 -f ${LIBFRIBIDI_VERSION}.tar.gz && \ + sed -i 's/^SUBDIRS =.*/SUBDIRS=gen.tab charset lib/' Makefile.am && \ + ./bootstrap --no-config && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ + make -j 1 && \ + make install && \ + rm -rf ${DIR} +## fontconfig https://www.freedesktop.org/wiki/Software/fontconfig/ +RUN \ + DIR=fontconfig && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://www.freedesktop.org/software/fontconfig/release/fontconfig-${LIBFONTCONFIG_VERSION}.tar.bz2 &&\ + tar -jx --strip-components=1 -f fontconfig-${LIBFONTCONFIG_VERSION}.tar.bz2 && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +RUN \ + DIR=libass && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/libass/libass/archive/${LIBASS_VERSION}.tar.gz &&\ + tar -zx --strip-components=1 -f ${LIBASS_VERSION}.tar.gz && \ + ./autogen.sh && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +## kvazaar https://github.com/ultravideo/kvazaar +RUN \ + DIR=kvazaar && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/ultravideo/kvazaar/archive/v${LIBKVAZAAR_VERSION}.tar.gz &&\ + tar -zx --strip-components=1 -f v${LIBKVAZAAR_VERSION}.tar.gz && \ + if [ -e ./autogen.sh ]; then \ + ./autogen.sh && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared ; \ + else \ + cd src ; \ + fi && \ + make && \ + make install && \ + rm -rf ${DIR} + +RUN \ + DIR=nv-codec-headers && \ + git clone --branch n${NVENC_VERSION} --depth=1 https://git.videolan.org/git/ffmpeg/nv-codec-headers.git ${DIR} && \ + cd ${DIR} && \ + sed -i 's@/usr/local@'"$PREFIX"'@' Makefile && \ + make && \ + make install && \ + rm -rf ${DIR} +RUN \ + DIR=ffmpeg && mkdir -p ${DIR} && cd ${DIR} && \ + curl -sLO https://ffmpeg.org/releases/ffmpeg-${FFMPEG_VERSION}.tar.bz2 && \ + tar -jx --strip-components=1 -f ffmpeg-${FFMPEG_VERSION}.tar.bz2 && \ + ./configure \ + --disable-debug \ + --disable-doc \ + --disable-ffplay \ + --enable-shared \ + --enable-avresample \ + --enable-openssl \ + --enable-postproc \ + --enable-small \ + --extra-cflags="-I${PREFIX}/include -I/usr/local/include" \ + --extra-ldflags="-L${PREFIX}/lib -L/usr/local/lib" \ + --enable-libopencore-amrnb \ + --enable-libopencore-amrwb \ + --enable-version3 \ + --enable-libx264 \ + --enable-libx265 \ + --enable-libopus \ + --enable-libvorbis \ + --enable-libtheora \ + --enable-libvpx \ + --enable-libmp3lame \ + --enable-libxvid \ + --enable-libfdk_aac \ + --enable-nonfree \ + --enable-libopenjpeg \ + --enable-libfreetype \ + --enable-libvidstab \ + --enable-gpl \ + --enable-libass \ + --enable-libkvazaar \ + --enable-vaapi \ + --enable-nvenc \ + --enable-nonfree \ + --prefix="${PREFIX}" && \ + make && \ + make install && \ + make distclean && \ + hash -r && \ + cd tools && \ + make qt-faststart && \ + cp qt-faststart ${PREFIX}/bin + +RUN \ + if false; then \ + cp -r ${PREFIX}/lib/*so* /usr/local/lib/ && \ + cp ${PREFIX}/bin/* /usr/local/bin/ ; \ + else \ + LD_LIBRARY_PATH=${PREFIX}/lib ldd ${PREFIX}/bin/ffmpeg | \ + grep ${PREFIX} | \ + cut -d ' ' -f 3 | \ + xargs -i cp {} /usr/local/lib/ && \ + cp ${PREFIX}/bin/ff* /usr/local/bin/ ; \ + fi && \ + if true; then \ + for lib in /usr/local/lib/*.so* /usr/local/bin/*; do strip --strip-all $lib; done ; \ + fi && \ + cp -r ${PREFIX}/share/ffmpeg /usr/local/share/ && \ + LD_LIBRARY_PATH=/usr/local/lib ffmpeg -buildconf + +FROM base AS release +MAINTAINER Julien Rottenberg + +CMD ["--help"] +ENTRYPOINT ["ffmpeg"] + +COPY --from=build /usr/local /usr/local +RUN test "base" = "base" && ldconfig /usr/local/lib /usr/local/lib64 + +# Let's make sure the app built correctly +# Convenient to verify on https://hub.docker.com/r/jrottenberg/ffmpeg/builds/ console output +>>>>>>> rewrite the dockerfile generation + vdapu + armv7 + dav1d diff --git a/docker-images/3.2/nvidia,/Dockerfile b/docker-images/3.2/nvidia,/Dockerfile new file mode 100644 index 000000000..452b62c02 --- /dev/null +++ b/docker-images/3.2/nvidia,/Dockerfile @@ -0,0 +1,14 @@ +usage: update.py [-h] [--enable-libopencore-amr] [--enable-libx264] + [--enable-libx265] [--enable-libogg] [--enable-libopus] + [--enable-libvorbis] [--enable-libtheora] [--enable-libvpx] + [--enable-libmp3lame] [--enable-libxvid] + [--enable-libfdk-aac] [--enable-libopenjpeg] + [--enable-libfreetype] [--enable-libvidstab] + [--enable-libfribidi] [--enable-libfontconfig] + [--enable-libass] [--enable-libkvazaar] [--enable-libaom] + [--enable-vaapi] [--enable-nvenc] [--enable-libdav1d] + [--enable-vdpau] [--enable-all] [--with-bins] [--no-strip] + [--fat | --slim | --scratch] + {alpine,centos,ubuntu,nvidia,armv7} + {snapshot,4.1,4.0,3.4,3.3,3.2,2.8} +update.py: error: argument variant: invalid choice: 'nvidia,' (choose from 'alpine', 'centos', 'ubuntu', 'nvidia', 'armv7') diff --git a/docker-images/3.2/ubuntu/Dockerfile b/docker-images/3.2/ubuntu/Dockerfile index b843b7d83..983516d39 100644 --- a/docker-images/3.2/ubuntu/Dockerfile +++ b/docker-images/3.2/ubuntu/Dockerfile @@ -1,3 +1,4 @@ +<<<<<<< HEAD # ffmpeg - http://ffmpeg.org/download.html # # From https://trac.ffmpeg.org/wiki/CompilationGuide/Ubuntu @@ -397,3 +398,421 @@ COPY --from=build /usr/local /usr/local/ # Let's make sure the app built correctly # Convenient to verify on https://hub.docker.com/r/jrottenberg/ffmpeg/builds/ console output +======= +FROM ubuntu:18.04 AS base + +RUN apt-get -yqq update && \ + apt-get install -yq --no-install-recommends libva2 libva-drm2 i965-va-driver ca-certificates expat libgomp1 libuuid1 libssl1.0 && \ + apt-get autoremove -y && \ + apt-get clean -y + +FROM base as build + +WORKDIR /tmp/workdir + +ARG PREFIX=/tmp/build +ARG MAKEFLAGS=-j6 +ARG PKG_CONFIG_PATH=/tmp/build/lib/pkgconfig + +RUN apt-get -yqq update && \ + apt-get install -yq --no-install-recommends \ + libva-dev \ + autoconf \ + automake \ + cmake \ + curl \ + bzip2 \ + libexpat1-dev \ + g++ \ + gcc \ + git \ + gperf \ + libtool \ + make \ + nasm \ + perl \ + pkg-config \ + python \ + libssl1.0-dev \ + yasm \ + zlib1g-dev \ + uuid-dev \ + ninja-build \ + meson + +ARG FFMPEG_VERSION=3.2.14 +ARG LIBOPENCORE_AMR_VERSION=0.1.5 +ARG LIBX264_VERSION=20190526-2245-stable +ARG LIBX265_VERSION=3.0 +ARG LIBOGG_VERSION=1.3.3 +ARG LIBOPUS_VERSION=1.3.1 +ARG LIBVORBIS_VERSION=1.3.6 +ARG LIBTHEORA_VERSION=1.1.1 +ARG LIBVPX_VERSION=1.8.0 +ARG LIBMP3LAME_VERSION=3.100 +ARG LIBXVID_VERSION=1.3.5 +ARG LIBFDK_AAC_VERSION=0.1.6 +ARG LIBOPENJPEG_VERSION=2.1.2 +ARG LIBFREETYPE_VERSION=2.10.0 +ARG LIBVIDSTAB_VERSION=1.1.0 +ARG LIBFRIBIDI_VERSION=0.19.7 +ARG LIBFONTCONFIG_VERSION=2.13.1 +ARG LIBFREETYPE_VERSION=2.10.0 +ARG LIBFRIBIDI_VERSION=0.19.7 +ARG LIBFONTCONFIG_VERSION=2.13.1 +ARG LIBASS_VERSION=0.14.0 +ARG LIBKVAZAAR_VERSION=1.2.0 +ARG NVENC_VERSION=9.0.18.1 + +ARG LIBOGG_SHA256SUM=c2e8a485110b97550f453226ec644ebac6cb29d1caef2902c007edab4308d985 +ARG LIBOPUS_SHA256SUM=65b58e1e25b2a114157014736a3d9dfeaad8d41be1c8179866f144a2fb44ff9d +ARG LIBVORBIS_SHA256SUM=6ed40e0241089a42c48604dc00e362beee00036af2d8b3f46338031c9e0351cb +ARG LIBTHEORA_SHA256SUM=40952956c47811928d1e7922cda3bc1f427eb75680c3c37249c91e949054916b +ARG LIBVIDSTAB_SHA256SUM=14d2a053e56edad4f397be0cb3ef8eb1ec3150404ce99a426c4eb641861dc0bb +ARG LIBFRIBIDI_SHA256SUM=3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 +ARG LIBFRIBIDI_SHA256SUM=3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 + +## opencore-amr https://sourceforge.net/projects/opencore-amr/ +RUN \ + DIR=opencore-amr && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://kent.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${LIBOPENCORE_AMR_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +## x264 http://www.videolan.org/developers/x264.html +RUN \ + DIR=x264 && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://download.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-${LIBX264_VERSION}.tar.bz2 | \ + tar -jx --strip-components=1 && \ + ./configure --prefix="${PREFIX}" --enable-shared --enable-pic && \ + make && \ + make install && \ + rm -rf ${DIR} +### x265 http://x265.org/ +RUN \ + DIR=x265 && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://download.videolan.org/pub/videolan/x265/x265_${LIBX265_VERSION}.tar.gz | \ + tar -zx && \ + cd x265_${LIBX265_VERSION}/build/linux && \ + sed -i "/-DEXTRA_LIB/ s/$/ -DCMAKE_INSTALL_PREFIX=\${PREFIX}/" multilib.sh && \ + sed -i "/^cmake/ s/$/ -DENABLE_CLI=ON/" multilib.sh && \ + ./multilib.sh && \ + make -C 8bit install && \ + rm -rf ${DIR} +## libogg https://www.xiph.org/ogg/ +RUN \ + DIR=ogg && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO http://downloads.xiph.org/releases/ogg/libogg-${LIBOGG_VERSION}.tar.gz && \ + echo "${LIBOGG_SHA256SUM} libogg-${LIBOGG_VERSION}.tar.gz" | sha256sum --check && \ + tar -zx --strip-components=1 -f libogg-${LIBOGG_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +RUN \ + DIR=opus && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://archive.mozilla.org/pub/opus/opus-${LIBOPUS_VERSION}.tar.gz && \ + echo "${LIBOPUS_SHA256SUM} opus-${LIBOPUS_VERSION}.tar.gz"| sha256sum --check && \ + tar -zx --strip-components=1 -f opus-${LIBOPUS_VERSION}.tar.gz && \ + autoreconf -fiv && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +### libvorbis https://xiph.org/vorbis/ +RUN \ + DIR=vorbis && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO http://downloads.xiph.org/releases/vorbis/libvorbis-${LIBVORBIS_VERSION}.tar.gz && \ + echo "${LIBVORBIS_SHA256SUM} libvorbis-${LIBVORBIS_VERSION}.tar.gz" | sha256sum --check && \ + tar -zx --strip-components=1 -f libvorbis-${LIBVORBIS_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +### libtheora http://www.theora.org/ +RUN \ + DIR=theora && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO http://downloads.xiph.org/releases/theora/libtheora-${LIBTHEORA_VERSION}.tar.gz && \ + echo "${LIBTHEORA_SHA256SUM} libtheora-${LIBTHEORA_VERSION}.tar.gz" | sha256sum --check && \ + tar -zx --strip-components=1 -f libtheora-${LIBTHEORA_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +### libvpx https://www.webmproject.org/code/ +RUN \ + DIR=vpx && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://codeload.github.com/webmproject/libvpx/tar.gz/v${LIBVPX_VERSION} | \ + tar -zx --strip-components=1 && \ + ./configure --prefix="${PREFIX}" --enable-vp8 --enable-vp9 --enable-vp9-highbitdepth --enable-pic --enable-shared \ + --disable-debug --disable-examples --disable-docs && \ + make && \ + make install && \ + rm -rf ${DIR} + +### libmp3lame http://lame.sourceforge.net/ +RUN \ + DIR=lame && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://kent.dl.sourceforge.net/project/lame/lame/$(echo ${LIBMP3LAME_VERSION} | sed -e 's/[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)/\1.\2/')/lame-${LIBMP3LAME_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" --enable-shared --enable-nasm --enable-pic && \ + make && \ + make install && \ + rm -rf ${DIR} +### xvid https://www.xvid.com/ +RUN \ + DIR=xvid && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO http://downloads.xvid.org/downloads/xvidcore-${LIBXVID_VERSION}.tar.gz && \ + tar -zx -f xvidcore-${LIBXVID_VERSION}.tar.gz && \ + cd xvidcore/build/generic && \ + ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" --datadir="${DIR}" --enable-shared --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +### fdk-aac https://github.com/mstorsjo/fdk-aac +RUN \ + DIR=fdk-aac && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://github.com/mstorsjo/fdk-aac/archive/v${LIBFDK_AAC_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + autoreconf -fiv && \ + ./configure --prefix="${PREFIX}" --enable-shared --datadir="${DIR}" && \ + make && \ + make install && \ + rm -rf ${DIR} +## openjpeg https://github.com/uclouvain/openjpeg +RUN \ + DIR=openjpeg && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + if test `echo ${LIBOPENJPEG_VERSION} | tr -d '.'` -ge '210'; then \ + version_prefix='v'; \ + else \ + version_prefix='version.' ;\ + fi && \ + curl -sL https://github.com/uclouvain/openjpeg/archive/${version_prefix}${LIBOPENJPEG_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + cmake -DBUILD_THIRDPARTY:BOOL=ON -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ + make && \ + make install && \ + rm -rf ${DIR} +## freetype https://www.freetype.org/ +RUN \ + DIR=freetype && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://download.savannah.gnu.org/releases/freetype/freetype-${LIBFREETYPE_VERSION}.tar.gz && \ + tar -zx --strip-components=1 -f freetype-${LIBFREETYPE_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +## libvstab https://github.com/georgmartius/vid.stab +RUN \ + DIR=vid.stab && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/georgmartius/vid.stab/archive/v${LIBVIDSTAB_VERSION}.tar.gz &&\ + echo "${LIBVIDSTAB_SHA256SUM} v${LIBVIDSTAB_VERSION}.tar.gz" | sha256sum --check && \ + tar -zx --strip-components=1 -f v${LIBVIDSTAB_VERSION}.tar.gz && \ + cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ + make && \ + make install && \ + rm -rf ${DIR} +## fridibi https://www.fribidi.org/ +# + https://github.com/fribidi/fribidi/issues/8 +RUN \ + DIR=fribidi && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/fribidi/fribidi/archive/${LIBFRIBIDI_VERSION}.tar.gz && \ + echo "${LIBFRIBIDI_SHA256SUM} ${LIBFRIBIDI_VERSION}.tar.gz" | sha256sum --check && \ + tar -zx --strip-components=1 -f ${LIBFRIBIDI_VERSION}.tar.gz && \ + sed -i 's/^SUBDIRS =.*/SUBDIRS=gen.tab charset lib/' Makefile.am && \ + ./bootstrap --no-config && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ + make -j 1 && \ + make install && \ + rm -rf ${DIR} +## fontconfig https://www.freedesktop.org/wiki/Software/fontconfig/ +RUN \ + DIR=fontconfig && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://www.freedesktop.org/software/fontconfig/release/fontconfig-${LIBFONTCONFIG_VERSION}.tar.bz2 &&\ + tar -jx --strip-components=1 -f fontconfig-${LIBFONTCONFIG_VERSION}.tar.bz2 && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +## freetype https://www.freetype.org/ +RUN \ + DIR=freetype && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://download.savannah.gnu.org/releases/freetype/freetype-${LIBFREETYPE_VERSION}.tar.gz && \ + tar -zx --strip-components=1 -f freetype-${LIBFREETYPE_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +## fridibi https://www.fribidi.org/ +# + https://github.com/fribidi/fribidi/issues/8 +RUN \ + DIR=fribidi && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/fribidi/fribidi/archive/${LIBFRIBIDI_VERSION}.tar.gz && \ + echo "${LIBFRIBIDI_SHA256SUM} ${LIBFRIBIDI_VERSION}.tar.gz" | sha256sum --check && \ + tar -zx --strip-components=1 -f ${LIBFRIBIDI_VERSION}.tar.gz && \ + sed -i 's/^SUBDIRS =.*/SUBDIRS=gen.tab charset lib/' Makefile.am && \ + ./bootstrap --no-config && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ + make -j 1 && \ + make install && \ + rm -rf ${DIR} +## fontconfig https://www.freedesktop.org/wiki/Software/fontconfig/ +RUN \ + DIR=fontconfig && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://www.freedesktop.org/software/fontconfig/release/fontconfig-${LIBFONTCONFIG_VERSION}.tar.bz2 &&\ + tar -jx --strip-components=1 -f fontconfig-${LIBFONTCONFIG_VERSION}.tar.bz2 && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +RUN \ + DIR=libass && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/libass/libass/archive/${LIBASS_VERSION}.tar.gz &&\ + tar -zx --strip-components=1 -f ${LIBASS_VERSION}.tar.gz && \ + ./autogen.sh && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +## kvazaar https://github.com/ultravideo/kvazaar +RUN \ + DIR=kvazaar && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/ultravideo/kvazaar/archive/v${LIBKVAZAAR_VERSION}.tar.gz &&\ + tar -zx --strip-components=1 -f v${LIBKVAZAAR_VERSION}.tar.gz && \ + if [ -e ./autogen.sh ]; then \ + ./autogen.sh && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared ; \ + else \ + cd src ; \ + fi && \ + make && \ + make install && \ + rm -rf ${DIR} + +RUN \ + DIR=nv-codec-headers && \ + git clone --branch n${NVENC_VERSION} --depth=1 https://git.videolan.org/git/ffmpeg/nv-codec-headers.git ${DIR} && \ + cd ${DIR} && \ + sed -i 's@/usr/local@'"$PREFIX"'@' Makefile && \ + make && \ + make install && \ + rm -rf ${DIR} +RUN \ + DIR=ffmpeg && mkdir -p ${DIR} && cd ${DIR} && \ + curl -sLO https://ffmpeg.org/releases/ffmpeg-${FFMPEG_VERSION}.tar.bz2 && \ + tar -jx --strip-components=1 -f ffmpeg-${FFMPEG_VERSION}.tar.bz2 && \ + ./configure \ + --disable-debug \ + --disable-doc \ + --disable-ffplay \ + --enable-shared \ + --enable-avresample \ + --enable-openssl \ + --enable-postproc \ + --enable-small \ + --extra-cflags="-I${PREFIX}/include -I/usr/local/include" \ + --extra-ldflags="-L${PREFIX}/lib -L/usr/local/lib" \ + --enable-libopencore-amrnb \ + --enable-libopencore-amrwb \ + --enable-version3 \ + --enable-libx264 \ + --enable-libx265 \ + --enable-libopus \ + --enable-libvorbis \ + --enable-libtheora \ + --enable-libvpx \ + --enable-libmp3lame \ + --enable-libxvid \ + --enable-libfdk_aac \ + --enable-nonfree \ + --enable-libopenjpeg \ + --enable-libfreetype \ + --enable-libvidstab \ + --enable-gpl \ + --enable-libass \ + --enable-libkvazaar \ + --enable-vaapi \ + --enable-nvenc \ + --enable-nonfree \ + --prefix="${PREFIX}" && \ + make && \ + make install && \ + make distclean && \ + hash -r && \ + cd tools && \ + make qt-faststart && \ + cp qt-faststart ${PREFIX}/bin + +RUN \ + if false; then \ + cp -r ${PREFIX}/lib/*so* /usr/local/lib/ && \ + cp ${PREFIX}/bin/* /usr/local/bin/ ; \ + else \ + LD_LIBRARY_PATH=${PREFIX}/lib ldd ${PREFIX}/bin/ffmpeg | \ + grep ${PREFIX} | \ + cut -d ' ' -f 3 | \ + xargs -i cp {} /usr/local/lib/ && \ + cp ${PREFIX}/bin/ff* /usr/local/bin/ ; \ + fi && \ + if true; then \ + for lib in /usr/local/lib/*.so* /usr/local/bin/*; do strip --strip-all $lib; done ; \ + fi && \ + cp -r ${PREFIX}/share/ffmpeg /usr/local/share/ && \ + LD_LIBRARY_PATH=/usr/local/lib ffmpeg -buildconf + +FROM base AS release +MAINTAINER Julien Rottenberg + +CMD ["--help"] +ENTRYPOINT ["ffmpeg"] + +COPY --from=build /usr/local /usr/local +RUN test "base" = "base" && ldconfig /usr/local/lib /usr/local/lib64 + +# Let's make sure the app built correctly +# Convenient to verify on https://hub.docker.com/r/jrottenberg/ffmpeg/builds/ console output +>>>>>>> rewrite the dockerfile generation + vdapu + armv7 + dav1d diff --git a/docker-images/3.3/alpine,/Dockerfile b/docker-images/3.3/alpine,/Dockerfile new file mode 100644 index 000000000..a0b97723e --- /dev/null +++ b/docker-images/3.3/alpine,/Dockerfile @@ -0,0 +1,14 @@ +usage: update.py [-h] [--enable-libopencore-amr] [--enable-libx264] + [--enable-libx265] [--enable-libogg] [--enable-libopus] + [--enable-libvorbis] [--enable-libtheora] [--enable-libvpx] + [--enable-libmp3lame] [--enable-libxvid] + [--enable-libfdk-aac] [--enable-libopenjpeg] + [--enable-libfreetype] [--enable-libvidstab] + [--enable-libfribidi] [--enable-libfontconfig] + [--enable-libass] [--enable-libkvazaar] [--enable-libaom] + [--enable-vaapi] [--enable-nvenc] [--enable-libdav1d] + [--enable-vdpau] [--enable-all] [--with-bins] [--no-strip] + [--fat | --slim | --scratch] + {alpine,centos,ubuntu,nvidia,armv7} + {snapshot,4.1,4.0,3.4,3.3,3.2,2.8} +update.py: error: argument variant: invalid choice: 'alpine,' (choose from 'alpine', 'centos', 'ubuntu', 'nvidia', 'armv7') diff --git a/docker-images/3.3/arm32v7/Dockerfile b/docker-images/3.3/arm32v7/Dockerfile new file mode 100644 index 000000000..8eea0df28 --- /dev/null +++ b/docker-images/3.3/arm32v7/Dockerfile @@ -0,0 +1,427 @@ +FROM alpine:3.9 as base + +RUN apk add --no-cache --update libva \ + libgcc \ + libstdc++ \ + ca-certificates \ + libcrypto1.1 \ + libssl1.1 \ + libgomp \ + expat \ + libuuid + +FROM base as build + +WORKDIR /tmp/workdir + +ARG PREFIX=/tmp/build +ARG MAKEFLAGS=-j6 +ARG PKG_CONFIG_PATH=/tmp/build/lib/pkgconfig + +RUN apk add --no-cache --update libva-dev \ + autoconf \ + automake \ + bash \ + binutils \ + bzip2 \ + cmake \ + curl \ + coreutils \ + diffutils \ + file \ + g++ \ + git \ + gcc \ + gperf \ + libtool \ + make \ + python \ + openssl-dev \ + tar \ + yasm \ + nasm \ + zlib-dev \ + expat-dev \ + util-linux-dev \ + meson \ + ninja + +ARG FFMPEG_VERSION=3.3.9 +ARG LIBOPENCORE_AMR_VERSION=0.1.5 +ARG LIBX264_VERSION=20190526-2245-stable +ARG LIBX265_VERSION=3.0 +ARG LIBOGG_VERSION=1.3.3 +ARG LIBOPUS_VERSION=1.3.1 +ARG LIBVORBIS_VERSION=1.3.6 +ARG LIBTHEORA_VERSION=1.1.1 +ARG LIBVPX_VERSION=1.8.0 +ARG LIBMP3LAME_VERSION=3.100 +ARG LIBXVID_VERSION=1.3.5 +ARG LIBFDK_AAC_VERSION=0.1.6 +ARG LIBOPENJPEG_VERSION=2.1.2 +ARG LIBFREETYPE_VERSION=2.10.0 +ARG LIBVIDSTAB_VERSION=1.1.0 +ARG LIBFRIBIDI_VERSION=0.19.7 +ARG LIBFONTCONFIG_VERSION=2.13.1 +ARG LIBFREETYPE_VERSION=2.10.0 +ARG LIBFRIBIDI_VERSION=0.19.7 +ARG LIBFONTCONFIG_VERSION=2.13.1 +ARG LIBASS_VERSION=0.14.0 +ARG LIBKVAZAAR_VERSION=1.2.0 +ARG NVENC_VERSION=9.0.18.1 + +ARG LIBOGG_SHA256SUM=c2e8a485110b97550f453226ec644ebac6cb29d1caef2902c007edab4308d985 +ARG LIBOPUS_SHA256SUM=65b58e1e25b2a114157014736a3d9dfeaad8d41be1c8179866f144a2fb44ff9d +ARG LIBVORBIS_SHA256SUM=6ed40e0241089a42c48604dc00e362beee00036af2d8b3f46338031c9e0351cb +ARG LIBTHEORA_SHA256SUM=40952956c47811928d1e7922cda3bc1f427eb75680c3c37249c91e949054916b +ARG LIBVIDSTAB_SHA256SUM=14d2a053e56edad4f397be0cb3ef8eb1ec3150404ce99a426c4eb641861dc0bb +ARG LIBFRIBIDI_SHA256SUM=3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 +ARG LIBFRIBIDI_SHA256SUM=3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 + +## opencore-amr https://sourceforge.net/projects/opencore-amr/ +RUN \ + DIR=opencore-amr && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://kent.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${LIBOPENCORE_AMR_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +## x264 http://www.videolan.org/developers/x264.html +RUN \ + DIR=x264 && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://download.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-${LIBX264_VERSION}.tar.bz2 | \ + tar -jx --strip-components=1 && \ + ./configure --prefix="${PREFIX}" --enable-shared --enable-pic && \ + make && \ + make install && \ + rm -rf ${DIR} +### x265 http://x265.org/ +RUN \ + DIR=x265 && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://download.videolan.org/pub/videolan/x265/x265_${LIBX265_VERSION}.tar.gz | \ + tar -zx && \ + cd x265_${LIBX265_VERSION}/build/linux && \ + sed -i "/-DEXTRA_LIB/ s/$/ -DCMAKE_INSTALL_PREFIX=\${PREFIX}/" multilib.sh && \ + sed -i "/^cmake/ s/$/ -DENABLE_CLI=ON/" multilib.sh && \ + ./multilib.sh && \ + make -C 8bit install && \ + rm -rf ${DIR} +## libogg https://www.xiph.org/ogg/ +RUN \ + DIR=ogg && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO http://downloads.xiph.org/releases/ogg/libogg-${LIBOGG_VERSION}.tar.gz && \ + echo "${LIBOGG_SHA256SUM} libogg-${LIBOGG_VERSION}.tar.gz" | sha256sum --check && \ + tar -zx --strip-components=1 -f libogg-${LIBOGG_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +RUN \ + DIR=opus && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://archive.mozilla.org/pub/opus/opus-${LIBOPUS_VERSION}.tar.gz && \ + echo "${LIBOPUS_SHA256SUM} opus-${LIBOPUS_VERSION}.tar.gz"| sha256sum --check && \ + tar -zx --strip-components=1 -f opus-${LIBOPUS_VERSION}.tar.gz && \ + autoreconf -fiv && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +### libvorbis https://xiph.org/vorbis/ +RUN \ + DIR=vorbis && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO http://downloads.xiph.org/releases/vorbis/libvorbis-${LIBVORBIS_VERSION}.tar.gz && \ + echo "${LIBVORBIS_SHA256SUM} libvorbis-${LIBVORBIS_VERSION}.tar.gz" | sha256sum --check && \ + tar -zx --strip-components=1 -f libvorbis-${LIBVORBIS_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +### libtheora http://www.theora.org/ +RUN \ + DIR=theora && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO http://downloads.xiph.org/releases/theora/libtheora-${LIBTHEORA_VERSION}.tar.gz && \ + echo "${LIBTHEORA_SHA256SUM} libtheora-${LIBTHEORA_VERSION}.tar.gz" | sha256sum --check && \ + tar -zx --strip-components=1 -f libtheora-${LIBTHEORA_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +### libvpx https://www.webmproject.org/code/ +RUN \ + DIR=vpx && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://codeload.github.com/webmproject/libvpx/tar.gz/v${LIBVPX_VERSION} | \ + tar -zx --strip-components=1 && \ + ./configure --prefix="${PREFIX}" --enable-vp8 --enable-vp9 --enable-vp9-highbitdepth --enable-pic --enable-shared \ + --disable-debug --disable-examples --disable-docs && \ + make && \ + make install && \ + rm -rf ${DIR} + +### libmp3lame http://lame.sourceforge.net/ +RUN \ + DIR=lame && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://kent.dl.sourceforge.net/project/lame/lame/$(echo ${LIBMP3LAME_VERSION} | sed -e 's/[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)/\1.\2/')/lame-${LIBMP3LAME_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" --enable-shared --enable-nasm --enable-pic && \ + make && \ + make install && \ + rm -rf ${DIR} +### xvid https://www.xvid.com/ +RUN \ + DIR=xvid && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO http://downloads.xvid.org/downloads/xvidcore-${LIBXVID_VERSION}.tar.gz && \ + tar -zx -f xvidcore-${LIBXVID_VERSION}.tar.gz && \ + cd xvidcore/build/generic && \ + ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" --datadir="${DIR}" --enable-shared --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +### fdk-aac https://github.com/mstorsjo/fdk-aac +RUN \ + DIR=fdk-aac && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://github.com/mstorsjo/fdk-aac/archive/v${LIBFDK_AAC_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + autoreconf -fiv && \ + ./configure --prefix="${PREFIX}" --enable-shared --datadir="${DIR}" && \ + make && \ + make install && \ + rm -rf ${DIR} +## openjpeg https://github.com/uclouvain/openjpeg +RUN \ + DIR=openjpeg && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + if test `echo ${LIBOPENJPEG_VERSION} | tr -d '.'` -ge '210'; then \ + version_prefix='v'; \ + else \ + version_prefix='version.' ;\ + fi && \ + curl -sL https://github.com/uclouvain/openjpeg/archive/${version_prefix}${LIBOPENJPEG_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + cmake -DBUILD_THIRDPARTY:BOOL=ON -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ + make && \ + make install && \ + rm -rf ${DIR} +## freetype https://www.freetype.org/ +RUN \ + DIR=freetype && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://download.savannah.gnu.org/releases/freetype/freetype-${LIBFREETYPE_VERSION}.tar.gz && \ + tar -zx --strip-components=1 -f freetype-${LIBFREETYPE_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +## libvstab https://github.com/georgmartius/vid.stab +RUN \ + DIR=vid.stab && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/georgmartius/vid.stab/archive/v${LIBVIDSTAB_VERSION}.tar.gz &&\ + echo "${LIBVIDSTAB_SHA256SUM} v${LIBVIDSTAB_VERSION}.tar.gz" | sha256sum --check && \ + tar -zx --strip-components=1 -f v${LIBVIDSTAB_VERSION}.tar.gz && \ + cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ + make && \ + make install && \ + rm -rf ${DIR} +## fridibi https://www.fribidi.org/ +# + https://github.com/fribidi/fribidi/issues/8 +RUN \ + DIR=fribidi && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/fribidi/fribidi/archive/${LIBFRIBIDI_VERSION}.tar.gz && \ + echo "${LIBFRIBIDI_SHA256SUM} ${LIBFRIBIDI_VERSION}.tar.gz" | sha256sum --check && \ + tar -zx --strip-components=1 -f ${LIBFRIBIDI_VERSION}.tar.gz && \ + sed -i 's/^SUBDIRS =.*/SUBDIRS=gen.tab charset lib/' Makefile.am && \ + ./bootstrap --no-config && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ + make -j 1 && \ + make install && \ + rm -rf ${DIR} +## fontconfig https://www.freedesktop.org/wiki/Software/fontconfig/ +RUN \ + DIR=fontconfig && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://www.freedesktop.org/software/fontconfig/release/fontconfig-${LIBFONTCONFIG_VERSION}.tar.bz2 &&\ + tar -jx --strip-components=1 -f fontconfig-${LIBFONTCONFIG_VERSION}.tar.bz2 && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +## freetype https://www.freetype.org/ +RUN \ + DIR=freetype && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://download.savannah.gnu.org/releases/freetype/freetype-${LIBFREETYPE_VERSION}.tar.gz && \ + tar -zx --strip-components=1 -f freetype-${LIBFREETYPE_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +## fridibi https://www.fribidi.org/ +# + https://github.com/fribidi/fribidi/issues/8 +RUN \ + DIR=fribidi && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/fribidi/fribidi/archive/${LIBFRIBIDI_VERSION}.tar.gz && \ + echo "${LIBFRIBIDI_SHA256SUM} ${LIBFRIBIDI_VERSION}.tar.gz" | sha256sum --check && \ + tar -zx --strip-components=1 -f ${LIBFRIBIDI_VERSION}.tar.gz && \ + sed -i 's/^SUBDIRS =.*/SUBDIRS=gen.tab charset lib/' Makefile.am && \ + ./bootstrap --no-config && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ + make -j 1 && \ + make install && \ + rm -rf ${DIR} +## fontconfig https://www.freedesktop.org/wiki/Software/fontconfig/ +RUN \ + DIR=fontconfig && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://www.freedesktop.org/software/fontconfig/release/fontconfig-${LIBFONTCONFIG_VERSION}.tar.bz2 &&\ + tar -jx --strip-components=1 -f fontconfig-${LIBFONTCONFIG_VERSION}.tar.bz2 && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +RUN \ + DIR=libass && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/libass/libass/archive/${LIBASS_VERSION}.tar.gz &&\ + tar -zx --strip-components=1 -f ${LIBASS_VERSION}.tar.gz && \ + ./autogen.sh && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +## kvazaar https://github.com/ultravideo/kvazaar +RUN \ + DIR=kvazaar && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/ultravideo/kvazaar/archive/v${LIBKVAZAAR_VERSION}.tar.gz &&\ + tar -zx --strip-components=1 -f v${LIBKVAZAAR_VERSION}.tar.gz && \ + if [ -e ./autogen.sh ]; then \ + ./autogen.sh && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared ; \ + else \ + cd src ; \ + fi && \ + make && \ + make install && \ + rm -rf ${DIR} + +RUN \ + DIR=nv-codec-headers && \ + git clone --branch n${NVENC_VERSION} --depth=1 https://git.videolan.org/git/ffmpeg/nv-codec-headers.git ${DIR} && \ + cd ${DIR} && \ + sed -i 's@/usr/local@'"$PREFIX"'@' Makefile && \ + make && \ + make install && \ + rm -rf ${DIR} +RUN \ + DIR=ffmpeg && mkdir -p ${DIR} && cd ${DIR} && \ + curl -sLO https://ffmpeg.org/releases/ffmpeg-${FFMPEG_VERSION}.tar.bz2 && \ + tar -jx --strip-components=1 -f ffmpeg-${FFMPEG_VERSION}.tar.bz2 && \ + ./configure \ + --disable-debug \ + --disable-doc \ + --disable-ffplay \ + --enable-shared \ + --enable-avresample \ + --enable-openssl \ + --enable-postproc \ + --enable-small \ + --extra-cflags="-I${PREFIX}/include -I/usr/local/include" \ + --extra-ldflags="-L${PREFIX}/lib -L/usr/local/lib" \ + --enable-libopencore-amrnb \ + --enable-libopencore-amrwb \ + --enable-version3 \ + --enable-libx264 \ + --enable-libx265 \ + --enable-libopus \ + --enable-libvorbis \ + --enable-libtheora \ + --enable-libvpx \ + --enable-libmp3lame \ + --enable-libxvid \ + --enable-libfdk_aac \ + --enable-nonfree \ + --enable-libopenjpeg \ + --enable-libfreetype \ + --enable-libvidstab \ + --enable-gpl \ + --enable-libass \ + --enable-libkvazaar \ + --enable-vaapi \ + --enable-cuda \ + --enable-nvenc \ + --enable-cuvid \ + --prefix="${PREFIX}" && \ + make && \ + make install && \ + make distclean && \ + hash -r && \ + cd tools && \ + make qt-faststart && \ + cp qt-faststart ${PREFIX}/bin + +RUN \ + if false; then \ + LD_LIBRARY_PATH=${PREFIX}/lib ldd ${PREFIX}/bin/* | \ + cut -d ' ' -f 3 | \ + strings | \ + xargs -i cp {} /usr/local/lib/ && \ + cp ${PREFIX}/bin/ff* /usr/local/bin/ ; \ + else \ + LD_LIBRARY_PATH=${PREFIX}/lib ldd ${PREFIX}/bin/ffmpeg | \ + cut -d ' ' -f 3 | \ + strings | \ + xargs -i cp {} /usr/local/lib/ && \ + cp ${PREFIX}/bin/ff* /usr/local/bin/ ; \ + fi && \ + if true; then \ + for lib in /usr/local/lib/*.so* /usr/local/bin/*; do strip --strip-all $lib; done ; \ + fi && \ + LD_LIBRARY_PATH=/usr/local/lib ffmpeg -buildconf + + +FROM scratch AS release +MAINTAINER Julien Rottenberg + +CMD ["--help"] +ENTRYPOINT ["/bin/ffmpeg"] + +COPY --from=build /usr/local / +RUN test "scratch" = "base" && ldconfig /usr/local/lib /usr/local/lib64 + +# Let's make sure the app built correctly +# Convenient to verify on https://hub.docker.com/r/jrottenberg/ffmpeg/builds/ console output diff --git a/docker-images/3.3/centos/Dockerfile b/docker-images/3.3/centos/Dockerfile index 55895b55a..7aa98cb6a 100644 --- a/docker-images/3.3/centos/Dockerfile +++ b/docker-images/3.3/centos/Dockerfile @@ -1,3 +1,4 @@ +<<<<<<< HEAD # ffmpeg - http://ffmpeg.org/download.html # # From https://trac.ffmpeg.org/wiki/CompilationGuide/Centos @@ -387,4 +388,466 @@ ENV LD_LIBRARY_PATH=/usr/local/lib64 COPY --from=build /usr/local/ /usr/local/ # Let's make sure the app built correctly -# Convenient to verify on https://hub.docker.com/r/jrottenberg/ffmpeg/builds/ console output \ No newline at end of file +# Convenient to verify on https://hub.docker.com/r/jrottenberg/ffmpeg/builds/ console output +======= +FROM centos:7 as base + +RUN yum -y install libva libgomp libuuid && \ + echo "/usr/local/lib" > /etc/ld.so.conf.d/local.conf && \ + echo "/usr/local/lib64" >> /etc/ld.so.conf.d/local.conf + +FROM base as build + +WORKDIR /tmp/workdir + +ARG PREFIX=/tmp/build +ARG MAKEFLAGS=-j6 +ARG PKG_CONFIG_PATH=/tmp/build/lib/pkgconfig:/tmp/build/lib64/pkgconfig + +RUN yum --enablerepo=extras install -y epel-release && \ + yum install -y \ + libva-devel \ + autoconf \ + automake \ + bzip2 \ + cmake \ + expat-devel \ + gcc \ + gcc-c++ \ + git \ + gperf \ + libtool \ + make \ + nasm \ + perl \ + openssl-devel \ + tar \ + yasm \ + which \ + zlib-devel \ + libuuid-devel \ + libcurl-devel \ + xz-devel \ + libarchive-devel \ + python36 \ + python36-pip + +#Centos is missing recent version of CMake (>= 3.5) +RUN \ + DIR=/tmp/cmake && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://cmake.org/files/v3.5/cmake-3.5.2.tar.gz | \ + tar -zx --strip-components=1 && \ + ./bootstrap --system-libs --no-system-jsoncpp && \ + make && \ + make install && \ + rm -rf ${DIR} + +#Centos is missing recent version of nasm (>= 2.13) +RUN \ + DIR=/tmp/nasm && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://www.nasm.us/pub/nasm/releasebuilds/2.13.03/nasm-2.13.03.tar.gz | \ + tar -zx --strip-components=1 && \ + ./configure --prefix="/usr" && \ + make && \ + make install && \ + rm -rf ${DIR} + +#Centos is missing ninja +RUN \ + DIR=/tmp/ninja && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://github.com/ninja-build/ninja/archive/v1.9.0.tar.gz | \ + tar -zx --strip-components=1 && \ + python configure.py --bootstrap && \ + cp ./ninja /usr/bin/ && \ + rm -rf ${DIR} + +RUN \ + DIR=/tmp/meson && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + pip3 install meson && \ + rm -rf ${DIR} + +ARG FFMPEG_VERSION=3.3.9 +ARG LIBOPENCORE_AMR_VERSION=0.1.5 +ARG LIBX264_VERSION=20190526-2245-stable +ARG LIBX265_VERSION=3.0 +ARG LIBOGG_VERSION=1.3.3 +ARG LIBOPUS_VERSION=1.3.1 +ARG LIBVORBIS_VERSION=1.3.6 +ARG LIBTHEORA_VERSION=1.1.1 +ARG LIBVPX_VERSION=1.8.0 +ARG LIBMP3LAME_VERSION=3.100 +ARG LIBXVID_VERSION=1.3.5 +ARG LIBFDK_AAC_VERSION=0.1.6 +ARG LIBOPENJPEG_VERSION=2.1.2 +ARG LIBFREETYPE_VERSION=2.10.0 +ARG LIBVIDSTAB_VERSION=1.1.0 +ARG LIBFRIBIDI_VERSION=0.19.7 +ARG LIBFONTCONFIG_VERSION=2.13.1 +ARG LIBFREETYPE_VERSION=2.10.0 +ARG LIBFRIBIDI_VERSION=0.19.7 +ARG LIBFONTCONFIG_VERSION=2.13.1 +ARG LIBASS_VERSION=0.14.0 +ARG LIBKVAZAAR_VERSION=1.2.0 +ARG NVENC_VERSION=9.0.18.1 + +ARG LIBOGG_SHA256SUM=c2e8a485110b97550f453226ec644ebac6cb29d1caef2902c007edab4308d985 +ARG LIBOPUS_SHA256SUM=65b58e1e25b2a114157014736a3d9dfeaad8d41be1c8179866f144a2fb44ff9d +ARG LIBVORBIS_SHA256SUM=6ed40e0241089a42c48604dc00e362beee00036af2d8b3f46338031c9e0351cb +ARG LIBTHEORA_SHA256SUM=40952956c47811928d1e7922cda3bc1f427eb75680c3c37249c91e949054916b +ARG LIBVIDSTAB_SHA256SUM=14d2a053e56edad4f397be0cb3ef8eb1ec3150404ce99a426c4eb641861dc0bb +ARG LIBFRIBIDI_SHA256SUM=3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 +ARG LIBFRIBIDI_SHA256SUM=3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 + +## opencore-amr https://sourceforge.net/projects/opencore-amr/ +RUN \ + DIR=opencore-amr && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://kent.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${LIBOPENCORE_AMR_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +## x264 http://www.videolan.org/developers/x264.html +RUN \ + DIR=x264 && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://download.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-${LIBX264_VERSION}.tar.bz2 | \ + tar -jx --strip-components=1 && \ + ./configure --prefix="${PREFIX}" --enable-shared --enable-pic && \ + make && \ + make install && \ + rm -rf ${DIR} +### x265 http://x265.org/ +RUN \ + DIR=x265 && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://download.videolan.org/pub/videolan/x265/x265_${LIBX265_VERSION}.tar.gz | \ + tar -zx && \ + cd x265_${LIBX265_VERSION}/build/linux && \ + sed -i "/-DEXTRA_LIB/ s/$/ -DCMAKE_INSTALL_PREFIX=\${PREFIX}/" multilib.sh && \ + sed -i "/^cmake/ s/$/ -DENABLE_CLI=ON/" multilib.sh && \ + ./multilib.sh && \ + make -C 8bit install && \ + rm -rf ${DIR} +## libogg https://www.xiph.org/ogg/ +RUN \ + DIR=ogg && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO http://downloads.xiph.org/releases/ogg/libogg-${LIBOGG_VERSION}.tar.gz && \ + echo "${LIBOGG_SHA256SUM} libogg-${LIBOGG_VERSION}.tar.gz" | sha256sum --check && \ + tar -zx --strip-components=1 -f libogg-${LIBOGG_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +RUN \ + DIR=opus && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://archive.mozilla.org/pub/opus/opus-${LIBOPUS_VERSION}.tar.gz && \ + echo "${LIBOPUS_SHA256SUM} opus-${LIBOPUS_VERSION}.tar.gz"| sha256sum --check && \ + tar -zx --strip-components=1 -f opus-${LIBOPUS_VERSION}.tar.gz && \ + autoreconf -fiv && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +### libvorbis https://xiph.org/vorbis/ +RUN \ + DIR=vorbis && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO http://downloads.xiph.org/releases/vorbis/libvorbis-${LIBVORBIS_VERSION}.tar.gz && \ + echo "${LIBVORBIS_SHA256SUM} libvorbis-${LIBVORBIS_VERSION}.tar.gz" | sha256sum --check && \ + tar -zx --strip-components=1 -f libvorbis-${LIBVORBIS_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +### libtheora http://www.theora.org/ +RUN \ + DIR=theora && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO http://downloads.xiph.org/releases/theora/libtheora-${LIBTHEORA_VERSION}.tar.gz && \ + echo "${LIBTHEORA_SHA256SUM} libtheora-${LIBTHEORA_VERSION}.tar.gz" | sha256sum --check && \ + tar -zx --strip-components=1 -f libtheora-${LIBTHEORA_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +### libvpx https://www.webmproject.org/code/ +RUN \ + DIR=vpx && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://codeload.github.com/webmproject/libvpx/tar.gz/v${LIBVPX_VERSION} | \ + tar -zx --strip-components=1 && \ + ./configure --prefix="${PREFIX}" --enable-vp8 --enable-vp9 --enable-vp9-highbitdepth --enable-pic --enable-shared \ + --disable-debug --disable-examples --disable-docs && \ + make && \ + make install && \ + rm -rf ${DIR} + +### libmp3lame http://lame.sourceforge.net/ +RUN \ + DIR=lame && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://kent.dl.sourceforge.net/project/lame/lame/$(echo ${LIBMP3LAME_VERSION} | sed -e 's/[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)/\1.\2/')/lame-${LIBMP3LAME_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" --enable-shared --enable-nasm --enable-pic && \ + make && \ + make install && \ + rm -rf ${DIR} +### xvid https://www.xvid.com/ +RUN \ + DIR=xvid && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO http://downloads.xvid.org/downloads/xvidcore-${LIBXVID_VERSION}.tar.gz && \ + tar -zx -f xvidcore-${LIBXVID_VERSION}.tar.gz && \ + cd xvidcore/build/generic && \ + ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" --datadir="${DIR}" --enable-shared --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +### fdk-aac https://github.com/mstorsjo/fdk-aac +RUN \ + DIR=fdk-aac && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://github.com/mstorsjo/fdk-aac/archive/v${LIBFDK_AAC_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + autoreconf -fiv && \ + ./configure --prefix="${PREFIX}" --enable-shared --datadir="${DIR}" && \ + make && \ + make install && \ + rm -rf ${DIR} +## openjpeg https://github.com/uclouvain/openjpeg +RUN \ + DIR=openjpeg && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + if test `echo ${LIBOPENJPEG_VERSION} | tr -d '.'` -ge '210'; then \ + version_prefix='v'; \ + else \ + version_prefix='version.' ;\ + fi && \ + curl -sL https://github.com/uclouvain/openjpeg/archive/${version_prefix}${LIBOPENJPEG_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + cmake -DBUILD_THIRDPARTY:BOOL=ON -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ + make && \ + make install && \ + rm -rf ${DIR} +## freetype https://www.freetype.org/ +RUN \ + DIR=freetype && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://download.savannah.gnu.org/releases/freetype/freetype-${LIBFREETYPE_VERSION}.tar.gz && \ + tar -zx --strip-components=1 -f freetype-${LIBFREETYPE_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +## libvstab https://github.com/georgmartius/vid.stab +RUN \ + DIR=vid.stab && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/georgmartius/vid.stab/archive/v${LIBVIDSTAB_VERSION}.tar.gz &&\ + echo "${LIBVIDSTAB_SHA256SUM} v${LIBVIDSTAB_VERSION}.tar.gz" | sha256sum --check && \ + tar -zx --strip-components=1 -f v${LIBVIDSTAB_VERSION}.tar.gz && \ + cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ + make && \ + make install && \ + rm -rf ${DIR} +## fridibi https://www.fribidi.org/ +# + https://github.com/fribidi/fribidi/issues/8 +RUN \ + DIR=fribidi && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/fribidi/fribidi/archive/${LIBFRIBIDI_VERSION}.tar.gz && \ + echo "${LIBFRIBIDI_SHA256SUM} ${LIBFRIBIDI_VERSION}.tar.gz" | sha256sum --check && \ + tar -zx --strip-components=1 -f ${LIBFRIBIDI_VERSION}.tar.gz && \ + sed -i 's/^SUBDIRS =.*/SUBDIRS=gen.tab charset lib/' Makefile.am && \ + ./bootstrap --no-config && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ + make -j 1 && \ + make install && \ + rm -rf ${DIR} +## fontconfig https://www.freedesktop.org/wiki/Software/fontconfig/ +RUN \ + DIR=fontconfig && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://www.freedesktop.org/software/fontconfig/release/fontconfig-${LIBFONTCONFIG_VERSION}.tar.bz2 &&\ + tar -jx --strip-components=1 -f fontconfig-${LIBFONTCONFIG_VERSION}.tar.bz2 && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +## freetype https://www.freetype.org/ +RUN \ + DIR=freetype && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://download.savannah.gnu.org/releases/freetype/freetype-${LIBFREETYPE_VERSION}.tar.gz && \ + tar -zx --strip-components=1 -f freetype-${LIBFREETYPE_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +## fridibi https://www.fribidi.org/ +# + https://github.com/fribidi/fribidi/issues/8 +RUN \ + DIR=fribidi && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/fribidi/fribidi/archive/${LIBFRIBIDI_VERSION}.tar.gz && \ + echo "${LIBFRIBIDI_SHA256SUM} ${LIBFRIBIDI_VERSION}.tar.gz" | sha256sum --check && \ + tar -zx --strip-components=1 -f ${LIBFRIBIDI_VERSION}.tar.gz && \ + sed -i 's/^SUBDIRS =.*/SUBDIRS=gen.tab charset lib/' Makefile.am && \ + ./bootstrap --no-config && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ + make -j 1 && \ + make install && \ + rm -rf ${DIR} +## fontconfig https://www.freedesktop.org/wiki/Software/fontconfig/ +RUN \ + DIR=fontconfig && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://www.freedesktop.org/software/fontconfig/release/fontconfig-${LIBFONTCONFIG_VERSION}.tar.bz2 &&\ + tar -jx --strip-components=1 -f fontconfig-${LIBFONTCONFIG_VERSION}.tar.bz2 && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +RUN \ + DIR=libass && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/libass/libass/archive/${LIBASS_VERSION}.tar.gz &&\ + tar -zx --strip-components=1 -f ${LIBASS_VERSION}.tar.gz && \ + ./autogen.sh && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +## kvazaar https://github.com/ultravideo/kvazaar +RUN \ + DIR=kvazaar && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/ultravideo/kvazaar/archive/v${LIBKVAZAAR_VERSION}.tar.gz &&\ + tar -zx --strip-components=1 -f v${LIBKVAZAAR_VERSION}.tar.gz && \ + if [ -e ./autogen.sh ]; then \ + ./autogen.sh && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared ; \ + else \ + cd src ; \ + fi && \ + make && \ + make install && \ + rm -rf ${DIR} + +RUN \ + DIR=nv-codec-headers && \ + git clone --branch n${NVENC_VERSION} --depth=1 https://git.videolan.org/git/ffmpeg/nv-codec-headers.git ${DIR} && \ + cd ${DIR} && \ + sed -i 's@/usr/local@'"$PREFIX"'@' Makefile && \ + make && \ + make install && \ + rm -rf ${DIR} +RUN \ + DIR=ffmpeg && mkdir -p ${DIR} && cd ${DIR} && \ + curl -sLO https://ffmpeg.org/releases/ffmpeg-${FFMPEG_VERSION}.tar.bz2 && \ + tar -jx --strip-components=1 -f ffmpeg-${FFMPEG_VERSION}.tar.bz2 && \ + ./configure \ + --disable-debug \ + --disable-doc \ + --disable-ffplay \ + --enable-shared \ + --enable-avresample \ + --enable-openssl \ + --enable-postproc \ + --enable-small \ + --extra-cflags="-I${PREFIX}/include -I/usr/local/include" \ + --extra-ldflags="-L${PREFIX}/lib -L/usr/local/lib" \ + --enable-libopencore-amrnb \ + --enable-libopencore-amrwb \ + --enable-version3 \ + --enable-libx264 \ + --enable-libx265 \ + --enable-libopus \ + --enable-libvorbis \ + --enable-libtheora \ + --enable-libvpx \ + --enable-libmp3lame \ + --enable-libxvid \ + --enable-libfdk_aac \ + --enable-nonfree \ + --enable-libopenjpeg \ + --enable-libfreetype \ + --enable-libvidstab \ + --enable-gpl \ + --enable-libass \ + --enable-libkvazaar \ + --enable-vaapi \ + --enable-cuda \ + --enable-nvenc \ + --enable-cuvid \ + --prefix="${PREFIX}" && \ + make && \ + make install && \ + make distclean && \ + hash -r && \ + cd tools && \ + make qt-faststart && \ + cp qt-faststart ${PREFIX}/bin + +RUN \ + if false; then \ + cp -r ${PREFIX}/lib/*so* /usr/local/lib/ && \ + cp ${PREFIX}/bin/* /usr/local/bin/ ; \ + else \ + LD_LIBRARY_PATH=${PREFIX}/lib ldd ${PREFIX}/bin/ffmpeg | \ + grep ${PREFIX} | \ + cut -d ' ' -f 3 | \ + xargs -i cp {} /usr/local/lib/ && \ + cp ${PREFIX}/bin/ff* /usr/local/bin/ ; \ + fi && \ + if true; then \ + for lib in /usr/local/lib/*.so* /usr/local/bin/*; do strip --strip-all $lib; done ; \ + fi && \ + cp -r ${PREFIX}/share/ffmpeg /usr/local/share/ && \ + LD_LIBRARY_PATH=/usr/local/lib ffmpeg -buildconf + +FROM base AS release +MAINTAINER Julien Rottenberg + +CMD ["--help"] +ENTRYPOINT ["ffmpeg"] + +COPY --from=build /usr/local /usr/local +RUN test "base" = "base" && ldconfig /usr/local/lib /usr/local/lib64 + +# Let's make sure the app built correctly +# Convenient to verify on https://hub.docker.com/r/jrottenberg/ffmpeg/builds/ console output +>>>>>>> rewrite the dockerfile generation + vdapu + armv7 + dav1d diff --git a/docker-images/3.3/nvidia,/Dockerfile b/docker-images/3.3/nvidia,/Dockerfile new file mode 100644 index 000000000..452b62c02 --- /dev/null +++ b/docker-images/3.3/nvidia,/Dockerfile @@ -0,0 +1,14 @@ +usage: update.py [-h] [--enable-libopencore-amr] [--enable-libx264] + [--enable-libx265] [--enable-libogg] [--enable-libopus] + [--enable-libvorbis] [--enable-libtheora] [--enable-libvpx] + [--enable-libmp3lame] [--enable-libxvid] + [--enable-libfdk-aac] [--enable-libopenjpeg] + [--enable-libfreetype] [--enable-libvidstab] + [--enable-libfribidi] [--enable-libfontconfig] + [--enable-libass] [--enable-libkvazaar] [--enable-libaom] + [--enable-vaapi] [--enable-nvenc] [--enable-libdav1d] + [--enable-vdpau] [--enable-all] [--with-bins] [--no-strip] + [--fat | --slim | --scratch] + {alpine,centos,ubuntu,nvidia,armv7} + {snapshot,4.1,4.0,3.4,3.3,3.2,2.8} +update.py: error: argument variant: invalid choice: 'nvidia,' (choose from 'alpine', 'centos', 'ubuntu', 'nvidia', 'armv7') diff --git a/docker-images/3.3/ubuntu/Dockerfile b/docker-images/3.3/ubuntu/Dockerfile index 4d191c1b4..3e3331d7e 100644 --- a/docker-images/3.3/ubuntu/Dockerfile +++ b/docker-images/3.3/ubuntu/Dockerfile @@ -1,3 +1,4 @@ +<<<<<<< HEAD # ffmpeg - http://ffmpeg.org/download.html # # From https://trac.ffmpeg.org/wiki/CompilationGuide/Ubuntu @@ -389,3 +390,422 @@ COPY --from=build /usr/local /usr/local/ # Let's make sure the app built correctly # Convenient to verify on https://hub.docker.com/r/jrottenberg/ffmpeg/builds/ console output +======= +FROM ubuntu:18.04 AS base + +RUN apt-get -yqq update && \ + apt-get install -yq --no-install-recommends libva2 libva-drm2 i965-va-driver ca-certificates expat libgomp1 libuuid1 libssl1.0 && \ + apt-get autoremove -y && \ + apt-get clean -y + +FROM base as build + +WORKDIR /tmp/workdir + +ARG PREFIX=/tmp/build +ARG MAKEFLAGS=-j6 +ARG PKG_CONFIG_PATH=/tmp/build/lib/pkgconfig + +RUN apt-get -yqq update && \ + apt-get install -yq --no-install-recommends \ + libva-dev \ + autoconf \ + automake \ + cmake \ + curl \ + bzip2 \ + libexpat1-dev \ + g++ \ + gcc \ + git \ + gperf \ + libtool \ + make \ + nasm \ + perl \ + pkg-config \ + python \ + libssl1.0-dev \ + yasm \ + zlib1g-dev \ + uuid-dev \ + ninja-build \ + meson + +ARG FFMPEG_VERSION=3.3.9 +ARG LIBOPENCORE_AMR_VERSION=0.1.5 +ARG LIBX264_VERSION=20190526-2245-stable +ARG LIBX265_VERSION=3.0 +ARG LIBOGG_VERSION=1.3.3 +ARG LIBOPUS_VERSION=1.3.1 +ARG LIBVORBIS_VERSION=1.3.6 +ARG LIBTHEORA_VERSION=1.1.1 +ARG LIBVPX_VERSION=1.8.0 +ARG LIBMP3LAME_VERSION=3.100 +ARG LIBXVID_VERSION=1.3.5 +ARG LIBFDK_AAC_VERSION=0.1.6 +ARG LIBOPENJPEG_VERSION=2.1.2 +ARG LIBFREETYPE_VERSION=2.10.0 +ARG LIBVIDSTAB_VERSION=1.1.0 +ARG LIBFRIBIDI_VERSION=0.19.7 +ARG LIBFONTCONFIG_VERSION=2.13.1 +ARG LIBFREETYPE_VERSION=2.10.0 +ARG LIBFRIBIDI_VERSION=0.19.7 +ARG LIBFONTCONFIG_VERSION=2.13.1 +ARG LIBASS_VERSION=0.14.0 +ARG LIBKVAZAAR_VERSION=1.2.0 +ARG NVENC_VERSION=9.0.18.1 + +ARG LIBOGG_SHA256SUM=c2e8a485110b97550f453226ec644ebac6cb29d1caef2902c007edab4308d985 +ARG LIBOPUS_SHA256SUM=65b58e1e25b2a114157014736a3d9dfeaad8d41be1c8179866f144a2fb44ff9d +ARG LIBVORBIS_SHA256SUM=6ed40e0241089a42c48604dc00e362beee00036af2d8b3f46338031c9e0351cb +ARG LIBTHEORA_SHA256SUM=40952956c47811928d1e7922cda3bc1f427eb75680c3c37249c91e949054916b +ARG LIBVIDSTAB_SHA256SUM=14d2a053e56edad4f397be0cb3ef8eb1ec3150404ce99a426c4eb641861dc0bb +ARG LIBFRIBIDI_SHA256SUM=3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 +ARG LIBFRIBIDI_SHA256SUM=3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 + +## opencore-amr https://sourceforge.net/projects/opencore-amr/ +RUN \ + DIR=opencore-amr && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://kent.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${LIBOPENCORE_AMR_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +## x264 http://www.videolan.org/developers/x264.html +RUN \ + DIR=x264 && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://download.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-${LIBX264_VERSION}.tar.bz2 | \ + tar -jx --strip-components=1 && \ + ./configure --prefix="${PREFIX}" --enable-shared --enable-pic && \ + make && \ + make install && \ + rm -rf ${DIR} +### x265 http://x265.org/ +RUN \ + DIR=x265 && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://download.videolan.org/pub/videolan/x265/x265_${LIBX265_VERSION}.tar.gz | \ + tar -zx && \ + cd x265_${LIBX265_VERSION}/build/linux && \ + sed -i "/-DEXTRA_LIB/ s/$/ -DCMAKE_INSTALL_PREFIX=\${PREFIX}/" multilib.sh && \ + sed -i "/^cmake/ s/$/ -DENABLE_CLI=ON/" multilib.sh && \ + ./multilib.sh && \ + make -C 8bit install && \ + rm -rf ${DIR} +## libogg https://www.xiph.org/ogg/ +RUN \ + DIR=ogg && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO http://downloads.xiph.org/releases/ogg/libogg-${LIBOGG_VERSION}.tar.gz && \ + echo "${LIBOGG_SHA256SUM} libogg-${LIBOGG_VERSION}.tar.gz" | sha256sum --check && \ + tar -zx --strip-components=1 -f libogg-${LIBOGG_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +RUN \ + DIR=opus && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://archive.mozilla.org/pub/opus/opus-${LIBOPUS_VERSION}.tar.gz && \ + echo "${LIBOPUS_SHA256SUM} opus-${LIBOPUS_VERSION}.tar.gz"| sha256sum --check && \ + tar -zx --strip-components=1 -f opus-${LIBOPUS_VERSION}.tar.gz && \ + autoreconf -fiv && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +### libvorbis https://xiph.org/vorbis/ +RUN \ + DIR=vorbis && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO http://downloads.xiph.org/releases/vorbis/libvorbis-${LIBVORBIS_VERSION}.tar.gz && \ + echo "${LIBVORBIS_SHA256SUM} libvorbis-${LIBVORBIS_VERSION}.tar.gz" | sha256sum --check && \ + tar -zx --strip-components=1 -f libvorbis-${LIBVORBIS_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +### libtheora http://www.theora.org/ +RUN \ + DIR=theora && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO http://downloads.xiph.org/releases/theora/libtheora-${LIBTHEORA_VERSION}.tar.gz && \ + echo "${LIBTHEORA_SHA256SUM} libtheora-${LIBTHEORA_VERSION}.tar.gz" | sha256sum --check && \ + tar -zx --strip-components=1 -f libtheora-${LIBTHEORA_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +### libvpx https://www.webmproject.org/code/ +RUN \ + DIR=vpx && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://codeload.github.com/webmproject/libvpx/tar.gz/v${LIBVPX_VERSION} | \ + tar -zx --strip-components=1 && \ + ./configure --prefix="${PREFIX}" --enable-vp8 --enable-vp9 --enable-vp9-highbitdepth --enable-pic --enable-shared \ + --disable-debug --disable-examples --disable-docs && \ + make && \ + make install && \ + rm -rf ${DIR} + +### libmp3lame http://lame.sourceforge.net/ +RUN \ + DIR=lame && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://kent.dl.sourceforge.net/project/lame/lame/$(echo ${LIBMP3LAME_VERSION} | sed -e 's/[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)/\1.\2/')/lame-${LIBMP3LAME_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" --enable-shared --enable-nasm --enable-pic && \ + make && \ + make install && \ + rm -rf ${DIR} +### xvid https://www.xvid.com/ +RUN \ + DIR=xvid && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO http://downloads.xvid.org/downloads/xvidcore-${LIBXVID_VERSION}.tar.gz && \ + tar -zx -f xvidcore-${LIBXVID_VERSION}.tar.gz && \ + cd xvidcore/build/generic && \ + ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" --datadir="${DIR}" --enable-shared --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +### fdk-aac https://github.com/mstorsjo/fdk-aac +RUN \ + DIR=fdk-aac && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://github.com/mstorsjo/fdk-aac/archive/v${LIBFDK_AAC_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + autoreconf -fiv && \ + ./configure --prefix="${PREFIX}" --enable-shared --datadir="${DIR}" && \ + make && \ + make install && \ + rm -rf ${DIR} +## openjpeg https://github.com/uclouvain/openjpeg +RUN \ + DIR=openjpeg && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + if test `echo ${LIBOPENJPEG_VERSION} | tr -d '.'` -ge '210'; then \ + version_prefix='v'; \ + else \ + version_prefix='version.' ;\ + fi && \ + curl -sL https://github.com/uclouvain/openjpeg/archive/${version_prefix}${LIBOPENJPEG_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + cmake -DBUILD_THIRDPARTY:BOOL=ON -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ + make && \ + make install && \ + rm -rf ${DIR} +## freetype https://www.freetype.org/ +RUN \ + DIR=freetype && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://download.savannah.gnu.org/releases/freetype/freetype-${LIBFREETYPE_VERSION}.tar.gz && \ + tar -zx --strip-components=1 -f freetype-${LIBFREETYPE_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +## libvstab https://github.com/georgmartius/vid.stab +RUN \ + DIR=vid.stab && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/georgmartius/vid.stab/archive/v${LIBVIDSTAB_VERSION}.tar.gz &&\ + echo "${LIBVIDSTAB_SHA256SUM} v${LIBVIDSTAB_VERSION}.tar.gz" | sha256sum --check && \ + tar -zx --strip-components=1 -f v${LIBVIDSTAB_VERSION}.tar.gz && \ + cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ + make && \ + make install && \ + rm -rf ${DIR} +## fridibi https://www.fribidi.org/ +# + https://github.com/fribidi/fribidi/issues/8 +RUN \ + DIR=fribidi && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/fribidi/fribidi/archive/${LIBFRIBIDI_VERSION}.tar.gz && \ + echo "${LIBFRIBIDI_SHA256SUM} ${LIBFRIBIDI_VERSION}.tar.gz" | sha256sum --check && \ + tar -zx --strip-components=1 -f ${LIBFRIBIDI_VERSION}.tar.gz && \ + sed -i 's/^SUBDIRS =.*/SUBDIRS=gen.tab charset lib/' Makefile.am && \ + ./bootstrap --no-config && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ + make -j 1 && \ + make install && \ + rm -rf ${DIR} +## fontconfig https://www.freedesktop.org/wiki/Software/fontconfig/ +RUN \ + DIR=fontconfig && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://www.freedesktop.org/software/fontconfig/release/fontconfig-${LIBFONTCONFIG_VERSION}.tar.bz2 &&\ + tar -jx --strip-components=1 -f fontconfig-${LIBFONTCONFIG_VERSION}.tar.bz2 && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +## freetype https://www.freetype.org/ +RUN \ + DIR=freetype && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://download.savannah.gnu.org/releases/freetype/freetype-${LIBFREETYPE_VERSION}.tar.gz && \ + tar -zx --strip-components=1 -f freetype-${LIBFREETYPE_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +## fridibi https://www.fribidi.org/ +# + https://github.com/fribidi/fribidi/issues/8 +RUN \ + DIR=fribidi && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/fribidi/fribidi/archive/${LIBFRIBIDI_VERSION}.tar.gz && \ + echo "${LIBFRIBIDI_SHA256SUM} ${LIBFRIBIDI_VERSION}.tar.gz" | sha256sum --check && \ + tar -zx --strip-components=1 -f ${LIBFRIBIDI_VERSION}.tar.gz && \ + sed -i 's/^SUBDIRS =.*/SUBDIRS=gen.tab charset lib/' Makefile.am && \ + ./bootstrap --no-config && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ + make -j 1 && \ + make install && \ + rm -rf ${DIR} +## fontconfig https://www.freedesktop.org/wiki/Software/fontconfig/ +RUN \ + DIR=fontconfig && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://www.freedesktop.org/software/fontconfig/release/fontconfig-${LIBFONTCONFIG_VERSION}.tar.bz2 &&\ + tar -jx --strip-components=1 -f fontconfig-${LIBFONTCONFIG_VERSION}.tar.bz2 && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +RUN \ + DIR=libass && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/libass/libass/archive/${LIBASS_VERSION}.tar.gz &&\ + tar -zx --strip-components=1 -f ${LIBASS_VERSION}.tar.gz && \ + ./autogen.sh && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +## kvazaar https://github.com/ultravideo/kvazaar +RUN \ + DIR=kvazaar && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/ultravideo/kvazaar/archive/v${LIBKVAZAAR_VERSION}.tar.gz &&\ + tar -zx --strip-components=1 -f v${LIBKVAZAAR_VERSION}.tar.gz && \ + if [ -e ./autogen.sh ]; then \ + ./autogen.sh && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared ; \ + else \ + cd src ; \ + fi && \ + make && \ + make install && \ + rm -rf ${DIR} + +RUN \ + DIR=nv-codec-headers && \ + git clone --branch n${NVENC_VERSION} --depth=1 https://git.videolan.org/git/ffmpeg/nv-codec-headers.git ${DIR} && \ + cd ${DIR} && \ + sed -i 's@/usr/local@'"$PREFIX"'@' Makefile && \ + make && \ + make install && \ + rm -rf ${DIR} +RUN \ + DIR=ffmpeg && mkdir -p ${DIR} && cd ${DIR} && \ + curl -sLO https://ffmpeg.org/releases/ffmpeg-${FFMPEG_VERSION}.tar.bz2 && \ + tar -jx --strip-components=1 -f ffmpeg-${FFMPEG_VERSION}.tar.bz2 && \ + ./configure \ + --disable-debug \ + --disable-doc \ + --disable-ffplay \ + --enable-shared \ + --enable-avresample \ + --enable-openssl \ + --enable-postproc \ + --enable-small \ + --extra-cflags="-I${PREFIX}/include -I/usr/local/include" \ + --extra-ldflags="-L${PREFIX}/lib -L/usr/local/lib" \ + --enable-libopencore-amrnb \ + --enable-libopencore-amrwb \ + --enable-version3 \ + --enable-libx264 \ + --enable-libx265 \ + --enable-libopus \ + --enable-libvorbis \ + --enable-libtheora \ + --enable-libvpx \ + --enable-libmp3lame \ + --enable-libxvid \ + --enable-libfdk_aac \ + --enable-nonfree \ + --enable-libopenjpeg \ + --enable-libfreetype \ + --enable-libvidstab \ + --enable-gpl \ + --enable-libass \ + --enable-libkvazaar \ + --enable-vaapi \ + --enable-cuda \ + --enable-nvenc \ + --enable-cuvid \ + --prefix="${PREFIX}" && \ + make && \ + make install && \ + make distclean && \ + hash -r && \ + cd tools && \ + make qt-faststart && \ + cp qt-faststart ${PREFIX}/bin + +RUN \ + if false; then \ + cp -r ${PREFIX}/lib/*so* /usr/local/lib/ && \ + cp ${PREFIX}/bin/* /usr/local/bin/ ; \ + else \ + LD_LIBRARY_PATH=${PREFIX}/lib ldd ${PREFIX}/bin/ffmpeg | \ + grep ${PREFIX} | \ + cut -d ' ' -f 3 | \ + xargs -i cp {} /usr/local/lib/ && \ + cp ${PREFIX}/bin/ff* /usr/local/bin/ ; \ + fi && \ + if true; then \ + for lib in /usr/local/lib/*.so* /usr/local/bin/*; do strip --strip-all $lib; done ; \ + fi && \ + cp -r ${PREFIX}/share/ffmpeg /usr/local/share/ && \ + LD_LIBRARY_PATH=/usr/local/lib ffmpeg -buildconf + +FROM base AS release +MAINTAINER Julien Rottenberg + +CMD ["--help"] +ENTRYPOINT ["ffmpeg"] + +COPY --from=build /usr/local /usr/local +RUN test "base" = "base" && ldconfig /usr/local/lib /usr/local/lib64 + +# Let's make sure the app built correctly +# Convenient to verify on https://hub.docker.com/r/jrottenberg/ffmpeg/builds/ console output +>>>>>>> rewrite the dockerfile generation + vdapu + armv7 + dav1d diff --git a/docker-images/3.4/alpine,/Dockerfile b/docker-images/3.4/alpine,/Dockerfile new file mode 100644 index 000000000..a0b97723e --- /dev/null +++ b/docker-images/3.4/alpine,/Dockerfile @@ -0,0 +1,14 @@ +usage: update.py [-h] [--enable-libopencore-amr] [--enable-libx264] + [--enable-libx265] [--enable-libogg] [--enable-libopus] + [--enable-libvorbis] [--enable-libtheora] [--enable-libvpx] + [--enable-libmp3lame] [--enable-libxvid] + [--enable-libfdk-aac] [--enable-libopenjpeg] + [--enable-libfreetype] [--enable-libvidstab] + [--enable-libfribidi] [--enable-libfontconfig] + [--enable-libass] [--enable-libkvazaar] [--enable-libaom] + [--enable-vaapi] [--enable-nvenc] [--enable-libdav1d] + [--enable-vdpau] [--enable-all] [--with-bins] [--no-strip] + [--fat | --slim | --scratch] + {alpine,centos,ubuntu,nvidia,armv7} + {snapshot,4.1,4.0,3.4,3.3,3.2,2.8} +update.py: error: argument variant: invalid choice: 'alpine,' (choose from 'alpine', 'centos', 'ubuntu', 'nvidia', 'armv7') diff --git a/docker-images/3.4/arm32v7/Dockerfile b/docker-images/3.4/arm32v7/Dockerfile new file mode 100644 index 000000000..06e446af8 --- /dev/null +++ b/docker-images/3.4/arm32v7/Dockerfile @@ -0,0 +1,427 @@ +FROM alpine:3.9 as base + +RUN apk add --no-cache --update libva \ + libgcc \ + libstdc++ \ + ca-certificates \ + libcrypto1.1 \ + libssl1.1 \ + libgomp \ + expat \ + libuuid + +FROM base as build + +WORKDIR /tmp/workdir + +ARG PREFIX=/tmp/build +ARG MAKEFLAGS=-j6 +ARG PKG_CONFIG_PATH=/tmp/build/lib/pkgconfig + +RUN apk add --no-cache --update libva-dev \ + autoconf \ + automake \ + bash \ + binutils \ + bzip2 \ + cmake \ + curl \ + coreutils \ + diffutils \ + file \ + g++ \ + git \ + gcc \ + gperf \ + libtool \ + make \ + python \ + openssl-dev \ + tar \ + yasm \ + nasm \ + zlib-dev \ + expat-dev \ + util-linux-dev \ + meson \ + ninja + +ARG FFMPEG_VERSION=3.4.6 +ARG LIBOPENCORE_AMR_VERSION=0.1.5 +ARG LIBX264_VERSION=20190526-2245-stable +ARG LIBX265_VERSION=3.0 +ARG LIBOGG_VERSION=1.3.3 +ARG LIBOPUS_VERSION=1.3.1 +ARG LIBVORBIS_VERSION=1.3.6 +ARG LIBTHEORA_VERSION=1.1.1 +ARG LIBVPX_VERSION=1.8.0 +ARG LIBMP3LAME_VERSION=3.100 +ARG LIBXVID_VERSION=1.3.5 +ARG LIBFDK_AAC_VERSION=0.1.6 +ARG LIBOPENJPEG_VERSION=2.1.2 +ARG LIBFREETYPE_VERSION=2.10.0 +ARG LIBVIDSTAB_VERSION=1.1.0 +ARG LIBFRIBIDI_VERSION=0.19.7 +ARG LIBFONTCONFIG_VERSION=2.13.1 +ARG LIBFREETYPE_VERSION=2.10.0 +ARG LIBFRIBIDI_VERSION=0.19.7 +ARG LIBFONTCONFIG_VERSION=2.13.1 +ARG LIBASS_VERSION=0.14.0 +ARG LIBKVAZAAR_VERSION=1.2.0 +ARG NVENC_VERSION=9.0.18.1 + +ARG LIBOGG_SHA256SUM=c2e8a485110b97550f453226ec644ebac6cb29d1caef2902c007edab4308d985 +ARG LIBOPUS_SHA256SUM=65b58e1e25b2a114157014736a3d9dfeaad8d41be1c8179866f144a2fb44ff9d +ARG LIBVORBIS_SHA256SUM=6ed40e0241089a42c48604dc00e362beee00036af2d8b3f46338031c9e0351cb +ARG LIBTHEORA_SHA256SUM=40952956c47811928d1e7922cda3bc1f427eb75680c3c37249c91e949054916b +ARG LIBVIDSTAB_SHA256SUM=14d2a053e56edad4f397be0cb3ef8eb1ec3150404ce99a426c4eb641861dc0bb +ARG LIBFRIBIDI_SHA256SUM=3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 +ARG LIBFRIBIDI_SHA256SUM=3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 + +## opencore-amr https://sourceforge.net/projects/opencore-amr/ +RUN \ + DIR=opencore-amr && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://kent.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${LIBOPENCORE_AMR_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +## x264 http://www.videolan.org/developers/x264.html +RUN \ + DIR=x264 && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://download.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-${LIBX264_VERSION}.tar.bz2 | \ + tar -jx --strip-components=1 && \ + ./configure --prefix="${PREFIX}" --enable-shared --enable-pic && \ + make && \ + make install && \ + rm -rf ${DIR} +### x265 http://x265.org/ +RUN \ + DIR=x265 && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://download.videolan.org/pub/videolan/x265/x265_${LIBX265_VERSION}.tar.gz | \ + tar -zx && \ + cd x265_${LIBX265_VERSION}/build/linux && \ + sed -i "/-DEXTRA_LIB/ s/$/ -DCMAKE_INSTALL_PREFIX=\${PREFIX}/" multilib.sh && \ + sed -i "/^cmake/ s/$/ -DENABLE_CLI=ON/" multilib.sh && \ + ./multilib.sh && \ + make -C 8bit install && \ + rm -rf ${DIR} +## libogg https://www.xiph.org/ogg/ +RUN \ + DIR=ogg && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO http://downloads.xiph.org/releases/ogg/libogg-${LIBOGG_VERSION}.tar.gz && \ + echo "${LIBOGG_SHA256SUM} libogg-${LIBOGG_VERSION}.tar.gz" | sha256sum --check && \ + tar -zx --strip-components=1 -f libogg-${LIBOGG_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +RUN \ + DIR=opus && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://archive.mozilla.org/pub/opus/opus-${LIBOPUS_VERSION}.tar.gz && \ + echo "${LIBOPUS_SHA256SUM} opus-${LIBOPUS_VERSION}.tar.gz"| sha256sum --check && \ + tar -zx --strip-components=1 -f opus-${LIBOPUS_VERSION}.tar.gz && \ + autoreconf -fiv && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +### libvorbis https://xiph.org/vorbis/ +RUN \ + DIR=vorbis && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO http://downloads.xiph.org/releases/vorbis/libvorbis-${LIBVORBIS_VERSION}.tar.gz && \ + echo "${LIBVORBIS_SHA256SUM} libvorbis-${LIBVORBIS_VERSION}.tar.gz" | sha256sum --check && \ + tar -zx --strip-components=1 -f libvorbis-${LIBVORBIS_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +### libtheora http://www.theora.org/ +RUN \ + DIR=theora && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO http://downloads.xiph.org/releases/theora/libtheora-${LIBTHEORA_VERSION}.tar.gz && \ + echo "${LIBTHEORA_SHA256SUM} libtheora-${LIBTHEORA_VERSION}.tar.gz" | sha256sum --check && \ + tar -zx --strip-components=1 -f libtheora-${LIBTHEORA_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +### libvpx https://www.webmproject.org/code/ +RUN \ + DIR=vpx && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://codeload.github.com/webmproject/libvpx/tar.gz/v${LIBVPX_VERSION} | \ + tar -zx --strip-components=1 && \ + ./configure --prefix="${PREFIX}" --enable-vp8 --enable-vp9 --enable-vp9-highbitdepth --enable-pic --enable-shared \ + --disable-debug --disable-examples --disable-docs && \ + make && \ + make install && \ + rm -rf ${DIR} + +### libmp3lame http://lame.sourceforge.net/ +RUN \ + DIR=lame && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://kent.dl.sourceforge.net/project/lame/lame/$(echo ${LIBMP3LAME_VERSION} | sed -e 's/[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)/\1.\2/')/lame-${LIBMP3LAME_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" --enable-shared --enable-nasm --enable-pic && \ + make && \ + make install && \ + rm -rf ${DIR} +### xvid https://www.xvid.com/ +RUN \ + DIR=xvid && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO http://downloads.xvid.org/downloads/xvidcore-${LIBXVID_VERSION}.tar.gz && \ + tar -zx -f xvidcore-${LIBXVID_VERSION}.tar.gz && \ + cd xvidcore/build/generic && \ + ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" --datadir="${DIR}" --enable-shared --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +### fdk-aac https://github.com/mstorsjo/fdk-aac +RUN \ + DIR=fdk-aac && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://github.com/mstorsjo/fdk-aac/archive/v${LIBFDK_AAC_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + autoreconf -fiv && \ + ./configure --prefix="${PREFIX}" --enable-shared --datadir="${DIR}" && \ + make && \ + make install && \ + rm -rf ${DIR} +## openjpeg https://github.com/uclouvain/openjpeg +RUN \ + DIR=openjpeg && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + if test `echo ${LIBOPENJPEG_VERSION} | tr -d '.'` -ge '210'; then \ + version_prefix='v'; \ + else \ + version_prefix='version.' ;\ + fi && \ + curl -sL https://github.com/uclouvain/openjpeg/archive/${version_prefix}${LIBOPENJPEG_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + cmake -DBUILD_THIRDPARTY:BOOL=ON -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ + make && \ + make install && \ + rm -rf ${DIR} +## freetype https://www.freetype.org/ +RUN \ + DIR=freetype && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://download.savannah.gnu.org/releases/freetype/freetype-${LIBFREETYPE_VERSION}.tar.gz && \ + tar -zx --strip-components=1 -f freetype-${LIBFREETYPE_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +## libvstab https://github.com/georgmartius/vid.stab +RUN \ + DIR=vid.stab && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/georgmartius/vid.stab/archive/v${LIBVIDSTAB_VERSION}.tar.gz &&\ + echo "${LIBVIDSTAB_SHA256SUM} v${LIBVIDSTAB_VERSION}.tar.gz" | sha256sum --check && \ + tar -zx --strip-components=1 -f v${LIBVIDSTAB_VERSION}.tar.gz && \ + cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ + make && \ + make install && \ + rm -rf ${DIR} +## fridibi https://www.fribidi.org/ +# + https://github.com/fribidi/fribidi/issues/8 +RUN \ + DIR=fribidi && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/fribidi/fribidi/archive/${LIBFRIBIDI_VERSION}.tar.gz && \ + echo "${LIBFRIBIDI_SHA256SUM} ${LIBFRIBIDI_VERSION}.tar.gz" | sha256sum --check && \ + tar -zx --strip-components=1 -f ${LIBFRIBIDI_VERSION}.tar.gz && \ + sed -i 's/^SUBDIRS =.*/SUBDIRS=gen.tab charset lib/' Makefile.am && \ + ./bootstrap --no-config && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ + make -j 1 && \ + make install && \ + rm -rf ${DIR} +## fontconfig https://www.freedesktop.org/wiki/Software/fontconfig/ +RUN \ + DIR=fontconfig && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://www.freedesktop.org/software/fontconfig/release/fontconfig-${LIBFONTCONFIG_VERSION}.tar.bz2 &&\ + tar -jx --strip-components=1 -f fontconfig-${LIBFONTCONFIG_VERSION}.tar.bz2 && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +## freetype https://www.freetype.org/ +RUN \ + DIR=freetype && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://download.savannah.gnu.org/releases/freetype/freetype-${LIBFREETYPE_VERSION}.tar.gz && \ + tar -zx --strip-components=1 -f freetype-${LIBFREETYPE_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +## fridibi https://www.fribidi.org/ +# + https://github.com/fribidi/fribidi/issues/8 +RUN \ + DIR=fribidi && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/fribidi/fribidi/archive/${LIBFRIBIDI_VERSION}.tar.gz && \ + echo "${LIBFRIBIDI_SHA256SUM} ${LIBFRIBIDI_VERSION}.tar.gz" | sha256sum --check && \ + tar -zx --strip-components=1 -f ${LIBFRIBIDI_VERSION}.tar.gz && \ + sed -i 's/^SUBDIRS =.*/SUBDIRS=gen.tab charset lib/' Makefile.am && \ + ./bootstrap --no-config && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ + make -j 1 && \ + make install && \ + rm -rf ${DIR} +## fontconfig https://www.freedesktop.org/wiki/Software/fontconfig/ +RUN \ + DIR=fontconfig && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://www.freedesktop.org/software/fontconfig/release/fontconfig-${LIBFONTCONFIG_VERSION}.tar.bz2 &&\ + tar -jx --strip-components=1 -f fontconfig-${LIBFONTCONFIG_VERSION}.tar.bz2 && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +RUN \ + DIR=libass && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/libass/libass/archive/${LIBASS_VERSION}.tar.gz &&\ + tar -zx --strip-components=1 -f ${LIBASS_VERSION}.tar.gz && \ + ./autogen.sh && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +## kvazaar https://github.com/ultravideo/kvazaar +RUN \ + DIR=kvazaar && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/ultravideo/kvazaar/archive/v${LIBKVAZAAR_VERSION}.tar.gz &&\ + tar -zx --strip-components=1 -f v${LIBKVAZAAR_VERSION}.tar.gz && \ + if [ -e ./autogen.sh ]; then \ + ./autogen.sh && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared ; \ + else \ + cd src ; \ + fi && \ + make && \ + make install && \ + rm -rf ${DIR} + +RUN \ + DIR=nv-codec-headers && \ + git clone --branch n${NVENC_VERSION} --depth=1 https://git.videolan.org/git/ffmpeg/nv-codec-headers.git ${DIR} && \ + cd ${DIR} && \ + sed -i 's@/usr/local@'"$PREFIX"'@' Makefile && \ + make && \ + make install && \ + rm -rf ${DIR} +RUN \ + DIR=ffmpeg && mkdir -p ${DIR} && cd ${DIR} && \ + curl -sLO https://ffmpeg.org/releases/ffmpeg-${FFMPEG_VERSION}.tar.bz2 && \ + tar -jx --strip-components=1 -f ffmpeg-${FFMPEG_VERSION}.tar.bz2 && \ + ./configure \ + --disable-debug \ + --disable-doc \ + --disable-ffplay \ + --enable-shared \ + --enable-avresample \ + --enable-openssl \ + --enable-postproc \ + --enable-small \ + --extra-cflags="-I${PREFIX}/include -I/usr/local/include" \ + --extra-ldflags="-L${PREFIX}/lib -L/usr/local/lib" \ + --enable-libopencore-amrnb \ + --enable-libopencore-amrwb \ + --enable-version3 \ + --enable-libx264 \ + --enable-libx265 \ + --enable-libopus \ + --enable-libvorbis \ + --enable-libtheora \ + --enable-libvpx \ + --enable-libmp3lame \ + --enable-libxvid \ + --enable-libfdk_aac \ + --enable-nonfree \ + --enable-libopenjpeg \ + --enable-libfreetype \ + --enable-libvidstab \ + --enable-gpl \ + --enable-libass \ + --enable-libkvazaar \ + --enable-vaapi \ + --enable-cuda \ + --enable-nvenc \ + --enable-cuvid \ + --prefix="${PREFIX}" && \ + make && \ + make install && \ + make distclean && \ + hash -r && \ + cd tools && \ + make qt-faststart && \ + cp qt-faststart ${PREFIX}/bin + +RUN \ + if false; then \ + LD_LIBRARY_PATH=${PREFIX}/lib ldd ${PREFIX}/bin/* | \ + cut -d ' ' -f 3 | \ + strings | \ + xargs -i cp {} /usr/local/lib/ && \ + cp ${PREFIX}/bin/ff* /usr/local/bin/ ; \ + else \ + LD_LIBRARY_PATH=${PREFIX}/lib ldd ${PREFIX}/bin/ffmpeg | \ + cut -d ' ' -f 3 | \ + strings | \ + xargs -i cp {} /usr/local/lib/ && \ + cp ${PREFIX}/bin/ff* /usr/local/bin/ ; \ + fi && \ + if true; then \ + for lib in /usr/local/lib/*.so* /usr/local/bin/*; do strip --strip-all $lib; done ; \ + fi && \ + LD_LIBRARY_PATH=/usr/local/lib ffmpeg -buildconf + + +FROM scratch AS release +MAINTAINER Julien Rottenberg + +CMD ["--help"] +ENTRYPOINT ["/bin/ffmpeg"] + +COPY --from=build /usr/local / +RUN test "scratch" = "base" && ldconfig /usr/local/lib /usr/local/lib64 + +# Let's make sure the app built correctly +# Convenient to verify on https://hub.docker.com/r/jrottenberg/ffmpeg/builds/ console output diff --git a/docker-images/3.4/centos/Dockerfile b/docker-images/3.4/centos/Dockerfile index ec42f0897..67e32e8f2 100644 --- a/docker-images/3.4/centos/Dockerfile +++ b/docker-images/3.4/centos/Dockerfile @@ -1,3 +1,4 @@ +<<<<<<< HEAD # ffmpeg - http://ffmpeg.org/download.html # # From https://trac.ffmpeg.org/wiki/CompilationGuide/Centos @@ -387,4 +388,466 @@ ENV LD_LIBRARY_PATH=/usr/local/lib64 COPY --from=build /usr/local/ /usr/local/ # Let's make sure the app built correctly -# Convenient to verify on https://hub.docker.com/r/jrottenberg/ffmpeg/builds/ console output \ No newline at end of file +# Convenient to verify on https://hub.docker.com/r/jrottenberg/ffmpeg/builds/ console output +======= +FROM centos:7 as base + +RUN yum -y install libva libgomp libuuid && \ + echo "/usr/local/lib" > /etc/ld.so.conf.d/local.conf && \ + echo "/usr/local/lib64" >> /etc/ld.so.conf.d/local.conf + +FROM base as build + +WORKDIR /tmp/workdir + +ARG PREFIX=/tmp/build +ARG MAKEFLAGS=-j6 +ARG PKG_CONFIG_PATH=/tmp/build/lib/pkgconfig:/tmp/build/lib64/pkgconfig + +RUN yum --enablerepo=extras install -y epel-release && \ + yum install -y \ + libva-devel \ + autoconf \ + automake \ + bzip2 \ + cmake \ + expat-devel \ + gcc \ + gcc-c++ \ + git \ + gperf \ + libtool \ + make \ + nasm \ + perl \ + openssl-devel \ + tar \ + yasm \ + which \ + zlib-devel \ + libuuid-devel \ + libcurl-devel \ + xz-devel \ + libarchive-devel \ + python36 \ + python36-pip + +#Centos is missing recent version of CMake (>= 3.5) +RUN \ + DIR=/tmp/cmake && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://cmake.org/files/v3.5/cmake-3.5.2.tar.gz | \ + tar -zx --strip-components=1 && \ + ./bootstrap --system-libs --no-system-jsoncpp && \ + make && \ + make install && \ + rm -rf ${DIR} + +#Centos is missing recent version of nasm (>= 2.13) +RUN \ + DIR=/tmp/nasm && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://www.nasm.us/pub/nasm/releasebuilds/2.13.03/nasm-2.13.03.tar.gz | \ + tar -zx --strip-components=1 && \ + ./configure --prefix="/usr" && \ + make && \ + make install && \ + rm -rf ${DIR} + +#Centos is missing ninja +RUN \ + DIR=/tmp/ninja && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://github.com/ninja-build/ninja/archive/v1.9.0.tar.gz | \ + tar -zx --strip-components=1 && \ + python configure.py --bootstrap && \ + cp ./ninja /usr/bin/ && \ + rm -rf ${DIR} + +RUN \ + DIR=/tmp/meson && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + pip3 install meson && \ + rm -rf ${DIR} + +ARG FFMPEG_VERSION=3.4.6 +ARG LIBOPENCORE_AMR_VERSION=0.1.5 +ARG LIBX264_VERSION=20190526-2245-stable +ARG LIBX265_VERSION=3.0 +ARG LIBOGG_VERSION=1.3.3 +ARG LIBOPUS_VERSION=1.3.1 +ARG LIBVORBIS_VERSION=1.3.6 +ARG LIBTHEORA_VERSION=1.1.1 +ARG LIBVPX_VERSION=1.8.0 +ARG LIBMP3LAME_VERSION=3.100 +ARG LIBXVID_VERSION=1.3.5 +ARG LIBFDK_AAC_VERSION=0.1.6 +ARG LIBOPENJPEG_VERSION=2.1.2 +ARG LIBFREETYPE_VERSION=2.10.0 +ARG LIBVIDSTAB_VERSION=1.1.0 +ARG LIBFRIBIDI_VERSION=0.19.7 +ARG LIBFONTCONFIG_VERSION=2.13.1 +ARG LIBFREETYPE_VERSION=2.10.0 +ARG LIBFRIBIDI_VERSION=0.19.7 +ARG LIBFONTCONFIG_VERSION=2.13.1 +ARG LIBASS_VERSION=0.14.0 +ARG LIBKVAZAAR_VERSION=1.2.0 +ARG NVENC_VERSION=9.0.18.1 + +ARG LIBOGG_SHA256SUM=c2e8a485110b97550f453226ec644ebac6cb29d1caef2902c007edab4308d985 +ARG LIBOPUS_SHA256SUM=65b58e1e25b2a114157014736a3d9dfeaad8d41be1c8179866f144a2fb44ff9d +ARG LIBVORBIS_SHA256SUM=6ed40e0241089a42c48604dc00e362beee00036af2d8b3f46338031c9e0351cb +ARG LIBTHEORA_SHA256SUM=40952956c47811928d1e7922cda3bc1f427eb75680c3c37249c91e949054916b +ARG LIBVIDSTAB_SHA256SUM=14d2a053e56edad4f397be0cb3ef8eb1ec3150404ce99a426c4eb641861dc0bb +ARG LIBFRIBIDI_SHA256SUM=3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 +ARG LIBFRIBIDI_SHA256SUM=3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 + +## opencore-amr https://sourceforge.net/projects/opencore-amr/ +RUN \ + DIR=opencore-amr && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://kent.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${LIBOPENCORE_AMR_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +## x264 http://www.videolan.org/developers/x264.html +RUN \ + DIR=x264 && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://download.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-${LIBX264_VERSION}.tar.bz2 | \ + tar -jx --strip-components=1 && \ + ./configure --prefix="${PREFIX}" --enable-shared --enable-pic && \ + make && \ + make install && \ + rm -rf ${DIR} +### x265 http://x265.org/ +RUN \ + DIR=x265 && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://download.videolan.org/pub/videolan/x265/x265_${LIBX265_VERSION}.tar.gz | \ + tar -zx && \ + cd x265_${LIBX265_VERSION}/build/linux && \ + sed -i "/-DEXTRA_LIB/ s/$/ -DCMAKE_INSTALL_PREFIX=\${PREFIX}/" multilib.sh && \ + sed -i "/^cmake/ s/$/ -DENABLE_CLI=ON/" multilib.sh && \ + ./multilib.sh && \ + make -C 8bit install && \ + rm -rf ${DIR} +## libogg https://www.xiph.org/ogg/ +RUN \ + DIR=ogg && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO http://downloads.xiph.org/releases/ogg/libogg-${LIBOGG_VERSION}.tar.gz && \ + echo "${LIBOGG_SHA256SUM} libogg-${LIBOGG_VERSION}.tar.gz" | sha256sum --check && \ + tar -zx --strip-components=1 -f libogg-${LIBOGG_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +RUN \ + DIR=opus && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://archive.mozilla.org/pub/opus/opus-${LIBOPUS_VERSION}.tar.gz && \ + echo "${LIBOPUS_SHA256SUM} opus-${LIBOPUS_VERSION}.tar.gz"| sha256sum --check && \ + tar -zx --strip-components=1 -f opus-${LIBOPUS_VERSION}.tar.gz && \ + autoreconf -fiv && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +### libvorbis https://xiph.org/vorbis/ +RUN \ + DIR=vorbis && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO http://downloads.xiph.org/releases/vorbis/libvorbis-${LIBVORBIS_VERSION}.tar.gz && \ + echo "${LIBVORBIS_SHA256SUM} libvorbis-${LIBVORBIS_VERSION}.tar.gz" | sha256sum --check && \ + tar -zx --strip-components=1 -f libvorbis-${LIBVORBIS_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +### libtheora http://www.theora.org/ +RUN \ + DIR=theora && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO http://downloads.xiph.org/releases/theora/libtheora-${LIBTHEORA_VERSION}.tar.gz && \ + echo "${LIBTHEORA_SHA256SUM} libtheora-${LIBTHEORA_VERSION}.tar.gz" | sha256sum --check && \ + tar -zx --strip-components=1 -f libtheora-${LIBTHEORA_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +### libvpx https://www.webmproject.org/code/ +RUN \ + DIR=vpx && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://codeload.github.com/webmproject/libvpx/tar.gz/v${LIBVPX_VERSION} | \ + tar -zx --strip-components=1 && \ + ./configure --prefix="${PREFIX}" --enable-vp8 --enable-vp9 --enable-vp9-highbitdepth --enable-pic --enable-shared \ + --disable-debug --disable-examples --disable-docs && \ + make && \ + make install && \ + rm -rf ${DIR} + +### libmp3lame http://lame.sourceforge.net/ +RUN \ + DIR=lame && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://kent.dl.sourceforge.net/project/lame/lame/$(echo ${LIBMP3LAME_VERSION} | sed -e 's/[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)/\1.\2/')/lame-${LIBMP3LAME_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" --enable-shared --enable-nasm --enable-pic && \ + make && \ + make install && \ + rm -rf ${DIR} +### xvid https://www.xvid.com/ +RUN \ + DIR=xvid && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO http://downloads.xvid.org/downloads/xvidcore-${LIBXVID_VERSION}.tar.gz && \ + tar -zx -f xvidcore-${LIBXVID_VERSION}.tar.gz && \ + cd xvidcore/build/generic && \ + ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" --datadir="${DIR}" --enable-shared --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +### fdk-aac https://github.com/mstorsjo/fdk-aac +RUN \ + DIR=fdk-aac && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://github.com/mstorsjo/fdk-aac/archive/v${LIBFDK_AAC_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + autoreconf -fiv && \ + ./configure --prefix="${PREFIX}" --enable-shared --datadir="${DIR}" && \ + make && \ + make install && \ + rm -rf ${DIR} +## openjpeg https://github.com/uclouvain/openjpeg +RUN \ + DIR=openjpeg && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + if test `echo ${LIBOPENJPEG_VERSION} | tr -d '.'` -ge '210'; then \ + version_prefix='v'; \ + else \ + version_prefix='version.' ;\ + fi && \ + curl -sL https://github.com/uclouvain/openjpeg/archive/${version_prefix}${LIBOPENJPEG_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + cmake -DBUILD_THIRDPARTY:BOOL=ON -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ + make && \ + make install && \ + rm -rf ${DIR} +## freetype https://www.freetype.org/ +RUN \ + DIR=freetype && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://download.savannah.gnu.org/releases/freetype/freetype-${LIBFREETYPE_VERSION}.tar.gz && \ + tar -zx --strip-components=1 -f freetype-${LIBFREETYPE_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +## libvstab https://github.com/georgmartius/vid.stab +RUN \ + DIR=vid.stab && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/georgmartius/vid.stab/archive/v${LIBVIDSTAB_VERSION}.tar.gz &&\ + echo "${LIBVIDSTAB_SHA256SUM} v${LIBVIDSTAB_VERSION}.tar.gz" | sha256sum --check && \ + tar -zx --strip-components=1 -f v${LIBVIDSTAB_VERSION}.tar.gz && \ + cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ + make && \ + make install && \ + rm -rf ${DIR} +## fridibi https://www.fribidi.org/ +# + https://github.com/fribidi/fribidi/issues/8 +RUN \ + DIR=fribidi && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/fribidi/fribidi/archive/${LIBFRIBIDI_VERSION}.tar.gz && \ + echo "${LIBFRIBIDI_SHA256SUM} ${LIBFRIBIDI_VERSION}.tar.gz" | sha256sum --check && \ + tar -zx --strip-components=1 -f ${LIBFRIBIDI_VERSION}.tar.gz && \ + sed -i 's/^SUBDIRS =.*/SUBDIRS=gen.tab charset lib/' Makefile.am && \ + ./bootstrap --no-config && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ + make -j 1 && \ + make install && \ + rm -rf ${DIR} +## fontconfig https://www.freedesktop.org/wiki/Software/fontconfig/ +RUN \ + DIR=fontconfig && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://www.freedesktop.org/software/fontconfig/release/fontconfig-${LIBFONTCONFIG_VERSION}.tar.bz2 &&\ + tar -jx --strip-components=1 -f fontconfig-${LIBFONTCONFIG_VERSION}.tar.bz2 && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +## freetype https://www.freetype.org/ +RUN \ + DIR=freetype && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://download.savannah.gnu.org/releases/freetype/freetype-${LIBFREETYPE_VERSION}.tar.gz && \ + tar -zx --strip-components=1 -f freetype-${LIBFREETYPE_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +## fridibi https://www.fribidi.org/ +# + https://github.com/fribidi/fribidi/issues/8 +RUN \ + DIR=fribidi && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/fribidi/fribidi/archive/${LIBFRIBIDI_VERSION}.tar.gz && \ + echo "${LIBFRIBIDI_SHA256SUM} ${LIBFRIBIDI_VERSION}.tar.gz" | sha256sum --check && \ + tar -zx --strip-components=1 -f ${LIBFRIBIDI_VERSION}.tar.gz && \ + sed -i 's/^SUBDIRS =.*/SUBDIRS=gen.tab charset lib/' Makefile.am && \ + ./bootstrap --no-config && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ + make -j 1 && \ + make install && \ + rm -rf ${DIR} +## fontconfig https://www.freedesktop.org/wiki/Software/fontconfig/ +RUN \ + DIR=fontconfig && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://www.freedesktop.org/software/fontconfig/release/fontconfig-${LIBFONTCONFIG_VERSION}.tar.bz2 &&\ + tar -jx --strip-components=1 -f fontconfig-${LIBFONTCONFIG_VERSION}.tar.bz2 && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +RUN \ + DIR=libass && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/libass/libass/archive/${LIBASS_VERSION}.tar.gz &&\ + tar -zx --strip-components=1 -f ${LIBASS_VERSION}.tar.gz && \ + ./autogen.sh && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +## kvazaar https://github.com/ultravideo/kvazaar +RUN \ + DIR=kvazaar && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/ultravideo/kvazaar/archive/v${LIBKVAZAAR_VERSION}.tar.gz &&\ + tar -zx --strip-components=1 -f v${LIBKVAZAAR_VERSION}.tar.gz && \ + if [ -e ./autogen.sh ]; then \ + ./autogen.sh && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared ; \ + else \ + cd src ; \ + fi && \ + make && \ + make install && \ + rm -rf ${DIR} + +RUN \ + DIR=nv-codec-headers && \ + git clone --branch n${NVENC_VERSION} --depth=1 https://git.videolan.org/git/ffmpeg/nv-codec-headers.git ${DIR} && \ + cd ${DIR} && \ + sed -i 's@/usr/local@'"$PREFIX"'@' Makefile && \ + make && \ + make install && \ + rm -rf ${DIR} +RUN \ + DIR=ffmpeg && mkdir -p ${DIR} && cd ${DIR} && \ + curl -sLO https://ffmpeg.org/releases/ffmpeg-${FFMPEG_VERSION}.tar.bz2 && \ + tar -jx --strip-components=1 -f ffmpeg-${FFMPEG_VERSION}.tar.bz2 && \ + ./configure \ + --disable-debug \ + --disable-doc \ + --disable-ffplay \ + --enable-shared \ + --enable-avresample \ + --enable-openssl \ + --enable-postproc \ + --enable-small \ + --extra-cflags="-I${PREFIX}/include -I/usr/local/include" \ + --extra-ldflags="-L${PREFIX}/lib -L/usr/local/lib" \ + --enable-libopencore-amrnb \ + --enable-libopencore-amrwb \ + --enable-version3 \ + --enable-libx264 \ + --enable-libx265 \ + --enable-libopus \ + --enable-libvorbis \ + --enable-libtheora \ + --enable-libvpx \ + --enable-libmp3lame \ + --enable-libxvid \ + --enable-libfdk_aac \ + --enable-nonfree \ + --enable-libopenjpeg \ + --enable-libfreetype \ + --enable-libvidstab \ + --enable-gpl \ + --enable-libass \ + --enable-libkvazaar \ + --enable-vaapi \ + --enable-cuda \ + --enable-nvenc \ + --enable-cuvid \ + --prefix="${PREFIX}" && \ + make && \ + make install && \ + make distclean && \ + hash -r && \ + cd tools && \ + make qt-faststart && \ + cp qt-faststart ${PREFIX}/bin + +RUN \ + if false; then \ + cp -r ${PREFIX}/lib/*so* /usr/local/lib/ && \ + cp ${PREFIX}/bin/* /usr/local/bin/ ; \ + else \ + LD_LIBRARY_PATH=${PREFIX}/lib ldd ${PREFIX}/bin/ffmpeg | \ + grep ${PREFIX} | \ + cut -d ' ' -f 3 | \ + xargs -i cp {} /usr/local/lib/ && \ + cp ${PREFIX}/bin/ff* /usr/local/bin/ ; \ + fi && \ + if true; then \ + for lib in /usr/local/lib/*.so* /usr/local/bin/*; do strip --strip-all $lib; done ; \ + fi && \ + cp -r ${PREFIX}/share/ffmpeg /usr/local/share/ && \ + LD_LIBRARY_PATH=/usr/local/lib ffmpeg -buildconf + +FROM base AS release +MAINTAINER Julien Rottenberg + +CMD ["--help"] +ENTRYPOINT ["ffmpeg"] + +COPY --from=build /usr/local /usr/local +RUN test "base" = "base" && ldconfig /usr/local/lib /usr/local/lib64 + +# Let's make sure the app built correctly +# Convenient to verify on https://hub.docker.com/r/jrottenberg/ffmpeg/builds/ console output +>>>>>>> rewrite the dockerfile generation + vdapu + armv7 + dav1d diff --git a/docker-images/3.4/nvidia,/Dockerfile b/docker-images/3.4/nvidia,/Dockerfile new file mode 100644 index 000000000..452b62c02 --- /dev/null +++ b/docker-images/3.4/nvidia,/Dockerfile @@ -0,0 +1,14 @@ +usage: update.py [-h] [--enable-libopencore-amr] [--enable-libx264] + [--enable-libx265] [--enable-libogg] [--enable-libopus] + [--enable-libvorbis] [--enable-libtheora] [--enable-libvpx] + [--enable-libmp3lame] [--enable-libxvid] + [--enable-libfdk-aac] [--enable-libopenjpeg] + [--enable-libfreetype] [--enable-libvidstab] + [--enable-libfribidi] [--enable-libfontconfig] + [--enable-libass] [--enable-libkvazaar] [--enable-libaom] + [--enable-vaapi] [--enable-nvenc] [--enable-libdav1d] + [--enable-vdpau] [--enable-all] [--with-bins] [--no-strip] + [--fat | --slim | --scratch] + {alpine,centos,ubuntu,nvidia,armv7} + {snapshot,4.1,4.0,3.4,3.3,3.2,2.8} +update.py: error: argument variant: invalid choice: 'nvidia,' (choose from 'alpine', 'centos', 'ubuntu', 'nvidia', 'armv7') diff --git a/docker-images/3.4/ubuntu/Dockerfile b/docker-images/3.4/ubuntu/Dockerfile index 44a124591..4fb555c65 100644 --- a/docker-images/3.4/ubuntu/Dockerfile +++ b/docker-images/3.4/ubuntu/Dockerfile @@ -1,3 +1,4 @@ +<<<<<<< HEAD # ffmpeg - http://ffmpeg.org/download.html # # From https://trac.ffmpeg.org/wiki/CompilationGuide/Ubuntu @@ -389,3 +390,422 @@ COPY --from=build /usr/local /usr/local/ # Let's make sure the app built correctly # Convenient to verify on https://hub.docker.com/r/jrottenberg/ffmpeg/builds/ console output +======= +FROM ubuntu:18.04 AS base + +RUN apt-get -yqq update && \ + apt-get install -yq --no-install-recommends libva2 libva-drm2 i965-va-driver ca-certificates expat libgomp1 libuuid1 libssl1.0 && \ + apt-get autoremove -y && \ + apt-get clean -y + +FROM base as build + +WORKDIR /tmp/workdir + +ARG PREFIX=/tmp/build +ARG MAKEFLAGS=-j6 +ARG PKG_CONFIG_PATH=/tmp/build/lib/pkgconfig + +RUN apt-get -yqq update && \ + apt-get install -yq --no-install-recommends \ + libva-dev \ + autoconf \ + automake \ + cmake \ + curl \ + bzip2 \ + libexpat1-dev \ + g++ \ + gcc \ + git \ + gperf \ + libtool \ + make \ + nasm \ + perl \ + pkg-config \ + python \ + libssl1.0-dev \ + yasm \ + zlib1g-dev \ + uuid-dev \ + ninja-build \ + meson + +ARG FFMPEG_VERSION=3.4.6 +ARG LIBOPENCORE_AMR_VERSION=0.1.5 +ARG LIBX264_VERSION=20190526-2245-stable +ARG LIBX265_VERSION=3.0 +ARG LIBOGG_VERSION=1.3.3 +ARG LIBOPUS_VERSION=1.3.1 +ARG LIBVORBIS_VERSION=1.3.6 +ARG LIBTHEORA_VERSION=1.1.1 +ARG LIBVPX_VERSION=1.8.0 +ARG LIBMP3LAME_VERSION=3.100 +ARG LIBXVID_VERSION=1.3.5 +ARG LIBFDK_AAC_VERSION=0.1.6 +ARG LIBOPENJPEG_VERSION=2.1.2 +ARG LIBFREETYPE_VERSION=2.10.0 +ARG LIBVIDSTAB_VERSION=1.1.0 +ARG LIBFRIBIDI_VERSION=0.19.7 +ARG LIBFONTCONFIG_VERSION=2.13.1 +ARG LIBFREETYPE_VERSION=2.10.0 +ARG LIBFRIBIDI_VERSION=0.19.7 +ARG LIBFONTCONFIG_VERSION=2.13.1 +ARG LIBASS_VERSION=0.14.0 +ARG LIBKVAZAAR_VERSION=1.2.0 +ARG NVENC_VERSION=9.0.18.1 + +ARG LIBOGG_SHA256SUM=c2e8a485110b97550f453226ec644ebac6cb29d1caef2902c007edab4308d985 +ARG LIBOPUS_SHA256SUM=65b58e1e25b2a114157014736a3d9dfeaad8d41be1c8179866f144a2fb44ff9d +ARG LIBVORBIS_SHA256SUM=6ed40e0241089a42c48604dc00e362beee00036af2d8b3f46338031c9e0351cb +ARG LIBTHEORA_SHA256SUM=40952956c47811928d1e7922cda3bc1f427eb75680c3c37249c91e949054916b +ARG LIBVIDSTAB_SHA256SUM=14d2a053e56edad4f397be0cb3ef8eb1ec3150404ce99a426c4eb641861dc0bb +ARG LIBFRIBIDI_SHA256SUM=3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 +ARG LIBFRIBIDI_SHA256SUM=3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 + +## opencore-amr https://sourceforge.net/projects/opencore-amr/ +RUN \ + DIR=opencore-amr && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://kent.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${LIBOPENCORE_AMR_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +## x264 http://www.videolan.org/developers/x264.html +RUN \ + DIR=x264 && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://download.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-${LIBX264_VERSION}.tar.bz2 | \ + tar -jx --strip-components=1 && \ + ./configure --prefix="${PREFIX}" --enable-shared --enable-pic && \ + make && \ + make install && \ + rm -rf ${DIR} +### x265 http://x265.org/ +RUN \ + DIR=x265 && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://download.videolan.org/pub/videolan/x265/x265_${LIBX265_VERSION}.tar.gz | \ + tar -zx && \ + cd x265_${LIBX265_VERSION}/build/linux && \ + sed -i "/-DEXTRA_LIB/ s/$/ -DCMAKE_INSTALL_PREFIX=\${PREFIX}/" multilib.sh && \ + sed -i "/^cmake/ s/$/ -DENABLE_CLI=ON/" multilib.sh && \ + ./multilib.sh && \ + make -C 8bit install && \ + rm -rf ${DIR} +## libogg https://www.xiph.org/ogg/ +RUN \ + DIR=ogg && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO http://downloads.xiph.org/releases/ogg/libogg-${LIBOGG_VERSION}.tar.gz && \ + echo "${LIBOGG_SHA256SUM} libogg-${LIBOGG_VERSION}.tar.gz" | sha256sum --check && \ + tar -zx --strip-components=1 -f libogg-${LIBOGG_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +RUN \ + DIR=opus && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://archive.mozilla.org/pub/opus/opus-${LIBOPUS_VERSION}.tar.gz && \ + echo "${LIBOPUS_SHA256SUM} opus-${LIBOPUS_VERSION}.tar.gz"| sha256sum --check && \ + tar -zx --strip-components=1 -f opus-${LIBOPUS_VERSION}.tar.gz && \ + autoreconf -fiv && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +### libvorbis https://xiph.org/vorbis/ +RUN \ + DIR=vorbis && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO http://downloads.xiph.org/releases/vorbis/libvorbis-${LIBVORBIS_VERSION}.tar.gz && \ + echo "${LIBVORBIS_SHA256SUM} libvorbis-${LIBVORBIS_VERSION}.tar.gz" | sha256sum --check && \ + tar -zx --strip-components=1 -f libvorbis-${LIBVORBIS_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +### libtheora http://www.theora.org/ +RUN \ + DIR=theora && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO http://downloads.xiph.org/releases/theora/libtheora-${LIBTHEORA_VERSION}.tar.gz && \ + echo "${LIBTHEORA_SHA256SUM} libtheora-${LIBTHEORA_VERSION}.tar.gz" | sha256sum --check && \ + tar -zx --strip-components=1 -f libtheora-${LIBTHEORA_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +### libvpx https://www.webmproject.org/code/ +RUN \ + DIR=vpx && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://codeload.github.com/webmproject/libvpx/tar.gz/v${LIBVPX_VERSION} | \ + tar -zx --strip-components=1 && \ + ./configure --prefix="${PREFIX}" --enable-vp8 --enable-vp9 --enable-vp9-highbitdepth --enable-pic --enable-shared \ + --disable-debug --disable-examples --disable-docs && \ + make && \ + make install && \ + rm -rf ${DIR} + +### libmp3lame http://lame.sourceforge.net/ +RUN \ + DIR=lame && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://kent.dl.sourceforge.net/project/lame/lame/$(echo ${LIBMP3LAME_VERSION} | sed -e 's/[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)/\1.\2/')/lame-${LIBMP3LAME_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" --enable-shared --enable-nasm --enable-pic && \ + make && \ + make install && \ + rm -rf ${DIR} +### xvid https://www.xvid.com/ +RUN \ + DIR=xvid && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO http://downloads.xvid.org/downloads/xvidcore-${LIBXVID_VERSION}.tar.gz && \ + tar -zx -f xvidcore-${LIBXVID_VERSION}.tar.gz && \ + cd xvidcore/build/generic && \ + ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" --datadir="${DIR}" --enable-shared --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +### fdk-aac https://github.com/mstorsjo/fdk-aac +RUN \ + DIR=fdk-aac && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://github.com/mstorsjo/fdk-aac/archive/v${LIBFDK_AAC_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + autoreconf -fiv && \ + ./configure --prefix="${PREFIX}" --enable-shared --datadir="${DIR}" && \ + make && \ + make install && \ + rm -rf ${DIR} +## openjpeg https://github.com/uclouvain/openjpeg +RUN \ + DIR=openjpeg && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + if test `echo ${LIBOPENJPEG_VERSION} | tr -d '.'` -ge '210'; then \ + version_prefix='v'; \ + else \ + version_prefix='version.' ;\ + fi && \ + curl -sL https://github.com/uclouvain/openjpeg/archive/${version_prefix}${LIBOPENJPEG_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + cmake -DBUILD_THIRDPARTY:BOOL=ON -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ + make && \ + make install && \ + rm -rf ${DIR} +## freetype https://www.freetype.org/ +RUN \ + DIR=freetype && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://download.savannah.gnu.org/releases/freetype/freetype-${LIBFREETYPE_VERSION}.tar.gz && \ + tar -zx --strip-components=1 -f freetype-${LIBFREETYPE_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +## libvstab https://github.com/georgmartius/vid.stab +RUN \ + DIR=vid.stab && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/georgmartius/vid.stab/archive/v${LIBVIDSTAB_VERSION}.tar.gz &&\ + echo "${LIBVIDSTAB_SHA256SUM} v${LIBVIDSTAB_VERSION}.tar.gz" | sha256sum --check && \ + tar -zx --strip-components=1 -f v${LIBVIDSTAB_VERSION}.tar.gz && \ + cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ + make && \ + make install && \ + rm -rf ${DIR} +## fridibi https://www.fribidi.org/ +# + https://github.com/fribidi/fribidi/issues/8 +RUN \ + DIR=fribidi && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/fribidi/fribidi/archive/${LIBFRIBIDI_VERSION}.tar.gz && \ + echo "${LIBFRIBIDI_SHA256SUM} ${LIBFRIBIDI_VERSION}.tar.gz" | sha256sum --check && \ + tar -zx --strip-components=1 -f ${LIBFRIBIDI_VERSION}.tar.gz && \ + sed -i 's/^SUBDIRS =.*/SUBDIRS=gen.tab charset lib/' Makefile.am && \ + ./bootstrap --no-config && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ + make -j 1 && \ + make install && \ + rm -rf ${DIR} +## fontconfig https://www.freedesktop.org/wiki/Software/fontconfig/ +RUN \ + DIR=fontconfig && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://www.freedesktop.org/software/fontconfig/release/fontconfig-${LIBFONTCONFIG_VERSION}.tar.bz2 &&\ + tar -jx --strip-components=1 -f fontconfig-${LIBFONTCONFIG_VERSION}.tar.bz2 && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +## freetype https://www.freetype.org/ +RUN \ + DIR=freetype && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://download.savannah.gnu.org/releases/freetype/freetype-${LIBFREETYPE_VERSION}.tar.gz && \ + tar -zx --strip-components=1 -f freetype-${LIBFREETYPE_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +## fridibi https://www.fribidi.org/ +# + https://github.com/fribidi/fribidi/issues/8 +RUN \ + DIR=fribidi && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/fribidi/fribidi/archive/${LIBFRIBIDI_VERSION}.tar.gz && \ + echo "${LIBFRIBIDI_SHA256SUM} ${LIBFRIBIDI_VERSION}.tar.gz" | sha256sum --check && \ + tar -zx --strip-components=1 -f ${LIBFRIBIDI_VERSION}.tar.gz && \ + sed -i 's/^SUBDIRS =.*/SUBDIRS=gen.tab charset lib/' Makefile.am && \ + ./bootstrap --no-config && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ + make -j 1 && \ + make install && \ + rm -rf ${DIR} +## fontconfig https://www.freedesktop.org/wiki/Software/fontconfig/ +RUN \ + DIR=fontconfig && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://www.freedesktop.org/software/fontconfig/release/fontconfig-${LIBFONTCONFIG_VERSION}.tar.bz2 &&\ + tar -jx --strip-components=1 -f fontconfig-${LIBFONTCONFIG_VERSION}.tar.bz2 && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +RUN \ + DIR=libass && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/libass/libass/archive/${LIBASS_VERSION}.tar.gz &&\ + tar -zx --strip-components=1 -f ${LIBASS_VERSION}.tar.gz && \ + ./autogen.sh && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +## kvazaar https://github.com/ultravideo/kvazaar +RUN \ + DIR=kvazaar && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/ultravideo/kvazaar/archive/v${LIBKVAZAAR_VERSION}.tar.gz &&\ + tar -zx --strip-components=1 -f v${LIBKVAZAAR_VERSION}.tar.gz && \ + if [ -e ./autogen.sh ]; then \ + ./autogen.sh && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared ; \ + else \ + cd src ; \ + fi && \ + make && \ + make install && \ + rm -rf ${DIR} + +RUN \ + DIR=nv-codec-headers && \ + git clone --branch n${NVENC_VERSION} --depth=1 https://git.videolan.org/git/ffmpeg/nv-codec-headers.git ${DIR} && \ + cd ${DIR} && \ + sed -i 's@/usr/local@'"$PREFIX"'@' Makefile && \ + make && \ + make install && \ + rm -rf ${DIR} +RUN \ + DIR=ffmpeg && mkdir -p ${DIR} && cd ${DIR} && \ + curl -sLO https://ffmpeg.org/releases/ffmpeg-${FFMPEG_VERSION}.tar.bz2 && \ + tar -jx --strip-components=1 -f ffmpeg-${FFMPEG_VERSION}.tar.bz2 && \ + ./configure \ + --disable-debug \ + --disable-doc \ + --disable-ffplay \ + --enable-shared \ + --enable-avresample \ + --enable-openssl \ + --enable-postproc \ + --enable-small \ + --extra-cflags="-I${PREFIX}/include -I/usr/local/include" \ + --extra-ldflags="-L${PREFIX}/lib -L/usr/local/lib" \ + --enable-libopencore-amrnb \ + --enable-libopencore-amrwb \ + --enable-version3 \ + --enable-libx264 \ + --enable-libx265 \ + --enable-libopus \ + --enable-libvorbis \ + --enable-libtheora \ + --enable-libvpx \ + --enable-libmp3lame \ + --enable-libxvid \ + --enable-libfdk_aac \ + --enable-nonfree \ + --enable-libopenjpeg \ + --enable-libfreetype \ + --enable-libvidstab \ + --enable-gpl \ + --enable-libass \ + --enable-libkvazaar \ + --enable-vaapi \ + --enable-cuda \ + --enable-nvenc \ + --enable-cuvid \ + --prefix="${PREFIX}" && \ + make && \ + make install && \ + make distclean && \ + hash -r && \ + cd tools && \ + make qt-faststart && \ + cp qt-faststart ${PREFIX}/bin + +RUN \ + if false; then \ + cp -r ${PREFIX}/lib/*so* /usr/local/lib/ && \ + cp ${PREFIX}/bin/* /usr/local/bin/ ; \ + else \ + LD_LIBRARY_PATH=${PREFIX}/lib ldd ${PREFIX}/bin/ffmpeg | \ + grep ${PREFIX} | \ + cut -d ' ' -f 3 | \ + xargs -i cp {} /usr/local/lib/ && \ + cp ${PREFIX}/bin/ff* /usr/local/bin/ ; \ + fi && \ + if true; then \ + for lib in /usr/local/lib/*.so* /usr/local/bin/*; do strip --strip-all $lib; done ; \ + fi && \ + cp -r ${PREFIX}/share/ffmpeg /usr/local/share/ && \ + LD_LIBRARY_PATH=/usr/local/lib ffmpeg -buildconf + +FROM base AS release +MAINTAINER Julien Rottenberg + +CMD ["--help"] +ENTRYPOINT ["ffmpeg"] + +COPY --from=build /usr/local /usr/local +RUN test "base" = "base" && ldconfig /usr/local/lib /usr/local/lib64 + +# Let's make sure the app built correctly +# Convenient to verify on https://hub.docker.com/r/jrottenberg/ffmpeg/builds/ console output +>>>>>>> rewrite the dockerfile generation + vdapu + armv7 + dav1d diff --git a/docker-images/4.0/alpine,/Dockerfile b/docker-images/4.0/alpine,/Dockerfile new file mode 100644 index 000000000..a0b97723e --- /dev/null +++ b/docker-images/4.0/alpine,/Dockerfile @@ -0,0 +1,14 @@ +usage: update.py [-h] [--enable-libopencore-amr] [--enable-libx264] + [--enable-libx265] [--enable-libogg] [--enable-libopus] + [--enable-libvorbis] [--enable-libtheora] [--enable-libvpx] + [--enable-libmp3lame] [--enable-libxvid] + [--enable-libfdk-aac] [--enable-libopenjpeg] + [--enable-libfreetype] [--enable-libvidstab] + [--enable-libfribidi] [--enable-libfontconfig] + [--enable-libass] [--enable-libkvazaar] [--enable-libaom] + [--enable-vaapi] [--enable-nvenc] [--enable-libdav1d] + [--enable-vdpau] [--enable-all] [--with-bins] [--no-strip] + [--fat | --slim | --scratch] + {alpine,centos,ubuntu,nvidia,armv7} + {snapshot,4.1,4.0,3.4,3.3,3.2,2.8} +update.py: error: argument variant: invalid choice: 'alpine,' (choose from 'alpine', 'centos', 'ubuntu', 'nvidia', 'armv7') diff --git a/docker-images/4.0/arm32v7/Dockerfile b/docker-images/4.0/arm32v7/Dockerfile new file mode 100644 index 000000000..3aa229226 --- /dev/null +++ b/docker-images/4.0/arm32v7/Dockerfile @@ -0,0 +1,441 @@ +FROM alpine:3.9 as base + +RUN apk add --no-cache --update libva \ + libgcc \ + libstdc++ \ + ca-certificates \ + libcrypto1.1 \ + libssl1.1 \ + libgomp \ + expat \ + libuuid + +FROM base as build + +WORKDIR /tmp/workdir + +ARG PREFIX=/tmp/build +ARG MAKEFLAGS=-j6 +ARG PKG_CONFIG_PATH=/tmp/build/lib/pkgconfig + +RUN apk add --no-cache --update libva-dev \ + autoconf \ + automake \ + bash \ + binutils \ + bzip2 \ + cmake \ + curl \ + coreutils \ + diffutils \ + file \ + g++ \ + git \ + gcc \ + gperf \ + libtool \ + make \ + python \ + openssl-dev \ + tar \ + yasm \ + nasm \ + zlib-dev \ + expat-dev \ + util-linux-dev \ + meson \ + ninja + +ARG FFMPEG_VERSION=4.0.4 +ARG LIBOPENCORE_AMR_VERSION=0.1.5 +ARG LIBX264_VERSION=20190526-2245-stable +ARG LIBX265_VERSION=3.0 +ARG LIBOGG_VERSION=1.3.3 +ARG LIBOPUS_VERSION=1.3.1 +ARG LIBVORBIS_VERSION=1.3.6 +ARG LIBTHEORA_VERSION=1.1.1 +ARG LIBVPX_VERSION=1.8.0 +ARG LIBMP3LAME_VERSION=3.100 +ARG LIBXVID_VERSION=1.3.5 +ARG LIBFDK_AAC_VERSION=0.1.6 +ARG LIBOPENJPEG_VERSION=2.3.1 +ARG LIBFREETYPE_VERSION=2.10.0 +ARG LIBVIDSTAB_VERSION=1.1.0 +ARG LIBFRIBIDI_VERSION=0.19.7 +ARG LIBFONTCONFIG_VERSION=2.13.1 +ARG LIBFREETYPE_VERSION=2.10.0 +ARG LIBFRIBIDI_VERSION=0.19.7 +ARG LIBFONTCONFIG_VERSION=2.13.1 +ARG LIBASS_VERSION=0.14.0 +ARG LIBKVAZAAR_VERSION=1.2.0 +ARG LIBAOM_VERSION=1.0.0-errata1 +ARG NVENC_VERSION=9.0.18.1 + +ARG LIBOGG_SHA256SUM=c2e8a485110b97550f453226ec644ebac6cb29d1caef2902c007edab4308d985 +ARG LIBOPUS_SHA256SUM=65b58e1e25b2a114157014736a3d9dfeaad8d41be1c8179866f144a2fb44ff9d +ARG LIBVORBIS_SHA256SUM=6ed40e0241089a42c48604dc00e362beee00036af2d8b3f46338031c9e0351cb +ARG LIBTHEORA_SHA256SUM=40952956c47811928d1e7922cda3bc1f427eb75680c3c37249c91e949054916b +ARG LIBVIDSTAB_SHA256SUM=14d2a053e56edad4f397be0cb3ef8eb1ec3150404ce99a426c4eb641861dc0bb +ARG LIBFRIBIDI_SHA256SUM=3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 +ARG LIBFRIBIDI_SHA256SUM=3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 + +## opencore-amr https://sourceforge.net/projects/opencore-amr/ +RUN \ + DIR=opencore-amr && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://kent.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${LIBOPENCORE_AMR_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +## x264 http://www.videolan.org/developers/x264.html +RUN \ + DIR=x264 && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://download.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-${LIBX264_VERSION}.tar.bz2 | \ + tar -jx --strip-components=1 && \ + ./configure --prefix="${PREFIX}" --enable-shared --enable-pic && \ + make && \ + make install && \ + rm -rf ${DIR} +### x265 http://x265.org/ +RUN \ + DIR=x265 && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://download.videolan.org/pub/videolan/x265/x265_${LIBX265_VERSION}.tar.gz | \ + tar -zx && \ + cd x265_${LIBX265_VERSION}/build/linux && \ + sed -i "/-DEXTRA_LIB/ s/$/ -DCMAKE_INSTALL_PREFIX=\${PREFIX}/" multilib.sh && \ + sed -i "/^cmake/ s/$/ -DENABLE_CLI=ON/" multilib.sh && \ + ./multilib.sh && \ + make -C 8bit install && \ + rm -rf ${DIR} +## libogg https://www.xiph.org/ogg/ +RUN \ + DIR=ogg && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO http://downloads.xiph.org/releases/ogg/libogg-${LIBOGG_VERSION}.tar.gz && \ + echo "${LIBOGG_SHA256SUM} libogg-${LIBOGG_VERSION}.tar.gz" | sha256sum --check && \ + tar -zx --strip-components=1 -f libogg-${LIBOGG_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +RUN \ + DIR=opus && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://archive.mozilla.org/pub/opus/opus-${LIBOPUS_VERSION}.tar.gz && \ + echo "${LIBOPUS_SHA256SUM} opus-${LIBOPUS_VERSION}.tar.gz"| sha256sum --check && \ + tar -zx --strip-components=1 -f opus-${LIBOPUS_VERSION}.tar.gz && \ + autoreconf -fiv && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +### libvorbis https://xiph.org/vorbis/ +RUN \ + DIR=vorbis && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO http://downloads.xiph.org/releases/vorbis/libvorbis-${LIBVORBIS_VERSION}.tar.gz && \ + echo "${LIBVORBIS_SHA256SUM} libvorbis-${LIBVORBIS_VERSION}.tar.gz" | sha256sum --check && \ + tar -zx --strip-components=1 -f libvorbis-${LIBVORBIS_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +### libtheora http://www.theora.org/ +RUN \ + DIR=theora && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO http://downloads.xiph.org/releases/theora/libtheora-${LIBTHEORA_VERSION}.tar.gz && \ + echo "${LIBTHEORA_SHA256SUM} libtheora-${LIBTHEORA_VERSION}.tar.gz" | sha256sum --check && \ + tar -zx --strip-components=1 -f libtheora-${LIBTHEORA_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +### libvpx https://www.webmproject.org/code/ +RUN \ + DIR=vpx && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://codeload.github.com/webmproject/libvpx/tar.gz/v${LIBVPX_VERSION} | \ + tar -zx --strip-components=1 && \ + ./configure --prefix="${PREFIX}" --enable-vp8 --enable-vp9 --enable-vp9-highbitdepth --enable-pic --enable-shared \ + --disable-debug --disable-examples --disable-docs && \ + make && \ + make install && \ + rm -rf ${DIR} + +### libmp3lame http://lame.sourceforge.net/ +RUN \ + DIR=lame && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://kent.dl.sourceforge.net/project/lame/lame/$(echo ${LIBMP3LAME_VERSION} | sed -e 's/[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)/\1.\2/')/lame-${LIBMP3LAME_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" --enable-shared --enable-nasm --enable-pic && \ + make && \ + make install && \ + rm -rf ${DIR} +### xvid https://www.xvid.com/ +RUN \ + DIR=xvid && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO http://downloads.xvid.org/downloads/xvidcore-${LIBXVID_VERSION}.tar.gz && \ + tar -zx -f xvidcore-${LIBXVID_VERSION}.tar.gz && \ + cd xvidcore/build/generic && \ + ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" --datadir="${DIR}" --enable-shared --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +### fdk-aac https://github.com/mstorsjo/fdk-aac +RUN \ + DIR=fdk-aac && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://github.com/mstorsjo/fdk-aac/archive/v${LIBFDK_AAC_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + autoreconf -fiv && \ + ./configure --prefix="${PREFIX}" --enable-shared --datadir="${DIR}" && \ + make && \ + make install && \ + rm -rf ${DIR} +## openjpeg https://github.com/uclouvain/openjpeg +RUN \ + DIR=openjpeg && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + if test `echo ${LIBOPENJPEG_VERSION} | tr -d '.'` -ge '210'; then \ + version_prefix='v'; \ + else \ + version_prefix='version.' ;\ + fi && \ + curl -sL https://github.com/uclouvain/openjpeg/archive/${version_prefix}${LIBOPENJPEG_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + cmake -DBUILD_THIRDPARTY:BOOL=ON -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ + make && \ + make install && \ + rm -rf ${DIR} +## freetype https://www.freetype.org/ +RUN \ + DIR=freetype && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://download.savannah.gnu.org/releases/freetype/freetype-${LIBFREETYPE_VERSION}.tar.gz && \ + tar -zx --strip-components=1 -f freetype-${LIBFREETYPE_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +## libvstab https://github.com/georgmartius/vid.stab +RUN \ + DIR=vid.stab && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/georgmartius/vid.stab/archive/v${LIBVIDSTAB_VERSION}.tar.gz &&\ + echo "${LIBVIDSTAB_SHA256SUM} v${LIBVIDSTAB_VERSION}.tar.gz" | sha256sum --check && \ + tar -zx --strip-components=1 -f v${LIBVIDSTAB_VERSION}.tar.gz && \ + cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ + make && \ + make install && \ + rm -rf ${DIR} +## fridibi https://www.fribidi.org/ +# + https://github.com/fribidi/fribidi/issues/8 +RUN \ + DIR=fribidi && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/fribidi/fribidi/archive/${LIBFRIBIDI_VERSION}.tar.gz && \ + echo "${LIBFRIBIDI_SHA256SUM} ${LIBFRIBIDI_VERSION}.tar.gz" | sha256sum --check && \ + tar -zx --strip-components=1 -f ${LIBFRIBIDI_VERSION}.tar.gz && \ + sed -i 's/^SUBDIRS =.*/SUBDIRS=gen.tab charset lib/' Makefile.am && \ + ./bootstrap --no-config && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ + make -j 1 && \ + make install && \ + rm -rf ${DIR} +## fontconfig https://www.freedesktop.org/wiki/Software/fontconfig/ +RUN \ + DIR=fontconfig && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://www.freedesktop.org/software/fontconfig/release/fontconfig-${LIBFONTCONFIG_VERSION}.tar.bz2 &&\ + tar -jx --strip-components=1 -f fontconfig-${LIBFONTCONFIG_VERSION}.tar.bz2 && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +## freetype https://www.freetype.org/ +RUN \ + DIR=freetype && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://download.savannah.gnu.org/releases/freetype/freetype-${LIBFREETYPE_VERSION}.tar.gz && \ + tar -zx --strip-components=1 -f freetype-${LIBFREETYPE_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +## fridibi https://www.fribidi.org/ +# + https://github.com/fribidi/fribidi/issues/8 +RUN \ + DIR=fribidi && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/fribidi/fribidi/archive/${LIBFRIBIDI_VERSION}.tar.gz && \ + echo "${LIBFRIBIDI_SHA256SUM} ${LIBFRIBIDI_VERSION}.tar.gz" | sha256sum --check && \ + tar -zx --strip-components=1 -f ${LIBFRIBIDI_VERSION}.tar.gz && \ + sed -i 's/^SUBDIRS =.*/SUBDIRS=gen.tab charset lib/' Makefile.am && \ + ./bootstrap --no-config && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ + make -j 1 && \ + make install && \ + rm -rf ${DIR} +## fontconfig https://www.freedesktop.org/wiki/Software/fontconfig/ +RUN \ + DIR=fontconfig && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://www.freedesktop.org/software/fontconfig/release/fontconfig-${LIBFONTCONFIG_VERSION}.tar.bz2 &&\ + tar -jx --strip-components=1 -f fontconfig-${LIBFONTCONFIG_VERSION}.tar.bz2 && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +RUN \ + DIR=libass && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/libass/libass/archive/${LIBASS_VERSION}.tar.gz &&\ + tar -zx --strip-components=1 -f ${LIBASS_VERSION}.tar.gz && \ + ./autogen.sh && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +## kvazaar https://github.com/ultravideo/kvazaar +RUN \ + DIR=kvazaar && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/ultravideo/kvazaar/archive/v${LIBKVAZAAR_VERSION}.tar.gz &&\ + tar -zx --strip-components=1 -f v${LIBKVAZAAR_VERSION}.tar.gz && \ + if [ -e ./autogen.sh ]; then \ + ./autogen.sh && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared ; \ + else \ + cd src ; \ + fi && \ + make && \ + make install && \ + rm -rf ${DIR} +RUN \ + DIR=aom && \ + git clone --branch v${LIBAOM_VERSION} --depth 1 https://aomedia.googlesource.com/aom ${DIR} ; \ + cd ${DIR} ; \ + rm -rf CMakeCache.txt CMakeFiles ; \ + mkdir -p ./aom_build ; \ + cd ./aom_build ; \ + cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" -DBUILD_SHARED_LIBS=1 ..; \ + make ; \ + make install ; \ + rm -rf ${DIR} + +RUN \ + DIR=nv-codec-headers && \ + git clone --branch n${NVENC_VERSION} --depth=1 https://git.videolan.org/git/ffmpeg/nv-codec-headers.git ${DIR} && \ + cd ${DIR} && \ + sed -i 's@/usr/local@'"$PREFIX"'@' Makefile && \ + make && \ + make install && \ + rm -rf ${DIR} +RUN \ + DIR=ffmpeg && mkdir -p ${DIR} && cd ${DIR} && \ + curl -sLO https://ffmpeg.org/releases/ffmpeg-${FFMPEG_VERSION}.tar.bz2 && \ + tar -jx --strip-components=1 -f ffmpeg-${FFMPEG_VERSION}.tar.bz2 && \ + ./configure \ + --disable-debug \ + --disable-doc \ + --disable-ffplay \ + --enable-shared \ + --enable-avresample \ + --enable-openssl \ + --enable-postproc \ + --enable-small \ + --extra-cflags="-I${PREFIX}/include -I/usr/local/include" \ + --extra-ldflags="-L${PREFIX}/lib -L/usr/local/lib" \ + --enable-libopencore-amrnb \ + --enable-libopencore-amrwb \ + --enable-version3 \ + --enable-libx264 \ + --enable-libx265 \ + --enable-libopus \ + --enable-libvorbis \ + --enable-libtheora \ + --enable-libvpx \ + --enable-libmp3lame \ + --enable-libxvid \ + --enable-libfdk_aac \ + --enable-nonfree \ + --enable-libopenjpeg \ + --enable-libfreetype \ + --enable-libvidstab \ + --enable-gpl \ + --enable-libass \ + --enable-libkvazaar \ + --enable-libaom \ + --extra-libs=-lpthread \ + --enable-vaapi \ + --enable-cuda \ + --enable-nvenc \ + --enable-cuvid \ + --prefix="${PREFIX}" && \ + make && \ + make install && \ + make distclean && \ + hash -r && \ + cd tools && \ + make qt-faststart && \ + cp qt-faststart ${PREFIX}/bin + +RUN \ + if false; then \ + LD_LIBRARY_PATH=${PREFIX}/lib ldd ${PREFIX}/bin/* | \ + cut -d ' ' -f 3 | \ + strings | \ + xargs -i cp {} /usr/local/lib/ && \ + cp ${PREFIX}/bin/ff* /usr/local/bin/ ; \ + else \ + LD_LIBRARY_PATH=${PREFIX}/lib ldd ${PREFIX}/bin/ffmpeg | \ + cut -d ' ' -f 3 | \ + strings | \ + xargs -i cp {} /usr/local/lib/ && \ + cp ${PREFIX}/bin/ff* /usr/local/bin/ ; \ + fi && \ + if true; then \ + for lib in /usr/local/lib/*.so* /usr/local/bin/*; do strip --strip-all $lib; done ; \ + fi && \ + LD_LIBRARY_PATH=/usr/local/lib ffmpeg -buildconf + + +FROM scratch AS release +MAINTAINER Julien Rottenberg + +CMD ["--help"] +ENTRYPOINT ["/bin/ffmpeg"] + +COPY --from=build /usr/local / +RUN test "scratch" = "base" && ldconfig /usr/local/lib /usr/local/lib64 + +# Let's make sure the app built correctly +# Convenient to verify on https://hub.docker.com/r/jrottenberg/ffmpeg/builds/ console output diff --git a/docker-images/4.0/centos/Dockerfile b/docker-images/4.0/centos/Dockerfile index f9a6422e8..476505f63 100644 --- a/docker-images/4.0/centos/Dockerfile +++ b/docker-images/4.0/centos/Dockerfile @@ -1,3 +1,4 @@ +<<<<<<< HEAD # ffmpeg - http://ffmpeg.org/download.html # # From https://trac.ffmpeg.org/wiki/CompilationGuide/Centos @@ -387,4 +388,480 @@ ENV LD_LIBRARY_PATH=/usr/local/lib64 COPY --from=build /usr/local/ /usr/local/ # Let's make sure the app built correctly -# Convenient to verify on https://hub.docker.com/r/jrottenberg/ffmpeg/builds/ console output \ No newline at end of file +# Convenient to verify on https://hub.docker.com/r/jrottenberg/ffmpeg/builds/ console output +======= +FROM centos:7 as base + +RUN yum -y install libva libgomp libuuid && \ + echo "/usr/local/lib" > /etc/ld.so.conf.d/local.conf && \ + echo "/usr/local/lib64" >> /etc/ld.so.conf.d/local.conf + +FROM base as build + +WORKDIR /tmp/workdir + +ARG PREFIX=/tmp/build +ARG MAKEFLAGS=-j6 +ARG PKG_CONFIG_PATH=/tmp/build/lib/pkgconfig:/tmp/build/lib64/pkgconfig + +RUN yum --enablerepo=extras install -y epel-release && \ + yum install -y \ + libva-devel \ + autoconf \ + automake \ + bzip2 \ + cmake \ + expat-devel \ + gcc \ + gcc-c++ \ + git \ + gperf \ + libtool \ + make \ + nasm \ + perl \ + openssl-devel \ + tar \ + yasm \ + which \ + zlib-devel \ + libuuid-devel \ + libcurl-devel \ + xz-devel \ + libarchive-devel \ + python36 \ + python36-pip + +#Centos is missing recent version of CMake (>= 3.5) +RUN \ + DIR=/tmp/cmake && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://cmake.org/files/v3.5/cmake-3.5.2.tar.gz | \ + tar -zx --strip-components=1 && \ + ./bootstrap --system-libs --no-system-jsoncpp && \ + make && \ + make install && \ + rm -rf ${DIR} + +#Centos is missing recent version of nasm (>= 2.13) +RUN \ + DIR=/tmp/nasm && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://www.nasm.us/pub/nasm/releasebuilds/2.13.03/nasm-2.13.03.tar.gz | \ + tar -zx --strip-components=1 && \ + ./configure --prefix="/usr" && \ + make && \ + make install && \ + rm -rf ${DIR} + +#Centos is missing ninja +RUN \ + DIR=/tmp/ninja && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://github.com/ninja-build/ninja/archive/v1.9.0.tar.gz | \ + tar -zx --strip-components=1 && \ + python configure.py --bootstrap && \ + cp ./ninja /usr/bin/ && \ + rm -rf ${DIR} + +RUN \ + DIR=/tmp/meson && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + pip3 install meson && \ + rm -rf ${DIR} + +ARG FFMPEG_VERSION=4.0.4 +ARG LIBOPENCORE_AMR_VERSION=0.1.5 +ARG LIBX264_VERSION=20190526-2245-stable +ARG LIBX265_VERSION=3.0 +ARG LIBOGG_VERSION=1.3.3 +ARG LIBOPUS_VERSION=1.3.1 +ARG LIBVORBIS_VERSION=1.3.6 +ARG LIBTHEORA_VERSION=1.1.1 +ARG LIBVPX_VERSION=1.8.0 +ARG LIBMP3LAME_VERSION=3.100 +ARG LIBXVID_VERSION=1.3.5 +ARG LIBFDK_AAC_VERSION=0.1.6 +ARG LIBOPENJPEG_VERSION=2.3.1 +ARG LIBFREETYPE_VERSION=2.10.0 +ARG LIBVIDSTAB_VERSION=1.1.0 +ARG LIBFRIBIDI_VERSION=0.19.7 +ARG LIBFONTCONFIG_VERSION=2.13.1 +ARG LIBFREETYPE_VERSION=2.10.0 +ARG LIBFRIBIDI_VERSION=0.19.7 +ARG LIBFONTCONFIG_VERSION=2.13.1 +ARG LIBASS_VERSION=0.14.0 +ARG LIBKVAZAAR_VERSION=1.2.0 +ARG LIBAOM_VERSION=1.0.0-errata1 +ARG NVENC_VERSION=9.0.18.1 + +ARG LIBOGG_SHA256SUM=c2e8a485110b97550f453226ec644ebac6cb29d1caef2902c007edab4308d985 +ARG LIBOPUS_SHA256SUM=65b58e1e25b2a114157014736a3d9dfeaad8d41be1c8179866f144a2fb44ff9d +ARG LIBVORBIS_SHA256SUM=6ed40e0241089a42c48604dc00e362beee00036af2d8b3f46338031c9e0351cb +ARG LIBTHEORA_SHA256SUM=40952956c47811928d1e7922cda3bc1f427eb75680c3c37249c91e949054916b +ARG LIBVIDSTAB_SHA256SUM=14d2a053e56edad4f397be0cb3ef8eb1ec3150404ce99a426c4eb641861dc0bb +ARG LIBFRIBIDI_SHA256SUM=3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 +ARG LIBFRIBIDI_SHA256SUM=3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 + +## opencore-amr https://sourceforge.net/projects/opencore-amr/ +RUN \ + DIR=opencore-amr && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://kent.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${LIBOPENCORE_AMR_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +## x264 http://www.videolan.org/developers/x264.html +RUN \ + DIR=x264 && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://download.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-${LIBX264_VERSION}.tar.bz2 | \ + tar -jx --strip-components=1 && \ + ./configure --prefix="${PREFIX}" --enable-shared --enable-pic && \ + make && \ + make install && \ + rm -rf ${DIR} +### x265 http://x265.org/ +RUN \ + DIR=x265 && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://download.videolan.org/pub/videolan/x265/x265_${LIBX265_VERSION}.tar.gz | \ + tar -zx && \ + cd x265_${LIBX265_VERSION}/build/linux && \ + sed -i "/-DEXTRA_LIB/ s/$/ -DCMAKE_INSTALL_PREFIX=\${PREFIX}/" multilib.sh && \ + sed -i "/^cmake/ s/$/ -DENABLE_CLI=ON/" multilib.sh && \ + ./multilib.sh && \ + make -C 8bit install && \ + rm -rf ${DIR} +## libogg https://www.xiph.org/ogg/ +RUN \ + DIR=ogg && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO http://downloads.xiph.org/releases/ogg/libogg-${LIBOGG_VERSION}.tar.gz && \ + echo "${LIBOGG_SHA256SUM} libogg-${LIBOGG_VERSION}.tar.gz" | sha256sum --check && \ + tar -zx --strip-components=1 -f libogg-${LIBOGG_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +RUN \ + DIR=opus && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://archive.mozilla.org/pub/opus/opus-${LIBOPUS_VERSION}.tar.gz && \ + echo "${LIBOPUS_SHA256SUM} opus-${LIBOPUS_VERSION}.tar.gz"| sha256sum --check && \ + tar -zx --strip-components=1 -f opus-${LIBOPUS_VERSION}.tar.gz && \ + autoreconf -fiv && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +### libvorbis https://xiph.org/vorbis/ +RUN \ + DIR=vorbis && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO http://downloads.xiph.org/releases/vorbis/libvorbis-${LIBVORBIS_VERSION}.tar.gz && \ + echo "${LIBVORBIS_SHA256SUM} libvorbis-${LIBVORBIS_VERSION}.tar.gz" | sha256sum --check && \ + tar -zx --strip-components=1 -f libvorbis-${LIBVORBIS_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +### libtheora http://www.theora.org/ +RUN \ + DIR=theora && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO http://downloads.xiph.org/releases/theora/libtheora-${LIBTHEORA_VERSION}.tar.gz && \ + echo "${LIBTHEORA_SHA256SUM} libtheora-${LIBTHEORA_VERSION}.tar.gz" | sha256sum --check && \ + tar -zx --strip-components=1 -f libtheora-${LIBTHEORA_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +### libvpx https://www.webmproject.org/code/ +RUN \ + DIR=vpx && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://codeload.github.com/webmproject/libvpx/tar.gz/v${LIBVPX_VERSION} | \ + tar -zx --strip-components=1 && \ + ./configure --prefix="${PREFIX}" --enable-vp8 --enable-vp9 --enable-vp9-highbitdepth --enable-pic --enable-shared \ + --disable-debug --disable-examples --disable-docs && \ + make && \ + make install && \ + rm -rf ${DIR} + +### libmp3lame http://lame.sourceforge.net/ +RUN \ + DIR=lame && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://kent.dl.sourceforge.net/project/lame/lame/$(echo ${LIBMP3LAME_VERSION} | sed -e 's/[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)/\1.\2/')/lame-${LIBMP3LAME_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" --enable-shared --enable-nasm --enable-pic && \ + make && \ + make install && \ + rm -rf ${DIR} +### xvid https://www.xvid.com/ +RUN \ + DIR=xvid && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO http://downloads.xvid.org/downloads/xvidcore-${LIBXVID_VERSION}.tar.gz && \ + tar -zx -f xvidcore-${LIBXVID_VERSION}.tar.gz && \ + cd xvidcore/build/generic && \ + ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" --datadir="${DIR}" --enable-shared --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +### fdk-aac https://github.com/mstorsjo/fdk-aac +RUN \ + DIR=fdk-aac && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://github.com/mstorsjo/fdk-aac/archive/v${LIBFDK_AAC_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + autoreconf -fiv && \ + ./configure --prefix="${PREFIX}" --enable-shared --datadir="${DIR}" && \ + make && \ + make install && \ + rm -rf ${DIR} +## openjpeg https://github.com/uclouvain/openjpeg +RUN \ + DIR=openjpeg && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + if test `echo ${LIBOPENJPEG_VERSION} | tr -d '.'` -ge '210'; then \ + version_prefix='v'; \ + else \ + version_prefix='version.' ;\ + fi && \ + curl -sL https://github.com/uclouvain/openjpeg/archive/${version_prefix}${LIBOPENJPEG_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + cmake -DBUILD_THIRDPARTY:BOOL=ON -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ + make && \ + make install && \ + rm -rf ${DIR} +## freetype https://www.freetype.org/ +RUN \ + DIR=freetype && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://download.savannah.gnu.org/releases/freetype/freetype-${LIBFREETYPE_VERSION}.tar.gz && \ + tar -zx --strip-components=1 -f freetype-${LIBFREETYPE_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +## libvstab https://github.com/georgmartius/vid.stab +RUN \ + DIR=vid.stab && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/georgmartius/vid.stab/archive/v${LIBVIDSTAB_VERSION}.tar.gz &&\ + echo "${LIBVIDSTAB_SHA256SUM} v${LIBVIDSTAB_VERSION}.tar.gz" | sha256sum --check && \ + tar -zx --strip-components=1 -f v${LIBVIDSTAB_VERSION}.tar.gz && \ + cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ + make && \ + make install && \ + rm -rf ${DIR} +## fridibi https://www.fribidi.org/ +# + https://github.com/fribidi/fribidi/issues/8 +RUN \ + DIR=fribidi && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/fribidi/fribidi/archive/${LIBFRIBIDI_VERSION}.tar.gz && \ + echo "${LIBFRIBIDI_SHA256SUM} ${LIBFRIBIDI_VERSION}.tar.gz" | sha256sum --check && \ + tar -zx --strip-components=1 -f ${LIBFRIBIDI_VERSION}.tar.gz && \ + sed -i 's/^SUBDIRS =.*/SUBDIRS=gen.tab charset lib/' Makefile.am && \ + ./bootstrap --no-config && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ + make -j 1 && \ + make install && \ + rm -rf ${DIR} +## fontconfig https://www.freedesktop.org/wiki/Software/fontconfig/ +RUN \ + DIR=fontconfig && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://www.freedesktop.org/software/fontconfig/release/fontconfig-${LIBFONTCONFIG_VERSION}.tar.bz2 &&\ + tar -jx --strip-components=1 -f fontconfig-${LIBFONTCONFIG_VERSION}.tar.bz2 && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +## freetype https://www.freetype.org/ +RUN \ + DIR=freetype && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://download.savannah.gnu.org/releases/freetype/freetype-${LIBFREETYPE_VERSION}.tar.gz && \ + tar -zx --strip-components=1 -f freetype-${LIBFREETYPE_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +## fridibi https://www.fribidi.org/ +# + https://github.com/fribidi/fribidi/issues/8 +RUN \ + DIR=fribidi && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/fribidi/fribidi/archive/${LIBFRIBIDI_VERSION}.tar.gz && \ + echo "${LIBFRIBIDI_SHA256SUM} ${LIBFRIBIDI_VERSION}.tar.gz" | sha256sum --check && \ + tar -zx --strip-components=1 -f ${LIBFRIBIDI_VERSION}.tar.gz && \ + sed -i 's/^SUBDIRS =.*/SUBDIRS=gen.tab charset lib/' Makefile.am && \ + ./bootstrap --no-config && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ + make -j 1 && \ + make install && \ + rm -rf ${DIR} +## fontconfig https://www.freedesktop.org/wiki/Software/fontconfig/ +RUN \ + DIR=fontconfig && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://www.freedesktop.org/software/fontconfig/release/fontconfig-${LIBFONTCONFIG_VERSION}.tar.bz2 &&\ + tar -jx --strip-components=1 -f fontconfig-${LIBFONTCONFIG_VERSION}.tar.bz2 && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +RUN \ + DIR=libass && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/libass/libass/archive/${LIBASS_VERSION}.tar.gz &&\ + tar -zx --strip-components=1 -f ${LIBASS_VERSION}.tar.gz && \ + ./autogen.sh && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +## kvazaar https://github.com/ultravideo/kvazaar +RUN \ + DIR=kvazaar && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/ultravideo/kvazaar/archive/v${LIBKVAZAAR_VERSION}.tar.gz &&\ + tar -zx --strip-components=1 -f v${LIBKVAZAAR_VERSION}.tar.gz && \ + if [ -e ./autogen.sh ]; then \ + ./autogen.sh && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared ; \ + else \ + cd src ; \ + fi && \ + make && \ + make install && \ + rm -rf ${DIR} +RUN \ + DIR=aom && \ + git clone --branch v${LIBAOM_VERSION} --depth 1 https://aomedia.googlesource.com/aom ${DIR} ; \ + cd ${DIR} ; \ + rm -rf CMakeCache.txt CMakeFiles ; \ + mkdir -p ./aom_build ; \ + cd ./aom_build ; \ + cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" -DBUILD_SHARED_LIBS=1 ..; \ + make ; \ + make install ; \ + rm -rf ${DIR} + +RUN \ + DIR=nv-codec-headers && \ + git clone --branch n${NVENC_VERSION} --depth=1 https://git.videolan.org/git/ffmpeg/nv-codec-headers.git ${DIR} && \ + cd ${DIR} && \ + sed -i 's@/usr/local@'"$PREFIX"'@' Makefile && \ + make && \ + make install && \ + rm -rf ${DIR} +RUN \ + DIR=ffmpeg && mkdir -p ${DIR} && cd ${DIR} && \ + curl -sLO https://ffmpeg.org/releases/ffmpeg-${FFMPEG_VERSION}.tar.bz2 && \ + tar -jx --strip-components=1 -f ffmpeg-${FFMPEG_VERSION}.tar.bz2 && \ + ./configure \ + --disable-debug \ + --disable-doc \ + --disable-ffplay \ + --enable-shared \ + --enable-avresample \ + --enable-openssl \ + --enable-postproc \ + --enable-small \ + --extra-cflags="-I${PREFIX}/include -I/usr/local/include" \ + --extra-ldflags="-L${PREFIX}/lib -L/usr/local/lib" \ + --enable-libopencore-amrnb \ + --enable-libopencore-amrwb \ + --enable-version3 \ + --enable-libx264 \ + --enable-libx265 \ + --enable-libopus \ + --enable-libvorbis \ + --enable-libtheora \ + --enable-libvpx \ + --enable-libmp3lame \ + --enable-libxvid \ + --enable-libfdk_aac \ + --enable-nonfree \ + --enable-libopenjpeg \ + --enable-libfreetype \ + --enable-libvidstab \ + --enable-gpl \ + --enable-libass \ + --enable-libkvazaar \ + --enable-libaom \ + --extra-libs=-lpthread \ + --enable-vaapi \ + --enable-cuda \ + --enable-nvenc \ + --enable-cuvid \ + --prefix="${PREFIX}" && \ + make && \ + make install && \ + make distclean && \ + hash -r && \ + cd tools && \ + make qt-faststart && \ + cp qt-faststart ${PREFIX}/bin + +RUN \ + if false; then \ + cp -r ${PREFIX}/lib/*so* /usr/local/lib/ && \ + cp ${PREFIX}/bin/* /usr/local/bin/ ; \ + else \ + LD_LIBRARY_PATH=${PREFIX}/lib ldd ${PREFIX}/bin/ffmpeg | \ + grep ${PREFIX} | \ + cut -d ' ' -f 3 | \ + xargs -i cp {} /usr/local/lib/ && \ + cp ${PREFIX}/bin/ff* /usr/local/bin/ ; \ + fi && \ + if true; then \ + for lib in /usr/local/lib/*.so* /usr/local/bin/*; do strip --strip-all $lib; done ; \ + fi && \ + cp -r ${PREFIX}/share/ffmpeg /usr/local/share/ && \ + LD_LIBRARY_PATH=/usr/local/lib ffmpeg -buildconf + +FROM base AS release +MAINTAINER Julien Rottenberg + +CMD ["--help"] +ENTRYPOINT ["ffmpeg"] + +COPY --from=build /usr/local /usr/local +RUN test "base" = "base" && ldconfig /usr/local/lib /usr/local/lib64 + +# Let's make sure the app built correctly +# Convenient to verify on https://hub.docker.com/r/jrottenberg/ffmpeg/builds/ console output +>>>>>>> rewrite the dockerfile generation + vdapu + armv7 + dav1d diff --git a/docker-images/4.0/nvidia,/Dockerfile b/docker-images/4.0/nvidia,/Dockerfile new file mode 100644 index 000000000..452b62c02 --- /dev/null +++ b/docker-images/4.0/nvidia,/Dockerfile @@ -0,0 +1,14 @@ +usage: update.py [-h] [--enable-libopencore-amr] [--enable-libx264] + [--enable-libx265] [--enable-libogg] [--enable-libopus] + [--enable-libvorbis] [--enable-libtheora] [--enable-libvpx] + [--enable-libmp3lame] [--enable-libxvid] + [--enable-libfdk-aac] [--enable-libopenjpeg] + [--enable-libfreetype] [--enable-libvidstab] + [--enable-libfribidi] [--enable-libfontconfig] + [--enable-libass] [--enable-libkvazaar] [--enable-libaom] + [--enable-vaapi] [--enable-nvenc] [--enable-libdav1d] + [--enable-vdpau] [--enable-all] [--with-bins] [--no-strip] + [--fat | --slim | --scratch] + {alpine,centos,ubuntu,nvidia,armv7} + {snapshot,4.1,4.0,3.4,3.3,3.2,2.8} +update.py: error: argument variant: invalid choice: 'nvidia,' (choose from 'alpine', 'centos', 'ubuntu', 'nvidia', 'armv7') diff --git a/docker-images/4.0/ubuntu/Dockerfile b/docker-images/4.0/ubuntu/Dockerfile index 852df286a..4b1684c49 100644 --- a/docker-images/4.0/ubuntu/Dockerfile +++ b/docker-images/4.0/ubuntu/Dockerfile @@ -1,3 +1,4 @@ +<<<<<<< HEAD # ffmpeg - http://ffmpeg.org/download.html # # From https://trac.ffmpeg.org/wiki/CompilationGuide/Ubuntu @@ -389,3 +390,436 @@ COPY --from=build /usr/local /usr/local/ # Let's make sure the app built correctly # Convenient to verify on https://hub.docker.com/r/jrottenberg/ffmpeg/builds/ console output +======= +FROM ubuntu:18.04 AS base + +RUN apt-get -yqq update && \ + apt-get install -yq --no-install-recommends libva2 libva-drm2 i965-va-driver ca-certificates expat libgomp1 libuuid1 libssl1.0 && \ + apt-get autoremove -y && \ + apt-get clean -y + +FROM base as build + +WORKDIR /tmp/workdir + +ARG PREFIX=/tmp/build +ARG MAKEFLAGS=-j6 +ARG PKG_CONFIG_PATH=/tmp/build/lib/pkgconfig + +RUN apt-get -yqq update && \ + apt-get install -yq --no-install-recommends \ + libva-dev \ + autoconf \ + automake \ + cmake \ + curl \ + bzip2 \ + libexpat1-dev \ + g++ \ + gcc \ + git \ + gperf \ + libtool \ + make \ + nasm \ + perl \ + pkg-config \ + python \ + libssl1.0-dev \ + yasm \ + zlib1g-dev \ + uuid-dev \ + ninja-build \ + meson + +ARG FFMPEG_VERSION=4.0.4 +ARG LIBOPENCORE_AMR_VERSION=0.1.5 +ARG LIBX264_VERSION=20190526-2245-stable +ARG LIBX265_VERSION=3.0 +ARG LIBOGG_VERSION=1.3.3 +ARG LIBOPUS_VERSION=1.3.1 +ARG LIBVORBIS_VERSION=1.3.6 +ARG LIBTHEORA_VERSION=1.1.1 +ARG LIBVPX_VERSION=1.8.0 +ARG LIBMP3LAME_VERSION=3.100 +ARG LIBXVID_VERSION=1.3.5 +ARG LIBFDK_AAC_VERSION=0.1.6 +ARG LIBOPENJPEG_VERSION=2.3.1 +ARG LIBFREETYPE_VERSION=2.10.0 +ARG LIBVIDSTAB_VERSION=1.1.0 +ARG LIBFRIBIDI_VERSION=0.19.7 +ARG LIBFONTCONFIG_VERSION=2.13.1 +ARG LIBFREETYPE_VERSION=2.10.0 +ARG LIBFRIBIDI_VERSION=0.19.7 +ARG LIBFONTCONFIG_VERSION=2.13.1 +ARG LIBASS_VERSION=0.14.0 +ARG LIBKVAZAAR_VERSION=1.2.0 +ARG LIBAOM_VERSION=1.0.0-errata1 +ARG NVENC_VERSION=9.0.18.1 + +ARG LIBOGG_SHA256SUM=c2e8a485110b97550f453226ec644ebac6cb29d1caef2902c007edab4308d985 +ARG LIBOPUS_SHA256SUM=65b58e1e25b2a114157014736a3d9dfeaad8d41be1c8179866f144a2fb44ff9d +ARG LIBVORBIS_SHA256SUM=6ed40e0241089a42c48604dc00e362beee00036af2d8b3f46338031c9e0351cb +ARG LIBTHEORA_SHA256SUM=40952956c47811928d1e7922cda3bc1f427eb75680c3c37249c91e949054916b +ARG LIBVIDSTAB_SHA256SUM=14d2a053e56edad4f397be0cb3ef8eb1ec3150404ce99a426c4eb641861dc0bb +ARG LIBFRIBIDI_SHA256SUM=3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 +ARG LIBFRIBIDI_SHA256SUM=3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 + +## opencore-amr https://sourceforge.net/projects/opencore-amr/ +RUN \ + DIR=opencore-amr && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://kent.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${LIBOPENCORE_AMR_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +## x264 http://www.videolan.org/developers/x264.html +RUN \ + DIR=x264 && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://download.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-${LIBX264_VERSION}.tar.bz2 | \ + tar -jx --strip-components=1 && \ + ./configure --prefix="${PREFIX}" --enable-shared --enable-pic && \ + make && \ + make install && \ + rm -rf ${DIR} +### x265 http://x265.org/ +RUN \ + DIR=x265 && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://download.videolan.org/pub/videolan/x265/x265_${LIBX265_VERSION}.tar.gz | \ + tar -zx && \ + cd x265_${LIBX265_VERSION}/build/linux && \ + sed -i "/-DEXTRA_LIB/ s/$/ -DCMAKE_INSTALL_PREFIX=\${PREFIX}/" multilib.sh && \ + sed -i "/^cmake/ s/$/ -DENABLE_CLI=ON/" multilib.sh && \ + ./multilib.sh && \ + make -C 8bit install && \ + rm -rf ${DIR} +## libogg https://www.xiph.org/ogg/ +RUN \ + DIR=ogg && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO http://downloads.xiph.org/releases/ogg/libogg-${LIBOGG_VERSION}.tar.gz && \ + echo "${LIBOGG_SHA256SUM} libogg-${LIBOGG_VERSION}.tar.gz" | sha256sum --check && \ + tar -zx --strip-components=1 -f libogg-${LIBOGG_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +RUN \ + DIR=opus && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://archive.mozilla.org/pub/opus/opus-${LIBOPUS_VERSION}.tar.gz && \ + echo "${LIBOPUS_SHA256SUM} opus-${LIBOPUS_VERSION}.tar.gz"| sha256sum --check && \ + tar -zx --strip-components=1 -f opus-${LIBOPUS_VERSION}.tar.gz && \ + autoreconf -fiv && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +### libvorbis https://xiph.org/vorbis/ +RUN \ + DIR=vorbis && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO http://downloads.xiph.org/releases/vorbis/libvorbis-${LIBVORBIS_VERSION}.tar.gz && \ + echo "${LIBVORBIS_SHA256SUM} libvorbis-${LIBVORBIS_VERSION}.tar.gz" | sha256sum --check && \ + tar -zx --strip-components=1 -f libvorbis-${LIBVORBIS_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +### libtheora http://www.theora.org/ +RUN \ + DIR=theora && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO http://downloads.xiph.org/releases/theora/libtheora-${LIBTHEORA_VERSION}.tar.gz && \ + echo "${LIBTHEORA_SHA256SUM} libtheora-${LIBTHEORA_VERSION}.tar.gz" | sha256sum --check && \ + tar -zx --strip-components=1 -f libtheora-${LIBTHEORA_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +### libvpx https://www.webmproject.org/code/ +RUN \ + DIR=vpx && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://codeload.github.com/webmproject/libvpx/tar.gz/v${LIBVPX_VERSION} | \ + tar -zx --strip-components=1 && \ + ./configure --prefix="${PREFIX}" --enable-vp8 --enable-vp9 --enable-vp9-highbitdepth --enable-pic --enable-shared \ + --disable-debug --disable-examples --disable-docs && \ + make && \ + make install && \ + rm -rf ${DIR} + +### libmp3lame http://lame.sourceforge.net/ +RUN \ + DIR=lame && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://kent.dl.sourceforge.net/project/lame/lame/$(echo ${LIBMP3LAME_VERSION} | sed -e 's/[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)/\1.\2/')/lame-${LIBMP3LAME_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" --enable-shared --enable-nasm --enable-pic && \ + make && \ + make install && \ + rm -rf ${DIR} +### xvid https://www.xvid.com/ +RUN \ + DIR=xvid && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO http://downloads.xvid.org/downloads/xvidcore-${LIBXVID_VERSION}.tar.gz && \ + tar -zx -f xvidcore-${LIBXVID_VERSION}.tar.gz && \ + cd xvidcore/build/generic && \ + ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" --datadir="${DIR}" --enable-shared --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +### fdk-aac https://github.com/mstorsjo/fdk-aac +RUN \ + DIR=fdk-aac && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://github.com/mstorsjo/fdk-aac/archive/v${LIBFDK_AAC_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + autoreconf -fiv && \ + ./configure --prefix="${PREFIX}" --enable-shared --datadir="${DIR}" && \ + make && \ + make install && \ + rm -rf ${DIR} +## openjpeg https://github.com/uclouvain/openjpeg +RUN \ + DIR=openjpeg && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + if test `echo ${LIBOPENJPEG_VERSION} | tr -d '.'` -ge '210'; then \ + version_prefix='v'; \ + else \ + version_prefix='version.' ;\ + fi && \ + curl -sL https://github.com/uclouvain/openjpeg/archive/${version_prefix}${LIBOPENJPEG_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + cmake -DBUILD_THIRDPARTY:BOOL=ON -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ + make && \ + make install && \ + rm -rf ${DIR} +## freetype https://www.freetype.org/ +RUN \ + DIR=freetype && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://download.savannah.gnu.org/releases/freetype/freetype-${LIBFREETYPE_VERSION}.tar.gz && \ + tar -zx --strip-components=1 -f freetype-${LIBFREETYPE_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +## libvstab https://github.com/georgmartius/vid.stab +RUN \ + DIR=vid.stab && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/georgmartius/vid.stab/archive/v${LIBVIDSTAB_VERSION}.tar.gz &&\ + echo "${LIBVIDSTAB_SHA256SUM} v${LIBVIDSTAB_VERSION}.tar.gz" | sha256sum --check && \ + tar -zx --strip-components=1 -f v${LIBVIDSTAB_VERSION}.tar.gz && \ + cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ + make && \ + make install && \ + rm -rf ${DIR} +## fridibi https://www.fribidi.org/ +# + https://github.com/fribidi/fribidi/issues/8 +RUN \ + DIR=fribidi && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/fribidi/fribidi/archive/${LIBFRIBIDI_VERSION}.tar.gz && \ + echo "${LIBFRIBIDI_SHA256SUM} ${LIBFRIBIDI_VERSION}.tar.gz" | sha256sum --check && \ + tar -zx --strip-components=1 -f ${LIBFRIBIDI_VERSION}.tar.gz && \ + sed -i 's/^SUBDIRS =.*/SUBDIRS=gen.tab charset lib/' Makefile.am && \ + ./bootstrap --no-config && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ + make -j 1 && \ + make install && \ + rm -rf ${DIR} +## fontconfig https://www.freedesktop.org/wiki/Software/fontconfig/ +RUN \ + DIR=fontconfig && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://www.freedesktop.org/software/fontconfig/release/fontconfig-${LIBFONTCONFIG_VERSION}.tar.bz2 &&\ + tar -jx --strip-components=1 -f fontconfig-${LIBFONTCONFIG_VERSION}.tar.bz2 && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +## freetype https://www.freetype.org/ +RUN \ + DIR=freetype && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://download.savannah.gnu.org/releases/freetype/freetype-${LIBFREETYPE_VERSION}.tar.gz && \ + tar -zx --strip-components=1 -f freetype-${LIBFREETYPE_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +## fridibi https://www.fribidi.org/ +# + https://github.com/fribidi/fribidi/issues/8 +RUN \ + DIR=fribidi && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/fribidi/fribidi/archive/${LIBFRIBIDI_VERSION}.tar.gz && \ + echo "${LIBFRIBIDI_SHA256SUM} ${LIBFRIBIDI_VERSION}.tar.gz" | sha256sum --check && \ + tar -zx --strip-components=1 -f ${LIBFRIBIDI_VERSION}.tar.gz && \ + sed -i 's/^SUBDIRS =.*/SUBDIRS=gen.tab charset lib/' Makefile.am && \ + ./bootstrap --no-config && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ + make -j 1 && \ + make install && \ + rm -rf ${DIR} +## fontconfig https://www.freedesktop.org/wiki/Software/fontconfig/ +RUN \ + DIR=fontconfig && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://www.freedesktop.org/software/fontconfig/release/fontconfig-${LIBFONTCONFIG_VERSION}.tar.bz2 &&\ + tar -jx --strip-components=1 -f fontconfig-${LIBFONTCONFIG_VERSION}.tar.bz2 && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +RUN \ + DIR=libass && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/libass/libass/archive/${LIBASS_VERSION}.tar.gz &&\ + tar -zx --strip-components=1 -f ${LIBASS_VERSION}.tar.gz && \ + ./autogen.sh && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +## kvazaar https://github.com/ultravideo/kvazaar +RUN \ + DIR=kvazaar && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/ultravideo/kvazaar/archive/v${LIBKVAZAAR_VERSION}.tar.gz &&\ + tar -zx --strip-components=1 -f v${LIBKVAZAAR_VERSION}.tar.gz && \ + if [ -e ./autogen.sh ]; then \ + ./autogen.sh && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared ; \ + else \ + cd src ; \ + fi && \ + make && \ + make install && \ + rm -rf ${DIR} +RUN \ + DIR=aom && \ + git clone --branch v${LIBAOM_VERSION} --depth 1 https://aomedia.googlesource.com/aom ${DIR} ; \ + cd ${DIR} ; \ + rm -rf CMakeCache.txt CMakeFiles ; \ + mkdir -p ./aom_build ; \ + cd ./aom_build ; \ + cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" -DBUILD_SHARED_LIBS=1 ..; \ + make ; \ + make install ; \ + rm -rf ${DIR} + +RUN \ + DIR=nv-codec-headers && \ + git clone --branch n${NVENC_VERSION} --depth=1 https://git.videolan.org/git/ffmpeg/nv-codec-headers.git ${DIR} && \ + cd ${DIR} && \ + sed -i 's@/usr/local@'"$PREFIX"'@' Makefile && \ + make && \ + make install && \ + rm -rf ${DIR} +RUN \ + DIR=ffmpeg && mkdir -p ${DIR} && cd ${DIR} && \ + curl -sLO https://ffmpeg.org/releases/ffmpeg-${FFMPEG_VERSION}.tar.bz2 && \ + tar -jx --strip-components=1 -f ffmpeg-${FFMPEG_VERSION}.tar.bz2 && \ + ./configure \ + --disable-debug \ + --disable-doc \ + --disable-ffplay \ + --enable-shared \ + --enable-avresample \ + --enable-openssl \ + --enable-postproc \ + --enable-small \ + --extra-cflags="-I${PREFIX}/include -I/usr/local/include" \ + --extra-ldflags="-L${PREFIX}/lib -L/usr/local/lib" \ + --enable-libopencore-amrnb \ + --enable-libopencore-amrwb \ + --enable-version3 \ + --enable-libx264 \ + --enable-libx265 \ + --enable-libopus \ + --enable-libvorbis \ + --enable-libtheora \ + --enable-libvpx \ + --enable-libmp3lame \ + --enable-libxvid \ + --enable-libfdk_aac \ + --enable-nonfree \ + --enable-libopenjpeg \ + --enable-libfreetype \ + --enable-libvidstab \ + --enable-gpl \ + --enable-libass \ + --enable-libkvazaar \ + --enable-libaom \ + --extra-libs=-lpthread \ + --enable-vaapi \ + --enable-cuda \ + --enable-nvenc \ + --enable-cuvid \ + --prefix="${PREFIX}" && \ + make && \ + make install && \ + make distclean && \ + hash -r && \ + cd tools && \ + make qt-faststart && \ + cp qt-faststart ${PREFIX}/bin + +RUN \ + if false; then \ + cp -r ${PREFIX}/lib/*so* /usr/local/lib/ && \ + cp ${PREFIX}/bin/* /usr/local/bin/ ; \ + else \ + LD_LIBRARY_PATH=${PREFIX}/lib ldd ${PREFIX}/bin/ffmpeg | \ + grep ${PREFIX} | \ + cut -d ' ' -f 3 | \ + xargs -i cp {} /usr/local/lib/ && \ + cp ${PREFIX}/bin/ff* /usr/local/bin/ ; \ + fi && \ + if true; then \ + for lib in /usr/local/lib/*.so* /usr/local/bin/*; do strip --strip-all $lib; done ; \ + fi && \ + cp -r ${PREFIX}/share/ffmpeg /usr/local/share/ && \ + LD_LIBRARY_PATH=/usr/local/lib ffmpeg -buildconf + +FROM base AS release +MAINTAINER Julien Rottenberg + +CMD ["--help"] +ENTRYPOINT ["ffmpeg"] + +COPY --from=build /usr/local /usr/local +RUN test "base" = "base" && ldconfig /usr/local/lib /usr/local/lib64 + +# Let's make sure the app built correctly +# Convenient to verify on https://hub.docker.com/r/jrottenberg/ffmpeg/builds/ console output +>>>>>>> rewrite the dockerfile generation + vdapu + armv7 + dav1d diff --git a/docker-images/4.1/alpine,/Dockerfile b/docker-images/4.1/alpine,/Dockerfile new file mode 100644 index 000000000..a0b97723e --- /dev/null +++ b/docker-images/4.1/alpine,/Dockerfile @@ -0,0 +1,14 @@ +usage: update.py [-h] [--enable-libopencore-amr] [--enable-libx264] + [--enable-libx265] [--enable-libogg] [--enable-libopus] + [--enable-libvorbis] [--enable-libtheora] [--enable-libvpx] + [--enable-libmp3lame] [--enable-libxvid] + [--enable-libfdk-aac] [--enable-libopenjpeg] + [--enable-libfreetype] [--enable-libvidstab] + [--enable-libfribidi] [--enable-libfontconfig] + [--enable-libass] [--enable-libkvazaar] [--enable-libaom] + [--enable-vaapi] [--enable-nvenc] [--enable-libdav1d] + [--enable-vdpau] [--enable-all] [--with-bins] [--no-strip] + [--fat | --slim | --scratch] + {alpine,centos,ubuntu,nvidia,armv7} + {snapshot,4.1,4.0,3.4,3.3,3.2,2.8} +update.py: error: argument variant: invalid choice: 'alpine,' (choose from 'alpine', 'centos', 'ubuntu', 'nvidia', 'armv7') diff --git a/docker-images/4.1/arm32v7/Dockerfile b/docker-images/4.1/arm32v7/Dockerfile new file mode 100644 index 000000000..5e798060e --- /dev/null +++ b/docker-images/4.1/arm32v7/Dockerfile @@ -0,0 +1,443 @@ +FROM alpine:3.9 as base + +RUN apk add --no-cache --update libvdpau libva \ + libgcc \ + libstdc++ \ + ca-certificates \ + libcrypto1.1 \ + libssl1.1 \ + libgomp \ + expat \ + libuuid + +FROM base as build + +WORKDIR /tmp/workdir + +ARG PREFIX=/tmp/build +ARG MAKEFLAGS=-j6 +ARG PKG_CONFIG_PATH=/tmp/build/lib/pkgconfig + +RUN apk add --no-cache --update libvdpau-dev libva-dev \ + autoconf \ + automake \ + bash \ + binutils \ + bzip2 \ + cmake \ + curl \ + coreutils \ + diffutils \ + file \ + g++ \ + git \ + gcc \ + gperf \ + libtool \ + make \ + python \ + openssl-dev \ + tar \ + yasm \ + nasm \ + zlib-dev \ + expat-dev \ + util-linux-dev \ + meson \ + ninja + +ARG FFMPEG_VERSION=4.1.3 +ARG LIBOPENCORE_AMR_VERSION=0.1.5 +ARG LIBX264_VERSION=20190526-2245-stable +ARG LIBX265_VERSION=3.0 +ARG LIBOGG_VERSION=1.3.3 +ARG LIBOPUS_VERSION=1.3.1 +ARG LIBVORBIS_VERSION=1.3.6 +ARG LIBTHEORA_VERSION=1.1.1 +ARG LIBVPX_VERSION=1.8.0 +ARG LIBMP3LAME_VERSION=3.100 +ARG LIBXVID_VERSION=1.3.5 +ARG LIBFDK_AAC_VERSION=2.0.0 +ARG LIBOPENJPEG_VERSION=2.3.1 +ARG LIBFREETYPE_VERSION=2.10.0 +ARG LIBVIDSTAB_VERSION=1.1.0 +ARG LIBFRIBIDI_VERSION=0.19.7 +ARG LIBFONTCONFIG_VERSION=2.13.1 +ARG LIBFREETYPE_VERSION=2.10.0 +ARG LIBFRIBIDI_VERSION=0.19.7 +ARG LIBFONTCONFIG_VERSION=2.13.1 +ARG LIBASS_VERSION=0.14.0 +ARG LIBKVAZAAR_VERSION=1.2.0 +ARG LIBAOM_VERSION=1.0.0-errata1 +ARG NVENC_VERSION=9.0.18.1 + +ARG LIBOGG_SHA256SUM=c2e8a485110b97550f453226ec644ebac6cb29d1caef2902c007edab4308d985 +ARG LIBOPUS_SHA256SUM=65b58e1e25b2a114157014736a3d9dfeaad8d41be1c8179866f144a2fb44ff9d +ARG LIBVORBIS_SHA256SUM=6ed40e0241089a42c48604dc00e362beee00036af2d8b3f46338031c9e0351cb +ARG LIBTHEORA_SHA256SUM=40952956c47811928d1e7922cda3bc1f427eb75680c3c37249c91e949054916b +ARG LIBVIDSTAB_SHA256SUM=14d2a053e56edad4f397be0cb3ef8eb1ec3150404ce99a426c4eb641861dc0bb +ARG LIBFRIBIDI_SHA256SUM=3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 +ARG LIBFRIBIDI_SHA256SUM=3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 + +## opencore-amr https://sourceforge.net/projects/opencore-amr/ +RUN \ + DIR=opencore-amr && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://kent.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${LIBOPENCORE_AMR_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +## x264 http://www.videolan.org/developers/x264.html +RUN \ + DIR=x264 && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://download.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-${LIBX264_VERSION}.tar.bz2 | \ + tar -jx --strip-components=1 && \ + ./configure --prefix="${PREFIX}" --enable-shared --enable-pic && \ + make && \ + make install && \ + rm -rf ${DIR} +### x265 http://x265.org/ +RUN \ + DIR=x265 && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://download.videolan.org/pub/videolan/x265/x265_${LIBX265_VERSION}.tar.gz | \ + tar -zx && \ + cd x265_${LIBX265_VERSION}/build/linux && \ + sed -i "/-DEXTRA_LIB/ s/$/ -DCMAKE_INSTALL_PREFIX=\${PREFIX}/" multilib.sh && \ + sed -i "/^cmake/ s/$/ -DENABLE_CLI=ON/" multilib.sh && \ + ./multilib.sh && \ + make -C 8bit install && \ + rm -rf ${DIR} +## libogg https://www.xiph.org/ogg/ +RUN \ + DIR=ogg && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO http://downloads.xiph.org/releases/ogg/libogg-${LIBOGG_VERSION}.tar.gz && \ + echo "${LIBOGG_SHA256SUM} libogg-${LIBOGG_VERSION}.tar.gz" | sha256sum --check && \ + tar -zx --strip-components=1 -f libogg-${LIBOGG_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +RUN \ + DIR=opus && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://archive.mozilla.org/pub/opus/opus-${LIBOPUS_VERSION}.tar.gz && \ + echo "${LIBOPUS_SHA256SUM} opus-${LIBOPUS_VERSION}.tar.gz"| sha256sum --check && \ + tar -zx --strip-components=1 -f opus-${LIBOPUS_VERSION}.tar.gz && \ + autoreconf -fiv && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +### libvorbis https://xiph.org/vorbis/ +RUN \ + DIR=vorbis && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO http://downloads.xiph.org/releases/vorbis/libvorbis-${LIBVORBIS_VERSION}.tar.gz && \ + echo "${LIBVORBIS_SHA256SUM} libvorbis-${LIBVORBIS_VERSION}.tar.gz" | sha256sum --check && \ + tar -zx --strip-components=1 -f libvorbis-${LIBVORBIS_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +### libtheora http://www.theora.org/ +RUN \ + DIR=theora && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO http://downloads.xiph.org/releases/theora/libtheora-${LIBTHEORA_VERSION}.tar.gz && \ + echo "${LIBTHEORA_SHA256SUM} libtheora-${LIBTHEORA_VERSION}.tar.gz" | sha256sum --check && \ + tar -zx --strip-components=1 -f libtheora-${LIBTHEORA_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +### libvpx https://www.webmproject.org/code/ +RUN \ + DIR=vpx && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://codeload.github.com/webmproject/libvpx/tar.gz/v${LIBVPX_VERSION} | \ + tar -zx --strip-components=1 && \ + ./configure --prefix="${PREFIX}" --enable-vp8 --enable-vp9 --enable-vp9-highbitdepth --enable-pic --enable-shared \ + --disable-debug --disable-examples --disable-docs && \ + make && \ + make install && \ + rm -rf ${DIR} + +### libmp3lame http://lame.sourceforge.net/ +RUN \ + DIR=lame && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://kent.dl.sourceforge.net/project/lame/lame/$(echo ${LIBMP3LAME_VERSION} | sed -e 's/[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)/\1.\2/')/lame-${LIBMP3LAME_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" --enable-shared --enable-nasm --enable-pic && \ + make && \ + make install && \ + rm -rf ${DIR} +### xvid https://www.xvid.com/ +RUN \ + DIR=xvid && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO http://downloads.xvid.org/downloads/xvidcore-${LIBXVID_VERSION}.tar.gz && \ + tar -zx -f xvidcore-${LIBXVID_VERSION}.tar.gz && \ + cd xvidcore/build/generic && \ + ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" --datadir="${DIR}" --enable-shared --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +### fdk-aac https://github.com/mstorsjo/fdk-aac +RUN \ + DIR=fdk-aac && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://github.com/mstorsjo/fdk-aac/archive/v${LIBFDK_AAC_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + autoreconf -fiv && \ + ./configure --prefix="${PREFIX}" --enable-shared --datadir="${DIR}" && \ + make && \ + make install && \ + rm -rf ${DIR} +## openjpeg https://github.com/uclouvain/openjpeg +RUN \ + DIR=openjpeg && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + if test `echo ${LIBOPENJPEG_VERSION} | tr -d '.'` -ge '210'; then \ + version_prefix='v'; \ + else \ + version_prefix='version.' ;\ + fi && \ + curl -sL https://github.com/uclouvain/openjpeg/archive/${version_prefix}${LIBOPENJPEG_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + cmake -DBUILD_THIRDPARTY:BOOL=ON -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ + make && \ + make install && \ + rm -rf ${DIR} +## freetype https://www.freetype.org/ +RUN \ + DIR=freetype && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://download.savannah.gnu.org/releases/freetype/freetype-${LIBFREETYPE_VERSION}.tar.gz && \ + tar -zx --strip-components=1 -f freetype-${LIBFREETYPE_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +## libvstab https://github.com/georgmartius/vid.stab +RUN \ + DIR=vid.stab && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/georgmartius/vid.stab/archive/v${LIBVIDSTAB_VERSION}.tar.gz &&\ + echo "${LIBVIDSTAB_SHA256SUM} v${LIBVIDSTAB_VERSION}.tar.gz" | sha256sum --check && \ + tar -zx --strip-components=1 -f v${LIBVIDSTAB_VERSION}.tar.gz && \ + cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ + make && \ + make install && \ + rm -rf ${DIR} +## fridibi https://www.fribidi.org/ +# + https://github.com/fribidi/fribidi/issues/8 +RUN \ + DIR=fribidi && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/fribidi/fribidi/archive/${LIBFRIBIDI_VERSION}.tar.gz && \ + echo "${LIBFRIBIDI_SHA256SUM} ${LIBFRIBIDI_VERSION}.tar.gz" | sha256sum --check && \ + tar -zx --strip-components=1 -f ${LIBFRIBIDI_VERSION}.tar.gz && \ + sed -i 's/^SUBDIRS =.*/SUBDIRS=gen.tab charset lib/' Makefile.am && \ + ./bootstrap --no-config && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ + make -j 1 && \ + make install && \ + rm -rf ${DIR} +## fontconfig https://www.freedesktop.org/wiki/Software/fontconfig/ +RUN \ + DIR=fontconfig && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://www.freedesktop.org/software/fontconfig/release/fontconfig-${LIBFONTCONFIG_VERSION}.tar.bz2 &&\ + tar -jx --strip-components=1 -f fontconfig-${LIBFONTCONFIG_VERSION}.tar.bz2 && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +## freetype https://www.freetype.org/ +RUN \ + DIR=freetype && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://download.savannah.gnu.org/releases/freetype/freetype-${LIBFREETYPE_VERSION}.tar.gz && \ + tar -zx --strip-components=1 -f freetype-${LIBFREETYPE_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +## fridibi https://www.fribidi.org/ +# + https://github.com/fribidi/fribidi/issues/8 +RUN \ + DIR=fribidi && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/fribidi/fribidi/archive/${LIBFRIBIDI_VERSION}.tar.gz && \ + echo "${LIBFRIBIDI_SHA256SUM} ${LIBFRIBIDI_VERSION}.tar.gz" | sha256sum --check && \ + tar -zx --strip-components=1 -f ${LIBFRIBIDI_VERSION}.tar.gz && \ + sed -i 's/^SUBDIRS =.*/SUBDIRS=gen.tab charset lib/' Makefile.am && \ + ./bootstrap --no-config && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ + make -j 1 && \ + make install && \ + rm -rf ${DIR} +## fontconfig https://www.freedesktop.org/wiki/Software/fontconfig/ +RUN \ + DIR=fontconfig && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://www.freedesktop.org/software/fontconfig/release/fontconfig-${LIBFONTCONFIG_VERSION}.tar.bz2 &&\ + tar -jx --strip-components=1 -f fontconfig-${LIBFONTCONFIG_VERSION}.tar.bz2 && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +RUN \ + DIR=libass && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/libass/libass/archive/${LIBASS_VERSION}.tar.gz &&\ + tar -zx --strip-components=1 -f ${LIBASS_VERSION}.tar.gz && \ + ./autogen.sh && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +## kvazaar https://github.com/ultravideo/kvazaar +RUN \ + DIR=kvazaar && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/ultravideo/kvazaar/archive/v${LIBKVAZAAR_VERSION}.tar.gz &&\ + tar -zx --strip-components=1 -f v${LIBKVAZAAR_VERSION}.tar.gz && \ + if [ -e ./autogen.sh ]; then \ + ./autogen.sh && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared ; \ + else \ + cd src ; \ + fi && \ + make && \ + make install && \ + rm -rf ${DIR} +RUN \ + DIR=aom && \ + git clone --branch v${LIBAOM_VERSION} --depth 1 https://aomedia.googlesource.com/aom ${DIR} ; \ + cd ${DIR} ; \ + rm -rf CMakeCache.txt CMakeFiles ; \ + mkdir -p ./aom_build ; \ + cd ./aom_build ; \ + cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" -DBUILD_SHARED_LIBS=1 ..; \ + make ; \ + make install ; \ + rm -rf ${DIR} + +RUN \ + DIR=nv-codec-headers && \ + git clone --branch n${NVENC_VERSION} --depth=1 https://git.videolan.org/git/ffmpeg/nv-codec-headers.git ${DIR} && \ + cd ${DIR} && \ + sed -i 's@/usr/local@'"$PREFIX"'@' Makefile && \ + make && \ + make install && \ + rm -rf ${DIR} + +RUN \ + DIR=ffmpeg && mkdir -p ${DIR} && cd ${DIR} && \ + curl -sLO https://ffmpeg.org/releases/ffmpeg-${FFMPEG_VERSION}.tar.bz2 && \ + tar -jx --strip-components=1 -f ffmpeg-${FFMPEG_VERSION}.tar.bz2 && \ + ./configure \ + --disable-debug \ + --disable-doc \ + --disable-ffplay \ + --enable-shared \ + --enable-avresample \ + --enable-openssl \ + --enable-postproc \ + --enable-small \ + --extra-cflags="-I${PREFIX}/include -I/usr/local/include" \ + --extra-ldflags="-L${PREFIX}/lib -L/usr/local/lib" \ + --enable-libopencore-amrnb \ + --enable-libopencore-amrwb \ + --enable-version3 \ + --enable-libx264 \ + --enable-libx265 \ + --enable-libopus \ + --enable-libvorbis \ + --enable-libtheora \ + --enable-libvpx \ + --enable-libmp3lame \ + --enable-libxvid \ + --enable-libfdk_aac \ + --enable-nonfree \ + --enable-libopenjpeg \ + --enable-libfreetype \ + --enable-libvidstab \ + --enable-gpl \ + --enable-libass \ + --enable-libkvazaar \ + --enable-libaom \ + --extra-libs=-lpthread \ + --enable-vaapi \ + --enable-cuda \ + --enable-nvenc \ + --enable-cuvid \ + --enable-vdpau \ + --prefix="${PREFIX}" && \ + make && \ + make install && \ + make distclean && \ + hash -r && \ + cd tools && \ + make qt-faststart && \ + cp qt-faststart ${PREFIX}/bin + +RUN \ + if false; then \ + LD_LIBRARY_PATH=${PREFIX}/lib ldd ${PREFIX}/bin/* | \ + cut -d ' ' -f 3 | \ + strings | \ + xargs -i cp {} /usr/local/lib/ && \ + cp ${PREFIX}/bin/ff* /usr/local/bin/ ; \ + else \ + LD_LIBRARY_PATH=${PREFIX}/lib ldd ${PREFIX}/bin/ffmpeg | \ + cut -d ' ' -f 3 | \ + strings | \ + xargs -i cp {} /usr/local/lib/ && \ + cp ${PREFIX}/bin/ff* /usr/local/bin/ ; \ + fi && \ + if true; then \ + for lib in /usr/local/lib/*.so* /usr/local/bin/*; do strip --strip-all $lib; done ; \ + fi && \ + LD_LIBRARY_PATH=/usr/local/lib ffmpeg -buildconf + + +FROM scratch AS release +MAINTAINER Julien Rottenberg + +CMD ["--help"] +ENTRYPOINT ["/bin/ffmpeg"] + +COPY --from=build /usr/local / +RUN test "scratch" = "base" && ldconfig /usr/local/lib /usr/local/lib64 + +# Let's make sure the app built correctly +# Convenient to verify on https://hub.docker.com/r/jrottenberg/ffmpeg/builds/ console output diff --git a/docker-images/4.1/centos/Dockerfile b/docker-images/4.1/centos/Dockerfile index 0dc0b8719..ca7b8227b 100644 --- a/docker-images/4.1/centos/Dockerfile +++ b/docker-images/4.1/centos/Dockerfile @@ -1,3 +1,4 @@ +<<<<<<< HEAD # ffmpeg - http://ffmpeg.org/download.html # # From https://trac.ffmpeg.org/wiki/CompilationGuide/Centos @@ -387,4 +388,482 @@ ENV LD_LIBRARY_PATH=/usr/local/lib64 COPY --from=build /usr/local/ /usr/local/ # Let's make sure the app built correctly -# Convenient to verify on https://hub.docker.com/r/jrottenberg/ffmpeg/builds/ console output \ No newline at end of file +# Convenient to verify on https://hub.docker.com/r/jrottenberg/ffmpeg/builds/ console output +======= +FROM centos:7 as base + +RUN yum -y install libvdpau libva libgomp libuuid && \ + echo "/usr/local/lib" > /etc/ld.so.conf.d/local.conf && \ + echo "/usr/local/lib64" >> /etc/ld.so.conf.d/local.conf + +FROM base as build + +WORKDIR /tmp/workdir + +ARG PREFIX=/tmp/build +ARG MAKEFLAGS=-j6 +ARG PKG_CONFIG_PATH=/tmp/build/lib/pkgconfig:/tmp/build/lib64/pkgconfig + +RUN yum --enablerepo=extras install -y epel-release && \ + yum install -y \ + libvdpau-devel libva-devel \ + autoconf \ + automake \ + bzip2 \ + cmake \ + expat-devel \ + gcc \ + gcc-c++ \ + git \ + gperf \ + libtool \ + make \ + nasm \ + perl \ + openssl-devel \ + tar \ + yasm \ + which \ + zlib-devel \ + libuuid-devel \ + libcurl-devel \ + xz-devel \ + libarchive-devel \ + python36 \ + python36-pip + +#Centos is missing recent version of CMake (>= 3.5) +RUN \ + DIR=/tmp/cmake && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://cmake.org/files/v3.5/cmake-3.5.2.tar.gz | \ + tar -zx --strip-components=1 && \ + ./bootstrap --system-libs --no-system-jsoncpp && \ + make && \ + make install && \ + rm -rf ${DIR} + +#Centos is missing recent version of nasm (>= 2.13) +RUN \ + DIR=/tmp/nasm && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://www.nasm.us/pub/nasm/releasebuilds/2.13.03/nasm-2.13.03.tar.gz | \ + tar -zx --strip-components=1 && \ + ./configure --prefix="/usr" && \ + make && \ + make install && \ + rm -rf ${DIR} + +#Centos is missing ninja +RUN \ + DIR=/tmp/ninja && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://github.com/ninja-build/ninja/archive/v1.9.0.tar.gz | \ + tar -zx --strip-components=1 && \ + python configure.py --bootstrap && \ + cp ./ninja /usr/bin/ && \ + rm -rf ${DIR} + +RUN \ + DIR=/tmp/meson && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + pip3 install meson && \ + rm -rf ${DIR} + +ARG FFMPEG_VERSION=4.1.3 +ARG LIBOPENCORE_AMR_VERSION=0.1.5 +ARG LIBX264_VERSION=20190526-2245-stable +ARG LIBX265_VERSION=3.0 +ARG LIBOGG_VERSION=1.3.3 +ARG LIBOPUS_VERSION=1.3.1 +ARG LIBVORBIS_VERSION=1.3.6 +ARG LIBTHEORA_VERSION=1.1.1 +ARG LIBVPX_VERSION=1.8.0 +ARG LIBMP3LAME_VERSION=3.100 +ARG LIBXVID_VERSION=1.3.5 +ARG LIBFDK_AAC_VERSION=2.0.0 +ARG LIBOPENJPEG_VERSION=2.3.1 +ARG LIBFREETYPE_VERSION=2.10.0 +ARG LIBVIDSTAB_VERSION=1.1.0 +ARG LIBFRIBIDI_VERSION=0.19.7 +ARG LIBFONTCONFIG_VERSION=2.13.1 +ARG LIBFREETYPE_VERSION=2.10.0 +ARG LIBFRIBIDI_VERSION=0.19.7 +ARG LIBFONTCONFIG_VERSION=2.13.1 +ARG LIBASS_VERSION=0.14.0 +ARG LIBKVAZAAR_VERSION=1.2.0 +ARG LIBAOM_VERSION=1.0.0-errata1 +ARG NVENC_VERSION=9.0.18.1 + +ARG LIBOGG_SHA256SUM=c2e8a485110b97550f453226ec644ebac6cb29d1caef2902c007edab4308d985 +ARG LIBOPUS_SHA256SUM=65b58e1e25b2a114157014736a3d9dfeaad8d41be1c8179866f144a2fb44ff9d +ARG LIBVORBIS_SHA256SUM=6ed40e0241089a42c48604dc00e362beee00036af2d8b3f46338031c9e0351cb +ARG LIBTHEORA_SHA256SUM=40952956c47811928d1e7922cda3bc1f427eb75680c3c37249c91e949054916b +ARG LIBVIDSTAB_SHA256SUM=14d2a053e56edad4f397be0cb3ef8eb1ec3150404ce99a426c4eb641861dc0bb +ARG LIBFRIBIDI_SHA256SUM=3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 +ARG LIBFRIBIDI_SHA256SUM=3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 + +## opencore-amr https://sourceforge.net/projects/opencore-amr/ +RUN \ + DIR=opencore-amr && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://kent.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${LIBOPENCORE_AMR_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +## x264 http://www.videolan.org/developers/x264.html +RUN \ + DIR=x264 && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://download.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-${LIBX264_VERSION}.tar.bz2 | \ + tar -jx --strip-components=1 && \ + ./configure --prefix="${PREFIX}" --enable-shared --enable-pic && \ + make && \ + make install && \ + rm -rf ${DIR} +### x265 http://x265.org/ +RUN \ + DIR=x265 && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://download.videolan.org/pub/videolan/x265/x265_${LIBX265_VERSION}.tar.gz | \ + tar -zx && \ + cd x265_${LIBX265_VERSION}/build/linux && \ + sed -i "/-DEXTRA_LIB/ s/$/ -DCMAKE_INSTALL_PREFIX=\${PREFIX}/" multilib.sh && \ + sed -i "/^cmake/ s/$/ -DENABLE_CLI=ON/" multilib.sh && \ + ./multilib.sh && \ + make -C 8bit install && \ + rm -rf ${DIR} +## libogg https://www.xiph.org/ogg/ +RUN \ + DIR=ogg && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO http://downloads.xiph.org/releases/ogg/libogg-${LIBOGG_VERSION}.tar.gz && \ + echo "${LIBOGG_SHA256SUM} libogg-${LIBOGG_VERSION}.tar.gz" | sha256sum --check && \ + tar -zx --strip-components=1 -f libogg-${LIBOGG_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +RUN \ + DIR=opus && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://archive.mozilla.org/pub/opus/opus-${LIBOPUS_VERSION}.tar.gz && \ + echo "${LIBOPUS_SHA256SUM} opus-${LIBOPUS_VERSION}.tar.gz"| sha256sum --check && \ + tar -zx --strip-components=1 -f opus-${LIBOPUS_VERSION}.tar.gz && \ + autoreconf -fiv && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +### libvorbis https://xiph.org/vorbis/ +RUN \ + DIR=vorbis && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO http://downloads.xiph.org/releases/vorbis/libvorbis-${LIBVORBIS_VERSION}.tar.gz && \ + echo "${LIBVORBIS_SHA256SUM} libvorbis-${LIBVORBIS_VERSION}.tar.gz" | sha256sum --check && \ + tar -zx --strip-components=1 -f libvorbis-${LIBVORBIS_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +### libtheora http://www.theora.org/ +RUN \ + DIR=theora && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO http://downloads.xiph.org/releases/theora/libtheora-${LIBTHEORA_VERSION}.tar.gz && \ + echo "${LIBTHEORA_SHA256SUM} libtheora-${LIBTHEORA_VERSION}.tar.gz" | sha256sum --check && \ + tar -zx --strip-components=1 -f libtheora-${LIBTHEORA_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +### libvpx https://www.webmproject.org/code/ +RUN \ + DIR=vpx && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://codeload.github.com/webmproject/libvpx/tar.gz/v${LIBVPX_VERSION} | \ + tar -zx --strip-components=1 && \ + ./configure --prefix="${PREFIX}" --enable-vp8 --enable-vp9 --enable-vp9-highbitdepth --enable-pic --enable-shared \ + --disable-debug --disable-examples --disable-docs && \ + make && \ + make install && \ + rm -rf ${DIR} + +### libmp3lame http://lame.sourceforge.net/ +RUN \ + DIR=lame && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://kent.dl.sourceforge.net/project/lame/lame/$(echo ${LIBMP3LAME_VERSION} | sed -e 's/[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)/\1.\2/')/lame-${LIBMP3LAME_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" --enable-shared --enable-nasm --enable-pic && \ + make && \ + make install && \ + rm -rf ${DIR} +### xvid https://www.xvid.com/ +RUN \ + DIR=xvid && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO http://downloads.xvid.org/downloads/xvidcore-${LIBXVID_VERSION}.tar.gz && \ + tar -zx -f xvidcore-${LIBXVID_VERSION}.tar.gz && \ + cd xvidcore/build/generic && \ + ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" --datadir="${DIR}" --enable-shared --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +### fdk-aac https://github.com/mstorsjo/fdk-aac +RUN \ + DIR=fdk-aac && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://github.com/mstorsjo/fdk-aac/archive/v${LIBFDK_AAC_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + autoreconf -fiv && \ + ./configure --prefix="${PREFIX}" --enable-shared --datadir="${DIR}" && \ + make && \ + make install && \ + rm -rf ${DIR} +## openjpeg https://github.com/uclouvain/openjpeg +RUN \ + DIR=openjpeg && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + if test `echo ${LIBOPENJPEG_VERSION} | tr -d '.'` -ge '210'; then \ + version_prefix='v'; \ + else \ + version_prefix='version.' ;\ + fi && \ + curl -sL https://github.com/uclouvain/openjpeg/archive/${version_prefix}${LIBOPENJPEG_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + cmake -DBUILD_THIRDPARTY:BOOL=ON -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ + make && \ + make install && \ + rm -rf ${DIR} +## freetype https://www.freetype.org/ +RUN \ + DIR=freetype && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://download.savannah.gnu.org/releases/freetype/freetype-${LIBFREETYPE_VERSION}.tar.gz && \ + tar -zx --strip-components=1 -f freetype-${LIBFREETYPE_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +## libvstab https://github.com/georgmartius/vid.stab +RUN \ + DIR=vid.stab && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/georgmartius/vid.stab/archive/v${LIBVIDSTAB_VERSION}.tar.gz &&\ + echo "${LIBVIDSTAB_SHA256SUM} v${LIBVIDSTAB_VERSION}.tar.gz" | sha256sum --check && \ + tar -zx --strip-components=1 -f v${LIBVIDSTAB_VERSION}.tar.gz && \ + cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ + make && \ + make install && \ + rm -rf ${DIR} +## fridibi https://www.fribidi.org/ +# + https://github.com/fribidi/fribidi/issues/8 +RUN \ + DIR=fribidi && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/fribidi/fribidi/archive/${LIBFRIBIDI_VERSION}.tar.gz && \ + echo "${LIBFRIBIDI_SHA256SUM} ${LIBFRIBIDI_VERSION}.tar.gz" | sha256sum --check && \ + tar -zx --strip-components=1 -f ${LIBFRIBIDI_VERSION}.tar.gz && \ + sed -i 's/^SUBDIRS =.*/SUBDIRS=gen.tab charset lib/' Makefile.am && \ + ./bootstrap --no-config && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ + make -j 1 && \ + make install && \ + rm -rf ${DIR} +## fontconfig https://www.freedesktop.org/wiki/Software/fontconfig/ +RUN \ + DIR=fontconfig && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://www.freedesktop.org/software/fontconfig/release/fontconfig-${LIBFONTCONFIG_VERSION}.tar.bz2 &&\ + tar -jx --strip-components=1 -f fontconfig-${LIBFONTCONFIG_VERSION}.tar.bz2 && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +## freetype https://www.freetype.org/ +RUN \ + DIR=freetype && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://download.savannah.gnu.org/releases/freetype/freetype-${LIBFREETYPE_VERSION}.tar.gz && \ + tar -zx --strip-components=1 -f freetype-${LIBFREETYPE_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +## fridibi https://www.fribidi.org/ +# + https://github.com/fribidi/fribidi/issues/8 +RUN \ + DIR=fribidi && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/fribidi/fribidi/archive/${LIBFRIBIDI_VERSION}.tar.gz && \ + echo "${LIBFRIBIDI_SHA256SUM} ${LIBFRIBIDI_VERSION}.tar.gz" | sha256sum --check && \ + tar -zx --strip-components=1 -f ${LIBFRIBIDI_VERSION}.tar.gz && \ + sed -i 's/^SUBDIRS =.*/SUBDIRS=gen.tab charset lib/' Makefile.am && \ + ./bootstrap --no-config && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ + make -j 1 && \ + make install && \ + rm -rf ${DIR} +## fontconfig https://www.freedesktop.org/wiki/Software/fontconfig/ +RUN \ + DIR=fontconfig && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://www.freedesktop.org/software/fontconfig/release/fontconfig-${LIBFONTCONFIG_VERSION}.tar.bz2 &&\ + tar -jx --strip-components=1 -f fontconfig-${LIBFONTCONFIG_VERSION}.tar.bz2 && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +RUN \ + DIR=libass && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/libass/libass/archive/${LIBASS_VERSION}.tar.gz &&\ + tar -zx --strip-components=1 -f ${LIBASS_VERSION}.tar.gz && \ + ./autogen.sh && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +## kvazaar https://github.com/ultravideo/kvazaar +RUN \ + DIR=kvazaar && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/ultravideo/kvazaar/archive/v${LIBKVAZAAR_VERSION}.tar.gz &&\ + tar -zx --strip-components=1 -f v${LIBKVAZAAR_VERSION}.tar.gz && \ + if [ -e ./autogen.sh ]; then \ + ./autogen.sh && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared ; \ + else \ + cd src ; \ + fi && \ + make && \ + make install && \ + rm -rf ${DIR} +RUN \ + DIR=aom && \ + git clone --branch v${LIBAOM_VERSION} --depth 1 https://aomedia.googlesource.com/aom ${DIR} ; \ + cd ${DIR} ; \ + rm -rf CMakeCache.txt CMakeFiles ; \ + mkdir -p ./aom_build ; \ + cd ./aom_build ; \ + cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" -DBUILD_SHARED_LIBS=1 ..; \ + make ; \ + make install ; \ + rm -rf ${DIR} + +RUN \ + DIR=nv-codec-headers && \ + git clone --branch n${NVENC_VERSION} --depth=1 https://git.videolan.org/git/ffmpeg/nv-codec-headers.git ${DIR} && \ + cd ${DIR} && \ + sed -i 's@/usr/local@'"$PREFIX"'@' Makefile && \ + make && \ + make install && \ + rm -rf ${DIR} + +RUN \ + DIR=ffmpeg && mkdir -p ${DIR} && cd ${DIR} && \ + curl -sLO https://ffmpeg.org/releases/ffmpeg-${FFMPEG_VERSION}.tar.bz2 && \ + tar -jx --strip-components=1 -f ffmpeg-${FFMPEG_VERSION}.tar.bz2 && \ + ./configure \ + --disable-debug \ + --disable-doc \ + --disable-ffplay \ + --enable-shared \ + --enable-avresample \ + --enable-openssl \ + --enable-postproc \ + --enable-small \ + --extra-cflags="-I${PREFIX}/include -I/usr/local/include" \ + --extra-ldflags="-L${PREFIX}/lib -L/usr/local/lib" \ + --enable-libopencore-amrnb \ + --enable-libopencore-amrwb \ + --enable-version3 \ + --enable-libx264 \ + --enable-libx265 \ + --enable-libopus \ + --enable-libvorbis \ + --enable-libtheora \ + --enable-libvpx \ + --enable-libmp3lame \ + --enable-libxvid \ + --enable-libfdk_aac \ + --enable-nonfree \ + --enable-libopenjpeg \ + --enable-libfreetype \ + --enable-libvidstab \ + --enable-gpl \ + --enable-libass \ + --enable-libkvazaar \ + --enable-libaom \ + --extra-libs=-lpthread \ + --enable-vaapi \ + --enable-cuda \ + --enable-nvenc \ + --enable-cuvid \ + --enable-vdpau \ + --prefix="${PREFIX}" && \ + make && \ + make install && \ + make distclean && \ + hash -r && \ + cd tools && \ + make qt-faststart && \ + cp qt-faststart ${PREFIX}/bin + +RUN \ + if false; then \ + cp -r ${PREFIX}/lib/*so* /usr/local/lib/ && \ + cp ${PREFIX}/bin/* /usr/local/bin/ ; \ + else \ + LD_LIBRARY_PATH=${PREFIX}/lib ldd ${PREFIX}/bin/ffmpeg | \ + grep ${PREFIX} | \ + cut -d ' ' -f 3 | \ + xargs -i cp {} /usr/local/lib/ && \ + cp ${PREFIX}/bin/ff* /usr/local/bin/ ; \ + fi && \ + if true; then \ + for lib in /usr/local/lib/*.so* /usr/local/bin/*; do strip --strip-all $lib; done ; \ + fi && \ + cp -r ${PREFIX}/share/ffmpeg /usr/local/share/ && \ + LD_LIBRARY_PATH=/usr/local/lib ffmpeg -buildconf + +FROM base AS release +MAINTAINER Julien Rottenberg + +CMD ["--help"] +ENTRYPOINT ["ffmpeg"] + +COPY --from=build /usr/local /usr/local +RUN test "base" = "base" && ldconfig /usr/local/lib /usr/local/lib64 + +# Let's make sure the app built correctly +# Convenient to verify on https://hub.docker.com/r/jrottenberg/ffmpeg/builds/ console output +>>>>>>> rewrite the dockerfile generation + vdapu + armv7 + dav1d diff --git a/docker-images/4.1/nvidia,/Dockerfile b/docker-images/4.1/nvidia,/Dockerfile new file mode 100644 index 000000000..452b62c02 --- /dev/null +++ b/docker-images/4.1/nvidia,/Dockerfile @@ -0,0 +1,14 @@ +usage: update.py [-h] [--enable-libopencore-amr] [--enable-libx264] + [--enable-libx265] [--enable-libogg] [--enable-libopus] + [--enable-libvorbis] [--enable-libtheora] [--enable-libvpx] + [--enable-libmp3lame] [--enable-libxvid] + [--enable-libfdk-aac] [--enable-libopenjpeg] + [--enable-libfreetype] [--enable-libvidstab] + [--enable-libfribidi] [--enable-libfontconfig] + [--enable-libass] [--enable-libkvazaar] [--enable-libaom] + [--enable-vaapi] [--enable-nvenc] [--enable-libdav1d] + [--enable-vdpau] [--enable-all] [--with-bins] [--no-strip] + [--fat | --slim | --scratch] + {alpine,centos,ubuntu,nvidia,armv7} + {snapshot,4.1,4.0,3.4,3.3,3.2,2.8} +update.py: error: argument variant: invalid choice: 'nvidia,' (choose from 'alpine', 'centos', 'ubuntu', 'nvidia', 'armv7') diff --git a/docker-images/4.1/ubuntu/Dockerfile b/docker-images/4.1/ubuntu/Dockerfile index 9360b6216..263b86b5b 100644 --- a/docker-images/4.1/ubuntu/Dockerfile +++ b/docker-images/4.1/ubuntu/Dockerfile @@ -1,3 +1,4 @@ +<<<<<<< HEAD # ffmpeg - http://ffmpeg.org/download.html # # From https://trac.ffmpeg.org/wiki/CompilationGuide/Ubuntu @@ -389,3 +390,438 @@ COPY --from=build /usr/local /usr/local/ # Let's make sure the app built correctly # Convenient to verify on https://hub.docker.com/r/jrottenberg/ffmpeg/builds/ console output +======= +FROM ubuntu:18.04 AS base + +RUN apt-get -yqq update && \ + apt-get install -yq --no-install-recommends libvdpau1 libva2 libva-drm2 i965-va-driver ca-certificates expat libgomp1 libuuid1 libssl1.0 && \ + apt-get autoremove -y && \ + apt-get clean -y + +FROM base as build + +WORKDIR /tmp/workdir + +ARG PREFIX=/tmp/build +ARG MAKEFLAGS=-j6 +ARG PKG_CONFIG_PATH=/tmp/build/lib/pkgconfig + +RUN apt-get -yqq update && \ + apt-get install -yq --no-install-recommends \ + libvdpau-dev libva-dev \ + autoconf \ + automake \ + cmake \ + curl \ + bzip2 \ + libexpat1-dev \ + g++ \ + gcc \ + git \ + gperf \ + libtool \ + make \ + nasm \ + perl \ + pkg-config \ + python \ + libssl1.0-dev \ + yasm \ + zlib1g-dev \ + uuid-dev \ + ninja-build \ + meson + +ARG FFMPEG_VERSION=4.1.3 +ARG LIBOPENCORE_AMR_VERSION=0.1.5 +ARG LIBX264_VERSION=20190526-2245-stable +ARG LIBX265_VERSION=3.0 +ARG LIBOGG_VERSION=1.3.3 +ARG LIBOPUS_VERSION=1.3.1 +ARG LIBVORBIS_VERSION=1.3.6 +ARG LIBTHEORA_VERSION=1.1.1 +ARG LIBVPX_VERSION=1.8.0 +ARG LIBMP3LAME_VERSION=3.100 +ARG LIBXVID_VERSION=1.3.5 +ARG LIBFDK_AAC_VERSION=2.0.0 +ARG LIBOPENJPEG_VERSION=2.3.1 +ARG LIBFREETYPE_VERSION=2.10.0 +ARG LIBVIDSTAB_VERSION=1.1.0 +ARG LIBFRIBIDI_VERSION=0.19.7 +ARG LIBFONTCONFIG_VERSION=2.13.1 +ARG LIBFREETYPE_VERSION=2.10.0 +ARG LIBFRIBIDI_VERSION=0.19.7 +ARG LIBFONTCONFIG_VERSION=2.13.1 +ARG LIBASS_VERSION=0.14.0 +ARG LIBKVAZAAR_VERSION=1.2.0 +ARG LIBAOM_VERSION=1.0.0-errata1 +ARG NVENC_VERSION=9.0.18.1 + +ARG LIBOGG_SHA256SUM=c2e8a485110b97550f453226ec644ebac6cb29d1caef2902c007edab4308d985 +ARG LIBOPUS_SHA256SUM=65b58e1e25b2a114157014736a3d9dfeaad8d41be1c8179866f144a2fb44ff9d +ARG LIBVORBIS_SHA256SUM=6ed40e0241089a42c48604dc00e362beee00036af2d8b3f46338031c9e0351cb +ARG LIBTHEORA_SHA256SUM=40952956c47811928d1e7922cda3bc1f427eb75680c3c37249c91e949054916b +ARG LIBVIDSTAB_SHA256SUM=14d2a053e56edad4f397be0cb3ef8eb1ec3150404ce99a426c4eb641861dc0bb +ARG LIBFRIBIDI_SHA256SUM=3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 +ARG LIBFRIBIDI_SHA256SUM=3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 + +## opencore-amr https://sourceforge.net/projects/opencore-amr/ +RUN \ + DIR=opencore-amr && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://kent.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${LIBOPENCORE_AMR_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +## x264 http://www.videolan.org/developers/x264.html +RUN \ + DIR=x264 && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://download.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-${LIBX264_VERSION}.tar.bz2 | \ + tar -jx --strip-components=1 && \ + ./configure --prefix="${PREFIX}" --enable-shared --enable-pic && \ + make && \ + make install && \ + rm -rf ${DIR} +### x265 http://x265.org/ +RUN \ + DIR=x265 && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://download.videolan.org/pub/videolan/x265/x265_${LIBX265_VERSION}.tar.gz | \ + tar -zx && \ + cd x265_${LIBX265_VERSION}/build/linux && \ + sed -i "/-DEXTRA_LIB/ s/$/ -DCMAKE_INSTALL_PREFIX=\${PREFIX}/" multilib.sh && \ + sed -i "/^cmake/ s/$/ -DENABLE_CLI=ON/" multilib.sh && \ + ./multilib.sh && \ + make -C 8bit install && \ + rm -rf ${DIR} +## libogg https://www.xiph.org/ogg/ +RUN \ + DIR=ogg && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO http://downloads.xiph.org/releases/ogg/libogg-${LIBOGG_VERSION}.tar.gz && \ + echo "${LIBOGG_SHA256SUM} libogg-${LIBOGG_VERSION}.tar.gz" | sha256sum --check && \ + tar -zx --strip-components=1 -f libogg-${LIBOGG_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +RUN \ + DIR=opus && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://archive.mozilla.org/pub/opus/opus-${LIBOPUS_VERSION}.tar.gz && \ + echo "${LIBOPUS_SHA256SUM} opus-${LIBOPUS_VERSION}.tar.gz"| sha256sum --check && \ + tar -zx --strip-components=1 -f opus-${LIBOPUS_VERSION}.tar.gz && \ + autoreconf -fiv && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +### libvorbis https://xiph.org/vorbis/ +RUN \ + DIR=vorbis && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO http://downloads.xiph.org/releases/vorbis/libvorbis-${LIBVORBIS_VERSION}.tar.gz && \ + echo "${LIBVORBIS_SHA256SUM} libvorbis-${LIBVORBIS_VERSION}.tar.gz" | sha256sum --check && \ + tar -zx --strip-components=1 -f libvorbis-${LIBVORBIS_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +### libtheora http://www.theora.org/ +RUN \ + DIR=theora && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO http://downloads.xiph.org/releases/theora/libtheora-${LIBTHEORA_VERSION}.tar.gz && \ + echo "${LIBTHEORA_SHA256SUM} libtheora-${LIBTHEORA_VERSION}.tar.gz" | sha256sum --check && \ + tar -zx --strip-components=1 -f libtheora-${LIBTHEORA_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +### libvpx https://www.webmproject.org/code/ +RUN \ + DIR=vpx && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://codeload.github.com/webmproject/libvpx/tar.gz/v${LIBVPX_VERSION} | \ + tar -zx --strip-components=1 && \ + ./configure --prefix="${PREFIX}" --enable-vp8 --enable-vp9 --enable-vp9-highbitdepth --enable-pic --enable-shared \ + --disable-debug --disable-examples --disable-docs && \ + make && \ + make install && \ + rm -rf ${DIR} + +### libmp3lame http://lame.sourceforge.net/ +RUN \ + DIR=lame && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://kent.dl.sourceforge.net/project/lame/lame/$(echo ${LIBMP3LAME_VERSION} | sed -e 's/[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)/\1.\2/')/lame-${LIBMP3LAME_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" --enable-shared --enable-nasm --enable-pic && \ + make && \ + make install && \ + rm -rf ${DIR} +### xvid https://www.xvid.com/ +RUN \ + DIR=xvid && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO http://downloads.xvid.org/downloads/xvidcore-${LIBXVID_VERSION}.tar.gz && \ + tar -zx -f xvidcore-${LIBXVID_VERSION}.tar.gz && \ + cd xvidcore/build/generic && \ + ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" --datadir="${DIR}" --enable-shared --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +### fdk-aac https://github.com/mstorsjo/fdk-aac +RUN \ + DIR=fdk-aac && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://github.com/mstorsjo/fdk-aac/archive/v${LIBFDK_AAC_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + autoreconf -fiv && \ + ./configure --prefix="${PREFIX}" --enable-shared --datadir="${DIR}" && \ + make && \ + make install && \ + rm -rf ${DIR} +## openjpeg https://github.com/uclouvain/openjpeg +RUN \ + DIR=openjpeg && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + if test `echo ${LIBOPENJPEG_VERSION} | tr -d '.'` -ge '210'; then \ + version_prefix='v'; \ + else \ + version_prefix='version.' ;\ + fi && \ + curl -sL https://github.com/uclouvain/openjpeg/archive/${version_prefix}${LIBOPENJPEG_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + cmake -DBUILD_THIRDPARTY:BOOL=ON -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ + make && \ + make install && \ + rm -rf ${DIR} +## freetype https://www.freetype.org/ +RUN \ + DIR=freetype && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://download.savannah.gnu.org/releases/freetype/freetype-${LIBFREETYPE_VERSION}.tar.gz && \ + tar -zx --strip-components=1 -f freetype-${LIBFREETYPE_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +## libvstab https://github.com/georgmartius/vid.stab +RUN \ + DIR=vid.stab && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/georgmartius/vid.stab/archive/v${LIBVIDSTAB_VERSION}.tar.gz &&\ + echo "${LIBVIDSTAB_SHA256SUM} v${LIBVIDSTAB_VERSION}.tar.gz" | sha256sum --check && \ + tar -zx --strip-components=1 -f v${LIBVIDSTAB_VERSION}.tar.gz && \ + cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ + make && \ + make install && \ + rm -rf ${DIR} +## fridibi https://www.fribidi.org/ +# + https://github.com/fribidi/fribidi/issues/8 +RUN \ + DIR=fribidi && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/fribidi/fribidi/archive/${LIBFRIBIDI_VERSION}.tar.gz && \ + echo "${LIBFRIBIDI_SHA256SUM} ${LIBFRIBIDI_VERSION}.tar.gz" | sha256sum --check && \ + tar -zx --strip-components=1 -f ${LIBFRIBIDI_VERSION}.tar.gz && \ + sed -i 's/^SUBDIRS =.*/SUBDIRS=gen.tab charset lib/' Makefile.am && \ + ./bootstrap --no-config && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ + make -j 1 && \ + make install && \ + rm -rf ${DIR} +## fontconfig https://www.freedesktop.org/wiki/Software/fontconfig/ +RUN \ + DIR=fontconfig && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://www.freedesktop.org/software/fontconfig/release/fontconfig-${LIBFONTCONFIG_VERSION}.tar.bz2 &&\ + tar -jx --strip-components=1 -f fontconfig-${LIBFONTCONFIG_VERSION}.tar.bz2 && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +## freetype https://www.freetype.org/ +RUN \ + DIR=freetype && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://download.savannah.gnu.org/releases/freetype/freetype-${LIBFREETYPE_VERSION}.tar.gz && \ + tar -zx --strip-components=1 -f freetype-${LIBFREETYPE_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +## fridibi https://www.fribidi.org/ +# + https://github.com/fribidi/fribidi/issues/8 +RUN \ + DIR=fribidi && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/fribidi/fribidi/archive/${LIBFRIBIDI_VERSION}.tar.gz && \ + echo "${LIBFRIBIDI_SHA256SUM} ${LIBFRIBIDI_VERSION}.tar.gz" | sha256sum --check && \ + tar -zx --strip-components=1 -f ${LIBFRIBIDI_VERSION}.tar.gz && \ + sed -i 's/^SUBDIRS =.*/SUBDIRS=gen.tab charset lib/' Makefile.am && \ + ./bootstrap --no-config && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ + make -j 1 && \ + make install && \ + rm -rf ${DIR} +## fontconfig https://www.freedesktop.org/wiki/Software/fontconfig/ +RUN \ + DIR=fontconfig && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://www.freedesktop.org/software/fontconfig/release/fontconfig-${LIBFONTCONFIG_VERSION}.tar.bz2 &&\ + tar -jx --strip-components=1 -f fontconfig-${LIBFONTCONFIG_VERSION}.tar.bz2 && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +RUN \ + DIR=libass && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/libass/libass/archive/${LIBASS_VERSION}.tar.gz &&\ + tar -zx --strip-components=1 -f ${LIBASS_VERSION}.tar.gz && \ + ./autogen.sh && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +## kvazaar https://github.com/ultravideo/kvazaar +RUN \ + DIR=kvazaar && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/ultravideo/kvazaar/archive/v${LIBKVAZAAR_VERSION}.tar.gz &&\ + tar -zx --strip-components=1 -f v${LIBKVAZAAR_VERSION}.tar.gz && \ + if [ -e ./autogen.sh ]; then \ + ./autogen.sh && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared ; \ + else \ + cd src ; \ + fi && \ + make && \ + make install && \ + rm -rf ${DIR} +RUN \ + DIR=aom && \ + git clone --branch v${LIBAOM_VERSION} --depth 1 https://aomedia.googlesource.com/aom ${DIR} ; \ + cd ${DIR} ; \ + rm -rf CMakeCache.txt CMakeFiles ; \ + mkdir -p ./aom_build ; \ + cd ./aom_build ; \ + cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" -DBUILD_SHARED_LIBS=1 ..; \ + make ; \ + make install ; \ + rm -rf ${DIR} + +RUN \ + DIR=nv-codec-headers && \ + git clone --branch n${NVENC_VERSION} --depth=1 https://git.videolan.org/git/ffmpeg/nv-codec-headers.git ${DIR} && \ + cd ${DIR} && \ + sed -i 's@/usr/local@'"$PREFIX"'@' Makefile && \ + make && \ + make install && \ + rm -rf ${DIR} + +RUN \ + DIR=ffmpeg && mkdir -p ${DIR} && cd ${DIR} && \ + curl -sLO https://ffmpeg.org/releases/ffmpeg-${FFMPEG_VERSION}.tar.bz2 && \ + tar -jx --strip-components=1 -f ffmpeg-${FFMPEG_VERSION}.tar.bz2 && \ + ./configure \ + --disable-debug \ + --disable-doc \ + --disable-ffplay \ + --enable-shared \ + --enable-avresample \ + --enable-openssl \ + --enable-postproc \ + --enable-small \ + --extra-cflags="-I${PREFIX}/include -I/usr/local/include" \ + --extra-ldflags="-L${PREFIX}/lib -L/usr/local/lib" \ + --enable-libopencore-amrnb \ + --enable-libopencore-amrwb \ + --enable-version3 \ + --enable-libx264 \ + --enable-libx265 \ + --enable-libopus \ + --enable-libvorbis \ + --enable-libtheora \ + --enable-libvpx \ + --enable-libmp3lame \ + --enable-libxvid \ + --enable-libfdk_aac \ + --enable-nonfree \ + --enable-libopenjpeg \ + --enable-libfreetype \ + --enable-libvidstab \ + --enable-gpl \ + --enable-libass \ + --enable-libkvazaar \ + --enable-libaom \ + --extra-libs=-lpthread \ + --enable-vaapi \ + --enable-cuda \ + --enable-nvenc \ + --enable-cuvid \ + --enable-vdpau \ + --prefix="${PREFIX}" && \ + make && \ + make install && \ + make distclean && \ + hash -r && \ + cd tools && \ + make qt-faststart && \ + cp qt-faststart ${PREFIX}/bin + +RUN \ + if false; then \ + cp -r ${PREFIX}/lib/*so* /usr/local/lib/ && \ + cp ${PREFIX}/bin/* /usr/local/bin/ ; \ + else \ + LD_LIBRARY_PATH=${PREFIX}/lib ldd ${PREFIX}/bin/ffmpeg | \ + grep ${PREFIX} | \ + cut -d ' ' -f 3 | \ + xargs -i cp {} /usr/local/lib/ && \ + cp ${PREFIX}/bin/ff* /usr/local/bin/ ; \ + fi && \ + if true; then \ + for lib in /usr/local/lib/*.so* /usr/local/bin/*; do strip --strip-all $lib; done ; \ + fi && \ + cp -r ${PREFIX}/share/ffmpeg /usr/local/share/ && \ + LD_LIBRARY_PATH=/usr/local/lib ffmpeg -buildconf + +FROM base AS release +MAINTAINER Julien Rottenberg + +CMD ["--help"] +ENTRYPOINT ["ffmpeg"] + +COPY --from=build /usr/local /usr/local +RUN test "base" = "base" && ldconfig /usr/local/lib /usr/local/lib64 + +# Let's make sure the app built correctly +# Convenient to verify on https://hub.docker.com/r/jrottenberg/ffmpeg/builds/ console output +>>>>>>> rewrite the dockerfile generation + vdapu + armv7 + dav1d diff --git a/docker-images/snapshot/alpine,/Dockerfile b/docker-images/snapshot/alpine,/Dockerfile new file mode 100644 index 000000000..a0b97723e --- /dev/null +++ b/docker-images/snapshot/alpine,/Dockerfile @@ -0,0 +1,14 @@ +usage: update.py [-h] [--enable-libopencore-amr] [--enable-libx264] + [--enable-libx265] [--enable-libogg] [--enable-libopus] + [--enable-libvorbis] [--enable-libtheora] [--enable-libvpx] + [--enable-libmp3lame] [--enable-libxvid] + [--enable-libfdk-aac] [--enable-libopenjpeg] + [--enable-libfreetype] [--enable-libvidstab] + [--enable-libfribidi] [--enable-libfontconfig] + [--enable-libass] [--enable-libkvazaar] [--enable-libaom] + [--enable-vaapi] [--enable-nvenc] [--enable-libdav1d] + [--enable-vdpau] [--enable-all] [--with-bins] [--no-strip] + [--fat | --slim | --scratch] + {alpine,centos,ubuntu,nvidia,armv7} + {snapshot,4.1,4.0,3.4,3.3,3.2,2.8} +update.py: error: argument variant: invalid choice: 'alpine,' (choose from 'alpine', 'centos', 'ubuntu', 'nvidia', 'armv7') diff --git a/docker-images/snapshot/arm32v7/Dockerfile b/docker-images/snapshot/arm32v7/Dockerfile new file mode 100644 index 000000000..625aa0b2d --- /dev/null +++ b/docker-images/snapshot/arm32v7/Dockerfile @@ -0,0 +1,453 @@ +FROM alpine:3.9 as base + +RUN apk add --no-cache --update libva \ + libgcc \ + libstdc++ \ + ca-certificates \ + libcrypto1.1 \ + libssl1.1 \ + libgomp \ + expat \ + libuuid + +FROM base as build + +WORKDIR /tmp/workdir + +ARG PREFIX=/tmp/build +ARG MAKEFLAGS=-j6 +ARG PKG_CONFIG_PATH=/tmp/build/lib/pkgconfig + +RUN apk add --no-cache --update libva-dev \ + autoconf \ + automake \ + bash \ + binutils \ + bzip2 \ + cmake \ + curl \ + coreutils \ + diffutils \ + file \ + g++ \ + git \ + gcc \ + gperf \ + libtool \ + make \ + python \ + openssl-dev \ + tar \ + yasm \ + nasm \ + zlib-dev \ + expat-dev \ + util-linux-dev \ + meson \ + ninja + +ARG FFMPEG_VERSION=snapshot +ARG LIBOPENCORE_AMR_VERSION=0.1.5 +ARG LIBX264_VERSION=20190526-2245-stable +ARG LIBX265_VERSION=3.0 +ARG LIBOGG_VERSION=1.3.3 +ARG LIBOPUS_VERSION=1.3.1 +ARG LIBVORBIS_VERSION=1.3.6 +ARG LIBTHEORA_VERSION=1.1.1 +ARG LIBVPX_VERSION=1.8.0 +ARG LIBMP3LAME_VERSION=3.100 +ARG LIBXVID_VERSION=1.3.5 +ARG LIBFDK_AAC_VERSION=2.0.0 +ARG LIBOPENJPEG_VERSION=2.3.1 +ARG LIBFREETYPE_VERSION=2.10.0 +ARG LIBVIDSTAB_VERSION=1.1.0 +ARG LIBFRIBIDI_VERSION=0.19.7 +ARG LIBFONTCONFIG_VERSION=2.13.1 +ARG LIBFREETYPE_VERSION=2.10.0 +ARG LIBFRIBIDI_VERSION=0.19.7 +ARG LIBFONTCONFIG_VERSION=2.13.1 +ARG LIBASS_VERSION=0.14.0 +ARG LIBKVAZAAR_VERSION=1.2.0 +ARG LIBAOM_VERSION=1.0.0-errata1 +ARG NVENC_VERSION=9.0.18.1 +ARG LIBDAV1D_VERSION=0.3.1 + +ARG LIBOGG_SHA256SUM=c2e8a485110b97550f453226ec644ebac6cb29d1caef2902c007edab4308d985 +ARG LIBOPUS_SHA256SUM=65b58e1e25b2a114157014736a3d9dfeaad8d41be1c8179866f144a2fb44ff9d +ARG LIBVORBIS_SHA256SUM=6ed40e0241089a42c48604dc00e362beee00036af2d8b3f46338031c9e0351cb +ARG LIBTHEORA_SHA256SUM=40952956c47811928d1e7922cda3bc1f427eb75680c3c37249c91e949054916b +ARG LIBVIDSTAB_SHA256SUM=14d2a053e56edad4f397be0cb3ef8eb1ec3150404ce99a426c4eb641861dc0bb +ARG LIBFRIBIDI_SHA256SUM=3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 +ARG LIBFRIBIDI_SHA256SUM=3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 + +## opencore-amr https://sourceforge.net/projects/opencore-amr/ +RUN \ + DIR=opencore-amr && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://kent.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${LIBOPENCORE_AMR_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +## x264 http://www.videolan.org/developers/x264.html +RUN \ + DIR=x264 && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://download.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-${LIBX264_VERSION}.tar.bz2 | \ + tar -jx --strip-components=1 && \ + ./configure --prefix="${PREFIX}" --enable-shared --enable-pic && \ + make && \ + make install && \ + rm -rf ${DIR} +### x265 http://x265.org/ +RUN \ + DIR=x265 && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://download.videolan.org/pub/videolan/x265/x265_${LIBX265_VERSION}.tar.gz | \ + tar -zx && \ + cd x265_${LIBX265_VERSION}/build/linux && \ + sed -i "/-DEXTRA_LIB/ s/$/ -DCMAKE_INSTALL_PREFIX=\${PREFIX}/" multilib.sh && \ + sed -i "/^cmake/ s/$/ -DENABLE_CLI=ON/" multilib.sh && \ + ./multilib.sh && \ + make -C 8bit install && \ + rm -rf ${DIR} +## libogg https://www.xiph.org/ogg/ +RUN \ + DIR=ogg && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO http://downloads.xiph.org/releases/ogg/libogg-${LIBOGG_VERSION}.tar.gz && \ + echo "${LIBOGG_SHA256SUM} libogg-${LIBOGG_VERSION}.tar.gz" | sha256sum --check && \ + tar -zx --strip-components=1 -f libogg-${LIBOGG_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +RUN \ + DIR=opus && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://archive.mozilla.org/pub/opus/opus-${LIBOPUS_VERSION}.tar.gz && \ + echo "${LIBOPUS_SHA256SUM} opus-${LIBOPUS_VERSION}.tar.gz"| sha256sum --check && \ + tar -zx --strip-components=1 -f opus-${LIBOPUS_VERSION}.tar.gz && \ + autoreconf -fiv && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +### libvorbis https://xiph.org/vorbis/ +RUN \ + DIR=vorbis && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO http://downloads.xiph.org/releases/vorbis/libvorbis-${LIBVORBIS_VERSION}.tar.gz && \ + echo "${LIBVORBIS_SHA256SUM} libvorbis-${LIBVORBIS_VERSION}.tar.gz" | sha256sum --check && \ + tar -zx --strip-components=1 -f libvorbis-${LIBVORBIS_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +### libtheora http://www.theora.org/ +RUN \ + DIR=theora && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO http://downloads.xiph.org/releases/theora/libtheora-${LIBTHEORA_VERSION}.tar.gz && \ + echo "${LIBTHEORA_SHA256SUM} libtheora-${LIBTHEORA_VERSION}.tar.gz" | sha256sum --check && \ + tar -zx --strip-components=1 -f libtheora-${LIBTHEORA_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +### libvpx https://www.webmproject.org/code/ +RUN \ + DIR=vpx && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://codeload.github.com/webmproject/libvpx/tar.gz/v${LIBVPX_VERSION} | \ + tar -zx --strip-components=1 && \ + ./configure --prefix="${PREFIX}" --enable-vp8 --enable-vp9 --enable-vp9-highbitdepth --enable-pic --enable-shared \ + --disable-debug --disable-examples --disable-docs && \ + make && \ + make install && \ + rm -rf ${DIR} + +### libmp3lame http://lame.sourceforge.net/ +RUN \ + DIR=lame && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://kent.dl.sourceforge.net/project/lame/lame/$(echo ${LIBMP3LAME_VERSION} | sed -e 's/[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)/\1.\2/')/lame-${LIBMP3LAME_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" --enable-shared --enable-nasm --enable-pic && \ + make && \ + make install && \ + rm -rf ${DIR} +### xvid https://www.xvid.com/ +RUN \ + DIR=xvid && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO http://downloads.xvid.org/downloads/xvidcore-${LIBXVID_VERSION}.tar.gz && \ + tar -zx -f xvidcore-${LIBXVID_VERSION}.tar.gz && \ + cd xvidcore/build/generic && \ + ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" --datadir="${DIR}" --enable-shared --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +### fdk-aac https://github.com/mstorsjo/fdk-aac +RUN \ + DIR=fdk-aac && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://github.com/mstorsjo/fdk-aac/archive/v${LIBFDK_AAC_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + autoreconf -fiv && \ + ./configure --prefix="${PREFIX}" --enable-shared --datadir="${DIR}" && \ + make && \ + make install && \ + rm -rf ${DIR} +## openjpeg https://github.com/uclouvain/openjpeg +RUN \ + DIR=openjpeg && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + if test `echo ${LIBOPENJPEG_VERSION} | tr -d '.'` -ge '210'; then \ + version_prefix='v'; \ + else \ + version_prefix='version.' ;\ + fi && \ + curl -sL https://github.com/uclouvain/openjpeg/archive/${version_prefix}${LIBOPENJPEG_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + cmake -DBUILD_THIRDPARTY:BOOL=ON -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ + make && \ + make install && \ + rm -rf ${DIR} +## freetype https://www.freetype.org/ +RUN \ + DIR=freetype && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://download.savannah.gnu.org/releases/freetype/freetype-${LIBFREETYPE_VERSION}.tar.gz && \ + tar -zx --strip-components=1 -f freetype-${LIBFREETYPE_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +## libvstab https://github.com/georgmartius/vid.stab +RUN \ + DIR=vid.stab && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/georgmartius/vid.stab/archive/v${LIBVIDSTAB_VERSION}.tar.gz &&\ + echo "${LIBVIDSTAB_SHA256SUM} v${LIBVIDSTAB_VERSION}.tar.gz" | sha256sum --check && \ + tar -zx --strip-components=1 -f v${LIBVIDSTAB_VERSION}.tar.gz && \ + cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ + make && \ + make install && \ + rm -rf ${DIR} +## fridibi https://www.fribidi.org/ +# + https://github.com/fribidi/fribidi/issues/8 +RUN \ + DIR=fribidi && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/fribidi/fribidi/archive/${LIBFRIBIDI_VERSION}.tar.gz && \ + echo "${LIBFRIBIDI_SHA256SUM} ${LIBFRIBIDI_VERSION}.tar.gz" | sha256sum --check && \ + tar -zx --strip-components=1 -f ${LIBFRIBIDI_VERSION}.tar.gz && \ + sed -i 's/^SUBDIRS =.*/SUBDIRS=gen.tab charset lib/' Makefile.am && \ + ./bootstrap --no-config && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ + make -j 1 && \ + make install && \ + rm -rf ${DIR} +## fontconfig https://www.freedesktop.org/wiki/Software/fontconfig/ +RUN \ + DIR=fontconfig && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://www.freedesktop.org/software/fontconfig/release/fontconfig-${LIBFONTCONFIG_VERSION}.tar.bz2 &&\ + tar -jx --strip-components=1 -f fontconfig-${LIBFONTCONFIG_VERSION}.tar.bz2 && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +## freetype https://www.freetype.org/ +RUN \ + DIR=freetype && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://download.savannah.gnu.org/releases/freetype/freetype-${LIBFREETYPE_VERSION}.tar.gz && \ + tar -zx --strip-components=1 -f freetype-${LIBFREETYPE_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +## fridibi https://www.fribidi.org/ +# + https://github.com/fribidi/fribidi/issues/8 +RUN \ + DIR=fribidi && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/fribidi/fribidi/archive/${LIBFRIBIDI_VERSION}.tar.gz && \ + echo "${LIBFRIBIDI_SHA256SUM} ${LIBFRIBIDI_VERSION}.tar.gz" | sha256sum --check && \ + tar -zx --strip-components=1 -f ${LIBFRIBIDI_VERSION}.tar.gz && \ + sed -i 's/^SUBDIRS =.*/SUBDIRS=gen.tab charset lib/' Makefile.am && \ + ./bootstrap --no-config && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ + make -j 1 && \ + make install && \ + rm -rf ${DIR} +## fontconfig https://www.freedesktop.org/wiki/Software/fontconfig/ +RUN \ + DIR=fontconfig && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://www.freedesktop.org/software/fontconfig/release/fontconfig-${LIBFONTCONFIG_VERSION}.tar.bz2 &&\ + tar -jx --strip-components=1 -f fontconfig-${LIBFONTCONFIG_VERSION}.tar.bz2 && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +RUN \ + DIR=libass && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/libass/libass/archive/${LIBASS_VERSION}.tar.gz &&\ + tar -zx --strip-components=1 -f ${LIBASS_VERSION}.tar.gz && \ + ./autogen.sh && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +## kvazaar https://github.com/ultravideo/kvazaar +RUN \ + DIR=kvazaar && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/ultravideo/kvazaar/archive/v${LIBKVAZAAR_VERSION}.tar.gz &&\ + tar -zx --strip-components=1 -f v${LIBKVAZAAR_VERSION}.tar.gz && \ + if [ -e ./autogen.sh ]; then \ + ./autogen.sh && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared ; \ + else \ + cd src ; \ + fi && \ + make && \ + make install && \ + rm -rf ${DIR} +RUN \ + DIR=aom && \ + git clone --branch v${LIBAOM_VERSION} --depth 1 https://aomedia.googlesource.com/aom ${DIR} ; \ + cd ${DIR} ; \ + rm -rf CMakeCache.txt CMakeFiles ; \ + mkdir -p ./aom_build ; \ + cd ./aom_build ; \ + cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" -DBUILD_SHARED_LIBS=1 ..; \ + make ; \ + make install ; \ + rm -rf ${DIR} + +RUN \ + DIR=nv-codec-headers && \ + git clone --branch n${NVENC_VERSION} --depth=1 https://git.videolan.org/git/ffmpeg/nv-codec-headers.git ${DIR} && \ + cd ${DIR} && \ + sed -i 's@/usr/local@'"$PREFIX"'@' Makefile && \ + make && \ + make install && \ + rm -rf ${DIR} +## dav1d https://code.videolan.org/videolan/dav1d +RUN \ + DIR=dav1d && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://code.videolan.org/videolan/dav1d/-/archive/${LIBDAV1D_VERSION}/dav1d-${LIBDAV1D_VERSION}.tar.gz && \ + tar -zx --strip-components=1 -f dav1d-${LIBDAV1D_VERSION}.tar.gz && \ + meson build --prefix ${PREFIX} --buildtype release && \ + ninja -C build install && \ + rm -rf ${DIR} +RUN \ + DIR=ffmpeg && mkdir -p ${DIR} && cd ${DIR} && \ + curl -sLO https://ffmpeg.org/releases/ffmpeg-${FFMPEG_VERSION}.tar.bz2 && \ + tar -jx --strip-components=1 -f ffmpeg-${FFMPEG_VERSION}.tar.bz2 && \ + ./configure \ + --disable-debug \ + --disable-doc \ + --disable-ffplay \ + --enable-shared \ + --enable-avresample \ + --enable-openssl \ + --enable-postproc \ + --enable-small \ + --extra-cflags="-I${PREFIX}/include -I/usr/local/include" \ + --extra-ldflags="-L${PREFIX}/lib -L/usr/local/lib" \ + --enable-libopencore-amrnb \ + --enable-libopencore-amrwb \ + --enable-version3 \ + --enable-libx264 \ + --enable-libx265 \ + --enable-libopus \ + --enable-libvorbis \ + --enable-libtheora \ + --enable-libvpx \ + --enable-libmp3lame \ + --enable-libxvid \ + --enable-libfdk_aac \ + --enable-nonfree \ + --enable-libopenjpeg \ + --enable-libfreetype \ + --enable-libvidstab \ + --enable-gpl \ + --enable-libass \ + --enable-libkvazaar \ + --enable-libaom \ + --extra-libs=-lpthread \ + --enable-vaapi \ + --enable-cuda \ + --enable-nvenc \ + --enable-cuvid \ + --enable-libdav1d \ + --prefix="${PREFIX}" && \ + make && \ + make install && \ + make distclean && \ + hash -r && \ + cd tools && \ + make qt-faststart && \ + cp qt-faststart ${PREFIX}/bin + +RUN \ + if false; then \ + LD_LIBRARY_PATH=${PREFIX}/lib ldd ${PREFIX}/bin/* | \ + cut -d ' ' -f 3 | \ + strings | \ + xargs -i cp {} /usr/local/lib/ && \ + cp ${PREFIX}/bin/ff* /usr/local/bin/ ; \ + else \ + LD_LIBRARY_PATH=${PREFIX}/lib ldd ${PREFIX}/bin/ffmpeg | \ + cut -d ' ' -f 3 | \ + strings | \ + xargs -i cp {} /usr/local/lib/ && \ + cp ${PREFIX}/bin/ff* /usr/local/bin/ ; \ + fi && \ + if true; then \ + for lib in /usr/local/lib/*.so* /usr/local/bin/*; do strip --strip-all $lib; done ; \ + fi && \ + LD_LIBRARY_PATH=/usr/local/lib ffmpeg -buildconf + + +FROM scratch AS release +MAINTAINER Julien Rottenberg + +CMD ["--help"] +ENTRYPOINT ["/bin/ffmpeg"] + +COPY --from=build /usr/local / +RUN test "scratch" = "base" && ldconfig /usr/local/lib /usr/local/lib64 + +# Let's make sure the app built correctly +# Convenient to verify on https://hub.docker.com/r/jrottenberg/ffmpeg/builds/ console output diff --git a/docker-images/snapshot/centos/Dockerfile b/docker-images/snapshot/centos/Dockerfile index 808164186..c67313f7a 100644 --- a/docker-images/snapshot/centos/Dockerfile +++ b/docker-images/snapshot/centos/Dockerfile @@ -1,3 +1,4 @@ +<<<<<<< HEAD # ffmpeg - http://ffmpeg.org/download.html # # From https://trac.ffmpeg.org/wiki/CompilationGuide/Centos @@ -387,4 +388,492 @@ ENV LD_LIBRARY_PATH=/usr/local/lib64 COPY --from=build /usr/local/ /usr/local/ # Let's make sure the app built correctly -# Convenient to verify on https://hub.docker.com/r/jrottenberg/ffmpeg/builds/ console output \ No newline at end of file +# Convenient to verify on https://hub.docker.com/r/jrottenberg/ffmpeg/builds/ console output +======= +FROM centos:7 as base + +RUN yum -y install libva libgomp libuuid && \ + echo "/usr/local/lib" > /etc/ld.so.conf.d/local.conf && \ + echo "/usr/local/lib64" >> /etc/ld.so.conf.d/local.conf + +FROM base as build + +WORKDIR /tmp/workdir + +ARG PREFIX=/tmp/build +ARG MAKEFLAGS=-j6 +ARG PKG_CONFIG_PATH=/tmp/build/lib/pkgconfig:/tmp/build/lib64/pkgconfig + +RUN yum --enablerepo=extras install -y epel-release && \ + yum install -y \ + libva-devel \ + autoconf \ + automake \ + bzip2 \ + cmake \ + expat-devel \ + gcc \ + gcc-c++ \ + git \ + gperf \ + libtool \ + make \ + nasm \ + perl \ + openssl-devel \ + tar \ + yasm \ + which \ + zlib-devel \ + libuuid-devel \ + libcurl-devel \ + xz-devel \ + libarchive-devel \ + python36 \ + python36-pip + +#Centos is missing recent version of CMake (>= 3.5) +RUN \ + DIR=/tmp/cmake && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://cmake.org/files/v3.5/cmake-3.5.2.tar.gz | \ + tar -zx --strip-components=1 && \ + ./bootstrap --system-libs --no-system-jsoncpp && \ + make && \ + make install && \ + rm -rf ${DIR} + +#Centos is missing recent version of nasm (>= 2.13) +RUN \ + DIR=/tmp/nasm && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://www.nasm.us/pub/nasm/releasebuilds/2.13.03/nasm-2.13.03.tar.gz | \ + tar -zx --strip-components=1 && \ + ./configure --prefix="/usr" && \ + make && \ + make install && \ + rm -rf ${DIR} + +#Centos is missing ninja +RUN \ + DIR=/tmp/ninja && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://github.com/ninja-build/ninja/archive/v1.9.0.tar.gz | \ + tar -zx --strip-components=1 && \ + python configure.py --bootstrap && \ + cp ./ninja /usr/bin/ && \ + rm -rf ${DIR} + +RUN \ + DIR=/tmp/meson && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + pip3 install meson && \ + rm -rf ${DIR} + +ARG FFMPEG_VERSION=snapshot +ARG LIBOPENCORE_AMR_VERSION=0.1.5 +ARG LIBX264_VERSION=20190526-2245-stable +ARG LIBX265_VERSION=3.0 +ARG LIBOGG_VERSION=1.3.3 +ARG LIBOPUS_VERSION=1.3.1 +ARG LIBVORBIS_VERSION=1.3.6 +ARG LIBTHEORA_VERSION=1.1.1 +ARG LIBVPX_VERSION=1.8.0 +ARG LIBMP3LAME_VERSION=3.100 +ARG LIBXVID_VERSION=1.3.5 +ARG LIBFDK_AAC_VERSION=2.0.0 +ARG LIBOPENJPEG_VERSION=2.3.1 +ARG LIBFREETYPE_VERSION=2.10.0 +ARG LIBVIDSTAB_VERSION=1.1.0 +ARG LIBFRIBIDI_VERSION=0.19.7 +ARG LIBFONTCONFIG_VERSION=2.13.1 +ARG LIBFREETYPE_VERSION=2.10.0 +ARG LIBFRIBIDI_VERSION=0.19.7 +ARG LIBFONTCONFIG_VERSION=2.13.1 +ARG LIBASS_VERSION=0.14.0 +ARG LIBKVAZAAR_VERSION=1.2.0 +ARG LIBAOM_VERSION=1.0.0-errata1 +ARG NVENC_VERSION=9.0.18.1 +ARG LIBDAV1D_VERSION=0.3.1 + +ARG LIBOGG_SHA256SUM=c2e8a485110b97550f453226ec644ebac6cb29d1caef2902c007edab4308d985 +ARG LIBOPUS_SHA256SUM=65b58e1e25b2a114157014736a3d9dfeaad8d41be1c8179866f144a2fb44ff9d +ARG LIBVORBIS_SHA256SUM=6ed40e0241089a42c48604dc00e362beee00036af2d8b3f46338031c9e0351cb +ARG LIBTHEORA_SHA256SUM=40952956c47811928d1e7922cda3bc1f427eb75680c3c37249c91e949054916b +ARG LIBVIDSTAB_SHA256SUM=14d2a053e56edad4f397be0cb3ef8eb1ec3150404ce99a426c4eb641861dc0bb +ARG LIBFRIBIDI_SHA256SUM=3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 +ARG LIBFRIBIDI_SHA256SUM=3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 + +## opencore-amr https://sourceforge.net/projects/opencore-amr/ +RUN \ + DIR=opencore-amr && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://kent.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${LIBOPENCORE_AMR_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +## x264 http://www.videolan.org/developers/x264.html +RUN \ + DIR=x264 && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://download.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-${LIBX264_VERSION}.tar.bz2 | \ + tar -jx --strip-components=1 && \ + ./configure --prefix="${PREFIX}" --enable-shared --enable-pic && \ + make && \ + make install && \ + rm -rf ${DIR} +### x265 http://x265.org/ +RUN \ + DIR=x265 && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://download.videolan.org/pub/videolan/x265/x265_${LIBX265_VERSION}.tar.gz | \ + tar -zx && \ + cd x265_${LIBX265_VERSION}/build/linux && \ + sed -i "/-DEXTRA_LIB/ s/$/ -DCMAKE_INSTALL_PREFIX=\${PREFIX}/" multilib.sh && \ + sed -i "/^cmake/ s/$/ -DENABLE_CLI=ON/" multilib.sh && \ + ./multilib.sh && \ + make -C 8bit install && \ + rm -rf ${DIR} +## libogg https://www.xiph.org/ogg/ +RUN \ + DIR=ogg && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO http://downloads.xiph.org/releases/ogg/libogg-${LIBOGG_VERSION}.tar.gz && \ + echo "${LIBOGG_SHA256SUM} libogg-${LIBOGG_VERSION}.tar.gz" | sha256sum --check && \ + tar -zx --strip-components=1 -f libogg-${LIBOGG_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +RUN \ + DIR=opus && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://archive.mozilla.org/pub/opus/opus-${LIBOPUS_VERSION}.tar.gz && \ + echo "${LIBOPUS_SHA256SUM} opus-${LIBOPUS_VERSION}.tar.gz"| sha256sum --check && \ + tar -zx --strip-components=1 -f opus-${LIBOPUS_VERSION}.tar.gz && \ + autoreconf -fiv && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +### libvorbis https://xiph.org/vorbis/ +RUN \ + DIR=vorbis && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO http://downloads.xiph.org/releases/vorbis/libvorbis-${LIBVORBIS_VERSION}.tar.gz && \ + echo "${LIBVORBIS_SHA256SUM} libvorbis-${LIBVORBIS_VERSION}.tar.gz" | sha256sum --check && \ + tar -zx --strip-components=1 -f libvorbis-${LIBVORBIS_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +### libtheora http://www.theora.org/ +RUN \ + DIR=theora && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO http://downloads.xiph.org/releases/theora/libtheora-${LIBTHEORA_VERSION}.tar.gz && \ + echo "${LIBTHEORA_SHA256SUM} libtheora-${LIBTHEORA_VERSION}.tar.gz" | sha256sum --check && \ + tar -zx --strip-components=1 -f libtheora-${LIBTHEORA_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +### libvpx https://www.webmproject.org/code/ +RUN \ + DIR=vpx && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://codeload.github.com/webmproject/libvpx/tar.gz/v${LIBVPX_VERSION} | \ + tar -zx --strip-components=1 && \ + ./configure --prefix="${PREFIX}" --enable-vp8 --enable-vp9 --enable-vp9-highbitdepth --enable-pic --enable-shared \ + --disable-debug --disable-examples --disable-docs && \ + make && \ + make install && \ + rm -rf ${DIR} + +### libmp3lame http://lame.sourceforge.net/ +RUN \ + DIR=lame && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://kent.dl.sourceforge.net/project/lame/lame/$(echo ${LIBMP3LAME_VERSION} | sed -e 's/[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)/\1.\2/')/lame-${LIBMP3LAME_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" --enable-shared --enable-nasm --enable-pic && \ + make && \ + make install && \ + rm -rf ${DIR} +### xvid https://www.xvid.com/ +RUN \ + DIR=xvid && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO http://downloads.xvid.org/downloads/xvidcore-${LIBXVID_VERSION}.tar.gz && \ + tar -zx -f xvidcore-${LIBXVID_VERSION}.tar.gz && \ + cd xvidcore/build/generic && \ + ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" --datadir="${DIR}" --enable-shared --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +### fdk-aac https://github.com/mstorsjo/fdk-aac +RUN \ + DIR=fdk-aac && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://github.com/mstorsjo/fdk-aac/archive/v${LIBFDK_AAC_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + autoreconf -fiv && \ + ./configure --prefix="${PREFIX}" --enable-shared --datadir="${DIR}" && \ + make && \ + make install && \ + rm -rf ${DIR} +## openjpeg https://github.com/uclouvain/openjpeg +RUN \ + DIR=openjpeg && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + if test `echo ${LIBOPENJPEG_VERSION} | tr -d '.'` -ge '210'; then \ + version_prefix='v'; \ + else \ + version_prefix='version.' ;\ + fi && \ + curl -sL https://github.com/uclouvain/openjpeg/archive/${version_prefix}${LIBOPENJPEG_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + cmake -DBUILD_THIRDPARTY:BOOL=ON -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ + make && \ + make install && \ + rm -rf ${DIR} +## freetype https://www.freetype.org/ +RUN \ + DIR=freetype && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://download.savannah.gnu.org/releases/freetype/freetype-${LIBFREETYPE_VERSION}.tar.gz && \ + tar -zx --strip-components=1 -f freetype-${LIBFREETYPE_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +## libvstab https://github.com/georgmartius/vid.stab +RUN \ + DIR=vid.stab && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/georgmartius/vid.stab/archive/v${LIBVIDSTAB_VERSION}.tar.gz &&\ + echo "${LIBVIDSTAB_SHA256SUM} v${LIBVIDSTAB_VERSION}.tar.gz" | sha256sum --check && \ + tar -zx --strip-components=1 -f v${LIBVIDSTAB_VERSION}.tar.gz && \ + cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ + make && \ + make install && \ + rm -rf ${DIR} +## fridibi https://www.fribidi.org/ +# + https://github.com/fribidi/fribidi/issues/8 +RUN \ + DIR=fribidi && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/fribidi/fribidi/archive/${LIBFRIBIDI_VERSION}.tar.gz && \ + echo "${LIBFRIBIDI_SHA256SUM} ${LIBFRIBIDI_VERSION}.tar.gz" | sha256sum --check && \ + tar -zx --strip-components=1 -f ${LIBFRIBIDI_VERSION}.tar.gz && \ + sed -i 's/^SUBDIRS =.*/SUBDIRS=gen.tab charset lib/' Makefile.am && \ + ./bootstrap --no-config && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ + make -j 1 && \ + make install && \ + rm -rf ${DIR} +## fontconfig https://www.freedesktop.org/wiki/Software/fontconfig/ +RUN \ + DIR=fontconfig && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://www.freedesktop.org/software/fontconfig/release/fontconfig-${LIBFONTCONFIG_VERSION}.tar.bz2 &&\ + tar -jx --strip-components=1 -f fontconfig-${LIBFONTCONFIG_VERSION}.tar.bz2 && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +## freetype https://www.freetype.org/ +RUN \ + DIR=freetype && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://download.savannah.gnu.org/releases/freetype/freetype-${LIBFREETYPE_VERSION}.tar.gz && \ + tar -zx --strip-components=1 -f freetype-${LIBFREETYPE_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +## fridibi https://www.fribidi.org/ +# + https://github.com/fribidi/fribidi/issues/8 +RUN \ + DIR=fribidi && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/fribidi/fribidi/archive/${LIBFRIBIDI_VERSION}.tar.gz && \ + echo "${LIBFRIBIDI_SHA256SUM} ${LIBFRIBIDI_VERSION}.tar.gz" | sha256sum --check && \ + tar -zx --strip-components=1 -f ${LIBFRIBIDI_VERSION}.tar.gz && \ + sed -i 's/^SUBDIRS =.*/SUBDIRS=gen.tab charset lib/' Makefile.am && \ + ./bootstrap --no-config && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ + make -j 1 && \ + make install && \ + rm -rf ${DIR} +## fontconfig https://www.freedesktop.org/wiki/Software/fontconfig/ +RUN \ + DIR=fontconfig && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://www.freedesktop.org/software/fontconfig/release/fontconfig-${LIBFONTCONFIG_VERSION}.tar.bz2 &&\ + tar -jx --strip-components=1 -f fontconfig-${LIBFONTCONFIG_VERSION}.tar.bz2 && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +RUN \ + DIR=libass && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/libass/libass/archive/${LIBASS_VERSION}.tar.gz &&\ + tar -zx --strip-components=1 -f ${LIBASS_VERSION}.tar.gz && \ + ./autogen.sh && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +## kvazaar https://github.com/ultravideo/kvazaar +RUN \ + DIR=kvazaar && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/ultravideo/kvazaar/archive/v${LIBKVAZAAR_VERSION}.tar.gz &&\ + tar -zx --strip-components=1 -f v${LIBKVAZAAR_VERSION}.tar.gz && \ + if [ -e ./autogen.sh ]; then \ + ./autogen.sh && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared ; \ + else \ + cd src ; \ + fi && \ + make && \ + make install && \ + rm -rf ${DIR} +RUN \ + DIR=aom && \ + git clone --branch v${LIBAOM_VERSION} --depth 1 https://aomedia.googlesource.com/aom ${DIR} ; \ + cd ${DIR} ; \ + rm -rf CMakeCache.txt CMakeFiles ; \ + mkdir -p ./aom_build ; \ + cd ./aom_build ; \ + cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" -DBUILD_SHARED_LIBS=1 ..; \ + make ; \ + make install ; \ + rm -rf ${DIR} + +RUN \ + DIR=nv-codec-headers && \ + git clone --branch n${NVENC_VERSION} --depth=1 https://git.videolan.org/git/ffmpeg/nv-codec-headers.git ${DIR} && \ + cd ${DIR} && \ + sed -i 's@/usr/local@'"$PREFIX"'@' Makefile && \ + make && \ + make install && \ + rm -rf ${DIR} +## dav1d https://code.videolan.org/videolan/dav1d +RUN \ + DIR=dav1d && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://code.videolan.org/videolan/dav1d/-/archive/${LIBDAV1D_VERSION}/dav1d-${LIBDAV1D_VERSION}.tar.gz && \ + tar -zx --strip-components=1 -f dav1d-${LIBDAV1D_VERSION}.tar.gz && \ + meson build --prefix ${PREFIX} --buildtype release && \ + ninja -C build install && \ + rm -rf ${DIR} +RUN \ + DIR=ffmpeg && mkdir -p ${DIR} && cd ${DIR} && \ + curl -sLO https://ffmpeg.org/releases/ffmpeg-${FFMPEG_VERSION}.tar.bz2 && \ + tar -jx --strip-components=1 -f ffmpeg-${FFMPEG_VERSION}.tar.bz2 && \ + ./configure \ + --disable-debug \ + --disable-doc \ + --disable-ffplay \ + --enable-shared \ + --enable-avresample \ + --enable-openssl \ + --enable-postproc \ + --enable-small \ + --extra-cflags="-I${PREFIX}/include -I/usr/local/include" \ + --extra-ldflags="-L${PREFIX}/lib -L/usr/local/lib" \ + --enable-libopencore-amrnb \ + --enable-libopencore-amrwb \ + --enable-version3 \ + --enable-libx264 \ + --enable-libx265 \ + --enable-libopus \ + --enable-libvorbis \ + --enable-libtheora \ + --enable-libvpx \ + --enable-libmp3lame \ + --enable-libxvid \ + --enable-libfdk_aac \ + --enable-nonfree \ + --enable-libopenjpeg \ + --enable-libfreetype \ + --enable-libvidstab \ + --enable-gpl \ + --enable-libass \ + --enable-libkvazaar \ + --enable-libaom \ + --extra-libs=-lpthread \ + --enable-vaapi \ + --enable-cuda \ + --enable-nvenc \ + --enable-cuvid \ + --enable-libdav1d \ + --prefix="${PREFIX}" && \ + make && \ + make install && \ + make distclean && \ + hash -r && \ + cd tools && \ + make qt-faststart && \ + cp qt-faststart ${PREFIX}/bin + +RUN \ + if false; then \ + cp -r ${PREFIX}/lib/*so* /usr/local/lib/ && \ + cp ${PREFIX}/bin/* /usr/local/bin/ ; \ + else \ + LD_LIBRARY_PATH=${PREFIX}/lib ldd ${PREFIX}/bin/ffmpeg | \ + grep ${PREFIX} | \ + cut -d ' ' -f 3 | \ + xargs -i cp {} /usr/local/lib/ && \ + cp ${PREFIX}/bin/ff* /usr/local/bin/ ; \ + fi && \ + if true; then \ + for lib in /usr/local/lib/*.so* /usr/local/bin/*; do strip --strip-all $lib; done ; \ + fi && \ + cp -r ${PREFIX}/share/ffmpeg /usr/local/share/ && \ + LD_LIBRARY_PATH=/usr/local/lib ffmpeg -buildconf + +FROM base AS release +MAINTAINER Julien Rottenberg + +CMD ["--help"] +ENTRYPOINT ["ffmpeg"] + +COPY --from=build /usr/local /usr/local +RUN test "base" = "base" && ldconfig /usr/local/lib /usr/local/lib64 + +# Let's make sure the app built correctly +# Convenient to verify on https://hub.docker.com/r/jrottenberg/ffmpeg/builds/ console output +>>>>>>> rewrite the dockerfile generation + vdapu + armv7 + dav1d diff --git a/docker-images/snapshot/nvidia,/Dockerfile b/docker-images/snapshot/nvidia,/Dockerfile new file mode 100644 index 000000000..452b62c02 --- /dev/null +++ b/docker-images/snapshot/nvidia,/Dockerfile @@ -0,0 +1,14 @@ +usage: update.py [-h] [--enable-libopencore-amr] [--enable-libx264] + [--enable-libx265] [--enable-libogg] [--enable-libopus] + [--enable-libvorbis] [--enable-libtheora] [--enable-libvpx] + [--enable-libmp3lame] [--enable-libxvid] + [--enable-libfdk-aac] [--enable-libopenjpeg] + [--enable-libfreetype] [--enable-libvidstab] + [--enable-libfribidi] [--enable-libfontconfig] + [--enable-libass] [--enable-libkvazaar] [--enable-libaom] + [--enable-vaapi] [--enable-nvenc] [--enable-libdav1d] + [--enable-vdpau] [--enable-all] [--with-bins] [--no-strip] + [--fat | --slim | --scratch] + {alpine,centos,ubuntu,nvidia,armv7} + {snapshot,4.1,4.0,3.4,3.3,3.2,2.8} +update.py: error: argument variant: invalid choice: 'nvidia,' (choose from 'alpine', 'centos', 'ubuntu', 'nvidia', 'armv7') diff --git a/docker-images/snapshot/ubuntu/Dockerfile b/docker-images/snapshot/ubuntu/Dockerfile index 0f34da5b7..f5b129474 100644 --- a/docker-images/snapshot/ubuntu/Dockerfile +++ b/docker-images/snapshot/ubuntu/Dockerfile @@ -1,3 +1,4 @@ +<<<<<<< HEAD # ffmpeg - http://ffmpeg.org/download.html # # From https://trac.ffmpeg.org/wiki/CompilationGuide/Ubuntu @@ -389,3 +390,448 @@ COPY --from=build /usr/local /usr/local/ # Let's make sure the app built correctly # Convenient to verify on https://hub.docker.com/r/jrottenberg/ffmpeg/builds/ console output +======= +FROM ubuntu:18.04 AS base + +RUN apt-get -yqq update && \ + apt-get install -yq --no-install-recommends libva2 libva-drm2 i965-va-driver ca-certificates expat libgomp1 libuuid1 libssl1.0 && \ + apt-get autoremove -y && \ + apt-get clean -y + +FROM base as build + +WORKDIR /tmp/workdir + +ARG PREFIX=/tmp/build +ARG MAKEFLAGS=-j6 +ARG PKG_CONFIG_PATH=/tmp/build/lib/pkgconfig + +RUN apt-get -yqq update && \ + apt-get install -yq --no-install-recommends \ + libva-dev \ + autoconf \ + automake \ + cmake \ + curl \ + bzip2 \ + libexpat1-dev \ + g++ \ + gcc \ + git \ + gperf \ + libtool \ + make \ + nasm \ + perl \ + pkg-config \ + python \ + libssl1.0-dev \ + yasm \ + zlib1g-dev \ + uuid-dev \ + ninja-build \ + meson + +ARG FFMPEG_VERSION=snapshot +ARG LIBOPENCORE_AMR_VERSION=0.1.5 +ARG LIBX264_VERSION=20190526-2245-stable +ARG LIBX265_VERSION=3.0 +ARG LIBOGG_VERSION=1.3.3 +ARG LIBOPUS_VERSION=1.3.1 +ARG LIBVORBIS_VERSION=1.3.6 +ARG LIBTHEORA_VERSION=1.1.1 +ARG LIBVPX_VERSION=1.8.0 +ARG LIBMP3LAME_VERSION=3.100 +ARG LIBXVID_VERSION=1.3.5 +ARG LIBFDK_AAC_VERSION=2.0.0 +ARG LIBOPENJPEG_VERSION=2.3.1 +ARG LIBFREETYPE_VERSION=2.10.0 +ARG LIBVIDSTAB_VERSION=1.1.0 +ARG LIBFRIBIDI_VERSION=0.19.7 +ARG LIBFONTCONFIG_VERSION=2.13.1 +ARG LIBFREETYPE_VERSION=2.10.0 +ARG LIBFRIBIDI_VERSION=0.19.7 +ARG LIBFONTCONFIG_VERSION=2.13.1 +ARG LIBASS_VERSION=0.14.0 +ARG LIBKVAZAAR_VERSION=1.2.0 +ARG LIBAOM_VERSION=1.0.0-errata1 +ARG NVENC_VERSION=9.0.18.1 +ARG LIBDAV1D_VERSION=0.3.1 + +ARG LIBOGG_SHA256SUM=c2e8a485110b97550f453226ec644ebac6cb29d1caef2902c007edab4308d985 +ARG LIBOPUS_SHA256SUM=65b58e1e25b2a114157014736a3d9dfeaad8d41be1c8179866f144a2fb44ff9d +ARG LIBVORBIS_SHA256SUM=6ed40e0241089a42c48604dc00e362beee00036af2d8b3f46338031c9e0351cb +ARG LIBTHEORA_SHA256SUM=40952956c47811928d1e7922cda3bc1f427eb75680c3c37249c91e949054916b +ARG LIBVIDSTAB_SHA256SUM=14d2a053e56edad4f397be0cb3ef8eb1ec3150404ce99a426c4eb641861dc0bb +ARG LIBFRIBIDI_SHA256SUM=3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 +ARG LIBFRIBIDI_SHA256SUM=3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 + +## opencore-amr https://sourceforge.net/projects/opencore-amr/ +RUN \ + DIR=opencore-amr && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://kent.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${LIBOPENCORE_AMR_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +## x264 http://www.videolan.org/developers/x264.html +RUN \ + DIR=x264 && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://download.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-${LIBX264_VERSION}.tar.bz2 | \ + tar -jx --strip-components=1 && \ + ./configure --prefix="${PREFIX}" --enable-shared --enable-pic && \ + make && \ + make install && \ + rm -rf ${DIR} +### x265 http://x265.org/ +RUN \ + DIR=x265 && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://download.videolan.org/pub/videolan/x265/x265_${LIBX265_VERSION}.tar.gz | \ + tar -zx && \ + cd x265_${LIBX265_VERSION}/build/linux && \ + sed -i "/-DEXTRA_LIB/ s/$/ -DCMAKE_INSTALL_PREFIX=\${PREFIX}/" multilib.sh && \ + sed -i "/^cmake/ s/$/ -DENABLE_CLI=ON/" multilib.sh && \ + ./multilib.sh && \ + make -C 8bit install && \ + rm -rf ${DIR} +## libogg https://www.xiph.org/ogg/ +RUN \ + DIR=ogg && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO http://downloads.xiph.org/releases/ogg/libogg-${LIBOGG_VERSION}.tar.gz && \ + echo "${LIBOGG_SHA256SUM} libogg-${LIBOGG_VERSION}.tar.gz" | sha256sum --check && \ + tar -zx --strip-components=1 -f libogg-${LIBOGG_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +RUN \ + DIR=opus && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://archive.mozilla.org/pub/opus/opus-${LIBOPUS_VERSION}.tar.gz && \ + echo "${LIBOPUS_SHA256SUM} opus-${LIBOPUS_VERSION}.tar.gz"| sha256sum --check && \ + tar -zx --strip-components=1 -f opus-${LIBOPUS_VERSION}.tar.gz && \ + autoreconf -fiv && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +### libvorbis https://xiph.org/vorbis/ +RUN \ + DIR=vorbis && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO http://downloads.xiph.org/releases/vorbis/libvorbis-${LIBVORBIS_VERSION}.tar.gz && \ + echo "${LIBVORBIS_SHA256SUM} libvorbis-${LIBVORBIS_VERSION}.tar.gz" | sha256sum --check && \ + tar -zx --strip-components=1 -f libvorbis-${LIBVORBIS_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +### libtheora http://www.theora.org/ +RUN \ + DIR=theora && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO http://downloads.xiph.org/releases/theora/libtheora-${LIBTHEORA_VERSION}.tar.gz && \ + echo "${LIBTHEORA_SHA256SUM} libtheora-${LIBTHEORA_VERSION}.tar.gz" | sha256sum --check && \ + tar -zx --strip-components=1 -f libtheora-${LIBTHEORA_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +### libvpx https://www.webmproject.org/code/ +RUN \ + DIR=vpx && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://codeload.github.com/webmproject/libvpx/tar.gz/v${LIBVPX_VERSION} | \ + tar -zx --strip-components=1 && \ + ./configure --prefix="${PREFIX}" --enable-vp8 --enable-vp9 --enable-vp9-highbitdepth --enable-pic --enable-shared \ + --disable-debug --disable-examples --disable-docs && \ + make && \ + make install && \ + rm -rf ${DIR} + +### libmp3lame http://lame.sourceforge.net/ +RUN \ + DIR=lame && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://kent.dl.sourceforge.net/project/lame/lame/$(echo ${LIBMP3LAME_VERSION} | sed -e 's/[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)/\1.\2/')/lame-${LIBMP3LAME_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" --enable-shared --enable-nasm --enable-pic && \ + make && \ + make install && \ + rm -rf ${DIR} +### xvid https://www.xvid.com/ +RUN \ + DIR=xvid && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO http://downloads.xvid.org/downloads/xvidcore-${LIBXVID_VERSION}.tar.gz && \ + tar -zx -f xvidcore-${LIBXVID_VERSION}.tar.gz && \ + cd xvidcore/build/generic && \ + ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" --datadir="${DIR}" --enable-shared --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +### fdk-aac https://github.com/mstorsjo/fdk-aac +RUN \ + DIR=fdk-aac && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://github.com/mstorsjo/fdk-aac/archive/v${LIBFDK_AAC_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + autoreconf -fiv && \ + ./configure --prefix="${PREFIX}" --enable-shared --datadir="${DIR}" && \ + make && \ + make install && \ + rm -rf ${DIR} +## openjpeg https://github.com/uclouvain/openjpeg +RUN \ + DIR=openjpeg && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + if test `echo ${LIBOPENJPEG_VERSION} | tr -d '.'` -ge '210'; then \ + version_prefix='v'; \ + else \ + version_prefix='version.' ;\ + fi && \ + curl -sL https://github.com/uclouvain/openjpeg/archive/${version_prefix}${LIBOPENJPEG_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + cmake -DBUILD_THIRDPARTY:BOOL=ON -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ + make && \ + make install && \ + rm -rf ${DIR} +## freetype https://www.freetype.org/ +RUN \ + DIR=freetype && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://download.savannah.gnu.org/releases/freetype/freetype-${LIBFREETYPE_VERSION}.tar.gz && \ + tar -zx --strip-components=1 -f freetype-${LIBFREETYPE_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +## libvstab https://github.com/georgmartius/vid.stab +RUN \ + DIR=vid.stab && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/georgmartius/vid.stab/archive/v${LIBVIDSTAB_VERSION}.tar.gz &&\ + echo "${LIBVIDSTAB_SHA256SUM} v${LIBVIDSTAB_VERSION}.tar.gz" | sha256sum --check && \ + tar -zx --strip-components=1 -f v${LIBVIDSTAB_VERSION}.tar.gz && \ + cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ + make && \ + make install && \ + rm -rf ${DIR} +## fridibi https://www.fribidi.org/ +# + https://github.com/fribidi/fribidi/issues/8 +RUN \ + DIR=fribidi && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/fribidi/fribidi/archive/${LIBFRIBIDI_VERSION}.tar.gz && \ + echo "${LIBFRIBIDI_SHA256SUM} ${LIBFRIBIDI_VERSION}.tar.gz" | sha256sum --check && \ + tar -zx --strip-components=1 -f ${LIBFRIBIDI_VERSION}.tar.gz && \ + sed -i 's/^SUBDIRS =.*/SUBDIRS=gen.tab charset lib/' Makefile.am && \ + ./bootstrap --no-config && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ + make -j 1 && \ + make install && \ + rm -rf ${DIR} +## fontconfig https://www.freedesktop.org/wiki/Software/fontconfig/ +RUN \ + DIR=fontconfig && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://www.freedesktop.org/software/fontconfig/release/fontconfig-${LIBFONTCONFIG_VERSION}.tar.bz2 &&\ + tar -jx --strip-components=1 -f fontconfig-${LIBFONTCONFIG_VERSION}.tar.bz2 && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +## freetype https://www.freetype.org/ +RUN \ + DIR=freetype && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://download.savannah.gnu.org/releases/freetype/freetype-${LIBFREETYPE_VERSION}.tar.gz && \ + tar -zx --strip-components=1 -f freetype-${LIBFREETYPE_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +## fridibi https://www.fribidi.org/ +# + https://github.com/fribidi/fribidi/issues/8 +RUN \ + DIR=fribidi && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/fribidi/fribidi/archive/${LIBFRIBIDI_VERSION}.tar.gz && \ + echo "${LIBFRIBIDI_SHA256SUM} ${LIBFRIBIDI_VERSION}.tar.gz" | sha256sum --check && \ + tar -zx --strip-components=1 -f ${LIBFRIBIDI_VERSION}.tar.gz && \ + sed -i 's/^SUBDIRS =.*/SUBDIRS=gen.tab charset lib/' Makefile.am && \ + ./bootstrap --no-config && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ + make -j 1 && \ + make install && \ + rm -rf ${DIR} +## fontconfig https://www.freedesktop.org/wiki/Software/fontconfig/ +RUN \ + DIR=fontconfig && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://www.freedesktop.org/software/fontconfig/release/fontconfig-${LIBFONTCONFIG_VERSION}.tar.bz2 &&\ + tar -jx --strip-components=1 -f fontconfig-${LIBFONTCONFIG_VERSION}.tar.bz2 && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +RUN \ + DIR=libass && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/libass/libass/archive/${LIBASS_VERSION}.tar.gz &&\ + tar -zx --strip-components=1 -f ${LIBASS_VERSION}.tar.gz && \ + ./autogen.sh && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +## kvazaar https://github.com/ultravideo/kvazaar +RUN \ + DIR=kvazaar && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/ultravideo/kvazaar/archive/v${LIBKVAZAAR_VERSION}.tar.gz &&\ + tar -zx --strip-components=1 -f v${LIBKVAZAAR_VERSION}.tar.gz && \ + if [ -e ./autogen.sh ]; then \ + ./autogen.sh && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared ; \ + else \ + cd src ; \ + fi && \ + make && \ + make install && \ + rm -rf ${DIR} +RUN \ + DIR=aom && \ + git clone --branch v${LIBAOM_VERSION} --depth 1 https://aomedia.googlesource.com/aom ${DIR} ; \ + cd ${DIR} ; \ + rm -rf CMakeCache.txt CMakeFiles ; \ + mkdir -p ./aom_build ; \ + cd ./aom_build ; \ + cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" -DBUILD_SHARED_LIBS=1 ..; \ + make ; \ + make install ; \ + rm -rf ${DIR} + +RUN \ + DIR=nv-codec-headers && \ + git clone --branch n${NVENC_VERSION} --depth=1 https://git.videolan.org/git/ffmpeg/nv-codec-headers.git ${DIR} && \ + cd ${DIR} && \ + sed -i 's@/usr/local@'"$PREFIX"'@' Makefile && \ + make && \ + make install && \ + rm -rf ${DIR} +## dav1d https://code.videolan.org/videolan/dav1d +RUN \ + DIR=dav1d && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://code.videolan.org/videolan/dav1d/-/archive/${LIBDAV1D_VERSION}/dav1d-${LIBDAV1D_VERSION}.tar.gz && \ + tar -zx --strip-components=1 -f dav1d-${LIBDAV1D_VERSION}.tar.gz && \ + meson build --prefix ${PREFIX} --buildtype release && \ + ninja -C build install && \ + rm -rf ${DIR} +RUN \ + DIR=ffmpeg && mkdir -p ${DIR} && cd ${DIR} && \ + curl -sLO https://ffmpeg.org/releases/ffmpeg-${FFMPEG_VERSION}.tar.bz2 && \ + tar -jx --strip-components=1 -f ffmpeg-${FFMPEG_VERSION}.tar.bz2 && \ + ./configure \ + --disable-debug \ + --disable-doc \ + --disable-ffplay \ + --enable-shared \ + --enable-avresample \ + --enable-openssl \ + --enable-postproc \ + --enable-small \ + --extra-cflags="-I${PREFIX}/include -I/usr/local/include" \ + --extra-ldflags="-L${PREFIX}/lib -L/usr/local/lib" \ + --enable-libopencore-amrnb \ + --enable-libopencore-amrwb \ + --enable-version3 \ + --enable-libx264 \ + --enable-libx265 \ + --enable-libopus \ + --enable-libvorbis \ + --enable-libtheora \ + --enable-libvpx \ + --enable-libmp3lame \ + --enable-libxvid \ + --enable-libfdk_aac \ + --enable-nonfree \ + --enable-libopenjpeg \ + --enable-libfreetype \ + --enable-libvidstab \ + --enable-gpl \ + --enable-libass \ + --enable-libkvazaar \ + --enable-libaom \ + --extra-libs=-lpthread \ + --enable-vaapi \ + --enable-cuda \ + --enable-nvenc \ + --enable-cuvid \ + --enable-libdav1d \ + --prefix="${PREFIX}" && \ + make && \ + make install && \ + make distclean && \ + hash -r && \ + cd tools && \ + make qt-faststart && \ + cp qt-faststart ${PREFIX}/bin + +RUN \ + if false; then \ + cp -r ${PREFIX}/lib/*so* /usr/local/lib/ && \ + cp ${PREFIX}/bin/* /usr/local/bin/ ; \ + else \ + LD_LIBRARY_PATH=${PREFIX}/lib ldd ${PREFIX}/bin/ffmpeg | \ + grep ${PREFIX} | \ + cut -d ' ' -f 3 | \ + xargs -i cp {} /usr/local/lib/ && \ + cp ${PREFIX}/bin/ff* /usr/local/bin/ ; \ + fi && \ + if true; then \ + for lib in /usr/local/lib/*.so* /usr/local/bin/*; do strip --strip-all $lib; done ; \ + fi && \ + cp -r ${PREFIX}/share/ffmpeg /usr/local/share/ && \ + LD_LIBRARY_PATH=/usr/local/lib ffmpeg -buildconf + +FROM base AS release +MAINTAINER Julien Rottenberg + +CMD ["--help"] +ENTRYPOINT ["ffmpeg"] + +COPY --from=build /usr/local /usr/local +RUN test "base" = "base" && ldconfig /usr/local/lib /usr/local/lib64 + +# Let's make sure the app built correctly +# Convenient to verify on https://hub.docker.com/r/jrottenberg/ffmpeg/builds/ console output +>>>>>>> rewrite the dockerfile generation + vdapu + armv7 + dav1d diff --git a/docker_gen.sh b/docker_gen.sh new file mode 100644 index 000000000..5db6099ce --- /dev/null +++ b/docker_gen.sh @@ -0,0 +1,28 @@ +#! /bin/sh + +variants=("ubuntu" "centos" "alpine", "nvidia", "arm32v7") +versions=("2.8" "3.2" "3.3" "3.4" "4.0" "4.1" "snapshot") + +for variant in ${variants[*]}; do + for version in ${versions[*]}; do + echo "${variant}: ffmpeg-${version}" + dir="docker-images/${version}/${variant}" + mkdir -p ${dir} + python3 update.py --slim --enable-all ${variant} ${version} > ${dir}/Dockerfile + done +done + +scratch_variant="alpine" +for version in ${versions[*]}; do + dir="docker-images/${version}/${variant}" + mkdir -p ${dir} + python3 update.py --scratch --enable-all ${scratch_variant} ${version} > ${dir}/Dockerfile +done + +# FFMPEG 2.8 Patches +# FFMPEG requires libssl1.0 +sed -ri\ + -e 's/alpine:[[:digit:]]+.[[:digit:]]+/alpine:3.8/' \ + -e 's/libssl1.[[:digit:]]/libssl1.0/' \ + -e 's/libcrypto1.[[:digit:]]/libcrypto1.0/' \ + docker-images/2.8/alpine/Dockerfile \ No newline at end of file From e9f367fbd50df7eabe3020624ed565cca5701511 Mon Sep 17 00:00:00 2001 From: GnaphronG Date: Tue, 18 Jun 2019 08:38:42 -0700 Subject: [PATCH 26/29] fix extra comma --- docker-images/2.8/alpine,/Dockerfile | 14 - docker-images/2.8/alpine/Dockerfile | 426 ++++++++++++++++++++ docker-images/2.8/nvidia,/Dockerfile | 14 - docker-images/2.8/nvidia/Dockerfile | 420 ++++++++++++++++++++ docker-images/3.2/alpine,/Dockerfile | 14 - docker-images/3.2/alpine/Dockerfile | 426 ++++++++++++++++++++ docker-images/3.2/nvidia,/Dockerfile | 14 - docker-images/3.2/nvidia/Dockerfile | 420 ++++++++++++++++++++ docker-images/3.3/alpine,/Dockerfile | 14 - docker-images/3.3/alpine/Dockerfile | 427 ++++++++++++++++++++ docker-images/3.3/nvidia,/Dockerfile | 14 - docker-images/3.3/nvidia/Dockerfile | 421 ++++++++++++++++++++ docker-images/3.4/alpine,/Dockerfile | 14 - docker-images/3.4/alpine/Dockerfile | 427 ++++++++++++++++++++ docker-images/3.4/nvidia,/Dockerfile | 14 - docker-images/3.4/nvidia/Dockerfile | 421 ++++++++++++++++++++ docker-images/4.0/alpine,/Dockerfile | 14 - docker-images/4.0/alpine/Dockerfile | 441 +++++++++++++++++++++ docker-images/4.0/nvidia,/Dockerfile | 14 - docker-images/4.0/nvidia/Dockerfile | 435 +++++++++++++++++++++ docker-images/4.1/alpine,/Dockerfile | 14 - docker-images/4.1/alpine/Dockerfile | 443 +++++++++++++++++++++ docker-images/4.1/nvidia,/Dockerfile | 14 - docker-images/4.1/nvidia/Dockerfile | 437 +++++++++++++++++++++ docker-images/snapshot/alpine,/Dockerfile | 14 - docker-images/snapshot/alpine/Dockerfile | 453 ++++++++++++++++++++++ docker-images/snapshot/nvidia,/Dockerfile | 14 - docker-images/snapshot/nvidia/Dockerfile | 447 +++++++++++++++++++++ docker_gen.sh | 8 +- update.py | 248 ++++++++---- 30 files changed, 6228 insertions(+), 268 deletions(-) delete mode 100644 docker-images/2.8/alpine,/Dockerfile delete mode 100644 docker-images/2.8/nvidia,/Dockerfile delete mode 100644 docker-images/3.2/alpine,/Dockerfile delete mode 100644 docker-images/3.2/nvidia,/Dockerfile delete mode 100644 docker-images/3.3/alpine,/Dockerfile delete mode 100644 docker-images/3.3/nvidia,/Dockerfile delete mode 100644 docker-images/3.4/alpine,/Dockerfile delete mode 100644 docker-images/3.4/nvidia,/Dockerfile delete mode 100644 docker-images/4.0/alpine,/Dockerfile delete mode 100644 docker-images/4.0/nvidia,/Dockerfile delete mode 100644 docker-images/4.1/alpine,/Dockerfile delete mode 100644 docker-images/4.1/nvidia,/Dockerfile delete mode 100644 docker-images/snapshot/alpine,/Dockerfile delete mode 100644 docker-images/snapshot/nvidia,/Dockerfile diff --git a/docker-images/2.8/alpine,/Dockerfile b/docker-images/2.8/alpine,/Dockerfile deleted file mode 100644 index a0b97723e..000000000 --- a/docker-images/2.8/alpine,/Dockerfile +++ /dev/null @@ -1,14 +0,0 @@ -usage: update.py [-h] [--enable-libopencore-amr] [--enable-libx264] - [--enable-libx265] [--enable-libogg] [--enable-libopus] - [--enable-libvorbis] [--enable-libtheora] [--enable-libvpx] - [--enable-libmp3lame] [--enable-libxvid] - [--enable-libfdk-aac] [--enable-libopenjpeg] - [--enable-libfreetype] [--enable-libvidstab] - [--enable-libfribidi] [--enable-libfontconfig] - [--enable-libass] [--enable-libkvazaar] [--enable-libaom] - [--enable-vaapi] [--enable-nvenc] [--enable-libdav1d] - [--enable-vdpau] [--enable-all] [--with-bins] [--no-strip] - [--fat | --slim | --scratch] - {alpine,centos,ubuntu,nvidia,armv7} - {snapshot,4.1,4.0,3.4,3.3,3.2,2.8} -update.py: error: argument variant: invalid choice: 'alpine,' (choose from 'alpine', 'centos', 'ubuntu', 'nvidia', 'armv7') diff --git a/docker-images/2.8/alpine/Dockerfile b/docker-images/2.8/alpine/Dockerfile index d866bbefb..94373f37d 100644 --- a/docker-images/2.8/alpine/Dockerfile +++ b/docker-images/2.8/alpine/Dockerfile @@ -1,3 +1,4 @@ +<<<<<<< HEAD # ffmpeg - http://ffmpeg.org/download.html # # https://hub.docker.com/r/jrottenberg/ffmpeg/ @@ -388,3 +389,428 @@ COPY --from=build /usr/local /usr/local # Let's make sure the app built correctly # Convenient to verify on https://hub.docker.com/r/jrottenberg/ffmpeg/builds/ console output +======= +FROM alpine:3.8 as base + +RUN apk add --no-cache --update libva \ + libgcc \ + libstdc++ \ + ca-certificates \ + libcrypto1.0 \ + libssl1.0 \ + libgomp \ + expat \ + libuuid + +FROM base as build + +WORKDIR /tmp/workdir + +ARG PREFIX=/tmp/build +ARG MAKEFLAGS=-j6 +ARG PKG_CONFIG_PATH=/tmp/build/lib/pkgconfig + +RUN apk add --no-cache --update libva-dev \ + autoconf \ + automake \ + bash \ + binutils \ + bzip2 \ + cmake \ + curl \ + coreutils \ + diffutils \ + file \ + g++ \ + git \ + gcc \ + gperf \ + libtool \ + make \ + python \ + openssl-dev \ + tar \ + yasm \ + nasm \ + zlib-dev \ + expat-dev \ + util-linux-dev \ + meson \ + ninja + +ARG FFMPEG_VERSION=2.8.15 +ARG LIBOPENCORE_AMR_VERSION=0.1.5 +ARG LIBX264_VERSION=20190526-2245-stable +ARG LIBX265_VERSION=3.0 +ARG LIBOGG_VERSION=1.3.3 +ARG LIBOPUS_VERSION=1.3.1 +ARG LIBVORBIS_VERSION=1.3.6 +ARG LIBTHEORA_VERSION=1.1.1 +ARG LIBVPX_VERSION=1.8.0 +ARG LIBMP3LAME_VERSION=3.100 +ARG LIBXVID_VERSION=1.3.5 +ARG LIBFDK_AAC_VERSION=0.1.6 +ARG LIBOPENJPEG_VERSION=1.5.2 +ARG LIBFREETYPE_VERSION=2.10.0 +ARG LIBVIDSTAB_VERSION=1.1.0 +ARG LIBFRIBIDI_VERSION=0.19.7 +ARG LIBFONTCONFIG_VERSION=2.13.1 +ARG LIBFREETYPE_VERSION=2.10.0 +ARG LIBFRIBIDI_VERSION=0.19.7 +ARG LIBFONTCONFIG_VERSION=2.13.1 +ARG LIBASS_VERSION=0.14.0 +ARG LIBKVAZAAR_VERSION=0.6.1 +ARG NVENC_VERSION=8.2.15.8 + +ARG LIBOGG_SHA256SUM=c2e8a485110b97550f453226ec644ebac6cb29d1caef2902c007edab4308d985 +ARG LIBOPUS_SHA256SUM=65b58e1e25b2a114157014736a3d9dfeaad8d41be1c8179866f144a2fb44ff9d +ARG LIBVORBIS_SHA256SUM=6ed40e0241089a42c48604dc00e362beee00036af2d8b3f46338031c9e0351cb +ARG LIBTHEORA_SHA256SUM=40952956c47811928d1e7922cda3bc1f427eb75680c3c37249c91e949054916b +ARG LIBVIDSTAB_SHA256SUM=14d2a053e56edad4f397be0cb3ef8eb1ec3150404ce99a426c4eb641861dc0bb +ARG LIBFRIBIDI_SHA256SUM=3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 +ARG LIBFRIBIDI_SHA256SUM=3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 + +## opencore-amr https://sourceforge.net/projects/opencore-amr/ +RUN \ + DIR=opencore-amr && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://kent.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${LIBOPENCORE_AMR_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +## x264 http://www.videolan.org/developers/x264.html +RUN \ + DIR=x264 && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://download.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-${LIBX264_VERSION}.tar.bz2 | \ + tar -jx --strip-components=1 && \ + ./configure --prefix="${PREFIX}" --enable-shared --enable-pic && \ + make && \ + make install && \ + rm -rf ${DIR} +### x265 http://x265.org/ +RUN \ + DIR=x265 && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://download.videolan.org/pub/videolan/x265/x265_${LIBX265_VERSION}.tar.gz | \ + tar -zx && \ + cd x265_${LIBX265_VERSION}/build/linux && \ + sed -i "/-DEXTRA_LIB/ s/$/ -DCMAKE_INSTALL_PREFIX=\${PREFIX}/" multilib.sh && \ + sed -i "/^cmake/ s/$/ -DENABLE_CLI=ON/" multilib.sh && \ + ./multilib.sh && \ + make -C 8bit install && \ + rm -rf ${DIR} +## libogg https://www.xiph.org/ogg/ +RUN \ + DIR=ogg && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO http://downloads.xiph.org/releases/ogg/libogg-${LIBOGG_VERSION}.tar.gz && \ + echo "${LIBOGG_SHA256SUM} libogg-${LIBOGG_VERSION}.tar.gz" | sha256sum --check && \ + tar -zx --strip-components=1 -f libogg-${LIBOGG_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +RUN \ + DIR=opus && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://archive.mozilla.org/pub/opus/opus-${LIBOPUS_VERSION}.tar.gz && \ + echo "${LIBOPUS_SHA256SUM} opus-${LIBOPUS_VERSION}.tar.gz"| sha256sum --check && \ + tar -zx --strip-components=1 -f opus-${LIBOPUS_VERSION}.tar.gz && \ + autoreconf -fiv && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +### libvorbis https://xiph.org/vorbis/ +RUN \ + DIR=vorbis && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO http://downloads.xiph.org/releases/vorbis/libvorbis-${LIBVORBIS_VERSION}.tar.gz && \ + echo "${LIBVORBIS_SHA256SUM} libvorbis-${LIBVORBIS_VERSION}.tar.gz" | sha256sum --check && \ + tar -zx --strip-components=1 -f libvorbis-${LIBVORBIS_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +### libtheora http://www.theora.org/ +RUN \ + DIR=theora && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO http://downloads.xiph.org/releases/theora/libtheora-${LIBTHEORA_VERSION}.tar.gz && \ + echo "${LIBTHEORA_SHA256SUM} libtheora-${LIBTHEORA_VERSION}.tar.gz" | sha256sum --check && \ + tar -zx --strip-components=1 -f libtheora-${LIBTHEORA_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +### libvpx https://www.webmproject.org/code/ +RUN \ + DIR=vpx && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://codeload.github.com/webmproject/libvpx/tar.gz/v${LIBVPX_VERSION} | \ + tar -zx --strip-components=1 && \ + ./configure --prefix="${PREFIX}" --enable-vp8 --enable-vp9 --enable-vp9-highbitdepth --enable-pic --enable-shared \ + --disable-debug --disable-examples --disable-docs && \ + make && \ + make install && \ + rm -rf ${DIR} + +### libmp3lame http://lame.sourceforge.net/ +RUN \ + DIR=lame && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://kent.dl.sourceforge.net/project/lame/lame/$(echo ${LIBMP3LAME_VERSION} | sed -e 's/[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)/\1.\2/')/lame-${LIBMP3LAME_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" --enable-shared --enable-nasm --enable-pic && \ + make && \ + make install && \ + rm -rf ${DIR} +### xvid https://www.xvid.com/ +RUN \ + DIR=xvid && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO http://downloads.xvid.org/downloads/xvidcore-${LIBXVID_VERSION}.tar.gz && \ + tar -zx -f xvidcore-${LIBXVID_VERSION}.tar.gz && \ + cd xvidcore/build/generic && \ + ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" --datadir="${DIR}" --enable-shared --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +### fdk-aac https://github.com/mstorsjo/fdk-aac +RUN \ + DIR=fdk-aac && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://github.com/mstorsjo/fdk-aac/archive/v${LIBFDK_AAC_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + autoreconf -fiv && \ + ./configure --prefix="${PREFIX}" --enable-shared --datadir="${DIR}" && \ + make && \ + make install && \ + rm -rf ${DIR} +## openjpeg https://github.com/uclouvain/openjpeg +RUN \ + DIR=openjpeg && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + if test `echo ${LIBOPENJPEG_VERSION} | tr -d '.'` -ge '210'; then \ + version_prefix='v'; \ + else \ + version_prefix='version.' ;\ + fi && \ + curl -sL https://github.com/uclouvain/openjpeg/archive/${version_prefix}${LIBOPENJPEG_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + cmake -DBUILD_THIRDPARTY:BOOL=ON -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ + make && \ + make install && \ + rm -rf ${DIR} +## freetype https://www.freetype.org/ +RUN \ + DIR=freetype && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://download.savannah.gnu.org/releases/freetype/freetype-${LIBFREETYPE_VERSION}.tar.gz && \ + tar -zx --strip-components=1 -f freetype-${LIBFREETYPE_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +## libvstab https://github.com/georgmartius/vid.stab +RUN \ + DIR=vid.stab && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/georgmartius/vid.stab/archive/v${LIBVIDSTAB_VERSION}.tar.gz &&\ + echo "${LIBVIDSTAB_SHA256SUM} v${LIBVIDSTAB_VERSION}.tar.gz" | sha256sum --check && \ + tar -zx --strip-components=1 -f v${LIBVIDSTAB_VERSION}.tar.gz && \ + cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ + make && \ + make install && \ + rm -rf ${DIR} +## fridibi https://www.fribidi.org/ +# + https://github.com/fribidi/fribidi/issues/8 +RUN \ + DIR=fribidi && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/fribidi/fribidi/archive/${LIBFRIBIDI_VERSION}.tar.gz && \ + echo "${LIBFRIBIDI_SHA256SUM} ${LIBFRIBIDI_VERSION}.tar.gz" | sha256sum --check && \ + tar -zx --strip-components=1 -f ${LIBFRIBIDI_VERSION}.tar.gz && \ + sed -i 's/^SUBDIRS =.*/SUBDIRS=gen.tab charset lib/' Makefile.am && \ + ./bootstrap --no-config && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ + make -j 1 && \ + make install && \ + rm -rf ${DIR} +## fontconfig https://www.freedesktop.org/wiki/Software/fontconfig/ +RUN \ + DIR=fontconfig && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://www.freedesktop.org/software/fontconfig/release/fontconfig-${LIBFONTCONFIG_VERSION}.tar.bz2 &&\ + tar -jx --strip-components=1 -f fontconfig-${LIBFONTCONFIG_VERSION}.tar.bz2 && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +## freetype https://www.freetype.org/ +RUN \ + DIR=freetype && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://download.savannah.gnu.org/releases/freetype/freetype-${LIBFREETYPE_VERSION}.tar.gz && \ + tar -zx --strip-components=1 -f freetype-${LIBFREETYPE_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +## fridibi https://www.fribidi.org/ +# + https://github.com/fribidi/fribidi/issues/8 +RUN \ + DIR=fribidi && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/fribidi/fribidi/archive/${LIBFRIBIDI_VERSION}.tar.gz && \ + echo "${LIBFRIBIDI_SHA256SUM} ${LIBFRIBIDI_VERSION}.tar.gz" | sha256sum --check && \ + tar -zx --strip-components=1 -f ${LIBFRIBIDI_VERSION}.tar.gz && \ + sed -i 's/^SUBDIRS =.*/SUBDIRS=gen.tab charset lib/' Makefile.am && \ + ./bootstrap --no-config && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ + make -j 1 && \ + make install && \ + rm -rf ${DIR} +## fontconfig https://www.freedesktop.org/wiki/Software/fontconfig/ +RUN \ + DIR=fontconfig && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://www.freedesktop.org/software/fontconfig/release/fontconfig-${LIBFONTCONFIG_VERSION}.tar.bz2 &&\ + tar -jx --strip-components=1 -f fontconfig-${LIBFONTCONFIG_VERSION}.tar.bz2 && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +RUN \ + DIR=libass && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/libass/libass/archive/${LIBASS_VERSION}.tar.gz &&\ + tar -zx --strip-components=1 -f ${LIBASS_VERSION}.tar.gz && \ + ./autogen.sh && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +## kvazaar https://github.com/ultravideo/kvazaar +RUN \ + DIR=kvazaar && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/ultravideo/kvazaar/archive/v${LIBKVAZAAR_VERSION}.tar.gz &&\ + tar -zx --strip-components=1 -f v${LIBKVAZAAR_VERSION}.tar.gz && \ + if [ -e ./autogen.sh ]; then \ + ./autogen.sh && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared ; \ + else \ + cd src ; \ + fi && \ + make && \ + make install && \ + rm -rf ${DIR} + +RUN \ + DIR=nv-codec-headers && \ + git clone --branch n${NVENC_VERSION} --depth=1 https://git.videolan.org/git/ffmpeg/nv-codec-headers.git ${DIR} && \ + cd ${DIR} && \ + sed -i 's@/usr/local@'"$PREFIX"'@' Makefile && \ + make && \ + make install && \ + rm -rf ${DIR} +RUN \ + DIR=ffmpeg && mkdir -p ${DIR} && cd ${DIR} && \ + curl -sLO https://ffmpeg.org/releases/ffmpeg-${FFMPEG_VERSION}.tar.bz2 && \ + tar -jx --strip-components=1 -f ffmpeg-${FFMPEG_VERSION}.tar.bz2 && \ + ./configure \ + --disable-debug \ + --disable-doc \ + --disable-ffplay \ + --enable-shared \ + --enable-avresample \ + --enable-openssl \ + --enable-postproc \ + --enable-small \ + --extra-cflags="-I${PREFIX}/include -I/usr/local/include" \ + --extra-ldflags="-L${PREFIX}/lib -L/usr/local/lib" \ + --enable-libopencore-amrnb \ + --enable-libopencore-amrwb \ + --enable-version3 \ + --enable-libx264 \ + --enable-libx265 \ + --enable-libopus \ + --enable-libvorbis \ + --enable-libtheora \ + --enable-libvpx \ + --enable-libmp3lame \ + --enable-libxvid \ + --enable-libfdk_aac \ + --enable-nonfree \ + --enable-libopenjpeg \ + --enable-libfreetype \ + --enable-libvidstab \ + --enable-gpl \ + --enable-libass \ + --enable-libkvazaar \ + --enable-vaapi \ + --enable-nvenc \ + --enable-nonfree \ + --prefix="${PREFIX}" && \ + make && \ + make install && \ + make distclean && \ + hash -r && \ + cd tools && \ + make qt-faststart && \ + cp qt-faststart ${PREFIX}/bin + +RUN \ + if false; then \ + cp -r ${PREFIX}/lib/*so* /usr/local/lib/ && \ + cp ${PREFIX}/bin/* /usr/local/bin/ ; \ + else \ + LD_LIBRARY_PATH=${PREFIX}/lib ldd ${PREFIX}/bin/ffmpeg | \ + grep ${PREFIX} | \ + cut -d ' ' -f 3 | \ + xargs -i cp {} /usr/local/lib/ && \ + cp ${PREFIX}/bin/ff* /usr/local/bin/ ; \ + fi && \ + if true; then \ + for lib in /usr/local/lib/*.so* /usr/local/bin/*; do strip --strip-all $lib; done ; \ + fi && \ + cp -r ${PREFIX}/share/ffmpeg /usr/local/share/ && \ + LD_LIBRARY_PATH=/usr/local/lib ffmpeg -buildconf + +FROM base AS release +MAINTAINER Julien Rottenberg + +CMD ["--help"] +ENTRYPOINT ["ffmpeg"] + +COPY --from=build /usr/local /usr/local +RUN test "base" = "base" && ldconfig /usr/local/lib /usr/local/lib64 + +# Let's make sure the app built correctly +# Convenient to verify on https://hub.docker.com/r/jrottenberg/ffmpeg/builds/ console output +>>>>>>> fix extra comma diff --git a/docker-images/2.8/nvidia,/Dockerfile b/docker-images/2.8/nvidia,/Dockerfile deleted file mode 100644 index 452b62c02..000000000 --- a/docker-images/2.8/nvidia,/Dockerfile +++ /dev/null @@ -1,14 +0,0 @@ -usage: update.py [-h] [--enable-libopencore-amr] [--enable-libx264] - [--enable-libx265] [--enable-libogg] [--enable-libopus] - [--enable-libvorbis] [--enable-libtheora] [--enable-libvpx] - [--enable-libmp3lame] [--enable-libxvid] - [--enable-libfdk-aac] [--enable-libopenjpeg] - [--enable-libfreetype] [--enable-libvidstab] - [--enable-libfribidi] [--enable-libfontconfig] - [--enable-libass] [--enable-libkvazaar] [--enable-libaom] - [--enable-vaapi] [--enable-nvenc] [--enable-libdav1d] - [--enable-vdpau] [--enable-all] [--with-bins] [--no-strip] - [--fat | --slim | --scratch] - {alpine,centos,ubuntu,nvidia,armv7} - {snapshot,4.1,4.0,3.4,3.3,3.2,2.8} -update.py: error: argument variant: invalid choice: 'nvidia,' (choose from 'alpine', 'centos', 'ubuntu', 'nvidia', 'armv7') diff --git a/docker-images/2.8/nvidia/Dockerfile b/docker-images/2.8/nvidia/Dockerfile index 71a097a4c..6de22f3da 100644 --- a/docker-images/2.8/nvidia/Dockerfile +++ b/docker-images/2.8/nvidia/Dockerfile @@ -1,3 +1,4 @@ +<<<<<<< HEAD # ffmpeg - http://ffmpeg.org/download.html # # From https://trac.ffmpeg.org/wiki/CompilationGuide/Ubuntu @@ -420,3 +421,422 @@ COPY --from=build /usr/local/lib /usr/local/lib/ # Let's make sure the app built correctly # Convenient to verify on https://hub.docker.com/r/jrottenberg/ffmpeg/builds/ console output +======= +FROM nvidia/cuda:10.1-runtime-ubuntu18.04 AS base + +ENV NVIDIA_DRIVER_CAPABILITIES=video + +RUN apt-get -yqq update && \ + apt-get install -yq --no-install-recommends libva2 libva-drm2 i965-va-driver ca-certificates expat libgomp1 libuuid1 libssl1.0 && \ + apt-get autoremove -y && \ + apt-get clean -y + +FROM base as build + +WORKDIR /tmp/workdir + +ARG PREFIX=/tmp/build +ARG MAKEFLAGS=-j6 +ARG PKG_CONFIG_PATH=/tmp/build/lib/pkgconfig +ARG C_INCLUDE_PATH=/tmp/build/include/ffnvcodec + +RUN apt-get -yqq update && \ + apt-get install -yq --no-install-recommends \ + libva-dev \ + autoconf \ + automake \ + cmake \ + curl \ + bzip2 \ + libexpat1-dev \ + g++ \ + gcc \ + git \ + gperf \ + libtool \ + make \ + nasm \ + perl \ + pkg-config \ + python \ + libssl1.0-dev \ + yasm \ + zlib1g-dev \ + uuid-dev + +ARG FFMPEG_VERSION=2.8.15 +ARG LIBOPENCORE_AMR_VERSION=0.1.5 +ARG LIBX264_VERSION=20190526-2245-stable +ARG LIBX265_VERSION=3.0 +ARG LIBOGG_VERSION=1.3.3 +ARG LIBOPUS_VERSION=1.3.1 +ARG LIBVORBIS_VERSION=1.3.6 +ARG LIBTHEORA_VERSION=1.1.1 +ARG LIBVPX_VERSION=1.8.0 +ARG LIBMP3LAME_VERSION=3.100 +ARG LIBXVID_VERSION=1.3.5 +ARG LIBFDK_AAC_VERSION=0.1.6 +ARG LIBOPENJPEG_VERSION=1.5.2 +ARG LIBFREETYPE_VERSION=2.10.0 +ARG LIBVIDSTAB_VERSION=1.1.0 +ARG LIBFRIBIDI_VERSION=0.19.7 +ARG LIBFONTCONFIG_VERSION=2.13.1 +ARG LIBFREETYPE_VERSION=2.10.0 +ARG LIBFRIBIDI_VERSION=0.19.7 +ARG LIBFONTCONFIG_VERSION=2.13.1 +ARG LIBASS_VERSION=0.14.0 +ARG LIBKVAZAAR_VERSION=0.6.1 +ARG NVENC_VERSION=8.2.15.8 + +ARG LIBOGG_SHA256SUM=c2e8a485110b97550f453226ec644ebac6cb29d1caef2902c007edab4308d985 +ARG LIBOPUS_SHA256SUM=65b58e1e25b2a114157014736a3d9dfeaad8d41be1c8179866f144a2fb44ff9d +ARG LIBVORBIS_SHA256SUM=6ed40e0241089a42c48604dc00e362beee00036af2d8b3f46338031c9e0351cb +ARG LIBTHEORA_SHA256SUM=40952956c47811928d1e7922cda3bc1f427eb75680c3c37249c91e949054916b +ARG LIBVIDSTAB_SHA256SUM=14d2a053e56edad4f397be0cb3ef8eb1ec3150404ce99a426c4eb641861dc0bb +ARG LIBFRIBIDI_SHA256SUM=3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 +ARG LIBFRIBIDI_SHA256SUM=3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 + +## opencore-amr https://sourceforge.net/projects/opencore-amr/ +RUN \ + DIR=opencore-amr && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://kent.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${LIBOPENCORE_AMR_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +## x264 http://www.videolan.org/developers/x264.html +RUN \ + DIR=x264 && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://download.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-${LIBX264_VERSION}.tar.bz2 | \ + tar -jx --strip-components=1 && \ + ./configure --prefix="${PREFIX}" --enable-shared --enable-pic && \ + make && \ + make install && \ + rm -rf ${DIR} +### x265 http://x265.org/ +RUN \ + DIR=x265 && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://download.videolan.org/pub/videolan/x265/x265_${LIBX265_VERSION}.tar.gz | \ + tar -zx && \ + cd x265_${LIBX265_VERSION}/build/linux && \ + sed -i "/-DEXTRA_LIB/ s/$/ -DCMAKE_INSTALL_PREFIX=\${PREFIX}/" multilib.sh && \ + sed -i "/^cmake/ s/$/ -DENABLE_CLI=ON/" multilib.sh && \ + ./multilib.sh && \ + make -C 8bit install && \ + rm -rf ${DIR} +## libogg https://www.xiph.org/ogg/ +RUN \ + DIR=ogg && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO http://downloads.xiph.org/releases/ogg/libogg-${LIBOGG_VERSION}.tar.gz && \ + echo "${LIBOGG_SHA256SUM} libogg-${LIBOGG_VERSION}.tar.gz" | sha256sum --check && \ + tar -zx --strip-components=1 -f libogg-${LIBOGG_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +RUN \ + DIR=opus && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://archive.mozilla.org/pub/opus/opus-${LIBOPUS_VERSION}.tar.gz && \ + echo "${LIBOPUS_SHA256SUM} opus-${LIBOPUS_VERSION}.tar.gz"| sha256sum --check && \ + tar -zx --strip-components=1 -f opus-${LIBOPUS_VERSION}.tar.gz && \ + autoreconf -fiv && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +### libvorbis https://xiph.org/vorbis/ +RUN \ + DIR=vorbis && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO http://downloads.xiph.org/releases/vorbis/libvorbis-${LIBVORBIS_VERSION}.tar.gz && \ + echo "${LIBVORBIS_SHA256SUM} libvorbis-${LIBVORBIS_VERSION}.tar.gz" | sha256sum --check && \ + tar -zx --strip-components=1 -f libvorbis-${LIBVORBIS_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +### libtheora http://www.theora.org/ +RUN \ + DIR=theora && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO http://downloads.xiph.org/releases/theora/libtheora-${LIBTHEORA_VERSION}.tar.gz && \ + echo "${LIBTHEORA_SHA256SUM} libtheora-${LIBTHEORA_VERSION}.tar.gz" | sha256sum --check && \ + tar -zx --strip-components=1 -f libtheora-${LIBTHEORA_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +### libvpx https://www.webmproject.org/code/ +RUN \ + DIR=vpx && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://codeload.github.com/webmproject/libvpx/tar.gz/v${LIBVPX_VERSION} | \ + tar -zx --strip-components=1 && \ + ./configure --prefix="${PREFIX}" --enable-vp8 --enable-vp9 --enable-vp9-highbitdepth --enable-pic --enable-shared \ + --disable-debug --disable-examples --disable-docs && \ + make && \ + make install && \ + rm -rf ${DIR} + +### libmp3lame http://lame.sourceforge.net/ +RUN \ + DIR=lame && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://kent.dl.sourceforge.net/project/lame/lame/$(echo ${LIBMP3LAME_VERSION} | sed -e 's/[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)/\1.\2/')/lame-${LIBMP3LAME_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" --enable-shared --enable-nasm --enable-pic && \ + make && \ + make install && \ + rm -rf ${DIR} +### xvid https://www.xvid.com/ +RUN \ + DIR=xvid && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO http://downloads.xvid.org/downloads/xvidcore-${LIBXVID_VERSION}.tar.gz && \ + tar -zx -f xvidcore-${LIBXVID_VERSION}.tar.gz && \ + cd xvidcore/build/generic && \ + ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" --datadir="${DIR}" --enable-shared --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +### fdk-aac https://github.com/mstorsjo/fdk-aac +RUN \ + DIR=fdk-aac && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://github.com/mstorsjo/fdk-aac/archive/v${LIBFDK_AAC_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + autoreconf -fiv && \ + ./configure --prefix="${PREFIX}" --enable-shared --datadir="${DIR}" && \ + make && \ + make install && \ + rm -rf ${DIR} +## openjpeg https://github.com/uclouvain/openjpeg +RUN \ + DIR=openjpeg && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + if test `echo ${LIBOPENJPEG_VERSION} | tr -d '.'` -ge '210'; then \ + version_prefix='v'; \ + else \ + version_prefix='version.' ;\ + fi && \ + curl -sL https://github.com/uclouvain/openjpeg/archive/${version_prefix}${LIBOPENJPEG_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + cmake -DBUILD_THIRDPARTY:BOOL=ON -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ + make && \ + make install && \ + rm -rf ${DIR} +## freetype https://www.freetype.org/ +RUN \ + DIR=freetype && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://download.savannah.gnu.org/releases/freetype/freetype-${LIBFREETYPE_VERSION}.tar.gz && \ + tar -zx --strip-components=1 -f freetype-${LIBFREETYPE_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +## libvstab https://github.com/georgmartius/vid.stab +RUN \ + DIR=vid.stab && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/georgmartius/vid.stab/archive/v${LIBVIDSTAB_VERSION}.tar.gz &&\ + echo "${LIBVIDSTAB_SHA256SUM} v${LIBVIDSTAB_VERSION}.tar.gz" | sha256sum --check && \ + tar -zx --strip-components=1 -f v${LIBVIDSTAB_VERSION}.tar.gz && \ + cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ + make && \ + make install && \ + rm -rf ${DIR} +## fridibi https://www.fribidi.org/ +# + https://github.com/fribidi/fribidi/issues/8 +RUN \ + DIR=fribidi && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/fribidi/fribidi/archive/${LIBFRIBIDI_VERSION}.tar.gz && \ + echo "${LIBFRIBIDI_SHA256SUM} ${LIBFRIBIDI_VERSION}.tar.gz" | sha256sum --check && \ + tar -zx --strip-components=1 -f ${LIBFRIBIDI_VERSION}.tar.gz && \ + sed -i 's/^SUBDIRS =.*/SUBDIRS=gen.tab charset lib/' Makefile.am && \ + ./bootstrap --no-config && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ + make -j 1 && \ + make install && \ + rm -rf ${DIR} +## fontconfig https://www.freedesktop.org/wiki/Software/fontconfig/ +RUN \ + DIR=fontconfig && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://www.freedesktop.org/software/fontconfig/release/fontconfig-${LIBFONTCONFIG_VERSION}.tar.bz2 &&\ + tar -jx --strip-components=1 -f fontconfig-${LIBFONTCONFIG_VERSION}.tar.bz2 && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +## freetype https://www.freetype.org/ +RUN \ + DIR=freetype && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://download.savannah.gnu.org/releases/freetype/freetype-${LIBFREETYPE_VERSION}.tar.gz && \ + tar -zx --strip-components=1 -f freetype-${LIBFREETYPE_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +## fridibi https://www.fribidi.org/ +# + https://github.com/fribidi/fribidi/issues/8 +RUN \ + DIR=fribidi && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/fribidi/fribidi/archive/${LIBFRIBIDI_VERSION}.tar.gz && \ + echo "${LIBFRIBIDI_SHA256SUM} ${LIBFRIBIDI_VERSION}.tar.gz" | sha256sum --check && \ + tar -zx --strip-components=1 -f ${LIBFRIBIDI_VERSION}.tar.gz && \ + sed -i 's/^SUBDIRS =.*/SUBDIRS=gen.tab charset lib/' Makefile.am && \ + ./bootstrap --no-config && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ + make -j 1 && \ + make install && \ + rm -rf ${DIR} +## fontconfig https://www.freedesktop.org/wiki/Software/fontconfig/ +RUN \ + DIR=fontconfig && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://www.freedesktop.org/software/fontconfig/release/fontconfig-${LIBFONTCONFIG_VERSION}.tar.bz2 &&\ + tar -jx --strip-components=1 -f fontconfig-${LIBFONTCONFIG_VERSION}.tar.bz2 && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +RUN \ + DIR=libass && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/libass/libass/archive/${LIBASS_VERSION}.tar.gz &&\ + tar -zx --strip-components=1 -f ${LIBASS_VERSION}.tar.gz && \ + ./autogen.sh && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +## kvazaar https://github.com/ultravideo/kvazaar +RUN \ + DIR=kvazaar && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/ultravideo/kvazaar/archive/v${LIBKVAZAAR_VERSION}.tar.gz &&\ + tar -zx --strip-components=1 -f v${LIBKVAZAAR_VERSION}.tar.gz && \ + if [ -e ./autogen.sh ]; then \ + ./autogen.sh && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared ; \ + else \ + cd src ; \ + fi && \ + make && \ + make install && \ + rm -rf ${DIR} + +RUN \ + DIR=nv-codec-headers && \ + git clone --branch n${NVENC_VERSION} --depth=1 https://git.videolan.org/git/ffmpeg/nv-codec-headers.git ${DIR} && \ + cd ${DIR} && \ + sed -i 's@/usr/local@'"$PREFIX"'@' Makefile && \ + make && \ + make install && \ + rm -rf ${DIR} +RUN \ + DIR=ffmpeg && mkdir -p ${DIR} && cd ${DIR} && \ + curl -sLO https://ffmpeg.org/releases/ffmpeg-${FFMPEG_VERSION}.tar.bz2 && \ + tar -jx --strip-components=1 -f ffmpeg-${FFMPEG_VERSION}.tar.bz2 && \ + ./configure \ + --disable-debug \ + --disable-doc \ + --disable-ffplay \ + --enable-shared \ + --enable-avresample \ + --enable-openssl \ + --enable-postproc \ + --enable-small \ + --extra-cflags="-I${PREFIX}/include -I/usr/local/include" \ + --extra-ldflags="-L${PREFIX}/lib -L/usr/local/lib" \ + --enable-libopencore-amrnb \ + --enable-libopencore-amrwb \ + --enable-version3 \ + --enable-libx264 \ + --enable-libx265 \ + --enable-libopus \ + --enable-libvorbis \ + --enable-libtheora \ + --enable-libvpx \ + --enable-libmp3lame \ + --enable-libxvid \ + --enable-libfdk_aac \ + --enable-nonfree \ + --enable-libopenjpeg \ + --enable-libfreetype \ + --enable-libvidstab \ + --enable-gpl \ + --enable-libass \ + --enable-libkvazaar \ + --enable-vaapi \ + --enable-nvenc \ + --enable-nonfree \ + --prefix="${PREFIX}" && \ + make && \ + make install && \ + make distclean && \ + hash -r && \ + cd tools && \ + make qt-faststart && \ + cp qt-faststart ${PREFIX}/bin + +RUN \ + if false; then \ + cp -r ${PREFIX}/lib/*so* /usr/local/lib/ && \ + cp ${PREFIX}/bin/* /usr/local/bin/ ; \ + else \ + LD_LIBRARY_PATH=${PREFIX}/lib ldd ${PREFIX}/bin/ffmpeg | \ + grep ${PREFIX} | \ + cut -d ' ' -f 3 | \ + xargs -i cp {} /usr/local/lib/ && \ + cp ${PREFIX}/bin/ff* /usr/local/bin/ ; \ + fi && \ + if true; then \ + for lib in /usr/local/lib/*.so* /usr/local/bin/*; do strip --strip-all $lib; done ; \ + fi && \ + cp -r ${PREFIX}/share/ffmpeg /usr/local/share/ && \ + LD_LIBRARY_PATH=/usr/local/lib ffmpeg -buildconf + +FROM base AS release +MAINTAINER Julien Rottenberg + +CMD ["--help"] +ENTRYPOINT ["ffmpeg"] + +COPY --from=build /usr/local /usr/local +RUN test "base" = "base" && ldconfig /usr/local/lib /usr/local/lib64 + +# Let's make sure the app built correctly +# Convenient to verify on https://hub.docker.com/r/jrottenberg/ffmpeg/builds/ console output +>>>>>>> fix extra comma diff --git a/docker-images/3.2/alpine,/Dockerfile b/docker-images/3.2/alpine,/Dockerfile deleted file mode 100644 index a0b97723e..000000000 --- a/docker-images/3.2/alpine,/Dockerfile +++ /dev/null @@ -1,14 +0,0 @@ -usage: update.py [-h] [--enable-libopencore-amr] [--enable-libx264] - [--enable-libx265] [--enable-libogg] [--enable-libopus] - [--enable-libvorbis] [--enable-libtheora] [--enable-libvpx] - [--enable-libmp3lame] [--enable-libxvid] - [--enable-libfdk-aac] [--enable-libopenjpeg] - [--enable-libfreetype] [--enable-libvidstab] - [--enable-libfribidi] [--enable-libfontconfig] - [--enable-libass] [--enable-libkvazaar] [--enable-libaom] - [--enable-vaapi] [--enable-nvenc] [--enable-libdav1d] - [--enable-vdpau] [--enable-all] [--with-bins] [--no-strip] - [--fat | --slim | --scratch] - {alpine,centos,ubuntu,nvidia,armv7} - {snapshot,4.1,4.0,3.4,3.3,3.2,2.8} -update.py: error: argument variant: invalid choice: 'alpine,' (choose from 'alpine', 'centos', 'ubuntu', 'nvidia', 'armv7') diff --git a/docker-images/3.2/alpine/Dockerfile b/docker-images/3.2/alpine/Dockerfile index 2ccd44145..2da25d07b 100644 --- a/docker-images/3.2/alpine/Dockerfile +++ b/docker-images/3.2/alpine/Dockerfile @@ -1,3 +1,4 @@ +<<<<<<< HEAD # ffmpeg - http://ffmpeg.org/download.html # # https://hub.docker.com/r/jrottenberg/ffmpeg/ @@ -396,3 +397,428 @@ COPY --from=build /usr/local /usr/local # Let's make sure the app built correctly # Convenient to verify on https://hub.docker.com/r/jrottenberg/ffmpeg/builds/ console output +======= +FROM alpine:3.9 as base + +RUN apk add --no-cache --update libva \ + libgcc \ + libstdc++ \ + ca-certificates \ + libcrypto1.1 \ + libssl1.1 \ + libgomp \ + expat \ + libuuid + +FROM base as build + +WORKDIR /tmp/workdir + +ARG PREFIX=/tmp/build +ARG MAKEFLAGS=-j6 +ARG PKG_CONFIG_PATH=/tmp/build/lib/pkgconfig + +RUN apk add --no-cache --update libva-dev \ + autoconf \ + automake \ + bash \ + binutils \ + bzip2 \ + cmake \ + curl \ + coreutils \ + diffutils \ + file \ + g++ \ + git \ + gcc \ + gperf \ + libtool \ + make \ + python \ + openssl-dev \ + tar \ + yasm \ + nasm \ + zlib-dev \ + expat-dev \ + util-linux-dev \ + meson \ + ninja + +ARG FFMPEG_VERSION=3.2.14 +ARG LIBOPENCORE_AMR_VERSION=0.1.5 +ARG LIBX264_VERSION=20190526-2245-stable +ARG LIBX265_VERSION=3.0 +ARG LIBOGG_VERSION=1.3.3 +ARG LIBOPUS_VERSION=1.3.1 +ARG LIBVORBIS_VERSION=1.3.6 +ARG LIBTHEORA_VERSION=1.1.1 +ARG LIBVPX_VERSION=1.8.0 +ARG LIBMP3LAME_VERSION=3.100 +ARG LIBXVID_VERSION=1.3.5 +ARG LIBFDK_AAC_VERSION=0.1.6 +ARG LIBOPENJPEG_VERSION=2.1.2 +ARG LIBFREETYPE_VERSION=2.10.0 +ARG LIBVIDSTAB_VERSION=1.1.0 +ARG LIBFRIBIDI_VERSION=0.19.7 +ARG LIBFONTCONFIG_VERSION=2.13.1 +ARG LIBFREETYPE_VERSION=2.10.0 +ARG LIBFRIBIDI_VERSION=0.19.7 +ARG LIBFONTCONFIG_VERSION=2.13.1 +ARG LIBASS_VERSION=0.14.0 +ARG LIBKVAZAAR_VERSION=1.2.0 +ARG NVENC_VERSION=9.0.18.1 + +ARG LIBOGG_SHA256SUM=c2e8a485110b97550f453226ec644ebac6cb29d1caef2902c007edab4308d985 +ARG LIBOPUS_SHA256SUM=65b58e1e25b2a114157014736a3d9dfeaad8d41be1c8179866f144a2fb44ff9d +ARG LIBVORBIS_SHA256SUM=6ed40e0241089a42c48604dc00e362beee00036af2d8b3f46338031c9e0351cb +ARG LIBTHEORA_SHA256SUM=40952956c47811928d1e7922cda3bc1f427eb75680c3c37249c91e949054916b +ARG LIBVIDSTAB_SHA256SUM=14d2a053e56edad4f397be0cb3ef8eb1ec3150404ce99a426c4eb641861dc0bb +ARG LIBFRIBIDI_SHA256SUM=3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 +ARG LIBFRIBIDI_SHA256SUM=3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 + +## opencore-amr https://sourceforge.net/projects/opencore-amr/ +RUN \ + DIR=opencore-amr && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://kent.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${LIBOPENCORE_AMR_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +## x264 http://www.videolan.org/developers/x264.html +RUN \ + DIR=x264 && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://download.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-${LIBX264_VERSION}.tar.bz2 | \ + tar -jx --strip-components=1 && \ + ./configure --prefix="${PREFIX}" --enable-shared --enable-pic && \ + make && \ + make install && \ + rm -rf ${DIR} +### x265 http://x265.org/ +RUN \ + DIR=x265 && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://download.videolan.org/pub/videolan/x265/x265_${LIBX265_VERSION}.tar.gz | \ + tar -zx && \ + cd x265_${LIBX265_VERSION}/build/linux && \ + sed -i "/-DEXTRA_LIB/ s/$/ -DCMAKE_INSTALL_PREFIX=\${PREFIX}/" multilib.sh && \ + sed -i "/^cmake/ s/$/ -DENABLE_CLI=ON/" multilib.sh && \ + ./multilib.sh && \ + make -C 8bit install && \ + rm -rf ${DIR} +## libogg https://www.xiph.org/ogg/ +RUN \ + DIR=ogg && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO http://downloads.xiph.org/releases/ogg/libogg-${LIBOGG_VERSION}.tar.gz && \ + echo "${LIBOGG_SHA256SUM} libogg-${LIBOGG_VERSION}.tar.gz" | sha256sum --check && \ + tar -zx --strip-components=1 -f libogg-${LIBOGG_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +RUN \ + DIR=opus && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://archive.mozilla.org/pub/opus/opus-${LIBOPUS_VERSION}.tar.gz && \ + echo "${LIBOPUS_SHA256SUM} opus-${LIBOPUS_VERSION}.tar.gz"| sha256sum --check && \ + tar -zx --strip-components=1 -f opus-${LIBOPUS_VERSION}.tar.gz && \ + autoreconf -fiv && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +### libvorbis https://xiph.org/vorbis/ +RUN \ + DIR=vorbis && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO http://downloads.xiph.org/releases/vorbis/libvorbis-${LIBVORBIS_VERSION}.tar.gz && \ + echo "${LIBVORBIS_SHA256SUM} libvorbis-${LIBVORBIS_VERSION}.tar.gz" | sha256sum --check && \ + tar -zx --strip-components=1 -f libvorbis-${LIBVORBIS_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +### libtheora http://www.theora.org/ +RUN \ + DIR=theora && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO http://downloads.xiph.org/releases/theora/libtheora-${LIBTHEORA_VERSION}.tar.gz && \ + echo "${LIBTHEORA_SHA256SUM} libtheora-${LIBTHEORA_VERSION}.tar.gz" | sha256sum --check && \ + tar -zx --strip-components=1 -f libtheora-${LIBTHEORA_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +### libvpx https://www.webmproject.org/code/ +RUN \ + DIR=vpx && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://codeload.github.com/webmproject/libvpx/tar.gz/v${LIBVPX_VERSION} | \ + tar -zx --strip-components=1 && \ + ./configure --prefix="${PREFIX}" --enable-vp8 --enable-vp9 --enable-vp9-highbitdepth --enable-pic --enable-shared \ + --disable-debug --disable-examples --disable-docs && \ + make && \ + make install && \ + rm -rf ${DIR} + +### libmp3lame http://lame.sourceforge.net/ +RUN \ + DIR=lame && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://kent.dl.sourceforge.net/project/lame/lame/$(echo ${LIBMP3LAME_VERSION} | sed -e 's/[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)/\1.\2/')/lame-${LIBMP3LAME_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" --enable-shared --enable-nasm --enable-pic && \ + make && \ + make install && \ + rm -rf ${DIR} +### xvid https://www.xvid.com/ +RUN \ + DIR=xvid && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO http://downloads.xvid.org/downloads/xvidcore-${LIBXVID_VERSION}.tar.gz && \ + tar -zx -f xvidcore-${LIBXVID_VERSION}.tar.gz && \ + cd xvidcore/build/generic && \ + ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" --datadir="${DIR}" --enable-shared --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +### fdk-aac https://github.com/mstorsjo/fdk-aac +RUN \ + DIR=fdk-aac && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://github.com/mstorsjo/fdk-aac/archive/v${LIBFDK_AAC_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + autoreconf -fiv && \ + ./configure --prefix="${PREFIX}" --enable-shared --datadir="${DIR}" && \ + make && \ + make install && \ + rm -rf ${DIR} +## openjpeg https://github.com/uclouvain/openjpeg +RUN \ + DIR=openjpeg && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + if test `echo ${LIBOPENJPEG_VERSION} | tr -d '.'` -ge '210'; then \ + version_prefix='v'; \ + else \ + version_prefix='version.' ;\ + fi && \ + curl -sL https://github.com/uclouvain/openjpeg/archive/${version_prefix}${LIBOPENJPEG_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + cmake -DBUILD_THIRDPARTY:BOOL=ON -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ + make && \ + make install && \ + rm -rf ${DIR} +## freetype https://www.freetype.org/ +RUN \ + DIR=freetype && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://download.savannah.gnu.org/releases/freetype/freetype-${LIBFREETYPE_VERSION}.tar.gz && \ + tar -zx --strip-components=1 -f freetype-${LIBFREETYPE_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +## libvstab https://github.com/georgmartius/vid.stab +RUN \ + DIR=vid.stab && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/georgmartius/vid.stab/archive/v${LIBVIDSTAB_VERSION}.tar.gz &&\ + echo "${LIBVIDSTAB_SHA256SUM} v${LIBVIDSTAB_VERSION}.tar.gz" | sha256sum --check && \ + tar -zx --strip-components=1 -f v${LIBVIDSTAB_VERSION}.tar.gz && \ + cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ + make && \ + make install && \ + rm -rf ${DIR} +## fridibi https://www.fribidi.org/ +# + https://github.com/fribidi/fribidi/issues/8 +RUN \ + DIR=fribidi && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/fribidi/fribidi/archive/${LIBFRIBIDI_VERSION}.tar.gz && \ + echo "${LIBFRIBIDI_SHA256SUM} ${LIBFRIBIDI_VERSION}.tar.gz" | sha256sum --check && \ + tar -zx --strip-components=1 -f ${LIBFRIBIDI_VERSION}.tar.gz && \ + sed -i 's/^SUBDIRS =.*/SUBDIRS=gen.tab charset lib/' Makefile.am && \ + ./bootstrap --no-config && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ + make -j 1 && \ + make install && \ + rm -rf ${DIR} +## fontconfig https://www.freedesktop.org/wiki/Software/fontconfig/ +RUN \ + DIR=fontconfig && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://www.freedesktop.org/software/fontconfig/release/fontconfig-${LIBFONTCONFIG_VERSION}.tar.bz2 &&\ + tar -jx --strip-components=1 -f fontconfig-${LIBFONTCONFIG_VERSION}.tar.bz2 && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +## freetype https://www.freetype.org/ +RUN \ + DIR=freetype && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://download.savannah.gnu.org/releases/freetype/freetype-${LIBFREETYPE_VERSION}.tar.gz && \ + tar -zx --strip-components=1 -f freetype-${LIBFREETYPE_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +## fridibi https://www.fribidi.org/ +# + https://github.com/fribidi/fribidi/issues/8 +RUN \ + DIR=fribidi && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/fribidi/fribidi/archive/${LIBFRIBIDI_VERSION}.tar.gz && \ + echo "${LIBFRIBIDI_SHA256SUM} ${LIBFRIBIDI_VERSION}.tar.gz" | sha256sum --check && \ + tar -zx --strip-components=1 -f ${LIBFRIBIDI_VERSION}.tar.gz && \ + sed -i 's/^SUBDIRS =.*/SUBDIRS=gen.tab charset lib/' Makefile.am && \ + ./bootstrap --no-config && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ + make -j 1 && \ + make install && \ + rm -rf ${DIR} +## fontconfig https://www.freedesktop.org/wiki/Software/fontconfig/ +RUN \ + DIR=fontconfig && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://www.freedesktop.org/software/fontconfig/release/fontconfig-${LIBFONTCONFIG_VERSION}.tar.bz2 &&\ + tar -jx --strip-components=1 -f fontconfig-${LIBFONTCONFIG_VERSION}.tar.bz2 && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +RUN \ + DIR=libass && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/libass/libass/archive/${LIBASS_VERSION}.tar.gz &&\ + tar -zx --strip-components=1 -f ${LIBASS_VERSION}.tar.gz && \ + ./autogen.sh && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +## kvazaar https://github.com/ultravideo/kvazaar +RUN \ + DIR=kvazaar && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/ultravideo/kvazaar/archive/v${LIBKVAZAAR_VERSION}.tar.gz &&\ + tar -zx --strip-components=1 -f v${LIBKVAZAAR_VERSION}.tar.gz && \ + if [ -e ./autogen.sh ]; then \ + ./autogen.sh && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared ; \ + else \ + cd src ; \ + fi && \ + make && \ + make install && \ + rm -rf ${DIR} + +RUN \ + DIR=nv-codec-headers && \ + git clone --branch n${NVENC_VERSION} --depth=1 https://git.videolan.org/git/ffmpeg/nv-codec-headers.git ${DIR} && \ + cd ${DIR} && \ + sed -i 's@/usr/local@'"$PREFIX"'@' Makefile && \ + make && \ + make install && \ + rm -rf ${DIR} +RUN \ + DIR=ffmpeg && mkdir -p ${DIR} && cd ${DIR} && \ + curl -sLO https://ffmpeg.org/releases/ffmpeg-${FFMPEG_VERSION}.tar.bz2 && \ + tar -jx --strip-components=1 -f ffmpeg-${FFMPEG_VERSION}.tar.bz2 && \ + ./configure \ + --disable-debug \ + --disable-doc \ + --disable-ffplay \ + --enable-shared \ + --enable-avresample \ + --enable-openssl \ + --enable-postproc \ + --enable-small \ + --extra-cflags="-I${PREFIX}/include -I/usr/local/include" \ + --extra-ldflags="-L${PREFIX}/lib -L/usr/local/lib" \ + --enable-libopencore-amrnb \ + --enable-libopencore-amrwb \ + --enable-version3 \ + --enable-libx264 \ + --enable-libx265 \ + --enable-libopus \ + --enable-libvorbis \ + --enable-libtheora \ + --enable-libvpx \ + --enable-libmp3lame \ + --enable-libxvid \ + --enable-libfdk_aac \ + --enable-nonfree \ + --enable-libopenjpeg \ + --enable-libfreetype \ + --enable-libvidstab \ + --enable-gpl \ + --enable-libass \ + --enable-libkvazaar \ + --enable-vaapi \ + --enable-nvenc \ + --enable-nonfree \ + --prefix="${PREFIX}" && \ + make && \ + make install && \ + make distclean && \ + hash -r && \ + cd tools && \ + make qt-faststart && \ + cp qt-faststart ${PREFIX}/bin + +RUN \ + if false; then \ + cp -r ${PREFIX}/lib/*so* /usr/local/lib/ && \ + cp ${PREFIX}/bin/* /usr/local/bin/ ; \ + else \ + LD_LIBRARY_PATH=${PREFIX}/lib ldd ${PREFIX}/bin/ffmpeg | \ + grep ${PREFIX} | \ + cut -d ' ' -f 3 | \ + xargs -i cp {} /usr/local/lib/ && \ + cp ${PREFIX}/bin/ff* /usr/local/bin/ ; \ + fi && \ + if true; then \ + for lib in /usr/local/lib/*.so* /usr/local/bin/*; do strip --strip-all $lib; done ; \ + fi && \ + cp -r ${PREFIX}/share/ffmpeg /usr/local/share/ && \ + LD_LIBRARY_PATH=/usr/local/lib ffmpeg -buildconf + +FROM base AS release +MAINTAINER Julien Rottenberg + +CMD ["--help"] +ENTRYPOINT ["ffmpeg"] + +COPY --from=build /usr/local /usr/local +RUN test "base" = "base" && ldconfig /usr/local/lib /usr/local/lib64 + +# Let's make sure the app built correctly +# Convenient to verify on https://hub.docker.com/r/jrottenberg/ffmpeg/builds/ console output +>>>>>>> fix extra comma diff --git a/docker-images/3.2/nvidia,/Dockerfile b/docker-images/3.2/nvidia,/Dockerfile deleted file mode 100644 index 452b62c02..000000000 --- a/docker-images/3.2/nvidia,/Dockerfile +++ /dev/null @@ -1,14 +0,0 @@ -usage: update.py [-h] [--enable-libopencore-amr] [--enable-libx264] - [--enable-libx265] [--enable-libogg] [--enable-libopus] - [--enable-libvorbis] [--enable-libtheora] [--enable-libvpx] - [--enable-libmp3lame] [--enable-libxvid] - [--enable-libfdk-aac] [--enable-libopenjpeg] - [--enable-libfreetype] [--enable-libvidstab] - [--enable-libfribidi] [--enable-libfontconfig] - [--enable-libass] [--enable-libkvazaar] [--enable-libaom] - [--enable-vaapi] [--enable-nvenc] [--enable-libdav1d] - [--enable-vdpau] [--enable-all] [--with-bins] [--no-strip] - [--fat | --slim | --scratch] - {alpine,centos,ubuntu,nvidia,armv7} - {snapshot,4.1,4.0,3.4,3.3,3.2,2.8} -update.py: error: argument variant: invalid choice: 'nvidia,' (choose from 'alpine', 'centos', 'ubuntu', 'nvidia', 'armv7') diff --git a/docker-images/3.2/nvidia/Dockerfile b/docker-images/3.2/nvidia/Dockerfile index 668231675..112311902 100644 --- a/docker-images/3.2/nvidia/Dockerfile +++ b/docker-images/3.2/nvidia/Dockerfile @@ -1,3 +1,4 @@ +<<<<<<< HEAD # ffmpeg - http://ffmpeg.org/download.html # # From https://trac.ffmpeg.org/wiki/CompilationGuide/Ubuntu @@ -428,3 +429,422 @@ COPY --from=build /usr/local/lib /usr/local/lib/ # Let's make sure the app built correctly # Convenient to verify on https://hub.docker.com/r/jrottenberg/ffmpeg/builds/ console output +======= +FROM nvidia/cuda:10.1-runtime-ubuntu18.04 AS base + +ENV NVIDIA_DRIVER_CAPABILITIES=video + +RUN apt-get -yqq update && \ + apt-get install -yq --no-install-recommends libva2 libva-drm2 i965-va-driver ca-certificates expat libgomp1 libuuid1 libssl1.0 && \ + apt-get autoremove -y && \ + apt-get clean -y + +FROM base as build + +WORKDIR /tmp/workdir + +ARG PREFIX=/tmp/build +ARG MAKEFLAGS=-j6 +ARG PKG_CONFIG_PATH=/tmp/build/lib/pkgconfig +ARG C_INCLUDE_PATH=/tmp/build/include/ffnvcodec + +RUN apt-get -yqq update && \ + apt-get install -yq --no-install-recommends \ + libva-dev \ + autoconf \ + automake \ + cmake \ + curl \ + bzip2 \ + libexpat1-dev \ + g++ \ + gcc \ + git \ + gperf \ + libtool \ + make \ + nasm \ + perl \ + pkg-config \ + python \ + libssl1.0-dev \ + yasm \ + zlib1g-dev \ + uuid-dev + +ARG FFMPEG_VERSION=3.2.14 +ARG LIBOPENCORE_AMR_VERSION=0.1.5 +ARG LIBX264_VERSION=20190526-2245-stable +ARG LIBX265_VERSION=3.0 +ARG LIBOGG_VERSION=1.3.3 +ARG LIBOPUS_VERSION=1.3.1 +ARG LIBVORBIS_VERSION=1.3.6 +ARG LIBTHEORA_VERSION=1.1.1 +ARG LIBVPX_VERSION=1.8.0 +ARG LIBMP3LAME_VERSION=3.100 +ARG LIBXVID_VERSION=1.3.5 +ARG LIBFDK_AAC_VERSION=0.1.6 +ARG LIBOPENJPEG_VERSION=2.1.2 +ARG LIBFREETYPE_VERSION=2.10.0 +ARG LIBVIDSTAB_VERSION=1.1.0 +ARG LIBFRIBIDI_VERSION=0.19.7 +ARG LIBFONTCONFIG_VERSION=2.13.1 +ARG LIBFREETYPE_VERSION=2.10.0 +ARG LIBFRIBIDI_VERSION=0.19.7 +ARG LIBFONTCONFIG_VERSION=2.13.1 +ARG LIBASS_VERSION=0.14.0 +ARG LIBKVAZAAR_VERSION=1.2.0 +ARG NVENC_VERSION=9.0.18.1 + +ARG LIBOGG_SHA256SUM=c2e8a485110b97550f453226ec644ebac6cb29d1caef2902c007edab4308d985 +ARG LIBOPUS_SHA256SUM=65b58e1e25b2a114157014736a3d9dfeaad8d41be1c8179866f144a2fb44ff9d +ARG LIBVORBIS_SHA256SUM=6ed40e0241089a42c48604dc00e362beee00036af2d8b3f46338031c9e0351cb +ARG LIBTHEORA_SHA256SUM=40952956c47811928d1e7922cda3bc1f427eb75680c3c37249c91e949054916b +ARG LIBVIDSTAB_SHA256SUM=14d2a053e56edad4f397be0cb3ef8eb1ec3150404ce99a426c4eb641861dc0bb +ARG LIBFRIBIDI_SHA256SUM=3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 +ARG LIBFRIBIDI_SHA256SUM=3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 + +## opencore-amr https://sourceforge.net/projects/opencore-amr/ +RUN \ + DIR=opencore-amr && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://kent.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${LIBOPENCORE_AMR_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +## x264 http://www.videolan.org/developers/x264.html +RUN \ + DIR=x264 && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://download.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-${LIBX264_VERSION}.tar.bz2 | \ + tar -jx --strip-components=1 && \ + ./configure --prefix="${PREFIX}" --enable-shared --enable-pic && \ + make && \ + make install && \ + rm -rf ${DIR} +### x265 http://x265.org/ +RUN \ + DIR=x265 && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://download.videolan.org/pub/videolan/x265/x265_${LIBX265_VERSION}.tar.gz | \ + tar -zx && \ + cd x265_${LIBX265_VERSION}/build/linux && \ + sed -i "/-DEXTRA_LIB/ s/$/ -DCMAKE_INSTALL_PREFIX=\${PREFIX}/" multilib.sh && \ + sed -i "/^cmake/ s/$/ -DENABLE_CLI=ON/" multilib.sh && \ + ./multilib.sh && \ + make -C 8bit install && \ + rm -rf ${DIR} +## libogg https://www.xiph.org/ogg/ +RUN \ + DIR=ogg && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO http://downloads.xiph.org/releases/ogg/libogg-${LIBOGG_VERSION}.tar.gz && \ + echo "${LIBOGG_SHA256SUM} libogg-${LIBOGG_VERSION}.tar.gz" | sha256sum --check && \ + tar -zx --strip-components=1 -f libogg-${LIBOGG_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +RUN \ + DIR=opus && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://archive.mozilla.org/pub/opus/opus-${LIBOPUS_VERSION}.tar.gz && \ + echo "${LIBOPUS_SHA256SUM} opus-${LIBOPUS_VERSION}.tar.gz"| sha256sum --check && \ + tar -zx --strip-components=1 -f opus-${LIBOPUS_VERSION}.tar.gz && \ + autoreconf -fiv && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +### libvorbis https://xiph.org/vorbis/ +RUN \ + DIR=vorbis && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO http://downloads.xiph.org/releases/vorbis/libvorbis-${LIBVORBIS_VERSION}.tar.gz && \ + echo "${LIBVORBIS_SHA256SUM} libvorbis-${LIBVORBIS_VERSION}.tar.gz" | sha256sum --check && \ + tar -zx --strip-components=1 -f libvorbis-${LIBVORBIS_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +### libtheora http://www.theora.org/ +RUN \ + DIR=theora && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO http://downloads.xiph.org/releases/theora/libtheora-${LIBTHEORA_VERSION}.tar.gz && \ + echo "${LIBTHEORA_SHA256SUM} libtheora-${LIBTHEORA_VERSION}.tar.gz" | sha256sum --check && \ + tar -zx --strip-components=1 -f libtheora-${LIBTHEORA_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +### libvpx https://www.webmproject.org/code/ +RUN \ + DIR=vpx && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://codeload.github.com/webmproject/libvpx/tar.gz/v${LIBVPX_VERSION} | \ + tar -zx --strip-components=1 && \ + ./configure --prefix="${PREFIX}" --enable-vp8 --enable-vp9 --enable-vp9-highbitdepth --enable-pic --enable-shared \ + --disable-debug --disable-examples --disable-docs && \ + make && \ + make install && \ + rm -rf ${DIR} + +### libmp3lame http://lame.sourceforge.net/ +RUN \ + DIR=lame && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://kent.dl.sourceforge.net/project/lame/lame/$(echo ${LIBMP3LAME_VERSION} | sed -e 's/[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)/\1.\2/')/lame-${LIBMP3LAME_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" --enable-shared --enable-nasm --enable-pic && \ + make && \ + make install && \ + rm -rf ${DIR} +### xvid https://www.xvid.com/ +RUN \ + DIR=xvid && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO http://downloads.xvid.org/downloads/xvidcore-${LIBXVID_VERSION}.tar.gz && \ + tar -zx -f xvidcore-${LIBXVID_VERSION}.tar.gz && \ + cd xvidcore/build/generic && \ + ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" --datadir="${DIR}" --enable-shared --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +### fdk-aac https://github.com/mstorsjo/fdk-aac +RUN \ + DIR=fdk-aac && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://github.com/mstorsjo/fdk-aac/archive/v${LIBFDK_AAC_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + autoreconf -fiv && \ + ./configure --prefix="${PREFIX}" --enable-shared --datadir="${DIR}" && \ + make && \ + make install && \ + rm -rf ${DIR} +## openjpeg https://github.com/uclouvain/openjpeg +RUN \ + DIR=openjpeg && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + if test `echo ${LIBOPENJPEG_VERSION} | tr -d '.'` -ge '210'; then \ + version_prefix='v'; \ + else \ + version_prefix='version.' ;\ + fi && \ + curl -sL https://github.com/uclouvain/openjpeg/archive/${version_prefix}${LIBOPENJPEG_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + cmake -DBUILD_THIRDPARTY:BOOL=ON -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ + make && \ + make install && \ + rm -rf ${DIR} +## freetype https://www.freetype.org/ +RUN \ + DIR=freetype && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://download.savannah.gnu.org/releases/freetype/freetype-${LIBFREETYPE_VERSION}.tar.gz && \ + tar -zx --strip-components=1 -f freetype-${LIBFREETYPE_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +## libvstab https://github.com/georgmartius/vid.stab +RUN \ + DIR=vid.stab && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/georgmartius/vid.stab/archive/v${LIBVIDSTAB_VERSION}.tar.gz &&\ + echo "${LIBVIDSTAB_SHA256SUM} v${LIBVIDSTAB_VERSION}.tar.gz" | sha256sum --check && \ + tar -zx --strip-components=1 -f v${LIBVIDSTAB_VERSION}.tar.gz && \ + cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ + make && \ + make install && \ + rm -rf ${DIR} +## fridibi https://www.fribidi.org/ +# + https://github.com/fribidi/fribidi/issues/8 +RUN \ + DIR=fribidi && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/fribidi/fribidi/archive/${LIBFRIBIDI_VERSION}.tar.gz && \ + echo "${LIBFRIBIDI_SHA256SUM} ${LIBFRIBIDI_VERSION}.tar.gz" | sha256sum --check && \ + tar -zx --strip-components=1 -f ${LIBFRIBIDI_VERSION}.tar.gz && \ + sed -i 's/^SUBDIRS =.*/SUBDIRS=gen.tab charset lib/' Makefile.am && \ + ./bootstrap --no-config && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ + make -j 1 && \ + make install && \ + rm -rf ${DIR} +## fontconfig https://www.freedesktop.org/wiki/Software/fontconfig/ +RUN \ + DIR=fontconfig && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://www.freedesktop.org/software/fontconfig/release/fontconfig-${LIBFONTCONFIG_VERSION}.tar.bz2 &&\ + tar -jx --strip-components=1 -f fontconfig-${LIBFONTCONFIG_VERSION}.tar.bz2 && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +## freetype https://www.freetype.org/ +RUN \ + DIR=freetype && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://download.savannah.gnu.org/releases/freetype/freetype-${LIBFREETYPE_VERSION}.tar.gz && \ + tar -zx --strip-components=1 -f freetype-${LIBFREETYPE_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +## fridibi https://www.fribidi.org/ +# + https://github.com/fribidi/fribidi/issues/8 +RUN \ + DIR=fribidi && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/fribidi/fribidi/archive/${LIBFRIBIDI_VERSION}.tar.gz && \ + echo "${LIBFRIBIDI_SHA256SUM} ${LIBFRIBIDI_VERSION}.tar.gz" | sha256sum --check && \ + tar -zx --strip-components=1 -f ${LIBFRIBIDI_VERSION}.tar.gz && \ + sed -i 's/^SUBDIRS =.*/SUBDIRS=gen.tab charset lib/' Makefile.am && \ + ./bootstrap --no-config && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ + make -j 1 && \ + make install && \ + rm -rf ${DIR} +## fontconfig https://www.freedesktop.org/wiki/Software/fontconfig/ +RUN \ + DIR=fontconfig && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://www.freedesktop.org/software/fontconfig/release/fontconfig-${LIBFONTCONFIG_VERSION}.tar.bz2 &&\ + tar -jx --strip-components=1 -f fontconfig-${LIBFONTCONFIG_VERSION}.tar.bz2 && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +RUN \ + DIR=libass && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/libass/libass/archive/${LIBASS_VERSION}.tar.gz &&\ + tar -zx --strip-components=1 -f ${LIBASS_VERSION}.tar.gz && \ + ./autogen.sh && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +## kvazaar https://github.com/ultravideo/kvazaar +RUN \ + DIR=kvazaar && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/ultravideo/kvazaar/archive/v${LIBKVAZAAR_VERSION}.tar.gz &&\ + tar -zx --strip-components=1 -f v${LIBKVAZAAR_VERSION}.tar.gz && \ + if [ -e ./autogen.sh ]; then \ + ./autogen.sh && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared ; \ + else \ + cd src ; \ + fi && \ + make && \ + make install && \ + rm -rf ${DIR} + +RUN \ + DIR=nv-codec-headers && \ + git clone --branch n${NVENC_VERSION} --depth=1 https://git.videolan.org/git/ffmpeg/nv-codec-headers.git ${DIR} && \ + cd ${DIR} && \ + sed -i 's@/usr/local@'"$PREFIX"'@' Makefile && \ + make && \ + make install && \ + rm -rf ${DIR} +RUN \ + DIR=ffmpeg && mkdir -p ${DIR} && cd ${DIR} && \ + curl -sLO https://ffmpeg.org/releases/ffmpeg-${FFMPEG_VERSION}.tar.bz2 && \ + tar -jx --strip-components=1 -f ffmpeg-${FFMPEG_VERSION}.tar.bz2 && \ + ./configure \ + --disable-debug \ + --disable-doc \ + --disable-ffplay \ + --enable-shared \ + --enable-avresample \ + --enable-openssl \ + --enable-postproc \ + --enable-small \ + --extra-cflags="-I${PREFIX}/include -I/usr/local/include" \ + --extra-ldflags="-L${PREFIX}/lib -L/usr/local/lib" \ + --enable-libopencore-amrnb \ + --enable-libopencore-amrwb \ + --enable-version3 \ + --enable-libx264 \ + --enable-libx265 \ + --enable-libopus \ + --enable-libvorbis \ + --enable-libtheora \ + --enable-libvpx \ + --enable-libmp3lame \ + --enable-libxvid \ + --enable-libfdk_aac \ + --enable-nonfree \ + --enable-libopenjpeg \ + --enable-libfreetype \ + --enable-libvidstab \ + --enable-gpl \ + --enable-libass \ + --enable-libkvazaar \ + --enable-vaapi \ + --enable-nvenc \ + --enable-nonfree \ + --prefix="${PREFIX}" && \ + make && \ + make install && \ + make distclean && \ + hash -r && \ + cd tools && \ + make qt-faststart && \ + cp qt-faststart ${PREFIX}/bin + +RUN \ + if false; then \ + cp -r ${PREFIX}/lib/*so* /usr/local/lib/ && \ + cp ${PREFIX}/bin/* /usr/local/bin/ ; \ + else \ + LD_LIBRARY_PATH=${PREFIX}/lib ldd ${PREFIX}/bin/ffmpeg | \ + grep ${PREFIX} | \ + cut -d ' ' -f 3 | \ + xargs -i cp {} /usr/local/lib/ && \ + cp ${PREFIX}/bin/ff* /usr/local/bin/ ; \ + fi && \ + if true; then \ + for lib in /usr/local/lib/*.so* /usr/local/bin/*; do strip --strip-all $lib; done ; \ + fi && \ + cp -r ${PREFIX}/share/ffmpeg /usr/local/share/ && \ + LD_LIBRARY_PATH=/usr/local/lib ffmpeg -buildconf + +FROM base AS release +MAINTAINER Julien Rottenberg + +CMD ["--help"] +ENTRYPOINT ["ffmpeg"] + +COPY --from=build /usr/local /usr/local +RUN test "base" = "base" && ldconfig /usr/local/lib /usr/local/lib64 + +# Let's make sure the app built correctly +# Convenient to verify on https://hub.docker.com/r/jrottenberg/ffmpeg/builds/ console output +>>>>>>> fix extra comma diff --git a/docker-images/3.3/alpine,/Dockerfile b/docker-images/3.3/alpine,/Dockerfile deleted file mode 100644 index a0b97723e..000000000 --- a/docker-images/3.3/alpine,/Dockerfile +++ /dev/null @@ -1,14 +0,0 @@ -usage: update.py [-h] [--enable-libopencore-amr] [--enable-libx264] - [--enable-libx265] [--enable-libogg] [--enable-libopus] - [--enable-libvorbis] [--enable-libtheora] [--enable-libvpx] - [--enable-libmp3lame] [--enable-libxvid] - [--enable-libfdk-aac] [--enable-libopenjpeg] - [--enable-libfreetype] [--enable-libvidstab] - [--enable-libfribidi] [--enable-libfontconfig] - [--enable-libass] [--enable-libkvazaar] [--enable-libaom] - [--enable-vaapi] [--enable-nvenc] [--enable-libdav1d] - [--enable-vdpau] [--enable-all] [--with-bins] [--no-strip] - [--fat | --slim | --scratch] - {alpine,centos,ubuntu,nvidia,armv7} - {snapshot,4.1,4.0,3.4,3.3,3.2,2.8} -update.py: error: argument variant: invalid choice: 'alpine,' (choose from 'alpine', 'centos', 'ubuntu', 'nvidia', 'armv7') diff --git a/docker-images/3.3/alpine/Dockerfile b/docker-images/3.3/alpine/Dockerfile index 75c792756..e4b912630 100644 --- a/docker-images/3.3/alpine/Dockerfile +++ b/docker-images/3.3/alpine/Dockerfile @@ -1,3 +1,4 @@ +<<<<<<< HEAD # ffmpeg - http://ffmpeg.org/download.html # # https://hub.docker.com/r/jrottenberg/ffmpeg/ @@ -388,3 +389,429 @@ COPY --from=build /usr/local /usr/local # Let's make sure the app built correctly # Convenient to verify on https://hub.docker.com/r/jrottenberg/ffmpeg/builds/ console output +======= +FROM alpine:3.9 as base + +RUN apk add --no-cache --update libva \ + libgcc \ + libstdc++ \ + ca-certificates \ + libcrypto1.1 \ + libssl1.1 \ + libgomp \ + expat \ + libuuid + +FROM base as build + +WORKDIR /tmp/workdir + +ARG PREFIX=/tmp/build +ARG MAKEFLAGS=-j6 +ARG PKG_CONFIG_PATH=/tmp/build/lib/pkgconfig + +RUN apk add --no-cache --update libva-dev \ + autoconf \ + automake \ + bash \ + binutils \ + bzip2 \ + cmake \ + curl \ + coreutils \ + diffutils \ + file \ + g++ \ + git \ + gcc \ + gperf \ + libtool \ + make \ + python \ + openssl-dev \ + tar \ + yasm \ + nasm \ + zlib-dev \ + expat-dev \ + util-linux-dev \ + meson \ + ninja + +ARG FFMPEG_VERSION=3.3.9 +ARG LIBOPENCORE_AMR_VERSION=0.1.5 +ARG LIBX264_VERSION=20190526-2245-stable +ARG LIBX265_VERSION=3.0 +ARG LIBOGG_VERSION=1.3.3 +ARG LIBOPUS_VERSION=1.3.1 +ARG LIBVORBIS_VERSION=1.3.6 +ARG LIBTHEORA_VERSION=1.1.1 +ARG LIBVPX_VERSION=1.8.0 +ARG LIBMP3LAME_VERSION=3.100 +ARG LIBXVID_VERSION=1.3.5 +ARG LIBFDK_AAC_VERSION=0.1.6 +ARG LIBOPENJPEG_VERSION=2.1.2 +ARG LIBFREETYPE_VERSION=2.10.0 +ARG LIBVIDSTAB_VERSION=1.1.0 +ARG LIBFRIBIDI_VERSION=0.19.7 +ARG LIBFONTCONFIG_VERSION=2.13.1 +ARG LIBFREETYPE_VERSION=2.10.0 +ARG LIBFRIBIDI_VERSION=0.19.7 +ARG LIBFONTCONFIG_VERSION=2.13.1 +ARG LIBASS_VERSION=0.14.0 +ARG LIBKVAZAAR_VERSION=1.2.0 +ARG NVENC_VERSION=9.0.18.1 + +ARG LIBOGG_SHA256SUM=c2e8a485110b97550f453226ec644ebac6cb29d1caef2902c007edab4308d985 +ARG LIBOPUS_SHA256SUM=65b58e1e25b2a114157014736a3d9dfeaad8d41be1c8179866f144a2fb44ff9d +ARG LIBVORBIS_SHA256SUM=6ed40e0241089a42c48604dc00e362beee00036af2d8b3f46338031c9e0351cb +ARG LIBTHEORA_SHA256SUM=40952956c47811928d1e7922cda3bc1f427eb75680c3c37249c91e949054916b +ARG LIBVIDSTAB_SHA256SUM=14d2a053e56edad4f397be0cb3ef8eb1ec3150404ce99a426c4eb641861dc0bb +ARG LIBFRIBIDI_SHA256SUM=3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 +ARG LIBFRIBIDI_SHA256SUM=3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 + +## opencore-amr https://sourceforge.net/projects/opencore-amr/ +RUN \ + DIR=opencore-amr && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://kent.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${LIBOPENCORE_AMR_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +## x264 http://www.videolan.org/developers/x264.html +RUN \ + DIR=x264 && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://download.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-${LIBX264_VERSION}.tar.bz2 | \ + tar -jx --strip-components=1 && \ + ./configure --prefix="${PREFIX}" --enable-shared --enable-pic && \ + make && \ + make install && \ + rm -rf ${DIR} +### x265 http://x265.org/ +RUN \ + DIR=x265 && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://download.videolan.org/pub/videolan/x265/x265_${LIBX265_VERSION}.tar.gz | \ + tar -zx && \ + cd x265_${LIBX265_VERSION}/build/linux && \ + sed -i "/-DEXTRA_LIB/ s/$/ -DCMAKE_INSTALL_PREFIX=\${PREFIX}/" multilib.sh && \ + sed -i "/^cmake/ s/$/ -DENABLE_CLI=ON/" multilib.sh && \ + ./multilib.sh && \ + make -C 8bit install && \ + rm -rf ${DIR} +## libogg https://www.xiph.org/ogg/ +RUN \ + DIR=ogg && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO http://downloads.xiph.org/releases/ogg/libogg-${LIBOGG_VERSION}.tar.gz && \ + echo "${LIBOGG_SHA256SUM} libogg-${LIBOGG_VERSION}.tar.gz" | sha256sum --check && \ + tar -zx --strip-components=1 -f libogg-${LIBOGG_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +RUN \ + DIR=opus && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://archive.mozilla.org/pub/opus/opus-${LIBOPUS_VERSION}.tar.gz && \ + echo "${LIBOPUS_SHA256SUM} opus-${LIBOPUS_VERSION}.tar.gz"| sha256sum --check && \ + tar -zx --strip-components=1 -f opus-${LIBOPUS_VERSION}.tar.gz && \ + autoreconf -fiv && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +### libvorbis https://xiph.org/vorbis/ +RUN \ + DIR=vorbis && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO http://downloads.xiph.org/releases/vorbis/libvorbis-${LIBVORBIS_VERSION}.tar.gz && \ + echo "${LIBVORBIS_SHA256SUM} libvorbis-${LIBVORBIS_VERSION}.tar.gz" | sha256sum --check && \ + tar -zx --strip-components=1 -f libvorbis-${LIBVORBIS_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +### libtheora http://www.theora.org/ +RUN \ + DIR=theora && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO http://downloads.xiph.org/releases/theora/libtheora-${LIBTHEORA_VERSION}.tar.gz && \ + echo "${LIBTHEORA_SHA256SUM} libtheora-${LIBTHEORA_VERSION}.tar.gz" | sha256sum --check && \ + tar -zx --strip-components=1 -f libtheora-${LIBTHEORA_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +### libvpx https://www.webmproject.org/code/ +RUN \ + DIR=vpx && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://codeload.github.com/webmproject/libvpx/tar.gz/v${LIBVPX_VERSION} | \ + tar -zx --strip-components=1 && \ + ./configure --prefix="${PREFIX}" --enable-vp8 --enable-vp9 --enable-vp9-highbitdepth --enable-pic --enable-shared \ + --disable-debug --disable-examples --disable-docs && \ + make && \ + make install && \ + rm -rf ${DIR} + +### libmp3lame http://lame.sourceforge.net/ +RUN \ + DIR=lame && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://kent.dl.sourceforge.net/project/lame/lame/$(echo ${LIBMP3LAME_VERSION} | sed -e 's/[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)/\1.\2/')/lame-${LIBMP3LAME_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" --enable-shared --enable-nasm --enable-pic && \ + make && \ + make install && \ + rm -rf ${DIR} +### xvid https://www.xvid.com/ +RUN \ + DIR=xvid && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO http://downloads.xvid.org/downloads/xvidcore-${LIBXVID_VERSION}.tar.gz && \ + tar -zx -f xvidcore-${LIBXVID_VERSION}.tar.gz && \ + cd xvidcore/build/generic && \ + ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" --datadir="${DIR}" --enable-shared --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +### fdk-aac https://github.com/mstorsjo/fdk-aac +RUN \ + DIR=fdk-aac && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://github.com/mstorsjo/fdk-aac/archive/v${LIBFDK_AAC_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + autoreconf -fiv && \ + ./configure --prefix="${PREFIX}" --enable-shared --datadir="${DIR}" && \ + make && \ + make install && \ + rm -rf ${DIR} +## openjpeg https://github.com/uclouvain/openjpeg +RUN \ + DIR=openjpeg && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + if test `echo ${LIBOPENJPEG_VERSION} | tr -d '.'` -ge '210'; then \ + version_prefix='v'; \ + else \ + version_prefix='version.' ;\ + fi && \ + curl -sL https://github.com/uclouvain/openjpeg/archive/${version_prefix}${LIBOPENJPEG_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + cmake -DBUILD_THIRDPARTY:BOOL=ON -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ + make && \ + make install && \ + rm -rf ${DIR} +## freetype https://www.freetype.org/ +RUN \ + DIR=freetype && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://download.savannah.gnu.org/releases/freetype/freetype-${LIBFREETYPE_VERSION}.tar.gz && \ + tar -zx --strip-components=1 -f freetype-${LIBFREETYPE_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +## libvstab https://github.com/georgmartius/vid.stab +RUN \ + DIR=vid.stab && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/georgmartius/vid.stab/archive/v${LIBVIDSTAB_VERSION}.tar.gz &&\ + echo "${LIBVIDSTAB_SHA256SUM} v${LIBVIDSTAB_VERSION}.tar.gz" | sha256sum --check && \ + tar -zx --strip-components=1 -f v${LIBVIDSTAB_VERSION}.tar.gz && \ + cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ + make && \ + make install && \ + rm -rf ${DIR} +## fridibi https://www.fribidi.org/ +# + https://github.com/fribidi/fribidi/issues/8 +RUN \ + DIR=fribidi && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/fribidi/fribidi/archive/${LIBFRIBIDI_VERSION}.tar.gz && \ + echo "${LIBFRIBIDI_SHA256SUM} ${LIBFRIBIDI_VERSION}.tar.gz" | sha256sum --check && \ + tar -zx --strip-components=1 -f ${LIBFRIBIDI_VERSION}.tar.gz && \ + sed -i 's/^SUBDIRS =.*/SUBDIRS=gen.tab charset lib/' Makefile.am && \ + ./bootstrap --no-config && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ + make -j 1 && \ + make install && \ + rm -rf ${DIR} +## fontconfig https://www.freedesktop.org/wiki/Software/fontconfig/ +RUN \ + DIR=fontconfig && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://www.freedesktop.org/software/fontconfig/release/fontconfig-${LIBFONTCONFIG_VERSION}.tar.bz2 &&\ + tar -jx --strip-components=1 -f fontconfig-${LIBFONTCONFIG_VERSION}.tar.bz2 && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +## freetype https://www.freetype.org/ +RUN \ + DIR=freetype && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://download.savannah.gnu.org/releases/freetype/freetype-${LIBFREETYPE_VERSION}.tar.gz && \ + tar -zx --strip-components=1 -f freetype-${LIBFREETYPE_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +## fridibi https://www.fribidi.org/ +# + https://github.com/fribidi/fribidi/issues/8 +RUN \ + DIR=fribidi && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/fribidi/fribidi/archive/${LIBFRIBIDI_VERSION}.tar.gz && \ + echo "${LIBFRIBIDI_SHA256SUM} ${LIBFRIBIDI_VERSION}.tar.gz" | sha256sum --check && \ + tar -zx --strip-components=1 -f ${LIBFRIBIDI_VERSION}.tar.gz && \ + sed -i 's/^SUBDIRS =.*/SUBDIRS=gen.tab charset lib/' Makefile.am && \ + ./bootstrap --no-config && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ + make -j 1 && \ + make install && \ + rm -rf ${DIR} +## fontconfig https://www.freedesktop.org/wiki/Software/fontconfig/ +RUN \ + DIR=fontconfig && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://www.freedesktop.org/software/fontconfig/release/fontconfig-${LIBFONTCONFIG_VERSION}.tar.bz2 &&\ + tar -jx --strip-components=1 -f fontconfig-${LIBFONTCONFIG_VERSION}.tar.bz2 && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +RUN \ + DIR=libass && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/libass/libass/archive/${LIBASS_VERSION}.tar.gz &&\ + tar -zx --strip-components=1 -f ${LIBASS_VERSION}.tar.gz && \ + ./autogen.sh && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +## kvazaar https://github.com/ultravideo/kvazaar +RUN \ + DIR=kvazaar && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/ultravideo/kvazaar/archive/v${LIBKVAZAAR_VERSION}.tar.gz &&\ + tar -zx --strip-components=1 -f v${LIBKVAZAAR_VERSION}.tar.gz && \ + if [ -e ./autogen.sh ]; then \ + ./autogen.sh && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared ; \ + else \ + cd src ; \ + fi && \ + make && \ + make install && \ + rm -rf ${DIR} + +RUN \ + DIR=nv-codec-headers && \ + git clone --branch n${NVENC_VERSION} --depth=1 https://git.videolan.org/git/ffmpeg/nv-codec-headers.git ${DIR} && \ + cd ${DIR} && \ + sed -i 's@/usr/local@'"$PREFIX"'@' Makefile && \ + make && \ + make install && \ + rm -rf ${DIR} +RUN \ + DIR=ffmpeg && mkdir -p ${DIR} && cd ${DIR} && \ + curl -sLO https://ffmpeg.org/releases/ffmpeg-${FFMPEG_VERSION}.tar.bz2 && \ + tar -jx --strip-components=1 -f ffmpeg-${FFMPEG_VERSION}.tar.bz2 && \ + ./configure \ + --disable-debug \ + --disable-doc \ + --disable-ffplay \ + --enable-shared \ + --enable-avresample \ + --enable-openssl \ + --enable-postproc \ + --enable-small \ + --extra-cflags="-I${PREFIX}/include -I/usr/local/include" \ + --extra-ldflags="-L${PREFIX}/lib -L/usr/local/lib" \ + --enable-libopencore-amrnb \ + --enable-libopencore-amrwb \ + --enable-version3 \ + --enable-libx264 \ + --enable-libx265 \ + --enable-libopus \ + --enable-libvorbis \ + --enable-libtheora \ + --enable-libvpx \ + --enable-libmp3lame \ + --enable-libxvid \ + --enable-libfdk_aac \ + --enable-nonfree \ + --enable-libopenjpeg \ + --enable-libfreetype \ + --enable-libvidstab \ + --enable-gpl \ + --enable-libass \ + --enable-libkvazaar \ + --enable-vaapi \ + --enable-cuda \ + --enable-nvenc \ + --enable-cuvid \ + --prefix="${PREFIX}" && \ + make && \ + make install && \ + make distclean && \ + hash -r && \ + cd tools && \ + make qt-faststart && \ + cp qt-faststart ${PREFIX}/bin + +RUN \ + if false; then \ + cp -r ${PREFIX}/lib/*so* /usr/local/lib/ && \ + cp ${PREFIX}/bin/* /usr/local/bin/ ; \ + else \ + LD_LIBRARY_PATH=${PREFIX}/lib ldd ${PREFIX}/bin/ffmpeg | \ + grep ${PREFIX} | \ + cut -d ' ' -f 3 | \ + xargs -i cp {} /usr/local/lib/ && \ + cp ${PREFIX}/bin/ff* /usr/local/bin/ ; \ + fi && \ + if true; then \ + for lib in /usr/local/lib/*.so* /usr/local/bin/*; do strip --strip-all $lib; done ; \ + fi && \ + cp -r ${PREFIX}/share/ffmpeg /usr/local/share/ && \ + LD_LIBRARY_PATH=/usr/local/lib ffmpeg -buildconf + +FROM base AS release +MAINTAINER Julien Rottenberg + +CMD ["--help"] +ENTRYPOINT ["ffmpeg"] + +COPY --from=build /usr/local /usr/local +RUN test "base" = "base" && ldconfig /usr/local/lib /usr/local/lib64 + +# Let's make sure the app built correctly +# Convenient to verify on https://hub.docker.com/r/jrottenberg/ffmpeg/builds/ console output +>>>>>>> fix extra comma diff --git a/docker-images/3.3/nvidia,/Dockerfile b/docker-images/3.3/nvidia,/Dockerfile deleted file mode 100644 index 452b62c02..000000000 --- a/docker-images/3.3/nvidia,/Dockerfile +++ /dev/null @@ -1,14 +0,0 @@ -usage: update.py [-h] [--enable-libopencore-amr] [--enable-libx264] - [--enable-libx265] [--enable-libogg] [--enable-libopus] - [--enable-libvorbis] [--enable-libtheora] [--enable-libvpx] - [--enable-libmp3lame] [--enable-libxvid] - [--enable-libfdk-aac] [--enable-libopenjpeg] - [--enable-libfreetype] [--enable-libvidstab] - [--enable-libfribidi] [--enable-libfontconfig] - [--enable-libass] [--enable-libkvazaar] [--enable-libaom] - [--enable-vaapi] [--enable-nvenc] [--enable-libdav1d] - [--enable-vdpau] [--enable-all] [--with-bins] [--no-strip] - [--fat | --slim | --scratch] - {alpine,centos,ubuntu,nvidia,armv7} - {snapshot,4.1,4.0,3.4,3.3,3.2,2.8} -update.py: error: argument variant: invalid choice: 'nvidia,' (choose from 'alpine', 'centos', 'ubuntu', 'nvidia', 'armv7') diff --git a/docker-images/3.3/nvidia/Dockerfile b/docker-images/3.3/nvidia/Dockerfile index 5b8394427..b3846e25f 100644 --- a/docker-images/3.3/nvidia/Dockerfile +++ b/docker-images/3.3/nvidia/Dockerfile @@ -1,3 +1,4 @@ +<<<<<<< HEAD # ffmpeg - http://ffmpeg.org/download.html # # From https://trac.ffmpeg.org/wiki/CompilationGuide/Ubuntu @@ -420,3 +421,423 @@ COPY --from=build /usr/local/lib /usr/local/lib/ # Let's make sure the app built correctly # Convenient to verify on https://hub.docker.com/r/jrottenberg/ffmpeg/builds/ console output +======= +FROM nvidia/cuda:10.1-runtime-ubuntu18.04 AS base + +ENV NVIDIA_DRIVER_CAPABILITIES=video + +RUN apt-get -yqq update && \ + apt-get install -yq --no-install-recommends libva2 libva-drm2 i965-va-driver ca-certificates expat libgomp1 libuuid1 libssl1.0 && \ + apt-get autoremove -y && \ + apt-get clean -y + +FROM base as build + +WORKDIR /tmp/workdir + +ARG PREFIX=/tmp/build +ARG MAKEFLAGS=-j6 +ARG PKG_CONFIG_PATH=/tmp/build/lib/pkgconfig +ARG C_INCLUDE_PATH=/tmp/build/include/ffnvcodec + +RUN apt-get -yqq update && \ + apt-get install -yq --no-install-recommends \ + libva-dev \ + autoconf \ + automake \ + cmake \ + curl \ + bzip2 \ + libexpat1-dev \ + g++ \ + gcc \ + git \ + gperf \ + libtool \ + make \ + nasm \ + perl \ + pkg-config \ + python \ + libssl1.0-dev \ + yasm \ + zlib1g-dev \ + uuid-dev + +ARG FFMPEG_VERSION=3.3.9 +ARG LIBOPENCORE_AMR_VERSION=0.1.5 +ARG LIBX264_VERSION=20190526-2245-stable +ARG LIBX265_VERSION=3.0 +ARG LIBOGG_VERSION=1.3.3 +ARG LIBOPUS_VERSION=1.3.1 +ARG LIBVORBIS_VERSION=1.3.6 +ARG LIBTHEORA_VERSION=1.1.1 +ARG LIBVPX_VERSION=1.8.0 +ARG LIBMP3LAME_VERSION=3.100 +ARG LIBXVID_VERSION=1.3.5 +ARG LIBFDK_AAC_VERSION=0.1.6 +ARG LIBOPENJPEG_VERSION=2.1.2 +ARG LIBFREETYPE_VERSION=2.10.0 +ARG LIBVIDSTAB_VERSION=1.1.0 +ARG LIBFRIBIDI_VERSION=0.19.7 +ARG LIBFONTCONFIG_VERSION=2.13.1 +ARG LIBFREETYPE_VERSION=2.10.0 +ARG LIBFRIBIDI_VERSION=0.19.7 +ARG LIBFONTCONFIG_VERSION=2.13.1 +ARG LIBASS_VERSION=0.14.0 +ARG LIBKVAZAAR_VERSION=1.2.0 +ARG NVENC_VERSION=9.0.18.1 + +ARG LIBOGG_SHA256SUM=c2e8a485110b97550f453226ec644ebac6cb29d1caef2902c007edab4308d985 +ARG LIBOPUS_SHA256SUM=65b58e1e25b2a114157014736a3d9dfeaad8d41be1c8179866f144a2fb44ff9d +ARG LIBVORBIS_SHA256SUM=6ed40e0241089a42c48604dc00e362beee00036af2d8b3f46338031c9e0351cb +ARG LIBTHEORA_SHA256SUM=40952956c47811928d1e7922cda3bc1f427eb75680c3c37249c91e949054916b +ARG LIBVIDSTAB_SHA256SUM=14d2a053e56edad4f397be0cb3ef8eb1ec3150404ce99a426c4eb641861dc0bb +ARG LIBFRIBIDI_SHA256SUM=3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 +ARG LIBFRIBIDI_SHA256SUM=3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 + +## opencore-amr https://sourceforge.net/projects/opencore-amr/ +RUN \ + DIR=opencore-amr && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://kent.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${LIBOPENCORE_AMR_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +## x264 http://www.videolan.org/developers/x264.html +RUN \ + DIR=x264 && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://download.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-${LIBX264_VERSION}.tar.bz2 | \ + tar -jx --strip-components=1 && \ + ./configure --prefix="${PREFIX}" --enable-shared --enable-pic && \ + make && \ + make install && \ + rm -rf ${DIR} +### x265 http://x265.org/ +RUN \ + DIR=x265 && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://download.videolan.org/pub/videolan/x265/x265_${LIBX265_VERSION}.tar.gz | \ + tar -zx && \ + cd x265_${LIBX265_VERSION}/build/linux && \ + sed -i "/-DEXTRA_LIB/ s/$/ -DCMAKE_INSTALL_PREFIX=\${PREFIX}/" multilib.sh && \ + sed -i "/^cmake/ s/$/ -DENABLE_CLI=ON/" multilib.sh && \ + ./multilib.sh && \ + make -C 8bit install && \ + rm -rf ${DIR} +## libogg https://www.xiph.org/ogg/ +RUN \ + DIR=ogg && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO http://downloads.xiph.org/releases/ogg/libogg-${LIBOGG_VERSION}.tar.gz && \ + echo "${LIBOGG_SHA256SUM} libogg-${LIBOGG_VERSION}.tar.gz" | sha256sum --check && \ + tar -zx --strip-components=1 -f libogg-${LIBOGG_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +RUN \ + DIR=opus && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://archive.mozilla.org/pub/opus/opus-${LIBOPUS_VERSION}.tar.gz && \ + echo "${LIBOPUS_SHA256SUM} opus-${LIBOPUS_VERSION}.tar.gz"| sha256sum --check && \ + tar -zx --strip-components=1 -f opus-${LIBOPUS_VERSION}.tar.gz && \ + autoreconf -fiv && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +### libvorbis https://xiph.org/vorbis/ +RUN \ + DIR=vorbis && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO http://downloads.xiph.org/releases/vorbis/libvorbis-${LIBVORBIS_VERSION}.tar.gz && \ + echo "${LIBVORBIS_SHA256SUM} libvorbis-${LIBVORBIS_VERSION}.tar.gz" | sha256sum --check && \ + tar -zx --strip-components=1 -f libvorbis-${LIBVORBIS_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +### libtheora http://www.theora.org/ +RUN \ + DIR=theora && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO http://downloads.xiph.org/releases/theora/libtheora-${LIBTHEORA_VERSION}.tar.gz && \ + echo "${LIBTHEORA_SHA256SUM} libtheora-${LIBTHEORA_VERSION}.tar.gz" | sha256sum --check && \ + tar -zx --strip-components=1 -f libtheora-${LIBTHEORA_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +### libvpx https://www.webmproject.org/code/ +RUN \ + DIR=vpx && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://codeload.github.com/webmproject/libvpx/tar.gz/v${LIBVPX_VERSION} | \ + tar -zx --strip-components=1 && \ + ./configure --prefix="${PREFIX}" --enable-vp8 --enable-vp9 --enable-vp9-highbitdepth --enable-pic --enable-shared \ + --disable-debug --disable-examples --disable-docs && \ + make && \ + make install && \ + rm -rf ${DIR} + +### libmp3lame http://lame.sourceforge.net/ +RUN \ + DIR=lame && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://kent.dl.sourceforge.net/project/lame/lame/$(echo ${LIBMP3LAME_VERSION} | sed -e 's/[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)/\1.\2/')/lame-${LIBMP3LAME_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" --enable-shared --enable-nasm --enable-pic && \ + make && \ + make install && \ + rm -rf ${DIR} +### xvid https://www.xvid.com/ +RUN \ + DIR=xvid && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO http://downloads.xvid.org/downloads/xvidcore-${LIBXVID_VERSION}.tar.gz && \ + tar -zx -f xvidcore-${LIBXVID_VERSION}.tar.gz && \ + cd xvidcore/build/generic && \ + ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" --datadir="${DIR}" --enable-shared --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +### fdk-aac https://github.com/mstorsjo/fdk-aac +RUN \ + DIR=fdk-aac && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://github.com/mstorsjo/fdk-aac/archive/v${LIBFDK_AAC_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + autoreconf -fiv && \ + ./configure --prefix="${PREFIX}" --enable-shared --datadir="${DIR}" && \ + make && \ + make install && \ + rm -rf ${DIR} +## openjpeg https://github.com/uclouvain/openjpeg +RUN \ + DIR=openjpeg && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + if test `echo ${LIBOPENJPEG_VERSION} | tr -d '.'` -ge '210'; then \ + version_prefix='v'; \ + else \ + version_prefix='version.' ;\ + fi && \ + curl -sL https://github.com/uclouvain/openjpeg/archive/${version_prefix}${LIBOPENJPEG_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + cmake -DBUILD_THIRDPARTY:BOOL=ON -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ + make && \ + make install && \ + rm -rf ${DIR} +## freetype https://www.freetype.org/ +RUN \ + DIR=freetype && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://download.savannah.gnu.org/releases/freetype/freetype-${LIBFREETYPE_VERSION}.tar.gz && \ + tar -zx --strip-components=1 -f freetype-${LIBFREETYPE_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +## libvstab https://github.com/georgmartius/vid.stab +RUN \ + DIR=vid.stab && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/georgmartius/vid.stab/archive/v${LIBVIDSTAB_VERSION}.tar.gz &&\ + echo "${LIBVIDSTAB_SHA256SUM} v${LIBVIDSTAB_VERSION}.tar.gz" | sha256sum --check && \ + tar -zx --strip-components=1 -f v${LIBVIDSTAB_VERSION}.tar.gz && \ + cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ + make && \ + make install && \ + rm -rf ${DIR} +## fridibi https://www.fribidi.org/ +# + https://github.com/fribidi/fribidi/issues/8 +RUN \ + DIR=fribidi && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/fribidi/fribidi/archive/${LIBFRIBIDI_VERSION}.tar.gz && \ + echo "${LIBFRIBIDI_SHA256SUM} ${LIBFRIBIDI_VERSION}.tar.gz" | sha256sum --check && \ + tar -zx --strip-components=1 -f ${LIBFRIBIDI_VERSION}.tar.gz && \ + sed -i 's/^SUBDIRS =.*/SUBDIRS=gen.tab charset lib/' Makefile.am && \ + ./bootstrap --no-config && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ + make -j 1 && \ + make install && \ + rm -rf ${DIR} +## fontconfig https://www.freedesktop.org/wiki/Software/fontconfig/ +RUN \ + DIR=fontconfig && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://www.freedesktop.org/software/fontconfig/release/fontconfig-${LIBFONTCONFIG_VERSION}.tar.bz2 &&\ + tar -jx --strip-components=1 -f fontconfig-${LIBFONTCONFIG_VERSION}.tar.bz2 && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +## freetype https://www.freetype.org/ +RUN \ + DIR=freetype && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://download.savannah.gnu.org/releases/freetype/freetype-${LIBFREETYPE_VERSION}.tar.gz && \ + tar -zx --strip-components=1 -f freetype-${LIBFREETYPE_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +## fridibi https://www.fribidi.org/ +# + https://github.com/fribidi/fribidi/issues/8 +RUN \ + DIR=fribidi && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/fribidi/fribidi/archive/${LIBFRIBIDI_VERSION}.tar.gz && \ + echo "${LIBFRIBIDI_SHA256SUM} ${LIBFRIBIDI_VERSION}.tar.gz" | sha256sum --check && \ + tar -zx --strip-components=1 -f ${LIBFRIBIDI_VERSION}.tar.gz && \ + sed -i 's/^SUBDIRS =.*/SUBDIRS=gen.tab charset lib/' Makefile.am && \ + ./bootstrap --no-config && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ + make -j 1 && \ + make install && \ + rm -rf ${DIR} +## fontconfig https://www.freedesktop.org/wiki/Software/fontconfig/ +RUN \ + DIR=fontconfig && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://www.freedesktop.org/software/fontconfig/release/fontconfig-${LIBFONTCONFIG_VERSION}.tar.bz2 &&\ + tar -jx --strip-components=1 -f fontconfig-${LIBFONTCONFIG_VERSION}.tar.bz2 && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +RUN \ + DIR=libass && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/libass/libass/archive/${LIBASS_VERSION}.tar.gz &&\ + tar -zx --strip-components=1 -f ${LIBASS_VERSION}.tar.gz && \ + ./autogen.sh && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +## kvazaar https://github.com/ultravideo/kvazaar +RUN \ + DIR=kvazaar && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/ultravideo/kvazaar/archive/v${LIBKVAZAAR_VERSION}.tar.gz &&\ + tar -zx --strip-components=1 -f v${LIBKVAZAAR_VERSION}.tar.gz && \ + if [ -e ./autogen.sh ]; then \ + ./autogen.sh && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared ; \ + else \ + cd src ; \ + fi && \ + make && \ + make install && \ + rm -rf ${DIR} + +RUN \ + DIR=nv-codec-headers && \ + git clone --branch n${NVENC_VERSION} --depth=1 https://git.videolan.org/git/ffmpeg/nv-codec-headers.git ${DIR} && \ + cd ${DIR} && \ + sed -i 's@/usr/local@'"$PREFIX"'@' Makefile && \ + make && \ + make install && \ + rm -rf ${DIR} +RUN \ + DIR=ffmpeg && mkdir -p ${DIR} && cd ${DIR} && \ + curl -sLO https://ffmpeg.org/releases/ffmpeg-${FFMPEG_VERSION}.tar.bz2 && \ + tar -jx --strip-components=1 -f ffmpeg-${FFMPEG_VERSION}.tar.bz2 && \ + ./configure \ + --disable-debug \ + --disable-doc \ + --disable-ffplay \ + --enable-shared \ + --enable-avresample \ + --enable-openssl \ + --enable-postproc \ + --enable-small \ + --extra-cflags="-I${PREFIX}/include -I/usr/local/include" \ + --extra-ldflags="-L${PREFIX}/lib -L/usr/local/lib" \ + --enable-libopencore-amrnb \ + --enable-libopencore-amrwb \ + --enable-version3 \ + --enable-libx264 \ + --enable-libx265 \ + --enable-libopus \ + --enable-libvorbis \ + --enable-libtheora \ + --enable-libvpx \ + --enable-libmp3lame \ + --enable-libxvid \ + --enable-libfdk_aac \ + --enable-nonfree \ + --enable-libopenjpeg \ + --enable-libfreetype \ + --enable-libvidstab \ + --enable-gpl \ + --enable-libass \ + --enable-libkvazaar \ + --enable-vaapi \ + --enable-cuda \ + --enable-nvenc \ + --enable-cuvid \ + --prefix="${PREFIX}" && \ + make && \ + make install && \ + make distclean && \ + hash -r && \ + cd tools && \ + make qt-faststart && \ + cp qt-faststart ${PREFIX}/bin + +RUN \ + if false; then \ + cp -r ${PREFIX}/lib/*so* /usr/local/lib/ && \ + cp ${PREFIX}/bin/* /usr/local/bin/ ; \ + else \ + LD_LIBRARY_PATH=${PREFIX}/lib ldd ${PREFIX}/bin/ffmpeg | \ + grep ${PREFIX} | \ + cut -d ' ' -f 3 | \ + xargs -i cp {} /usr/local/lib/ && \ + cp ${PREFIX}/bin/ff* /usr/local/bin/ ; \ + fi && \ + if true; then \ + for lib in /usr/local/lib/*.so* /usr/local/bin/*; do strip --strip-all $lib; done ; \ + fi && \ + cp -r ${PREFIX}/share/ffmpeg /usr/local/share/ && \ + LD_LIBRARY_PATH=/usr/local/lib ffmpeg -buildconf + +FROM base AS release +MAINTAINER Julien Rottenberg + +CMD ["--help"] +ENTRYPOINT ["ffmpeg"] + +COPY --from=build /usr/local /usr/local +RUN test "base" = "base" && ldconfig /usr/local/lib /usr/local/lib64 + +# Let's make sure the app built correctly +# Convenient to verify on https://hub.docker.com/r/jrottenberg/ffmpeg/builds/ console output +>>>>>>> fix extra comma diff --git a/docker-images/3.4/alpine,/Dockerfile b/docker-images/3.4/alpine,/Dockerfile deleted file mode 100644 index a0b97723e..000000000 --- a/docker-images/3.4/alpine,/Dockerfile +++ /dev/null @@ -1,14 +0,0 @@ -usage: update.py [-h] [--enable-libopencore-amr] [--enable-libx264] - [--enable-libx265] [--enable-libogg] [--enable-libopus] - [--enable-libvorbis] [--enable-libtheora] [--enable-libvpx] - [--enable-libmp3lame] [--enable-libxvid] - [--enable-libfdk-aac] [--enable-libopenjpeg] - [--enable-libfreetype] [--enable-libvidstab] - [--enable-libfribidi] [--enable-libfontconfig] - [--enable-libass] [--enable-libkvazaar] [--enable-libaom] - [--enable-vaapi] [--enable-nvenc] [--enable-libdav1d] - [--enable-vdpau] [--enable-all] [--with-bins] [--no-strip] - [--fat | --slim | --scratch] - {alpine,centos,ubuntu,nvidia,armv7} - {snapshot,4.1,4.0,3.4,3.3,3.2,2.8} -update.py: error: argument variant: invalid choice: 'alpine,' (choose from 'alpine', 'centos', 'ubuntu', 'nvidia', 'armv7') diff --git a/docker-images/3.4/alpine/Dockerfile b/docker-images/3.4/alpine/Dockerfile index 3a75494a2..bad7171df 100644 --- a/docker-images/3.4/alpine/Dockerfile +++ b/docker-images/3.4/alpine/Dockerfile @@ -1,3 +1,4 @@ +<<<<<<< HEAD # ffmpeg - http://ffmpeg.org/download.html # # https://hub.docker.com/r/jrottenberg/ffmpeg/ @@ -388,3 +389,429 @@ COPY --from=build /usr/local /usr/local # Let's make sure the app built correctly # Convenient to verify on https://hub.docker.com/r/jrottenberg/ffmpeg/builds/ console output +======= +FROM alpine:3.9 as base + +RUN apk add --no-cache --update libva \ + libgcc \ + libstdc++ \ + ca-certificates \ + libcrypto1.1 \ + libssl1.1 \ + libgomp \ + expat \ + libuuid + +FROM base as build + +WORKDIR /tmp/workdir + +ARG PREFIX=/tmp/build +ARG MAKEFLAGS=-j6 +ARG PKG_CONFIG_PATH=/tmp/build/lib/pkgconfig + +RUN apk add --no-cache --update libva-dev \ + autoconf \ + automake \ + bash \ + binutils \ + bzip2 \ + cmake \ + curl \ + coreutils \ + diffutils \ + file \ + g++ \ + git \ + gcc \ + gperf \ + libtool \ + make \ + python \ + openssl-dev \ + tar \ + yasm \ + nasm \ + zlib-dev \ + expat-dev \ + util-linux-dev \ + meson \ + ninja + +ARG FFMPEG_VERSION=3.4.6 +ARG LIBOPENCORE_AMR_VERSION=0.1.5 +ARG LIBX264_VERSION=20190526-2245-stable +ARG LIBX265_VERSION=3.0 +ARG LIBOGG_VERSION=1.3.3 +ARG LIBOPUS_VERSION=1.3.1 +ARG LIBVORBIS_VERSION=1.3.6 +ARG LIBTHEORA_VERSION=1.1.1 +ARG LIBVPX_VERSION=1.8.0 +ARG LIBMP3LAME_VERSION=3.100 +ARG LIBXVID_VERSION=1.3.5 +ARG LIBFDK_AAC_VERSION=0.1.6 +ARG LIBOPENJPEG_VERSION=2.1.2 +ARG LIBFREETYPE_VERSION=2.10.0 +ARG LIBVIDSTAB_VERSION=1.1.0 +ARG LIBFRIBIDI_VERSION=0.19.7 +ARG LIBFONTCONFIG_VERSION=2.13.1 +ARG LIBFREETYPE_VERSION=2.10.0 +ARG LIBFRIBIDI_VERSION=0.19.7 +ARG LIBFONTCONFIG_VERSION=2.13.1 +ARG LIBASS_VERSION=0.14.0 +ARG LIBKVAZAAR_VERSION=1.2.0 +ARG NVENC_VERSION=9.0.18.1 + +ARG LIBOGG_SHA256SUM=c2e8a485110b97550f453226ec644ebac6cb29d1caef2902c007edab4308d985 +ARG LIBOPUS_SHA256SUM=65b58e1e25b2a114157014736a3d9dfeaad8d41be1c8179866f144a2fb44ff9d +ARG LIBVORBIS_SHA256SUM=6ed40e0241089a42c48604dc00e362beee00036af2d8b3f46338031c9e0351cb +ARG LIBTHEORA_SHA256SUM=40952956c47811928d1e7922cda3bc1f427eb75680c3c37249c91e949054916b +ARG LIBVIDSTAB_SHA256SUM=14d2a053e56edad4f397be0cb3ef8eb1ec3150404ce99a426c4eb641861dc0bb +ARG LIBFRIBIDI_SHA256SUM=3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 +ARG LIBFRIBIDI_SHA256SUM=3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 + +## opencore-amr https://sourceforge.net/projects/opencore-amr/ +RUN \ + DIR=opencore-amr && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://kent.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${LIBOPENCORE_AMR_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +## x264 http://www.videolan.org/developers/x264.html +RUN \ + DIR=x264 && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://download.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-${LIBX264_VERSION}.tar.bz2 | \ + tar -jx --strip-components=1 && \ + ./configure --prefix="${PREFIX}" --enable-shared --enable-pic && \ + make && \ + make install && \ + rm -rf ${DIR} +### x265 http://x265.org/ +RUN \ + DIR=x265 && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://download.videolan.org/pub/videolan/x265/x265_${LIBX265_VERSION}.tar.gz | \ + tar -zx && \ + cd x265_${LIBX265_VERSION}/build/linux && \ + sed -i "/-DEXTRA_LIB/ s/$/ -DCMAKE_INSTALL_PREFIX=\${PREFIX}/" multilib.sh && \ + sed -i "/^cmake/ s/$/ -DENABLE_CLI=ON/" multilib.sh && \ + ./multilib.sh && \ + make -C 8bit install && \ + rm -rf ${DIR} +## libogg https://www.xiph.org/ogg/ +RUN \ + DIR=ogg && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO http://downloads.xiph.org/releases/ogg/libogg-${LIBOGG_VERSION}.tar.gz && \ + echo "${LIBOGG_SHA256SUM} libogg-${LIBOGG_VERSION}.tar.gz" | sha256sum --check && \ + tar -zx --strip-components=1 -f libogg-${LIBOGG_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +RUN \ + DIR=opus && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://archive.mozilla.org/pub/opus/opus-${LIBOPUS_VERSION}.tar.gz && \ + echo "${LIBOPUS_SHA256SUM} opus-${LIBOPUS_VERSION}.tar.gz"| sha256sum --check && \ + tar -zx --strip-components=1 -f opus-${LIBOPUS_VERSION}.tar.gz && \ + autoreconf -fiv && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +### libvorbis https://xiph.org/vorbis/ +RUN \ + DIR=vorbis && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO http://downloads.xiph.org/releases/vorbis/libvorbis-${LIBVORBIS_VERSION}.tar.gz && \ + echo "${LIBVORBIS_SHA256SUM} libvorbis-${LIBVORBIS_VERSION}.tar.gz" | sha256sum --check && \ + tar -zx --strip-components=1 -f libvorbis-${LIBVORBIS_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +### libtheora http://www.theora.org/ +RUN \ + DIR=theora && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO http://downloads.xiph.org/releases/theora/libtheora-${LIBTHEORA_VERSION}.tar.gz && \ + echo "${LIBTHEORA_SHA256SUM} libtheora-${LIBTHEORA_VERSION}.tar.gz" | sha256sum --check && \ + tar -zx --strip-components=1 -f libtheora-${LIBTHEORA_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +### libvpx https://www.webmproject.org/code/ +RUN \ + DIR=vpx && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://codeload.github.com/webmproject/libvpx/tar.gz/v${LIBVPX_VERSION} | \ + tar -zx --strip-components=1 && \ + ./configure --prefix="${PREFIX}" --enable-vp8 --enable-vp9 --enable-vp9-highbitdepth --enable-pic --enable-shared \ + --disable-debug --disable-examples --disable-docs && \ + make && \ + make install && \ + rm -rf ${DIR} + +### libmp3lame http://lame.sourceforge.net/ +RUN \ + DIR=lame && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://kent.dl.sourceforge.net/project/lame/lame/$(echo ${LIBMP3LAME_VERSION} | sed -e 's/[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)/\1.\2/')/lame-${LIBMP3LAME_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" --enable-shared --enable-nasm --enable-pic && \ + make && \ + make install && \ + rm -rf ${DIR} +### xvid https://www.xvid.com/ +RUN \ + DIR=xvid && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO http://downloads.xvid.org/downloads/xvidcore-${LIBXVID_VERSION}.tar.gz && \ + tar -zx -f xvidcore-${LIBXVID_VERSION}.tar.gz && \ + cd xvidcore/build/generic && \ + ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" --datadir="${DIR}" --enable-shared --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +### fdk-aac https://github.com/mstorsjo/fdk-aac +RUN \ + DIR=fdk-aac && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://github.com/mstorsjo/fdk-aac/archive/v${LIBFDK_AAC_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + autoreconf -fiv && \ + ./configure --prefix="${PREFIX}" --enable-shared --datadir="${DIR}" && \ + make && \ + make install && \ + rm -rf ${DIR} +## openjpeg https://github.com/uclouvain/openjpeg +RUN \ + DIR=openjpeg && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + if test `echo ${LIBOPENJPEG_VERSION} | tr -d '.'` -ge '210'; then \ + version_prefix='v'; \ + else \ + version_prefix='version.' ;\ + fi && \ + curl -sL https://github.com/uclouvain/openjpeg/archive/${version_prefix}${LIBOPENJPEG_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + cmake -DBUILD_THIRDPARTY:BOOL=ON -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ + make && \ + make install && \ + rm -rf ${DIR} +## freetype https://www.freetype.org/ +RUN \ + DIR=freetype && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://download.savannah.gnu.org/releases/freetype/freetype-${LIBFREETYPE_VERSION}.tar.gz && \ + tar -zx --strip-components=1 -f freetype-${LIBFREETYPE_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +## libvstab https://github.com/georgmartius/vid.stab +RUN \ + DIR=vid.stab && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/georgmartius/vid.stab/archive/v${LIBVIDSTAB_VERSION}.tar.gz &&\ + echo "${LIBVIDSTAB_SHA256SUM} v${LIBVIDSTAB_VERSION}.tar.gz" | sha256sum --check && \ + tar -zx --strip-components=1 -f v${LIBVIDSTAB_VERSION}.tar.gz && \ + cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ + make && \ + make install && \ + rm -rf ${DIR} +## fridibi https://www.fribidi.org/ +# + https://github.com/fribidi/fribidi/issues/8 +RUN \ + DIR=fribidi && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/fribidi/fribidi/archive/${LIBFRIBIDI_VERSION}.tar.gz && \ + echo "${LIBFRIBIDI_SHA256SUM} ${LIBFRIBIDI_VERSION}.tar.gz" | sha256sum --check && \ + tar -zx --strip-components=1 -f ${LIBFRIBIDI_VERSION}.tar.gz && \ + sed -i 's/^SUBDIRS =.*/SUBDIRS=gen.tab charset lib/' Makefile.am && \ + ./bootstrap --no-config && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ + make -j 1 && \ + make install && \ + rm -rf ${DIR} +## fontconfig https://www.freedesktop.org/wiki/Software/fontconfig/ +RUN \ + DIR=fontconfig && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://www.freedesktop.org/software/fontconfig/release/fontconfig-${LIBFONTCONFIG_VERSION}.tar.bz2 &&\ + tar -jx --strip-components=1 -f fontconfig-${LIBFONTCONFIG_VERSION}.tar.bz2 && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +## freetype https://www.freetype.org/ +RUN \ + DIR=freetype && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://download.savannah.gnu.org/releases/freetype/freetype-${LIBFREETYPE_VERSION}.tar.gz && \ + tar -zx --strip-components=1 -f freetype-${LIBFREETYPE_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +## fridibi https://www.fribidi.org/ +# + https://github.com/fribidi/fribidi/issues/8 +RUN \ + DIR=fribidi && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/fribidi/fribidi/archive/${LIBFRIBIDI_VERSION}.tar.gz && \ + echo "${LIBFRIBIDI_SHA256SUM} ${LIBFRIBIDI_VERSION}.tar.gz" | sha256sum --check && \ + tar -zx --strip-components=1 -f ${LIBFRIBIDI_VERSION}.tar.gz && \ + sed -i 's/^SUBDIRS =.*/SUBDIRS=gen.tab charset lib/' Makefile.am && \ + ./bootstrap --no-config && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ + make -j 1 && \ + make install && \ + rm -rf ${DIR} +## fontconfig https://www.freedesktop.org/wiki/Software/fontconfig/ +RUN \ + DIR=fontconfig && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://www.freedesktop.org/software/fontconfig/release/fontconfig-${LIBFONTCONFIG_VERSION}.tar.bz2 &&\ + tar -jx --strip-components=1 -f fontconfig-${LIBFONTCONFIG_VERSION}.tar.bz2 && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +RUN \ + DIR=libass && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/libass/libass/archive/${LIBASS_VERSION}.tar.gz &&\ + tar -zx --strip-components=1 -f ${LIBASS_VERSION}.tar.gz && \ + ./autogen.sh && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +## kvazaar https://github.com/ultravideo/kvazaar +RUN \ + DIR=kvazaar && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/ultravideo/kvazaar/archive/v${LIBKVAZAAR_VERSION}.tar.gz &&\ + tar -zx --strip-components=1 -f v${LIBKVAZAAR_VERSION}.tar.gz && \ + if [ -e ./autogen.sh ]; then \ + ./autogen.sh && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared ; \ + else \ + cd src ; \ + fi && \ + make && \ + make install && \ + rm -rf ${DIR} + +RUN \ + DIR=nv-codec-headers && \ + git clone --branch n${NVENC_VERSION} --depth=1 https://git.videolan.org/git/ffmpeg/nv-codec-headers.git ${DIR} && \ + cd ${DIR} && \ + sed -i 's@/usr/local@'"$PREFIX"'@' Makefile && \ + make && \ + make install && \ + rm -rf ${DIR} +RUN \ + DIR=ffmpeg && mkdir -p ${DIR} && cd ${DIR} && \ + curl -sLO https://ffmpeg.org/releases/ffmpeg-${FFMPEG_VERSION}.tar.bz2 && \ + tar -jx --strip-components=1 -f ffmpeg-${FFMPEG_VERSION}.tar.bz2 && \ + ./configure \ + --disable-debug \ + --disable-doc \ + --disable-ffplay \ + --enable-shared \ + --enable-avresample \ + --enable-openssl \ + --enable-postproc \ + --enable-small \ + --extra-cflags="-I${PREFIX}/include -I/usr/local/include" \ + --extra-ldflags="-L${PREFIX}/lib -L/usr/local/lib" \ + --enable-libopencore-amrnb \ + --enable-libopencore-amrwb \ + --enable-version3 \ + --enable-libx264 \ + --enable-libx265 \ + --enable-libopus \ + --enable-libvorbis \ + --enable-libtheora \ + --enable-libvpx \ + --enable-libmp3lame \ + --enable-libxvid \ + --enable-libfdk_aac \ + --enable-nonfree \ + --enable-libopenjpeg \ + --enable-libfreetype \ + --enable-libvidstab \ + --enable-gpl \ + --enable-libass \ + --enable-libkvazaar \ + --enable-vaapi \ + --enable-cuda \ + --enable-nvenc \ + --enable-cuvid \ + --prefix="${PREFIX}" && \ + make && \ + make install && \ + make distclean && \ + hash -r && \ + cd tools && \ + make qt-faststart && \ + cp qt-faststart ${PREFIX}/bin + +RUN \ + if false; then \ + cp -r ${PREFIX}/lib/*so* /usr/local/lib/ && \ + cp ${PREFIX}/bin/* /usr/local/bin/ ; \ + else \ + LD_LIBRARY_PATH=${PREFIX}/lib ldd ${PREFIX}/bin/ffmpeg | \ + grep ${PREFIX} | \ + cut -d ' ' -f 3 | \ + xargs -i cp {} /usr/local/lib/ && \ + cp ${PREFIX}/bin/ff* /usr/local/bin/ ; \ + fi && \ + if true; then \ + for lib in /usr/local/lib/*.so* /usr/local/bin/*; do strip --strip-all $lib; done ; \ + fi && \ + cp -r ${PREFIX}/share/ffmpeg /usr/local/share/ && \ + LD_LIBRARY_PATH=/usr/local/lib ffmpeg -buildconf + +FROM base AS release +MAINTAINER Julien Rottenberg + +CMD ["--help"] +ENTRYPOINT ["ffmpeg"] + +COPY --from=build /usr/local /usr/local +RUN test "base" = "base" && ldconfig /usr/local/lib /usr/local/lib64 + +# Let's make sure the app built correctly +# Convenient to verify on https://hub.docker.com/r/jrottenberg/ffmpeg/builds/ console output +>>>>>>> fix extra comma diff --git a/docker-images/3.4/nvidia,/Dockerfile b/docker-images/3.4/nvidia,/Dockerfile deleted file mode 100644 index 452b62c02..000000000 --- a/docker-images/3.4/nvidia,/Dockerfile +++ /dev/null @@ -1,14 +0,0 @@ -usage: update.py [-h] [--enable-libopencore-amr] [--enable-libx264] - [--enable-libx265] [--enable-libogg] [--enable-libopus] - [--enable-libvorbis] [--enable-libtheora] [--enable-libvpx] - [--enable-libmp3lame] [--enable-libxvid] - [--enable-libfdk-aac] [--enable-libopenjpeg] - [--enable-libfreetype] [--enable-libvidstab] - [--enable-libfribidi] [--enable-libfontconfig] - [--enable-libass] [--enable-libkvazaar] [--enable-libaom] - [--enable-vaapi] [--enable-nvenc] [--enable-libdav1d] - [--enable-vdpau] [--enable-all] [--with-bins] [--no-strip] - [--fat | --slim | --scratch] - {alpine,centos,ubuntu,nvidia,armv7} - {snapshot,4.1,4.0,3.4,3.3,3.2,2.8} -update.py: error: argument variant: invalid choice: 'nvidia,' (choose from 'alpine', 'centos', 'ubuntu', 'nvidia', 'armv7') diff --git a/docker-images/3.4/nvidia/Dockerfile b/docker-images/3.4/nvidia/Dockerfile index aba12de02..79334da46 100644 --- a/docker-images/3.4/nvidia/Dockerfile +++ b/docker-images/3.4/nvidia/Dockerfile @@ -1,3 +1,4 @@ +<<<<<<< HEAD # ffmpeg - http://ffmpeg.org/download.html # # From https://trac.ffmpeg.org/wiki/CompilationGuide/Ubuntu @@ -420,3 +421,423 @@ COPY --from=build /usr/local/lib /usr/local/lib/ # Let's make sure the app built correctly # Convenient to verify on https://hub.docker.com/r/jrottenberg/ffmpeg/builds/ console output +======= +FROM nvidia/cuda:10.1-runtime-ubuntu18.04 AS base + +ENV NVIDIA_DRIVER_CAPABILITIES=video + +RUN apt-get -yqq update && \ + apt-get install -yq --no-install-recommends libva2 libva-drm2 i965-va-driver ca-certificates expat libgomp1 libuuid1 libssl1.0 && \ + apt-get autoremove -y && \ + apt-get clean -y + +FROM base as build + +WORKDIR /tmp/workdir + +ARG PREFIX=/tmp/build +ARG MAKEFLAGS=-j6 +ARG PKG_CONFIG_PATH=/tmp/build/lib/pkgconfig +ARG C_INCLUDE_PATH=/tmp/build/include/ffnvcodec + +RUN apt-get -yqq update && \ + apt-get install -yq --no-install-recommends \ + libva-dev \ + autoconf \ + automake \ + cmake \ + curl \ + bzip2 \ + libexpat1-dev \ + g++ \ + gcc \ + git \ + gperf \ + libtool \ + make \ + nasm \ + perl \ + pkg-config \ + python \ + libssl1.0-dev \ + yasm \ + zlib1g-dev \ + uuid-dev + +ARG FFMPEG_VERSION=3.4.6 +ARG LIBOPENCORE_AMR_VERSION=0.1.5 +ARG LIBX264_VERSION=20190526-2245-stable +ARG LIBX265_VERSION=3.0 +ARG LIBOGG_VERSION=1.3.3 +ARG LIBOPUS_VERSION=1.3.1 +ARG LIBVORBIS_VERSION=1.3.6 +ARG LIBTHEORA_VERSION=1.1.1 +ARG LIBVPX_VERSION=1.8.0 +ARG LIBMP3LAME_VERSION=3.100 +ARG LIBXVID_VERSION=1.3.5 +ARG LIBFDK_AAC_VERSION=0.1.6 +ARG LIBOPENJPEG_VERSION=2.1.2 +ARG LIBFREETYPE_VERSION=2.10.0 +ARG LIBVIDSTAB_VERSION=1.1.0 +ARG LIBFRIBIDI_VERSION=0.19.7 +ARG LIBFONTCONFIG_VERSION=2.13.1 +ARG LIBFREETYPE_VERSION=2.10.0 +ARG LIBFRIBIDI_VERSION=0.19.7 +ARG LIBFONTCONFIG_VERSION=2.13.1 +ARG LIBASS_VERSION=0.14.0 +ARG LIBKVAZAAR_VERSION=1.2.0 +ARG NVENC_VERSION=9.0.18.1 + +ARG LIBOGG_SHA256SUM=c2e8a485110b97550f453226ec644ebac6cb29d1caef2902c007edab4308d985 +ARG LIBOPUS_SHA256SUM=65b58e1e25b2a114157014736a3d9dfeaad8d41be1c8179866f144a2fb44ff9d +ARG LIBVORBIS_SHA256SUM=6ed40e0241089a42c48604dc00e362beee00036af2d8b3f46338031c9e0351cb +ARG LIBTHEORA_SHA256SUM=40952956c47811928d1e7922cda3bc1f427eb75680c3c37249c91e949054916b +ARG LIBVIDSTAB_SHA256SUM=14d2a053e56edad4f397be0cb3ef8eb1ec3150404ce99a426c4eb641861dc0bb +ARG LIBFRIBIDI_SHA256SUM=3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 +ARG LIBFRIBIDI_SHA256SUM=3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 + +## opencore-amr https://sourceforge.net/projects/opencore-amr/ +RUN \ + DIR=opencore-amr && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://kent.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${LIBOPENCORE_AMR_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +## x264 http://www.videolan.org/developers/x264.html +RUN \ + DIR=x264 && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://download.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-${LIBX264_VERSION}.tar.bz2 | \ + tar -jx --strip-components=1 && \ + ./configure --prefix="${PREFIX}" --enable-shared --enable-pic && \ + make && \ + make install && \ + rm -rf ${DIR} +### x265 http://x265.org/ +RUN \ + DIR=x265 && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://download.videolan.org/pub/videolan/x265/x265_${LIBX265_VERSION}.tar.gz | \ + tar -zx && \ + cd x265_${LIBX265_VERSION}/build/linux && \ + sed -i "/-DEXTRA_LIB/ s/$/ -DCMAKE_INSTALL_PREFIX=\${PREFIX}/" multilib.sh && \ + sed -i "/^cmake/ s/$/ -DENABLE_CLI=ON/" multilib.sh && \ + ./multilib.sh && \ + make -C 8bit install && \ + rm -rf ${DIR} +## libogg https://www.xiph.org/ogg/ +RUN \ + DIR=ogg && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO http://downloads.xiph.org/releases/ogg/libogg-${LIBOGG_VERSION}.tar.gz && \ + echo "${LIBOGG_SHA256SUM} libogg-${LIBOGG_VERSION}.tar.gz" | sha256sum --check && \ + tar -zx --strip-components=1 -f libogg-${LIBOGG_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +RUN \ + DIR=opus && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://archive.mozilla.org/pub/opus/opus-${LIBOPUS_VERSION}.tar.gz && \ + echo "${LIBOPUS_SHA256SUM} opus-${LIBOPUS_VERSION}.tar.gz"| sha256sum --check && \ + tar -zx --strip-components=1 -f opus-${LIBOPUS_VERSION}.tar.gz && \ + autoreconf -fiv && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +### libvorbis https://xiph.org/vorbis/ +RUN \ + DIR=vorbis && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO http://downloads.xiph.org/releases/vorbis/libvorbis-${LIBVORBIS_VERSION}.tar.gz && \ + echo "${LIBVORBIS_SHA256SUM} libvorbis-${LIBVORBIS_VERSION}.tar.gz" | sha256sum --check && \ + tar -zx --strip-components=1 -f libvorbis-${LIBVORBIS_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +### libtheora http://www.theora.org/ +RUN \ + DIR=theora && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO http://downloads.xiph.org/releases/theora/libtheora-${LIBTHEORA_VERSION}.tar.gz && \ + echo "${LIBTHEORA_SHA256SUM} libtheora-${LIBTHEORA_VERSION}.tar.gz" | sha256sum --check && \ + tar -zx --strip-components=1 -f libtheora-${LIBTHEORA_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +### libvpx https://www.webmproject.org/code/ +RUN \ + DIR=vpx && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://codeload.github.com/webmproject/libvpx/tar.gz/v${LIBVPX_VERSION} | \ + tar -zx --strip-components=1 && \ + ./configure --prefix="${PREFIX}" --enable-vp8 --enable-vp9 --enable-vp9-highbitdepth --enable-pic --enable-shared \ + --disable-debug --disable-examples --disable-docs && \ + make && \ + make install && \ + rm -rf ${DIR} + +### libmp3lame http://lame.sourceforge.net/ +RUN \ + DIR=lame && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://kent.dl.sourceforge.net/project/lame/lame/$(echo ${LIBMP3LAME_VERSION} | sed -e 's/[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)/\1.\2/')/lame-${LIBMP3LAME_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" --enable-shared --enable-nasm --enable-pic && \ + make && \ + make install && \ + rm -rf ${DIR} +### xvid https://www.xvid.com/ +RUN \ + DIR=xvid && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO http://downloads.xvid.org/downloads/xvidcore-${LIBXVID_VERSION}.tar.gz && \ + tar -zx -f xvidcore-${LIBXVID_VERSION}.tar.gz && \ + cd xvidcore/build/generic && \ + ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" --datadir="${DIR}" --enable-shared --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +### fdk-aac https://github.com/mstorsjo/fdk-aac +RUN \ + DIR=fdk-aac && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://github.com/mstorsjo/fdk-aac/archive/v${LIBFDK_AAC_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + autoreconf -fiv && \ + ./configure --prefix="${PREFIX}" --enable-shared --datadir="${DIR}" && \ + make && \ + make install && \ + rm -rf ${DIR} +## openjpeg https://github.com/uclouvain/openjpeg +RUN \ + DIR=openjpeg && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + if test `echo ${LIBOPENJPEG_VERSION} | tr -d '.'` -ge '210'; then \ + version_prefix='v'; \ + else \ + version_prefix='version.' ;\ + fi && \ + curl -sL https://github.com/uclouvain/openjpeg/archive/${version_prefix}${LIBOPENJPEG_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + cmake -DBUILD_THIRDPARTY:BOOL=ON -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ + make && \ + make install && \ + rm -rf ${DIR} +## freetype https://www.freetype.org/ +RUN \ + DIR=freetype && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://download.savannah.gnu.org/releases/freetype/freetype-${LIBFREETYPE_VERSION}.tar.gz && \ + tar -zx --strip-components=1 -f freetype-${LIBFREETYPE_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +## libvstab https://github.com/georgmartius/vid.stab +RUN \ + DIR=vid.stab && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/georgmartius/vid.stab/archive/v${LIBVIDSTAB_VERSION}.tar.gz &&\ + echo "${LIBVIDSTAB_SHA256SUM} v${LIBVIDSTAB_VERSION}.tar.gz" | sha256sum --check && \ + tar -zx --strip-components=1 -f v${LIBVIDSTAB_VERSION}.tar.gz && \ + cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ + make && \ + make install && \ + rm -rf ${DIR} +## fridibi https://www.fribidi.org/ +# + https://github.com/fribidi/fribidi/issues/8 +RUN \ + DIR=fribidi && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/fribidi/fribidi/archive/${LIBFRIBIDI_VERSION}.tar.gz && \ + echo "${LIBFRIBIDI_SHA256SUM} ${LIBFRIBIDI_VERSION}.tar.gz" | sha256sum --check && \ + tar -zx --strip-components=1 -f ${LIBFRIBIDI_VERSION}.tar.gz && \ + sed -i 's/^SUBDIRS =.*/SUBDIRS=gen.tab charset lib/' Makefile.am && \ + ./bootstrap --no-config && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ + make -j 1 && \ + make install && \ + rm -rf ${DIR} +## fontconfig https://www.freedesktop.org/wiki/Software/fontconfig/ +RUN \ + DIR=fontconfig && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://www.freedesktop.org/software/fontconfig/release/fontconfig-${LIBFONTCONFIG_VERSION}.tar.bz2 &&\ + tar -jx --strip-components=1 -f fontconfig-${LIBFONTCONFIG_VERSION}.tar.bz2 && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +## freetype https://www.freetype.org/ +RUN \ + DIR=freetype && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://download.savannah.gnu.org/releases/freetype/freetype-${LIBFREETYPE_VERSION}.tar.gz && \ + tar -zx --strip-components=1 -f freetype-${LIBFREETYPE_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +## fridibi https://www.fribidi.org/ +# + https://github.com/fribidi/fribidi/issues/8 +RUN \ + DIR=fribidi && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/fribidi/fribidi/archive/${LIBFRIBIDI_VERSION}.tar.gz && \ + echo "${LIBFRIBIDI_SHA256SUM} ${LIBFRIBIDI_VERSION}.tar.gz" | sha256sum --check && \ + tar -zx --strip-components=1 -f ${LIBFRIBIDI_VERSION}.tar.gz && \ + sed -i 's/^SUBDIRS =.*/SUBDIRS=gen.tab charset lib/' Makefile.am && \ + ./bootstrap --no-config && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ + make -j 1 && \ + make install && \ + rm -rf ${DIR} +## fontconfig https://www.freedesktop.org/wiki/Software/fontconfig/ +RUN \ + DIR=fontconfig && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://www.freedesktop.org/software/fontconfig/release/fontconfig-${LIBFONTCONFIG_VERSION}.tar.bz2 &&\ + tar -jx --strip-components=1 -f fontconfig-${LIBFONTCONFIG_VERSION}.tar.bz2 && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +RUN \ + DIR=libass && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/libass/libass/archive/${LIBASS_VERSION}.tar.gz &&\ + tar -zx --strip-components=1 -f ${LIBASS_VERSION}.tar.gz && \ + ./autogen.sh && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +## kvazaar https://github.com/ultravideo/kvazaar +RUN \ + DIR=kvazaar && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/ultravideo/kvazaar/archive/v${LIBKVAZAAR_VERSION}.tar.gz &&\ + tar -zx --strip-components=1 -f v${LIBKVAZAAR_VERSION}.tar.gz && \ + if [ -e ./autogen.sh ]; then \ + ./autogen.sh && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared ; \ + else \ + cd src ; \ + fi && \ + make && \ + make install && \ + rm -rf ${DIR} + +RUN \ + DIR=nv-codec-headers && \ + git clone --branch n${NVENC_VERSION} --depth=1 https://git.videolan.org/git/ffmpeg/nv-codec-headers.git ${DIR} && \ + cd ${DIR} && \ + sed -i 's@/usr/local@'"$PREFIX"'@' Makefile && \ + make && \ + make install && \ + rm -rf ${DIR} +RUN \ + DIR=ffmpeg && mkdir -p ${DIR} && cd ${DIR} && \ + curl -sLO https://ffmpeg.org/releases/ffmpeg-${FFMPEG_VERSION}.tar.bz2 && \ + tar -jx --strip-components=1 -f ffmpeg-${FFMPEG_VERSION}.tar.bz2 && \ + ./configure \ + --disable-debug \ + --disable-doc \ + --disable-ffplay \ + --enable-shared \ + --enable-avresample \ + --enable-openssl \ + --enable-postproc \ + --enable-small \ + --extra-cflags="-I${PREFIX}/include -I/usr/local/include" \ + --extra-ldflags="-L${PREFIX}/lib -L/usr/local/lib" \ + --enable-libopencore-amrnb \ + --enable-libopencore-amrwb \ + --enable-version3 \ + --enable-libx264 \ + --enable-libx265 \ + --enable-libopus \ + --enable-libvorbis \ + --enable-libtheora \ + --enable-libvpx \ + --enable-libmp3lame \ + --enable-libxvid \ + --enable-libfdk_aac \ + --enable-nonfree \ + --enable-libopenjpeg \ + --enable-libfreetype \ + --enable-libvidstab \ + --enable-gpl \ + --enable-libass \ + --enable-libkvazaar \ + --enable-vaapi \ + --enable-cuda \ + --enable-nvenc \ + --enable-cuvid \ + --prefix="${PREFIX}" && \ + make && \ + make install && \ + make distclean && \ + hash -r && \ + cd tools && \ + make qt-faststart && \ + cp qt-faststart ${PREFIX}/bin + +RUN \ + if false; then \ + cp -r ${PREFIX}/lib/*so* /usr/local/lib/ && \ + cp ${PREFIX}/bin/* /usr/local/bin/ ; \ + else \ + LD_LIBRARY_PATH=${PREFIX}/lib ldd ${PREFIX}/bin/ffmpeg | \ + grep ${PREFIX} | \ + cut -d ' ' -f 3 | \ + xargs -i cp {} /usr/local/lib/ && \ + cp ${PREFIX}/bin/ff* /usr/local/bin/ ; \ + fi && \ + if true; then \ + for lib in /usr/local/lib/*.so* /usr/local/bin/*; do strip --strip-all $lib; done ; \ + fi && \ + cp -r ${PREFIX}/share/ffmpeg /usr/local/share/ && \ + LD_LIBRARY_PATH=/usr/local/lib ffmpeg -buildconf + +FROM base AS release +MAINTAINER Julien Rottenberg + +CMD ["--help"] +ENTRYPOINT ["ffmpeg"] + +COPY --from=build /usr/local /usr/local +RUN test "base" = "base" && ldconfig /usr/local/lib /usr/local/lib64 + +# Let's make sure the app built correctly +# Convenient to verify on https://hub.docker.com/r/jrottenberg/ffmpeg/builds/ console output +>>>>>>> fix extra comma diff --git a/docker-images/4.0/alpine,/Dockerfile b/docker-images/4.0/alpine,/Dockerfile deleted file mode 100644 index a0b97723e..000000000 --- a/docker-images/4.0/alpine,/Dockerfile +++ /dev/null @@ -1,14 +0,0 @@ -usage: update.py [-h] [--enable-libopencore-amr] [--enable-libx264] - [--enable-libx265] [--enable-libogg] [--enable-libopus] - [--enable-libvorbis] [--enable-libtheora] [--enable-libvpx] - [--enable-libmp3lame] [--enable-libxvid] - [--enable-libfdk-aac] [--enable-libopenjpeg] - [--enable-libfreetype] [--enable-libvidstab] - [--enable-libfribidi] [--enable-libfontconfig] - [--enable-libass] [--enable-libkvazaar] [--enable-libaom] - [--enable-vaapi] [--enable-nvenc] [--enable-libdav1d] - [--enable-vdpau] [--enable-all] [--with-bins] [--no-strip] - [--fat | --slim | --scratch] - {alpine,centos,ubuntu,nvidia,armv7} - {snapshot,4.1,4.0,3.4,3.3,3.2,2.8} -update.py: error: argument variant: invalid choice: 'alpine,' (choose from 'alpine', 'centos', 'ubuntu', 'nvidia', 'armv7') diff --git a/docker-images/4.0/alpine/Dockerfile b/docker-images/4.0/alpine/Dockerfile index 96ce81dec..25bd8c25b 100644 --- a/docker-images/4.0/alpine/Dockerfile +++ b/docker-images/4.0/alpine/Dockerfile @@ -1,3 +1,4 @@ +<<<<<<< HEAD # ffmpeg - http://ffmpeg.org/download.html # # https://hub.docker.com/r/jrottenberg/ffmpeg/ @@ -388,3 +389,443 @@ COPY --from=build /usr/local /usr/local # Let's make sure the app built correctly # Convenient to verify on https://hub.docker.com/r/jrottenberg/ffmpeg/builds/ console output +======= +FROM alpine:3.9 as base + +RUN apk add --no-cache --update libva \ + libgcc \ + libstdc++ \ + ca-certificates \ + libcrypto1.1 \ + libssl1.1 \ + libgomp \ + expat \ + libuuid + +FROM base as build + +WORKDIR /tmp/workdir + +ARG PREFIX=/tmp/build +ARG MAKEFLAGS=-j6 +ARG PKG_CONFIG_PATH=/tmp/build/lib/pkgconfig + +RUN apk add --no-cache --update libva-dev \ + autoconf \ + automake \ + bash \ + binutils \ + bzip2 \ + cmake \ + curl \ + coreutils \ + diffutils \ + file \ + g++ \ + git \ + gcc \ + gperf \ + libtool \ + make \ + python \ + openssl-dev \ + tar \ + yasm \ + nasm \ + zlib-dev \ + expat-dev \ + util-linux-dev \ + meson \ + ninja + +ARG FFMPEG_VERSION=4.0.4 +ARG LIBOPENCORE_AMR_VERSION=0.1.5 +ARG LIBX264_VERSION=20190526-2245-stable +ARG LIBX265_VERSION=3.0 +ARG LIBOGG_VERSION=1.3.3 +ARG LIBOPUS_VERSION=1.3.1 +ARG LIBVORBIS_VERSION=1.3.6 +ARG LIBTHEORA_VERSION=1.1.1 +ARG LIBVPX_VERSION=1.8.0 +ARG LIBMP3LAME_VERSION=3.100 +ARG LIBXVID_VERSION=1.3.5 +ARG LIBFDK_AAC_VERSION=0.1.6 +ARG LIBOPENJPEG_VERSION=2.3.1 +ARG LIBFREETYPE_VERSION=2.10.0 +ARG LIBVIDSTAB_VERSION=1.1.0 +ARG LIBFRIBIDI_VERSION=0.19.7 +ARG LIBFONTCONFIG_VERSION=2.13.1 +ARG LIBFREETYPE_VERSION=2.10.0 +ARG LIBFRIBIDI_VERSION=0.19.7 +ARG LIBFONTCONFIG_VERSION=2.13.1 +ARG LIBASS_VERSION=0.14.0 +ARG LIBKVAZAAR_VERSION=1.2.0 +ARG LIBAOM_VERSION=1.0.0-errata1 +ARG NVENC_VERSION=9.0.18.1 + +ARG LIBOGG_SHA256SUM=c2e8a485110b97550f453226ec644ebac6cb29d1caef2902c007edab4308d985 +ARG LIBOPUS_SHA256SUM=65b58e1e25b2a114157014736a3d9dfeaad8d41be1c8179866f144a2fb44ff9d +ARG LIBVORBIS_SHA256SUM=6ed40e0241089a42c48604dc00e362beee00036af2d8b3f46338031c9e0351cb +ARG LIBTHEORA_SHA256SUM=40952956c47811928d1e7922cda3bc1f427eb75680c3c37249c91e949054916b +ARG LIBVIDSTAB_SHA256SUM=14d2a053e56edad4f397be0cb3ef8eb1ec3150404ce99a426c4eb641861dc0bb +ARG LIBFRIBIDI_SHA256SUM=3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 +ARG LIBFRIBIDI_SHA256SUM=3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 + +## opencore-amr https://sourceforge.net/projects/opencore-amr/ +RUN \ + DIR=opencore-amr && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://kent.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${LIBOPENCORE_AMR_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +## x264 http://www.videolan.org/developers/x264.html +RUN \ + DIR=x264 && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://download.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-${LIBX264_VERSION}.tar.bz2 | \ + tar -jx --strip-components=1 && \ + ./configure --prefix="${PREFIX}" --enable-shared --enable-pic && \ + make && \ + make install && \ + rm -rf ${DIR} +### x265 http://x265.org/ +RUN \ + DIR=x265 && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://download.videolan.org/pub/videolan/x265/x265_${LIBX265_VERSION}.tar.gz | \ + tar -zx && \ + cd x265_${LIBX265_VERSION}/build/linux && \ + sed -i "/-DEXTRA_LIB/ s/$/ -DCMAKE_INSTALL_PREFIX=\${PREFIX}/" multilib.sh && \ + sed -i "/^cmake/ s/$/ -DENABLE_CLI=ON/" multilib.sh && \ + ./multilib.sh && \ + make -C 8bit install && \ + rm -rf ${DIR} +## libogg https://www.xiph.org/ogg/ +RUN \ + DIR=ogg && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO http://downloads.xiph.org/releases/ogg/libogg-${LIBOGG_VERSION}.tar.gz && \ + echo "${LIBOGG_SHA256SUM} libogg-${LIBOGG_VERSION}.tar.gz" | sha256sum --check && \ + tar -zx --strip-components=1 -f libogg-${LIBOGG_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +RUN \ + DIR=opus && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://archive.mozilla.org/pub/opus/opus-${LIBOPUS_VERSION}.tar.gz && \ + echo "${LIBOPUS_SHA256SUM} opus-${LIBOPUS_VERSION}.tar.gz"| sha256sum --check && \ + tar -zx --strip-components=1 -f opus-${LIBOPUS_VERSION}.tar.gz && \ + autoreconf -fiv && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +### libvorbis https://xiph.org/vorbis/ +RUN \ + DIR=vorbis && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO http://downloads.xiph.org/releases/vorbis/libvorbis-${LIBVORBIS_VERSION}.tar.gz && \ + echo "${LIBVORBIS_SHA256SUM} libvorbis-${LIBVORBIS_VERSION}.tar.gz" | sha256sum --check && \ + tar -zx --strip-components=1 -f libvorbis-${LIBVORBIS_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +### libtheora http://www.theora.org/ +RUN \ + DIR=theora && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO http://downloads.xiph.org/releases/theora/libtheora-${LIBTHEORA_VERSION}.tar.gz && \ + echo "${LIBTHEORA_SHA256SUM} libtheora-${LIBTHEORA_VERSION}.tar.gz" | sha256sum --check && \ + tar -zx --strip-components=1 -f libtheora-${LIBTHEORA_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +### libvpx https://www.webmproject.org/code/ +RUN \ + DIR=vpx && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://codeload.github.com/webmproject/libvpx/tar.gz/v${LIBVPX_VERSION} | \ + tar -zx --strip-components=1 && \ + ./configure --prefix="${PREFIX}" --enable-vp8 --enable-vp9 --enable-vp9-highbitdepth --enable-pic --enable-shared \ + --disable-debug --disable-examples --disable-docs && \ + make && \ + make install && \ + rm -rf ${DIR} + +### libmp3lame http://lame.sourceforge.net/ +RUN \ + DIR=lame && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://kent.dl.sourceforge.net/project/lame/lame/$(echo ${LIBMP3LAME_VERSION} | sed -e 's/[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)/\1.\2/')/lame-${LIBMP3LAME_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" --enable-shared --enable-nasm --enable-pic && \ + make && \ + make install && \ + rm -rf ${DIR} +### xvid https://www.xvid.com/ +RUN \ + DIR=xvid && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO http://downloads.xvid.org/downloads/xvidcore-${LIBXVID_VERSION}.tar.gz && \ + tar -zx -f xvidcore-${LIBXVID_VERSION}.tar.gz && \ + cd xvidcore/build/generic && \ + ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" --datadir="${DIR}" --enable-shared --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +### fdk-aac https://github.com/mstorsjo/fdk-aac +RUN \ + DIR=fdk-aac && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://github.com/mstorsjo/fdk-aac/archive/v${LIBFDK_AAC_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + autoreconf -fiv && \ + ./configure --prefix="${PREFIX}" --enable-shared --datadir="${DIR}" && \ + make && \ + make install && \ + rm -rf ${DIR} +## openjpeg https://github.com/uclouvain/openjpeg +RUN \ + DIR=openjpeg && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + if test `echo ${LIBOPENJPEG_VERSION} | tr -d '.'` -ge '210'; then \ + version_prefix='v'; \ + else \ + version_prefix='version.' ;\ + fi && \ + curl -sL https://github.com/uclouvain/openjpeg/archive/${version_prefix}${LIBOPENJPEG_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + cmake -DBUILD_THIRDPARTY:BOOL=ON -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ + make && \ + make install && \ + rm -rf ${DIR} +## freetype https://www.freetype.org/ +RUN \ + DIR=freetype && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://download.savannah.gnu.org/releases/freetype/freetype-${LIBFREETYPE_VERSION}.tar.gz && \ + tar -zx --strip-components=1 -f freetype-${LIBFREETYPE_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +## libvstab https://github.com/georgmartius/vid.stab +RUN \ + DIR=vid.stab && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/georgmartius/vid.stab/archive/v${LIBVIDSTAB_VERSION}.tar.gz &&\ + echo "${LIBVIDSTAB_SHA256SUM} v${LIBVIDSTAB_VERSION}.tar.gz" | sha256sum --check && \ + tar -zx --strip-components=1 -f v${LIBVIDSTAB_VERSION}.tar.gz && \ + cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ + make && \ + make install && \ + rm -rf ${DIR} +## fridibi https://www.fribidi.org/ +# + https://github.com/fribidi/fribidi/issues/8 +RUN \ + DIR=fribidi && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/fribidi/fribidi/archive/${LIBFRIBIDI_VERSION}.tar.gz && \ + echo "${LIBFRIBIDI_SHA256SUM} ${LIBFRIBIDI_VERSION}.tar.gz" | sha256sum --check && \ + tar -zx --strip-components=1 -f ${LIBFRIBIDI_VERSION}.tar.gz && \ + sed -i 's/^SUBDIRS =.*/SUBDIRS=gen.tab charset lib/' Makefile.am && \ + ./bootstrap --no-config && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ + make -j 1 && \ + make install && \ + rm -rf ${DIR} +## fontconfig https://www.freedesktop.org/wiki/Software/fontconfig/ +RUN \ + DIR=fontconfig && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://www.freedesktop.org/software/fontconfig/release/fontconfig-${LIBFONTCONFIG_VERSION}.tar.bz2 &&\ + tar -jx --strip-components=1 -f fontconfig-${LIBFONTCONFIG_VERSION}.tar.bz2 && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +## freetype https://www.freetype.org/ +RUN \ + DIR=freetype && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://download.savannah.gnu.org/releases/freetype/freetype-${LIBFREETYPE_VERSION}.tar.gz && \ + tar -zx --strip-components=1 -f freetype-${LIBFREETYPE_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +## fridibi https://www.fribidi.org/ +# + https://github.com/fribidi/fribidi/issues/8 +RUN \ + DIR=fribidi && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/fribidi/fribidi/archive/${LIBFRIBIDI_VERSION}.tar.gz && \ + echo "${LIBFRIBIDI_SHA256SUM} ${LIBFRIBIDI_VERSION}.tar.gz" | sha256sum --check && \ + tar -zx --strip-components=1 -f ${LIBFRIBIDI_VERSION}.tar.gz && \ + sed -i 's/^SUBDIRS =.*/SUBDIRS=gen.tab charset lib/' Makefile.am && \ + ./bootstrap --no-config && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ + make -j 1 && \ + make install && \ + rm -rf ${DIR} +## fontconfig https://www.freedesktop.org/wiki/Software/fontconfig/ +RUN \ + DIR=fontconfig && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://www.freedesktop.org/software/fontconfig/release/fontconfig-${LIBFONTCONFIG_VERSION}.tar.bz2 &&\ + tar -jx --strip-components=1 -f fontconfig-${LIBFONTCONFIG_VERSION}.tar.bz2 && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +RUN \ + DIR=libass && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/libass/libass/archive/${LIBASS_VERSION}.tar.gz &&\ + tar -zx --strip-components=1 -f ${LIBASS_VERSION}.tar.gz && \ + ./autogen.sh && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +## kvazaar https://github.com/ultravideo/kvazaar +RUN \ + DIR=kvazaar && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/ultravideo/kvazaar/archive/v${LIBKVAZAAR_VERSION}.tar.gz &&\ + tar -zx --strip-components=1 -f v${LIBKVAZAAR_VERSION}.tar.gz && \ + if [ -e ./autogen.sh ]; then \ + ./autogen.sh && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared ; \ + else \ + cd src ; \ + fi && \ + make && \ + make install && \ + rm -rf ${DIR} +RUN \ + DIR=aom && \ + git clone --branch v${LIBAOM_VERSION} --depth 1 https://aomedia.googlesource.com/aom ${DIR} ; \ + cd ${DIR} ; \ + rm -rf CMakeCache.txt CMakeFiles ; \ + mkdir -p ./aom_build ; \ + cd ./aom_build ; \ + cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" -DBUILD_SHARED_LIBS=1 ..; \ + make ; \ + make install ; \ + rm -rf ${DIR} + +RUN \ + DIR=nv-codec-headers && \ + git clone --branch n${NVENC_VERSION} --depth=1 https://git.videolan.org/git/ffmpeg/nv-codec-headers.git ${DIR} && \ + cd ${DIR} && \ + sed -i 's@/usr/local@'"$PREFIX"'@' Makefile && \ + make && \ + make install && \ + rm -rf ${DIR} +RUN \ + DIR=ffmpeg && mkdir -p ${DIR} && cd ${DIR} && \ + curl -sLO https://ffmpeg.org/releases/ffmpeg-${FFMPEG_VERSION}.tar.bz2 && \ + tar -jx --strip-components=1 -f ffmpeg-${FFMPEG_VERSION}.tar.bz2 && \ + ./configure \ + --disable-debug \ + --disable-doc \ + --disable-ffplay \ + --enable-shared \ + --enable-avresample \ + --enable-openssl \ + --enable-postproc \ + --enable-small \ + --extra-cflags="-I${PREFIX}/include -I/usr/local/include" \ + --extra-ldflags="-L${PREFIX}/lib -L/usr/local/lib" \ + --enable-libopencore-amrnb \ + --enable-libopencore-amrwb \ + --enable-version3 \ + --enable-libx264 \ + --enable-libx265 \ + --enable-libopus \ + --enable-libvorbis \ + --enable-libtheora \ + --enable-libvpx \ + --enable-libmp3lame \ + --enable-libxvid \ + --enable-libfdk_aac \ + --enable-nonfree \ + --enable-libopenjpeg \ + --enable-libfreetype \ + --enable-libvidstab \ + --enable-gpl \ + --enable-libass \ + --enable-libkvazaar \ + --enable-libaom \ + --extra-libs=-lpthread \ + --enable-vaapi \ + --enable-cuda \ + --enable-nvenc \ + --enable-cuvid \ + --prefix="${PREFIX}" && \ + make && \ + make install && \ + make distclean && \ + hash -r && \ + cd tools && \ + make qt-faststart && \ + cp qt-faststart ${PREFIX}/bin + +RUN \ + if false; then \ + cp -r ${PREFIX}/lib/*so* /usr/local/lib/ && \ + cp ${PREFIX}/bin/* /usr/local/bin/ ; \ + else \ + LD_LIBRARY_PATH=${PREFIX}/lib ldd ${PREFIX}/bin/ffmpeg | \ + grep ${PREFIX} | \ + cut -d ' ' -f 3 | \ + xargs -i cp {} /usr/local/lib/ && \ + cp ${PREFIX}/bin/ff* /usr/local/bin/ ; \ + fi && \ + if true; then \ + for lib in /usr/local/lib/*.so* /usr/local/bin/*; do strip --strip-all $lib; done ; \ + fi && \ + cp -r ${PREFIX}/share/ffmpeg /usr/local/share/ && \ + LD_LIBRARY_PATH=/usr/local/lib ffmpeg -buildconf + +FROM base AS release +MAINTAINER Julien Rottenberg + +CMD ["--help"] +ENTRYPOINT ["ffmpeg"] + +COPY --from=build /usr/local /usr/local +RUN test "base" = "base" && ldconfig /usr/local/lib /usr/local/lib64 + +# Let's make sure the app built correctly +# Convenient to verify on https://hub.docker.com/r/jrottenberg/ffmpeg/builds/ console output +>>>>>>> fix extra comma diff --git a/docker-images/4.0/nvidia,/Dockerfile b/docker-images/4.0/nvidia,/Dockerfile deleted file mode 100644 index 452b62c02..000000000 --- a/docker-images/4.0/nvidia,/Dockerfile +++ /dev/null @@ -1,14 +0,0 @@ -usage: update.py [-h] [--enable-libopencore-amr] [--enable-libx264] - [--enable-libx265] [--enable-libogg] [--enable-libopus] - [--enable-libvorbis] [--enable-libtheora] [--enable-libvpx] - [--enable-libmp3lame] [--enable-libxvid] - [--enable-libfdk-aac] [--enable-libopenjpeg] - [--enable-libfreetype] [--enable-libvidstab] - [--enable-libfribidi] [--enable-libfontconfig] - [--enable-libass] [--enable-libkvazaar] [--enable-libaom] - [--enable-vaapi] [--enable-nvenc] [--enable-libdav1d] - [--enable-vdpau] [--enable-all] [--with-bins] [--no-strip] - [--fat | --slim | --scratch] - {alpine,centos,ubuntu,nvidia,armv7} - {snapshot,4.1,4.0,3.4,3.3,3.2,2.8} -update.py: error: argument variant: invalid choice: 'nvidia,' (choose from 'alpine', 'centos', 'ubuntu', 'nvidia', 'armv7') diff --git a/docker-images/4.0/nvidia/Dockerfile b/docker-images/4.0/nvidia/Dockerfile index 40350a59d..619cad62f 100644 --- a/docker-images/4.0/nvidia/Dockerfile +++ b/docker-images/4.0/nvidia/Dockerfile @@ -1,3 +1,4 @@ +<<<<<<< HEAD # ffmpeg - http://ffmpeg.org/download.html # # From https://trac.ffmpeg.org/wiki/CompilationGuide/Ubuntu @@ -423,3 +424,437 @@ COPY --from=build /usr/local/lib /usr/local/lib/ # Let's make sure the app built correctly # Convenient to verify on https://hub.docker.com/r/jrottenberg/ffmpeg/builds/ console output +======= +FROM nvidia/cuda:10.1-runtime-ubuntu18.04 AS base + +ENV NVIDIA_DRIVER_CAPABILITIES=video + +RUN apt-get -yqq update && \ + apt-get install -yq --no-install-recommends libva2 libva-drm2 i965-va-driver ca-certificates expat libgomp1 libuuid1 libssl1.0 && \ + apt-get autoremove -y && \ + apt-get clean -y + +FROM base as build + +WORKDIR /tmp/workdir + +ARG PREFIX=/tmp/build +ARG MAKEFLAGS=-j6 +ARG PKG_CONFIG_PATH=/tmp/build/lib/pkgconfig +ARG C_INCLUDE_PATH=/tmp/build/include/ffnvcodec + +RUN apt-get -yqq update && \ + apt-get install -yq --no-install-recommends \ + libva-dev \ + autoconf \ + automake \ + cmake \ + curl \ + bzip2 \ + libexpat1-dev \ + g++ \ + gcc \ + git \ + gperf \ + libtool \ + make \ + nasm \ + perl \ + pkg-config \ + python \ + libssl1.0-dev \ + yasm \ + zlib1g-dev \ + uuid-dev + +ARG FFMPEG_VERSION=4.0.4 +ARG LIBOPENCORE_AMR_VERSION=0.1.5 +ARG LIBX264_VERSION=20190526-2245-stable +ARG LIBX265_VERSION=3.0 +ARG LIBOGG_VERSION=1.3.3 +ARG LIBOPUS_VERSION=1.3.1 +ARG LIBVORBIS_VERSION=1.3.6 +ARG LIBTHEORA_VERSION=1.1.1 +ARG LIBVPX_VERSION=1.8.0 +ARG LIBMP3LAME_VERSION=3.100 +ARG LIBXVID_VERSION=1.3.5 +ARG LIBFDK_AAC_VERSION=0.1.6 +ARG LIBOPENJPEG_VERSION=2.3.1 +ARG LIBFREETYPE_VERSION=2.10.0 +ARG LIBVIDSTAB_VERSION=1.1.0 +ARG LIBFRIBIDI_VERSION=0.19.7 +ARG LIBFONTCONFIG_VERSION=2.13.1 +ARG LIBFREETYPE_VERSION=2.10.0 +ARG LIBFRIBIDI_VERSION=0.19.7 +ARG LIBFONTCONFIG_VERSION=2.13.1 +ARG LIBASS_VERSION=0.14.0 +ARG LIBKVAZAAR_VERSION=1.2.0 +ARG LIBAOM_VERSION=1.0.0-errata1 +ARG NVENC_VERSION=9.0.18.1 + +ARG LIBOGG_SHA256SUM=c2e8a485110b97550f453226ec644ebac6cb29d1caef2902c007edab4308d985 +ARG LIBOPUS_SHA256SUM=65b58e1e25b2a114157014736a3d9dfeaad8d41be1c8179866f144a2fb44ff9d +ARG LIBVORBIS_SHA256SUM=6ed40e0241089a42c48604dc00e362beee00036af2d8b3f46338031c9e0351cb +ARG LIBTHEORA_SHA256SUM=40952956c47811928d1e7922cda3bc1f427eb75680c3c37249c91e949054916b +ARG LIBVIDSTAB_SHA256SUM=14d2a053e56edad4f397be0cb3ef8eb1ec3150404ce99a426c4eb641861dc0bb +ARG LIBFRIBIDI_SHA256SUM=3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 +ARG LIBFRIBIDI_SHA256SUM=3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 + +## opencore-amr https://sourceforge.net/projects/opencore-amr/ +RUN \ + DIR=opencore-amr && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://kent.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${LIBOPENCORE_AMR_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +## x264 http://www.videolan.org/developers/x264.html +RUN \ + DIR=x264 && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://download.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-${LIBX264_VERSION}.tar.bz2 | \ + tar -jx --strip-components=1 && \ + ./configure --prefix="${PREFIX}" --enable-shared --enable-pic && \ + make && \ + make install && \ + rm -rf ${DIR} +### x265 http://x265.org/ +RUN \ + DIR=x265 && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://download.videolan.org/pub/videolan/x265/x265_${LIBX265_VERSION}.tar.gz | \ + tar -zx && \ + cd x265_${LIBX265_VERSION}/build/linux && \ + sed -i "/-DEXTRA_LIB/ s/$/ -DCMAKE_INSTALL_PREFIX=\${PREFIX}/" multilib.sh && \ + sed -i "/^cmake/ s/$/ -DENABLE_CLI=ON/" multilib.sh && \ + ./multilib.sh && \ + make -C 8bit install && \ + rm -rf ${DIR} +## libogg https://www.xiph.org/ogg/ +RUN \ + DIR=ogg && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO http://downloads.xiph.org/releases/ogg/libogg-${LIBOGG_VERSION}.tar.gz && \ + echo "${LIBOGG_SHA256SUM} libogg-${LIBOGG_VERSION}.tar.gz" | sha256sum --check && \ + tar -zx --strip-components=1 -f libogg-${LIBOGG_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +RUN \ + DIR=opus && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://archive.mozilla.org/pub/opus/opus-${LIBOPUS_VERSION}.tar.gz && \ + echo "${LIBOPUS_SHA256SUM} opus-${LIBOPUS_VERSION}.tar.gz"| sha256sum --check && \ + tar -zx --strip-components=1 -f opus-${LIBOPUS_VERSION}.tar.gz && \ + autoreconf -fiv && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +### libvorbis https://xiph.org/vorbis/ +RUN \ + DIR=vorbis && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO http://downloads.xiph.org/releases/vorbis/libvorbis-${LIBVORBIS_VERSION}.tar.gz && \ + echo "${LIBVORBIS_SHA256SUM} libvorbis-${LIBVORBIS_VERSION}.tar.gz" | sha256sum --check && \ + tar -zx --strip-components=1 -f libvorbis-${LIBVORBIS_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +### libtheora http://www.theora.org/ +RUN \ + DIR=theora && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO http://downloads.xiph.org/releases/theora/libtheora-${LIBTHEORA_VERSION}.tar.gz && \ + echo "${LIBTHEORA_SHA256SUM} libtheora-${LIBTHEORA_VERSION}.tar.gz" | sha256sum --check && \ + tar -zx --strip-components=1 -f libtheora-${LIBTHEORA_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +### libvpx https://www.webmproject.org/code/ +RUN \ + DIR=vpx && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://codeload.github.com/webmproject/libvpx/tar.gz/v${LIBVPX_VERSION} | \ + tar -zx --strip-components=1 && \ + ./configure --prefix="${PREFIX}" --enable-vp8 --enable-vp9 --enable-vp9-highbitdepth --enable-pic --enable-shared \ + --disable-debug --disable-examples --disable-docs && \ + make && \ + make install && \ + rm -rf ${DIR} + +### libmp3lame http://lame.sourceforge.net/ +RUN \ + DIR=lame && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://kent.dl.sourceforge.net/project/lame/lame/$(echo ${LIBMP3LAME_VERSION} | sed -e 's/[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)/\1.\2/')/lame-${LIBMP3LAME_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" --enable-shared --enable-nasm --enable-pic && \ + make && \ + make install && \ + rm -rf ${DIR} +### xvid https://www.xvid.com/ +RUN \ + DIR=xvid && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO http://downloads.xvid.org/downloads/xvidcore-${LIBXVID_VERSION}.tar.gz && \ + tar -zx -f xvidcore-${LIBXVID_VERSION}.tar.gz && \ + cd xvidcore/build/generic && \ + ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" --datadir="${DIR}" --enable-shared --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +### fdk-aac https://github.com/mstorsjo/fdk-aac +RUN \ + DIR=fdk-aac && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://github.com/mstorsjo/fdk-aac/archive/v${LIBFDK_AAC_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + autoreconf -fiv && \ + ./configure --prefix="${PREFIX}" --enable-shared --datadir="${DIR}" && \ + make && \ + make install && \ + rm -rf ${DIR} +## openjpeg https://github.com/uclouvain/openjpeg +RUN \ + DIR=openjpeg && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + if test `echo ${LIBOPENJPEG_VERSION} | tr -d '.'` -ge '210'; then \ + version_prefix='v'; \ + else \ + version_prefix='version.' ;\ + fi && \ + curl -sL https://github.com/uclouvain/openjpeg/archive/${version_prefix}${LIBOPENJPEG_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + cmake -DBUILD_THIRDPARTY:BOOL=ON -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ + make && \ + make install && \ + rm -rf ${DIR} +## freetype https://www.freetype.org/ +RUN \ + DIR=freetype && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://download.savannah.gnu.org/releases/freetype/freetype-${LIBFREETYPE_VERSION}.tar.gz && \ + tar -zx --strip-components=1 -f freetype-${LIBFREETYPE_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +## libvstab https://github.com/georgmartius/vid.stab +RUN \ + DIR=vid.stab && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/georgmartius/vid.stab/archive/v${LIBVIDSTAB_VERSION}.tar.gz &&\ + echo "${LIBVIDSTAB_SHA256SUM} v${LIBVIDSTAB_VERSION}.tar.gz" | sha256sum --check && \ + tar -zx --strip-components=1 -f v${LIBVIDSTAB_VERSION}.tar.gz && \ + cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ + make && \ + make install && \ + rm -rf ${DIR} +## fridibi https://www.fribidi.org/ +# + https://github.com/fribidi/fribidi/issues/8 +RUN \ + DIR=fribidi && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/fribidi/fribidi/archive/${LIBFRIBIDI_VERSION}.tar.gz && \ + echo "${LIBFRIBIDI_SHA256SUM} ${LIBFRIBIDI_VERSION}.tar.gz" | sha256sum --check && \ + tar -zx --strip-components=1 -f ${LIBFRIBIDI_VERSION}.tar.gz && \ + sed -i 's/^SUBDIRS =.*/SUBDIRS=gen.tab charset lib/' Makefile.am && \ + ./bootstrap --no-config && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ + make -j 1 && \ + make install && \ + rm -rf ${DIR} +## fontconfig https://www.freedesktop.org/wiki/Software/fontconfig/ +RUN \ + DIR=fontconfig && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://www.freedesktop.org/software/fontconfig/release/fontconfig-${LIBFONTCONFIG_VERSION}.tar.bz2 &&\ + tar -jx --strip-components=1 -f fontconfig-${LIBFONTCONFIG_VERSION}.tar.bz2 && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +## freetype https://www.freetype.org/ +RUN \ + DIR=freetype && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://download.savannah.gnu.org/releases/freetype/freetype-${LIBFREETYPE_VERSION}.tar.gz && \ + tar -zx --strip-components=1 -f freetype-${LIBFREETYPE_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +## fridibi https://www.fribidi.org/ +# + https://github.com/fribidi/fribidi/issues/8 +RUN \ + DIR=fribidi && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/fribidi/fribidi/archive/${LIBFRIBIDI_VERSION}.tar.gz && \ + echo "${LIBFRIBIDI_SHA256SUM} ${LIBFRIBIDI_VERSION}.tar.gz" | sha256sum --check && \ + tar -zx --strip-components=1 -f ${LIBFRIBIDI_VERSION}.tar.gz && \ + sed -i 's/^SUBDIRS =.*/SUBDIRS=gen.tab charset lib/' Makefile.am && \ + ./bootstrap --no-config && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ + make -j 1 && \ + make install && \ + rm -rf ${DIR} +## fontconfig https://www.freedesktop.org/wiki/Software/fontconfig/ +RUN \ + DIR=fontconfig && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://www.freedesktop.org/software/fontconfig/release/fontconfig-${LIBFONTCONFIG_VERSION}.tar.bz2 &&\ + tar -jx --strip-components=1 -f fontconfig-${LIBFONTCONFIG_VERSION}.tar.bz2 && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +RUN \ + DIR=libass && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/libass/libass/archive/${LIBASS_VERSION}.tar.gz &&\ + tar -zx --strip-components=1 -f ${LIBASS_VERSION}.tar.gz && \ + ./autogen.sh && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +## kvazaar https://github.com/ultravideo/kvazaar +RUN \ + DIR=kvazaar && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/ultravideo/kvazaar/archive/v${LIBKVAZAAR_VERSION}.tar.gz &&\ + tar -zx --strip-components=1 -f v${LIBKVAZAAR_VERSION}.tar.gz && \ + if [ -e ./autogen.sh ]; then \ + ./autogen.sh && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared ; \ + else \ + cd src ; \ + fi && \ + make && \ + make install && \ + rm -rf ${DIR} +RUN \ + DIR=aom && \ + git clone --branch v${LIBAOM_VERSION} --depth 1 https://aomedia.googlesource.com/aom ${DIR} ; \ + cd ${DIR} ; \ + rm -rf CMakeCache.txt CMakeFiles ; \ + mkdir -p ./aom_build ; \ + cd ./aom_build ; \ + cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" -DBUILD_SHARED_LIBS=1 ..; \ + make ; \ + make install ; \ + rm -rf ${DIR} + +RUN \ + DIR=nv-codec-headers && \ + git clone --branch n${NVENC_VERSION} --depth=1 https://git.videolan.org/git/ffmpeg/nv-codec-headers.git ${DIR} && \ + cd ${DIR} && \ + sed -i 's@/usr/local@'"$PREFIX"'@' Makefile && \ + make && \ + make install && \ + rm -rf ${DIR} +RUN \ + DIR=ffmpeg && mkdir -p ${DIR} && cd ${DIR} && \ + curl -sLO https://ffmpeg.org/releases/ffmpeg-${FFMPEG_VERSION}.tar.bz2 && \ + tar -jx --strip-components=1 -f ffmpeg-${FFMPEG_VERSION}.tar.bz2 && \ + ./configure \ + --disable-debug \ + --disable-doc \ + --disable-ffplay \ + --enable-shared \ + --enable-avresample \ + --enable-openssl \ + --enable-postproc \ + --enable-small \ + --extra-cflags="-I${PREFIX}/include -I/usr/local/include" \ + --extra-ldflags="-L${PREFIX}/lib -L/usr/local/lib" \ + --enable-libopencore-amrnb \ + --enable-libopencore-amrwb \ + --enable-version3 \ + --enable-libx264 \ + --enable-libx265 \ + --enable-libopus \ + --enable-libvorbis \ + --enable-libtheora \ + --enable-libvpx \ + --enable-libmp3lame \ + --enable-libxvid \ + --enable-libfdk_aac \ + --enable-nonfree \ + --enable-libopenjpeg \ + --enable-libfreetype \ + --enable-libvidstab \ + --enable-gpl \ + --enable-libass \ + --enable-libkvazaar \ + --enable-libaom \ + --extra-libs=-lpthread \ + --enable-vaapi \ + --enable-cuda \ + --enable-nvenc \ + --enable-cuvid \ + --prefix="${PREFIX}" && \ + make && \ + make install && \ + make distclean && \ + hash -r && \ + cd tools && \ + make qt-faststart && \ + cp qt-faststart ${PREFIX}/bin + +RUN \ + if false; then \ + cp -r ${PREFIX}/lib/*so* /usr/local/lib/ && \ + cp ${PREFIX}/bin/* /usr/local/bin/ ; \ + else \ + LD_LIBRARY_PATH=${PREFIX}/lib ldd ${PREFIX}/bin/ffmpeg | \ + grep ${PREFIX} | \ + cut -d ' ' -f 3 | \ + xargs -i cp {} /usr/local/lib/ && \ + cp ${PREFIX}/bin/ff* /usr/local/bin/ ; \ + fi && \ + if true; then \ + for lib in /usr/local/lib/*.so* /usr/local/bin/*; do strip --strip-all $lib; done ; \ + fi && \ + cp -r ${PREFIX}/share/ffmpeg /usr/local/share/ && \ + LD_LIBRARY_PATH=/usr/local/lib ffmpeg -buildconf + +FROM base AS release +MAINTAINER Julien Rottenberg + +CMD ["--help"] +ENTRYPOINT ["ffmpeg"] + +COPY --from=build /usr/local /usr/local +RUN test "base" = "base" && ldconfig /usr/local/lib /usr/local/lib64 + +# Let's make sure the app built correctly +# Convenient to verify on https://hub.docker.com/r/jrottenberg/ffmpeg/builds/ console output +>>>>>>> fix extra comma diff --git a/docker-images/4.1/alpine,/Dockerfile b/docker-images/4.1/alpine,/Dockerfile deleted file mode 100644 index a0b97723e..000000000 --- a/docker-images/4.1/alpine,/Dockerfile +++ /dev/null @@ -1,14 +0,0 @@ -usage: update.py [-h] [--enable-libopencore-amr] [--enable-libx264] - [--enable-libx265] [--enable-libogg] [--enable-libopus] - [--enable-libvorbis] [--enable-libtheora] [--enable-libvpx] - [--enable-libmp3lame] [--enable-libxvid] - [--enable-libfdk-aac] [--enable-libopenjpeg] - [--enable-libfreetype] [--enable-libvidstab] - [--enable-libfribidi] [--enable-libfontconfig] - [--enable-libass] [--enable-libkvazaar] [--enable-libaom] - [--enable-vaapi] [--enable-nvenc] [--enable-libdav1d] - [--enable-vdpau] [--enable-all] [--with-bins] [--no-strip] - [--fat | --slim | --scratch] - {alpine,centos,ubuntu,nvidia,armv7} - {snapshot,4.1,4.0,3.4,3.3,3.2,2.8} -update.py: error: argument variant: invalid choice: 'alpine,' (choose from 'alpine', 'centos', 'ubuntu', 'nvidia', 'armv7') diff --git a/docker-images/4.1/alpine/Dockerfile b/docker-images/4.1/alpine/Dockerfile index 9e7c74a51..600078ca1 100644 --- a/docker-images/4.1/alpine/Dockerfile +++ b/docker-images/4.1/alpine/Dockerfile @@ -1,3 +1,4 @@ +<<<<<<< HEAD # ffmpeg - http://ffmpeg.org/download.html # # https://hub.docker.com/r/jrottenberg/ffmpeg/ @@ -388,3 +389,445 @@ COPY --from=build /usr/local /usr/local # Let's make sure the app built correctly # Convenient to verify on https://hub.docker.com/r/jrottenberg/ffmpeg/builds/ console output +======= +FROM alpine:3.9 as base + +RUN apk add --no-cache --update libvdpau libva \ + libgcc \ + libstdc++ \ + ca-certificates \ + libcrypto1.1 \ + libssl1.1 \ + libgomp \ + expat \ + libuuid + +FROM base as build + +WORKDIR /tmp/workdir + +ARG PREFIX=/tmp/build +ARG MAKEFLAGS=-j6 +ARG PKG_CONFIG_PATH=/tmp/build/lib/pkgconfig + +RUN apk add --no-cache --update libvdpau-dev libva-dev \ + autoconf \ + automake \ + bash \ + binutils \ + bzip2 \ + cmake \ + curl \ + coreutils \ + diffutils \ + file \ + g++ \ + git \ + gcc \ + gperf \ + libtool \ + make \ + python \ + openssl-dev \ + tar \ + yasm \ + nasm \ + zlib-dev \ + expat-dev \ + util-linux-dev \ + meson \ + ninja + +ARG FFMPEG_VERSION=4.1.3 +ARG LIBOPENCORE_AMR_VERSION=0.1.5 +ARG LIBX264_VERSION=20190526-2245-stable +ARG LIBX265_VERSION=3.0 +ARG LIBOGG_VERSION=1.3.3 +ARG LIBOPUS_VERSION=1.3.1 +ARG LIBVORBIS_VERSION=1.3.6 +ARG LIBTHEORA_VERSION=1.1.1 +ARG LIBVPX_VERSION=1.8.0 +ARG LIBMP3LAME_VERSION=3.100 +ARG LIBXVID_VERSION=1.3.5 +ARG LIBFDK_AAC_VERSION=2.0.0 +ARG LIBOPENJPEG_VERSION=2.3.1 +ARG LIBFREETYPE_VERSION=2.10.0 +ARG LIBVIDSTAB_VERSION=1.1.0 +ARG LIBFRIBIDI_VERSION=0.19.7 +ARG LIBFONTCONFIG_VERSION=2.13.1 +ARG LIBFREETYPE_VERSION=2.10.0 +ARG LIBFRIBIDI_VERSION=0.19.7 +ARG LIBFONTCONFIG_VERSION=2.13.1 +ARG LIBASS_VERSION=0.14.0 +ARG LIBKVAZAAR_VERSION=1.2.0 +ARG LIBAOM_VERSION=1.0.0-errata1 +ARG NVENC_VERSION=9.0.18.1 + +ARG LIBOGG_SHA256SUM=c2e8a485110b97550f453226ec644ebac6cb29d1caef2902c007edab4308d985 +ARG LIBOPUS_SHA256SUM=65b58e1e25b2a114157014736a3d9dfeaad8d41be1c8179866f144a2fb44ff9d +ARG LIBVORBIS_SHA256SUM=6ed40e0241089a42c48604dc00e362beee00036af2d8b3f46338031c9e0351cb +ARG LIBTHEORA_SHA256SUM=40952956c47811928d1e7922cda3bc1f427eb75680c3c37249c91e949054916b +ARG LIBVIDSTAB_SHA256SUM=14d2a053e56edad4f397be0cb3ef8eb1ec3150404ce99a426c4eb641861dc0bb +ARG LIBFRIBIDI_SHA256SUM=3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 +ARG LIBFRIBIDI_SHA256SUM=3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 + +## opencore-amr https://sourceforge.net/projects/opencore-amr/ +RUN \ + DIR=opencore-amr && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://kent.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${LIBOPENCORE_AMR_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +## x264 http://www.videolan.org/developers/x264.html +RUN \ + DIR=x264 && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://download.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-${LIBX264_VERSION}.tar.bz2 | \ + tar -jx --strip-components=1 && \ + ./configure --prefix="${PREFIX}" --enable-shared --enable-pic && \ + make && \ + make install && \ + rm -rf ${DIR} +### x265 http://x265.org/ +RUN \ + DIR=x265 && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://download.videolan.org/pub/videolan/x265/x265_${LIBX265_VERSION}.tar.gz | \ + tar -zx && \ + cd x265_${LIBX265_VERSION}/build/linux && \ + sed -i "/-DEXTRA_LIB/ s/$/ -DCMAKE_INSTALL_PREFIX=\${PREFIX}/" multilib.sh && \ + sed -i "/^cmake/ s/$/ -DENABLE_CLI=ON/" multilib.sh && \ + ./multilib.sh && \ + make -C 8bit install && \ + rm -rf ${DIR} +## libogg https://www.xiph.org/ogg/ +RUN \ + DIR=ogg && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO http://downloads.xiph.org/releases/ogg/libogg-${LIBOGG_VERSION}.tar.gz && \ + echo "${LIBOGG_SHA256SUM} libogg-${LIBOGG_VERSION}.tar.gz" | sha256sum --check && \ + tar -zx --strip-components=1 -f libogg-${LIBOGG_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +RUN \ + DIR=opus && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://archive.mozilla.org/pub/opus/opus-${LIBOPUS_VERSION}.tar.gz && \ + echo "${LIBOPUS_SHA256SUM} opus-${LIBOPUS_VERSION}.tar.gz"| sha256sum --check && \ + tar -zx --strip-components=1 -f opus-${LIBOPUS_VERSION}.tar.gz && \ + autoreconf -fiv && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +### libvorbis https://xiph.org/vorbis/ +RUN \ + DIR=vorbis && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO http://downloads.xiph.org/releases/vorbis/libvorbis-${LIBVORBIS_VERSION}.tar.gz && \ + echo "${LIBVORBIS_SHA256SUM} libvorbis-${LIBVORBIS_VERSION}.tar.gz" | sha256sum --check && \ + tar -zx --strip-components=1 -f libvorbis-${LIBVORBIS_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +### libtheora http://www.theora.org/ +RUN \ + DIR=theora && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO http://downloads.xiph.org/releases/theora/libtheora-${LIBTHEORA_VERSION}.tar.gz && \ + echo "${LIBTHEORA_SHA256SUM} libtheora-${LIBTHEORA_VERSION}.tar.gz" | sha256sum --check && \ + tar -zx --strip-components=1 -f libtheora-${LIBTHEORA_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +### libvpx https://www.webmproject.org/code/ +RUN \ + DIR=vpx && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://codeload.github.com/webmproject/libvpx/tar.gz/v${LIBVPX_VERSION} | \ + tar -zx --strip-components=1 && \ + ./configure --prefix="${PREFIX}" --enable-vp8 --enable-vp9 --enable-vp9-highbitdepth --enable-pic --enable-shared \ + --disable-debug --disable-examples --disable-docs && \ + make && \ + make install && \ + rm -rf ${DIR} + +### libmp3lame http://lame.sourceforge.net/ +RUN \ + DIR=lame && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://kent.dl.sourceforge.net/project/lame/lame/$(echo ${LIBMP3LAME_VERSION} | sed -e 's/[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)/\1.\2/')/lame-${LIBMP3LAME_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" --enable-shared --enable-nasm --enable-pic && \ + make && \ + make install && \ + rm -rf ${DIR} +### xvid https://www.xvid.com/ +RUN \ + DIR=xvid && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO http://downloads.xvid.org/downloads/xvidcore-${LIBXVID_VERSION}.tar.gz && \ + tar -zx -f xvidcore-${LIBXVID_VERSION}.tar.gz && \ + cd xvidcore/build/generic && \ + ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" --datadir="${DIR}" --enable-shared --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +### fdk-aac https://github.com/mstorsjo/fdk-aac +RUN \ + DIR=fdk-aac && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://github.com/mstorsjo/fdk-aac/archive/v${LIBFDK_AAC_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + autoreconf -fiv && \ + ./configure --prefix="${PREFIX}" --enable-shared --datadir="${DIR}" && \ + make && \ + make install && \ + rm -rf ${DIR} +## openjpeg https://github.com/uclouvain/openjpeg +RUN \ + DIR=openjpeg && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + if test `echo ${LIBOPENJPEG_VERSION} | tr -d '.'` -ge '210'; then \ + version_prefix='v'; \ + else \ + version_prefix='version.' ;\ + fi && \ + curl -sL https://github.com/uclouvain/openjpeg/archive/${version_prefix}${LIBOPENJPEG_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + cmake -DBUILD_THIRDPARTY:BOOL=ON -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ + make && \ + make install && \ + rm -rf ${DIR} +## freetype https://www.freetype.org/ +RUN \ + DIR=freetype && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://download.savannah.gnu.org/releases/freetype/freetype-${LIBFREETYPE_VERSION}.tar.gz && \ + tar -zx --strip-components=1 -f freetype-${LIBFREETYPE_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +## libvstab https://github.com/georgmartius/vid.stab +RUN \ + DIR=vid.stab && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/georgmartius/vid.stab/archive/v${LIBVIDSTAB_VERSION}.tar.gz &&\ + echo "${LIBVIDSTAB_SHA256SUM} v${LIBVIDSTAB_VERSION}.tar.gz" | sha256sum --check && \ + tar -zx --strip-components=1 -f v${LIBVIDSTAB_VERSION}.tar.gz && \ + cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ + make && \ + make install && \ + rm -rf ${DIR} +## fridibi https://www.fribidi.org/ +# + https://github.com/fribidi/fribidi/issues/8 +RUN \ + DIR=fribidi && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/fribidi/fribidi/archive/${LIBFRIBIDI_VERSION}.tar.gz && \ + echo "${LIBFRIBIDI_SHA256SUM} ${LIBFRIBIDI_VERSION}.tar.gz" | sha256sum --check && \ + tar -zx --strip-components=1 -f ${LIBFRIBIDI_VERSION}.tar.gz && \ + sed -i 's/^SUBDIRS =.*/SUBDIRS=gen.tab charset lib/' Makefile.am && \ + ./bootstrap --no-config && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ + make -j 1 && \ + make install && \ + rm -rf ${DIR} +## fontconfig https://www.freedesktop.org/wiki/Software/fontconfig/ +RUN \ + DIR=fontconfig && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://www.freedesktop.org/software/fontconfig/release/fontconfig-${LIBFONTCONFIG_VERSION}.tar.bz2 &&\ + tar -jx --strip-components=1 -f fontconfig-${LIBFONTCONFIG_VERSION}.tar.bz2 && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +## freetype https://www.freetype.org/ +RUN \ + DIR=freetype && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://download.savannah.gnu.org/releases/freetype/freetype-${LIBFREETYPE_VERSION}.tar.gz && \ + tar -zx --strip-components=1 -f freetype-${LIBFREETYPE_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +## fridibi https://www.fribidi.org/ +# + https://github.com/fribidi/fribidi/issues/8 +RUN \ + DIR=fribidi && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/fribidi/fribidi/archive/${LIBFRIBIDI_VERSION}.tar.gz && \ + echo "${LIBFRIBIDI_SHA256SUM} ${LIBFRIBIDI_VERSION}.tar.gz" | sha256sum --check && \ + tar -zx --strip-components=1 -f ${LIBFRIBIDI_VERSION}.tar.gz && \ + sed -i 's/^SUBDIRS =.*/SUBDIRS=gen.tab charset lib/' Makefile.am && \ + ./bootstrap --no-config && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ + make -j 1 && \ + make install && \ + rm -rf ${DIR} +## fontconfig https://www.freedesktop.org/wiki/Software/fontconfig/ +RUN \ + DIR=fontconfig && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://www.freedesktop.org/software/fontconfig/release/fontconfig-${LIBFONTCONFIG_VERSION}.tar.bz2 &&\ + tar -jx --strip-components=1 -f fontconfig-${LIBFONTCONFIG_VERSION}.tar.bz2 && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +RUN \ + DIR=libass && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/libass/libass/archive/${LIBASS_VERSION}.tar.gz &&\ + tar -zx --strip-components=1 -f ${LIBASS_VERSION}.tar.gz && \ + ./autogen.sh && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +## kvazaar https://github.com/ultravideo/kvazaar +RUN \ + DIR=kvazaar && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/ultravideo/kvazaar/archive/v${LIBKVAZAAR_VERSION}.tar.gz &&\ + tar -zx --strip-components=1 -f v${LIBKVAZAAR_VERSION}.tar.gz && \ + if [ -e ./autogen.sh ]; then \ + ./autogen.sh && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared ; \ + else \ + cd src ; \ + fi && \ + make && \ + make install && \ + rm -rf ${DIR} +RUN \ + DIR=aom && \ + git clone --branch v${LIBAOM_VERSION} --depth 1 https://aomedia.googlesource.com/aom ${DIR} ; \ + cd ${DIR} ; \ + rm -rf CMakeCache.txt CMakeFiles ; \ + mkdir -p ./aom_build ; \ + cd ./aom_build ; \ + cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" -DBUILD_SHARED_LIBS=1 ..; \ + make ; \ + make install ; \ + rm -rf ${DIR} + +RUN \ + DIR=nv-codec-headers && \ + git clone --branch n${NVENC_VERSION} --depth=1 https://git.videolan.org/git/ffmpeg/nv-codec-headers.git ${DIR} && \ + cd ${DIR} && \ + sed -i 's@/usr/local@'"$PREFIX"'@' Makefile && \ + make && \ + make install && \ + rm -rf ${DIR} + +RUN \ + DIR=ffmpeg && mkdir -p ${DIR} && cd ${DIR} && \ + curl -sLO https://ffmpeg.org/releases/ffmpeg-${FFMPEG_VERSION}.tar.bz2 && \ + tar -jx --strip-components=1 -f ffmpeg-${FFMPEG_VERSION}.tar.bz2 && \ + ./configure \ + --disable-debug \ + --disable-doc \ + --disable-ffplay \ + --enable-shared \ + --enable-avresample \ + --enable-openssl \ + --enable-postproc \ + --enable-small \ + --extra-cflags="-I${PREFIX}/include -I/usr/local/include" \ + --extra-ldflags="-L${PREFIX}/lib -L/usr/local/lib" \ + --enable-libopencore-amrnb \ + --enable-libopencore-amrwb \ + --enable-version3 \ + --enable-libx264 \ + --enable-libx265 \ + --enable-libopus \ + --enable-libvorbis \ + --enable-libtheora \ + --enable-libvpx \ + --enable-libmp3lame \ + --enable-libxvid \ + --enable-libfdk_aac \ + --enable-nonfree \ + --enable-libopenjpeg \ + --enable-libfreetype \ + --enable-libvidstab \ + --enable-gpl \ + --enable-libass \ + --enable-libkvazaar \ + --enable-libaom \ + --extra-libs=-lpthread \ + --enable-vaapi \ + --enable-cuda \ + --enable-nvenc \ + --enable-cuvid \ + --enable-vdpau \ + --prefix="${PREFIX}" && \ + make && \ + make install && \ + make distclean && \ + hash -r && \ + cd tools && \ + make qt-faststart && \ + cp qt-faststart ${PREFIX}/bin + +RUN \ + if false; then \ + cp -r ${PREFIX}/lib/*so* /usr/local/lib/ && \ + cp ${PREFIX}/bin/* /usr/local/bin/ ; \ + else \ + LD_LIBRARY_PATH=${PREFIX}/lib ldd ${PREFIX}/bin/ffmpeg | \ + grep ${PREFIX} | \ + cut -d ' ' -f 3 | \ + xargs -i cp {} /usr/local/lib/ && \ + cp ${PREFIX}/bin/ff* /usr/local/bin/ ; \ + fi && \ + if true; then \ + for lib in /usr/local/lib/*.so* /usr/local/bin/*; do strip --strip-all $lib; done ; \ + fi && \ + cp -r ${PREFIX}/share/ffmpeg /usr/local/share/ && \ + LD_LIBRARY_PATH=/usr/local/lib ffmpeg -buildconf + +FROM base AS release +MAINTAINER Julien Rottenberg + +CMD ["--help"] +ENTRYPOINT ["ffmpeg"] + +COPY --from=build /usr/local /usr/local +RUN test "base" = "base" && ldconfig /usr/local/lib /usr/local/lib64 + +# Let's make sure the app built correctly +# Convenient to verify on https://hub.docker.com/r/jrottenberg/ffmpeg/builds/ console output +>>>>>>> fix extra comma diff --git a/docker-images/4.1/nvidia,/Dockerfile b/docker-images/4.1/nvidia,/Dockerfile deleted file mode 100644 index 452b62c02..000000000 --- a/docker-images/4.1/nvidia,/Dockerfile +++ /dev/null @@ -1,14 +0,0 @@ -usage: update.py [-h] [--enable-libopencore-amr] [--enable-libx264] - [--enable-libx265] [--enable-libogg] [--enable-libopus] - [--enable-libvorbis] [--enable-libtheora] [--enable-libvpx] - [--enable-libmp3lame] [--enable-libxvid] - [--enable-libfdk-aac] [--enable-libopenjpeg] - [--enable-libfreetype] [--enable-libvidstab] - [--enable-libfribidi] [--enable-libfontconfig] - [--enable-libass] [--enable-libkvazaar] [--enable-libaom] - [--enable-vaapi] [--enable-nvenc] [--enable-libdav1d] - [--enable-vdpau] [--enable-all] [--with-bins] [--no-strip] - [--fat | --slim | --scratch] - {alpine,centos,ubuntu,nvidia,armv7} - {snapshot,4.1,4.0,3.4,3.3,3.2,2.8} -update.py: error: argument variant: invalid choice: 'nvidia,' (choose from 'alpine', 'centos', 'ubuntu', 'nvidia', 'armv7') diff --git a/docker-images/4.1/nvidia/Dockerfile b/docker-images/4.1/nvidia/Dockerfile index 9ed961542..babc04b2c 100644 --- a/docker-images/4.1/nvidia/Dockerfile +++ b/docker-images/4.1/nvidia/Dockerfile @@ -1,3 +1,4 @@ +<<<<<<< HEAD # ffmpeg - http://ffmpeg.org/download.html # # From https://trac.ffmpeg.org/wiki/CompilationGuide/Ubuntu @@ -423,3 +424,439 @@ COPY --from=build /usr/local/lib /usr/local/lib/ # Let's make sure the app built correctly # Convenient to verify on https://hub.docker.com/r/jrottenberg/ffmpeg/builds/ console output +======= +FROM nvidia/cuda:10.1-runtime-ubuntu18.04 AS base + +ENV NVIDIA_DRIVER_CAPABILITIES=video + +RUN apt-get -yqq update && \ + apt-get install -yq --no-install-recommends libvdpau1 libva2 libva-drm2 i965-va-driver ca-certificates expat libgomp1 libuuid1 libssl1.0 && \ + apt-get autoremove -y && \ + apt-get clean -y + +FROM base as build + +WORKDIR /tmp/workdir + +ARG PREFIX=/tmp/build +ARG MAKEFLAGS=-j6 +ARG PKG_CONFIG_PATH=/tmp/build/lib/pkgconfig +ARG C_INCLUDE_PATH=/tmp/build/include/ffnvcodec + +RUN apt-get -yqq update && \ + apt-get install -yq --no-install-recommends \ + libvdpau-dev libva-dev \ + autoconf \ + automake \ + cmake \ + curl \ + bzip2 \ + libexpat1-dev \ + g++ \ + gcc \ + git \ + gperf \ + libtool \ + make \ + nasm \ + perl \ + pkg-config \ + python \ + libssl1.0-dev \ + yasm \ + zlib1g-dev \ + uuid-dev + +ARG FFMPEG_VERSION=4.1.3 +ARG LIBOPENCORE_AMR_VERSION=0.1.5 +ARG LIBX264_VERSION=20190526-2245-stable +ARG LIBX265_VERSION=3.0 +ARG LIBOGG_VERSION=1.3.3 +ARG LIBOPUS_VERSION=1.3.1 +ARG LIBVORBIS_VERSION=1.3.6 +ARG LIBTHEORA_VERSION=1.1.1 +ARG LIBVPX_VERSION=1.8.0 +ARG LIBMP3LAME_VERSION=3.100 +ARG LIBXVID_VERSION=1.3.5 +ARG LIBFDK_AAC_VERSION=2.0.0 +ARG LIBOPENJPEG_VERSION=2.3.1 +ARG LIBFREETYPE_VERSION=2.10.0 +ARG LIBVIDSTAB_VERSION=1.1.0 +ARG LIBFRIBIDI_VERSION=0.19.7 +ARG LIBFONTCONFIG_VERSION=2.13.1 +ARG LIBFREETYPE_VERSION=2.10.0 +ARG LIBFRIBIDI_VERSION=0.19.7 +ARG LIBFONTCONFIG_VERSION=2.13.1 +ARG LIBASS_VERSION=0.14.0 +ARG LIBKVAZAAR_VERSION=1.2.0 +ARG LIBAOM_VERSION=1.0.0-errata1 +ARG NVENC_VERSION=9.0.18.1 + +ARG LIBOGG_SHA256SUM=c2e8a485110b97550f453226ec644ebac6cb29d1caef2902c007edab4308d985 +ARG LIBOPUS_SHA256SUM=65b58e1e25b2a114157014736a3d9dfeaad8d41be1c8179866f144a2fb44ff9d +ARG LIBVORBIS_SHA256SUM=6ed40e0241089a42c48604dc00e362beee00036af2d8b3f46338031c9e0351cb +ARG LIBTHEORA_SHA256SUM=40952956c47811928d1e7922cda3bc1f427eb75680c3c37249c91e949054916b +ARG LIBVIDSTAB_SHA256SUM=14d2a053e56edad4f397be0cb3ef8eb1ec3150404ce99a426c4eb641861dc0bb +ARG LIBFRIBIDI_SHA256SUM=3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 +ARG LIBFRIBIDI_SHA256SUM=3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 + +## opencore-amr https://sourceforge.net/projects/opencore-amr/ +RUN \ + DIR=opencore-amr && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://kent.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${LIBOPENCORE_AMR_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +## x264 http://www.videolan.org/developers/x264.html +RUN \ + DIR=x264 && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://download.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-${LIBX264_VERSION}.tar.bz2 | \ + tar -jx --strip-components=1 && \ + ./configure --prefix="${PREFIX}" --enable-shared --enable-pic && \ + make && \ + make install && \ + rm -rf ${DIR} +### x265 http://x265.org/ +RUN \ + DIR=x265 && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://download.videolan.org/pub/videolan/x265/x265_${LIBX265_VERSION}.tar.gz | \ + tar -zx && \ + cd x265_${LIBX265_VERSION}/build/linux && \ + sed -i "/-DEXTRA_LIB/ s/$/ -DCMAKE_INSTALL_PREFIX=\${PREFIX}/" multilib.sh && \ + sed -i "/^cmake/ s/$/ -DENABLE_CLI=ON/" multilib.sh && \ + ./multilib.sh && \ + make -C 8bit install && \ + rm -rf ${DIR} +## libogg https://www.xiph.org/ogg/ +RUN \ + DIR=ogg && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO http://downloads.xiph.org/releases/ogg/libogg-${LIBOGG_VERSION}.tar.gz && \ + echo "${LIBOGG_SHA256SUM} libogg-${LIBOGG_VERSION}.tar.gz" | sha256sum --check && \ + tar -zx --strip-components=1 -f libogg-${LIBOGG_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +RUN \ + DIR=opus && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://archive.mozilla.org/pub/opus/opus-${LIBOPUS_VERSION}.tar.gz && \ + echo "${LIBOPUS_SHA256SUM} opus-${LIBOPUS_VERSION}.tar.gz"| sha256sum --check && \ + tar -zx --strip-components=1 -f opus-${LIBOPUS_VERSION}.tar.gz && \ + autoreconf -fiv && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +### libvorbis https://xiph.org/vorbis/ +RUN \ + DIR=vorbis && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO http://downloads.xiph.org/releases/vorbis/libvorbis-${LIBVORBIS_VERSION}.tar.gz && \ + echo "${LIBVORBIS_SHA256SUM} libvorbis-${LIBVORBIS_VERSION}.tar.gz" | sha256sum --check && \ + tar -zx --strip-components=1 -f libvorbis-${LIBVORBIS_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +### libtheora http://www.theora.org/ +RUN \ + DIR=theora && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO http://downloads.xiph.org/releases/theora/libtheora-${LIBTHEORA_VERSION}.tar.gz && \ + echo "${LIBTHEORA_SHA256SUM} libtheora-${LIBTHEORA_VERSION}.tar.gz" | sha256sum --check && \ + tar -zx --strip-components=1 -f libtheora-${LIBTHEORA_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +### libvpx https://www.webmproject.org/code/ +RUN \ + DIR=vpx && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://codeload.github.com/webmproject/libvpx/tar.gz/v${LIBVPX_VERSION} | \ + tar -zx --strip-components=1 && \ + ./configure --prefix="${PREFIX}" --enable-vp8 --enable-vp9 --enable-vp9-highbitdepth --enable-pic --enable-shared \ + --disable-debug --disable-examples --disable-docs && \ + make && \ + make install && \ + rm -rf ${DIR} + +### libmp3lame http://lame.sourceforge.net/ +RUN \ + DIR=lame && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://kent.dl.sourceforge.net/project/lame/lame/$(echo ${LIBMP3LAME_VERSION} | sed -e 's/[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)/\1.\2/')/lame-${LIBMP3LAME_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" --enable-shared --enable-nasm --enable-pic && \ + make && \ + make install && \ + rm -rf ${DIR} +### xvid https://www.xvid.com/ +RUN \ + DIR=xvid && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO http://downloads.xvid.org/downloads/xvidcore-${LIBXVID_VERSION}.tar.gz && \ + tar -zx -f xvidcore-${LIBXVID_VERSION}.tar.gz && \ + cd xvidcore/build/generic && \ + ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" --datadir="${DIR}" --enable-shared --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +### fdk-aac https://github.com/mstorsjo/fdk-aac +RUN \ + DIR=fdk-aac && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://github.com/mstorsjo/fdk-aac/archive/v${LIBFDK_AAC_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + autoreconf -fiv && \ + ./configure --prefix="${PREFIX}" --enable-shared --datadir="${DIR}" && \ + make && \ + make install && \ + rm -rf ${DIR} +## openjpeg https://github.com/uclouvain/openjpeg +RUN \ + DIR=openjpeg && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + if test `echo ${LIBOPENJPEG_VERSION} | tr -d '.'` -ge '210'; then \ + version_prefix='v'; \ + else \ + version_prefix='version.' ;\ + fi && \ + curl -sL https://github.com/uclouvain/openjpeg/archive/${version_prefix}${LIBOPENJPEG_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + cmake -DBUILD_THIRDPARTY:BOOL=ON -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ + make && \ + make install && \ + rm -rf ${DIR} +## freetype https://www.freetype.org/ +RUN \ + DIR=freetype && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://download.savannah.gnu.org/releases/freetype/freetype-${LIBFREETYPE_VERSION}.tar.gz && \ + tar -zx --strip-components=1 -f freetype-${LIBFREETYPE_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +## libvstab https://github.com/georgmartius/vid.stab +RUN \ + DIR=vid.stab && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/georgmartius/vid.stab/archive/v${LIBVIDSTAB_VERSION}.tar.gz &&\ + echo "${LIBVIDSTAB_SHA256SUM} v${LIBVIDSTAB_VERSION}.tar.gz" | sha256sum --check && \ + tar -zx --strip-components=1 -f v${LIBVIDSTAB_VERSION}.tar.gz && \ + cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ + make && \ + make install && \ + rm -rf ${DIR} +## fridibi https://www.fribidi.org/ +# + https://github.com/fribidi/fribidi/issues/8 +RUN \ + DIR=fribidi && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/fribidi/fribidi/archive/${LIBFRIBIDI_VERSION}.tar.gz && \ + echo "${LIBFRIBIDI_SHA256SUM} ${LIBFRIBIDI_VERSION}.tar.gz" | sha256sum --check && \ + tar -zx --strip-components=1 -f ${LIBFRIBIDI_VERSION}.tar.gz && \ + sed -i 's/^SUBDIRS =.*/SUBDIRS=gen.tab charset lib/' Makefile.am && \ + ./bootstrap --no-config && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ + make -j 1 && \ + make install && \ + rm -rf ${DIR} +## fontconfig https://www.freedesktop.org/wiki/Software/fontconfig/ +RUN \ + DIR=fontconfig && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://www.freedesktop.org/software/fontconfig/release/fontconfig-${LIBFONTCONFIG_VERSION}.tar.bz2 &&\ + tar -jx --strip-components=1 -f fontconfig-${LIBFONTCONFIG_VERSION}.tar.bz2 && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +## freetype https://www.freetype.org/ +RUN \ + DIR=freetype && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://download.savannah.gnu.org/releases/freetype/freetype-${LIBFREETYPE_VERSION}.tar.gz && \ + tar -zx --strip-components=1 -f freetype-${LIBFREETYPE_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +## fridibi https://www.fribidi.org/ +# + https://github.com/fribidi/fribidi/issues/8 +RUN \ + DIR=fribidi && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/fribidi/fribidi/archive/${LIBFRIBIDI_VERSION}.tar.gz && \ + echo "${LIBFRIBIDI_SHA256SUM} ${LIBFRIBIDI_VERSION}.tar.gz" | sha256sum --check && \ + tar -zx --strip-components=1 -f ${LIBFRIBIDI_VERSION}.tar.gz && \ + sed -i 's/^SUBDIRS =.*/SUBDIRS=gen.tab charset lib/' Makefile.am && \ + ./bootstrap --no-config && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ + make -j 1 && \ + make install && \ + rm -rf ${DIR} +## fontconfig https://www.freedesktop.org/wiki/Software/fontconfig/ +RUN \ + DIR=fontconfig && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://www.freedesktop.org/software/fontconfig/release/fontconfig-${LIBFONTCONFIG_VERSION}.tar.bz2 &&\ + tar -jx --strip-components=1 -f fontconfig-${LIBFONTCONFIG_VERSION}.tar.bz2 && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +RUN \ + DIR=libass && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/libass/libass/archive/${LIBASS_VERSION}.tar.gz &&\ + tar -zx --strip-components=1 -f ${LIBASS_VERSION}.tar.gz && \ + ./autogen.sh && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +## kvazaar https://github.com/ultravideo/kvazaar +RUN \ + DIR=kvazaar && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/ultravideo/kvazaar/archive/v${LIBKVAZAAR_VERSION}.tar.gz &&\ + tar -zx --strip-components=1 -f v${LIBKVAZAAR_VERSION}.tar.gz && \ + if [ -e ./autogen.sh ]; then \ + ./autogen.sh && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared ; \ + else \ + cd src ; \ + fi && \ + make && \ + make install && \ + rm -rf ${DIR} +RUN \ + DIR=aom && \ + git clone --branch v${LIBAOM_VERSION} --depth 1 https://aomedia.googlesource.com/aom ${DIR} ; \ + cd ${DIR} ; \ + rm -rf CMakeCache.txt CMakeFiles ; \ + mkdir -p ./aom_build ; \ + cd ./aom_build ; \ + cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" -DBUILD_SHARED_LIBS=1 ..; \ + make ; \ + make install ; \ + rm -rf ${DIR} + +RUN \ + DIR=nv-codec-headers && \ + git clone --branch n${NVENC_VERSION} --depth=1 https://git.videolan.org/git/ffmpeg/nv-codec-headers.git ${DIR} && \ + cd ${DIR} && \ + sed -i 's@/usr/local@'"$PREFIX"'@' Makefile && \ + make && \ + make install && \ + rm -rf ${DIR} + +RUN \ + DIR=ffmpeg && mkdir -p ${DIR} && cd ${DIR} && \ + curl -sLO https://ffmpeg.org/releases/ffmpeg-${FFMPEG_VERSION}.tar.bz2 && \ + tar -jx --strip-components=1 -f ffmpeg-${FFMPEG_VERSION}.tar.bz2 && \ + ./configure \ + --disable-debug \ + --disable-doc \ + --disable-ffplay \ + --enable-shared \ + --enable-avresample \ + --enable-openssl \ + --enable-postproc \ + --enable-small \ + --extra-cflags="-I${PREFIX}/include -I/usr/local/include" \ + --extra-ldflags="-L${PREFIX}/lib -L/usr/local/lib" \ + --enable-libopencore-amrnb \ + --enable-libopencore-amrwb \ + --enable-version3 \ + --enable-libx264 \ + --enable-libx265 \ + --enable-libopus \ + --enable-libvorbis \ + --enable-libtheora \ + --enable-libvpx \ + --enable-libmp3lame \ + --enable-libxvid \ + --enable-libfdk_aac \ + --enable-nonfree \ + --enable-libopenjpeg \ + --enable-libfreetype \ + --enable-libvidstab \ + --enable-gpl \ + --enable-libass \ + --enable-libkvazaar \ + --enable-libaom \ + --extra-libs=-lpthread \ + --enable-vaapi \ + --enable-cuda \ + --enable-nvenc \ + --enable-cuvid \ + --enable-vdpau \ + --prefix="${PREFIX}" && \ + make && \ + make install && \ + make distclean && \ + hash -r && \ + cd tools && \ + make qt-faststart && \ + cp qt-faststart ${PREFIX}/bin + +RUN \ + if false; then \ + cp -r ${PREFIX}/lib/*so* /usr/local/lib/ && \ + cp ${PREFIX}/bin/* /usr/local/bin/ ; \ + else \ + LD_LIBRARY_PATH=${PREFIX}/lib ldd ${PREFIX}/bin/ffmpeg | \ + grep ${PREFIX} | \ + cut -d ' ' -f 3 | \ + xargs -i cp {} /usr/local/lib/ && \ + cp ${PREFIX}/bin/ff* /usr/local/bin/ ; \ + fi && \ + if true; then \ + for lib in /usr/local/lib/*.so* /usr/local/bin/*; do strip --strip-all $lib; done ; \ + fi && \ + cp -r ${PREFIX}/share/ffmpeg /usr/local/share/ && \ + LD_LIBRARY_PATH=/usr/local/lib ffmpeg -buildconf + +FROM base AS release +MAINTAINER Julien Rottenberg + +CMD ["--help"] +ENTRYPOINT ["ffmpeg"] + +COPY --from=build /usr/local /usr/local +RUN test "base" = "base" && ldconfig /usr/local/lib /usr/local/lib64 + +# Let's make sure the app built correctly +# Convenient to verify on https://hub.docker.com/r/jrottenberg/ffmpeg/builds/ console output +>>>>>>> fix extra comma diff --git a/docker-images/snapshot/alpine,/Dockerfile b/docker-images/snapshot/alpine,/Dockerfile deleted file mode 100644 index a0b97723e..000000000 --- a/docker-images/snapshot/alpine,/Dockerfile +++ /dev/null @@ -1,14 +0,0 @@ -usage: update.py [-h] [--enable-libopencore-amr] [--enable-libx264] - [--enable-libx265] [--enable-libogg] [--enable-libopus] - [--enable-libvorbis] [--enable-libtheora] [--enable-libvpx] - [--enable-libmp3lame] [--enable-libxvid] - [--enable-libfdk-aac] [--enable-libopenjpeg] - [--enable-libfreetype] [--enable-libvidstab] - [--enable-libfribidi] [--enable-libfontconfig] - [--enable-libass] [--enable-libkvazaar] [--enable-libaom] - [--enable-vaapi] [--enable-nvenc] [--enable-libdav1d] - [--enable-vdpau] [--enable-all] [--with-bins] [--no-strip] - [--fat | --slim | --scratch] - {alpine,centos,ubuntu,nvidia,armv7} - {snapshot,4.1,4.0,3.4,3.3,3.2,2.8} -update.py: error: argument variant: invalid choice: 'alpine,' (choose from 'alpine', 'centos', 'ubuntu', 'nvidia', 'armv7') diff --git a/docker-images/snapshot/alpine/Dockerfile b/docker-images/snapshot/alpine/Dockerfile index ebded30f5..930f91a84 100644 --- a/docker-images/snapshot/alpine/Dockerfile +++ b/docker-images/snapshot/alpine/Dockerfile @@ -1,3 +1,4 @@ +<<<<<<< HEAD # ffmpeg - http://ffmpeg.org/download.html # # https://hub.docker.com/r/jrottenberg/ffmpeg/ @@ -388,3 +389,455 @@ COPY --from=build /usr/local /usr/local # Let's make sure the app built correctly # Convenient to verify on https://hub.docker.com/r/jrottenberg/ffmpeg/builds/ console output +======= +FROM alpine:3.9 as base + +RUN apk add --no-cache --update libva \ + libgcc \ + libstdc++ \ + ca-certificates \ + libcrypto1.1 \ + libssl1.1 \ + libgomp \ + expat \ + libuuid + +FROM base as build + +WORKDIR /tmp/workdir + +ARG PREFIX=/tmp/build +ARG MAKEFLAGS=-j6 +ARG PKG_CONFIG_PATH=/tmp/build/lib/pkgconfig + +RUN apk add --no-cache --update libva-dev \ + autoconf \ + automake \ + bash \ + binutils \ + bzip2 \ + cmake \ + curl \ + coreutils \ + diffutils \ + file \ + g++ \ + git \ + gcc \ + gperf \ + libtool \ + make \ + python \ + openssl-dev \ + tar \ + yasm \ + nasm \ + zlib-dev \ + expat-dev \ + util-linux-dev \ + meson \ + ninja + +ARG FFMPEG_VERSION=snapshot +ARG LIBOPENCORE_AMR_VERSION=0.1.5 +ARG LIBX264_VERSION=20190526-2245-stable +ARG LIBX265_VERSION=3.0 +ARG LIBOGG_VERSION=1.3.3 +ARG LIBOPUS_VERSION=1.3.1 +ARG LIBVORBIS_VERSION=1.3.6 +ARG LIBTHEORA_VERSION=1.1.1 +ARG LIBVPX_VERSION=1.8.0 +ARG LIBMP3LAME_VERSION=3.100 +ARG LIBXVID_VERSION=1.3.5 +ARG LIBFDK_AAC_VERSION=2.0.0 +ARG LIBOPENJPEG_VERSION=2.3.1 +ARG LIBFREETYPE_VERSION=2.10.0 +ARG LIBVIDSTAB_VERSION=1.1.0 +ARG LIBFRIBIDI_VERSION=0.19.7 +ARG LIBFONTCONFIG_VERSION=2.13.1 +ARG LIBFREETYPE_VERSION=2.10.0 +ARG LIBFRIBIDI_VERSION=0.19.7 +ARG LIBFONTCONFIG_VERSION=2.13.1 +ARG LIBASS_VERSION=0.14.0 +ARG LIBKVAZAAR_VERSION=1.2.0 +ARG LIBAOM_VERSION=1.0.0-errata1 +ARG NVENC_VERSION=9.0.18.1 +ARG LIBDAV1D_VERSION=0.3.1 + +ARG LIBOGG_SHA256SUM=c2e8a485110b97550f453226ec644ebac6cb29d1caef2902c007edab4308d985 +ARG LIBOPUS_SHA256SUM=65b58e1e25b2a114157014736a3d9dfeaad8d41be1c8179866f144a2fb44ff9d +ARG LIBVORBIS_SHA256SUM=6ed40e0241089a42c48604dc00e362beee00036af2d8b3f46338031c9e0351cb +ARG LIBTHEORA_SHA256SUM=40952956c47811928d1e7922cda3bc1f427eb75680c3c37249c91e949054916b +ARG LIBVIDSTAB_SHA256SUM=14d2a053e56edad4f397be0cb3ef8eb1ec3150404ce99a426c4eb641861dc0bb +ARG LIBFRIBIDI_SHA256SUM=3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 +ARG LIBFRIBIDI_SHA256SUM=3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 + +## opencore-amr https://sourceforge.net/projects/opencore-amr/ +RUN \ + DIR=opencore-amr && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://kent.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${LIBOPENCORE_AMR_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +## x264 http://www.videolan.org/developers/x264.html +RUN \ + DIR=x264 && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://download.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-${LIBX264_VERSION}.tar.bz2 | \ + tar -jx --strip-components=1 && \ + ./configure --prefix="${PREFIX}" --enable-shared --enable-pic && \ + make && \ + make install && \ + rm -rf ${DIR} +### x265 http://x265.org/ +RUN \ + DIR=x265 && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://download.videolan.org/pub/videolan/x265/x265_${LIBX265_VERSION}.tar.gz | \ + tar -zx && \ + cd x265_${LIBX265_VERSION}/build/linux && \ + sed -i "/-DEXTRA_LIB/ s/$/ -DCMAKE_INSTALL_PREFIX=\${PREFIX}/" multilib.sh && \ + sed -i "/^cmake/ s/$/ -DENABLE_CLI=ON/" multilib.sh && \ + ./multilib.sh && \ + make -C 8bit install && \ + rm -rf ${DIR} +## libogg https://www.xiph.org/ogg/ +RUN \ + DIR=ogg && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO http://downloads.xiph.org/releases/ogg/libogg-${LIBOGG_VERSION}.tar.gz && \ + echo "${LIBOGG_SHA256SUM} libogg-${LIBOGG_VERSION}.tar.gz" | sha256sum --check && \ + tar -zx --strip-components=1 -f libogg-${LIBOGG_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +RUN \ + DIR=opus && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://archive.mozilla.org/pub/opus/opus-${LIBOPUS_VERSION}.tar.gz && \ + echo "${LIBOPUS_SHA256SUM} opus-${LIBOPUS_VERSION}.tar.gz"| sha256sum --check && \ + tar -zx --strip-components=1 -f opus-${LIBOPUS_VERSION}.tar.gz && \ + autoreconf -fiv && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +### libvorbis https://xiph.org/vorbis/ +RUN \ + DIR=vorbis && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO http://downloads.xiph.org/releases/vorbis/libvorbis-${LIBVORBIS_VERSION}.tar.gz && \ + echo "${LIBVORBIS_SHA256SUM} libvorbis-${LIBVORBIS_VERSION}.tar.gz" | sha256sum --check && \ + tar -zx --strip-components=1 -f libvorbis-${LIBVORBIS_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +### libtheora http://www.theora.org/ +RUN \ + DIR=theora && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO http://downloads.xiph.org/releases/theora/libtheora-${LIBTHEORA_VERSION}.tar.gz && \ + echo "${LIBTHEORA_SHA256SUM} libtheora-${LIBTHEORA_VERSION}.tar.gz" | sha256sum --check && \ + tar -zx --strip-components=1 -f libtheora-${LIBTHEORA_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +### libvpx https://www.webmproject.org/code/ +RUN \ + DIR=vpx && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://codeload.github.com/webmproject/libvpx/tar.gz/v${LIBVPX_VERSION} | \ + tar -zx --strip-components=1 && \ + ./configure --prefix="${PREFIX}" --enable-vp8 --enable-vp9 --enable-vp9-highbitdepth --enable-pic --enable-shared \ + --disable-debug --disable-examples --disable-docs && \ + make && \ + make install && \ + rm -rf ${DIR} + +### libmp3lame http://lame.sourceforge.net/ +RUN \ + DIR=lame && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://kent.dl.sourceforge.net/project/lame/lame/$(echo ${LIBMP3LAME_VERSION} | sed -e 's/[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)/\1.\2/')/lame-${LIBMP3LAME_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" --enable-shared --enable-nasm --enable-pic && \ + make && \ + make install && \ + rm -rf ${DIR} +### xvid https://www.xvid.com/ +RUN \ + DIR=xvid && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO http://downloads.xvid.org/downloads/xvidcore-${LIBXVID_VERSION}.tar.gz && \ + tar -zx -f xvidcore-${LIBXVID_VERSION}.tar.gz && \ + cd xvidcore/build/generic && \ + ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" --datadir="${DIR}" --enable-shared --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +### fdk-aac https://github.com/mstorsjo/fdk-aac +RUN \ + DIR=fdk-aac && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://github.com/mstorsjo/fdk-aac/archive/v${LIBFDK_AAC_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + autoreconf -fiv && \ + ./configure --prefix="${PREFIX}" --enable-shared --datadir="${DIR}" && \ + make && \ + make install && \ + rm -rf ${DIR} +## openjpeg https://github.com/uclouvain/openjpeg +RUN \ + DIR=openjpeg && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + if test `echo ${LIBOPENJPEG_VERSION} | tr -d '.'` -ge '210'; then \ + version_prefix='v'; \ + else \ + version_prefix='version.' ;\ + fi && \ + curl -sL https://github.com/uclouvain/openjpeg/archive/${version_prefix}${LIBOPENJPEG_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + cmake -DBUILD_THIRDPARTY:BOOL=ON -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ + make && \ + make install && \ + rm -rf ${DIR} +## freetype https://www.freetype.org/ +RUN \ + DIR=freetype && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://download.savannah.gnu.org/releases/freetype/freetype-${LIBFREETYPE_VERSION}.tar.gz && \ + tar -zx --strip-components=1 -f freetype-${LIBFREETYPE_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +## libvstab https://github.com/georgmartius/vid.stab +RUN \ + DIR=vid.stab && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/georgmartius/vid.stab/archive/v${LIBVIDSTAB_VERSION}.tar.gz &&\ + echo "${LIBVIDSTAB_SHA256SUM} v${LIBVIDSTAB_VERSION}.tar.gz" | sha256sum --check && \ + tar -zx --strip-components=1 -f v${LIBVIDSTAB_VERSION}.tar.gz && \ + cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ + make && \ + make install && \ + rm -rf ${DIR} +## fridibi https://www.fribidi.org/ +# + https://github.com/fribidi/fribidi/issues/8 +RUN \ + DIR=fribidi && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/fribidi/fribidi/archive/${LIBFRIBIDI_VERSION}.tar.gz && \ + echo "${LIBFRIBIDI_SHA256SUM} ${LIBFRIBIDI_VERSION}.tar.gz" | sha256sum --check && \ + tar -zx --strip-components=1 -f ${LIBFRIBIDI_VERSION}.tar.gz && \ + sed -i 's/^SUBDIRS =.*/SUBDIRS=gen.tab charset lib/' Makefile.am && \ + ./bootstrap --no-config && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ + make -j 1 && \ + make install && \ + rm -rf ${DIR} +## fontconfig https://www.freedesktop.org/wiki/Software/fontconfig/ +RUN \ + DIR=fontconfig && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://www.freedesktop.org/software/fontconfig/release/fontconfig-${LIBFONTCONFIG_VERSION}.tar.bz2 &&\ + tar -jx --strip-components=1 -f fontconfig-${LIBFONTCONFIG_VERSION}.tar.bz2 && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +## freetype https://www.freetype.org/ +RUN \ + DIR=freetype && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://download.savannah.gnu.org/releases/freetype/freetype-${LIBFREETYPE_VERSION}.tar.gz && \ + tar -zx --strip-components=1 -f freetype-${LIBFREETYPE_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +## fridibi https://www.fribidi.org/ +# + https://github.com/fribidi/fribidi/issues/8 +RUN \ + DIR=fribidi && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/fribidi/fribidi/archive/${LIBFRIBIDI_VERSION}.tar.gz && \ + echo "${LIBFRIBIDI_SHA256SUM} ${LIBFRIBIDI_VERSION}.tar.gz" | sha256sum --check && \ + tar -zx --strip-components=1 -f ${LIBFRIBIDI_VERSION}.tar.gz && \ + sed -i 's/^SUBDIRS =.*/SUBDIRS=gen.tab charset lib/' Makefile.am && \ + ./bootstrap --no-config && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ + make -j 1 && \ + make install && \ + rm -rf ${DIR} +## fontconfig https://www.freedesktop.org/wiki/Software/fontconfig/ +RUN \ + DIR=fontconfig && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://www.freedesktop.org/software/fontconfig/release/fontconfig-${LIBFONTCONFIG_VERSION}.tar.bz2 &&\ + tar -jx --strip-components=1 -f fontconfig-${LIBFONTCONFIG_VERSION}.tar.bz2 && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +RUN \ + DIR=libass && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/libass/libass/archive/${LIBASS_VERSION}.tar.gz &&\ + tar -zx --strip-components=1 -f ${LIBASS_VERSION}.tar.gz && \ + ./autogen.sh && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +## kvazaar https://github.com/ultravideo/kvazaar +RUN \ + DIR=kvazaar && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/ultravideo/kvazaar/archive/v${LIBKVAZAAR_VERSION}.tar.gz &&\ + tar -zx --strip-components=1 -f v${LIBKVAZAAR_VERSION}.tar.gz && \ + if [ -e ./autogen.sh ]; then \ + ./autogen.sh && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared ; \ + else \ + cd src ; \ + fi && \ + make && \ + make install && \ + rm -rf ${DIR} +RUN \ + DIR=aom && \ + git clone --branch v${LIBAOM_VERSION} --depth 1 https://aomedia.googlesource.com/aom ${DIR} ; \ + cd ${DIR} ; \ + rm -rf CMakeCache.txt CMakeFiles ; \ + mkdir -p ./aom_build ; \ + cd ./aom_build ; \ + cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" -DBUILD_SHARED_LIBS=1 ..; \ + make ; \ + make install ; \ + rm -rf ${DIR} + +RUN \ + DIR=nv-codec-headers && \ + git clone --branch n${NVENC_VERSION} --depth=1 https://git.videolan.org/git/ffmpeg/nv-codec-headers.git ${DIR} && \ + cd ${DIR} && \ + sed -i 's@/usr/local@'"$PREFIX"'@' Makefile && \ + make && \ + make install && \ + rm -rf ${DIR} +## dav1d https://code.videolan.org/videolan/dav1d +RUN \ + DIR=dav1d && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://code.videolan.org/videolan/dav1d/-/archive/${LIBDAV1D_VERSION}/dav1d-${LIBDAV1D_VERSION}.tar.gz && \ + tar -zx --strip-components=1 -f dav1d-${LIBDAV1D_VERSION}.tar.gz && \ + meson build --prefix ${PREFIX} --buildtype release && \ + ninja -C build install && \ + rm -rf ${DIR} +RUN \ + DIR=ffmpeg && mkdir -p ${DIR} && cd ${DIR} && \ + curl -sLO https://ffmpeg.org/releases/ffmpeg-${FFMPEG_VERSION}.tar.bz2 && \ + tar -jx --strip-components=1 -f ffmpeg-${FFMPEG_VERSION}.tar.bz2 && \ + ./configure \ + --disable-debug \ + --disable-doc \ + --disable-ffplay \ + --enable-shared \ + --enable-avresample \ + --enable-openssl \ + --enable-postproc \ + --enable-small \ + --extra-cflags="-I${PREFIX}/include -I/usr/local/include" \ + --extra-ldflags="-L${PREFIX}/lib -L/usr/local/lib" \ + --enable-libopencore-amrnb \ + --enable-libopencore-amrwb \ + --enable-version3 \ + --enable-libx264 \ + --enable-libx265 \ + --enable-libopus \ + --enable-libvorbis \ + --enable-libtheora \ + --enable-libvpx \ + --enable-libmp3lame \ + --enable-libxvid \ + --enable-libfdk_aac \ + --enable-nonfree \ + --enable-libopenjpeg \ + --enable-libfreetype \ + --enable-libvidstab \ + --enable-gpl \ + --enable-libass \ + --enable-libkvazaar \ + --enable-libaom \ + --extra-libs=-lpthread \ + --enable-vaapi \ + --enable-cuda \ + --enable-nvenc \ + --enable-cuvid \ + --enable-libdav1d \ + --prefix="${PREFIX}" && \ + make && \ + make install && \ + make distclean && \ + hash -r && \ + cd tools && \ + make qt-faststart && \ + cp qt-faststart ${PREFIX}/bin + +RUN \ + if false; then \ + cp -r ${PREFIX}/lib/*so* /usr/local/lib/ && \ + cp ${PREFIX}/bin/* /usr/local/bin/ ; \ + else \ + LD_LIBRARY_PATH=${PREFIX}/lib ldd ${PREFIX}/bin/ffmpeg | \ + grep ${PREFIX} | \ + cut -d ' ' -f 3 | \ + xargs -i cp {} /usr/local/lib/ && \ + cp ${PREFIX}/bin/ff* /usr/local/bin/ ; \ + fi && \ + if true; then \ + for lib in /usr/local/lib/*.so* /usr/local/bin/*; do strip --strip-all $lib; done ; \ + fi && \ + cp -r ${PREFIX}/share/ffmpeg /usr/local/share/ && \ + LD_LIBRARY_PATH=/usr/local/lib ffmpeg -buildconf + +FROM base AS release +MAINTAINER Julien Rottenberg + +CMD ["--help"] +ENTRYPOINT ["ffmpeg"] + +COPY --from=build /usr/local /usr/local +RUN test "base" = "base" && ldconfig /usr/local/lib /usr/local/lib64 + +# Let's make sure the app built correctly +# Convenient to verify on https://hub.docker.com/r/jrottenberg/ffmpeg/builds/ console output +>>>>>>> fix extra comma diff --git a/docker-images/snapshot/nvidia,/Dockerfile b/docker-images/snapshot/nvidia,/Dockerfile deleted file mode 100644 index 452b62c02..000000000 --- a/docker-images/snapshot/nvidia,/Dockerfile +++ /dev/null @@ -1,14 +0,0 @@ -usage: update.py [-h] [--enable-libopencore-amr] [--enable-libx264] - [--enable-libx265] [--enable-libogg] [--enable-libopus] - [--enable-libvorbis] [--enable-libtheora] [--enable-libvpx] - [--enable-libmp3lame] [--enable-libxvid] - [--enable-libfdk-aac] [--enable-libopenjpeg] - [--enable-libfreetype] [--enable-libvidstab] - [--enable-libfribidi] [--enable-libfontconfig] - [--enable-libass] [--enable-libkvazaar] [--enable-libaom] - [--enable-vaapi] [--enable-nvenc] [--enable-libdav1d] - [--enable-vdpau] [--enable-all] [--with-bins] [--no-strip] - [--fat | --slim | --scratch] - {alpine,centos,ubuntu,nvidia,armv7} - {snapshot,4.1,4.0,3.4,3.3,3.2,2.8} -update.py: error: argument variant: invalid choice: 'nvidia,' (choose from 'alpine', 'centos', 'ubuntu', 'nvidia', 'armv7') diff --git a/docker-images/snapshot/nvidia/Dockerfile b/docker-images/snapshot/nvidia/Dockerfile index 489f481ac..7853f0103 100644 --- a/docker-images/snapshot/nvidia/Dockerfile +++ b/docker-images/snapshot/nvidia/Dockerfile @@ -1,3 +1,4 @@ +<<<<<<< HEAD # ffmpeg - http://ffmpeg.org/download.html # # From https://trac.ffmpeg.org/wiki/CompilationGuide/Ubuntu @@ -423,3 +424,449 @@ COPY --from=build /usr/local/lib /usr/local/lib/ # Let's make sure the app built correctly # Convenient to verify on https://hub.docker.com/r/jrottenberg/ffmpeg/builds/ console output +======= +FROM nvidia/cuda:10.1-runtime-ubuntu18.04 AS base + +ENV NVIDIA_DRIVER_CAPABILITIES=video + +RUN apt-get -yqq update && \ + apt-get install -yq --no-install-recommends libva2 libva-drm2 i965-va-driver ca-certificates expat libgomp1 libuuid1 libssl1.0 && \ + apt-get autoremove -y && \ + apt-get clean -y + +FROM base as build + +WORKDIR /tmp/workdir + +ARG PREFIX=/tmp/build +ARG MAKEFLAGS=-j6 +ARG PKG_CONFIG_PATH=/tmp/build/lib/pkgconfig +ARG C_INCLUDE_PATH=/tmp/build/include/ffnvcodec + +RUN apt-get -yqq update && \ + apt-get install -yq --no-install-recommends \ + libva-dev \ + autoconf \ + automake \ + cmake \ + curl \ + bzip2 \ + libexpat1-dev \ + g++ \ + gcc \ + git \ + gperf \ + libtool \ + make \ + nasm \ + perl \ + pkg-config \ + python \ + libssl1.0-dev \ + yasm \ + zlib1g-dev \ + uuid-dev + +ARG FFMPEG_VERSION=snapshot +ARG LIBOPENCORE_AMR_VERSION=0.1.5 +ARG LIBX264_VERSION=20190526-2245-stable +ARG LIBX265_VERSION=3.0 +ARG LIBOGG_VERSION=1.3.3 +ARG LIBOPUS_VERSION=1.3.1 +ARG LIBVORBIS_VERSION=1.3.6 +ARG LIBTHEORA_VERSION=1.1.1 +ARG LIBVPX_VERSION=1.8.0 +ARG LIBMP3LAME_VERSION=3.100 +ARG LIBXVID_VERSION=1.3.5 +ARG LIBFDK_AAC_VERSION=2.0.0 +ARG LIBOPENJPEG_VERSION=2.3.1 +ARG LIBFREETYPE_VERSION=2.10.0 +ARG LIBVIDSTAB_VERSION=1.1.0 +ARG LIBFRIBIDI_VERSION=0.19.7 +ARG LIBFONTCONFIG_VERSION=2.13.1 +ARG LIBFREETYPE_VERSION=2.10.0 +ARG LIBFRIBIDI_VERSION=0.19.7 +ARG LIBFONTCONFIG_VERSION=2.13.1 +ARG LIBASS_VERSION=0.14.0 +ARG LIBKVAZAAR_VERSION=1.2.0 +ARG LIBAOM_VERSION=1.0.0-errata1 +ARG NVENC_VERSION=9.0.18.1 +ARG LIBDAV1D_VERSION=0.3.1 + +ARG LIBOGG_SHA256SUM=c2e8a485110b97550f453226ec644ebac6cb29d1caef2902c007edab4308d985 +ARG LIBOPUS_SHA256SUM=65b58e1e25b2a114157014736a3d9dfeaad8d41be1c8179866f144a2fb44ff9d +ARG LIBVORBIS_SHA256SUM=6ed40e0241089a42c48604dc00e362beee00036af2d8b3f46338031c9e0351cb +ARG LIBTHEORA_SHA256SUM=40952956c47811928d1e7922cda3bc1f427eb75680c3c37249c91e949054916b +ARG LIBVIDSTAB_SHA256SUM=14d2a053e56edad4f397be0cb3ef8eb1ec3150404ce99a426c4eb641861dc0bb +ARG LIBFRIBIDI_SHA256SUM=3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 +ARG LIBFRIBIDI_SHA256SUM=3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 + +## opencore-amr https://sourceforge.net/projects/opencore-amr/ +RUN \ + DIR=opencore-amr && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://kent.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${LIBOPENCORE_AMR_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +## x264 http://www.videolan.org/developers/x264.html +RUN \ + DIR=x264 && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://download.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-${LIBX264_VERSION}.tar.bz2 | \ + tar -jx --strip-components=1 && \ + ./configure --prefix="${PREFIX}" --enable-shared --enable-pic && \ + make && \ + make install && \ + rm -rf ${DIR} +### x265 http://x265.org/ +RUN \ + DIR=x265 && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://download.videolan.org/pub/videolan/x265/x265_${LIBX265_VERSION}.tar.gz | \ + tar -zx && \ + cd x265_${LIBX265_VERSION}/build/linux && \ + sed -i "/-DEXTRA_LIB/ s/$/ -DCMAKE_INSTALL_PREFIX=\${PREFIX}/" multilib.sh && \ + sed -i "/^cmake/ s/$/ -DENABLE_CLI=ON/" multilib.sh && \ + ./multilib.sh && \ + make -C 8bit install && \ + rm -rf ${DIR} +## libogg https://www.xiph.org/ogg/ +RUN \ + DIR=ogg && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO http://downloads.xiph.org/releases/ogg/libogg-${LIBOGG_VERSION}.tar.gz && \ + echo "${LIBOGG_SHA256SUM} libogg-${LIBOGG_VERSION}.tar.gz" | sha256sum --check && \ + tar -zx --strip-components=1 -f libogg-${LIBOGG_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +RUN \ + DIR=opus && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://archive.mozilla.org/pub/opus/opus-${LIBOPUS_VERSION}.tar.gz && \ + echo "${LIBOPUS_SHA256SUM} opus-${LIBOPUS_VERSION}.tar.gz"| sha256sum --check && \ + tar -zx --strip-components=1 -f opus-${LIBOPUS_VERSION}.tar.gz && \ + autoreconf -fiv && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +### libvorbis https://xiph.org/vorbis/ +RUN \ + DIR=vorbis && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO http://downloads.xiph.org/releases/vorbis/libvorbis-${LIBVORBIS_VERSION}.tar.gz && \ + echo "${LIBVORBIS_SHA256SUM} libvorbis-${LIBVORBIS_VERSION}.tar.gz" | sha256sum --check && \ + tar -zx --strip-components=1 -f libvorbis-${LIBVORBIS_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +### libtheora http://www.theora.org/ +RUN \ + DIR=theora && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO http://downloads.xiph.org/releases/theora/libtheora-${LIBTHEORA_VERSION}.tar.gz && \ + echo "${LIBTHEORA_SHA256SUM} libtheora-${LIBTHEORA_VERSION}.tar.gz" | sha256sum --check && \ + tar -zx --strip-components=1 -f libtheora-${LIBTHEORA_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +### libvpx https://www.webmproject.org/code/ +RUN \ + DIR=vpx && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://codeload.github.com/webmproject/libvpx/tar.gz/v${LIBVPX_VERSION} | \ + tar -zx --strip-components=1 && \ + ./configure --prefix="${PREFIX}" --enable-vp8 --enable-vp9 --enable-vp9-highbitdepth --enable-pic --enable-shared \ + --disable-debug --disable-examples --disable-docs && \ + make && \ + make install && \ + rm -rf ${DIR} + +### libmp3lame http://lame.sourceforge.net/ +RUN \ + DIR=lame && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://kent.dl.sourceforge.net/project/lame/lame/$(echo ${LIBMP3LAME_VERSION} | sed -e 's/[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)/\1.\2/')/lame-${LIBMP3LAME_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" --enable-shared --enable-nasm --enable-pic && \ + make && \ + make install && \ + rm -rf ${DIR} +### xvid https://www.xvid.com/ +RUN \ + DIR=xvid && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO http://downloads.xvid.org/downloads/xvidcore-${LIBXVID_VERSION}.tar.gz && \ + tar -zx -f xvidcore-${LIBXVID_VERSION}.tar.gz && \ + cd xvidcore/build/generic && \ + ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" --datadir="${DIR}" --enable-shared --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +### fdk-aac https://github.com/mstorsjo/fdk-aac +RUN \ + DIR=fdk-aac && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://github.com/mstorsjo/fdk-aac/archive/v${LIBFDK_AAC_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + autoreconf -fiv && \ + ./configure --prefix="${PREFIX}" --enable-shared --datadir="${DIR}" && \ + make && \ + make install && \ + rm -rf ${DIR} +## openjpeg https://github.com/uclouvain/openjpeg +RUN \ + DIR=openjpeg && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + if test `echo ${LIBOPENJPEG_VERSION} | tr -d '.'` -ge '210'; then \ + version_prefix='v'; \ + else \ + version_prefix='version.' ;\ + fi && \ + curl -sL https://github.com/uclouvain/openjpeg/archive/${version_prefix}${LIBOPENJPEG_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + cmake -DBUILD_THIRDPARTY:BOOL=ON -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ + make && \ + make install && \ + rm -rf ${DIR} +## freetype https://www.freetype.org/ +RUN \ + DIR=freetype && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://download.savannah.gnu.org/releases/freetype/freetype-${LIBFREETYPE_VERSION}.tar.gz && \ + tar -zx --strip-components=1 -f freetype-${LIBFREETYPE_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +## libvstab https://github.com/georgmartius/vid.stab +RUN \ + DIR=vid.stab && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/georgmartius/vid.stab/archive/v${LIBVIDSTAB_VERSION}.tar.gz &&\ + echo "${LIBVIDSTAB_SHA256SUM} v${LIBVIDSTAB_VERSION}.tar.gz" | sha256sum --check && \ + tar -zx --strip-components=1 -f v${LIBVIDSTAB_VERSION}.tar.gz && \ + cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ + make && \ + make install && \ + rm -rf ${DIR} +## fridibi https://www.fribidi.org/ +# + https://github.com/fribidi/fribidi/issues/8 +RUN \ + DIR=fribidi && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/fribidi/fribidi/archive/${LIBFRIBIDI_VERSION}.tar.gz && \ + echo "${LIBFRIBIDI_SHA256SUM} ${LIBFRIBIDI_VERSION}.tar.gz" | sha256sum --check && \ + tar -zx --strip-components=1 -f ${LIBFRIBIDI_VERSION}.tar.gz && \ + sed -i 's/^SUBDIRS =.*/SUBDIRS=gen.tab charset lib/' Makefile.am && \ + ./bootstrap --no-config && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ + make -j 1 && \ + make install && \ + rm -rf ${DIR} +## fontconfig https://www.freedesktop.org/wiki/Software/fontconfig/ +RUN \ + DIR=fontconfig && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://www.freedesktop.org/software/fontconfig/release/fontconfig-${LIBFONTCONFIG_VERSION}.tar.bz2 &&\ + tar -jx --strip-components=1 -f fontconfig-${LIBFONTCONFIG_VERSION}.tar.bz2 && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +## freetype https://www.freetype.org/ +RUN \ + DIR=freetype && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://download.savannah.gnu.org/releases/freetype/freetype-${LIBFREETYPE_VERSION}.tar.gz && \ + tar -zx --strip-components=1 -f freetype-${LIBFREETYPE_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +## fridibi https://www.fribidi.org/ +# + https://github.com/fribidi/fribidi/issues/8 +RUN \ + DIR=fribidi && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/fribidi/fribidi/archive/${LIBFRIBIDI_VERSION}.tar.gz && \ + echo "${LIBFRIBIDI_SHA256SUM} ${LIBFRIBIDI_VERSION}.tar.gz" | sha256sum --check && \ + tar -zx --strip-components=1 -f ${LIBFRIBIDI_VERSION}.tar.gz && \ + sed -i 's/^SUBDIRS =.*/SUBDIRS=gen.tab charset lib/' Makefile.am && \ + ./bootstrap --no-config && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ + make -j 1 && \ + make install && \ + rm -rf ${DIR} +## fontconfig https://www.freedesktop.org/wiki/Software/fontconfig/ +RUN \ + DIR=fontconfig && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://www.freedesktop.org/software/fontconfig/release/fontconfig-${LIBFONTCONFIG_VERSION}.tar.bz2 &&\ + tar -jx --strip-components=1 -f fontconfig-${LIBFONTCONFIG_VERSION}.tar.bz2 && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +RUN \ + DIR=libass && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/libass/libass/archive/${LIBASS_VERSION}.tar.gz &&\ + tar -zx --strip-components=1 -f ${LIBASS_VERSION}.tar.gz && \ + ./autogen.sh && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} +## kvazaar https://github.com/ultravideo/kvazaar +RUN \ + DIR=kvazaar && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/ultravideo/kvazaar/archive/v${LIBKVAZAAR_VERSION}.tar.gz &&\ + tar -zx --strip-components=1 -f v${LIBKVAZAAR_VERSION}.tar.gz && \ + if [ -e ./autogen.sh ]; then \ + ./autogen.sh && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared ; \ + else \ + cd src ; \ + fi && \ + make && \ + make install && \ + rm -rf ${DIR} +RUN \ + DIR=aom && \ + git clone --branch v${LIBAOM_VERSION} --depth 1 https://aomedia.googlesource.com/aom ${DIR} ; \ + cd ${DIR} ; \ + rm -rf CMakeCache.txt CMakeFiles ; \ + mkdir -p ./aom_build ; \ + cd ./aom_build ; \ + cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" -DBUILD_SHARED_LIBS=1 ..; \ + make ; \ + make install ; \ + rm -rf ${DIR} + +RUN \ + DIR=nv-codec-headers && \ + git clone --branch n${NVENC_VERSION} --depth=1 https://git.videolan.org/git/ffmpeg/nv-codec-headers.git ${DIR} && \ + cd ${DIR} && \ + sed -i 's@/usr/local@'"$PREFIX"'@' Makefile && \ + make && \ + make install && \ + rm -rf ${DIR} +## dav1d https://code.videolan.org/videolan/dav1d +RUN \ + DIR=dav1d && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://code.videolan.org/videolan/dav1d/-/archive/${LIBDAV1D_VERSION}/dav1d-${LIBDAV1D_VERSION}.tar.gz && \ + tar -zx --strip-components=1 -f dav1d-${LIBDAV1D_VERSION}.tar.gz && \ + meson build --prefix ${PREFIX} --buildtype release && \ + ninja -C build install && \ + rm -rf ${DIR} +RUN \ + DIR=ffmpeg && mkdir -p ${DIR} && cd ${DIR} && \ + curl -sLO https://ffmpeg.org/releases/ffmpeg-${FFMPEG_VERSION}.tar.bz2 && \ + tar -jx --strip-components=1 -f ffmpeg-${FFMPEG_VERSION}.tar.bz2 && \ + ./configure \ + --disable-debug \ + --disable-doc \ + --disable-ffplay \ + --enable-shared \ + --enable-avresample \ + --enable-openssl \ + --enable-postproc \ + --enable-small \ + --extra-cflags="-I${PREFIX}/include -I/usr/local/include" \ + --extra-ldflags="-L${PREFIX}/lib -L/usr/local/lib" \ + --enable-libopencore-amrnb \ + --enable-libopencore-amrwb \ + --enable-version3 \ + --enable-libx264 \ + --enable-libx265 \ + --enable-libopus \ + --enable-libvorbis \ + --enable-libtheora \ + --enable-libvpx \ + --enable-libmp3lame \ + --enable-libxvid \ + --enable-libfdk_aac \ + --enable-nonfree \ + --enable-libopenjpeg \ + --enable-libfreetype \ + --enable-libvidstab \ + --enable-gpl \ + --enable-libass \ + --enable-libkvazaar \ + --enable-libaom \ + --extra-libs=-lpthread \ + --enable-vaapi \ + --enable-cuda \ + --enable-nvenc \ + --enable-cuvid \ + --enable-libdav1d \ + --prefix="${PREFIX}" && \ + make && \ + make install && \ + make distclean && \ + hash -r && \ + cd tools && \ + make qt-faststart && \ + cp qt-faststart ${PREFIX}/bin + +RUN \ + if false; then \ + cp -r ${PREFIX}/lib/*so* /usr/local/lib/ && \ + cp ${PREFIX}/bin/* /usr/local/bin/ ; \ + else \ + LD_LIBRARY_PATH=${PREFIX}/lib ldd ${PREFIX}/bin/ffmpeg | \ + grep ${PREFIX} | \ + cut -d ' ' -f 3 | \ + xargs -i cp {} /usr/local/lib/ && \ + cp ${PREFIX}/bin/ff* /usr/local/bin/ ; \ + fi && \ + if true; then \ + for lib in /usr/local/lib/*.so* /usr/local/bin/*; do strip --strip-all $lib; done ; \ + fi && \ + cp -r ${PREFIX}/share/ffmpeg /usr/local/share/ && \ + LD_LIBRARY_PATH=/usr/local/lib ffmpeg -buildconf + +FROM base AS release +MAINTAINER Julien Rottenberg + +CMD ["--help"] +ENTRYPOINT ["ffmpeg"] + +COPY --from=build /usr/local /usr/local +RUN test "base" = "base" && ldconfig /usr/local/lib /usr/local/lib64 + +# Let's make sure the app built correctly +# Convenient to verify on https://hub.docker.com/r/jrottenberg/ffmpeg/builds/ console output +>>>>>>> fix extra comma diff --git a/docker_gen.sh b/docker_gen.sh index 5db6099ce..991fb8eca 100644 --- a/docker_gen.sh +++ b/docker_gen.sh @@ -1,10 +1,10 @@ #! /bin/sh -variants=("ubuntu" "centos" "alpine", "nvidia", "arm32v7") +variants=("ubuntu" "centos" "alpine" "nvidia" "arm32v7") versions=("2.8" "3.2" "3.3" "3.4" "4.0" "4.1" "snapshot") for variant in ${variants[*]}; do - for version in ${versions[*]}; do + for version in ${versions[*]}; do echo "${variant}: ffmpeg-${version}" dir="docker-images/${version}/${variant}" mkdir -p ${dir} @@ -13,7 +13,7 @@ for variant in ${variants[*]}; do done scratch_variant="alpine" -for version in ${versions[*]}; do +for version in ${versions[*]}; do dir="docker-images/${version}/${variant}" mkdir -p ${dir} python3 update.py --scratch --enable-all ${scratch_variant} ${version} > ${dir}/Dockerfile @@ -25,4 +25,4 @@ sed -ri\ -e 's/alpine:[[:digit:]]+.[[:digit:]]+/alpine:3.8/' \ -e 's/libssl1.[[:digit:]]/libssl1.0/' \ -e 's/libcrypto1.[[:digit:]]/libcrypto1.0/' \ - docker-images/2.8/alpine/Dockerfile \ No newline at end of file + docker-images/2.8/alpine/Dockerfile diff --git a/update.py b/update.py index 7e929578c..91be2cc10 100755 --- a/update.py +++ b/update.py @@ -1,9 +1,8 @@ -#!/usr/bin/env python +#! /usr/bin/env python - -# Get latest release from ffmpeg.org -import os +from string import Template import sys +<<<<<<< HEAD import re import urllib from distutils.version import StrictVersion @@ -49,68 +48,181 @@ version, variant) travis.append(' - VERSION=%s VARIANT=%s' % (version, variant)) azure.append(' %s_%s:\n VERSION: %s\n VARIANT: %s' % (version.replace('.', '_'), variant, version, variant)) +======= +import getopt +import argparse +import configparser +from os import listdir, path + +variants = ['alpine', 'centos', 'ubuntu', 'nvidia', 'armv7'] +versions = ['snapshot', '4.1', '4.0', '3.4', '3.3', '3.2', '2.8'] +builddir = '/tmp/build' +makeflags = '-j6' + +templates = "./templates" + +fragments = path.join(templates, "fragments") +common = path.join(templates, "common") +configfile_template = path.join(templates, 'config', "config_${version}.ini") + +class ActionEnableDisable(argparse.Action): + def __init__(self, option_strings, dest, default=None, required=False, help=None): + if len(option_strings) != 1: + raise ValueError('Only a single argument is allowed with enable/disable action') + if not option_strings[0].startswith('--'): + raise ValueError('Enable/Disable arguments must be prefixed with "--"') + + opt_name = option_strings[0][2:] + opts = ['--enable-' + opt_name, '--disable-' + opt_name] + super(ActionEnableDisable, self).__init__(opts, dest, nargs=0, const=None, default=default, required=required, help=help) + + def __call__(self, parser, namespace, values, option_strings=None): + if option_strings.startswith('--disable-'): + setattr(namespace, self.dest, False) +>>>>>>> fix extra comma else: - dockerfile = 'docker-images/%s/%s/Dockerfile' % ( - version[0:3], variant) - travis.append(' - VERSION=%s VARIANT=%s' % (version[0:3], variant)) - azure.append(' %s_%s:\n VERSION: %s\n VARIANT: %s' % (version[0:3].replace('.', '_'), variant, version[0:3], variant)) - - with open('templates/Dockerfile-env', 'r') as tmpfile: - env_content = tmpfile.read() - with open('templates/Dockerfile-template.' + variant, 'r') as tmpfile: - template = tmpfile.read() - with open('templates/Dockerfile-run', 'r') as tmpfile: - run_content = tmpfile.read() - env_content = env_content.replace('%%FFMPEG_VERSION%%', version) - docker_content = template.replace('%%ENV%%', env_content) - docker_content = docker_content.replace('%%RUN%%', run_content) - # OpenJpeg 2.1 is not supported in 2.8 - if version[0:3] == '2.8': - docker_content = docker_content.replace('--enable-libopenjpeg', '') - docker_content = docker_content.replace('--enable-libkvazaar', '') - if (version != 'snapshot' and version[0] < '4') or variant == 'centos': - docker_content = re.sub(r"--enable-libaom [^\\]*", "", docker_content) - if (version == 'snapshot' or version[0] >= '3') and variant == 'vaapi': - docker_content = docker_content.replace('--disable-ffplay', '--disable-ffplay \\\n --enable-vaapi') - - if variant == 'nvidia': - docker_content = docker_content.replace('--extra-cflags="-I${PREFIX}/include"', '--extra-cflags="-I${PREFIX}/include -I${PREFIX}/include/ffnvcodec -I/usr/local/cuda/include/"') - docker_content = docker_content.replace('--extra-ldflags="-L${PREFIX}/lib"', '--extra-ldflags="-L${PREFIX}/lib -L/usr/local/cuda/lib64/ -L/usr/local/cuda/lib32/"') - if (version == 'snapshot' or version[0] >= '4') : - docker_content = docker_content.replace('--disable-ffplay', '--disable-ffplay \\\n --enable-cuda \\\n --enable-nvenc \\\n --enable-cuvid \\\n --enable-libnpp') - # Don't support hw decoding and scaling on older ffmpeg versions - if (version[0] < '4') : - docker_content = docker_content.replace('--disable-ffplay', '--disable-ffplay \\\n --enable-nvenc') - # FFmpeg 3.2 and earlier don't compile correctly on Ubuntu 18.04 due to openssl issues - if (version[0] < '3' or (version[0] == '3' and version[2] < '3')) : - docker_content = docker_content.replace('-ubuntu18.04', '-ubuntu16.04') - - # FFmpeg 3.2 and earlier don't compile correctly on Ubuntu 18.04 due to openssl issues - if variant == 'vaapi' and (version[0] < '3' or (version[0] == '3' and version[2] < '3')): - docker_content = docker_content.replace('ubuntu:18.04', 'ubuntu:16.04') - docker_content = docker_content.replace('libva-drm2', 'libva-drm1') - docker_content = docker_content.replace('libva2', 'libva1') - - d = os.path.dirname(dockerfile) - if not os.path.exists(d): - os.makedirs(d) - - with open(dockerfile, 'w') as dfile: - dfile.write(docker_content) - - -with open('templates/travis.template', 'r') as tmpfile: - template = tmpfile.read() -travis = template.replace('%%VERSIONS%%', '\n'.join(travis)) - - -with open('.travis.yml', 'w') as travisfile: - travisfile.write(travis) - -with open('templates/azure.template', 'r') as tmpfile: - template = tmpfile.read() -azure = template.replace('%%VERSIONS%%', '\n'.join(azure)) - - -with open('azure-pipelines.yml', 'w') as azurefile: - azurefile.write(azure) + setattr(namespace, self.dest, True) + +def parser_gen(): + parser = argparse.ArgumentParser(description='Dockerfile generator.') + for f in listdir(fragments): + if f != 'ffmpeg' and path.isfile(path.join(fragments, f)): + parser.add_argument('--' + f, action=ActionEnableDisable, default=None, help='enable/disable ' + f) + + parser.add_argument('--enable-all', help='set all external libraries to true', action='store_true', default=False) + parser.add_argument('variant', default='alpine', choices=variants) + parser.add_argument('version', default='4.1', choices=versions) + parser.add_argument('--with-bins', action='store_true', default=False ) + parser.add_argument('--no-strip', action='store_true', default=False) + + outsize = parser.add_mutually_exclusive_group(required=False) + outsize.add_argument('--fat', help='keep everything', action='store_true', default=True) + outsize.add_argument('--slim', help='only keep libraries', action='store_true', default=False) + outsize.add_argument('--scratch', help='build from scratch', action='store_true', default=False) + + return parser + +def kebab_arg(name): + return name.replace('_', '-') + +def snake_arg(name): + return name.replace('-', '_') + +def dockerfile_gen(args, config, packages): + variant = open(path.join(templates, 'variants', "Dockerfile.%s" % (getattr(args, 'variant')))) + src = Template(variant.read()) + + d={ + 'prefix': builddir, + 'makeflags': makeflags, + 'packages': '', + 'dev_packages': '' + } + + + + deps = [] + flags = [] + default = False + if getattr(args, 'enable_all'): + delattr(args, 'enable_all') + default = True + + for section in config.sections(): + dep = snake_arg(section) + if hasattr(args, dep) and getattr(args, dep) is None: + setattr(args, dep, default) + + for arg in vars(args): + library = kebab_arg(arg) + if getattr(args, arg) and library in config: + if 'Variants' in config[library] and variant in config[library]['Variants'].split(','): + continue + if 'DependsOn' in config[library]: + if not config[library]['DependsOn'] in deps: + for dependency in config[library]['DependsOn'].split(','): + deps.append(dependency.strip()) + if 'Flags' in config[library]: + if not config[library]['Flags'] in flags: + for flag in config[library]['Flags'].split(','): + flags.append(flag.strip()) + if not library in deps: + deps.append(library) + + for dep in deps + ['ffmpeg']: + if 'Install' in config[dep]: + for package in config[dep]['Install'].split(','): + d['packages'] = "%s %s" % (packages[getattr(args, 'variant')][package].strip(), d['packages']) + if 'InstallDev' in config[dep]: + for package in config[dep]['InstallDev'].split(','): + d['dev_packages'] = "%s %s" % (packages[getattr(args, 'variant')][package].strip(), d['dev_packages']) + + result = src.safe_substitute(d) + print(result) + + print ("") + print ("ARG\tFFMPEG_VERSION=%s" % (config.get('ffmpeg', 'Version'))) + for dependency in deps: + if "Version" in config[dependency]: + print ("ARG\t%s_VERSION=%s" % (snake_arg(dependency.upper()), config.get(dependency, "Version"))) + + print ("") + for dependency in deps: + if "SHA256sum" in config[dependency]: + print ("ARG\t%s_SHA256SUM=%s" % (dependency.upper(), config.get(dependency, "SHA256sum"))) + + print("") + for dependency in deps: + with open(path.join(fragments, dependency)) as fragment: + print (fragment.read()) + + with open(path.join(fragments, 'ffmpeg')) as ffmpeg_fragment: + ffmpeg_template = Template(ffmpeg_fragment.read()) + ffmpeg_flags = ' \\\n\t'.join(flags) + + result = ffmpeg_template.safe_substitute({'lib_flags': ffmpeg_flags}) + print(result) + + if getattr(args, 'slim'): + assembly_type = 'slim' + release_pattern = {'source': 'base', 'entrypoint': 'ffmpeg', 'install_dir': '/usr/local'} + assembly_pattern = { + 'bins': 'true' if getattr(args, 'with_bins') else 'false', + 'strip': 'false' if getattr(args, 'no_strip') else 'true' + } + elif getattr(args, 'scratch'): + assembly_type = 'scratch' + release_pattern = {'source': 'scratch', 'entrypoint': '/bin/ffmpeg', 'install_dir': '/'} + assembly_pattern = { + 'bins': 'true' if getattr(args, 'with_bins') else 'false', + 'strip': 'false' if getattr(args, 'no_strip') else 'true' + } + else : + assembly_type = 'fat' + release_pattern = {'source': 'base', 'entrypoint': 'ffmpeg', 'install_dir': '/usr/local'} + assembly_pattern = {} + + with open(path.join(common, assembly_type)) as assembly: + assembly_template = Template(assembly.read()) + print (assembly_template.safe_substitute(assembly_pattern)) + + with open(path.join(common, 'release')) as release: + release_template = Template(release.read()) + print (release_template.safe_substitute(release_pattern)) + + + +def main(argv): + args_parser = parser_gen() + config_parser = configparser.ConfigParser() + package_parser = configparser.ConfigParser() + + args = args_parser.parse_args() + configfile = Template(configfile_template) + + config_parser.read(configfile.safe_substitute({'version': getattr(args, 'version')})) + package_parser.read(path.join(templates, 'variants', 'packages.ini')) + dockerfile_gen(args, config_parser, package_parser) + +if __name__ == '__main__': + main(sys.argv) \ No newline at end of file From 73774540abe1664c2c10081ed122081c5ff7677c Mon Sep 17 00:00:00 2001 From: GnaphronG Date: Wed, 12 Jun 2019 23:06:12 -0700 Subject: [PATCH 27/29] rewrite the dockerfile generation + vdapu + armv7 + dav1d --- docker-images/2.8/alpine,/Dockerfile | 14 ++++++++++++++ docker-images/2.8/centos/Dockerfile | 6 ++++++ docker-images/2.8/nvidia,/Dockerfile | 14 ++++++++++++++ docker-images/2.8/ubuntu/Dockerfile | 6 ++++++ docker-images/3.2/alpine,/Dockerfile | 14 ++++++++++++++ docker-images/3.2/centos/Dockerfile | 6 ++++++ docker-images/3.2/nvidia,/Dockerfile | 14 ++++++++++++++ docker-images/3.2/ubuntu/Dockerfile | 6 ++++++ docker-images/3.3/alpine,/Dockerfile | 14 ++++++++++++++ docker-images/3.3/centos/Dockerfile | 6 ++++++ docker-images/3.3/nvidia,/Dockerfile | 14 ++++++++++++++ docker-images/3.3/ubuntu/Dockerfile | 6 ++++++ docker-images/3.4/alpine,/Dockerfile | 14 ++++++++++++++ docker-images/3.4/centos/Dockerfile | 6 ++++++ docker-images/3.4/nvidia,/Dockerfile | 14 ++++++++++++++ docker-images/3.4/ubuntu/Dockerfile | 6 ++++++ docker-images/4.0/alpine,/Dockerfile | 14 ++++++++++++++ docker-images/4.0/centos/Dockerfile | 6 ++++++ docker-images/4.0/nvidia,/Dockerfile | 14 ++++++++++++++ docker-images/4.0/ubuntu/Dockerfile | 6 ++++++ docker-images/4.1/alpine,/Dockerfile | 14 ++++++++++++++ docker-images/4.1/centos/Dockerfile | 6 ++++++ docker-images/4.1/nvidia,/Dockerfile | 14 ++++++++++++++ docker-images/4.1/ubuntu/Dockerfile | 6 ++++++ docker-images/snapshot/alpine,/Dockerfile | 14 ++++++++++++++ docker-images/snapshot/centos/Dockerfile | 6 ++++++ docker-images/snapshot/nvidia,/Dockerfile | 14 ++++++++++++++ docker-images/snapshot/ubuntu/Dockerfile | 6 ++++++ docker_gen.sh | 16 ++++++++++++++++ 29 files changed, 296 insertions(+) create mode 100644 docker-images/2.8/alpine,/Dockerfile create mode 100644 docker-images/2.8/nvidia,/Dockerfile create mode 100644 docker-images/3.2/alpine,/Dockerfile create mode 100644 docker-images/3.2/nvidia,/Dockerfile create mode 100644 docker-images/3.3/alpine,/Dockerfile create mode 100644 docker-images/3.3/nvidia,/Dockerfile create mode 100644 docker-images/3.4/alpine,/Dockerfile create mode 100644 docker-images/3.4/nvidia,/Dockerfile create mode 100644 docker-images/4.0/alpine,/Dockerfile create mode 100644 docker-images/4.0/nvidia,/Dockerfile create mode 100644 docker-images/4.1/alpine,/Dockerfile create mode 100644 docker-images/4.1/nvidia,/Dockerfile create mode 100644 docker-images/snapshot/alpine,/Dockerfile create mode 100644 docker-images/snapshot/nvidia,/Dockerfile diff --git a/docker-images/2.8/alpine,/Dockerfile b/docker-images/2.8/alpine,/Dockerfile new file mode 100644 index 000000000..a0b97723e --- /dev/null +++ b/docker-images/2.8/alpine,/Dockerfile @@ -0,0 +1,14 @@ +usage: update.py [-h] [--enable-libopencore-amr] [--enable-libx264] + [--enable-libx265] [--enable-libogg] [--enable-libopus] + [--enable-libvorbis] [--enable-libtheora] [--enable-libvpx] + [--enable-libmp3lame] [--enable-libxvid] + [--enable-libfdk-aac] [--enable-libopenjpeg] + [--enable-libfreetype] [--enable-libvidstab] + [--enable-libfribidi] [--enable-libfontconfig] + [--enable-libass] [--enable-libkvazaar] [--enable-libaom] + [--enable-vaapi] [--enable-nvenc] [--enable-libdav1d] + [--enable-vdpau] [--enable-all] [--with-bins] [--no-strip] + [--fat | --slim | --scratch] + {alpine,centos,ubuntu,nvidia,armv7} + {snapshot,4.1,4.0,3.4,3.3,3.2,2.8} +update.py: error: argument variant: invalid choice: 'alpine,' (choose from 'alpine', 'centos', 'ubuntu', 'nvidia', 'armv7') diff --git a/docker-images/2.8/centos/Dockerfile b/docker-images/2.8/centos/Dockerfile index 0054d2590..37fd49d77 100644 --- a/docker-images/2.8/centos/Dockerfile +++ b/docker-images/2.8/centos/Dockerfile @@ -1,4 +1,5 @@ <<<<<<< HEAD +<<<<<<< HEAD # ffmpeg - http://ffmpeg.org/download.html # # From https://trac.ffmpeg.org/wiki/CompilationGuide/Centos @@ -390,6 +391,8 @@ COPY --from=build /usr/local/ /usr/local/ # Let's make sure the app built correctly # Convenient to verify on https://hub.docker.com/r/jrottenberg/ffmpeg/builds/ console output ======= +======= +>>>>>>> rewrite the dockerfile generation + vdapu + armv7 + dav1d FROM centos:7 as base RUN yum -y install libva libgomp libuuid && \ @@ -849,4 +852,7 @@ RUN test "base" = "base" && ldconfig /usr/local/lib /usr/local/lib64 # Let's make sure the app built correctly # Convenient to verify on https://hub.docker.com/r/jrottenberg/ffmpeg/builds/ console output +<<<<<<< HEAD +>>>>>>> rewrite the dockerfile generation + vdapu + armv7 + dav1d +======= >>>>>>> rewrite the dockerfile generation + vdapu + armv7 + dav1d diff --git a/docker-images/2.8/nvidia,/Dockerfile b/docker-images/2.8/nvidia,/Dockerfile new file mode 100644 index 000000000..452b62c02 --- /dev/null +++ b/docker-images/2.8/nvidia,/Dockerfile @@ -0,0 +1,14 @@ +usage: update.py [-h] [--enable-libopencore-amr] [--enable-libx264] + [--enable-libx265] [--enable-libogg] [--enable-libopus] + [--enable-libvorbis] [--enable-libtheora] [--enable-libvpx] + [--enable-libmp3lame] [--enable-libxvid] + [--enable-libfdk-aac] [--enable-libopenjpeg] + [--enable-libfreetype] [--enable-libvidstab] + [--enable-libfribidi] [--enable-libfontconfig] + [--enable-libass] [--enable-libkvazaar] [--enable-libaom] + [--enable-vaapi] [--enable-nvenc] [--enable-libdav1d] + [--enable-vdpau] [--enable-all] [--with-bins] [--no-strip] + [--fat | --slim | --scratch] + {alpine,centos,ubuntu,nvidia,armv7} + {snapshot,4.1,4.0,3.4,3.3,3.2,2.8} +update.py: error: argument variant: invalid choice: 'nvidia,' (choose from 'alpine', 'centos', 'ubuntu', 'nvidia', 'armv7') diff --git a/docker-images/2.8/ubuntu/Dockerfile b/docker-images/2.8/ubuntu/Dockerfile index 52a400d5f..44ba6952c 100644 --- a/docker-images/2.8/ubuntu/Dockerfile +++ b/docker-images/2.8/ubuntu/Dockerfile @@ -1,4 +1,5 @@ <<<<<<< HEAD +<<<<<<< HEAD # ffmpeg - http://ffmpeg.org/download.html # # From https://trac.ffmpeg.org/wiki/CompilationGuide/Ubuntu @@ -391,6 +392,8 @@ COPY --from=build /usr/local /usr/local/ # Let's make sure the app built correctly # Convenient to verify on https://hub.docker.com/r/jrottenberg/ffmpeg/builds/ console output ======= +======= +>>>>>>> rewrite the dockerfile generation + vdapu + armv7 + dav1d FROM ubuntu:18.04 AS base RUN apt-get -yqq update && \ @@ -807,4 +810,7 @@ RUN test "base" = "base" && ldconfig /usr/local/lib /usr/local/lib64 # Let's make sure the app built correctly # Convenient to verify on https://hub.docker.com/r/jrottenberg/ffmpeg/builds/ console output +<<<<<<< HEAD +>>>>>>> rewrite the dockerfile generation + vdapu + armv7 + dav1d +======= >>>>>>> rewrite the dockerfile generation + vdapu + armv7 + dav1d diff --git a/docker-images/3.2/alpine,/Dockerfile b/docker-images/3.2/alpine,/Dockerfile new file mode 100644 index 000000000..a0b97723e --- /dev/null +++ b/docker-images/3.2/alpine,/Dockerfile @@ -0,0 +1,14 @@ +usage: update.py [-h] [--enable-libopencore-amr] [--enable-libx264] + [--enable-libx265] [--enable-libogg] [--enable-libopus] + [--enable-libvorbis] [--enable-libtheora] [--enable-libvpx] + [--enable-libmp3lame] [--enable-libxvid] + [--enable-libfdk-aac] [--enable-libopenjpeg] + [--enable-libfreetype] [--enable-libvidstab] + [--enable-libfribidi] [--enable-libfontconfig] + [--enable-libass] [--enable-libkvazaar] [--enable-libaom] + [--enable-vaapi] [--enable-nvenc] [--enable-libdav1d] + [--enable-vdpau] [--enable-all] [--with-bins] [--no-strip] + [--fat | --slim | --scratch] + {alpine,centos,ubuntu,nvidia,armv7} + {snapshot,4.1,4.0,3.4,3.3,3.2,2.8} +update.py: error: argument variant: invalid choice: 'alpine,' (choose from 'alpine', 'centos', 'ubuntu', 'nvidia', 'armv7') diff --git a/docker-images/3.2/centos/Dockerfile b/docker-images/3.2/centos/Dockerfile index 7148d0482..00554be73 100644 --- a/docker-images/3.2/centos/Dockerfile +++ b/docker-images/3.2/centos/Dockerfile @@ -1,4 +1,5 @@ <<<<<<< HEAD +<<<<<<< HEAD # ffmpeg - http://ffmpeg.org/download.html # # From https://trac.ffmpeg.org/wiki/CompilationGuide/Centos @@ -398,6 +399,8 @@ COPY --from=build /usr/local/ /usr/local/ # Let's make sure the app built correctly # Convenient to verify on https://hub.docker.com/r/jrottenberg/ffmpeg/builds/ console output ======= +======= +>>>>>>> rewrite the dockerfile generation + vdapu + armv7 + dav1d FROM centos:7 as base RUN yum -y install libva libgomp libuuid && \ @@ -857,4 +860,7 @@ RUN test "base" = "base" && ldconfig /usr/local/lib /usr/local/lib64 # Let's make sure the app built correctly # Convenient to verify on https://hub.docker.com/r/jrottenberg/ffmpeg/builds/ console output +<<<<<<< HEAD +>>>>>>> rewrite the dockerfile generation + vdapu + armv7 + dav1d +======= >>>>>>> rewrite the dockerfile generation + vdapu + armv7 + dav1d diff --git a/docker-images/3.2/nvidia,/Dockerfile b/docker-images/3.2/nvidia,/Dockerfile new file mode 100644 index 000000000..452b62c02 --- /dev/null +++ b/docker-images/3.2/nvidia,/Dockerfile @@ -0,0 +1,14 @@ +usage: update.py [-h] [--enable-libopencore-amr] [--enable-libx264] + [--enable-libx265] [--enable-libogg] [--enable-libopus] + [--enable-libvorbis] [--enable-libtheora] [--enable-libvpx] + [--enable-libmp3lame] [--enable-libxvid] + [--enable-libfdk-aac] [--enable-libopenjpeg] + [--enable-libfreetype] [--enable-libvidstab] + [--enable-libfribidi] [--enable-libfontconfig] + [--enable-libass] [--enable-libkvazaar] [--enable-libaom] + [--enable-vaapi] [--enable-nvenc] [--enable-libdav1d] + [--enable-vdpau] [--enable-all] [--with-bins] [--no-strip] + [--fat | --slim | --scratch] + {alpine,centos,ubuntu,nvidia,armv7} + {snapshot,4.1,4.0,3.4,3.3,3.2,2.8} +update.py: error: argument variant: invalid choice: 'nvidia,' (choose from 'alpine', 'centos', 'ubuntu', 'nvidia', 'armv7') diff --git a/docker-images/3.2/ubuntu/Dockerfile b/docker-images/3.2/ubuntu/Dockerfile index 983516d39..1c51127a3 100644 --- a/docker-images/3.2/ubuntu/Dockerfile +++ b/docker-images/3.2/ubuntu/Dockerfile @@ -1,4 +1,5 @@ <<<<<<< HEAD +<<<<<<< HEAD # ffmpeg - http://ffmpeg.org/download.html # # From https://trac.ffmpeg.org/wiki/CompilationGuide/Ubuntu @@ -399,6 +400,8 @@ COPY --from=build /usr/local /usr/local/ # Let's make sure the app built correctly # Convenient to verify on https://hub.docker.com/r/jrottenberg/ffmpeg/builds/ console output ======= +======= +>>>>>>> rewrite the dockerfile generation + vdapu + armv7 + dav1d FROM ubuntu:18.04 AS base RUN apt-get -yqq update && \ @@ -815,4 +818,7 @@ RUN test "base" = "base" && ldconfig /usr/local/lib /usr/local/lib64 # Let's make sure the app built correctly # Convenient to verify on https://hub.docker.com/r/jrottenberg/ffmpeg/builds/ console output +<<<<<<< HEAD +>>>>>>> rewrite the dockerfile generation + vdapu + armv7 + dav1d +======= >>>>>>> rewrite the dockerfile generation + vdapu + armv7 + dav1d diff --git a/docker-images/3.3/alpine,/Dockerfile b/docker-images/3.3/alpine,/Dockerfile new file mode 100644 index 000000000..a0b97723e --- /dev/null +++ b/docker-images/3.3/alpine,/Dockerfile @@ -0,0 +1,14 @@ +usage: update.py [-h] [--enable-libopencore-amr] [--enable-libx264] + [--enable-libx265] [--enable-libogg] [--enable-libopus] + [--enable-libvorbis] [--enable-libtheora] [--enable-libvpx] + [--enable-libmp3lame] [--enable-libxvid] + [--enable-libfdk-aac] [--enable-libopenjpeg] + [--enable-libfreetype] [--enable-libvidstab] + [--enable-libfribidi] [--enable-libfontconfig] + [--enable-libass] [--enable-libkvazaar] [--enable-libaom] + [--enable-vaapi] [--enable-nvenc] [--enable-libdav1d] + [--enable-vdpau] [--enable-all] [--with-bins] [--no-strip] + [--fat | --slim | --scratch] + {alpine,centos,ubuntu,nvidia,armv7} + {snapshot,4.1,4.0,3.4,3.3,3.2,2.8} +update.py: error: argument variant: invalid choice: 'alpine,' (choose from 'alpine', 'centos', 'ubuntu', 'nvidia', 'armv7') diff --git a/docker-images/3.3/centos/Dockerfile b/docker-images/3.3/centos/Dockerfile index 7aa98cb6a..4786f70d8 100644 --- a/docker-images/3.3/centos/Dockerfile +++ b/docker-images/3.3/centos/Dockerfile @@ -1,4 +1,5 @@ <<<<<<< HEAD +<<<<<<< HEAD # ffmpeg - http://ffmpeg.org/download.html # # From https://trac.ffmpeg.org/wiki/CompilationGuide/Centos @@ -390,6 +391,8 @@ COPY --from=build /usr/local/ /usr/local/ # Let's make sure the app built correctly # Convenient to verify on https://hub.docker.com/r/jrottenberg/ffmpeg/builds/ console output ======= +======= +>>>>>>> rewrite the dockerfile generation + vdapu + armv7 + dav1d FROM centos:7 as base RUN yum -y install libva libgomp libuuid && \ @@ -850,4 +853,7 @@ RUN test "base" = "base" && ldconfig /usr/local/lib /usr/local/lib64 # Let's make sure the app built correctly # Convenient to verify on https://hub.docker.com/r/jrottenberg/ffmpeg/builds/ console output +<<<<<<< HEAD +>>>>>>> rewrite the dockerfile generation + vdapu + armv7 + dav1d +======= >>>>>>> rewrite the dockerfile generation + vdapu + armv7 + dav1d diff --git a/docker-images/3.3/nvidia,/Dockerfile b/docker-images/3.3/nvidia,/Dockerfile new file mode 100644 index 000000000..452b62c02 --- /dev/null +++ b/docker-images/3.3/nvidia,/Dockerfile @@ -0,0 +1,14 @@ +usage: update.py [-h] [--enable-libopencore-amr] [--enable-libx264] + [--enable-libx265] [--enable-libogg] [--enable-libopus] + [--enable-libvorbis] [--enable-libtheora] [--enable-libvpx] + [--enable-libmp3lame] [--enable-libxvid] + [--enable-libfdk-aac] [--enable-libopenjpeg] + [--enable-libfreetype] [--enable-libvidstab] + [--enable-libfribidi] [--enable-libfontconfig] + [--enable-libass] [--enable-libkvazaar] [--enable-libaom] + [--enable-vaapi] [--enable-nvenc] [--enable-libdav1d] + [--enable-vdpau] [--enable-all] [--with-bins] [--no-strip] + [--fat | --slim | --scratch] + {alpine,centos,ubuntu,nvidia,armv7} + {snapshot,4.1,4.0,3.4,3.3,3.2,2.8} +update.py: error: argument variant: invalid choice: 'nvidia,' (choose from 'alpine', 'centos', 'ubuntu', 'nvidia', 'armv7') diff --git a/docker-images/3.3/ubuntu/Dockerfile b/docker-images/3.3/ubuntu/Dockerfile index 3e3331d7e..3be1e7c21 100644 --- a/docker-images/3.3/ubuntu/Dockerfile +++ b/docker-images/3.3/ubuntu/Dockerfile @@ -1,4 +1,5 @@ <<<<<<< HEAD +<<<<<<< HEAD # ffmpeg - http://ffmpeg.org/download.html # # From https://trac.ffmpeg.org/wiki/CompilationGuide/Ubuntu @@ -391,6 +392,8 @@ COPY --from=build /usr/local /usr/local/ # Let's make sure the app built correctly # Convenient to verify on https://hub.docker.com/r/jrottenberg/ffmpeg/builds/ console output ======= +======= +>>>>>>> rewrite the dockerfile generation + vdapu + armv7 + dav1d FROM ubuntu:18.04 AS base RUN apt-get -yqq update && \ @@ -808,4 +811,7 @@ RUN test "base" = "base" && ldconfig /usr/local/lib /usr/local/lib64 # Let's make sure the app built correctly # Convenient to verify on https://hub.docker.com/r/jrottenberg/ffmpeg/builds/ console output +<<<<<<< HEAD +>>>>>>> rewrite the dockerfile generation + vdapu + armv7 + dav1d +======= >>>>>>> rewrite the dockerfile generation + vdapu + armv7 + dav1d diff --git a/docker-images/3.4/alpine,/Dockerfile b/docker-images/3.4/alpine,/Dockerfile new file mode 100644 index 000000000..a0b97723e --- /dev/null +++ b/docker-images/3.4/alpine,/Dockerfile @@ -0,0 +1,14 @@ +usage: update.py [-h] [--enable-libopencore-amr] [--enable-libx264] + [--enable-libx265] [--enable-libogg] [--enable-libopus] + [--enable-libvorbis] [--enable-libtheora] [--enable-libvpx] + [--enable-libmp3lame] [--enable-libxvid] + [--enable-libfdk-aac] [--enable-libopenjpeg] + [--enable-libfreetype] [--enable-libvidstab] + [--enable-libfribidi] [--enable-libfontconfig] + [--enable-libass] [--enable-libkvazaar] [--enable-libaom] + [--enable-vaapi] [--enable-nvenc] [--enable-libdav1d] + [--enable-vdpau] [--enable-all] [--with-bins] [--no-strip] + [--fat | --slim | --scratch] + {alpine,centos,ubuntu,nvidia,armv7} + {snapshot,4.1,4.0,3.4,3.3,3.2,2.8} +update.py: error: argument variant: invalid choice: 'alpine,' (choose from 'alpine', 'centos', 'ubuntu', 'nvidia', 'armv7') diff --git a/docker-images/3.4/centos/Dockerfile b/docker-images/3.4/centos/Dockerfile index 67e32e8f2..cf846b073 100644 --- a/docker-images/3.4/centos/Dockerfile +++ b/docker-images/3.4/centos/Dockerfile @@ -1,4 +1,5 @@ <<<<<<< HEAD +<<<<<<< HEAD # ffmpeg - http://ffmpeg.org/download.html # # From https://trac.ffmpeg.org/wiki/CompilationGuide/Centos @@ -390,6 +391,8 @@ COPY --from=build /usr/local/ /usr/local/ # Let's make sure the app built correctly # Convenient to verify on https://hub.docker.com/r/jrottenberg/ffmpeg/builds/ console output ======= +======= +>>>>>>> rewrite the dockerfile generation + vdapu + armv7 + dav1d FROM centos:7 as base RUN yum -y install libva libgomp libuuid && \ @@ -850,4 +853,7 @@ RUN test "base" = "base" && ldconfig /usr/local/lib /usr/local/lib64 # Let's make sure the app built correctly # Convenient to verify on https://hub.docker.com/r/jrottenberg/ffmpeg/builds/ console output +<<<<<<< HEAD +>>>>>>> rewrite the dockerfile generation + vdapu + armv7 + dav1d +======= >>>>>>> rewrite the dockerfile generation + vdapu + armv7 + dav1d diff --git a/docker-images/3.4/nvidia,/Dockerfile b/docker-images/3.4/nvidia,/Dockerfile new file mode 100644 index 000000000..452b62c02 --- /dev/null +++ b/docker-images/3.4/nvidia,/Dockerfile @@ -0,0 +1,14 @@ +usage: update.py [-h] [--enable-libopencore-amr] [--enable-libx264] + [--enable-libx265] [--enable-libogg] [--enable-libopus] + [--enable-libvorbis] [--enable-libtheora] [--enable-libvpx] + [--enable-libmp3lame] [--enable-libxvid] + [--enable-libfdk-aac] [--enable-libopenjpeg] + [--enable-libfreetype] [--enable-libvidstab] + [--enable-libfribidi] [--enable-libfontconfig] + [--enable-libass] [--enable-libkvazaar] [--enable-libaom] + [--enable-vaapi] [--enable-nvenc] [--enable-libdav1d] + [--enable-vdpau] [--enable-all] [--with-bins] [--no-strip] + [--fat | --slim | --scratch] + {alpine,centos,ubuntu,nvidia,armv7} + {snapshot,4.1,4.0,3.4,3.3,3.2,2.8} +update.py: error: argument variant: invalid choice: 'nvidia,' (choose from 'alpine', 'centos', 'ubuntu', 'nvidia', 'armv7') diff --git a/docker-images/3.4/ubuntu/Dockerfile b/docker-images/3.4/ubuntu/Dockerfile index 4fb555c65..8008fa5f0 100644 --- a/docker-images/3.4/ubuntu/Dockerfile +++ b/docker-images/3.4/ubuntu/Dockerfile @@ -1,4 +1,5 @@ <<<<<<< HEAD +<<<<<<< HEAD # ffmpeg - http://ffmpeg.org/download.html # # From https://trac.ffmpeg.org/wiki/CompilationGuide/Ubuntu @@ -391,6 +392,8 @@ COPY --from=build /usr/local /usr/local/ # Let's make sure the app built correctly # Convenient to verify on https://hub.docker.com/r/jrottenberg/ffmpeg/builds/ console output ======= +======= +>>>>>>> rewrite the dockerfile generation + vdapu + armv7 + dav1d FROM ubuntu:18.04 AS base RUN apt-get -yqq update && \ @@ -808,4 +811,7 @@ RUN test "base" = "base" && ldconfig /usr/local/lib /usr/local/lib64 # Let's make sure the app built correctly # Convenient to verify on https://hub.docker.com/r/jrottenberg/ffmpeg/builds/ console output +<<<<<<< HEAD +>>>>>>> rewrite the dockerfile generation + vdapu + armv7 + dav1d +======= >>>>>>> rewrite the dockerfile generation + vdapu + armv7 + dav1d diff --git a/docker-images/4.0/alpine,/Dockerfile b/docker-images/4.0/alpine,/Dockerfile new file mode 100644 index 000000000..a0b97723e --- /dev/null +++ b/docker-images/4.0/alpine,/Dockerfile @@ -0,0 +1,14 @@ +usage: update.py [-h] [--enable-libopencore-amr] [--enable-libx264] + [--enable-libx265] [--enable-libogg] [--enable-libopus] + [--enable-libvorbis] [--enable-libtheora] [--enable-libvpx] + [--enable-libmp3lame] [--enable-libxvid] + [--enable-libfdk-aac] [--enable-libopenjpeg] + [--enable-libfreetype] [--enable-libvidstab] + [--enable-libfribidi] [--enable-libfontconfig] + [--enable-libass] [--enable-libkvazaar] [--enable-libaom] + [--enable-vaapi] [--enable-nvenc] [--enable-libdav1d] + [--enable-vdpau] [--enable-all] [--with-bins] [--no-strip] + [--fat | --slim | --scratch] + {alpine,centos,ubuntu,nvidia,armv7} + {snapshot,4.1,4.0,3.4,3.3,3.2,2.8} +update.py: error: argument variant: invalid choice: 'alpine,' (choose from 'alpine', 'centos', 'ubuntu', 'nvidia', 'armv7') diff --git a/docker-images/4.0/centos/Dockerfile b/docker-images/4.0/centos/Dockerfile index 476505f63..aa44d08de 100644 --- a/docker-images/4.0/centos/Dockerfile +++ b/docker-images/4.0/centos/Dockerfile @@ -1,4 +1,5 @@ <<<<<<< HEAD +<<<<<<< HEAD # ffmpeg - http://ffmpeg.org/download.html # # From https://trac.ffmpeg.org/wiki/CompilationGuide/Centos @@ -390,6 +391,8 @@ COPY --from=build /usr/local/ /usr/local/ # Let's make sure the app built correctly # Convenient to verify on https://hub.docker.com/r/jrottenberg/ffmpeg/builds/ console output ======= +======= +>>>>>>> rewrite the dockerfile generation + vdapu + armv7 + dav1d FROM centos:7 as base RUN yum -y install libva libgomp libuuid && \ @@ -864,4 +867,7 @@ RUN test "base" = "base" && ldconfig /usr/local/lib /usr/local/lib64 # Let's make sure the app built correctly # Convenient to verify on https://hub.docker.com/r/jrottenberg/ffmpeg/builds/ console output +<<<<<<< HEAD +>>>>>>> rewrite the dockerfile generation + vdapu + armv7 + dav1d +======= >>>>>>> rewrite the dockerfile generation + vdapu + armv7 + dav1d diff --git a/docker-images/4.0/nvidia,/Dockerfile b/docker-images/4.0/nvidia,/Dockerfile new file mode 100644 index 000000000..452b62c02 --- /dev/null +++ b/docker-images/4.0/nvidia,/Dockerfile @@ -0,0 +1,14 @@ +usage: update.py [-h] [--enable-libopencore-amr] [--enable-libx264] + [--enable-libx265] [--enable-libogg] [--enable-libopus] + [--enable-libvorbis] [--enable-libtheora] [--enable-libvpx] + [--enable-libmp3lame] [--enable-libxvid] + [--enable-libfdk-aac] [--enable-libopenjpeg] + [--enable-libfreetype] [--enable-libvidstab] + [--enable-libfribidi] [--enable-libfontconfig] + [--enable-libass] [--enable-libkvazaar] [--enable-libaom] + [--enable-vaapi] [--enable-nvenc] [--enable-libdav1d] + [--enable-vdpau] [--enable-all] [--with-bins] [--no-strip] + [--fat | --slim | --scratch] + {alpine,centos,ubuntu,nvidia,armv7} + {snapshot,4.1,4.0,3.4,3.3,3.2,2.8} +update.py: error: argument variant: invalid choice: 'nvidia,' (choose from 'alpine', 'centos', 'ubuntu', 'nvidia', 'armv7') diff --git a/docker-images/4.0/ubuntu/Dockerfile b/docker-images/4.0/ubuntu/Dockerfile index 4b1684c49..2511001aa 100644 --- a/docker-images/4.0/ubuntu/Dockerfile +++ b/docker-images/4.0/ubuntu/Dockerfile @@ -1,4 +1,5 @@ <<<<<<< HEAD +<<<<<<< HEAD # ffmpeg - http://ffmpeg.org/download.html # # From https://trac.ffmpeg.org/wiki/CompilationGuide/Ubuntu @@ -391,6 +392,8 @@ COPY --from=build /usr/local /usr/local/ # Let's make sure the app built correctly # Convenient to verify on https://hub.docker.com/r/jrottenberg/ffmpeg/builds/ console output ======= +======= +>>>>>>> rewrite the dockerfile generation + vdapu + armv7 + dav1d FROM ubuntu:18.04 AS base RUN apt-get -yqq update && \ @@ -822,4 +825,7 @@ RUN test "base" = "base" && ldconfig /usr/local/lib /usr/local/lib64 # Let's make sure the app built correctly # Convenient to verify on https://hub.docker.com/r/jrottenberg/ffmpeg/builds/ console output +<<<<<<< HEAD +>>>>>>> rewrite the dockerfile generation + vdapu + armv7 + dav1d +======= >>>>>>> rewrite the dockerfile generation + vdapu + armv7 + dav1d diff --git a/docker-images/4.1/alpine,/Dockerfile b/docker-images/4.1/alpine,/Dockerfile new file mode 100644 index 000000000..a0b97723e --- /dev/null +++ b/docker-images/4.1/alpine,/Dockerfile @@ -0,0 +1,14 @@ +usage: update.py [-h] [--enable-libopencore-amr] [--enable-libx264] + [--enable-libx265] [--enable-libogg] [--enable-libopus] + [--enable-libvorbis] [--enable-libtheora] [--enable-libvpx] + [--enable-libmp3lame] [--enable-libxvid] + [--enable-libfdk-aac] [--enable-libopenjpeg] + [--enable-libfreetype] [--enable-libvidstab] + [--enable-libfribidi] [--enable-libfontconfig] + [--enable-libass] [--enable-libkvazaar] [--enable-libaom] + [--enable-vaapi] [--enable-nvenc] [--enable-libdav1d] + [--enable-vdpau] [--enable-all] [--with-bins] [--no-strip] + [--fat | --slim | --scratch] + {alpine,centos,ubuntu,nvidia,armv7} + {snapshot,4.1,4.0,3.4,3.3,3.2,2.8} +update.py: error: argument variant: invalid choice: 'alpine,' (choose from 'alpine', 'centos', 'ubuntu', 'nvidia', 'armv7') diff --git a/docker-images/4.1/centos/Dockerfile b/docker-images/4.1/centos/Dockerfile index ca7b8227b..f8d85c401 100644 --- a/docker-images/4.1/centos/Dockerfile +++ b/docker-images/4.1/centos/Dockerfile @@ -1,4 +1,5 @@ <<<<<<< HEAD +<<<<<<< HEAD # ffmpeg - http://ffmpeg.org/download.html # # From https://trac.ffmpeg.org/wiki/CompilationGuide/Centos @@ -390,6 +391,8 @@ COPY --from=build /usr/local/ /usr/local/ # Let's make sure the app built correctly # Convenient to verify on https://hub.docker.com/r/jrottenberg/ffmpeg/builds/ console output ======= +======= +>>>>>>> rewrite the dockerfile generation + vdapu + armv7 + dav1d FROM centos:7 as base RUN yum -y install libvdpau libva libgomp libuuid && \ @@ -866,4 +869,7 @@ RUN test "base" = "base" && ldconfig /usr/local/lib /usr/local/lib64 # Let's make sure the app built correctly # Convenient to verify on https://hub.docker.com/r/jrottenberg/ffmpeg/builds/ console output +<<<<<<< HEAD +>>>>>>> rewrite the dockerfile generation + vdapu + armv7 + dav1d +======= >>>>>>> rewrite the dockerfile generation + vdapu + armv7 + dav1d diff --git a/docker-images/4.1/nvidia,/Dockerfile b/docker-images/4.1/nvidia,/Dockerfile new file mode 100644 index 000000000..452b62c02 --- /dev/null +++ b/docker-images/4.1/nvidia,/Dockerfile @@ -0,0 +1,14 @@ +usage: update.py [-h] [--enable-libopencore-amr] [--enable-libx264] + [--enable-libx265] [--enable-libogg] [--enable-libopus] + [--enable-libvorbis] [--enable-libtheora] [--enable-libvpx] + [--enable-libmp3lame] [--enable-libxvid] + [--enable-libfdk-aac] [--enable-libopenjpeg] + [--enable-libfreetype] [--enable-libvidstab] + [--enable-libfribidi] [--enable-libfontconfig] + [--enable-libass] [--enable-libkvazaar] [--enable-libaom] + [--enable-vaapi] [--enable-nvenc] [--enable-libdav1d] + [--enable-vdpau] [--enable-all] [--with-bins] [--no-strip] + [--fat | --slim | --scratch] + {alpine,centos,ubuntu,nvidia,armv7} + {snapshot,4.1,4.0,3.4,3.3,3.2,2.8} +update.py: error: argument variant: invalid choice: 'nvidia,' (choose from 'alpine', 'centos', 'ubuntu', 'nvidia', 'armv7') diff --git a/docker-images/4.1/ubuntu/Dockerfile b/docker-images/4.1/ubuntu/Dockerfile index 263b86b5b..c8ecfe3f5 100644 --- a/docker-images/4.1/ubuntu/Dockerfile +++ b/docker-images/4.1/ubuntu/Dockerfile @@ -1,4 +1,5 @@ <<<<<<< HEAD +<<<<<<< HEAD # ffmpeg - http://ffmpeg.org/download.html # # From https://trac.ffmpeg.org/wiki/CompilationGuide/Ubuntu @@ -391,6 +392,8 @@ COPY --from=build /usr/local /usr/local/ # Let's make sure the app built correctly # Convenient to verify on https://hub.docker.com/r/jrottenberg/ffmpeg/builds/ console output ======= +======= +>>>>>>> rewrite the dockerfile generation + vdapu + armv7 + dav1d FROM ubuntu:18.04 AS base RUN apt-get -yqq update && \ @@ -824,4 +827,7 @@ RUN test "base" = "base" && ldconfig /usr/local/lib /usr/local/lib64 # Let's make sure the app built correctly # Convenient to verify on https://hub.docker.com/r/jrottenberg/ffmpeg/builds/ console output +<<<<<<< HEAD +>>>>>>> rewrite the dockerfile generation + vdapu + armv7 + dav1d +======= >>>>>>> rewrite the dockerfile generation + vdapu + armv7 + dav1d diff --git a/docker-images/snapshot/alpine,/Dockerfile b/docker-images/snapshot/alpine,/Dockerfile new file mode 100644 index 000000000..a0b97723e --- /dev/null +++ b/docker-images/snapshot/alpine,/Dockerfile @@ -0,0 +1,14 @@ +usage: update.py [-h] [--enable-libopencore-amr] [--enable-libx264] + [--enable-libx265] [--enable-libogg] [--enable-libopus] + [--enable-libvorbis] [--enable-libtheora] [--enable-libvpx] + [--enable-libmp3lame] [--enable-libxvid] + [--enable-libfdk-aac] [--enable-libopenjpeg] + [--enable-libfreetype] [--enable-libvidstab] + [--enable-libfribidi] [--enable-libfontconfig] + [--enable-libass] [--enable-libkvazaar] [--enable-libaom] + [--enable-vaapi] [--enable-nvenc] [--enable-libdav1d] + [--enable-vdpau] [--enable-all] [--with-bins] [--no-strip] + [--fat | --slim | --scratch] + {alpine,centos,ubuntu,nvidia,armv7} + {snapshot,4.1,4.0,3.4,3.3,3.2,2.8} +update.py: error: argument variant: invalid choice: 'alpine,' (choose from 'alpine', 'centos', 'ubuntu', 'nvidia', 'armv7') diff --git a/docker-images/snapshot/centos/Dockerfile b/docker-images/snapshot/centos/Dockerfile index c67313f7a..7c2af0160 100644 --- a/docker-images/snapshot/centos/Dockerfile +++ b/docker-images/snapshot/centos/Dockerfile @@ -1,4 +1,5 @@ <<<<<<< HEAD +<<<<<<< HEAD # ffmpeg - http://ffmpeg.org/download.html # # From https://trac.ffmpeg.org/wiki/CompilationGuide/Centos @@ -390,6 +391,8 @@ COPY --from=build /usr/local/ /usr/local/ # Let's make sure the app built correctly # Convenient to verify on https://hub.docker.com/r/jrottenberg/ffmpeg/builds/ console output ======= +======= +>>>>>>> rewrite the dockerfile generation + vdapu + armv7 + dav1d FROM centos:7 as base RUN yum -y install libva libgomp libuuid && \ @@ -876,4 +879,7 @@ RUN test "base" = "base" && ldconfig /usr/local/lib /usr/local/lib64 # Let's make sure the app built correctly # Convenient to verify on https://hub.docker.com/r/jrottenberg/ffmpeg/builds/ console output +<<<<<<< HEAD +>>>>>>> rewrite the dockerfile generation + vdapu + armv7 + dav1d +======= >>>>>>> rewrite the dockerfile generation + vdapu + armv7 + dav1d diff --git a/docker-images/snapshot/nvidia,/Dockerfile b/docker-images/snapshot/nvidia,/Dockerfile new file mode 100644 index 000000000..452b62c02 --- /dev/null +++ b/docker-images/snapshot/nvidia,/Dockerfile @@ -0,0 +1,14 @@ +usage: update.py [-h] [--enable-libopencore-amr] [--enable-libx264] + [--enable-libx265] [--enable-libogg] [--enable-libopus] + [--enable-libvorbis] [--enable-libtheora] [--enable-libvpx] + [--enable-libmp3lame] [--enable-libxvid] + [--enable-libfdk-aac] [--enable-libopenjpeg] + [--enable-libfreetype] [--enable-libvidstab] + [--enable-libfribidi] [--enable-libfontconfig] + [--enable-libass] [--enable-libkvazaar] [--enable-libaom] + [--enable-vaapi] [--enable-nvenc] [--enable-libdav1d] + [--enable-vdpau] [--enable-all] [--with-bins] [--no-strip] + [--fat | --slim | --scratch] + {alpine,centos,ubuntu,nvidia,armv7} + {snapshot,4.1,4.0,3.4,3.3,3.2,2.8} +update.py: error: argument variant: invalid choice: 'nvidia,' (choose from 'alpine', 'centos', 'ubuntu', 'nvidia', 'armv7') diff --git a/docker-images/snapshot/ubuntu/Dockerfile b/docker-images/snapshot/ubuntu/Dockerfile index f5b129474..ebf591472 100644 --- a/docker-images/snapshot/ubuntu/Dockerfile +++ b/docker-images/snapshot/ubuntu/Dockerfile @@ -1,4 +1,5 @@ <<<<<<< HEAD +<<<<<<< HEAD # ffmpeg - http://ffmpeg.org/download.html # # From https://trac.ffmpeg.org/wiki/CompilationGuide/Ubuntu @@ -391,6 +392,8 @@ COPY --from=build /usr/local /usr/local/ # Let's make sure the app built correctly # Convenient to verify on https://hub.docker.com/r/jrottenberg/ffmpeg/builds/ console output ======= +======= +>>>>>>> rewrite the dockerfile generation + vdapu + armv7 + dav1d FROM ubuntu:18.04 AS base RUN apt-get -yqq update && \ @@ -834,4 +837,7 @@ RUN test "base" = "base" && ldconfig /usr/local/lib /usr/local/lib64 # Let's make sure the app built correctly # Convenient to verify on https://hub.docker.com/r/jrottenberg/ffmpeg/builds/ console output +<<<<<<< HEAD +>>>>>>> rewrite the dockerfile generation + vdapu + armv7 + dav1d +======= >>>>>>> rewrite the dockerfile generation + vdapu + armv7 + dav1d diff --git a/docker_gen.sh b/docker_gen.sh index 991fb8eca..02ef8b385 100644 --- a/docker_gen.sh +++ b/docker_gen.sh @@ -1,10 +1,18 @@ #! /bin/sh +<<<<<<< HEAD variants=("ubuntu" "centos" "alpine" "nvidia" "arm32v7") versions=("2.8" "3.2" "3.3" "3.4" "4.0" "4.1" "snapshot") for variant in ${variants[*]}; do for version in ${versions[*]}; do +======= +variants=("ubuntu" "centos" "alpine", "nvidia", "arm32v7") +versions=("2.8" "3.2" "3.3" "3.4" "4.0" "4.1" "snapshot") + +for variant in ${variants[*]}; do + for version in ${versions[*]}; do +>>>>>>> rewrite the dockerfile generation + vdapu + armv7 + dav1d echo "${variant}: ffmpeg-${version}" dir="docker-images/${version}/${variant}" mkdir -p ${dir} @@ -13,7 +21,11 @@ for variant in ${variants[*]}; do done scratch_variant="alpine" +<<<<<<< HEAD for version in ${versions[*]}; do +======= +for version in ${versions[*]}; do +>>>>>>> rewrite the dockerfile generation + vdapu + armv7 + dav1d dir="docker-images/${version}/${variant}" mkdir -p ${dir} python3 update.py --scratch --enable-all ${scratch_variant} ${version} > ${dir}/Dockerfile @@ -25,4 +37,8 @@ sed -ri\ -e 's/alpine:[[:digit:]]+.[[:digit:]]+/alpine:3.8/' \ -e 's/libssl1.[[:digit:]]/libssl1.0/' \ -e 's/libcrypto1.[[:digit:]]/libcrypto1.0/' \ +<<<<<<< HEAD + docker-images/2.8/alpine/Dockerfile +======= docker-images/2.8/alpine/Dockerfile +>>>>>>> rewrite the dockerfile generation + vdapu + armv7 + dav1d From 1847a96a42e5ef9e9c03845224b0eef0aabbc09d Mon Sep 17 00:00:00 2001 From: GnaphronG Date: Tue, 18 Jun 2019 08:38:42 -0700 Subject: [PATCH 28/29] fix extra comma --- docker-images/2.8/alpine,/Dockerfile | 14 -------------- docker-images/2.8/alpine/Dockerfile | 6 ++++++ docker-images/2.8/nvidia,/Dockerfile | 14 -------------- docker-images/2.8/nvidia/Dockerfile | 6 ++++++ docker-images/3.2/alpine,/Dockerfile | 14 -------------- docker-images/3.2/alpine/Dockerfile | 6 ++++++ docker-images/3.2/nvidia,/Dockerfile | 14 -------------- docker-images/3.2/nvidia/Dockerfile | 6 ++++++ docker-images/3.3/alpine,/Dockerfile | 14 -------------- docker-images/3.3/alpine/Dockerfile | 6 ++++++ docker-images/3.3/nvidia,/Dockerfile | 14 -------------- docker-images/3.3/nvidia/Dockerfile | 6 ++++++ docker-images/3.4/alpine,/Dockerfile | 14 -------------- docker-images/3.4/alpine/Dockerfile | 6 ++++++ docker-images/3.4/nvidia,/Dockerfile | 14 -------------- docker-images/3.4/nvidia/Dockerfile | 6 ++++++ docker-images/4.0/alpine,/Dockerfile | 14 -------------- docker-images/4.0/alpine/Dockerfile | 6 ++++++ docker-images/4.0/nvidia,/Dockerfile | 14 -------------- docker-images/4.0/nvidia/Dockerfile | 6 ++++++ docker-images/4.1/alpine,/Dockerfile | 14 -------------- docker-images/4.1/alpine/Dockerfile | 6 ++++++ docker-images/4.1/nvidia,/Dockerfile | 14 -------------- docker-images/4.1/nvidia/Dockerfile | 6 ++++++ docker-images/snapshot/alpine,/Dockerfile | 14 -------------- docker-images/snapshot/alpine/Dockerfile | 6 ++++++ docker-images/snapshot/nvidia,/Dockerfile | 14 -------------- docker-images/snapshot/nvidia/Dockerfile | 6 ++++++ docker_gen.sh | 16 ++++++++++++++++ update.py | 6 ++++++ 30 files changed, 106 insertions(+), 196 deletions(-) delete mode 100644 docker-images/2.8/alpine,/Dockerfile delete mode 100644 docker-images/2.8/nvidia,/Dockerfile delete mode 100644 docker-images/3.2/alpine,/Dockerfile delete mode 100644 docker-images/3.2/nvidia,/Dockerfile delete mode 100644 docker-images/3.3/alpine,/Dockerfile delete mode 100644 docker-images/3.3/nvidia,/Dockerfile delete mode 100644 docker-images/3.4/alpine,/Dockerfile delete mode 100644 docker-images/3.4/nvidia,/Dockerfile delete mode 100644 docker-images/4.0/alpine,/Dockerfile delete mode 100644 docker-images/4.0/nvidia,/Dockerfile delete mode 100644 docker-images/4.1/alpine,/Dockerfile delete mode 100644 docker-images/4.1/nvidia,/Dockerfile delete mode 100644 docker-images/snapshot/alpine,/Dockerfile delete mode 100644 docker-images/snapshot/nvidia,/Dockerfile diff --git a/docker-images/2.8/alpine,/Dockerfile b/docker-images/2.8/alpine,/Dockerfile deleted file mode 100644 index a0b97723e..000000000 --- a/docker-images/2.8/alpine,/Dockerfile +++ /dev/null @@ -1,14 +0,0 @@ -usage: update.py [-h] [--enable-libopencore-amr] [--enable-libx264] - [--enable-libx265] [--enable-libogg] [--enable-libopus] - [--enable-libvorbis] [--enable-libtheora] [--enable-libvpx] - [--enable-libmp3lame] [--enable-libxvid] - [--enable-libfdk-aac] [--enable-libopenjpeg] - [--enable-libfreetype] [--enable-libvidstab] - [--enable-libfribidi] [--enable-libfontconfig] - [--enable-libass] [--enable-libkvazaar] [--enable-libaom] - [--enable-vaapi] [--enable-nvenc] [--enable-libdav1d] - [--enable-vdpau] [--enable-all] [--with-bins] [--no-strip] - [--fat | --slim | --scratch] - {alpine,centos,ubuntu,nvidia,armv7} - {snapshot,4.1,4.0,3.4,3.3,3.2,2.8} -update.py: error: argument variant: invalid choice: 'alpine,' (choose from 'alpine', 'centos', 'ubuntu', 'nvidia', 'armv7') diff --git a/docker-images/2.8/alpine/Dockerfile b/docker-images/2.8/alpine/Dockerfile index 94373f37d..92971e830 100644 --- a/docker-images/2.8/alpine/Dockerfile +++ b/docker-images/2.8/alpine/Dockerfile @@ -1,4 +1,5 @@ <<<<<<< HEAD +<<<<<<< HEAD # ffmpeg - http://ffmpeg.org/download.html # # https://hub.docker.com/r/jrottenberg/ffmpeg/ @@ -390,6 +391,8 @@ COPY --from=build /usr/local /usr/local # Let's make sure the app built correctly # Convenient to verify on https://hub.docker.com/r/jrottenberg/ffmpeg/builds/ console output ======= +======= +>>>>>>> fix extra comma FROM alpine:3.8 as base RUN apk add --no-cache --update libva \ @@ -813,4 +816,7 @@ RUN test "base" = "base" && ldconfig /usr/local/lib /usr/local/lib64 # Let's make sure the app built correctly # Convenient to verify on https://hub.docker.com/r/jrottenberg/ffmpeg/builds/ console output +<<<<<<< HEAD +>>>>>>> fix extra comma +======= >>>>>>> fix extra comma diff --git a/docker-images/2.8/nvidia,/Dockerfile b/docker-images/2.8/nvidia,/Dockerfile deleted file mode 100644 index 452b62c02..000000000 --- a/docker-images/2.8/nvidia,/Dockerfile +++ /dev/null @@ -1,14 +0,0 @@ -usage: update.py [-h] [--enable-libopencore-amr] [--enable-libx264] - [--enable-libx265] [--enable-libogg] [--enable-libopus] - [--enable-libvorbis] [--enable-libtheora] [--enable-libvpx] - [--enable-libmp3lame] [--enable-libxvid] - [--enable-libfdk-aac] [--enable-libopenjpeg] - [--enable-libfreetype] [--enable-libvidstab] - [--enable-libfribidi] [--enable-libfontconfig] - [--enable-libass] [--enable-libkvazaar] [--enable-libaom] - [--enable-vaapi] [--enable-nvenc] [--enable-libdav1d] - [--enable-vdpau] [--enable-all] [--with-bins] [--no-strip] - [--fat | --slim | --scratch] - {alpine,centos,ubuntu,nvidia,armv7} - {snapshot,4.1,4.0,3.4,3.3,3.2,2.8} -update.py: error: argument variant: invalid choice: 'nvidia,' (choose from 'alpine', 'centos', 'ubuntu', 'nvidia', 'armv7') diff --git a/docker-images/2.8/nvidia/Dockerfile b/docker-images/2.8/nvidia/Dockerfile index 6de22f3da..cb7e928d3 100644 --- a/docker-images/2.8/nvidia/Dockerfile +++ b/docker-images/2.8/nvidia/Dockerfile @@ -1,4 +1,5 @@ <<<<<<< HEAD +<<<<<<< HEAD # ffmpeg - http://ffmpeg.org/download.html # # From https://trac.ffmpeg.org/wiki/CompilationGuide/Ubuntu @@ -422,6 +423,8 @@ COPY --from=build /usr/local/lib /usr/local/lib/ # Convenient to verify on https://hub.docker.com/r/jrottenberg/ffmpeg/builds/ console output ======= +======= +>>>>>>> fix extra comma FROM nvidia/cuda:10.1-runtime-ubuntu18.04 AS base ENV NVIDIA_DRIVER_CAPABILITIES=video @@ -839,4 +842,7 @@ RUN test "base" = "base" && ldconfig /usr/local/lib /usr/local/lib64 # Let's make sure the app built correctly # Convenient to verify on https://hub.docker.com/r/jrottenberg/ffmpeg/builds/ console output +<<<<<<< HEAD +>>>>>>> fix extra comma +======= >>>>>>> fix extra comma diff --git a/docker-images/3.2/alpine,/Dockerfile b/docker-images/3.2/alpine,/Dockerfile deleted file mode 100644 index a0b97723e..000000000 --- a/docker-images/3.2/alpine,/Dockerfile +++ /dev/null @@ -1,14 +0,0 @@ -usage: update.py [-h] [--enable-libopencore-amr] [--enable-libx264] - [--enable-libx265] [--enable-libogg] [--enable-libopus] - [--enable-libvorbis] [--enable-libtheora] [--enable-libvpx] - [--enable-libmp3lame] [--enable-libxvid] - [--enable-libfdk-aac] [--enable-libopenjpeg] - [--enable-libfreetype] [--enable-libvidstab] - [--enable-libfribidi] [--enable-libfontconfig] - [--enable-libass] [--enable-libkvazaar] [--enable-libaom] - [--enable-vaapi] [--enable-nvenc] [--enable-libdav1d] - [--enable-vdpau] [--enable-all] [--with-bins] [--no-strip] - [--fat | --slim | --scratch] - {alpine,centos,ubuntu,nvidia,armv7} - {snapshot,4.1,4.0,3.4,3.3,3.2,2.8} -update.py: error: argument variant: invalid choice: 'alpine,' (choose from 'alpine', 'centos', 'ubuntu', 'nvidia', 'armv7') diff --git a/docker-images/3.2/alpine/Dockerfile b/docker-images/3.2/alpine/Dockerfile index 2da25d07b..fe9c86121 100644 --- a/docker-images/3.2/alpine/Dockerfile +++ b/docker-images/3.2/alpine/Dockerfile @@ -1,4 +1,5 @@ <<<<<<< HEAD +<<<<<<< HEAD # ffmpeg - http://ffmpeg.org/download.html # # https://hub.docker.com/r/jrottenberg/ffmpeg/ @@ -398,6 +399,8 @@ COPY --from=build /usr/local /usr/local # Let's make sure the app built correctly # Convenient to verify on https://hub.docker.com/r/jrottenberg/ffmpeg/builds/ console output ======= +======= +>>>>>>> fix extra comma FROM alpine:3.9 as base RUN apk add --no-cache --update libva \ @@ -821,4 +824,7 @@ RUN test "base" = "base" && ldconfig /usr/local/lib /usr/local/lib64 # Let's make sure the app built correctly # Convenient to verify on https://hub.docker.com/r/jrottenberg/ffmpeg/builds/ console output +<<<<<<< HEAD +>>>>>>> fix extra comma +======= >>>>>>> fix extra comma diff --git a/docker-images/3.2/nvidia,/Dockerfile b/docker-images/3.2/nvidia,/Dockerfile deleted file mode 100644 index 452b62c02..000000000 --- a/docker-images/3.2/nvidia,/Dockerfile +++ /dev/null @@ -1,14 +0,0 @@ -usage: update.py [-h] [--enable-libopencore-amr] [--enable-libx264] - [--enable-libx265] [--enable-libogg] [--enable-libopus] - [--enable-libvorbis] [--enable-libtheora] [--enable-libvpx] - [--enable-libmp3lame] [--enable-libxvid] - [--enable-libfdk-aac] [--enable-libopenjpeg] - [--enable-libfreetype] [--enable-libvidstab] - [--enable-libfribidi] [--enable-libfontconfig] - [--enable-libass] [--enable-libkvazaar] [--enable-libaom] - [--enable-vaapi] [--enable-nvenc] [--enable-libdav1d] - [--enable-vdpau] [--enable-all] [--with-bins] [--no-strip] - [--fat | --slim | --scratch] - {alpine,centos,ubuntu,nvidia,armv7} - {snapshot,4.1,4.0,3.4,3.3,3.2,2.8} -update.py: error: argument variant: invalid choice: 'nvidia,' (choose from 'alpine', 'centos', 'ubuntu', 'nvidia', 'armv7') diff --git a/docker-images/3.2/nvidia/Dockerfile b/docker-images/3.2/nvidia/Dockerfile index 112311902..f2c5b1fe4 100644 --- a/docker-images/3.2/nvidia/Dockerfile +++ b/docker-images/3.2/nvidia/Dockerfile @@ -1,4 +1,5 @@ <<<<<<< HEAD +<<<<<<< HEAD # ffmpeg - http://ffmpeg.org/download.html # # From https://trac.ffmpeg.org/wiki/CompilationGuide/Ubuntu @@ -430,6 +431,8 @@ COPY --from=build /usr/local/lib /usr/local/lib/ # Convenient to verify on https://hub.docker.com/r/jrottenberg/ffmpeg/builds/ console output ======= +======= +>>>>>>> fix extra comma FROM nvidia/cuda:10.1-runtime-ubuntu18.04 AS base ENV NVIDIA_DRIVER_CAPABILITIES=video @@ -847,4 +850,7 @@ RUN test "base" = "base" && ldconfig /usr/local/lib /usr/local/lib64 # Let's make sure the app built correctly # Convenient to verify on https://hub.docker.com/r/jrottenberg/ffmpeg/builds/ console output +<<<<<<< HEAD +>>>>>>> fix extra comma +======= >>>>>>> fix extra comma diff --git a/docker-images/3.3/alpine,/Dockerfile b/docker-images/3.3/alpine,/Dockerfile deleted file mode 100644 index a0b97723e..000000000 --- a/docker-images/3.3/alpine,/Dockerfile +++ /dev/null @@ -1,14 +0,0 @@ -usage: update.py [-h] [--enable-libopencore-amr] [--enable-libx264] - [--enable-libx265] [--enable-libogg] [--enable-libopus] - [--enable-libvorbis] [--enable-libtheora] [--enable-libvpx] - [--enable-libmp3lame] [--enable-libxvid] - [--enable-libfdk-aac] [--enable-libopenjpeg] - [--enable-libfreetype] [--enable-libvidstab] - [--enable-libfribidi] [--enable-libfontconfig] - [--enable-libass] [--enable-libkvazaar] [--enable-libaom] - [--enable-vaapi] [--enable-nvenc] [--enable-libdav1d] - [--enable-vdpau] [--enable-all] [--with-bins] [--no-strip] - [--fat | --slim | --scratch] - {alpine,centos,ubuntu,nvidia,armv7} - {snapshot,4.1,4.0,3.4,3.3,3.2,2.8} -update.py: error: argument variant: invalid choice: 'alpine,' (choose from 'alpine', 'centos', 'ubuntu', 'nvidia', 'armv7') diff --git a/docker-images/3.3/alpine/Dockerfile b/docker-images/3.3/alpine/Dockerfile index e4b912630..50086bbcf 100644 --- a/docker-images/3.3/alpine/Dockerfile +++ b/docker-images/3.3/alpine/Dockerfile @@ -1,4 +1,5 @@ <<<<<<< HEAD +<<<<<<< HEAD # ffmpeg - http://ffmpeg.org/download.html # # https://hub.docker.com/r/jrottenberg/ffmpeg/ @@ -390,6 +391,8 @@ COPY --from=build /usr/local /usr/local # Let's make sure the app built correctly # Convenient to verify on https://hub.docker.com/r/jrottenberg/ffmpeg/builds/ console output ======= +======= +>>>>>>> fix extra comma FROM alpine:3.9 as base RUN apk add --no-cache --update libva \ @@ -814,4 +817,7 @@ RUN test "base" = "base" && ldconfig /usr/local/lib /usr/local/lib64 # Let's make sure the app built correctly # Convenient to verify on https://hub.docker.com/r/jrottenberg/ffmpeg/builds/ console output +<<<<<<< HEAD +>>>>>>> fix extra comma +======= >>>>>>> fix extra comma diff --git a/docker-images/3.3/nvidia,/Dockerfile b/docker-images/3.3/nvidia,/Dockerfile deleted file mode 100644 index 452b62c02..000000000 --- a/docker-images/3.3/nvidia,/Dockerfile +++ /dev/null @@ -1,14 +0,0 @@ -usage: update.py [-h] [--enable-libopencore-amr] [--enable-libx264] - [--enable-libx265] [--enable-libogg] [--enable-libopus] - [--enable-libvorbis] [--enable-libtheora] [--enable-libvpx] - [--enable-libmp3lame] [--enable-libxvid] - [--enable-libfdk-aac] [--enable-libopenjpeg] - [--enable-libfreetype] [--enable-libvidstab] - [--enable-libfribidi] [--enable-libfontconfig] - [--enable-libass] [--enable-libkvazaar] [--enable-libaom] - [--enable-vaapi] [--enable-nvenc] [--enable-libdav1d] - [--enable-vdpau] [--enable-all] [--with-bins] [--no-strip] - [--fat | --slim | --scratch] - {alpine,centos,ubuntu,nvidia,armv7} - {snapshot,4.1,4.0,3.4,3.3,3.2,2.8} -update.py: error: argument variant: invalid choice: 'nvidia,' (choose from 'alpine', 'centos', 'ubuntu', 'nvidia', 'armv7') diff --git a/docker-images/3.3/nvidia/Dockerfile b/docker-images/3.3/nvidia/Dockerfile index b3846e25f..6762145d5 100644 --- a/docker-images/3.3/nvidia/Dockerfile +++ b/docker-images/3.3/nvidia/Dockerfile @@ -1,4 +1,5 @@ <<<<<<< HEAD +<<<<<<< HEAD # ffmpeg - http://ffmpeg.org/download.html # # From https://trac.ffmpeg.org/wiki/CompilationGuide/Ubuntu @@ -422,6 +423,8 @@ COPY --from=build /usr/local/lib /usr/local/lib/ # Convenient to verify on https://hub.docker.com/r/jrottenberg/ffmpeg/builds/ console output ======= +======= +>>>>>>> fix extra comma FROM nvidia/cuda:10.1-runtime-ubuntu18.04 AS base ENV NVIDIA_DRIVER_CAPABILITIES=video @@ -840,4 +843,7 @@ RUN test "base" = "base" && ldconfig /usr/local/lib /usr/local/lib64 # Let's make sure the app built correctly # Convenient to verify on https://hub.docker.com/r/jrottenberg/ffmpeg/builds/ console output +<<<<<<< HEAD +>>>>>>> fix extra comma +======= >>>>>>> fix extra comma diff --git a/docker-images/3.4/alpine,/Dockerfile b/docker-images/3.4/alpine,/Dockerfile deleted file mode 100644 index a0b97723e..000000000 --- a/docker-images/3.4/alpine,/Dockerfile +++ /dev/null @@ -1,14 +0,0 @@ -usage: update.py [-h] [--enable-libopencore-amr] [--enable-libx264] - [--enable-libx265] [--enable-libogg] [--enable-libopus] - [--enable-libvorbis] [--enable-libtheora] [--enable-libvpx] - [--enable-libmp3lame] [--enable-libxvid] - [--enable-libfdk-aac] [--enable-libopenjpeg] - [--enable-libfreetype] [--enable-libvidstab] - [--enable-libfribidi] [--enable-libfontconfig] - [--enable-libass] [--enable-libkvazaar] [--enable-libaom] - [--enable-vaapi] [--enable-nvenc] [--enable-libdav1d] - [--enable-vdpau] [--enable-all] [--with-bins] [--no-strip] - [--fat | --slim | --scratch] - {alpine,centos,ubuntu,nvidia,armv7} - {snapshot,4.1,4.0,3.4,3.3,3.2,2.8} -update.py: error: argument variant: invalid choice: 'alpine,' (choose from 'alpine', 'centos', 'ubuntu', 'nvidia', 'armv7') diff --git a/docker-images/3.4/alpine/Dockerfile b/docker-images/3.4/alpine/Dockerfile index bad7171df..1f09a55d4 100644 --- a/docker-images/3.4/alpine/Dockerfile +++ b/docker-images/3.4/alpine/Dockerfile @@ -1,4 +1,5 @@ <<<<<<< HEAD +<<<<<<< HEAD # ffmpeg - http://ffmpeg.org/download.html # # https://hub.docker.com/r/jrottenberg/ffmpeg/ @@ -390,6 +391,8 @@ COPY --from=build /usr/local /usr/local # Let's make sure the app built correctly # Convenient to verify on https://hub.docker.com/r/jrottenberg/ffmpeg/builds/ console output ======= +======= +>>>>>>> fix extra comma FROM alpine:3.9 as base RUN apk add --no-cache --update libva \ @@ -814,4 +817,7 @@ RUN test "base" = "base" && ldconfig /usr/local/lib /usr/local/lib64 # Let's make sure the app built correctly # Convenient to verify on https://hub.docker.com/r/jrottenberg/ffmpeg/builds/ console output +<<<<<<< HEAD +>>>>>>> fix extra comma +======= >>>>>>> fix extra comma diff --git a/docker-images/3.4/nvidia,/Dockerfile b/docker-images/3.4/nvidia,/Dockerfile deleted file mode 100644 index 452b62c02..000000000 --- a/docker-images/3.4/nvidia,/Dockerfile +++ /dev/null @@ -1,14 +0,0 @@ -usage: update.py [-h] [--enable-libopencore-amr] [--enable-libx264] - [--enable-libx265] [--enable-libogg] [--enable-libopus] - [--enable-libvorbis] [--enable-libtheora] [--enable-libvpx] - [--enable-libmp3lame] [--enable-libxvid] - [--enable-libfdk-aac] [--enable-libopenjpeg] - [--enable-libfreetype] [--enable-libvidstab] - [--enable-libfribidi] [--enable-libfontconfig] - [--enable-libass] [--enable-libkvazaar] [--enable-libaom] - [--enable-vaapi] [--enable-nvenc] [--enable-libdav1d] - [--enable-vdpau] [--enable-all] [--with-bins] [--no-strip] - [--fat | --slim | --scratch] - {alpine,centos,ubuntu,nvidia,armv7} - {snapshot,4.1,4.0,3.4,3.3,3.2,2.8} -update.py: error: argument variant: invalid choice: 'nvidia,' (choose from 'alpine', 'centos', 'ubuntu', 'nvidia', 'armv7') diff --git a/docker-images/3.4/nvidia/Dockerfile b/docker-images/3.4/nvidia/Dockerfile index 79334da46..ba457aed5 100644 --- a/docker-images/3.4/nvidia/Dockerfile +++ b/docker-images/3.4/nvidia/Dockerfile @@ -1,4 +1,5 @@ <<<<<<< HEAD +<<<<<<< HEAD # ffmpeg - http://ffmpeg.org/download.html # # From https://trac.ffmpeg.org/wiki/CompilationGuide/Ubuntu @@ -422,6 +423,8 @@ COPY --from=build /usr/local/lib /usr/local/lib/ # Convenient to verify on https://hub.docker.com/r/jrottenberg/ffmpeg/builds/ console output ======= +======= +>>>>>>> fix extra comma FROM nvidia/cuda:10.1-runtime-ubuntu18.04 AS base ENV NVIDIA_DRIVER_CAPABILITIES=video @@ -840,4 +843,7 @@ RUN test "base" = "base" && ldconfig /usr/local/lib /usr/local/lib64 # Let's make sure the app built correctly # Convenient to verify on https://hub.docker.com/r/jrottenberg/ffmpeg/builds/ console output +<<<<<<< HEAD +>>>>>>> fix extra comma +======= >>>>>>> fix extra comma diff --git a/docker-images/4.0/alpine,/Dockerfile b/docker-images/4.0/alpine,/Dockerfile deleted file mode 100644 index a0b97723e..000000000 --- a/docker-images/4.0/alpine,/Dockerfile +++ /dev/null @@ -1,14 +0,0 @@ -usage: update.py [-h] [--enable-libopencore-amr] [--enable-libx264] - [--enable-libx265] [--enable-libogg] [--enable-libopus] - [--enable-libvorbis] [--enable-libtheora] [--enable-libvpx] - [--enable-libmp3lame] [--enable-libxvid] - [--enable-libfdk-aac] [--enable-libopenjpeg] - [--enable-libfreetype] [--enable-libvidstab] - [--enable-libfribidi] [--enable-libfontconfig] - [--enable-libass] [--enable-libkvazaar] [--enable-libaom] - [--enable-vaapi] [--enable-nvenc] [--enable-libdav1d] - [--enable-vdpau] [--enable-all] [--with-bins] [--no-strip] - [--fat | --slim | --scratch] - {alpine,centos,ubuntu,nvidia,armv7} - {snapshot,4.1,4.0,3.4,3.3,3.2,2.8} -update.py: error: argument variant: invalid choice: 'alpine,' (choose from 'alpine', 'centos', 'ubuntu', 'nvidia', 'armv7') diff --git a/docker-images/4.0/alpine/Dockerfile b/docker-images/4.0/alpine/Dockerfile index 25bd8c25b..9899b15a2 100644 --- a/docker-images/4.0/alpine/Dockerfile +++ b/docker-images/4.0/alpine/Dockerfile @@ -1,4 +1,5 @@ <<<<<<< HEAD +<<<<<<< HEAD # ffmpeg - http://ffmpeg.org/download.html # # https://hub.docker.com/r/jrottenberg/ffmpeg/ @@ -390,6 +391,8 @@ COPY --from=build /usr/local /usr/local # Let's make sure the app built correctly # Convenient to verify on https://hub.docker.com/r/jrottenberg/ffmpeg/builds/ console output ======= +======= +>>>>>>> fix extra comma FROM alpine:3.9 as base RUN apk add --no-cache --update libva \ @@ -828,4 +831,7 @@ RUN test "base" = "base" && ldconfig /usr/local/lib /usr/local/lib64 # Let's make sure the app built correctly # Convenient to verify on https://hub.docker.com/r/jrottenberg/ffmpeg/builds/ console output +<<<<<<< HEAD +>>>>>>> fix extra comma +======= >>>>>>> fix extra comma diff --git a/docker-images/4.0/nvidia,/Dockerfile b/docker-images/4.0/nvidia,/Dockerfile deleted file mode 100644 index 452b62c02..000000000 --- a/docker-images/4.0/nvidia,/Dockerfile +++ /dev/null @@ -1,14 +0,0 @@ -usage: update.py [-h] [--enable-libopencore-amr] [--enable-libx264] - [--enable-libx265] [--enable-libogg] [--enable-libopus] - [--enable-libvorbis] [--enable-libtheora] [--enable-libvpx] - [--enable-libmp3lame] [--enable-libxvid] - [--enable-libfdk-aac] [--enable-libopenjpeg] - [--enable-libfreetype] [--enable-libvidstab] - [--enable-libfribidi] [--enable-libfontconfig] - [--enable-libass] [--enable-libkvazaar] [--enable-libaom] - [--enable-vaapi] [--enable-nvenc] [--enable-libdav1d] - [--enable-vdpau] [--enable-all] [--with-bins] [--no-strip] - [--fat | --slim | --scratch] - {alpine,centos,ubuntu,nvidia,armv7} - {snapshot,4.1,4.0,3.4,3.3,3.2,2.8} -update.py: error: argument variant: invalid choice: 'nvidia,' (choose from 'alpine', 'centos', 'ubuntu', 'nvidia', 'armv7') diff --git a/docker-images/4.0/nvidia/Dockerfile b/docker-images/4.0/nvidia/Dockerfile index 619cad62f..391fd9d88 100644 --- a/docker-images/4.0/nvidia/Dockerfile +++ b/docker-images/4.0/nvidia/Dockerfile @@ -1,4 +1,5 @@ <<<<<<< HEAD +<<<<<<< HEAD # ffmpeg - http://ffmpeg.org/download.html # # From https://trac.ffmpeg.org/wiki/CompilationGuide/Ubuntu @@ -425,6 +426,8 @@ COPY --from=build /usr/local/lib /usr/local/lib/ # Convenient to verify on https://hub.docker.com/r/jrottenberg/ffmpeg/builds/ console output ======= +======= +>>>>>>> fix extra comma FROM nvidia/cuda:10.1-runtime-ubuntu18.04 AS base ENV NVIDIA_DRIVER_CAPABILITIES=video @@ -857,4 +860,7 @@ RUN test "base" = "base" && ldconfig /usr/local/lib /usr/local/lib64 # Let's make sure the app built correctly # Convenient to verify on https://hub.docker.com/r/jrottenberg/ffmpeg/builds/ console output +<<<<<<< HEAD +>>>>>>> fix extra comma +======= >>>>>>> fix extra comma diff --git a/docker-images/4.1/alpine,/Dockerfile b/docker-images/4.1/alpine,/Dockerfile deleted file mode 100644 index a0b97723e..000000000 --- a/docker-images/4.1/alpine,/Dockerfile +++ /dev/null @@ -1,14 +0,0 @@ -usage: update.py [-h] [--enable-libopencore-amr] [--enable-libx264] - [--enable-libx265] [--enable-libogg] [--enable-libopus] - [--enable-libvorbis] [--enable-libtheora] [--enable-libvpx] - [--enable-libmp3lame] [--enable-libxvid] - [--enable-libfdk-aac] [--enable-libopenjpeg] - [--enable-libfreetype] [--enable-libvidstab] - [--enable-libfribidi] [--enable-libfontconfig] - [--enable-libass] [--enable-libkvazaar] [--enable-libaom] - [--enable-vaapi] [--enable-nvenc] [--enable-libdav1d] - [--enable-vdpau] [--enable-all] [--with-bins] [--no-strip] - [--fat | --slim | --scratch] - {alpine,centos,ubuntu,nvidia,armv7} - {snapshot,4.1,4.0,3.4,3.3,3.2,2.8} -update.py: error: argument variant: invalid choice: 'alpine,' (choose from 'alpine', 'centos', 'ubuntu', 'nvidia', 'armv7') diff --git a/docker-images/4.1/alpine/Dockerfile b/docker-images/4.1/alpine/Dockerfile index 600078ca1..e61a04b4e 100644 --- a/docker-images/4.1/alpine/Dockerfile +++ b/docker-images/4.1/alpine/Dockerfile @@ -1,4 +1,5 @@ <<<<<<< HEAD +<<<<<<< HEAD # ffmpeg - http://ffmpeg.org/download.html # # https://hub.docker.com/r/jrottenberg/ffmpeg/ @@ -390,6 +391,8 @@ COPY --from=build /usr/local /usr/local # Let's make sure the app built correctly # Convenient to verify on https://hub.docker.com/r/jrottenberg/ffmpeg/builds/ console output ======= +======= +>>>>>>> fix extra comma FROM alpine:3.9 as base RUN apk add --no-cache --update libvdpau libva \ @@ -830,4 +833,7 @@ RUN test "base" = "base" && ldconfig /usr/local/lib /usr/local/lib64 # Let's make sure the app built correctly # Convenient to verify on https://hub.docker.com/r/jrottenberg/ffmpeg/builds/ console output +<<<<<<< HEAD +>>>>>>> fix extra comma +======= >>>>>>> fix extra comma diff --git a/docker-images/4.1/nvidia,/Dockerfile b/docker-images/4.1/nvidia,/Dockerfile deleted file mode 100644 index 452b62c02..000000000 --- a/docker-images/4.1/nvidia,/Dockerfile +++ /dev/null @@ -1,14 +0,0 @@ -usage: update.py [-h] [--enable-libopencore-amr] [--enable-libx264] - [--enable-libx265] [--enable-libogg] [--enable-libopus] - [--enable-libvorbis] [--enable-libtheora] [--enable-libvpx] - [--enable-libmp3lame] [--enable-libxvid] - [--enable-libfdk-aac] [--enable-libopenjpeg] - [--enable-libfreetype] [--enable-libvidstab] - [--enable-libfribidi] [--enable-libfontconfig] - [--enable-libass] [--enable-libkvazaar] [--enable-libaom] - [--enable-vaapi] [--enable-nvenc] [--enable-libdav1d] - [--enable-vdpau] [--enable-all] [--with-bins] [--no-strip] - [--fat | --slim | --scratch] - {alpine,centos,ubuntu,nvidia,armv7} - {snapshot,4.1,4.0,3.4,3.3,3.2,2.8} -update.py: error: argument variant: invalid choice: 'nvidia,' (choose from 'alpine', 'centos', 'ubuntu', 'nvidia', 'armv7') diff --git a/docker-images/4.1/nvidia/Dockerfile b/docker-images/4.1/nvidia/Dockerfile index babc04b2c..84c9c6dfb 100644 --- a/docker-images/4.1/nvidia/Dockerfile +++ b/docker-images/4.1/nvidia/Dockerfile @@ -1,4 +1,5 @@ <<<<<<< HEAD +<<<<<<< HEAD # ffmpeg - http://ffmpeg.org/download.html # # From https://trac.ffmpeg.org/wiki/CompilationGuide/Ubuntu @@ -425,6 +426,8 @@ COPY --from=build /usr/local/lib /usr/local/lib/ # Convenient to verify on https://hub.docker.com/r/jrottenberg/ffmpeg/builds/ console output ======= +======= +>>>>>>> fix extra comma FROM nvidia/cuda:10.1-runtime-ubuntu18.04 AS base ENV NVIDIA_DRIVER_CAPABILITIES=video @@ -859,4 +862,7 @@ RUN test "base" = "base" && ldconfig /usr/local/lib /usr/local/lib64 # Let's make sure the app built correctly # Convenient to verify on https://hub.docker.com/r/jrottenberg/ffmpeg/builds/ console output +<<<<<<< HEAD +>>>>>>> fix extra comma +======= >>>>>>> fix extra comma diff --git a/docker-images/snapshot/alpine,/Dockerfile b/docker-images/snapshot/alpine,/Dockerfile deleted file mode 100644 index a0b97723e..000000000 --- a/docker-images/snapshot/alpine,/Dockerfile +++ /dev/null @@ -1,14 +0,0 @@ -usage: update.py [-h] [--enable-libopencore-amr] [--enable-libx264] - [--enable-libx265] [--enable-libogg] [--enable-libopus] - [--enable-libvorbis] [--enable-libtheora] [--enable-libvpx] - [--enable-libmp3lame] [--enable-libxvid] - [--enable-libfdk-aac] [--enable-libopenjpeg] - [--enable-libfreetype] [--enable-libvidstab] - [--enable-libfribidi] [--enable-libfontconfig] - [--enable-libass] [--enable-libkvazaar] [--enable-libaom] - [--enable-vaapi] [--enable-nvenc] [--enable-libdav1d] - [--enable-vdpau] [--enable-all] [--with-bins] [--no-strip] - [--fat | --slim | --scratch] - {alpine,centos,ubuntu,nvidia,armv7} - {snapshot,4.1,4.0,3.4,3.3,3.2,2.8} -update.py: error: argument variant: invalid choice: 'alpine,' (choose from 'alpine', 'centos', 'ubuntu', 'nvidia', 'armv7') diff --git a/docker-images/snapshot/alpine/Dockerfile b/docker-images/snapshot/alpine/Dockerfile index 930f91a84..5b1b42eb8 100644 --- a/docker-images/snapshot/alpine/Dockerfile +++ b/docker-images/snapshot/alpine/Dockerfile @@ -1,4 +1,5 @@ <<<<<<< HEAD +<<<<<<< HEAD # ffmpeg - http://ffmpeg.org/download.html # # https://hub.docker.com/r/jrottenberg/ffmpeg/ @@ -390,6 +391,8 @@ COPY --from=build /usr/local /usr/local # Let's make sure the app built correctly # Convenient to verify on https://hub.docker.com/r/jrottenberg/ffmpeg/builds/ console output ======= +======= +>>>>>>> fix extra comma FROM alpine:3.9 as base RUN apk add --no-cache --update libva \ @@ -840,4 +843,7 @@ RUN test "base" = "base" && ldconfig /usr/local/lib /usr/local/lib64 # Let's make sure the app built correctly # Convenient to verify on https://hub.docker.com/r/jrottenberg/ffmpeg/builds/ console output +<<<<<<< HEAD +>>>>>>> fix extra comma +======= >>>>>>> fix extra comma diff --git a/docker-images/snapshot/nvidia,/Dockerfile b/docker-images/snapshot/nvidia,/Dockerfile deleted file mode 100644 index 452b62c02..000000000 --- a/docker-images/snapshot/nvidia,/Dockerfile +++ /dev/null @@ -1,14 +0,0 @@ -usage: update.py [-h] [--enable-libopencore-amr] [--enable-libx264] - [--enable-libx265] [--enable-libogg] [--enable-libopus] - [--enable-libvorbis] [--enable-libtheora] [--enable-libvpx] - [--enable-libmp3lame] [--enable-libxvid] - [--enable-libfdk-aac] [--enable-libopenjpeg] - [--enable-libfreetype] [--enable-libvidstab] - [--enable-libfribidi] [--enable-libfontconfig] - [--enable-libass] [--enable-libkvazaar] [--enable-libaom] - [--enable-vaapi] [--enable-nvenc] [--enable-libdav1d] - [--enable-vdpau] [--enable-all] [--with-bins] [--no-strip] - [--fat | --slim | --scratch] - {alpine,centos,ubuntu,nvidia,armv7} - {snapshot,4.1,4.0,3.4,3.3,3.2,2.8} -update.py: error: argument variant: invalid choice: 'nvidia,' (choose from 'alpine', 'centos', 'ubuntu', 'nvidia', 'armv7') diff --git a/docker-images/snapshot/nvidia/Dockerfile b/docker-images/snapshot/nvidia/Dockerfile index 7853f0103..05715d265 100644 --- a/docker-images/snapshot/nvidia/Dockerfile +++ b/docker-images/snapshot/nvidia/Dockerfile @@ -1,4 +1,5 @@ <<<<<<< HEAD +<<<<<<< HEAD # ffmpeg - http://ffmpeg.org/download.html # # From https://trac.ffmpeg.org/wiki/CompilationGuide/Ubuntu @@ -425,6 +426,8 @@ COPY --from=build /usr/local/lib /usr/local/lib/ # Convenient to verify on https://hub.docker.com/r/jrottenberg/ffmpeg/builds/ console output ======= +======= +>>>>>>> fix extra comma FROM nvidia/cuda:10.1-runtime-ubuntu18.04 AS base ENV NVIDIA_DRIVER_CAPABILITIES=video @@ -869,4 +872,7 @@ RUN test "base" = "base" && ldconfig /usr/local/lib /usr/local/lib64 # Let's make sure the app built correctly # Convenient to verify on https://hub.docker.com/r/jrottenberg/ffmpeg/builds/ console output +<<<<<<< HEAD +>>>>>>> fix extra comma +======= >>>>>>> fix extra comma diff --git a/docker_gen.sh b/docker_gen.sh index 02ef8b385..9e45ef55a 100644 --- a/docker_gen.sh +++ b/docker_gen.sh @@ -1,5 +1,6 @@ #! /bin/sh +<<<<<<< HEAD <<<<<<< HEAD variants=("ubuntu" "centos" "alpine" "nvidia" "arm32v7") versions=("2.8" "3.2" "3.3" "3.4" "4.0" "4.1" "snapshot") @@ -13,6 +14,13 @@ versions=("2.8" "3.2" "3.3" "3.4" "4.0" "4.1" "snapshot") for variant in ${variants[*]}; do for version in ${versions[*]}; do >>>>>>> rewrite the dockerfile generation + vdapu + armv7 + dav1d +======= +variants=("ubuntu" "centos" "alpine" "nvidia" "arm32v7") +versions=("2.8" "3.2" "3.3" "3.4" "4.0" "4.1" "snapshot") + +for variant in ${variants[*]}; do + for version in ${versions[*]}; do +>>>>>>> fix extra comma echo "${variant}: ffmpeg-${version}" dir="docker-images/${version}/${variant}" mkdir -p ${dir} @@ -22,10 +30,14 @@ done scratch_variant="alpine" <<<<<<< HEAD +<<<<<<< HEAD for version in ${versions[*]}; do ======= for version in ${versions[*]}; do >>>>>>> rewrite the dockerfile generation + vdapu + armv7 + dav1d +======= +for version in ${versions[*]}; do +>>>>>>> fix extra comma dir="docker-images/${version}/${variant}" mkdir -p ${dir} python3 update.py --scratch --enable-all ${scratch_variant} ${version} > ${dir}/Dockerfile @@ -37,8 +49,12 @@ sed -ri\ -e 's/alpine:[[:digit:]]+.[[:digit:]]+/alpine:3.8/' \ -e 's/libssl1.[[:digit:]]/libssl1.0/' \ -e 's/libcrypto1.[[:digit:]]/libcrypto1.0/' \ +<<<<<<< HEAD <<<<<<< HEAD docker-images/2.8/alpine/Dockerfile ======= docker-images/2.8/alpine/Dockerfile >>>>>>> rewrite the dockerfile generation + vdapu + armv7 + dav1d +======= + docker-images/2.8/alpine/Dockerfile +>>>>>>> fix extra comma diff --git a/update.py b/update.py index 91be2cc10..67ceb6976 100755 --- a/update.py +++ b/update.py @@ -3,6 +3,7 @@ from string import Template import sys <<<<<<< HEAD +<<<<<<< HEAD import re import urllib from distutils.version import StrictVersion @@ -49,6 +50,8 @@ travis.append(' - VERSION=%s VARIANT=%s' % (version, variant)) azure.append(' %s_%s:\n VERSION: %s\n VARIANT: %s' % (version.replace('.', '_'), variant, version, variant)) ======= +======= +>>>>>>> fix extra comma import getopt import argparse import configparser @@ -79,6 +82,9 @@ def __init__(self, option_strings, dest, default=None, required=False, help=None def __call__(self, parser, namespace, values, option_strings=None): if option_strings.startswith('--disable-'): setattr(namespace, self.dest, False) +<<<<<<< HEAD +>>>>>>> fix extra comma +======= >>>>>>> fix extra comma else: setattr(namespace, self.dest, True) From 306fb1a7ed34fef298fcd4ebbc9719b651880f6a Mon Sep 17 00:00:00 2001 From: GnaphronG Date: Sat, 29 Jun 2019 15:18:05 -0700 Subject: [PATCH 29/29] add files --- templates/Dockerfile-template.centos | 64 ------------------ templates/Dockerfile-template.nvidia | 95 -------------------------- templates/Dockerfile-template.vaapi | 71 -------------------- templates/common/fat | 4 ++ templates/common/release | 12 ++++ templates/common/scratch | 19 ++++++ templates/common/slim | 17 +++++ templates/config/config_2.8.ini | 90 +++++++++++++++++++++++++ templates/config/config_3.2.ini | 90 +++++++++++++++++++++++++ templates/config/config_3.3.ini | 90 +++++++++++++++++++++++++ templates/config/config_3.4.ini | 90 +++++++++++++++++++++++++ templates/config/config_4.0.ini | 94 ++++++++++++++++++++++++++ templates/config/config_4.1.ini | 99 ++++++++++++++++++++++++++++ templates/config/config_snapshot.ini | 98 +++++++++++++++++++++++++++ templates/fragments/ffmpeg | 24 +++++++ templates/fragments/libaom | 11 ++++ templates/fragments/libass | 11 ++++ templates/fragments/libdav1d | 10 +++ templates/fragments/libfdk-aac | 12 ++++ templates/fragments/libfontconfig | 11 ++++ templates/fragments/libfreetype | 11 ++++ templates/fragments/libfribidi | 15 +++++ templates/fragments/libkvazaar | 16 +++++ templates/fragments/libmp3lame | 11 ++++ templates/fragments/libogg | 12 ++++ templates/fragments/libopencore-amr | 11 ++++ templates/fragments/libopenjpeg | 16 +++++ templates/fragments/libopus | 12 ++++ templates/fragments/libtheora | 12 ++++ templates/fragments/libvidstab | 12 ++++ templates/fragments/libvorbis | 12 ++++ templates/fragments/libvpx | 12 ++++ templates/fragments/libx264 | 11 ++++ templates/fragments/libx265 | 13 ++++ templates/fragments/libxvid | 12 ++++ templates/fragments/nvenc | 8 +++ templates/fragments/vaapi | 0 templates/fragments/vdpau | 0 templates/variants/Dockerfile.alpine | 47 +++++++++++++ templates/variants/Dockerfile.armv7 | 47 +++++++++++++ templates/variants/Dockerfile.centos | 83 +++++++++++++++++++++++ templates/variants/Dockerfile.nvidia | 41 ++++++++++++ templates/variants/Dockerfile.ubuntu | 40 +++++++++++ templates/variants/packages.ini | 30 +++++++++ 44 files changed, 1266 insertions(+), 230 deletions(-) delete mode 100644 templates/Dockerfile-template.centos delete mode 100644 templates/Dockerfile-template.nvidia delete mode 100644 templates/Dockerfile-template.vaapi create mode 100644 templates/common/fat create mode 100644 templates/common/release create mode 100644 templates/common/scratch create mode 100644 templates/common/slim create mode 100644 templates/config/config_2.8.ini create mode 100644 templates/config/config_3.2.ini create mode 100644 templates/config/config_3.3.ini create mode 100644 templates/config/config_3.4.ini create mode 100644 templates/config/config_4.0.ini create mode 100644 templates/config/config_4.1.ini create mode 100644 templates/config/config_snapshot.ini create mode 100644 templates/fragments/ffmpeg create mode 100644 templates/fragments/libaom create mode 100644 templates/fragments/libass create mode 100644 templates/fragments/libdav1d create mode 100644 templates/fragments/libfdk-aac create mode 100644 templates/fragments/libfontconfig create mode 100644 templates/fragments/libfreetype create mode 100644 templates/fragments/libfribidi create mode 100644 templates/fragments/libkvazaar create mode 100644 templates/fragments/libmp3lame create mode 100644 templates/fragments/libogg create mode 100644 templates/fragments/libopencore-amr create mode 100644 templates/fragments/libopenjpeg create mode 100644 templates/fragments/libopus create mode 100644 templates/fragments/libtheora create mode 100644 templates/fragments/libvidstab create mode 100644 templates/fragments/libvorbis create mode 100644 templates/fragments/libvpx create mode 100644 templates/fragments/libx264 create mode 100644 templates/fragments/libx265 create mode 100644 templates/fragments/libxvid create mode 100644 templates/fragments/nvenc create mode 100644 templates/fragments/vaapi create mode 100644 templates/fragments/vdpau create mode 100644 templates/variants/Dockerfile.alpine create mode 100644 templates/variants/Dockerfile.armv7 create mode 100644 templates/variants/Dockerfile.centos create mode 100644 templates/variants/Dockerfile.nvidia create mode 100644 templates/variants/Dockerfile.ubuntu create mode 100644 templates/variants/packages.ini diff --git a/templates/Dockerfile-template.centos b/templates/Dockerfile-template.centos deleted file mode 100644 index 04ffaccf3..000000000 --- a/templates/Dockerfile-template.centos +++ /dev/null @@ -1,64 +0,0 @@ -# ffmpeg - http://ffmpeg.org/download.html -# -# From https://trac.ffmpeg.org/wiki/CompilationGuide/Centos -# -# https://hub.docker.com/r/jrottenberg/ffmpeg/ -# -# -FROM centos:7 AS base - -RUN yum -y install libgomp && \ - yum clean all; - - -FROM base AS build - -WORKDIR /tmp/workdir - -ARG PKG_CONFIG_PATH=/opt/ffmpeg/lib/pkgconfig -ARG LD_LIBRARY_PATH=/opt/ffmpeg/lib -ARG PREFIX=/opt/ffmpeg -ARG MAKEFLAGS="-j2" - -ENV %%ENV%% - -RUN buildDeps="autoconf \ - automake \ - bzip2 \ - cmake \ - expat-devel \ - gcc \ - gcc-c++ \ - git \ - gperf \ - libtool \ - make \ - nasm \ - perl \ - openssl-devel \ - tar \ - yasm \ - which \ - zlib-devel" && \ - echo "${SRC}/lib" > /etc/ld.so.conf.d/libc.conf && \ - yum --enablerepo=extras install -y epel-release && \ - yum install -y ${buildDeps} -%%RUN%% -RUN \ - ldd ${PREFIX}/bin/ffmpeg | grep opt/ffmpeg | cut -d ' ' -f 3 | xargs -i cp {} /usr/local/lib64/ && \ - cp ${PREFIX}/bin/* /usr/local/bin/ && \ - cp -r ${PREFIX}/share/ffmpeg /usr/local/share/ && \ - LD_LIBRARY_PATH=/usr/local/lib64 ffmpeg -buildconf - -FROM base -MAINTAINER Julien Rottenberg - -CMD ["--help"] -ENTRYPOINT ["ffmpeg"] - -ENV LD_LIBRARY_PATH=/usr/local/lib64 - -COPY --from=build /usr/local/ /usr/local/ - -# Let's make sure the app built correctly -# Convenient to verify on https://hub.docker.com/r/jrottenberg/ffmpeg/builds/ console output \ No newline at end of file diff --git a/templates/Dockerfile-template.nvidia b/templates/Dockerfile-template.nvidia deleted file mode 100644 index 5938d9908..000000000 --- a/templates/Dockerfile-template.nvidia +++ /dev/null @@ -1,95 +0,0 @@ -# ffmpeg - http://ffmpeg.org/download.html -# -# From https://trac.ffmpeg.org/wiki/CompilationGuide/Ubuntu -# -# https://hub.docker.com/r/jrottenberg/ffmpeg/ -# -# - -FROM nvidia/cudagl:9.2-devel-ubuntu18.04 AS devel-base - -ENV NVIDIA_DRIVER_CAPABILITIES compat32,compute,video -WORKDIR /tmp/workdir - -RUN apt-get -yqq update && \ - apt-get install -yq --no-install-recommends ca-certificates expat libgomp1 && \ - apt-get autoremove -y && \ - apt-get clean -y - -FROM nvidia/cudagl:9.2-runtime-ubuntu18.04 AS runtime-base - -ENV NVIDIA_DRIVER_CAPABILITIES compat32,compute,video -WORKDIR /tmp/workdir - -RUN apt-get -yqq update && \ - apt-get install -yq --no-install-recommends ca-certificates expat libgomp1 libxcb-shape0-dev && \ - apt-get autoremove -y && \ - apt-get clean -y - - -FROM devel-base as build - -ENV NVIDIA_HEADERS_VERSION=8.1.24.9 -ARG PKG_CONFIG_PATH=/opt/ffmpeg/lib/pkgconfig -ENV LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/opt/ffmpeg/lib" -ARG PREFIX=/opt/ffmpeg -ARG MAKEFLAGS="-j12" - -ENV %%ENV%% - -RUN buildDeps="autoconf \ - automake \ - cmake \ - curl \ - bzip2 \ - libexpat1-dev \ - g++ \ - gcc \ - git \ - gperf \ - libtool \ - make \ - nasm \ - perl \ - pkg-config \ - python \ - libssl-dev \ - yasm \ - zlib1g-dev" && \ - apt-get -yqq update && \ - apt-get install -yq --no-install-recommends ${buildDeps} - -RUN \ - DIR=/tmp/nv-codec-headers && \ - git clone https://git.videolan.org/git/ffmpeg/nv-codec-headers.git ${DIR} && \ - cd ${DIR} && \ - git checkout n${NVIDIA_HEADERS_VERSION} && \ - sed -i 's@/usr/local@'"$PREFIX"'@' Makefile && \ - make && \ - make install && \ - rm -rf ${DIR} - -%%RUN%% -## cleanup -RUN \ - ldd ${PREFIX}/bin/ffmpeg | grep opt/ffmpeg | cut -d ' ' -f 3 | xargs -i cp {} /usr/local/lib/ && \ - cp ${PREFIX}/bin/* /usr/local/bin/ && \ - cp -r ${PREFIX}/share/ffmpeg /usr/local/share/ && \ - LD_LIBRARY_PATH=/usr/local/lib ffmpeg -buildconf - - - -FROM runtime-base AS release -MAINTAINER Julien Rottenberg - -CMD ["--help"] -ENTRYPOINT ["ffmpeg"] -ENV LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/usr/local/lib" - -COPY --from=build /usr/local/bin /usr/local/bin/ -COPY --from=build /usr/local/share /usr/local/share/ -COPY --from=build /usr/local/lib /usr/local/lib/ - -# Let's make sure the app built correctly -# Convenient to verify on https://hub.docker.com/r/jrottenberg/ffmpeg/builds/ console output - diff --git a/templates/Dockerfile-template.vaapi b/templates/Dockerfile-template.vaapi deleted file mode 100644 index ccd06f5c2..000000000 --- a/templates/Dockerfile-template.vaapi +++ /dev/null @@ -1,71 +0,0 @@ -# ffmpeg - http://ffmpeg.org/download.html -# -# From https://trac.ffmpeg.org/wiki/CompilationGuide/Ubuntu -# -# https://hub.docker.com/r/jrottenberg/ffmpeg/ -# -# -FROM ubuntu:18.04 AS base - -WORKDIR /tmp/workdir - -RUN apt-get -yqq update && \ - apt-get install -yq --no-install-recommends ca-certificates expat libgomp1 && \ - apt-get autoremove -y && \ - apt-get clean -y - -FROM base as build - -ARG PKG_CONFIG_PATH=/opt/ffmpeg/lib/pkgconfig -ARG LD_LIBRARY_PATH=/opt/ffmpeg/lib -ARG PREFIX=/opt/ffmpeg -ARG MAKEFLAGS="-j2" - -ENV %%ENV%% - -RUN buildDeps="autoconf \ - automake \ - cmake \ - curl \ - bzip2 \ - libexpat1-dev \ - g++ \ - gcc \ - git \ - gperf \ - libtool \ - make \ - nasm \ - perl \ - pkg-config \ - python \ - libssl-dev \ - yasm \ - libva-dev \ - zlib1g-dev" && \ - apt-get -yqq update && \ - apt-get install -yq --no-install-recommends ${buildDeps} -%%RUN%% -## cleanup -RUN \ - ldd ${PREFIX}/bin/ffmpeg | grep opt/ffmpeg | cut -d ' ' -f 3 | xargs -i cp {} /usr/local/lib/ && \ - cp ${PREFIX}/bin/* /usr/local/bin/ && \ - cp -r ${PREFIX}/share/ffmpeg /usr/local/share/ && \ - LD_LIBRARY_PATH=/usr/local/lib ffmpeg -buildconf - -FROM base AS release -MAINTAINER Julien Rottenberg - -CMD ["--help"] -ENTRYPOINT ["ffmpeg"] -ENV LD_LIBRARY_PATH=/usr/local/lib - -COPY --from=build /usr/local /usr/local/ - -RUN \ - apt-get update -y && \ - apt-get install -y --no-install-recommends libva-drm2 libva2 i965-va-driver && \ - rm -rf /var/lib/apt/lists/* - -# Let's make sure the app built correctly -# Convenient to verify on https://hub.docker.com/r/jrottenberg/ffmpeg/builds/ console output diff --git a/templates/common/fat b/templates/common/fat new file mode 100644 index 000000000..c42cffabd --- /dev/null +++ b/templates/common/fat @@ -0,0 +1,4 @@ + +RUN \ + cp -r ${PREFIX}/* /usr/local && \ + LD_LIBRARY_PATH=/usr/local/lib ffmpeg -buildconf diff --git a/templates/common/release b/templates/common/release new file mode 100644 index 000000000..25f32d312 --- /dev/null +++ b/templates/common/release @@ -0,0 +1,12 @@ + +FROM $source AS release +MAINTAINER Julien Rottenberg + +CMD ["--help"] +ENTRYPOINT ["$entrypoint"] + +COPY --from=build /usr/local $install_dir +RUN test "$source" = "base" && ldconfig /usr/local/lib /usr/local/lib64 + +# Let's make sure the app built correctly +# Convenient to verify on https://hub.docker.com/r/jrottenberg/ffmpeg/builds/ console output \ No newline at end of file diff --git a/templates/common/scratch b/templates/common/scratch new file mode 100644 index 000000000..90f23c615 --- /dev/null +++ b/templates/common/scratch @@ -0,0 +1,19 @@ + +RUN \ + if $bins; then \ + LD_LIBRARY_PATH=${PREFIX}/lib ldd ${PREFIX}/bin/* | \ + cut -d ' ' -f 3 | \ + strings | \ + xargs -i cp {} /usr/local/lib/ && \ + cp ${PREFIX}/bin/ff* /usr/local/bin/ ; \ + else \ + LD_LIBRARY_PATH=${PREFIX}/lib ldd ${PREFIX}/bin/ffmpeg | \ + cut -d ' ' -f 3 | \ + strings | \ + xargs -i cp {} /usr/local/lib/ && \ + cp ${PREFIX}/bin/ff* /usr/local/bin/ ; \ + fi && \ + if $strip; then \ + for lib in /usr/local/lib/*.so* /usr/local/bin/*; do strip --strip-all $lib; done ; \ + fi && \ + LD_LIBRARY_PATH=/usr/local/lib ffmpeg -buildconf diff --git a/templates/common/slim b/templates/common/slim new file mode 100644 index 000000000..0a77506f7 --- /dev/null +++ b/templates/common/slim @@ -0,0 +1,17 @@ + +RUN \ + if $bins; then \ + cp -r ${PREFIX}/lib/*so* /usr/local/lib/ && \ + cp ${PREFIX}/bin/* /usr/local/bin/ ; \ + else \ + LD_LIBRARY_PATH=${PREFIX}/lib ldd ${PREFIX}/bin/ffmpeg | \ + grep ${PREFIX} | \ + cut -d ' ' -f 3 | \ + xargs -i cp {} /usr/local/lib/ && \ + cp ${PREFIX}/bin/ff* /usr/local/bin/ ; \ + fi && \ + if $strip; then \ + for lib in /usr/local/lib/*.so* /usr/local/bin/*; do strip --strip-all $lib; done ; \ + fi && \ + cp -r ${PREFIX}/share/ffmpeg /usr/local/share/ && \ + LD_LIBRARY_PATH=/usr/local/lib ffmpeg -buildconf \ No newline at end of file diff --git a/templates/config/config_2.8.ini b/templates/config/config_2.8.ini new file mode 100644 index 000000000..93e4a0ba0 --- /dev/null +++ b/templates/config/config_2.8.ini @@ -0,0 +1,90 @@ +[ffmpeg] +Version = 2.8.15 + +[libass] +Version = 0.14.0 +DependsOn = libfreetype, libfribidi, libfontconfig +Flags = --enable-libass + +[libfdk-aac] +Version = 0.1.6 +Flags = --enable-libfdk_aac, --enable-nonfree + +[libfontconfig] +Version = 2.13.1 + +[libfreetype] +Version = 2.10.0 +Flags = --enable-libfreetype + +[libfribidi] +Version = 0.19.7 +SHA256sum = 3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 + +[libkvazaar] +Version = 0.6.1 +Flags = --enable-libkvazaar + +[libmp3lame] +Version = 3.100 +Flags = --enable-libmp3lame + +[libogg] +Version = 1.3.3 +SHA256sum = c2e8a485110b97550f453226ec644ebac6cb29d1caef2902c007edab4308d985 + +[libopencore-amr] +Version = 0.1.5 +Flags = --enable-libopencore-amrnb, --enable-libopencore-amrwb, --enable-version3 + +[libopenjpeg] +Version = 1.5.2 +Flags = --enable-libopenjpeg + +[libopus] +Version = 1.3.1 +SHA256sum = 65b58e1e25b2a114157014736a3d9dfeaad8d41be1c8179866f144a2fb44ff9d +Flags = --enable-libopus + +[libtheora] +Version = 1.1.1 +SHA256sum = 40952956c47811928d1e7922cda3bc1f427eb75680c3c37249c91e949054916b +DependsOn = libogg +Flags = --enable-libtheora + +[libvidstab] +Version = 1.1.0 +SHA256sum = 14d2a053e56edad4f397be0cb3ef8eb1ec3150404ce99a426c4eb641861dc0bb +Flags = --enable-libvidstab, --enable-gpl + +[libvorbis] +Version = 1.3.6 +SHA256sum = 6ed40e0241089a42c48604dc00e362beee00036af2d8b3f46338031c9e0351cb +DependsOn = libogg +Flags = --enable-libvorbis + +[libvpx] +Version = 1.8.0 +Flags = --enable-libvpx + +[libx264] +Version = 20190526-2245-stable +Flags = --enable-libx264 + +[libx265] +Version = 3.0 +Flags = --enable-libx265 + +[libxvid] +Version = 1.3.5 +Flags = --enable-libxvid + +[vaapi] +Flags = --enable-vaapi +Install = libva +InstallDev = libva-dev + +[nvenc] +Version=8.2.15.8 +Flags = --enable-nvenc, --enable-nonfree +Variants = nvidia \ No newline at end of file diff --git a/templates/config/config_3.2.ini b/templates/config/config_3.2.ini new file mode 100644 index 000000000..15d3972f7 --- /dev/null +++ b/templates/config/config_3.2.ini @@ -0,0 +1,90 @@ +[ffmpeg] +Version = 3.2.14 + +[libass] +Version = 0.14.0 +DependsOn = libfreetype, libfribidi, libfontconfig +Flags = --enable-libass + +[libfdk-aac] +Version = 0.1.6 +Flags = --enable-libfdk_aac, --enable-nonfree + +[libfontconfig] +Version = 2.13.1 + +[libfreetype] +Version = 2.10.0 +Flags = --enable-libfreetype + +[libfribidi] +Version = 0.19.7 +SHA256sum = 3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 + +[libkvazaar] +Version = 1.2.0 +Flags = --enable-libkvazaar + +[libmp3lame] +Version = 3.100 +Flags = --enable-libmp3lame + +[libogg] +Version = 1.3.3 +SHA256sum = c2e8a485110b97550f453226ec644ebac6cb29d1caef2902c007edab4308d985 + +[libopencore-amr] +Version = 0.1.5 +Flags = --enable-libopencore-amrnb, --enable-libopencore-amrwb, --enable-version3 + +[libopenjpeg] +Version = 2.1.2 +Flags = --enable-libopenjpeg + +[libopus] +Version = 1.3.1 +SHA256sum = 65b58e1e25b2a114157014736a3d9dfeaad8d41be1c8179866f144a2fb44ff9d +Flags = --enable-libopus + +[libtheora] +Version = 1.1.1 +SHA256sum = 40952956c47811928d1e7922cda3bc1f427eb75680c3c37249c91e949054916b +DependsOn = libogg +Flags = --enable-libtheora + +[libvidstab] +Version = 1.1.0 +SHA256sum = 14d2a053e56edad4f397be0cb3ef8eb1ec3150404ce99a426c4eb641861dc0bb +Flags = --enable-libvidstab, --enable-gpl + +[libvorbis] +Version = 1.3.6 +SHA256sum = 6ed40e0241089a42c48604dc00e362beee00036af2d8b3f46338031c9e0351cb +DependsOn = libogg +Flags = --enable-libvorbis + +[libvpx] +Version = 1.8.0 +Flags = --enable-libvpx + +[libx264] +Version = 20190526-2245-stable +Flags = --enable-libx264 + +[libx265] +Version = 3.0 +Flags = --enable-libx265 + +[libxvid] +Version = 1.3.5 +Flags = --enable-libxvid + +[vaapi] +Flags = --enable-vaapi +Install = libva +InstallDev = libva-dev + +[nvenc] +Version=9.0.18.1 +Flags = --enable-nvenc, --enable-nonfree +Variants = nvidia \ No newline at end of file diff --git a/templates/config/config_3.3.ini b/templates/config/config_3.3.ini new file mode 100644 index 000000000..8f80f2de5 --- /dev/null +++ b/templates/config/config_3.3.ini @@ -0,0 +1,90 @@ +[ffmpeg] +Version = 3.3.9 + +[libass] +Version = 0.14.0 +DependsOn = libfreetype, libfribidi, libfontconfig +Flags = --enable-libass + +[libfdk-aac] +Version = 0.1.6 +Flags = --enable-libfdk_aac, --enable-nonfree + +[libfontconfig] +Version = 2.13.1 + +[libfreetype] +Version = 2.10.0 +Flags = --enable-libfreetype + +[libfribidi] +Version = 0.19.7 +SHA256sum = 3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 + +[libkvazaar] +Version = 1.2.0 +Flags = --enable-libkvazaar + +[libmp3lame] +Version = 3.100 +Flags = --enable-libmp3lame + +[libogg] +Version = 1.3.3 +SHA256sum = c2e8a485110b97550f453226ec644ebac6cb29d1caef2902c007edab4308d985 + +[libopencore-amr] +Version = 0.1.5 +Flags = --enable-libopencore-amrnb, --enable-libopencore-amrwb, --enable-version3 + +[libopenjpeg] +Version = 2.1.2 +Flags = --enable-libopenjpeg + +[libopus] +Version = 1.3.1 +SHA256sum = 65b58e1e25b2a114157014736a3d9dfeaad8d41be1c8179866f144a2fb44ff9d +Flags = --enable-libopus + +[libtheora] +Version = 1.1.1 +SHA256sum = 40952956c47811928d1e7922cda3bc1f427eb75680c3c37249c91e949054916b +DependsOn = libogg +Flags = --enable-libtheora + +[libvidstab] +Version = 1.1.0 +SHA256sum = 14d2a053e56edad4f397be0cb3ef8eb1ec3150404ce99a426c4eb641861dc0bb +Flags = --enable-libvidstab, --enable-gpl + +[libvorbis] +Version = 1.3.6 +SHA256sum = 6ed40e0241089a42c48604dc00e362beee00036af2d8b3f46338031c9e0351cb +DependsOn = libogg +Flags = --enable-libvorbis + +[libvpx] +Version = 1.8.0 +Flags = --enable-libvpx + +[libx264] +Version = 20190526-2245-stable +Flags = --enable-libx264 + +[libx265] +Version = 3.0 +Flags = --enable-libx265 + +[libxvid] +Version = 1.3.5 +Flags = --enable-libxvid + +[vaapi] +Flags = --enable-vaapi +Install = libva +InstallDev = libva-dev + +[nvenc] +Version=9.0.18.1 +Flags = --enable-cuda, --enable-nvenc, --enable-cuvid +Variants = nvidia \ No newline at end of file diff --git a/templates/config/config_3.4.ini b/templates/config/config_3.4.ini new file mode 100644 index 000000000..8a523291b --- /dev/null +++ b/templates/config/config_3.4.ini @@ -0,0 +1,90 @@ +[ffmpeg] +Version = 3.4.6 + +[libass] +Version = 0.14.0 +DependsOn = libfreetype, libfribidi, libfontconfig +Flags = --enable-libass + +[libfdk-aac] +Version = 0.1.6 +Flags = --enable-libfdk_aac, --enable-nonfree + +[libfontconfig] +Version = 2.13.1 + +[libfreetype] +Version = 2.10.0 +Flags = --enable-libfreetype + +[libfribidi] +Version = 0.19.7 +SHA256sum = 3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 + +[libkvazaar] +Version = 1.2.0 +Flags = --enable-libkvazaar + +[libmp3lame] +Version = 3.100 +Flags = --enable-libmp3lame + +[libogg] +Version = 1.3.3 +SHA256sum = c2e8a485110b97550f453226ec644ebac6cb29d1caef2902c007edab4308d985 + +[libopencore-amr] +Version = 0.1.5 +Flags = --enable-libopencore-amrnb, --enable-libopencore-amrwb, --enable-version3 + +[libopenjpeg] +Version = 2.1.2 +Flags = --enable-libopenjpeg + +[libopus] +Version = 1.3.1 +SHA256sum = 65b58e1e25b2a114157014736a3d9dfeaad8d41be1c8179866f144a2fb44ff9d +Flags = --enable-libopus + +[libtheora] +Version = 1.1.1 +SHA256sum = 40952956c47811928d1e7922cda3bc1f427eb75680c3c37249c91e949054916b +DependsOn = libogg +Flags = --enable-libtheora + +[libvidstab] +Version = 1.1.0 +SHA256sum = 14d2a053e56edad4f397be0cb3ef8eb1ec3150404ce99a426c4eb641861dc0bb +Flags = --enable-libvidstab, --enable-gpl + +[libvorbis] +Version = 1.3.6 +SHA256sum = 6ed40e0241089a42c48604dc00e362beee00036af2d8b3f46338031c9e0351cb +DependsOn = libogg +Flags = --enable-libvorbis + +[libvpx] +Version = 1.8.0 +Flags = --enable-libvpx + +[libx264] +Version = 20190526-2245-stable +Flags = --enable-libx264 + +[libx265] +Version = 3.0 +Flags = --enable-libx265 + +[libxvid] +Version = 1.3.5 +Flags = --enable-libxvid + +[vaapi] +Flags = --enable-vaapi +Install = libva +InstallDev = libva-dev + +[nvenc] +Version=9.0.18.1 +Flags = --enable-cuda, --enable-nvenc, --enable-cuvid +Variants = nvidia \ No newline at end of file diff --git a/templates/config/config_4.0.ini b/templates/config/config_4.0.ini new file mode 100644 index 000000000..29bc3ec9d --- /dev/null +++ b/templates/config/config_4.0.ini @@ -0,0 +1,94 @@ +[ffmpeg] +Version = 4.0.4 + +[libaom] +Version = 1.0.0-errata1 +Flags = --enable-libaom, --extra-libs=-lpthread + +[libass] +Version = 0.14.0 +DependsOn = libfreetype, libfribidi, libfontconfig +Flags = --enable-libass + +[libfdk-aac] +Version = 0.1.6 +Flags = --enable-libfdk_aac, --enable-nonfree + +[libfontconfig] +Version = 2.13.1 + +[libfreetype] +Version = 2.10.0 +Flags = --enable-libfreetype + +[libfribidi] +Version = 0.19.7 +SHA256sum = 3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 + +[libkvazaar] +Version = 1.2.0 +Flags = --enable-libkvazaar + +[libmp3lame] +Version = 3.100 +Flags = --enable-libmp3lame + +[libogg] +Version = 1.3.3 +SHA256sum = c2e8a485110b97550f453226ec644ebac6cb29d1caef2902c007edab4308d985 + +[libopencore-amr] +Version = 0.1.5 +Flags = --enable-libopencore-amrnb, --enable-libopencore-amrwb, --enable-version3 + +[libopenjpeg] +Version = 2.3.1 +Flags = --enable-libopenjpeg + +[libopus] +Version = 1.3.1 +SHA256sum = 65b58e1e25b2a114157014736a3d9dfeaad8d41be1c8179866f144a2fb44ff9d +Flags = --enable-libopus + +[libtheora] +Version = 1.1.1 +SHA256sum = 40952956c47811928d1e7922cda3bc1f427eb75680c3c37249c91e949054916b +DependsOn = libogg +Flags = --enable-libtheora + +[libvidstab] +Version = 1.1.0 +SHA256sum = 14d2a053e56edad4f397be0cb3ef8eb1ec3150404ce99a426c4eb641861dc0bb +Flags = --enable-libvidstab, --enable-gpl + +[libvorbis] +Version = 1.3.6 +SHA256sum = 6ed40e0241089a42c48604dc00e362beee00036af2d8b3f46338031c9e0351cb +DependsOn = libogg +Flags = --enable-libvorbis + +[libvpx] +Version = 1.8.0 +Flags = --enable-libvpx + +[libx264] +Version = 20190526-2245-stable +Flags = --enable-libx264 + +[libx265] +Version = 3.0 +Flags = --enable-libx265 + +[libxvid] +Version = 1.3.5 +Flags = --enable-libxvid + +[vaapi] +Flags = --enable-vaapi +Install = libva +InstallDev = libva-dev + +[nvenc] +Version=9.0.18.1 +Flags = --enable-cuda, --enable-nvenc, --enable-cuvid +Variants = nvidia \ No newline at end of file diff --git a/templates/config/config_4.1.ini b/templates/config/config_4.1.ini new file mode 100644 index 000000000..a06710c89 --- /dev/null +++ b/templates/config/config_4.1.ini @@ -0,0 +1,99 @@ +[ffmpeg] +Version = 4.1.3 + +[libaom] +Version = 1.0.0-errata1 +Flags = --enable-libaom, --extra-libs=-lpthread + +[libass] +Version = 0.14.0 +DependsOn = libfreetype, libfribidi, libfontconfig +Flags = --enable-libass + +[libfdk-aac] +Version = 2.0.0 +Flags = --enable-libfdk_aac, --enable-nonfree + +[libfontconfig] +Version = 2.13.1 + +[libfreetype] +Version = 2.10.0 +Flags = --enable-libfreetype + +[libfribidi] +Version = 0.19.7 +SHA256sum = 3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 + +[libkvazaar] +Version = 1.2.0 +Flags = --enable-libkvazaar + +[libmp3lame] +Version = 3.100 +Flags = --enable-libmp3lame + +[libogg] +Version = 1.3.3 +SHA256sum = c2e8a485110b97550f453226ec644ebac6cb29d1caef2902c007edab4308d985 + +[libopencore-amr] +Version = 0.1.5 +Flags = --enable-libopencore-amrnb, --enable-libopencore-amrwb, --enable-version3 + +[libopenjpeg] +Version = 2.3.1 +Flags = --enable-libopenjpeg + +[libopus] +Version = 1.3.1 +SHA256sum = 65b58e1e25b2a114157014736a3d9dfeaad8d41be1c8179866f144a2fb44ff9d +Flags = --enable-libopus + +[libtheora] +Version = 1.1.1 +SHA256sum = 40952956c47811928d1e7922cda3bc1f427eb75680c3c37249c91e949054916b +DependsOn = libogg +Flags = --enable-libtheora + +[libvidstab] +Version = 1.1.0 +SHA256sum = 14d2a053e56edad4f397be0cb3ef8eb1ec3150404ce99a426c4eb641861dc0bb +Flags = --enable-libvidstab, --enable-gpl + +[libvorbis] +Version = 1.3.6 +SHA256sum = 6ed40e0241089a42c48604dc00e362beee00036af2d8b3f46338031c9e0351cb +DependsOn = libogg +Flags = --enable-libvorbis + +[libvpx] +Version = 1.8.0 +Flags = --enable-libvpx + +[libx264] +Version = 20190526-2245-stable +Flags = --enable-libx264 + +[libx265] +Version = 3.0 +Flags = --enable-libx265 + +[libxvid] +Version = 1.3.5 +Flags = --enable-libxvid + +[vaapi] +Flags = --enable-vaapi +Install = libva +InstallDev = libva-dev + +[nvenc] +Version=9.0.18.1 +Flags = --enable-cuda, --enable-nvenc, --enable-cuvid +Variants = nvidia + +[vdpau] +Flags = --enable-vdpau +Install = libvdpau +InstallDev = libvdpau-dev \ No newline at end of file diff --git a/templates/config/config_snapshot.ini b/templates/config/config_snapshot.ini new file mode 100644 index 000000000..c55c64bb6 --- /dev/null +++ b/templates/config/config_snapshot.ini @@ -0,0 +1,98 @@ +[ffmpeg] +Version = snapshot + +[libaom] +Version = 1.0.0-errata1 +Flags = --enable-libaom, --extra-libs=-lpthread + +[libass] +Version = 0.14.0 +DependsOn = libfreetype, libfribidi, libfontconfig +Flags = --enable-libass + +[libfdk-aac] +Version = 2.0.0 +Flags = --enable-libfdk_aac, --enable-nonfree + +[libfontconfig] +Version = 2.13.1 + +[libfreetype] +Version = 2.10.0 +Flags = --enable-libfreetype + +[libfribidi] +Version = 0.19.7 +SHA256sum = 3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 + +[libkvazaar] +Version = 1.2.0 +Flags = --enable-libkvazaar + +[libmp3lame] +Version = 3.100 +Flags = --enable-libmp3lame + +[libogg] +Version = 1.3.3 +SHA256sum = c2e8a485110b97550f453226ec644ebac6cb29d1caef2902c007edab4308d985 + +[libopencore-amr] +Version = 0.1.5 +Flags = --enable-libopencore-amrnb, --enable-libopencore-amrwb, --enable-version3 + +[libopenjpeg] +Version = 2.3.1 +Flags = --enable-libopenjpeg + +[libopus] +Version = 1.3.1 +SHA256sum = 65b58e1e25b2a114157014736a3d9dfeaad8d41be1c8179866f144a2fb44ff9d +Flags = --enable-libopus + +[libtheora] +Version = 1.1.1 +SHA256sum = 40952956c47811928d1e7922cda3bc1f427eb75680c3c37249c91e949054916b +DependsOn = libogg +Flags = --enable-libtheora + +[libvidstab] +Version = 1.1.0 +SHA256sum = 14d2a053e56edad4f397be0cb3ef8eb1ec3150404ce99a426c4eb641861dc0bb +Flags = --enable-libvidstab, --enable-gpl + +[libvorbis] +Version = 1.3.6 +SHA256sum = 6ed40e0241089a42c48604dc00e362beee00036af2d8b3f46338031c9e0351cb +DependsOn = libogg +Flags = --enable-libvorbis + +[libvpx] +Version = 1.8.0 +Flags = --enable-libvpx + +[libx264] +Version = 20190526-2245-stable +Flags = --enable-libx264 + +[libx265] +Version = 3.0 +Flags = --enable-libx265 + +[libxvid] +Version = 1.3.5 +Flags = --enable-libxvid + +[vaapi] +Flags = --enable-vaapi +Install = libva +InstallDev = libva-dev + +[nvenc] +Version=9.0.18.1 +Flags = --enable-cuda, --enable-nvenc, --enable-cuvid +Variants = nvidia + +[libdav1d] +Version=0.3.1 +Flags= --enable-libdav1d \ No newline at end of file diff --git a/templates/fragments/ffmpeg b/templates/fragments/ffmpeg new file mode 100644 index 000000000..00d6d6243 --- /dev/null +++ b/templates/fragments/ffmpeg @@ -0,0 +1,24 @@ +RUN \ + DIR=ffmpeg && mkdir -p ${DIR} && cd ${DIR} && \ + curl -sLO https://ffmpeg.org/releases/ffmpeg-${FFMPEG_VERSION}.tar.bz2 && \ + tar -jx --strip-components=1 -f ffmpeg-${FFMPEG_VERSION}.tar.bz2 && \ + ./configure \ + --disable-debug \ + --disable-doc \ + --disable-ffplay \ + --enable-shared \ + --enable-avresample \ + --enable-openssl \ + --enable-postproc \ + --enable-small \ + --extra-cflags="-I${PREFIX}/include -I/usr/local/include" \ + --extra-ldflags="-L${PREFIX}/lib -L/usr/local/lib" \ + $lib_flags \ + --prefix="${PREFIX}" && \ + make && \ + make install && \ + make distclean && \ + hash -r && \ + cd tools && \ + make qt-faststart && \ + cp qt-faststart ${PREFIX}/bin \ No newline at end of file diff --git a/templates/fragments/libaom b/templates/fragments/libaom new file mode 100644 index 000000000..d60d431a6 --- /dev/null +++ b/templates/fragments/libaom @@ -0,0 +1,11 @@ +RUN \ + DIR=aom && \ + git clone --branch v${LIBAOM_VERSION} --depth 1 https://aomedia.googlesource.com/aom ${DIR} ; \ + cd ${DIR} ; \ + rm -rf CMakeCache.txt CMakeFiles ; \ + mkdir -p ./aom_build ; \ + cd ./aom_build ; \ + cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" -DBUILD_SHARED_LIBS=1 ..; \ + make ; \ + make install ; \ + rm -rf ${DIR} \ No newline at end of file diff --git a/templates/fragments/libass b/templates/fragments/libass new file mode 100644 index 000000000..f3f6aa318 --- /dev/null +++ b/templates/fragments/libass @@ -0,0 +1,11 @@ +RUN \ + DIR=libass && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/libass/libass/archive/${LIBASS_VERSION}.tar.gz &&\ + tar -zx --strip-components=1 -f ${LIBASS_VERSION}.tar.gz && \ + ./autogen.sh && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} \ No newline at end of file diff --git a/templates/fragments/libdav1d b/templates/fragments/libdav1d new file mode 100644 index 000000000..24a46e3a7 --- /dev/null +++ b/templates/fragments/libdav1d @@ -0,0 +1,10 @@ +## dav1d https://code.videolan.org/videolan/dav1d +RUN \ + DIR=dav1d && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://code.videolan.org/videolan/dav1d/-/archive/${LIBDAV1D_VERSION}/dav1d-${LIBDAV1D_VERSION}.tar.gz && \ + tar -zx --strip-components=1 -f dav1d-${LIBDAV1D_VERSION}.tar.gz && \ + meson build --prefix ${PREFIX} --buildtype release && \ + ninja -C build install && \ + rm -rf ${DIR} \ No newline at end of file diff --git a/templates/fragments/libfdk-aac b/templates/fragments/libfdk-aac new file mode 100644 index 000000000..2f6768f2d --- /dev/null +++ b/templates/fragments/libfdk-aac @@ -0,0 +1,12 @@ +### fdk-aac https://github.com/mstorsjo/fdk-aac +RUN \ + DIR=fdk-aac && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://github.com/mstorsjo/fdk-aac/archive/v${LIBFDK_AAC_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + autoreconf -fiv && \ + ./configure --prefix="${PREFIX}" --enable-shared --datadir="${DIR}" && \ + make && \ + make install && \ + rm -rf ${DIR} \ No newline at end of file diff --git a/templates/fragments/libfontconfig b/templates/fragments/libfontconfig new file mode 100644 index 000000000..6fed3e4bd --- /dev/null +++ b/templates/fragments/libfontconfig @@ -0,0 +1,11 @@ +## fontconfig https://www.freedesktop.org/wiki/Software/fontconfig/ +RUN \ + DIR=fontconfig && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://www.freedesktop.org/software/fontconfig/release/fontconfig-${LIBFONTCONFIG_VERSION}.tar.bz2 &&\ + tar -jx --strip-components=1 -f fontconfig-${LIBFONTCONFIG_VERSION}.tar.bz2 && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} \ No newline at end of file diff --git a/templates/fragments/libfreetype b/templates/fragments/libfreetype new file mode 100644 index 000000000..85f084118 --- /dev/null +++ b/templates/fragments/libfreetype @@ -0,0 +1,11 @@ +## freetype https://www.freetype.org/ +RUN \ + DIR=freetype && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://download.savannah.gnu.org/releases/freetype/freetype-${LIBFREETYPE_VERSION}.tar.gz && \ + tar -zx --strip-components=1 -f freetype-${LIBFREETYPE_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} \ No newline at end of file diff --git a/templates/fragments/libfribidi b/templates/fragments/libfribidi new file mode 100644 index 000000000..99469ca4b --- /dev/null +++ b/templates/fragments/libfribidi @@ -0,0 +1,15 @@ +## fridibi https://www.fribidi.org/ +# + https://github.com/fribidi/fribidi/issues/8 +RUN \ + DIR=fribidi && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/fribidi/fribidi/archive/${LIBFRIBIDI_VERSION}.tar.gz && \ + echo "${LIBFRIBIDI_SHA256SUM} ${LIBFRIBIDI_VERSION}.tar.gz" | sha256sum --check && \ + tar -zx --strip-components=1 -f ${LIBFRIBIDI_VERSION}.tar.gz && \ + sed -i 's/^SUBDIRS =.*/SUBDIRS=gen.tab charset lib/' Makefile.am && \ + ./bootstrap --no-config && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ + make -j 1 && \ + make install && \ + rm -rf ${DIR} \ No newline at end of file diff --git a/templates/fragments/libkvazaar b/templates/fragments/libkvazaar new file mode 100644 index 000000000..94e80bd61 --- /dev/null +++ b/templates/fragments/libkvazaar @@ -0,0 +1,16 @@ +## kvazaar https://github.com/ultravideo/kvazaar +RUN \ + DIR=kvazaar && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/ultravideo/kvazaar/archive/v${LIBKVAZAAR_VERSION}.tar.gz &&\ + tar -zx --strip-components=1 -f v${LIBKVAZAAR_VERSION}.tar.gz && \ + if [ -e ./autogen.sh ]; then \ + ./autogen.sh && \ + ./configure -prefix="${PREFIX}" --disable-static --enable-shared ; \ + else \ + cd src ; \ + fi && \ + make && \ + make install && \ + rm -rf ${DIR} \ No newline at end of file diff --git a/templates/fragments/libmp3lame b/templates/fragments/libmp3lame new file mode 100644 index 000000000..06a6f4b1e --- /dev/null +++ b/templates/fragments/libmp3lame @@ -0,0 +1,11 @@ +### libmp3lame http://lame.sourceforge.net/ +RUN \ + DIR=lame && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://kent.dl.sourceforge.net/project/lame/lame/$(echo ${LIBMP3LAME_VERSION} | sed -e 's/[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)/\1.\2/')/lame-${LIBMP3LAME_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" --enable-shared --enable-nasm --enable-pic && \ + make && \ + make install && \ + rm -rf ${DIR} \ No newline at end of file diff --git a/templates/fragments/libogg b/templates/fragments/libogg new file mode 100644 index 000000000..d93368e15 --- /dev/null +++ b/templates/fragments/libogg @@ -0,0 +1,12 @@ +## libogg https://www.xiph.org/ogg/ +RUN \ + DIR=ogg && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO http://downloads.xiph.org/releases/ogg/libogg-${LIBOGG_VERSION}.tar.gz && \ + echo "${LIBOGG_SHA256SUM} libogg-${LIBOGG_VERSION}.tar.gz" | sha256sum --check && \ + tar -zx --strip-components=1 -f libogg-${LIBOGG_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} \ No newline at end of file diff --git a/templates/fragments/libopencore-amr b/templates/fragments/libopencore-amr new file mode 100644 index 000000000..0eb21a18b --- /dev/null +++ b/templates/fragments/libopencore-amr @@ -0,0 +1,11 @@ +## opencore-amr https://sourceforge.net/projects/opencore-amr/ +RUN \ + DIR=opencore-amr && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://kent.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${LIBOPENCORE_AMR_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} \ No newline at end of file diff --git a/templates/fragments/libopenjpeg b/templates/fragments/libopenjpeg new file mode 100644 index 000000000..2c5c89747 --- /dev/null +++ b/templates/fragments/libopenjpeg @@ -0,0 +1,16 @@ +## openjpeg https://github.com/uclouvain/openjpeg +RUN \ + DIR=openjpeg && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + if test `echo ${LIBOPENJPEG_VERSION} | tr -d '.'` -ge '210'; then \ + version_prefix='v'; \ + else \ + version_prefix='version.' ;\ + fi && \ + curl -sL https://github.com/uclouvain/openjpeg/archive/${version_prefix}${LIBOPENJPEG_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + cmake -DBUILD_THIRDPARTY:BOOL=ON -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ + make && \ + make install && \ + rm -rf ${DIR} \ No newline at end of file diff --git a/templates/fragments/libopus b/templates/fragments/libopus new file mode 100644 index 000000000..a5a3f9d58 --- /dev/null +++ b/templates/fragments/libopus @@ -0,0 +1,12 @@ +RUN \ + DIR=opus && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://archive.mozilla.org/pub/opus/opus-${LIBOPUS_VERSION}.tar.gz && \ + echo "${LIBOPUS_SHA256SUM} opus-${LIBOPUS_VERSION}.tar.gz"| sha256sum --check && \ + tar -zx --strip-components=1 -f opus-${LIBOPUS_VERSION}.tar.gz && \ + autoreconf -fiv && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} \ No newline at end of file diff --git a/templates/fragments/libtheora b/templates/fragments/libtheora new file mode 100644 index 000000000..431728745 --- /dev/null +++ b/templates/fragments/libtheora @@ -0,0 +1,12 @@ +### libtheora http://www.theora.org/ +RUN \ + DIR=theora && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO http://downloads.xiph.org/releases/theora/libtheora-${LIBTHEORA_VERSION}.tar.gz && \ + echo "${LIBTHEORA_SHA256SUM} libtheora-${LIBTHEORA_VERSION}.tar.gz" | sha256sum --check && \ + tar -zx --strip-components=1 -f libtheora-${LIBTHEORA_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} \ No newline at end of file diff --git a/templates/fragments/libvidstab b/templates/fragments/libvidstab new file mode 100644 index 000000000..198daa7e3 --- /dev/null +++ b/templates/fragments/libvidstab @@ -0,0 +1,12 @@ +## libvstab https://github.com/georgmartius/vid.stab +RUN \ + DIR=vid.stab && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/georgmartius/vid.stab/archive/v${LIBVIDSTAB_VERSION}.tar.gz &&\ + echo "${LIBVIDSTAB_SHA256SUM} v${LIBVIDSTAB_VERSION}.tar.gz" | sha256sum --check && \ + tar -zx --strip-components=1 -f v${LIBVIDSTAB_VERSION}.tar.gz && \ + cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ + make && \ + make install && \ + rm -rf ${DIR} \ No newline at end of file diff --git a/templates/fragments/libvorbis b/templates/fragments/libvorbis new file mode 100644 index 000000000..cd8285542 --- /dev/null +++ b/templates/fragments/libvorbis @@ -0,0 +1,12 @@ +### libvorbis https://xiph.org/vorbis/ +RUN \ + DIR=vorbis && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO http://downloads.xiph.org/releases/vorbis/libvorbis-${LIBVORBIS_VERSION}.tar.gz && \ + echo "${LIBVORBIS_SHA256SUM} libvorbis-${LIBVORBIS_VERSION}.tar.gz" | sha256sum --check && \ + tar -zx --strip-components=1 -f libvorbis-${LIBVORBIS_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} \ No newline at end of file diff --git a/templates/fragments/libvpx b/templates/fragments/libvpx new file mode 100644 index 000000000..c8460983d --- /dev/null +++ b/templates/fragments/libvpx @@ -0,0 +1,12 @@ +### libvpx https://www.webmproject.org/code/ +RUN \ + DIR=vpx && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://codeload.github.com/webmproject/libvpx/tar.gz/v${LIBVPX_VERSION} | \ + tar -zx --strip-components=1 && \ + ./configure --prefix="${PREFIX}" --enable-vp8 --enable-vp9 --enable-vp9-highbitdepth --enable-pic --enable-shared \ + --disable-debug --disable-examples --disable-docs && \ + make && \ + make install && \ + rm -rf ${DIR} diff --git a/templates/fragments/libx264 b/templates/fragments/libx264 new file mode 100644 index 000000000..af230c59c --- /dev/null +++ b/templates/fragments/libx264 @@ -0,0 +1,11 @@ +## x264 http://www.videolan.org/developers/x264.html +RUN \ + DIR=x264 && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://download.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-${LIBX264_VERSION}.tar.bz2 | \ + tar -jx --strip-components=1 && \ + ./configure --prefix="${PREFIX}" --enable-shared --enable-pic && \ + make && \ + make install && \ + rm -rf ${DIR} \ No newline at end of file diff --git a/templates/fragments/libx265 b/templates/fragments/libx265 new file mode 100644 index 000000000..c45da2910 --- /dev/null +++ b/templates/fragments/libx265 @@ -0,0 +1,13 @@ +### x265 http://x265.org/ +RUN \ + DIR=x265 && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://download.videolan.org/pub/videolan/x265/x265_${LIBX265_VERSION}.tar.gz | \ + tar -zx && \ + cd x265_${LIBX265_VERSION}/build/linux && \ + sed -i "/-DEXTRA_LIB/ s/$/ -DCMAKE_INSTALL_PREFIX=\${PREFIX}/" multilib.sh && \ + sed -i "/^cmake/ s/$/ -DENABLE_CLI=ON/" multilib.sh && \ + ./multilib.sh && \ + make -C 8bit install && \ + rm -rf ${DIR} \ No newline at end of file diff --git a/templates/fragments/libxvid b/templates/fragments/libxvid new file mode 100644 index 000000000..e8c3f10e2 --- /dev/null +++ b/templates/fragments/libxvid @@ -0,0 +1,12 @@ +### xvid https://www.xvid.com/ +RUN \ + DIR=xvid && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO http://downloads.xvid.org/downloads/xvidcore-${LIBXVID_VERSION}.tar.gz && \ + tar -zx -f xvidcore-${LIBXVID_VERSION}.tar.gz && \ + cd xvidcore/build/generic && \ + ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" --datadir="${DIR}" --enable-shared --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} \ No newline at end of file diff --git a/templates/fragments/nvenc b/templates/fragments/nvenc new file mode 100644 index 000000000..de0cea90d --- /dev/null +++ b/templates/fragments/nvenc @@ -0,0 +1,8 @@ +RUN \ + DIR=nv-codec-headers && \ + git clone --branch n${NVENC_VERSION} --depth=1 https://git.videolan.org/git/ffmpeg/nv-codec-headers.git ${DIR} && \ + cd ${DIR} && \ + sed -i 's@/usr/local@'"$PREFIX"'@' Makefile && \ + make && \ + make install && \ + rm -rf ${DIR} \ No newline at end of file diff --git a/templates/fragments/vaapi b/templates/fragments/vaapi new file mode 100644 index 000000000..e69de29bb diff --git a/templates/fragments/vdpau b/templates/fragments/vdpau new file mode 100644 index 000000000..e69de29bb diff --git a/templates/variants/Dockerfile.alpine b/templates/variants/Dockerfile.alpine new file mode 100644 index 000000000..62a53761c --- /dev/null +++ b/templates/variants/Dockerfile.alpine @@ -0,0 +1,47 @@ +FROM alpine:3.9 as base + +RUN apk add --no-cache --update $packages \ + libgcc \ + libstdc++ \ + ca-certificates \ + libcrypto1.1 \ + libssl1.1 \ + libgomp \ + expat \ + libuuid + +FROM base as build + +WORKDIR /tmp/workdir + +ARG PREFIX=$prefix +ARG MAKEFLAGS=$makeflags +ARG PKG_CONFIG_PATH=$prefix/lib/pkgconfig + +RUN apk add --no-cache --update $dev_packages \ + autoconf \ + automake \ + bash \ + binutils \ + bzip2 \ + cmake \ + curl \ + coreutils \ + diffutils \ + file \ + g++ \ + git \ + gcc \ + gperf \ + libtool \ + make \ + python \ + openssl-dev \ + tar \ + yasm \ + nasm \ + zlib-dev \ + expat-dev \ + util-linux-dev \ + meson \ + ninja \ No newline at end of file diff --git a/templates/variants/Dockerfile.armv7 b/templates/variants/Dockerfile.armv7 new file mode 100644 index 000000000..da7477d07 --- /dev/null +++ b/templates/variants/Dockerfile.armv7 @@ -0,0 +1,47 @@ +FROM arm32v7/alpine:3.9 as base + +RUN apk add --no-cache --update $packages \ + libgcc \ + libstdc++ \ + ca-certificates \ + libcrypto1.1 \ + libssl1.1 \ + libgomp \ + expat \ + libuuid + +FROM base as build + +WORKDIR /tmp/workdir + +ARG PREFIX=$prefix +ARG MAKEFLAGS=$makeflags +ARG PKG_CONFIG_PATH=$prefix/lib/pkgconfig + +RUN apk add --no-cache --update $dev_packages \ + autoconf \ + automake \ + bash \ + binutils \ + bzip2 \ + cmake \ + curl \ + coreutils \ + diffutils \ + file \ + g++ \ + git \ + gcc \ + gperf \ + libtool \ + make \ + python \ + openssl-dev \ + tar \ + yasm \ + nasm \ + zlib-dev \ + expat-dev \ + util-linux-dev \ + meson \ + ninja \ No newline at end of file diff --git a/templates/variants/Dockerfile.centos b/templates/variants/Dockerfile.centos new file mode 100644 index 000000000..ea82aed7c --- /dev/null +++ b/templates/variants/Dockerfile.centos @@ -0,0 +1,83 @@ +FROM centos:7 as base + +RUN yum -y install $packages libgomp libuuid && \ + echo "/usr/local/lib" > /etc/ld.so.conf.d/local.conf && \ + echo "/usr/local/lib64" >> /etc/ld.so.conf.d/local.conf + +FROM base as build + +WORKDIR /tmp/workdir + +ARG PREFIX=$prefix +ARG MAKEFLAGS=$makeflags +ARG PKG_CONFIG_PATH=$prefix/lib/pkgconfig:$prefix/lib64/pkgconfig + +RUN yum --enablerepo=extras install -y epel-release && \ + yum install -y \ + $dev_packages \ + autoconf \ + automake \ + bzip2 \ + cmake \ + expat-devel \ + gcc \ + gcc-c++ \ + git \ + gperf \ + libtool \ + make \ + nasm \ + perl \ + openssl-devel \ + tar \ + yasm \ + which \ + zlib-devel \ + libuuid-devel \ + libcurl-devel \ + xz-devel \ + libarchive-devel \ + python36 \ + python36-pip + +#Centos is missing recent version of CMake (>= 3.5) +RUN \ + DIR=/tmp/cmake && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://cmake.org/files/v3.5/cmake-3.5.2.tar.gz | \ + tar -zx --strip-components=1 && \ + ./bootstrap --system-libs --no-system-jsoncpp && \ + make && \ + make install && \ + rm -rf ${DIR} + +#Centos is missing recent version of nasm (>= 2.13) +RUN \ + DIR=/tmp/nasm && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://www.nasm.us/pub/nasm/releasebuilds/2.13.03/nasm-2.13.03.tar.gz | \ + tar -zx --strip-components=1 && \ + ./configure --prefix="/usr" && \ + make && \ + make install && \ + rm -rf ${DIR} + +#Centos is missing ninja +RUN \ + DIR=/tmp/ninja && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://github.com/ninja-build/ninja/archive/v1.9.0.tar.gz | \ + tar -zx --strip-components=1 && \ + python configure.py --bootstrap && \ + cp ./ninja /usr/bin/ && \ + rm -rf ${DIR} + +RUN \ + DIR=/tmp/meson && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + pip3 install meson && \ + rm -rf ${DIR} \ No newline at end of file diff --git a/templates/variants/Dockerfile.nvidia b/templates/variants/Dockerfile.nvidia new file mode 100644 index 000000000..c52c5ce74 --- /dev/null +++ b/templates/variants/Dockerfile.nvidia @@ -0,0 +1,41 @@ +FROM nvidia/cuda:10.1-runtime-ubuntu18.04 AS base + +ENV NVIDIA_DRIVER_CAPABILITIES=video + +RUN apt-get -yqq update && \ + apt-get install -yq --no-install-recommends $packages ca-certificates expat libgomp1 libuuid1 libssl1.0 && \ + apt-get autoremove -y && \ + apt-get clean -y + +FROM base as build + +WORKDIR /tmp/workdir + +ARG PREFIX=$prefix +ARG MAKEFLAGS=$makeflags +ARG PKG_CONFIG_PATH=$prefix/lib/pkgconfig +ARG C_INCLUDE_PATH=$prefix/include/ffnvcodec + +RUN apt-get -yqq update && \ + apt-get install -yq --no-install-recommends \ + $dev_packages \ + autoconf \ + automake \ + cmake \ + curl \ + bzip2 \ + libexpat1-dev \ + g++ \ + gcc \ + git \ + gperf \ + libtool \ + make \ + nasm \ + perl \ + pkg-config \ + python \ + libssl1.0-dev \ + yasm \ + zlib1g-dev \ + uuid-dev \ No newline at end of file diff --git a/templates/variants/Dockerfile.ubuntu b/templates/variants/Dockerfile.ubuntu new file mode 100644 index 000000000..89963d668 --- /dev/null +++ b/templates/variants/Dockerfile.ubuntu @@ -0,0 +1,40 @@ +FROM ubuntu:18.04 AS base + +RUN apt-get -yqq update && \ + apt-get install -yq --no-install-recommends $packages ca-certificates expat libgomp1 libuuid1 libssl1.0 && \ + apt-get autoremove -y && \ + apt-get clean -y + +FROM base as build + +WORKDIR /tmp/workdir + +ARG PREFIX=$prefix +ARG MAKEFLAGS=$makeflags +ARG PKG_CONFIG_PATH=$prefix/lib/pkgconfig + +RUN apt-get -yqq update && \ + apt-get install -yq --no-install-recommends \ + $dev_packages \ + autoconf \ + automake \ + cmake \ + curl \ + bzip2 \ + libexpat1-dev \ + g++ \ + gcc \ + git \ + gperf \ + libtool \ + make \ + nasm \ + perl \ + pkg-config \ + python \ + libssl1.0-dev \ + yasm \ + zlib1g-dev \ + uuid-dev \ + ninja-build \ + meson \ No newline at end of file diff --git a/templates/variants/packages.ini b/templates/variants/packages.ini new file mode 100644 index 000000000..cf2e91ffe --- /dev/null +++ b/templates/variants/packages.ini @@ -0,0 +1,30 @@ +[ubuntu] +libva = libva2 libva-drm2 i965-va-driver +libva-dev = libva-dev +libssl1.0 = libssl1.0 +libssl1.0-dev = libssl1.0-dev +libvdpau = libvdpau1 +libvdpau-dev = libvdpau-dev + +[centos] +libva = libva +libva-dev = libva-devel +libvdpau = libvdpau +libvdpau-dev = libvdpau-devel + + +[alpine] +libva = libva +libva-dev = libva-dev +libssl1.0 = libressl +libssl1.0-dev = libressl-dev +libvdpau = libvdpau +libvdpau-dev = libvdpau-dev + +[nvidia] +libva = libva2 libva-drm2 i965-va-driver +libva-dev = libva-dev +libssl1.0 = libssl1.0 +libssl1.0-dev = libssl1.0-dev +libvdpau = libvdpau1 +libvdpau-dev = libvdpau-dev