From d4fcf0dcb39a905d4c8659fdc8442c4e14e2aba0 Mon Sep 17 00:00:00 2001 From: Zennoe Date: Sat, 11 Jan 2020 16:01:46 +0100 Subject: [PATCH 1/8] updated from source libs to newest versions this involved updating version numbers, changing some download URLs, matching the respective sha256sums and adjusting build command chains. --- templates/Dockerfile-env | 45 ++++++++++++++++++++-------------------- templates/Dockerfile-run | 25 ++++++++++------------ 2 files changed, 33 insertions(+), 37 deletions(-) diff --git a/templates/Dockerfile-env b/templates/Dockerfile-env index 1e3802c8d..1215bed84 100644 --- a/templates/Dockerfile-env +++ b/templates/Dockerfile-env @@ -1,39 +1,38 @@ 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 \ + FDKAAC_VERSION=2.0.1 \ + FONTCONFIG_VERSION=2.13.92 \ + FREETYPE_VERSION=2.10.1 \ + FRIBIDI_VERSION=1.0.8 \ + KVAZAAR_VERSION=1.3.0 \ LAME_VERSION=3.100 \ - LIBASS_VERSION=0.13.7 \ + LIBASS_VERSION=0.14.0 \ LIBPTHREAD_STUBS_VERSION=0.4 \ LIBVIDSTAB_VERSION=1.1.0 \ LIBXCB_VERSION=1.13.1 \ XCBPROTO_VERSION=1.13 \ - OGG_VERSION=1.3.2 \ + OGG_VERSION=1.3.4 \ OPENCOREAMR_VERSION=0.1.5 \ - OPUS_VERSION=1.2 \ - OPENJPEG_VERSION=2.1.2 \ + OPUS_VERSION=1.3.1 \ + OPENJPEG_VERSION=2.3.1 \ 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 \ + VORBIS_VERSION=1.3.6 \ + VPX_VERSION=1.8.2 \ + WEBP_VERSION=1.0.3 \ + X265_VERSION=3.2.1 \ XAU_VERSION=1.0.9 \ XORG_MACROS_VERSION=1.19.2 \ XPROTO_VERSION=7.0.31 \ - XVID_VERSION=1.3.4 \ + XVID_VERSION=1.3.7 \ SRC=/usr/local -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 FREETYPE_SHA256SUM="3a60d391fd579440561bf0e7f31af2222bc610ad6ce4d9d7bd2165bca8669110 freetype-2.10.1.tar.gz" +ARG FRIBIDI_SHA256SUM="94c7b68d86ad2a9613b4dcffe7bbeb03523d63b5b37918bdf2e4ef34195c1e6c fribidi-1.0.8.tar.bz2" +ARG LIBASS_SHA256SUM="8d5a5c920b90b70a108007ffcd2289ac652c0e03fc88e6eecefa37df0f2e7fdf libass-0.14.0.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" +ARG OGG_SHA256SUM="fe5670640bd49e828d64d2879c31cb4dde9758681bb664f9bdbf159a01b0c76e libogg-1.3.4.tar.gz" +ARG OPUS_SHA256SUM="65b58e1e25b2a114157014736a3d9dfeaad8d41be1c8179866f144a2fb44ff9d opus-1.3.1.tar.gz" +ARG THEORA_SHA256SUM="b6ae1ee2fa3d42ac489287d3ec34c5885730b1296f0801ae577a35193d3affbc libtheora-1.1.1.tar.bz2" +ARG VORBIS_SHA256SUM="6ed40e0241089a42c48604dc00e362beee00036af2d8b3f46338031c9e0351cb libvorbis-1.3.6.tar.gz" +ARG XVID_SHA256SUM="abbdcbd39555691dd1c9b4d08f0a031376a3b211652c0d8b3b8aa9be1303ce2d xvidcore-1.3.7.tar.gz" diff --git a/templates/Dockerfile-run b/templates/Dockerfile-run index f8e3284a3..b0b8f2af1 100644 --- a/templates/Dockerfile-run +++ b/templates/Dockerfile-run @@ -14,7 +14,7 @@ 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 | \ + curl -sL https://code.videolan.org/videolan/x264/-/archive/stable/x264-stable.tar.bz2 | \ tar -jx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared --enable-pic --disable-cli && \ make && \ @@ -75,9 +75,9 @@ RUN \ DIR=/tmp/theora && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sLO http://downloads.xiph.org/releases/theora/libtheora-${THEORA_VERSION}.tar.gz && \ + curl -sLO http://downloads.xiph.org/releases/theora/libtheora-${THEORA_VERSION}.tar.bz2 && \ echo ${THEORA_SHA256SUM} | sha256sum --check && \ - tar -zx --strip-components=1 -f libtheora-${THEORA_VERSION}.tar.gz && \ + tar -jx --strip-components=1 -f libtheora-${THEORA_VERSION}.tar.bz2 && \ ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ make && \ make install && \ @@ -121,7 +121,7 @@ RUN \ DIR=/tmp/xvid && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sLO http://downloads.xvid.org/downloads/xvidcore-${XVID_VERSION}.tar.gz && \ + curl -sLO http://downloads.xvid.com/downloads/xvidcore-${XVID_VERSION}.tar.gz && \ echo ${XVID_SHA256SUM} | sha256sum --check && \ tar -zx -f xvidcore-${XVID_VERSION}.tar.gz && \ cd xvidcore/build/generic && \ @@ -182,12 +182,10 @@ RUN \ DIR=/tmp/fribidi && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sLO https://github.com/fribidi/fribidi/archive/${FRIBIDI_VERSION}.tar.gz && \ + curl -sLO https://github.com/fribidi/fribidi/releases/download/v${FRIBIDI_VERSION}/fribidi-${FRIBIDI_VERSION}.tar.bz2 && \ 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 && \ + tar -jx --strip-components=1 -f ${FRIBIDI_VERSION}.tar.bz2 && \ + ./autogen.sh && \ make -j 1 && \ make install && \ rm -rf ${DIR} @@ -196,8 +194,8 @@ 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 && \ + curl -sLO https://www.freedesktop.org/software/fontconfig/release/fontconfig-${FONTCONFIG_VERSION}.tar.gz &&\ + tar -zx --strip-components=1 -f fontconfig-${FONTCONFIG_VERSION}.tar.gz && \ ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ make && \ make install && \ @@ -207,10 +205,9 @@ RUN \ DIR=/tmp/libass && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sLO https://github.com/libass/libass/archive/${LIBASS_VERSION}.tar.gz &&\ + curl -sLO https://github.com/libass/libass/releases/download/${LIBASS_VERSION}/libass-${LIBASS_VERSION}.tar.gz &&\ echo ${LIBASS_SHA256SUM} | sha256sum --check && \ - tar -zx --strip-components=1 -f ${LIBASS_VERSION}.tar.gz && \ - ./autogen.sh && \ + tar -zx --strip-components=1 -f libass-${LIBASS_VERSION}.tar.gz && \ ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ make && \ make install && \ From a47d928c3749b542ca3094bbf6b0dcd9e452138a Mon Sep 17 00:00:00 2001 From: Zennoe Date: Sat, 11 Jan 2020 16:08:33 +0100 Subject: [PATCH 2/8] run ./update.py to apply template changes --- docker-images/3.2/alpine/Dockerfile | 70 +++++++++++------------ docker-images/3.2/centos/Dockerfile | 70 +++++++++++------------ docker-images/3.2/nvidia/Dockerfile | 70 +++++++++++------------ docker-images/3.2/scratch/Dockerfile | 70 +++++++++++------------ docker-images/3.2/ubuntu/Dockerfile | 70 +++++++++++------------ docker-images/3.2/vaapi/Dockerfile | 70 +++++++++++------------ docker-images/3.3/alpine/Dockerfile | 70 +++++++++++------------ docker-images/3.3/centos/Dockerfile | 70 +++++++++++------------ docker-images/3.3/nvidia/Dockerfile | 70 +++++++++++------------ docker-images/3.3/scratch/Dockerfile | 70 +++++++++++------------ docker-images/3.3/ubuntu/Dockerfile | 70 +++++++++++------------ docker-images/3.3/vaapi/Dockerfile | 70 +++++++++++------------ docker-images/3.4/alpine/Dockerfile | 70 +++++++++++------------ docker-images/3.4/centos/Dockerfile | 70 +++++++++++------------ docker-images/3.4/nvidia/Dockerfile | 70 +++++++++++------------ docker-images/3.4/scratch/Dockerfile | 70 +++++++++++------------ docker-images/3.4/ubuntu/Dockerfile | 70 +++++++++++------------ docker-images/3.4/vaapi/Dockerfile | 70 +++++++++++------------ docker-images/4.0/alpine/Dockerfile | 70 +++++++++++------------ docker-images/4.0/centos/Dockerfile | 70 +++++++++++------------ docker-images/4.0/nvidia/Dockerfile | 70 +++++++++++------------ docker-images/4.0/scratch/Dockerfile | 70 +++++++++++------------ docker-images/4.0/ubuntu/Dockerfile | 70 +++++++++++------------ docker-images/4.0/vaapi/Dockerfile | 70 +++++++++++------------ docker-images/4.1/alpine/Dockerfile | 70 +++++++++++------------ docker-images/4.1/centos/Dockerfile | 70 +++++++++++------------ docker-images/4.1/nvidia/Dockerfile | 70 +++++++++++------------ docker-images/4.1/scratch/Dockerfile | 70 +++++++++++------------ docker-images/4.1/ubuntu/Dockerfile | 70 +++++++++++------------ docker-images/4.1/vaapi/Dockerfile | 70 +++++++++++------------ docker-images/4.2/alpine/Dockerfile | 70 +++++++++++------------ docker-images/4.2/centos/Dockerfile | 70 +++++++++++------------ docker-images/4.2/nvidia/Dockerfile | 70 +++++++++++------------ docker-images/4.2/scratch/Dockerfile | 70 +++++++++++------------ docker-images/4.2/ubuntu/Dockerfile | 70 +++++++++++------------ docker-images/4.2/vaapi/Dockerfile | 70 +++++++++++------------ docker-images/snapshot/alpine/Dockerfile | 70 +++++++++++------------ docker-images/snapshot/centos/Dockerfile | 70 +++++++++++------------ docker-images/snapshot/nvidia/Dockerfile | 70 +++++++++++------------ docker-images/snapshot/scratch/Dockerfile | 70 +++++++++++------------ docker-images/snapshot/ubuntu/Dockerfile | 70 +++++++++++------------ docker-images/snapshot/vaapi/Dockerfile | 70 +++++++++++------------ 42 files changed, 1386 insertions(+), 1554 deletions(-) diff --git a/docker-images/3.2/alpine/Dockerfile b/docker-images/3.2/alpine/Dockerfile index f13fee978..b9df85197 100644 --- a/docker-images/3.2/alpine/Dockerfile +++ b/docker-images/3.2/alpine/Dockerfile @@ -20,42 +20,41 @@ ARG MAKEFLAGS="-j2" 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 \ + FDKAAC_VERSION=2.0.1 \ + FONTCONFIG_VERSION=2.13.92 \ + FREETYPE_VERSION=2.10.1 \ + FRIBIDI_VERSION=1.0.8 \ + KVAZAAR_VERSION=1.3.0 \ LAME_VERSION=3.100 \ - LIBASS_VERSION=0.13.7 \ + LIBASS_VERSION=0.14.0 \ LIBPTHREAD_STUBS_VERSION=0.4 \ LIBVIDSTAB_VERSION=1.1.0 \ LIBXCB_VERSION=1.13.1 \ XCBPROTO_VERSION=1.13 \ - OGG_VERSION=1.3.2 \ + OGG_VERSION=1.3.4 \ OPENCOREAMR_VERSION=0.1.5 \ - OPUS_VERSION=1.2 \ - OPENJPEG_VERSION=2.1.2 \ + OPUS_VERSION=1.3.1 \ + OPENJPEG_VERSION=2.3.1 \ 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 \ + VORBIS_VERSION=1.3.6 \ + VPX_VERSION=1.8.2 \ + WEBP_VERSION=1.0.3 \ + X265_VERSION=3.2.1 \ XAU_VERSION=1.0.9 \ XORG_MACROS_VERSION=1.19.2 \ XPROTO_VERSION=7.0.31 \ - XVID_VERSION=1.3.4 \ + XVID_VERSION=1.3.7 \ SRC=/usr/local -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 FREETYPE_SHA256SUM="3a60d391fd579440561bf0e7f31af2222bc610ad6ce4d9d7bd2165bca8669110 freetype-2.10.1.tar.gz" +ARG FRIBIDI_SHA256SUM="94c7b68d86ad2a9613b4dcffe7bbeb03523d63b5b37918bdf2e4ef34195c1e6c fribidi-1.0.8.tar.bz2" +ARG LIBASS_SHA256SUM="8d5a5c920b90b70a108007ffcd2289ac652c0e03fc88e6eecefa37df0f2e7fdf libass-0.14.0.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" +ARG OGG_SHA256SUM="fe5670640bd49e828d64d2879c31cb4dde9758681bb664f9bdbf159a01b0c76e libogg-1.3.4.tar.gz" +ARG OPUS_SHA256SUM="65b58e1e25b2a114157014736a3d9dfeaad8d41be1c8179866f144a2fb44ff9d opus-1.3.1.tar.gz" +ARG THEORA_SHA256SUM="b6ae1ee2fa3d42ac489287d3ec34c5885730b1296f0801ae577a35193d3affbc libtheora-1.1.1.tar.bz2" +ARG VORBIS_SHA256SUM="6ed40e0241089a42c48604dc00e362beee00036af2d8b3f46338031c9e0351cb libvorbis-1.3.6.tar.gz" +ARG XVID_SHA256SUM="abbdcbd39555691dd1c9b4d08f0a031376a3b211652c0d8b3b8aa9be1303ce2d xvidcore-1.3.7.tar.gz" @@ -98,7 +97,7 @@ 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 | \ + curl -sL https://code.videolan.org/videolan/x264/-/archive/stable/x264-stable.tar.bz2 | \ tar -jx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared --enable-pic --disable-cli && \ make && \ @@ -159,9 +158,9 @@ RUN \ DIR=/tmp/theora && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sLO http://downloads.xiph.org/releases/theora/libtheora-${THEORA_VERSION}.tar.gz && \ + curl -sLO http://downloads.xiph.org/releases/theora/libtheora-${THEORA_VERSION}.tar.bz2 && \ echo ${THEORA_SHA256SUM} | sha256sum --check && \ - tar -zx --strip-components=1 -f libtheora-${THEORA_VERSION}.tar.gz && \ + tar -jx --strip-components=1 -f libtheora-${THEORA_VERSION}.tar.bz2 && \ ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ make && \ make install && \ @@ -205,7 +204,7 @@ RUN \ DIR=/tmp/xvid && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sLO http://downloads.xvid.org/downloads/xvidcore-${XVID_VERSION}.tar.gz && \ + curl -sLO http://downloads.xvid.com/downloads/xvidcore-${XVID_VERSION}.tar.gz && \ echo ${XVID_SHA256SUM} | sha256sum --check && \ tar -zx -f xvidcore-${XVID_VERSION}.tar.gz && \ cd xvidcore/build/generic && \ @@ -266,12 +265,10 @@ RUN \ DIR=/tmp/fribidi && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sLO https://github.com/fribidi/fribidi/archive/${FRIBIDI_VERSION}.tar.gz && \ + curl -sLO https://github.com/fribidi/fribidi/releases/download/v${FRIBIDI_VERSION}/fribidi-${FRIBIDI_VERSION}.tar.bz2 && \ 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 && \ + tar -jx --strip-components=1 -f ${FRIBIDI_VERSION}.tar.bz2 && \ + ./autogen.sh && \ make -j 1 && \ make install && \ rm -rf ${DIR} @@ -280,8 +277,8 @@ 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 && \ + curl -sLO https://www.freedesktop.org/software/fontconfig/release/fontconfig-${FONTCONFIG_VERSION}.tar.gz &&\ + tar -zx --strip-components=1 -f fontconfig-${FONTCONFIG_VERSION}.tar.gz && \ ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ make && \ make install && \ @@ -291,10 +288,9 @@ RUN \ DIR=/tmp/libass && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sLO https://github.com/libass/libass/archive/${LIBASS_VERSION}.tar.gz &&\ + curl -sLO https://github.com/libass/libass/releases/download/${LIBASS_VERSION}/libass-${LIBASS_VERSION}.tar.gz &&\ echo ${LIBASS_SHA256SUM} | sha256sum --check && \ - tar -zx --strip-components=1 -f ${LIBASS_VERSION}.tar.gz && \ - ./autogen.sh && \ + tar -zx --strip-components=1 -f libass-${LIBASS_VERSION}.tar.gz && \ ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ make && \ make install && \ diff --git a/docker-images/3.2/centos/Dockerfile b/docker-images/3.2/centos/Dockerfile index a726fd25d..54d7badd5 100644 --- a/docker-images/3.2/centos/Dockerfile +++ b/docker-images/3.2/centos/Dockerfile @@ -22,42 +22,41 @@ ARG MAKEFLAGS="-j2" 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 \ + FDKAAC_VERSION=2.0.1 \ + FONTCONFIG_VERSION=2.13.92 \ + FREETYPE_VERSION=2.10.1 \ + FRIBIDI_VERSION=1.0.8 \ + KVAZAAR_VERSION=1.3.0 \ LAME_VERSION=3.100 \ - LIBASS_VERSION=0.13.7 \ + LIBASS_VERSION=0.14.0 \ LIBPTHREAD_STUBS_VERSION=0.4 \ LIBVIDSTAB_VERSION=1.1.0 \ LIBXCB_VERSION=1.13.1 \ XCBPROTO_VERSION=1.13 \ - OGG_VERSION=1.3.2 \ + OGG_VERSION=1.3.4 \ OPENCOREAMR_VERSION=0.1.5 \ - OPUS_VERSION=1.2 \ - OPENJPEG_VERSION=2.1.2 \ + OPUS_VERSION=1.3.1 \ + OPENJPEG_VERSION=2.3.1 \ 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 \ + VORBIS_VERSION=1.3.6 \ + VPX_VERSION=1.8.2 \ + WEBP_VERSION=1.0.3 \ + X265_VERSION=3.2.1 \ XAU_VERSION=1.0.9 \ XORG_MACROS_VERSION=1.19.2 \ XPROTO_VERSION=7.0.31 \ - XVID_VERSION=1.3.4 \ + XVID_VERSION=1.3.7 \ SRC=/usr/local -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 FREETYPE_SHA256SUM="3a60d391fd579440561bf0e7f31af2222bc610ad6ce4d9d7bd2165bca8669110 freetype-2.10.1.tar.gz" +ARG FRIBIDI_SHA256SUM="94c7b68d86ad2a9613b4dcffe7bbeb03523d63b5b37918bdf2e4ef34195c1e6c fribidi-1.0.8.tar.bz2" +ARG LIBASS_SHA256SUM="8d5a5c920b90b70a108007ffcd2289ac652c0e03fc88e6eecefa37df0f2e7fdf libass-0.14.0.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" +ARG OGG_SHA256SUM="fe5670640bd49e828d64d2879c31cb4dde9758681bb664f9bdbf159a01b0c76e libogg-1.3.4.tar.gz" +ARG OPUS_SHA256SUM="65b58e1e25b2a114157014736a3d9dfeaad8d41be1c8179866f144a2fb44ff9d opus-1.3.1.tar.gz" +ARG THEORA_SHA256SUM="b6ae1ee2fa3d42ac489287d3ec34c5885730b1296f0801ae577a35193d3affbc libtheora-1.1.1.tar.bz2" +ARG VORBIS_SHA256SUM="6ed40e0241089a42c48604dc00e362beee00036af2d8b3f46338031c9e0351cb libvorbis-1.3.6.tar.gz" +ARG XVID_SHA256SUM="abbdcbd39555691dd1c9b4d08f0a031376a3b211652c0d8b3b8aa9be1303ce2d xvidcore-1.3.7.tar.gz" @@ -98,7 +97,7 @@ 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 | \ + curl -sL https://code.videolan.org/videolan/x264/-/archive/stable/x264-stable.tar.bz2 | \ tar -jx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared --enable-pic --disable-cli && \ make && \ @@ -159,9 +158,9 @@ RUN \ DIR=/tmp/theora && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sLO http://downloads.xiph.org/releases/theora/libtheora-${THEORA_VERSION}.tar.gz && \ + curl -sLO http://downloads.xiph.org/releases/theora/libtheora-${THEORA_VERSION}.tar.bz2 && \ echo ${THEORA_SHA256SUM} | sha256sum --check && \ - tar -zx --strip-components=1 -f libtheora-${THEORA_VERSION}.tar.gz && \ + tar -jx --strip-components=1 -f libtheora-${THEORA_VERSION}.tar.bz2 && \ ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ make && \ make install && \ @@ -205,7 +204,7 @@ RUN \ DIR=/tmp/xvid && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sLO http://downloads.xvid.org/downloads/xvidcore-${XVID_VERSION}.tar.gz && \ + curl -sLO http://downloads.xvid.com/downloads/xvidcore-${XVID_VERSION}.tar.gz && \ echo ${XVID_SHA256SUM} | sha256sum --check && \ tar -zx -f xvidcore-${XVID_VERSION}.tar.gz && \ cd xvidcore/build/generic && \ @@ -266,12 +265,10 @@ RUN \ DIR=/tmp/fribidi && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sLO https://github.com/fribidi/fribidi/archive/${FRIBIDI_VERSION}.tar.gz && \ + curl -sLO https://github.com/fribidi/fribidi/releases/download/v${FRIBIDI_VERSION}/fribidi-${FRIBIDI_VERSION}.tar.bz2 && \ 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 && \ + tar -jx --strip-components=1 -f ${FRIBIDI_VERSION}.tar.bz2 && \ + ./autogen.sh && \ make -j 1 && \ make install && \ rm -rf ${DIR} @@ -280,8 +277,8 @@ 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 && \ + curl -sLO https://www.freedesktop.org/software/fontconfig/release/fontconfig-${FONTCONFIG_VERSION}.tar.gz &&\ + tar -zx --strip-components=1 -f fontconfig-${FONTCONFIG_VERSION}.tar.gz && \ ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ make && \ make install && \ @@ -291,10 +288,9 @@ RUN \ DIR=/tmp/libass && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sLO https://github.com/libass/libass/archive/${LIBASS_VERSION}.tar.gz &&\ + curl -sLO https://github.com/libass/libass/releases/download/${LIBASS_VERSION}/libass-${LIBASS_VERSION}.tar.gz &&\ echo ${LIBASS_SHA256SUM} | sha256sum --check && \ - tar -zx --strip-components=1 -f ${LIBASS_VERSION}.tar.gz && \ - ./autogen.sh && \ + tar -zx --strip-components=1 -f libass-${LIBASS_VERSION}.tar.gz && \ ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ make && \ make install && \ diff --git a/docker-images/3.2/nvidia/Dockerfile b/docker-images/3.2/nvidia/Dockerfile index 4568df47b..7676c06ed 100644 --- a/docker-images/3.2/nvidia/Dockerfile +++ b/docker-images/3.2/nvidia/Dockerfile @@ -37,42 +37,41 @@ ARG MAKEFLAGS="-j12" 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 \ + FDKAAC_VERSION=2.0.1 \ + FONTCONFIG_VERSION=2.13.92 \ + FREETYPE_VERSION=2.10.1 \ + FRIBIDI_VERSION=1.0.8 \ + KVAZAAR_VERSION=1.3.0 \ LAME_VERSION=3.100 \ - LIBASS_VERSION=0.13.7 \ + LIBASS_VERSION=0.14.0 \ LIBPTHREAD_STUBS_VERSION=0.4 \ LIBVIDSTAB_VERSION=1.1.0 \ LIBXCB_VERSION=1.13.1 \ XCBPROTO_VERSION=1.13 \ - OGG_VERSION=1.3.2 \ + OGG_VERSION=1.3.4 \ OPENCOREAMR_VERSION=0.1.5 \ - OPUS_VERSION=1.2 \ - OPENJPEG_VERSION=2.1.2 \ + OPUS_VERSION=1.3.1 \ + OPENJPEG_VERSION=2.3.1 \ 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 \ + VORBIS_VERSION=1.3.6 \ + VPX_VERSION=1.8.2 \ + WEBP_VERSION=1.0.3 \ + X265_VERSION=3.2.1 \ XAU_VERSION=1.0.9 \ XORG_MACROS_VERSION=1.19.2 \ XPROTO_VERSION=7.0.31 \ - XVID_VERSION=1.3.4 \ + XVID_VERSION=1.3.7 \ SRC=/usr/local -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 FREETYPE_SHA256SUM="3a60d391fd579440561bf0e7f31af2222bc610ad6ce4d9d7bd2165bca8669110 freetype-2.10.1.tar.gz" +ARG FRIBIDI_SHA256SUM="94c7b68d86ad2a9613b4dcffe7bbeb03523d63b5b37918bdf2e4ef34195c1e6c fribidi-1.0.8.tar.bz2" +ARG LIBASS_SHA256SUM="8d5a5c920b90b70a108007ffcd2289ac652c0e03fc88e6eecefa37df0f2e7fdf libass-0.14.0.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" +ARG OGG_SHA256SUM="fe5670640bd49e828d64d2879c31cb4dde9758681bb664f9bdbf159a01b0c76e libogg-1.3.4.tar.gz" +ARG OPUS_SHA256SUM="65b58e1e25b2a114157014736a3d9dfeaad8d41be1c8179866f144a2fb44ff9d opus-1.3.1.tar.gz" +ARG THEORA_SHA256SUM="b6ae1ee2fa3d42ac489287d3ec34c5885730b1296f0801ae577a35193d3affbc libtheora-1.1.1.tar.bz2" +ARG VORBIS_SHA256SUM="6ed40e0241089a42c48604dc00e362beee00036af2d8b3f46338031c9e0351cb libvorbis-1.3.6.tar.gz" +ARG XVID_SHA256SUM="abbdcbd39555691dd1c9b4d08f0a031376a3b211652c0d8b3b8aa9be1303ce2d xvidcore-1.3.7.tar.gz" @@ -124,7 +123,7 @@ 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 | \ + curl -sL https://code.videolan.org/videolan/x264/-/archive/stable/x264-stable.tar.bz2 | \ tar -jx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared --enable-pic --disable-cli && \ make && \ @@ -185,9 +184,9 @@ RUN \ DIR=/tmp/theora && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sLO http://downloads.xiph.org/releases/theora/libtheora-${THEORA_VERSION}.tar.gz && \ + curl -sLO http://downloads.xiph.org/releases/theora/libtheora-${THEORA_VERSION}.tar.bz2 && \ echo ${THEORA_SHA256SUM} | sha256sum --check && \ - tar -zx --strip-components=1 -f libtheora-${THEORA_VERSION}.tar.gz && \ + tar -jx --strip-components=1 -f libtheora-${THEORA_VERSION}.tar.bz2 && \ ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ make && \ make install && \ @@ -231,7 +230,7 @@ RUN \ DIR=/tmp/xvid && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sLO http://downloads.xvid.org/downloads/xvidcore-${XVID_VERSION}.tar.gz && \ + curl -sLO http://downloads.xvid.com/downloads/xvidcore-${XVID_VERSION}.tar.gz && \ echo ${XVID_SHA256SUM} | sha256sum --check && \ tar -zx -f xvidcore-${XVID_VERSION}.tar.gz && \ cd xvidcore/build/generic && \ @@ -292,12 +291,10 @@ RUN \ DIR=/tmp/fribidi && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sLO https://github.com/fribidi/fribidi/archive/${FRIBIDI_VERSION}.tar.gz && \ + curl -sLO https://github.com/fribidi/fribidi/releases/download/v${FRIBIDI_VERSION}/fribidi-${FRIBIDI_VERSION}.tar.bz2 && \ 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 && \ + tar -jx --strip-components=1 -f ${FRIBIDI_VERSION}.tar.bz2 && \ + ./autogen.sh && \ make -j 1 && \ make install && \ rm -rf ${DIR} @@ -306,8 +303,8 @@ 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 && \ + curl -sLO https://www.freedesktop.org/software/fontconfig/release/fontconfig-${FONTCONFIG_VERSION}.tar.gz &&\ + tar -zx --strip-components=1 -f fontconfig-${FONTCONFIG_VERSION}.tar.gz && \ ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ make && \ make install && \ @@ -317,10 +314,9 @@ RUN \ DIR=/tmp/libass && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sLO https://github.com/libass/libass/archive/${LIBASS_VERSION}.tar.gz &&\ + curl -sLO https://github.com/libass/libass/releases/download/${LIBASS_VERSION}/libass-${LIBASS_VERSION}.tar.gz &&\ echo ${LIBASS_SHA256SUM} | sha256sum --check && \ - tar -zx --strip-components=1 -f ${LIBASS_VERSION}.tar.gz && \ - ./autogen.sh && \ + tar -zx --strip-components=1 -f libass-${LIBASS_VERSION}.tar.gz && \ ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ make && \ make install && \ diff --git a/docker-images/3.2/scratch/Dockerfile b/docker-images/3.2/scratch/Dockerfile index 5f34f3d27..cf8513fa7 100644 --- a/docker-images/3.2/scratch/Dockerfile +++ b/docker-images/3.2/scratch/Dockerfile @@ -15,42 +15,41 @@ ARG MAKEFLAGS="-j2" 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 \ + FDKAAC_VERSION=2.0.1 \ + FONTCONFIG_VERSION=2.13.92 \ + FREETYPE_VERSION=2.10.1 \ + FRIBIDI_VERSION=1.0.8 \ + KVAZAAR_VERSION=1.3.0 \ LAME_VERSION=3.100 \ - LIBASS_VERSION=0.13.7 \ + LIBASS_VERSION=0.14.0 \ LIBPTHREAD_STUBS_VERSION=0.4 \ LIBVIDSTAB_VERSION=1.1.0 \ LIBXCB_VERSION=1.13.1 \ XCBPROTO_VERSION=1.13 \ - OGG_VERSION=1.3.2 \ + OGG_VERSION=1.3.4 \ OPENCOREAMR_VERSION=0.1.5 \ - OPUS_VERSION=1.2 \ - OPENJPEG_VERSION=2.1.2 \ + OPUS_VERSION=1.3.1 \ + OPENJPEG_VERSION=2.3.1 \ 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 \ + VORBIS_VERSION=1.3.6 \ + VPX_VERSION=1.8.2 \ + WEBP_VERSION=1.0.3 \ + X265_VERSION=3.2.1 \ XAU_VERSION=1.0.9 \ XORG_MACROS_VERSION=1.19.2 \ XPROTO_VERSION=7.0.31 \ - XVID_VERSION=1.3.4 \ + XVID_VERSION=1.3.7 \ SRC=/usr/local -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 FREETYPE_SHA256SUM="3a60d391fd579440561bf0e7f31af2222bc610ad6ce4d9d7bd2165bca8669110 freetype-2.10.1.tar.gz" +ARG FRIBIDI_SHA256SUM="94c7b68d86ad2a9613b4dcffe7bbeb03523d63b5b37918bdf2e4ef34195c1e6c fribidi-1.0.8.tar.bz2" +ARG LIBASS_SHA256SUM="8d5a5c920b90b70a108007ffcd2289ac652c0e03fc88e6eecefa37df0f2e7fdf libass-0.14.0.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" +ARG OGG_SHA256SUM="fe5670640bd49e828d64d2879c31cb4dde9758681bb664f9bdbf159a01b0c76e libogg-1.3.4.tar.gz" +ARG OPUS_SHA256SUM="65b58e1e25b2a114157014736a3d9dfeaad8d41be1c8179866f144a2fb44ff9d opus-1.3.1.tar.gz" +ARG THEORA_SHA256SUM="b6ae1ee2fa3d42ac489287d3ec34c5885730b1296f0801ae577a35193d3affbc libtheora-1.1.1.tar.bz2" +ARG VORBIS_SHA256SUM="6ed40e0241089a42c48604dc00e362beee00036af2d8b3f46338031c9e0351cb libvorbis-1.3.6.tar.gz" +ARG XVID_SHA256SUM="abbdcbd39555691dd1c9b4d08f0a031376a3b211652c0d8b3b8aa9be1303ce2d xvidcore-1.3.7.tar.gz" @@ -95,7 +94,7 @@ 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 | \ + curl -sL https://code.videolan.org/videolan/x264/-/archive/stable/x264-stable.tar.bz2 | \ tar -jx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared --enable-pic --disable-cli && \ make && \ @@ -156,9 +155,9 @@ RUN \ DIR=/tmp/theora && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sLO http://downloads.xiph.org/releases/theora/libtheora-${THEORA_VERSION}.tar.gz && \ + curl -sLO http://downloads.xiph.org/releases/theora/libtheora-${THEORA_VERSION}.tar.bz2 && \ echo ${THEORA_SHA256SUM} | sha256sum --check && \ - tar -zx --strip-components=1 -f libtheora-${THEORA_VERSION}.tar.gz && \ + tar -jx --strip-components=1 -f libtheora-${THEORA_VERSION}.tar.bz2 && \ ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ make && \ make install && \ @@ -202,7 +201,7 @@ RUN \ DIR=/tmp/xvid && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sLO http://downloads.xvid.org/downloads/xvidcore-${XVID_VERSION}.tar.gz && \ + curl -sLO http://downloads.xvid.com/downloads/xvidcore-${XVID_VERSION}.tar.gz && \ echo ${XVID_SHA256SUM} | sha256sum --check && \ tar -zx -f xvidcore-${XVID_VERSION}.tar.gz && \ cd xvidcore/build/generic && \ @@ -263,12 +262,10 @@ RUN \ DIR=/tmp/fribidi && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sLO https://github.com/fribidi/fribidi/archive/${FRIBIDI_VERSION}.tar.gz && \ + curl -sLO https://github.com/fribidi/fribidi/releases/download/v${FRIBIDI_VERSION}/fribidi-${FRIBIDI_VERSION}.tar.bz2 && \ 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 && \ + tar -jx --strip-components=1 -f ${FRIBIDI_VERSION}.tar.bz2 && \ + ./autogen.sh && \ make -j 1 && \ make install && \ rm -rf ${DIR} @@ -277,8 +274,8 @@ 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 && \ + curl -sLO https://www.freedesktop.org/software/fontconfig/release/fontconfig-${FONTCONFIG_VERSION}.tar.gz &&\ + tar -zx --strip-components=1 -f fontconfig-${FONTCONFIG_VERSION}.tar.gz && \ ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ make && \ make install && \ @@ -288,10 +285,9 @@ RUN \ DIR=/tmp/libass && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sLO https://github.com/libass/libass/archive/${LIBASS_VERSION}.tar.gz &&\ + curl -sLO https://github.com/libass/libass/releases/download/${LIBASS_VERSION}/libass-${LIBASS_VERSION}.tar.gz &&\ echo ${LIBASS_SHA256SUM} | sha256sum --check && \ - tar -zx --strip-components=1 -f ${LIBASS_VERSION}.tar.gz && \ - ./autogen.sh && \ + tar -zx --strip-components=1 -f libass-${LIBASS_VERSION}.tar.gz && \ ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ make && \ make install && \ diff --git a/docker-images/3.2/ubuntu/Dockerfile b/docker-images/3.2/ubuntu/Dockerfile index 8286feb67..b85504980 100644 --- a/docker-images/3.2/ubuntu/Dockerfile +++ b/docker-images/3.2/ubuntu/Dockerfile @@ -23,42 +23,41 @@ ARG MAKEFLAGS="-j2" 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 \ + FDKAAC_VERSION=2.0.1 \ + FONTCONFIG_VERSION=2.13.92 \ + FREETYPE_VERSION=2.10.1 \ + FRIBIDI_VERSION=1.0.8 \ + KVAZAAR_VERSION=1.3.0 \ LAME_VERSION=3.100 \ - LIBASS_VERSION=0.13.7 \ + LIBASS_VERSION=0.14.0 \ LIBPTHREAD_STUBS_VERSION=0.4 \ LIBVIDSTAB_VERSION=1.1.0 \ LIBXCB_VERSION=1.13.1 \ XCBPROTO_VERSION=1.13 \ - OGG_VERSION=1.3.2 \ + OGG_VERSION=1.3.4 \ OPENCOREAMR_VERSION=0.1.5 \ - OPUS_VERSION=1.2 \ - OPENJPEG_VERSION=2.1.2 \ + OPUS_VERSION=1.3.1 \ + OPENJPEG_VERSION=2.3.1 \ 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 \ + VORBIS_VERSION=1.3.6 \ + VPX_VERSION=1.8.2 \ + WEBP_VERSION=1.0.3 \ + X265_VERSION=3.2.1 \ XAU_VERSION=1.0.9 \ XORG_MACROS_VERSION=1.19.2 \ XPROTO_VERSION=7.0.31 \ - XVID_VERSION=1.3.4 \ + XVID_VERSION=1.3.7 \ SRC=/usr/local -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 FREETYPE_SHA256SUM="3a60d391fd579440561bf0e7f31af2222bc610ad6ce4d9d7bd2165bca8669110 freetype-2.10.1.tar.gz" +ARG FRIBIDI_SHA256SUM="94c7b68d86ad2a9613b4dcffe7bbeb03523d63b5b37918bdf2e4ef34195c1e6c fribidi-1.0.8.tar.bz2" +ARG LIBASS_SHA256SUM="8d5a5c920b90b70a108007ffcd2289ac652c0e03fc88e6eecefa37df0f2e7fdf libass-0.14.0.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" +ARG OGG_SHA256SUM="fe5670640bd49e828d64d2879c31cb4dde9758681bb664f9bdbf159a01b0c76e libogg-1.3.4.tar.gz" +ARG OPUS_SHA256SUM="65b58e1e25b2a114157014736a3d9dfeaad8d41be1c8179866f144a2fb44ff9d opus-1.3.1.tar.gz" +ARG THEORA_SHA256SUM="b6ae1ee2fa3d42ac489287d3ec34c5885730b1296f0801ae577a35193d3affbc libtheora-1.1.1.tar.bz2" +ARG VORBIS_SHA256SUM="6ed40e0241089a42c48604dc00e362beee00036af2d8b3f46338031c9e0351cb libvorbis-1.3.6.tar.gz" +ARG XVID_SHA256SUM="abbdcbd39555691dd1c9b4d08f0a031376a3b211652c0d8b3b8aa9be1303ce2d xvidcore-1.3.7.tar.gz" @@ -99,7 +98,7 @@ 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 | \ + curl -sL https://code.videolan.org/videolan/x264/-/archive/stable/x264-stable.tar.bz2 | \ tar -jx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared --enable-pic --disable-cli && \ make && \ @@ -160,9 +159,9 @@ RUN \ DIR=/tmp/theora && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sLO http://downloads.xiph.org/releases/theora/libtheora-${THEORA_VERSION}.tar.gz && \ + curl -sLO http://downloads.xiph.org/releases/theora/libtheora-${THEORA_VERSION}.tar.bz2 && \ echo ${THEORA_SHA256SUM} | sha256sum --check && \ - tar -zx --strip-components=1 -f libtheora-${THEORA_VERSION}.tar.gz && \ + tar -jx --strip-components=1 -f libtheora-${THEORA_VERSION}.tar.bz2 && \ ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ make && \ make install && \ @@ -206,7 +205,7 @@ RUN \ DIR=/tmp/xvid && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sLO http://downloads.xvid.org/downloads/xvidcore-${XVID_VERSION}.tar.gz && \ + curl -sLO http://downloads.xvid.com/downloads/xvidcore-${XVID_VERSION}.tar.gz && \ echo ${XVID_SHA256SUM} | sha256sum --check && \ tar -zx -f xvidcore-${XVID_VERSION}.tar.gz && \ cd xvidcore/build/generic && \ @@ -267,12 +266,10 @@ RUN \ DIR=/tmp/fribidi && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sLO https://github.com/fribidi/fribidi/archive/${FRIBIDI_VERSION}.tar.gz && \ + curl -sLO https://github.com/fribidi/fribidi/releases/download/v${FRIBIDI_VERSION}/fribidi-${FRIBIDI_VERSION}.tar.bz2 && \ 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 && \ + tar -jx --strip-components=1 -f ${FRIBIDI_VERSION}.tar.bz2 && \ + ./autogen.sh && \ make -j 1 && \ make install && \ rm -rf ${DIR} @@ -281,8 +278,8 @@ 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 && \ + curl -sLO https://www.freedesktop.org/software/fontconfig/release/fontconfig-${FONTCONFIG_VERSION}.tar.gz &&\ + tar -zx --strip-components=1 -f fontconfig-${FONTCONFIG_VERSION}.tar.gz && \ ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ make && \ make install && \ @@ -292,10 +289,9 @@ RUN \ DIR=/tmp/libass && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sLO https://github.com/libass/libass/archive/${LIBASS_VERSION}.tar.gz &&\ + curl -sLO https://github.com/libass/libass/releases/download/${LIBASS_VERSION}/libass-${LIBASS_VERSION}.tar.gz &&\ echo ${LIBASS_SHA256SUM} | sha256sum --check && \ - tar -zx --strip-components=1 -f ${LIBASS_VERSION}.tar.gz && \ - ./autogen.sh && \ + tar -zx --strip-components=1 -f libass-${LIBASS_VERSION}.tar.gz && \ ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ make && \ make install && \ diff --git a/docker-images/3.2/vaapi/Dockerfile b/docker-images/3.2/vaapi/Dockerfile index cef2150e2..49476ccc5 100644 --- a/docker-images/3.2/vaapi/Dockerfile +++ b/docker-images/3.2/vaapi/Dockerfile @@ -23,42 +23,41 @@ ARG MAKEFLAGS="-j2" 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 \ + FDKAAC_VERSION=2.0.1 \ + FONTCONFIG_VERSION=2.13.92 \ + FREETYPE_VERSION=2.10.1 \ + FRIBIDI_VERSION=1.0.8 \ + KVAZAAR_VERSION=1.3.0 \ LAME_VERSION=3.100 \ - LIBASS_VERSION=0.13.7 \ + LIBASS_VERSION=0.14.0 \ LIBPTHREAD_STUBS_VERSION=0.4 \ LIBVIDSTAB_VERSION=1.1.0 \ LIBXCB_VERSION=1.13.1 \ XCBPROTO_VERSION=1.13 \ - OGG_VERSION=1.3.2 \ + OGG_VERSION=1.3.4 \ OPENCOREAMR_VERSION=0.1.5 \ - OPUS_VERSION=1.2 \ - OPENJPEG_VERSION=2.1.2 \ + OPUS_VERSION=1.3.1 \ + OPENJPEG_VERSION=2.3.1 \ 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 \ + VORBIS_VERSION=1.3.6 \ + VPX_VERSION=1.8.2 \ + WEBP_VERSION=1.0.3 \ + X265_VERSION=3.2.1 \ XAU_VERSION=1.0.9 \ XORG_MACROS_VERSION=1.19.2 \ XPROTO_VERSION=7.0.31 \ - XVID_VERSION=1.3.4 \ + XVID_VERSION=1.3.7 \ SRC=/usr/local -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 FREETYPE_SHA256SUM="3a60d391fd579440561bf0e7f31af2222bc610ad6ce4d9d7bd2165bca8669110 freetype-2.10.1.tar.gz" +ARG FRIBIDI_SHA256SUM="94c7b68d86ad2a9613b4dcffe7bbeb03523d63b5b37918bdf2e4ef34195c1e6c fribidi-1.0.8.tar.bz2" +ARG LIBASS_SHA256SUM="8d5a5c920b90b70a108007ffcd2289ac652c0e03fc88e6eecefa37df0f2e7fdf libass-0.14.0.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" +ARG OGG_SHA256SUM="fe5670640bd49e828d64d2879c31cb4dde9758681bb664f9bdbf159a01b0c76e libogg-1.3.4.tar.gz" +ARG OPUS_SHA256SUM="65b58e1e25b2a114157014736a3d9dfeaad8d41be1c8179866f144a2fb44ff9d opus-1.3.1.tar.gz" +ARG THEORA_SHA256SUM="b6ae1ee2fa3d42ac489287d3ec34c5885730b1296f0801ae577a35193d3affbc libtheora-1.1.1.tar.bz2" +ARG VORBIS_SHA256SUM="6ed40e0241089a42c48604dc00e362beee00036af2d8b3f46338031c9e0351cb libvorbis-1.3.6.tar.gz" +ARG XVID_SHA256SUM="abbdcbd39555691dd1c9b4d08f0a031376a3b211652c0d8b3b8aa9be1303ce2d xvidcore-1.3.7.tar.gz" @@ -100,7 +99,7 @@ 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 | \ + curl -sL https://code.videolan.org/videolan/x264/-/archive/stable/x264-stable.tar.bz2 | \ tar -jx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared --enable-pic --disable-cli && \ make && \ @@ -161,9 +160,9 @@ RUN \ DIR=/tmp/theora && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sLO http://downloads.xiph.org/releases/theora/libtheora-${THEORA_VERSION}.tar.gz && \ + curl -sLO http://downloads.xiph.org/releases/theora/libtheora-${THEORA_VERSION}.tar.bz2 && \ echo ${THEORA_SHA256SUM} | sha256sum --check && \ - tar -zx --strip-components=1 -f libtheora-${THEORA_VERSION}.tar.gz && \ + tar -jx --strip-components=1 -f libtheora-${THEORA_VERSION}.tar.bz2 && \ ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ make && \ make install && \ @@ -207,7 +206,7 @@ RUN \ DIR=/tmp/xvid && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sLO http://downloads.xvid.org/downloads/xvidcore-${XVID_VERSION}.tar.gz && \ + curl -sLO http://downloads.xvid.com/downloads/xvidcore-${XVID_VERSION}.tar.gz && \ echo ${XVID_SHA256SUM} | sha256sum --check && \ tar -zx -f xvidcore-${XVID_VERSION}.tar.gz && \ cd xvidcore/build/generic && \ @@ -268,12 +267,10 @@ RUN \ DIR=/tmp/fribidi && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sLO https://github.com/fribidi/fribidi/archive/${FRIBIDI_VERSION}.tar.gz && \ + curl -sLO https://github.com/fribidi/fribidi/releases/download/v${FRIBIDI_VERSION}/fribidi-${FRIBIDI_VERSION}.tar.bz2 && \ 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 && \ + tar -jx --strip-components=1 -f ${FRIBIDI_VERSION}.tar.bz2 && \ + ./autogen.sh && \ make -j 1 && \ make install && \ rm -rf ${DIR} @@ -282,8 +279,8 @@ 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 && \ + curl -sLO https://www.freedesktop.org/software/fontconfig/release/fontconfig-${FONTCONFIG_VERSION}.tar.gz &&\ + tar -zx --strip-components=1 -f fontconfig-${FONTCONFIG_VERSION}.tar.gz && \ ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ make && \ make install && \ @@ -293,10 +290,9 @@ RUN \ DIR=/tmp/libass && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sLO https://github.com/libass/libass/archive/${LIBASS_VERSION}.tar.gz &&\ + curl -sLO https://github.com/libass/libass/releases/download/${LIBASS_VERSION}/libass-${LIBASS_VERSION}.tar.gz &&\ echo ${LIBASS_SHA256SUM} | sha256sum --check && \ - tar -zx --strip-components=1 -f ${LIBASS_VERSION}.tar.gz && \ - ./autogen.sh && \ + tar -zx --strip-components=1 -f libass-${LIBASS_VERSION}.tar.gz && \ ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ make && \ make install && \ diff --git a/docker-images/3.3/alpine/Dockerfile b/docker-images/3.3/alpine/Dockerfile index 52e201cec..e8e17faa4 100644 --- a/docker-images/3.3/alpine/Dockerfile +++ b/docker-images/3.3/alpine/Dockerfile @@ -20,42 +20,41 @@ ARG MAKEFLAGS="-j2" 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 \ + FDKAAC_VERSION=2.0.1 \ + FONTCONFIG_VERSION=2.13.92 \ + FREETYPE_VERSION=2.10.1 \ + FRIBIDI_VERSION=1.0.8 \ + KVAZAAR_VERSION=1.3.0 \ LAME_VERSION=3.100 \ - LIBASS_VERSION=0.13.7 \ + LIBASS_VERSION=0.14.0 \ LIBPTHREAD_STUBS_VERSION=0.4 \ LIBVIDSTAB_VERSION=1.1.0 \ LIBXCB_VERSION=1.13.1 \ XCBPROTO_VERSION=1.13 \ - OGG_VERSION=1.3.2 \ + OGG_VERSION=1.3.4 \ OPENCOREAMR_VERSION=0.1.5 \ - OPUS_VERSION=1.2 \ - OPENJPEG_VERSION=2.1.2 \ + OPUS_VERSION=1.3.1 \ + OPENJPEG_VERSION=2.3.1 \ 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 \ + VORBIS_VERSION=1.3.6 \ + VPX_VERSION=1.8.2 \ + WEBP_VERSION=1.0.3 \ + X265_VERSION=3.2.1 \ XAU_VERSION=1.0.9 \ XORG_MACROS_VERSION=1.19.2 \ XPROTO_VERSION=7.0.31 \ - XVID_VERSION=1.3.4 \ + XVID_VERSION=1.3.7 \ SRC=/usr/local -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 FREETYPE_SHA256SUM="3a60d391fd579440561bf0e7f31af2222bc610ad6ce4d9d7bd2165bca8669110 freetype-2.10.1.tar.gz" +ARG FRIBIDI_SHA256SUM="94c7b68d86ad2a9613b4dcffe7bbeb03523d63b5b37918bdf2e4ef34195c1e6c fribidi-1.0.8.tar.bz2" +ARG LIBASS_SHA256SUM="8d5a5c920b90b70a108007ffcd2289ac652c0e03fc88e6eecefa37df0f2e7fdf libass-0.14.0.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" +ARG OGG_SHA256SUM="fe5670640bd49e828d64d2879c31cb4dde9758681bb664f9bdbf159a01b0c76e libogg-1.3.4.tar.gz" +ARG OPUS_SHA256SUM="65b58e1e25b2a114157014736a3d9dfeaad8d41be1c8179866f144a2fb44ff9d opus-1.3.1.tar.gz" +ARG THEORA_SHA256SUM="b6ae1ee2fa3d42ac489287d3ec34c5885730b1296f0801ae577a35193d3affbc libtheora-1.1.1.tar.bz2" +ARG VORBIS_SHA256SUM="6ed40e0241089a42c48604dc00e362beee00036af2d8b3f46338031c9e0351cb libvorbis-1.3.6.tar.gz" +ARG XVID_SHA256SUM="abbdcbd39555691dd1c9b4d08f0a031376a3b211652c0d8b3b8aa9be1303ce2d xvidcore-1.3.7.tar.gz" @@ -98,7 +97,7 @@ 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 | \ + curl -sL https://code.videolan.org/videolan/x264/-/archive/stable/x264-stable.tar.bz2 | \ tar -jx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared --enable-pic --disable-cli && \ make && \ @@ -159,9 +158,9 @@ RUN \ DIR=/tmp/theora && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sLO http://downloads.xiph.org/releases/theora/libtheora-${THEORA_VERSION}.tar.gz && \ + curl -sLO http://downloads.xiph.org/releases/theora/libtheora-${THEORA_VERSION}.tar.bz2 && \ echo ${THEORA_SHA256SUM} | sha256sum --check && \ - tar -zx --strip-components=1 -f libtheora-${THEORA_VERSION}.tar.gz && \ + tar -jx --strip-components=1 -f libtheora-${THEORA_VERSION}.tar.bz2 && \ ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ make && \ make install && \ @@ -205,7 +204,7 @@ RUN \ DIR=/tmp/xvid && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sLO http://downloads.xvid.org/downloads/xvidcore-${XVID_VERSION}.tar.gz && \ + curl -sLO http://downloads.xvid.com/downloads/xvidcore-${XVID_VERSION}.tar.gz && \ echo ${XVID_SHA256SUM} | sha256sum --check && \ tar -zx -f xvidcore-${XVID_VERSION}.tar.gz && \ cd xvidcore/build/generic && \ @@ -266,12 +265,10 @@ RUN \ DIR=/tmp/fribidi && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sLO https://github.com/fribidi/fribidi/archive/${FRIBIDI_VERSION}.tar.gz && \ + curl -sLO https://github.com/fribidi/fribidi/releases/download/v${FRIBIDI_VERSION}/fribidi-${FRIBIDI_VERSION}.tar.bz2 && \ 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 && \ + tar -jx --strip-components=1 -f ${FRIBIDI_VERSION}.tar.bz2 && \ + ./autogen.sh && \ make -j 1 && \ make install && \ rm -rf ${DIR} @@ -280,8 +277,8 @@ 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 && \ + curl -sLO https://www.freedesktop.org/software/fontconfig/release/fontconfig-${FONTCONFIG_VERSION}.tar.gz &&\ + tar -zx --strip-components=1 -f fontconfig-${FONTCONFIG_VERSION}.tar.gz && \ ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ make && \ make install && \ @@ -291,10 +288,9 @@ RUN \ DIR=/tmp/libass && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sLO https://github.com/libass/libass/archive/${LIBASS_VERSION}.tar.gz &&\ + curl -sLO https://github.com/libass/libass/releases/download/${LIBASS_VERSION}/libass-${LIBASS_VERSION}.tar.gz &&\ echo ${LIBASS_SHA256SUM} | sha256sum --check && \ - tar -zx --strip-components=1 -f ${LIBASS_VERSION}.tar.gz && \ - ./autogen.sh && \ + tar -zx --strip-components=1 -f libass-${LIBASS_VERSION}.tar.gz && \ ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ make && \ make install && \ diff --git a/docker-images/3.3/centos/Dockerfile b/docker-images/3.3/centos/Dockerfile index 8ab831c88..cc47142d6 100644 --- a/docker-images/3.3/centos/Dockerfile +++ b/docker-images/3.3/centos/Dockerfile @@ -22,42 +22,41 @@ ARG MAKEFLAGS="-j2" 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 \ + FDKAAC_VERSION=2.0.1 \ + FONTCONFIG_VERSION=2.13.92 \ + FREETYPE_VERSION=2.10.1 \ + FRIBIDI_VERSION=1.0.8 \ + KVAZAAR_VERSION=1.3.0 \ LAME_VERSION=3.100 \ - LIBASS_VERSION=0.13.7 \ + LIBASS_VERSION=0.14.0 \ LIBPTHREAD_STUBS_VERSION=0.4 \ LIBVIDSTAB_VERSION=1.1.0 \ LIBXCB_VERSION=1.13.1 \ XCBPROTO_VERSION=1.13 \ - OGG_VERSION=1.3.2 \ + OGG_VERSION=1.3.4 \ OPENCOREAMR_VERSION=0.1.5 \ - OPUS_VERSION=1.2 \ - OPENJPEG_VERSION=2.1.2 \ + OPUS_VERSION=1.3.1 \ + OPENJPEG_VERSION=2.3.1 \ 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 \ + VORBIS_VERSION=1.3.6 \ + VPX_VERSION=1.8.2 \ + WEBP_VERSION=1.0.3 \ + X265_VERSION=3.2.1 \ XAU_VERSION=1.0.9 \ XORG_MACROS_VERSION=1.19.2 \ XPROTO_VERSION=7.0.31 \ - XVID_VERSION=1.3.4 \ + XVID_VERSION=1.3.7 \ SRC=/usr/local -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 FREETYPE_SHA256SUM="3a60d391fd579440561bf0e7f31af2222bc610ad6ce4d9d7bd2165bca8669110 freetype-2.10.1.tar.gz" +ARG FRIBIDI_SHA256SUM="94c7b68d86ad2a9613b4dcffe7bbeb03523d63b5b37918bdf2e4ef34195c1e6c fribidi-1.0.8.tar.bz2" +ARG LIBASS_SHA256SUM="8d5a5c920b90b70a108007ffcd2289ac652c0e03fc88e6eecefa37df0f2e7fdf libass-0.14.0.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" +ARG OGG_SHA256SUM="fe5670640bd49e828d64d2879c31cb4dde9758681bb664f9bdbf159a01b0c76e libogg-1.3.4.tar.gz" +ARG OPUS_SHA256SUM="65b58e1e25b2a114157014736a3d9dfeaad8d41be1c8179866f144a2fb44ff9d opus-1.3.1.tar.gz" +ARG THEORA_SHA256SUM="b6ae1ee2fa3d42ac489287d3ec34c5885730b1296f0801ae577a35193d3affbc libtheora-1.1.1.tar.bz2" +ARG VORBIS_SHA256SUM="6ed40e0241089a42c48604dc00e362beee00036af2d8b3f46338031c9e0351cb libvorbis-1.3.6.tar.gz" +ARG XVID_SHA256SUM="abbdcbd39555691dd1c9b4d08f0a031376a3b211652c0d8b3b8aa9be1303ce2d xvidcore-1.3.7.tar.gz" @@ -98,7 +97,7 @@ 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 | \ + curl -sL https://code.videolan.org/videolan/x264/-/archive/stable/x264-stable.tar.bz2 | \ tar -jx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared --enable-pic --disable-cli && \ make && \ @@ -159,9 +158,9 @@ RUN \ DIR=/tmp/theora && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sLO http://downloads.xiph.org/releases/theora/libtheora-${THEORA_VERSION}.tar.gz && \ + curl -sLO http://downloads.xiph.org/releases/theora/libtheora-${THEORA_VERSION}.tar.bz2 && \ echo ${THEORA_SHA256SUM} | sha256sum --check && \ - tar -zx --strip-components=1 -f libtheora-${THEORA_VERSION}.tar.gz && \ + tar -jx --strip-components=1 -f libtheora-${THEORA_VERSION}.tar.bz2 && \ ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ make && \ make install && \ @@ -205,7 +204,7 @@ RUN \ DIR=/tmp/xvid && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sLO http://downloads.xvid.org/downloads/xvidcore-${XVID_VERSION}.tar.gz && \ + curl -sLO http://downloads.xvid.com/downloads/xvidcore-${XVID_VERSION}.tar.gz && \ echo ${XVID_SHA256SUM} | sha256sum --check && \ tar -zx -f xvidcore-${XVID_VERSION}.tar.gz && \ cd xvidcore/build/generic && \ @@ -266,12 +265,10 @@ RUN \ DIR=/tmp/fribidi && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sLO https://github.com/fribidi/fribidi/archive/${FRIBIDI_VERSION}.tar.gz && \ + curl -sLO https://github.com/fribidi/fribidi/releases/download/v${FRIBIDI_VERSION}/fribidi-${FRIBIDI_VERSION}.tar.bz2 && \ 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 && \ + tar -jx --strip-components=1 -f ${FRIBIDI_VERSION}.tar.bz2 && \ + ./autogen.sh && \ make -j 1 && \ make install && \ rm -rf ${DIR} @@ -280,8 +277,8 @@ 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 && \ + curl -sLO https://www.freedesktop.org/software/fontconfig/release/fontconfig-${FONTCONFIG_VERSION}.tar.gz &&\ + tar -zx --strip-components=1 -f fontconfig-${FONTCONFIG_VERSION}.tar.gz && \ ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ make && \ make install && \ @@ -291,10 +288,9 @@ RUN \ DIR=/tmp/libass && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sLO https://github.com/libass/libass/archive/${LIBASS_VERSION}.tar.gz &&\ + curl -sLO https://github.com/libass/libass/releases/download/${LIBASS_VERSION}/libass-${LIBASS_VERSION}.tar.gz &&\ echo ${LIBASS_SHA256SUM} | sha256sum --check && \ - tar -zx --strip-components=1 -f ${LIBASS_VERSION}.tar.gz && \ - ./autogen.sh && \ + tar -zx --strip-components=1 -f libass-${LIBASS_VERSION}.tar.gz && \ ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ make && \ make install && \ diff --git a/docker-images/3.3/nvidia/Dockerfile b/docker-images/3.3/nvidia/Dockerfile index e7e2c1d25..b2aa9fc07 100644 --- a/docker-images/3.3/nvidia/Dockerfile +++ b/docker-images/3.3/nvidia/Dockerfile @@ -37,42 +37,41 @@ ARG MAKEFLAGS="-j12" 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 \ + FDKAAC_VERSION=2.0.1 \ + FONTCONFIG_VERSION=2.13.92 \ + FREETYPE_VERSION=2.10.1 \ + FRIBIDI_VERSION=1.0.8 \ + KVAZAAR_VERSION=1.3.0 \ LAME_VERSION=3.100 \ - LIBASS_VERSION=0.13.7 \ + LIBASS_VERSION=0.14.0 \ LIBPTHREAD_STUBS_VERSION=0.4 \ LIBVIDSTAB_VERSION=1.1.0 \ LIBXCB_VERSION=1.13.1 \ XCBPROTO_VERSION=1.13 \ - OGG_VERSION=1.3.2 \ + OGG_VERSION=1.3.4 \ OPENCOREAMR_VERSION=0.1.5 \ - OPUS_VERSION=1.2 \ - OPENJPEG_VERSION=2.1.2 \ + OPUS_VERSION=1.3.1 \ + OPENJPEG_VERSION=2.3.1 \ 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 \ + VORBIS_VERSION=1.3.6 \ + VPX_VERSION=1.8.2 \ + WEBP_VERSION=1.0.3 \ + X265_VERSION=3.2.1 \ XAU_VERSION=1.0.9 \ XORG_MACROS_VERSION=1.19.2 \ XPROTO_VERSION=7.0.31 \ - XVID_VERSION=1.3.4 \ + XVID_VERSION=1.3.7 \ SRC=/usr/local -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 FREETYPE_SHA256SUM="3a60d391fd579440561bf0e7f31af2222bc610ad6ce4d9d7bd2165bca8669110 freetype-2.10.1.tar.gz" +ARG FRIBIDI_SHA256SUM="94c7b68d86ad2a9613b4dcffe7bbeb03523d63b5b37918bdf2e4ef34195c1e6c fribidi-1.0.8.tar.bz2" +ARG LIBASS_SHA256SUM="8d5a5c920b90b70a108007ffcd2289ac652c0e03fc88e6eecefa37df0f2e7fdf libass-0.14.0.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" +ARG OGG_SHA256SUM="fe5670640bd49e828d64d2879c31cb4dde9758681bb664f9bdbf159a01b0c76e libogg-1.3.4.tar.gz" +ARG OPUS_SHA256SUM="65b58e1e25b2a114157014736a3d9dfeaad8d41be1c8179866f144a2fb44ff9d opus-1.3.1.tar.gz" +ARG THEORA_SHA256SUM="b6ae1ee2fa3d42ac489287d3ec34c5885730b1296f0801ae577a35193d3affbc libtheora-1.1.1.tar.bz2" +ARG VORBIS_SHA256SUM="6ed40e0241089a42c48604dc00e362beee00036af2d8b3f46338031c9e0351cb libvorbis-1.3.6.tar.gz" +ARG XVID_SHA256SUM="abbdcbd39555691dd1c9b4d08f0a031376a3b211652c0d8b3b8aa9be1303ce2d xvidcore-1.3.7.tar.gz" @@ -124,7 +123,7 @@ 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 | \ + curl -sL https://code.videolan.org/videolan/x264/-/archive/stable/x264-stable.tar.bz2 | \ tar -jx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared --enable-pic --disable-cli && \ make && \ @@ -185,9 +184,9 @@ RUN \ DIR=/tmp/theora && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sLO http://downloads.xiph.org/releases/theora/libtheora-${THEORA_VERSION}.tar.gz && \ + curl -sLO http://downloads.xiph.org/releases/theora/libtheora-${THEORA_VERSION}.tar.bz2 && \ echo ${THEORA_SHA256SUM} | sha256sum --check && \ - tar -zx --strip-components=1 -f libtheora-${THEORA_VERSION}.tar.gz && \ + tar -jx --strip-components=1 -f libtheora-${THEORA_VERSION}.tar.bz2 && \ ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ make && \ make install && \ @@ -231,7 +230,7 @@ RUN \ DIR=/tmp/xvid && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sLO http://downloads.xvid.org/downloads/xvidcore-${XVID_VERSION}.tar.gz && \ + curl -sLO http://downloads.xvid.com/downloads/xvidcore-${XVID_VERSION}.tar.gz && \ echo ${XVID_SHA256SUM} | sha256sum --check && \ tar -zx -f xvidcore-${XVID_VERSION}.tar.gz && \ cd xvidcore/build/generic && \ @@ -292,12 +291,10 @@ RUN \ DIR=/tmp/fribidi && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sLO https://github.com/fribidi/fribidi/archive/${FRIBIDI_VERSION}.tar.gz && \ + curl -sLO https://github.com/fribidi/fribidi/releases/download/v${FRIBIDI_VERSION}/fribidi-${FRIBIDI_VERSION}.tar.bz2 && \ 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 && \ + tar -jx --strip-components=1 -f ${FRIBIDI_VERSION}.tar.bz2 && \ + ./autogen.sh && \ make -j 1 && \ make install && \ rm -rf ${DIR} @@ -306,8 +303,8 @@ 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 && \ + curl -sLO https://www.freedesktop.org/software/fontconfig/release/fontconfig-${FONTCONFIG_VERSION}.tar.gz &&\ + tar -zx --strip-components=1 -f fontconfig-${FONTCONFIG_VERSION}.tar.gz && \ ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ make && \ make install && \ @@ -317,10 +314,9 @@ RUN \ DIR=/tmp/libass && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sLO https://github.com/libass/libass/archive/${LIBASS_VERSION}.tar.gz &&\ + curl -sLO https://github.com/libass/libass/releases/download/${LIBASS_VERSION}/libass-${LIBASS_VERSION}.tar.gz &&\ echo ${LIBASS_SHA256SUM} | sha256sum --check && \ - tar -zx --strip-components=1 -f ${LIBASS_VERSION}.tar.gz && \ - ./autogen.sh && \ + tar -zx --strip-components=1 -f libass-${LIBASS_VERSION}.tar.gz && \ ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ make && \ make install && \ diff --git a/docker-images/3.3/scratch/Dockerfile b/docker-images/3.3/scratch/Dockerfile index f065d11c7..8a3a104c0 100644 --- a/docker-images/3.3/scratch/Dockerfile +++ b/docker-images/3.3/scratch/Dockerfile @@ -15,42 +15,41 @@ ARG MAKEFLAGS="-j2" 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 \ + FDKAAC_VERSION=2.0.1 \ + FONTCONFIG_VERSION=2.13.92 \ + FREETYPE_VERSION=2.10.1 \ + FRIBIDI_VERSION=1.0.8 \ + KVAZAAR_VERSION=1.3.0 \ LAME_VERSION=3.100 \ - LIBASS_VERSION=0.13.7 \ + LIBASS_VERSION=0.14.0 \ LIBPTHREAD_STUBS_VERSION=0.4 \ LIBVIDSTAB_VERSION=1.1.0 \ LIBXCB_VERSION=1.13.1 \ XCBPROTO_VERSION=1.13 \ - OGG_VERSION=1.3.2 \ + OGG_VERSION=1.3.4 \ OPENCOREAMR_VERSION=0.1.5 \ - OPUS_VERSION=1.2 \ - OPENJPEG_VERSION=2.1.2 \ + OPUS_VERSION=1.3.1 \ + OPENJPEG_VERSION=2.3.1 \ 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 \ + VORBIS_VERSION=1.3.6 \ + VPX_VERSION=1.8.2 \ + WEBP_VERSION=1.0.3 \ + X265_VERSION=3.2.1 \ XAU_VERSION=1.0.9 \ XORG_MACROS_VERSION=1.19.2 \ XPROTO_VERSION=7.0.31 \ - XVID_VERSION=1.3.4 \ + XVID_VERSION=1.3.7 \ SRC=/usr/local -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 FREETYPE_SHA256SUM="3a60d391fd579440561bf0e7f31af2222bc610ad6ce4d9d7bd2165bca8669110 freetype-2.10.1.tar.gz" +ARG FRIBIDI_SHA256SUM="94c7b68d86ad2a9613b4dcffe7bbeb03523d63b5b37918bdf2e4ef34195c1e6c fribidi-1.0.8.tar.bz2" +ARG LIBASS_SHA256SUM="8d5a5c920b90b70a108007ffcd2289ac652c0e03fc88e6eecefa37df0f2e7fdf libass-0.14.0.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" +ARG OGG_SHA256SUM="fe5670640bd49e828d64d2879c31cb4dde9758681bb664f9bdbf159a01b0c76e libogg-1.3.4.tar.gz" +ARG OPUS_SHA256SUM="65b58e1e25b2a114157014736a3d9dfeaad8d41be1c8179866f144a2fb44ff9d opus-1.3.1.tar.gz" +ARG THEORA_SHA256SUM="b6ae1ee2fa3d42ac489287d3ec34c5885730b1296f0801ae577a35193d3affbc libtheora-1.1.1.tar.bz2" +ARG VORBIS_SHA256SUM="6ed40e0241089a42c48604dc00e362beee00036af2d8b3f46338031c9e0351cb libvorbis-1.3.6.tar.gz" +ARG XVID_SHA256SUM="abbdcbd39555691dd1c9b4d08f0a031376a3b211652c0d8b3b8aa9be1303ce2d xvidcore-1.3.7.tar.gz" @@ -95,7 +94,7 @@ 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 | \ + curl -sL https://code.videolan.org/videolan/x264/-/archive/stable/x264-stable.tar.bz2 | \ tar -jx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared --enable-pic --disable-cli && \ make && \ @@ -156,9 +155,9 @@ RUN \ DIR=/tmp/theora && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sLO http://downloads.xiph.org/releases/theora/libtheora-${THEORA_VERSION}.tar.gz && \ + curl -sLO http://downloads.xiph.org/releases/theora/libtheora-${THEORA_VERSION}.tar.bz2 && \ echo ${THEORA_SHA256SUM} | sha256sum --check && \ - tar -zx --strip-components=1 -f libtheora-${THEORA_VERSION}.tar.gz && \ + tar -jx --strip-components=1 -f libtheora-${THEORA_VERSION}.tar.bz2 && \ ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ make && \ make install && \ @@ -202,7 +201,7 @@ RUN \ DIR=/tmp/xvid && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sLO http://downloads.xvid.org/downloads/xvidcore-${XVID_VERSION}.tar.gz && \ + curl -sLO http://downloads.xvid.com/downloads/xvidcore-${XVID_VERSION}.tar.gz && \ echo ${XVID_SHA256SUM} | sha256sum --check && \ tar -zx -f xvidcore-${XVID_VERSION}.tar.gz && \ cd xvidcore/build/generic && \ @@ -263,12 +262,10 @@ RUN \ DIR=/tmp/fribidi && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sLO https://github.com/fribidi/fribidi/archive/${FRIBIDI_VERSION}.tar.gz && \ + curl -sLO https://github.com/fribidi/fribidi/releases/download/v${FRIBIDI_VERSION}/fribidi-${FRIBIDI_VERSION}.tar.bz2 && \ 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 && \ + tar -jx --strip-components=1 -f ${FRIBIDI_VERSION}.tar.bz2 && \ + ./autogen.sh && \ make -j 1 && \ make install && \ rm -rf ${DIR} @@ -277,8 +274,8 @@ 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 && \ + curl -sLO https://www.freedesktop.org/software/fontconfig/release/fontconfig-${FONTCONFIG_VERSION}.tar.gz &&\ + tar -zx --strip-components=1 -f fontconfig-${FONTCONFIG_VERSION}.tar.gz && \ ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ make && \ make install && \ @@ -288,10 +285,9 @@ RUN \ DIR=/tmp/libass && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sLO https://github.com/libass/libass/archive/${LIBASS_VERSION}.tar.gz &&\ + curl -sLO https://github.com/libass/libass/releases/download/${LIBASS_VERSION}/libass-${LIBASS_VERSION}.tar.gz &&\ echo ${LIBASS_SHA256SUM} | sha256sum --check && \ - tar -zx --strip-components=1 -f ${LIBASS_VERSION}.tar.gz && \ - ./autogen.sh && \ + tar -zx --strip-components=1 -f libass-${LIBASS_VERSION}.tar.gz && \ ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ make && \ make install && \ diff --git a/docker-images/3.3/ubuntu/Dockerfile b/docker-images/3.3/ubuntu/Dockerfile index 312d87e2e..2ff518096 100644 --- a/docker-images/3.3/ubuntu/Dockerfile +++ b/docker-images/3.3/ubuntu/Dockerfile @@ -23,42 +23,41 @@ ARG MAKEFLAGS="-j2" 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 \ + FDKAAC_VERSION=2.0.1 \ + FONTCONFIG_VERSION=2.13.92 \ + FREETYPE_VERSION=2.10.1 \ + FRIBIDI_VERSION=1.0.8 \ + KVAZAAR_VERSION=1.3.0 \ LAME_VERSION=3.100 \ - LIBASS_VERSION=0.13.7 \ + LIBASS_VERSION=0.14.0 \ LIBPTHREAD_STUBS_VERSION=0.4 \ LIBVIDSTAB_VERSION=1.1.0 \ LIBXCB_VERSION=1.13.1 \ XCBPROTO_VERSION=1.13 \ - OGG_VERSION=1.3.2 \ + OGG_VERSION=1.3.4 \ OPENCOREAMR_VERSION=0.1.5 \ - OPUS_VERSION=1.2 \ - OPENJPEG_VERSION=2.1.2 \ + OPUS_VERSION=1.3.1 \ + OPENJPEG_VERSION=2.3.1 \ 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 \ + VORBIS_VERSION=1.3.6 \ + VPX_VERSION=1.8.2 \ + WEBP_VERSION=1.0.3 \ + X265_VERSION=3.2.1 \ XAU_VERSION=1.0.9 \ XORG_MACROS_VERSION=1.19.2 \ XPROTO_VERSION=7.0.31 \ - XVID_VERSION=1.3.4 \ + XVID_VERSION=1.3.7 \ SRC=/usr/local -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 FREETYPE_SHA256SUM="3a60d391fd579440561bf0e7f31af2222bc610ad6ce4d9d7bd2165bca8669110 freetype-2.10.1.tar.gz" +ARG FRIBIDI_SHA256SUM="94c7b68d86ad2a9613b4dcffe7bbeb03523d63b5b37918bdf2e4ef34195c1e6c fribidi-1.0.8.tar.bz2" +ARG LIBASS_SHA256SUM="8d5a5c920b90b70a108007ffcd2289ac652c0e03fc88e6eecefa37df0f2e7fdf libass-0.14.0.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" +ARG OGG_SHA256SUM="fe5670640bd49e828d64d2879c31cb4dde9758681bb664f9bdbf159a01b0c76e libogg-1.3.4.tar.gz" +ARG OPUS_SHA256SUM="65b58e1e25b2a114157014736a3d9dfeaad8d41be1c8179866f144a2fb44ff9d opus-1.3.1.tar.gz" +ARG THEORA_SHA256SUM="b6ae1ee2fa3d42ac489287d3ec34c5885730b1296f0801ae577a35193d3affbc libtheora-1.1.1.tar.bz2" +ARG VORBIS_SHA256SUM="6ed40e0241089a42c48604dc00e362beee00036af2d8b3f46338031c9e0351cb libvorbis-1.3.6.tar.gz" +ARG XVID_SHA256SUM="abbdcbd39555691dd1c9b4d08f0a031376a3b211652c0d8b3b8aa9be1303ce2d xvidcore-1.3.7.tar.gz" @@ -99,7 +98,7 @@ 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 | \ + curl -sL https://code.videolan.org/videolan/x264/-/archive/stable/x264-stable.tar.bz2 | \ tar -jx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared --enable-pic --disable-cli && \ make && \ @@ -160,9 +159,9 @@ RUN \ DIR=/tmp/theora && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sLO http://downloads.xiph.org/releases/theora/libtheora-${THEORA_VERSION}.tar.gz && \ + curl -sLO http://downloads.xiph.org/releases/theora/libtheora-${THEORA_VERSION}.tar.bz2 && \ echo ${THEORA_SHA256SUM} | sha256sum --check && \ - tar -zx --strip-components=1 -f libtheora-${THEORA_VERSION}.tar.gz && \ + tar -jx --strip-components=1 -f libtheora-${THEORA_VERSION}.tar.bz2 && \ ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ make && \ make install && \ @@ -206,7 +205,7 @@ RUN \ DIR=/tmp/xvid && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sLO http://downloads.xvid.org/downloads/xvidcore-${XVID_VERSION}.tar.gz && \ + curl -sLO http://downloads.xvid.com/downloads/xvidcore-${XVID_VERSION}.tar.gz && \ echo ${XVID_SHA256SUM} | sha256sum --check && \ tar -zx -f xvidcore-${XVID_VERSION}.tar.gz && \ cd xvidcore/build/generic && \ @@ -267,12 +266,10 @@ RUN \ DIR=/tmp/fribidi && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sLO https://github.com/fribidi/fribidi/archive/${FRIBIDI_VERSION}.tar.gz && \ + curl -sLO https://github.com/fribidi/fribidi/releases/download/v${FRIBIDI_VERSION}/fribidi-${FRIBIDI_VERSION}.tar.bz2 && \ 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 && \ + tar -jx --strip-components=1 -f ${FRIBIDI_VERSION}.tar.bz2 && \ + ./autogen.sh && \ make -j 1 && \ make install && \ rm -rf ${DIR} @@ -281,8 +278,8 @@ 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 && \ + curl -sLO https://www.freedesktop.org/software/fontconfig/release/fontconfig-${FONTCONFIG_VERSION}.tar.gz &&\ + tar -zx --strip-components=1 -f fontconfig-${FONTCONFIG_VERSION}.tar.gz && \ ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ make && \ make install && \ @@ -292,10 +289,9 @@ RUN \ DIR=/tmp/libass && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sLO https://github.com/libass/libass/archive/${LIBASS_VERSION}.tar.gz &&\ + curl -sLO https://github.com/libass/libass/releases/download/${LIBASS_VERSION}/libass-${LIBASS_VERSION}.tar.gz &&\ echo ${LIBASS_SHA256SUM} | sha256sum --check && \ - tar -zx --strip-components=1 -f ${LIBASS_VERSION}.tar.gz && \ - ./autogen.sh && \ + tar -zx --strip-components=1 -f libass-${LIBASS_VERSION}.tar.gz && \ ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ make && \ make install && \ diff --git a/docker-images/3.3/vaapi/Dockerfile b/docker-images/3.3/vaapi/Dockerfile index 97512a6de..2b3e77faf 100644 --- a/docker-images/3.3/vaapi/Dockerfile +++ b/docker-images/3.3/vaapi/Dockerfile @@ -23,42 +23,41 @@ ARG MAKEFLAGS="-j2" 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 \ + FDKAAC_VERSION=2.0.1 \ + FONTCONFIG_VERSION=2.13.92 \ + FREETYPE_VERSION=2.10.1 \ + FRIBIDI_VERSION=1.0.8 \ + KVAZAAR_VERSION=1.3.0 \ LAME_VERSION=3.100 \ - LIBASS_VERSION=0.13.7 \ + LIBASS_VERSION=0.14.0 \ LIBPTHREAD_STUBS_VERSION=0.4 \ LIBVIDSTAB_VERSION=1.1.0 \ LIBXCB_VERSION=1.13.1 \ XCBPROTO_VERSION=1.13 \ - OGG_VERSION=1.3.2 \ + OGG_VERSION=1.3.4 \ OPENCOREAMR_VERSION=0.1.5 \ - OPUS_VERSION=1.2 \ - OPENJPEG_VERSION=2.1.2 \ + OPUS_VERSION=1.3.1 \ + OPENJPEG_VERSION=2.3.1 \ 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 \ + VORBIS_VERSION=1.3.6 \ + VPX_VERSION=1.8.2 \ + WEBP_VERSION=1.0.3 \ + X265_VERSION=3.2.1 \ XAU_VERSION=1.0.9 \ XORG_MACROS_VERSION=1.19.2 \ XPROTO_VERSION=7.0.31 \ - XVID_VERSION=1.3.4 \ + XVID_VERSION=1.3.7 \ SRC=/usr/local -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 FREETYPE_SHA256SUM="3a60d391fd579440561bf0e7f31af2222bc610ad6ce4d9d7bd2165bca8669110 freetype-2.10.1.tar.gz" +ARG FRIBIDI_SHA256SUM="94c7b68d86ad2a9613b4dcffe7bbeb03523d63b5b37918bdf2e4ef34195c1e6c fribidi-1.0.8.tar.bz2" +ARG LIBASS_SHA256SUM="8d5a5c920b90b70a108007ffcd2289ac652c0e03fc88e6eecefa37df0f2e7fdf libass-0.14.0.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" +ARG OGG_SHA256SUM="fe5670640bd49e828d64d2879c31cb4dde9758681bb664f9bdbf159a01b0c76e libogg-1.3.4.tar.gz" +ARG OPUS_SHA256SUM="65b58e1e25b2a114157014736a3d9dfeaad8d41be1c8179866f144a2fb44ff9d opus-1.3.1.tar.gz" +ARG THEORA_SHA256SUM="b6ae1ee2fa3d42ac489287d3ec34c5885730b1296f0801ae577a35193d3affbc libtheora-1.1.1.tar.bz2" +ARG VORBIS_SHA256SUM="6ed40e0241089a42c48604dc00e362beee00036af2d8b3f46338031c9e0351cb libvorbis-1.3.6.tar.gz" +ARG XVID_SHA256SUM="abbdcbd39555691dd1c9b4d08f0a031376a3b211652c0d8b3b8aa9be1303ce2d xvidcore-1.3.7.tar.gz" @@ -100,7 +99,7 @@ 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 | \ + curl -sL https://code.videolan.org/videolan/x264/-/archive/stable/x264-stable.tar.bz2 | \ tar -jx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared --enable-pic --disable-cli && \ make && \ @@ -161,9 +160,9 @@ RUN \ DIR=/tmp/theora && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sLO http://downloads.xiph.org/releases/theora/libtheora-${THEORA_VERSION}.tar.gz && \ + curl -sLO http://downloads.xiph.org/releases/theora/libtheora-${THEORA_VERSION}.tar.bz2 && \ echo ${THEORA_SHA256SUM} | sha256sum --check && \ - tar -zx --strip-components=1 -f libtheora-${THEORA_VERSION}.tar.gz && \ + tar -jx --strip-components=1 -f libtheora-${THEORA_VERSION}.tar.bz2 && \ ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ make && \ make install && \ @@ -207,7 +206,7 @@ RUN \ DIR=/tmp/xvid && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sLO http://downloads.xvid.org/downloads/xvidcore-${XVID_VERSION}.tar.gz && \ + curl -sLO http://downloads.xvid.com/downloads/xvidcore-${XVID_VERSION}.tar.gz && \ echo ${XVID_SHA256SUM} | sha256sum --check && \ tar -zx -f xvidcore-${XVID_VERSION}.tar.gz && \ cd xvidcore/build/generic && \ @@ -268,12 +267,10 @@ RUN \ DIR=/tmp/fribidi && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sLO https://github.com/fribidi/fribidi/archive/${FRIBIDI_VERSION}.tar.gz && \ + curl -sLO https://github.com/fribidi/fribidi/releases/download/v${FRIBIDI_VERSION}/fribidi-${FRIBIDI_VERSION}.tar.bz2 && \ 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 && \ + tar -jx --strip-components=1 -f ${FRIBIDI_VERSION}.tar.bz2 && \ + ./autogen.sh && \ make -j 1 && \ make install && \ rm -rf ${DIR} @@ -282,8 +279,8 @@ 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 && \ + curl -sLO https://www.freedesktop.org/software/fontconfig/release/fontconfig-${FONTCONFIG_VERSION}.tar.gz &&\ + tar -zx --strip-components=1 -f fontconfig-${FONTCONFIG_VERSION}.tar.gz && \ ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ make && \ make install && \ @@ -293,10 +290,9 @@ RUN \ DIR=/tmp/libass && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sLO https://github.com/libass/libass/archive/${LIBASS_VERSION}.tar.gz &&\ + curl -sLO https://github.com/libass/libass/releases/download/${LIBASS_VERSION}/libass-${LIBASS_VERSION}.tar.gz &&\ echo ${LIBASS_SHA256SUM} | sha256sum --check && \ - tar -zx --strip-components=1 -f ${LIBASS_VERSION}.tar.gz && \ - ./autogen.sh && \ + tar -zx --strip-components=1 -f libass-${LIBASS_VERSION}.tar.gz && \ ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ make && \ make install && \ diff --git a/docker-images/3.4/alpine/Dockerfile b/docker-images/3.4/alpine/Dockerfile index a91a51bbf..3ac2ef305 100644 --- a/docker-images/3.4/alpine/Dockerfile +++ b/docker-images/3.4/alpine/Dockerfile @@ -20,42 +20,41 @@ ARG MAKEFLAGS="-j2" ENV FFMPEG_VERSION=3.4.7 \ 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 \ + FDKAAC_VERSION=2.0.1 \ + FONTCONFIG_VERSION=2.13.92 \ + FREETYPE_VERSION=2.10.1 \ + FRIBIDI_VERSION=1.0.8 \ + KVAZAAR_VERSION=1.3.0 \ LAME_VERSION=3.100 \ - LIBASS_VERSION=0.13.7 \ + LIBASS_VERSION=0.14.0 \ LIBPTHREAD_STUBS_VERSION=0.4 \ LIBVIDSTAB_VERSION=1.1.0 \ LIBXCB_VERSION=1.13.1 \ XCBPROTO_VERSION=1.13 \ - OGG_VERSION=1.3.2 \ + OGG_VERSION=1.3.4 \ OPENCOREAMR_VERSION=0.1.5 \ - OPUS_VERSION=1.2 \ - OPENJPEG_VERSION=2.1.2 \ + OPUS_VERSION=1.3.1 \ + OPENJPEG_VERSION=2.3.1 \ 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 \ + VORBIS_VERSION=1.3.6 \ + VPX_VERSION=1.8.2 \ + WEBP_VERSION=1.0.3 \ + X265_VERSION=3.2.1 \ XAU_VERSION=1.0.9 \ XORG_MACROS_VERSION=1.19.2 \ XPROTO_VERSION=7.0.31 \ - XVID_VERSION=1.3.4 \ + XVID_VERSION=1.3.7 \ SRC=/usr/local -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 FREETYPE_SHA256SUM="3a60d391fd579440561bf0e7f31af2222bc610ad6ce4d9d7bd2165bca8669110 freetype-2.10.1.tar.gz" +ARG FRIBIDI_SHA256SUM="94c7b68d86ad2a9613b4dcffe7bbeb03523d63b5b37918bdf2e4ef34195c1e6c fribidi-1.0.8.tar.bz2" +ARG LIBASS_SHA256SUM="8d5a5c920b90b70a108007ffcd2289ac652c0e03fc88e6eecefa37df0f2e7fdf libass-0.14.0.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" +ARG OGG_SHA256SUM="fe5670640bd49e828d64d2879c31cb4dde9758681bb664f9bdbf159a01b0c76e libogg-1.3.4.tar.gz" +ARG OPUS_SHA256SUM="65b58e1e25b2a114157014736a3d9dfeaad8d41be1c8179866f144a2fb44ff9d opus-1.3.1.tar.gz" +ARG THEORA_SHA256SUM="b6ae1ee2fa3d42ac489287d3ec34c5885730b1296f0801ae577a35193d3affbc libtheora-1.1.1.tar.bz2" +ARG VORBIS_SHA256SUM="6ed40e0241089a42c48604dc00e362beee00036af2d8b3f46338031c9e0351cb libvorbis-1.3.6.tar.gz" +ARG XVID_SHA256SUM="abbdcbd39555691dd1c9b4d08f0a031376a3b211652c0d8b3b8aa9be1303ce2d xvidcore-1.3.7.tar.gz" @@ -98,7 +97,7 @@ 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 | \ + curl -sL https://code.videolan.org/videolan/x264/-/archive/stable/x264-stable.tar.bz2 | \ tar -jx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared --enable-pic --disable-cli && \ make && \ @@ -159,9 +158,9 @@ RUN \ DIR=/tmp/theora && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sLO http://downloads.xiph.org/releases/theora/libtheora-${THEORA_VERSION}.tar.gz && \ + curl -sLO http://downloads.xiph.org/releases/theora/libtheora-${THEORA_VERSION}.tar.bz2 && \ echo ${THEORA_SHA256SUM} | sha256sum --check && \ - tar -zx --strip-components=1 -f libtheora-${THEORA_VERSION}.tar.gz && \ + tar -jx --strip-components=1 -f libtheora-${THEORA_VERSION}.tar.bz2 && \ ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ make && \ make install && \ @@ -205,7 +204,7 @@ RUN \ DIR=/tmp/xvid && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sLO http://downloads.xvid.org/downloads/xvidcore-${XVID_VERSION}.tar.gz && \ + curl -sLO http://downloads.xvid.com/downloads/xvidcore-${XVID_VERSION}.tar.gz && \ echo ${XVID_SHA256SUM} | sha256sum --check && \ tar -zx -f xvidcore-${XVID_VERSION}.tar.gz && \ cd xvidcore/build/generic && \ @@ -266,12 +265,10 @@ RUN \ DIR=/tmp/fribidi && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sLO https://github.com/fribidi/fribidi/archive/${FRIBIDI_VERSION}.tar.gz && \ + curl -sLO https://github.com/fribidi/fribidi/releases/download/v${FRIBIDI_VERSION}/fribidi-${FRIBIDI_VERSION}.tar.bz2 && \ 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 && \ + tar -jx --strip-components=1 -f ${FRIBIDI_VERSION}.tar.bz2 && \ + ./autogen.sh && \ make -j 1 && \ make install && \ rm -rf ${DIR} @@ -280,8 +277,8 @@ 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 && \ + curl -sLO https://www.freedesktop.org/software/fontconfig/release/fontconfig-${FONTCONFIG_VERSION}.tar.gz &&\ + tar -zx --strip-components=1 -f fontconfig-${FONTCONFIG_VERSION}.tar.gz && \ ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ make && \ make install && \ @@ -291,10 +288,9 @@ RUN \ DIR=/tmp/libass && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sLO https://github.com/libass/libass/archive/${LIBASS_VERSION}.tar.gz &&\ + curl -sLO https://github.com/libass/libass/releases/download/${LIBASS_VERSION}/libass-${LIBASS_VERSION}.tar.gz &&\ echo ${LIBASS_SHA256SUM} | sha256sum --check && \ - tar -zx --strip-components=1 -f ${LIBASS_VERSION}.tar.gz && \ - ./autogen.sh && \ + tar -zx --strip-components=1 -f libass-${LIBASS_VERSION}.tar.gz && \ ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ make && \ make install && \ diff --git a/docker-images/3.4/centos/Dockerfile b/docker-images/3.4/centos/Dockerfile index 9752e23ed..79c9f34e7 100644 --- a/docker-images/3.4/centos/Dockerfile +++ b/docker-images/3.4/centos/Dockerfile @@ -22,42 +22,41 @@ ARG MAKEFLAGS="-j2" ENV FFMPEG_VERSION=3.4.7 \ 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 \ + FDKAAC_VERSION=2.0.1 \ + FONTCONFIG_VERSION=2.13.92 \ + FREETYPE_VERSION=2.10.1 \ + FRIBIDI_VERSION=1.0.8 \ + KVAZAAR_VERSION=1.3.0 \ LAME_VERSION=3.100 \ - LIBASS_VERSION=0.13.7 \ + LIBASS_VERSION=0.14.0 \ LIBPTHREAD_STUBS_VERSION=0.4 \ LIBVIDSTAB_VERSION=1.1.0 \ LIBXCB_VERSION=1.13.1 \ XCBPROTO_VERSION=1.13 \ - OGG_VERSION=1.3.2 \ + OGG_VERSION=1.3.4 \ OPENCOREAMR_VERSION=0.1.5 \ - OPUS_VERSION=1.2 \ - OPENJPEG_VERSION=2.1.2 \ + OPUS_VERSION=1.3.1 \ + OPENJPEG_VERSION=2.3.1 \ 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 \ + VORBIS_VERSION=1.3.6 \ + VPX_VERSION=1.8.2 \ + WEBP_VERSION=1.0.3 \ + X265_VERSION=3.2.1 \ XAU_VERSION=1.0.9 \ XORG_MACROS_VERSION=1.19.2 \ XPROTO_VERSION=7.0.31 \ - XVID_VERSION=1.3.4 \ + XVID_VERSION=1.3.7 \ SRC=/usr/local -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 FREETYPE_SHA256SUM="3a60d391fd579440561bf0e7f31af2222bc610ad6ce4d9d7bd2165bca8669110 freetype-2.10.1.tar.gz" +ARG FRIBIDI_SHA256SUM="94c7b68d86ad2a9613b4dcffe7bbeb03523d63b5b37918bdf2e4ef34195c1e6c fribidi-1.0.8.tar.bz2" +ARG LIBASS_SHA256SUM="8d5a5c920b90b70a108007ffcd2289ac652c0e03fc88e6eecefa37df0f2e7fdf libass-0.14.0.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" +ARG OGG_SHA256SUM="fe5670640bd49e828d64d2879c31cb4dde9758681bb664f9bdbf159a01b0c76e libogg-1.3.4.tar.gz" +ARG OPUS_SHA256SUM="65b58e1e25b2a114157014736a3d9dfeaad8d41be1c8179866f144a2fb44ff9d opus-1.3.1.tar.gz" +ARG THEORA_SHA256SUM="b6ae1ee2fa3d42ac489287d3ec34c5885730b1296f0801ae577a35193d3affbc libtheora-1.1.1.tar.bz2" +ARG VORBIS_SHA256SUM="6ed40e0241089a42c48604dc00e362beee00036af2d8b3f46338031c9e0351cb libvorbis-1.3.6.tar.gz" +ARG XVID_SHA256SUM="abbdcbd39555691dd1c9b4d08f0a031376a3b211652c0d8b3b8aa9be1303ce2d xvidcore-1.3.7.tar.gz" @@ -98,7 +97,7 @@ 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 | \ + curl -sL https://code.videolan.org/videolan/x264/-/archive/stable/x264-stable.tar.bz2 | \ tar -jx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared --enable-pic --disable-cli && \ make && \ @@ -159,9 +158,9 @@ RUN \ DIR=/tmp/theora && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sLO http://downloads.xiph.org/releases/theora/libtheora-${THEORA_VERSION}.tar.gz && \ + curl -sLO http://downloads.xiph.org/releases/theora/libtheora-${THEORA_VERSION}.tar.bz2 && \ echo ${THEORA_SHA256SUM} | sha256sum --check && \ - tar -zx --strip-components=1 -f libtheora-${THEORA_VERSION}.tar.gz && \ + tar -jx --strip-components=1 -f libtheora-${THEORA_VERSION}.tar.bz2 && \ ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ make && \ make install && \ @@ -205,7 +204,7 @@ RUN \ DIR=/tmp/xvid && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sLO http://downloads.xvid.org/downloads/xvidcore-${XVID_VERSION}.tar.gz && \ + curl -sLO http://downloads.xvid.com/downloads/xvidcore-${XVID_VERSION}.tar.gz && \ echo ${XVID_SHA256SUM} | sha256sum --check && \ tar -zx -f xvidcore-${XVID_VERSION}.tar.gz && \ cd xvidcore/build/generic && \ @@ -266,12 +265,10 @@ RUN \ DIR=/tmp/fribidi && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sLO https://github.com/fribidi/fribidi/archive/${FRIBIDI_VERSION}.tar.gz && \ + curl -sLO https://github.com/fribidi/fribidi/releases/download/v${FRIBIDI_VERSION}/fribidi-${FRIBIDI_VERSION}.tar.bz2 && \ 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 && \ + tar -jx --strip-components=1 -f ${FRIBIDI_VERSION}.tar.bz2 && \ + ./autogen.sh && \ make -j 1 && \ make install && \ rm -rf ${DIR} @@ -280,8 +277,8 @@ 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 && \ + curl -sLO https://www.freedesktop.org/software/fontconfig/release/fontconfig-${FONTCONFIG_VERSION}.tar.gz &&\ + tar -zx --strip-components=1 -f fontconfig-${FONTCONFIG_VERSION}.tar.gz && \ ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ make && \ make install && \ @@ -291,10 +288,9 @@ RUN \ DIR=/tmp/libass && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sLO https://github.com/libass/libass/archive/${LIBASS_VERSION}.tar.gz &&\ + curl -sLO https://github.com/libass/libass/releases/download/${LIBASS_VERSION}/libass-${LIBASS_VERSION}.tar.gz &&\ echo ${LIBASS_SHA256SUM} | sha256sum --check && \ - tar -zx --strip-components=1 -f ${LIBASS_VERSION}.tar.gz && \ - ./autogen.sh && \ + tar -zx --strip-components=1 -f libass-${LIBASS_VERSION}.tar.gz && \ ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ make && \ make install && \ diff --git a/docker-images/3.4/nvidia/Dockerfile b/docker-images/3.4/nvidia/Dockerfile index eeaab982e..4fb3e89f8 100644 --- a/docker-images/3.4/nvidia/Dockerfile +++ b/docker-images/3.4/nvidia/Dockerfile @@ -37,42 +37,41 @@ ARG MAKEFLAGS="-j12" ENV FFMPEG_VERSION=3.4.7 \ 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 \ + FDKAAC_VERSION=2.0.1 \ + FONTCONFIG_VERSION=2.13.92 \ + FREETYPE_VERSION=2.10.1 \ + FRIBIDI_VERSION=1.0.8 \ + KVAZAAR_VERSION=1.3.0 \ LAME_VERSION=3.100 \ - LIBASS_VERSION=0.13.7 \ + LIBASS_VERSION=0.14.0 \ LIBPTHREAD_STUBS_VERSION=0.4 \ LIBVIDSTAB_VERSION=1.1.0 \ LIBXCB_VERSION=1.13.1 \ XCBPROTO_VERSION=1.13 \ - OGG_VERSION=1.3.2 \ + OGG_VERSION=1.3.4 \ OPENCOREAMR_VERSION=0.1.5 \ - OPUS_VERSION=1.2 \ - OPENJPEG_VERSION=2.1.2 \ + OPUS_VERSION=1.3.1 \ + OPENJPEG_VERSION=2.3.1 \ 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 \ + VORBIS_VERSION=1.3.6 \ + VPX_VERSION=1.8.2 \ + WEBP_VERSION=1.0.3 \ + X265_VERSION=3.2.1 \ XAU_VERSION=1.0.9 \ XORG_MACROS_VERSION=1.19.2 \ XPROTO_VERSION=7.0.31 \ - XVID_VERSION=1.3.4 \ + XVID_VERSION=1.3.7 \ SRC=/usr/local -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 FREETYPE_SHA256SUM="3a60d391fd579440561bf0e7f31af2222bc610ad6ce4d9d7bd2165bca8669110 freetype-2.10.1.tar.gz" +ARG FRIBIDI_SHA256SUM="94c7b68d86ad2a9613b4dcffe7bbeb03523d63b5b37918bdf2e4ef34195c1e6c fribidi-1.0.8.tar.bz2" +ARG LIBASS_SHA256SUM="8d5a5c920b90b70a108007ffcd2289ac652c0e03fc88e6eecefa37df0f2e7fdf libass-0.14.0.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" +ARG OGG_SHA256SUM="fe5670640bd49e828d64d2879c31cb4dde9758681bb664f9bdbf159a01b0c76e libogg-1.3.4.tar.gz" +ARG OPUS_SHA256SUM="65b58e1e25b2a114157014736a3d9dfeaad8d41be1c8179866f144a2fb44ff9d opus-1.3.1.tar.gz" +ARG THEORA_SHA256SUM="b6ae1ee2fa3d42ac489287d3ec34c5885730b1296f0801ae577a35193d3affbc libtheora-1.1.1.tar.bz2" +ARG VORBIS_SHA256SUM="6ed40e0241089a42c48604dc00e362beee00036af2d8b3f46338031c9e0351cb libvorbis-1.3.6.tar.gz" +ARG XVID_SHA256SUM="abbdcbd39555691dd1c9b4d08f0a031376a3b211652c0d8b3b8aa9be1303ce2d xvidcore-1.3.7.tar.gz" @@ -124,7 +123,7 @@ 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 | \ + curl -sL https://code.videolan.org/videolan/x264/-/archive/stable/x264-stable.tar.bz2 | \ tar -jx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared --enable-pic --disable-cli && \ make && \ @@ -185,9 +184,9 @@ RUN \ DIR=/tmp/theora && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sLO http://downloads.xiph.org/releases/theora/libtheora-${THEORA_VERSION}.tar.gz && \ + curl -sLO http://downloads.xiph.org/releases/theora/libtheora-${THEORA_VERSION}.tar.bz2 && \ echo ${THEORA_SHA256SUM} | sha256sum --check && \ - tar -zx --strip-components=1 -f libtheora-${THEORA_VERSION}.tar.gz && \ + tar -jx --strip-components=1 -f libtheora-${THEORA_VERSION}.tar.bz2 && \ ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ make && \ make install && \ @@ -231,7 +230,7 @@ RUN \ DIR=/tmp/xvid && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sLO http://downloads.xvid.org/downloads/xvidcore-${XVID_VERSION}.tar.gz && \ + curl -sLO http://downloads.xvid.com/downloads/xvidcore-${XVID_VERSION}.tar.gz && \ echo ${XVID_SHA256SUM} | sha256sum --check && \ tar -zx -f xvidcore-${XVID_VERSION}.tar.gz && \ cd xvidcore/build/generic && \ @@ -292,12 +291,10 @@ RUN \ DIR=/tmp/fribidi && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sLO https://github.com/fribidi/fribidi/archive/${FRIBIDI_VERSION}.tar.gz && \ + curl -sLO https://github.com/fribidi/fribidi/releases/download/v${FRIBIDI_VERSION}/fribidi-${FRIBIDI_VERSION}.tar.bz2 && \ 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 && \ + tar -jx --strip-components=1 -f ${FRIBIDI_VERSION}.tar.bz2 && \ + ./autogen.sh && \ make -j 1 && \ make install && \ rm -rf ${DIR} @@ -306,8 +303,8 @@ 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 && \ + curl -sLO https://www.freedesktop.org/software/fontconfig/release/fontconfig-${FONTCONFIG_VERSION}.tar.gz &&\ + tar -zx --strip-components=1 -f fontconfig-${FONTCONFIG_VERSION}.tar.gz && \ ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ make && \ make install && \ @@ -317,10 +314,9 @@ RUN \ DIR=/tmp/libass && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sLO https://github.com/libass/libass/archive/${LIBASS_VERSION}.tar.gz &&\ + curl -sLO https://github.com/libass/libass/releases/download/${LIBASS_VERSION}/libass-${LIBASS_VERSION}.tar.gz &&\ echo ${LIBASS_SHA256SUM} | sha256sum --check && \ - tar -zx --strip-components=1 -f ${LIBASS_VERSION}.tar.gz && \ - ./autogen.sh && \ + tar -zx --strip-components=1 -f libass-${LIBASS_VERSION}.tar.gz && \ ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ make && \ make install && \ diff --git a/docker-images/3.4/scratch/Dockerfile b/docker-images/3.4/scratch/Dockerfile index 8ed7c8923..0e5ab9016 100644 --- a/docker-images/3.4/scratch/Dockerfile +++ b/docker-images/3.4/scratch/Dockerfile @@ -15,42 +15,41 @@ ARG MAKEFLAGS="-j2" ENV FFMPEG_VERSION=3.4.7 \ 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 \ + FDKAAC_VERSION=2.0.1 \ + FONTCONFIG_VERSION=2.13.92 \ + FREETYPE_VERSION=2.10.1 \ + FRIBIDI_VERSION=1.0.8 \ + KVAZAAR_VERSION=1.3.0 \ LAME_VERSION=3.100 \ - LIBASS_VERSION=0.13.7 \ + LIBASS_VERSION=0.14.0 \ LIBPTHREAD_STUBS_VERSION=0.4 \ LIBVIDSTAB_VERSION=1.1.0 \ LIBXCB_VERSION=1.13.1 \ XCBPROTO_VERSION=1.13 \ - OGG_VERSION=1.3.2 \ + OGG_VERSION=1.3.4 \ OPENCOREAMR_VERSION=0.1.5 \ - OPUS_VERSION=1.2 \ - OPENJPEG_VERSION=2.1.2 \ + OPUS_VERSION=1.3.1 \ + OPENJPEG_VERSION=2.3.1 \ 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 \ + VORBIS_VERSION=1.3.6 \ + VPX_VERSION=1.8.2 \ + WEBP_VERSION=1.0.3 \ + X265_VERSION=3.2.1 \ XAU_VERSION=1.0.9 \ XORG_MACROS_VERSION=1.19.2 \ XPROTO_VERSION=7.0.31 \ - XVID_VERSION=1.3.4 \ + XVID_VERSION=1.3.7 \ SRC=/usr/local -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 FREETYPE_SHA256SUM="3a60d391fd579440561bf0e7f31af2222bc610ad6ce4d9d7bd2165bca8669110 freetype-2.10.1.tar.gz" +ARG FRIBIDI_SHA256SUM="94c7b68d86ad2a9613b4dcffe7bbeb03523d63b5b37918bdf2e4ef34195c1e6c fribidi-1.0.8.tar.bz2" +ARG LIBASS_SHA256SUM="8d5a5c920b90b70a108007ffcd2289ac652c0e03fc88e6eecefa37df0f2e7fdf libass-0.14.0.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" +ARG OGG_SHA256SUM="fe5670640bd49e828d64d2879c31cb4dde9758681bb664f9bdbf159a01b0c76e libogg-1.3.4.tar.gz" +ARG OPUS_SHA256SUM="65b58e1e25b2a114157014736a3d9dfeaad8d41be1c8179866f144a2fb44ff9d opus-1.3.1.tar.gz" +ARG THEORA_SHA256SUM="b6ae1ee2fa3d42ac489287d3ec34c5885730b1296f0801ae577a35193d3affbc libtheora-1.1.1.tar.bz2" +ARG VORBIS_SHA256SUM="6ed40e0241089a42c48604dc00e362beee00036af2d8b3f46338031c9e0351cb libvorbis-1.3.6.tar.gz" +ARG XVID_SHA256SUM="abbdcbd39555691dd1c9b4d08f0a031376a3b211652c0d8b3b8aa9be1303ce2d xvidcore-1.3.7.tar.gz" @@ -95,7 +94,7 @@ 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 | \ + curl -sL https://code.videolan.org/videolan/x264/-/archive/stable/x264-stable.tar.bz2 | \ tar -jx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared --enable-pic --disable-cli && \ make && \ @@ -156,9 +155,9 @@ RUN \ DIR=/tmp/theora && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sLO http://downloads.xiph.org/releases/theora/libtheora-${THEORA_VERSION}.tar.gz && \ + curl -sLO http://downloads.xiph.org/releases/theora/libtheora-${THEORA_VERSION}.tar.bz2 && \ echo ${THEORA_SHA256SUM} | sha256sum --check && \ - tar -zx --strip-components=1 -f libtheora-${THEORA_VERSION}.tar.gz && \ + tar -jx --strip-components=1 -f libtheora-${THEORA_VERSION}.tar.bz2 && \ ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ make && \ make install && \ @@ -202,7 +201,7 @@ RUN \ DIR=/tmp/xvid && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sLO http://downloads.xvid.org/downloads/xvidcore-${XVID_VERSION}.tar.gz && \ + curl -sLO http://downloads.xvid.com/downloads/xvidcore-${XVID_VERSION}.tar.gz && \ echo ${XVID_SHA256SUM} | sha256sum --check && \ tar -zx -f xvidcore-${XVID_VERSION}.tar.gz && \ cd xvidcore/build/generic && \ @@ -263,12 +262,10 @@ RUN \ DIR=/tmp/fribidi && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sLO https://github.com/fribidi/fribidi/archive/${FRIBIDI_VERSION}.tar.gz && \ + curl -sLO https://github.com/fribidi/fribidi/releases/download/v${FRIBIDI_VERSION}/fribidi-${FRIBIDI_VERSION}.tar.bz2 && \ 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 && \ + tar -jx --strip-components=1 -f ${FRIBIDI_VERSION}.tar.bz2 && \ + ./autogen.sh && \ make -j 1 && \ make install && \ rm -rf ${DIR} @@ -277,8 +274,8 @@ 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 && \ + curl -sLO https://www.freedesktop.org/software/fontconfig/release/fontconfig-${FONTCONFIG_VERSION}.tar.gz &&\ + tar -zx --strip-components=1 -f fontconfig-${FONTCONFIG_VERSION}.tar.gz && \ ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ make && \ make install && \ @@ -288,10 +285,9 @@ RUN \ DIR=/tmp/libass && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sLO https://github.com/libass/libass/archive/${LIBASS_VERSION}.tar.gz &&\ + curl -sLO https://github.com/libass/libass/releases/download/${LIBASS_VERSION}/libass-${LIBASS_VERSION}.tar.gz &&\ echo ${LIBASS_SHA256SUM} | sha256sum --check && \ - tar -zx --strip-components=1 -f ${LIBASS_VERSION}.tar.gz && \ - ./autogen.sh && \ + tar -zx --strip-components=1 -f libass-${LIBASS_VERSION}.tar.gz && \ ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ make && \ make install && \ diff --git a/docker-images/3.4/ubuntu/Dockerfile b/docker-images/3.4/ubuntu/Dockerfile index 7c357752a..19d901b84 100644 --- a/docker-images/3.4/ubuntu/Dockerfile +++ b/docker-images/3.4/ubuntu/Dockerfile @@ -23,42 +23,41 @@ ARG MAKEFLAGS="-j2" ENV FFMPEG_VERSION=3.4.7 \ 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 \ + FDKAAC_VERSION=2.0.1 \ + FONTCONFIG_VERSION=2.13.92 \ + FREETYPE_VERSION=2.10.1 \ + FRIBIDI_VERSION=1.0.8 \ + KVAZAAR_VERSION=1.3.0 \ LAME_VERSION=3.100 \ - LIBASS_VERSION=0.13.7 \ + LIBASS_VERSION=0.14.0 \ LIBPTHREAD_STUBS_VERSION=0.4 \ LIBVIDSTAB_VERSION=1.1.0 \ LIBXCB_VERSION=1.13.1 \ XCBPROTO_VERSION=1.13 \ - OGG_VERSION=1.3.2 \ + OGG_VERSION=1.3.4 \ OPENCOREAMR_VERSION=0.1.5 \ - OPUS_VERSION=1.2 \ - OPENJPEG_VERSION=2.1.2 \ + OPUS_VERSION=1.3.1 \ + OPENJPEG_VERSION=2.3.1 \ 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 \ + VORBIS_VERSION=1.3.6 \ + VPX_VERSION=1.8.2 \ + WEBP_VERSION=1.0.3 \ + X265_VERSION=3.2.1 \ XAU_VERSION=1.0.9 \ XORG_MACROS_VERSION=1.19.2 \ XPROTO_VERSION=7.0.31 \ - XVID_VERSION=1.3.4 \ + XVID_VERSION=1.3.7 \ SRC=/usr/local -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 FREETYPE_SHA256SUM="3a60d391fd579440561bf0e7f31af2222bc610ad6ce4d9d7bd2165bca8669110 freetype-2.10.1.tar.gz" +ARG FRIBIDI_SHA256SUM="94c7b68d86ad2a9613b4dcffe7bbeb03523d63b5b37918bdf2e4ef34195c1e6c fribidi-1.0.8.tar.bz2" +ARG LIBASS_SHA256SUM="8d5a5c920b90b70a108007ffcd2289ac652c0e03fc88e6eecefa37df0f2e7fdf libass-0.14.0.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" +ARG OGG_SHA256SUM="fe5670640bd49e828d64d2879c31cb4dde9758681bb664f9bdbf159a01b0c76e libogg-1.3.4.tar.gz" +ARG OPUS_SHA256SUM="65b58e1e25b2a114157014736a3d9dfeaad8d41be1c8179866f144a2fb44ff9d opus-1.3.1.tar.gz" +ARG THEORA_SHA256SUM="b6ae1ee2fa3d42ac489287d3ec34c5885730b1296f0801ae577a35193d3affbc libtheora-1.1.1.tar.bz2" +ARG VORBIS_SHA256SUM="6ed40e0241089a42c48604dc00e362beee00036af2d8b3f46338031c9e0351cb libvorbis-1.3.6.tar.gz" +ARG XVID_SHA256SUM="abbdcbd39555691dd1c9b4d08f0a031376a3b211652c0d8b3b8aa9be1303ce2d xvidcore-1.3.7.tar.gz" @@ -99,7 +98,7 @@ 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 | \ + curl -sL https://code.videolan.org/videolan/x264/-/archive/stable/x264-stable.tar.bz2 | \ tar -jx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared --enable-pic --disable-cli && \ make && \ @@ -160,9 +159,9 @@ RUN \ DIR=/tmp/theora && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sLO http://downloads.xiph.org/releases/theora/libtheora-${THEORA_VERSION}.tar.gz && \ + curl -sLO http://downloads.xiph.org/releases/theora/libtheora-${THEORA_VERSION}.tar.bz2 && \ echo ${THEORA_SHA256SUM} | sha256sum --check && \ - tar -zx --strip-components=1 -f libtheora-${THEORA_VERSION}.tar.gz && \ + tar -jx --strip-components=1 -f libtheora-${THEORA_VERSION}.tar.bz2 && \ ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ make && \ make install && \ @@ -206,7 +205,7 @@ RUN \ DIR=/tmp/xvid && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sLO http://downloads.xvid.org/downloads/xvidcore-${XVID_VERSION}.tar.gz && \ + curl -sLO http://downloads.xvid.com/downloads/xvidcore-${XVID_VERSION}.tar.gz && \ echo ${XVID_SHA256SUM} | sha256sum --check && \ tar -zx -f xvidcore-${XVID_VERSION}.tar.gz && \ cd xvidcore/build/generic && \ @@ -267,12 +266,10 @@ RUN \ DIR=/tmp/fribidi && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sLO https://github.com/fribidi/fribidi/archive/${FRIBIDI_VERSION}.tar.gz && \ + curl -sLO https://github.com/fribidi/fribidi/releases/download/v${FRIBIDI_VERSION}/fribidi-${FRIBIDI_VERSION}.tar.bz2 && \ 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 && \ + tar -jx --strip-components=1 -f ${FRIBIDI_VERSION}.tar.bz2 && \ + ./autogen.sh && \ make -j 1 && \ make install && \ rm -rf ${DIR} @@ -281,8 +278,8 @@ 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 && \ + curl -sLO https://www.freedesktop.org/software/fontconfig/release/fontconfig-${FONTCONFIG_VERSION}.tar.gz &&\ + tar -zx --strip-components=1 -f fontconfig-${FONTCONFIG_VERSION}.tar.gz && \ ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ make && \ make install && \ @@ -292,10 +289,9 @@ RUN \ DIR=/tmp/libass && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sLO https://github.com/libass/libass/archive/${LIBASS_VERSION}.tar.gz &&\ + curl -sLO https://github.com/libass/libass/releases/download/${LIBASS_VERSION}/libass-${LIBASS_VERSION}.tar.gz &&\ echo ${LIBASS_SHA256SUM} | sha256sum --check && \ - tar -zx --strip-components=1 -f ${LIBASS_VERSION}.tar.gz && \ - ./autogen.sh && \ + tar -zx --strip-components=1 -f libass-${LIBASS_VERSION}.tar.gz && \ ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ make && \ make install && \ diff --git a/docker-images/3.4/vaapi/Dockerfile b/docker-images/3.4/vaapi/Dockerfile index 50d97f43f..4b52b18f1 100644 --- a/docker-images/3.4/vaapi/Dockerfile +++ b/docker-images/3.4/vaapi/Dockerfile @@ -23,42 +23,41 @@ ARG MAKEFLAGS="-j2" ENV FFMPEG_VERSION=3.4.7 \ 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 \ + FDKAAC_VERSION=2.0.1 \ + FONTCONFIG_VERSION=2.13.92 \ + FREETYPE_VERSION=2.10.1 \ + FRIBIDI_VERSION=1.0.8 \ + KVAZAAR_VERSION=1.3.0 \ LAME_VERSION=3.100 \ - LIBASS_VERSION=0.13.7 \ + LIBASS_VERSION=0.14.0 \ LIBPTHREAD_STUBS_VERSION=0.4 \ LIBVIDSTAB_VERSION=1.1.0 \ LIBXCB_VERSION=1.13.1 \ XCBPROTO_VERSION=1.13 \ - OGG_VERSION=1.3.2 \ + OGG_VERSION=1.3.4 \ OPENCOREAMR_VERSION=0.1.5 \ - OPUS_VERSION=1.2 \ - OPENJPEG_VERSION=2.1.2 \ + OPUS_VERSION=1.3.1 \ + OPENJPEG_VERSION=2.3.1 \ 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 \ + VORBIS_VERSION=1.3.6 \ + VPX_VERSION=1.8.2 \ + WEBP_VERSION=1.0.3 \ + X265_VERSION=3.2.1 \ XAU_VERSION=1.0.9 \ XORG_MACROS_VERSION=1.19.2 \ XPROTO_VERSION=7.0.31 \ - XVID_VERSION=1.3.4 \ + XVID_VERSION=1.3.7 \ SRC=/usr/local -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 FREETYPE_SHA256SUM="3a60d391fd579440561bf0e7f31af2222bc610ad6ce4d9d7bd2165bca8669110 freetype-2.10.1.tar.gz" +ARG FRIBIDI_SHA256SUM="94c7b68d86ad2a9613b4dcffe7bbeb03523d63b5b37918bdf2e4ef34195c1e6c fribidi-1.0.8.tar.bz2" +ARG LIBASS_SHA256SUM="8d5a5c920b90b70a108007ffcd2289ac652c0e03fc88e6eecefa37df0f2e7fdf libass-0.14.0.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" +ARG OGG_SHA256SUM="fe5670640bd49e828d64d2879c31cb4dde9758681bb664f9bdbf159a01b0c76e libogg-1.3.4.tar.gz" +ARG OPUS_SHA256SUM="65b58e1e25b2a114157014736a3d9dfeaad8d41be1c8179866f144a2fb44ff9d opus-1.3.1.tar.gz" +ARG THEORA_SHA256SUM="b6ae1ee2fa3d42ac489287d3ec34c5885730b1296f0801ae577a35193d3affbc libtheora-1.1.1.tar.bz2" +ARG VORBIS_SHA256SUM="6ed40e0241089a42c48604dc00e362beee00036af2d8b3f46338031c9e0351cb libvorbis-1.3.6.tar.gz" +ARG XVID_SHA256SUM="abbdcbd39555691dd1c9b4d08f0a031376a3b211652c0d8b3b8aa9be1303ce2d xvidcore-1.3.7.tar.gz" @@ -100,7 +99,7 @@ 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 | \ + curl -sL https://code.videolan.org/videolan/x264/-/archive/stable/x264-stable.tar.bz2 | \ tar -jx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared --enable-pic --disable-cli && \ make && \ @@ -161,9 +160,9 @@ RUN \ DIR=/tmp/theora && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sLO http://downloads.xiph.org/releases/theora/libtheora-${THEORA_VERSION}.tar.gz && \ + curl -sLO http://downloads.xiph.org/releases/theora/libtheora-${THEORA_VERSION}.tar.bz2 && \ echo ${THEORA_SHA256SUM} | sha256sum --check && \ - tar -zx --strip-components=1 -f libtheora-${THEORA_VERSION}.tar.gz && \ + tar -jx --strip-components=1 -f libtheora-${THEORA_VERSION}.tar.bz2 && \ ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ make && \ make install && \ @@ -207,7 +206,7 @@ RUN \ DIR=/tmp/xvid && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sLO http://downloads.xvid.org/downloads/xvidcore-${XVID_VERSION}.tar.gz && \ + curl -sLO http://downloads.xvid.com/downloads/xvidcore-${XVID_VERSION}.tar.gz && \ echo ${XVID_SHA256SUM} | sha256sum --check && \ tar -zx -f xvidcore-${XVID_VERSION}.tar.gz && \ cd xvidcore/build/generic && \ @@ -268,12 +267,10 @@ RUN \ DIR=/tmp/fribidi && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sLO https://github.com/fribidi/fribidi/archive/${FRIBIDI_VERSION}.tar.gz && \ + curl -sLO https://github.com/fribidi/fribidi/releases/download/v${FRIBIDI_VERSION}/fribidi-${FRIBIDI_VERSION}.tar.bz2 && \ 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 && \ + tar -jx --strip-components=1 -f ${FRIBIDI_VERSION}.tar.bz2 && \ + ./autogen.sh && \ make -j 1 && \ make install && \ rm -rf ${DIR} @@ -282,8 +279,8 @@ 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 && \ + curl -sLO https://www.freedesktop.org/software/fontconfig/release/fontconfig-${FONTCONFIG_VERSION}.tar.gz &&\ + tar -zx --strip-components=1 -f fontconfig-${FONTCONFIG_VERSION}.tar.gz && \ ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ make && \ make install && \ @@ -293,10 +290,9 @@ RUN \ DIR=/tmp/libass && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sLO https://github.com/libass/libass/archive/${LIBASS_VERSION}.tar.gz &&\ + curl -sLO https://github.com/libass/libass/releases/download/${LIBASS_VERSION}/libass-${LIBASS_VERSION}.tar.gz &&\ echo ${LIBASS_SHA256SUM} | sha256sum --check && \ - tar -zx --strip-components=1 -f ${LIBASS_VERSION}.tar.gz && \ - ./autogen.sh && \ + tar -zx --strip-components=1 -f libass-${LIBASS_VERSION}.tar.gz && \ ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ make && \ make install && \ diff --git a/docker-images/4.0/alpine/Dockerfile b/docker-images/4.0/alpine/Dockerfile index 24aac28b1..b6a9569fb 100644 --- a/docker-images/4.0/alpine/Dockerfile +++ b/docker-images/4.0/alpine/Dockerfile @@ -20,42 +20,41 @@ ARG MAKEFLAGS="-j2" ENV FFMPEG_VERSION=4.0.5 \ 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 \ + FDKAAC_VERSION=2.0.1 \ + FONTCONFIG_VERSION=2.13.92 \ + FREETYPE_VERSION=2.10.1 \ + FRIBIDI_VERSION=1.0.8 \ + KVAZAAR_VERSION=1.3.0 \ LAME_VERSION=3.100 \ - LIBASS_VERSION=0.13.7 \ + LIBASS_VERSION=0.14.0 \ LIBPTHREAD_STUBS_VERSION=0.4 \ LIBVIDSTAB_VERSION=1.1.0 \ LIBXCB_VERSION=1.13.1 \ XCBPROTO_VERSION=1.13 \ - OGG_VERSION=1.3.2 \ + OGG_VERSION=1.3.4 \ OPENCOREAMR_VERSION=0.1.5 \ - OPUS_VERSION=1.2 \ - OPENJPEG_VERSION=2.1.2 \ + OPUS_VERSION=1.3.1 \ + OPENJPEG_VERSION=2.3.1 \ 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 \ + VORBIS_VERSION=1.3.6 \ + VPX_VERSION=1.8.2 \ + WEBP_VERSION=1.0.3 \ + X265_VERSION=3.2.1 \ XAU_VERSION=1.0.9 \ XORG_MACROS_VERSION=1.19.2 \ XPROTO_VERSION=7.0.31 \ - XVID_VERSION=1.3.4 \ + XVID_VERSION=1.3.7 \ SRC=/usr/local -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 FREETYPE_SHA256SUM="3a60d391fd579440561bf0e7f31af2222bc610ad6ce4d9d7bd2165bca8669110 freetype-2.10.1.tar.gz" +ARG FRIBIDI_SHA256SUM="94c7b68d86ad2a9613b4dcffe7bbeb03523d63b5b37918bdf2e4ef34195c1e6c fribidi-1.0.8.tar.bz2" +ARG LIBASS_SHA256SUM="8d5a5c920b90b70a108007ffcd2289ac652c0e03fc88e6eecefa37df0f2e7fdf libass-0.14.0.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" +ARG OGG_SHA256SUM="fe5670640bd49e828d64d2879c31cb4dde9758681bb664f9bdbf159a01b0c76e libogg-1.3.4.tar.gz" +ARG OPUS_SHA256SUM="65b58e1e25b2a114157014736a3d9dfeaad8d41be1c8179866f144a2fb44ff9d opus-1.3.1.tar.gz" +ARG THEORA_SHA256SUM="b6ae1ee2fa3d42ac489287d3ec34c5885730b1296f0801ae577a35193d3affbc libtheora-1.1.1.tar.bz2" +ARG VORBIS_SHA256SUM="6ed40e0241089a42c48604dc00e362beee00036af2d8b3f46338031c9e0351cb libvorbis-1.3.6.tar.gz" +ARG XVID_SHA256SUM="abbdcbd39555691dd1c9b4d08f0a031376a3b211652c0d8b3b8aa9be1303ce2d xvidcore-1.3.7.tar.gz" @@ -98,7 +97,7 @@ 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 | \ + curl -sL https://code.videolan.org/videolan/x264/-/archive/stable/x264-stable.tar.bz2 | \ tar -jx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared --enable-pic --disable-cli && \ make && \ @@ -159,9 +158,9 @@ RUN \ DIR=/tmp/theora && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sLO http://downloads.xiph.org/releases/theora/libtheora-${THEORA_VERSION}.tar.gz && \ + curl -sLO http://downloads.xiph.org/releases/theora/libtheora-${THEORA_VERSION}.tar.bz2 && \ echo ${THEORA_SHA256SUM} | sha256sum --check && \ - tar -zx --strip-components=1 -f libtheora-${THEORA_VERSION}.tar.gz && \ + tar -jx --strip-components=1 -f libtheora-${THEORA_VERSION}.tar.bz2 && \ ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ make && \ make install && \ @@ -205,7 +204,7 @@ RUN \ DIR=/tmp/xvid && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sLO http://downloads.xvid.org/downloads/xvidcore-${XVID_VERSION}.tar.gz && \ + curl -sLO http://downloads.xvid.com/downloads/xvidcore-${XVID_VERSION}.tar.gz && \ echo ${XVID_SHA256SUM} | sha256sum --check && \ tar -zx -f xvidcore-${XVID_VERSION}.tar.gz && \ cd xvidcore/build/generic && \ @@ -266,12 +265,10 @@ RUN \ DIR=/tmp/fribidi && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sLO https://github.com/fribidi/fribidi/archive/${FRIBIDI_VERSION}.tar.gz && \ + curl -sLO https://github.com/fribidi/fribidi/releases/download/v${FRIBIDI_VERSION}/fribidi-${FRIBIDI_VERSION}.tar.bz2 && \ 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 && \ + tar -jx --strip-components=1 -f ${FRIBIDI_VERSION}.tar.bz2 && \ + ./autogen.sh && \ make -j 1 && \ make install && \ rm -rf ${DIR} @@ -280,8 +277,8 @@ 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 && \ + curl -sLO https://www.freedesktop.org/software/fontconfig/release/fontconfig-${FONTCONFIG_VERSION}.tar.gz &&\ + tar -zx --strip-components=1 -f fontconfig-${FONTCONFIG_VERSION}.tar.gz && \ ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ make && \ make install && \ @@ -291,10 +288,9 @@ RUN \ DIR=/tmp/libass && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sLO https://github.com/libass/libass/archive/${LIBASS_VERSION}.tar.gz &&\ + curl -sLO https://github.com/libass/libass/releases/download/${LIBASS_VERSION}/libass-${LIBASS_VERSION}.tar.gz &&\ echo ${LIBASS_SHA256SUM} | sha256sum --check && \ - tar -zx --strip-components=1 -f ${LIBASS_VERSION}.tar.gz && \ - ./autogen.sh && \ + tar -zx --strip-components=1 -f libass-${LIBASS_VERSION}.tar.gz && \ ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ make && \ make install && \ diff --git a/docker-images/4.0/centos/Dockerfile b/docker-images/4.0/centos/Dockerfile index 2f00e1d87..12fe761ac 100644 --- a/docker-images/4.0/centos/Dockerfile +++ b/docker-images/4.0/centos/Dockerfile @@ -22,42 +22,41 @@ ARG MAKEFLAGS="-j2" ENV FFMPEG_VERSION=4.0.5 \ 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 \ + FDKAAC_VERSION=2.0.1 \ + FONTCONFIG_VERSION=2.13.92 \ + FREETYPE_VERSION=2.10.1 \ + FRIBIDI_VERSION=1.0.8 \ + KVAZAAR_VERSION=1.3.0 \ LAME_VERSION=3.100 \ - LIBASS_VERSION=0.13.7 \ + LIBASS_VERSION=0.14.0 \ LIBPTHREAD_STUBS_VERSION=0.4 \ LIBVIDSTAB_VERSION=1.1.0 \ LIBXCB_VERSION=1.13.1 \ XCBPROTO_VERSION=1.13 \ - OGG_VERSION=1.3.2 \ + OGG_VERSION=1.3.4 \ OPENCOREAMR_VERSION=0.1.5 \ - OPUS_VERSION=1.2 \ - OPENJPEG_VERSION=2.1.2 \ + OPUS_VERSION=1.3.1 \ + OPENJPEG_VERSION=2.3.1 \ 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 \ + VORBIS_VERSION=1.3.6 \ + VPX_VERSION=1.8.2 \ + WEBP_VERSION=1.0.3 \ + X265_VERSION=3.2.1 \ XAU_VERSION=1.0.9 \ XORG_MACROS_VERSION=1.19.2 \ XPROTO_VERSION=7.0.31 \ - XVID_VERSION=1.3.4 \ + XVID_VERSION=1.3.7 \ SRC=/usr/local -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 FREETYPE_SHA256SUM="3a60d391fd579440561bf0e7f31af2222bc610ad6ce4d9d7bd2165bca8669110 freetype-2.10.1.tar.gz" +ARG FRIBIDI_SHA256SUM="94c7b68d86ad2a9613b4dcffe7bbeb03523d63b5b37918bdf2e4ef34195c1e6c fribidi-1.0.8.tar.bz2" +ARG LIBASS_SHA256SUM="8d5a5c920b90b70a108007ffcd2289ac652c0e03fc88e6eecefa37df0f2e7fdf libass-0.14.0.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" +ARG OGG_SHA256SUM="fe5670640bd49e828d64d2879c31cb4dde9758681bb664f9bdbf159a01b0c76e libogg-1.3.4.tar.gz" +ARG OPUS_SHA256SUM="65b58e1e25b2a114157014736a3d9dfeaad8d41be1c8179866f144a2fb44ff9d opus-1.3.1.tar.gz" +ARG THEORA_SHA256SUM="b6ae1ee2fa3d42ac489287d3ec34c5885730b1296f0801ae577a35193d3affbc libtheora-1.1.1.tar.bz2" +ARG VORBIS_SHA256SUM="6ed40e0241089a42c48604dc00e362beee00036af2d8b3f46338031c9e0351cb libvorbis-1.3.6.tar.gz" +ARG XVID_SHA256SUM="abbdcbd39555691dd1c9b4d08f0a031376a3b211652c0d8b3b8aa9be1303ce2d xvidcore-1.3.7.tar.gz" @@ -98,7 +97,7 @@ 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 | \ + curl -sL https://code.videolan.org/videolan/x264/-/archive/stable/x264-stable.tar.bz2 | \ tar -jx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared --enable-pic --disable-cli && \ make && \ @@ -159,9 +158,9 @@ RUN \ DIR=/tmp/theora && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sLO http://downloads.xiph.org/releases/theora/libtheora-${THEORA_VERSION}.tar.gz && \ + curl -sLO http://downloads.xiph.org/releases/theora/libtheora-${THEORA_VERSION}.tar.bz2 && \ echo ${THEORA_SHA256SUM} | sha256sum --check && \ - tar -zx --strip-components=1 -f libtheora-${THEORA_VERSION}.tar.gz && \ + tar -jx --strip-components=1 -f libtheora-${THEORA_VERSION}.tar.bz2 && \ ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ make && \ make install && \ @@ -205,7 +204,7 @@ RUN \ DIR=/tmp/xvid && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sLO http://downloads.xvid.org/downloads/xvidcore-${XVID_VERSION}.tar.gz && \ + curl -sLO http://downloads.xvid.com/downloads/xvidcore-${XVID_VERSION}.tar.gz && \ echo ${XVID_SHA256SUM} | sha256sum --check && \ tar -zx -f xvidcore-${XVID_VERSION}.tar.gz && \ cd xvidcore/build/generic && \ @@ -266,12 +265,10 @@ RUN \ DIR=/tmp/fribidi && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sLO https://github.com/fribidi/fribidi/archive/${FRIBIDI_VERSION}.tar.gz && \ + curl -sLO https://github.com/fribidi/fribidi/releases/download/v${FRIBIDI_VERSION}/fribidi-${FRIBIDI_VERSION}.tar.bz2 && \ 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 && \ + tar -jx --strip-components=1 -f ${FRIBIDI_VERSION}.tar.bz2 && \ + ./autogen.sh && \ make -j 1 && \ make install && \ rm -rf ${DIR} @@ -280,8 +277,8 @@ 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 && \ + curl -sLO https://www.freedesktop.org/software/fontconfig/release/fontconfig-${FONTCONFIG_VERSION}.tar.gz &&\ + tar -zx --strip-components=1 -f fontconfig-${FONTCONFIG_VERSION}.tar.gz && \ ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ make && \ make install && \ @@ -291,10 +288,9 @@ RUN \ DIR=/tmp/libass && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sLO https://github.com/libass/libass/archive/${LIBASS_VERSION}.tar.gz &&\ + curl -sLO https://github.com/libass/libass/releases/download/${LIBASS_VERSION}/libass-${LIBASS_VERSION}.tar.gz &&\ echo ${LIBASS_SHA256SUM} | sha256sum --check && \ - tar -zx --strip-components=1 -f ${LIBASS_VERSION}.tar.gz && \ - ./autogen.sh && \ + tar -zx --strip-components=1 -f libass-${LIBASS_VERSION}.tar.gz && \ ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ make && \ make install && \ diff --git a/docker-images/4.0/nvidia/Dockerfile b/docker-images/4.0/nvidia/Dockerfile index 2fa9ebaaa..1d8e4431e 100644 --- a/docker-images/4.0/nvidia/Dockerfile +++ b/docker-images/4.0/nvidia/Dockerfile @@ -37,42 +37,41 @@ ARG MAKEFLAGS="-j12" ENV FFMPEG_VERSION=4.0.5 \ 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 \ + FDKAAC_VERSION=2.0.1 \ + FONTCONFIG_VERSION=2.13.92 \ + FREETYPE_VERSION=2.10.1 \ + FRIBIDI_VERSION=1.0.8 \ + KVAZAAR_VERSION=1.3.0 \ LAME_VERSION=3.100 \ - LIBASS_VERSION=0.13.7 \ + LIBASS_VERSION=0.14.0 \ LIBPTHREAD_STUBS_VERSION=0.4 \ LIBVIDSTAB_VERSION=1.1.0 \ LIBXCB_VERSION=1.13.1 \ XCBPROTO_VERSION=1.13 \ - OGG_VERSION=1.3.2 \ + OGG_VERSION=1.3.4 \ OPENCOREAMR_VERSION=0.1.5 \ - OPUS_VERSION=1.2 \ - OPENJPEG_VERSION=2.1.2 \ + OPUS_VERSION=1.3.1 \ + OPENJPEG_VERSION=2.3.1 \ 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 \ + VORBIS_VERSION=1.3.6 \ + VPX_VERSION=1.8.2 \ + WEBP_VERSION=1.0.3 \ + X265_VERSION=3.2.1 \ XAU_VERSION=1.0.9 \ XORG_MACROS_VERSION=1.19.2 \ XPROTO_VERSION=7.0.31 \ - XVID_VERSION=1.3.4 \ + XVID_VERSION=1.3.7 \ SRC=/usr/local -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 FREETYPE_SHA256SUM="3a60d391fd579440561bf0e7f31af2222bc610ad6ce4d9d7bd2165bca8669110 freetype-2.10.1.tar.gz" +ARG FRIBIDI_SHA256SUM="94c7b68d86ad2a9613b4dcffe7bbeb03523d63b5b37918bdf2e4ef34195c1e6c fribidi-1.0.8.tar.bz2" +ARG LIBASS_SHA256SUM="8d5a5c920b90b70a108007ffcd2289ac652c0e03fc88e6eecefa37df0f2e7fdf libass-0.14.0.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" +ARG OGG_SHA256SUM="fe5670640bd49e828d64d2879c31cb4dde9758681bb664f9bdbf159a01b0c76e libogg-1.3.4.tar.gz" +ARG OPUS_SHA256SUM="65b58e1e25b2a114157014736a3d9dfeaad8d41be1c8179866f144a2fb44ff9d opus-1.3.1.tar.gz" +ARG THEORA_SHA256SUM="b6ae1ee2fa3d42ac489287d3ec34c5885730b1296f0801ae577a35193d3affbc libtheora-1.1.1.tar.bz2" +ARG VORBIS_SHA256SUM="6ed40e0241089a42c48604dc00e362beee00036af2d8b3f46338031c9e0351cb libvorbis-1.3.6.tar.gz" +ARG XVID_SHA256SUM="abbdcbd39555691dd1c9b4d08f0a031376a3b211652c0d8b3b8aa9be1303ce2d xvidcore-1.3.7.tar.gz" @@ -124,7 +123,7 @@ 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 | \ + curl -sL https://code.videolan.org/videolan/x264/-/archive/stable/x264-stable.tar.bz2 | \ tar -jx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared --enable-pic --disable-cli && \ make && \ @@ -185,9 +184,9 @@ RUN \ DIR=/tmp/theora && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sLO http://downloads.xiph.org/releases/theora/libtheora-${THEORA_VERSION}.tar.gz && \ + curl -sLO http://downloads.xiph.org/releases/theora/libtheora-${THEORA_VERSION}.tar.bz2 && \ echo ${THEORA_SHA256SUM} | sha256sum --check && \ - tar -zx --strip-components=1 -f libtheora-${THEORA_VERSION}.tar.gz && \ + tar -jx --strip-components=1 -f libtheora-${THEORA_VERSION}.tar.bz2 && \ ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ make && \ make install && \ @@ -231,7 +230,7 @@ RUN \ DIR=/tmp/xvid && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sLO http://downloads.xvid.org/downloads/xvidcore-${XVID_VERSION}.tar.gz && \ + curl -sLO http://downloads.xvid.com/downloads/xvidcore-${XVID_VERSION}.tar.gz && \ echo ${XVID_SHA256SUM} | sha256sum --check && \ tar -zx -f xvidcore-${XVID_VERSION}.tar.gz && \ cd xvidcore/build/generic && \ @@ -292,12 +291,10 @@ RUN \ DIR=/tmp/fribidi && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sLO https://github.com/fribidi/fribidi/archive/${FRIBIDI_VERSION}.tar.gz && \ + curl -sLO https://github.com/fribidi/fribidi/releases/download/v${FRIBIDI_VERSION}/fribidi-${FRIBIDI_VERSION}.tar.bz2 && \ 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 && \ + tar -jx --strip-components=1 -f ${FRIBIDI_VERSION}.tar.bz2 && \ + ./autogen.sh && \ make -j 1 && \ make install && \ rm -rf ${DIR} @@ -306,8 +303,8 @@ 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 && \ + curl -sLO https://www.freedesktop.org/software/fontconfig/release/fontconfig-${FONTCONFIG_VERSION}.tar.gz &&\ + tar -zx --strip-components=1 -f fontconfig-${FONTCONFIG_VERSION}.tar.gz && \ ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ make && \ make install && \ @@ -317,10 +314,9 @@ RUN \ DIR=/tmp/libass && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sLO https://github.com/libass/libass/archive/${LIBASS_VERSION}.tar.gz &&\ + curl -sLO https://github.com/libass/libass/releases/download/${LIBASS_VERSION}/libass-${LIBASS_VERSION}.tar.gz &&\ echo ${LIBASS_SHA256SUM} | sha256sum --check && \ - tar -zx --strip-components=1 -f ${LIBASS_VERSION}.tar.gz && \ - ./autogen.sh && \ + tar -zx --strip-components=1 -f libass-${LIBASS_VERSION}.tar.gz && \ ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ make && \ make install && \ diff --git a/docker-images/4.0/scratch/Dockerfile b/docker-images/4.0/scratch/Dockerfile index 79eb330dc..3658cd0c7 100644 --- a/docker-images/4.0/scratch/Dockerfile +++ b/docker-images/4.0/scratch/Dockerfile @@ -15,42 +15,41 @@ ARG MAKEFLAGS="-j2" ENV FFMPEG_VERSION=4.0.5 \ 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 \ + FDKAAC_VERSION=2.0.1 \ + FONTCONFIG_VERSION=2.13.92 \ + FREETYPE_VERSION=2.10.1 \ + FRIBIDI_VERSION=1.0.8 \ + KVAZAAR_VERSION=1.3.0 \ LAME_VERSION=3.100 \ - LIBASS_VERSION=0.13.7 \ + LIBASS_VERSION=0.14.0 \ LIBPTHREAD_STUBS_VERSION=0.4 \ LIBVIDSTAB_VERSION=1.1.0 \ LIBXCB_VERSION=1.13.1 \ XCBPROTO_VERSION=1.13 \ - OGG_VERSION=1.3.2 \ + OGG_VERSION=1.3.4 \ OPENCOREAMR_VERSION=0.1.5 \ - OPUS_VERSION=1.2 \ - OPENJPEG_VERSION=2.1.2 \ + OPUS_VERSION=1.3.1 \ + OPENJPEG_VERSION=2.3.1 \ 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 \ + VORBIS_VERSION=1.3.6 \ + VPX_VERSION=1.8.2 \ + WEBP_VERSION=1.0.3 \ + X265_VERSION=3.2.1 \ XAU_VERSION=1.0.9 \ XORG_MACROS_VERSION=1.19.2 \ XPROTO_VERSION=7.0.31 \ - XVID_VERSION=1.3.4 \ + XVID_VERSION=1.3.7 \ SRC=/usr/local -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 FREETYPE_SHA256SUM="3a60d391fd579440561bf0e7f31af2222bc610ad6ce4d9d7bd2165bca8669110 freetype-2.10.1.tar.gz" +ARG FRIBIDI_SHA256SUM="94c7b68d86ad2a9613b4dcffe7bbeb03523d63b5b37918bdf2e4ef34195c1e6c fribidi-1.0.8.tar.bz2" +ARG LIBASS_SHA256SUM="8d5a5c920b90b70a108007ffcd2289ac652c0e03fc88e6eecefa37df0f2e7fdf libass-0.14.0.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" +ARG OGG_SHA256SUM="fe5670640bd49e828d64d2879c31cb4dde9758681bb664f9bdbf159a01b0c76e libogg-1.3.4.tar.gz" +ARG OPUS_SHA256SUM="65b58e1e25b2a114157014736a3d9dfeaad8d41be1c8179866f144a2fb44ff9d opus-1.3.1.tar.gz" +ARG THEORA_SHA256SUM="b6ae1ee2fa3d42ac489287d3ec34c5885730b1296f0801ae577a35193d3affbc libtheora-1.1.1.tar.bz2" +ARG VORBIS_SHA256SUM="6ed40e0241089a42c48604dc00e362beee00036af2d8b3f46338031c9e0351cb libvorbis-1.3.6.tar.gz" +ARG XVID_SHA256SUM="abbdcbd39555691dd1c9b4d08f0a031376a3b211652c0d8b3b8aa9be1303ce2d xvidcore-1.3.7.tar.gz" @@ -95,7 +94,7 @@ 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 | \ + curl -sL https://code.videolan.org/videolan/x264/-/archive/stable/x264-stable.tar.bz2 | \ tar -jx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared --enable-pic --disable-cli && \ make && \ @@ -156,9 +155,9 @@ RUN \ DIR=/tmp/theora && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sLO http://downloads.xiph.org/releases/theora/libtheora-${THEORA_VERSION}.tar.gz && \ + curl -sLO http://downloads.xiph.org/releases/theora/libtheora-${THEORA_VERSION}.tar.bz2 && \ echo ${THEORA_SHA256SUM} | sha256sum --check && \ - tar -zx --strip-components=1 -f libtheora-${THEORA_VERSION}.tar.gz && \ + tar -jx --strip-components=1 -f libtheora-${THEORA_VERSION}.tar.bz2 && \ ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ make && \ make install && \ @@ -202,7 +201,7 @@ RUN \ DIR=/tmp/xvid && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sLO http://downloads.xvid.org/downloads/xvidcore-${XVID_VERSION}.tar.gz && \ + curl -sLO http://downloads.xvid.com/downloads/xvidcore-${XVID_VERSION}.tar.gz && \ echo ${XVID_SHA256SUM} | sha256sum --check && \ tar -zx -f xvidcore-${XVID_VERSION}.tar.gz && \ cd xvidcore/build/generic && \ @@ -263,12 +262,10 @@ RUN \ DIR=/tmp/fribidi && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sLO https://github.com/fribidi/fribidi/archive/${FRIBIDI_VERSION}.tar.gz && \ + curl -sLO https://github.com/fribidi/fribidi/releases/download/v${FRIBIDI_VERSION}/fribidi-${FRIBIDI_VERSION}.tar.bz2 && \ 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 && \ + tar -jx --strip-components=1 -f ${FRIBIDI_VERSION}.tar.bz2 && \ + ./autogen.sh && \ make -j 1 && \ make install && \ rm -rf ${DIR} @@ -277,8 +274,8 @@ 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 && \ + curl -sLO https://www.freedesktop.org/software/fontconfig/release/fontconfig-${FONTCONFIG_VERSION}.tar.gz &&\ + tar -zx --strip-components=1 -f fontconfig-${FONTCONFIG_VERSION}.tar.gz && \ ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ make && \ make install && \ @@ -288,10 +285,9 @@ RUN \ DIR=/tmp/libass && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sLO https://github.com/libass/libass/archive/${LIBASS_VERSION}.tar.gz &&\ + curl -sLO https://github.com/libass/libass/releases/download/${LIBASS_VERSION}/libass-${LIBASS_VERSION}.tar.gz &&\ echo ${LIBASS_SHA256SUM} | sha256sum --check && \ - tar -zx --strip-components=1 -f ${LIBASS_VERSION}.tar.gz && \ - ./autogen.sh && \ + tar -zx --strip-components=1 -f libass-${LIBASS_VERSION}.tar.gz && \ ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ make && \ make install && \ diff --git a/docker-images/4.0/ubuntu/Dockerfile b/docker-images/4.0/ubuntu/Dockerfile index 90bef9348..c026cf453 100644 --- a/docker-images/4.0/ubuntu/Dockerfile +++ b/docker-images/4.0/ubuntu/Dockerfile @@ -23,42 +23,41 @@ ARG MAKEFLAGS="-j2" ENV FFMPEG_VERSION=4.0.5 \ 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 \ + FDKAAC_VERSION=2.0.1 \ + FONTCONFIG_VERSION=2.13.92 \ + FREETYPE_VERSION=2.10.1 \ + FRIBIDI_VERSION=1.0.8 \ + KVAZAAR_VERSION=1.3.0 \ LAME_VERSION=3.100 \ - LIBASS_VERSION=0.13.7 \ + LIBASS_VERSION=0.14.0 \ LIBPTHREAD_STUBS_VERSION=0.4 \ LIBVIDSTAB_VERSION=1.1.0 \ LIBXCB_VERSION=1.13.1 \ XCBPROTO_VERSION=1.13 \ - OGG_VERSION=1.3.2 \ + OGG_VERSION=1.3.4 \ OPENCOREAMR_VERSION=0.1.5 \ - OPUS_VERSION=1.2 \ - OPENJPEG_VERSION=2.1.2 \ + OPUS_VERSION=1.3.1 \ + OPENJPEG_VERSION=2.3.1 \ 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 \ + VORBIS_VERSION=1.3.6 \ + VPX_VERSION=1.8.2 \ + WEBP_VERSION=1.0.3 \ + X265_VERSION=3.2.1 \ XAU_VERSION=1.0.9 \ XORG_MACROS_VERSION=1.19.2 \ XPROTO_VERSION=7.0.31 \ - XVID_VERSION=1.3.4 \ + XVID_VERSION=1.3.7 \ SRC=/usr/local -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 FREETYPE_SHA256SUM="3a60d391fd579440561bf0e7f31af2222bc610ad6ce4d9d7bd2165bca8669110 freetype-2.10.1.tar.gz" +ARG FRIBIDI_SHA256SUM="94c7b68d86ad2a9613b4dcffe7bbeb03523d63b5b37918bdf2e4ef34195c1e6c fribidi-1.0.8.tar.bz2" +ARG LIBASS_SHA256SUM="8d5a5c920b90b70a108007ffcd2289ac652c0e03fc88e6eecefa37df0f2e7fdf libass-0.14.0.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" +ARG OGG_SHA256SUM="fe5670640bd49e828d64d2879c31cb4dde9758681bb664f9bdbf159a01b0c76e libogg-1.3.4.tar.gz" +ARG OPUS_SHA256SUM="65b58e1e25b2a114157014736a3d9dfeaad8d41be1c8179866f144a2fb44ff9d opus-1.3.1.tar.gz" +ARG THEORA_SHA256SUM="b6ae1ee2fa3d42ac489287d3ec34c5885730b1296f0801ae577a35193d3affbc libtheora-1.1.1.tar.bz2" +ARG VORBIS_SHA256SUM="6ed40e0241089a42c48604dc00e362beee00036af2d8b3f46338031c9e0351cb libvorbis-1.3.6.tar.gz" +ARG XVID_SHA256SUM="abbdcbd39555691dd1c9b4d08f0a031376a3b211652c0d8b3b8aa9be1303ce2d xvidcore-1.3.7.tar.gz" @@ -99,7 +98,7 @@ 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 | \ + curl -sL https://code.videolan.org/videolan/x264/-/archive/stable/x264-stable.tar.bz2 | \ tar -jx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared --enable-pic --disable-cli && \ make && \ @@ -160,9 +159,9 @@ RUN \ DIR=/tmp/theora && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sLO http://downloads.xiph.org/releases/theora/libtheora-${THEORA_VERSION}.tar.gz && \ + curl -sLO http://downloads.xiph.org/releases/theora/libtheora-${THEORA_VERSION}.tar.bz2 && \ echo ${THEORA_SHA256SUM} | sha256sum --check && \ - tar -zx --strip-components=1 -f libtheora-${THEORA_VERSION}.tar.gz && \ + tar -jx --strip-components=1 -f libtheora-${THEORA_VERSION}.tar.bz2 && \ ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ make && \ make install && \ @@ -206,7 +205,7 @@ RUN \ DIR=/tmp/xvid && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sLO http://downloads.xvid.org/downloads/xvidcore-${XVID_VERSION}.tar.gz && \ + curl -sLO http://downloads.xvid.com/downloads/xvidcore-${XVID_VERSION}.tar.gz && \ echo ${XVID_SHA256SUM} | sha256sum --check && \ tar -zx -f xvidcore-${XVID_VERSION}.tar.gz && \ cd xvidcore/build/generic && \ @@ -267,12 +266,10 @@ RUN \ DIR=/tmp/fribidi && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sLO https://github.com/fribidi/fribidi/archive/${FRIBIDI_VERSION}.tar.gz && \ + curl -sLO https://github.com/fribidi/fribidi/releases/download/v${FRIBIDI_VERSION}/fribidi-${FRIBIDI_VERSION}.tar.bz2 && \ 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 && \ + tar -jx --strip-components=1 -f ${FRIBIDI_VERSION}.tar.bz2 && \ + ./autogen.sh && \ make -j 1 && \ make install && \ rm -rf ${DIR} @@ -281,8 +278,8 @@ 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 && \ + curl -sLO https://www.freedesktop.org/software/fontconfig/release/fontconfig-${FONTCONFIG_VERSION}.tar.gz &&\ + tar -zx --strip-components=1 -f fontconfig-${FONTCONFIG_VERSION}.tar.gz && \ ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ make && \ make install && \ @@ -292,10 +289,9 @@ RUN \ DIR=/tmp/libass && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sLO https://github.com/libass/libass/archive/${LIBASS_VERSION}.tar.gz &&\ + curl -sLO https://github.com/libass/libass/releases/download/${LIBASS_VERSION}/libass-${LIBASS_VERSION}.tar.gz &&\ echo ${LIBASS_SHA256SUM} | sha256sum --check && \ - tar -zx --strip-components=1 -f ${LIBASS_VERSION}.tar.gz && \ - ./autogen.sh && \ + tar -zx --strip-components=1 -f libass-${LIBASS_VERSION}.tar.gz && \ ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ make && \ make install && \ diff --git a/docker-images/4.0/vaapi/Dockerfile b/docker-images/4.0/vaapi/Dockerfile index 2bb34fae6..272b22976 100644 --- a/docker-images/4.0/vaapi/Dockerfile +++ b/docker-images/4.0/vaapi/Dockerfile @@ -23,42 +23,41 @@ ARG MAKEFLAGS="-j2" ENV FFMPEG_VERSION=4.0.5 \ 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 \ + FDKAAC_VERSION=2.0.1 \ + FONTCONFIG_VERSION=2.13.92 \ + FREETYPE_VERSION=2.10.1 \ + FRIBIDI_VERSION=1.0.8 \ + KVAZAAR_VERSION=1.3.0 \ LAME_VERSION=3.100 \ - LIBASS_VERSION=0.13.7 \ + LIBASS_VERSION=0.14.0 \ LIBPTHREAD_STUBS_VERSION=0.4 \ LIBVIDSTAB_VERSION=1.1.0 \ LIBXCB_VERSION=1.13.1 \ XCBPROTO_VERSION=1.13 \ - OGG_VERSION=1.3.2 \ + OGG_VERSION=1.3.4 \ OPENCOREAMR_VERSION=0.1.5 \ - OPUS_VERSION=1.2 \ - OPENJPEG_VERSION=2.1.2 \ + OPUS_VERSION=1.3.1 \ + OPENJPEG_VERSION=2.3.1 \ 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 \ + VORBIS_VERSION=1.3.6 \ + VPX_VERSION=1.8.2 \ + WEBP_VERSION=1.0.3 \ + X265_VERSION=3.2.1 \ XAU_VERSION=1.0.9 \ XORG_MACROS_VERSION=1.19.2 \ XPROTO_VERSION=7.0.31 \ - XVID_VERSION=1.3.4 \ + XVID_VERSION=1.3.7 \ SRC=/usr/local -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 FREETYPE_SHA256SUM="3a60d391fd579440561bf0e7f31af2222bc610ad6ce4d9d7bd2165bca8669110 freetype-2.10.1.tar.gz" +ARG FRIBIDI_SHA256SUM="94c7b68d86ad2a9613b4dcffe7bbeb03523d63b5b37918bdf2e4ef34195c1e6c fribidi-1.0.8.tar.bz2" +ARG LIBASS_SHA256SUM="8d5a5c920b90b70a108007ffcd2289ac652c0e03fc88e6eecefa37df0f2e7fdf libass-0.14.0.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" +ARG OGG_SHA256SUM="fe5670640bd49e828d64d2879c31cb4dde9758681bb664f9bdbf159a01b0c76e libogg-1.3.4.tar.gz" +ARG OPUS_SHA256SUM="65b58e1e25b2a114157014736a3d9dfeaad8d41be1c8179866f144a2fb44ff9d opus-1.3.1.tar.gz" +ARG THEORA_SHA256SUM="b6ae1ee2fa3d42ac489287d3ec34c5885730b1296f0801ae577a35193d3affbc libtheora-1.1.1.tar.bz2" +ARG VORBIS_SHA256SUM="6ed40e0241089a42c48604dc00e362beee00036af2d8b3f46338031c9e0351cb libvorbis-1.3.6.tar.gz" +ARG XVID_SHA256SUM="abbdcbd39555691dd1c9b4d08f0a031376a3b211652c0d8b3b8aa9be1303ce2d xvidcore-1.3.7.tar.gz" @@ -100,7 +99,7 @@ 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 | \ + curl -sL https://code.videolan.org/videolan/x264/-/archive/stable/x264-stable.tar.bz2 | \ tar -jx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared --enable-pic --disable-cli && \ make && \ @@ -161,9 +160,9 @@ RUN \ DIR=/tmp/theora && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sLO http://downloads.xiph.org/releases/theora/libtheora-${THEORA_VERSION}.tar.gz && \ + curl -sLO http://downloads.xiph.org/releases/theora/libtheora-${THEORA_VERSION}.tar.bz2 && \ echo ${THEORA_SHA256SUM} | sha256sum --check && \ - tar -zx --strip-components=1 -f libtheora-${THEORA_VERSION}.tar.gz && \ + tar -jx --strip-components=1 -f libtheora-${THEORA_VERSION}.tar.bz2 && \ ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ make && \ make install && \ @@ -207,7 +206,7 @@ RUN \ DIR=/tmp/xvid && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sLO http://downloads.xvid.org/downloads/xvidcore-${XVID_VERSION}.tar.gz && \ + curl -sLO http://downloads.xvid.com/downloads/xvidcore-${XVID_VERSION}.tar.gz && \ echo ${XVID_SHA256SUM} | sha256sum --check && \ tar -zx -f xvidcore-${XVID_VERSION}.tar.gz && \ cd xvidcore/build/generic && \ @@ -268,12 +267,10 @@ RUN \ DIR=/tmp/fribidi && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sLO https://github.com/fribidi/fribidi/archive/${FRIBIDI_VERSION}.tar.gz && \ + curl -sLO https://github.com/fribidi/fribidi/releases/download/v${FRIBIDI_VERSION}/fribidi-${FRIBIDI_VERSION}.tar.bz2 && \ 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 && \ + tar -jx --strip-components=1 -f ${FRIBIDI_VERSION}.tar.bz2 && \ + ./autogen.sh && \ make -j 1 && \ make install && \ rm -rf ${DIR} @@ -282,8 +279,8 @@ 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 && \ + curl -sLO https://www.freedesktop.org/software/fontconfig/release/fontconfig-${FONTCONFIG_VERSION}.tar.gz &&\ + tar -zx --strip-components=1 -f fontconfig-${FONTCONFIG_VERSION}.tar.gz && \ ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ make && \ make install && \ @@ -293,10 +290,9 @@ RUN \ DIR=/tmp/libass && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sLO https://github.com/libass/libass/archive/${LIBASS_VERSION}.tar.gz &&\ + curl -sLO https://github.com/libass/libass/releases/download/${LIBASS_VERSION}/libass-${LIBASS_VERSION}.tar.gz &&\ echo ${LIBASS_SHA256SUM} | sha256sum --check && \ - tar -zx --strip-components=1 -f ${LIBASS_VERSION}.tar.gz && \ - ./autogen.sh && \ + tar -zx --strip-components=1 -f libass-${LIBASS_VERSION}.tar.gz && \ ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ make && \ make install && \ diff --git a/docker-images/4.1/alpine/Dockerfile b/docker-images/4.1/alpine/Dockerfile index cdf524296..04da8bd32 100644 --- a/docker-images/4.1/alpine/Dockerfile +++ b/docker-images/4.1/alpine/Dockerfile @@ -20,42 +20,41 @@ ARG MAKEFLAGS="-j2" ENV FFMPEG_VERSION=4.1.5 \ 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 \ + FDKAAC_VERSION=2.0.1 \ + FONTCONFIG_VERSION=2.13.92 \ + FREETYPE_VERSION=2.10.1 \ + FRIBIDI_VERSION=1.0.8 \ + KVAZAAR_VERSION=1.3.0 \ LAME_VERSION=3.100 \ - LIBASS_VERSION=0.13.7 \ + LIBASS_VERSION=0.14.0 \ LIBPTHREAD_STUBS_VERSION=0.4 \ LIBVIDSTAB_VERSION=1.1.0 \ LIBXCB_VERSION=1.13.1 \ XCBPROTO_VERSION=1.13 \ - OGG_VERSION=1.3.2 \ + OGG_VERSION=1.3.4 \ OPENCOREAMR_VERSION=0.1.5 \ - OPUS_VERSION=1.2 \ - OPENJPEG_VERSION=2.1.2 \ + OPUS_VERSION=1.3.1 \ + OPENJPEG_VERSION=2.3.1 \ 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 \ + VORBIS_VERSION=1.3.6 \ + VPX_VERSION=1.8.2 \ + WEBP_VERSION=1.0.3 \ + X265_VERSION=3.2.1 \ XAU_VERSION=1.0.9 \ XORG_MACROS_VERSION=1.19.2 \ XPROTO_VERSION=7.0.31 \ - XVID_VERSION=1.3.4 \ + XVID_VERSION=1.3.7 \ SRC=/usr/local -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 FREETYPE_SHA256SUM="3a60d391fd579440561bf0e7f31af2222bc610ad6ce4d9d7bd2165bca8669110 freetype-2.10.1.tar.gz" +ARG FRIBIDI_SHA256SUM="94c7b68d86ad2a9613b4dcffe7bbeb03523d63b5b37918bdf2e4ef34195c1e6c fribidi-1.0.8.tar.bz2" +ARG LIBASS_SHA256SUM="8d5a5c920b90b70a108007ffcd2289ac652c0e03fc88e6eecefa37df0f2e7fdf libass-0.14.0.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" +ARG OGG_SHA256SUM="fe5670640bd49e828d64d2879c31cb4dde9758681bb664f9bdbf159a01b0c76e libogg-1.3.4.tar.gz" +ARG OPUS_SHA256SUM="65b58e1e25b2a114157014736a3d9dfeaad8d41be1c8179866f144a2fb44ff9d opus-1.3.1.tar.gz" +ARG THEORA_SHA256SUM="b6ae1ee2fa3d42ac489287d3ec34c5885730b1296f0801ae577a35193d3affbc libtheora-1.1.1.tar.bz2" +ARG VORBIS_SHA256SUM="6ed40e0241089a42c48604dc00e362beee00036af2d8b3f46338031c9e0351cb libvorbis-1.3.6.tar.gz" +ARG XVID_SHA256SUM="abbdcbd39555691dd1c9b4d08f0a031376a3b211652c0d8b3b8aa9be1303ce2d xvidcore-1.3.7.tar.gz" @@ -98,7 +97,7 @@ 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 | \ + curl -sL https://code.videolan.org/videolan/x264/-/archive/stable/x264-stable.tar.bz2 | \ tar -jx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared --enable-pic --disable-cli && \ make && \ @@ -159,9 +158,9 @@ RUN \ DIR=/tmp/theora && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sLO http://downloads.xiph.org/releases/theora/libtheora-${THEORA_VERSION}.tar.gz && \ + curl -sLO http://downloads.xiph.org/releases/theora/libtheora-${THEORA_VERSION}.tar.bz2 && \ echo ${THEORA_SHA256SUM} | sha256sum --check && \ - tar -zx --strip-components=1 -f libtheora-${THEORA_VERSION}.tar.gz && \ + tar -jx --strip-components=1 -f libtheora-${THEORA_VERSION}.tar.bz2 && \ ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ make && \ make install && \ @@ -205,7 +204,7 @@ RUN \ DIR=/tmp/xvid && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sLO http://downloads.xvid.org/downloads/xvidcore-${XVID_VERSION}.tar.gz && \ + curl -sLO http://downloads.xvid.com/downloads/xvidcore-${XVID_VERSION}.tar.gz && \ echo ${XVID_SHA256SUM} | sha256sum --check && \ tar -zx -f xvidcore-${XVID_VERSION}.tar.gz && \ cd xvidcore/build/generic && \ @@ -266,12 +265,10 @@ RUN \ DIR=/tmp/fribidi && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sLO https://github.com/fribidi/fribidi/archive/${FRIBIDI_VERSION}.tar.gz && \ + curl -sLO https://github.com/fribidi/fribidi/releases/download/v${FRIBIDI_VERSION}/fribidi-${FRIBIDI_VERSION}.tar.bz2 && \ 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 && \ + tar -jx --strip-components=1 -f ${FRIBIDI_VERSION}.tar.bz2 && \ + ./autogen.sh && \ make -j 1 && \ make install && \ rm -rf ${DIR} @@ -280,8 +277,8 @@ 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 && \ + curl -sLO https://www.freedesktop.org/software/fontconfig/release/fontconfig-${FONTCONFIG_VERSION}.tar.gz &&\ + tar -zx --strip-components=1 -f fontconfig-${FONTCONFIG_VERSION}.tar.gz && \ ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ make && \ make install && \ @@ -291,10 +288,9 @@ RUN \ DIR=/tmp/libass && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sLO https://github.com/libass/libass/archive/${LIBASS_VERSION}.tar.gz &&\ + curl -sLO https://github.com/libass/libass/releases/download/${LIBASS_VERSION}/libass-${LIBASS_VERSION}.tar.gz &&\ echo ${LIBASS_SHA256SUM} | sha256sum --check && \ - tar -zx --strip-components=1 -f ${LIBASS_VERSION}.tar.gz && \ - ./autogen.sh && \ + tar -zx --strip-components=1 -f libass-${LIBASS_VERSION}.tar.gz && \ ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ make && \ make install && \ diff --git a/docker-images/4.1/centos/Dockerfile b/docker-images/4.1/centos/Dockerfile index 4e679d58a..beb41e526 100644 --- a/docker-images/4.1/centos/Dockerfile +++ b/docker-images/4.1/centos/Dockerfile @@ -22,42 +22,41 @@ ARG MAKEFLAGS="-j2" ENV FFMPEG_VERSION=4.1.5 \ 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 \ + FDKAAC_VERSION=2.0.1 \ + FONTCONFIG_VERSION=2.13.92 \ + FREETYPE_VERSION=2.10.1 \ + FRIBIDI_VERSION=1.0.8 \ + KVAZAAR_VERSION=1.3.0 \ LAME_VERSION=3.100 \ - LIBASS_VERSION=0.13.7 \ + LIBASS_VERSION=0.14.0 \ LIBPTHREAD_STUBS_VERSION=0.4 \ LIBVIDSTAB_VERSION=1.1.0 \ LIBXCB_VERSION=1.13.1 \ XCBPROTO_VERSION=1.13 \ - OGG_VERSION=1.3.2 \ + OGG_VERSION=1.3.4 \ OPENCOREAMR_VERSION=0.1.5 \ - OPUS_VERSION=1.2 \ - OPENJPEG_VERSION=2.1.2 \ + OPUS_VERSION=1.3.1 \ + OPENJPEG_VERSION=2.3.1 \ 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 \ + VORBIS_VERSION=1.3.6 \ + VPX_VERSION=1.8.2 \ + WEBP_VERSION=1.0.3 \ + X265_VERSION=3.2.1 \ XAU_VERSION=1.0.9 \ XORG_MACROS_VERSION=1.19.2 \ XPROTO_VERSION=7.0.31 \ - XVID_VERSION=1.3.4 \ + XVID_VERSION=1.3.7 \ SRC=/usr/local -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 FREETYPE_SHA256SUM="3a60d391fd579440561bf0e7f31af2222bc610ad6ce4d9d7bd2165bca8669110 freetype-2.10.1.tar.gz" +ARG FRIBIDI_SHA256SUM="94c7b68d86ad2a9613b4dcffe7bbeb03523d63b5b37918bdf2e4ef34195c1e6c fribidi-1.0.8.tar.bz2" +ARG LIBASS_SHA256SUM="8d5a5c920b90b70a108007ffcd2289ac652c0e03fc88e6eecefa37df0f2e7fdf libass-0.14.0.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" +ARG OGG_SHA256SUM="fe5670640bd49e828d64d2879c31cb4dde9758681bb664f9bdbf159a01b0c76e libogg-1.3.4.tar.gz" +ARG OPUS_SHA256SUM="65b58e1e25b2a114157014736a3d9dfeaad8d41be1c8179866f144a2fb44ff9d opus-1.3.1.tar.gz" +ARG THEORA_SHA256SUM="b6ae1ee2fa3d42ac489287d3ec34c5885730b1296f0801ae577a35193d3affbc libtheora-1.1.1.tar.bz2" +ARG VORBIS_SHA256SUM="6ed40e0241089a42c48604dc00e362beee00036af2d8b3f46338031c9e0351cb libvorbis-1.3.6.tar.gz" +ARG XVID_SHA256SUM="abbdcbd39555691dd1c9b4d08f0a031376a3b211652c0d8b3b8aa9be1303ce2d xvidcore-1.3.7.tar.gz" @@ -98,7 +97,7 @@ 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 | \ + curl -sL https://code.videolan.org/videolan/x264/-/archive/stable/x264-stable.tar.bz2 | \ tar -jx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared --enable-pic --disable-cli && \ make && \ @@ -159,9 +158,9 @@ RUN \ DIR=/tmp/theora && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sLO http://downloads.xiph.org/releases/theora/libtheora-${THEORA_VERSION}.tar.gz && \ + curl -sLO http://downloads.xiph.org/releases/theora/libtheora-${THEORA_VERSION}.tar.bz2 && \ echo ${THEORA_SHA256SUM} | sha256sum --check && \ - tar -zx --strip-components=1 -f libtheora-${THEORA_VERSION}.tar.gz && \ + tar -jx --strip-components=1 -f libtheora-${THEORA_VERSION}.tar.bz2 && \ ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ make && \ make install && \ @@ -205,7 +204,7 @@ RUN \ DIR=/tmp/xvid && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sLO http://downloads.xvid.org/downloads/xvidcore-${XVID_VERSION}.tar.gz && \ + curl -sLO http://downloads.xvid.com/downloads/xvidcore-${XVID_VERSION}.tar.gz && \ echo ${XVID_SHA256SUM} | sha256sum --check && \ tar -zx -f xvidcore-${XVID_VERSION}.tar.gz && \ cd xvidcore/build/generic && \ @@ -266,12 +265,10 @@ RUN \ DIR=/tmp/fribidi && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sLO https://github.com/fribidi/fribidi/archive/${FRIBIDI_VERSION}.tar.gz && \ + curl -sLO https://github.com/fribidi/fribidi/releases/download/v${FRIBIDI_VERSION}/fribidi-${FRIBIDI_VERSION}.tar.bz2 && \ 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 && \ + tar -jx --strip-components=1 -f ${FRIBIDI_VERSION}.tar.bz2 && \ + ./autogen.sh && \ make -j 1 && \ make install && \ rm -rf ${DIR} @@ -280,8 +277,8 @@ 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 && \ + curl -sLO https://www.freedesktop.org/software/fontconfig/release/fontconfig-${FONTCONFIG_VERSION}.tar.gz &&\ + tar -zx --strip-components=1 -f fontconfig-${FONTCONFIG_VERSION}.tar.gz && \ ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ make && \ make install && \ @@ -291,10 +288,9 @@ RUN \ DIR=/tmp/libass && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sLO https://github.com/libass/libass/archive/${LIBASS_VERSION}.tar.gz &&\ + curl -sLO https://github.com/libass/libass/releases/download/${LIBASS_VERSION}/libass-${LIBASS_VERSION}.tar.gz &&\ echo ${LIBASS_SHA256SUM} | sha256sum --check && \ - tar -zx --strip-components=1 -f ${LIBASS_VERSION}.tar.gz && \ - ./autogen.sh && \ + tar -zx --strip-components=1 -f libass-${LIBASS_VERSION}.tar.gz && \ ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ make && \ make install && \ diff --git a/docker-images/4.1/nvidia/Dockerfile b/docker-images/4.1/nvidia/Dockerfile index 42b771691..7f6cd78fc 100644 --- a/docker-images/4.1/nvidia/Dockerfile +++ b/docker-images/4.1/nvidia/Dockerfile @@ -37,42 +37,41 @@ ARG MAKEFLAGS="-j12" ENV FFMPEG_VERSION=4.1.5 \ 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 \ + FDKAAC_VERSION=2.0.1 \ + FONTCONFIG_VERSION=2.13.92 \ + FREETYPE_VERSION=2.10.1 \ + FRIBIDI_VERSION=1.0.8 \ + KVAZAAR_VERSION=1.3.0 \ LAME_VERSION=3.100 \ - LIBASS_VERSION=0.13.7 \ + LIBASS_VERSION=0.14.0 \ LIBPTHREAD_STUBS_VERSION=0.4 \ LIBVIDSTAB_VERSION=1.1.0 \ LIBXCB_VERSION=1.13.1 \ XCBPROTO_VERSION=1.13 \ - OGG_VERSION=1.3.2 \ + OGG_VERSION=1.3.4 \ OPENCOREAMR_VERSION=0.1.5 \ - OPUS_VERSION=1.2 \ - OPENJPEG_VERSION=2.1.2 \ + OPUS_VERSION=1.3.1 \ + OPENJPEG_VERSION=2.3.1 \ 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 \ + VORBIS_VERSION=1.3.6 \ + VPX_VERSION=1.8.2 \ + WEBP_VERSION=1.0.3 \ + X265_VERSION=3.2.1 \ XAU_VERSION=1.0.9 \ XORG_MACROS_VERSION=1.19.2 \ XPROTO_VERSION=7.0.31 \ - XVID_VERSION=1.3.4 \ + XVID_VERSION=1.3.7 \ SRC=/usr/local -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 FREETYPE_SHA256SUM="3a60d391fd579440561bf0e7f31af2222bc610ad6ce4d9d7bd2165bca8669110 freetype-2.10.1.tar.gz" +ARG FRIBIDI_SHA256SUM="94c7b68d86ad2a9613b4dcffe7bbeb03523d63b5b37918bdf2e4ef34195c1e6c fribidi-1.0.8.tar.bz2" +ARG LIBASS_SHA256SUM="8d5a5c920b90b70a108007ffcd2289ac652c0e03fc88e6eecefa37df0f2e7fdf libass-0.14.0.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" +ARG OGG_SHA256SUM="fe5670640bd49e828d64d2879c31cb4dde9758681bb664f9bdbf159a01b0c76e libogg-1.3.4.tar.gz" +ARG OPUS_SHA256SUM="65b58e1e25b2a114157014736a3d9dfeaad8d41be1c8179866f144a2fb44ff9d opus-1.3.1.tar.gz" +ARG THEORA_SHA256SUM="b6ae1ee2fa3d42ac489287d3ec34c5885730b1296f0801ae577a35193d3affbc libtheora-1.1.1.tar.bz2" +ARG VORBIS_SHA256SUM="6ed40e0241089a42c48604dc00e362beee00036af2d8b3f46338031c9e0351cb libvorbis-1.3.6.tar.gz" +ARG XVID_SHA256SUM="abbdcbd39555691dd1c9b4d08f0a031376a3b211652c0d8b3b8aa9be1303ce2d xvidcore-1.3.7.tar.gz" @@ -124,7 +123,7 @@ 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 | \ + curl -sL https://code.videolan.org/videolan/x264/-/archive/stable/x264-stable.tar.bz2 | \ tar -jx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared --enable-pic --disable-cli && \ make && \ @@ -185,9 +184,9 @@ RUN \ DIR=/tmp/theora && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sLO http://downloads.xiph.org/releases/theora/libtheora-${THEORA_VERSION}.tar.gz && \ + curl -sLO http://downloads.xiph.org/releases/theora/libtheora-${THEORA_VERSION}.tar.bz2 && \ echo ${THEORA_SHA256SUM} | sha256sum --check && \ - tar -zx --strip-components=1 -f libtheora-${THEORA_VERSION}.tar.gz && \ + tar -jx --strip-components=1 -f libtheora-${THEORA_VERSION}.tar.bz2 && \ ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ make && \ make install && \ @@ -231,7 +230,7 @@ RUN \ DIR=/tmp/xvid && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sLO http://downloads.xvid.org/downloads/xvidcore-${XVID_VERSION}.tar.gz && \ + curl -sLO http://downloads.xvid.com/downloads/xvidcore-${XVID_VERSION}.tar.gz && \ echo ${XVID_SHA256SUM} | sha256sum --check && \ tar -zx -f xvidcore-${XVID_VERSION}.tar.gz && \ cd xvidcore/build/generic && \ @@ -292,12 +291,10 @@ RUN \ DIR=/tmp/fribidi && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sLO https://github.com/fribidi/fribidi/archive/${FRIBIDI_VERSION}.tar.gz && \ + curl -sLO https://github.com/fribidi/fribidi/releases/download/v${FRIBIDI_VERSION}/fribidi-${FRIBIDI_VERSION}.tar.bz2 && \ 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 && \ + tar -jx --strip-components=1 -f ${FRIBIDI_VERSION}.tar.bz2 && \ + ./autogen.sh && \ make -j 1 && \ make install && \ rm -rf ${DIR} @@ -306,8 +303,8 @@ 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 && \ + curl -sLO https://www.freedesktop.org/software/fontconfig/release/fontconfig-${FONTCONFIG_VERSION}.tar.gz &&\ + tar -zx --strip-components=1 -f fontconfig-${FONTCONFIG_VERSION}.tar.gz && \ ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ make && \ make install && \ @@ -317,10 +314,9 @@ RUN \ DIR=/tmp/libass && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sLO https://github.com/libass/libass/archive/${LIBASS_VERSION}.tar.gz &&\ + curl -sLO https://github.com/libass/libass/releases/download/${LIBASS_VERSION}/libass-${LIBASS_VERSION}.tar.gz &&\ echo ${LIBASS_SHA256SUM} | sha256sum --check && \ - tar -zx --strip-components=1 -f ${LIBASS_VERSION}.tar.gz && \ - ./autogen.sh && \ + tar -zx --strip-components=1 -f libass-${LIBASS_VERSION}.tar.gz && \ ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ make && \ make install && \ diff --git a/docker-images/4.1/scratch/Dockerfile b/docker-images/4.1/scratch/Dockerfile index 1e87a0d65..2155a4035 100644 --- a/docker-images/4.1/scratch/Dockerfile +++ b/docker-images/4.1/scratch/Dockerfile @@ -15,42 +15,41 @@ ARG MAKEFLAGS="-j2" ENV FFMPEG_VERSION=4.1.5 \ 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 \ + FDKAAC_VERSION=2.0.1 \ + FONTCONFIG_VERSION=2.13.92 \ + FREETYPE_VERSION=2.10.1 \ + FRIBIDI_VERSION=1.0.8 \ + KVAZAAR_VERSION=1.3.0 \ LAME_VERSION=3.100 \ - LIBASS_VERSION=0.13.7 \ + LIBASS_VERSION=0.14.0 \ LIBPTHREAD_STUBS_VERSION=0.4 \ LIBVIDSTAB_VERSION=1.1.0 \ LIBXCB_VERSION=1.13.1 \ XCBPROTO_VERSION=1.13 \ - OGG_VERSION=1.3.2 \ + OGG_VERSION=1.3.4 \ OPENCOREAMR_VERSION=0.1.5 \ - OPUS_VERSION=1.2 \ - OPENJPEG_VERSION=2.1.2 \ + OPUS_VERSION=1.3.1 \ + OPENJPEG_VERSION=2.3.1 \ 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 \ + VORBIS_VERSION=1.3.6 \ + VPX_VERSION=1.8.2 \ + WEBP_VERSION=1.0.3 \ + X265_VERSION=3.2.1 \ XAU_VERSION=1.0.9 \ XORG_MACROS_VERSION=1.19.2 \ XPROTO_VERSION=7.0.31 \ - XVID_VERSION=1.3.4 \ + XVID_VERSION=1.3.7 \ SRC=/usr/local -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 FREETYPE_SHA256SUM="3a60d391fd579440561bf0e7f31af2222bc610ad6ce4d9d7bd2165bca8669110 freetype-2.10.1.tar.gz" +ARG FRIBIDI_SHA256SUM="94c7b68d86ad2a9613b4dcffe7bbeb03523d63b5b37918bdf2e4ef34195c1e6c fribidi-1.0.8.tar.bz2" +ARG LIBASS_SHA256SUM="8d5a5c920b90b70a108007ffcd2289ac652c0e03fc88e6eecefa37df0f2e7fdf libass-0.14.0.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" +ARG OGG_SHA256SUM="fe5670640bd49e828d64d2879c31cb4dde9758681bb664f9bdbf159a01b0c76e libogg-1.3.4.tar.gz" +ARG OPUS_SHA256SUM="65b58e1e25b2a114157014736a3d9dfeaad8d41be1c8179866f144a2fb44ff9d opus-1.3.1.tar.gz" +ARG THEORA_SHA256SUM="b6ae1ee2fa3d42ac489287d3ec34c5885730b1296f0801ae577a35193d3affbc libtheora-1.1.1.tar.bz2" +ARG VORBIS_SHA256SUM="6ed40e0241089a42c48604dc00e362beee00036af2d8b3f46338031c9e0351cb libvorbis-1.3.6.tar.gz" +ARG XVID_SHA256SUM="abbdcbd39555691dd1c9b4d08f0a031376a3b211652c0d8b3b8aa9be1303ce2d xvidcore-1.3.7.tar.gz" @@ -95,7 +94,7 @@ 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 | \ + curl -sL https://code.videolan.org/videolan/x264/-/archive/stable/x264-stable.tar.bz2 | \ tar -jx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared --enable-pic --disable-cli && \ make && \ @@ -156,9 +155,9 @@ RUN \ DIR=/tmp/theora && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sLO http://downloads.xiph.org/releases/theora/libtheora-${THEORA_VERSION}.tar.gz && \ + curl -sLO http://downloads.xiph.org/releases/theora/libtheora-${THEORA_VERSION}.tar.bz2 && \ echo ${THEORA_SHA256SUM} | sha256sum --check && \ - tar -zx --strip-components=1 -f libtheora-${THEORA_VERSION}.tar.gz && \ + tar -jx --strip-components=1 -f libtheora-${THEORA_VERSION}.tar.bz2 && \ ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ make && \ make install && \ @@ -202,7 +201,7 @@ RUN \ DIR=/tmp/xvid && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sLO http://downloads.xvid.org/downloads/xvidcore-${XVID_VERSION}.tar.gz && \ + curl -sLO http://downloads.xvid.com/downloads/xvidcore-${XVID_VERSION}.tar.gz && \ echo ${XVID_SHA256SUM} | sha256sum --check && \ tar -zx -f xvidcore-${XVID_VERSION}.tar.gz && \ cd xvidcore/build/generic && \ @@ -263,12 +262,10 @@ RUN \ DIR=/tmp/fribidi && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sLO https://github.com/fribidi/fribidi/archive/${FRIBIDI_VERSION}.tar.gz && \ + curl -sLO https://github.com/fribidi/fribidi/releases/download/v${FRIBIDI_VERSION}/fribidi-${FRIBIDI_VERSION}.tar.bz2 && \ 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 && \ + tar -jx --strip-components=1 -f ${FRIBIDI_VERSION}.tar.bz2 && \ + ./autogen.sh && \ make -j 1 && \ make install && \ rm -rf ${DIR} @@ -277,8 +274,8 @@ 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 && \ + curl -sLO https://www.freedesktop.org/software/fontconfig/release/fontconfig-${FONTCONFIG_VERSION}.tar.gz &&\ + tar -zx --strip-components=1 -f fontconfig-${FONTCONFIG_VERSION}.tar.gz && \ ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ make && \ make install && \ @@ -288,10 +285,9 @@ RUN \ DIR=/tmp/libass && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sLO https://github.com/libass/libass/archive/${LIBASS_VERSION}.tar.gz &&\ + curl -sLO https://github.com/libass/libass/releases/download/${LIBASS_VERSION}/libass-${LIBASS_VERSION}.tar.gz &&\ echo ${LIBASS_SHA256SUM} | sha256sum --check && \ - tar -zx --strip-components=1 -f ${LIBASS_VERSION}.tar.gz && \ - ./autogen.sh && \ + tar -zx --strip-components=1 -f libass-${LIBASS_VERSION}.tar.gz && \ ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ make && \ make install && \ diff --git a/docker-images/4.1/ubuntu/Dockerfile b/docker-images/4.1/ubuntu/Dockerfile index d1985ea84..d20e72a89 100644 --- a/docker-images/4.1/ubuntu/Dockerfile +++ b/docker-images/4.1/ubuntu/Dockerfile @@ -23,42 +23,41 @@ ARG MAKEFLAGS="-j2" ENV FFMPEG_VERSION=4.1.5 \ 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 \ + FDKAAC_VERSION=2.0.1 \ + FONTCONFIG_VERSION=2.13.92 \ + FREETYPE_VERSION=2.10.1 \ + FRIBIDI_VERSION=1.0.8 \ + KVAZAAR_VERSION=1.3.0 \ LAME_VERSION=3.100 \ - LIBASS_VERSION=0.13.7 \ + LIBASS_VERSION=0.14.0 \ LIBPTHREAD_STUBS_VERSION=0.4 \ LIBVIDSTAB_VERSION=1.1.0 \ LIBXCB_VERSION=1.13.1 \ XCBPROTO_VERSION=1.13 \ - OGG_VERSION=1.3.2 \ + OGG_VERSION=1.3.4 \ OPENCOREAMR_VERSION=0.1.5 \ - OPUS_VERSION=1.2 \ - OPENJPEG_VERSION=2.1.2 \ + OPUS_VERSION=1.3.1 \ + OPENJPEG_VERSION=2.3.1 \ 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 \ + VORBIS_VERSION=1.3.6 \ + VPX_VERSION=1.8.2 \ + WEBP_VERSION=1.0.3 \ + X265_VERSION=3.2.1 \ XAU_VERSION=1.0.9 \ XORG_MACROS_VERSION=1.19.2 \ XPROTO_VERSION=7.0.31 \ - XVID_VERSION=1.3.4 \ + XVID_VERSION=1.3.7 \ SRC=/usr/local -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 FREETYPE_SHA256SUM="3a60d391fd579440561bf0e7f31af2222bc610ad6ce4d9d7bd2165bca8669110 freetype-2.10.1.tar.gz" +ARG FRIBIDI_SHA256SUM="94c7b68d86ad2a9613b4dcffe7bbeb03523d63b5b37918bdf2e4ef34195c1e6c fribidi-1.0.8.tar.bz2" +ARG LIBASS_SHA256SUM="8d5a5c920b90b70a108007ffcd2289ac652c0e03fc88e6eecefa37df0f2e7fdf libass-0.14.0.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" +ARG OGG_SHA256SUM="fe5670640bd49e828d64d2879c31cb4dde9758681bb664f9bdbf159a01b0c76e libogg-1.3.4.tar.gz" +ARG OPUS_SHA256SUM="65b58e1e25b2a114157014736a3d9dfeaad8d41be1c8179866f144a2fb44ff9d opus-1.3.1.tar.gz" +ARG THEORA_SHA256SUM="b6ae1ee2fa3d42ac489287d3ec34c5885730b1296f0801ae577a35193d3affbc libtheora-1.1.1.tar.bz2" +ARG VORBIS_SHA256SUM="6ed40e0241089a42c48604dc00e362beee00036af2d8b3f46338031c9e0351cb libvorbis-1.3.6.tar.gz" +ARG XVID_SHA256SUM="abbdcbd39555691dd1c9b4d08f0a031376a3b211652c0d8b3b8aa9be1303ce2d xvidcore-1.3.7.tar.gz" @@ -99,7 +98,7 @@ 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 | \ + curl -sL https://code.videolan.org/videolan/x264/-/archive/stable/x264-stable.tar.bz2 | \ tar -jx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared --enable-pic --disable-cli && \ make && \ @@ -160,9 +159,9 @@ RUN \ DIR=/tmp/theora && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sLO http://downloads.xiph.org/releases/theora/libtheora-${THEORA_VERSION}.tar.gz && \ + curl -sLO http://downloads.xiph.org/releases/theora/libtheora-${THEORA_VERSION}.tar.bz2 && \ echo ${THEORA_SHA256SUM} | sha256sum --check && \ - tar -zx --strip-components=1 -f libtheora-${THEORA_VERSION}.tar.gz && \ + tar -jx --strip-components=1 -f libtheora-${THEORA_VERSION}.tar.bz2 && \ ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ make && \ make install && \ @@ -206,7 +205,7 @@ RUN \ DIR=/tmp/xvid && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sLO http://downloads.xvid.org/downloads/xvidcore-${XVID_VERSION}.tar.gz && \ + curl -sLO http://downloads.xvid.com/downloads/xvidcore-${XVID_VERSION}.tar.gz && \ echo ${XVID_SHA256SUM} | sha256sum --check && \ tar -zx -f xvidcore-${XVID_VERSION}.tar.gz && \ cd xvidcore/build/generic && \ @@ -267,12 +266,10 @@ RUN \ DIR=/tmp/fribidi && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sLO https://github.com/fribidi/fribidi/archive/${FRIBIDI_VERSION}.tar.gz && \ + curl -sLO https://github.com/fribidi/fribidi/releases/download/v${FRIBIDI_VERSION}/fribidi-${FRIBIDI_VERSION}.tar.bz2 && \ 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 && \ + tar -jx --strip-components=1 -f ${FRIBIDI_VERSION}.tar.bz2 && \ + ./autogen.sh && \ make -j 1 && \ make install && \ rm -rf ${DIR} @@ -281,8 +278,8 @@ 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 && \ + curl -sLO https://www.freedesktop.org/software/fontconfig/release/fontconfig-${FONTCONFIG_VERSION}.tar.gz &&\ + tar -zx --strip-components=1 -f fontconfig-${FONTCONFIG_VERSION}.tar.gz && \ ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ make && \ make install && \ @@ -292,10 +289,9 @@ RUN \ DIR=/tmp/libass && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sLO https://github.com/libass/libass/archive/${LIBASS_VERSION}.tar.gz &&\ + curl -sLO https://github.com/libass/libass/releases/download/${LIBASS_VERSION}/libass-${LIBASS_VERSION}.tar.gz &&\ echo ${LIBASS_SHA256SUM} | sha256sum --check && \ - tar -zx --strip-components=1 -f ${LIBASS_VERSION}.tar.gz && \ - ./autogen.sh && \ + tar -zx --strip-components=1 -f libass-${LIBASS_VERSION}.tar.gz && \ ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ make && \ make install && \ diff --git a/docker-images/4.1/vaapi/Dockerfile b/docker-images/4.1/vaapi/Dockerfile index 2e12ad8dc..59862a1b7 100644 --- a/docker-images/4.1/vaapi/Dockerfile +++ b/docker-images/4.1/vaapi/Dockerfile @@ -23,42 +23,41 @@ ARG MAKEFLAGS="-j2" ENV FFMPEG_VERSION=4.1.5 \ 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 \ + FDKAAC_VERSION=2.0.1 \ + FONTCONFIG_VERSION=2.13.92 \ + FREETYPE_VERSION=2.10.1 \ + FRIBIDI_VERSION=1.0.8 \ + KVAZAAR_VERSION=1.3.0 \ LAME_VERSION=3.100 \ - LIBASS_VERSION=0.13.7 \ + LIBASS_VERSION=0.14.0 \ LIBPTHREAD_STUBS_VERSION=0.4 \ LIBVIDSTAB_VERSION=1.1.0 \ LIBXCB_VERSION=1.13.1 \ XCBPROTO_VERSION=1.13 \ - OGG_VERSION=1.3.2 \ + OGG_VERSION=1.3.4 \ OPENCOREAMR_VERSION=0.1.5 \ - OPUS_VERSION=1.2 \ - OPENJPEG_VERSION=2.1.2 \ + OPUS_VERSION=1.3.1 \ + OPENJPEG_VERSION=2.3.1 \ 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 \ + VORBIS_VERSION=1.3.6 \ + VPX_VERSION=1.8.2 \ + WEBP_VERSION=1.0.3 \ + X265_VERSION=3.2.1 \ XAU_VERSION=1.0.9 \ XORG_MACROS_VERSION=1.19.2 \ XPROTO_VERSION=7.0.31 \ - XVID_VERSION=1.3.4 \ + XVID_VERSION=1.3.7 \ SRC=/usr/local -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 FREETYPE_SHA256SUM="3a60d391fd579440561bf0e7f31af2222bc610ad6ce4d9d7bd2165bca8669110 freetype-2.10.1.tar.gz" +ARG FRIBIDI_SHA256SUM="94c7b68d86ad2a9613b4dcffe7bbeb03523d63b5b37918bdf2e4ef34195c1e6c fribidi-1.0.8.tar.bz2" +ARG LIBASS_SHA256SUM="8d5a5c920b90b70a108007ffcd2289ac652c0e03fc88e6eecefa37df0f2e7fdf libass-0.14.0.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" +ARG OGG_SHA256SUM="fe5670640bd49e828d64d2879c31cb4dde9758681bb664f9bdbf159a01b0c76e libogg-1.3.4.tar.gz" +ARG OPUS_SHA256SUM="65b58e1e25b2a114157014736a3d9dfeaad8d41be1c8179866f144a2fb44ff9d opus-1.3.1.tar.gz" +ARG THEORA_SHA256SUM="b6ae1ee2fa3d42ac489287d3ec34c5885730b1296f0801ae577a35193d3affbc libtheora-1.1.1.tar.bz2" +ARG VORBIS_SHA256SUM="6ed40e0241089a42c48604dc00e362beee00036af2d8b3f46338031c9e0351cb libvorbis-1.3.6.tar.gz" +ARG XVID_SHA256SUM="abbdcbd39555691dd1c9b4d08f0a031376a3b211652c0d8b3b8aa9be1303ce2d xvidcore-1.3.7.tar.gz" @@ -100,7 +99,7 @@ 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 | \ + curl -sL https://code.videolan.org/videolan/x264/-/archive/stable/x264-stable.tar.bz2 | \ tar -jx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared --enable-pic --disable-cli && \ make && \ @@ -161,9 +160,9 @@ RUN \ DIR=/tmp/theora && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sLO http://downloads.xiph.org/releases/theora/libtheora-${THEORA_VERSION}.tar.gz && \ + curl -sLO http://downloads.xiph.org/releases/theora/libtheora-${THEORA_VERSION}.tar.bz2 && \ echo ${THEORA_SHA256SUM} | sha256sum --check && \ - tar -zx --strip-components=1 -f libtheora-${THEORA_VERSION}.tar.gz && \ + tar -jx --strip-components=1 -f libtheora-${THEORA_VERSION}.tar.bz2 && \ ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ make && \ make install && \ @@ -207,7 +206,7 @@ RUN \ DIR=/tmp/xvid && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sLO http://downloads.xvid.org/downloads/xvidcore-${XVID_VERSION}.tar.gz && \ + curl -sLO http://downloads.xvid.com/downloads/xvidcore-${XVID_VERSION}.tar.gz && \ echo ${XVID_SHA256SUM} | sha256sum --check && \ tar -zx -f xvidcore-${XVID_VERSION}.tar.gz && \ cd xvidcore/build/generic && \ @@ -268,12 +267,10 @@ RUN \ DIR=/tmp/fribidi && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sLO https://github.com/fribidi/fribidi/archive/${FRIBIDI_VERSION}.tar.gz && \ + curl -sLO https://github.com/fribidi/fribidi/releases/download/v${FRIBIDI_VERSION}/fribidi-${FRIBIDI_VERSION}.tar.bz2 && \ 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 && \ + tar -jx --strip-components=1 -f ${FRIBIDI_VERSION}.tar.bz2 && \ + ./autogen.sh && \ make -j 1 && \ make install && \ rm -rf ${DIR} @@ -282,8 +279,8 @@ 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 && \ + curl -sLO https://www.freedesktop.org/software/fontconfig/release/fontconfig-${FONTCONFIG_VERSION}.tar.gz &&\ + tar -zx --strip-components=1 -f fontconfig-${FONTCONFIG_VERSION}.tar.gz && \ ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ make && \ make install && \ @@ -293,10 +290,9 @@ RUN \ DIR=/tmp/libass && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sLO https://github.com/libass/libass/archive/${LIBASS_VERSION}.tar.gz &&\ + curl -sLO https://github.com/libass/libass/releases/download/${LIBASS_VERSION}/libass-${LIBASS_VERSION}.tar.gz &&\ echo ${LIBASS_SHA256SUM} | sha256sum --check && \ - tar -zx --strip-components=1 -f ${LIBASS_VERSION}.tar.gz && \ - ./autogen.sh && \ + tar -zx --strip-components=1 -f libass-${LIBASS_VERSION}.tar.gz && \ ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ make && \ make install && \ diff --git a/docker-images/4.2/alpine/Dockerfile b/docker-images/4.2/alpine/Dockerfile index 678a851d4..ba809b7f2 100644 --- a/docker-images/4.2/alpine/Dockerfile +++ b/docker-images/4.2/alpine/Dockerfile @@ -20,42 +20,41 @@ ARG MAKEFLAGS="-j2" ENV FFMPEG_VERSION=4.2.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 \ + FDKAAC_VERSION=2.0.1 \ + FONTCONFIG_VERSION=2.13.92 \ + FREETYPE_VERSION=2.10.1 \ + FRIBIDI_VERSION=1.0.8 \ + KVAZAAR_VERSION=1.3.0 \ LAME_VERSION=3.100 \ - LIBASS_VERSION=0.13.7 \ + LIBASS_VERSION=0.14.0 \ LIBPTHREAD_STUBS_VERSION=0.4 \ LIBVIDSTAB_VERSION=1.1.0 \ LIBXCB_VERSION=1.13.1 \ XCBPROTO_VERSION=1.13 \ - OGG_VERSION=1.3.2 \ + OGG_VERSION=1.3.4 \ OPENCOREAMR_VERSION=0.1.5 \ - OPUS_VERSION=1.2 \ - OPENJPEG_VERSION=2.1.2 \ + OPUS_VERSION=1.3.1 \ + OPENJPEG_VERSION=2.3.1 \ 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 \ + VORBIS_VERSION=1.3.6 \ + VPX_VERSION=1.8.2 \ + WEBP_VERSION=1.0.3 \ + X265_VERSION=3.2.1 \ XAU_VERSION=1.0.9 \ XORG_MACROS_VERSION=1.19.2 \ XPROTO_VERSION=7.0.31 \ - XVID_VERSION=1.3.4 \ + XVID_VERSION=1.3.7 \ SRC=/usr/local -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 FREETYPE_SHA256SUM="3a60d391fd579440561bf0e7f31af2222bc610ad6ce4d9d7bd2165bca8669110 freetype-2.10.1.tar.gz" +ARG FRIBIDI_SHA256SUM="94c7b68d86ad2a9613b4dcffe7bbeb03523d63b5b37918bdf2e4ef34195c1e6c fribidi-1.0.8.tar.bz2" +ARG LIBASS_SHA256SUM="8d5a5c920b90b70a108007ffcd2289ac652c0e03fc88e6eecefa37df0f2e7fdf libass-0.14.0.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" +ARG OGG_SHA256SUM="fe5670640bd49e828d64d2879c31cb4dde9758681bb664f9bdbf159a01b0c76e libogg-1.3.4.tar.gz" +ARG OPUS_SHA256SUM="65b58e1e25b2a114157014736a3d9dfeaad8d41be1c8179866f144a2fb44ff9d opus-1.3.1.tar.gz" +ARG THEORA_SHA256SUM="b6ae1ee2fa3d42ac489287d3ec34c5885730b1296f0801ae577a35193d3affbc libtheora-1.1.1.tar.bz2" +ARG VORBIS_SHA256SUM="6ed40e0241089a42c48604dc00e362beee00036af2d8b3f46338031c9e0351cb libvorbis-1.3.6.tar.gz" +ARG XVID_SHA256SUM="abbdcbd39555691dd1c9b4d08f0a031376a3b211652c0d8b3b8aa9be1303ce2d xvidcore-1.3.7.tar.gz" @@ -98,7 +97,7 @@ 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 | \ + curl -sL https://code.videolan.org/videolan/x264/-/archive/stable/x264-stable.tar.bz2 | \ tar -jx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared --enable-pic --disable-cli && \ make && \ @@ -159,9 +158,9 @@ RUN \ DIR=/tmp/theora && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sLO http://downloads.xiph.org/releases/theora/libtheora-${THEORA_VERSION}.tar.gz && \ + curl -sLO http://downloads.xiph.org/releases/theora/libtheora-${THEORA_VERSION}.tar.bz2 && \ echo ${THEORA_SHA256SUM} | sha256sum --check && \ - tar -zx --strip-components=1 -f libtheora-${THEORA_VERSION}.tar.gz && \ + tar -jx --strip-components=1 -f libtheora-${THEORA_VERSION}.tar.bz2 && \ ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ make && \ make install && \ @@ -205,7 +204,7 @@ RUN \ DIR=/tmp/xvid && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sLO http://downloads.xvid.org/downloads/xvidcore-${XVID_VERSION}.tar.gz && \ + curl -sLO http://downloads.xvid.com/downloads/xvidcore-${XVID_VERSION}.tar.gz && \ echo ${XVID_SHA256SUM} | sha256sum --check && \ tar -zx -f xvidcore-${XVID_VERSION}.tar.gz && \ cd xvidcore/build/generic && \ @@ -266,12 +265,10 @@ RUN \ DIR=/tmp/fribidi && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sLO https://github.com/fribidi/fribidi/archive/${FRIBIDI_VERSION}.tar.gz && \ + curl -sLO https://github.com/fribidi/fribidi/releases/download/v${FRIBIDI_VERSION}/fribidi-${FRIBIDI_VERSION}.tar.bz2 && \ 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 && \ + tar -jx --strip-components=1 -f ${FRIBIDI_VERSION}.tar.bz2 && \ + ./autogen.sh && \ make -j 1 && \ make install && \ rm -rf ${DIR} @@ -280,8 +277,8 @@ 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 && \ + curl -sLO https://www.freedesktop.org/software/fontconfig/release/fontconfig-${FONTCONFIG_VERSION}.tar.gz &&\ + tar -zx --strip-components=1 -f fontconfig-${FONTCONFIG_VERSION}.tar.gz && \ ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ make && \ make install && \ @@ -291,10 +288,9 @@ RUN \ DIR=/tmp/libass && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sLO https://github.com/libass/libass/archive/${LIBASS_VERSION}.tar.gz &&\ + curl -sLO https://github.com/libass/libass/releases/download/${LIBASS_VERSION}/libass-${LIBASS_VERSION}.tar.gz &&\ echo ${LIBASS_SHA256SUM} | sha256sum --check && \ - tar -zx --strip-components=1 -f ${LIBASS_VERSION}.tar.gz && \ - ./autogen.sh && \ + tar -zx --strip-components=1 -f libass-${LIBASS_VERSION}.tar.gz && \ ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ make && \ make install && \ diff --git a/docker-images/4.2/centos/Dockerfile b/docker-images/4.2/centos/Dockerfile index 03d2dd10e..44d3c5a54 100644 --- a/docker-images/4.2/centos/Dockerfile +++ b/docker-images/4.2/centos/Dockerfile @@ -22,42 +22,41 @@ ARG MAKEFLAGS="-j2" ENV FFMPEG_VERSION=4.2.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 \ + FDKAAC_VERSION=2.0.1 \ + FONTCONFIG_VERSION=2.13.92 \ + FREETYPE_VERSION=2.10.1 \ + FRIBIDI_VERSION=1.0.8 \ + KVAZAAR_VERSION=1.3.0 \ LAME_VERSION=3.100 \ - LIBASS_VERSION=0.13.7 \ + LIBASS_VERSION=0.14.0 \ LIBPTHREAD_STUBS_VERSION=0.4 \ LIBVIDSTAB_VERSION=1.1.0 \ LIBXCB_VERSION=1.13.1 \ XCBPROTO_VERSION=1.13 \ - OGG_VERSION=1.3.2 \ + OGG_VERSION=1.3.4 \ OPENCOREAMR_VERSION=0.1.5 \ - OPUS_VERSION=1.2 \ - OPENJPEG_VERSION=2.1.2 \ + OPUS_VERSION=1.3.1 \ + OPENJPEG_VERSION=2.3.1 \ 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 \ + VORBIS_VERSION=1.3.6 \ + VPX_VERSION=1.8.2 \ + WEBP_VERSION=1.0.3 \ + X265_VERSION=3.2.1 \ XAU_VERSION=1.0.9 \ XORG_MACROS_VERSION=1.19.2 \ XPROTO_VERSION=7.0.31 \ - XVID_VERSION=1.3.4 \ + XVID_VERSION=1.3.7 \ SRC=/usr/local -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 FREETYPE_SHA256SUM="3a60d391fd579440561bf0e7f31af2222bc610ad6ce4d9d7bd2165bca8669110 freetype-2.10.1.tar.gz" +ARG FRIBIDI_SHA256SUM="94c7b68d86ad2a9613b4dcffe7bbeb03523d63b5b37918bdf2e4ef34195c1e6c fribidi-1.0.8.tar.bz2" +ARG LIBASS_SHA256SUM="8d5a5c920b90b70a108007ffcd2289ac652c0e03fc88e6eecefa37df0f2e7fdf libass-0.14.0.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" +ARG OGG_SHA256SUM="fe5670640bd49e828d64d2879c31cb4dde9758681bb664f9bdbf159a01b0c76e libogg-1.3.4.tar.gz" +ARG OPUS_SHA256SUM="65b58e1e25b2a114157014736a3d9dfeaad8d41be1c8179866f144a2fb44ff9d opus-1.3.1.tar.gz" +ARG THEORA_SHA256SUM="b6ae1ee2fa3d42ac489287d3ec34c5885730b1296f0801ae577a35193d3affbc libtheora-1.1.1.tar.bz2" +ARG VORBIS_SHA256SUM="6ed40e0241089a42c48604dc00e362beee00036af2d8b3f46338031c9e0351cb libvorbis-1.3.6.tar.gz" +ARG XVID_SHA256SUM="abbdcbd39555691dd1c9b4d08f0a031376a3b211652c0d8b3b8aa9be1303ce2d xvidcore-1.3.7.tar.gz" @@ -98,7 +97,7 @@ 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 | \ + curl -sL https://code.videolan.org/videolan/x264/-/archive/stable/x264-stable.tar.bz2 | \ tar -jx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared --enable-pic --disable-cli && \ make && \ @@ -159,9 +158,9 @@ RUN \ DIR=/tmp/theora && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sLO http://downloads.xiph.org/releases/theora/libtheora-${THEORA_VERSION}.tar.gz && \ + curl -sLO http://downloads.xiph.org/releases/theora/libtheora-${THEORA_VERSION}.tar.bz2 && \ echo ${THEORA_SHA256SUM} | sha256sum --check && \ - tar -zx --strip-components=1 -f libtheora-${THEORA_VERSION}.tar.gz && \ + tar -jx --strip-components=1 -f libtheora-${THEORA_VERSION}.tar.bz2 && \ ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ make && \ make install && \ @@ -205,7 +204,7 @@ RUN \ DIR=/tmp/xvid && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sLO http://downloads.xvid.org/downloads/xvidcore-${XVID_VERSION}.tar.gz && \ + curl -sLO http://downloads.xvid.com/downloads/xvidcore-${XVID_VERSION}.tar.gz && \ echo ${XVID_SHA256SUM} | sha256sum --check && \ tar -zx -f xvidcore-${XVID_VERSION}.tar.gz && \ cd xvidcore/build/generic && \ @@ -266,12 +265,10 @@ RUN \ DIR=/tmp/fribidi && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sLO https://github.com/fribidi/fribidi/archive/${FRIBIDI_VERSION}.tar.gz && \ + curl -sLO https://github.com/fribidi/fribidi/releases/download/v${FRIBIDI_VERSION}/fribidi-${FRIBIDI_VERSION}.tar.bz2 && \ 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 && \ + tar -jx --strip-components=1 -f ${FRIBIDI_VERSION}.tar.bz2 && \ + ./autogen.sh && \ make -j 1 && \ make install && \ rm -rf ${DIR} @@ -280,8 +277,8 @@ 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 && \ + curl -sLO https://www.freedesktop.org/software/fontconfig/release/fontconfig-${FONTCONFIG_VERSION}.tar.gz &&\ + tar -zx --strip-components=1 -f fontconfig-${FONTCONFIG_VERSION}.tar.gz && \ ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ make && \ make install && \ @@ -291,10 +288,9 @@ RUN \ DIR=/tmp/libass && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sLO https://github.com/libass/libass/archive/${LIBASS_VERSION}.tar.gz &&\ + curl -sLO https://github.com/libass/libass/releases/download/${LIBASS_VERSION}/libass-${LIBASS_VERSION}.tar.gz &&\ echo ${LIBASS_SHA256SUM} | sha256sum --check && \ - tar -zx --strip-components=1 -f ${LIBASS_VERSION}.tar.gz && \ - ./autogen.sh && \ + tar -zx --strip-components=1 -f libass-${LIBASS_VERSION}.tar.gz && \ ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ make && \ make install && \ diff --git a/docker-images/4.2/nvidia/Dockerfile b/docker-images/4.2/nvidia/Dockerfile index b75e960bd..d2bf53729 100644 --- a/docker-images/4.2/nvidia/Dockerfile +++ b/docker-images/4.2/nvidia/Dockerfile @@ -37,42 +37,41 @@ ARG MAKEFLAGS="-j12" ENV FFMPEG_VERSION=4.2.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 \ + FDKAAC_VERSION=2.0.1 \ + FONTCONFIG_VERSION=2.13.92 \ + FREETYPE_VERSION=2.10.1 \ + FRIBIDI_VERSION=1.0.8 \ + KVAZAAR_VERSION=1.3.0 \ LAME_VERSION=3.100 \ - LIBASS_VERSION=0.13.7 \ + LIBASS_VERSION=0.14.0 \ LIBPTHREAD_STUBS_VERSION=0.4 \ LIBVIDSTAB_VERSION=1.1.0 \ LIBXCB_VERSION=1.13.1 \ XCBPROTO_VERSION=1.13 \ - OGG_VERSION=1.3.2 \ + OGG_VERSION=1.3.4 \ OPENCOREAMR_VERSION=0.1.5 \ - OPUS_VERSION=1.2 \ - OPENJPEG_VERSION=2.1.2 \ + OPUS_VERSION=1.3.1 \ + OPENJPEG_VERSION=2.3.1 \ 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 \ + VORBIS_VERSION=1.3.6 \ + VPX_VERSION=1.8.2 \ + WEBP_VERSION=1.0.3 \ + X265_VERSION=3.2.1 \ XAU_VERSION=1.0.9 \ XORG_MACROS_VERSION=1.19.2 \ XPROTO_VERSION=7.0.31 \ - XVID_VERSION=1.3.4 \ + XVID_VERSION=1.3.7 \ SRC=/usr/local -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 FREETYPE_SHA256SUM="3a60d391fd579440561bf0e7f31af2222bc610ad6ce4d9d7bd2165bca8669110 freetype-2.10.1.tar.gz" +ARG FRIBIDI_SHA256SUM="94c7b68d86ad2a9613b4dcffe7bbeb03523d63b5b37918bdf2e4ef34195c1e6c fribidi-1.0.8.tar.bz2" +ARG LIBASS_SHA256SUM="8d5a5c920b90b70a108007ffcd2289ac652c0e03fc88e6eecefa37df0f2e7fdf libass-0.14.0.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" +ARG OGG_SHA256SUM="fe5670640bd49e828d64d2879c31cb4dde9758681bb664f9bdbf159a01b0c76e libogg-1.3.4.tar.gz" +ARG OPUS_SHA256SUM="65b58e1e25b2a114157014736a3d9dfeaad8d41be1c8179866f144a2fb44ff9d opus-1.3.1.tar.gz" +ARG THEORA_SHA256SUM="b6ae1ee2fa3d42ac489287d3ec34c5885730b1296f0801ae577a35193d3affbc libtheora-1.1.1.tar.bz2" +ARG VORBIS_SHA256SUM="6ed40e0241089a42c48604dc00e362beee00036af2d8b3f46338031c9e0351cb libvorbis-1.3.6.tar.gz" +ARG XVID_SHA256SUM="abbdcbd39555691dd1c9b4d08f0a031376a3b211652c0d8b3b8aa9be1303ce2d xvidcore-1.3.7.tar.gz" @@ -124,7 +123,7 @@ 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 | \ + curl -sL https://code.videolan.org/videolan/x264/-/archive/stable/x264-stable.tar.bz2 | \ tar -jx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared --enable-pic --disable-cli && \ make && \ @@ -185,9 +184,9 @@ RUN \ DIR=/tmp/theora && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sLO http://downloads.xiph.org/releases/theora/libtheora-${THEORA_VERSION}.tar.gz && \ + curl -sLO http://downloads.xiph.org/releases/theora/libtheora-${THEORA_VERSION}.tar.bz2 && \ echo ${THEORA_SHA256SUM} | sha256sum --check && \ - tar -zx --strip-components=1 -f libtheora-${THEORA_VERSION}.tar.gz && \ + tar -jx --strip-components=1 -f libtheora-${THEORA_VERSION}.tar.bz2 && \ ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ make && \ make install && \ @@ -231,7 +230,7 @@ RUN \ DIR=/tmp/xvid && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sLO http://downloads.xvid.org/downloads/xvidcore-${XVID_VERSION}.tar.gz && \ + curl -sLO http://downloads.xvid.com/downloads/xvidcore-${XVID_VERSION}.tar.gz && \ echo ${XVID_SHA256SUM} | sha256sum --check && \ tar -zx -f xvidcore-${XVID_VERSION}.tar.gz && \ cd xvidcore/build/generic && \ @@ -292,12 +291,10 @@ RUN \ DIR=/tmp/fribidi && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sLO https://github.com/fribidi/fribidi/archive/${FRIBIDI_VERSION}.tar.gz && \ + curl -sLO https://github.com/fribidi/fribidi/releases/download/v${FRIBIDI_VERSION}/fribidi-${FRIBIDI_VERSION}.tar.bz2 && \ 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 && \ + tar -jx --strip-components=1 -f ${FRIBIDI_VERSION}.tar.bz2 && \ + ./autogen.sh && \ make -j 1 && \ make install && \ rm -rf ${DIR} @@ -306,8 +303,8 @@ 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 && \ + curl -sLO https://www.freedesktop.org/software/fontconfig/release/fontconfig-${FONTCONFIG_VERSION}.tar.gz &&\ + tar -zx --strip-components=1 -f fontconfig-${FONTCONFIG_VERSION}.tar.gz && \ ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ make && \ make install && \ @@ -317,10 +314,9 @@ RUN \ DIR=/tmp/libass && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sLO https://github.com/libass/libass/archive/${LIBASS_VERSION}.tar.gz &&\ + curl -sLO https://github.com/libass/libass/releases/download/${LIBASS_VERSION}/libass-${LIBASS_VERSION}.tar.gz &&\ echo ${LIBASS_SHA256SUM} | sha256sum --check && \ - tar -zx --strip-components=1 -f ${LIBASS_VERSION}.tar.gz && \ - ./autogen.sh && \ + tar -zx --strip-components=1 -f libass-${LIBASS_VERSION}.tar.gz && \ ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ make && \ make install && \ diff --git a/docker-images/4.2/scratch/Dockerfile b/docker-images/4.2/scratch/Dockerfile index 974806bd9..5acf6fd5d 100644 --- a/docker-images/4.2/scratch/Dockerfile +++ b/docker-images/4.2/scratch/Dockerfile @@ -15,42 +15,41 @@ ARG MAKEFLAGS="-j2" ENV FFMPEG_VERSION=4.2.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 \ + FDKAAC_VERSION=2.0.1 \ + FONTCONFIG_VERSION=2.13.92 \ + FREETYPE_VERSION=2.10.1 \ + FRIBIDI_VERSION=1.0.8 \ + KVAZAAR_VERSION=1.3.0 \ LAME_VERSION=3.100 \ - LIBASS_VERSION=0.13.7 \ + LIBASS_VERSION=0.14.0 \ LIBPTHREAD_STUBS_VERSION=0.4 \ LIBVIDSTAB_VERSION=1.1.0 \ LIBXCB_VERSION=1.13.1 \ XCBPROTO_VERSION=1.13 \ - OGG_VERSION=1.3.2 \ + OGG_VERSION=1.3.4 \ OPENCOREAMR_VERSION=0.1.5 \ - OPUS_VERSION=1.2 \ - OPENJPEG_VERSION=2.1.2 \ + OPUS_VERSION=1.3.1 \ + OPENJPEG_VERSION=2.3.1 \ 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 \ + VORBIS_VERSION=1.3.6 \ + VPX_VERSION=1.8.2 \ + WEBP_VERSION=1.0.3 \ + X265_VERSION=3.2.1 \ XAU_VERSION=1.0.9 \ XORG_MACROS_VERSION=1.19.2 \ XPROTO_VERSION=7.0.31 \ - XVID_VERSION=1.3.4 \ + XVID_VERSION=1.3.7 \ SRC=/usr/local -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 FREETYPE_SHA256SUM="3a60d391fd579440561bf0e7f31af2222bc610ad6ce4d9d7bd2165bca8669110 freetype-2.10.1.tar.gz" +ARG FRIBIDI_SHA256SUM="94c7b68d86ad2a9613b4dcffe7bbeb03523d63b5b37918bdf2e4ef34195c1e6c fribidi-1.0.8.tar.bz2" +ARG LIBASS_SHA256SUM="8d5a5c920b90b70a108007ffcd2289ac652c0e03fc88e6eecefa37df0f2e7fdf libass-0.14.0.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" +ARG OGG_SHA256SUM="fe5670640bd49e828d64d2879c31cb4dde9758681bb664f9bdbf159a01b0c76e libogg-1.3.4.tar.gz" +ARG OPUS_SHA256SUM="65b58e1e25b2a114157014736a3d9dfeaad8d41be1c8179866f144a2fb44ff9d opus-1.3.1.tar.gz" +ARG THEORA_SHA256SUM="b6ae1ee2fa3d42ac489287d3ec34c5885730b1296f0801ae577a35193d3affbc libtheora-1.1.1.tar.bz2" +ARG VORBIS_SHA256SUM="6ed40e0241089a42c48604dc00e362beee00036af2d8b3f46338031c9e0351cb libvorbis-1.3.6.tar.gz" +ARG XVID_SHA256SUM="abbdcbd39555691dd1c9b4d08f0a031376a3b211652c0d8b3b8aa9be1303ce2d xvidcore-1.3.7.tar.gz" @@ -95,7 +94,7 @@ 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 | \ + curl -sL https://code.videolan.org/videolan/x264/-/archive/stable/x264-stable.tar.bz2 | \ tar -jx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared --enable-pic --disable-cli && \ make && \ @@ -156,9 +155,9 @@ RUN \ DIR=/tmp/theora && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sLO http://downloads.xiph.org/releases/theora/libtheora-${THEORA_VERSION}.tar.gz && \ + curl -sLO http://downloads.xiph.org/releases/theora/libtheora-${THEORA_VERSION}.tar.bz2 && \ echo ${THEORA_SHA256SUM} | sha256sum --check && \ - tar -zx --strip-components=1 -f libtheora-${THEORA_VERSION}.tar.gz && \ + tar -jx --strip-components=1 -f libtheora-${THEORA_VERSION}.tar.bz2 && \ ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ make && \ make install && \ @@ -202,7 +201,7 @@ RUN \ DIR=/tmp/xvid && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sLO http://downloads.xvid.org/downloads/xvidcore-${XVID_VERSION}.tar.gz && \ + curl -sLO http://downloads.xvid.com/downloads/xvidcore-${XVID_VERSION}.tar.gz && \ echo ${XVID_SHA256SUM} | sha256sum --check && \ tar -zx -f xvidcore-${XVID_VERSION}.tar.gz && \ cd xvidcore/build/generic && \ @@ -263,12 +262,10 @@ RUN \ DIR=/tmp/fribidi && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sLO https://github.com/fribidi/fribidi/archive/${FRIBIDI_VERSION}.tar.gz && \ + curl -sLO https://github.com/fribidi/fribidi/releases/download/v${FRIBIDI_VERSION}/fribidi-${FRIBIDI_VERSION}.tar.bz2 && \ 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 && \ + tar -jx --strip-components=1 -f ${FRIBIDI_VERSION}.tar.bz2 && \ + ./autogen.sh && \ make -j 1 && \ make install && \ rm -rf ${DIR} @@ -277,8 +274,8 @@ 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 && \ + curl -sLO https://www.freedesktop.org/software/fontconfig/release/fontconfig-${FONTCONFIG_VERSION}.tar.gz &&\ + tar -zx --strip-components=1 -f fontconfig-${FONTCONFIG_VERSION}.tar.gz && \ ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ make && \ make install && \ @@ -288,10 +285,9 @@ RUN \ DIR=/tmp/libass && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sLO https://github.com/libass/libass/archive/${LIBASS_VERSION}.tar.gz &&\ + curl -sLO https://github.com/libass/libass/releases/download/${LIBASS_VERSION}/libass-${LIBASS_VERSION}.tar.gz &&\ echo ${LIBASS_SHA256SUM} | sha256sum --check && \ - tar -zx --strip-components=1 -f ${LIBASS_VERSION}.tar.gz && \ - ./autogen.sh && \ + tar -zx --strip-components=1 -f libass-${LIBASS_VERSION}.tar.gz && \ ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ make && \ make install && \ diff --git a/docker-images/4.2/ubuntu/Dockerfile b/docker-images/4.2/ubuntu/Dockerfile index 344099280..b8f1b1c10 100644 --- a/docker-images/4.2/ubuntu/Dockerfile +++ b/docker-images/4.2/ubuntu/Dockerfile @@ -23,42 +23,41 @@ ARG MAKEFLAGS="-j2" ENV FFMPEG_VERSION=4.2.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 \ + FDKAAC_VERSION=2.0.1 \ + FONTCONFIG_VERSION=2.13.92 \ + FREETYPE_VERSION=2.10.1 \ + FRIBIDI_VERSION=1.0.8 \ + KVAZAAR_VERSION=1.3.0 \ LAME_VERSION=3.100 \ - LIBASS_VERSION=0.13.7 \ + LIBASS_VERSION=0.14.0 \ LIBPTHREAD_STUBS_VERSION=0.4 \ LIBVIDSTAB_VERSION=1.1.0 \ LIBXCB_VERSION=1.13.1 \ XCBPROTO_VERSION=1.13 \ - OGG_VERSION=1.3.2 \ + OGG_VERSION=1.3.4 \ OPENCOREAMR_VERSION=0.1.5 \ - OPUS_VERSION=1.2 \ - OPENJPEG_VERSION=2.1.2 \ + OPUS_VERSION=1.3.1 \ + OPENJPEG_VERSION=2.3.1 \ 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 \ + VORBIS_VERSION=1.3.6 \ + VPX_VERSION=1.8.2 \ + WEBP_VERSION=1.0.3 \ + X265_VERSION=3.2.1 \ XAU_VERSION=1.0.9 \ XORG_MACROS_VERSION=1.19.2 \ XPROTO_VERSION=7.0.31 \ - XVID_VERSION=1.3.4 \ + XVID_VERSION=1.3.7 \ SRC=/usr/local -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 FREETYPE_SHA256SUM="3a60d391fd579440561bf0e7f31af2222bc610ad6ce4d9d7bd2165bca8669110 freetype-2.10.1.tar.gz" +ARG FRIBIDI_SHA256SUM="94c7b68d86ad2a9613b4dcffe7bbeb03523d63b5b37918bdf2e4ef34195c1e6c fribidi-1.0.8.tar.bz2" +ARG LIBASS_SHA256SUM="8d5a5c920b90b70a108007ffcd2289ac652c0e03fc88e6eecefa37df0f2e7fdf libass-0.14.0.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" +ARG OGG_SHA256SUM="fe5670640bd49e828d64d2879c31cb4dde9758681bb664f9bdbf159a01b0c76e libogg-1.3.4.tar.gz" +ARG OPUS_SHA256SUM="65b58e1e25b2a114157014736a3d9dfeaad8d41be1c8179866f144a2fb44ff9d opus-1.3.1.tar.gz" +ARG THEORA_SHA256SUM="b6ae1ee2fa3d42ac489287d3ec34c5885730b1296f0801ae577a35193d3affbc libtheora-1.1.1.tar.bz2" +ARG VORBIS_SHA256SUM="6ed40e0241089a42c48604dc00e362beee00036af2d8b3f46338031c9e0351cb libvorbis-1.3.6.tar.gz" +ARG XVID_SHA256SUM="abbdcbd39555691dd1c9b4d08f0a031376a3b211652c0d8b3b8aa9be1303ce2d xvidcore-1.3.7.tar.gz" @@ -99,7 +98,7 @@ 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 | \ + curl -sL https://code.videolan.org/videolan/x264/-/archive/stable/x264-stable.tar.bz2 | \ tar -jx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared --enable-pic --disable-cli && \ make && \ @@ -160,9 +159,9 @@ RUN \ DIR=/tmp/theora && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sLO http://downloads.xiph.org/releases/theora/libtheora-${THEORA_VERSION}.tar.gz && \ + curl -sLO http://downloads.xiph.org/releases/theora/libtheora-${THEORA_VERSION}.tar.bz2 && \ echo ${THEORA_SHA256SUM} | sha256sum --check && \ - tar -zx --strip-components=1 -f libtheora-${THEORA_VERSION}.tar.gz && \ + tar -jx --strip-components=1 -f libtheora-${THEORA_VERSION}.tar.bz2 && \ ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ make && \ make install && \ @@ -206,7 +205,7 @@ RUN \ DIR=/tmp/xvid && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sLO http://downloads.xvid.org/downloads/xvidcore-${XVID_VERSION}.tar.gz && \ + curl -sLO http://downloads.xvid.com/downloads/xvidcore-${XVID_VERSION}.tar.gz && \ echo ${XVID_SHA256SUM} | sha256sum --check && \ tar -zx -f xvidcore-${XVID_VERSION}.tar.gz && \ cd xvidcore/build/generic && \ @@ -267,12 +266,10 @@ RUN \ DIR=/tmp/fribidi && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sLO https://github.com/fribidi/fribidi/archive/${FRIBIDI_VERSION}.tar.gz && \ + curl -sLO https://github.com/fribidi/fribidi/releases/download/v${FRIBIDI_VERSION}/fribidi-${FRIBIDI_VERSION}.tar.bz2 && \ 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 && \ + tar -jx --strip-components=1 -f ${FRIBIDI_VERSION}.tar.bz2 && \ + ./autogen.sh && \ make -j 1 && \ make install && \ rm -rf ${DIR} @@ -281,8 +278,8 @@ 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 && \ + curl -sLO https://www.freedesktop.org/software/fontconfig/release/fontconfig-${FONTCONFIG_VERSION}.tar.gz &&\ + tar -zx --strip-components=1 -f fontconfig-${FONTCONFIG_VERSION}.tar.gz && \ ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ make && \ make install && \ @@ -292,10 +289,9 @@ RUN \ DIR=/tmp/libass && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sLO https://github.com/libass/libass/archive/${LIBASS_VERSION}.tar.gz &&\ + curl -sLO https://github.com/libass/libass/releases/download/${LIBASS_VERSION}/libass-${LIBASS_VERSION}.tar.gz &&\ echo ${LIBASS_SHA256SUM} | sha256sum --check && \ - tar -zx --strip-components=1 -f ${LIBASS_VERSION}.tar.gz && \ - ./autogen.sh && \ + tar -zx --strip-components=1 -f libass-${LIBASS_VERSION}.tar.gz && \ ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ make && \ make install && \ diff --git a/docker-images/4.2/vaapi/Dockerfile b/docker-images/4.2/vaapi/Dockerfile index 26e3ca7ea..ac7c21ff0 100644 --- a/docker-images/4.2/vaapi/Dockerfile +++ b/docker-images/4.2/vaapi/Dockerfile @@ -23,42 +23,41 @@ ARG MAKEFLAGS="-j2" ENV FFMPEG_VERSION=4.2.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 \ + FDKAAC_VERSION=2.0.1 \ + FONTCONFIG_VERSION=2.13.92 \ + FREETYPE_VERSION=2.10.1 \ + FRIBIDI_VERSION=1.0.8 \ + KVAZAAR_VERSION=1.3.0 \ LAME_VERSION=3.100 \ - LIBASS_VERSION=0.13.7 \ + LIBASS_VERSION=0.14.0 \ LIBPTHREAD_STUBS_VERSION=0.4 \ LIBVIDSTAB_VERSION=1.1.0 \ LIBXCB_VERSION=1.13.1 \ XCBPROTO_VERSION=1.13 \ - OGG_VERSION=1.3.2 \ + OGG_VERSION=1.3.4 \ OPENCOREAMR_VERSION=0.1.5 \ - OPUS_VERSION=1.2 \ - OPENJPEG_VERSION=2.1.2 \ + OPUS_VERSION=1.3.1 \ + OPENJPEG_VERSION=2.3.1 \ 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 \ + VORBIS_VERSION=1.3.6 \ + VPX_VERSION=1.8.2 \ + WEBP_VERSION=1.0.3 \ + X265_VERSION=3.2.1 \ XAU_VERSION=1.0.9 \ XORG_MACROS_VERSION=1.19.2 \ XPROTO_VERSION=7.0.31 \ - XVID_VERSION=1.3.4 \ + XVID_VERSION=1.3.7 \ SRC=/usr/local -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 FREETYPE_SHA256SUM="3a60d391fd579440561bf0e7f31af2222bc610ad6ce4d9d7bd2165bca8669110 freetype-2.10.1.tar.gz" +ARG FRIBIDI_SHA256SUM="94c7b68d86ad2a9613b4dcffe7bbeb03523d63b5b37918bdf2e4ef34195c1e6c fribidi-1.0.8.tar.bz2" +ARG LIBASS_SHA256SUM="8d5a5c920b90b70a108007ffcd2289ac652c0e03fc88e6eecefa37df0f2e7fdf libass-0.14.0.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" +ARG OGG_SHA256SUM="fe5670640bd49e828d64d2879c31cb4dde9758681bb664f9bdbf159a01b0c76e libogg-1.3.4.tar.gz" +ARG OPUS_SHA256SUM="65b58e1e25b2a114157014736a3d9dfeaad8d41be1c8179866f144a2fb44ff9d opus-1.3.1.tar.gz" +ARG THEORA_SHA256SUM="b6ae1ee2fa3d42ac489287d3ec34c5885730b1296f0801ae577a35193d3affbc libtheora-1.1.1.tar.bz2" +ARG VORBIS_SHA256SUM="6ed40e0241089a42c48604dc00e362beee00036af2d8b3f46338031c9e0351cb libvorbis-1.3.6.tar.gz" +ARG XVID_SHA256SUM="abbdcbd39555691dd1c9b4d08f0a031376a3b211652c0d8b3b8aa9be1303ce2d xvidcore-1.3.7.tar.gz" @@ -100,7 +99,7 @@ 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 | \ + curl -sL https://code.videolan.org/videolan/x264/-/archive/stable/x264-stable.tar.bz2 | \ tar -jx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared --enable-pic --disable-cli && \ make && \ @@ -161,9 +160,9 @@ RUN \ DIR=/tmp/theora && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sLO http://downloads.xiph.org/releases/theora/libtheora-${THEORA_VERSION}.tar.gz && \ + curl -sLO http://downloads.xiph.org/releases/theora/libtheora-${THEORA_VERSION}.tar.bz2 && \ echo ${THEORA_SHA256SUM} | sha256sum --check && \ - tar -zx --strip-components=1 -f libtheora-${THEORA_VERSION}.tar.gz && \ + tar -jx --strip-components=1 -f libtheora-${THEORA_VERSION}.tar.bz2 && \ ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ make && \ make install && \ @@ -207,7 +206,7 @@ RUN \ DIR=/tmp/xvid && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sLO http://downloads.xvid.org/downloads/xvidcore-${XVID_VERSION}.tar.gz && \ + curl -sLO http://downloads.xvid.com/downloads/xvidcore-${XVID_VERSION}.tar.gz && \ echo ${XVID_SHA256SUM} | sha256sum --check && \ tar -zx -f xvidcore-${XVID_VERSION}.tar.gz && \ cd xvidcore/build/generic && \ @@ -268,12 +267,10 @@ RUN \ DIR=/tmp/fribidi && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sLO https://github.com/fribidi/fribidi/archive/${FRIBIDI_VERSION}.tar.gz && \ + curl -sLO https://github.com/fribidi/fribidi/releases/download/v${FRIBIDI_VERSION}/fribidi-${FRIBIDI_VERSION}.tar.bz2 && \ 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 && \ + tar -jx --strip-components=1 -f ${FRIBIDI_VERSION}.tar.bz2 && \ + ./autogen.sh && \ make -j 1 && \ make install && \ rm -rf ${DIR} @@ -282,8 +279,8 @@ 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 && \ + curl -sLO https://www.freedesktop.org/software/fontconfig/release/fontconfig-${FONTCONFIG_VERSION}.tar.gz &&\ + tar -zx --strip-components=1 -f fontconfig-${FONTCONFIG_VERSION}.tar.gz && \ ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ make && \ make install && \ @@ -293,10 +290,9 @@ RUN \ DIR=/tmp/libass && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sLO https://github.com/libass/libass/archive/${LIBASS_VERSION}.tar.gz &&\ + curl -sLO https://github.com/libass/libass/releases/download/${LIBASS_VERSION}/libass-${LIBASS_VERSION}.tar.gz &&\ echo ${LIBASS_SHA256SUM} | sha256sum --check && \ - tar -zx --strip-components=1 -f ${LIBASS_VERSION}.tar.gz && \ - ./autogen.sh && \ + tar -zx --strip-components=1 -f libass-${LIBASS_VERSION}.tar.gz && \ ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ make && \ make install && \ diff --git a/docker-images/snapshot/alpine/Dockerfile b/docker-images/snapshot/alpine/Dockerfile index 28fc5fb0c..6c380d72e 100644 --- a/docker-images/snapshot/alpine/Dockerfile +++ b/docker-images/snapshot/alpine/Dockerfile @@ -20,42 +20,41 @@ ARG MAKEFLAGS="-j2" 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 \ + FDKAAC_VERSION=2.0.1 \ + FONTCONFIG_VERSION=2.13.92 \ + FREETYPE_VERSION=2.10.1 \ + FRIBIDI_VERSION=1.0.8 \ + KVAZAAR_VERSION=1.3.0 \ LAME_VERSION=3.100 \ - LIBASS_VERSION=0.13.7 \ + LIBASS_VERSION=0.14.0 \ LIBPTHREAD_STUBS_VERSION=0.4 \ LIBVIDSTAB_VERSION=1.1.0 \ LIBXCB_VERSION=1.13.1 \ XCBPROTO_VERSION=1.13 \ - OGG_VERSION=1.3.2 \ + OGG_VERSION=1.3.4 \ OPENCOREAMR_VERSION=0.1.5 \ - OPUS_VERSION=1.2 \ - OPENJPEG_VERSION=2.1.2 \ + OPUS_VERSION=1.3.1 \ + OPENJPEG_VERSION=2.3.1 \ 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 \ + VORBIS_VERSION=1.3.6 \ + VPX_VERSION=1.8.2 \ + WEBP_VERSION=1.0.3 \ + X265_VERSION=3.2.1 \ XAU_VERSION=1.0.9 \ XORG_MACROS_VERSION=1.19.2 \ XPROTO_VERSION=7.0.31 \ - XVID_VERSION=1.3.4 \ + XVID_VERSION=1.3.7 \ SRC=/usr/local -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 FREETYPE_SHA256SUM="3a60d391fd579440561bf0e7f31af2222bc610ad6ce4d9d7bd2165bca8669110 freetype-2.10.1.tar.gz" +ARG FRIBIDI_SHA256SUM="94c7b68d86ad2a9613b4dcffe7bbeb03523d63b5b37918bdf2e4ef34195c1e6c fribidi-1.0.8.tar.bz2" +ARG LIBASS_SHA256SUM="8d5a5c920b90b70a108007ffcd2289ac652c0e03fc88e6eecefa37df0f2e7fdf libass-0.14.0.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" +ARG OGG_SHA256SUM="fe5670640bd49e828d64d2879c31cb4dde9758681bb664f9bdbf159a01b0c76e libogg-1.3.4.tar.gz" +ARG OPUS_SHA256SUM="65b58e1e25b2a114157014736a3d9dfeaad8d41be1c8179866f144a2fb44ff9d opus-1.3.1.tar.gz" +ARG THEORA_SHA256SUM="b6ae1ee2fa3d42ac489287d3ec34c5885730b1296f0801ae577a35193d3affbc libtheora-1.1.1.tar.bz2" +ARG VORBIS_SHA256SUM="6ed40e0241089a42c48604dc00e362beee00036af2d8b3f46338031c9e0351cb libvorbis-1.3.6.tar.gz" +ARG XVID_SHA256SUM="abbdcbd39555691dd1c9b4d08f0a031376a3b211652c0d8b3b8aa9be1303ce2d xvidcore-1.3.7.tar.gz" @@ -98,7 +97,7 @@ 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 | \ + curl -sL https://code.videolan.org/videolan/x264/-/archive/stable/x264-stable.tar.bz2 | \ tar -jx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared --enable-pic --disable-cli && \ make && \ @@ -159,9 +158,9 @@ RUN \ DIR=/tmp/theora && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sLO http://downloads.xiph.org/releases/theora/libtheora-${THEORA_VERSION}.tar.gz && \ + curl -sLO http://downloads.xiph.org/releases/theora/libtheora-${THEORA_VERSION}.tar.bz2 && \ echo ${THEORA_SHA256SUM} | sha256sum --check && \ - tar -zx --strip-components=1 -f libtheora-${THEORA_VERSION}.tar.gz && \ + tar -jx --strip-components=1 -f libtheora-${THEORA_VERSION}.tar.bz2 && \ ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ make && \ make install && \ @@ -205,7 +204,7 @@ RUN \ DIR=/tmp/xvid && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sLO http://downloads.xvid.org/downloads/xvidcore-${XVID_VERSION}.tar.gz && \ + curl -sLO http://downloads.xvid.com/downloads/xvidcore-${XVID_VERSION}.tar.gz && \ echo ${XVID_SHA256SUM} | sha256sum --check && \ tar -zx -f xvidcore-${XVID_VERSION}.tar.gz && \ cd xvidcore/build/generic && \ @@ -266,12 +265,10 @@ RUN \ DIR=/tmp/fribidi && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sLO https://github.com/fribidi/fribidi/archive/${FRIBIDI_VERSION}.tar.gz && \ + curl -sLO https://github.com/fribidi/fribidi/releases/download/v${FRIBIDI_VERSION}/fribidi-${FRIBIDI_VERSION}.tar.bz2 && \ 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 && \ + tar -jx --strip-components=1 -f ${FRIBIDI_VERSION}.tar.bz2 && \ + ./autogen.sh && \ make -j 1 && \ make install && \ rm -rf ${DIR} @@ -280,8 +277,8 @@ 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 && \ + curl -sLO https://www.freedesktop.org/software/fontconfig/release/fontconfig-${FONTCONFIG_VERSION}.tar.gz &&\ + tar -zx --strip-components=1 -f fontconfig-${FONTCONFIG_VERSION}.tar.gz && \ ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ make && \ make install && \ @@ -291,10 +288,9 @@ RUN \ DIR=/tmp/libass && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sLO https://github.com/libass/libass/archive/${LIBASS_VERSION}.tar.gz &&\ + curl -sLO https://github.com/libass/libass/releases/download/${LIBASS_VERSION}/libass-${LIBASS_VERSION}.tar.gz &&\ echo ${LIBASS_SHA256SUM} | sha256sum --check && \ - tar -zx --strip-components=1 -f ${LIBASS_VERSION}.tar.gz && \ - ./autogen.sh && \ + tar -zx --strip-components=1 -f libass-${LIBASS_VERSION}.tar.gz && \ ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ make && \ make install && \ diff --git a/docker-images/snapshot/centos/Dockerfile b/docker-images/snapshot/centos/Dockerfile index 5ebf9bb80..6ed5f70d1 100644 --- a/docker-images/snapshot/centos/Dockerfile +++ b/docker-images/snapshot/centos/Dockerfile @@ -22,42 +22,41 @@ ARG MAKEFLAGS="-j2" 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 \ + FDKAAC_VERSION=2.0.1 \ + FONTCONFIG_VERSION=2.13.92 \ + FREETYPE_VERSION=2.10.1 \ + FRIBIDI_VERSION=1.0.8 \ + KVAZAAR_VERSION=1.3.0 \ LAME_VERSION=3.100 \ - LIBASS_VERSION=0.13.7 \ + LIBASS_VERSION=0.14.0 \ LIBPTHREAD_STUBS_VERSION=0.4 \ LIBVIDSTAB_VERSION=1.1.0 \ LIBXCB_VERSION=1.13.1 \ XCBPROTO_VERSION=1.13 \ - OGG_VERSION=1.3.2 \ + OGG_VERSION=1.3.4 \ OPENCOREAMR_VERSION=0.1.5 \ - OPUS_VERSION=1.2 \ - OPENJPEG_VERSION=2.1.2 \ + OPUS_VERSION=1.3.1 \ + OPENJPEG_VERSION=2.3.1 \ 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 \ + VORBIS_VERSION=1.3.6 \ + VPX_VERSION=1.8.2 \ + WEBP_VERSION=1.0.3 \ + X265_VERSION=3.2.1 \ XAU_VERSION=1.0.9 \ XORG_MACROS_VERSION=1.19.2 \ XPROTO_VERSION=7.0.31 \ - XVID_VERSION=1.3.4 \ + XVID_VERSION=1.3.7 \ SRC=/usr/local -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 FREETYPE_SHA256SUM="3a60d391fd579440561bf0e7f31af2222bc610ad6ce4d9d7bd2165bca8669110 freetype-2.10.1.tar.gz" +ARG FRIBIDI_SHA256SUM="94c7b68d86ad2a9613b4dcffe7bbeb03523d63b5b37918bdf2e4ef34195c1e6c fribidi-1.0.8.tar.bz2" +ARG LIBASS_SHA256SUM="8d5a5c920b90b70a108007ffcd2289ac652c0e03fc88e6eecefa37df0f2e7fdf libass-0.14.0.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" +ARG OGG_SHA256SUM="fe5670640bd49e828d64d2879c31cb4dde9758681bb664f9bdbf159a01b0c76e libogg-1.3.4.tar.gz" +ARG OPUS_SHA256SUM="65b58e1e25b2a114157014736a3d9dfeaad8d41be1c8179866f144a2fb44ff9d opus-1.3.1.tar.gz" +ARG THEORA_SHA256SUM="b6ae1ee2fa3d42ac489287d3ec34c5885730b1296f0801ae577a35193d3affbc libtheora-1.1.1.tar.bz2" +ARG VORBIS_SHA256SUM="6ed40e0241089a42c48604dc00e362beee00036af2d8b3f46338031c9e0351cb libvorbis-1.3.6.tar.gz" +ARG XVID_SHA256SUM="abbdcbd39555691dd1c9b4d08f0a031376a3b211652c0d8b3b8aa9be1303ce2d xvidcore-1.3.7.tar.gz" @@ -98,7 +97,7 @@ 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 | \ + curl -sL https://code.videolan.org/videolan/x264/-/archive/stable/x264-stable.tar.bz2 | \ tar -jx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared --enable-pic --disable-cli && \ make && \ @@ -159,9 +158,9 @@ RUN \ DIR=/tmp/theora && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sLO http://downloads.xiph.org/releases/theora/libtheora-${THEORA_VERSION}.tar.gz && \ + curl -sLO http://downloads.xiph.org/releases/theora/libtheora-${THEORA_VERSION}.tar.bz2 && \ echo ${THEORA_SHA256SUM} | sha256sum --check && \ - tar -zx --strip-components=1 -f libtheora-${THEORA_VERSION}.tar.gz && \ + tar -jx --strip-components=1 -f libtheora-${THEORA_VERSION}.tar.bz2 && \ ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ make && \ make install && \ @@ -205,7 +204,7 @@ RUN \ DIR=/tmp/xvid && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sLO http://downloads.xvid.org/downloads/xvidcore-${XVID_VERSION}.tar.gz && \ + curl -sLO http://downloads.xvid.com/downloads/xvidcore-${XVID_VERSION}.tar.gz && \ echo ${XVID_SHA256SUM} | sha256sum --check && \ tar -zx -f xvidcore-${XVID_VERSION}.tar.gz && \ cd xvidcore/build/generic && \ @@ -266,12 +265,10 @@ RUN \ DIR=/tmp/fribidi && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sLO https://github.com/fribidi/fribidi/archive/${FRIBIDI_VERSION}.tar.gz && \ + curl -sLO https://github.com/fribidi/fribidi/releases/download/v${FRIBIDI_VERSION}/fribidi-${FRIBIDI_VERSION}.tar.bz2 && \ 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 && \ + tar -jx --strip-components=1 -f ${FRIBIDI_VERSION}.tar.bz2 && \ + ./autogen.sh && \ make -j 1 && \ make install && \ rm -rf ${DIR} @@ -280,8 +277,8 @@ 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 && \ + curl -sLO https://www.freedesktop.org/software/fontconfig/release/fontconfig-${FONTCONFIG_VERSION}.tar.gz &&\ + tar -zx --strip-components=1 -f fontconfig-${FONTCONFIG_VERSION}.tar.gz && \ ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ make && \ make install && \ @@ -291,10 +288,9 @@ RUN \ DIR=/tmp/libass && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sLO https://github.com/libass/libass/archive/${LIBASS_VERSION}.tar.gz &&\ + curl -sLO https://github.com/libass/libass/releases/download/${LIBASS_VERSION}/libass-${LIBASS_VERSION}.tar.gz &&\ echo ${LIBASS_SHA256SUM} | sha256sum --check && \ - tar -zx --strip-components=1 -f ${LIBASS_VERSION}.tar.gz && \ - ./autogen.sh && \ + tar -zx --strip-components=1 -f libass-${LIBASS_VERSION}.tar.gz && \ ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ make && \ make install && \ diff --git a/docker-images/snapshot/nvidia/Dockerfile b/docker-images/snapshot/nvidia/Dockerfile index dc6b7c15d..d88db677e 100644 --- a/docker-images/snapshot/nvidia/Dockerfile +++ b/docker-images/snapshot/nvidia/Dockerfile @@ -37,42 +37,41 @@ ARG MAKEFLAGS="-j12" 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 \ + FDKAAC_VERSION=2.0.1 \ + FONTCONFIG_VERSION=2.13.92 \ + FREETYPE_VERSION=2.10.1 \ + FRIBIDI_VERSION=1.0.8 \ + KVAZAAR_VERSION=1.3.0 \ LAME_VERSION=3.100 \ - LIBASS_VERSION=0.13.7 \ + LIBASS_VERSION=0.14.0 \ LIBPTHREAD_STUBS_VERSION=0.4 \ LIBVIDSTAB_VERSION=1.1.0 \ LIBXCB_VERSION=1.13.1 \ XCBPROTO_VERSION=1.13 \ - OGG_VERSION=1.3.2 \ + OGG_VERSION=1.3.4 \ OPENCOREAMR_VERSION=0.1.5 \ - OPUS_VERSION=1.2 \ - OPENJPEG_VERSION=2.1.2 \ + OPUS_VERSION=1.3.1 \ + OPENJPEG_VERSION=2.3.1 \ 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 \ + VORBIS_VERSION=1.3.6 \ + VPX_VERSION=1.8.2 \ + WEBP_VERSION=1.0.3 \ + X265_VERSION=3.2.1 \ XAU_VERSION=1.0.9 \ XORG_MACROS_VERSION=1.19.2 \ XPROTO_VERSION=7.0.31 \ - XVID_VERSION=1.3.4 \ + XVID_VERSION=1.3.7 \ SRC=/usr/local -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 FREETYPE_SHA256SUM="3a60d391fd579440561bf0e7f31af2222bc610ad6ce4d9d7bd2165bca8669110 freetype-2.10.1.tar.gz" +ARG FRIBIDI_SHA256SUM="94c7b68d86ad2a9613b4dcffe7bbeb03523d63b5b37918bdf2e4ef34195c1e6c fribidi-1.0.8.tar.bz2" +ARG LIBASS_SHA256SUM="8d5a5c920b90b70a108007ffcd2289ac652c0e03fc88e6eecefa37df0f2e7fdf libass-0.14.0.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" +ARG OGG_SHA256SUM="fe5670640bd49e828d64d2879c31cb4dde9758681bb664f9bdbf159a01b0c76e libogg-1.3.4.tar.gz" +ARG OPUS_SHA256SUM="65b58e1e25b2a114157014736a3d9dfeaad8d41be1c8179866f144a2fb44ff9d opus-1.3.1.tar.gz" +ARG THEORA_SHA256SUM="b6ae1ee2fa3d42ac489287d3ec34c5885730b1296f0801ae577a35193d3affbc libtheora-1.1.1.tar.bz2" +ARG VORBIS_SHA256SUM="6ed40e0241089a42c48604dc00e362beee00036af2d8b3f46338031c9e0351cb libvorbis-1.3.6.tar.gz" +ARG XVID_SHA256SUM="abbdcbd39555691dd1c9b4d08f0a031376a3b211652c0d8b3b8aa9be1303ce2d xvidcore-1.3.7.tar.gz" @@ -124,7 +123,7 @@ 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 | \ + curl -sL https://code.videolan.org/videolan/x264/-/archive/stable/x264-stable.tar.bz2 | \ tar -jx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared --enable-pic --disable-cli && \ make && \ @@ -185,9 +184,9 @@ RUN \ DIR=/tmp/theora && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sLO http://downloads.xiph.org/releases/theora/libtheora-${THEORA_VERSION}.tar.gz && \ + curl -sLO http://downloads.xiph.org/releases/theora/libtheora-${THEORA_VERSION}.tar.bz2 && \ echo ${THEORA_SHA256SUM} | sha256sum --check && \ - tar -zx --strip-components=1 -f libtheora-${THEORA_VERSION}.tar.gz && \ + tar -jx --strip-components=1 -f libtheora-${THEORA_VERSION}.tar.bz2 && \ ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ make && \ make install && \ @@ -231,7 +230,7 @@ RUN \ DIR=/tmp/xvid && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sLO http://downloads.xvid.org/downloads/xvidcore-${XVID_VERSION}.tar.gz && \ + curl -sLO http://downloads.xvid.com/downloads/xvidcore-${XVID_VERSION}.tar.gz && \ echo ${XVID_SHA256SUM} | sha256sum --check && \ tar -zx -f xvidcore-${XVID_VERSION}.tar.gz && \ cd xvidcore/build/generic && \ @@ -292,12 +291,10 @@ RUN \ DIR=/tmp/fribidi && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sLO https://github.com/fribidi/fribidi/archive/${FRIBIDI_VERSION}.tar.gz && \ + curl -sLO https://github.com/fribidi/fribidi/releases/download/v${FRIBIDI_VERSION}/fribidi-${FRIBIDI_VERSION}.tar.bz2 && \ 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 && \ + tar -jx --strip-components=1 -f ${FRIBIDI_VERSION}.tar.bz2 && \ + ./autogen.sh && \ make -j 1 && \ make install && \ rm -rf ${DIR} @@ -306,8 +303,8 @@ 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 && \ + curl -sLO https://www.freedesktop.org/software/fontconfig/release/fontconfig-${FONTCONFIG_VERSION}.tar.gz &&\ + tar -zx --strip-components=1 -f fontconfig-${FONTCONFIG_VERSION}.tar.gz && \ ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ make && \ make install && \ @@ -317,10 +314,9 @@ RUN \ DIR=/tmp/libass && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sLO https://github.com/libass/libass/archive/${LIBASS_VERSION}.tar.gz &&\ + curl -sLO https://github.com/libass/libass/releases/download/${LIBASS_VERSION}/libass-${LIBASS_VERSION}.tar.gz &&\ echo ${LIBASS_SHA256SUM} | sha256sum --check && \ - tar -zx --strip-components=1 -f ${LIBASS_VERSION}.tar.gz && \ - ./autogen.sh && \ + tar -zx --strip-components=1 -f libass-${LIBASS_VERSION}.tar.gz && \ ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ make && \ make install && \ diff --git a/docker-images/snapshot/scratch/Dockerfile b/docker-images/snapshot/scratch/Dockerfile index af891d28c..20c204322 100644 --- a/docker-images/snapshot/scratch/Dockerfile +++ b/docker-images/snapshot/scratch/Dockerfile @@ -15,42 +15,41 @@ ARG MAKEFLAGS="-j2" 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 \ + FDKAAC_VERSION=2.0.1 \ + FONTCONFIG_VERSION=2.13.92 \ + FREETYPE_VERSION=2.10.1 \ + FRIBIDI_VERSION=1.0.8 \ + KVAZAAR_VERSION=1.3.0 \ LAME_VERSION=3.100 \ - LIBASS_VERSION=0.13.7 \ + LIBASS_VERSION=0.14.0 \ LIBPTHREAD_STUBS_VERSION=0.4 \ LIBVIDSTAB_VERSION=1.1.0 \ LIBXCB_VERSION=1.13.1 \ XCBPROTO_VERSION=1.13 \ - OGG_VERSION=1.3.2 \ + OGG_VERSION=1.3.4 \ OPENCOREAMR_VERSION=0.1.5 \ - OPUS_VERSION=1.2 \ - OPENJPEG_VERSION=2.1.2 \ + OPUS_VERSION=1.3.1 \ + OPENJPEG_VERSION=2.3.1 \ 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 \ + VORBIS_VERSION=1.3.6 \ + VPX_VERSION=1.8.2 \ + WEBP_VERSION=1.0.3 \ + X265_VERSION=3.2.1 \ XAU_VERSION=1.0.9 \ XORG_MACROS_VERSION=1.19.2 \ XPROTO_VERSION=7.0.31 \ - XVID_VERSION=1.3.4 \ + XVID_VERSION=1.3.7 \ SRC=/usr/local -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 FREETYPE_SHA256SUM="3a60d391fd579440561bf0e7f31af2222bc610ad6ce4d9d7bd2165bca8669110 freetype-2.10.1.tar.gz" +ARG FRIBIDI_SHA256SUM="94c7b68d86ad2a9613b4dcffe7bbeb03523d63b5b37918bdf2e4ef34195c1e6c fribidi-1.0.8.tar.bz2" +ARG LIBASS_SHA256SUM="8d5a5c920b90b70a108007ffcd2289ac652c0e03fc88e6eecefa37df0f2e7fdf libass-0.14.0.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" +ARG OGG_SHA256SUM="fe5670640bd49e828d64d2879c31cb4dde9758681bb664f9bdbf159a01b0c76e libogg-1.3.4.tar.gz" +ARG OPUS_SHA256SUM="65b58e1e25b2a114157014736a3d9dfeaad8d41be1c8179866f144a2fb44ff9d opus-1.3.1.tar.gz" +ARG THEORA_SHA256SUM="b6ae1ee2fa3d42ac489287d3ec34c5885730b1296f0801ae577a35193d3affbc libtheora-1.1.1.tar.bz2" +ARG VORBIS_SHA256SUM="6ed40e0241089a42c48604dc00e362beee00036af2d8b3f46338031c9e0351cb libvorbis-1.3.6.tar.gz" +ARG XVID_SHA256SUM="abbdcbd39555691dd1c9b4d08f0a031376a3b211652c0d8b3b8aa9be1303ce2d xvidcore-1.3.7.tar.gz" @@ -95,7 +94,7 @@ 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 | \ + curl -sL https://code.videolan.org/videolan/x264/-/archive/stable/x264-stable.tar.bz2 | \ tar -jx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared --enable-pic --disable-cli && \ make && \ @@ -156,9 +155,9 @@ RUN \ DIR=/tmp/theora && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sLO http://downloads.xiph.org/releases/theora/libtheora-${THEORA_VERSION}.tar.gz && \ + curl -sLO http://downloads.xiph.org/releases/theora/libtheora-${THEORA_VERSION}.tar.bz2 && \ echo ${THEORA_SHA256SUM} | sha256sum --check && \ - tar -zx --strip-components=1 -f libtheora-${THEORA_VERSION}.tar.gz && \ + tar -jx --strip-components=1 -f libtheora-${THEORA_VERSION}.tar.bz2 && \ ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ make && \ make install && \ @@ -202,7 +201,7 @@ RUN \ DIR=/tmp/xvid && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sLO http://downloads.xvid.org/downloads/xvidcore-${XVID_VERSION}.tar.gz && \ + curl -sLO http://downloads.xvid.com/downloads/xvidcore-${XVID_VERSION}.tar.gz && \ echo ${XVID_SHA256SUM} | sha256sum --check && \ tar -zx -f xvidcore-${XVID_VERSION}.tar.gz && \ cd xvidcore/build/generic && \ @@ -263,12 +262,10 @@ RUN \ DIR=/tmp/fribidi && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sLO https://github.com/fribidi/fribidi/archive/${FRIBIDI_VERSION}.tar.gz && \ + curl -sLO https://github.com/fribidi/fribidi/releases/download/v${FRIBIDI_VERSION}/fribidi-${FRIBIDI_VERSION}.tar.bz2 && \ 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 && \ + tar -jx --strip-components=1 -f ${FRIBIDI_VERSION}.tar.bz2 && \ + ./autogen.sh && \ make -j 1 && \ make install && \ rm -rf ${DIR} @@ -277,8 +274,8 @@ 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 && \ + curl -sLO https://www.freedesktop.org/software/fontconfig/release/fontconfig-${FONTCONFIG_VERSION}.tar.gz &&\ + tar -zx --strip-components=1 -f fontconfig-${FONTCONFIG_VERSION}.tar.gz && \ ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ make && \ make install && \ @@ -288,10 +285,9 @@ RUN \ DIR=/tmp/libass && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sLO https://github.com/libass/libass/archive/${LIBASS_VERSION}.tar.gz &&\ + curl -sLO https://github.com/libass/libass/releases/download/${LIBASS_VERSION}/libass-${LIBASS_VERSION}.tar.gz &&\ echo ${LIBASS_SHA256SUM} | sha256sum --check && \ - tar -zx --strip-components=1 -f ${LIBASS_VERSION}.tar.gz && \ - ./autogen.sh && \ + tar -zx --strip-components=1 -f libass-${LIBASS_VERSION}.tar.gz && \ ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ make && \ make install && \ diff --git a/docker-images/snapshot/ubuntu/Dockerfile b/docker-images/snapshot/ubuntu/Dockerfile index c7292f437..7e5d130b8 100644 --- a/docker-images/snapshot/ubuntu/Dockerfile +++ b/docker-images/snapshot/ubuntu/Dockerfile @@ -23,42 +23,41 @@ ARG MAKEFLAGS="-j2" 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 \ + FDKAAC_VERSION=2.0.1 \ + FONTCONFIG_VERSION=2.13.92 \ + FREETYPE_VERSION=2.10.1 \ + FRIBIDI_VERSION=1.0.8 \ + KVAZAAR_VERSION=1.3.0 \ LAME_VERSION=3.100 \ - LIBASS_VERSION=0.13.7 \ + LIBASS_VERSION=0.14.0 \ LIBPTHREAD_STUBS_VERSION=0.4 \ LIBVIDSTAB_VERSION=1.1.0 \ LIBXCB_VERSION=1.13.1 \ XCBPROTO_VERSION=1.13 \ - OGG_VERSION=1.3.2 \ + OGG_VERSION=1.3.4 \ OPENCOREAMR_VERSION=0.1.5 \ - OPUS_VERSION=1.2 \ - OPENJPEG_VERSION=2.1.2 \ + OPUS_VERSION=1.3.1 \ + OPENJPEG_VERSION=2.3.1 \ 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 \ + VORBIS_VERSION=1.3.6 \ + VPX_VERSION=1.8.2 \ + WEBP_VERSION=1.0.3 \ + X265_VERSION=3.2.1 \ XAU_VERSION=1.0.9 \ XORG_MACROS_VERSION=1.19.2 \ XPROTO_VERSION=7.0.31 \ - XVID_VERSION=1.3.4 \ + XVID_VERSION=1.3.7 \ SRC=/usr/local -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 FREETYPE_SHA256SUM="3a60d391fd579440561bf0e7f31af2222bc610ad6ce4d9d7bd2165bca8669110 freetype-2.10.1.tar.gz" +ARG FRIBIDI_SHA256SUM="94c7b68d86ad2a9613b4dcffe7bbeb03523d63b5b37918bdf2e4ef34195c1e6c fribidi-1.0.8.tar.bz2" +ARG LIBASS_SHA256SUM="8d5a5c920b90b70a108007ffcd2289ac652c0e03fc88e6eecefa37df0f2e7fdf libass-0.14.0.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" +ARG OGG_SHA256SUM="fe5670640bd49e828d64d2879c31cb4dde9758681bb664f9bdbf159a01b0c76e libogg-1.3.4.tar.gz" +ARG OPUS_SHA256SUM="65b58e1e25b2a114157014736a3d9dfeaad8d41be1c8179866f144a2fb44ff9d opus-1.3.1.tar.gz" +ARG THEORA_SHA256SUM="b6ae1ee2fa3d42ac489287d3ec34c5885730b1296f0801ae577a35193d3affbc libtheora-1.1.1.tar.bz2" +ARG VORBIS_SHA256SUM="6ed40e0241089a42c48604dc00e362beee00036af2d8b3f46338031c9e0351cb libvorbis-1.3.6.tar.gz" +ARG XVID_SHA256SUM="abbdcbd39555691dd1c9b4d08f0a031376a3b211652c0d8b3b8aa9be1303ce2d xvidcore-1.3.7.tar.gz" @@ -99,7 +98,7 @@ 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 | \ + curl -sL https://code.videolan.org/videolan/x264/-/archive/stable/x264-stable.tar.bz2 | \ tar -jx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared --enable-pic --disable-cli && \ make && \ @@ -160,9 +159,9 @@ RUN \ DIR=/tmp/theora && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sLO http://downloads.xiph.org/releases/theora/libtheora-${THEORA_VERSION}.tar.gz && \ + curl -sLO http://downloads.xiph.org/releases/theora/libtheora-${THEORA_VERSION}.tar.bz2 && \ echo ${THEORA_SHA256SUM} | sha256sum --check && \ - tar -zx --strip-components=1 -f libtheora-${THEORA_VERSION}.tar.gz && \ + tar -jx --strip-components=1 -f libtheora-${THEORA_VERSION}.tar.bz2 && \ ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ make && \ make install && \ @@ -206,7 +205,7 @@ RUN \ DIR=/tmp/xvid && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sLO http://downloads.xvid.org/downloads/xvidcore-${XVID_VERSION}.tar.gz && \ + curl -sLO http://downloads.xvid.com/downloads/xvidcore-${XVID_VERSION}.tar.gz && \ echo ${XVID_SHA256SUM} | sha256sum --check && \ tar -zx -f xvidcore-${XVID_VERSION}.tar.gz && \ cd xvidcore/build/generic && \ @@ -267,12 +266,10 @@ RUN \ DIR=/tmp/fribidi && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sLO https://github.com/fribidi/fribidi/archive/${FRIBIDI_VERSION}.tar.gz && \ + curl -sLO https://github.com/fribidi/fribidi/releases/download/v${FRIBIDI_VERSION}/fribidi-${FRIBIDI_VERSION}.tar.bz2 && \ 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 && \ + tar -jx --strip-components=1 -f ${FRIBIDI_VERSION}.tar.bz2 && \ + ./autogen.sh && \ make -j 1 && \ make install && \ rm -rf ${DIR} @@ -281,8 +278,8 @@ 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 && \ + curl -sLO https://www.freedesktop.org/software/fontconfig/release/fontconfig-${FONTCONFIG_VERSION}.tar.gz &&\ + tar -zx --strip-components=1 -f fontconfig-${FONTCONFIG_VERSION}.tar.gz && \ ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ make && \ make install && \ @@ -292,10 +289,9 @@ RUN \ DIR=/tmp/libass && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sLO https://github.com/libass/libass/archive/${LIBASS_VERSION}.tar.gz &&\ + curl -sLO https://github.com/libass/libass/releases/download/${LIBASS_VERSION}/libass-${LIBASS_VERSION}.tar.gz &&\ echo ${LIBASS_SHA256SUM} | sha256sum --check && \ - tar -zx --strip-components=1 -f ${LIBASS_VERSION}.tar.gz && \ - ./autogen.sh && \ + tar -zx --strip-components=1 -f libass-${LIBASS_VERSION}.tar.gz && \ ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ make && \ make install && \ diff --git a/docker-images/snapshot/vaapi/Dockerfile b/docker-images/snapshot/vaapi/Dockerfile index c671cd0fb..d1d6dbf49 100644 --- a/docker-images/snapshot/vaapi/Dockerfile +++ b/docker-images/snapshot/vaapi/Dockerfile @@ -23,42 +23,41 @@ ARG MAKEFLAGS="-j2" 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 \ + FDKAAC_VERSION=2.0.1 \ + FONTCONFIG_VERSION=2.13.92 \ + FREETYPE_VERSION=2.10.1 \ + FRIBIDI_VERSION=1.0.8 \ + KVAZAAR_VERSION=1.3.0 \ LAME_VERSION=3.100 \ - LIBASS_VERSION=0.13.7 \ + LIBASS_VERSION=0.14.0 \ LIBPTHREAD_STUBS_VERSION=0.4 \ LIBVIDSTAB_VERSION=1.1.0 \ LIBXCB_VERSION=1.13.1 \ XCBPROTO_VERSION=1.13 \ - OGG_VERSION=1.3.2 \ + OGG_VERSION=1.3.4 \ OPENCOREAMR_VERSION=0.1.5 \ - OPUS_VERSION=1.2 \ - OPENJPEG_VERSION=2.1.2 \ + OPUS_VERSION=1.3.1 \ + OPENJPEG_VERSION=2.3.1 \ 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 \ + VORBIS_VERSION=1.3.6 \ + VPX_VERSION=1.8.2 \ + WEBP_VERSION=1.0.3 \ + X265_VERSION=3.2.1 \ XAU_VERSION=1.0.9 \ XORG_MACROS_VERSION=1.19.2 \ XPROTO_VERSION=7.0.31 \ - XVID_VERSION=1.3.4 \ + XVID_VERSION=1.3.7 \ SRC=/usr/local -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 FREETYPE_SHA256SUM="3a60d391fd579440561bf0e7f31af2222bc610ad6ce4d9d7bd2165bca8669110 freetype-2.10.1.tar.gz" +ARG FRIBIDI_SHA256SUM="94c7b68d86ad2a9613b4dcffe7bbeb03523d63b5b37918bdf2e4ef34195c1e6c fribidi-1.0.8.tar.bz2" +ARG LIBASS_SHA256SUM="8d5a5c920b90b70a108007ffcd2289ac652c0e03fc88e6eecefa37df0f2e7fdf libass-0.14.0.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" +ARG OGG_SHA256SUM="fe5670640bd49e828d64d2879c31cb4dde9758681bb664f9bdbf159a01b0c76e libogg-1.3.4.tar.gz" +ARG OPUS_SHA256SUM="65b58e1e25b2a114157014736a3d9dfeaad8d41be1c8179866f144a2fb44ff9d opus-1.3.1.tar.gz" +ARG THEORA_SHA256SUM="b6ae1ee2fa3d42ac489287d3ec34c5885730b1296f0801ae577a35193d3affbc libtheora-1.1.1.tar.bz2" +ARG VORBIS_SHA256SUM="6ed40e0241089a42c48604dc00e362beee00036af2d8b3f46338031c9e0351cb libvorbis-1.3.6.tar.gz" +ARG XVID_SHA256SUM="abbdcbd39555691dd1c9b4d08f0a031376a3b211652c0d8b3b8aa9be1303ce2d xvidcore-1.3.7.tar.gz" @@ -100,7 +99,7 @@ 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 | \ + curl -sL https://code.videolan.org/videolan/x264/-/archive/stable/x264-stable.tar.bz2 | \ tar -jx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared --enable-pic --disable-cli && \ make && \ @@ -161,9 +160,9 @@ RUN \ DIR=/tmp/theora && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sLO http://downloads.xiph.org/releases/theora/libtheora-${THEORA_VERSION}.tar.gz && \ + curl -sLO http://downloads.xiph.org/releases/theora/libtheora-${THEORA_VERSION}.tar.bz2 && \ echo ${THEORA_SHA256SUM} | sha256sum --check && \ - tar -zx --strip-components=1 -f libtheora-${THEORA_VERSION}.tar.gz && \ + tar -jx --strip-components=1 -f libtheora-${THEORA_VERSION}.tar.bz2 && \ ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ make && \ make install && \ @@ -207,7 +206,7 @@ RUN \ DIR=/tmp/xvid && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sLO http://downloads.xvid.org/downloads/xvidcore-${XVID_VERSION}.tar.gz && \ + curl -sLO http://downloads.xvid.com/downloads/xvidcore-${XVID_VERSION}.tar.gz && \ echo ${XVID_SHA256SUM} | sha256sum --check && \ tar -zx -f xvidcore-${XVID_VERSION}.tar.gz && \ cd xvidcore/build/generic && \ @@ -268,12 +267,10 @@ RUN \ DIR=/tmp/fribidi && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sLO https://github.com/fribidi/fribidi/archive/${FRIBIDI_VERSION}.tar.gz && \ + curl -sLO https://github.com/fribidi/fribidi/releases/download/v${FRIBIDI_VERSION}/fribidi-${FRIBIDI_VERSION}.tar.bz2 && \ 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 && \ + tar -jx --strip-components=1 -f ${FRIBIDI_VERSION}.tar.bz2 && \ + ./autogen.sh && \ make -j 1 && \ make install && \ rm -rf ${DIR} @@ -282,8 +279,8 @@ 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 && \ + curl -sLO https://www.freedesktop.org/software/fontconfig/release/fontconfig-${FONTCONFIG_VERSION}.tar.gz &&\ + tar -zx --strip-components=1 -f fontconfig-${FONTCONFIG_VERSION}.tar.gz && \ ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ make && \ make install && \ @@ -293,10 +290,9 @@ RUN \ DIR=/tmp/libass && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sLO https://github.com/libass/libass/archive/${LIBASS_VERSION}.tar.gz &&\ + curl -sLO https://github.com/libass/libass/releases/download/${LIBASS_VERSION}/libass-${LIBASS_VERSION}.tar.gz &&\ echo ${LIBASS_SHA256SUM} | sha256sum --check && \ - tar -zx --strip-components=1 -f ${LIBASS_VERSION}.tar.gz && \ - ./autogen.sh && \ + tar -zx --strip-components=1 -f libass-${LIBASS_VERSION}.tar.gz && \ ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ make && \ make install && \ From 88f088be0d43c3a831e814db84a280c4958bf445 Mon Sep 17 00:00:00 2001 From: Zennoe Date: Sat, 11 Jan 2020 16:48:21 +0100 Subject: [PATCH 3/8] small filename change i overlooked in d4fcf0dcb --- templates/Dockerfile-run | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/Dockerfile-run b/templates/Dockerfile-run index b0b8f2af1..808790886 100644 --- a/templates/Dockerfile-run +++ b/templates/Dockerfile-run @@ -184,7 +184,7 @@ RUN \ cd ${DIR} && \ curl -sLO https://github.com/fribidi/fribidi/releases/download/v${FRIBIDI_VERSION}/fribidi-${FRIBIDI_VERSION}.tar.bz2 && \ echo ${FRIBIDI_SHA256SUM} | sha256sum --check && \ - tar -jx --strip-components=1 -f ${FRIBIDI_VERSION}.tar.bz2 && \ + tar -jx --strip-components=1 -f fribidi-${FRIBIDI_VERSION}.tar.bz2 && \ ./autogen.sh && \ make -j 1 && \ make install && \ From 4bed344fea49b061d0db12725e0366d72ca2622e Mon Sep 17 00:00:00 2001 From: Zennoe Date: Sat, 11 Jan 2020 16:49:30 +0100 Subject: [PATCH 4/8] ran ./update.py to apply template changes --- 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/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 +- 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 +- 42 files changed, 42 insertions(+), 42 deletions(-) diff --git a/docker-images/3.2/alpine/Dockerfile b/docker-images/3.2/alpine/Dockerfile index b9df85197..c5fbcd2dc 100644 --- a/docker-images/3.2/alpine/Dockerfile +++ b/docker-images/3.2/alpine/Dockerfile @@ -267,7 +267,7 @@ RUN \ cd ${DIR} && \ curl -sLO https://github.com/fribidi/fribidi/releases/download/v${FRIBIDI_VERSION}/fribidi-${FRIBIDI_VERSION}.tar.bz2 && \ echo ${FRIBIDI_SHA256SUM} | sha256sum --check && \ - tar -jx --strip-components=1 -f ${FRIBIDI_VERSION}.tar.bz2 && \ + tar -jx --strip-components=1 -f fribidi-${FRIBIDI_VERSION}.tar.bz2 && \ ./autogen.sh && \ make -j 1 && \ make install && \ diff --git a/docker-images/3.2/centos/Dockerfile b/docker-images/3.2/centos/Dockerfile index 54d7badd5..8154744a1 100644 --- a/docker-images/3.2/centos/Dockerfile +++ b/docker-images/3.2/centos/Dockerfile @@ -267,7 +267,7 @@ RUN \ cd ${DIR} && \ curl -sLO https://github.com/fribidi/fribidi/releases/download/v${FRIBIDI_VERSION}/fribidi-${FRIBIDI_VERSION}.tar.bz2 && \ echo ${FRIBIDI_SHA256SUM} | sha256sum --check && \ - tar -jx --strip-components=1 -f ${FRIBIDI_VERSION}.tar.bz2 && \ + tar -jx --strip-components=1 -f fribidi-${FRIBIDI_VERSION}.tar.bz2 && \ ./autogen.sh && \ make -j 1 && \ make install && \ diff --git a/docker-images/3.2/nvidia/Dockerfile b/docker-images/3.2/nvidia/Dockerfile index 7676c06ed..48eff09ff 100644 --- a/docker-images/3.2/nvidia/Dockerfile +++ b/docker-images/3.2/nvidia/Dockerfile @@ -293,7 +293,7 @@ RUN \ cd ${DIR} && \ curl -sLO https://github.com/fribidi/fribidi/releases/download/v${FRIBIDI_VERSION}/fribidi-${FRIBIDI_VERSION}.tar.bz2 && \ echo ${FRIBIDI_SHA256SUM} | sha256sum --check && \ - tar -jx --strip-components=1 -f ${FRIBIDI_VERSION}.tar.bz2 && \ + tar -jx --strip-components=1 -f fribidi-${FRIBIDI_VERSION}.tar.bz2 && \ ./autogen.sh && \ make -j 1 && \ make install && \ diff --git a/docker-images/3.2/scratch/Dockerfile b/docker-images/3.2/scratch/Dockerfile index cf8513fa7..927065c40 100644 --- a/docker-images/3.2/scratch/Dockerfile +++ b/docker-images/3.2/scratch/Dockerfile @@ -264,7 +264,7 @@ RUN \ cd ${DIR} && \ curl -sLO https://github.com/fribidi/fribidi/releases/download/v${FRIBIDI_VERSION}/fribidi-${FRIBIDI_VERSION}.tar.bz2 && \ echo ${FRIBIDI_SHA256SUM} | sha256sum --check && \ - tar -jx --strip-components=1 -f ${FRIBIDI_VERSION}.tar.bz2 && \ + tar -jx --strip-components=1 -f fribidi-${FRIBIDI_VERSION}.tar.bz2 && \ ./autogen.sh && \ make -j 1 && \ make install && \ diff --git a/docker-images/3.2/ubuntu/Dockerfile b/docker-images/3.2/ubuntu/Dockerfile index b85504980..f88386c3b 100644 --- a/docker-images/3.2/ubuntu/Dockerfile +++ b/docker-images/3.2/ubuntu/Dockerfile @@ -268,7 +268,7 @@ RUN \ cd ${DIR} && \ curl -sLO https://github.com/fribidi/fribidi/releases/download/v${FRIBIDI_VERSION}/fribidi-${FRIBIDI_VERSION}.tar.bz2 && \ echo ${FRIBIDI_SHA256SUM} | sha256sum --check && \ - tar -jx --strip-components=1 -f ${FRIBIDI_VERSION}.tar.bz2 && \ + tar -jx --strip-components=1 -f fribidi-${FRIBIDI_VERSION}.tar.bz2 && \ ./autogen.sh && \ make -j 1 && \ make install && \ diff --git a/docker-images/3.2/vaapi/Dockerfile b/docker-images/3.2/vaapi/Dockerfile index 49476ccc5..d3a6d4034 100644 --- a/docker-images/3.2/vaapi/Dockerfile +++ b/docker-images/3.2/vaapi/Dockerfile @@ -269,7 +269,7 @@ RUN \ cd ${DIR} && \ curl -sLO https://github.com/fribidi/fribidi/releases/download/v${FRIBIDI_VERSION}/fribidi-${FRIBIDI_VERSION}.tar.bz2 && \ echo ${FRIBIDI_SHA256SUM} | sha256sum --check && \ - tar -jx --strip-components=1 -f ${FRIBIDI_VERSION}.tar.bz2 && \ + tar -jx --strip-components=1 -f fribidi-${FRIBIDI_VERSION}.tar.bz2 && \ ./autogen.sh && \ make -j 1 && \ make install && \ diff --git a/docker-images/3.3/alpine/Dockerfile b/docker-images/3.3/alpine/Dockerfile index e8e17faa4..d581f06f1 100644 --- a/docker-images/3.3/alpine/Dockerfile +++ b/docker-images/3.3/alpine/Dockerfile @@ -267,7 +267,7 @@ RUN \ cd ${DIR} && \ curl -sLO https://github.com/fribidi/fribidi/releases/download/v${FRIBIDI_VERSION}/fribidi-${FRIBIDI_VERSION}.tar.bz2 && \ echo ${FRIBIDI_SHA256SUM} | sha256sum --check && \ - tar -jx --strip-components=1 -f ${FRIBIDI_VERSION}.tar.bz2 && \ + tar -jx --strip-components=1 -f fribidi-${FRIBIDI_VERSION}.tar.bz2 && \ ./autogen.sh && \ make -j 1 && \ make install && \ diff --git a/docker-images/3.3/centos/Dockerfile b/docker-images/3.3/centos/Dockerfile index cc47142d6..eee723794 100644 --- a/docker-images/3.3/centos/Dockerfile +++ b/docker-images/3.3/centos/Dockerfile @@ -267,7 +267,7 @@ RUN \ cd ${DIR} && \ curl -sLO https://github.com/fribidi/fribidi/releases/download/v${FRIBIDI_VERSION}/fribidi-${FRIBIDI_VERSION}.tar.bz2 && \ echo ${FRIBIDI_SHA256SUM} | sha256sum --check && \ - tar -jx --strip-components=1 -f ${FRIBIDI_VERSION}.tar.bz2 && \ + tar -jx --strip-components=1 -f fribidi-${FRIBIDI_VERSION}.tar.bz2 && \ ./autogen.sh && \ make -j 1 && \ make install && \ diff --git a/docker-images/3.3/nvidia/Dockerfile b/docker-images/3.3/nvidia/Dockerfile index b2aa9fc07..a317f1293 100644 --- a/docker-images/3.3/nvidia/Dockerfile +++ b/docker-images/3.3/nvidia/Dockerfile @@ -293,7 +293,7 @@ RUN \ cd ${DIR} && \ curl -sLO https://github.com/fribidi/fribidi/releases/download/v${FRIBIDI_VERSION}/fribidi-${FRIBIDI_VERSION}.tar.bz2 && \ echo ${FRIBIDI_SHA256SUM} | sha256sum --check && \ - tar -jx --strip-components=1 -f ${FRIBIDI_VERSION}.tar.bz2 && \ + tar -jx --strip-components=1 -f fribidi-${FRIBIDI_VERSION}.tar.bz2 && \ ./autogen.sh && \ make -j 1 && \ make install && \ diff --git a/docker-images/3.3/scratch/Dockerfile b/docker-images/3.3/scratch/Dockerfile index 8a3a104c0..41edf3861 100644 --- a/docker-images/3.3/scratch/Dockerfile +++ b/docker-images/3.3/scratch/Dockerfile @@ -264,7 +264,7 @@ RUN \ cd ${DIR} && \ curl -sLO https://github.com/fribidi/fribidi/releases/download/v${FRIBIDI_VERSION}/fribidi-${FRIBIDI_VERSION}.tar.bz2 && \ echo ${FRIBIDI_SHA256SUM} | sha256sum --check && \ - tar -jx --strip-components=1 -f ${FRIBIDI_VERSION}.tar.bz2 && \ + tar -jx --strip-components=1 -f fribidi-${FRIBIDI_VERSION}.tar.bz2 && \ ./autogen.sh && \ make -j 1 && \ make install && \ diff --git a/docker-images/3.3/ubuntu/Dockerfile b/docker-images/3.3/ubuntu/Dockerfile index 2ff518096..1098fcc57 100644 --- a/docker-images/3.3/ubuntu/Dockerfile +++ b/docker-images/3.3/ubuntu/Dockerfile @@ -268,7 +268,7 @@ RUN \ cd ${DIR} && \ curl -sLO https://github.com/fribidi/fribidi/releases/download/v${FRIBIDI_VERSION}/fribidi-${FRIBIDI_VERSION}.tar.bz2 && \ echo ${FRIBIDI_SHA256SUM} | sha256sum --check && \ - tar -jx --strip-components=1 -f ${FRIBIDI_VERSION}.tar.bz2 && \ + tar -jx --strip-components=1 -f fribidi-${FRIBIDI_VERSION}.tar.bz2 && \ ./autogen.sh && \ make -j 1 && \ make install && \ diff --git a/docker-images/3.3/vaapi/Dockerfile b/docker-images/3.3/vaapi/Dockerfile index 2b3e77faf..2b0e9f108 100644 --- a/docker-images/3.3/vaapi/Dockerfile +++ b/docker-images/3.3/vaapi/Dockerfile @@ -269,7 +269,7 @@ RUN \ cd ${DIR} && \ curl -sLO https://github.com/fribidi/fribidi/releases/download/v${FRIBIDI_VERSION}/fribidi-${FRIBIDI_VERSION}.tar.bz2 && \ echo ${FRIBIDI_SHA256SUM} | sha256sum --check && \ - tar -jx --strip-components=1 -f ${FRIBIDI_VERSION}.tar.bz2 && \ + tar -jx --strip-components=1 -f fribidi-${FRIBIDI_VERSION}.tar.bz2 && \ ./autogen.sh && \ make -j 1 && \ make install && \ diff --git a/docker-images/3.4/alpine/Dockerfile b/docker-images/3.4/alpine/Dockerfile index 3ac2ef305..88a996c1f 100644 --- a/docker-images/3.4/alpine/Dockerfile +++ b/docker-images/3.4/alpine/Dockerfile @@ -267,7 +267,7 @@ RUN \ cd ${DIR} && \ curl -sLO https://github.com/fribidi/fribidi/releases/download/v${FRIBIDI_VERSION}/fribidi-${FRIBIDI_VERSION}.tar.bz2 && \ echo ${FRIBIDI_SHA256SUM} | sha256sum --check && \ - tar -jx --strip-components=1 -f ${FRIBIDI_VERSION}.tar.bz2 && \ + tar -jx --strip-components=1 -f fribidi-${FRIBIDI_VERSION}.tar.bz2 && \ ./autogen.sh && \ make -j 1 && \ make install && \ diff --git a/docker-images/3.4/centos/Dockerfile b/docker-images/3.4/centos/Dockerfile index 79c9f34e7..2839aad50 100644 --- a/docker-images/3.4/centos/Dockerfile +++ b/docker-images/3.4/centos/Dockerfile @@ -267,7 +267,7 @@ RUN \ cd ${DIR} && \ curl -sLO https://github.com/fribidi/fribidi/releases/download/v${FRIBIDI_VERSION}/fribidi-${FRIBIDI_VERSION}.tar.bz2 && \ echo ${FRIBIDI_SHA256SUM} | sha256sum --check && \ - tar -jx --strip-components=1 -f ${FRIBIDI_VERSION}.tar.bz2 && \ + tar -jx --strip-components=1 -f fribidi-${FRIBIDI_VERSION}.tar.bz2 && \ ./autogen.sh && \ make -j 1 && \ make install && \ diff --git a/docker-images/3.4/nvidia/Dockerfile b/docker-images/3.4/nvidia/Dockerfile index 4fb3e89f8..073a25e67 100644 --- a/docker-images/3.4/nvidia/Dockerfile +++ b/docker-images/3.4/nvidia/Dockerfile @@ -293,7 +293,7 @@ RUN \ cd ${DIR} && \ curl -sLO https://github.com/fribidi/fribidi/releases/download/v${FRIBIDI_VERSION}/fribidi-${FRIBIDI_VERSION}.tar.bz2 && \ echo ${FRIBIDI_SHA256SUM} | sha256sum --check && \ - tar -jx --strip-components=1 -f ${FRIBIDI_VERSION}.tar.bz2 && \ + tar -jx --strip-components=1 -f fribidi-${FRIBIDI_VERSION}.tar.bz2 && \ ./autogen.sh && \ make -j 1 && \ make install && \ diff --git a/docker-images/3.4/scratch/Dockerfile b/docker-images/3.4/scratch/Dockerfile index 0e5ab9016..54dffc23e 100644 --- a/docker-images/3.4/scratch/Dockerfile +++ b/docker-images/3.4/scratch/Dockerfile @@ -264,7 +264,7 @@ RUN \ cd ${DIR} && \ curl -sLO https://github.com/fribidi/fribidi/releases/download/v${FRIBIDI_VERSION}/fribidi-${FRIBIDI_VERSION}.tar.bz2 && \ echo ${FRIBIDI_SHA256SUM} | sha256sum --check && \ - tar -jx --strip-components=1 -f ${FRIBIDI_VERSION}.tar.bz2 && \ + tar -jx --strip-components=1 -f fribidi-${FRIBIDI_VERSION}.tar.bz2 && \ ./autogen.sh && \ make -j 1 && \ make install && \ diff --git a/docker-images/3.4/ubuntu/Dockerfile b/docker-images/3.4/ubuntu/Dockerfile index 19d901b84..ed4a0bc60 100644 --- a/docker-images/3.4/ubuntu/Dockerfile +++ b/docker-images/3.4/ubuntu/Dockerfile @@ -268,7 +268,7 @@ RUN \ cd ${DIR} && \ curl -sLO https://github.com/fribidi/fribidi/releases/download/v${FRIBIDI_VERSION}/fribidi-${FRIBIDI_VERSION}.tar.bz2 && \ echo ${FRIBIDI_SHA256SUM} | sha256sum --check && \ - tar -jx --strip-components=1 -f ${FRIBIDI_VERSION}.tar.bz2 && \ + tar -jx --strip-components=1 -f fribidi-${FRIBIDI_VERSION}.tar.bz2 && \ ./autogen.sh && \ make -j 1 && \ make install && \ diff --git a/docker-images/3.4/vaapi/Dockerfile b/docker-images/3.4/vaapi/Dockerfile index 4b52b18f1..633ff16eb 100644 --- a/docker-images/3.4/vaapi/Dockerfile +++ b/docker-images/3.4/vaapi/Dockerfile @@ -269,7 +269,7 @@ RUN \ cd ${DIR} && \ curl -sLO https://github.com/fribidi/fribidi/releases/download/v${FRIBIDI_VERSION}/fribidi-${FRIBIDI_VERSION}.tar.bz2 && \ echo ${FRIBIDI_SHA256SUM} | sha256sum --check && \ - tar -jx --strip-components=1 -f ${FRIBIDI_VERSION}.tar.bz2 && \ + tar -jx --strip-components=1 -f fribidi-${FRIBIDI_VERSION}.tar.bz2 && \ ./autogen.sh && \ make -j 1 && \ make install && \ diff --git a/docker-images/4.0/alpine/Dockerfile b/docker-images/4.0/alpine/Dockerfile index b6a9569fb..821b2942e 100644 --- a/docker-images/4.0/alpine/Dockerfile +++ b/docker-images/4.0/alpine/Dockerfile @@ -267,7 +267,7 @@ RUN \ cd ${DIR} && \ curl -sLO https://github.com/fribidi/fribidi/releases/download/v${FRIBIDI_VERSION}/fribidi-${FRIBIDI_VERSION}.tar.bz2 && \ echo ${FRIBIDI_SHA256SUM} | sha256sum --check && \ - tar -jx --strip-components=1 -f ${FRIBIDI_VERSION}.tar.bz2 && \ + tar -jx --strip-components=1 -f fribidi-${FRIBIDI_VERSION}.tar.bz2 && \ ./autogen.sh && \ make -j 1 && \ make install && \ diff --git a/docker-images/4.0/centos/Dockerfile b/docker-images/4.0/centos/Dockerfile index 12fe761ac..03b897427 100644 --- a/docker-images/4.0/centos/Dockerfile +++ b/docker-images/4.0/centos/Dockerfile @@ -267,7 +267,7 @@ RUN \ cd ${DIR} && \ curl -sLO https://github.com/fribidi/fribidi/releases/download/v${FRIBIDI_VERSION}/fribidi-${FRIBIDI_VERSION}.tar.bz2 && \ echo ${FRIBIDI_SHA256SUM} | sha256sum --check && \ - tar -jx --strip-components=1 -f ${FRIBIDI_VERSION}.tar.bz2 && \ + tar -jx --strip-components=1 -f fribidi-${FRIBIDI_VERSION}.tar.bz2 && \ ./autogen.sh && \ make -j 1 && \ make install && \ diff --git a/docker-images/4.0/nvidia/Dockerfile b/docker-images/4.0/nvidia/Dockerfile index 1d8e4431e..7dcff546a 100644 --- a/docker-images/4.0/nvidia/Dockerfile +++ b/docker-images/4.0/nvidia/Dockerfile @@ -293,7 +293,7 @@ RUN \ cd ${DIR} && \ curl -sLO https://github.com/fribidi/fribidi/releases/download/v${FRIBIDI_VERSION}/fribidi-${FRIBIDI_VERSION}.tar.bz2 && \ echo ${FRIBIDI_SHA256SUM} | sha256sum --check && \ - tar -jx --strip-components=1 -f ${FRIBIDI_VERSION}.tar.bz2 && \ + tar -jx --strip-components=1 -f fribidi-${FRIBIDI_VERSION}.tar.bz2 && \ ./autogen.sh && \ make -j 1 && \ make install && \ diff --git a/docker-images/4.0/scratch/Dockerfile b/docker-images/4.0/scratch/Dockerfile index 3658cd0c7..3266f9fd9 100644 --- a/docker-images/4.0/scratch/Dockerfile +++ b/docker-images/4.0/scratch/Dockerfile @@ -264,7 +264,7 @@ RUN \ cd ${DIR} && \ curl -sLO https://github.com/fribidi/fribidi/releases/download/v${FRIBIDI_VERSION}/fribidi-${FRIBIDI_VERSION}.tar.bz2 && \ echo ${FRIBIDI_SHA256SUM} | sha256sum --check && \ - tar -jx --strip-components=1 -f ${FRIBIDI_VERSION}.tar.bz2 && \ + tar -jx --strip-components=1 -f fribidi-${FRIBIDI_VERSION}.tar.bz2 && \ ./autogen.sh && \ make -j 1 && \ make install && \ diff --git a/docker-images/4.0/ubuntu/Dockerfile b/docker-images/4.0/ubuntu/Dockerfile index c026cf453..89e0ef139 100644 --- a/docker-images/4.0/ubuntu/Dockerfile +++ b/docker-images/4.0/ubuntu/Dockerfile @@ -268,7 +268,7 @@ RUN \ cd ${DIR} && \ curl -sLO https://github.com/fribidi/fribidi/releases/download/v${FRIBIDI_VERSION}/fribidi-${FRIBIDI_VERSION}.tar.bz2 && \ echo ${FRIBIDI_SHA256SUM} | sha256sum --check && \ - tar -jx --strip-components=1 -f ${FRIBIDI_VERSION}.tar.bz2 && \ + tar -jx --strip-components=1 -f fribidi-${FRIBIDI_VERSION}.tar.bz2 && \ ./autogen.sh && \ make -j 1 && \ make install && \ diff --git a/docker-images/4.0/vaapi/Dockerfile b/docker-images/4.0/vaapi/Dockerfile index 272b22976..e5404ec39 100644 --- a/docker-images/4.0/vaapi/Dockerfile +++ b/docker-images/4.0/vaapi/Dockerfile @@ -269,7 +269,7 @@ RUN \ cd ${DIR} && \ curl -sLO https://github.com/fribidi/fribidi/releases/download/v${FRIBIDI_VERSION}/fribidi-${FRIBIDI_VERSION}.tar.bz2 && \ echo ${FRIBIDI_SHA256SUM} | sha256sum --check && \ - tar -jx --strip-components=1 -f ${FRIBIDI_VERSION}.tar.bz2 && \ + tar -jx --strip-components=1 -f fribidi-${FRIBIDI_VERSION}.tar.bz2 && \ ./autogen.sh && \ make -j 1 && \ make install && \ diff --git a/docker-images/4.1/alpine/Dockerfile b/docker-images/4.1/alpine/Dockerfile index 04da8bd32..1b8f27bbe 100644 --- a/docker-images/4.1/alpine/Dockerfile +++ b/docker-images/4.1/alpine/Dockerfile @@ -267,7 +267,7 @@ RUN \ cd ${DIR} && \ curl -sLO https://github.com/fribidi/fribidi/releases/download/v${FRIBIDI_VERSION}/fribidi-${FRIBIDI_VERSION}.tar.bz2 && \ echo ${FRIBIDI_SHA256SUM} | sha256sum --check && \ - tar -jx --strip-components=1 -f ${FRIBIDI_VERSION}.tar.bz2 && \ + tar -jx --strip-components=1 -f fribidi-${FRIBIDI_VERSION}.tar.bz2 && \ ./autogen.sh && \ make -j 1 && \ make install && \ diff --git a/docker-images/4.1/centos/Dockerfile b/docker-images/4.1/centos/Dockerfile index beb41e526..b248440f9 100644 --- a/docker-images/4.1/centos/Dockerfile +++ b/docker-images/4.1/centos/Dockerfile @@ -267,7 +267,7 @@ RUN \ cd ${DIR} && \ curl -sLO https://github.com/fribidi/fribidi/releases/download/v${FRIBIDI_VERSION}/fribidi-${FRIBIDI_VERSION}.tar.bz2 && \ echo ${FRIBIDI_SHA256SUM} | sha256sum --check && \ - tar -jx --strip-components=1 -f ${FRIBIDI_VERSION}.tar.bz2 && \ + tar -jx --strip-components=1 -f fribidi-${FRIBIDI_VERSION}.tar.bz2 && \ ./autogen.sh && \ make -j 1 && \ make install && \ diff --git a/docker-images/4.1/nvidia/Dockerfile b/docker-images/4.1/nvidia/Dockerfile index 7f6cd78fc..8c7e9c769 100644 --- a/docker-images/4.1/nvidia/Dockerfile +++ b/docker-images/4.1/nvidia/Dockerfile @@ -293,7 +293,7 @@ RUN \ cd ${DIR} && \ curl -sLO https://github.com/fribidi/fribidi/releases/download/v${FRIBIDI_VERSION}/fribidi-${FRIBIDI_VERSION}.tar.bz2 && \ echo ${FRIBIDI_SHA256SUM} | sha256sum --check && \ - tar -jx --strip-components=1 -f ${FRIBIDI_VERSION}.tar.bz2 && \ + tar -jx --strip-components=1 -f fribidi-${FRIBIDI_VERSION}.tar.bz2 && \ ./autogen.sh && \ make -j 1 && \ make install && \ diff --git a/docker-images/4.1/scratch/Dockerfile b/docker-images/4.1/scratch/Dockerfile index 2155a4035..3bb72fdb0 100644 --- a/docker-images/4.1/scratch/Dockerfile +++ b/docker-images/4.1/scratch/Dockerfile @@ -264,7 +264,7 @@ RUN \ cd ${DIR} && \ curl -sLO https://github.com/fribidi/fribidi/releases/download/v${FRIBIDI_VERSION}/fribidi-${FRIBIDI_VERSION}.tar.bz2 && \ echo ${FRIBIDI_SHA256SUM} | sha256sum --check && \ - tar -jx --strip-components=1 -f ${FRIBIDI_VERSION}.tar.bz2 && \ + tar -jx --strip-components=1 -f fribidi-${FRIBIDI_VERSION}.tar.bz2 && \ ./autogen.sh && \ make -j 1 && \ make install && \ diff --git a/docker-images/4.1/ubuntu/Dockerfile b/docker-images/4.1/ubuntu/Dockerfile index d20e72a89..26ae482fb 100644 --- a/docker-images/4.1/ubuntu/Dockerfile +++ b/docker-images/4.1/ubuntu/Dockerfile @@ -268,7 +268,7 @@ RUN \ cd ${DIR} && \ curl -sLO https://github.com/fribidi/fribidi/releases/download/v${FRIBIDI_VERSION}/fribidi-${FRIBIDI_VERSION}.tar.bz2 && \ echo ${FRIBIDI_SHA256SUM} | sha256sum --check && \ - tar -jx --strip-components=1 -f ${FRIBIDI_VERSION}.tar.bz2 && \ + tar -jx --strip-components=1 -f fribidi-${FRIBIDI_VERSION}.tar.bz2 && \ ./autogen.sh && \ make -j 1 && \ make install && \ diff --git a/docker-images/4.1/vaapi/Dockerfile b/docker-images/4.1/vaapi/Dockerfile index 59862a1b7..30d7efe42 100644 --- a/docker-images/4.1/vaapi/Dockerfile +++ b/docker-images/4.1/vaapi/Dockerfile @@ -269,7 +269,7 @@ RUN \ cd ${DIR} && \ curl -sLO https://github.com/fribidi/fribidi/releases/download/v${FRIBIDI_VERSION}/fribidi-${FRIBIDI_VERSION}.tar.bz2 && \ echo ${FRIBIDI_SHA256SUM} | sha256sum --check && \ - tar -jx --strip-components=1 -f ${FRIBIDI_VERSION}.tar.bz2 && \ + tar -jx --strip-components=1 -f fribidi-${FRIBIDI_VERSION}.tar.bz2 && \ ./autogen.sh && \ make -j 1 && \ make install && \ diff --git a/docker-images/4.2/alpine/Dockerfile b/docker-images/4.2/alpine/Dockerfile index ba809b7f2..0f3158ff7 100644 --- a/docker-images/4.2/alpine/Dockerfile +++ b/docker-images/4.2/alpine/Dockerfile @@ -267,7 +267,7 @@ RUN \ cd ${DIR} && \ curl -sLO https://github.com/fribidi/fribidi/releases/download/v${FRIBIDI_VERSION}/fribidi-${FRIBIDI_VERSION}.tar.bz2 && \ echo ${FRIBIDI_SHA256SUM} | sha256sum --check && \ - tar -jx --strip-components=1 -f ${FRIBIDI_VERSION}.tar.bz2 && \ + tar -jx --strip-components=1 -f fribidi-${FRIBIDI_VERSION}.tar.bz2 && \ ./autogen.sh && \ make -j 1 && \ make install && \ diff --git a/docker-images/4.2/centos/Dockerfile b/docker-images/4.2/centos/Dockerfile index 44d3c5a54..6e6971ef0 100644 --- a/docker-images/4.2/centos/Dockerfile +++ b/docker-images/4.2/centos/Dockerfile @@ -267,7 +267,7 @@ RUN \ cd ${DIR} && \ curl -sLO https://github.com/fribidi/fribidi/releases/download/v${FRIBIDI_VERSION}/fribidi-${FRIBIDI_VERSION}.tar.bz2 && \ echo ${FRIBIDI_SHA256SUM} | sha256sum --check && \ - tar -jx --strip-components=1 -f ${FRIBIDI_VERSION}.tar.bz2 && \ + tar -jx --strip-components=1 -f fribidi-${FRIBIDI_VERSION}.tar.bz2 && \ ./autogen.sh && \ make -j 1 && \ make install && \ diff --git a/docker-images/4.2/nvidia/Dockerfile b/docker-images/4.2/nvidia/Dockerfile index d2bf53729..b4f83b3e8 100644 --- a/docker-images/4.2/nvidia/Dockerfile +++ b/docker-images/4.2/nvidia/Dockerfile @@ -293,7 +293,7 @@ RUN \ cd ${DIR} && \ curl -sLO https://github.com/fribidi/fribidi/releases/download/v${FRIBIDI_VERSION}/fribidi-${FRIBIDI_VERSION}.tar.bz2 && \ echo ${FRIBIDI_SHA256SUM} | sha256sum --check && \ - tar -jx --strip-components=1 -f ${FRIBIDI_VERSION}.tar.bz2 && \ + tar -jx --strip-components=1 -f fribidi-${FRIBIDI_VERSION}.tar.bz2 && \ ./autogen.sh && \ make -j 1 && \ make install && \ diff --git a/docker-images/4.2/scratch/Dockerfile b/docker-images/4.2/scratch/Dockerfile index 5acf6fd5d..aa2acf63c 100644 --- a/docker-images/4.2/scratch/Dockerfile +++ b/docker-images/4.2/scratch/Dockerfile @@ -264,7 +264,7 @@ RUN \ cd ${DIR} && \ curl -sLO https://github.com/fribidi/fribidi/releases/download/v${FRIBIDI_VERSION}/fribidi-${FRIBIDI_VERSION}.tar.bz2 && \ echo ${FRIBIDI_SHA256SUM} | sha256sum --check && \ - tar -jx --strip-components=1 -f ${FRIBIDI_VERSION}.tar.bz2 && \ + tar -jx --strip-components=1 -f fribidi-${FRIBIDI_VERSION}.tar.bz2 && \ ./autogen.sh && \ make -j 1 && \ make install && \ diff --git a/docker-images/4.2/ubuntu/Dockerfile b/docker-images/4.2/ubuntu/Dockerfile index b8f1b1c10..a60bf6f6f 100644 --- a/docker-images/4.2/ubuntu/Dockerfile +++ b/docker-images/4.2/ubuntu/Dockerfile @@ -268,7 +268,7 @@ RUN \ cd ${DIR} && \ curl -sLO https://github.com/fribidi/fribidi/releases/download/v${FRIBIDI_VERSION}/fribidi-${FRIBIDI_VERSION}.tar.bz2 && \ echo ${FRIBIDI_SHA256SUM} | sha256sum --check && \ - tar -jx --strip-components=1 -f ${FRIBIDI_VERSION}.tar.bz2 && \ + tar -jx --strip-components=1 -f fribidi-${FRIBIDI_VERSION}.tar.bz2 && \ ./autogen.sh && \ make -j 1 && \ make install && \ diff --git a/docker-images/4.2/vaapi/Dockerfile b/docker-images/4.2/vaapi/Dockerfile index ac7c21ff0..b34fa2b2e 100644 --- a/docker-images/4.2/vaapi/Dockerfile +++ b/docker-images/4.2/vaapi/Dockerfile @@ -269,7 +269,7 @@ RUN \ cd ${DIR} && \ curl -sLO https://github.com/fribidi/fribidi/releases/download/v${FRIBIDI_VERSION}/fribidi-${FRIBIDI_VERSION}.tar.bz2 && \ echo ${FRIBIDI_SHA256SUM} | sha256sum --check && \ - tar -jx --strip-components=1 -f ${FRIBIDI_VERSION}.tar.bz2 && \ + tar -jx --strip-components=1 -f fribidi-${FRIBIDI_VERSION}.tar.bz2 && \ ./autogen.sh && \ make -j 1 && \ make install && \ diff --git a/docker-images/snapshot/alpine/Dockerfile b/docker-images/snapshot/alpine/Dockerfile index 6c380d72e..52fe8dc6e 100644 --- a/docker-images/snapshot/alpine/Dockerfile +++ b/docker-images/snapshot/alpine/Dockerfile @@ -267,7 +267,7 @@ RUN \ cd ${DIR} && \ curl -sLO https://github.com/fribidi/fribidi/releases/download/v${FRIBIDI_VERSION}/fribidi-${FRIBIDI_VERSION}.tar.bz2 && \ echo ${FRIBIDI_SHA256SUM} | sha256sum --check && \ - tar -jx --strip-components=1 -f ${FRIBIDI_VERSION}.tar.bz2 && \ + tar -jx --strip-components=1 -f fribidi-${FRIBIDI_VERSION}.tar.bz2 && \ ./autogen.sh && \ make -j 1 && \ make install && \ diff --git a/docker-images/snapshot/centos/Dockerfile b/docker-images/snapshot/centos/Dockerfile index 6ed5f70d1..8ff2e335a 100644 --- a/docker-images/snapshot/centos/Dockerfile +++ b/docker-images/snapshot/centos/Dockerfile @@ -267,7 +267,7 @@ RUN \ cd ${DIR} && \ curl -sLO https://github.com/fribidi/fribidi/releases/download/v${FRIBIDI_VERSION}/fribidi-${FRIBIDI_VERSION}.tar.bz2 && \ echo ${FRIBIDI_SHA256SUM} | sha256sum --check && \ - tar -jx --strip-components=1 -f ${FRIBIDI_VERSION}.tar.bz2 && \ + tar -jx --strip-components=1 -f fribidi-${FRIBIDI_VERSION}.tar.bz2 && \ ./autogen.sh && \ make -j 1 && \ make install && \ diff --git a/docker-images/snapshot/nvidia/Dockerfile b/docker-images/snapshot/nvidia/Dockerfile index d88db677e..582bcdfc5 100644 --- a/docker-images/snapshot/nvidia/Dockerfile +++ b/docker-images/snapshot/nvidia/Dockerfile @@ -293,7 +293,7 @@ RUN \ cd ${DIR} && \ curl -sLO https://github.com/fribidi/fribidi/releases/download/v${FRIBIDI_VERSION}/fribidi-${FRIBIDI_VERSION}.tar.bz2 && \ echo ${FRIBIDI_SHA256SUM} | sha256sum --check && \ - tar -jx --strip-components=1 -f ${FRIBIDI_VERSION}.tar.bz2 && \ + tar -jx --strip-components=1 -f fribidi-${FRIBIDI_VERSION}.tar.bz2 && \ ./autogen.sh && \ make -j 1 && \ make install && \ diff --git a/docker-images/snapshot/scratch/Dockerfile b/docker-images/snapshot/scratch/Dockerfile index 20c204322..a01e29942 100644 --- a/docker-images/snapshot/scratch/Dockerfile +++ b/docker-images/snapshot/scratch/Dockerfile @@ -264,7 +264,7 @@ RUN \ cd ${DIR} && \ curl -sLO https://github.com/fribidi/fribidi/releases/download/v${FRIBIDI_VERSION}/fribidi-${FRIBIDI_VERSION}.tar.bz2 && \ echo ${FRIBIDI_SHA256SUM} | sha256sum --check && \ - tar -jx --strip-components=1 -f ${FRIBIDI_VERSION}.tar.bz2 && \ + tar -jx --strip-components=1 -f fribidi-${FRIBIDI_VERSION}.tar.bz2 && \ ./autogen.sh && \ make -j 1 && \ make install && \ diff --git a/docker-images/snapshot/ubuntu/Dockerfile b/docker-images/snapshot/ubuntu/Dockerfile index 7e5d130b8..2a9df4853 100644 --- a/docker-images/snapshot/ubuntu/Dockerfile +++ b/docker-images/snapshot/ubuntu/Dockerfile @@ -268,7 +268,7 @@ RUN \ cd ${DIR} && \ curl -sLO https://github.com/fribidi/fribidi/releases/download/v${FRIBIDI_VERSION}/fribidi-${FRIBIDI_VERSION}.tar.bz2 && \ echo ${FRIBIDI_SHA256SUM} | sha256sum --check && \ - tar -jx --strip-components=1 -f ${FRIBIDI_VERSION}.tar.bz2 && \ + tar -jx --strip-components=1 -f fribidi-${FRIBIDI_VERSION}.tar.bz2 && \ ./autogen.sh && \ make -j 1 && \ make install && \ diff --git a/docker-images/snapshot/vaapi/Dockerfile b/docker-images/snapshot/vaapi/Dockerfile index d1d6dbf49..c75477abb 100644 --- a/docker-images/snapshot/vaapi/Dockerfile +++ b/docker-images/snapshot/vaapi/Dockerfile @@ -269,7 +269,7 @@ RUN \ cd ${DIR} && \ curl -sLO https://github.com/fribidi/fribidi/releases/download/v${FRIBIDI_VERSION}/fribidi-${FRIBIDI_VERSION}.tar.bz2 && \ echo ${FRIBIDI_SHA256SUM} | sha256sum --check && \ - tar -jx --strip-components=1 -f ${FRIBIDI_VERSION}.tar.bz2 && \ + tar -jx --strip-components=1 -f fribidi-${FRIBIDI_VERSION}.tar.bz2 && \ ./autogen.sh && \ make -j 1 && \ make install && \ From 4252fbad43719d2ba4970e77863ed7dcb4d453d7 Mon Sep 17 00:00:00 2001 From: Zennoe Date: Sat, 11 Jan 2020 16:01:46 +0100 Subject: [PATCH 5/8] updated from source libs to newest versions this involved updating version numbers, changing some download URLs, matching the respective sha256sums and adjusting build command chains. --- templates/Dockerfile-env | 45 ++++++++++++++++++++-------------------- templates/Dockerfile-run | 25 ++++++++++------------ 2 files changed, 33 insertions(+), 37 deletions(-) diff --git a/templates/Dockerfile-env b/templates/Dockerfile-env index 52acc8cdb..3a0e310cc 100644 --- a/templates/Dockerfile-env +++ b/templates/Dockerfile-env @@ -1,43 +1,42 @@ 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 \ + FDKAAC_VERSION=2.0.1 \ + FONTCONFIG_VERSION=2.13.92 \ + FREETYPE_VERSION=2.10.1 \ + FRIBIDI_VERSION=1.0.8 \ + KVAZAAR_VERSION=1.3.0 \ LAME_VERSION=3.100 \ - LIBASS_VERSION=0.13.7 \ + LIBASS_VERSION=0.14.0 \ LIBPTHREAD_STUBS_VERSION=0.4 \ LIBVIDSTAB_VERSION=1.1.0 \ LIBXCB_VERSION=1.13.1 \ XCBPROTO_VERSION=1.13 \ - OGG_VERSION=1.3.2 \ + OGG_VERSION=1.3.4 \ OPENCOREAMR_VERSION=0.1.5 \ - OPUS_VERSION=1.2 \ - OPENJPEG_VERSION=2.1.2 \ + OPUS_VERSION=1.3.1 \ + OPENJPEG_VERSION=2.3.1 \ 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 \ + VORBIS_VERSION=1.3.6 \ + VPX_VERSION=1.8.2 \ + WEBP_VERSION=1.0.3 \ + X265_VERSION=3.2.1 \ XAU_VERSION=1.0.9 \ XORG_MACROS_VERSION=1.19.2 \ XPROTO_VERSION=7.0.31 \ - XVID_VERSION=1.3.4 \ + XVID_VERSION=1.3.7 \ LIBXML2_VERSION=2.9.10 \ LIBBLURAY_VERSION=1.1.2 \ SRC=/usr/local -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 FREETYPE_SHA256SUM="3a60d391fd579440561bf0e7f31af2222bc610ad6ce4d9d7bd2165bca8669110 freetype-2.10.1.tar.gz" +ARG FRIBIDI_SHA256SUM="94c7b68d86ad2a9613b4dcffe7bbeb03523d63b5b37918bdf2e4ef34195c1e6c fribidi-1.0.8.tar.bz2" +ARG LIBASS_SHA256SUM="8d5a5c920b90b70a108007ffcd2289ac652c0e03fc88e6eecefa37df0f2e7fdf libass-0.14.0.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" +ARG OGG_SHA256SUM="fe5670640bd49e828d64d2879c31cb4dde9758681bb664f9bdbf159a01b0c76e libogg-1.3.4.tar.gz" +ARG OPUS_SHA256SUM="65b58e1e25b2a114157014736a3d9dfeaad8d41be1c8179866f144a2fb44ff9d opus-1.3.1.tar.gz" +ARG THEORA_SHA256SUM="b6ae1ee2fa3d42ac489287d3ec34c5885730b1296f0801ae577a35193d3affbc libtheora-1.1.1.tar.bz2" +ARG VORBIS_SHA256SUM="6ed40e0241089a42c48604dc00e362beee00036af2d8b3f46338031c9e0351cb libvorbis-1.3.6.tar.gz" +ARG XVID_SHA256SUM="abbdcbd39555691dd1c9b4d08f0a031376a3b211652c0d8b3b8aa9be1303ce2d xvidcore-1.3.7.tar.gz" ARG LIBXML2_SHA256SUM="f07dab13bf42d2b8db80620cce7419b3b87827cc937c8bb20fe13b8571ee9501 libxml2-v2.9.10.tar.gz" ARG LIBBLURAY_SHA256SUM="a3dd452239b100dc9da0d01b30e1692693e2a332a7d29917bf84bb10ea7c0b42 libbluray-1.1.2.tar.bz2" diff --git a/templates/Dockerfile-run b/templates/Dockerfile-run index fc7a63502..618461020 100644 --- a/templates/Dockerfile-run +++ b/templates/Dockerfile-run @@ -14,7 +14,7 @@ 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 | \ + curl -sL https://code.videolan.org/videolan/x264/-/archive/stable/x264-stable.tar.bz2 | \ tar -jx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared --enable-pic --disable-cli && \ make && \ @@ -75,9 +75,9 @@ RUN \ DIR=/tmp/theora && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sLO http://downloads.xiph.org/releases/theora/libtheora-${THEORA_VERSION}.tar.gz && \ + curl -sLO http://downloads.xiph.org/releases/theora/libtheora-${THEORA_VERSION}.tar.bz2 && \ echo ${THEORA_SHA256SUM} | sha256sum --check && \ - tar -zx --strip-components=1 -f libtheora-${THEORA_VERSION}.tar.gz && \ + tar -jx --strip-components=1 -f libtheora-${THEORA_VERSION}.tar.bz2 && \ ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ make && \ make install && \ @@ -121,7 +121,7 @@ RUN \ DIR=/tmp/xvid && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sLO http://downloads.xvid.org/downloads/xvidcore-${XVID_VERSION}.tar.gz && \ + curl -sLO http://downloads.xvid.com/downloads/xvidcore-${XVID_VERSION}.tar.gz && \ echo ${XVID_SHA256SUM} | sha256sum --check && \ tar -zx -f xvidcore-${XVID_VERSION}.tar.gz && \ cd xvidcore/build/generic && \ @@ -182,12 +182,10 @@ RUN \ DIR=/tmp/fribidi && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sLO https://github.com/fribidi/fribidi/archive/${FRIBIDI_VERSION}.tar.gz && \ + curl -sLO https://github.com/fribidi/fribidi/releases/download/v${FRIBIDI_VERSION}/fribidi-${FRIBIDI_VERSION}.tar.bz2 && \ 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 && \ + tar -jx --strip-components=1 -f ${FRIBIDI_VERSION}.tar.bz2 && \ + ./autogen.sh && \ make -j 1 && \ make install && \ rm -rf ${DIR} @@ -196,8 +194,8 @@ 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 && \ + curl -sLO https://www.freedesktop.org/software/fontconfig/release/fontconfig-${FONTCONFIG_VERSION}.tar.gz &&\ + tar -zx --strip-components=1 -f fontconfig-${FONTCONFIG_VERSION}.tar.gz && \ ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ make && \ make install && \ @@ -207,10 +205,9 @@ RUN \ DIR=/tmp/libass && \ mkdir -p ${DIR} && \ cd ${DIR} && \ - curl -sLO https://github.com/libass/libass/archive/${LIBASS_VERSION}.tar.gz &&\ + curl -sLO https://github.com/libass/libass/releases/download/${LIBASS_VERSION}/libass-${LIBASS_VERSION}.tar.gz &&\ echo ${LIBASS_SHA256SUM} | sha256sum --check && \ - tar -zx --strip-components=1 -f ${LIBASS_VERSION}.tar.gz && \ - ./autogen.sh && \ + tar -zx --strip-components=1 -f libass-${LIBASS_VERSION}.tar.gz && \ ./configure -prefix="${PREFIX}" --disable-static --enable-shared && \ make && \ make install && \ From 25e65d03b4784e5e70a5360bfa740897a3480031 Mon Sep 17 00:00:00 2001 From: Zennoe Date: Sat, 11 Jan 2020 16:48:21 +0100 Subject: [PATCH 6/8] small filename change i overlooked in d4fcf0dcb --- templates/Dockerfile-run | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/Dockerfile-run b/templates/Dockerfile-run index 618461020..945cc40b7 100644 --- a/templates/Dockerfile-run +++ b/templates/Dockerfile-run @@ -184,7 +184,7 @@ RUN \ cd ${DIR} && \ curl -sLO https://github.com/fribidi/fribidi/releases/download/v${FRIBIDI_VERSION}/fribidi-${FRIBIDI_VERSION}.tar.bz2 && \ echo ${FRIBIDI_SHA256SUM} | sha256sum --check && \ - tar -jx --strip-components=1 -f ${FRIBIDI_VERSION}.tar.bz2 && \ + tar -jx --strip-components=1 -f fribidi-${FRIBIDI_VERSION}.tar.bz2 && \ ./autogen.sh && \ make -j 1 && \ make install && \ From 79a11a4e6e12ad4d05f7721f7277daba07c26bcc Mon Sep 17 00:00:00 2001 From: Zennoe Date: Tue, 4 Feb 2020 17:22:41 +0100 Subject: [PATCH 7/8] added fribidi build dependency for CentOS --- docker-images/3.2/centos/Dockerfile | 1 + docker-images/3.3/centos/Dockerfile | 1 + docker-images/3.4/centos/Dockerfile | 1 + docker-images/4.0/centos/Dockerfile | 1 + docker-images/4.1/centos/Dockerfile | 1 + docker-images/4.2/centos/Dockerfile | 1 + docker-images/snapshot/centos/Dockerfile | 1 + templates/Dockerfile-template.centos | 1 + 8 files changed, 8 insertions(+) diff --git a/docker-images/3.2/centos/Dockerfile b/docker-images/3.2/centos/Dockerfile index 8d55906a5..14fd68dfa 100644 --- a/docker-images/3.2/centos/Dockerfile +++ b/docker-images/3.2/centos/Dockerfile @@ -70,6 +70,7 @@ RUN buildDeps="autoconf \ cmake \ diffutils \ expat-devel \ + fribidi-devel \ gcc \ gcc-c++ \ git \ diff --git a/docker-images/3.3/centos/Dockerfile b/docker-images/3.3/centos/Dockerfile index 377d9699f..30ba72d0a 100644 --- a/docker-images/3.3/centos/Dockerfile +++ b/docker-images/3.3/centos/Dockerfile @@ -70,6 +70,7 @@ RUN buildDeps="autoconf \ cmake \ diffutils \ expat-devel \ + fribidi-devel \ gcc \ gcc-c++ \ git \ diff --git a/docker-images/3.4/centos/Dockerfile b/docker-images/3.4/centos/Dockerfile index 287d75ef8..5101db2ea 100644 --- a/docker-images/3.4/centos/Dockerfile +++ b/docker-images/3.4/centos/Dockerfile @@ -70,6 +70,7 @@ RUN buildDeps="autoconf \ cmake \ diffutils \ expat-devel \ + fribidi-devel \ gcc \ gcc-c++ \ git \ diff --git a/docker-images/4.0/centos/Dockerfile b/docker-images/4.0/centos/Dockerfile index 93695c86b..6d5f3451f 100644 --- a/docker-images/4.0/centos/Dockerfile +++ b/docker-images/4.0/centos/Dockerfile @@ -70,6 +70,7 @@ RUN buildDeps="autoconf \ cmake \ diffutils \ expat-devel \ + fribidi-devel \ gcc \ gcc-c++ \ git \ diff --git a/docker-images/4.1/centos/Dockerfile b/docker-images/4.1/centos/Dockerfile index 1e190d72d..023ba014f 100644 --- a/docker-images/4.1/centos/Dockerfile +++ b/docker-images/4.1/centos/Dockerfile @@ -70,6 +70,7 @@ RUN buildDeps="autoconf \ cmake \ diffutils \ expat-devel \ + fribidi-devel \ gcc \ gcc-c++ \ git \ diff --git a/docker-images/4.2/centos/Dockerfile b/docker-images/4.2/centos/Dockerfile index 84d34d0d0..88b11bfdc 100644 --- a/docker-images/4.2/centos/Dockerfile +++ b/docker-images/4.2/centos/Dockerfile @@ -70,6 +70,7 @@ RUN buildDeps="autoconf \ cmake \ diffutils \ expat-devel \ + fribidi-devel \ gcc \ gcc-c++ \ git \ diff --git a/docker-images/snapshot/centos/Dockerfile b/docker-images/snapshot/centos/Dockerfile index 793f5dac8..096e4c204 100644 --- a/docker-images/snapshot/centos/Dockerfile +++ b/docker-images/snapshot/centos/Dockerfile @@ -70,6 +70,7 @@ RUN buildDeps="autoconf \ cmake \ diffutils \ expat-devel \ + fribidi-devel \ gcc \ gcc-c++ \ git \ diff --git a/templates/Dockerfile-template.centos b/templates/Dockerfile-template.centos index 8c04e876c..59d43ab60 100644 --- a/templates/Dockerfile-template.centos +++ b/templates/Dockerfile-template.centos @@ -28,6 +28,7 @@ RUN buildDeps="autoconf \ cmake \ diffutils \ expat-devel \ + fribidi-devel \ gcc \ gcc-c++ \ git \ From baa9513cf601947f80c211a8df0ab267b5b3deb7 Mon Sep 17 00:00:00 2001 From: Zennoe Date: Tue, 4 Feb 2020 18:25:02 +0100 Subject: [PATCH 8/8] add both fribidi and fribidi-devel dependency to CentOS builds --- docker-images/3.2/centos/Dockerfile | 1 + docker-images/3.3/centos/Dockerfile | 1 + docker-images/3.4/centos/Dockerfile | 1 + docker-images/4.0/centos/Dockerfile | 1 + docker-images/4.1/centos/Dockerfile | 1 + docker-images/4.2/centos/Dockerfile | 1 + docker-images/snapshot/centos/Dockerfile | 1 + templates/Dockerfile-template.centos | 1 + 8 files changed, 8 insertions(+) diff --git a/docker-images/3.2/centos/Dockerfile b/docker-images/3.2/centos/Dockerfile index 14fd68dfa..edeecaa13 100644 --- a/docker-images/3.2/centos/Dockerfile +++ b/docker-images/3.2/centos/Dockerfile @@ -70,6 +70,7 @@ RUN buildDeps="autoconf \ cmake \ diffutils \ expat-devel \ + fribidi \ fribidi-devel \ gcc \ gcc-c++ \ diff --git a/docker-images/3.3/centos/Dockerfile b/docker-images/3.3/centos/Dockerfile index 30ba72d0a..71f9dae9c 100644 --- a/docker-images/3.3/centos/Dockerfile +++ b/docker-images/3.3/centos/Dockerfile @@ -70,6 +70,7 @@ RUN buildDeps="autoconf \ cmake \ diffutils \ expat-devel \ + fribidi \ fribidi-devel \ gcc \ gcc-c++ \ diff --git a/docker-images/3.4/centos/Dockerfile b/docker-images/3.4/centos/Dockerfile index 5101db2ea..5447e08a1 100644 --- a/docker-images/3.4/centos/Dockerfile +++ b/docker-images/3.4/centos/Dockerfile @@ -70,6 +70,7 @@ RUN buildDeps="autoconf \ cmake \ diffutils \ expat-devel \ + fribidi \ fribidi-devel \ gcc \ gcc-c++ \ diff --git a/docker-images/4.0/centos/Dockerfile b/docker-images/4.0/centos/Dockerfile index 6d5f3451f..87e457631 100644 --- a/docker-images/4.0/centos/Dockerfile +++ b/docker-images/4.0/centos/Dockerfile @@ -70,6 +70,7 @@ RUN buildDeps="autoconf \ cmake \ diffutils \ expat-devel \ + fribidi \ fribidi-devel \ gcc \ gcc-c++ \ diff --git a/docker-images/4.1/centos/Dockerfile b/docker-images/4.1/centos/Dockerfile index 023ba014f..c812e959c 100644 --- a/docker-images/4.1/centos/Dockerfile +++ b/docker-images/4.1/centos/Dockerfile @@ -70,6 +70,7 @@ RUN buildDeps="autoconf \ cmake \ diffutils \ expat-devel \ + fribidi \ fribidi-devel \ gcc \ gcc-c++ \ diff --git a/docker-images/4.2/centos/Dockerfile b/docker-images/4.2/centos/Dockerfile index 88b11bfdc..c9ec1b32a 100644 --- a/docker-images/4.2/centos/Dockerfile +++ b/docker-images/4.2/centos/Dockerfile @@ -70,6 +70,7 @@ RUN buildDeps="autoconf \ cmake \ diffutils \ expat-devel \ + fribidi \ fribidi-devel \ gcc \ gcc-c++ \ diff --git a/docker-images/snapshot/centos/Dockerfile b/docker-images/snapshot/centos/Dockerfile index 096e4c204..f02d5d9e6 100644 --- a/docker-images/snapshot/centos/Dockerfile +++ b/docker-images/snapshot/centos/Dockerfile @@ -70,6 +70,7 @@ RUN buildDeps="autoconf \ cmake \ diffutils \ expat-devel \ + fribidi \ fribidi-devel \ gcc \ gcc-c++ \ diff --git a/templates/Dockerfile-template.centos b/templates/Dockerfile-template.centos index 59d43ab60..2e46ccf3b 100644 --- a/templates/Dockerfile-template.centos +++ b/templates/Dockerfile-template.centos @@ -28,6 +28,7 @@ RUN buildDeps="autoconf \ cmake \ diffutils \ expat-devel \ + fribidi \ fribidi-devel \ gcc \ gcc-c++ \