diff --git a/docker-images/3.2/alpine/Dockerfile b/docker-images/3.2/alpine/Dockerfile index 13913b492..f2ac33f16 100644 --- a/docker-images/3.2/alpine/Dockerfile +++ b/docker-images/3.2/alpine/Dockerfile @@ -20,44 +20,43 @@ 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 \ 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" @@ -102,7 +101,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 && \ @@ -163,9 +162,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 && \ @@ -209,7 +208,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 && \ @@ -270,12 +269,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-${FRIBIDI_VERSION}.tar.bz2 && \ + ./autogen.sh && \ make -j 1 && \ make install && \ rm -rf ${DIR} @@ -284,8 +281,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 && \ @@ -295,10 +292,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 e83841002..edeecaa13 100644 --- a/docker-images/3.2/centos/Dockerfile +++ b/docker-images/3.2/centos/Dockerfile @@ -22,44 +22,43 @@ 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 \ 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" @@ -71,6 +70,8 @@ RUN buildDeps="autoconf \ cmake \ diffutils \ expat-devel \ + fribidi \ + fribidi-devel \ gcc \ gcc-c++ \ git \ @@ -105,7 +106,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 && \ @@ -166,9 +167,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 && \ @@ -212,7 +213,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 && \ @@ -273,12 +274,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-${FRIBIDI_VERSION}.tar.bz2 && \ + ./autogen.sh && \ make -j 1 && \ make install && \ rm -rf ${DIR} @@ -287,8 +286,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 && \ @@ -298,10 +297,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 d14cce8ae..59d0f389f 100644 --- a/docker-images/3.2/nvidia/Dockerfile +++ b/docker-images/3.2/nvidia/Dockerfile @@ -37,44 +37,43 @@ 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 \ 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" @@ -128,7 +127,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 && \ @@ -189,9 +188,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 && \ @@ -235,7 +234,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 && \ @@ -296,12 +295,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-${FRIBIDI_VERSION}.tar.bz2 && \ + ./autogen.sh && \ make -j 1 && \ make install && \ rm -rf ${DIR} @@ -310,8 +307,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 && \ @@ -321,10 +318,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 e587f542b..923975eea 100644 --- a/docker-images/3.2/scratch/Dockerfile +++ b/docker-images/3.2/scratch/Dockerfile @@ -15,44 +15,43 @@ 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 \ 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" @@ -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-${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/ubuntu/Dockerfile b/docker-images/3.2/ubuntu/Dockerfile index 38a87e05e..97a0b8b6e 100644 --- a/docker-images/3.2/ubuntu/Dockerfile +++ b/docker-images/3.2/ubuntu/Dockerfile @@ -23,44 +23,43 @@ 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 \ 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" @@ -103,7 +102,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 && \ @@ -164,9 +163,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 && \ @@ -210,7 +209,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 && \ @@ -271,12 +270,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-${FRIBIDI_VERSION}.tar.bz2 && \ + ./autogen.sh && \ make -j 1 && \ make install && \ rm -rf ${DIR} @@ -285,8 +282,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 && \ @@ -296,10 +293,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 a4b59d3f8..c8606d9fa 100644 --- a/docker-images/3.2/vaapi/Dockerfile +++ b/docker-images/3.2/vaapi/Dockerfile @@ -23,44 +23,43 @@ 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 \ 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" @@ -104,7 +103,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 && \ @@ -165,9 +164,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 && \ @@ -211,7 +210,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 && \ @@ -272,12 +271,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-${FRIBIDI_VERSION}.tar.bz2 && \ + ./autogen.sh && \ make -j 1 && \ make install && \ rm -rf ${DIR} @@ -286,8 +283,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 && \ @@ -297,10 +294,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 dab71ab25..fea06c644 100644 --- a/docker-images/3.3/alpine/Dockerfile +++ b/docker-images/3.3/alpine/Dockerfile @@ -20,44 +20,43 @@ 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 \ 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" @@ -102,7 +101,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 && \ @@ -163,9 +162,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 && \ @@ -209,7 +208,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 && \ @@ -270,12 +269,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-${FRIBIDI_VERSION}.tar.bz2 && \ + ./autogen.sh && \ make -j 1 && \ make install && \ rm -rf ${DIR} @@ -284,8 +281,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 && \ @@ -295,10 +292,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 a4536cabc..71f9dae9c 100644 --- a/docker-images/3.3/centos/Dockerfile +++ b/docker-images/3.3/centos/Dockerfile @@ -22,44 +22,43 @@ 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 \ 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" @@ -71,6 +70,8 @@ RUN buildDeps="autoconf \ cmake \ diffutils \ expat-devel \ + fribidi \ + fribidi-devel \ gcc \ gcc-c++ \ git \ @@ -105,7 +106,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 && \ @@ -166,9 +167,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 && \ @@ -212,7 +213,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 && \ @@ -273,12 +274,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-${FRIBIDI_VERSION}.tar.bz2 && \ + ./autogen.sh && \ make -j 1 && \ make install && \ rm -rf ${DIR} @@ -287,8 +286,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 && \ @@ -298,10 +297,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 c5729dc83..4504cebd9 100644 --- a/docker-images/3.3/nvidia/Dockerfile +++ b/docker-images/3.3/nvidia/Dockerfile @@ -37,44 +37,43 @@ 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 \ 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" @@ -128,7 +127,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 && \ @@ -189,9 +188,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 && \ @@ -235,7 +234,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 && \ @@ -296,12 +295,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-${FRIBIDI_VERSION}.tar.bz2 && \ + ./autogen.sh && \ make -j 1 && \ make install && \ rm -rf ${DIR} @@ -310,8 +307,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 && \ @@ -321,10 +318,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 63d10d16b..2b1fca460 100644 --- a/docker-images/3.3/scratch/Dockerfile +++ b/docker-images/3.3/scratch/Dockerfile @@ -15,44 +15,43 @@ 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 \ 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" @@ -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-${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/ubuntu/Dockerfile b/docker-images/3.3/ubuntu/Dockerfile index b19127cac..f3d65edc7 100644 --- a/docker-images/3.3/ubuntu/Dockerfile +++ b/docker-images/3.3/ubuntu/Dockerfile @@ -23,44 +23,43 @@ 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 \ 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" @@ -103,7 +102,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 && \ @@ -164,9 +163,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 && \ @@ -210,7 +209,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 && \ @@ -271,12 +270,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-${FRIBIDI_VERSION}.tar.bz2 && \ + ./autogen.sh && \ make -j 1 && \ make install && \ rm -rf ${DIR} @@ -285,8 +282,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 && \ @@ -296,10 +293,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 91ac3eac3..67b5cb119 100644 --- a/docker-images/3.3/vaapi/Dockerfile +++ b/docker-images/3.3/vaapi/Dockerfile @@ -23,44 +23,43 @@ 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 \ 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" @@ -104,7 +103,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 && \ @@ -165,9 +164,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 && \ @@ -211,7 +210,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 && \ @@ -272,12 +271,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-${FRIBIDI_VERSION}.tar.bz2 && \ + ./autogen.sh && \ make -j 1 && \ make install && \ rm -rf ${DIR} @@ -286,8 +283,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 && \ @@ -297,10 +294,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 95fdbdda3..708f95407 100644 --- a/docker-images/3.4/alpine/Dockerfile +++ b/docker-images/3.4/alpine/Dockerfile @@ -20,44 +20,43 @@ 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 \ 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" @@ -102,7 +101,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 && \ @@ -163,9 +162,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 && \ @@ -209,7 +208,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 && \ @@ -270,12 +269,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-${FRIBIDI_VERSION}.tar.bz2 && \ + ./autogen.sh && \ make -j 1 && \ make install && \ rm -rf ${DIR} @@ -284,8 +281,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 && \ @@ -295,10 +292,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 bf3331912..5447e08a1 100644 --- a/docker-images/3.4/centos/Dockerfile +++ b/docker-images/3.4/centos/Dockerfile @@ -22,44 +22,43 @@ 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 \ 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" @@ -71,6 +70,8 @@ RUN buildDeps="autoconf \ cmake \ diffutils \ expat-devel \ + fribidi \ + fribidi-devel \ gcc \ gcc-c++ \ git \ @@ -105,7 +106,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 && \ @@ -166,9 +167,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 && \ @@ -212,7 +213,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 && \ @@ -273,12 +274,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-${FRIBIDI_VERSION}.tar.bz2 && \ + ./autogen.sh && \ make -j 1 && \ make install && \ rm -rf ${DIR} @@ -287,8 +286,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 && \ @@ -298,10 +297,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 161b57ef4..7ce10237d 100644 --- a/docker-images/3.4/nvidia/Dockerfile +++ b/docker-images/3.4/nvidia/Dockerfile @@ -37,44 +37,43 @@ 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 \ 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" @@ -128,7 +127,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 && \ @@ -189,9 +188,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 && \ @@ -235,7 +234,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 && \ @@ -296,12 +295,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-${FRIBIDI_VERSION}.tar.bz2 && \ + ./autogen.sh && \ make -j 1 && \ make install && \ rm -rf ${DIR} @@ -310,8 +307,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 && \ @@ -321,10 +318,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 7b1c525ee..934acaa26 100644 --- a/docker-images/3.4/scratch/Dockerfile +++ b/docker-images/3.4/scratch/Dockerfile @@ -15,44 +15,43 @@ 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 \ 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" @@ -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-${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/ubuntu/Dockerfile b/docker-images/3.4/ubuntu/Dockerfile index 747f66cbe..74613184e 100644 --- a/docker-images/3.4/ubuntu/Dockerfile +++ b/docker-images/3.4/ubuntu/Dockerfile @@ -23,44 +23,43 @@ 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 \ 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" @@ -103,7 +102,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 && \ @@ -164,9 +163,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 && \ @@ -210,7 +209,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 && \ @@ -271,12 +270,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-${FRIBIDI_VERSION}.tar.bz2 && \ + ./autogen.sh && \ make -j 1 && \ make install && \ rm -rf ${DIR} @@ -285,8 +282,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 && \ @@ -296,10 +293,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 ce98c51ce..b7a6a2adc 100644 --- a/docker-images/3.4/vaapi/Dockerfile +++ b/docker-images/3.4/vaapi/Dockerfile @@ -23,44 +23,43 @@ 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 \ 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" @@ -104,7 +103,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 && \ @@ -165,9 +164,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 && \ @@ -211,7 +210,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 && \ @@ -272,12 +271,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-${FRIBIDI_VERSION}.tar.bz2 && \ + ./autogen.sh && \ make -j 1 && \ make install && \ rm -rf ${DIR} @@ -286,8 +283,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 && \ @@ -297,10 +294,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 018d606c6..e0e3274fa 100644 --- a/docker-images/4.0/alpine/Dockerfile +++ b/docker-images/4.0/alpine/Dockerfile @@ -20,44 +20,43 @@ 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 \ 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" @@ -102,7 +101,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 && \ @@ -163,9 +162,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 && \ @@ -209,7 +208,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 && \ @@ -270,12 +269,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-${FRIBIDI_VERSION}.tar.bz2 && \ + ./autogen.sh && \ make -j 1 && \ make install && \ rm -rf ${DIR} @@ -284,8 +281,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 && \ @@ -295,10 +292,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 0f76b3b49..87e457631 100644 --- a/docker-images/4.0/centos/Dockerfile +++ b/docker-images/4.0/centos/Dockerfile @@ -22,44 +22,43 @@ 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 \ 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" @@ -71,6 +70,8 @@ RUN buildDeps="autoconf \ cmake \ diffutils \ expat-devel \ + fribidi \ + fribidi-devel \ gcc \ gcc-c++ \ git \ @@ -105,7 +106,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 && \ @@ -166,9 +167,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 && \ @@ -212,7 +213,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 && \ @@ -273,12 +274,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-${FRIBIDI_VERSION}.tar.bz2 && \ + ./autogen.sh && \ make -j 1 && \ make install && \ rm -rf ${DIR} @@ -287,8 +286,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 && \ @@ -298,10 +297,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 4cdacaea6..21c62eda6 100644 --- a/docker-images/4.0/nvidia/Dockerfile +++ b/docker-images/4.0/nvidia/Dockerfile @@ -37,44 +37,43 @@ 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 \ 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" @@ -128,7 +127,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 && \ @@ -189,9 +188,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 && \ @@ -235,7 +234,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 && \ @@ -296,12 +295,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-${FRIBIDI_VERSION}.tar.bz2 && \ + ./autogen.sh && \ make -j 1 && \ make install && \ rm -rf ${DIR} @@ -310,8 +307,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 && \ @@ -321,10 +318,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 4b69e42d7..f5777e259 100644 --- a/docker-images/4.0/scratch/Dockerfile +++ b/docker-images/4.0/scratch/Dockerfile @@ -15,44 +15,43 @@ 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 \ 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" @@ -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-${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/ubuntu/Dockerfile b/docker-images/4.0/ubuntu/Dockerfile index 3ebc7f05f..2de103460 100644 --- a/docker-images/4.0/ubuntu/Dockerfile +++ b/docker-images/4.0/ubuntu/Dockerfile @@ -23,44 +23,43 @@ 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 \ 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" @@ -103,7 +102,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 && \ @@ -164,9 +163,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 && \ @@ -210,7 +209,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 && \ @@ -271,12 +270,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-${FRIBIDI_VERSION}.tar.bz2 && \ + ./autogen.sh && \ make -j 1 && \ make install && \ rm -rf ${DIR} @@ -285,8 +282,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 && \ @@ -296,10 +293,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 f99f714d5..8758ba4c8 100644 --- a/docker-images/4.0/vaapi/Dockerfile +++ b/docker-images/4.0/vaapi/Dockerfile @@ -23,44 +23,43 @@ 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 \ 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" @@ -104,7 +103,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 && \ @@ -165,9 +164,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 && \ @@ -211,7 +210,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 && \ @@ -272,12 +271,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-${FRIBIDI_VERSION}.tar.bz2 && \ + ./autogen.sh && \ make -j 1 && \ make install && \ rm -rf ${DIR} @@ -286,8 +283,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 && \ @@ -297,10 +294,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 ec88ad460..f9729ba7d 100644 --- a/docker-images/4.1/alpine/Dockerfile +++ b/docker-images/4.1/alpine/Dockerfile @@ -20,44 +20,43 @@ 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 \ 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" @@ -102,7 +101,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 && \ @@ -163,9 +162,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 && \ @@ -209,7 +208,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 && \ @@ -270,12 +269,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-${FRIBIDI_VERSION}.tar.bz2 && \ + ./autogen.sh && \ make -j 1 && \ make install && \ rm -rf ${DIR} @@ -284,8 +281,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 && \ @@ -295,10 +292,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 e7722ccff..c812e959c 100644 --- a/docker-images/4.1/centos/Dockerfile +++ b/docker-images/4.1/centos/Dockerfile @@ -22,44 +22,43 @@ 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 \ 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" @@ -71,6 +70,8 @@ RUN buildDeps="autoconf \ cmake \ diffutils \ expat-devel \ + fribidi \ + fribidi-devel \ gcc \ gcc-c++ \ git \ @@ -105,7 +106,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 && \ @@ -166,9 +167,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 && \ @@ -212,7 +213,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 && \ @@ -273,12 +274,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-${FRIBIDI_VERSION}.tar.bz2 && \ + ./autogen.sh && \ make -j 1 && \ make install && \ rm -rf ${DIR} @@ -287,8 +286,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 && \ @@ -298,10 +297,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 c9eae51ac..630767b02 100644 --- a/docker-images/4.1/nvidia/Dockerfile +++ b/docker-images/4.1/nvidia/Dockerfile @@ -37,44 +37,43 @@ 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 \ 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" @@ -128,7 +127,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 && \ @@ -189,9 +188,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 && \ @@ -235,7 +234,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 && \ @@ -296,12 +295,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-${FRIBIDI_VERSION}.tar.bz2 && \ + ./autogen.sh && \ make -j 1 && \ make install && \ rm -rf ${DIR} @@ -310,8 +307,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 && \ @@ -321,10 +318,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 9095e4e41..c0d6c172b 100644 --- a/docker-images/4.1/scratch/Dockerfile +++ b/docker-images/4.1/scratch/Dockerfile @@ -15,44 +15,43 @@ 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 \ 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" @@ -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-${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/ubuntu/Dockerfile b/docker-images/4.1/ubuntu/Dockerfile index 8ae48139a..e705070e6 100644 --- a/docker-images/4.1/ubuntu/Dockerfile +++ b/docker-images/4.1/ubuntu/Dockerfile @@ -23,44 +23,43 @@ 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 \ 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" @@ -103,7 +102,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 && \ @@ -164,9 +163,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 && \ @@ -210,7 +209,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 && \ @@ -271,12 +270,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-${FRIBIDI_VERSION}.tar.bz2 && \ + ./autogen.sh && \ make -j 1 && \ make install && \ rm -rf ${DIR} @@ -285,8 +282,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 && \ @@ -296,10 +293,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 b2267c50d..0e940ba50 100644 --- a/docker-images/4.1/vaapi/Dockerfile +++ b/docker-images/4.1/vaapi/Dockerfile @@ -23,44 +23,43 @@ 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 \ 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" @@ -104,7 +103,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 && \ @@ -165,9 +164,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 && \ @@ -211,7 +210,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 && \ @@ -272,12 +271,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-${FRIBIDI_VERSION}.tar.bz2 && \ + ./autogen.sh && \ make -j 1 && \ make install && \ rm -rf ${DIR} @@ -286,8 +283,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 && \ @@ -297,10 +294,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 fd83dfbe1..b0b19fced 100644 --- a/docker-images/4.2/alpine/Dockerfile +++ b/docker-images/4.2/alpine/Dockerfile @@ -20,44 +20,43 @@ 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 \ 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" @@ -102,7 +101,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 && \ @@ -163,9 +162,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 && \ @@ -209,7 +208,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 && \ @@ -270,12 +269,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-${FRIBIDI_VERSION}.tar.bz2 && \ + ./autogen.sh && \ make -j 1 && \ make install && \ rm -rf ${DIR} @@ -284,8 +281,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 && \ @@ -295,10 +292,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 862a9c4f6..c9ec1b32a 100644 --- a/docker-images/4.2/centos/Dockerfile +++ b/docker-images/4.2/centos/Dockerfile @@ -22,44 +22,43 @@ 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 \ 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" @@ -71,6 +70,8 @@ RUN buildDeps="autoconf \ cmake \ diffutils \ expat-devel \ + fribidi \ + fribidi-devel \ gcc \ gcc-c++ \ git \ @@ -105,7 +106,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 && \ @@ -166,9 +167,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 && \ @@ -212,7 +213,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 && \ @@ -273,12 +274,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-${FRIBIDI_VERSION}.tar.bz2 && \ + ./autogen.sh && \ make -j 1 && \ make install && \ rm -rf ${DIR} @@ -287,8 +286,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 && \ @@ -298,10 +297,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 51643c5e0..16a84f6e7 100644 --- a/docker-images/4.2/nvidia/Dockerfile +++ b/docker-images/4.2/nvidia/Dockerfile @@ -37,44 +37,43 @@ 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 \ 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" @@ -128,7 +127,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 && \ @@ -189,9 +188,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 && \ @@ -235,7 +234,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 && \ @@ -296,12 +295,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-${FRIBIDI_VERSION}.tar.bz2 && \ + ./autogen.sh && \ make -j 1 && \ make install && \ rm -rf ${DIR} @@ -310,8 +307,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 && \ @@ -321,10 +318,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 701947240..78807e548 100644 --- a/docker-images/4.2/scratch/Dockerfile +++ b/docker-images/4.2/scratch/Dockerfile @@ -15,44 +15,43 @@ 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 \ 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" @@ -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-${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/ubuntu/Dockerfile b/docker-images/4.2/ubuntu/Dockerfile index 1363a25c8..f0c4bad02 100644 --- a/docker-images/4.2/ubuntu/Dockerfile +++ b/docker-images/4.2/ubuntu/Dockerfile @@ -23,44 +23,43 @@ 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 \ 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" @@ -103,7 +102,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 && \ @@ -164,9 +163,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 && \ @@ -210,7 +209,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 && \ @@ -271,12 +270,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-${FRIBIDI_VERSION}.tar.bz2 && \ + ./autogen.sh && \ make -j 1 && \ make install && \ rm -rf ${DIR} @@ -285,8 +282,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 && \ @@ -296,10 +293,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 c11debbbc..27f1509ff 100644 --- a/docker-images/4.2/vaapi/Dockerfile +++ b/docker-images/4.2/vaapi/Dockerfile @@ -23,44 +23,43 @@ 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 \ 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" @@ -104,7 +103,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 && \ @@ -165,9 +164,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 && \ @@ -211,7 +210,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 && \ @@ -272,12 +271,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-${FRIBIDI_VERSION}.tar.bz2 && \ + ./autogen.sh && \ make -j 1 && \ make install && \ rm -rf ${DIR} @@ -286,8 +283,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 && \ @@ -297,10 +294,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 42b26670f..6db46786b 100644 --- a/docker-images/snapshot/alpine/Dockerfile +++ b/docker-images/snapshot/alpine/Dockerfile @@ -20,44 +20,43 @@ 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 \ 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" @@ -102,7 +101,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 && \ @@ -163,9 +162,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 && \ @@ -209,7 +208,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 && \ @@ -270,12 +269,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-${FRIBIDI_VERSION}.tar.bz2 && \ + ./autogen.sh && \ make -j 1 && \ make install && \ rm -rf ${DIR} @@ -284,8 +281,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 && \ @@ -295,10 +292,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 0302ce5fa..f02d5d9e6 100644 --- a/docker-images/snapshot/centos/Dockerfile +++ b/docker-images/snapshot/centos/Dockerfile @@ -22,44 +22,43 @@ 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 \ 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" @@ -71,6 +70,8 @@ RUN buildDeps="autoconf \ cmake \ diffutils \ expat-devel \ + fribidi \ + fribidi-devel \ gcc \ gcc-c++ \ git \ @@ -105,7 +106,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 && \ @@ -166,9 +167,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 && \ @@ -212,7 +213,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 && \ @@ -273,12 +274,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-${FRIBIDI_VERSION}.tar.bz2 && \ + ./autogen.sh && \ make -j 1 && \ make install && \ rm -rf ${DIR} @@ -287,8 +286,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 && \ @@ -298,10 +297,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 a96440784..859dea2e8 100644 --- a/docker-images/snapshot/nvidia/Dockerfile +++ b/docker-images/snapshot/nvidia/Dockerfile @@ -37,44 +37,43 @@ 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 \ 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" @@ -128,7 +127,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 && \ @@ -189,9 +188,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 && \ @@ -235,7 +234,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 && \ @@ -296,12 +295,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-${FRIBIDI_VERSION}.tar.bz2 && \ + ./autogen.sh && \ make -j 1 && \ make install && \ rm -rf ${DIR} @@ -310,8 +307,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 && \ @@ -321,10 +318,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 264651219..019ba1a05 100644 --- a/docker-images/snapshot/scratch/Dockerfile +++ b/docker-images/snapshot/scratch/Dockerfile @@ -15,44 +15,43 @@ 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 \ 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" @@ -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-${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/ubuntu/Dockerfile b/docker-images/snapshot/ubuntu/Dockerfile index 61aa1572e..4db873140 100644 --- a/docker-images/snapshot/ubuntu/Dockerfile +++ b/docker-images/snapshot/ubuntu/Dockerfile @@ -23,44 +23,43 @@ 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 \ 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" @@ -103,7 +102,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 && \ @@ -164,9 +163,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 && \ @@ -210,7 +209,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 && \ @@ -271,12 +270,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-${FRIBIDI_VERSION}.tar.bz2 && \ + ./autogen.sh && \ make -j 1 && \ make install && \ rm -rf ${DIR} @@ -285,8 +282,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 && \ @@ -296,10 +293,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 0958719d6..c483d0979 100644 --- a/docker-images/snapshot/vaapi/Dockerfile +++ b/docker-images/snapshot/vaapi/Dockerfile @@ -23,44 +23,43 @@ 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 \ 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" @@ -104,7 +103,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 && \ @@ -165,9 +164,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 && \ @@ -211,7 +210,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 && \ @@ -272,12 +271,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-${FRIBIDI_VERSION}.tar.bz2 && \ + ./autogen.sh && \ make -j 1 && \ make install && \ rm -rf ${DIR} @@ -286,8 +283,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 && \ @@ -297,10 +294,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/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..945cc40b7 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-${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 && \ diff --git a/templates/Dockerfile-template.centos b/templates/Dockerfile-template.centos index 8c04e876c..2e46ccf3b 100644 --- a/templates/Dockerfile-template.centos +++ b/templates/Dockerfile-template.centos @@ -28,6 +28,8 @@ RUN buildDeps="autoconf \ cmake \ diffutils \ expat-devel \ + fribidi \ + fribidi-devel \ gcc \ gcc-c++ \ git \