diff --git a/docker-images/3.2/alpine38/Dockerfile b/docker-images/3.2/alpine38/Dockerfile index e192081a2..eb91f0879 100644 --- a/docker-images/3.2/alpine38/Dockerfile +++ b/docker-images/3.2/alpine38/Dockerfile @@ -14,40 +14,41 @@ FROM base AS build WORKDIR /tmp/workdir ENV FFMPEG_VERSION=3.2.15 \ - AOM_VERSION=v1.0.0 \ - FDKAAC_VERSION=0.1.5 \ - FONTCONFIG_VERSION=2.12.4 \ - FREETYPE_VERSION=2.10.4 \ - FRIBIDI_VERSION=0.19.7 \ - KVAZAAR_VERSION=2.0.0 \ - LAME_VERSION=3.100 \ - LIBASS_VERSION=0.13.7 \ - LIBPTHREAD_STUBS_VERSION=0.4 \ - LIBVIDSTAB_VERSION=1.1.0 \ - LIBXCB_VERSION=1.13.1 \ - XCBPROTO_VERSION=1.13 \ - OGG_VERSION=1.3.2 \ - OPENCOREAMR_VERSION=0.1.5 \ - OPUS_VERSION=1.2 \ - OPENJPEG_VERSION=2.1.2 \ - THEORA_VERSION=1.1.1 \ - VORBIS_VERSION=1.3.5 \ - VPX_VERSION=1.8.0 \ - WEBP_VERSION=1.0.2 \ - X264_VERSION=20170226-2245-stable \ - X265_VERSION=3.4 \ - XAU_VERSION=1.0.9 \ - XORG_MACROS_VERSION=1.19.2 \ - XPROTO_VERSION=7.0.31 \ - XVID_VERSION=1.3.4 \ - LIBXML2_VERSION=2.9.10 \ - LIBBLURAY_VERSION=1.1.2 \ - LIBZMQ_VERSION=4.3.2 \ - LIBSRT_VERSION=1.4.1 \ - LIBARIBB24_VERSION=1.0.3 \ - LIBPNG_VERSION=1.6.9 \ - LIBVMAF_VERSION=2.1.1 \ - SRC=/usr/local + AOM_VERSION=v1.0.0 \ + FDKAAC_VERSION=0.1.5 \ + FONTCONFIG_VERSION=2.12.4 \ + FREETYPE_VERSION=2.10.4 \ + FRIBIDI_VERSION=0.19.7 \ + KVAZAAR_VERSION=2.0.0 \ + LAME_VERSION=3.100 \ + LIBARIBB24_VERSION=1.0.3 \ + LIBASS_VERSION=0.13.7 \ + LIBBLURAY_VERSION=1.1.2 \ + LIBPNG_VERSION=1.6.9 \ + LIBPTHREAD_STUBS_VERSION=0.4 \ + LIBSRT_VERSION=1.4.1 \ + LIBVIDSTAB_VERSION=1.1.0 \ + LIBVMAF_VERSION=2.1.1 \ + LIBXCB_VERSION=1.13.1 \ + LIBXML2_VERSION=2.9.10 \ + LIBZMQ_VERSION=4.3.2 \ + OGG_VERSION=1.3.2 \ + OPENCOREAMR_VERSION=0.1.5 \ + OPENJPEG_VERSION=2.1.2 \ + OPUS_VERSION=1.2 \ + THEORA_VERSION=1.1.1 \ + VORBIS_VERSION=1.3.5 \ + VPX_VERSION=1.8.0 \ + WEBP_VERSION=1.0.2 \ + X264_VERSION=20170226-2245-stable \ + X265_VERSION=3.4 \ + XAU_VERSION=1.0.9 \ + XCBPROTO_VERSION=1.13 \ + XORG_MACROS_VERSION=1.19.2 \ + XPROTO_VERSION=7.0.31 \ + XVID_VERSION=1.3.4 \ + ZIMG_VERSION=3.0.3 \ + SRC=/usr/local ARG FREETYPE_SHA256SUM="5eab795ebb23ac77001cfb68b7d4d50b5d6c7469247b0b01b2c953269f658dac freetype-2.10.4.tar.gz" ARG FRIBIDI_SHA256SUM="3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 0.19.7.tar.gz" @@ -95,24 +96,39 @@ RUN buildDeps="autoconf \ zlib-dev \ expat-dev" && \ apk add --no-cache --update ${buildDeps} +# zimg https://github.com/sekrit-twc/zimg +RUN \ + DIR=/tmp/zimg && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://github.com/sekrit-twc/zimg/archive/refs/tags/release-${ZIMG_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + ./autogen.sh && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} + + + ## libvmaf https://github.com/Netflix/vmaf RUN \ if which meson || false; then \ - echo "Building VMAF." && \ - DIR=/tmp/vmaf && \ - mkdir -p ${DIR} && \ - cd ${DIR} && \ - curl -sLO https://github.com/Netflix/vmaf/archive/v${LIBVMAF_VERSION}.tar.gz && \ - tar -xz --strip-components=1 -f v${LIBVMAF_VERSION}.tar.gz && \ - cd /tmp/vmaf/libvmaf && \ - meson build --buildtype release --prefix=${PREFIX} && \ - ninja -vC build && \ - ninja -vC build install && \ - mkdir -p ${PREFIX}/share/model/ && \ - cp -r /tmp/vmaf/model/* ${PREFIX}/share/model/ && \ - rm -rf ${DIR}; \ + echo "Building VMAF." && \ + DIR=/tmp/vmaf && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/Netflix/vmaf/archive/v${LIBVMAF_VERSION}.tar.gz && \ + tar -xz --strip-components=1 -f v${LIBVMAF_VERSION}.tar.gz && \ + cd /tmp/vmaf/libvmaf && \ + meson build --buildtype release --prefix=${PREFIX} && \ + ninja -vC build && \ + ninja -vC build install && \ + mkdir -p ${PREFIX}/share/model/ && \ + cp -r /tmp/vmaf/model/* ${PREFIX}/share/model/ && \ + rm -rf ${DIR}; \ else \ - echo "VMAF skipped."; \ + echo "VMAF skipped."; \ fi ## opencore-amr https://sourceforge.net/projects/opencore-amr/ @@ -518,40 +534,41 @@ RUN \ --disable-debug \ --disable-doc \ --disable-ffplay \ - --enable-shared \ --enable-avresample \ - --enable-libopencore-amrnb \ - --enable-libopencore-amrwb \ + --enable-fontconfig \ --enable-gpl \ --enable-libass \ - --enable-fontconfig \ + --enable-libbluray \ + --enable-libfdk_aac \ --enable-libfreetype \ - --enable-libvidstab \ --enable-libmp3lame \ + --enable-libopencore-amrnb \ + --enable-libopencore-amrwb \ --enable-libopus \ --enable-libtheora \ + --enable-libvidstab \ --enable-libvorbis \ --enable-libvpx \ --enable-libwebp \ - --enable-libxcb \ + --enable-libx264 \ --enable-libx265 \ + --enable-libxcb \ --enable-libxvid \ - --enable-libx264 \ + --enable-libzmq \ --enable-nonfree \ --enable-openssl \ - --enable-libfdk_aac \ --enable-postproc \ + --enable-shared \ --enable-small \ --enable-version3 \ - --enable-libbluray \ - --enable-libzmq \ + --enable-zimg \ --extra-libs=-ldl \ --prefix="${PREFIX}" \ --enable-libopenjpeg \ --enable-libkvazaar \ --extra-cflags="-I${PREFIX}/include" \ --extra-ldflags="-L${PREFIX}/lib" && \ - make && \ +make && \ make install && \ make tools/zmqsend && cp tools/zmqsend ${PREFIX}/bin/ && \ make distclean && \ diff --git a/docker-images/3.2/centos7/Dockerfile b/docker-images/3.2/centos7/Dockerfile index e218f8d3b..c830ab1d0 100644 --- a/docker-images/3.2/centos7/Dockerfile +++ b/docker-images/3.2/centos7/Dockerfile @@ -16,40 +16,41 @@ FROM base AS build WORKDIR /tmp/workdir ENV FFMPEG_VERSION=3.2.15 \ - AOM_VERSION=v1.0.0 \ - FDKAAC_VERSION=0.1.5 \ - FONTCONFIG_VERSION=2.12.4 \ - FREETYPE_VERSION=2.10.4 \ - FRIBIDI_VERSION=0.19.7 \ - KVAZAAR_VERSION=2.0.0 \ - LAME_VERSION=3.100 \ - LIBASS_VERSION=0.13.7 \ - LIBPTHREAD_STUBS_VERSION=0.4 \ - LIBVIDSTAB_VERSION=1.1.0 \ - LIBXCB_VERSION=1.13.1 \ - XCBPROTO_VERSION=1.13 \ - OGG_VERSION=1.3.2 \ - OPENCOREAMR_VERSION=0.1.5 \ - OPUS_VERSION=1.2 \ - OPENJPEG_VERSION=2.1.2 \ - THEORA_VERSION=1.1.1 \ - VORBIS_VERSION=1.3.5 \ - VPX_VERSION=1.8.0 \ - WEBP_VERSION=1.0.2 \ - X264_VERSION=20170226-2245-stable \ - X265_VERSION=3.4 \ - XAU_VERSION=1.0.9 \ - XORG_MACROS_VERSION=1.19.2 \ - XPROTO_VERSION=7.0.31 \ - XVID_VERSION=1.3.4 \ - LIBXML2_VERSION=2.9.10 \ - LIBBLURAY_VERSION=1.1.2 \ - LIBZMQ_VERSION=4.3.2 \ - LIBSRT_VERSION=1.4.1 \ - LIBARIBB24_VERSION=1.0.3 \ - LIBPNG_VERSION=1.6.9 \ - LIBVMAF_VERSION=2.1.1 \ - SRC=/usr/local + AOM_VERSION=v1.0.0 \ + FDKAAC_VERSION=0.1.5 \ + FONTCONFIG_VERSION=2.12.4 \ + FREETYPE_VERSION=2.10.4 \ + FRIBIDI_VERSION=0.19.7 \ + KVAZAAR_VERSION=2.0.0 \ + LAME_VERSION=3.100 \ + LIBARIBB24_VERSION=1.0.3 \ + LIBASS_VERSION=0.13.7 \ + LIBBLURAY_VERSION=1.1.2 \ + LIBPNG_VERSION=1.6.9 \ + LIBPTHREAD_STUBS_VERSION=0.4 \ + LIBSRT_VERSION=1.4.1 \ + LIBVIDSTAB_VERSION=1.1.0 \ + LIBVMAF_VERSION=2.1.1 \ + LIBXCB_VERSION=1.13.1 \ + LIBXML2_VERSION=2.9.10 \ + LIBZMQ_VERSION=4.3.2 \ + OGG_VERSION=1.3.2 \ + OPENCOREAMR_VERSION=0.1.5 \ + OPENJPEG_VERSION=2.1.2 \ + OPUS_VERSION=1.2 \ + THEORA_VERSION=1.1.1 \ + VORBIS_VERSION=1.3.5 \ + VPX_VERSION=1.8.0 \ + WEBP_VERSION=1.0.2 \ + X264_VERSION=20170226-2245-stable \ + X265_VERSION=3.4 \ + XAU_VERSION=1.0.9 \ + XCBPROTO_VERSION=1.13 \ + XORG_MACROS_VERSION=1.19.2 \ + XPROTO_VERSION=7.0.31 \ + XVID_VERSION=1.3.4 \ + ZIMG_VERSION=3.0.3 \ + SRC=/usr/local ARG FREETYPE_SHA256SUM="5eab795ebb23ac77001cfb68b7d4d50b5d6c7469247b0b01b2c953269f658dac freetype-2.10.4.tar.gz" ARG FRIBIDI_SHA256SUM="3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 0.19.7.tar.gz" @@ -132,24 +133,39 @@ RUN buildDeps="autoconf \ yum history undo $(yum history info | grep 'Transaction ID' | awk -F: '{print$2}' | tr -d ' ') -y && \ yum autoremove -y +# zimg https://github.com/sekrit-twc/zimg +RUN \ + DIR=/tmp/zimg && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://github.com/sekrit-twc/zimg/archive/refs/tags/release-${ZIMG_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + ./autogen.sh && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} + + + ## libvmaf https://github.com/Netflix/vmaf RUN \ if which meson || false; then \ - echo "Building VMAF." && \ - DIR=/tmp/vmaf && \ - mkdir -p ${DIR} && \ - cd ${DIR} && \ - curl -sLO https://github.com/Netflix/vmaf/archive/v${LIBVMAF_VERSION}.tar.gz && \ - tar -xz --strip-components=1 -f v${LIBVMAF_VERSION}.tar.gz && \ - cd /tmp/vmaf/libvmaf && \ - meson build --buildtype release --prefix=${PREFIX} && \ - ninja -vC build && \ - ninja -vC build install && \ - mkdir -p ${PREFIX}/share/model/ && \ - cp -r /tmp/vmaf/model/* ${PREFIX}/share/model/ && \ - rm -rf ${DIR}; \ + echo "Building VMAF." && \ + DIR=/tmp/vmaf && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/Netflix/vmaf/archive/v${LIBVMAF_VERSION}.tar.gz && \ + tar -xz --strip-components=1 -f v${LIBVMAF_VERSION}.tar.gz && \ + cd /tmp/vmaf/libvmaf && \ + meson build --buildtype release --prefix=${PREFIX} && \ + ninja -vC build && \ + ninja -vC build install && \ + mkdir -p ${PREFIX}/share/model/ && \ + cp -r /tmp/vmaf/model/* ${PREFIX}/share/model/ && \ + rm -rf ${DIR}; \ else \ - echo "VMAF skipped."; \ + echo "VMAF skipped."; \ fi ## opencore-amr https://sourceforge.net/projects/opencore-amr/ @@ -555,40 +571,41 @@ RUN \ --disable-debug \ --disable-doc \ --disable-ffplay \ - --enable-shared \ --enable-avresample \ - --enable-libopencore-amrnb \ - --enable-libopencore-amrwb \ + --enable-fontconfig \ --enable-gpl \ --enable-libass \ - --enable-fontconfig \ + --enable-libbluray \ + --enable-libfdk_aac \ --enable-libfreetype \ - --enable-libvidstab \ --enable-libmp3lame \ + --enable-libopencore-amrnb \ + --enable-libopencore-amrwb \ --enable-libopus \ --enable-libtheora \ + --enable-libvidstab \ --enable-libvorbis \ --enable-libvpx \ --enable-libwebp \ - --enable-libxcb \ + --enable-libx264 \ --enable-libx265 \ + --enable-libxcb \ --enable-libxvid \ - --enable-libx264 \ + --enable-libzmq \ --enable-nonfree \ --enable-openssl \ - --enable-libfdk_aac \ --enable-postproc \ + --enable-shared \ --enable-small \ --enable-version3 \ - --enable-libbluray \ - --enable-libzmq \ + --enable-zimg \ --extra-libs=-ldl \ --prefix="${PREFIX}" \ --enable-libopenjpeg \ --enable-libkvazaar \ --extra-cflags="-I${PREFIX}/include" \ --extra-ldflags="-L${PREFIX}/lib" && \ - make && \ +make && \ make install && \ make tools/zmqsend && cp tools/zmqsend ${PREFIX}/bin/ && \ make distclean && \ diff --git a/docker-images/3.2/scratch38/Dockerfile b/docker-images/3.2/scratch38/Dockerfile index fda536387..9db81737b 100644 --- a/docker-images/3.2/scratch38/Dockerfile +++ b/docker-images/3.2/scratch38/Dockerfile @@ -9,40 +9,41 @@ FROM alpine:3.8 AS build WORKDIR /tmp/workdir ENV FFMPEG_VERSION=3.2.15 \ - AOM_VERSION=v1.0.0 \ - FDKAAC_VERSION=0.1.5 \ - FONTCONFIG_VERSION=2.12.4 \ - FREETYPE_VERSION=2.10.4 \ - FRIBIDI_VERSION=0.19.7 \ - KVAZAAR_VERSION=2.0.0 \ - LAME_VERSION=3.100 \ - LIBASS_VERSION=0.13.7 \ - LIBPTHREAD_STUBS_VERSION=0.4 \ - LIBVIDSTAB_VERSION=1.1.0 \ - LIBXCB_VERSION=1.13.1 \ - XCBPROTO_VERSION=1.13 \ - OGG_VERSION=1.3.2 \ - OPENCOREAMR_VERSION=0.1.5 \ - OPUS_VERSION=1.2 \ - OPENJPEG_VERSION=2.1.2 \ - THEORA_VERSION=1.1.1 \ - VORBIS_VERSION=1.3.5 \ - VPX_VERSION=1.8.0 \ - WEBP_VERSION=1.0.2 \ - X264_VERSION=20170226-2245-stable \ - X265_VERSION=3.4 \ - XAU_VERSION=1.0.9 \ - XORG_MACROS_VERSION=1.19.2 \ - XPROTO_VERSION=7.0.31 \ - XVID_VERSION=1.3.4 \ - LIBXML2_VERSION=2.9.10 \ - LIBBLURAY_VERSION=1.1.2 \ - LIBZMQ_VERSION=4.3.2 \ - LIBSRT_VERSION=1.4.1 \ - LIBARIBB24_VERSION=1.0.3 \ - LIBPNG_VERSION=1.6.9 \ - LIBVMAF_VERSION=2.1.1 \ - SRC=/usr/local + AOM_VERSION=v1.0.0 \ + FDKAAC_VERSION=0.1.5 \ + FONTCONFIG_VERSION=2.12.4 \ + FREETYPE_VERSION=2.10.4 \ + FRIBIDI_VERSION=0.19.7 \ + KVAZAAR_VERSION=2.0.0 \ + LAME_VERSION=3.100 \ + LIBARIBB24_VERSION=1.0.3 \ + LIBASS_VERSION=0.13.7 \ + LIBBLURAY_VERSION=1.1.2 \ + LIBPNG_VERSION=1.6.9 \ + LIBPTHREAD_STUBS_VERSION=0.4 \ + LIBSRT_VERSION=1.4.1 \ + LIBVIDSTAB_VERSION=1.1.0 \ + LIBVMAF_VERSION=2.1.1 \ + LIBXCB_VERSION=1.13.1 \ + LIBXML2_VERSION=2.9.10 \ + LIBZMQ_VERSION=4.3.2 \ + OGG_VERSION=1.3.2 \ + OPENCOREAMR_VERSION=0.1.5 \ + OPENJPEG_VERSION=2.1.2 \ + OPUS_VERSION=1.2 \ + THEORA_VERSION=1.1.1 \ + VORBIS_VERSION=1.3.5 \ + VPX_VERSION=1.8.0 \ + WEBP_VERSION=1.0.2 \ + X264_VERSION=20170226-2245-stable \ + X265_VERSION=3.4 \ + XAU_VERSION=1.0.9 \ + XCBPROTO_VERSION=1.13 \ + XORG_MACROS_VERSION=1.19.2 \ + XPROTO_VERSION=7.0.31 \ + XVID_VERSION=1.3.4 \ + ZIMG_VERSION=3.0.3 \ + SRC=/usr/local ARG FREETYPE_SHA256SUM="5eab795ebb23ac77001cfb68b7d4d50b5d6c7469247b0b01b2c953269f658dac freetype-2.10.4.tar.gz" ARG FRIBIDI_SHA256SUM="3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 0.19.7.tar.gz" @@ -97,24 +98,39 @@ RUN buildDeps="autoconf \ libssl1.0" && \ apk add --update ${buildDeps} +# zimg https://github.com/sekrit-twc/zimg +RUN \ + DIR=/tmp/zimg && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://github.com/sekrit-twc/zimg/archive/refs/tags/release-${ZIMG_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + ./autogen.sh && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} + + + ## libvmaf https://github.com/Netflix/vmaf RUN \ if which meson || false; then \ - echo "Building VMAF." && \ - DIR=/tmp/vmaf && \ - mkdir -p ${DIR} && \ - cd ${DIR} && \ - curl -sLO https://github.com/Netflix/vmaf/archive/v${LIBVMAF_VERSION}.tar.gz && \ - tar -xz --strip-components=1 -f v${LIBVMAF_VERSION}.tar.gz && \ - cd /tmp/vmaf/libvmaf && \ - meson build --buildtype release --prefix=${PREFIX} && \ - ninja -vC build && \ - ninja -vC build install && \ - mkdir -p ${PREFIX}/share/model/ && \ - cp -r /tmp/vmaf/model/* ${PREFIX}/share/model/ && \ - rm -rf ${DIR}; \ + echo "Building VMAF." && \ + DIR=/tmp/vmaf && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/Netflix/vmaf/archive/v${LIBVMAF_VERSION}.tar.gz && \ + tar -xz --strip-components=1 -f v${LIBVMAF_VERSION}.tar.gz && \ + cd /tmp/vmaf/libvmaf && \ + meson build --buildtype release --prefix=${PREFIX} && \ + ninja -vC build && \ + ninja -vC build install && \ + mkdir -p ${PREFIX}/share/model/ && \ + cp -r /tmp/vmaf/model/* ${PREFIX}/share/model/ && \ + rm -rf ${DIR}; \ else \ - echo "VMAF skipped."; \ + echo "VMAF skipped."; \ fi ## opencore-amr https://sourceforge.net/projects/opencore-amr/ @@ -520,40 +536,41 @@ RUN \ --disable-debug \ --disable-doc \ --disable-ffplay \ - --enable-shared \ --enable-avresample \ - --enable-libopencore-amrnb \ - --enable-libopencore-amrwb \ + --enable-fontconfig \ --enable-gpl \ --enable-libass \ - --enable-fontconfig \ + --enable-libbluray \ + --enable-libfdk_aac \ --enable-libfreetype \ - --enable-libvidstab \ --enable-libmp3lame \ + --enable-libopencore-amrnb \ + --enable-libopencore-amrwb \ --enable-libopus \ --enable-libtheora \ + --enable-libvidstab \ --enable-libvorbis \ --enable-libvpx \ --enable-libwebp \ - --enable-libxcb \ + --enable-libx264 \ --enable-libx265 \ + --enable-libxcb \ --enable-libxvid \ - --enable-libx264 \ + --enable-libzmq \ --enable-nonfree \ --enable-openssl \ - --enable-libfdk_aac \ --enable-postproc \ + --enable-shared \ --enable-small \ --enable-version3 \ - --enable-libbluray \ - --enable-libzmq \ + --enable-zimg \ --extra-libs=-ldl \ --prefix="${PREFIX}" \ --enable-libopenjpeg \ --enable-libkvazaar \ --extra-cflags="-I${PREFIX}/include" \ --extra-ldflags="-L${PREFIX}/lib" && \ - make && \ +make && \ make install && \ make tools/zmqsend && cp tools/zmqsend ${PREFIX}/bin/ && \ make distclean && \ diff --git a/docker-images/3.2/ubuntu2004/Dockerfile b/docker-images/3.2/ubuntu2004/Dockerfile index bf7e75225..43e3631c1 100644 --- a/docker-images/3.2/ubuntu2004/Dockerfile +++ b/docker-images/3.2/ubuntu2004/Dockerfile @@ -17,40 +17,41 @@ RUN apt-get -yqq update && \ FROM base as build ENV FFMPEG_VERSION=3.2.15 \ - AOM_VERSION=v1.0.0 \ - FDKAAC_VERSION=0.1.5 \ - FONTCONFIG_VERSION=2.12.4 \ - FREETYPE_VERSION=2.10.4 \ - FRIBIDI_VERSION=0.19.7 \ - KVAZAAR_VERSION=2.0.0 \ - LAME_VERSION=3.100 \ - LIBASS_VERSION=0.13.7 \ - LIBPTHREAD_STUBS_VERSION=0.4 \ - LIBVIDSTAB_VERSION=1.1.0 \ - LIBXCB_VERSION=1.13.1 \ - XCBPROTO_VERSION=1.13 \ - OGG_VERSION=1.3.2 \ - OPENCOREAMR_VERSION=0.1.5 \ - OPUS_VERSION=1.2 \ - OPENJPEG_VERSION=2.1.2 \ - THEORA_VERSION=1.1.1 \ - VORBIS_VERSION=1.3.5 \ - VPX_VERSION=1.8.0 \ - WEBP_VERSION=1.0.2 \ - X264_VERSION=20170226-2245-stable \ - X265_VERSION=3.4 \ - XAU_VERSION=1.0.9 \ - XORG_MACROS_VERSION=1.19.2 \ - XPROTO_VERSION=7.0.31 \ - XVID_VERSION=1.3.4 \ - LIBXML2_VERSION=2.9.10 \ - LIBBLURAY_VERSION=1.1.2 \ - LIBZMQ_VERSION=4.3.2 \ - LIBSRT_VERSION=1.4.1 \ - LIBARIBB24_VERSION=1.0.3 \ - LIBPNG_VERSION=1.6.9 \ - LIBVMAF_VERSION=2.1.1 \ - SRC=/usr/local + AOM_VERSION=v1.0.0 \ + FDKAAC_VERSION=0.1.5 \ + FONTCONFIG_VERSION=2.12.4 \ + FREETYPE_VERSION=2.10.4 \ + FRIBIDI_VERSION=0.19.7 \ + KVAZAAR_VERSION=2.0.0 \ + LAME_VERSION=3.100 \ + LIBARIBB24_VERSION=1.0.3 \ + LIBASS_VERSION=0.13.7 \ + LIBBLURAY_VERSION=1.1.2 \ + LIBPNG_VERSION=1.6.9 \ + LIBPTHREAD_STUBS_VERSION=0.4 \ + LIBSRT_VERSION=1.4.1 \ + LIBVIDSTAB_VERSION=1.1.0 \ + LIBVMAF_VERSION=2.1.1 \ + LIBXCB_VERSION=1.13.1 \ + LIBXML2_VERSION=2.9.10 \ + LIBZMQ_VERSION=4.3.2 \ + OGG_VERSION=1.3.2 \ + OPENCOREAMR_VERSION=0.1.5 \ + OPENJPEG_VERSION=2.1.2 \ + OPUS_VERSION=1.2 \ + THEORA_VERSION=1.1.1 \ + VORBIS_VERSION=1.3.5 \ + VPX_VERSION=1.8.0 \ + WEBP_VERSION=1.0.2 \ + X264_VERSION=20170226-2245-stable \ + X265_VERSION=3.4 \ + XAU_VERSION=1.0.9 \ + XCBPROTO_VERSION=1.13 \ + XORG_MACROS_VERSION=1.19.2 \ + XPROTO_VERSION=7.0.31 \ + XVID_VERSION=1.3.4 \ + ZIMG_VERSION=3.0.3 \ + SRC=/usr/local ARG FREETYPE_SHA256SUM="5eab795ebb23ac77001cfb68b7d4d50b5d6c7469247b0b01b2c953269f658dac freetype-2.10.4.tar.gz" ARG FRIBIDI_SHA256SUM="3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 0.19.7.tar.gz" @@ -99,24 +100,39 @@ RUN buildDeps="autoconf \ zlib1g-dev" && \ apt-get -yqq update && \ apt-get install -yq --no-install-recommends ${buildDeps} +# zimg https://github.com/sekrit-twc/zimg +RUN \ + DIR=/tmp/zimg && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://github.com/sekrit-twc/zimg/archive/refs/tags/release-${ZIMG_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + ./autogen.sh && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} + + + ## libvmaf https://github.com/Netflix/vmaf RUN \ if which meson || false; then \ - echo "Building VMAF." && \ - DIR=/tmp/vmaf && \ - mkdir -p ${DIR} && \ - cd ${DIR} && \ - curl -sLO https://github.com/Netflix/vmaf/archive/v${LIBVMAF_VERSION}.tar.gz && \ - tar -xz --strip-components=1 -f v${LIBVMAF_VERSION}.tar.gz && \ - cd /tmp/vmaf/libvmaf && \ - meson build --buildtype release --prefix=${PREFIX} && \ - ninja -vC build && \ - ninja -vC build install && \ - mkdir -p ${PREFIX}/share/model/ && \ - cp -r /tmp/vmaf/model/* ${PREFIX}/share/model/ && \ - rm -rf ${DIR}; \ + echo "Building VMAF." && \ + DIR=/tmp/vmaf && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/Netflix/vmaf/archive/v${LIBVMAF_VERSION}.tar.gz && \ + tar -xz --strip-components=1 -f v${LIBVMAF_VERSION}.tar.gz && \ + cd /tmp/vmaf/libvmaf && \ + meson build --buildtype release --prefix=${PREFIX} && \ + ninja -vC build && \ + ninja -vC build install && \ + mkdir -p ${PREFIX}/share/model/ && \ + cp -r /tmp/vmaf/model/* ${PREFIX}/share/model/ && \ + rm -rf ${DIR}; \ else \ - echo "VMAF skipped."; \ + echo "VMAF skipped."; \ fi ## opencore-amr https://sourceforge.net/projects/opencore-amr/ @@ -522,40 +538,41 @@ RUN \ --disable-debug \ --disable-doc \ --disable-ffplay \ - --enable-shared \ --enable-avresample \ - --enable-libopencore-amrnb \ - --enable-libopencore-amrwb \ + --enable-fontconfig \ --enable-gpl \ --enable-libass \ - --enable-fontconfig \ + --enable-libbluray \ + --enable-libfdk_aac \ --enable-libfreetype \ - --enable-libvidstab \ --enable-libmp3lame \ + --enable-libopencore-amrnb \ + --enable-libopencore-amrwb \ --enable-libopus \ --enable-libtheora \ + --enable-libvidstab \ --enable-libvorbis \ --enable-libvpx \ --enable-libwebp \ - --enable-libxcb \ + --enable-libx264 \ --enable-libx265 \ + --enable-libxcb \ --enable-libxvid \ - --enable-libx264 \ + --enable-libzmq \ --enable-nonfree \ --enable-openssl \ - --enable-libfdk_aac \ --enable-postproc \ + --enable-shared \ --enable-small \ --enable-version3 \ - --enable-libbluray \ - --enable-libzmq \ + --enable-zimg \ --extra-libs=-ldl \ --prefix="${PREFIX}" \ --enable-libopenjpeg \ --enable-libkvazaar \ --extra-cflags="-I${PREFIX}/include" \ --extra-ldflags="-L${PREFIX}/lib" && \ - make && \ +make && \ make install && \ make tools/zmqsend && cp tools/zmqsend ${PREFIX}/bin/ && \ make distclean && \ diff --git a/docker-images/3.2/vaapi2004/Dockerfile b/docker-images/3.2/vaapi2004/Dockerfile index 54f7a233c..1303f5118 100644 --- a/docker-images/3.2/vaapi2004/Dockerfile +++ b/docker-images/3.2/vaapi2004/Dockerfile @@ -17,40 +17,41 @@ RUN apt-get -yqq update && \ FROM base as build ENV FFMPEG_VERSION=3.2.15 \ - AOM_VERSION=v1.0.0 \ - FDKAAC_VERSION=0.1.5 \ - FONTCONFIG_VERSION=2.12.4 \ - FREETYPE_VERSION=2.10.4 \ - FRIBIDI_VERSION=0.19.7 \ - KVAZAAR_VERSION=2.0.0 \ - LAME_VERSION=3.100 \ - LIBASS_VERSION=0.13.7 \ - LIBPTHREAD_STUBS_VERSION=0.4 \ - LIBVIDSTAB_VERSION=1.1.0 \ - LIBXCB_VERSION=1.13.1 \ - XCBPROTO_VERSION=1.13 \ - OGG_VERSION=1.3.2 \ - OPENCOREAMR_VERSION=0.1.5 \ - OPUS_VERSION=1.2 \ - OPENJPEG_VERSION=2.1.2 \ - THEORA_VERSION=1.1.1 \ - VORBIS_VERSION=1.3.5 \ - VPX_VERSION=1.8.0 \ - WEBP_VERSION=1.0.2 \ - X264_VERSION=20170226-2245-stable \ - X265_VERSION=3.4 \ - XAU_VERSION=1.0.9 \ - XORG_MACROS_VERSION=1.19.2 \ - XPROTO_VERSION=7.0.31 \ - XVID_VERSION=1.3.4 \ - LIBXML2_VERSION=2.9.10 \ - LIBBLURAY_VERSION=1.1.2 \ - LIBZMQ_VERSION=4.3.2 \ - LIBSRT_VERSION=1.4.1 \ - LIBARIBB24_VERSION=1.0.3 \ - LIBPNG_VERSION=1.6.9 \ - LIBVMAF_VERSION=2.1.1 \ - SRC=/usr/local + AOM_VERSION=v1.0.0 \ + FDKAAC_VERSION=0.1.5 \ + FONTCONFIG_VERSION=2.12.4 \ + FREETYPE_VERSION=2.10.4 \ + FRIBIDI_VERSION=0.19.7 \ + KVAZAAR_VERSION=2.0.0 \ + LAME_VERSION=3.100 \ + LIBARIBB24_VERSION=1.0.3 \ + LIBASS_VERSION=0.13.7 \ + LIBBLURAY_VERSION=1.1.2 \ + LIBPNG_VERSION=1.6.9 \ + LIBPTHREAD_STUBS_VERSION=0.4 \ + LIBSRT_VERSION=1.4.1 \ + LIBVIDSTAB_VERSION=1.1.0 \ + LIBVMAF_VERSION=2.1.1 \ + LIBXCB_VERSION=1.13.1 \ + LIBXML2_VERSION=2.9.10 \ + LIBZMQ_VERSION=4.3.2 \ + OGG_VERSION=1.3.2 \ + OPENCOREAMR_VERSION=0.1.5 \ + OPENJPEG_VERSION=2.1.2 \ + OPUS_VERSION=1.2 \ + THEORA_VERSION=1.1.1 \ + VORBIS_VERSION=1.3.5 \ + VPX_VERSION=1.8.0 \ + WEBP_VERSION=1.0.2 \ + X264_VERSION=20170226-2245-stable \ + X265_VERSION=3.4 \ + XAU_VERSION=1.0.9 \ + XCBPROTO_VERSION=1.13 \ + XORG_MACROS_VERSION=1.19.2 \ + XPROTO_VERSION=7.0.31 \ + XVID_VERSION=1.3.4 \ + ZIMG_VERSION=3.0.3 \ + SRC=/usr/local ARG FREETYPE_SHA256SUM="5eab795ebb23ac77001cfb68b7d4d50b5d6c7469247b0b01b2c953269f658dac freetype-2.10.4.tar.gz" ARG FRIBIDI_SHA256SUM="3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 0.19.7.tar.gz" @@ -100,24 +101,39 @@ RUN buildDeps="autoconf \ zlib1g-dev" && \ apt-get -yqq update && \ apt-get install -yq --no-install-recommends ${buildDeps} +# zimg https://github.com/sekrit-twc/zimg +RUN \ + DIR=/tmp/zimg && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://github.com/sekrit-twc/zimg/archive/refs/tags/release-${ZIMG_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + ./autogen.sh && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} + + + ## libvmaf https://github.com/Netflix/vmaf RUN \ if which meson || false; then \ - echo "Building VMAF." && \ - DIR=/tmp/vmaf && \ - mkdir -p ${DIR} && \ - cd ${DIR} && \ - curl -sLO https://github.com/Netflix/vmaf/archive/v${LIBVMAF_VERSION}.tar.gz && \ - tar -xz --strip-components=1 -f v${LIBVMAF_VERSION}.tar.gz && \ - cd /tmp/vmaf/libvmaf && \ - meson build --buildtype release --prefix=${PREFIX} && \ - ninja -vC build && \ - ninja -vC build install && \ - mkdir -p ${PREFIX}/share/model/ && \ - cp -r /tmp/vmaf/model/* ${PREFIX}/share/model/ && \ - rm -rf ${DIR}; \ + echo "Building VMAF." && \ + DIR=/tmp/vmaf && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/Netflix/vmaf/archive/v${LIBVMAF_VERSION}.tar.gz && \ + tar -xz --strip-components=1 -f v${LIBVMAF_VERSION}.tar.gz && \ + cd /tmp/vmaf/libvmaf && \ + meson build --buildtype release --prefix=${PREFIX} && \ + ninja -vC build && \ + ninja -vC build install && \ + mkdir -p ${PREFIX}/share/model/ && \ + cp -r /tmp/vmaf/model/* ${PREFIX}/share/model/ && \ + rm -rf ${DIR}; \ else \ - echo "VMAF skipped."; \ + echo "VMAF skipped."; \ fi ## opencore-amr https://sourceforge.net/projects/opencore-amr/ @@ -523,33 +539,34 @@ RUN \ --disable-debug \ --disable-doc \ --disable-ffplay \ - --enable-shared \ --enable-avresample \ - --enable-libopencore-amrnb \ - --enable-libopencore-amrwb \ + --enable-fontconfig \ --enable-gpl \ --enable-libass \ - --enable-fontconfig \ + --enable-libbluray \ + --enable-libfdk_aac \ --enable-libfreetype \ - --enable-libvidstab \ --enable-libmp3lame \ + --enable-libopencore-amrnb \ + --enable-libopencore-amrwb \ --enable-libopus \ --enable-libtheora \ + --enable-libvidstab \ --enable-libvorbis \ --enable-libvpx \ --enable-libwebp \ - --enable-libxcb \ + --enable-libx264 \ --enable-libx265 \ + --enable-libxcb \ --enable-libxvid \ - --enable-libx264 \ + --enable-libzmq \ --enable-nonfree \ --enable-openssl \ - --enable-libfdk_aac \ --enable-postproc \ + --enable-shared \ --enable-small \ --enable-version3 \ - --enable-libbluray \ - --enable-libzmq \ + --enable-zimg \ --extra-libs=-ldl \ --prefix="${PREFIX}" \ --enable-libopenjpeg \ @@ -557,7 +574,7 @@ RUN \ --enable-vaapi \ --extra-cflags="-I${PREFIX}/include" \ --extra-ldflags="-L${PREFIX}/lib" && \ - make && \ +make && \ make install && \ make tools/zmqsend && cp tools/zmqsend ${PREFIX}/bin/ && \ make distclean && \ diff --git a/docker-images/3.3/alpine312/Dockerfile b/docker-images/3.3/alpine312/Dockerfile index 37b63e48c..e15dc709b 100644 --- a/docker-images/3.3/alpine312/Dockerfile +++ b/docker-images/3.3/alpine312/Dockerfile @@ -14,40 +14,41 @@ FROM base AS build WORKDIR /tmp/workdir ENV FFMPEG_VERSION=3.3.9 \ - AOM_VERSION=v1.0.0 \ - FDKAAC_VERSION=0.1.5 \ - FONTCONFIG_VERSION=2.12.4 \ - FREETYPE_VERSION=2.10.4 \ - FRIBIDI_VERSION=0.19.7 \ - KVAZAAR_VERSION=2.0.0 \ - LAME_VERSION=3.100 \ - LIBASS_VERSION=0.13.7 \ - LIBPTHREAD_STUBS_VERSION=0.4 \ - LIBVIDSTAB_VERSION=1.1.0 \ - LIBXCB_VERSION=1.13.1 \ - XCBPROTO_VERSION=1.13 \ - OGG_VERSION=1.3.2 \ - OPENCOREAMR_VERSION=0.1.5 \ - OPUS_VERSION=1.2 \ - OPENJPEG_VERSION=2.1.2 \ - THEORA_VERSION=1.1.1 \ - VORBIS_VERSION=1.3.5 \ - VPX_VERSION=1.8.0 \ - WEBP_VERSION=1.0.2 \ - X264_VERSION=20170226-2245-stable \ - X265_VERSION=3.4 \ - XAU_VERSION=1.0.9 \ - XORG_MACROS_VERSION=1.19.2 \ - XPROTO_VERSION=7.0.31 \ - XVID_VERSION=1.3.4 \ - LIBXML2_VERSION=2.9.10 \ - LIBBLURAY_VERSION=1.1.2 \ - LIBZMQ_VERSION=4.3.2 \ - LIBSRT_VERSION=1.4.1 \ - LIBARIBB24_VERSION=1.0.3 \ - LIBPNG_VERSION=1.6.9 \ - LIBVMAF_VERSION=2.1.1 \ - SRC=/usr/local + AOM_VERSION=v1.0.0 \ + FDKAAC_VERSION=0.1.5 \ + FONTCONFIG_VERSION=2.12.4 \ + FREETYPE_VERSION=2.10.4 \ + FRIBIDI_VERSION=0.19.7 \ + KVAZAAR_VERSION=2.0.0 \ + LAME_VERSION=3.100 \ + LIBARIBB24_VERSION=1.0.3 \ + LIBASS_VERSION=0.13.7 \ + LIBBLURAY_VERSION=1.1.2 \ + LIBPNG_VERSION=1.6.9 \ + LIBPTHREAD_STUBS_VERSION=0.4 \ + LIBSRT_VERSION=1.4.1 \ + LIBVIDSTAB_VERSION=1.1.0 \ + LIBVMAF_VERSION=2.1.1 \ + LIBXCB_VERSION=1.13.1 \ + LIBXML2_VERSION=2.9.10 \ + LIBZMQ_VERSION=4.3.2 \ + OGG_VERSION=1.3.2 \ + OPENCOREAMR_VERSION=0.1.5 \ + OPENJPEG_VERSION=2.1.2 \ + OPUS_VERSION=1.2 \ + THEORA_VERSION=1.1.1 \ + VORBIS_VERSION=1.3.5 \ + VPX_VERSION=1.8.0 \ + WEBP_VERSION=1.0.2 \ + X264_VERSION=20170226-2245-stable \ + X265_VERSION=3.4 \ + XAU_VERSION=1.0.9 \ + XCBPROTO_VERSION=1.13 \ + XORG_MACROS_VERSION=1.19.2 \ + XPROTO_VERSION=7.0.31 \ + XVID_VERSION=1.3.4 \ + ZIMG_VERSION=3.0.3 \ + SRC=/usr/local ARG FREETYPE_SHA256SUM="5eab795ebb23ac77001cfb68b7d4d50b5d6c7469247b0b01b2c953269f658dac freetype-2.10.4.tar.gz" ARG FRIBIDI_SHA256SUM="3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 0.19.7.tar.gz" @@ -95,24 +96,39 @@ RUN buildDeps="autoconf \ zlib-dev \ expat-dev" && \ apk add --no-cache --update ${buildDeps} +# zimg https://github.com/sekrit-twc/zimg +RUN \ + DIR=/tmp/zimg && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://github.com/sekrit-twc/zimg/archive/refs/tags/release-${ZIMG_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + ./autogen.sh && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} + + + ## libvmaf https://github.com/Netflix/vmaf RUN \ if which meson || false; then \ - echo "Building VMAF." && \ - DIR=/tmp/vmaf && \ - mkdir -p ${DIR} && \ - cd ${DIR} && \ - curl -sLO https://github.com/Netflix/vmaf/archive/v${LIBVMAF_VERSION}.tar.gz && \ - tar -xz --strip-components=1 -f v${LIBVMAF_VERSION}.tar.gz && \ - cd /tmp/vmaf/libvmaf && \ - meson build --buildtype release --prefix=${PREFIX} && \ - ninja -vC build && \ - ninja -vC build install && \ - mkdir -p ${PREFIX}/share/model/ && \ - cp -r /tmp/vmaf/model/* ${PREFIX}/share/model/ && \ - rm -rf ${DIR}; \ + echo "Building VMAF." && \ + DIR=/tmp/vmaf && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/Netflix/vmaf/archive/v${LIBVMAF_VERSION}.tar.gz && \ + tar -xz --strip-components=1 -f v${LIBVMAF_VERSION}.tar.gz && \ + cd /tmp/vmaf/libvmaf && \ + meson build --buildtype release --prefix=${PREFIX} && \ + ninja -vC build && \ + ninja -vC build install && \ + mkdir -p ${PREFIX}/share/model/ && \ + cp -r /tmp/vmaf/model/* ${PREFIX}/share/model/ && \ + rm -rf ${DIR}; \ else \ - echo "VMAF skipped."; \ + echo "VMAF skipped."; \ fi ## opencore-amr https://sourceforge.net/projects/opencore-amr/ @@ -518,40 +534,41 @@ RUN \ --disable-debug \ --disable-doc \ --disable-ffplay \ - --enable-shared \ --enable-avresample \ - --enable-libopencore-amrnb \ - --enable-libopencore-amrwb \ + --enable-fontconfig \ --enable-gpl \ --enable-libass \ - --enable-fontconfig \ + --enable-libbluray \ + --enable-libfdk_aac \ --enable-libfreetype \ - --enable-libvidstab \ --enable-libmp3lame \ + --enable-libopencore-amrnb \ + --enable-libopencore-amrwb \ --enable-libopus \ --enable-libtheora \ + --enable-libvidstab \ --enable-libvorbis \ --enable-libvpx \ --enable-libwebp \ - --enable-libxcb \ + --enable-libx264 \ --enable-libx265 \ + --enable-libxcb \ --enable-libxvid \ - --enable-libx264 \ + --enable-libzmq \ --enable-nonfree \ --enable-openssl \ - --enable-libfdk_aac \ --enable-postproc \ + --enable-shared \ --enable-small \ --enable-version3 \ - --enable-libbluray \ - --enable-libzmq \ + --enable-zimg \ --extra-libs=-ldl \ --prefix="${PREFIX}" \ --enable-libopenjpeg \ --enable-libkvazaar \ --extra-cflags="-I${PREFIX}/include" \ --extra-ldflags="-L${PREFIX}/lib" && \ - make && \ +make && \ make install && \ make tools/zmqsend && cp tools/zmqsend ${PREFIX}/bin/ && \ make distclean && \ diff --git a/docker-images/3.3/centos7/Dockerfile b/docker-images/3.3/centos7/Dockerfile index e13b11fd8..d5e8c46c4 100644 --- a/docker-images/3.3/centos7/Dockerfile +++ b/docker-images/3.3/centos7/Dockerfile @@ -16,40 +16,41 @@ FROM base AS build WORKDIR /tmp/workdir ENV FFMPEG_VERSION=3.3.9 \ - AOM_VERSION=v1.0.0 \ - FDKAAC_VERSION=0.1.5 \ - FONTCONFIG_VERSION=2.12.4 \ - FREETYPE_VERSION=2.10.4 \ - FRIBIDI_VERSION=0.19.7 \ - KVAZAAR_VERSION=2.0.0 \ - LAME_VERSION=3.100 \ - LIBASS_VERSION=0.13.7 \ - LIBPTHREAD_STUBS_VERSION=0.4 \ - LIBVIDSTAB_VERSION=1.1.0 \ - LIBXCB_VERSION=1.13.1 \ - XCBPROTO_VERSION=1.13 \ - OGG_VERSION=1.3.2 \ - OPENCOREAMR_VERSION=0.1.5 \ - OPUS_VERSION=1.2 \ - OPENJPEG_VERSION=2.1.2 \ - THEORA_VERSION=1.1.1 \ - VORBIS_VERSION=1.3.5 \ - VPX_VERSION=1.8.0 \ - WEBP_VERSION=1.0.2 \ - X264_VERSION=20170226-2245-stable \ - X265_VERSION=3.4 \ - XAU_VERSION=1.0.9 \ - XORG_MACROS_VERSION=1.19.2 \ - XPROTO_VERSION=7.0.31 \ - XVID_VERSION=1.3.4 \ - LIBXML2_VERSION=2.9.10 \ - LIBBLURAY_VERSION=1.1.2 \ - LIBZMQ_VERSION=4.3.2 \ - LIBSRT_VERSION=1.4.1 \ - LIBARIBB24_VERSION=1.0.3 \ - LIBPNG_VERSION=1.6.9 \ - LIBVMAF_VERSION=2.1.1 \ - SRC=/usr/local + AOM_VERSION=v1.0.0 \ + FDKAAC_VERSION=0.1.5 \ + FONTCONFIG_VERSION=2.12.4 \ + FREETYPE_VERSION=2.10.4 \ + FRIBIDI_VERSION=0.19.7 \ + KVAZAAR_VERSION=2.0.0 \ + LAME_VERSION=3.100 \ + LIBARIBB24_VERSION=1.0.3 \ + LIBASS_VERSION=0.13.7 \ + LIBBLURAY_VERSION=1.1.2 \ + LIBPNG_VERSION=1.6.9 \ + LIBPTHREAD_STUBS_VERSION=0.4 \ + LIBSRT_VERSION=1.4.1 \ + LIBVIDSTAB_VERSION=1.1.0 \ + LIBVMAF_VERSION=2.1.1 \ + LIBXCB_VERSION=1.13.1 \ + LIBXML2_VERSION=2.9.10 \ + LIBZMQ_VERSION=4.3.2 \ + OGG_VERSION=1.3.2 \ + OPENCOREAMR_VERSION=0.1.5 \ + OPENJPEG_VERSION=2.1.2 \ + OPUS_VERSION=1.2 \ + THEORA_VERSION=1.1.1 \ + VORBIS_VERSION=1.3.5 \ + VPX_VERSION=1.8.0 \ + WEBP_VERSION=1.0.2 \ + X264_VERSION=20170226-2245-stable \ + X265_VERSION=3.4 \ + XAU_VERSION=1.0.9 \ + XCBPROTO_VERSION=1.13 \ + XORG_MACROS_VERSION=1.19.2 \ + XPROTO_VERSION=7.0.31 \ + XVID_VERSION=1.3.4 \ + ZIMG_VERSION=3.0.3 \ + SRC=/usr/local ARG FREETYPE_SHA256SUM="5eab795ebb23ac77001cfb68b7d4d50b5d6c7469247b0b01b2c953269f658dac freetype-2.10.4.tar.gz" ARG FRIBIDI_SHA256SUM="3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 0.19.7.tar.gz" @@ -132,24 +133,39 @@ RUN buildDeps="autoconf \ yum history undo $(yum history info | grep 'Transaction ID' | awk -F: '{print$2}' | tr -d ' ') -y && \ yum autoremove -y +# zimg https://github.com/sekrit-twc/zimg +RUN \ + DIR=/tmp/zimg && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://github.com/sekrit-twc/zimg/archive/refs/tags/release-${ZIMG_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + ./autogen.sh && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} + + + ## libvmaf https://github.com/Netflix/vmaf RUN \ if which meson || false; then \ - echo "Building VMAF." && \ - DIR=/tmp/vmaf && \ - mkdir -p ${DIR} && \ - cd ${DIR} && \ - curl -sLO https://github.com/Netflix/vmaf/archive/v${LIBVMAF_VERSION}.tar.gz && \ - tar -xz --strip-components=1 -f v${LIBVMAF_VERSION}.tar.gz && \ - cd /tmp/vmaf/libvmaf && \ - meson build --buildtype release --prefix=${PREFIX} && \ - ninja -vC build && \ - ninja -vC build install && \ - mkdir -p ${PREFIX}/share/model/ && \ - cp -r /tmp/vmaf/model/* ${PREFIX}/share/model/ && \ - rm -rf ${DIR}; \ + echo "Building VMAF." && \ + DIR=/tmp/vmaf && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/Netflix/vmaf/archive/v${LIBVMAF_VERSION}.tar.gz && \ + tar -xz --strip-components=1 -f v${LIBVMAF_VERSION}.tar.gz && \ + cd /tmp/vmaf/libvmaf && \ + meson build --buildtype release --prefix=${PREFIX} && \ + ninja -vC build && \ + ninja -vC build install && \ + mkdir -p ${PREFIX}/share/model/ && \ + cp -r /tmp/vmaf/model/* ${PREFIX}/share/model/ && \ + rm -rf ${DIR}; \ else \ - echo "VMAF skipped."; \ + echo "VMAF skipped."; \ fi ## opencore-amr https://sourceforge.net/projects/opencore-amr/ @@ -555,40 +571,41 @@ RUN \ --disable-debug \ --disable-doc \ --disable-ffplay \ - --enable-shared \ --enable-avresample \ - --enable-libopencore-amrnb \ - --enable-libopencore-amrwb \ + --enable-fontconfig \ --enable-gpl \ --enable-libass \ - --enable-fontconfig \ + --enable-libbluray \ + --enable-libfdk_aac \ --enable-libfreetype \ - --enable-libvidstab \ --enable-libmp3lame \ + --enable-libopencore-amrnb \ + --enable-libopencore-amrwb \ --enable-libopus \ --enable-libtheora \ + --enable-libvidstab \ --enable-libvorbis \ --enable-libvpx \ --enable-libwebp \ - --enable-libxcb \ + --enable-libx264 \ --enable-libx265 \ + --enable-libxcb \ --enable-libxvid \ - --enable-libx264 \ + --enable-libzmq \ --enable-nonfree \ --enable-openssl \ - --enable-libfdk_aac \ --enable-postproc \ + --enable-shared \ --enable-small \ --enable-version3 \ - --enable-libbluray \ - --enable-libzmq \ + --enable-zimg \ --extra-libs=-ldl \ --prefix="${PREFIX}" \ --enable-libopenjpeg \ --enable-libkvazaar \ --extra-cflags="-I${PREFIX}/include" \ --extra-ldflags="-L${PREFIX}/lib" && \ - make && \ +make && \ make install && \ make tools/zmqsend && cp tools/zmqsend ${PREFIX}/bin/ && \ make distclean && \ diff --git a/docker-images/3.3/centos8/Dockerfile b/docker-images/3.3/centos8/Dockerfile index 2f60425fc..30670cbfd 100644 --- a/docker-images/3.3/centos8/Dockerfile +++ b/docker-images/3.3/centos8/Dockerfile @@ -16,40 +16,41 @@ FROM base AS build WORKDIR /tmp/workdir ENV FFMPEG_VERSION=3.3.9 \ - AOM_VERSION=v1.0.0 \ - FDKAAC_VERSION=0.1.5 \ - FONTCONFIG_VERSION=2.12.4 \ - FREETYPE_VERSION=2.10.4 \ - FRIBIDI_VERSION=0.19.7 \ - KVAZAAR_VERSION=2.0.0 \ - LAME_VERSION=3.100 \ - LIBASS_VERSION=0.13.7 \ - LIBPTHREAD_STUBS_VERSION=0.4 \ - LIBVIDSTAB_VERSION=1.1.0 \ - LIBXCB_VERSION=1.13.1 \ - XCBPROTO_VERSION=1.13 \ - OGG_VERSION=1.3.2 \ - OPENCOREAMR_VERSION=0.1.5 \ - OPUS_VERSION=1.2 \ - OPENJPEG_VERSION=2.1.2 \ - THEORA_VERSION=1.1.1 \ - VORBIS_VERSION=1.3.5 \ - VPX_VERSION=1.8.0 \ - WEBP_VERSION=1.0.2 \ - X264_VERSION=20170226-2245-stable \ - X265_VERSION=3.4 \ - XAU_VERSION=1.0.9 \ - XORG_MACROS_VERSION=1.19.2 \ - XPROTO_VERSION=7.0.31 \ - XVID_VERSION=1.3.4 \ - LIBXML2_VERSION=2.9.10 \ - LIBBLURAY_VERSION=1.1.2 \ - LIBZMQ_VERSION=4.3.2 \ - LIBSRT_VERSION=1.4.1 \ - LIBARIBB24_VERSION=1.0.3 \ - LIBPNG_VERSION=1.6.9 \ - LIBVMAF_VERSION=2.1.1 \ - SRC=/usr/local + AOM_VERSION=v1.0.0 \ + FDKAAC_VERSION=0.1.5 \ + FONTCONFIG_VERSION=2.12.4 \ + FREETYPE_VERSION=2.10.4 \ + FRIBIDI_VERSION=0.19.7 \ + KVAZAAR_VERSION=2.0.0 \ + LAME_VERSION=3.100 \ + LIBARIBB24_VERSION=1.0.3 \ + LIBASS_VERSION=0.13.7 \ + LIBBLURAY_VERSION=1.1.2 \ + LIBPNG_VERSION=1.6.9 \ + LIBPTHREAD_STUBS_VERSION=0.4 \ + LIBSRT_VERSION=1.4.1 \ + LIBVIDSTAB_VERSION=1.1.0 \ + LIBVMAF_VERSION=2.1.1 \ + LIBXCB_VERSION=1.13.1 \ + LIBXML2_VERSION=2.9.10 \ + LIBZMQ_VERSION=4.3.2 \ + OGG_VERSION=1.3.2 \ + OPENCOREAMR_VERSION=0.1.5 \ + OPENJPEG_VERSION=2.1.2 \ + OPUS_VERSION=1.2 \ + THEORA_VERSION=1.1.1 \ + VORBIS_VERSION=1.3.5 \ + VPX_VERSION=1.8.0 \ + WEBP_VERSION=1.0.2 \ + X264_VERSION=20170226-2245-stable \ + X265_VERSION=3.4 \ + XAU_VERSION=1.0.9 \ + XCBPROTO_VERSION=1.13 \ + XORG_MACROS_VERSION=1.19.2 \ + XPROTO_VERSION=7.0.31 \ + XVID_VERSION=1.3.4 \ + ZIMG_VERSION=3.0.3 \ + SRC=/usr/local ARG FREETYPE_SHA256SUM="5eab795ebb23ac77001cfb68b7d4d50b5d6c7469247b0b01b2c953269f658dac freetype-2.10.4.tar.gz" ARG FRIBIDI_SHA256SUM="3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 0.19.7.tar.gz" @@ -101,24 +102,39 @@ RUN buildDeps="autoconf \ yum config-manager --set-enabled powertools && \ dnf install -y ${buildDeps} && \ alternatives --set python /usr/bin/python3 +# zimg https://github.com/sekrit-twc/zimg +RUN \ + DIR=/tmp/zimg && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://github.com/sekrit-twc/zimg/archive/refs/tags/release-${ZIMG_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + ./autogen.sh && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} + + + ## libvmaf https://github.com/Netflix/vmaf RUN \ if which meson || false; then \ - echo "Building VMAF." && \ - DIR=/tmp/vmaf && \ - mkdir -p ${DIR} && \ - cd ${DIR} && \ - curl -sLO https://github.com/Netflix/vmaf/archive/v${LIBVMAF_VERSION}.tar.gz && \ - tar -xz --strip-components=1 -f v${LIBVMAF_VERSION}.tar.gz && \ - cd /tmp/vmaf/libvmaf && \ - meson build --buildtype release --prefix=${PREFIX} && \ - ninja -vC build && \ - ninja -vC build install && \ - mkdir -p ${PREFIX}/share/model/ && \ - cp -r /tmp/vmaf/model/* ${PREFIX}/share/model/ && \ - rm -rf ${DIR}; \ + echo "Building VMAF." && \ + DIR=/tmp/vmaf && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/Netflix/vmaf/archive/v${LIBVMAF_VERSION}.tar.gz && \ + tar -xz --strip-components=1 -f v${LIBVMAF_VERSION}.tar.gz && \ + cd /tmp/vmaf/libvmaf && \ + meson build --buildtype release --prefix=${PREFIX} && \ + ninja -vC build && \ + ninja -vC build install && \ + mkdir -p ${PREFIX}/share/model/ && \ + cp -r /tmp/vmaf/model/* ${PREFIX}/share/model/ && \ + rm -rf ${DIR}; \ else \ - echo "VMAF skipped."; \ + echo "VMAF skipped."; \ fi ## opencore-amr https://sourceforge.net/projects/opencore-amr/ @@ -524,40 +540,41 @@ RUN \ --disable-debug \ --disable-doc \ --disable-ffplay \ - --enable-shared \ --enable-avresample \ - --enable-libopencore-amrnb \ - --enable-libopencore-amrwb \ + --enable-fontconfig \ --enable-gpl \ --enable-libass \ - --enable-fontconfig \ + --enable-libbluray \ + --enable-libfdk_aac \ --enable-libfreetype \ - --enable-libvidstab \ --enable-libmp3lame \ + --enable-libopencore-amrnb \ + --enable-libopencore-amrwb \ --enable-libopus \ --enable-libtheora \ + --enable-libvidstab \ --enable-libvorbis \ --enable-libvpx \ --enable-libwebp \ - --enable-libxcb \ + --enable-libx264 \ --enable-libx265 \ + --enable-libxcb \ --enable-libxvid \ - --enable-libx264 \ + --enable-libzmq \ --enable-nonfree \ --enable-openssl \ - --enable-libfdk_aac \ --enable-postproc \ + --enable-shared \ --enable-small \ --enable-version3 \ - --enable-libbluray \ - --enable-libzmq \ + --enable-zimg \ --extra-libs=-ldl \ --prefix="${PREFIX}" \ --enable-libopenjpeg \ --enable-libkvazaar \ --extra-cflags="-I${PREFIX}/include" \ --extra-ldflags="-L${PREFIX}/lib" && \ - make && \ +make && \ make install && \ make tools/zmqsend && cp tools/zmqsend ${PREFIX}/bin/ && \ make distclean && \ diff --git a/docker-images/3.3/nvidia2004/Dockerfile b/docker-images/3.3/nvidia2004/Dockerfile index 5e10bdece..991600344 100644 --- a/docker-images/3.3/nvidia2004/Dockerfile +++ b/docker-images/3.3/nvidia2004/Dockerfile @@ -34,40 +34,41 @@ FROM devel-base as build ENV NVIDIA_HEADERS_VERSION=11.1.5.0 ENV FFMPEG_VERSION=3.3.9 \ - AOM_VERSION=v1.0.0 \ - FDKAAC_VERSION=0.1.5 \ - FONTCONFIG_VERSION=2.12.4 \ - FREETYPE_VERSION=2.10.4 \ - FRIBIDI_VERSION=0.19.7 \ - KVAZAAR_VERSION=2.0.0 \ - LAME_VERSION=3.100 \ - LIBASS_VERSION=0.13.7 \ - LIBPTHREAD_STUBS_VERSION=0.4 \ - LIBVIDSTAB_VERSION=1.1.0 \ - LIBXCB_VERSION=1.13.1 \ - XCBPROTO_VERSION=1.13 \ - OGG_VERSION=1.3.2 \ - OPENCOREAMR_VERSION=0.1.5 \ - OPUS_VERSION=1.2 \ - OPENJPEG_VERSION=2.1.2 \ - THEORA_VERSION=1.1.1 \ - VORBIS_VERSION=1.3.5 \ - VPX_VERSION=1.8.0 \ - WEBP_VERSION=1.0.2 \ - X264_VERSION=20170226-2245-stable \ - X265_VERSION=3.4 \ - XAU_VERSION=1.0.9 \ - XORG_MACROS_VERSION=1.19.2 \ - XPROTO_VERSION=7.0.31 \ - XVID_VERSION=1.3.4 \ - LIBXML2_VERSION=2.9.10 \ - LIBBLURAY_VERSION=1.1.2 \ - LIBZMQ_VERSION=4.3.2 \ - LIBSRT_VERSION=1.4.1 \ - LIBARIBB24_VERSION=1.0.3 \ - LIBPNG_VERSION=1.6.9 \ - LIBVMAF_VERSION=2.1.1 \ - SRC=/usr/local + AOM_VERSION=v1.0.0 \ + FDKAAC_VERSION=0.1.5 \ + FONTCONFIG_VERSION=2.12.4 \ + FREETYPE_VERSION=2.10.4 \ + FRIBIDI_VERSION=0.19.7 \ + KVAZAAR_VERSION=2.0.0 \ + LAME_VERSION=3.100 \ + LIBARIBB24_VERSION=1.0.3 \ + LIBASS_VERSION=0.13.7 \ + LIBBLURAY_VERSION=1.1.2 \ + LIBPNG_VERSION=1.6.9 \ + LIBPTHREAD_STUBS_VERSION=0.4 \ + LIBSRT_VERSION=1.4.1 \ + LIBVIDSTAB_VERSION=1.1.0 \ + LIBVMAF_VERSION=2.1.1 \ + LIBXCB_VERSION=1.13.1 \ + LIBXML2_VERSION=2.9.10 \ + LIBZMQ_VERSION=4.3.2 \ + OGG_VERSION=1.3.2 \ + OPENCOREAMR_VERSION=0.1.5 \ + OPENJPEG_VERSION=2.1.2 \ + OPUS_VERSION=1.2 \ + THEORA_VERSION=1.1.1 \ + VORBIS_VERSION=1.3.5 \ + VPX_VERSION=1.8.0 \ + WEBP_VERSION=1.0.2 \ + X264_VERSION=20170226-2245-stable \ + X265_VERSION=3.4 \ + XAU_VERSION=1.0.9 \ + XCBPROTO_VERSION=1.13 \ + XORG_MACROS_VERSION=1.19.2 \ + XPROTO_VERSION=7.0.31 \ + XVID_VERSION=1.3.4 \ + ZIMG_VERSION=3.0.3 \ + SRC=/usr/local ARG FREETYPE_SHA256SUM="5eab795ebb23ac77001cfb68b7d4d50b5d6c7469247b0b01b2c953269f658dac freetype-2.10.4.tar.gz" ARG FRIBIDI_SHA256SUM="3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 0.19.7.tar.gz" @@ -123,24 +124,39 @@ RUN \ make install PREFIX="${PREFIX}" && \ rm -rf ${DIR} +# zimg https://github.com/sekrit-twc/zimg +RUN \ + DIR=/tmp/zimg && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://github.com/sekrit-twc/zimg/archive/refs/tags/release-${ZIMG_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + ./autogen.sh && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} + + + ## libvmaf https://github.com/Netflix/vmaf RUN \ if which meson || false; then \ - echo "Building VMAF." && \ - DIR=/tmp/vmaf && \ - mkdir -p ${DIR} && \ - cd ${DIR} && \ - curl -sLO https://github.com/Netflix/vmaf/archive/v${LIBVMAF_VERSION}.tar.gz && \ - tar -xz --strip-components=1 -f v${LIBVMAF_VERSION}.tar.gz && \ - cd /tmp/vmaf/libvmaf && \ - meson build --buildtype release --prefix=${PREFIX} && \ - ninja -vC build && \ - ninja -vC build install && \ - mkdir -p ${PREFIX}/share/model/ && \ - cp -r /tmp/vmaf/model/* ${PREFIX}/share/model/ && \ - rm -rf ${DIR}; \ + echo "Building VMAF." && \ + DIR=/tmp/vmaf && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/Netflix/vmaf/archive/v${LIBVMAF_VERSION}.tar.gz && \ + tar -xz --strip-components=1 -f v${LIBVMAF_VERSION}.tar.gz && \ + cd /tmp/vmaf/libvmaf && \ + meson build --buildtype release --prefix=${PREFIX} && \ + ninja -vC build && \ + ninja -vC build install && \ + mkdir -p ${PREFIX}/share/model/ && \ + cp -r /tmp/vmaf/model/* ${PREFIX}/share/model/ && \ + rm -rf ${DIR}; \ else \ - echo "VMAF skipped."; \ + echo "VMAF skipped."; \ fi ## opencore-amr https://sourceforge.net/projects/opencore-amr/ @@ -546,33 +562,34 @@ RUN \ --disable-debug \ --disable-doc \ --disable-ffplay \ - --enable-shared \ --enable-avresample \ - --enable-libopencore-amrnb \ - --enable-libopencore-amrwb \ + --enable-fontconfig \ --enable-gpl \ --enable-libass \ - --enable-fontconfig \ + --enable-libbluray \ + --enable-libfdk_aac \ --enable-libfreetype \ - --enable-libvidstab \ --enable-libmp3lame \ + --enable-libopencore-amrnb \ + --enable-libopencore-amrwb \ --enable-libopus \ --enable-libtheora \ + --enable-libvidstab \ --enable-libvorbis \ --enable-libvpx \ --enable-libwebp \ - --enable-libxcb \ + --enable-libx264 \ --enable-libx265 \ + --enable-libxcb \ --enable-libxvid \ - --enable-libx264 \ + --enable-libzmq \ --enable-nonfree \ --enable-openssl \ - --enable-libfdk_aac \ --enable-postproc \ + --enable-shared \ --enable-small \ --enable-version3 \ - --enable-libbluray \ - --enable-libzmq \ + --enable-zimg \ --extra-libs=-ldl \ --prefix="${PREFIX}" \ --enable-libopenjpeg \ @@ -580,7 +597,7 @@ RUN \ --enable-nvenc \ --extra-cflags="-I${PREFIX}/include -I${PREFIX}/include/ffnvcodec -I/usr/local/cuda/include/" \ --extra-ldflags="-L${PREFIX}/lib -L/usr/local/cuda/lib64 -L/usr/local/cuda/lib32/" && \ - make && \ +make && \ make install && \ make tools/zmqsend && cp tools/zmqsend ${PREFIX}/bin/ && \ make distclean && \ diff --git a/docker-images/3.3/scratch312/Dockerfile b/docker-images/3.3/scratch312/Dockerfile index d36caefe9..a054845bb 100644 --- a/docker-images/3.3/scratch312/Dockerfile +++ b/docker-images/3.3/scratch312/Dockerfile @@ -9,40 +9,41 @@ FROM alpine:3.12 AS build WORKDIR /tmp/workdir ENV FFMPEG_VERSION=3.3.9 \ - AOM_VERSION=v1.0.0 \ - FDKAAC_VERSION=0.1.5 \ - FONTCONFIG_VERSION=2.12.4 \ - FREETYPE_VERSION=2.10.4 \ - FRIBIDI_VERSION=0.19.7 \ - KVAZAAR_VERSION=2.0.0 \ - LAME_VERSION=3.100 \ - LIBASS_VERSION=0.13.7 \ - LIBPTHREAD_STUBS_VERSION=0.4 \ - LIBVIDSTAB_VERSION=1.1.0 \ - LIBXCB_VERSION=1.13.1 \ - XCBPROTO_VERSION=1.13 \ - OGG_VERSION=1.3.2 \ - OPENCOREAMR_VERSION=0.1.5 \ - OPUS_VERSION=1.2 \ - OPENJPEG_VERSION=2.1.2 \ - THEORA_VERSION=1.1.1 \ - VORBIS_VERSION=1.3.5 \ - VPX_VERSION=1.8.0 \ - WEBP_VERSION=1.0.2 \ - X264_VERSION=20170226-2245-stable \ - X265_VERSION=3.4 \ - XAU_VERSION=1.0.9 \ - XORG_MACROS_VERSION=1.19.2 \ - XPROTO_VERSION=7.0.31 \ - XVID_VERSION=1.3.4 \ - LIBXML2_VERSION=2.9.10 \ - LIBBLURAY_VERSION=1.1.2 \ - LIBZMQ_VERSION=4.3.2 \ - LIBSRT_VERSION=1.4.1 \ - LIBARIBB24_VERSION=1.0.3 \ - LIBPNG_VERSION=1.6.9 \ - LIBVMAF_VERSION=2.1.1 \ - SRC=/usr/local + AOM_VERSION=v1.0.0 \ + FDKAAC_VERSION=0.1.5 \ + FONTCONFIG_VERSION=2.12.4 \ + FREETYPE_VERSION=2.10.4 \ + FRIBIDI_VERSION=0.19.7 \ + KVAZAAR_VERSION=2.0.0 \ + LAME_VERSION=3.100 \ + LIBARIBB24_VERSION=1.0.3 \ + LIBASS_VERSION=0.13.7 \ + LIBBLURAY_VERSION=1.1.2 \ + LIBPNG_VERSION=1.6.9 \ + LIBPTHREAD_STUBS_VERSION=0.4 \ + LIBSRT_VERSION=1.4.1 \ + LIBVIDSTAB_VERSION=1.1.0 \ + LIBVMAF_VERSION=2.1.1 \ + LIBXCB_VERSION=1.13.1 \ + LIBXML2_VERSION=2.9.10 \ + LIBZMQ_VERSION=4.3.2 \ + OGG_VERSION=1.3.2 \ + OPENCOREAMR_VERSION=0.1.5 \ + OPENJPEG_VERSION=2.1.2 \ + OPUS_VERSION=1.2 \ + THEORA_VERSION=1.1.1 \ + VORBIS_VERSION=1.3.5 \ + VPX_VERSION=1.8.0 \ + WEBP_VERSION=1.0.2 \ + X264_VERSION=20170226-2245-stable \ + X265_VERSION=3.4 \ + XAU_VERSION=1.0.9 \ + XCBPROTO_VERSION=1.13 \ + XORG_MACROS_VERSION=1.19.2 \ + XPROTO_VERSION=7.0.31 \ + XVID_VERSION=1.3.4 \ + ZIMG_VERSION=3.0.3 \ + SRC=/usr/local ARG FREETYPE_SHA256SUM="5eab795ebb23ac77001cfb68b7d4d50b5d6c7469247b0b01b2c953269f658dac freetype-2.10.4.tar.gz" ARG FRIBIDI_SHA256SUM="3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 0.19.7.tar.gz" @@ -97,24 +98,39 @@ RUN buildDeps="autoconf \ libssl1.1" && \ apk add --update ${buildDeps} +# zimg https://github.com/sekrit-twc/zimg +RUN \ + DIR=/tmp/zimg && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://github.com/sekrit-twc/zimg/archive/refs/tags/release-${ZIMG_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + ./autogen.sh && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} + + + ## libvmaf https://github.com/Netflix/vmaf RUN \ if which meson || false; then \ - echo "Building VMAF." && \ - DIR=/tmp/vmaf && \ - mkdir -p ${DIR} && \ - cd ${DIR} && \ - curl -sLO https://github.com/Netflix/vmaf/archive/v${LIBVMAF_VERSION}.tar.gz && \ - tar -xz --strip-components=1 -f v${LIBVMAF_VERSION}.tar.gz && \ - cd /tmp/vmaf/libvmaf && \ - meson build --buildtype release --prefix=${PREFIX} && \ - ninja -vC build && \ - ninja -vC build install && \ - mkdir -p ${PREFIX}/share/model/ && \ - cp -r /tmp/vmaf/model/* ${PREFIX}/share/model/ && \ - rm -rf ${DIR}; \ + echo "Building VMAF." && \ + DIR=/tmp/vmaf && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/Netflix/vmaf/archive/v${LIBVMAF_VERSION}.tar.gz && \ + tar -xz --strip-components=1 -f v${LIBVMAF_VERSION}.tar.gz && \ + cd /tmp/vmaf/libvmaf && \ + meson build --buildtype release --prefix=${PREFIX} && \ + ninja -vC build && \ + ninja -vC build install && \ + mkdir -p ${PREFIX}/share/model/ && \ + cp -r /tmp/vmaf/model/* ${PREFIX}/share/model/ && \ + rm -rf ${DIR}; \ else \ - echo "VMAF skipped."; \ + echo "VMAF skipped."; \ fi ## opencore-amr https://sourceforge.net/projects/opencore-amr/ @@ -520,40 +536,41 @@ RUN \ --disable-debug \ --disable-doc \ --disable-ffplay \ - --enable-shared \ --enable-avresample \ - --enable-libopencore-amrnb \ - --enable-libopencore-amrwb \ + --enable-fontconfig \ --enable-gpl \ --enable-libass \ - --enable-fontconfig \ + --enable-libbluray \ + --enable-libfdk_aac \ --enable-libfreetype \ - --enable-libvidstab \ --enable-libmp3lame \ + --enable-libopencore-amrnb \ + --enable-libopencore-amrwb \ --enable-libopus \ --enable-libtheora \ + --enable-libvidstab \ --enable-libvorbis \ --enable-libvpx \ --enable-libwebp \ - --enable-libxcb \ + --enable-libx264 \ --enable-libx265 \ + --enable-libxcb \ --enable-libxvid \ - --enable-libx264 \ + --enable-libzmq \ --enable-nonfree \ --enable-openssl \ - --enable-libfdk_aac \ --enable-postproc \ + --enable-shared \ --enable-small \ --enable-version3 \ - --enable-libbluray \ - --enable-libzmq \ + --enable-zimg \ --extra-libs=-ldl \ --prefix="${PREFIX}" \ --enable-libopenjpeg \ --enable-libkvazaar \ --extra-cflags="-I${PREFIX}/include" \ --extra-ldflags="-L${PREFIX}/lib" && \ - make && \ +make && \ make install && \ make tools/zmqsend && cp tools/zmqsend ${PREFIX}/bin/ && \ make distclean && \ diff --git a/docker-images/3.3/ubuntu1804/Dockerfile b/docker-images/3.3/ubuntu1804/Dockerfile index 6cd61b6ef..548b7fa60 100644 --- a/docker-images/3.3/ubuntu1804/Dockerfile +++ b/docker-images/3.3/ubuntu1804/Dockerfile @@ -17,40 +17,41 @@ RUN apt-get -yqq update && \ FROM base as build ENV FFMPEG_VERSION=3.3.9 \ - AOM_VERSION=v1.0.0 \ - FDKAAC_VERSION=0.1.5 \ - FONTCONFIG_VERSION=2.12.4 \ - FREETYPE_VERSION=2.10.4 \ - FRIBIDI_VERSION=0.19.7 \ - KVAZAAR_VERSION=2.0.0 \ - LAME_VERSION=3.100 \ - LIBASS_VERSION=0.13.7 \ - LIBPTHREAD_STUBS_VERSION=0.4 \ - LIBVIDSTAB_VERSION=1.1.0 \ - LIBXCB_VERSION=1.13.1 \ - XCBPROTO_VERSION=1.13 \ - OGG_VERSION=1.3.2 \ - OPENCOREAMR_VERSION=0.1.5 \ - OPUS_VERSION=1.2 \ - OPENJPEG_VERSION=2.1.2 \ - THEORA_VERSION=1.1.1 \ - VORBIS_VERSION=1.3.5 \ - VPX_VERSION=1.8.0 \ - WEBP_VERSION=1.0.2 \ - X264_VERSION=20170226-2245-stable \ - X265_VERSION=3.4 \ - XAU_VERSION=1.0.9 \ - XORG_MACROS_VERSION=1.19.2 \ - XPROTO_VERSION=7.0.31 \ - XVID_VERSION=1.3.4 \ - LIBXML2_VERSION=2.9.10 \ - LIBBLURAY_VERSION=1.1.2 \ - LIBZMQ_VERSION=4.3.2 \ - LIBSRT_VERSION=1.4.1 \ - LIBARIBB24_VERSION=1.0.3 \ - LIBPNG_VERSION=1.6.9 \ - LIBVMAF_VERSION=2.1.1 \ - SRC=/usr/local + AOM_VERSION=v1.0.0 \ + FDKAAC_VERSION=0.1.5 \ + FONTCONFIG_VERSION=2.12.4 \ + FREETYPE_VERSION=2.10.4 \ + FRIBIDI_VERSION=0.19.7 \ + KVAZAAR_VERSION=2.0.0 \ + LAME_VERSION=3.100 \ + LIBARIBB24_VERSION=1.0.3 \ + LIBASS_VERSION=0.13.7 \ + LIBBLURAY_VERSION=1.1.2 \ + LIBPNG_VERSION=1.6.9 \ + LIBPTHREAD_STUBS_VERSION=0.4 \ + LIBSRT_VERSION=1.4.1 \ + LIBVIDSTAB_VERSION=1.1.0 \ + LIBVMAF_VERSION=2.1.1 \ + LIBXCB_VERSION=1.13.1 \ + LIBXML2_VERSION=2.9.10 \ + LIBZMQ_VERSION=4.3.2 \ + OGG_VERSION=1.3.2 \ + OPENCOREAMR_VERSION=0.1.5 \ + OPENJPEG_VERSION=2.1.2 \ + OPUS_VERSION=1.2 \ + THEORA_VERSION=1.1.1 \ + VORBIS_VERSION=1.3.5 \ + VPX_VERSION=1.8.0 \ + WEBP_VERSION=1.0.2 \ + X264_VERSION=20170226-2245-stable \ + X265_VERSION=3.4 \ + XAU_VERSION=1.0.9 \ + XCBPROTO_VERSION=1.13 \ + XORG_MACROS_VERSION=1.19.2 \ + XPROTO_VERSION=7.0.31 \ + XVID_VERSION=1.3.4 \ + ZIMG_VERSION=3.0.3 \ + SRC=/usr/local ARG FREETYPE_SHA256SUM="5eab795ebb23ac77001cfb68b7d4d50b5d6c7469247b0b01b2c953269f658dac freetype-2.10.4.tar.gz" ARG FRIBIDI_SHA256SUM="3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 0.19.7.tar.gz" @@ -96,24 +97,39 @@ RUN buildDeps="autoconf \ zlib1g-dev" && \ apt-get -yqq update && \ apt-get install -yq --no-install-recommends ${buildDeps} +# zimg https://github.com/sekrit-twc/zimg +RUN \ + DIR=/tmp/zimg && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://github.com/sekrit-twc/zimg/archive/refs/tags/release-${ZIMG_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + ./autogen.sh && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} + + + ## libvmaf https://github.com/Netflix/vmaf RUN \ if which meson || false; then \ - echo "Building VMAF." && \ - DIR=/tmp/vmaf && \ - mkdir -p ${DIR} && \ - cd ${DIR} && \ - curl -sLO https://github.com/Netflix/vmaf/archive/v${LIBVMAF_VERSION}.tar.gz && \ - tar -xz --strip-components=1 -f v${LIBVMAF_VERSION}.tar.gz && \ - cd /tmp/vmaf/libvmaf && \ - meson build --buildtype release --prefix=${PREFIX} && \ - ninja -vC build && \ - ninja -vC build install && \ - mkdir -p ${PREFIX}/share/model/ && \ - cp -r /tmp/vmaf/model/* ${PREFIX}/share/model/ && \ - rm -rf ${DIR}; \ + echo "Building VMAF." && \ + DIR=/tmp/vmaf && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/Netflix/vmaf/archive/v${LIBVMAF_VERSION}.tar.gz && \ + tar -xz --strip-components=1 -f v${LIBVMAF_VERSION}.tar.gz && \ + cd /tmp/vmaf/libvmaf && \ + meson build --buildtype release --prefix=${PREFIX} && \ + ninja -vC build && \ + ninja -vC build install && \ + mkdir -p ${PREFIX}/share/model/ && \ + cp -r /tmp/vmaf/model/* ${PREFIX}/share/model/ && \ + rm -rf ${DIR}; \ else \ - echo "VMAF skipped."; \ + echo "VMAF skipped."; \ fi ## opencore-amr https://sourceforge.net/projects/opencore-amr/ @@ -519,40 +535,41 @@ RUN \ --disable-debug \ --disable-doc \ --disable-ffplay \ - --enable-shared \ --enable-avresample \ - --enable-libopencore-amrnb \ - --enable-libopencore-amrwb \ + --enable-fontconfig \ --enable-gpl \ --enable-libass \ - --enable-fontconfig \ + --enable-libbluray \ + --enable-libfdk_aac \ --enable-libfreetype \ - --enable-libvidstab \ --enable-libmp3lame \ + --enable-libopencore-amrnb \ + --enable-libopencore-amrwb \ --enable-libopus \ --enable-libtheora \ + --enable-libvidstab \ --enable-libvorbis \ --enable-libvpx \ --enable-libwebp \ - --enable-libxcb \ + --enable-libx264 \ --enable-libx265 \ + --enable-libxcb \ --enable-libxvid \ - --enable-libx264 \ + --enable-libzmq \ --enable-nonfree \ --enable-openssl \ - --enable-libfdk_aac \ --enable-postproc \ + --enable-shared \ --enable-small \ --enable-version3 \ - --enable-libbluray \ - --enable-libzmq \ + --enable-zimg \ --extra-libs=-ldl \ --prefix="${PREFIX}" \ --enable-libopenjpeg \ --enable-libkvazaar \ --extra-cflags="-I${PREFIX}/include" \ --extra-ldflags="-L${PREFIX}/lib" && \ - make && \ +make && \ make install && \ make tools/zmqsend && cp tools/zmqsend ${PREFIX}/bin/ && \ make distclean && \ diff --git a/docker-images/3.3/ubuntu2004/Dockerfile b/docker-images/3.3/ubuntu2004/Dockerfile index 9a9de82e2..f285eaa81 100644 --- a/docker-images/3.3/ubuntu2004/Dockerfile +++ b/docker-images/3.3/ubuntu2004/Dockerfile @@ -17,40 +17,41 @@ RUN apt-get -yqq update && \ FROM base as build ENV FFMPEG_VERSION=3.3.9 \ - AOM_VERSION=v1.0.0 \ - FDKAAC_VERSION=0.1.5 \ - FONTCONFIG_VERSION=2.12.4 \ - FREETYPE_VERSION=2.10.4 \ - FRIBIDI_VERSION=0.19.7 \ - KVAZAAR_VERSION=2.0.0 \ - LAME_VERSION=3.100 \ - LIBASS_VERSION=0.13.7 \ - LIBPTHREAD_STUBS_VERSION=0.4 \ - LIBVIDSTAB_VERSION=1.1.0 \ - LIBXCB_VERSION=1.13.1 \ - XCBPROTO_VERSION=1.13 \ - OGG_VERSION=1.3.2 \ - OPENCOREAMR_VERSION=0.1.5 \ - OPUS_VERSION=1.2 \ - OPENJPEG_VERSION=2.1.2 \ - THEORA_VERSION=1.1.1 \ - VORBIS_VERSION=1.3.5 \ - VPX_VERSION=1.8.0 \ - WEBP_VERSION=1.0.2 \ - X264_VERSION=20170226-2245-stable \ - X265_VERSION=3.4 \ - XAU_VERSION=1.0.9 \ - XORG_MACROS_VERSION=1.19.2 \ - XPROTO_VERSION=7.0.31 \ - XVID_VERSION=1.3.4 \ - LIBXML2_VERSION=2.9.10 \ - LIBBLURAY_VERSION=1.1.2 \ - LIBZMQ_VERSION=4.3.2 \ - LIBSRT_VERSION=1.4.1 \ - LIBARIBB24_VERSION=1.0.3 \ - LIBPNG_VERSION=1.6.9 \ - LIBVMAF_VERSION=2.1.1 \ - SRC=/usr/local + AOM_VERSION=v1.0.0 \ + FDKAAC_VERSION=0.1.5 \ + FONTCONFIG_VERSION=2.12.4 \ + FREETYPE_VERSION=2.10.4 \ + FRIBIDI_VERSION=0.19.7 \ + KVAZAAR_VERSION=2.0.0 \ + LAME_VERSION=3.100 \ + LIBARIBB24_VERSION=1.0.3 \ + LIBASS_VERSION=0.13.7 \ + LIBBLURAY_VERSION=1.1.2 \ + LIBPNG_VERSION=1.6.9 \ + LIBPTHREAD_STUBS_VERSION=0.4 \ + LIBSRT_VERSION=1.4.1 \ + LIBVIDSTAB_VERSION=1.1.0 \ + LIBVMAF_VERSION=2.1.1 \ + LIBXCB_VERSION=1.13.1 \ + LIBXML2_VERSION=2.9.10 \ + LIBZMQ_VERSION=4.3.2 \ + OGG_VERSION=1.3.2 \ + OPENCOREAMR_VERSION=0.1.5 \ + OPENJPEG_VERSION=2.1.2 \ + OPUS_VERSION=1.2 \ + THEORA_VERSION=1.1.1 \ + VORBIS_VERSION=1.3.5 \ + VPX_VERSION=1.8.0 \ + WEBP_VERSION=1.0.2 \ + X264_VERSION=20170226-2245-stable \ + X265_VERSION=3.4 \ + XAU_VERSION=1.0.9 \ + XCBPROTO_VERSION=1.13 \ + XORG_MACROS_VERSION=1.19.2 \ + XPROTO_VERSION=7.0.31 \ + XVID_VERSION=1.3.4 \ + ZIMG_VERSION=3.0.3 \ + SRC=/usr/local ARG FREETYPE_SHA256SUM="5eab795ebb23ac77001cfb68b7d4d50b5d6c7469247b0b01b2c953269f658dac freetype-2.10.4.tar.gz" ARG FRIBIDI_SHA256SUM="3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 0.19.7.tar.gz" @@ -99,24 +100,39 @@ RUN buildDeps="autoconf \ zlib1g-dev" && \ apt-get -yqq update && \ apt-get install -yq --no-install-recommends ${buildDeps} +# zimg https://github.com/sekrit-twc/zimg +RUN \ + DIR=/tmp/zimg && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://github.com/sekrit-twc/zimg/archive/refs/tags/release-${ZIMG_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + ./autogen.sh && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} + + + ## libvmaf https://github.com/Netflix/vmaf RUN \ if which meson || false; then \ - echo "Building VMAF." && \ - DIR=/tmp/vmaf && \ - mkdir -p ${DIR} && \ - cd ${DIR} && \ - curl -sLO https://github.com/Netflix/vmaf/archive/v${LIBVMAF_VERSION}.tar.gz && \ - tar -xz --strip-components=1 -f v${LIBVMAF_VERSION}.tar.gz && \ - cd /tmp/vmaf/libvmaf && \ - meson build --buildtype release --prefix=${PREFIX} && \ - ninja -vC build && \ - ninja -vC build install && \ - mkdir -p ${PREFIX}/share/model/ && \ - cp -r /tmp/vmaf/model/* ${PREFIX}/share/model/ && \ - rm -rf ${DIR}; \ + echo "Building VMAF." && \ + DIR=/tmp/vmaf && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/Netflix/vmaf/archive/v${LIBVMAF_VERSION}.tar.gz && \ + tar -xz --strip-components=1 -f v${LIBVMAF_VERSION}.tar.gz && \ + cd /tmp/vmaf/libvmaf && \ + meson build --buildtype release --prefix=${PREFIX} && \ + ninja -vC build && \ + ninja -vC build install && \ + mkdir -p ${PREFIX}/share/model/ && \ + cp -r /tmp/vmaf/model/* ${PREFIX}/share/model/ && \ + rm -rf ${DIR}; \ else \ - echo "VMAF skipped."; \ + echo "VMAF skipped."; \ fi ## opencore-amr https://sourceforge.net/projects/opencore-amr/ @@ -522,40 +538,41 @@ RUN \ --disable-debug \ --disable-doc \ --disable-ffplay \ - --enable-shared \ --enable-avresample \ - --enable-libopencore-amrnb \ - --enable-libopencore-amrwb \ + --enable-fontconfig \ --enable-gpl \ --enable-libass \ - --enable-fontconfig \ + --enable-libbluray \ + --enable-libfdk_aac \ --enable-libfreetype \ - --enable-libvidstab \ --enable-libmp3lame \ + --enable-libopencore-amrnb \ + --enable-libopencore-amrwb \ --enable-libopus \ --enable-libtheora \ + --enable-libvidstab \ --enable-libvorbis \ --enable-libvpx \ --enable-libwebp \ - --enable-libxcb \ + --enable-libx264 \ --enable-libx265 \ + --enable-libxcb \ --enable-libxvid \ - --enable-libx264 \ + --enable-libzmq \ --enable-nonfree \ --enable-openssl \ - --enable-libfdk_aac \ --enable-postproc \ + --enable-shared \ --enable-small \ --enable-version3 \ - --enable-libbluray \ - --enable-libzmq \ + --enable-zimg \ --extra-libs=-ldl \ --prefix="${PREFIX}" \ --enable-libopenjpeg \ --enable-libkvazaar \ --extra-cflags="-I${PREFIX}/include" \ --extra-ldflags="-L${PREFIX}/lib" && \ - make && \ +make && \ make install && \ make tools/zmqsend && cp tools/zmqsend ${PREFIX}/bin/ && \ make distclean && \ diff --git a/docker-images/3.3/vaapi2004/Dockerfile b/docker-images/3.3/vaapi2004/Dockerfile index 1ce4e3ca4..e6f179fbf 100644 --- a/docker-images/3.3/vaapi2004/Dockerfile +++ b/docker-images/3.3/vaapi2004/Dockerfile @@ -17,40 +17,41 @@ RUN apt-get -yqq update && \ FROM base as build ENV FFMPEG_VERSION=3.3.9 \ - AOM_VERSION=v1.0.0 \ - FDKAAC_VERSION=0.1.5 \ - FONTCONFIG_VERSION=2.12.4 \ - FREETYPE_VERSION=2.10.4 \ - FRIBIDI_VERSION=0.19.7 \ - KVAZAAR_VERSION=2.0.0 \ - LAME_VERSION=3.100 \ - LIBASS_VERSION=0.13.7 \ - LIBPTHREAD_STUBS_VERSION=0.4 \ - LIBVIDSTAB_VERSION=1.1.0 \ - LIBXCB_VERSION=1.13.1 \ - XCBPROTO_VERSION=1.13 \ - OGG_VERSION=1.3.2 \ - OPENCOREAMR_VERSION=0.1.5 \ - OPUS_VERSION=1.2 \ - OPENJPEG_VERSION=2.1.2 \ - THEORA_VERSION=1.1.1 \ - VORBIS_VERSION=1.3.5 \ - VPX_VERSION=1.8.0 \ - WEBP_VERSION=1.0.2 \ - X264_VERSION=20170226-2245-stable \ - X265_VERSION=3.4 \ - XAU_VERSION=1.0.9 \ - XORG_MACROS_VERSION=1.19.2 \ - XPROTO_VERSION=7.0.31 \ - XVID_VERSION=1.3.4 \ - LIBXML2_VERSION=2.9.10 \ - LIBBLURAY_VERSION=1.1.2 \ - LIBZMQ_VERSION=4.3.2 \ - LIBSRT_VERSION=1.4.1 \ - LIBARIBB24_VERSION=1.0.3 \ - LIBPNG_VERSION=1.6.9 \ - LIBVMAF_VERSION=2.1.1 \ - SRC=/usr/local + AOM_VERSION=v1.0.0 \ + FDKAAC_VERSION=0.1.5 \ + FONTCONFIG_VERSION=2.12.4 \ + FREETYPE_VERSION=2.10.4 \ + FRIBIDI_VERSION=0.19.7 \ + KVAZAAR_VERSION=2.0.0 \ + LAME_VERSION=3.100 \ + LIBARIBB24_VERSION=1.0.3 \ + LIBASS_VERSION=0.13.7 \ + LIBBLURAY_VERSION=1.1.2 \ + LIBPNG_VERSION=1.6.9 \ + LIBPTHREAD_STUBS_VERSION=0.4 \ + LIBSRT_VERSION=1.4.1 \ + LIBVIDSTAB_VERSION=1.1.0 \ + LIBVMAF_VERSION=2.1.1 \ + LIBXCB_VERSION=1.13.1 \ + LIBXML2_VERSION=2.9.10 \ + LIBZMQ_VERSION=4.3.2 \ + OGG_VERSION=1.3.2 \ + OPENCOREAMR_VERSION=0.1.5 \ + OPENJPEG_VERSION=2.1.2 \ + OPUS_VERSION=1.2 \ + THEORA_VERSION=1.1.1 \ + VORBIS_VERSION=1.3.5 \ + VPX_VERSION=1.8.0 \ + WEBP_VERSION=1.0.2 \ + X264_VERSION=20170226-2245-stable \ + X265_VERSION=3.4 \ + XAU_VERSION=1.0.9 \ + XCBPROTO_VERSION=1.13 \ + XORG_MACROS_VERSION=1.19.2 \ + XPROTO_VERSION=7.0.31 \ + XVID_VERSION=1.3.4 \ + ZIMG_VERSION=3.0.3 \ + SRC=/usr/local ARG FREETYPE_SHA256SUM="5eab795ebb23ac77001cfb68b7d4d50b5d6c7469247b0b01b2c953269f658dac freetype-2.10.4.tar.gz" ARG FRIBIDI_SHA256SUM="3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 0.19.7.tar.gz" @@ -100,24 +101,39 @@ RUN buildDeps="autoconf \ zlib1g-dev" && \ apt-get -yqq update && \ apt-get install -yq --no-install-recommends ${buildDeps} +# zimg https://github.com/sekrit-twc/zimg +RUN \ + DIR=/tmp/zimg && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://github.com/sekrit-twc/zimg/archive/refs/tags/release-${ZIMG_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + ./autogen.sh && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} + + + ## libvmaf https://github.com/Netflix/vmaf RUN \ if which meson || false; then \ - echo "Building VMAF." && \ - DIR=/tmp/vmaf && \ - mkdir -p ${DIR} && \ - cd ${DIR} && \ - curl -sLO https://github.com/Netflix/vmaf/archive/v${LIBVMAF_VERSION}.tar.gz && \ - tar -xz --strip-components=1 -f v${LIBVMAF_VERSION}.tar.gz && \ - cd /tmp/vmaf/libvmaf && \ - meson build --buildtype release --prefix=${PREFIX} && \ - ninja -vC build && \ - ninja -vC build install && \ - mkdir -p ${PREFIX}/share/model/ && \ - cp -r /tmp/vmaf/model/* ${PREFIX}/share/model/ && \ - rm -rf ${DIR}; \ + echo "Building VMAF." && \ + DIR=/tmp/vmaf && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/Netflix/vmaf/archive/v${LIBVMAF_VERSION}.tar.gz && \ + tar -xz --strip-components=1 -f v${LIBVMAF_VERSION}.tar.gz && \ + cd /tmp/vmaf/libvmaf && \ + meson build --buildtype release --prefix=${PREFIX} && \ + ninja -vC build && \ + ninja -vC build install && \ + mkdir -p ${PREFIX}/share/model/ && \ + cp -r /tmp/vmaf/model/* ${PREFIX}/share/model/ && \ + rm -rf ${DIR}; \ else \ - echo "VMAF skipped."; \ + echo "VMAF skipped."; \ fi ## opencore-amr https://sourceforge.net/projects/opencore-amr/ @@ -523,33 +539,34 @@ RUN \ --disable-debug \ --disable-doc \ --disable-ffplay \ - --enable-shared \ --enable-avresample \ - --enable-libopencore-amrnb \ - --enable-libopencore-amrwb \ + --enable-fontconfig \ --enable-gpl \ --enable-libass \ - --enable-fontconfig \ + --enable-libbluray \ + --enable-libfdk_aac \ --enable-libfreetype \ - --enable-libvidstab \ --enable-libmp3lame \ + --enable-libopencore-amrnb \ + --enable-libopencore-amrwb \ --enable-libopus \ --enable-libtheora \ + --enable-libvidstab \ --enable-libvorbis \ --enable-libvpx \ --enable-libwebp \ - --enable-libxcb \ + --enable-libx264 \ --enable-libx265 \ + --enable-libxcb \ --enable-libxvid \ - --enable-libx264 \ + --enable-libzmq \ --enable-nonfree \ --enable-openssl \ - --enable-libfdk_aac \ --enable-postproc \ + --enable-shared \ --enable-small \ --enable-version3 \ - --enable-libbluray \ - --enable-libzmq \ + --enable-zimg \ --extra-libs=-ldl \ --prefix="${PREFIX}" \ --enable-libopenjpeg \ @@ -557,7 +574,7 @@ RUN \ --enable-vaapi \ --extra-cflags="-I${PREFIX}/include" \ --extra-ldflags="-L${PREFIX}/lib" && \ - make && \ +make && \ make install && \ make tools/zmqsend && cp tools/zmqsend ${PREFIX}/bin/ && \ make distclean && \ diff --git a/docker-images/3.4/alpine312/Dockerfile b/docker-images/3.4/alpine312/Dockerfile index 9d6627dfb..20e9f7947 100644 --- a/docker-images/3.4/alpine312/Dockerfile +++ b/docker-images/3.4/alpine312/Dockerfile @@ -14,40 +14,41 @@ FROM base AS build WORKDIR /tmp/workdir ENV FFMPEG_VERSION=3.4.8 \ - AOM_VERSION=v1.0.0 \ - FDKAAC_VERSION=0.1.5 \ - FONTCONFIG_VERSION=2.12.4 \ - FREETYPE_VERSION=2.10.4 \ - FRIBIDI_VERSION=0.19.7 \ - KVAZAAR_VERSION=2.0.0 \ - LAME_VERSION=3.100 \ - LIBASS_VERSION=0.13.7 \ - LIBPTHREAD_STUBS_VERSION=0.4 \ - LIBVIDSTAB_VERSION=1.1.0 \ - LIBXCB_VERSION=1.13.1 \ - XCBPROTO_VERSION=1.13 \ - OGG_VERSION=1.3.2 \ - OPENCOREAMR_VERSION=0.1.5 \ - OPUS_VERSION=1.2 \ - OPENJPEG_VERSION=2.1.2 \ - THEORA_VERSION=1.1.1 \ - VORBIS_VERSION=1.3.5 \ - VPX_VERSION=1.8.0 \ - WEBP_VERSION=1.0.2 \ - X264_VERSION=20170226-2245-stable \ - X265_VERSION=3.4 \ - XAU_VERSION=1.0.9 \ - XORG_MACROS_VERSION=1.19.2 \ - XPROTO_VERSION=7.0.31 \ - XVID_VERSION=1.3.4 \ - LIBXML2_VERSION=2.9.10 \ - LIBBLURAY_VERSION=1.1.2 \ - LIBZMQ_VERSION=4.3.2 \ - LIBSRT_VERSION=1.4.1 \ - LIBARIBB24_VERSION=1.0.3 \ - LIBPNG_VERSION=1.6.9 \ - LIBVMAF_VERSION=2.1.1 \ - SRC=/usr/local + AOM_VERSION=v1.0.0 \ + FDKAAC_VERSION=0.1.5 \ + FONTCONFIG_VERSION=2.12.4 \ + FREETYPE_VERSION=2.10.4 \ + FRIBIDI_VERSION=0.19.7 \ + KVAZAAR_VERSION=2.0.0 \ + LAME_VERSION=3.100 \ + LIBARIBB24_VERSION=1.0.3 \ + LIBASS_VERSION=0.13.7 \ + LIBBLURAY_VERSION=1.1.2 \ + LIBPNG_VERSION=1.6.9 \ + LIBPTHREAD_STUBS_VERSION=0.4 \ + LIBSRT_VERSION=1.4.1 \ + LIBVIDSTAB_VERSION=1.1.0 \ + LIBVMAF_VERSION=2.1.1 \ + LIBXCB_VERSION=1.13.1 \ + LIBXML2_VERSION=2.9.10 \ + LIBZMQ_VERSION=4.3.2 \ + OGG_VERSION=1.3.2 \ + OPENCOREAMR_VERSION=0.1.5 \ + OPENJPEG_VERSION=2.1.2 \ + OPUS_VERSION=1.2 \ + THEORA_VERSION=1.1.1 \ + VORBIS_VERSION=1.3.5 \ + VPX_VERSION=1.8.0 \ + WEBP_VERSION=1.0.2 \ + X264_VERSION=20170226-2245-stable \ + X265_VERSION=3.4 \ + XAU_VERSION=1.0.9 \ + XCBPROTO_VERSION=1.13 \ + XORG_MACROS_VERSION=1.19.2 \ + XPROTO_VERSION=7.0.31 \ + XVID_VERSION=1.3.4 \ + ZIMG_VERSION=3.0.3 \ + SRC=/usr/local ARG FREETYPE_SHA256SUM="5eab795ebb23ac77001cfb68b7d4d50b5d6c7469247b0b01b2c953269f658dac freetype-2.10.4.tar.gz" ARG FRIBIDI_SHA256SUM="3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 0.19.7.tar.gz" @@ -95,24 +96,39 @@ RUN buildDeps="autoconf \ zlib-dev \ expat-dev" && \ apk add --no-cache --update ${buildDeps} +# zimg https://github.com/sekrit-twc/zimg +RUN \ + DIR=/tmp/zimg && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://github.com/sekrit-twc/zimg/archive/refs/tags/release-${ZIMG_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + ./autogen.sh && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} + + + ## libvmaf https://github.com/Netflix/vmaf RUN \ if which meson || false; then \ - echo "Building VMAF." && \ - DIR=/tmp/vmaf && \ - mkdir -p ${DIR} && \ - cd ${DIR} && \ - curl -sLO https://github.com/Netflix/vmaf/archive/v${LIBVMAF_VERSION}.tar.gz && \ - tar -xz --strip-components=1 -f v${LIBVMAF_VERSION}.tar.gz && \ - cd /tmp/vmaf/libvmaf && \ - meson build --buildtype release --prefix=${PREFIX} && \ - ninja -vC build && \ - ninja -vC build install && \ - mkdir -p ${PREFIX}/share/model/ && \ - cp -r /tmp/vmaf/model/* ${PREFIX}/share/model/ && \ - rm -rf ${DIR}; \ + echo "Building VMAF." && \ + DIR=/tmp/vmaf && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/Netflix/vmaf/archive/v${LIBVMAF_VERSION}.tar.gz && \ + tar -xz --strip-components=1 -f v${LIBVMAF_VERSION}.tar.gz && \ + cd /tmp/vmaf/libvmaf && \ + meson build --buildtype release --prefix=${PREFIX} && \ + ninja -vC build && \ + ninja -vC build install && \ + mkdir -p ${PREFIX}/share/model/ && \ + cp -r /tmp/vmaf/model/* ${PREFIX}/share/model/ && \ + rm -rf ${DIR}; \ else \ - echo "VMAF skipped."; \ + echo "VMAF skipped."; \ fi ## opencore-amr https://sourceforge.net/projects/opencore-amr/ @@ -518,40 +534,41 @@ RUN \ --disable-debug \ --disable-doc \ --disable-ffplay \ - --enable-shared \ --enable-avresample \ - --enable-libopencore-amrnb \ - --enable-libopencore-amrwb \ + --enable-fontconfig \ --enable-gpl \ --enable-libass \ - --enable-fontconfig \ + --enable-libbluray \ + --enable-libfdk_aac \ --enable-libfreetype \ - --enable-libvidstab \ --enable-libmp3lame \ + --enable-libopencore-amrnb \ + --enable-libopencore-amrwb \ --enable-libopus \ --enable-libtheora \ + --enable-libvidstab \ --enable-libvorbis \ --enable-libvpx \ --enable-libwebp \ - --enable-libxcb \ + --enable-libx264 \ --enable-libx265 \ + --enable-libxcb \ --enable-libxvid \ - --enable-libx264 \ + --enable-libzmq \ --enable-nonfree \ --enable-openssl \ - --enable-libfdk_aac \ --enable-postproc \ + --enable-shared \ --enable-small \ --enable-version3 \ - --enable-libbluray \ - --enable-libzmq \ + --enable-zimg \ --extra-libs=-ldl \ --prefix="${PREFIX}" \ --enable-libopenjpeg \ --enable-libkvazaar \ --extra-cflags="-I${PREFIX}/include" \ --extra-ldflags="-L${PREFIX}/lib" && \ - make && \ +make && \ make install && \ make tools/zmqsend && cp tools/zmqsend ${PREFIX}/bin/ && \ make distclean && \ diff --git a/docker-images/3.4/centos7/Dockerfile b/docker-images/3.4/centos7/Dockerfile index f6bf7756e..f439a1bdd 100644 --- a/docker-images/3.4/centos7/Dockerfile +++ b/docker-images/3.4/centos7/Dockerfile @@ -16,40 +16,41 @@ FROM base AS build WORKDIR /tmp/workdir ENV FFMPEG_VERSION=3.4.8 \ - AOM_VERSION=v1.0.0 \ - FDKAAC_VERSION=0.1.5 \ - FONTCONFIG_VERSION=2.12.4 \ - FREETYPE_VERSION=2.10.4 \ - FRIBIDI_VERSION=0.19.7 \ - KVAZAAR_VERSION=2.0.0 \ - LAME_VERSION=3.100 \ - LIBASS_VERSION=0.13.7 \ - LIBPTHREAD_STUBS_VERSION=0.4 \ - LIBVIDSTAB_VERSION=1.1.0 \ - LIBXCB_VERSION=1.13.1 \ - XCBPROTO_VERSION=1.13 \ - OGG_VERSION=1.3.2 \ - OPENCOREAMR_VERSION=0.1.5 \ - OPUS_VERSION=1.2 \ - OPENJPEG_VERSION=2.1.2 \ - THEORA_VERSION=1.1.1 \ - VORBIS_VERSION=1.3.5 \ - VPX_VERSION=1.8.0 \ - WEBP_VERSION=1.0.2 \ - X264_VERSION=20170226-2245-stable \ - X265_VERSION=3.4 \ - XAU_VERSION=1.0.9 \ - XORG_MACROS_VERSION=1.19.2 \ - XPROTO_VERSION=7.0.31 \ - XVID_VERSION=1.3.4 \ - LIBXML2_VERSION=2.9.10 \ - LIBBLURAY_VERSION=1.1.2 \ - LIBZMQ_VERSION=4.3.2 \ - LIBSRT_VERSION=1.4.1 \ - LIBARIBB24_VERSION=1.0.3 \ - LIBPNG_VERSION=1.6.9 \ - LIBVMAF_VERSION=2.1.1 \ - SRC=/usr/local + AOM_VERSION=v1.0.0 \ + FDKAAC_VERSION=0.1.5 \ + FONTCONFIG_VERSION=2.12.4 \ + FREETYPE_VERSION=2.10.4 \ + FRIBIDI_VERSION=0.19.7 \ + KVAZAAR_VERSION=2.0.0 \ + LAME_VERSION=3.100 \ + LIBARIBB24_VERSION=1.0.3 \ + LIBASS_VERSION=0.13.7 \ + LIBBLURAY_VERSION=1.1.2 \ + LIBPNG_VERSION=1.6.9 \ + LIBPTHREAD_STUBS_VERSION=0.4 \ + LIBSRT_VERSION=1.4.1 \ + LIBVIDSTAB_VERSION=1.1.0 \ + LIBVMAF_VERSION=2.1.1 \ + LIBXCB_VERSION=1.13.1 \ + LIBXML2_VERSION=2.9.10 \ + LIBZMQ_VERSION=4.3.2 \ + OGG_VERSION=1.3.2 \ + OPENCOREAMR_VERSION=0.1.5 \ + OPENJPEG_VERSION=2.1.2 \ + OPUS_VERSION=1.2 \ + THEORA_VERSION=1.1.1 \ + VORBIS_VERSION=1.3.5 \ + VPX_VERSION=1.8.0 \ + WEBP_VERSION=1.0.2 \ + X264_VERSION=20170226-2245-stable \ + X265_VERSION=3.4 \ + XAU_VERSION=1.0.9 \ + XCBPROTO_VERSION=1.13 \ + XORG_MACROS_VERSION=1.19.2 \ + XPROTO_VERSION=7.0.31 \ + XVID_VERSION=1.3.4 \ + ZIMG_VERSION=3.0.3 \ + SRC=/usr/local ARG FREETYPE_SHA256SUM="5eab795ebb23ac77001cfb68b7d4d50b5d6c7469247b0b01b2c953269f658dac freetype-2.10.4.tar.gz" ARG FRIBIDI_SHA256SUM="3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 0.19.7.tar.gz" @@ -132,24 +133,39 @@ RUN buildDeps="autoconf \ yum history undo $(yum history info | grep 'Transaction ID' | awk -F: '{print$2}' | tr -d ' ') -y && \ yum autoremove -y +# zimg https://github.com/sekrit-twc/zimg +RUN \ + DIR=/tmp/zimg && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://github.com/sekrit-twc/zimg/archive/refs/tags/release-${ZIMG_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + ./autogen.sh && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} + + + ## libvmaf https://github.com/Netflix/vmaf RUN \ if which meson || false; then \ - echo "Building VMAF." && \ - DIR=/tmp/vmaf && \ - mkdir -p ${DIR} && \ - cd ${DIR} && \ - curl -sLO https://github.com/Netflix/vmaf/archive/v${LIBVMAF_VERSION}.tar.gz && \ - tar -xz --strip-components=1 -f v${LIBVMAF_VERSION}.tar.gz && \ - cd /tmp/vmaf/libvmaf && \ - meson build --buildtype release --prefix=${PREFIX} && \ - ninja -vC build && \ - ninja -vC build install && \ - mkdir -p ${PREFIX}/share/model/ && \ - cp -r /tmp/vmaf/model/* ${PREFIX}/share/model/ && \ - rm -rf ${DIR}; \ + echo "Building VMAF." && \ + DIR=/tmp/vmaf && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/Netflix/vmaf/archive/v${LIBVMAF_VERSION}.tar.gz && \ + tar -xz --strip-components=1 -f v${LIBVMAF_VERSION}.tar.gz && \ + cd /tmp/vmaf/libvmaf && \ + meson build --buildtype release --prefix=${PREFIX} && \ + ninja -vC build && \ + ninja -vC build install && \ + mkdir -p ${PREFIX}/share/model/ && \ + cp -r /tmp/vmaf/model/* ${PREFIX}/share/model/ && \ + rm -rf ${DIR}; \ else \ - echo "VMAF skipped."; \ + echo "VMAF skipped."; \ fi ## opencore-amr https://sourceforge.net/projects/opencore-amr/ @@ -555,40 +571,41 @@ RUN \ --disable-debug \ --disable-doc \ --disable-ffplay \ - --enable-shared \ --enable-avresample \ - --enable-libopencore-amrnb \ - --enable-libopencore-amrwb \ + --enable-fontconfig \ --enable-gpl \ --enable-libass \ - --enable-fontconfig \ + --enable-libbluray \ + --enable-libfdk_aac \ --enable-libfreetype \ - --enable-libvidstab \ --enable-libmp3lame \ + --enable-libopencore-amrnb \ + --enable-libopencore-amrwb \ --enable-libopus \ --enable-libtheora \ + --enable-libvidstab \ --enable-libvorbis \ --enable-libvpx \ --enable-libwebp \ - --enable-libxcb \ + --enable-libx264 \ --enable-libx265 \ + --enable-libxcb \ --enable-libxvid \ - --enable-libx264 \ + --enable-libzmq \ --enable-nonfree \ --enable-openssl \ - --enable-libfdk_aac \ --enable-postproc \ + --enable-shared \ --enable-small \ --enable-version3 \ - --enable-libbluray \ - --enable-libzmq \ + --enable-zimg \ --extra-libs=-ldl \ --prefix="${PREFIX}" \ --enable-libopenjpeg \ --enable-libkvazaar \ --extra-cflags="-I${PREFIX}/include" \ --extra-ldflags="-L${PREFIX}/lib" && \ - make && \ +make && \ make install && \ make tools/zmqsend && cp tools/zmqsend ${PREFIX}/bin/ && \ make distclean && \ diff --git a/docker-images/3.4/centos8/Dockerfile b/docker-images/3.4/centos8/Dockerfile index b01a3bf7e..6b0fdbaf8 100644 --- a/docker-images/3.4/centos8/Dockerfile +++ b/docker-images/3.4/centos8/Dockerfile @@ -16,40 +16,41 @@ FROM base AS build WORKDIR /tmp/workdir ENV FFMPEG_VERSION=3.4.8 \ - AOM_VERSION=v1.0.0 \ - FDKAAC_VERSION=0.1.5 \ - FONTCONFIG_VERSION=2.12.4 \ - FREETYPE_VERSION=2.10.4 \ - FRIBIDI_VERSION=0.19.7 \ - KVAZAAR_VERSION=2.0.0 \ - LAME_VERSION=3.100 \ - LIBASS_VERSION=0.13.7 \ - LIBPTHREAD_STUBS_VERSION=0.4 \ - LIBVIDSTAB_VERSION=1.1.0 \ - LIBXCB_VERSION=1.13.1 \ - XCBPROTO_VERSION=1.13 \ - OGG_VERSION=1.3.2 \ - OPENCOREAMR_VERSION=0.1.5 \ - OPUS_VERSION=1.2 \ - OPENJPEG_VERSION=2.1.2 \ - THEORA_VERSION=1.1.1 \ - VORBIS_VERSION=1.3.5 \ - VPX_VERSION=1.8.0 \ - WEBP_VERSION=1.0.2 \ - X264_VERSION=20170226-2245-stable \ - X265_VERSION=3.4 \ - XAU_VERSION=1.0.9 \ - XORG_MACROS_VERSION=1.19.2 \ - XPROTO_VERSION=7.0.31 \ - XVID_VERSION=1.3.4 \ - LIBXML2_VERSION=2.9.10 \ - LIBBLURAY_VERSION=1.1.2 \ - LIBZMQ_VERSION=4.3.2 \ - LIBSRT_VERSION=1.4.1 \ - LIBARIBB24_VERSION=1.0.3 \ - LIBPNG_VERSION=1.6.9 \ - LIBVMAF_VERSION=2.1.1 \ - SRC=/usr/local + AOM_VERSION=v1.0.0 \ + FDKAAC_VERSION=0.1.5 \ + FONTCONFIG_VERSION=2.12.4 \ + FREETYPE_VERSION=2.10.4 \ + FRIBIDI_VERSION=0.19.7 \ + KVAZAAR_VERSION=2.0.0 \ + LAME_VERSION=3.100 \ + LIBARIBB24_VERSION=1.0.3 \ + LIBASS_VERSION=0.13.7 \ + LIBBLURAY_VERSION=1.1.2 \ + LIBPNG_VERSION=1.6.9 \ + LIBPTHREAD_STUBS_VERSION=0.4 \ + LIBSRT_VERSION=1.4.1 \ + LIBVIDSTAB_VERSION=1.1.0 \ + LIBVMAF_VERSION=2.1.1 \ + LIBXCB_VERSION=1.13.1 \ + LIBXML2_VERSION=2.9.10 \ + LIBZMQ_VERSION=4.3.2 \ + OGG_VERSION=1.3.2 \ + OPENCOREAMR_VERSION=0.1.5 \ + OPENJPEG_VERSION=2.1.2 \ + OPUS_VERSION=1.2 \ + THEORA_VERSION=1.1.1 \ + VORBIS_VERSION=1.3.5 \ + VPX_VERSION=1.8.0 \ + WEBP_VERSION=1.0.2 \ + X264_VERSION=20170226-2245-stable \ + X265_VERSION=3.4 \ + XAU_VERSION=1.0.9 \ + XCBPROTO_VERSION=1.13 \ + XORG_MACROS_VERSION=1.19.2 \ + XPROTO_VERSION=7.0.31 \ + XVID_VERSION=1.3.4 \ + ZIMG_VERSION=3.0.3 \ + SRC=/usr/local ARG FREETYPE_SHA256SUM="5eab795ebb23ac77001cfb68b7d4d50b5d6c7469247b0b01b2c953269f658dac freetype-2.10.4.tar.gz" ARG FRIBIDI_SHA256SUM="3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 0.19.7.tar.gz" @@ -101,24 +102,39 @@ RUN buildDeps="autoconf \ yum config-manager --set-enabled powertools && \ dnf install -y ${buildDeps} && \ alternatives --set python /usr/bin/python3 +# zimg https://github.com/sekrit-twc/zimg +RUN \ + DIR=/tmp/zimg && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://github.com/sekrit-twc/zimg/archive/refs/tags/release-${ZIMG_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + ./autogen.sh && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} + + + ## libvmaf https://github.com/Netflix/vmaf RUN \ if which meson || false; then \ - echo "Building VMAF." && \ - DIR=/tmp/vmaf && \ - mkdir -p ${DIR} && \ - cd ${DIR} && \ - curl -sLO https://github.com/Netflix/vmaf/archive/v${LIBVMAF_VERSION}.tar.gz && \ - tar -xz --strip-components=1 -f v${LIBVMAF_VERSION}.tar.gz && \ - cd /tmp/vmaf/libvmaf && \ - meson build --buildtype release --prefix=${PREFIX} && \ - ninja -vC build && \ - ninja -vC build install && \ - mkdir -p ${PREFIX}/share/model/ && \ - cp -r /tmp/vmaf/model/* ${PREFIX}/share/model/ && \ - rm -rf ${DIR}; \ + echo "Building VMAF." && \ + DIR=/tmp/vmaf && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/Netflix/vmaf/archive/v${LIBVMAF_VERSION}.tar.gz && \ + tar -xz --strip-components=1 -f v${LIBVMAF_VERSION}.tar.gz && \ + cd /tmp/vmaf/libvmaf && \ + meson build --buildtype release --prefix=${PREFIX} && \ + ninja -vC build && \ + ninja -vC build install && \ + mkdir -p ${PREFIX}/share/model/ && \ + cp -r /tmp/vmaf/model/* ${PREFIX}/share/model/ && \ + rm -rf ${DIR}; \ else \ - echo "VMAF skipped."; \ + echo "VMAF skipped."; \ fi ## opencore-amr https://sourceforge.net/projects/opencore-amr/ @@ -524,40 +540,41 @@ RUN \ --disable-debug \ --disable-doc \ --disable-ffplay \ - --enable-shared \ --enable-avresample \ - --enable-libopencore-amrnb \ - --enable-libopencore-amrwb \ + --enable-fontconfig \ --enable-gpl \ --enable-libass \ - --enable-fontconfig \ + --enable-libbluray \ + --enable-libfdk_aac \ --enable-libfreetype \ - --enable-libvidstab \ --enable-libmp3lame \ + --enable-libopencore-amrnb \ + --enable-libopencore-amrwb \ --enable-libopus \ --enable-libtheora \ + --enable-libvidstab \ --enable-libvorbis \ --enable-libvpx \ --enable-libwebp \ - --enable-libxcb \ + --enable-libx264 \ --enable-libx265 \ + --enable-libxcb \ --enable-libxvid \ - --enable-libx264 \ + --enable-libzmq \ --enable-nonfree \ --enable-openssl \ - --enable-libfdk_aac \ --enable-postproc \ + --enable-shared \ --enable-small \ --enable-version3 \ - --enable-libbluray \ - --enable-libzmq \ + --enable-zimg \ --extra-libs=-ldl \ --prefix="${PREFIX}" \ --enable-libopenjpeg \ --enable-libkvazaar \ --extra-cflags="-I${PREFIX}/include" \ --extra-ldflags="-L${PREFIX}/lib" && \ - make && \ +make && \ make install && \ make tools/zmqsend && cp tools/zmqsend ${PREFIX}/bin/ && \ make distclean && \ diff --git a/docker-images/3.4/nvidia2004/Dockerfile b/docker-images/3.4/nvidia2004/Dockerfile index 05e05be8c..e45a3c5a2 100644 --- a/docker-images/3.4/nvidia2004/Dockerfile +++ b/docker-images/3.4/nvidia2004/Dockerfile @@ -34,40 +34,41 @@ FROM devel-base as build ENV NVIDIA_HEADERS_VERSION=11.1.5.0 ENV FFMPEG_VERSION=3.4.8 \ - AOM_VERSION=v1.0.0 \ - FDKAAC_VERSION=0.1.5 \ - FONTCONFIG_VERSION=2.12.4 \ - FREETYPE_VERSION=2.10.4 \ - FRIBIDI_VERSION=0.19.7 \ - KVAZAAR_VERSION=2.0.0 \ - LAME_VERSION=3.100 \ - LIBASS_VERSION=0.13.7 \ - LIBPTHREAD_STUBS_VERSION=0.4 \ - LIBVIDSTAB_VERSION=1.1.0 \ - LIBXCB_VERSION=1.13.1 \ - XCBPROTO_VERSION=1.13 \ - OGG_VERSION=1.3.2 \ - OPENCOREAMR_VERSION=0.1.5 \ - OPUS_VERSION=1.2 \ - OPENJPEG_VERSION=2.1.2 \ - THEORA_VERSION=1.1.1 \ - VORBIS_VERSION=1.3.5 \ - VPX_VERSION=1.8.0 \ - WEBP_VERSION=1.0.2 \ - X264_VERSION=20170226-2245-stable \ - X265_VERSION=3.4 \ - XAU_VERSION=1.0.9 \ - XORG_MACROS_VERSION=1.19.2 \ - XPROTO_VERSION=7.0.31 \ - XVID_VERSION=1.3.4 \ - LIBXML2_VERSION=2.9.10 \ - LIBBLURAY_VERSION=1.1.2 \ - LIBZMQ_VERSION=4.3.2 \ - LIBSRT_VERSION=1.4.1 \ - LIBARIBB24_VERSION=1.0.3 \ - LIBPNG_VERSION=1.6.9 \ - LIBVMAF_VERSION=2.1.1 \ - SRC=/usr/local + AOM_VERSION=v1.0.0 \ + FDKAAC_VERSION=0.1.5 \ + FONTCONFIG_VERSION=2.12.4 \ + FREETYPE_VERSION=2.10.4 \ + FRIBIDI_VERSION=0.19.7 \ + KVAZAAR_VERSION=2.0.0 \ + LAME_VERSION=3.100 \ + LIBARIBB24_VERSION=1.0.3 \ + LIBASS_VERSION=0.13.7 \ + LIBBLURAY_VERSION=1.1.2 \ + LIBPNG_VERSION=1.6.9 \ + LIBPTHREAD_STUBS_VERSION=0.4 \ + LIBSRT_VERSION=1.4.1 \ + LIBVIDSTAB_VERSION=1.1.0 \ + LIBVMAF_VERSION=2.1.1 \ + LIBXCB_VERSION=1.13.1 \ + LIBXML2_VERSION=2.9.10 \ + LIBZMQ_VERSION=4.3.2 \ + OGG_VERSION=1.3.2 \ + OPENCOREAMR_VERSION=0.1.5 \ + OPENJPEG_VERSION=2.1.2 \ + OPUS_VERSION=1.2 \ + THEORA_VERSION=1.1.1 \ + VORBIS_VERSION=1.3.5 \ + VPX_VERSION=1.8.0 \ + WEBP_VERSION=1.0.2 \ + X264_VERSION=20170226-2245-stable \ + X265_VERSION=3.4 \ + XAU_VERSION=1.0.9 \ + XCBPROTO_VERSION=1.13 \ + XORG_MACROS_VERSION=1.19.2 \ + XPROTO_VERSION=7.0.31 \ + XVID_VERSION=1.3.4 \ + ZIMG_VERSION=3.0.3 \ + SRC=/usr/local ARG FREETYPE_SHA256SUM="5eab795ebb23ac77001cfb68b7d4d50b5d6c7469247b0b01b2c953269f658dac freetype-2.10.4.tar.gz" ARG FRIBIDI_SHA256SUM="3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 0.19.7.tar.gz" @@ -123,24 +124,39 @@ RUN \ make install PREFIX="${PREFIX}" && \ rm -rf ${DIR} +# zimg https://github.com/sekrit-twc/zimg +RUN \ + DIR=/tmp/zimg && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://github.com/sekrit-twc/zimg/archive/refs/tags/release-${ZIMG_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + ./autogen.sh && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} + + + ## libvmaf https://github.com/Netflix/vmaf RUN \ if which meson || false; then \ - echo "Building VMAF." && \ - DIR=/tmp/vmaf && \ - mkdir -p ${DIR} && \ - cd ${DIR} && \ - curl -sLO https://github.com/Netflix/vmaf/archive/v${LIBVMAF_VERSION}.tar.gz && \ - tar -xz --strip-components=1 -f v${LIBVMAF_VERSION}.tar.gz && \ - cd /tmp/vmaf/libvmaf && \ - meson build --buildtype release --prefix=${PREFIX} && \ - ninja -vC build && \ - ninja -vC build install && \ - mkdir -p ${PREFIX}/share/model/ && \ - cp -r /tmp/vmaf/model/* ${PREFIX}/share/model/ && \ - rm -rf ${DIR}; \ + echo "Building VMAF." && \ + DIR=/tmp/vmaf && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/Netflix/vmaf/archive/v${LIBVMAF_VERSION}.tar.gz && \ + tar -xz --strip-components=1 -f v${LIBVMAF_VERSION}.tar.gz && \ + cd /tmp/vmaf/libvmaf && \ + meson build --buildtype release --prefix=${PREFIX} && \ + ninja -vC build && \ + ninja -vC build install && \ + mkdir -p ${PREFIX}/share/model/ && \ + cp -r /tmp/vmaf/model/* ${PREFIX}/share/model/ && \ + rm -rf ${DIR}; \ else \ - echo "VMAF skipped."; \ + echo "VMAF skipped."; \ fi ## opencore-amr https://sourceforge.net/projects/opencore-amr/ @@ -546,33 +562,34 @@ RUN \ --disable-debug \ --disable-doc \ --disable-ffplay \ - --enable-shared \ --enable-avresample \ - --enable-libopencore-amrnb \ - --enable-libopencore-amrwb \ + --enable-fontconfig \ --enable-gpl \ --enable-libass \ - --enable-fontconfig \ + --enable-libbluray \ + --enable-libfdk_aac \ --enable-libfreetype \ - --enable-libvidstab \ --enable-libmp3lame \ + --enable-libopencore-amrnb \ + --enable-libopencore-amrwb \ --enable-libopus \ --enable-libtheora \ + --enable-libvidstab \ --enable-libvorbis \ --enable-libvpx \ --enable-libwebp \ - --enable-libxcb \ + --enable-libx264 \ --enable-libx265 \ + --enable-libxcb \ --enable-libxvid \ - --enable-libx264 \ + --enable-libzmq \ --enable-nonfree \ --enable-openssl \ - --enable-libfdk_aac \ --enable-postproc \ + --enable-shared \ --enable-small \ --enable-version3 \ - --enable-libbluray \ - --enable-libzmq \ + --enable-zimg \ --extra-libs=-ldl \ --prefix="${PREFIX}" \ --enable-libopenjpeg \ @@ -580,7 +597,7 @@ RUN \ --enable-nvenc \ --extra-cflags="-I${PREFIX}/include -I${PREFIX}/include/ffnvcodec -I/usr/local/cuda/include/" \ --extra-ldflags="-L${PREFIX}/lib -L/usr/local/cuda/lib64 -L/usr/local/cuda/lib32/" && \ - make && \ +make && \ make install && \ make tools/zmqsend && cp tools/zmqsend ${PREFIX}/bin/ && \ make distclean && \ diff --git a/docker-images/3.4/scratch312/Dockerfile b/docker-images/3.4/scratch312/Dockerfile index 1c5fb0949..426b9eeaa 100644 --- a/docker-images/3.4/scratch312/Dockerfile +++ b/docker-images/3.4/scratch312/Dockerfile @@ -9,40 +9,41 @@ FROM alpine:3.12 AS build WORKDIR /tmp/workdir ENV FFMPEG_VERSION=3.4.8 \ - AOM_VERSION=v1.0.0 \ - FDKAAC_VERSION=0.1.5 \ - FONTCONFIG_VERSION=2.12.4 \ - FREETYPE_VERSION=2.10.4 \ - FRIBIDI_VERSION=0.19.7 \ - KVAZAAR_VERSION=2.0.0 \ - LAME_VERSION=3.100 \ - LIBASS_VERSION=0.13.7 \ - LIBPTHREAD_STUBS_VERSION=0.4 \ - LIBVIDSTAB_VERSION=1.1.0 \ - LIBXCB_VERSION=1.13.1 \ - XCBPROTO_VERSION=1.13 \ - OGG_VERSION=1.3.2 \ - OPENCOREAMR_VERSION=0.1.5 \ - OPUS_VERSION=1.2 \ - OPENJPEG_VERSION=2.1.2 \ - THEORA_VERSION=1.1.1 \ - VORBIS_VERSION=1.3.5 \ - VPX_VERSION=1.8.0 \ - WEBP_VERSION=1.0.2 \ - X264_VERSION=20170226-2245-stable \ - X265_VERSION=3.4 \ - XAU_VERSION=1.0.9 \ - XORG_MACROS_VERSION=1.19.2 \ - XPROTO_VERSION=7.0.31 \ - XVID_VERSION=1.3.4 \ - LIBXML2_VERSION=2.9.10 \ - LIBBLURAY_VERSION=1.1.2 \ - LIBZMQ_VERSION=4.3.2 \ - LIBSRT_VERSION=1.4.1 \ - LIBARIBB24_VERSION=1.0.3 \ - LIBPNG_VERSION=1.6.9 \ - LIBVMAF_VERSION=2.1.1 \ - SRC=/usr/local + AOM_VERSION=v1.0.0 \ + FDKAAC_VERSION=0.1.5 \ + FONTCONFIG_VERSION=2.12.4 \ + FREETYPE_VERSION=2.10.4 \ + FRIBIDI_VERSION=0.19.7 \ + KVAZAAR_VERSION=2.0.0 \ + LAME_VERSION=3.100 \ + LIBARIBB24_VERSION=1.0.3 \ + LIBASS_VERSION=0.13.7 \ + LIBBLURAY_VERSION=1.1.2 \ + LIBPNG_VERSION=1.6.9 \ + LIBPTHREAD_STUBS_VERSION=0.4 \ + LIBSRT_VERSION=1.4.1 \ + LIBVIDSTAB_VERSION=1.1.0 \ + LIBVMAF_VERSION=2.1.1 \ + LIBXCB_VERSION=1.13.1 \ + LIBXML2_VERSION=2.9.10 \ + LIBZMQ_VERSION=4.3.2 \ + OGG_VERSION=1.3.2 \ + OPENCOREAMR_VERSION=0.1.5 \ + OPENJPEG_VERSION=2.1.2 \ + OPUS_VERSION=1.2 \ + THEORA_VERSION=1.1.1 \ + VORBIS_VERSION=1.3.5 \ + VPX_VERSION=1.8.0 \ + WEBP_VERSION=1.0.2 \ + X264_VERSION=20170226-2245-stable \ + X265_VERSION=3.4 \ + XAU_VERSION=1.0.9 \ + XCBPROTO_VERSION=1.13 \ + XORG_MACROS_VERSION=1.19.2 \ + XPROTO_VERSION=7.0.31 \ + XVID_VERSION=1.3.4 \ + ZIMG_VERSION=3.0.3 \ + SRC=/usr/local ARG FREETYPE_SHA256SUM="5eab795ebb23ac77001cfb68b7d4d50b5d6c7469247b0b01b2c953269f658dac freetype-2.10.4.tar.gz" ARG FRIBIDI_SHA256SUM="3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 0.19.7.tar.gz" @@ -97,24 +98,39 @@ RUN buildDeps="autoconf \ libssl1.1" && \ apk add --update ${buildDeps} +# zimg https://github.com/sekrit-twc/zimg +RUN \ + DIR=/tmp/zimg && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://github.com/sekrit-twc/zimg/archive/refs/tags/release-${ZIMG_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + ./autogen.sh && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} + + + ## libvmaf https://github.com/Netflix/vmaf RUN \ if which meson || false; then \ - echo "Building VMAF." && \ - DIR=/tmp/vmaf && \ - mkdir -p ${DIR} && \ - cd ${DIR} && \ - curl -sLO https://github.com/Netflix/vmaf/archive/v${LIBVMAF_VERSION}.tar.gz && \ - tar -xz --strip-components=1 -f v${LIBVMAF_VERSION}.tar.gz && \ - cd /tmp/vmaf/libvmaf && \ - meson build --buildtype release --prefix=${PREFIX} && \ - ninja -vC build && \ - ninja -vC build install && \ - mkdir -p ${PREFIX}/share/model/ && \ - cp -r /tmp/vmaf/model/* ${PREFIX}/share/model/ && \ - rm -rf ${DIR}; \ + echo "Building VMAF." && \ + DIR=/tmp/vmaf && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/Netflix/vmaf/archive/v${LIBVMAF_VERSION}.tar.gz && \ + tar -xz --strip-components=1 -f v${LIBVMAF_VERSION}.tar.gz && \ + cd /tmp/vmaf/libvmaf && \ + meson build --buildtype release --prefix=${PREFIX} && \ + ninja -vC build && \ + ninja -vC build install && \ + mkdir -p ${PREFIX}/share/model/ && \ + cp -r /tmp/vmaf/model/* ${PREFIX}/share/model/ && \ + rm -rf ${DIR}; \ else \ - echo "VMAF skipped."; \ + echo "VMAF skipped."; \ fi ## opencore-amr https://sourceforge.net/projects/opencore-amr/ @@ -520,40 +536,41 @@ RUN \ --disable-debug \ --disable-doc \ --disable-ffplay \ - --enable-shared \ --enable-avresample \ - --enable-libopencore-amrnb \ - --enable-libopencore-amrwb \ + --enable-fontconfig \ --enable-gpl \ --enable-libass \ - --enable-fontconfig \ + --enable-libbluray \ + --enable-libfdk_aac \ --enable-libfreetype \ - --enable-libvidstab \ --enable-libmp3lame \ + --enable-libopencore-amrnb \ + --enable-libopencore-amrwb \ --enable-libopus \ --enable-libtheora \ + --enable-libvidstab \ --enable-libvorbis \ --enable-libvpx \ --enable-libwebp \ - --enable-libxcb \ + --enable-libx264 \ --enable-libx265 \ + --enable-libxcb \ --enable-libxvid \ - --enable-libx264 \ + --enable-libzmq \ --enable-nonfree \ --enable-openssl \ - --enable-libfdk_aac \ --enable-postproc \ + --enable-shared \ --enable-small \ --enable-version3 \ - --enable-libbluray \ - --enable-libzmq \ + --enable-zimg \ --extra-libs=-ldl \ --prefix="${PREFIX}" \ --enable-libopenjpeg \ --enable-libkvazaar \ --extra-cflags="-I${PREFIX}/include" \ --extra-ldflags="-L${PREFIX}/lib" && \ - make && \ +make && \ make install && \ make tools/zmqsend && cp tools/zmqsend ${PREFIX}/bin/ && \ make distclean && \ diff --git a/docker-images/3.4/ubuntu1804/Dockerfile b/docker-images/3.4/ubuntu1804/Dockerfile index c5e55a1e9..36222816a 100644 --- a/docker-images/3.4/ubuntu1804/Dockerfile +++ b/docker-images/3.4/ubuntu1804/Dockerfile @@ -17,40 +17,41 @@ RUN apt-get -yqq update && \ FROM base as build ENV FFMPEG_VERSION=3.4.8 \ - AOM_VERSION=v1.0.0 \ - FDKAAC_VERSION=0.1.5 \ - FONTCONFIG_VERSION=2.12.4 \ - FREETYPE_VERSION=2.10.4 \ - FRIBIDI_VERSION=0.19.7 \ - KVAZAAR_VERSION=2.0.0 \ - LAME_VERSION=3.100 \ - LIBASS_VERSION=0.13.7 \ - LIBPTHREAD_STUBS_VERSION=0.4 \ - LIBVIDSTAB_VERSION=1.1.0 \ - LIBXCB_VERSION=1.13.1 \ - XCBPROTO_VERSION=1.13 \ - OGG_VERSION=1.3.2 \ - OPENCOREAMR_VERSION=0.1.5 \ - OPUS_VERSION=1.2 \ - OPENJPEG_VERSION=2.1.2 \ - THEORA_VERSION=1.1.1 \ - VORBIS_VERSION=1.3.5 \ - VPX_VERSION=1.8.0 \ - WEBP_VERSION=1.0.2 \ - X264_VERSION=20170226-2245-stable \ - X265_VERSION=3.4 \ - XAU_VERSION=1.0.9 \ - XORG_MACROS_VERSION=1.19.2 \ - XPROTO_VERSION=7.0.31 \ - XVID_VERSION=1.3.4 \ - LIBXML2_VERSION=2.9.10 \ - LIBBLURAY_VERSION=1.1.2 \ - LIBZMQ_VERSION=4.3.2 \ - LIBSRT_VERSION=1.4.1 \ - LIBARIBB24_VERSION=1.0.3 \ - LIBPNG_VERSION=1.6.9 \ - LIBVMAF_VERSION=2.1.1 \ - SRC=/usr/local + AOM_VERSION=v1.0.0 \ + FDKAAC_VERSION=0.1.5 \ + FONTCONFIG_VERSION=2.12.4 \ + FREETYPE_VERSION=2.10.4 \ + FRIBIDI_VERSION=0.19.7 \ + KVAZAAR_VERSION=2.0.0 \ + LAME_VERSION=3.100 \ + LIBARIBB24_VERSION=1.0.3 \ + LIBASS_VERSION=0.13.7 \ + LIBBLURAY_VERSION=1.1.2 \ + LIBPNG_VERSION=1.6.9 \ + LIBPTHREAD_STUBS_VERSION=0.4 \ + LIBSRT_VERSION=1.4.1 \ + LIBVIDSTAB_VERSION=1.1.0 \ + LIBVMAF_VERSION=2.1.1 \ + LIBXCB_VERSION=1.13.1 \ + LIBXML2_VERSION=2.9.10 \ + LIBZMQ_VERSION=4.3.2 \ + OGG_VERSION=1.3.2 \ + OPENCOREAMR_VERSION=0.1.5 \ + OPENJPEG_VERSION=2.1.2 \ + OPUS_VERSION=1.2 \ + THEORA_VERSION=1.1.1 \ + VORBIS_VERSION=1.3.5 \ + VPX_VERSION=1.8.0 \ + WEBP_VERSION=1.0.2 \ + X264_VERSION=20170226-2245-stable \ + X265_VERSION=3.4 \ + XAU_VERSION=1.0.9 \ + XCBPROTO_VERSION=1.13 \ + XORG_MACROS_VERSION=1.19.2 \ + XPROTO_VERSION=7.0.31 \ + XVID_VERSION=1.3.4 \ + ZIMG_VERSION=3.0.3 \ + SRC=/usr/local ARG FREETYPE_SHA256SUM="5eab795ebb23ac77001cfb68b7d4d50b5d6c7469247b0b01b2c953269f658dac freetype-2.10.4.tar.gz" ARG FRIBIDI_SHA256SUM="3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 0.19.7.tar.gz" @@ -96,24 +97,39 @@ RUN buildDeps="autoconf \ zlib1g-dev" && \ apt-get -yqq update && \ apt-get install -yq --no-install-recommends ${buildDeps} +# zimg https://github.com/sekrit-twc/zimg +RUN \ + DIR=/tmp/zimg && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://github.com/sekrit-twc/zimg/archive/refs/tags/release-${ZIMG_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + ./autogen.sh && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} + + + ## libvmaf https://github.com/Netflix/vmaf RUN \ if which meson || false; then \ - echo "Building VMAF." && \ - DIR=/tmp/vmaf && \ - mkdir -p ${DIR} && \ - cd ${DIR} && \ - curl -sLO https://github.com/Netflix/vmaf/archive/v${LIBVMAF_VERSION}.tar.gz && \ - tar -xz --strip-components=1 -f v${LIBVMAF_VERSION}.tar.gz && \ - cd /tmp/vmaf/libvmaf && \ - meson build --buildtype release --prefix=${PREFIX} && \ - ninja -vC build && \ - ninja -vC build install && \ - mkdir -p ${PREFIX}/share/model/ && \ - cp -r /tmp/vmaf/model/* ${PREFIX}/share/model/ && \ - rm -rf ${DIR}; \ + echo "Building VMAF." && \ + DIR=/tmp/vmaf && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/Netflix/vmaf/archive/v${LIBVMAF_VERSION}.tar.gz && \ + tar -xz --strip-components=1 -f v${LIBVMAF_VERSION}.tar.gz && \ + cd /tmp/vmaf/libvmaf && \ + meson build --buildtype release --prefix=${PREFIX} && \ + ninja -vC build && \ + ninja -vC build install && \ + mkdir -p ${PREFIX}/share/model/ && \ + cp -r /tmp/vmaf/model/* ${PREFIX}/share/model/ && \ + rm -rf ${DIR}; \ else \ - echo "VMAF skipped."; \ + echo "VMAF skipped."; \ fi ## opencore-amr https://sourceforge.net/projects/opencore-amr/ @@ -519,40 +535,41 @@ RUN \ --disable-debug \ --disable-doc \ --disable-ffplay \ - --enable-shared \ --enable-avresample \ - --enable-libopencore-amrnb \ - --enable-libopencore-amrwb \ + --enable-fontconfig \ --enable-gpl \ --enable-libass \ - --enable-fontconfig \ + --enable-libbluray \ + --enable-libfdk_aac \ --enable-libfreetype \ - --enable-libvidstab \ --enable-libmp3lame \ + --enable-libopencore-amrnb \ + --enable-libopencore-amrwb \ --enable-libopus \ --enable-libtheora \ + --enable-libvidstab \ --enable-libvorbis \ --enable-libvpx \ --enable-libwebp \ - --enable-libxcb \ + --enable-libx264 \ --enable-libx265 \ + --enable-libxcb \ --enable-libxvid \ - --enable-libx264 \ + --enable-libzmq \ --enable-nonfree \ --enable-openssl \ - --enable-libfdk_aac \ --enable-postproc \ + --enable-shared \ --enable-small \ --enable-version3 \ - --enable-libbluray \ - --enable-libzmq \ + --enable-zimg \ --extra-libs=-ldl \ --prefix="${PREFIX}" \ --enable-libopenjpeg \ --enable-libkvazaar \ --extra-cflags="-I${PREFIX}/include" \ --extra-ldflags="-L${PREFIX}/lib" && \ - make && \ +make && \ make install && \ make tools/zmqsend && cp tools/zmqsend ${PREFIX}/bin/ && \ make distclean && \ diff --git a/docker-images/3.4/ubuntu2004/Dockerfile b/docker-images/3.4/ubuntu2004/Dockerfile index 884678456..b5b472f74 100644 --- a/docker-images/3.4/ubuntu2004/Dockerfile +++ b/docker-images/3.4/ubuntu2004/Dockerfile @@ -17,40 +17,41 @@ RUN apt-get -yqq update && \ FROM base as build ENV FFMPEG_VERSION=3.4.8 \ - AOM_VERSION=v1.0.0 \ - FDKAAC_VERSION=0.1.5 \ - FONTCONFIG_VERSION=2.12.4 \ - FREETYPE_VERSION=2.10.4 \ - FRIBIDI_VERSION=0.19.7 \ - KVAZAAR_VERSION=2.0.0 \ - LAME_VERSION=3.100 \ - LIBASS_VERSION=0.13.7 \ - LIBPTHREAD_STUBS_VERSION=0.4 \ - LIBVIDSTAB_VERSION=1.1.0 \ - LIBXCB_VERSION=1.13.1 \ - XCBPROTO_VERSION=1.13 \ - OGG_VERSION=1.3.2 \ - OPENCOREAMR_VERSION=0.1.5 \ - OPUS_VERSION=1.2 \ - OPENJPEG_VERSION=2.1.2 \ - THEORA_VERSION=1.1.1 \ - VORBIS_VERSION=1.3.5 \ - VPX_VERSION=1.8.0 \ - WEBP_VERSION=1.0.2 \ - X264_VERSION=20170226-2245-stable \ - X265_VERSION=3.4 \ - XAU_VERSION=1.0.9 \ - XORG_MACROS_VERSION=1.19.2 \ - XPROTO_VERSION=7.0.31 \ - XVID_VERSION=1.3.4 \ - LIBXML2_VERSION=2.9.10 \ - LIBBLURAY_VERSION=1.1.2 \ - LIBZMQ_VERSION=4.3.2 \ - LIBSRT_VERSION=1.4.1 \ - LIBARIBB24_VERSION=1.0.3 \ - LIBPNG_VERSION=1.6.9 \ - LIBVMAF_VERSION=2.1.1 \ - SRC=/usr/local + AOM_VERSION=v1.0.0 \ + FDKAAC_VERSION=0.1.5 \ + FONTCONFIG_VERSION=2.12.4 \ + FREETYPE_VERSION=2.10.4 \ + FRIBIDI_VERSION=0.19.7 \ + KVAZAAR_VERSION=2.0.0 \ + LAME_VERSION=3.100 \ + LIBARIBB24_VERSION=1.0.3 \ + LIBASS_VERSION=0.13.7 \ + LIBBLURAY_VERSION=1.1.2 \ + LIBPNG_VERSION=1.6.9 \ + LIBPTHREAD_STUBS_VERSION=0.4 \ + LIBSRT_VERSION=1.4.1 \ + LIBVIDSTAB_VERSION=1.1.0 \ + LIBVMAF_VERSION=2.1.1 \ + LIBXCB_VERSION=1.13.1 \ + LIBXML2_VERSION=2.9.10 \ + LIBZMQ_VERSION=4.3.2 \ + OGG_VERSION=1.3.2 \ + OPENCOREAMR_VERSION=0.1.5 \ + OPENJPEG_VERSION=2.1.2 \ + OPUS_VERSION=1.2 \ + THEORA_VERSION=1.1.1 \ + VORBIS_VERSION=1.3.5 \ + VPX_VERSION=1.8.0 \ + WEBP_VERSION=1.0.2 \ + X264_VERSION=20170226-2245-stable \ + X265_VERSION=3.4 \ + XAU_VERSION=1.0.9 \ + XCBPROTO_VERSION=1.13 \ + XORG_MACROS_VERSION=1.19.2 \ + XPROTO_VERSION=7.0.31 \ + XVID_VERSION=1.3.4 \ + ZIMG_VERSION=3.0.3 \ + SRC=/usr/local ARG FREETYPE_SHA256SUM="5eab795ebb23ac77001cfb68b7d4d50b5d6c7469247b0b01b2c953269f658dac freetype-2.10.4.tar.gz" ARG FRIBIDI_SHA256SUM="3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 0.19.7.tar.gz" @@ -99,24 +100,39 @@ RUN buildDeps="autoconf \ zlib1g-dev" && \ apt-get -yqq update && \ apt-get install -yq --no-install-recommends ${buildDeps} +# zimg https://github.com/sekrit-twc/zimg +RUN \ + DIR=/tmp/zimg && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://github.com/sekrit-twc/zimg/archive/refs/tags/release-${ZIMG_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + ./autogen.sh && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} + + + ## libvmaf https://github.com/Netflix/vmaf RUN \ if which meson || false; then \ - echo "Building VMAF." && \ - DIR=/tmp/vmaf && \ - mkdir -p ${DIR} && \ - cd ${DIR} && \ - curl -sLO https://github.com/Netflix/vmaf/archive/v${LIBVMAF_VERSION}.tar.gz && \ - tar -xz --strip-components=1 -f v${LIBVMAF_VERSION}.tar.gz && \ - cd /tmp/vmaf/libvmaf && \ - meson build --buildtype release --prefix=${PREFIX} && \ - ninja -vC build && \ - ninja -vC build install && \ - mkdir -p ${PREFIX}/share/model/ && \ - cp -r /tmp/vmaf/model/* ${PREFIX}/share/model/ && \ - rm -rf ${DIR}; \ + echo "Building VMAF." && \ + DIR=/tmp/vmaf && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/Netflix/vmaf/archive/v${LIBVMAF_VERSION}.tar.gz && \ + tar -xz --strip-components=1 -f v${LIBVMAF_VERSION}.tar.gz && \ + cd /tmp/vmaf/libvmaf && \ + meson build --buildtype release --prefix=${PREFIX} && \ + ninja -vC build && \ + ninja -vC build install && \ + mkdir -p ${PREFIX}/share/model/ && \ + cp -r /tmp/vmaf/model/* ${PREFIX}/share/model/ && \ + rm -rf ${DIR}; \ else \ - echo "VMAF skipped."; \ + echo "VMAF skipped."; \ fi ## opencore-amr https://sourceforge.net/projects/opencore-amr/ @@ -522,40 +538,41 @@ RUN \ --disable-debug \ --disable-doc \ --disable-ffplay \ - --enable-shared \ --enable-avresample \ - --enable-libopencore-amrnb \ - --enable-libopencore-amrwb \ + --enable-fontconfig \ --enable-gpl \ --enable-libass \ - --enable-fontconfig \ + --enable-libbluray \ + --enable-libfdk_aac \ --enable-libfreetype \ - --enable-libvidstab \ --enable-libmp3lame \ + --enable-libopencore-amrnb \ + --enable-libopencore-amrwb \ --enable-libopus \ --enable-libtheora \ + --enable-libvidstab \ --enable-libvorbis \ --enable-libvpx \ --enable-libwebp \ - --enable-libxcb \ + --enable-libx264 \ --enable-libx265 \ + --enable-libxcb \ --enable-libxvid \ - --enable-libx264 \ + --enable-libzmq \ --enable-nonfree \ --enable-openssl \ - --enable-libfdk_aac \ --enable-postproc \ + --enable-shared \ --enable-small \ --enable-version3 \ - --enable-libbluray \ - --enable-libzmq \ + --enable-zimg \ --extra-libs=-ldl \ --prefix="${PREFIX}" \ --enable-libopenjpeg \ --enable-libkvazaar \ --extra-cflags="-I${PREFIX}/include" \ --extra-ldflags="-L${PREFIX}/lib" && \ - make && \ +make && \ make install && \ make tools/zmqsend && cp tools/zmqsend ${PREFIX}/bin/ && \ make distclean && \ diff --git a/docker-images/3.4/vaapi2004/Dockerfile b/docker-images/3.4/vaapi2004/Dockerfile index 37956fa7c..45b72884c 100644 --- a/docker-images/3.4/vaapi2004/Dockerfile +++ b/docker-images/3.4/vaapi2004/Dockerfile @@ -17,40 +17,41 @@ RUN apt-get -yqq update && \ FROM base as build ENV FFMPEG_VERSION=3.4.8 \ - AOM_VERSION=v1.0.0 \ - FDKAAC_VERSION=0.1.5 \ - FONTCONFIG_VERSION=2.12.4 \ - FREETYPE_VERSION=2.10.4 \ - FRIBIDI_VERSION=0.19.7 \ - KVAZAAR_VERSION=2.0.0 \ - LAME_VERSION=3.100 \ - LIBASS_VERSION=0.13.7 \ - LIBPTHREAD_STUBS_VERSION=0.4 \ - LIBVIDSTAB_VERSION=1.1.0 \ - LIBXCB_VERSION=1.13.1 \ - XCBPROTO_VERSION=1.13 \ - OGG_VERSION=1.3.2 \ - OPENCOREAMR_VERSION=0.1.5 \ - OPUS_VERSION=1.2 \ - OPENJPEG_VERSION=2.1.2 \ - THEORA_VERSION=1.1.1 \ - VORBIS_VERSION=1.3.5 \ - VPX_VERSION=1.8.0 \ - WEBP_VERSION=1.0.2 \ - X264_VERSION=20170226-2245-stable \ - X265_VERSION=3.4 \ - XAU_VERSION=1.0.9 \ - XORG_MACROS_VERSION=1.19.2 \ - XPROTO_VERSION=7.0.31 \ - XVID_VERSION=1.3.4 \ - LIBXML2_VERSION=2.9.10 \ - LIBBLURAY_VERSION=1.1.2 \ - LIBZMQ_VERSION=4.3.2 \ - LIBSRT_VERSION=1.4.1 \ - LIBARIBB24_VERSION=1.0.3 \ - LIBPNG_VERSION=1.6.9 \ - LIBVMAF_VERSION=2.1.1 \ - SRC=/usr/local + AOM_VERSION=v1.0.0 \ + FDKAAC_VERSION=0.1.5 \ + FONTCONFIG_VERSION=2.12.4 \ + FREETYPE_VERSION=2.10.4 \ + FRIBIDI_VERSION=0.19.7 \ + KVAZAAR_VERSION=2.0.0 \ + LAME_VERSION=3.100 \ + LIBARIBB24_VERSION=1.0.3 \ + LIBASS_VERSION=0.13.7 \ + LIBBLURAY_VERSION=1.1.2 \ + LIBPNG_VERSION=1.6.9 \ + LIBPTHREAD_STUBS_VERSION=0.4 \ + LIBSRT_VERSION=1.4.1 \ + LIBVIDSTAB_VERSION=1.1.0 \ + LIBVMAF_VERSION=2.1.1 \ + LIBXCB_VERSION=1.13.1 \ + LIBXML2_VERSION=2.9.10 \ + LIBZMQ_VERSION=4.3.2 \ + OGG_VERSION=1.3.2 \ + OPENCOREAMR_VERSION=0.1.5 \ + OPENJPEG_VERSION=2.1.2 \ + OPUS_VERSION=1.2 \ + THEORA_VERSION=1.1.1 \ + VORBIS_VERSION=1.3.5 \ + VPX_VERSION=1.8.0 \ + WEBP_VERSION=1.0.2 \ + X264_VERSION=20170226-2245-stable \ + X265_VERSION=3.4 \ + XAU_VERSION=1.0.9 \ + XCBPROTO_VERSION=1.13 \ + XORG_MACROS_VERSION=1.19.2 \ + XPROTO_VERSION=7.0.31 \ + XVID_VERSION=1.3.4 \ + ZIMG_VERSION=3.0.3 \ + SRC=/usr/local ARG FREETYPE_SHA256SUM="5eab795ebb23ac77001cfb68b7d4d50b5d6c7469247b0b01b2c953269f658dac freetype-2.10.4.tar.gz" ARG FRIBIDI_SHA256SUM="3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 0.19.7.tar.gz" @@ -100,24 +101,39 @@ RUN buildDeps="autoconf \ zlib1g-dev" && \ apt-get -yqq update && \ apt-get install -yq --no-install-recommends ${buildDeps} +# zimg https://github.com/sekrit-twc/zimg +RUN \ + DIR=/tmp/zimg && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://github.com/sekrit-twc/zimg/archive/refs/tags/release-${ZIMG_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + ./autogen.sh && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} + + + ## libvmaf https://github.com/Netflix/vmaf RUN \ if which meson || false; then \ - echo "Building VMAF." && \ - DIR=/tmp/vmaf && \ - mkdir -p ${DIR} && \ - cd ${DIR} && \ - curl -sLO https://github.com/Netflix/vmaf/archive/v${LIBVMAF_VERSION}.tar.gz && \ - tar -xz --strip-components=1 -f v${LIBVMAF_VERSION}.tar.gz && \ - cd /tmp/vmaf/libvmaf && \ - meson build --buildtype release --prefix=${PREFIX} && \ - ninja -vC build && \ - ninja -vC build install && \ - mkdir -p ${PREFIX}/share/model/ && \ - cp -r /tmp/vmaf/model/* ${PREFIX}/share/model/ && \ - rm -rf ${DIR}; \ + echo "Building VMAF." && \ + DIR=/tmp/vmaf && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/Netflix/vmaf/archive/v${LIBVMAF_VERSION}.tar.gz && \ + tar -xz --strip-components=1 -f v${LIBVMAF_VERSION}.tar.gz && \ + cd /tmp/vmaf/libvmaf && \ + meson build --buildtype release --prefix=${PREFIX} && \ + ninja -vC build && \ + ninja -vC build install && \ + mkdir -p ${PREFIX}/share/model/ && \ + cp -r /tmp/vmaf/model/* ${PREFIX}/share/model/ && \ + rm -rf ${DIR}; \ else \ - echo "VMAF skipped."; \ + echo "VMAF skipped."; \ fi ## opencore-amr https://sourceforge.net/projects/opencore-amr/ @@ -523,33 +539,34 @@ RUN \ --disable-debug \ --disable-doc \ --disable-ffplay \ - --enable-shared \ --enable-avresample \ - --enable-libopencore-amrnb \ - --enable-libopencore-amrwb \ + --enable-fontconfig \ --enable-gpl \ --enable-libass \ - --enable-fontconfig \ + --enable-libbluray \ + --enable-libfdk_aac \ --enable-libfreetype \ - --enable-libvidstab \ --enable-libmp3lame \ + --enable-libopencore-amrnb \ + --enable-libopencore-amrwb \ --enable-libopus \ --enable-libtheora \ + --enable-libvidstab \ --enable-libvorbis \ --enable-libvpx \ --enable-libwebp \ - --enable-libxcb \ + --enable-libx264 \ --enable-libx265 \ + --enable-libxcb \ --enable-libxvid \ - --enable-libx264 \ + --enable-libzmq \ --enable-nonfree \ --enable-openssl \ - --enable-libfdk_aac \ --enable-postproc \ + --enable-shared \ --enable-small \ --enable-version3 \ - --enable-libbluray \ - --enable-libzmq \ + --enable-zimg \ --extra-libs=-ldl \ --prefix="${PREFIX}" \ --enable-libopenjpeg \ @@ -557,7 +574,7 @@ RUN \ --enable-vaapi \ --extra-cflags="-I${PREFIX}/include" \ --extra-ldflags="-L${PREFIX}/lib" && \ - make && \ +make && \ make install && \ make tools/zmqsend && cp tools/zmqsend ${PREFIX}/bin/ && \ make distclean && \ diff --git a/docker-images/4.0/alpine312/Dockerfile b/docker-images/4.0/alpine312/Dockerfile index 9b200757c..fb6594ba3 100644 --- a/docker-images/4.0/alpine312/Dockerfile +++ b/docker-images/4.0/alpine312/Dockerfile @@ -14,40 +14,41 @@ FROM base AS build WORKDIR /tmp/workdir ENV FFMPEG_VERSION=4.0.6 \ - AOM_VERSION=v1.0.0 \ - FDKAAC_VERSION=0.1.5 \ - FONTCONFIG_VERSION=2.12.4 \ - FREETYPE_VERSION=2.10.4 \ - FRIBIDI_VERSION=0.19.7 \ - KVAZAAR_VERSION=2.0.0 \ - LAME_VERSION=3.100 \ - LIBASS_VERSION=0.13.7 \ - LIBPTHREAD_STUBS_VERSION=0.4 \ - LIBVIDSTAB_VERSION=1.1.0 \ - LIBXCB_VERSION=1.13.1 \ - XCBPROTO_VERSION=1.13 \ - OGG_VERSION=1.3.2 \ - OPENCOREAMR_VERSION=0.1.5 \ - OPUS_VERSION=1.2 \ - OPENJPEG_VERSION=2.1.2 \ - THEORA_VERSION=1.1.1 \ - VORBIS_VERSION=1.3.5 \ - VPX_VERSION=1.8.0 \ - WEBP_VERSION=1.0.2 \ - X264_VERSION=20170226-2245-stable \ - X265_VERSION=3.4 \ - XAU_VERSION=1.0.9 \ - XORG_MACROS_VERSION=1.19.2 \ - XPROTO_VERSION=7.0.31 \ - XVID_VERSION=1.3.4 \ - LIBXML2_VERSION=2.9.10 \ - LIBBLURAY_VERSION=1.1.2 \ - LIBZMQ_VERSION=4.3.2 \ - LIBSRT_VERSION=1.4.1 \ - LIBARIBB24_VERSION=1.0.3 \ - LIBPNG_VERSION=1.6.9 \ - LIBVMAF_VERSION=2.1.1 \ - SRC=/usr/local + AOM_VERSION=v1.0.0 \ + FDKAAC_VERSION=0.1.5 \ + FONTCONFIG_VERSION=2.12.4 \ + FREETYPE_VERSION=2.10.4 \ + FRIBIDI_VERSION=0.19.7 \ + KVAZAAR_VERSION=2.0.0 \ + LAME_VERSION=3.100 \ + LIBARIBB24_VERSION=1.0.3 \ + LIBASS_VERSION=0.13.7 \ + LIBBLURAY_VERSION=1.1.2 \ + LIBPNG_VERSION=1.6.9 \ + LIBPTHREAD_STUBS_VERSION=0.4 \ + LIBSRT_VERSION=1.4.1 \ + LIBVIDSTAB_VERSION=1.1.0 \ + LIBVMAF_VERSION=2.1.1 \ + LIBXCB_VERSION=1.13.1 \ + LIBXML2_VERSION=2.9.10 \ + LIBZMQ_VERSION=4.3.2 \ + OGG_VERSION=1.3.2 \ + OPENCOREAMR_VERSION=0.1.5 \ + OPENJPEG_VERSION=2.1.2 \ + OPUS_VERSION=1.2 \ + THEORA_VERSION=1.1.1 \ + VORBIS_VERSION=1.3.5 \ + VPX_VERSION=1.8.0 \ + WEBP_VERSION=1.0.2 \ + X264_VERSION=20170226-2245-stable \ + X265_VERSION=3.4 \ + XAU_VERSION=1.0.9 \ + XCBPROTO_VERSION=1.13 \ + XORG_MACROS_VERSION=1.19.2 \ + XPROTO_VERSION=7.0.31 \ + XVID_VERSION=1.3.4 \ + ZIMG_VERSION=3.0.3 \ + SRC=/usr/local ARG FREETYPE_SHA256SUM="5eab795ebb23ac77001cfb68b7d4d50b5d6c7469247b0b01b2c953269f658dac freetype-2.10.4.tar.gz" ARG FRIBIDI_SHA256SUM="3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 0.19.7.tar.gz" @@ -95,24 +96,39 @@ RUN buildDeps="autoconf \ zlib-dev \ expat-dev" && \ apk add --no-cache --update ${buildDeps} +# zimg https://github.com/sekrit-twc/zimg +RUN \ + DIR=/tmp/zimg && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://github.com/sekrit-twc/zimg/archive/refs/tags/release-${ZIMG_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + ./autogen.sh && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} + + + ## libvmaf https://github.com/Netflix/vmaf RUN \ if which meson || false; then \ - echo "Building VMAF." && \ - DIR=/tmp/vmaf && \ - mkdir -p ${DIR} && \ - cd ${DIR} && \ - curl -sLO https://github.com/Netflix/vmaf/archive/v${LIBVMAF_VERSION}.tar.gz && \ - tar -xz --strip-components=1 -f v${LIBVMAF_VERSION}.tar.gz && \ - cd /tmp/vmaf/libvmaf && \ - meson build --buildtype release --prefix=${PREFIX} && \ - ninja -vC build && \ - ninja -vC build install && \ - mkdir -p ${PREFIX}/share/model/ && \ - cp -r /tmp/vmaf/model/* ${PREFIX}/share/model/ && \ - rm -rf ${DIR}; \ + echo "Building VMAF." && \ + DIR=/tmp/vmaf && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/Netflix/vmaf/archive/v${LIBVMAF_VERSION}.tar.gz && \ + tar -xz --strip-components=1 -f v${LIBVMAF_VERSION}.tar.gz && \ + cd /tmp/vmaf/libvmaf && \ + meson build --buildtype release --prefix=${PREFIX} && \ + ninja -vC build && \ + ninja -vC build install && \ + mkdir -p ${PREFIX}/share/model/ && \ + cp -r /tmp/vmaf/model/* ${PREFIX}/share/model/ && \ + rm -rf ${DIR}; \ else \ - echo "VMAF skipped."; \ + echo "VMAF skipped."; \ fi ## opencore-amr https://sourceforge.net/projects/opencore-amr/ @@ -518,33 +534,34 @@ RUN \ --disable-debug \ --disable-doc \ --disable-ffplay \ - --enable-shared \ --enable-avresample \ - --enable-libopencore-amrnb \ - --enable-libopencore-amrwb \ + --enable-fontconfig \ --enable-gpl \ --enable-libass \ - --enable-fontconfig \ + --enable-libbluray \ + --enable-libfdk_aac \ --enable-libfreetype \ - --enable-libvidstab \ --enable-libmp3lame \ + --enable-libopencore-amrnb \ + --enable-libopencore-amrwb \ --enable-libopus \ --enable-libtheora \ + --enable-libvidstab \ --enable-libvorbis \ --enable-libvpx \ --enable-libwebp \ - --enable-libxcb \ + --enable-libx264 \ --enable-libx265 \ + --enable-libxcb \ --enable-libxvid \ - --enable-libx264 \ + --enable-libzmq \ --enable-nonfree \ --enable-openssl \ - --enable-libfdk_aac \ --enable-postproc \ + --enable-shared \ --enable-small \ --enable-version3 \ - --enable-libbluray \ - --enable-libzmq \ + --enable-zimg \ --extra-libs=-ldl \ --prefix="${PREFIX}" \ --enable-libopenjpeg \ @@ -554,7 +571,7 @@ RUN \ --enable-libsrt \ --extra-cflags="-I${PREFIX}/include" \ --extra-ldflags="-L${PREFIX}/lib" && \ - make && \ +make && \ make install && \ make tools/zmqsend && cp tools/zmqsend ${PREFIX}/bin/ && \ make distclean && \ diff --git a/docker-images/4.0/centos7/Dockerfile b/docker-images/4.0/centos7/Dockerfile index 96c67c959..8bb93fb53 100644 --- a/docker-images/4.0/centos7/Dockerfile +++ b/docker-images/4.0/centos7/Dockerfile @@ -16,40 +16,41 @@ FROM base AS build WORKDIR /tmp/workdir ENV FFMPEG_VERSION=4.0.6 \ - AOM_VERSION=v1.0.0 \ - FDKAAC_VERSION=0.1.5 \ - FONTCONFIG_VERSION=2.12.4 \ - FREETYPE_VERSION=2.10.4 \ - FRIBIDI_VERSION=0.19.7 \ - KVAZAAR_VERSION=2.0.0 \ - LAME_VERSION=3.100 \ - LIBASS_VERSION=0.13.7 \ - LIBPTHREAD_STUBS_VERSION=0.4 \ - LIBVIDSTAB_VERSION=1.1.0 \ - LIBXCB_VERSION=1.13.1 \ - XCBPROTO_VERSION=1.13 \ - OGG_VERSION=1.3.2 \ - OPENCOREAMR_VERSION=0.1.5 \ - OPUS_VERSION=1.2 \ - OPENJPEG_VERSION=2.1.2 \ - THEORA_VERSION=1.1.1 \ - VORBIS_VERSION=1.3.5 \ - VPX_VERSION=1.8.0 \ - WEBP_VERSION=1.0.2 \ - X264_VERSION=20170226-2245-stable \ - X265_VERSION=3.4 \ - XAU_VERSION=1.0.9 \ - XORG_MACROS_VERSION=1.19.2 \ - XPROTO_VERSION=7.0.31 \ - XVID_VERSION=1.3.4 \ - LIBXML2_VERSION=2.9.10 \ - LIBBLURAY_VERSION=1.1.2 \ - LIBZMQ_VERSION=4.3.2 \ - LIBSRT_VERSION=1.4.1 \ - LIBARIBB24_VERSION=1.0.3 \ - LIBPNG_VERSION=1.6.9 \ - LIBVMAF_VERSION=2.1.1 \ - SRC=/usr/local + AOM_VERSION=v1.0.0 \ + FDKAAC_VERSION=0.1.5 \ + FONTCONFIG_VERSION=2.12.4 \ + FREETYPE_VERSION=2.10.4 \ + FRIBIDI_VERSION=0.19.7 \ + KVAZAAR_VERSION=2.0.0 \ + LAME_VERSION=3.100 \ + LIBARIBB24_VERSION=1.0.3 \ + LIBASS_VERSION=0.13.7 \ + LIBBLURAY_VERSION=1.1.2 \ + LIBPNG_VERSION=1.6.9 \ + LIBPTHREAD_STUBS_VERSION=0.4 \ + LIBSRT_VERSION=1.4.1 \ + LIBVIDSTAB_VERSION=1.1.0 \ + LIBVMAF_VERSION=2.1.1 \ + LIBXCB_VERSION=1.13.1 \ + LIBXML2_VERSION=2.9.10 \ + LIBZMQ_VERSION=4.3.2 \ + OGG_VERSION=1.3.2 \ + OPENCOREAMR_VERSION=0.1.5 \ + OPENJPEG_VERSION=2.1.2 \ + OPUS_VERSION=1.2 \ + THEORA_VERSION=1.1.1 \ + VORBIS_VERSION=1.3.5 \ + VPX_VERSION=1.8.0 \ + WEBP_VERSION=1.0.2 \ + X264_VERSION=20170226-2245-stable \ + X265_VERSION=3.4 \ + XAU_VERSION=1.0.9 \ + XCBPROTO_VERSION=1.13 \ + XORG_MACROS_VERSION=1.19.2 \ + XPROTO_VERSION=7.0.31 \ + XVID_VERSION=1.3.4 \ + ZIMG_VERSION=3.0.3 \ + SRC=/usr/local ARG FREETYPE_SHA256SUM="5eab795ebb23ac77001cfb68b7d4d50b5d6c7469247b0b01b2c953269f658dac freetype-2.10.4.tar.gz" ARG FRIBIDI_SHA256SUM="3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 0.19.7.tar.gz" @@ -132,24 +133,39 @@ RUN buildDeps="autoconf \ yum history undo $(yum history info | grep 'Transaction ID' | awk -F: '{print$2}' | tr -d ' ') -y && \ yum autoremove -y +# zimg https://github.com/sekrit-twc/zimg +RUN \ + DIR=/tmp/zimg && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://github.com/sekrit-twc/zimg/archive/refs/tags/release-${ZIMG_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + ./autogen.sh && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} + + + ## libvmaf https://github.com/Netflix/vmaf RUN \ if which meson || false; then \ - echo "Building VMAF." && \ - DIR=/tmp/vmaf && \ - mkdir -p ${DIR} && \ - cd ${DIR} && \ - curl -sLO https://github.com/Netflix/vmaf/archive/v${LIBVMAF_VERSION}.tar.gz && \ - tar -xz --strip-components=1 -f v${LIBVMAF_VERSION}.tar.gz && \ - cd /tmp/vmaf/libvmaf && \ - meson build --buildtype release --prefix=${PREFIX} && \ - ninja -vC build && \ - ninja -vC build install && \ - mkdir -p ${PREFIX}/share/model/ && \ - cp -r /tmp/vmaf/model/* ${PREFIX}/share/model/ && \ - rm -rf ${DIR}; \ + echo "Building VMAF." && \ + DIR=/tmp/vmaf && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/Netflix/vmaf/archive/v${LIBVMAF_VERSION}.tar.gz && \ + tar -xz --strip-components=1 -f v${LIBVMAF_VERSION}.tar.gz && \ + cd /tmp/vmaf/libvmaf && \ + meson build --buildtype release --prefix=${PREFIX} && \ + ninja -vC build && \ + ninja -vC build install && \ + mkdir -p ${PREFIX}/share/model/ && \ + cp -r /tmp/vmaf/model/* ${PREFIX}/share/model/ && \ + rm -rf ${DIR}; \ else \ - echo "VMAF skipped."; \ + echo "VMAF skipped."; \ fi ## opencore-amr https://sourceforge.net/projects/opencore-amr/ @@ -555,33 +571,34 @@ RUN \ --disable-debug \ --disable-doc \ --disable-ffplay \ - --enable-shared \ --enable-avresample \ - --enable-libopencore-amrnb \ - --enable-libopencore-amrwb \ + --enable-fontconfig \ --enable-gpl \ --enable-libass \ - --enable-fontconfig \ + --enable-libbluray \ + --enable-libfdk_aac \ --enable-libfreetype \ - --enable-libvidstab \ --enable-libmp3lame \ + --enable-libopencore-amrnb \ + --enable-libopencore-amrwb \ --enable-libopus \ --enable-libtheora \ + --enable-libvidstab \ --enable-libvorbis \ --enable-libvpx \ --enable-libwebp \ - --enable-libxcb \ + --enable-libx264 \ --enable-libx265 \ + --enable-libxcb \ --enable-libxvid \ - --enable-libx264 \ + --enable-libzmq \ --enable-nonfree \ --enable-openssl \ - --enable-libfdk_aac \ --enable-postproc \ + --enable-shared \ --enable-small \ --enable-version3 \ - --enable-libbluray \ - --enable-libzmq \ + --enable-zimg \ --extra-libs=-ldl \ --prefix="${PREFIX}" \ --enable-libopenjpeg \ @@ -591,7 +608,7 @@ RUN \ --enable-libsrt \ --extra-cflags="-I${PREFIX}/include" \ --extra-ldflags="-L${PREFIX}/lib" && \ - make && \ +make && \ make install && \ make tools/zmqsend && cp tools/zmqsend ${PREFIX}/bin/ && \ make distclean && \ diff --git a/docker-images/4.0/centos8/Dockerfile b/docker-images/4.0/centos8/Dockerfile index 78f7efe03..1486bec82 100644 --- a/docker-images/4.0/centos8/Dockerfile +++ b/docker-images/4.0/centos8/Dockerfile @@ -16,40 +16,41 @@ FROM base AS build WORKDIR /tmp/workdir ENV FFMPEG_VERSION=4.0.6 \ - AOM_VERSION=v1.0.0 \ - FDKAAC_VERSION=0.1.5 \ - FONTCONFIG_VERSION=2.12.4 \ - FREETYPE_VERSION=2.10.4 \ - FRIBIDI_VERSION=0.19.7 \ - KVAZAAR_VERSION=2.0.0 \ - LAME_VERSION=3.100 \ - LIBASS_VERSION=0.13.7 \ - LIBPTHREAD_STUBS_VERSION=0.4 \ - LIBVIDSTAB_VERSION=1.1.0 \ - LIBXCB_VERSION=1.13.1 \ - XCBPROTO_VERSION=1.13 \ - OGG_VERSION=1.3.2 \ - OPENCOREAMR_VERSION=0.1.5 \ - OPUS_VERSION=1.2 \ - OPENJPEG_VERSION=2.1.2 \ - THEORA_VERSION=1.1.1 \ - VORBIS_VERSION=1.3.5 \ - VPX_VERSION=1.8.0 \ - WEBP_VERSION=1.0.2 \ - X264_VERSION=20170226-2245-stable \ - X265_VERSION=3.4 \ - XAU_VERSION=1.0.9 \ - XORG_MACROS_VERSION=1.19.2 \ - XPROTO_VERSION=7.0.31 \ - XVID_VERSION=1.3.4 \ - LIBXML2_VERSION=2.9.10 \ - LIBBLURAY_VERSION=1.1.2 \ - LIBZMQ_VERSION=4.3.2 \ - LIBSRT_VERSION=1.4.1 \ - LIBARIBB24_VERSION=1.0.3 \ - LIBPNG_VERSION=1.6.9 \ - LIBVMAF_VERSION=2.1.1 \ - SRC=/usr/local + AOM_VERSION=v1.0.0 \ + FDKAAC_VERSION=0.1.5 \ + FONTCONFIG_VERSION=2.12.4 \ + FREETYPE_VERSION=2.10.4 \ + FRIBIDI_VERSION=0.19.7 \ + KVAZAAR_VERSION=2.0.0 \ + LAME_VERSION=3.100 \ + LIBARIBB24_VERSION=1.0.3 \ + LIBASS_VERSION=0.13.7 \ + LIBBLURAY_VERSION=1.1.2 \ + LIBPNG_VERSION=1.6.9 \ + LIBPTHREAD_STUBS_VERSION=0.4 \ + LIBSRT_VERSION=1.4.1 \ + LIBVIDSTAB_VERSION=1.1.0 \ + LIBVMAF_VERSION=2.1.1 \ + LIBXCB_VERSION=1.13.1 \ + LIBXML2_VERSION=2.9.10 \ + LIBZMQ_VERSION=4.3.2 \ + OGG_VERSION=1.3.2 \ + OPENCOREAMR_VERSION=0.1.5 \ + OPENJPEG_VERSION=2.1.2 \ + OPUS_VERSION=1.2 \ + THEORA_VERSION=1.1.1 \ + VORBIS_VERSION=1.3.5 \ + VPX_VERSION=1.8.0 \ + WEBP_VERSION=1.0.2 \ + X264_VERSION=20170226-2245-stable \ + X265_VERSION=3.4 \ + XAU_VERSION=1.0.9 \ + XCBPROTO_VERSION=1.13 \ + XORG_MACROS_VERSION=1.19.2 \ + XPROTO_VERSION=7.0.31 \ + XVID_VERSION=1.3.4 \ + ZIMG_VERSION=3.0.3 \ + SRC=/usr/local ARG FREETYPE_SHA256SUM="5eab795ebb23ac77001cfb68b7d4d50b5d6c7469247b0b01b2c953269f658dac freetype-2.10.4.tar.gz" ARG FRIBIDI_SHA256SUM="3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 0.19.7.tar.gz" @@ -101,24 +102,39 @@ RUN buildDeps="autoconf \ yum config-manager --set-enabled powertools && \ dnf install -y ${buildDeps} && \ alternatives --set python /usr/bin/python3 +# zimg https://github.com/sekrit-twc/zimg +RUN \ + DIR=/tmp/zimg && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://github.com/sekrit-twc/zimg/archive/refs/tags/release-${ZIMG_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + ./autogen.sh && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} + + + ## libvmaf https://github.com/Netflix/vmaf RUN \ if which meson || false; then \ - echo "Building VMAF." && \ - DIR=/tmp/vmaf && \ - mkdir -p ${DIR} && \ - cd ${DIR} && \ - curl -sLO https://github.com/Netflix/vmaf/archive/v${LIBVMAF_VERSION}.tar.gz && \ - tar -xz --strip-components=1 -f v${LIBVMAF_VERSION}.tar.gz && \ - cd /tmp/vmaf/libvmaf && \ - meson build --buildtype release --prefix=${PREFIX} && \ - ninja -vC build && \ - ninja -vC build install && \ - mkdir -p ${PREFIX}/share/model/ && \ - cp -r /tmp/vmaf/model/* ${PREFIX}/share/model/ && \ - rm -rf ${DIR}; \ + echo "Building VMAF." && \ + DIR=/tmp/vmaf && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/Netflix/vmaf/archive/v${LIBVMAF_VERSION}.tar.gz && \ + tar -xz --strip-components=1 -f v${LIBVMAF_VERSION}.tar.gz && \ + cd /tmp/vmaf/libvmaf && \ + meson build --buildtype release --prefix=${PREFIX} && \ + ninja -vC build && \ + ninja -vC build install && \ + mkdir -p ${PREFIX}/share/model/ && \ + cp -r /tmp/vmaf/model/* ${PREFIX}/share/model/ && \ + rm -rf ${DIR}; \ else \ - echo "VMAF skipped."; \ + echo "VMAF skipped."; \ fi ## opencore-amr https://sourceforge.net/projects/opencore-amr/ @@ -524,33 +540,34 @@ RUN \ --disable-debug \ --disable-doc \ --disable-ffplay \ - --enable-shared \ --enable-avresample \ - --enable-libopencore-amrnb \ - --enable-libopencore-amrwb \ + --enable-fontconfig \ --enable-gpl \ --enable-libass \ - --enable-fontconfig \ + --enable-libbluray \ + --enable-libfdk_aac \ --enable-libfreetype \ - --enable-libvidstab \ --enable-libmp3lame \ + --enable-libopencore-amrnb \ + --enable-libopencore-amrwb \ --enable-libopus \ --enable-libtheora \ + --enable-libvidstab \ --enable-libvorbis \ --enable-libvpx \ --enable-libwebp \ - --enable-libxcb \ + --enable-libx264 \ --enable-libx265 \ + --enable-libxcb \ --enable-libxvid \ - --enable-libx264 \ + --enable-libzmq \ --enable-nonfree \ --enable-openssl \ - --enable-libfdk_aac \ --enable-postproc \ + --enable-shared \ --enable-small \ --enable-version3 \ - --enable-libbluray \ - --enable-libzmq \ + --enable-zimg \ --extra-libs=-ldl \ --prefix="${PREFIX}" \ --enable-libopenjpeg \ @@ -560,7 +577,7 @@ RUN \ --enable-libsrt \ --extra-cflags="-I${PREFIX}/include" \ --extra-ldflags="-L${PREFIX}/lib" && \ - make && \ +make && \ make install && \ make tools/zmqsend && cp tools/zmqsend ${PREFIX}/bin/ && \ make distclean && \ diff --git a/docker-images/4.0/nvidia2004/Dockerfile b/docker-images/4.0/nvidia2004/Dockerfile index d5de136e5..59dfd7c97 100644 --- a/docker-images/4.0/nvidia2004/Dockerfile +++ b/docker-images/4.0/nvidia2004/Dockerfile @@ -34,40 +34,41 @@ FROM devel-base as build ENV NVIDIA_HEADERS_VERSION=11.1.5.0 ENV FFMPEG_VERSION=4.0.6 \ - AOM_VERSION=v1.0.0 \ - FDKAAC_VERSION=0.1.5 \ - FONTCONFIG_VERSION=2.12.4 \ - FREETYPE_VERSION=2.10.4 \ - FRIBIDI_VERSION=0.19.7 \ - KVAZAAR_VERSION=2.0.0 \ - LAME_VERSION=3.100 \ - LIBASS_VERSION=0.13.7 \ - LIBPTHREAD_STUBS_VERSION=0.4 \ - LIBVIDSTAB_VERSION=1.1.0 \ - LIBXCB_VERSION=1.13.1 \ - XCBPROTO_VERSION=1.13 \ - OGG_VERSION=1.3.2 \ - OPENCOREAMR_VERSION=0.1.5 \ - OPUS_VERSION=1.2 \ - OPENJPEG_VERSION=2.1.2 \ - THEORA_VERSION=1.1.1 \ - VORBIS_VERSION=1.3.5 \ - VPX_VERSION=1.8.0 \ - WEBP_VERSION=1.0.2 \ - X264_VERSION=20170226-2245-stable \ - X265_VERSION=3.4 \ - XAU_VERSION=1.0.9 \ - XORG_MACROS_VERSION=1.19.2 \ - XPROTO_VERSION=7.0.31 \ - XVID_VERSION=1.3.4 \ - LIBXML2_VERSION=2.9.10 \ - LIBBLURAY_VERSION=1.1.2 \ - LIBZMQ_VERSION=4.3.2 \ - LIBSRT_VERSION=1.4.1 \ - LIBARIBB24_VERSION=1.0.3 \ - LIBPNG_VERSION=1.6.9 \ - LIBVMAF_VERSION=2.1.1 \ - SRC=/usr/local + AOM_VERSION=v1.0.0 \ + FDKAAC_VERSION=0.1.5 \ + FONTCONFIG_VERSION=2.12.4 \ + FREETYPE_VERSION=2.10.4 \ + FRIBIDI_VERSION=0.19.7 \ + KVAZAAR_VERSION=2.0.0 \ + LAME_VERSION=3.100 \ + LIBARIBB24_VERSION=1.0.3 \ + LIBASS_VERSION=0.13.7 \ + LIBBLURAY_VERSION=1.1.2 \ + LIBPNG_VERSION=1.6.9 \ + LIBPTHREAD_STUBS_VERSION=0.4 \ + LIBSRT_VERSION=1.4.1 \ + LIBVIDSTAB_VERSION=1.1.0 \ + LIBVMAF_VERSION=2.1.1 \ + LIBXCB_VERSION=1.13.1 \ + LIBXML2_VERSION=2.9.10 \ + LIBZMQ_VERSION=4.3.2 \ + OGG_VERSION=1.3.2 \ + OPENCOREAMR_VERSION=0.1.5 \ + OPENJPEG_VERSION=2.1.2 \ + OPUS_VERSION=1.2 \ + THEORA_VERSION=1.1.1 \ + VORBIS_VERSION=1.3.5 \ + VPX_VERSION=1.8.0 \ + WEBP_VERSION=1.0.2 \ + X264_VERSION=20170226-2245-stable \ + X265_VERSION=3.4 \ + XAU_VERSION=1.0.9 \ + XCBPROTO_VERSION=1.13 \ + XORG_MACROS_VERSION=1.19.2 \ + XPROTO_VERSION=7.0.31 \ + XVID_VERSION=1.3.4 \ + ZIMG_VERSION=3.0.3 \ + SRC=/usr/local ARG FREETYPE_SHA256SUM="5eab795ebb23ac77001cfb68b7d4d50b5d6c7469247b0b01b2c953269f658dac freetype-2.10.4.tar.gz" ARG FRIBIDI_SHA256SUM="3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 0.19.7.tar.gz" @@ -123,24 +124,39 @@ RUN \ make install PREFIX="${PREFIX}" && \ rm -rf ${DIR} +# zimg https://github.com/sekrit-twc/zimg +RUN \ + DIR=/tmp/zimg && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://github.com/sekrit-twc/zimg/archive/refs/tags/release-${ZIMG_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + ./autogen.sh && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} + + + ## libvmaf https://github.com/Netflix/vmaf RUN \ if which meson || false; then \ - echo "Building VMAF." && \ - DIR=/tmp/vmaf && \ - mkdir -p ${DIR} && \ - cd ${DIR} && \ - curl -sLO https://github.com/Netflix/vmaf/archive/v${LIBVMAF_VERSION}.tar.gz && \ - tar -xz --strip-components=1 -f v${LIBVMAF_VERSION}.tar.gz && \ - cd /tmp/vmaf/libvmaf && \ - meson build --buildtype release --prefix=${PREFIX} && \ - ninja -vC build && \ - ninja -vC build install && \ - mkdir -p ${PREFIX}/share/model/ && \ - cp -r /tmp/vmaf/model/* ${PREFIX}/share/model/ && \ - rm -rf ${DIR}; \ + echo "Building VMAF." && \ + DIR=/tmp/vmaf && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/Netflix/vmaf/archive/v${LIBVMAF_VERSION}.tar.gz && \ + tar -xz --strip-components=1 -f v${LIBVMAF_VERSION}.tar.gz && \ + cd /tmp/vmaf/libvmaf && \ + meson build --buildtype release --prefix=${PREFIX} && \ + ninja -vC build && \ + ninja -vC build install && \ + mkdir -p ${PREFIX}/share/model/ && \ + cp -r /tmp/vmaf/model/* ${PREFIX}/share/model/ && \ + rm -rf ${DIR}; \ else \ - echo "VMAF skipped."; \ + echo "VMAF skipped."; \ fi ## opencore-amr https://sourceforge.net/projects/opencore-amr/ @@ -546,33 +562,34 @@ RUN \ --disable-debug \ --disable-doc \ --disable-ffplay \ - --enable-shared \ --enable-avresample \ - --enable-libopencore-amrnb \ - --enable-libopencore-amrwb \ + --enable-fontconfig \ --enable-gpl \ --enable-libass \ - --enable-fontconfig \ + --enable-libbluray \ + --enable-libfdk_aac \ --enable-libfreetype \ - --enable-libvidstab \ --enable-libmp3lame \ + --enable-libopencore-amrnb \ + --enable-libopencore-amrwb \ --enable-libopus \ --enable-libtheora \ + --enable-libvidstab \ --enable-libvorbis \ --enable-libvpx \ --enable-libwebp \ - --enable-libxcb \ + --enable-libx264 \ --enable-libx265 \ + --enable-libxcb \ --enable-libxvid \ - --enable-libx264 \ + --enable-libzmq \ --enable-nonfree \ --enable-openssl \ - --enable-libfdk_aac \ --enable-postproc \ + --enable-shared \ --enable-small \ --enable-version3 \ - --enable-libbluray \ - --enable-libzmq \ + --enable-zimg \ --extra-libs=-ldl \ --prefix="${PREFIX}" \ --enable-libopenjpeg \ @@ -586,7 +603,7 @@ RUN \ --enable-libnpp \ --extra-cflags="-I${PREFIX}/include -I${PREFIX}/include/ffnvcodec -I/usr/local/cuda/include/" \ --extra-ldflags="-L${PREFIX}/lib -L/usr/local/cuda/lib64 -L/usr/local/cuda/lib32/" && \ - make && \ +make && \ make install && \ make tools/zmqsend && cp tools/zmqsend ${PREFIX}/bin/ && \ make distclean && \ diff --git a/docker-images/4.0/scratch312/Dockerfile b/docker-images/4.0/scratch312/Dockerfile index 1dd8c4e05..740002f50 100644 --- a/docker-images/4.0/scratch312/Dockerfile +++ b/docker-images/4.0/scratch312/Dockerfile @@ -9,40 +9,41 @@ FROM alpine:3.12 AS build WORKDIR /tmp/workdir ENV FFMPEG_VERSION=4.0.6 \ - AOM_VERSION=v1.0.0 \ - FDKAAC_VERSION=0.1.5 \ - FONTCONFIG_VERSION=2.12.4 \ - FREETYPE_VERSION=2.10.4 \ - FRIBIDI_VERSION=0.19.7 \ - KVAZAAR_VERSION=2.0.0 \ - LAME_VERSION=3.100 \ - LIBASS_VERSION=0.13.7 \ - LIBPTHREAD_STUBS_VERSION=0.4 \ - LIBVIDSTAB_VERSION=1.1.0 \ - LIBXCB_VERSION=1.13.1 \ - XCBPROTO_VERSION=1.13 \ - OGG_VERSION=1.3.2 \ - OPENCOREAMR_VERSION=0.1.5 \ - OPUS_VERSION=1.2 \ - OPENJPEG_VERSION=2.1.2 \ - THEORA_VERSION=1.1.1 \ - VORBIS_VERSION=1.3.5 \ - VPX_VERSION=1.8.0 \ - WEBP_VERSION=1.0.2 \ - X264_VERSION=20170226-2245-stable \ - X265_VERSION=3.4 \ - XAU_VERSION=1.0.9 \ - XORG_MACROS_VERSION=1.19.2 \ - XPROTO_VERSION=7.0.31 \ - XVID_VERSION=1.3.4 \ - LIBXML2_VERSION=2.9.10 \ - LIBBLURAY_VERSION=1.1.2 \ - LIBZMQ_VERSION=4.3.2 \ - LIBSRT_VERSION=1.4.1 \ - LIBARIBB24_VERSION=1.0.3 \ - LIBPNG_VERSION=1.6.9 \ - LIBVMAF_VERSION=2.1.1 \ - SRC=/usr/local + AOM_VERSION=v1.0.0 \ + FDKAAC_VERSION=0.1.5 \ + FONTCONFIG_VERSION=2.12.4 \ + FREETYPE_VERSION=2.10.4 \ + FRIBIDI_VERSION=0.19.7 \ + KVAZAAR_VERSION=2.0.0 \ + LAME_VERSION=3.100 \ + LIBARIBB24_VERSION=1.0.3 \ + LIBASS_VERSION=0.13.7 \ + LIBBLURAY_VERSION=1.1.2 \ + LIBPNG_VERSION=1.6.9 \ + LIBPTHREAD_STUBS_VERSION=0.4 \ + LIBSRT_VERSION=1.4.1 \ + LIBVIDSTAB_VERSION=1.1.0 \ + LIBVMAF_VERSION=2.1.1 \ + LIBXCB_VERSION=1.13.1 \ + LIBXML2_VERSION=2.9.10 \ + LIBZMQ_VERSION=4.3.2 \ + OGG_VERSION=1.3.2 \ + OPENCOREAMR_VERSION=0.1.5 \ + OPENJPEG_VERSION=2.1.2 \ + OPUS_VERSION=1.2 \ + THEORA_VERSION=1.1.1 \ + VORBIS_VERSION=1.3.5 \ + VPX_VERSION=1.8.0 \ + WEBP_VERSION=1.0.2 \ + X264_VERSION=20170226-2245-stable \ + X265_VERSION=3.4 \ + XAU_VERSION=1.0.9 \ + XCBPROTO_VERSION=1.13 \ + XORG_MACROS_VERSION=1.19.2 \ + XPROTO_VERSION=7.0.31 \ + XVID_VERSION=1.3.4 \ + ZIMG_VERSION=3.0.3 \ + SRC=/usr/local ARG FREETYPE_SHA256SUM="5eab795ebb23ac77001cfb68b7d4d50b5d6c7469247b0b01b2c953269f658dac freetype-2.10.4.tar.gz" ARG FRIBIDI_SHA256SUM="3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 0.19.7.tar.gz" @@ -97,24 +98,39 @@ RUN buildDeps="autoconf \ libssl1.1" && \ apk add --update ${buildDeps} +# zimg https://github.com/sekrit-twc/zimg +RUN \ + DIR=/tmp/zimg && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://github.com/sekrit-twc/zimg/archive/refs/tags/release-${ZIMG_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + ./autogen.sh && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} + + + ## libvmaf https://github.com/Netflix/vmaf RUN \ if which meson || false; then \ - echo "Building VMAF." && \ - DIR=/tmp/vmaf && \ - mkdir -p ${DIR} && \ - cd ${DIR} && \ - curl -sLO https://github.com/Netflix/vmaf/archive/v${LIBVMAF_VERSION}.tar.gz && \ - tar -xz --strip-components=1 -f v${LIBVMAF_VERSION}.tar.gz && \ - cd /tmp/vmaf/libvmaf && \ - meson build --buildtype release --prefix=${PREFIX} && \ - ninja -vC build && \ - ninja -vC build install && \ - mkdir -p ${PREFIX}/share/model/ && \ - cp -r /tmp/vmaf/model/* ${PREFIX}/share/model/ && \ - rm -rf ${DIR}; \ + echo "Building VMAF." && \ + DIR=/tmp/vmaf && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/Netflix/vmaf/archive/v${LIBVMAF_VERSION}.tar.gz && \ + tar -xz --strip-components=1 -f v${LIBVMAF_VERSION}.tar.gz && \ + cd /tmp/vmaf/libvmaf && \ + meson build --buildtype release --prefix=${PREFIX} && \ + ninja -vC build && \ + ninja -vC build install && \ + mkdir -p ${PREFIX}/share/model/ && \ + cp -r /tmp/vmaf/model/* ${PREFIX}/share/model/ && \ + rm -rf ${DIR}; \ else \ - echo "VMAF skipped."; \ + echo "VMAF skipped."; \ fi ## opencore-amr https://sourceforge.net/projects/opencore-amr/ @@ -520,33 +536,34 @@ RUN \ --disable-debug \ --disable-doc \ --disable-ffplay \ - --enable-shared \ --enable-avresample \ - --enable-libopencore-amrnb \ - --enable-libopencore-amrwb \ + --enable-fontconfig \ --enable-gpl \ --enable-libass \ - --enable-fontconfig \ + --enable-libbluray \ + --enable-libfdk_aac \ --enable-libfreetype \ - --enable-libvidstab \ --enable-libmp3lame \ + --enable-libopencore-amrnb \ + --enable-libopencore-amrwb \ --enable-libopus \ --enable-libtheora \ + --enable-libvidstab \ --enable-libvorbis \ --enable-libvpx \ --enable-libwebp \ - --enable-libxcb \ + --enable-libx264 \ --enable-libx265 \ + --enable-libxcb \ --enable-libxvid \ - --enable-libx264 \ + --enable-libzmq \ --enable-nonfree \ --enable-openssl \ - --enable-libfdk_aac \ --enable-postproc \ + --enable-shared \ --enable-small \ --enable-version3 \ - --enable-libbluray \ - --enable-libzmq \ + --enable-zimg \ --extra-libs=-ldl \ --prefix="${PREFIX}" \ --enable-libopenjpeg \ @@ -556,7 +573,7 @@ RUN \ --enable-libsrt \ --extra-cflags="-I${PREFIX}/include" \ --extra-ldflags="-L${PREFIX}/lib" && \ - make && \ +make && \ make install && \ make tools/zmqsend && cp tools/zmqsend ${PREFIX}/bin/ && \ make distclean && \ diff --git a/docker-images/4.0/ubuntu1804/Dockerfile b/docker-images/4.0/ubuntu1804/Dockerfile index f8ac152d3..0ae87d6a8 100644 --- a/docker-images/4.0/ubuntu1804/Dockerfile +++ b/docker-images/4.0/ubuntu1804/Dockerfile @@ -17,40 +17,41 @@ RUN apt-get -yqq update && \ FROM base as build ENV FFMPEG_VERSION=4.0.6 \ - AOM_VERSION=v1.0.0 \ - FDKAAC_VERSION=0.1.5 \ - FONTCONFIG_VERSION=2.12.4 \ - FREETYPE_VERSION=2.10.4 \ - FRIBIDI_VERSION=0.19.7 \ - KVAZAAR_VERSION=2.0.0 \ - LAME_VERSION=3.100 \ - LIBASS_VERSION=0.13.7 \ - LIBPTHREAD_STUBS_VERSION=0.4 \ - LIBVIDSTAB_VERSION=1.1.0 \ - LIBXCB_VERSION=1.13.1 \ - XCBPROTO_VERSION=1.13 \ - OGG_VERSION=1.3.2 \ - OPENCOREAMR_VERSION=0.1.5 \ - OPUS_VERSION=1.2 \ - OPENJPEG_VERSION=2.1.2 \ - THEORA_VERSION=1.1.1 \ - VORBIS_VERSION=1.3.5 \ - VPX_VERSION=1.8.0 \ - WEBP_VERSION=1.0.2 \ - X264_VERSION=20170226-2245-stable \ - X265_VERSION=3.4 \ - XAU_VERSION=1.0.9 \ - XORG_MACROS_VERSION=1.19.2 \ - XPROTO_VERSION=7.0.31 \ - XVID_VERSION=1.3.4 \ - LIBXML2_VERSION=2.9.10 \ - LIBBLURAY_VERSION=1.1.2 \ - LIBZMQ_VERSION=4.3.2 \ - LIBSRT_VERSION=1.4.1 \ - LIBARIBB24_VERSION=1.0.3 \ - LIBPNG_VERSION=1.6.9 \ - LIBVMAF_VERSION=2.1.1 \ - SRC=/usr/local + AOM_VERSION=v1.0.0 \ + FDKAAC_VERSION=0.1.5 \ + FONTCONFIG_VERSION=2.12.4 \ + FREETYPE_VERSION=2.10.4 \ + FRIBIDI_VERSION=0.19.7 \ + KVAZAAR_VERSION=2.0.0 \ + LAME_VERSION=3.100 \ + LIBARIBB24_VERSION=1.0.3 \ + LIBASS_VERSION=0.13.7 \ + LIBBLURAY_VERSION=1.1.2 \ + LIBPNG_VERSION=1.6.9 \ + LIBPTHREAD_STUBS_VERSION=0.4 \ + LIBSRT_VERSION=1.4.1 \ + LIBVIDSTAB_VERSION=1.1.0 \ + LIBVMAF_VERSION=2.1.1 \ + LIBXCB_VERSION=1.13.1 \ + LIBXML2_VERSION=2.9.10 \ + LIBZMQ_VERSION=4.3.2 \ + OGG_VERSION=1.3.2 \ + OPENCOREAMR_VERSION=0.1.5 \ + OPENJPEG_VERSION=2.1.2 \ + OPUS_VERSION=1.2 \ + THEORA_VERSION=1.1.1 \ + VORBIS_VERSION=1.3.5 \ + VPX_VERSION=1.8.0 \ + WEBP_VERSION=1.0.2 \ + X264_VERSION=20170226-2245-stable \ + X265_VERSION=3.4 \ + XAU_VERSION=1.0.9 \ + XCBPROTO_VERSION=1.13 \ + XORG_MACROS_VERSION=1.19.2 \ + XPROTO_VERSION=7.0.31 \ + XVID_VERSION=1.3.4 \ + ZIMG_VERSION=3.0.3 \ + SRC=/usr/local ARG FREETYPE_SHA256SUM="5eab795ebb23ac77001cfb68b7d4d50b5d6c7469247b0b01b2c953269f658dac freetype-2.10.4.tar.gz" ARG FRIBIDI_SHA256SUM="3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 0.19.7.tar.gz" @@ -96,24 +97,39 @@ RUN buildDeps="autoconf \ zlib1g-dev" && \ apt-get -yqq update && \ apt-get install -yq --no-install-recommends ${buildDeps} +# zimg https://github.com/sekrit-twc/zimg +RUN \ + DIR=/tmp/zimg && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://github.com/sekrit-twc/zimg/archive/refs/tags/release-${ZIMG_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + ./autogen.sh && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} + + + ## libvmaf https://github.com/Netflix/vmaf RUN \ if which meson || false; then \ - echo "Building VMAF." && \ - DIR=/tmp/vmaf && \ - mkdir -p ${DIR} && \ - cd ${DIR} && \ - curl -sLO https://github.com/Netflix/vmaf/archive/v${LIBVMAF_VERSION}.tar.gz && \ - tar -xz --strip-components=1 -f v${LIBVMAF_VERSION}.tar.gz && \ - cd /tmp/vmaf/libvmaf && \ - meson build --buildtype release --prefix=${PREFIX} && \ - ninja -vC build && \ - ninja -vC build install && \ - mkdir -p ${PREFIX}/share/model/ && \ - cp -r /tmp/vmaf/model/* ${PREFIX}/share/model/ && \ - rm -rf ${DIR}; \ + echo "Building VMAF." && \ + DIR=/tmp/vmaf && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/Netflix/vmaf/archive/v${LIBVMAF_VERSION}.tar.gz && \ + tar -xz --strip-components=1 -f v${LIBVMAF_VERSION}.tar.gz && \ + cd /tmp/vmaf/libvmaf && \ + meson build --buildtype release --prefix=${PREFIX} && \ + ninja -vC build && \ + ninja -vC build install && \ + mkdir -p ${PREFIX}/share/model/ && \ + cp -r /tmp/vmaf/model/* ${PREFIX}/share/model/ && \ + rm -rf ${DIR}; \ else \ - echo "VMAF skipped."; \ + echo "VMAF skipped."; \ fi ## opencore-amr https://sourceforge.net/projects/opencore-amr/ @@ -519,33 +535,34 @@ RUN \ --disable-debug \ --disable-doc \ --disable-ffplay \ - --enable-shared \ --enable-avresample \ - --enable-libopencore-amrnb \ - --enable-libopencore-amrwb \ + --enable-fontconfig \ --enable-gpl \ --enable-libass \ - --enable-fontconfig \ + --enable-libbluray \ + --enable-libfdk_aac \ --enable-libfreetype \ - --enable-libvidstab \ --enable-libmp3lame \ + --enable-libopencore-amrnb \ + --enable-libopencore-amrwb \ --enable-libopus \ --enable-libtheora \ + --enable-libvidstab \ --enable-libvorbis \ --enable-libvpx \ --enable-libwebp \ - --enable-libxcb \ + --enable-libx264 \ --enable-libx265 \ + --enable-libxcb \ --enable-libxvid \ - --enable-libx264 \ + --enable-libzmq \ --enable-nonfree \ --enable-openssl \ - --enable-libfdk_aac \ --enable-postproc \ + --enable-shared \ --enable-small \ --enable-version3 \ - --enable-libbluray \ - --enable-libzmq \ + --enable-zimg \ --extra-libs=-ldl \ --prefix="${PREFIX}" \ --enable-libopenjpeg \ @@ -555,7 +572,7 @@ RUN \ --enable-libsrt \ --extra-cflags="-I${PREFIX}/include" \ --extra-ldflags="-L${PREFIX}/lib" && \ - make && \ +make && \ make install && \ make tools/zmqsend && cp tools/zmqsend ${PREFIX}/bin/ && \ make distclean && \ diff --git a/docker-images/4.0/ubuntu2004/Dockerfile b/docker-images/4.0/ubuntu2004/Dockerfile index b6ccc64ad..ce34bdab9 100644 --- a/docker-images/4.0/ubuntu2004/Dockerfile +++ b/docker-images/4.0/ubuntu2004/Dockerfile @@ -17,40 +17,41 @@ RUN apt-get -yqq update && \ FROM base as build ENV FFMPEG_VERSION=4.0.6 \ - AOM_VERSION=v1.0.0 \ - FDKAAC_VERSION=0.1.5 \ - FONTCONFIG_VERSION=2.12.4 \ - FREETYPE_VERSION=2.10.4 \ - FRIBIDI_VERSION=0.19.7 \ - KVAZAAR_VERSION=2.0.0 \ - LAME_VERSION=3.100 \ - LIBASS_VERSION=0.13.7 \ - LIBPTHREAD_STUBS_VERSION=0.4 \ - LIBVIDSTAB_VERSION=1.1.0 \ - LIBXCB_VERSION=1.13.1 \ - XCBPROTO_VERSION=1.13 \ - OGG_VERSION=1.3.2 \ - OPENCOREAMR_VERSION=0.1.5 \ - OPUS_VERSION=1.2 \ - OPENJPEG_VERSION=2.1.2 \ - THEORA_VERSION=1.1.1 \ - VORBIS_VERSION=1.3.5 \ - VPX_VERSION=1.8.0 \ - WEBP_VERSION=1.0.2 \ - X264_VERSION=20170226-2245-stable \ - X265_VERSION=3.4 \ - XAU_VERSION=1.0.9 \ - XORG_MACROS_VERSION=1.19.2 \ - XPROTO_VERSION=7.0.31 \ - XVID_VERSION=1.3.4 \ - LIBXML2_VERSION=2.9.10 \ - LIBBLURAY_VERSION=1.1.2 \ - LIBZMQ_VERSION=4.3.2 \ - LIBSRT_VERSION=1.4.1 \ - LIBARIBB24_VERSION=1.0.3 \ - LIBPNG_VERSION=1.6.9 \ - LIBVMAF_VERSION=2.1.1 \ - SRC=/usr/local + AOM_VERSION=v1.0.0 \ + FDKAAC_VERSION=0.1.5 \ + FONTCONFIG_VERSION=2.12.4 \ + FREETYPE_VERSION=2.10.4 \ + FRIBIDI_VERSION=0.19.7 \ + KVAZAAR_VERSION=2.0.0 \ + LAME_VERSION=3.100 \ + LIBARIBB24_VERSION=1.0.3 \ + LIBASS_VERSION=0.13.7 \ + LIBBLURAY_VERSION=1.1.2 \ + LIBPNG_VERSION=1.6.9 \ + LIBPTHREAD_STUBS_VERSION=0.4 \ + LIBSRT_VERSION=1.4.1 \ + LIBVIDSTAB_VERSION=1.1.0 \ + LIBVMAF_VERSION=2.1.1 \ + LIBXCB_VERSION=1.13.1 \ + LIBXML2_VERSION=2.9.10 \ + LIBZMQ_VERSION=4.3.2 \ + OGG_VERSION=1.3.2 \ + OPENCOREAMR_VERSION=0.1.5 \ + OPENJPEG_VERSION=2.1.2 \ + OPUS_VERSION=1.2 \ + THEORA_VERSION=1.1.1 \ + VORBIS_VERSION=1.3.5 \ + VPX_VERSION=1.8.0 \ + WEBP_VERSION=1.0.2 \ + X264_VERSION=20170226-2245-stable \ + X265_VERSION=3.4 \ + XAU_VERSION=1.0.9 \ + XCBPROTO_VERSION=1.13 \ + XORG_MACROS_VERSION=1.19.2 \ + XPROTO_VERSION=7.0.31 \ + XVID_VERSION=1.3.4 \ + ZIMG_VERSION=3.0.3 \ + SRC=/usr/local ARG FREETYPE_SHA256SUM="5eab795ebb23ac77001cfb68b7d4d50b5d6c7469247b0b01b2c953269f658dac freetype-2.10.4.tar.gz" ARG FRIBIDI_SHA256SUM="3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 0.19.7.tar.gz" @@ -99,24 +100,39 @@ RUN buildDeps="autoconf \ zlib1g-dev" && \ apt-get -yqq update && \ apt-get install -yq --no-install-recommends ${buildDeps} +# zimg https://github.com/sekrit-twc/zimg +RUN \ + DIR=/tmp/zimg && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://github.com/sekrit-twc/zimg/archive/refs/tags/release-${ZIMG_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + ./autogen.sh && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} + + + ## libvmaf https://github.com/Netflix/vmaf RUN \ if which meson || false; then \ - echo "Building VMAF." && \ - DIR=/tmp/vmaf && \ - mkdir -p ${DIR} && \ - cd ${DIR} && \ - curl -sLO https://github.com/Netflix/vmaf/archive/v${LIBVMAF_VERSION}.tar.gz && \ - tar -xz --strip-components=1 -f v${LIBVMAF_VERSION}.tar.gz && \ - cd /tmp/vmaf/libvmaf && \ - meson build --buildtype release --prefix=${PREFIX} && \ - ninja -vC build && \ - ninja -vC build install && \ - mkdir -p ${PREFIX}/share/model/ && \ - cp -r /tmp/vmaf/model/* ${PREFIX}/share/model/ && \ - rm -rf ${DIR}; \ + echo "Building VMAF." && \ + DIR=/tmp/vmaf && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/Netflix/vmaf/archive/v${LIBVMAF_VERSION}.tar.gz && \ + tar -xz --strip-components=1 -f v${LIBVMAF_VERSION}.tar.gz && \ + cd /tmp/vmaf/libvmaf && \ + meson build --buildtype release --prefix=${PREFIX} && \ + ninja -vC build && \ + ninja -vC build install && \ + mkdir -p ${PREFIX}/share/model/ && \ + cp -r /tmp/vmaf/model/* ${PREFIX}/share/model/ && \ + rm -rf ${DIR}; \ else \ - echo "VMAF skipped."; \ + echo "VMAF skipped."; \ fi ## opencore-amr https://sourceforge.net/projects/opencore-amr/ @@ -522,33 +538,34 @@ RUN \ --disable-debug \ --disable-doc \ --disable-ffplay \ - --enable-shared \ --enable-avresample \ - --enable-libopencore-amrnb \ - --enable-libopencore-amrwb \ + --enable-fontconfig \ --enable-gpl \ --enable-libass \ - --enable-fontconfig \ + --enable-libbluray \ + --enable-libfdk_aac \ --enable-libfreetype \ - --enable-libvidstab \ --enable-libmp3lame \ + --enable-libopencore-amrnb \ + --enable-libopencore-amrwb \ --enable-libopus \ --enable-libtheora \ + --enable-libvidstab \ --enable-libvorbis \ --enable-libvpx \ --enable-libwebp \ - --enable-libxcb \ + --enable-libx264 \ --enable-libx265 \ + --enable-libxcb \ --enable-libxvid \ - --enable-libx264 \ + --enable-libzmq \ --enable-nonfree \ --enable-openssl \ - --enable-libfdk_aac \ --enable-postproc \ + --enable-shared \ --enable-small \ --enable-version3 \ - --enable-libbluray \ - --enable-libzmq \ + --enable-zimg \ --extra-libs=-ldl \ --prefix="${PREFIX}" \ --enable-libopenjpeg \ @@ -558,7 +575,7 @@ RUN \ --enable-libsrt \ --extra-cflags="-I${PREFIX}/include" \ --extra-ldflags="-L${PREFIX}/lib" && \ - make && \ +make && \ make install && \ make tools/zmqsend && cp tools/zmqsend ${PREFIX}/bin/ && \ make distclean && \ diff --git a/docker-images/4.0/vaapi2004/Dockerfile b/docker-images/4.0/vaapi2004/Dockerfile index f6c0465a5..db65538ec 100644 --- a/docker-images/4.0/vaapi2004/Dockerfile +++ b/docker-images/4.0/vaapi2004/Dockerfile @@ -17,40 +17,41 @@ RUN apt-get -yqq update && \ FROM base as build ENV FFMPEG_VERSION=4.0.6 \ - AOM_VERSION=v1.0.0 \ - FDKAAC_VERSION=0.1.5 \ - FONTCONFIG_VERSION=2.12.4 \ - FREETYPE_VERSION=2.10.4 \ - FRIBIDI_VERSION=0.19.7 \ - KVAZAAR_VERSION=2.0.0 \ - LAME_VERSION=3.100 \ - LIBASS_VERSION=0.13.7 \ - LIBPTHREAD_STUBS_VERSION=0.4 \ - LIBVIDSTAB_VERSION=1.1.0 \ - LIBXCB_VERSION=1.13.1 \ - XCBPROTO_VERSION=1.13 \ - OGG_VERSION=1.3.2 \ - OPENCOREAMR_VERSION=0.1.5 \ - OPUS_VERSION=1.2 \ - OPENJPEG_VERSION=2.1.2 \ - THEORA_VERSION=1.1.1 \ - VORBIS_VERSION=1.3.5 \ - VPX_VERSION=1.8.0 \ - WEBP_VERSION=1.0.2 \ - X264_VERSION=20170226-2245-stable \ - X265_VERSION=3.4 \ - XAU_VERSION=1.0.9 \ - XORG_MACROS_VERSION=1.19.2 \ - XPROTO_VERSION=7.0.31 \ - XVID_VERSION=1.3.4 \ - LIBXML2_VERSION=2.9.10 \ - LIBBLURAY_VERSION=1.1.2 \ - LIBZMQ_VERSION=4.3.2 \ - LIBSRT_VERSION=1.4.1 \ - LIBARIBB24_VERSION=1.0.3 \ - LIBPNG_VERSION=1.6.9 \ - LIBVMAF_VERSION=2.1.1 \ - SRC=/usr/local + AOM_VERSION=v1.0.0 \ + FDKAAC_VERSION=0.1.5 \ + FONTCONFIG_VERSION=2.12.4 \ + FREETYPE_VERSION=2.10.4 \ + FRIBIDI_VERSION=0.19.7 \ + KVAZAAR_VERSION=2.0.0 \ + LAME_VERSION=3.100 \ + LIBARIBB24_VERSION=1.0.3 \ + LIBASS_VERSION=0.13.7 \ + LIBBLURAY_VERSION=1.1.2 \ + LIBPNG_VERSION=1.6.9 \ + LIBPTHREAD_STUBS_VERSION=0.4 \ + LIBSRT_VERSION=1.4.1 \ + LIBVIDSTAB_VERSION=1.1.0 \ + LIBVMAF_VERSION=2.1.1 \ + LIBXCB_VERSION=1.13.1 \ + LIBXML2_VERSION=2.9.10 \ + LIBZMQ_VERSION=4.3.2 \ + OGG_VERSION=1.3.2 \ + OPENCOREAMR_VERSION=0.1.5 \ + OPENJPEG_VERSION=2.1.2 \ + OPUS_VERSION=1.2 \ + THEORA_VERSION=1.1.1 \ + VORBIS_VERSION=1.3.5 \ + VPX_VERSION=1.8.0 \ + WEBP_VERSION=1.0.2 \ + X264_VERSION=20170226-2245-stable \ + X265_VERSION=3.4 \ + XAU_VERSION=1.0.9 \ + XCBPROTO_VERSION=1.13 \ + XORG_MACROS_VERSION=1.19.2 \ + XPROTO_VERSION=7.0.31 \ + XVID_VERSION=1.3.4 \ + ZIMG_VERSION=3.0.3 \ + SRC=/usr/local ARG FREETYPE_SHA256SUM="5eab795ebb23ac77001cfb68b7d4d50b5d6c7469247b0b01b2c953269f658dac freetype-2.10.4.tar.gz" ARG FRIBIDI_SHA256SUM="3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 0.19.7.tar.gz" @@ -100,24 +101,39 @@ RUN buildDeps="autoconf \ zlib1g-dev" && \ apt-get -yqq update && \ apt-get install -yq --no-install-recommends ${buildDeps} +# zimg https://github.com/sekrit-twc/zimg +RUN \ + DIR=/tmp/zimg && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://github.com/sekrit-twc/zimg/archive/refs/tags/release-${ZIMG_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + ./autogen.sh && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} + + + ## libvmaf https://github.com/Netflix/vmaf RUN \ if which meson || false; then \ - echo "Building VMAF." && \ - DIR=/tmp/vmaf && \ - mkdir -p ${DIR} && \ - cd ${DIR} && \ - curl -sLO https://github.com/Netflix/vmaf/archive/v${LIBVMAF_VERSION}.tar.gz && \ - tar -xz --strip-components=1 -f v${LIBVMAF_VERSION}.tar.gz && \ - cd /tmp/vmaf/libvmaf && \ - meson build --buildtype release --prefix=${PREFIX} && \ - ninja -vC build && \ - ninja -vC build install && \ - mkdir -p ${PREFIX}/share/model/ && \ - cp -r /tmp/vmaf/model/* ${PREFIX}/share/model/ && \ - rm -rf ${DIR}; \ + echo "Building VMAF." && \ + DIR=/tmp/vmaf && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/Netflix/vmaf/archive/v${LIBVMAF_VERSION}.tar.gz && \ + tar -xz --strip-components=1 -f v${LIBVMAF_VERSION}.tar.gz && \ + cd /tmp/vmaf/libvmaf && \ + meson build --buildtype release --prefix=${PREFIX} && \ + ninja -vC build && \ + ninja -vC build install && \ + mkdir -p ${PREFIX}/share/model/ && \ + cp -r /tmp/vmaf/model/* ${PREFIX}/share/model/ && \ + rm -rf ${DIR}; \ else \ - echo "VMAF skipped."; \ + echo "VMAF skipped."; \ fi ## opencore-amr https://sourceforge.net/projects/opencore-amr/ @@ -523,33 +539,34 @@ RUN \ --disable-debug \ --disable-doc \ --disable-ffplay \ - --enable-shared \ --enable-avresample \ - --enable-libopencore-amrnb \ - --enable-libopencore-amrwb \ + --enable-fontconfig \ --enable-gpl \ --enable-libass \ - --enable-fontconfig \ + --enable-libbluray \ + --enable-libfdk_aac \ --enable-libfreetype \ - --enable-libvidstab \ --enable-libmp3lame \ + --enable-libopencore-amrnb \ + --enable-libopencore-amrwb \ --enable-libopus \ --enable-libtheora \ + --enable-libvidstab \ --enable-libvorbis \ --enable-libvpx \ --enable-libwebp \ - --enable-libxcb \ + --enable-libx264 \ --enable-libx265 \ + --enable-libxcb \ --enable-libxvid \ - --enable-libx264 \ + --enable-libzmq \ --enable-nonfree \ --enable-openssl \ - --enable-libfdk_aac \ --enable-postproc \ + --enable-shared \ --enable-small \ --enable-version3 \ - --enable-libbluray \ - --enable-libzmq \ + --enable-zimg \ --extra-libs=-ldl \ --prefix="${PREFIX}" \ --enable-libopenjpeg \ @@ -560,7 +577,7 @@ RUN \ --enable-vaapi \ --extra-cflags="-I${PREFIX}/include" \ --extra-ldflags="-L${PREFIX}/lib" && \ - make && \ +make && \ make install && \ make tools/zmqsend && cp tools/zmqsend ${PREFIX}/bin/ && \ make distclean && \ diff --git a/docker-images/4.1/alpine312/Dockerfile b/docker-images/4.1/alpine312/Dockerfile index c72d8e765..63f2ff032 100644 --- a/docker-images/4.1/alpine312/Dockerfile +++ b/docker-images/4.1/alpine312/Dockerfile @@ -14,40 +14,41 @@ FROM base AS build WORKDIR /tmp/workdir ENV FFMPEG_VERSION=4.1.7 \ - AOM_VERSION=v1.0.0 \ - FDKAAC_VERSION=0.1.5 \ - FONTCONFIG_VERSION=2.12.4 \ - FREETYPE_VERSION=2.10.4 \ - FRIBIDI_VERSION=0.19.7 \ - KVAZAAR_VERSION=2.0.0 \ - LAME_VERSION=3.100 \ - LIBASS_VERSION=0.13.7 \ - LIBPTHREAD_STUBS_VERSION=0.4 \ - LIBVIDSTAB_VERSION=1.1.0 \ - LIBXCB_VERSION=1.13.1 \ - XCBPROTO_VERSION=1.13 \ - OGG_VERSION=1.3.2 \ - OPENCOREAMR_VERSION=0.1.5 \ - OPUS_VERSION=1.2 \ - OPENJPEG_VERSION=2.1.2 \ - THEORA_VERSION=1.1.1 \ - VORBIS_VERSION=1.3.5 \ - VPX_VERSION=1.8.0 \ - WEBP_VERSION=1.0.2 \ - X264_VERSION=20170226-2245-stable \ - X265_VERSION=3.4 \ - XAU_VERSION=1.0.9 \ - XORG_MACROS_VERSION=1.19.2 \ - XPROTO_VERSION=7.0.31 \ - XVID_VERSION=1.3.4 \ - LIBXML2_VERSION=2.9.10 \ - LIBBLURAY_VERSION=1.1.2 \ - LIBZMQ_VERSION=4.3.2 \ - LIBSRT_VERSION=1.4.1 \ - LIBARIBB24_VERSION=1.0.3 \ - LIBPNG_VERSION=1.6.9 \ - LIBVMAF_VERSION=2.1.1 \ - SRC=/usr/local + AOM_VERSION=v1.0.0 \ + FDKAAC_VERSION=0.1.5 \ + FONTCONFIG_VERSION=2.12.4 \ + FREETYPE_VERSION=2.10.4 \ + FRIBIDI_VERSION=0.19.7 \ + KVAZAAR_VERSION=2.0.0 \ + LAME_VERSION=3.100 \ + LIBARIBB24_VERSION=1.0.3 \ + LIBASS_VERSION=0.13.7 \ + LIBBLURAY_VERSION=1.1.2 \ + LIBPNG_VERSION=1.6.9 \ + LIBPTHREAD_STUBS_VERSION=0.4 \ + LIBSRT_VERSION=1.4.1 \ + LIBVIDSTAB_VERSION=1.1.0 \ + LIBVMAF_VERSION=2.1.1 \ + LIBXCB_VERSION=1.13.1 \ + LIBXML2_VERSION=2.9.10 \ + LIBZMQ_VERSION=4.3.2 \ + OGG_VERSION=1.3.2 \ + OPENCOREAMR_VERSION=0.1.5 \ + OPENJPEG_VERSION=2.1.2 \ + OPUS_VERSION=1.2 \ + THEORA_VERSION=1.1.1 \ + VORBIS_VERSION=1.3.5 \ + VPX_VERSION=1.8.0 \ + WEBP_VERSION=1.0.2 \ + X264_VERSION=20170226-2245-stable \ + X265_VERSION=3.4 \ + XAU_VERSION=1.0.9 \ + XCBPROTO_VERSION=1.13 \ + XORG_MACROS_VERSION=1.19.2 \ + XPROTO_VERSION=7.0.31 \ + XVID_VERSION=1.3.4 \ + ZIMG_VERSION=3.0.3 \ + SRC=/usr/local ARG FREETYPE_SHA256SUM="5eab795ebb23ac77001cfb68b7d4d50b5d6c7469247b0b01b2c953269f658dac freetype-2.10.4.tar.gz" ARG FRIBIDI_SHA256SUM="3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 0.19.7.tar.gz" @@ -95,24 +96,39 @@ RUN buildDeps="autoconf \ zlib-dev \ expat-dev" && \ apk add --no-cache --update ${buildDeps} +# zimg https://github.com/sekrit-twc/zimg +RUN \ + DIR=/tmp/zimg && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://github.com/sekrit-twc/zimg/archive/refs/tags/release-${ZIMG_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + ./autogen.sh && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} + + + ## libvmaf https://github.com/Netflix/vmaf RUN \ if which meson || false; then \ - echo "Building VMAF." && \ - DIR=/tmp/vmaf && \ - mkdir -p ${DIR} && \ - cd ${DIR} && \ - curl -sLO https://github.com/Netflix/vmaf/archive/v${LIBVMAF_VERSION}.tar.gz && \ - tar -xz --strip-components=1 -f v${LIBVMAF_VERSION}.tar.gz && \ - cd /tmp/vmaf/libvmaf && \ - meson build --buildtype release --prefix=${PREFIX} && \ - ninja -vC build && \ - ninja -vC build install && \ - mkdir -p ${PREFIX}/share/model/ && \ - cp -r /tmp/vmaf/model/* ${PREFIX}/share/model/ && \ - rm -rf ${DIR}; \ + echo "Building VMAF." && \ + DIR=/tmp/vmaf && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/Netflix/vmaf/archive/v${LIBVMAF_VERSION}.tar.gz && \ + tar -xz --strip-components=1 -f v${LIBVMAF_VERSION}.tar.gz && \ + cd /tmp/vmaf/libvmaf && \ + meson build --buildtype release --prefix=${PREFIX} && \ + ninja -vC build && \ + ninja -vC build install && \ + mkdir -p ${PREFIX}/share/model/ && \ + cp -r /tmp/vmaf/model/* ${PREFIX}/share/model/ && \ + rm -rf ${DIR}; \ else \ - echo "VMAF skipped."; \ + echo "VMAF skipped."; \ fi ## opencore-amr https://sourceforge.net/projects/opencore-amr/ @@ -518,33 +534,34 @@ RUN \ --disable-debug \ --disable-doc \ --disable-ffplay \ - --enable-shared \ --enable-avresample \ - --enable-libopencore-amrnb \ - --enable-libopencore-amrwb \ + --enable-fontconfig \ --enable-gpl \ --enable-libass \ - --enable-fontconfig \ + --enable-libbluray \ + --enable-libfdk_aac \ --enable-libfreetype \ - --enable-libvidstab \ --enable-libmp3lame \ + --enable-libopencore-amrnb \ + --enable-libopencore-amrwb \ --enable-libopus \ --enable-libtheora \ + --enable-libvidstab \ --enable-libvorbis \ --enable-libvpx \ --enable-libwebp \ - --enable-libxcb \ + --enable-libx264 \ --enable-libx265 \ + --enable-libxcb \ --enable-libxvid \ - --enable-libx264 \ + --enable-libzmq \ --enable-nonfree \ --enable-openssl \ - --enable-libfdk_aac \ --enable-postproc \ + --enable-shared \ --enable-small \ --enable-version3 \ - --enable-libbluray \ - --enable-libzmq \ + --enable-zimg \ --extra-libs=-ldl \ --prefix="${PREFIX}" \ --enable-libopenjpeg \ @@ -554,7 +571,7 @@ RUN \ --enable-libsrt \ --extra-cflags="-I${PREFIX}/include" \ --extra-ldflags="-L${PREFIX}/lib" && \ - make && \ +make && \ make install && \ make tools/zmqsend && cp tools/zmqsend ${PREFIX}/bin/ && \ make distclean && \ diff --git a/docker-images/4.1/centos7/Dockerfile b/docker-images/4.1/centos7/Dockerfile index 04a434d48..48907d5f6 100644 --- a/docker-images/4.1/centos7/Dockerfile +++ b/docker-images/4.1/centos7/Dockerfile @@ -16,40 +16,41 @@ FROM base AS build WORKDIR /tmp/workdir ENV FFMPEG_VERSION=4.1.7 \ - AOM_VERSION=v1.0.0 \ - FDKAAC_VERSION=0.1.5 \ - FONTCONFIG_VERSION=2.12.4 \ - FREETYPE_VERSION=2.10.4 \ - FRIBIDI_VERSION=0.19.7 \ - KVAZAAR_VERSION=2.0.0 \ - LAME_VERSION=3.100 \ - LIBASS_VERSION=0.13.7 \ - LIBPTHREAD_STUBS_VERSION=0.4 \ - LIBVIDSTAB_VERSION=1.1.0 \ - LIBXCB_VERSION=1.13.1 \ - XCBPROTO_VERSION=1.13 \ - OGG_VERSION=1.3.2 \ - OPENCOREAMR_VERSION=0.1.5 \ - OPUS_VERSION=1.2 \ - OPENJPEG_VERSION=2.1.2 \ - THEORA_VERSION=1.1.1 \ - VORBIS_VERSION=1.3.5 \ - VPX_VERSION=1.8.0 \ - WEBP_VERSION=1.0.2 \ - X264_VERSION=20170226-2245-stable \ - X265_VERSION=3.4 \ - XAU_VERSION=1.0.9 \ - XORG_MACROS_VERSION=1.19.2 \ - XPROTO_VERSION=7.0.31 \ - XVID_VERSION=1.3.4 \ - LIBXML2_VERSION=2.9.10 \ - LIBBLURAY_VERSION=1.1.2 \ - LIBZMQ_VERSION=4.3.2 \ - LIBSRT_VERSION=1.4.1 \ - LIBARIBB24_VERSION=1.0.3 \ - LIBPNG_VERSION=1.6.9 \ - LIBVMAF_VERSION=2.1.1 \ - SRC=/usr/local + AOM_VERSION=v1.0.0 \ + FDKAAC_VERSION=0.1.5 \ + FONTCONFIG_VERSION=2.12.4 \ + FREETYPE_VERSION=2.10.4 \ + FRIBIDI_VERSION=0.19.7 \ + KVAZAAR_VERSION=2.0.0 \ + LAME_VERSION=3.100 \ + LIBARIBB24_VERSION=1.0.3 \ + LIBASS_VERSION=0.13.7 \ + LIBBLURAY_VERSION=1.1.2 \ + LIBPNG_VERSION=1.6.9 \ + LIBPTHREAD_STUBS_VERSION=0.4 \ + LIBSRT_VERSION=1.4.1 \ + LIBVIDSTAB_VERSION=1.1.0 \ + LIBVMAF_VERSION=2.1.1 \ + LIBXCB_VERSION=1.13.1 \ + LIBXML2_VERSION=2.9.10 \ + LIBZMQ_VERSION=4.3.2 \ + OGG_VERSION=1.3.2 \ + OPENCOREAMR_VERSION=0.1.5 \ + OPENJPEG_VERSION=2.1.2 \ + OPUS_VERSION=1.2 \ + THEORA_VERSION=1.1.1 \ + VORBIS_VERSION=1.3.5 \ + VPX_VERSION=1.8.0 \ + WEBP_VERSION=1.0.2 \ + X264_VERSION=20170226-2245-stable \ + X265_VERSION=3.4 \ + XAU_VERSION=1.0.9 \ + XCBPROTO_VERSION=1.13 \ + XORG_MACROS_VERSION=1.19.2 \ + XPROTO_VERSION=7.0.31 \ + XVID_VERSION=1.3.4 \ + ZIMG_VERSION=3.0.3 \ + SRC=/usr/local ARG FREETYPE_SHA256SUM="5eab795ebb23ac77001cfb68b7d4d50b5d6c7469247b0b01b2c953269f658dac freetype-2.10.4.tar.gz" ARG FRIBIDI_SHA256SUM="3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 0.19.7.tar.gz" @@ -132,24 +133,39 @@ RUN buildDeps="autoconf \ yum history undo $(yum history info | grep 'Transaction ID' | awk -F: '{print$2}' | tr -d ' ') -y && \ yum autoremove -y +# zimg https://github.com/sekrit-twc/zimg +RUN \ + DIR=/tmp/zimg && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://github.com/sekrit-twc/zimg/archive/refs/tags/release-${ZIMG_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + ./autogen.sh && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} + + + ## libvmaf https://github.com/Netflix/vmaf RUN \ if which meson || false; then \ - echo "Building VMAF." && \ - DIR=/tmp/vmaf && \ - mkdir -p ${DIR} && \ - cd ${DIR} && \ - curl -sLO https://github.com/Netflix/vmaf/archive/v${LIBVMAF_VERSION}.tar.gz && \ - tar -xz --strip-components=1 -f v${LIBVMAF_VERSION}.tar.gz && \ - cd /tmp/vmaf/libvmaf && \ - meson build --buildtype release --prefix=${PREFIX} && \ - ninja -vC build && \ - ninja -vC build install && \ - mkdir -p ${PREFIX}/share/model/ && \ - cp -r /tmp/vmaf/model/* ${PREFIX}/share/model/ && \ - rm -rf ${DIR}; \ + echo "Building VMAF." && \ + DIR=/tmp/vmaf && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/Netflix/vmaf/archive/v${LIBVMAF_VERSION}.tar.gz && \ + tar -xz --strip-components=1 -f v${LIBVMAF_VERSION}.tar.gz && \ + cd /tmp/vmaf/libvmaf && \ + meson build --buildtype release --prefix=${PREFIX} && \ + ninja -vC build && \ + ninja -vC build install && \ + mkdir -p ${PREFIX}/share/model/ && \ + cp -r /tmp/vmaf/model/* ${PREFIX}/share/model/ && \ + rm -rf ${DIR}; \ else \ - echo "VMAF skipped."; \ + echo "VMAF skipped."; \ fi ## opencore-amr https://sourceforge.net/projects/opencore-amr/ @@ -555,33 +571,34 @@ RUN \ --disable-debug \ --disable-doc \ --disable-ffplay \ - --enable-shared \ --enable-avresample \ - --enable-libopencore-amrnb \ - --enable-libopencore-amrwb \ + --enable-fontconfig \ --enable-gpl \ --enable-libass \ - --enable-fontconfig \ + --enable-libbluray \ + --enable-libfdk_aac \ --enable-libfreetype \ - --enable-libvidstab \ --enable-libmp3lame \ + --enable-libopencore-amrnb \ + --enable-libopencore-amrwb \ --enable-libopus \ --enable-libtheora \ + --enable-libvidstab \ --enable-libvorbis \ --enable-libvpx \ --enable-libwebp \ - --enable-libxcb \ + --enable-libx264 \ --enable-libx265 \ + --enable-libxcb \ --enable-libxvid \ - --enable-libx264 \ + --enable-libzmq \ --enable-nonfree \ --enable-openssl \ - --enable-libfdk_aac \ --enable-postproc \ + --enable-shared \ --enable-small \ --enable-version3 \ - --enable-libbluray \ - --enable-libzmq \ + --enable-zimg \ --extra-libs=-ldl \ --prefix="${PREFIX}" \ --enable-libopenjpeg \ @@ -591,7 +608,7 @@ RUN \ --enable-libsrt \ --extra-cflags="-I${PREFIX}/include" \ --extra-ldflags="-L${PREFIX}/lib" && \ - make && \ +make && \ make install && \ make tools/zmqsend && cp tools/zmqsend ${PREFIX}/bin/ && \ make distclean && \ diff --git a/docker-images/4.1/centos8/Dockerfile b/docker-images/4.1/centos8/Dockerfile index 84bbbfa42..3082495c8 100644 --- a/docker-images/4.1/centos8/Dockerfile +++ b/docker-images/4.1/centos8/Dockerfile @@ -16,40 +16,41 @@ FROM base AS build WORKDIR /tmp/workdir ENV FFMPEG_VERSION=4.1.7 \ - AOM_VERSION=v1.0.0 \ - FDKAAC_VERSION=0.1.5 \ - FONTCONFIG_VERSION=2.12.4 \ - FREETYPE_VERSION=2.10.4 \ - FRIBIDI_VERSION=0.19.7 \ - KVAZAAR_VERSION=2.0.0 \ - LAME_VERSION=3.100 \ - LIBASS_VERSION=0.13.7 \ - LIBPTHREAD_STUBS_VERSION=0.4 \ - LIBVIDSTAB_VERSION=1.1.0 \ - LIBXCB_VERSION=1.13.1 \ - XCBPROTO_VERSION=1.13 \ - OGG_VERSION=1.3.2 \ - OPENCOREAMR_VERSION=0.1.5 \ - OPUS_VERSION=1.2 \ - OPENJPEG_VERSION=2.1.2 \ - THEORA_VERSION=1.1.1 \ - VORBIS_VERSION=1.3.5 \ - VPX_VERSION=1.8.0 \ - WEBP_VERSION=1.0.2 \ - X264_VERSION=20170226-2245-stable \ - X265_VERSION=3.4 \ - XAU_VERSION=1.0.9 \ - XORG_MACROS_VERSION=1.19.2 \ - XPROTO_VERSION=7.0.31 \ - XVID_VERSION=1.3.4 \ - LIBXML2_VERSION=2.9.10 \ - LIBBLURAY_VERSION=1.1.2 \ - LIBZMQ_VERSION=4.3.2 \ - LIBSRT_VERSION=1.4.1 \ - LIBARIBB24_VERSION=1.0.3 \ - LIBPNG_VERSION=1.6.9 \ - LIBVMAF_VERSION=2.1.1 \ - SRC=/usr/local + AOM_VERSION=v1.0.0 \ + FDKAAC_VERSION=0.1.5 \ + FONTCONFIG_VERSION=2.12.4 \ + FREETYPE_VERSION=2.10.4 \ + FRIBIDI_VERSION=0.19.7 \ + KVAZAAR_VERSION=2.0.0 \ + LAME_VERSION=3.100 \ + LIBARIBB24_VERSION=1.0.3 \ + LIBASS_VERSION=0.13.7 \ + LIBBLURAY_VERSION=1.1.2 \ + LIBPNG_VERSION=1.6.9 \ + LIBPTHREAD_STUBS_VERSION=0.4 \ + LIBSRT_VERSION=1.4.1 \ + LIBVIDSTAB_VERSION=1.1.0 \ + LIBVMAF_VERSION=2.1.1 \ + LIBXCB_VERSION=1.13.1 \ + LIBXML2_VERSION=2.9.10 \ + LIBZMQ_VERSION=4.3.2 \ + OGG_VERSION=1.3.2 \ + OPENCOREAMR_VERSION=0.1.5 \ + OPENJPEG_VERSION=2.1.2 \ + OPUS_VERSION=1.2 \ + THEORA_VERSION=1.1.1 \ + VORBIS_VERSION=1.3.5 \ + VPX_VERSION=1.8.0 \ + WEBP_VERSION=1.0.2 \ + X264_VERSION=20170226-2245-stable \ + X265_VERSION=3.4 \ + XAU_VERSION=1.0.9 \ + XCBPROTO_VERSION=1.13 \ + XORG_MACROS_VERSION=1.19.2 \ + XPROTO_VERSION=7.0.31 \ + XVID_VERSION=1.3.4 \ + ZIMG_VERSION=3.0.3 \ + SRC=/usr/local ARG FREETYPE_SHA256SUM="5eab795ebb23ac77001cfb68b7d4d50b5d6c7469247b0b01b2c953269f658dac freetype-2.10.4.tar.gz" ARG FRIBIDI_SHA256SUM="3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 0.19.7.tar.gz" @@ -101,24 +102,39 @@ RUN buildDeps="autoconf \ yum config-manager --set-enabled powertools && \ dnf install -y ${buildDeps} && \ alternatives --set python /usr/bin/python3 +# zimg https://github.com/sekrit-twc/zimg +RUN \ + DIR=/tmp/zimg && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://github.com/sekrit-twc/zimg/archive/refs/tags/release-${ZIMG_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + ./autogen.sh && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} + + + ## libvmaf https://github.com/Netflix/vmaf RUN \ if which meson || false; then \ - echo "Building VMAF." && \ - DIR=/tmp/vmaf && \ - mkdir -p ${DIR} && \ - cd ${DIR} && \ - curl -sLO https://github.com/Netflix/vmaf/archive/v${LIBVMAF_VERSION}.tar.gz && \ - tar -xz --strip-components=1 -f v${LIBVMAF_VERSION}.tar.gz && \ - cd /tmp/vmaf/libvmaf && \ - meson build --buildtype release --prefix=${PREFIX} && \ - ninja -vC build && \ - ninja -vC build install && \ - mkdir -p ${PREFIX}/share/model/ && \ - cp -r /tmp/vmaf/model/* ${PREFIX}/share/model/ && \ - rm -rf ${DIR}; \ + echo "Building VMAF." && \ + DIR=/tmp/vmaf && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/Netflix/vmaf/archive/v${LIBVMAF_VERSION}.tar.gz && \ + tar -xz --strip-components=1 -f v${LIBVMAF_VERSION}.tar.gz && \ + cd /tmp/vmaf/libvmaf && \ + meson build --buildtype release --prefix=${PREFIX} && \ + ninja -vC build && \ + ninja -vC build install && \ + mkdir -p ${PREFIX}/share/model/ && \ + cp -r /tmp/vmaf/model/* ${PREFIX}/share/model/ && \ + rm -rf ${DIR}; \ else \ - echo "VMAF skipped."; \ + echo "VMAF skipped."; \ fi ## opencore-amr https://sourceforge.net/projects/opencore-amr/ @@ -524,33 +540,34 @@ RUN \ --disable-debug \ --disable-doc \ --disable-ffplay \ - --enable-shared \ --enable-avresample \ - --enable-libopencore-amrnb \ - --enable-libopencore-amrwb \ + --enable-fontconfig \ --enable-gpl \ --enable-libass \ - --enable-fontconfig \ + --enable-libbluray \ + --enable-libfdk_aac \ --enable-libfreetype \ - --enable-libvidstab \ --enable-libmp3lame \ + --enable-libopencore-amrnb \ + --enable-libopencore-amrwb \ --enable-libopus \ --enable-libtheora \ + --enable-libvidstab \ --enable-libvorbis \ --enable-libvpx \ --enable-libwebp \ - --enable-libxcb \ + --enable-libx264 \ --enable-libx265 \ + --enable-libxcb \ --enable-libxvid \ - --enable-libx264 \ + --enable-libzmq \ --enable-nonfree \ --enable-openssl \ - --enable-libfdk_aac \ --enable-postproc \ + --enable-shared \ --enable-small \ --enable-version3 \ - --enable-libbluray \ - --enable-libzmq \ + --enable-zimg \ --extra-libs=-ldl \ --prefix="${PREFIX}" \ --enable-libopenjpeg \ @@ -560,7 +577,7 @@ RUN \ --enable-libsrt \ --extra-cflags="-I${PREFIX}/include" \ --extra-ldflags="-L${PREFIX}/lib" && \ - make && \ +make && \ make install && \ make tools/zmqsend && cp tools/zmqsend ${PREFIX}/bin/ && \ make distclean && \ diff --git a/docker-images/4.1/nvidia2004/Dockerfile b/docker-images/4.1/nvidia2004/Dockerfile index 6287cd17a..0283c6a78 100644 --- a/docker-images/4.1/nvidia2004/Dockerfile +++ b/docker-images/4.1/nvidia2004/Dockerfile @@ -34,40 +34,41 @@ FROM devel-base as build ENV NVIDIA_HEADERS_VERSION=11.1.5.0 ENV FFMPEG_VERSION=4.1.7 \ - AOM_VERSION=v1.0.0 \ - FDKAAC_VERSION=0.1.5 \ - FONTCONFIG_VERSION=2.12.4 \ - FREETYPE_VERSION=2.10.4 \ - FRIBIDI_VERSION=0.19.7 \ - KVAZAAR_VERSION=2.0.0 \ - LAME_VERSION=3.100 \ - LIBASS_VERSION=0.13.7 \ - LIBPTHREAD_STUBS_VERSION=0.4 \ - LIBVIDSTAB_VERSION=1.1.0 \ - LIBXCB_VERSION=1.13.1 \ - XCBPROTO_VERSION=1.13 \ - OGG_VERSION=1.3.2 \ - OPENCOREAMR_VERSION=0.1.5 \ - OPUS_VERSION=1.2 \ - OPENJPEG_VERSION=2.1.2 \ - THEORA_VERSION=1.1.1 \ - VORBIS_VERSION=1.3.5 \ - VPX_VERSION=1.8.0 \ - WEBP_VERSION=1.0.2 \ - X264_VERSION=20170226-2245-stable \ - X265_VERSION=3.4 \ - XAU_VERSION=1.0.9 \ - XORG_MACROS_VERSION=1.19.2 \ - XPROTO_VERSION=7.0.31 \ - XVID_VERSION=1.3.4 \ - LIBXML2_VERSION=2.9.10 \ - LIBBLURAY_VERSION=1.1.2 \ - LIBZMQ_VERSION=4.3.2 \ - LIBSRT_VERSION=1.4.1 \ - LIBARIBB24_VERSION=1.0.3 \ - LIBPNG_VERSION=1.6.9 \ - LIBVMAF_VERSION=2.1.1 \ - SRC=/usr/local + AOM_VERSION=v1.0.0 \ + FDKAAC_VERSION=0.1.5 \ + FONTCONFIG_VERSION=2.12.4 \ + FREETYPE_VERSION=2.10.4 \ + FRIBIDI_VERSION=0.19.7 \ + KVAZAAR_VERSION=2.0.0 \ + LAME_VERSION=3.100 \ + LIBARIBB24_VERSION=1.0.3 \ + LIBASS_VERSION=0.13.7 \ + LIBBLURAY_VERSION=1.1.2 \ + LIBPNG_VERSION=1.6.9 \ + LIBPTHREAD_STUBS_VERSION=0.4 \ + LIBSRT_VERSION=1.4.1 \ + LIBVIDSTAB_VERSION=1.1.0 \ + LIBVMAF_VERSION=2.1.1 \ + LIBXCB_VERSION=1.13.1 \ + LIBXML2_VERSION=2.9.10 \ + LIBZMQ_VERSION=4.3.2 \ + OGG_VERSION=1.3.2 \ + OPENCOREAMR_VERSION=0.1.5 \ + OPENJPEG_VERSION=2.1.2 \ + OPUS_VERSION=1.2 \ + THEORA_VERSION=1.1.1 \ + VORBIS_VERSION=1.3.5 \ + VPX_VERSION=1.8.0 \ + WEBP_VERSION=1.0.2 \ + X264_VERSION=20170226-2245-stable \ + X265_VERSION=3.4 \ + XAU_VERSION=1.0.9 \ + XCBPROTO_VERSION=1.13 \ + XORG_MACROS_VERSION=1.19.2 \ + XPROTO_VERSION=7.0.31 \ + XVID_VERSION=1.3.4 \ + ZIMG_VERSION=3.0.3 \ + SRC=/usr/local ARG FREETYPE_SHA256SUM="5eab795ebb23ac77001cfb68b7d4d50b5d6c7469247b0b01b2c953269f658dac freetype-2.10.4.tar.gz" ARG FRIBIDI_SHA256SUM="3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 0.19.7.tar.gz" @@ -123,24 +124,39 @@ RUN \ make install PREFIX="${PREFIX}" && \ rm -rf ${DIR} +# zimg https://github.com/sekrit-twc/zimg +RUN \ + DIR=/tmp/zimg && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://github.com/sekrit-twc/zimg/archive/refs/tags/release-${ZIMG_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + ./autogen.sh && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} + + + ## libvmaf https://github.com/Netflix/vmaf RUN \ if which meson || false; then \ - echo "Building VMAF." && \ - DIR=/tmp/vmaf && \ - mkdir -p ${DIR} && \ - cd ${DIR} && \ - curl -sLO https://github.com/Netflix/vmaf/archive/v${LIBVMAF_VERSION}.tar.gz && \ - tar -xz --strip-components=1 -f v${LIBVMAF_VERSION}.tar.gz && \ - cd /tmp/vmaf/libvmaf && \ - meson build --buildtype release --prefix=${PREFIX} && \ - ninja -vC build && \ - ninja -vC build install && \ - mkdir -p ${PREFIX}/share/model/ && \ - cp -r /tmp/vmaf/model/* ${PREFIX}/share/model/ && \ - rm -rf ${DIR}; \ + echo "Building VMAF." && \ + DIR=/tmp/vmaf && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/Netflix/vmaf/archive/v${LIBVMAF_VERSION}.tar.gz && \ + tar -xz --strip-components=1 -f v${LIBVMAF_VERSION}.tar.gz && \ + cd /tmp/vmaf/libvmaf && \ + meson build --buildtype release --prefix=${PREFIX} && \ + ninja -vC build && \ + ninja -vC build install && \ + mkdir -p ${PREFIX}/share/model/ && \ + cp -r /tmp/vmaf/model/* ${PREFIX}/share/model/ && \ + rm -rf ${DIR}; \ else \ - echo "VMAF skipped."; \ + echo "VMAF skipped."; \ fi ## opencore-amr https://sourceforge.net/projects/opencore-amr/ @@ -546,33 +562,34 @@ RUN \ --disable-debug \ --disable-doc \ --disable-ffplay \ - --enable-shared \ --enable-avresample \ - --enable-libopencore-amrnb \ - --enable-libopencore-amrwb \ + --enable-fontconfig \ --enable-gpl \ --enable-libass \ - --enable-fontconfig \ + --enable-libbluray \ + --enable-libfdk_aac \ --enable-libfreetype \ - --enable-libvidstab \ --enable-libmp3lame \ + --enable-libopencore-amrnb \ + --enable-libopencore-amrwb \ --enable-libopus \ --enable-libtheora \ + --enable-libvidstab \ --enable-libvorbis \ --enable-libvpx \ --enable-libwebp \ - --enable-libxcb \ + --enable-libx264 \ --enable-libx265 \ + --enable-libxcb \ --enable-libxvid \ - --enable-libx264 \ + --enable-libzmq \ --enable-nonfree \ --enable-openssl \ - --enable-libfdk_aac \ --enable-postproc \ + --enable-shared \ --enable-small \ --enable-version3 \ - --enable-libbluray \ - --enable-libzmq \ + --enable-zimg \ --extra-libs=-ldl \ --prefix="${PREFIX}" \ --enable-libopenjpeg \ @@ -586,7 +603,7 @@ RUN \ --enable-libnpp \ --extra-cflags="-I${PREFIX}/include -I${PREFIX}/include/ffnvcodec -I/usr/local/cuda/include/" \ --extra-ldflags="-L${PREFIX}/lib -L/usr/local/cuda/lib64 -L/usr/local/cuda/lib32/" && \ - make && \ +make && \ make install && \ make tools/zmqsend && cp tools/zmqsend ${PREFIX}/bin/ && \ make distclean && \ diff --git a/docker-images/4.1/scratch312/Dockerfile b/docker-images/4.1/scratch312/Dockerfile index be9520229..c2e72a46e 100644 --- a/docker-images/4.1/scratch312/Dockerfile +++ b/docker-images/4.1/scratch312/Dockerfile @@ -9,40 +9,41 @@ FROM alpine:3.12 AS build WORKDIR /tmp/workdir ENV FFMPEG_VERSION=4.1.7 \ - AOM_VERSION=v1.0.0 \ - FDKAAC_VERSION=0.1.5 \ - FONTCONFIG_VERSION=2.12.4 \ - FREETYPE_VERSION=2.10.4 \ - FRIBIDI_VERSION=0.19.7 \ - KVAZAAR_VERSION=2.0.0 \ - LAME_VERSION=3.100 \ - LIBASS_VERSION=0.13.7 \ - LIBPTHREAD_STUBS_VERSION=0.4 \ - LIBVIDSTAB_VERSION=1.1.0 \ - LIBXCB_VERSION=1.13.1 \ - XCBPROTO_VERSION=1.13 \ - OGG_VERSION=1.3.2 \ - OPENCOREAMR_VERSION=0.1.5 \ - OPUS_VERSION=1.2 \ - OPENJPEG_VERSION=2.1.2 \ - THEORA_VERSION=1.1.1 \ - VORBIS_VERSION=1.3.5 \ - VPX_VERSION=1.8.0 \ - WEBP_VERSION=1.0.2 \ - X264_VERSION=20170226-2245-stable \ - X265_VERSION=3.4 \ - XAU_VERSION=1.0.9 \ - XORG_MACROS_VERSION=1.19.2 \ - XPROTO_VERSION=7.0.31 \ - XVID_VERSION=1.3.4 \ - LIBXML2_VERSION=2.9.10 \ - LIBBLURAY_VERSION=1.1.2 \ - LIBZMQ_VERSION=4.3.2 \ - LIBSRT_VERSION=1.4.1 \ - LIBARIBB24_VERSION=1.0.3 \ - LIBPNG_VERSION=1.6.9 \ - LIBVMAF_VERSION=2.1.1 \ - SRC=/usr/local + AOM_VERSION=v1.0.0 \ + FDKAAC_VERSION=0.1.5 \ + FONTCONFIG_VERSION=2.12.4 \ + FREETYPE_VERSION=2.10.4 \ + FRIBIDI_VERSION=0.19.7 \ + KVAZAAR_VERSION=2.0.0 \ + LAME_VERSION=3.100 \ + LIBARIBB24_VERSION=1.0.3 \ + LIBASS_VERSION=0.13.7 \ + LIBBLURAY_VERSION=1.1.2 \ + LIBPNG_VERSION=1.6.9 \ + LIBPTHREAD_STUBS_VERSION=0.4 \ + LIBSRT_VERSION=1.4.1 \ + LIBVIDSTAB_VERSION=1.1.0 \ + LIBVMAF_VERSION=2.1.1 \ + LIBXCB_VERSION=1.13.1 \ + LIBXML2_VERSION=2.9.10 \ + LIBZMQ_VERSION=4.3.2 \ + OGG_VERSION=1.3.2 \ + OPENCOREAMR_VERSION=0.1.5 \ + OPENJPEG_VERSION=2.1.2 \ + OPUS_VERSION=1.2 \ + THEORA_VERSION=1.1.1 \ + VORBIS_VERSION=1.3.5 \ + VPX_VERSION=1.8.0 \ + WEBP_VERSION=1.0.2 \ + X264_VERSION=20170226-2245-stable \ + X265_VERSION=3.4 \ + XAU_VERSION=1.0.9 \ + XCBPROTO_VERSION=1.13 \ + XORG_MACROS_VERSION=1.19.2 \ + XPROTO_VERSION=7.0.31 \ + XVID_VERSION=1.3.4 \ + ZIMG_VERSION=3.0.3 \ + SRC=/usr/local ARG FREETYPE_SHA256SUM="5eab795ebb23ac77001cfb68b7d4d50b5d6c7469247b0b01b2c953269f658dac freetype-2.10.4.tar.gz" ARG FRIBIDI_SHA256SUM="3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 0.19.7.tar.gz" @@ -97,24 +98,39 @@ RUN buildDeps="autoconf \ libssl1.1" && \ apk add --update ${buildDeps} +# zimg https://github.com/sekrit-twc/zimg +RUN \ + DIR=/tmp/zimg && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://github.com/sekrit-twc/zimg/archive/refs/tags/release-${ZIMG_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + ./autogen.sh && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} + + + ## libvmaf https://github.com/Netflix/vmaf RUN \ if which meson || false; then \ - echo "Building VMAF." && \ - DIR=/tmp/vmaf && \ - mkdir -p ${DIR} && \ - cd ${DIR} && \ - curl -sLO https://github.com/Netflix/vmaf/archive/v${LIBVMAF_VERSION}.tar.gz && \ - tar -xz --strip-components=1 -f v${LIBVMAF_VERSION}.tar.gz && \ - cd /tmp/vmaf/libvmaf && \ - meson build --buildtype release --prefix=${PREFIX} && \ - ninja -vC build && \ - ninja -vC build install && \ - mkdir -p ${PREFIX}/share/model/ && \ - cp -r /tmp/vmaf/model/* ${PREFIX}/share/model/ && \ - rm -rf ${DIR}; \ + echo "Building VMAF." && \ + DIR=/tmp/vmaf && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/Netflix/vmaf/archive/v${LIBVMAF_VERSION}.tar.gz && \ + tar -xz --strip-components=1 -f v${LIBVMAF_VERSION}.tar.gz && \ + cd /tmp/vmaf/libvmaf && \ + meson build --buildtype release --prefix=${PREFIX} && \ + ninja -vC build && \ + ninja -vC build install && \ + mkdir -p ${PREFIX}/share/model/ && \ + cp -r /tmp/vmaf/model/* ${PREFIX}/share/model/ && \ + rm -rf ${DIR}; \ else \ - echo "VMAF skipped."; \ + echo "VMAF skipped."; \ fi ## opencore-amr https://sourceforge.net/projects/opencore-amr/ @@ -520,33 +536,34 @@ RUN \ --disable-debug \ --disable-doc \ --disable-ffplay \ - --enable-shared \ --enable-avresample \ - --enable-libopencore-amrnb \ - --enable-libopencore-amrwb \ + --enable-fontconfig \ --enable-gpl \ --enable-libass \ - --enable-fontconfig \ + --enable-libbluray \ + --enable-libfdk_aac \ --enable-libfreetype \ - --enable-libvidstab \ --enable-libmp3lame \ + --enable-libopencore-amrnb \ + --enable-libopencore-amrwb \ --enable-libopus \ --enable-libtheora \ + --enable-libvidstab \ --enable-libvorbis \ --enable-libvpx \ --enable-libwebp \ - --enable-libxcb \ + --enable-libx264 \ --enable-libx265 \ + --enable-libxcb \ --enable-libxvid \ - --enable-libx264 \ + --enable-libzmq \ --enable-nonfree \ --enable-openssl \ - --enable-libfdk_aac \ --enable-postproc \ + --enable-shared \ --enable-small \ --enable-version3 \ - --enable-libbluray \ - --enable-libzmq \ + --enable-zimg \ --extra-libs=-ldl \ --prefix="${PREFIX}" \ --enable-libopenjpeg \ @@ -556,7 +573,7 @@ RUN \ --enable-libsrt \ --extra-cflags="-I${PREFIX}/include" \ --extra-ldflags="-L${PREFIX}/lib" && \ - make && \ +make && \ make install && \ make tools/zmqsend && cp tools/zmqsend ${PREFIX}/bin/ && \ make distclean && \ diff --git a/docker-images/4.1/ubuntu1804/Dockerfile b/docker-images/4.1/ubuntu1804/Dockerfile index a5eaa8ea1..d9c5519f8 100644 --- a/docker-images/4.1/ubuntu1804/Dockerfile +++ b/docker-images/4.1/ubuntu1804/Dockerfile @@ -17,40 +17,41 @@ RUN apt-get -yqq update && \ FROM base as build ENV FFMPEG_VERSION=4.1.7 \ - AOM_VERSION=v1.0.0 \ - FDKAAC_VERSION=0.1.5 \ - FONTCONFIG_VERSION=2.12.4 \ - FREETYPE_VERSION=2.10.4 \ - FRIBIDI_VERSION=0.19.7 \ - KVAZAAR_VERSION=2.0.0 \ - LAME_VERSION=3.100 \ - LIBASS_VERSION=0.13.7 \ - LIBPTHREAD_STUBS_VERSION=0.4 \ - LIBVIDSTAB_VERSION=1.1.0 \ - LIBXCB_VERSION=1.13.1 \ - XCBPROTO_VERSION=1.13 \ - OGG_VERSION=1.3.2 \ - OPENCOREAMR_VERSION=0.1.5 \ - OPUS_VERSION=1.2 \ - OPENJPEG_VERSION=2.1.2 \ - THEORA_VERSION=1.1.1 \ - VORBIS_VERSION=1.3.5 \ - VPX_VERSION=1.8.0 \ - WEBP_VERSION=1.0.2 \ - X264_VERSION=20170226-2245-stable \ - X265_VERSION=3.4 \ - XAU_VERSION=1.0.9 \ - XORG_MACROS_VERSION=1.19.2 \ - XPROTO_VERSION=7.0.31 \ - XVID_VERSION=1.3.4 \ - LIBXML2_VERSION=2.9.10 \ - LIBBLURAY_VERSION=1.1.2 \ - LIBZMQ_VERSION=4.3.2 \ - LIBSRT_VERSION=1.4.1 \ - LIBARIBB24_VERSION=1.0.3 \ - LIBPNG_VERSION=1.6.9 \ - LIBVMAF_VERSION=2.1.1 \ - SRC=/usr/local + AOM_VERSION=v1.0.0 \ + FDKAAC_VERSION=0.1.5 \ + FONTCONFIG_VERSION=2.12.4 \ + FREETYPE_VERSION=2.10.4 \ + FRIBIDI_VERSION=0.19.7 \ + KVAZAAR_VERSION=2.0.0 \ + LAME_VERSION=3.100 \ + LIBARIBB24_VERSION=1.0.3 \ + LIBASS_VERSION=0.13.7 \ + LIBBLURAY_VERSION=1.1.2 \ + LIBPNG_VERSION=1.6.9 \ + LIBPTHREAD_STUBS_VERSION=0.4 \ + LIBSRT_VERSION=1.4.1 \ + LIBVIDSTAB_VERSION=1.1.0 \ + LIBVMAF_VERSION=2.1.1 \ + LIBXCB_VERSION=1.13.1 \ + LIBXML2_VERSION=2.9.10 \ + LIBZMQ_VERSION=4.3.2 \ + OGG_VERSION=1.3.2 \ + OPENCOREAMR_VERSION=0.1.5 \ + OPENJPEG_VERSION=2.1.2 \ + OPUS_VERSION=1.2 \ + THEORA_VERSION=1.1.1 \ + VORBIS_VERSION=1.3.5 \ + VPX_VERSION=1.8.0 \ + WEBP_VERSION=1.0.2 \ + X264_VERSION=20170226-2245-stable \ + X265_VERSION=3.4 \ + XAU_VERSION=1.0.9 \ + XCBPROTO_VERSION=1.13 \ + XORG_MACROS_VERSION=1.19.2 \ + XPROTO_VERSION=7.0.31 \ + XVID_VERSION=1.3.4 \ + ZIMG_VERSION=3.0.3 \ + SRC=/usr/local ARG FREETYPE_SHA256SUM="5eab795ebb23ac77001cfb68b7d4d50b5d6c7469247b0b01b2c953269f658dac freetype-2.10.4.tar.gz" ARG FRIBIDI_SHA256SUM="3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 0.19.7.tar.gz" @@ -96,24 +97,39 @@ RUN buildDeps="autoconf \ zlib1g-dev" && \ apt-get -yqq update && \ apt-get install -yq --no-install-recommends ${buildDeps} +# zimg https://github.com/sekrit-twc/zimg +RUN \ + DIR=/tmp/zimg && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://github.com/sekrit-twc/zimg/archive/refs/tags/release-${ZIMG_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + ./autogen.sh && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} + + + ## libvmaf https://github.com/Netflix/vmaf RUN \ if which meson || false; then \ - echo "Building VMAF." && \ - DIR=/tmp/vmaf && \ - mkdir -p ${DIR} && \ - cd ${DIR} && \ - curl -sLO https://github.com/Netflix/vmaf/archive/v${LIBVMAF_VERSION}.tar.gz && \ - tar -xz --strip-components=1 -f v${LIBVMAF_VERSION}.tar.gz && \ - cd /tmp/vmaf/libvmaf && \ - meson build --buildtype release --prefix=${PREFIX} && \ - ninja -vC build && \ - ninja -vC build install && \ - mkdir -p ${PREFIX}/share/model/ && \ - cp -r /tmp/vmaf/model/* ${PREFIX}/share/model/ && \ - rm -rf ${DIR}; \ + echo "Building VMAF." && \ + DIR=/tmp/vmaf && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/Netflix/vmaf/archive/v${LIBVMAF_VERSION}.tar.gz && \ + tar -xz --strip-components=1 -f v${LIBVMAF_VERSION}.tar.gz && \ + cd /tmp/vmaf/libvmaf && \ + meson build --buildtype release --prefix=${PREFIX} && \ + ninja -vC build && \ + ninja -vC build install && \ + mkdir -p ${PREFIX}/share/model/ && \ + cp -r /tmp/vmaf/model/* ${PREFIX}/share/model/ && \ + rm -rf ${DIR}; \ else \ - echo "VMAF skipped."; \ + echo "VMAF skipped."; \ fi ## opencore-amr https://sourceforge.net/projects/opencore-amr/ @@ -519,33 +535,34 @@ RUN \ --disable-debug \ --disable-doc \ --disable-ffplay \ - --enable-shared \ --enable-avresample \ - --enable-libopencore-amrnb \ - --enable-libopencore-amrwb \ + --enable-fontconfig \ --enable-gpl \ --enable-libass \ - --enable-fontconfig \ + --enable-libbluray \ + --enable-libfdk_aac \ --enable-libfreetype \ - --enable-libvidstab \ --enable-libmp3lame \ + --enable-libopencore-amrnb \ + --enable-libopencore-amrwb \ --enable-libopus \ --enable-libtheora \ + --enable-libvidstab \ --enable-libvorbis \ --enable-libvpx \ --enable-libwebp \ - --enable-libxcb \ + --enable-libx264 \ --enable-libx265 \ + --enable-libxcb \ --enable-libxvid \ - --enable-libx264 \ + --enable-libzmq \ --enable-nonfree \ --enable-openssl \ - --enable-libfdk_aac \ --enable-postproc \ + --enable-shared \ --enable-small \ --enable-version3 \ - --enable-libbluray \ - --enable-libzmq \ + --enable-zimg \ --extra-libs=-ldl \ --prefix="${PREFIX}" \ --enable-libopenjpeg \ @@ -555,7 +572,7 @@ RUN \ --enable-libsrt \ --extra-cflags="-I${PREFIX}/include" \ --extra-ldflags="-L${PREFIX}/lib" && \ - make && \ +make && \ make install && \ make tools/zmqsend && cp tools/zmqsend ${PREFIX}/bin/ && \ make distclean && \ diff --git a/docker-images/4.1/ubuntu2004/Dockerfile b/docker-images/4.1/ubuntu2004/Dockerfile index 5c9cda0e7..ae7e4be24 100644 --- a/docker-images/4.1/ubuntu2004/Dockerfile +++ b/docker-images/4.1/ubuntu2004/Dockerfile @@ -17,40 +17,41 @@ RUN apt-get -yqq update && \ FROM base as build ENV FFMPEG_VERSION=4.1.7 \ - AOM_VERSION=v1.0.0 \ - FDKAAC_VERSION=0.1.5 \ - FONTCONFIG_VERSION=2.12.4 \ - FREETYPE_VERSION=2.10.4 \ - FRIBIDI_VERSION=0.19.7 \ - KVAZAAR_VERSION=2.0.0 \ - LAME_VERSION=3.100 \ - LIBASS_VERSION=0.13.7 \ - LIBPTHREAD_STUBS_VERSION=0.4 \ - LIBVIDSTAB_VERSION=1.1.0 \ - LIBXCB_VERSION=1.13.1 \ - XCBPROTO_VERSION=1.13 \ - OGG_VERSION=1.3.2 \ - OPENCOREAMR_VERSION=0.1.5 \ - OPUS_VERSION=1.2 \ - OPENJPEG_VERSION=2.1.2 \ - THEORA_VERSION=1.1.1 \ - VORBIS_VERSION=1.3.5 \ - VPX_VERSION=1.8.0 \ - WEBP_VERSION=1.0.2 \ - X264_VERSION=20170226-2245-stable \ - X265_VERSION=3.4 \ - XAU_VERSION=1.0.9 \ - XORG_MACROS_VERSION=1.19.2 \ - XPROTO_VERSION=7.0.31 \ - XVID_VERSION=1.3.4 \ - LIBXML2_VERSION=2.9.10 \ - LIBBLURAY_VERSION=1.1.2 \ - LIBZMQ_VERSION=4.3.2 \ - LIBSRT_VERSION=1.4.1 \ - LIBARIBB24_VERSION=1.0.3 \ - LIBPNG_VERSION=1.6.9 \ - LIBVMAF_VERSION=2.1.1 \ - SRC=/usr/local + AOM_VERSION=v1.0.0 \ + FDKAAC_VERSION=0.1.5 \ + FONTCONFIG_VERSION=2.12.4 \ + FREETYPE_VERSION=2.10.4 \ + FRIBIDI_VERSION=0.19.7 \ + KVAZAAR_VERSION=2.0.0 \ + LAME_VERSION=3.100 \ + LIBARIBB24_VERSION=1.0.3 \ + LIBASS_VERSION=0.13.7 \ + LIBBLURAY_VERSION=1.1.2 \ + LIBPNG_VERSION=1.6.9 \ + LIBPTHREAD_STUBS_VERSION=0.4 \ + LIBSRT_VERSION=1.4.1 \ + LIBVIDSTAB_VERSION=1.1.0 \ + LIBVMAF_VERSION=2.1.1 \ + LIBXCB_VERSION=1.13.1 \ + LIBXML2_VERSION=2.9.10 \ + LIBZMQ_VERSION=4.3.2 \ + OGG_VERSION=1.3.2 \ + OPENCOREAMR_VERSION=0.1.5 \ + OPENJPEG_VERSION=2.1.2 \ + OPUS_VERSION=1.2 \ + THEORA_VERSION=1.1.1 \ + VORBIS_VERSION=1.3.5 \ + VPX_VERSION=1.8.0 \ + WEBP_VERSION=1.0.2 \ + X264_VERSION=20170226-2245-stable \ + X265_VERSION=3.4 \ + XAU_VERSION=1.0.9 \ + XCBPROTO_VERSION=1.13 \ + XORG_MACROS_VERSION=1.19.2 \ + XPROTO_VERSION=7.0.31 \ + XVID_VERSION=1.3.4 \ + ZIMG_VERSION=3.0.3 \ + SRC=/usr/local ARG FREETYPE_SHA256SUM="5eab795ebb23ac77001cfb68b7d4d50b5d6c7469247b0b01b2c953269f658dac freetype-2.10.4.tar.gz" ARG FRIBIDI_SHA256SUM="3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 0.19.7.tar.gz" @@ -99,24 +100,39 @@ RUN buildDeps="autoconf \ zlib1g-dev" && \ apt-get -yqq update && \ apt-get install -yq --no-install-recommends ${buildDeps} +# zimg https://github.com/sekrit-twc/zimg +RUN \ + DIR=/tmp/zimg && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://github.com/sekrit-twc/zimg/archive/refs/tags/release-${ZIMG_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + ./autogen.sh && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} + + + ## libvmaf https://github.com/Netflix/vmaf RUN \ if which meson || false; then \ - echo "Building VMAF." && \ - DIR=/tmp/vmaf && \ - mkdir -p ${DIR} && \ - cd ${DIR} && \ - curl -sLO https://github.com/Netflix/vmaf/archive/v${LIBVMAF_VERSION}.tar.gz && \ - tar -xz --strip-components=1 -f v${LIBVMAF_VERSION}.tar.gz && \ - cd /tmp/vmaf/libvmaf && \ - meson build --buildtype release --prefix=${PREFIX} && \ - ninja -vC build && \ - ninja -vC build install && \ - mkdir -p ${PREFIX}/share/model/ && \ - cp -r /tmp/vmaf/model/* ${PREFIX}/share/model/ && \ - rm -rf ${DIR}; \ + echo "Building VMAF." && \ + DIR=/tmp/vmaf && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/Netflix/vmaf/archive/v${LIBVMAF_VERSION}.tar.gz && \ + tar -xz --strip-components=1 -f v${LIBVMAF_VERSION}.tar.gz && \ + cd /tmp/vmaf/libvmaf && \ + meson build --buildtype release --prefix=${PREFIX} && \ + ninja -vC build && \ + ninja -vC build install && \ + mkdir -p ${PREFIX}/share/model/ && \ + cp -r /tmp/vmaf/model/* ${PREFIX}/share/model/ && \ + rm -rf ${DIR}; \ else \ - echo "VMAF skipped."; \ + echo "VMAF skipped."; \ fi ## opencore-amr https://sourceforge.net/projects/opencore-amr/ @@ -522,33 +538,34 @@ RUN \ --disable-debug \ --disable-doc \ --disable-ffplay \ - --enable-shared \ --enable-avresample \ - --enable-libopencore-amrnb \ - --enable-libopencore-amrwb \ + --enable-fontconfig \ --enable-gpl \ --enable-libass \ - --enable-fontconfig \ + --enable-libbluray \ + --enable-libfdk_aac \ --enable-libfreetype \ - --enable-libvidstab \ --enable-libmp3lame \ + --enable-libopencore-amrnb \ + --enable-libopencore-amrwb \ --enable-libopus \ --enable-libtheora \ + --enable-libvidstab \ --enable-libvorbis \ --enable-libvpx \ --enable-libwebp \ - --enable-libxcb \ + --enable-libx264 \ --enable-libx265 \ + --enable-libxcb \ --enable-libxvid \ - --enable-libx264 \ + --enable-libzmq \ --enable-nonfree \ --enable-openssl \ - --enable-libfdk_aac \ --enable-postproc \ + --enable-shared \ --enable-small \ --enable-version3 \ - --enable-libbluray \ - --enable-libzmq \ + --enable-zimg \ --extra-libs=-ldl \ --prefix="${PREFIX}" \ --enable-libopenjpeg \ @@ -558,7 +575,7 @@ RUN \ --enable-libsrt \ --extra-cflags="-I${PREFIX}/include" \ --extra-ldflags="-L${PREFIX}/lib" && \ - make && \ +make && \ make install && \ make tools/zmqsend && cp tools/zmqsend ${PREFIX}/bin/ && \ make distclean && \ diff --git a/docker-images/4.1/vaapi2004/Dockerfile b/docker-images/4.1/vaapi2004/Dockerfile index 9f4ec0c7a..fe9a380cd 100644 --- a/docker-images/4.1/vaapi2004/Dockerfile +++ b/docker-images/4.1/vaapi2004/Dockerfile @@ -17,40 +17,41 @@ RUN apt-get -yqq update && \ FROM base as build ENV FFMPEG_VERSION=4.1.7 \ - AOM_VERSION=v1.0.0 \ - FDKAAC_VERSION=0.1.5 \ - FONTCONFIG_VERSION=2.12.4 \ - FREETYPE_VERSION=2.10.4 \ - FRIBIDI_VERSION=0.19.7 \ - KVAZAAR_VERSION=2.0.0 \ - LAME_VERSION=3.100 \ - LIBASS_VERSION=0.13.7 \ - LIBPTHREAD_STUBS_VERSION=0.4 \ - LIBVIDSTAB_VERSION=1.1.0 \ - LIBXCB_VERSION=1.13.1 \ - XCBPROTO_VERSION=1.13 \ - OGG_VERSION=1.3.2 \ - OPENCOREAMR_VERSION=0.1.5 \ - OPUS_VERSION=1.2 \ - OPENJPEG_VERSION=2.1.2 \ - THEORA_VERSION=1.1.1 \ - VORBIS_VERSION=1.3.5 \ - VPX_VERSION=1.8.0 \ - WEBP_VERSION=1.0.2 \ - X264_VERSION=20170226-2245-stable \ - X265_VERSION=3.4 \ - XAU_VERSION=1.0.9 \ - XORG_MACROS_VERSION=1.19.2 \ - XPROTO_VERSION=7.0.31 \ - XVID_VERSION=1.3.4 \ - LIBXML2_VERSION=2.9.10 \ - LIBBLURAY_VERSION=1.1.2 \ - LIBZMQ_VERSION=4.3.2 \ - LIBSRT_VERSION=1.4.1 \ - LIBARIBB24_VERSION=1.0.3 \ - LIBPNG_VERSION=1.6.9 \ - LIBVMAF_VERSION=2.1.1 \ - SRC=/usr/local + AOM_VERSION=v1.0.0 \ + FDKAAC_VERSION=0.1.5 \ + FONTCONFIG_VERSION=2.12.4 \ + FREETYPE_VERSION=2.10.4 \ + FRIBIDI_VERSION=0.19.7 \ + KVAZAAR_VERSION=2.0.0 \ + LAME_VERSION=3.100 \ + LIBARIBB24_VERSION=1.0.3 \ + LIBASS_VERSION=0.13.7 \ + LIBBLURAY_VERSION=1.1.2 \ + LIBPNG_VERSION=1.6.9 \ + LIBPTHREAD_STUBS_VERSION=0.4 \ + LIBSRT_VERSION=1.4.1 \ + LIBVIDSTAB_VERSION=1.1.0 \ + LIBVMAF_VERSION=2.1.1 \ + LIBXCB_VERSION=1.13.1 \ + LIBXML2_VERSION=2.9.10 \ + LIBZMQ_VERSION=4.3.2 \ + OGG_VERSION=1.3.2 \ + OPENCOREAMR_VERSION=0.1.5 \ + OPENJPEG_VERSION=2.1.2 \ + OPUS_VERSION=1.2 \ + THEORA_VERSION=1.1.1 \ + VORBIS_VERSION=1.3.5 \ + VPX_VERSION=1.8.0 \ + WEBP_VERSION=1.0.2 \ + X264_VERSION=20170226-2245-stable \ + X265_VERSION=3.4 \ + XAU_VERSION=1.0.9 \ + XCBPROTO_VERSION=1.13 \ + XORG_MACROS_VERSION=1.19.2 \ + XPROTO_VERSION=7.0.31 \ + XVID_VERSION=1.3.4 \ + ZIMG_VERSION=3.0.3 \ + SRC=/usr/local ARG FREETYPE_SHA256SUM="5eab795ebb23ac77001cfb68b7d4d50b5d6c7469247b0b01b2c953269f658dac freetype-2.10.4.tar.gz" ARG FRIBIDI_SHA256SUM="3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 0.19.7.tar.gz" @@ -100,24 +101,39 @@ RUN buildDeps="autoconf \ zlib1g-dev" && \ apt-get -yqq update && \ apt-get install -yq --no-install-recommends ${buildDeps} +# zimg https://github.com/sekrit-twc/zimg +RUN \ + DIR=/tmp/zimg && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://github.com/sekrit-twc/zimg/archive/refs/tags/release-${ZIMG_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + ./autogen.sh && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} + + + ## libvmaf https://github.com/Netflix/vmaf RUN \ if which meson || false; then \ - echo "Building VMAF." && \ - DIR=/tmp/vmaf && \ - mkdir -p ${DIR} && \ - cd ${DIR} && \ - curl -sLO https://github.com/Netflix/vmaf/archive/v${LIBVMAF_VERSION}.tar.gz && \ - tar -xz --strip-components=1 -f v${LIBVMAF_VERSION}.tar.gz && \ - cd /tmp/vmaf/libvmaf && \ - meson build --buildtype release --prefix=${PREFIX} && \ - ninja -vC build && \ - ninja -vC build install && \ - mkdir -p ${PREFIX}/share/model/ && \ - cp -r /tmp/vmaf/model/* ${PREFIX}/share/model/ && \ - rm -rf ${DIR}; \ + echo "Building VMAF." && \ + DIR=/tmp/vmaf && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/Netflix/vmaf/archive/v${LIBVMAF_VERSION}.tar.gz && \ + tar -xz --strip-components=1 -f v${LIBVMAF_VERSION}.tar.gz && \ + cd /tmp/vmaf/libvmaf && \ + meson build --buildtype release --prefix=${PREFIX} && \ + ninja -vC build && \ + ninja -vC build install && \ + mkdir -p ${PREFIX}/share/model/ && \ + cp -r /tmp/vmaf/model/* ${PREFIX}/share/model/ && \ + rm -rf ${DIR}; \ else \ - echo "VMAF skipped."; \ + echo "VMAF skipped."; \ fi ## opencore-amr https://sourceforge.net/projects/opencore-amr/ @@ -523,33 +539,34 @@ RUN \ --disable-debug \ --disable-doc \ --disable-ffplay \ - --enable-shared \ --enable-avresample \ - --enable-libopencore-amrnb \ - --enable-libopencore-amrwb \ + --enable-fontconfig \ --enable-gpl \ --enable-libass \ - --enable-fontconfig \ + --enable-libbluray \ + --enable-libfdk_aac \ --enable-libfreetype \ - --enable-libvidstab \ --enable-libmp3lame \ + --enable-libopencore-amrnb \ + --enable-libopencore-amrwb \ --enable-libopus \ --enable-libtheora \ + --enable-libvidstab \ --enable-libvorbis \ --enable-libvpx \ --enable-libwebp \ - --enable-libxcb \ + --enable-libx264 \ --enable-libx265 \ + --enable-libxcb \ --enable-libxvid \ - --enable-libx264 \ + --enable-libzmq \ --enable-nonfree \ --enable-openssl \ - --enable-libfdk_aac \ --enable-postproc \ + --enable-shared \ --enable-small \ --enable-version3 \ - --enable-libbluray \ - --enable-libzmq \ + --enable-zimg \ --extra-libs=-ldl \ --prefix="${PREFIX}" \ --enable-libopenjpeg \ @@ -560,7 +577,7 @@ RUN \ --enable-vaapi \ --extra-cflags="-I${PREFIX}/include" \ --extra-ldflags="-L${PREFIX}/lib" && \ - make && \ +make && \ make install && \ make tools/zmqsend && cp tools/zmqsend ${PREFIX}/bin/ && \ make distclean && \ diff --git a/docker-images/4.2/alpine312/Dockerfile b/docker-images/4.2/alpine312/Dockerfile index 4a9469b37..b42c7fa6c 100644 --- a/docker-images/4.2/alpine312/Dockerfile +++ b/docker-images/4.2/alpine312/Dockerfile @@ -14,40 +14,41 @@ FROM base AS build WORKDIR /tmp/workdir ENV FFMPEG_VERSION=4.2.4 \ - AOM_VERSION=v1.0.0 \ - FDKAAC_VERSION=0.1.5 \ - FONTCONFIG_VERSION=2.12.4 \ - FREETYPE_VERSION=2.10.4 \ - FRIBIDI_VERSION=0.19.7 \ - KVAZAAR_VERSION=2.0.0 \ - LAME_VERSION=3.100 \ - LIBASS_VERSION=0.13.7 \ - LIBPTHREAD_STUBS_VERSION=0.4 \ - LIBVIDSTAB_VERSION=1.1.0 \ - LIBXCB_VERSION=1.13.1 \ - XCBPROTO_VERSION=1.13 \ - OGG_VERSION=1.3.2 \ - OPENCOREAMR_VERSION=0.1.5 \ - OPUS_VERSION=1.2 \ - OPENJPEG_VERSION=2.1.2 \ - THEORA_VERSION=1.1.1 \ - VORBIS_VERSION=1.3.5 \ - VPX_VERSION=1.8.0 \ - WEBP_VERSION=1.0.2 \ - X264_VERSION=20170226-2245-stable \ - X265_VERSION=3.4 \ - XAU_VERSION=1.0.9 \ - XORG_MACROS_VERSION=1.19.2 \ - XPROTO_VERSION=7.0.31 \ - XVID_VERSION=1.3.4 \ - LIBXML2_VERSION=2.9.10 \ - LIBBLURAY_VERSION=1.1.2 \ - LIBZMQ_VERSION=4.3.2 \ - LIBSRT_VERSION=1.4.1 \ - LIBARIBB24_VERSION=1.0.3 \ - LIBPNG_VERSION=1.6.9 \ - LIBVMAF_VERSION=2.1.1 \ - SRC=/usr/local + AOM_VERSION=v1.0.0 \ + FDKAAC_VERSION=0.1.5 \ + FONTCONFIG_VERSION=2.12.4 \ + FREETYPE_VERSION=2.10.4 \ + FRIBIDI_VERSION=0.19.7 \ + KVAZAAR_VERSION=2.0.0 \ + LAME_VERSION=3.100 \ + LIBARIBB24_VERSION=1.0.3 \ + LIBASS_VERSION=0.13.7 \ + LIBBLURAY_VERSION=1.1.2 \ + LIBPNG_VERSION=1.6.9 \ + LIBPTHREAD_STUBS_VERSION=0.4 \ + LIBSRT_VERSION=1.4.1 \ + LIBVIDSTAB_VERSION=1.1.0 \ + LIBVMAF_VERSION=2.1.1 \ + LIBXCB_VERSION=1.13.1 \ + LIBXML2_VERSION=2.9.10 \ + LIBZMQ_VERSION=4.3.2 \ + OGG_VERSION=1.3.2 \ + OPENCOREAMR_VERSION=0.1.5 \ + OPENJPEG_VERSION=2.1.2 \ + OPUS_VERSION=1.2 \ + THEORA_VERSION=1.1.1 \ + VORBIS_VERSION=1.3.5 \ + VPX_VERSION=1.8.0 \ + WEBP_VERSION=1.0.2 \ + X264_VERSION=20170226-2245-stable \ + X265_VERSION=3.4 \ + XAU_VERSION=1.0.9 \ + XCBPROTO_VERSION=1.13 \ + XORG_MACROS_VERSION=1.19.2 \ + XPROTO_VERSION=7.0.31 \ + XVID_VERSION=1.3.4 \ + ZIMG_VERSION=3.0.3 \ + SRC=/usr/local ARG FREETYPE_SHA256SUM="5eab795ebb23ac77001cfb68b7d4d50b5d6c7469247b0b01b2c953269f658dac freetype-2.10.4.tar.gz" ARG FRIBIDI_SHA256SUM="3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 0.19.7.tar.gz" @@ -95,24 +96,39 @@ RUN buildDeps="autoconf \ zlib-dev \ expat-dev" && \ apk add --no-cache --update ${buildDeps} +# zimg https://github.com/sekrit-twc/zimg +RUN \ + DIR=/tmp/zimg && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://github.com/sekrit-twc/zimg/archive/refs/tags/release-${ZIMG_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + ./autogen.sh && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} + + + ## libvmaf https://github.com/Netflix/vmaf RUN \ if which meson || false; then \ - echo "Building VMAF." && \ - DIR=/tmp/vmaf && \ - mkdir -p ${DIR} && \ - cd ${DIR} && \ - curl -sLO https://github.com/Netflix/vmaf/archive/v${LIBVMAF_VERSION}.tar.gz && \ - tar -xz --strip-components=1 -f v${LIBVMAF_VERSION}.tar.gz && \ - cd /tmp/vmaf/libvmaf && \ - meson build --buildtype release --prefix=${PREFIX} && \ - ninja -vC build && \ - ninja -vC build install && \ - mkdir -p ${PREFIX}/share/model/ && \ - cp -r /tmp/vmaf/model/* ${PREFIX}/share/model/ && \ - rm -rf ${DIR}; \ + echo "Building VMAF." && \ + DIR=/tmp/vmaf && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/Netflix/vmaf/archive/v${LIBVMAF_VERSION}.tar.gz && \ + tar -xz --strip-components=1 -f v${LIBVMAF_VERSION}.tar.gz && \ + cd /tmp/vmaf/libvmaf && \ + meson build --buildtype release --prefix=${PREFIX} && \ + ninja -vC build && \ + ninja -vC build install && \ + mkdir -p ${PREFIX}/share/model/ && \ + cp -r /tmp/vmaf/model/* ${PREFIX}/share/model/ && \ + rm -rf ${DIR}; \ else \ - echo "VMAF skipped."; \ + echo "VMAF skipped."; \ fi ## opencore-amr https://sourceforge.net/projects/opencore-amr/ @@ -518,33 +534,34 @@ RUN \ --disable-debug \ --disable-doc \ --disable-ffplay \ - --enable-shared \ --enable-avresample \ - --enable-libopencore-amrnb \ - --enable-libopencore-amrwb \ + --enable-fontconfig \ --enable-gpl \ --enable-libass \ - --enable-fontconfig \ + --enable-libbluray \ + --enable-libfdk_aac \ --enable-libfreetype \ - --enable-libvidstab \ --enable-libmp3lame \ + --enable-libopencore-amrnb \ + --enable-libopencore-amrwb \ --enable-libopus \ --enable-libtheora \ + --enable-libvidstab \ --enable-libvorbis \ --enable-libvpx \ --enable-libwebp \ - --enable-libxcb \ + --enable-libx264 \ --enable-libx265 \ + --enable-libxcb \ --enable-libxvid \ - --enable-libx264 \ + --enable-libzmq \ --enable-nonfree \ --enable-openssl \ - --enable-libfdk_aac \ --enable-postproc \ + --enable-shared \ --enable-small \ --enable-version3 \ - --enable-libbluray \ - --enable-libzmq \ + --enable-zimg \ --extra-libs=-ldl \ --prefix="${PREFIX}" \ --enable-libopenjpeg \ @@ -555,7 +572,7 @@ RUN \ --enable-libaribb24 \ --extra-cflags="-I${PREFIX}/include" \ --extra-ldflags="-L${PREFIX}/lib" && \ - make && \ +make && \ make install && \ make tools/zmqsend && cp tools/zmqsend ${PREFIX}/bin/ && \ make distclean && \ diff --git a/docker-images/4.2/centos7/Dockerfile b/docker-images/4.2/centos7/Dockerfile index 079e968df..b32a81c89 100644 --- a/docker-images/4.2/centos7/Dockerfile +++ b/docker-images/4.2/centos7/Dockerfile @@ -16,40 +16,41 @@ FROM base AS build WORKDIR /tmp/workdir ENV FFMPEG_VERSION=4.2.4 \ - AOM_VERSION=v1.0.0 \ - FDKAAC_VERSION=0.1.5 \ - FONTCONFIG_VERSION=2.12.4 \ - FREETYPE_VERSION=2.10.4 \ - FRIBIDI_VERSION=0.19.7 \ - KVAZAAR_VERSION=2.0.0 \ - LAME_VERSION=3.100 \ - LIBASS_VERSION=0.13.7 \ - LIBPTHREAD_STUBS_VERSION=0.4 \ - LIBVIDSTAB_VERSION=1.1.0 \ - LIBXCB_VERSION=1.13.1 \ - XCBPROTO_VERSION=1.13 \ - OGG_VERSION=1.3.2 \ - OPENCOREAMR_VERSION=0.1.5 \ - OPUS_VERSION=1.2 \ - OPENJPEG_VERSION=2.1.2 \ - THEORA_VERSION=1.1.1 \ - VORBIS_VERSION=1.3.5 \ - VPX_VERSION=1.8.0 \ - WEBP_VERSION=1.0.2 \ - X264_VERSION=20170226-2245-stable \ - X265_VERSION=3.4 \ - XAU_VERSION=1.0.9 \ - XORG_MACROS_VERSION=1.19.2 \ - XPROTO_VERSION=7.0.31 \ - XVID_VERSION=1.3.4 \ - LIBXML2_VERSION=2.9.10 \ - LIBBLURAY_VERSION=1.1.2 \ - LIBZMQ_VERSION=4.3.2 \ - LIBSRT_VERSION=1.4.1 \ - LIBARIBB24_VERSION=1.0.3 \ - LIBPNG_VERSION=1.6.9 \ - LIBVMAF_VERSION=2.1.1 \ - SRC=/usr/local + AOM_VERSION=v1.0.0 \ + FDKAAC_VERSION=0.1.5 \ + FONTCONFIG_VERSION=2.12.4 \ + FREETYPE_VERSION=2.10.4 \ + FRIBIDI_VERSION=0.19.7 \ + KVAZAAR_VERSION=2.0.0 \ + LAME_VERSION=3.100 \ + LIBARIBB24_VERSION=1.0.3 \ + LIBASS_VERSION=0.13.7 \ + LIBBLURAY_VERSION=1.1.2 \ + LIBPNG_VERSION=1.6.9 \ + LIBPTHREAD_STUBS_VERSION=0.4 \ + LIBSRT_VERSION=1.4.1 \ + LIBVIDSTAB_VERSION=1.1.0 \ + LIBVMAF_VERSION=2.1.1 \ + LIBXCB_VERSION=1.13.1 \ + LIBXML2_VERSION=2.9.10 \ + LIBZMQ_VERSION=4.3.2 \ + OGG_VERSION=1.3.2 \ + OPENCOREAMR_VERSION=0.1.5 \ + OPENJPEG_VERSION=2.1.2 \ + OPUS_VERSION=1.2 \ + THEORA_VERSION=1.1.1 \ + VORBIS_VERSION=1.3.5 \ + VPX_VERSION=1.8.0 \ + WEBP_VERSION=1.0.2 \ + X264_VERSION=20170226-2245-stable \ + X265_VERSION=3.4 \ + XAU_VERSION=1.0.9 \ + XCBPROTO_VERSION=1.13 \ + XORG_MACROS_VERSION=1.19.2 \ + XPROTO_VERSION=7.0.31 \ + XVID_VERSION=1.3.4 \ + ZIMG_VERSION=3.0.3 \ + SRC=/usr/local ARG FREETYPE_SHA256SUM="5eab795ebb23ac77001cfb68b7d4d50b5d6c7469247b0b01b2c953269f658dac freetype-2.10.4.tar.gz" ARG FRIBIDI_SHA256SUM="3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 0.19.7.tar.gz" @@ -132,24 +133,39 @@ RUN buildDeps="autoconf \ yum history undo $(yum history info | grep 'Transaction ID' | awk -F: '{print$2}' | tr -d ' ') -y && \ yum autoremove -y +# zimg https://github.com/sekrit-twc/zimg +RUN \ + DIR=/tmp/zimg && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://github.com/sekrit-twc/zimg/archive/refs/tags/release-${ZIMG_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + ./autogen.sh && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} + + + ## libvmaf https://github.com/Netflix/vmaf RUN \ if which meson || false; then \ - echo "Building VMAF." && \ - DIR=/tmp/vmaf && \ - mkdir -p ${DIR} && \ - cd ${DIR} && \ - curl -sLO https://github.com/Netflix/vmaf/archive/v${LIBVMAF_VERSION}.tar.gz && \ - tar -xz --strip-components=1 -f v${LIBVMAF_VERSION}.tar.gz && \ - cd /tmp/vmaf/libvmaf && \ - meson build --buildtype release --prefix=${PREFIX} && \ - ninja -vC build && \ - ninja -vC build install && \ - mkdir -p ${PREFIX}/share/model/ && \ - cp -r /tmp/vmaf/model/* ${PREFIX}/share/model/ && \ - rm -rf ${DIR}; \ + echo "Building VMAF." && \ + DIR=/tmp/vmaf && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/Netflix/vmaf/archive/v${LIBVMAF_VERSION}.tar.gz && \ + tar -xz --strip-components=1 -f v${LIBVMAF_VERSION}.tar.gz && \ + cd /tmp/vmaf/libvmaf && \ + meson build --buildtype release --prefix=${PREFIX} && \ + ninja -vC build && \ + ninja -vC build install && \ + mkdir -p ${PREFIX}/share/model/ && \ + cp -r /tmp/vmaf/model/* ${PREFIX}/share/model/ && \ + rm -rf ${DIR}; \ else \ - echo "VMAF skipped."; \ + echo "VMAF skipped."; \ fi ## opencore-amr https://sourceforge.net/projects/opencore-amr/ @@ -555,33 +571,34 @@ RUN \ --disable-debug \ --disable-doc \ --disable-ffplay \ - --enable-shared \ --enable-avresample \ - --enable-libopencore-amrnb \ - --enable-libopencore-amrwb \ + --enable-fontconfig \ --enable-gpl \ --enable-libass \ - --enable-fontconfig \ + --enable-libbluray \ + --enable-libfdk_aac \ --enable-libfreetype \ - --enable-libvidstab \ --enable-libmp3lame \ + --enable-libopencore-amrnb \ + --enable-libopencore-amrwb \ --enable-libopus \ --enable-libtheora \ + --enable-libvidstab \ --enable-libvorbis \ --enable-libvpx \ --enable-libwebp \ - --enable-libxcb \ + --enable-libx264 \ --enable-libx265 \ + --enable-libxcb \ --enable-libxvid \ - --enable-libx264 \ + --enable-libzmq \ --enable-nonfree \ --enable-openssl \ - --enable-libfdk_aac \ --enable-postproc \ + --enable-shared \ --enable-small \ --enable-version3 \ - --enable-libbluray \ - --enable-libzmq \ + --enable-zimg \ --extra-libs=-ldl \ --prefix="${PREFIX}" \ --enable-libopenjpeg \ @@ -592,7 +609,7 @@ RUN \ --enable-libaribb24 \ --extra-cflags="-I${PREFIX}/include" \ --extra-ldflags="-L${PREFIX}/lib" && \ - make && \ +make && \ make install && \ make tools/zmqsend && cp tools/zmqsend ${PREFIX}/bin/ && \ make distclean && \ diff --git a/docker-images/4.2/centos8/Dockerfile b/docker-images/4.2/centos8/Dockerfile index da5c69f1e..7cadb89a7 100644 --- a/docker-images/4.2/centos8/Dockerfile +++ b/docker-images/4.2/centos8/Dockerfile @@ -16,40 +16,41 @@ FROM base AS build WORKDIR /tmp/workdir ENV FFMPEG_VERSION=4.2.4 \ - AOM_VERSION=v1.0.0 \ - FDKAAC_VERSION=0.1.5 \ - FONTCONFIG_VERSION=2.12.4 \ - FREETYPE_VERSION=2.10.4 \ - FRIBIDI_VERSION=0.19.7 \ - KVAZAAR_VERSION=2.0.0 \ - LAME_VERSION=3.100 \ - LIBASS_VERSION=0.13.7 \ - LIBPTHREAD_STUBS_VERSION=0.4 \ - LIBVIDSTAB_VERSION=1.1.0 \ - LIBXCB_VERSION=1.13.1 \ - XCBPROTO_VERSION=1.13 \ - OGG_VERSION=1.3.2 \ - OPENCOREAMR_VERSION=0.1.5 \ - OPUS_VERSION=1.2 \ - OPENJPEG_VERSION=2.1.2 \ - THEORA_VERSION=1.1.1 \ - VORBIS_VERSION=1.3.5 \ - VPX_VERSION=1.8.0 \ - WEBP_VERSION=1.0.2 \ - X264_VERSION=20170226-2245-stable \ - X265_VERSION=3.4 \ - XAU_VERSION=1.0.9 \ - XORG_MACROS_VERSION=1.19.2 \ - XPROTO_VERSION=7.0.31 \ - XVID_VERSION=1.3.4 \ - LIBXML2_VERSION=2.9.10 \ - LIBBLURAY_VERSION=1.1.2 \ - LIBZMQ_VERSION=4.3.2 \ - LIBSRT_VERSION=1.4.1 \ - LIBARIBB24_VERSION=1.0.3 \ - LIBPNG_VERSION=1.6.9 \ - LIBVMAF_VERSION=2.1.1 \ - SRC=/usr/local + AOM_VERSION=v1.0.0 \ + FDKAAC_VERSION=0.1.5 \ + FONTCONFIG_VERSION=2.12.4 \ + FREETYPE_VERSION=2.10.4 \ + FRIBIDI_VERSION=0.19.7 \ + KVAZAAR_VERSION=2.0.0 \ + LAME_VERSION=3.100 \ + LIBARIBB24_VERSION=1.0.3 \ + LIBASS_VERSION=0.13.7 \ + LIBBLURAY_VERSION=1.1.2 \ + LIBPNG_VERSION=1.6.9 \ + LIBPTHREAD_STUBS_VERSION=0.4 \ + LIBSRT_VERSION=1.4.1 \ + LIBVIDSTAB_VERSION=1.1.0 \ + LIBVMAF_VERSION=2.1.1 \ + LIBXCB_VERSION=1.13.1 \ + LIBXML2_VERSION=2.9.10 \ + LIBZMQ_VERSION=4.3.2 \ + OGG_VERSION=1.3.2 \ + OPENCOREAMR_VERSION=0.1.5 \ + OPENJPEG_VERSION=2.1.2 \ + OPUS_VERSION=1.2 \ + THEORA_VERSION=1.1.1 \ + VORBIS_VERSION=1.3.5 \ + VPX_VERSION=1.8.0 \ + WEBP_VERSION=1.0.2 \ + X264_VERSION=20170226-2245-stable \ + X265_VERSION=3.4 \ + XAU_VERSION=1.0.9 \ + XCBPROTO_VERSION=1.13 \ + XORG_MACROS_VERSION=1.19.2 \ + XPROTO_VERSION=7.0.31 \ + XVID_VERSION=1.3.4 \ + ZIMG_VERSION=3.0.3 \ + SRC=/usr/local ARG FREETYPE_SHA256SUM="5eab795ebb23ac77001cfb68b7d4d50b5d6c7469247b0b01b2c953269f658dac freetype-2.10.4.tar.gz" ARG FRIBIDI_SHA256SUM="3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 0.19.7.tar.gz" @@ -101,24 +102,39 @@ RUN buildDeps="autoconf \ yum config-manager --set-enabled powertools && \ dnf install -y ${buildDeps} && \ alternatives --set python /usr/bin/python3 +# zimg https://github.com/sekrit-twc/zimg +RUN \ + DIR=/tmp/zimg && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://github.com/sekrit-twc/zimg/archive/refs/tags/release-${ZIMG_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + ./autogen.sh && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} + + + ## libvmaf https://github.com/Netflix/vmaf RUN \ if which meson || false; then \ - echo "Building VMAF." && \ - DIR=/tmp/vmaf && \ - mkdir -p ${DIR} && \ - cd ${DIR} && \ - curl -sLO https://github.com/Netflix/vmaf/archive/v${LIBVMAF_VERSION}.tar.gz && \ - tar -xz --strip-components=1 -f v${LIBVMAF_VERSION}.tar.gz && \ - cd /tmp/vmaf/libvmaf && \ - meson build --buildtype release --prefix=${PREFIX} && \ - ninja -vC build && \ - ninja -vC build install && \ - mkdir -p ${PREFIX}/share/model/ && \ - cp -r /tmp/vmaf/model/* ${PREFIX}/share/model/ && \ - rm -rf ${DIR}; \ + echo "Building VMAF." && \ + DIR=/tmp/vmaf && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/Netflix/vmaf/archive/v${LIBVMAF_VERSION}.tar.gz && \ + tar -xz --strip-components=1 -f v${LIBVMAF_VERSION}.tar.gz && \ + cd /tmp/vmaf/libvmaf && \ + meson build --buildtype release --prefix=${PREFIX} && \ + ninja -vC build && \ + ninja -vC build install && \ + mkdir -p ${PREFIX}/share/model/ && \ + cp -r /tmp/vmaf/model/* ${PREFIX}/share/model/ && \ + rm -rf ${DIR}; \ else \ - echo "VMAF skipped."; \ + echo "VMAF skipped."; \ fi ## opencore-amr https://sourceforge.net/projects/opencore-amr/ @@ -524,33 +540,34 @@ RUN \ --disable-debug \ --disable-doc \ --disable-ffplay \ - --enable-shared \ --enable-avresample \ - --enable-libopencore-amrnb \ - --enable-libopencore-amrwb \ + --enable-fontconfig \ --enable-gpl \ --enable-libass \ - --enable-fontconfig \ + --enable-libbluray \ + --enable-libfdk_aac \ --enable-libfreetype \ - --enable-libvidstab \ --enable-libmp3lame \ + --enable-libopencore-amrnb \ + --enable-libopencore-amrwb \ --enable-libopus \ --enable-libtheora \ + --enable-libvidstab \ --enable-libvorbis \ --enable-libvpx \ --enable-libwebp \ - --enable-libxcb \ + --enable-libx264 \ --enable-libx265 \ + --enable-libxcb \ --enable-libxvid \ - --enable-libx264 \ + --enable-libzmq \ --enable-nonfree \ --enable-openssl \ - --enable-libfdk_aac \ --enable-postproc \ + --enable-shared \ --enable-small \ --enable-version3 \ - --enable-libbluray \ - --enable-libzmq \ + --enable-zimg \ --extra-libs=-ldl \ --prefix="${PREFIX}" \ --enable-libopenjpeg \ @@ -561,7 +578,7 @@ RUN \ --enable-libaribb24 \ --extra-cflags="-I${PREFIX}/include" \ --extra-ldflags="-L${PREFIX}/lib" && \ - make && \ +make && \ make install && \ make tools/zmqsend && cp tools/zmqsend ${PREFIX}/bin/ && \ make distclean && \ diff --git a/docker-images/4.2/nvidia2004/Dockerfile b/docker-images/4.2/nvidia2004/Dockerfile index f927b3e44..96a463054 100644 --- a/docker-images/4.2/nvidia2004/Dockerfile +++ b/docker-images/4.2/nvidia2004/Dockerfile @@ -34,40 +34,41 @@ FROM devel-base as build ENV NVIDIA_HEADERS_VERSION=11.1.5.0 ENV FFMPEG_VERSION=4.2.4 \ - AOM_VERSION=v1.0.0 \ - FDKAAC_VERSION=0.1.5 \ - FONTCONFIG_VERSION=2.12.4 \ - FREETYPE_VERSION=2.10.4 \ - FRIBIDI_VERSION=0.19.7 \ - KVAZAAR_VERSION=2.0.0 \ - LAME_VERSION=3.100 \ - LIBASS_VERSION=0.13.7 \ - LIBPTHREAD_STUBS_VERSION=0.4 \ - LIBVIDSTAB_VERSION=1.1.0 \ - LIBXCB_VERSION=1.13.1 \ - XCBPROTO_VERSION=1.13 \ - OGG_VERSION=1.3.2 \ - OPENCOREAMR_VERSION=0.1.5 \ - OPUS_VERSION=1.2 \ - OPENJPEG_VERSION=2.1.2 \ - THEORA_VERSION=1.1.1 \ - VORBIS_VERSION=1.3.5 \ - VPX_VERSION=1.8.0 \ - WEBP_VERSION=1.0.2 \ - X264_VERSION=20170226-2245-stable \ - X265_VERSION=3.4 \ - XAU_VERSION=1.0.9 \ - XORG_MACROS_VERSION=1.19.2 \ - XPROTO_VERSION=7.0.31 \ - XVID_VERSION=1.3.4 \ - LIBXML2_VERSION=2.9.10 \ - LIBBLURAY_VERSION=1.1.2 \ - LIBZMQ_VERSION=4.3.2 \ - LIBSRT_VERSION=1.4.1 \ - LIBARIBB24_VERSION=1.0.3 \ - LIBPNG_VERSION=1.6.9 \ - LIBVMAF_VERSION=2.1.1 \ - SRC=/usr/local + AOM_VERSION=v1.0.0 \ + FDKAAC_VERSION=0.1.5 \ + FONTCONFIG_VERSION=2.12.4 \ + FREETYPE_VERSION=2.10.4 \ + FRIBIDI_VERSION=0.19.7 \ + KVAZAAR_VERSION=2.0.0 \ + LAME_VERSION=3.100 \ + LIBARIBB24_VERSION=1.0.3 \ + LIBASS_VERSION=0.13.7 \ + LIBBLURAY_VERSION=1.1.2 \ + LIBPNG_VERSION=1.6.9 \ + LIBPTHREAD_STUBS_VERSION=0.4 \ + LIBSRT_VERSION=1.4.1 \ + LIBVIDSTAB_VERSION=1.1.0 \ + LIBVMAF_VERSION=2.1.1 \ + LIBXCB_VERSION=1.13.1 \ + LIBXML2_VERSION=2.9.10 \ + LIBZMQ_VERSION=4.3.2 \ + OGG_VERSION=1.3.2 \ + OPENCOREAMR_VERSION=0.1.5 \ + OPENJPEG_VERSION=2.1.2 \ + OPUS_VERSION=1.2 \ + THEORA_VERSION=1.1.1 \ + VORBIS_VERSION=1.3.5 \ + VPX_VERSION=1.8.0 \ + WEBP_VERSION=1.0.2 \ + X264_VERSION=20170226-2245-stable \ + X265_VERSION=3.4 \ + XAU_VERSION=1.0.9 \ + XCBPROTO_VERSION=1.13 \ + XORG_MACROS_VERSION=1.19.2 \ + XPROTO_VERSION=7.0.31 \ + XVID_VERSION=1.3.4 \ + ZIMG_VERSION=3.0.3 \ + SRC=/usr/local ARG FREETYPE_SHA256SUM="5eab795ebb23ac77001cfb68b7d4d50b5d6c7469247b0b01b2c953269f658dac freetype-2.10.4.tar.gz" ARG FRIBIDI_SHA256SUM="3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 0.19.7.tar.gz" @@ -123,24 +124,39 @@ RUN \ make install PREFIX="${PREFIX}" && \ rm -rf ${DIR} +# zimg https://github.com/sekrit-twc/zimg +RUN \ + DIR=/tmp/zimg && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://github.com/sekrit-twc/zimg/archive/refs/tags/release-${ZIMG_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + ./autogen.sh && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} + + + ## libvmaf https://github.com/Netflix/vmaf RUN \ if which meson || false; then \ - echo "Building VMAF." && \ - DIR=/tmp/vmaf && \ - mkdir -p ${DIR} && \ - cd ${DIR} && \ - curl -sLO https://github.com/Netflix/vmaf/archive/v${LIBVMAF_VERSION}.tar.gz && \ - tar -xz --strip-components=1 -f v${LIBVMAF_VERSION}.tar.gz && \ - cd /tmp/vmaf/libvmaf && \ - meson build --buildtype release --prefix=${PREFIX} && \ - ninja -vC build && \ - ninja -vC build install && \ - mkdir -p ${PREFIX}/share/model/ && \ - cp -r /tmp/vmaf/model/* ${PREFIX}/share/model/ && \ - rm -rf ${DIR}; \ + echo "Building VMAF." && \ + DIR=/tmp/vmaf && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/Netflix/vmaf/archive/v${LIBVMAF_VERSION}.tar.gz && \ + tar -xz --strip-components=1 -f v${LIBVMAF_VERSION}.tar.gz && \ + cd /tmp/vmaf/libvmaf && \ + meson build --buildtype release --prefix=${PREFIX} && \ + ninja -vC build && \ + ninja -vC build install && \ + mkdir -p ${PREFIX}/share/model/ && \ + cp -r /tmp/vmaf/model/* ${PREFIX}/share/model/ && \ + rm -rf ${DIR}; \ else \ - echo "VMAF skipped."; \ + echo "VMAF skipped."; \ fi ## opencore-amr https://sourceforge.net/projects/opencore-amr/ @@ -546,33 +562,34 @@ RUN \ --disable-debug \ --disable-doc \ --disable-ffplay \ - --enable-shared \ --enable-avresample \ - --enable-libopencore-amrnb \ - --enable-libopencore-amrwb \ + --enable-fontconfig \ --enable-gpl \ --enable-libass \ - --enable-fontconfig \ + --enable-libbluray \ + --enable-libfdk_aac \ --enable-libfreetype \ - --enable-libvidstab \ --enable-libmp3lame \ + --enable-libopencore-amrnb \ + --enable-libopencore-amrwb \ --enable-libopus \ --enable-libtheora \ + --enable-libvidstab \ --enable-libvorbis \ --enable-libvpx \ --enable-libwebp \ - --enable-libxcb \ + --enable-libx264 \ --enable-libx265 \ + --enable-libxcb \ --enable-libxvid \ - --enable-libx264 \ + --enable-libzmq \ --enable-nonfree \ --enable-openssl \ - --enable-libfdk_aac \ --enable-postproc \ + --enable-shared \ --enable-small \ --enable-version3 \ - --enable-libbluray \ - --enable-libzmq \ + --enable-zimg \ --extra-libs=-ldl \ --prefix="${PREFIX}" \ --enable-libopenjpeg \ @@ -587,7 +604,7 @@ RUN \ --enable-libnpp \ --extra-cflags="-I${PREFIX}/include -I${PREFIX}/include/ffnvcodec -I/usr/local/cuda/include/" \ --extra-ldflags="-L${PREFIX}/lib -L/usr/local/cuda/lib64 -L/usr/local/cuda/lib32/" && \ - make && \ +make && \ make install && \ make tools/zmqsend && cp tools/zmqsend ${PREFIX}/bin/ && \ make distclean && \ diff --git a/docker-images/4.2/scratch312/Dockerfile b/docker-images/4.2/scratch312/Dockerfile index fcdcc2128..21d66ffd9 100644 --- a/docker-images/4.2/scratch312/Dockerfile +++ b/docker-images/4.2/scratch312/Dockerfile @@ -9,40 +9,41 @@ FROM alpine:3.12 AS build WORKDIR /tmp/workdir ENV FFMPEG_VERSION=4.2.4 \ - AOM_VERSION=v1.0.0 \ - FDKAAC_VERSION=0.1.5 \ - FONTCONFIG_VERSION=2.12.4 \ - FREETYPE_VERSION=2.10.4 \ - FRIBIDI_VERSION=0.19.7 \ - KVAZAAR_VERSION=2.0.0 \ - LAME_VERSION=3.100 \ - LIBASS_VERSION=0.13.7 \ - LIBPTHREAD_STUBS_VERSION=0.4 \ - LIBVIDSTAB_VERSION=1.1.0 \ - LIBXCB_VERSION=1.13.1 \ - XCBPROTO_VERSION=1.13 \ - OGG_VERSION=1.3.2 \ - OPENCOREAMR_VERSION=0.1.5 \ - OPUS_VERSION=1.2 \ - OPENJPEG_VERSION=2.1.2 \ - THEORA_VERSION=1.1.1 \ - VORBIS_VERSION=1.3.5 \ - VPX_VERSION=1.8.0 \ - WEBP_VERSION=1.0.2 \ - X264_VERSION=20170226-2245-stable \ - X265_VERSION=3.4 \ - XAU_VERSION=1.0.9 \ - XORG_MACROS_VERSION=1.19.2 \ - XPROTO_VERSION=7.0.31 \ - XVID_VERSION=1.3.4 \ - LIBXML2_VERSION=2.9.10 \ - LIBBLURAY_VERSION=1.1.2 \ - LIBZMQ_VERSION=4.3.2 \ - LIBSRT_VERSION=1.4.1 \ - LIBARIBB24_VERSION=1.0.3 \ - LIBPNG_VERSION=1.6.9 \ - LIBVMAF_VERSION=2.1.1 \ - SRC=/usr/local + AOM_VERSION=v1.0.0 \ + FDKAAC_VERSION=0.1.5 \ + FONTCONFIG_VERSION=2.12.4 \ + FREETYPE_VERSION=2.10.4 \ + FRIBIDI_VERSION=0.19.7 \ + KVAZAAR_VERSION=2.0.0 \ + LAME_VERSION=3.100 \ + LIBARIBB24_VERSION=1.0.3 \ + LIBASS_VERSION=0.13.7 \ + LIBBLURAY_VERSION=1.1.2 \ + LIBPNG_VERSION=1.6.9 \ + LIBPTHREAD_STUBS_VERSION=0.4 \ + LIBSRT_VERSION=1.4.1 \ + LIBVIDSTAB_VERSION=1.1.0 \ + LIBVMAF_VERSION=2.1.1 \ + LIBXCB_VERSION=1.13.1 \ + LIBXML2_VERSION=2.9.10 \ + LIBZMQ_VERSION=4.3.2 \ + OGG_VERSION=1.3.2 \ + OPENCOREAMR_VERSION=0.1.5 \ + OPENJPEG_VERSION=2.1.2 \ + OPUS_VERSION=1.2 \ + THEORA_VERSION=1.1.1 \ + VORBIS_VERSION=1.3.5 \ + VPX_VERSION=1.8.0 \ + WEBP_VERSION=1.0.2 \ + X264_VERSION=20170226-2245-stable \ + X265_VERSION=3.4 \ + XAU_VERSION=1.0.9 \ + XCBPROTO_VERSION=1.13 \ + XORG_MACROS_VERSION=1.19.2 \ + XPROTO_VERSION=7.0.31 \ + XVID_VERSION=1.3.4 \ + ZIMG_VERSION=3.0.3 \ + SRC=/usr/local ARG FREETYPE_SHA256SUM="5eab795ebb23ac77001cfb68b7d4d50b5d6c7469247b0b01b2c953269f658dac freetype-2.10.4.tar.gz" ARG FRIBIDI_SHA256SUM="3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 0.19.7.tar.gz" @@ -97,24 +98,39 @@ RUN buildDeps="autoconf \ libssl1.1" && \ apk add --update ${buildDeps} +# zimg https://github.com/sekrit-twc/zimg +RUN \ + DIR=/tmp/zimg && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://github.com/sekrit-twc/zimg/archive/refs/tags/release-${ZIMG_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + ./autogen.sh && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} + + + ## libvmaf https://github.com/Netflix/vmaf RUN \ if which meson || false; then \ - echo "Building VMAF." && \ - DIR=/tmp/vmaf && \ - mkdir -p ${DIR} && \ - cd ${DIR} && \ - curl -sLO https://github.com/Netflix/vmaf/archive/v${LIBVMAF_VERSION}.tar.gz && \ - tar -xz --strip-components=1 -f v${LIBVMAF_VERSION}.tar.gz && \ - cd /tmp/vmaf/libvmaf && \ - meson build --buildtype release --prefix=${PREFIX} && \ - ninja -vC build && \ - ninja -vC build install && \ - mkdir -p ${PREFIX}/share/model/ && \ - cp -r /tmp/vmaf/model/* ${PREFIX}/share/model/ && \ - rm -rf ${DIR}; \ + echo "Building VMAF." && \ + DIR=/tmp/vmaf && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/Netflix/vmaf/archive/v${LIBVMAF_VERSION}.tar.gz && \ + tar -xz --strip-components=1 -f v${LIBVMAF_VERSION}.tar.gz && \ + cd /tmp/vmaf/libvmaf && \ + meson build --buildtype release --prefix=${PREFIX} && \ + ninja -vC build && \ + ninja -vC build install && \ + mkdir -p ${PREFIX}/share/model/ && \ + cp -r /tmp/vmaf/model/* ${PREFIX}/share/model/ && \ + rm -rf ${DIR}; \ else \ - echo "VMAF skipped."; \ + echo "VMAF skipped."; \ fi ## opencore-amr https://sourceforge.net/projects/opencore-amr/ @@ -520,33 +536,34 @@ RUN \ --disable-debug \ --disable-doc \ --disable-ffplay \ - --enable-shared \ --enable-avresample \ - --enable-libopencore-amrnb \ - --enable-libopencore-amrwb \ + --enable-fontconfig \ --enable-gpl \ --enable-libass \ - --enable-fontconfig \ + --enable-libbluray \ + --enable-libfdk_aac \ --enable-libfreetype \ - --enable-libvidstab \ --enable-libmp3lame \ + --enable-libopencore-amrnb \ + --enable-libopencore-amrwb \ --enable-libopus \ --enable-libtheora \ + --enable-libvidstab \ --enable-libvorbis \ --enable-libvpx \ --enable-libwebp \ - --enable-libxcb \ + --enable-libx264 \ --enable-libx265 \ + --enable-libxcb \ --enable-libxvid \ - --enable-libx264 \ + --enable-libzmq \ --enable-nonfree \ --enable-openssl \ - --enable-libfdk_aac \ --enable-postproc \ + --enable-shared \ --enable-small \ --enable-version3 \ - --enable-libbluray \ - --enable-libzmq \ + --enable-zimg \ --extra-libs=-ldl \ --prefix="${PREFIX}" \ --enable-libopenjpeg \ @@ -557,7 +574,7 @@ RUN \ --enable-libaribb24 \ --extra-cflags="-I${PREFIX}/include" \ --extra-ldflags="-L${PREFIX}/lib" && \ - make && \ +make && \ make install && \ make tools/zmqsend && cp tools/zmqsend ${PREFIX}/bin/ && \ make distclean && \ diff --git a/docker-images/4.2/ubuntu1804/Dockerfile b/docker-images/4.2/ubuntu1804/Dockerfile index e33b098ec..c25e7b7c7 100644 --- a/docker-images/4.2/ubuntu1804/Dockerfile +++ b/docker-images/4.2/ubuntu1804/Dockerfile @@ -17,40 +17,41 @@ RUN apt-get -yqq update && \ FROM base as build ENV FFMPEG_VERSION=4.2.4 \ - AOM_VERSION=v1.0.0 \ - FDKAAC_VERSION=0.1.5 \ - FONTCONFIG_VERSION=2.12.4 \ - FREETYPE_VERSION=2.10.4 \ - FRIBIDI_VERSION=0.19.7 \ - KVAZAAR_VERSION=2.0.0 \ - LAME_VERSION=3.100 \ - LIBASS_VERSION=0.13.7 \ - LIBPTHREAD_STUBS_VERSION=0.4 \ - LIBVIDSTAB_VERSION=1.1.0 \ - LIBXCB_VERSION=1.13.1 \ - XCBPROTO_VERSION=1.13 \ - OGG_VERSION=1.3.2 \ - OPENCOREAMR_VERSION=0.1.5 \ - OPUS_VERSION=1.2 \ - OPENJPEG_VERSION=2.1.2 \ - THEORA_VERSION=1.1.1 \ - VORBIS_VERSION=1.3.5 \ - VPX_VERSION=1.8.0 \ - WEBP_VERSION=1.0.2 \ - X264_VERSION=20170226-2245-stable \ - X265_VERSION=3.4 \ - XAU_VERSION=1.0.9 \ - XORG_MACROS_VERSION=1.19.2 \ - XPROTO_VERSION=7.0.31 \ - XVID_VERSION=1.3.4 \ - LIBXML2_VERSION=2.9.10 \ - LIBBLURAY_VERSION=1.1.2 \ - LIBZMQ_VERSION=4.3.2 \ - LIBSRT_VERSION=1.4.1 \ - LIBARIBB24_VERSION=1.0.3 \ - LIBPNG_VERSION=1.6.9 \ - LIBVMAF_VERSION=2.1.1 \ - SRC=/usr/local + AOM_VERSION=v1.0.0 \ + FDKAAC_VERSION=0.1.5 \ + FONTCONFIG_VERSION=2.12.4 \ + FREETYPE_VERSION=2.10.4 \ + FRIBIDI_VERSION=0.19.7 \ + KVAZAAR_VERSION=2.0.0 \ + LAME_VERSION=3.100 \ + LIBARIBB24_VERSION=1.0.3 \ + LIBASS_VERSION=0.13.7 \ + LIBBLURAY_VERSION=1.1.2 \ + LIBPNG_VERSION=1.6.9 \ + LIBPTHREAD_STUBS_VERSION=0.4 \ + LIBSRT_VERSION=1.4.1 \ + LIBVIDSTAB_VERSION=1.1.0 \ + LIBVMAF_VERSION=2.1.1 \ + LIBXCB_VERSION=1.13.1 \ + LIBXML2_VERSION=2.9.10 \ + LIBZMQ_VERSION=4.3.2 \ + OGG_VERSION=1.3.2 \ + OPENCOREAMR_VERSION=0.1.5 \ + OPENJPEG_VERSION=2.1.2 \ + OPUS_VERSION=1.2 \ + THEORA_VERSION=1.1.1 \ + VORBIS_VERSION=1.3.5 \ + VPX_VERSION=1.8.0 \ + WEBP_VERSION=1.0.2 \ + X264_VERSION=20170226-2245-stable \ + X265_VERSION=3.4 \ + XAU_VERSION=1.0.9 \ + XCBPROTO_VERSION=1.13 \ + XORG_MACROS_VERSION=1.19.2 \ + XPROTO_VERSION=7.0.31 \ + XVID_VERSION=1.3.4 \ + ZIMG_VERSION=3.0.3 \ + SRC=/usr/local ARG FREETYPE_SHA256SUM="5eab795ebb23ac77001cfb68b7d4d50b5d6c7469247b0b01b2c953269f658dac freetype-2.10.4.tar.gz" ARG FRIBIDI_SHA256SUM="3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 0.19.7.tar.gz" @@ -96,24 +97,39 @@ RUN buildDeps="autoconf \ zlib1g-dev" && \ apt-get -yqq update && \ apt-get install -yq --no-install-recommends ${buildDeps} +# zimg https://github.com/sekrit-twc/zimg +RUN \ + DIR=/tmp/zimg && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://github.com/sekrit-twc/zimg/archive/refs/tags/release-${ZIMG_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + ./autogen.sh && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} + + + ## libvmaf https://github.com/Netflix/vmaf RUN \ if which meson || false; then \ - echo "Building VMAF." && \ - DIR=/tmp/vmaf && \ - mkdir -p ${DIR} && \ - cd ${DIR} && \ - curl -sLO https://github.com/Netflix/vmaf/archive/v${LIBVMAF_VERSION}.tar.gz && \ - tar -xz --strip-components=1 -f v${LIBVMAF_VERSION}.tar.gz && \ - cd /tmp/vmaf/libvmaf && \ - meson build --buildtype release --prefix=${PREFIX} && \ - ninja -vC build && \ - ninja -vC build install && \ - mkdir -p ${PREFIX}/share/model/ && \ - cp -r /tmp/vmaf/model/* ${PREFIX}/share/model/ && \ - rm -rf ${DIR}; \ + echo "Building VMAF." && \ + DIR=/tmp/vmaf && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/Netflix/vmaf/archive/v${LIBVMAF_VERSION}.tar.gz && \ + tar -xz --strip-components=1 -f v${LIBVMAF_VERSION}.tar.gz && \ + cd /tmp/vmaf/libvmaf && \ + meson build --buildtype release --prefix=${PREFIX} && \ + ninja -vC build && \ + ninja -vC build install && \ + mkdir -p ${PREFIX}/share/model/ && \ + cp -r /tmp/vmaf/model/* ${PREFIX}/share/model/ && \ + rm -rf ${DIR}; \ else \ - echo "VMAF skipped."; \ + echo "VMAF skipped."; \ fi ## opencore-amr https://sourceforge.net/projects/opencore-amr/ @@ -519,33 +535,34 @@ RUN \ --disable-debug \ --disable-doc \ --disable-ffplay \ - --enable-shared \ --enable-avresample \ - --enable-libopencore-amrnb \ - --enable-libopencore-amrwb \ + --enable-fontconfig \ --enable-gpl \ --enable-libass \ - --enable-fontconfig \ + --enable-libbluray \ + --enable-libfdk_aac \ --enable-libfreetype \ - --enable-libvidstab \ --enable-libmp3lame \ + --enable-libopencore-amrnb \ + --enable-libopencore-amrwb \ --enable-libopus \ --enable-libtheora \ + --enable-libvidstab \ --enable-libvorbis \ --enable-libvpx \ --enable-libwebp \ - --enable-libxcb \ + --enable-libx264 \ --enable-libx265 \ + --enable-libxcb \ --enable-libxvid \ - --enable-libx264 \ + --enable-libzmq \ --enable-nonfree \ --enable-openssl \ - --enable-libfdk_aac \ --enable-postproc \ + --enable-shared \ --enable-small \ --enable-version3 \ - --enable-libbluray \ - --enable-libzmq \ + --enable-zimg \ --extra-libs=-ldl \ --prefix="${PREFIX}" \ --enable-libopenjpeg \ @@ -556,7 +573,7 @@ RUN \ --enable-libaribb24 \ --extra-cflags="-I${PREFIX}/include" \ --extra-ldflags="-L${PREFIX}/lib" && \ - make && \ +make && \ make install && \ make tools/zmqsend && cp tools/zmqsend ${PREFIX}/bin/ && \ make distclean && \ diff --git a/docker-images/4.2/ubuntu2004/Dockerfile b/docker-images/4.2/ubuntu2004/Dockerfile index da1cf55c7..c5612b699 100644 --- a/docker-images/4.2/ubuntu2004/Dockerfile +++ b/docker-images/4.2/ubuntu2004/Dockerfile @@ -17,40 +17,41 @@ RUN apt-get -yqq update && \ FROM base as build ENV FFMPEG_VERSION=4.2.4 \ - AOM_VERSION=v1.0.0 \ - FDKAAC_VERSION=0.1.5 \ - FONTCONFIG_VERSION=2.12.4 \ - FREETYPE_VERSION=2.10.4 \ - FRIBIDI_VERSION=0.19.7 \ - KVAZAAR_VERSION=2.0.0 \ - LAME_VERSION=3.100 \ - LIBASS_VERSION=0.13.7 \ - LIBPTHREAD_STUBS_VERSION=0.4 \ - LIBVIDSTAB_VERSION=1.1.0 \ - LIBXCB_VERSION=1.13.1 \ - XCBPROTO_VERSION=1.13 \ - OGG_VERSION=1.3.2 \ - OPENCOREAMR_VERSION=0.1.5 \ - OPUS_VERSION=1.2 \ - OPENJPEG_VERSION=2.1.2 \ - THEORA_VERSION=1.1.1 \ - VORBIS_VERSION=1.3.5 \ - VPX_VERSION=1.8.0 \ - WEBP_VERSION=1.0.2 \ - X264_VERSION=20170226-2245-stable \ - X265_VERSION=3.4 \ - XAU_VERSION=1.0.9 \ - XORG_MACROS_VERSION=1.19.2 \ - XPROTO_VERSION=7.0.31 \ - XVID_VERSION=1.3.4 \ - LIBXML2_VERSION=2.9.10 \ - LIBBLURAY_VERSION=1.1.2 \ - LIBZMQ_VERSION=4.3.2 \ - LIBSRT_VERSION=1.4.1 \ - LIBARIBB24_VERSION=1.0.3 \ - LIBPNG_VERSION=1.6.9 \ - LIBVMAF_VERSION=2.1.1 \ - SRC=/usr/local + AOM_VERSION=v1.0.0 \ + FDKAAC_VERSION=0.1.5 \ + FONTCONFIG_VERSION=2.12.4 \ + FREETYPE_VERSION=2.10.4 \ + FRIBIDI_VERSION=0.19.7 \ + KVAZAAR_VERSION=2.0.0 \ + LAME_VERSION=3.100 \ + LIBARIBB24_VERSION=1.0.3 \ + LIBASS_VERSION=0.13.7 \ + LIBBLURAY_VERSION=1.1.2 \ + LIBPNG_VERSION=1.6.9 \ + LIBPTHREAD_STUBS_VERSION=0.4 \ + LIBSRT_VERSION=1.4.1 \ + LIBVIDSTAB_VERSION=1.1.0 \ + LIBVMAF_VERSION=2.1.1 \ + LIBXCB_VERSION=1.13.1 \ + LIBXML2_VERSION=2.9.10 \ + LIBZMQ_VERSION=4.3.2 \ + OGG_VERSION=1.3.2 \ + OPENCOREAMR_VERSION=0.1.5 \ + OPENJPEG_VERSION=2.1.2 \ + OPUS_VERSION=1.2 \ + THEORA_VERSION=1.1.1 \ + VORBIS_VERSION=1.3.5 \ + VPX_VERSION=1.8.0 \ + WEBP_VERSION=1.0.2 \ + X264_VERSION=20170226-2245-stable \ + X265_VERSION=3.4 \ + XAU_VERSION=1.0.9 \ + XCBPROTO_VERSION=1.13 \ + XORG_MACROS_VERSION=1.19.2 \ + XPROTO_VERSION=7.0.31 \ + XVID_VERSION=1.3.4 \ + ZIMG_VERSION=3.0.3 \ + SRC=/usr/local ARG FREETYPE_SHA256SUM="5eab795ebb23ac77001cfb68b7d4d50b5d6c7469247b0b01b2c953269f658dac freetype-2.10.4.tar.gz" ARG FRIBIDI_SHA256SUM="3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 0.19.7.tar.gz" @@ -99,24 +100,39 @@ RUN buildDeps="autoconf \ zlib1g-dev" && \ apt-get -yqq update && \ apt-get install -yq --no-install-recommends ${buildDeps} +# zimg https://github.com/sekrit-twc/zimg +RUN \ + DIR=/tmp/zimg && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://github.com/sekrit-twc/zimg/archive/refs/tags/release-${ZIMG_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + ./autogen.sh && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} + + + ## libvmaf https://github.com/Netflix/vmaf RUN \ if which meson || false; then \ - echo "Building VMAF." && \ - DIR=/tmp/vmaf && \ - mkdir -p ${DIR} && \ - cd ${DIR} && \ - curl -sLO https://github.com/Netflix/vmaf/archive/v${LIBVMAF_VERSION}.tar.gz && \ - tar -xz --strip-components=1 -f v${LIBVMAF_VERSION}.tar.gz && \ - cd /tmp/vmaf/libvmaf && \ - meson build --buildtype release --prefix=${PREFIX} && \ - ninja -vC build && \ - ninja -vC build install && \ - mkdir -p ${PREFIX}/share/model/ && \ - cp -r /tmp/vmaf/model/* ${PREFIX}/share/model/ && \ - rm -rf ${DIR}; \ + echo "Building VMAF." && \ + DIR=/tmp/vmaf && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/Netflix/vmaf/archive/v${LIBVMAF_VERSION}.tar.gz && \ + tar -xz --strip-components=1 -f v${LIBVMAF_VERSION}.tar.gz && \ + cd /tmp/vmaf/libvmaf && \ + meson build --buildtype release --prefix=${PREFIX} && \ + ninja -vC build && \ + ninja -vC build install && \ + mkdir -p ${PREFIX}/share/model/ && \ + cp -r /tmp/vmaf/model/* ${PREFIX}/share/model/ && \ + rm -rf ${DIR}; \ else \ - echo "VMAF skipped."; \ + echo "VMAF skipped."; \ fi ## opencore-amr https://sourceforge.net/projects/opencore-amr/ @@ -522,33 +538,34 @@ RUN \ --disable-debug \ --disable-doc \ --disable-ffplay \ - --enable-shared \ --enable-avresample \ - --enable-libopencore-amrnb \ - --enable-libopencore-amrwb \ + --enable-fontconfig \ --enable-gpl \ --enable-libass \ - --enable-fontconfig \ + --enable-libbluray \ + --enable-libfdk_aac \ --enable-libfreetype \ - --enable-libvidstab \ --enable-libmp3lame \ + --enable-libopencore-amrnb \ + --enable-libopencore-amrwb \ --enable-libopus \ --enable-libtheora \ + --enable-libvidstab \ --enable-libvorbis \ --enable-libvpx \ --enable-libwebp \ - --enable-libxcb \ + --enable-libx264 \ --enable-libx265 \ + --enable-libxcb \ --enable-libxvid \ - --enable-libx264 \ + --enable-libzmq \ --enable-nonfree \ --enable-openssl \ - --enable-libfdk_aac \ --enable-postproc \ + --enable-shared \ --enable-small \ --enable-version3 \ - --enable-libbluray \ - --enable-libzmq \ + --enable-zimg \ --extra-libs=-ldl \ --prefix="${PREFIX}" \ --enable-libopenjpeg \ @@ -559,7 +576,7 @@ RUN \ --enable-libaribb24 \ --extra-cflags="-I${PREFIX}/include" \ --extra-ldflags="-L${PREFIX}/lib" && \ - make && \ +make && \ make install && \ make tools/zmqsend && cp tools/zmqsend ${PREFIX}/bin/ && \ make distclean && \ diff --git a/docker-images/4.2/vaapi2004/Dockerfile b/docker-images/4.2/vaapi2004/Dockerfile index b7b52cb0c..06f60baac 100644 --- a/docker-images/4.2/vaapi2004/Dockerfile +++ b/docker-images/4.2/vaapi2004/Dockerfile @@ -17,40 +17,41 @@ RUN apt-get -yqq update && \ FROM base as build ENV FFMPEG_VERSION=4.2.4 \ - AOM_VERSION=v1.0.0 \ - FDKAAC_VERSION=0.1.5 \ - FONTCONFIG_VERSION=2.12.4 \ - FREETYPE_VERSION=2.10.4 \ - FRIBIDI_VERSION=0.19.7 \ - KVAZAAR_VERSION=2.0.0 \ - LAME_VERSION=3.100 \ - LIBASS_VERSION=0.13.7 \ - LIBPTHREAD_STUBS_VERSION=0.4 \ - LIBVIDSTAB_VERSION=1.1.0 \ - LIBXCB_VERSION=1.13.1 \ - XCBPROTO_VERSION=1.13 \ - OGG_VERSION=1.3.2 \ - OPENCOREAMR_VERSION=0.1.5 \ - OPUS_VERSION=1.2 \ - OPENJPEG_VERSION=2.1.2 \ - THEORA_VERSION=1.1.1 \ - VORBIS_VERSION=1.3.5 \ - VPX_VERSION=1.8.0 \ - WEBP_VERSION=1.0.2 \ - X264_VERSION=20170226-2245-stable \ - X265_VERSION=3.4 \ - XAU_VERSION=1.0.9 \ - XORG_MACROS_VERSION=1.19.2 \ - XPROTO_VERSION=7.0.31 \ - XVID_VERSION=1.3.4 \ - LIBXML2_VERSION=2.9.10 \ - LIBBLURAY_VERSION=1.1.2 \ - LIBZMQ_VERSION=4.3.2 \ - LIBSRT_VERSION=1.4.1 \ - LIBARIBB24_VERSION=1.0.3 \ - LIBPNG_VERSION=1.6.9 \ - LIBVMAF_VERSION=2.1.1 \ - SRC=/usr/local + AOM_VERSION=v1.0.0 \ + FDKAAC_VERSION=0.1.5 \ + FONTCONFIG_VERSION=2.12.4 \ + FREETYPE_VERSION=2.10.4 \ + FRIBIDI_VERSION=0.19.7 \ + KVAZAAR_VERSION=2.0.0 \ + LAME_VERSION=3.100 \ + LIBARIBB24_VERSION=1.0.3 \ + LIBASS_VERSION=0.13.7 \ + LIBBLURAY_VERSION=1.1.2 \ + LIBPNG_VERSION=1.6.9 \ + LIBPTHREAD_STUBS_VERSION=0.4 \ + LIBSRT_VERSION=1.4.1 \ + LIBVIDSTAB_VERSION=1.1.0 \ + LIBVMAF_VERSION=2.1.1 \ + LIBXCB_VERSION=1.13.1 \ + LIBXML2_VERSION=2.9.10 \ + LIBZMQ_VERSION=4.3.2 \ + OGG_VERSION=1.3.2 \ + OPENCOREAMR_VERSION=0.1.5 \ + OPENJPEG_VERSION=2.1.2 \ + OPUS_VERSION=1.2 \ + THEORA_VERSION=1.1.1 \ + VORBIS_VERSION=1.3.5 \ + VPX_VERSION=1.8.0 \ + WEBP_VERSION=1.0.2 \ + X264_VERSION=20170226-2245-stable \ + X265_VERSION=3.4 \ + XAU_VERSION=1.0.9 \ + XCBPROTO_VERSION=1.13 \ + XORG_MACROS_VERSION=1.19.2 \ + XPROTO_VERSION=7.0.31 \ + XVID_VERSION=1.3.4 \ + ZIMG_VERSION=3.0.3 \ + SRC=/usr/local ARG FREETYPE_SHA256SUM="5eab795ebb23ac77001cfb68b7d4d50b5d6c7469247b0b01b2c953269f658dac freetype-2.10.4.tar.gz" ARG FRIBIDI_SHA256SUM="3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 0.19.7.tar.gz" @@ -100,24 +101,39 @@ RUN buildDeps="autoconf \ zlib1g-dev" && \ apt-get -yqq update && \ apt-get install -yq --no-install-recommends ${buildDeps} +# zimg https://github.com/sekrit-twc/zimg +RUN \ + DIR=/tmp/zimg && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://github.com/sekrit-twc/zimg/archive/refs/tags/release-${ZIMG_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + ./autogen.sh && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} + + + ## libvmaf https://github.com/Netflix/vmaf RUN \ if which meson || false; then \ - echo "Building VMAF." && \ - DIR=/tmp/vmaf && \ - mkdir -p ${DIR} && \ - cd ${DIR} && \ - curl -sLO https://github.com/Netflix/vmaf/archive/v${LIBVMAF_VERSION}.tar.gz && \ - tar -xz --strip-components=1 -f v${LIBVMAF_VERSION}.tar.gz && \ - cd /tmp/vmaf/libvmaf && \ - meson build --buildtype release --prefix=${PREFIX} && \ - ninja -vC build && \ - ninja -vC build install && \ - mkdir -p ${PREFIX}/share/model/ && \ - cp -r /tmp/vmaf/model/* ${PREFIX}/share/model/ && \ - rm -rf ${DIR}; \ + echo "Building VMAF." && \ + DIR=/tmp/vmaf && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/Netflix/vmaf/archive/v${LIBVMAF_VERSION}.tar.gz && \ + tar -xz --strip-components=1 -f v${LIBVMAF_VERSION}.tar.gz && \ + cd /tmp/vmaf/libvmaf && \ + meson build --buildtype release --prefix=${PREFIX} && \ + ninja -vC build && \ + ninja -vC build install && \ + mkdir -p ${PREFIX}/share/model/ && \ + cp -r /tmp/vmaf/model/* ${PREFIX}/share/model/ && \ + rm -rf ${DIR}; \ else \ - echo "VMAF skipped."; \ + echo "VMAF skipped."; \ fi ## opencore-amr https://sourceforge.net/projects/opencore-amr/ @@ -523,33 +539,34 @@ RUN \ --disable-debug \ --disable-doc \ --disable-ffplay \ - --enable-shared \ --enable-avresample \ - --enable-libopencore-amrnb \ - --enable-libopencore-amrwb \ + --enable-fontconfig \ --enable-gpl \ --enable-libass \ - --enable-fontconfig \ + --enable-libbluray \ + --enable-libfdk_aac \ --enable-libfreetype \ - --enable-libvidstab \ --enable-libmp3lame \ + --enable-libopencore-amrnb \ + --enable-libopencore-amrwb \ --enable-libopus \ --enable-libtheora \ + --enable-libvidstab \ --enable-libvorbis \ --enable-libvpx \ --enable-libwebp \ - --enable-libxcb \ + --enable-libx264 \ --enable-libx265 \ + --enable-libxcb \ --enable-libxvid \ - --enable-libx264 \ + --enable-libzmq \ --enable-nonfree \ --enable-openssl \ - --enable-libfdk_aac \ --enable-postproc \ + --enable-shared \ --enable-small \ --enable-version3 \ - --enable-libbluray \ - --enable-libzmq \ + --enable-zimg \ --extra-libs=-ldl \ --prefix="${PREFIX}" \ --enable-libopenjpeg \ @@ -561,7 +578,7 @@ RUN \ --enable-vaapi \ --extra-cflags="-I${PREFIX}/include" \ --extra-ldflags="-L${PREFIX}/lib" && \ - make && \ +make && \ make install && \ make tools/zmqsend && cp tools/zmqsend ${PREFIX}/bin/ && \ make distclean && \ diff --git a/docker-images/4.3/alpine312/Dockerfile b/docker-images/4.3/alpine312/Dockerfile index 58e3c2bad..16676a990 100644 --- a/docker-images/4.3/alpine312/Dockerfile +++ b/docker-images/4.3/alpine312/Dockerfile @@ -14,40 +14,41 @@ FROM base AS build WORKDIR /tmp/workdir ENV FFMPEG_VERSION=4.3.2 \ - AOM_VERSION=v1.0.0 \ - FDKAAC_VERSION=0.1.5 \ - FONTCONFIG_VERSION=2.12.4 \ - FREETYPE_VERSION=2.10.4 \ - FRIBIDI_VERSION=0.19.7 \ - KVAZAAR_VERSION=2.0.0 \ - LAME_VERSION=3.100 \ - LIBASS_VERSION=0.13.7 \ - LIBPTHREAD_STUBS_VERSION=0.4 \ - LIBVIDSTAB_VERSION=1.1.0 \ - LIBXCB_VERSION=1.13.1 \ - XCBPROTO_VERSION=1.13 \ - OGG_VERSION=1.3.2 \ - OPENCOREAMR_VERSION=0.1.5 \ - OPUS_VERSION=1.2 \ - OPENJPEG_VERSION=2.1.2 \ - THEORA_VERSION=1.1.1 \ - VORBIS_VERSION=1.3.5 \ - VPX_VERSION=1.8.0 \ - WEBP_VERSION=1.0.2 \ - X264_VERSION=20170226-2245-stable \ - X265_VERSION=3.4 \ - XAU_VERSION=1.0.9 \ - XORG_MACROS_VERSION=1.19.2 \ - XPROTO_VERSION=7.0.31 \ - XVID_VERSION=1.3.4 \ - LIBXML2_VERSION=2.9.10 \ - LIBBLURAY_VERSION=1.1.2 \ - LIBZMQ_VERSION=4.3.2 \ - LIBSRT_VERSION=1.4.1 \ - LIBARIBB24_VERSION=1.0.3 \ - LIBPNG_VERSION=1.6.9 \ - LIBVMAF_VERSION=2.1.1 \ - SRC=/usr/local + AOM_VERSION=v1.0.0 \ + FDKAAC_VERSION=0.1.5 \ + FONTCONFIG_VERSION=2.12.4 \ + FREETYPE_VERSION=2.10.4 \ + FRIBIDI_VERSION=0.19.7 \ + KVAZAAR_VERSION=2.0.0 \ + LAME_VERSION=3.100 \ + LIBARIBB24_VERSION=1.0.3 \ + LIBASS_VERSION=0.13.7 \ + LIBBLURAY_VERSION=1.1.2 \ + LIBPNG_VERSION=1.6.9 \ + LIBPTHREAD_STUBS_VERSION=0.4 \ + LIBSRT_VERSION=1.4.1 \ + LIBVIDSTAB_VERSION=1.1.0 \ + LIBVMAF_VERSION=2.1.1 \ + LIBXCB_VERSION=1.13.1 \ + LIBXML2_VERSION=2.9.10 \ + LIBZMQ_VERSION=4.3.2 \ + OGG_VERSION=1.3.2 \ + OPENCOREAMR_VERSION=0.1.5 \ + OPENJPEG_VERSION=2.1.2 \ + OPUS_VERSION=1.2 \ + THEORA_VERSION=1.1.1 \ + VORBIS_VERSION=1.3.5 \ + VPX_VERSION=1.8.0 \ + WEBP_VERSION=1.0.2 \ + X264_VERSION=20170226-2245-stable \ + X265_VERSION=3.4 \ + XAU_VERSION=1.0.9 \ + XCBPROTO_VERSION=1.13 \ + XORG_MACROS_VERSION=1.19.2 \ + XPROTO_VERSION=7.0.31 \ + XVID_VERSION=1.3.4 \ + ZIMG_VERSION=3.0.3 \ + SRC=/usr/local ARG FREETYPE_SHA256SUM="5eab795ebb23ac77001cfb68b7d4d50b5d6c7469247b0b01b2c953269f658dac freetype-2.10.4.tar.gz" ARG FRIBIDI_SHA256SUM="3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 0.19.7.tar.gz" @@ -95,24 +96,39 @@ RUN buildDeps="autoconf \ zlib-dev \ expat-dev" && \ apk add --no-cache --update ${buildDeps} +# zimg https://github.com/sekrit-twc/zimg +RUN \ + DIR=/tmp/zimg && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://github.com/sekrit-twc/zimg/archive/refs/tags/release-${ZIMG_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + ./autogen.sh && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} + + + ## libvmaf https://github.com/Netflix/vmaf RUN \ if which meson || false; then \ - echo "Building VMAF." && \ - DIR=/tmp/vmaf && \ - mkdir -p ${DIR} && \ - cd ${DIR} && \ - curl -sLO https://github.com/Netflix/vmaf/archive/v${LIBVMAF_VERSION}.tar.gz && \ - tar -xz --strip-components=1 -f v${LIBVMAF_VERSION}.tar.gz && \ - cd /tmp/vmaf/libvmaf && \ - meson build --buildtype release --prefix=${PREFIX} && \ - ninja -vC build && \ - ninja -vC build install && \ - mkdir -p ${PREFIX}/share/model/ && \ - cp -r /tmp/vmaf/model/* ${PREFIX}/share/model/ && \ - rm -rf ${DIR}; \ + echo "Building VMAF." && \ + DIR=/tmp/vmaf && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/Netflix/vmaf/archive/v${LIBVMAF_VERSION}.tar.gz && \ + tar -xz --strip-components=1 -f v${LIBVMAF_VERSION}.tar.gz && \ + cd /tmp/vmaf/libvmaf && \ + meson build --buildtype release --prefix=${PREFIX} && \ + ninja -vC build && \ + ninja -vC build install && \ + mkdir -p ${PREFIX}/share/model/ && \ + cp -r /tmp/vmaf/model/* ${PREFIX}/share/model/ && \ + rm -rf ${DIR}; \ else \ - echo "VMAF skipped."; \ + echo "VMAF skipped."; \ fi ## opencore-amr https://sourceforge.net/projects/opencore-amr/ @@ -518,33 +534,34 @@ RUN \ --disable-debug \ --disable-doc \ --disable-ffplay \ - --enable-shared \ --enable-avresample \ - --enable-libopencore-amrnb \ - --enable-libopencore-amrwb \ + --enable-fontconfig \ --enable-gpl \ --enable-libass \ - --enable-fontconfig \ + --enable-libbluray \ + --enable-libfdk_aac \ --enable-libfreetype \ - --enable-libvidstab \ --enable-libmp3lame \ + --enable-libopencore-amrnb \ + --enable-libopencore-amrwb \ --enable-libopus \ --enable-libtheora \ + --enable-libvidstab \ --enable-libvorbis \ --enable-libvpx \ --enable-libwebp \ - --enable-libxcb \ + --enable-libx264 \ --enable-libx265 \ + --enable-libxcb \ --enable-libxvid \ - --enable-libx264 \ + --enable-libzmq \ --enable-nonfree \ --enable-openssl \ - --enable-libfdk_aac \ --enable-postproc \ + --enable-shared \ --enable-small \ --enable-version3 \ - --enable-libbluray \ - --enable-libzmq \ + --enable-zimg \ --extra-libs=-ldl \ --prefix="${PREFIX}" \ --enable-libopenjpeg \ @@ -555,7 +572,7 @@ RUN \ --enable-libaribb24 \ --extra-cflags="-I${PREFIX}/include" \ --extra-ldflags="-L${PREFIX}/lib" && \ - make && \ +make && \ make install && \ make tools/zmqsend && cp tools/zmqsend ${PREFIX}/bin/ && \ make distclean && \ diff --git a/docker-images/4.3/alpine38/Dockerfile b/docker-images/4.3/alpine38/Dockerfile index 19fd7b4bd..be13611d4 100644 --- a/docker-images/4.3/alpine38/Dockerfile +++ b/docker-images/4.3/alpine38/Dockerfile @@ -14,40 +14,41 @@ FROM base AS build WORKDIR /tmp/workdir ENV FFMPEG_VERSION=4.3.2 \ - AOM_VERSION=v1.0.0 \ - FDKAAC_VERSION=0.1.5 \ - FONTCONFIG_VERSION=2.12.4 \ - FREETYPE_VERSION=2.10.4 \ - FRIBIDI_VERSION=0.19.7 \ - KVAZAAR_VERSION=2.0.0 \ - LAME_VERSION=3.100 \ - LIBASS_VERSION=0.13.7 \ - LIBPTHREAD_STUBS_VERSION=0.4 \ - LIBVIDSTAB_VERSION=1.1.0 \ - LIBXCB_VERSION=1.13.1 \ - XCBPROTO_VERSION=1.13 \ - OGG_VERSION=1.3.2 \ - OPENCOREAMR_VERSION=0.1.5 \ - OPUS_VERSION=1.2 \ - OPENJPEG_VERSION=2.1.2 \ - THEORA_VERSION=1.1.1 \ - VORBIS_VERSION=1.3.5 \ - VPX_VERSION=1.8.0 \ - WEBP_VERSION=1.0.2 \ - X264_VERSION=20170226-2245-stable \ - X265_VERSION=3.4 \ - XAU_VERSION=1.0.9 \ - XORG_MACROS_VERSION=1.19.2 \ - XPROTO_VERSION=7.0.31 \ - XVID_VERSION=1.3.4 \ - LIBXML2_VERSION=2.9.10 \ - LIBBLURAY_VERSION=1.1.2 \ - LIBZMQ_VERSION=4.3.2 \ - LIBSRT_VERSION=1.4.1 \ - LIBARIBB24_VERSION=1.0.3 \ - LIBPNG_VERSION=1.6.9 \ - LIBVMAF_VERSION=2.1.1 \ - SRC=/usr/local + AOM_VERSION=v1.0.0 \ + FDKAAC_VERSION=0.1.5 \ + FONTCONFIG_VERSION=2.12.4 \ + FREETYPE_VERSION=2.10.4 \ + FRIBIDI_VERSION=0.19.7 \ + KVAZAAR_VERSION=2.0.0 \ + LAME_VERSION=3.100 \ + LIBARIBB24_VERSION=1.0.3 \ + LIBASS_VERSION=0.13.7 \ + LIBBLURAY_VERSION=1.1.2 \ + LIBPNG_VERSION=1.6.9 \ + LIBPTHREAD_STUBS_VERSION=0.4 \ + LIBSRT_VERSION=1.4.1 \ + LIBVIDSTAB_VERSION=1.1.0 \ + LIBVMAF_VERSION=2.1.1 \ + LIBXCB_VERSION=1.13.1 \ + LIBXML2_VERSION=2.9.10 \ + LIBZMQ_VERSION=4.3.2 \ + OGG_VERSION=1.3.2 \ + OPENCOREAMR_VERSION=0.1.5 \ + OPENJPEG_VERSION=2.1.2 \ + OPUS_VERSION=1.2 \ + THEORA_VERSION=1.1.1 \ + VORBIS_VERSION=1.3.5 \ + VPX_VERSION=1.8.0 \ + WEBP_VERSION=1.0.2 \ + X264_VERSION=20170226-2245-stable \ + X265_VERSION=3.4 \ + XAU_VERSION=1.0.9 \ + XCBPROTO_VERSION=1.13 \ + XORG_MACROS_VERSION=1.19.2 \ + XPROTO_VERSION=7.0.31 \ + XVID_VERSION=1.3.4 \ + ZIMG_VERSION=3.0.3 \ + SRC=/usr/local ARG FREETYPE_SHA256SUM="5eab795ebb23ac77001cfb68b7d4d50b5d6c7469247b0b01b2c953269f658dac freetype-2.10.4.tar.gz" ARG FRIBIDI_SHA256SUM="3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 0.19.7.tar.gz" @@ -95,24 +96,39 @@ RUN buildDeps="autoconf \ zlib-dev \ expat-dev" && \ apk add --no-cache --update ${buildDeps} +# zimg https://github.com/sekrit-twc/zimg +RUN \ + DIR=/tmp/zimg && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://github.com/sekrit-twc/zimg/archive/refs/tags/release-${ZIMG_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + ./autogen.sh && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} + + + ## libvmaf https://github.com/Netflix/vmaf RUN \ if which meson || false; then \ - echo "Building VMAF." && \ - DIR=/tmp/vmaf && \ - mkdir -p ${DIR} && \ - cd ${DIR} && \ - curl -sLO https://github.com/Netflix/vmaf/archive/v${LIBVMAF_VERSION}.tar.gz && \ - tar -xz --strip-components=1 -f v${LIBVMAF_VERSION}.tar.gz && \ - cd /tmp/vmaf/libvmaf && \ - meson build --buildtype release --prefix=${PREFIX} && \ - ninja -vC build && \ - ninja -vC build install && \ - mkdir -p ${PREFIX}/share/model/ && \ - cp -r /tmp/vmaf/model/* ${PREFIX}/share/model/ && \ - rm -rf ${DIR}; \ + echo "Building VMAF." && \ + DIR=/tmp/vmaf && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/Netflix/vmaf/archive/v${LIBVMAF_VERSION}.tar.gz && \ + tar -xz --strip-components=1 -f v${LIBVMAF_VERSION}.tar.gz && \ + cd /tmp/vmaf/libvmaf && \ + meson build --buildtype release --prefix=${PREFIX} && \ + ninja -vC build && \ + ninja -vC build install && \ + mkdir -p ${PREFIX}/share/model/ && \ + cp -r /tmp/vmaf/model/* ${PREFIX}/share/model/ && \ + rm -rf ${DIR}; \ else \ - echo "VMAF skipped."; \ + echo "VMAF skipped."; \ fi ## opencore-amr https://sourceforge.net/projects/opencore-amr/ @@ -518,33 +534,34 @@ RUN \ --disable-debug \ --disable-doc \ --disable-ffplay \ - --enable-shared \ --enable-avresample \ - --enable-libopencore-amrnb \ - --enable-libopencore-amrwb \ + --enable-fontconfig \ --enable-gpl \ --enable-libass \ - --enable-fontconfig \ + --enable-libbluray \ + --enable-libfdk_aac \ --enable-libfreetype \ - --enable-libvidstab \ --enable-libmp3lame \ + --enable-libopencore-amrnb \ + --enable-libopencore-amrwb \ --enable-libopus \ --enable-libtheora \ + --enable-libvidstab \ --enable-libvorbis \ --enable-libvpx \ --enable-libwebp \ - --enable-libxcb \ + --enable-libx264 \ --enable-libx265 \ + --enable-libxcb \ --enable-libxvid \ - --enable-libx264 \ + --enable-libzmq \ --enable-nonfree \ --enable-openssl \ - --enable-libfdk_aac \ --enable-postproc \ + --enable-shared \ --enable-small \ --enable-version3 \ - --enable-libbluray \ - --enable-libzmq \ + --enable-zimg \ --extra-libs=-ldl \ --prefix="${PREFIX}" \ --enable-libopenjpeg \ @@ -555,7 +572,7 @@ RUN \ --enable-libaribb24 \ --extra-cflags="-I${PREFIX}/include" \ --extra-ldflags="-L${PREFIX}/lib" && \ - make && \ +make && \ make install && \ make tools/zmqsend && cp tools/zmqsend ${PREFIX}/bin/ && \ make distclean && \ diff --git a/docker-images/4.3/centos7/Dockerfile b/docker-images/4.3/centos7/Dockerfile index e9c76385c..aa69c8749 100644 --- a/docker-images/4.3/centos7/Dockerfile +++ b/docker-images/4.3/centos7/Dockerfile @@ -16,40 +16,41 @@ FROM base AS build WORKDIR /tmp/workdir ENV FFMPEG_VERSION=4.3.2 \ - AOM_VERSION=v1.0.0 \ - FDKAAC_VERSION=0.1.5 \ - FONTCONFIG_VERSION=2.12.4 \ - FREETYPE_VERSION=2.10.4 \ - FRIBIDI_VERSION=0.19.7 \ - KVAZAAR_VERSION=2.0.0 \ - LAME_VERSION=3.100 \ - LIBASS_VERSION=0.13.7 \ - LIBPTHREAD_STUBS_VERSION=0.4 \ - LIBVIDSTAB_VERSION=1.1.0 \ - LIBXCB_VERSION=1.13.1 \ - XCBPROTO_VERSION=1.13 \ - OGG_VERSION=1.3.2 \ - OPENCOREAMR_VERSION=0.1.5 \ - OPUS_VERSION=1.2 \ - OPENJPEG_VERSION=2.1.2 \ - THEORA_VERSION=1.1.1 \ - VORBIS_VERSION=1.3.5 \ - VPX_VERSION=1.8.0 \ - WEBP_VERSION=1.0.2 \ - X264_VERSION=20170226-2245-stable \ - X265_VERSION=3.4 \ - XAU_VERSION=1.0.9 \ - XORG_MACROS_VERSION=1.19.2 \ - XPROTO_VERSION=7.0.31 \ - XVID_VERSION=1.3.4 \ - LIBXML2_VERSION=2.9.10 \ - LIBBLURAY_VERSION=1.1.2 \ - LIBZMQ_VERSION=4.3.2 \ - LIBSRT_VERSION=1.4.1 \ - LIBARIBB24_VERSION=1.0.3 \ - LIBPNG_VERSION=1.6.9 \ - LIBVMAF_VERSION=2.1.1 \ - SRC=/usr/local + AOM_VERSION=v1.0.0 \ + FDKAAC_VERSION=0.1.5 \ + FONTCONFIG_VERSION=2.12.4 \ + FREETYPE_VERSION=2.10.4 \ + FRIBIDI_VERSION=0.19.7 \ + KVAZAAR_VERSION=2.0.0 \ + LAME_VERSION=3.100 \ + LIBARIBB24_VERSION=1.0.3 \ + LIBASS_VERSION=0.13.7 \ + LIBBLURAY_VERSION=1.1.2 \ + LIBPNG_VERSION=1.6.9 \ + LIBPTHREAD_STUBS_VERSION=0.4 \ + LIBSRT_VERSION=1.4.1 \ + LIBVIDSTAB_VERSION=1.1.0 \ + LIBVMAF_VERSION=2.1.1 \ + LIBXCB_VERSION=1.13.1 \ + LIBXML2_VERSION=2.9.10 \ + LIBZMQ_VERSION=4.3.2 \ + OGG_VERSION=1.3.2 \ + OPENCOREAMR_VERSION=0.1.5 \ + OPENJPEG_VERSION=2.1.2 \ + OPUS_VERSION=1.2 \ + THEORA_VERSION=1.1.1 \ + VORBIS_VERSION=1.3.5 \ + VPX_VERSION=1.8.0 \ + WEBP_VERSION=1.0.2 \ + X264_VERSION=20170226-2245-stable \ + X265_VERSION=3.4 \ + XAU_VERSION=1.0.9 \ + XCBPROTO_VERSION=1.13 \ + XORG_MACROS_VERSION=1.19.2 \ + XPROTO_VERSION=7.0.31 \ + XVID_VERSION=1.3.4 \ + ZIMG_VERSION=3.0.3 \ + SRC=/usr/local ARG FREETYPE_SHA256SUM="5eab795ebb23ac77001cfb68b7d4d50b5d6c7469247b0b01b2c953269f658dac freetype-2.10.4.tar.gz" ARG FRIBIDI_SHA256SUM="3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 0.19.7.tar.gz" @@ -132,24 +133,39 @@ RUN buildDeps="autoconf \ yum history undo $(yum history info | grep 'Transaction ID' | awk -F: '{print$2}' | tr -d ' ') -y && \ yum autoremove -y +# zimg https://github.com/sekrit-twc/zimg +RUN \ + DIR=/tmp/zimg && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://github.com/sekrit-twc/zimg/archive/refs/tags/release-${ZIMG_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + ./autogen.sh && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} + + + ## libvmaf https://github.com/Netflix/vmaf RUN \ if which meson || false; then \ - echo "Building VMAF." && \ - DIR=/tmp/vmaf && \ - mkdir -p ${DIR} && \ - cd ${DIR} && \ - curl -sLO https://github.com/Netflix/vmaf/archive/v${LIBVMAF_VERSION}.tar.gz && \ - tar -xz --strip-components=1 -f v${LIBVMAF_VERSION}.tar.gz && \ - cd /tmp/vmaf/libvmaf && \ - meson build --buildtype release --prefix=${PREFIX} && \ - ninja -vC build && \ - ninja -vC build install && \ - mkdir -p ${PREFIX}/share/model/ && \ - cp -r /tmp/vmaf/model/* ${PREFIX}/share/model/ && \ - rm -rf ${DIR}; \ + echo "Building VMAF." && \ + DIR=/tmp/vmaf && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/Netflix/vmaf/archive/v${LIBVMAF_VERSION}.tar.gz && \ + tar -xz --strip-components=1 -f v${LIBVMAF_VERSION}.tar.gz && \ + cd /tmp/vmaf/libvmaf && \ + meson build --buildtype release --prefix=${PREFIX} && \ + ninja -vC build && \ + ninja -vC build install && \ + mkdir -p ${PREFIX}/share/model/ && \ + cp -r /tmp/vmaf/model/* ${PREFIX}/share/model/ && \ + rm -rf ${DIR}; \ else \ - echo "VMAF skipped."; \ + echo "VMAF skipped."; \ fi ## opencore-amr https://sourceforge.net/projects/opencore-amr/ @@ -555,33 +571,34 @@ RUN \ --disable-debug \ --disable-doc \ --disable-ffplay \ - --enable-shared \ --enable-avresample \ - --enable-libopencore-amrnb \ - --enable-libopencore-amrwb \ + --enable-fontconfig \ --enable-gpl \ --enable-libass \ - --enable-fontconfig \ + --enable-libbluray \ + --enable-libfdk_aac \ --enable-libfreetype \ - --enable-libvidstab \ --enable-libmp3lame \ + --enable-libopencore-amrnb \ + --enable-libopencore-amrwb \ --enable-libopus \ --enable-libtheora \ + --enable-libvidstab \ --enable-libvorbis \ --enable-libvpx \ --enable-libwebp \ - --enable-libxcb \ + --enable-libx264 \ --enable-libx265 \ + --enable-libxcb \ --enable-libxvid \ - --enable-libx264 \ + --enable-libzmq \ --enable-nonfree \ --enable-openssl \ - --enable-libfdk_aac \ --enable-postproc \ + --enable-shared \ --enable-small \ --enable-version3 \ - --enable-libbluray \ - --enable-libzmq \ + --enable-zimg \ --extra-libs=-ldl \ --prefix="${PREFIX}" \ --enable-libopenjpeg \ @@ -592,7 +609,7 @@ RUN \ --enable-libaribb24 \ --extra-cflags="-I${PREFIX}/include" \ --extra-ldflags="-L${PREFIX}/lib" && \ - make && \ +make && \ make install && \ make tools/zmqsend && cp tools/zmqsend ${PREFIX}/bin/ && \ make distclean && \ diff --git a/docker-images/4.3/centos8/Dockerfile b/docker-images/4.3/centos8/Dockerfile index d9151877a..8f9a71a77 100644 --- a/docker-images/4.3/centos8/Dockerfile +++ b/docker-images/4.3/centos8/Dockerfile @@ -16,40 +16,41 @@ FROM base AS build WORKDIR /tmp/workdir ENV FFMPEG_VERSION=4.3.2 \ - AOM_VERSION=v1.0.0 \ - FDKAAC_VERSION=0.1.5 \ - FONTCONFIG_VERSION=2.12.4 \ - FREETYPE_VERSION=2.10.4 \ - FRIBIDI_VERSION=0.19.7 \ - KVAZAAR_VERSION=2.0.0 \ - LAME_VERSION=3.100 \ - LIBASS_VERSION=0.13.7 \ - LIBPTHREAD_STUBS_VERSION=0.4 \ - LIBVIDSTAB_VERSION=1.1.0 \ - LIBXCB_VERSION=1.13.1 \ - XCBPROTO_VERSION=1.13 \ - OGG_VERSION=1.3.2 \ - OPENCOREAMR_VERSION=0.1.5 \ - OPUS_VERSION=1.2 \ - OPENJPEG_VERSION=2.1.2 \ - THEORA_VERSION=1.1.1 \ - VORBIS_VERSION=1.3.5 \ - VPX_VERSION=1.8.0 \ - WEBP_VERSION=1.0.2 \ - X264_VERSION=20170226-2245-stable \ - X265_VERSION=3.4 \ - XAU_VERSION=1.0.9 \ - XORG_MACROS_VERSION=1.19.2 \ - XPROTO_VERSION=7.0.31 \ - XVID_VERSION=1.3.4 \ - LIBXML2_VERSION=2.9.10 \ - LIBBLURAY_VERSION=1.1.2 \ - LIBZMQ_VERSION=4.3.2 \ - LIBSRT_VERSION=1.4.1 \ - LIBARIBB24_VERSION=1.0.3 \ - LIBPNG_VERSION=1.6.9 \ - LIBVMAF_VERSION=2.1.1 \ - SRC=/usr/local + AOM_VERSION=v1.0.0 \ + FDKAAC_VERSION=0.1.5 \ + FONTCONFIG_VERSION=2.12.4 \ + FREETYPE_VERSION=2.10.4 \ + FRIBIDI_VERSION=0.19.7 \ + KVAZAAR_VERSION=2.0.0 \ + LAME_VERSION=3.100 \ + LIBARIBB24_VERSION=1.0.3 \ + LIBASS_VERSION=0.13.7 \ + LIBBLURAY_VERSION=1.1.2 \ + LIBPNG_VERSION=1.6.9 \ + LIBPTHREAD_STUBS_VERSION=0.4 \ + LIBSRT_VERSION=1.4.1 \ + LIBVIDSTAB_VERSION=1.1.0 \ + LIBVMAF_VERSION=2.1.1 \ + LIBXCB_VERSION=1.13.1 \ + LIBXML2_VERSION=2.9.10 \ + LIBZMQ_VERSION=4.3.2 \ + OGG_VERSION=1.3.2 \ + OPENCOREAMR_VERSION=0.1.5 \ + OPENJPEG_VERSION=2.1.2 \ + OPUS_VERSION=1.2 \ + THEORA_VERSION=1.1.1 \ + VORBIS_VERSION=1.3.5 \ + VPX_VERSION=1.8.0 \ + WEBP_VERSION=1.0.2 \ + X264_VERSION=20170226-2245-stable \ + X265_VERSION=3.4 \ + XAU_VERSION=1.0.9 \ + XCBPROTO_VERSION=1.13 \ + XORG_MACROS_VERSION=1.19.2 \ + XPROTO_VERSION=7.0.31 \ + XVID_VERSION=1.3.4 \ + ZIMG_VERSION=3.0.3 \ + SRC=/usr/local ARG FREETYPE_SHA256SUM="5eab795ebb23ac77001cfb68b7d4d50b5d6c7469247b0b01b2c953269f658dac freetype-2.10.4.tar.gz" ARG FRIBIDI_SHA256SUM="3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 0.19.7.tar.gz" @@ -101,24 +102,39 @@ RUN buildDeps="autoconf \ yum config-manager --set-enabled powertools && \ dnf install -y ${buildDeps} && \ alternatives --set python /usr/bin/python3 +# zimg https://github.com/sekrit-twc/zimg +RUN \ + DIR=/tmp/zimg && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://github.com/sekrit-twc/zimg/archive/refs/tags/release-${ZIMG_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + ./autogen.sh && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} + + + ## libvmaf https://github.com/Netflix/vmaf RUN \ if which meson || false; then \ - echo "Building VMAF." && \ - DIR=/tmp/vmaf && \ - mkdir -p ${DIR} && \ - cd ${DIR} && \ - curl -sLO https://github.com/Netflix/vmaf/archive/v${LIBVMAF_VERSION}.tar.gz && \ - tar -xz --strip-components=1 -f v${LIBVMAF_VERSION}.tar.gz && \ - cd /tmp/vmaf/libvmaf && \ - meson build --buildtype release --prefix=${PREFIX} && \ - ninja -vC build && \ - ninja -vC build install && \ - mkdir -p ${PREFIX}/share/model/ && \ - cp -r /tmp/vmaf/model/* ${PREFIX}/share/model/ && \ - rm -rf ${DIR}; \ + echo "Building VMAF." && \ + DIR=/tmp/vmaf && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/Netflix/vmaf/archive/v${LIBVMAF_VERSION}.tar.gz && \ + tar -xz --strip-components=1 -f v${LIBVMAF_VERSION}.tar.gz && \ + cd /tmp/vmaf/libvmaf && \ + meson build --buildtype release --prefix=${PREFIX} && \ + ninja -vC build && \ + ninja -vC build install && \ + mkdir -p ${PREFIX}/share/model/ && \ + cp -r /tmp/vmaf/model/* ${PREFIX}/share/model/ && \ + rm -rf ${DIR}; \ else \ - echo "VMAF skipped."; \ + echo "VMAF skipped."; \ fi ## opencore-amr https://sourceforge.net/projects/opencore-amr/ @@ -524,33 +540,34 @@ RUN \ --disable-debug \ --disable-doc \ --disable-ffplay \ - --enable-shared \ --enable-avresample \ - --enable-libopencore-amrnb \ - --enable-libopencore-amrwb \ + --enable-fontconfig \ --enable-gpl \ --enable-libass \ - --enable-fontconfig \ + --enable-libbluray \ + --enable-libfdk_aac \ --enable-libfreetype \ - --enable-libvidstab \ --enable-libmp3lame \ + --enable-libopencore-amrnb \ + --enable-libopencore-amrwb \ --enable-libopus \ --enable-libtheora \ + --enable-libvidstab \ --enable-libvorbis \ --enable-libvpx \ --enable-libwebp \ - --enable-libxcb \ + --enable-libx264 \ --enable-libx265 \ + --enable-libxcb \ --enable-libxvid \ - --enable-libx264 \ + --enable-libzmq \ --enable-nonfree \ --enable-openssl \ - --enable-libfdk_aac \ --enable-postproc \ + --enable-shared \ --enable-small \ --enable-version3 \ - --enable-libbluray \ - --enable-libzmq \ + --enable-zimg \ --extra-libs=-ldl \ --prefix="${PREFIX}" \ --enable-libopenjpeg \ @@ -561,7 +578,7 @@ RUN \ --enable-libaribb24 \ --extra-cflags="-I${PREFIX}/include" \ --extra-ldflags="-L${PREFIX}/lib" && \ - make && \ +make && \ make install && \ make tools/zmqsend && cp tools/zmqsend ${PREFIX}/bin/ && \ make distclean && \ diff --git a/docker-images/4.3/nvidia2004/Dockerfile b/docker-images/4.3/nvidia2004/Dockerfile index c1290cae0..00f36f806 100644 --- a/docker-images/4.3/nvidia2004/Dockerfile +++ b/docker-images/4.3/nvidia2004/Dockerfile @@ -34,40 +34,41 @@ FROM devel-base as build ENV NVIDIA_HEADERS_VERSION=11.1.5.0 ENV FFMPEG_VERSION=4.3.2 \ - AOM_VERSION=v1.0.0 \ - FDKAAC_VERSION=0.1.5 \ - FONTCONFIG_VERSION=2.12.4 \ - FREETYPE_VERSION=2.10.4 \ - FRIBIDI_VERSION=0.19.7 \ - KVAZAAR_VERSION=2.0.0 \ - LAME_VERSION=3.100 \ - LIBASS_VERSION=0.13.7 \ - LIBPTHREAD_STUBS_VERSION=0.4 \ - LIBVIDSTAB_VERSION=1.1.0 \ - LIBXCB_VERSION=1.13.1 \ - XCBPROTO_VERSION=1.13 \ - OGG_VERSION=1.3.2 \ - OPENCOREAMR_VERSION=0.1.5 \ - OPUS_VERSION=1.2 \ - OPENJPEG_VERSION=2.1.2 \ - THEORA_VERSION=1.1.1 \ - VORBIS_VERSION=1.3.5 \ - VPX_VERSION=1.8.0 \ - WEBP_VERSION=1.0.2 \ - X264_VERSION=20170226-2245-stable \ - X265_VERSION=3.4 \ - XAU_VERSION=1.0.9 \ - XORG_MACROS_VERSION=1.19.2 \ - XPROTO_VERSION=7.0.31 \ - XVID_VERSION=1.3.4 \ - LIBXML2_VERSION=2.9.10 \ - LIBBLURAY_VERSION=1.1.2 \ - LIBZMQ_VERSION=4.3.2 \ - LIBSRT_VERSION=1.4.1 \ - LIBARIBB24_VERSION=1.0.3 \ - LIBPNG_VERSION=1.6.9 \ - LIBVMAF_VERSION=2.1.1 \ - SRC=/usr/local + AOM_VERSION=v1.0.0 \ + FDKAAC_VERSION=0.1.5 \ + FONTCONFIG_VERSION=2.12.4 \ + FREETYPE_VERSION=2.10.4 \ + FRIBIDI_VERSION=0.19.7 \ + KVAZAAR_VERSION=2.0.0 \ + LAME_VERSION=3.100 \ + LIBARIBB24_VERSION=1.0.3 \ + LIBASS_VERSION=0.13.7 \ + LIBBLURAY_VERSION=1.1.2 \ + LIBPNG_VERSION=1.6.9 \ + LIBPTHREAD_STUBS_VERSION=0.4 \ + LIBSRT_VERSION=1.4.1 \ + LIBVIDSTAB_VERSION=1.1.0 \ + LIBVMAF_VERSION=2.1.1 \ + LIBXCB_VERSION=1.13.1 \ + LIBXML2_VERSION=2.9.10 \ + LIBZMQ_VERSION=4.3.2 \ + OGG_VERSION=1.3.2 \ + OPENCOREAMR_VERSION=0.1.5 \ + OPENJPEG_VERSION=2.1.2 \ + OPUS_VERSION=1.2 \ + THEORA_VERSION=1.1.1 \ + VORBIS_VERSION=1.3.5 \ + VPX_VERSION=1.8.0 \ + WEBP_VERSION=1.0.2 \ + X264_VERSION=20170226-2245-stable \ + X265_VERSION=3.4 \ + XAU_VERSION=1.0.9 \ + XCBPROTO_VERSION=1.13 \ + XORG_MACROS_VERSION=1.19.2 \ + XPROTO_VERSION=7.0.31 \ + XVID_VERSION=1.3.4 \ + ZIMG_VERSION=3.0.3 \ + SRC=/usr/local ARG FREETYPE_SHA256SUM="5eab795ebb23ac77001cfb68b7d4d50b5d6c7469247b0b01b2c953269f658dac freetype-2.10.4.tar.gz" ARG FRIBIDI_SHA256SUM="3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 0.19.7.tar.gz" @@ -123,24 +124,39 @@ RUN \ make install PREFIX="${PREFIX}" && \ rm -rf ${DIR} +# zimg https://github.com/sekrit-twc/zimg +RUN \ + DIR=/tmp/zimg && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://github.com/sekrit-twc/zimg/archive/refs/tags/release-${ZIMG_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + ./autogen.sh && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} + + + ## libvmaf https://github.com/Netflix/vmaf RUN \ if which meson || false; then \ - echo "Building VMAF." && \ - DIR=/tmp/vmaf && \ - mkdir -p ${DIR} && \ - cd ${DIR} && \ - curl -sLO https://github.com/Netflix/vmaf/archive/v${LIBVMAF_VERSION}.tar.gz && \ - tar -xz --strip-components=1 -f v${LIBVMAF_VERSION}.tar.gz && \ - cd /tmp/vmaf/libvmaf && \ - meson build --buildtype release --prefix=${PREFIX} && \ - ninja -vC build && \ - ninja -vC build install && \ - mkdir -p ${PREFIX}/share/model/ && \ - cp -r /tmp/vmaf/model/* ${PREFIX}/share/model/ && \ - rm -rf ${DIR}; \ + echo "Building VMAF." && \ + DIR=/tmp/vmaf && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/Netflix/vmaf/archive/v${LIBVMAF_VERSION}.tar.gz && \ + tar -xz --strip-components=1 -f v${LIBVMAF_VERSION}.tar.gz && \ + cd /tmp/vmaf/libvmaf && \ + meson build --buildtype release --prefix=${PREFIX} && \ + ninja -vC build && \ + ninja -vC build install && \ + mkdir -p ${PREFIX}/share/model/ && \ + cp -r /tmp/vmaf/model/* ${PREFIX}/share/model/ && \ + rm -rf ${DIR}; \ else \ - echo "VMAF skipped."; \ + echo "VMAF skipped."; \ fi ## opencore-amr https://sourceforge.net/projects/opencore-amr/ @@ -546,33 +562,34 @@ RUN \ --disable-debug \ --disable-doc \ --disable-ffplay \ - --enable-shared \ --enable-avresample \ - --enable-libopencore-amrnb \ - --enable-libopencore-amrwb \ + --enable-fontconfig \ --enable-gpl \ --enable-libass \ - --enable-fontconfig \ + --enable-libbluray \ + --enable-libfdk_aac \ --enable-libfreetype \ - --enable-libvidstab \ --enable-libmp3lame \ + --enable-libopencore-amrnb \ + --enable-libopencore-amrwb \ --enable-libopus \ --enable-libtheora \ + --enable-libvidstab \ --enable-libvorbis \ --enable-libvpx \ --enable-libwebp \ - --enable-libxcb \ + --enable-libx264 \ --enable-libx265 \ + --enable-libxcb \ --enable-libxvid \ - --enable-libx264 \ + --enable-libzmq \ --enable-nonfree \ --enable-openssl \ - --enable-libfdk_aac \ --enable-postproc \ + --enable-shared \ --enable-small \ --enable-version3 \ - --enable-libbluray \ - --enable-libzmq \ + --enable-zimg \ --extra-libs=-ldl \ --prefix="${PREFIX}" \ --enable-libopenjpeg \ @@ -587,7 +604,7 @@ RUN \ --enable-libnpp \ --extra-cflags="-I${PREFIX}/include -I${PREFIX}/include/ffnvcodec -I/usr/local/cuda/include/" \ --extra-ldflags="-L${PREFIX}/lib -L/usr/local/cuda/lib64 -L/usr/local/cuda/lib32/" && \ - make && \ +make && \ make install && \ make tools/zmqsend && cp tools/zmqsend ${PREFIX}/bin/ && \ make distclean && \ diff --git a/docker-images/4.3/scratch312/Dockerfile b/docker-images/4.3/scratch312/Dockerfile index 4891bfbc6..8749aa1ff 100644 --- a/docker-images/4.3/scratch312/Dockerfile +++ b/docker-images/4.3/scratch312/Dockerfile @@ -9,40 +9,41 @@ FROM alpine:3.12 AS build WORKDIR /tmp/workdir ENV FFMPEG_VERSION=4.3.2 \ - AOM_VERSION=v1.0.0 \ - FDKAAC_VERSION=0.1.5 \ - FONTCONFIG_VERSION=2.12.4 \ - FREETYPE_VERSION=2.10.4 \ - FRIBIDI_VERSION=0.19.7 \ - KVAZAAR_VERSION=2.0.0 \ - LAME_VERSION=3.100 \ - LIBASS_VERSION=0.13.7 \ - LIBPTHREAD_STUBS_VERSION=0.4 \ - LIBVIDSTAB_VERSION=1.1.0 \ - LIBXCB_VERSION=1.13.1 \ - XCBPROTO_VERSION=1.13 \ - OGG_VERSION=1.3.2 \ - OPENCOREAMR_VERSION=0.1.5 \ - OPUS_VERSION=1.2 \ - OPENJPEG_VERSION=2.1.2 \ - THEORA_VERSION=1.1.1 \ - VORBIS_VERSION=1.3.5 \ - VPX_VERSION=1.8.0 \ - WEBP_VERSION=1.0.2 \ - X264_VERSION=20170226-2245-stable \ - X265_VERSION=3.4 \ - XAU_VERSION=1.0.9 \ - XORG_MACROS_VERSION=1.19.2 \ - XPROTO_VERSION=7.0.31 \ - XVID_VERSION=1.3.4 \ - LIBXML2_VERSION=2.9.10 \ - LIBBLURAY_VERSION=1.1.2 \ - LIBZMQ_VERSION=4.3.2 \ - LIBSRT_VERSION=1.4.1 \ - LIBARIBB24_VERSION=1.0.3 \ - LIBPNG_VERSION=1.6.9 \ - LIBVMAF_VERSION=2.1.1 \ - SRC=/usr/local + AOM_VERSION=v1.0.0 \ + FDKAAC_VERSION=0.1.5 \ + FONTCONFIG_VERSION=2.12.4 \ + FREETYPE_VERSION=2.10.4 \ + FRIBIDI_VERSION=0.19.7 \ + KVAZAAR_VERSION=2.0.0 \ + LAME_VERSION=3.100 \ + LIBARIBB24_VERSION=1.0.3 \ + LIBASS_VERSION=0.13.7 \ + LIBBLURAY_VERSION=1.1.2 \ + LIBPNG_VERSION=1.6.9 \ + LIBPTHREAD_STUBS_VERSION=0.4 \ + LIBSRT_VERSION=1.4.1 \ + LIBVIDSTAB_VERSION=1.1.0 \ + LIBVMAF_VERSION=2.1.1 \ + LIBXCB_VERSION=1.13.1 \ + LIBXML2_VERSION=2.9.10 \ + LIBZMQ_VERSION=4.3.2 \ + OGG_VERSION=1.3.2 \ + OPENCOREAMR_VERSION=0.1.5 \ + OPENJPEG_VERSION=2.1.2 \ + OPUS_VERSION=1.2 \ + THEORA_VERSION=1.1.1 \ + VORBIS_VERSION=1.3.5 \ + VPX_VERSION=1.8.0 \ + WEBP_VERSION=1.0.2 \ + X264_VERSION=20170226-2245-stable \ + X265_VERSION=3.4 \ + XAU_VERSION=1.0.9 \ + XCBPROTO_VERSION=1.13 \ + XORG_MACROS_VERSION=1.19.2 \ + XPROTO_VERSION=7.0.31 \ + XVID_VERSION=1.3.4 \ + ZIMG_VERSION=3.0.3 \ + SRC=/usr/local ARG FREETYPE_SHA256SUM="5eab795ebb23ac77001cfb68b7d4d50b5d6c7469247b0b01b2c953269f658dac freetype-2.10.4.tar.gz" ARG FRIBIDI_SHA256SUM="3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 0.19.7.tar.gz" @@ -97,24 +98,39 @@ RUN buildDeps="autoconf \ libssl1.1" && \ apk add --update ${buildDeps} +# zimg https://github.com/sekrit-twc/zimg +RUN \ + DIR=/tmp/zimg && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://github.com/sekrit-twc/zimg/archive/refs/tags/release-${ZIMG_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + ./autogen.sh && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} + + + ## libvmaf https://github.com/Netflix/vmaf RUN \ if which meson || false; then \ - echo "Building VMAF." && \ - DIR=/tmp/vmaf && \ - mkdir -p ${DIR} && \ - cd ${DIR} && \ - curl -sLO https://github.com/Netflix/vmaf/archive/v${LIBVMAF_VERSION}.tar.gz && \ - tar -xz --strip-components=1 -f v${LIBVMAF_VERSION}.tar.gz && \ - cd /tmp/vmaf/libvmaf && \ - meson build --buildtype release --prefix=${PREFIX} && \ - ninja -vC build && \ - ninja -vC build install && \ - mkdir -p ${PREFIX}/share/model/ && \ - cp -r /tmp/vmaf/model/* ${PREFIX}/share/model/ && \ - rm -rf ${DIR}; \ + echo "Building VMAF." && \ + DIR=/tmp/vmaf && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/Netflix/vmaf/archive/v${LIBVMAF_VERSION}.tar.gz && \ + tar -xz --strip-components=1 -f v${LIBVMAF_VERSION}.tar.gz && \ + cd /tmp/vmaf/libvmaf && \ + meson build --buildtype release --prefix=${PREFIX} && \ + ninja -vC build && \ + ninja -vC build install && \ + mkdir -p ${PREFIX}/share/model/ && \ + cp -r /tmp/vmaf/model/* ${PREFIX}/share/model/ && \ + rm -rf ${DIR}; \ else \ - echo "VMAF skipped."; \ + echo "VMAF skipped."; \ fi ## opencore-amr https://sourceforge.net/projects/opencore-amr/ @@ -520,33 +536,34 @@ RUN \ --disable-debug \ --disable-doc \ --disable-ffplay \ - --enable-shared \ --enable-avresample \ - --enable-libopencore-amrnb \ - --enable-libopencore-amrwb \ + --enable-fontconfig \ --enable-gpl \ --enable-libass \ - --enable-fontconfig \ + --enable-libbluray \ + --enable-libfdk_aac \ --enable-libfreetype \ - --enable-libvidstab \ --enable-libmp3lame \ + --enable-libopencore-amrnb \ + --enable-libopencore-amrwb \ --enable-libopus \ --enable-libtheora \ + --enable-libvidstab \ --enable-libvorbis \ --enable-libvpx \ --enable-libwebp \ - --enable-libxcb \ + --enable-libx264 \ --enable-libx265 \ + --enable-libxcb \ --enable-libxvid \ - --enable-libx264 \ + --enable-libzmq \ --enable-nonfree \ --enable-openssl \ - --enable-libfdk_aac \ --enable-postproc \ + --enable-shared \ --enable-small \ --enable-version3 \ - --enable-libbluray \ - --enable-libzmq \ + --enable-zimg \ --extra-libs=-ldl \ --prefix="${PREFIX}" \ --enable-libopenjpeg \ @@ -557,7 +574,7 @@ RUN \ --enable-libaribb24 \ --extra-cflags="-I${PREFIX}/include" \ --extra-ldflags="-L${PREFIX}/lib" && \ - make && \ +make && \ make install && \ make tools/zmqsend && cp tools/zmqsend ${PREFIX}/bin/ && \ make distclean && \ diff --git a/docker-images/4.3/scratch38/Dockerfile b/docker-images/4.3/scratch38/Dockerfile index 006d4c111..f506b3ea7 100644 --- a/docker-images/4.3/scratch38/Dockerfile +++ b/docker-images/4.3/scratch38/Dockerfile @@ -9,40 +9,41 @@ FROM alpine:3.8 AS build WORKDIR /tmp/workdir ENV FFMPEG_VERSION=4.3.2 \ - AOM_VERSION=v1.0.0 \ - FDKAAC_VERSION=0.1.5 \ - FONTCONFIG_VERSION=2.12.4 \ - FREETYPE_VERSION=2.10.4 \ - FRIBIDI_VERSION=0.19.7 \ - KVAZAAR_VERSION=2.0.0 \ - LAME_VERSION=3.100 \ - LIBASS_VERSION=0.13.7 \ - LIBPTHREAD_STUBS_VERSION=0.4 \ - LIBVIDSTAB_VERSION=1.1.0 \ - LIBXCB_VERSION=1.13.1 \ - XCBPROTO_VERSION=1.13 \ - OGG_VERSION=1.3.2 \ - OPENCOREAMR_VERSION=0.1.5 \ - OPUS_VERSION=1.2 \ - OPENJPEG_VERSION=2.1.2 \ - THEORA_VERSION=1.1.1 \ - VORBIS_VERSION=1.3.5 \ - VPX_VERSION=1.8.0 \ - WEBP_VERSION=1.0.2 \ - X264_VERSION=20170226-2245-stable \ - X265_VERSION=3.4 \ - XAU_VERSION=1.0.9 \ - XORG_MACROS_VERSION=1.19.2 \ - XPROTO_VERSION=7.0.31 \ - XVID_VERSION=1.3.4 \ - LIBXML2_VERSION=2.9.10 \ - LIBBLURAY_VERSION=1.1.2 \ - LIBZMQ_VERSION=4.3.2 \ - LIBSRT_VERSION=1.4.1 \ - LIBARIBB24_VERSION=1.0.3 \ - LIBPNG_VERSION=1.6.9 \ - LIBVMAF_VERSION=2.1.1 \ - SRC=/usr/local + AOM_VERSION=v1.0.0 \ + FDKAAC_VERSION=0.1.5 \ + FONTCONFIG_VERSION=2.12.4 \ + FREETYPE_VERSION=2.10.4 \ + FRIBIDI_VERSION=0.19.7 \ + KVAZAAR_VERSION=2.0.0 \ + LAME_VERSION=3.100 \ + LIBARIBB24_VERSION=1.0.3 \ + LIBASS_VERSION=0.13.7 \ + LIBBLURAY_VERSION=1.1.2 \ + LIBPNG_VERSION=1.6.9 \ + LIBPTHREAD_STUBS_VERSION=0.4 \ + LIBSRT_VERSION=1.4.1 \ + LIBVIDSTAB_VERSION=1.1.0 \ + LIBVMAF_VERSION=2.1.1 \ + LIBXCB_VERSION=1.13.1 \ + LIBXML2_VERSION=2.9.10 \ + LIBZMQ_VERSION=4.3.2 \ + OGG_VERSION=1.3.2 \ + OPENCOREAMR_VERSION=0.1.5 \ + OPENJPEG_VERSION=2.1.2 \ + OPUS_VERSION=1.2 \ + THEORA_VERSION=1.1.1 \ + VORBIS_VERSION=1.3.5 \ + VPX_VERSION=1.8.0 \ + WEBP_VERSION=1.0.2 \ + X264_VERSION=20170226-2245-stable \ + X265_VERSION=3.4 \ + XAU_VERSION=1.0.9 \ + XCBPROTO_VERSION=1.13 \ + XORG_MACROS_VERSION=1.19.2 \ + XPROTO_VERSION=7.0.31 \ + XVID_VERSION=1.3.4 \ + ZIMG_VERSION=3.0.3 \ + SRC=/usr/local ARG FREETYPE_SHA256SUM="5eab795ebb23ac77001cfb68b7d4d50b5d6c7469247b0b01b2c953269f658dac freetype-2.10.4.tar.gz" ARG FRIBIDI_SHA256SUM="3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 0.19.7.tar.gz" @@ -97,24 +98,39 @@ RUN buildDeps="autoconf \ libssl1.0" && \ apk add --update ${buildDeps} +# zimg https://github.com/sekrit-twc/zimg +RUN \ + DIR=/tmp/zimg && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://github.com/sekrit-twc/zimg/archive/refs/tags/release-${ZIMG_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + ./autogen.sh && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} + + + ## libvmaf https://github.com/Netflix/vmaf RUN \ if which meson || false; then \ - echo "Building VMAF." && \ - DIR=/tmp/vmaf && \ - mkdir -p ${DIR} && \ - cd ${DIR} && \ - curl -sLO https://github.com/Netflix/vmaf/archive/v${LIBVMAF_VERSION}.tar.gz && \ - tar -xz --strip-components=1 -f v${LIBVMAF_VERSION}.tar.gz && \ - cd /tmp/vmaf/libvmaf && \ - meson build --buildtype release --prefix=${PREFIX} && \ - ninja -vC build && \ - ninja -vC build install && \ - mkdir -p ${PREFIX}/share/model/ && \ - cp -r /tmp/vmaf/model/* ${PREFIX}/share/model/ && \ - rm -rf ${DIR}; \ + echo "Building VMAF." && \ + DIR=/tmp/vmaf && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/Netflix/vmaf/archive/v${LIBVMAF_VERSION}.tar.gz && \ + tar -xz --strip-components=1 -f v${LIBVMAF_VERSION}.tar.gz && \ + cd /tmp/vmaf/libvmaf && \ + meson build --buildtype release --prefix=${PREFIX} && \ + ninja -vC build && \ + ninja -vC build install && \ + mkdir -p ${PREFIX}/share/model/ && \ + cp -r /tmp/vmaf/model/* ${PREFIX}/share/model/ && \ + rm -rf ${DIR}; \ else \ - echo "VMAF skipped."; \ + echo "VMAF skipped."; \ fi ## opencore-amr https://sourceforge.net/projects/opencore-amr/ @@ -520,33 +536,34 @@ RUN \ --disable-debug \ --disable-doc \ --disable-ffplay \ - --enable-shared \ --enable-avresample \ - --enable-libopencore-amrnb \ - --enable-libopencore-amrwb \ + --enable-fontconfig \ --enable-gpl \ --enable-libass \ - --enable-fontconfig \ + --enable-libbluray \ + --enable-libfdk_aac \ --enable-libfreetype \ - --enable-libvidstab \ --enable-libmp3lame \ + --enable-libopencore-amrnb \ + --enable-libopencore-amrwb \ --enable-libopus \ --enable-libtheora \ + --enable-libvidstab \ --enable-libvorbis \ --enable-libvpx \ --enable-libwebp \ - --enable-libxcb \ + --enable-libx264 \ --enable-libx265 \ + --enable-libxcb \ --enable-libxvid \ - --enable-libx264 \ + --enable-libzmq \ --enable-nonfree \ --enable-openssl \ - --enable-libfdk_aac \ --enable-postproc \ + --enable-shared \ --enable-small \ --enable-version3 \ - --enable-libbluray \ - --enable-libzmq \ + --enable-zimg \ --extra-libs=-ldl \ --prefix="${PREFIX}" \ --enable-libopenjpeg \ @@ -557,7 +574,7 @@ RUN \ --enable-libaribb24 \ --extra-cflags="-I${PREFIX}/include" \ --extra-ldflags="-L${PREFIX}/lib" && \ - make && \ +make && \ make install && \ make tools/zmqsend && cp tools/zmqsend ${PREFIX}/bin/ && \ make distclean && \ diff --git a/docker-images/4.3/ubuntu1804/Dockerfile b/docker-images/4.3/ubuntu1804/Dockerfile index 0a844ce40..1ef0ff173 100644 --- a/docker-images/4.3/ubuntu1804/Dockerfile +++ b/docker-images/4.3/ubuntu1804/Dockerfile @@ -17,40 +17,41 @@ RUN apt-get -yqq update && \ FROM base as build ENV FFMPEG_VERSION=4.3.2 \ - AOM_VERSION=v1.0.0 \ - FDKAAC_VERSION=0.1.5 \ - FONTCONFIG_VERSION=2.12.4 \ - FREETYPE_VERSION=2.10.4 \ - FRIBIDI_VERSION=0.19.7 \ - KVAZAAR_VERSION=2.0.0 \ - LAME_VERSION=3.100 \ - LIBASS_VERSION=0.13.7 \ - LIBPTHREAD_STUBS_VERSION=0.4 \ - LIBVIDSTAB_VERSION=1.1.0 \ - LIBXCB_VERSION=1.13.1 \ - XCBPROTO_VERSION=1.13 \ - OGG_VERSION=1.3.2 \ - OPENCOREAMR_VERSION=0.1.5 \ - OPUS_VERSION=1.2 \ - OPENJPEG_VERSION=2.1.2 \ - THEORA_VERSION=1.1.1 \ - VORBIS_VERSION=1.3.5 \ - VPX_VERSION=1.8.0 \ - WEBP_VERSION=1.0.2 \ - X264_VERSION=20170226-2245-stable \ - X265_VERSION=3.4 \ - XAU_VERSION=1.0.9 \ - XORG_MACROS_VERSION=1.19.2 \ - XPROTO_VERSION=7.0.31 \ - XVID_VERSION=1.3.4 \ - LIBXML2_VERSION=2.9.10 \ - LIBBLURAY_VERSION=1.1.2 \ - LIBZMQ_VERSION=4.3.2 \ - LIBSRT_VERSION=1.4.1 \ - LIBARIBB24_VERSION=1.0.3 \ - LIBPNG_VERSION=1.6.9 \ - LIBVMAF_VERSION=2.1.1 \ - SRC=/usr/local + AOM_VERSION=v1.0.0 \ + FDKAAC_VERSION=0.1.5 \ + FONTCONFIG_VERSION=2.12.4 \ + FREETYPE_VERSION=2.10.4 \ + FRIBIDI_VERSION=0.19.7 \ + KVAZAAR_VERSION=2.0.0 \ + LAME_VERSION=3.100 \ + LIBARIBB24_VERSION=1.0.3 \ + LIBASS_VERSION=0.13.7 \ + LIBBLURAY_VERSION=1.1.2 \ + LIBPNG_VERSION=1.6.9 \ + LIBPTHREAD_STUBS_VERSION=0.4 \ + LIBSRT_VERSION=1.4.1 \ + LIBVIDSTAB_VERSION=1.1.0 \ + LIBVMAF_VERSION=2.1.1 \ + LIBXCB_VERSION=1.13.1 \ + LIBXML2_VERSION=2.9.10 \ + LIBZMQ_VERSION=4.3.2 \ + OGG_VERSION=1.3.2 \ + OPENCOREAMR_VERSION=0.1.5 \ + OPENJPEG_VERSION=2.1.2 \ + OPUS_VERSION=1.2 \ + THEORA_VERSION=1.1.1 \ + VORBIS_VERSION=1.3.5 \ + VPX_VERSION=1.8.0 \ + WEBP_VERSION=1.0.2 \ + X264_VERSION=20170226-2245-stable \ + X265_VERSION=3.4 \ + XAU_VERSION=1.0.9 \ + XCBPROTO_VERSION=1.13 \ + XORG_MACROS_VERSION=1.19.2 \ + XPROTO_VERSION=7.0.31 \ + XVID_VERSION=1.3.4 \ + ZIMG_VERSION=3.0.3 \ + SRC=/usr/local ARG FREETYPE_SHA256SUM="5eab795ebb23ac77001cfb68b7d4d50b5d6c7469247b0b01b2c953269f658dac freetype-2.10.4.tar.gz" ARG FRIBIDI_SHA256SUM="3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 0.19.7.tar.gz" @@ -96,24 +97,39 @@ RUN buildDeps="autoconf \ zlib1g-dev" && \ apt-get -yqq update && \ apt-get install -yq --no-install-recommends ${buildDeps} +# zimg https://github.com/sekrit-twc/zimg +RUN \ + DIR=/tmp/zimg && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://github.com/sekrit-twc/zimg/archive/refs/tags/release-${ZIMG_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + ./autogen.sh && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} + + + ## libvmaf https://github.com/Netflix/vmaf RUN \ if which meson || false; then \ - echo "Building VMAF." && \ - DIR=/tmp/vmaf && \ - mkdir -p ${DIR} && \ - cd ${DIR} && \ - curl -sLO https://github.com/Netflix/vmaf/archive/v${LIBVMAF_VERSION}.tar.gz && \ - tar -xz --strip-components=1 -f v${LIBVMAF_VERSION}.tar.gz && \ - cd /tmp/vmaf/libvmaf && \ - meson build --buildtype release --prefix=${PREFIX} && \ - ninja -vC build && \ - ninja -vC build install && \ - mkdir -p ${PREFIX}/share/model/ && \ - cp -r /tmp/vmaf/model/* ${PREFIX}/share/model/ && \ - rm -rf ${DIR}; \ + echo "Building VMAF." && \ + DIR=/tmp/vmaf && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/Netflix/vmaf/archive/v${LIBVMAF_VERSION}.tar.gz && \ + tar -xz --strip-components=1 -f v${LIBVMAF_VERSION}.tar.gz && \ + cd /tmp/vmaf/libvmaf && \ + meson build --buildtype release --prefix=${PREFIX} && \ + ninja -vC build && \ + ninja -vC build install && \ + mkdir -p ${PREFIX}/share/model/ && \ + cp -r /tmp/vmaf/model/* ${PREFIX}/share/model/ && \ + rm -rf ${DIR}; \ else \ - echo "VMAF skipped."; \ + echo "VMAF skipped."; \ fi ## opencore-amr https://sourceforge.net/projects/opencore-amr/ @@ -519,33 +535,34 @@ RUN \ --disable-debug \ --disable-doc \ --disable-ffplay \ - --enable-shared \ --enable-avresample \ - --enable-libopencore-amrnb \ - --enable-libopencore-amrwb \ + --enable-fontconfig \ --enable-gpl \ --enable-libass \ - --enable-fontconfig \ + --enable-libbluray \ + --enable-libfdk_aac \ --enable-libfreetype \ - --enable-libvidstab \ --enable-libmp3lame \ + --enable-libopencore-amrnb \ + --enable-libopencore-amrwb \ --enable-libopus \ --enable-libtheora \ + --enable-libvidstab \ --enable-libvorbis \ --enable-libvpx \ --enable-libwebp \ - --enable-libxcb \ + --enable-libx264 \ --enable-libx265 \ + --enable-libxcb \ --enable-libxvid \ - --enable-libx264 \ + --enable-libzmq \ --enable-nonfree \ --enable-openssl \ - --enable-libfdk_aac \ --enable-postproc \ + --enable-shared \ --enable-small \ --enable-version3 \ - --enable-libbluray \ - --enable-libzmq \ + --enable-zimg \ --extra-libs=-ldl \ --prefix="${PREFIX}" \ --enable-libopenjpeg \ @@ -556,7 +573,7 @@ RUN \ --enable-libaribb24 \ --extra-cflags="-I${PREFIX}/include" \ --extra-ldflags="-L${PREFIX}/lib" && \ - make && \ +make && \ make install && \ make tools/zmqsend && cp tools/zmqsend ${PREFIX}/bin/ && \ make distclean && \ diff --git a/docker-images/4.3/ubuntu2004/Dockerfile b/docker-images/4.3/ubuntu2004/Dockerfile index 89d3e8346..7c89cc8e8 100644 --- a/docker-images/4.3/ubuntu2004/Dockerfile +++ b/docker-images/4.3/ubuntu2004/Dockerfile @@ -17,40 +17,41 @@ RUN apt-get -yqq update && \ FROM base as build ENV FFMPEG_VERSION=4.3.2 \ - AOM_VERSION=v1.0.0 \ - FDKAAC_VERSION=0.1.5 \ - FONTCONFIG_VERSION=2.12.4 \ - FREETYPE_VERSION=2.10.4 \ - FRIBIDI_VERSION=0.19.7 \ - KVAZAAR_VERSION=2.0.0 \ - LAME_VERSION=3.100 \ - LIBASS_VERSION=0.13.7 \ - LIBPTHREAD_STUBS_VERSION=0.4 \ - LIBVIDSTAB_VERSION=1.1.0 \ - LIBXCB_VERSION=1.13.1 \ - XCBPROTO_VERSION=1.13 \ - OGG_VERSION=1.3.2 \ - OPENCOREAMR_VERSION=0.1.5 \ - OPUS_VERSION=1.2 \ - OPENJPEG_VERSION=2.1.2 \ - THEORA_VERSION=1.1.1 \ - VORBIS_VERSION=1.3.5 \ - VPX_VERSION=1.8.0 \ - WEBP_VERSION=1.0.2 \ - X264_VERSION=20170226-2245-stable \ - X265_VERSION=3.4 \ - XAU_VERSION=1.0.9 \ - XORG_MACROS_VERSION=1.19.2 \ - XPROTO_VERSION=7.0.31 \ - XVID_VERSION=1.3.4 \ - LIBXML2_VERSION=2.9.10 \ - LIBBLURAY_VERSION=1.1.2 \ - LIBZMQ_VERSION=4.3.2 \ - LIBSRT_VERSION=1.4.1 \ - LIBARIBB24_VERSION=1.0.3 \ - LIBPNG_VERSION=1.6.9 \ - LIBVMAF_VERSION=2.1.1 \ - SRC=/usr/local + AOM_VERSION=v1.0.0 \ + FDKAAC_VERSION=0.1.5 \ + FONTCONFIG_VERSION=2.12.4 \ + FREETYPE_VERSION=2.10.4 \ + FRIBIDI_VERSION=0.19.7 \ + KVAZAAR_VERSION=2.0.0 \ + LAME_VERSION=3.100 \ + LIBARIBB24_VERSION=1.0.3 \ + LIBASS_VERSION=0.13.7 \ + LIBBLURAY_VERSION=1.1.2 \ + LIBPNG_VERSION=1.6.9 \ + LIBPTHREAD_STUBS_VERSION=0.4 \ + LIBSRT_VERSION=1.4.1 \ + LIBVIDSTAB_VERSION=1.1.0 \ + LIBVMAF_VERSION=2.1.1 \ + LIBXCB_VERSION=1.13.1 \ + LIBXML2_VERSION=2.9.10 \ + LIBZMQ_VERSION=4.3.2 \ + OGG_VERSION=1.3.2 \ + OPENCOREAMR_VERSION=0.1.5 \ + OPENJPEG_VERSION=2.1.2 \ + OPUS_VERSION=1.2 \ + THEORA_VERSION=1.1.1 \ + VORBIS_VERSION=1.3.5 \ + VPX_VERSION=1.8.0 \ + WEBP_VERSION=1.0.2 \ + X264_VERSION=20170226-2245-stable \ + X265_VERSION=3.4 \ + XAU_VERSION=1.0.9 \ + XCBPROTO_VERSION=1.13 \ + XORG_MACROS_VERSION=1.19.2 \ + XPROTO_VERSION=7.0.31 \ + XVID_VERSION=1.3.4 \ + ZIMG_VERSION=3.0.3 \ + SRC=/usr/local ARG FREETYPE_SHA256SUM="5eab795ebb23ac77001cfb68b7d4d50b5d6c7469247b0b01b2c953269f658dac freetype-2.10.4.tar.gz" ARG FRIBIDI_SHA256SUM="3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 0.19.7.tar.gz" @@ -99,24 +100,39 @@ RUN buildDeps="autoconf \ zlib1g-dev" && \ apt-get -yqq update && \ apt-get install -yq --no-install-recommends ${buildDeps} +# zimg https://github.com/sekrit-twc/zimg +RUN \ + DIR=/tmp/zimg && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://github.com/sekrit-twc/zimg/archive/refs/tags/release-${ZIMG_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + ./autogen.sh && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} + + + ## libvmaf https://github.com/Netflix/vmaf RUN \ if which meson || false; then \ - echo "Building VMAF." && \ - DIR=/tmp/vmaf && \ - mkdir -p ${DIR} && \ - cd ${DIR} && \ - curl -sLO https://github.com/Netflix/vmaf/archive/v${LIBVMAF_VERSION}.tar.gz && \ - tar -xz --strip-components=1 -f v${LIBVMAF_VERSION}.tar.gz && \ - cd /tmp/vmaf/libvmaf && \ - meson build --buildtype release --prefix=${PREFIX} && \ - ninja -vC build && \ - ninja -vC build install && \ - mkdir -p ${PREFIX}/share/model/ && \ - cp -r /tmp/vmaf/model/* ${PREFIX}/share/model/ && \ - rm -rf ${DIR}; \ + echo "Building VMAF." && \ + DIR=/tmp/vmaf && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/Netflix/vmaf/archive/v${LIBVMAF_VERSION}.tar.gz && \ + tar -xz --strip-components=1 -f v${LIBVMAF_VERSION}.tar.gz && \ + cd /tmp/vmaf/libvmaf && \ + meson build --buildtype release --prefix=${PREFIX} && \ + ninja -vC build && \ + ninja -vC build install && \ + mkdir -p ${PREFIX}/share/model/ && \ + cp -r /tmp/vmaf/model/* ${PREFIX}/share/model/ && \ + rm -rf ${DIR}; \ else \ - echo "VMAF skipped."; \ + echo "VMAF skipped."; \ fi ## opencore-amr https://sourceforge.net/projects/opencore-amr/ @@ -522,33 +538,34 @@ RUN \ --disable-debug \ --disable-doc \ --disable-ffplay \ - --enable-shared \ --enable-avresample \ - --enable-libopencore-amrnb \ - --enable-libopencore-amrwb \ + --enable-fontconfig \ --enable-gpl \ --enable-libass \ - --enable-fontconfig \ + --enable-libbluray \ + --enable-libfdk_aac \ --enable-libfreetype \ - --enable-libvidstab \ --enable-libmp3lame \ + --enable-libopencore-amrnb \ + --enable-libopencore-amrwb \ --enable-libopus \ --enable-libtheora \ + --enable-libvidstab \ --enable-libvorbis \ --enable-libvpx \ --enable-libwebp \ - --enable-libxcb \ + --enable-libx264 \ --enable-libx265 \ + --enable-libxcb \ --enable-libxvid \ - --enable-libx264 \ + --enable-libzmq \ --enable-nonfree \ --enable-openssl \ - --enable-libfdk_aac \ --enable-postproc \ + --enable-shared \ --enable-small \ --enable-version3 \ - --enable-libbluray \ - --enable-libzmq \ + --enable-zimg \ --extra-libs=-ldl \ --prefix="${PREFIX}" \ --enable-libopenjpeg \ @@ -560,7 +577,7 @@ RUN \ --enable-libvmaf \ --extra-cflags="-I${PREFIX}/include" \ --extra-ldflags="-L${PREFIX}/lib" && \ - make && \ +make && \ make install && \ make tools/zmqsend && cp tools/zmqsend ${PREFIX}/bin/ && \ make distclean && \ diff --git a/docker-images/4.3/vaapi1804/Dockerfile b/docker-images/4.3/vaapi1804/Dockerfile index 1dba72491..b2b46e633 100644 --- a/docker-images/4.3/vaapi1804/Dockerfile +++ b/docker-images/4.3/vaapi1804/Dockerfile @@ -17,40 +17,41 @@ RUN apt-get -yqq update && \ FROM base as build ENV FFMPEG_VERSION=4.3.2 \ - AOM_VERSION=v1.0.0 \ - FDKAAC_VERSION=0.1.5 \ - FONTCONFIG_VERSION=2.12.4 \ - FREETYPE_VERSION=2.10.4 \ - FRIBIDI_VERSION=0.19.7 \ - KVAZAAR_VERSION=2.0.0 \ - LAME_VERSION=3.100 \ - LIBASS_VERSION=0.13.7 \ - LIBPTHREAD_STUBS_VERSION=0.4 \ - LIBVIDSTAB_VERSION=1.1.0 \ - LIBXCB_VERSION=1.13.1 \ - XCBPROTO_VERSION=1.13 \ - OGG_VERSION=1.3.2 \ - OPENCOREAMR_VERSION=0.1.5 \ - OPUS_VERSION=1.2 \ - OPENJPEG_VERSION=2.1.2 \ - THEORA_VERSION=1.1.1 \ - VORBIS_VERSION=1.3.5 \ - VPX_VERSION=1.8.0 \ - WEBP_VERSION=1.0.2 \ - X264_VERSION=20170226-2245-stable \ - X265_VERSION=3.4 \ - XAU_VERSION=1.0.9 \ - XORG_MACROS_VERSION=1.19.2 \ - XPROTO_VERSION=7.0.31 \ - XVID_VERSION=1.3.4 \ - LIBXML2_VERSION=2.9.10 \ - LIBBLURAY_VERSION=1.1.2 \ - LIBZMQ_VERSION=4.3.2 \ - LIBSRT_VERSION=1.4.1 \ - LIBARIBB24_VERSION=1.0.3 \ - LIBPNG_VERSION=1.6.9 \ - LIBVMAF_VERSION=2.1.1 \ - SRC=/usr/local + AOM_VERSION=v1.0.0 \ + FDKAAC_VERSION=0.1.5 \ + FONTCONFIG_VERSION=2.12.4 \ + FREETYPE_VERSION=2.10.4 \ + FRIBIDI_VERSION=0.19.7 \ + KVAZAAR_VERSION=2.0.0 \ + LAME_VERSION=3.100 \ + LIBARIBB24_VERSION=1.0.3 \ + LIBASS_VERSION=0.13.7 \ + LIBBLURAY_VERSION=1.1.2 \ + LIBPNG_VERSION=1.6.9 \ + LIBPTHREAD_STUBS_VERSION=0.4 \ + LIBSRT_VERSION=1.4.1 \ + LIBVIDSTAB_VERSION=1.1.0 \ + LIBVMAF_VERSION=2.1.1 \ + LIBXCB_VERSION=1.13.1 \ + LIBXML2_VERSION=2.9.10 \ + LIBZMQ_VERSION=4.3.2 \ + OGG_VERSION=1.3.2 \ + OPENCOREAMR_VERSION=0.1.5 \ + OPENJPEG_VERSION=2.1.2 \ + OPUS_VERSION=1.2 \ + THEORA_VERSION=1.1.1 \ + VORBIS_VERSION=1.3.5 \ + VPX_VERSION=1.8.0 \ + WEBP_VERSION=1.0.2 \ + X264_VERSION=20170226-2245-stable \ + X265_VERSION=3.4 \ + XAU_VERSION=1.0.9 \ + XCBPROTO_VERSION=1.13 \ + XORG_MACROS_VERSION=1.19.2 \ + XPROTO_VERSION=7.0.31 \ + XVID_VERSION=1.3.4 \ + ZIMG_VERSION=3.0.3 \ + SRC=/usr/local ARG FREETYPE_SHA256SUM="5eab795ebb23ac77001cfb68b7d4d50b5d6c7469247b0b01b2c953269f658dac freetype-2.10.4.tar.gz" ARG FRIBIDI_SHA256SUM="3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 0.19.7.tar.gz" @@ -97,24 +98,39 @@ RUN buildDeps="autoconf \ zlib1g-dev" && \ apt-get -yqq update && \ apt-get install -yq --no-install-recommends ${buildDeps} +# zimg https://github.com/sekrit-twc/zimg +RUN \ + DIR=/tmp/zimg && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://github.com/sekrit-twc/zimg/archive/refs/tags/release-${ZIMG_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + ./autogen.sh && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} + + + ## libvmaf https://github.com/Netflix/vmaf RUN \ if which meson || false; then \ - echo "Building VMAF." && \ - DIR=/tmp/vmaf && \ - mkdir -p ${DIR} && \ - cd ${DIR} && \ - curl -sLO https://github.com/Netflix/vmaf/archive/v${LIBVMAF_VERSION}.tar.gz && \ - tar -xz --strip-components=1 -f v${LIBVMAF_VERSION}.tar.gz && \ - cd /tmp/vmaf/libvmaf && \ - meson build --buildtype release --prefix=${PREFIX} && \ - ninja -vC build && \ - ninja -vC build install && \ - mkdir -p ${PREFIX}/share/model/ && \ - cp -r /tmp/vmaf/model/* ${PREFIX}/share/model/ && \ - rm -rf ${DIR}; \ + echo "Building VMAF." && \ + DIR=/tmp/vmaf && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/Netflix/vmaf/archive/v${LIBVMAF_VERSION}.tar.gz && \ + tar -xz --strip-components=1 -f v${LIBVMAF_VERSION}.tar.gz && \ + cd /tmp/vmaf/libvmaf && \ + meson build --buildtype release --prefix=${PREFIX} && \ + ninja -vC build && \ + ninja -vC build install && \ + mkdir -p ${PREFIX}/share/model/ && \ + cp -r /tmp/vmaf/model/* ${PREFIX}/share/model/ && \ + rm -rf ${DIR}; \ else \ - echo "VMAF skipped."; \ + echo "VMAF skipped."; \ fi ## opencore-amr https://sourceforge.net/projects/opencore-amr/ @@ -520,33 +536,34 @@ RUN \ --disable-debug \ --disable-doc \ --disable-ffplay \ - --enable-shared \ --enable-avresample \ - --enable-libopencore-amrnb \ - --enable-libopencore-amrwb \ + --enable-fontconfig \ --enable-gpl \ --enable-libass \ - --enable-fontconfig \ + --enable-libbluray \ + --enable-libfdk_aac \ --enable-libfreetype \ - --enable-libvidstab \ --enable-libmp3lame \ + --enable-libopencore-amrnb \ + --enable-libopencore-amrwb \ --enable-libopus \ --enable-libtheora \ + --enable-libvidstab \ --enable-libvorbis \ --enable-libvpx \ --enable-libwebp \ - --enable-libxcb \ + --enable-libx264 \ --enable-libx265 \ + --enable-libxcb \ --enable-libxvid \ - --enable-libx264 \ + --enable-libzmq \ --enable-nonfree \ --enable-openssl \ - --enable-libfdk_aac \ --enable-postproc \ + --enable-shared \ --enable-small \ --enable-version3 \ - --enable-libbluray \ - --enable-libzmq \ + --enable-zimg \ --extra-libs=-ldl \ --prefix="${PREFIX}" \ --enable-libopenjpeg \ @@ -558,7 +575,7 @@ RUN \ --enable-vaapi \ --extra-cflags="-I${PREFIX}/include" \ --extra-ldflags="-L${PREFIX}/lib" && \ - make && \ +make && \ make install && \ make tools/zmqsend && cp tools/zmqsend ${PREFIX}/bin/ && \ make distclean && \ diff --git a/docker-images/4.3/vaapi2004/Dockerfile b/docker-images/4.3/vaapi2004/Dockerfile index bdb983f3e..311cbd8aa 100644 --- a/docker-images/4.3/vaapi2004/Dockerfile +++ b/docker-images/4.3/vaapi2004/Dockerfile @@ -17,40 +17,41 @@ RUN apt-get -yqq update && \ FROM base as build ENV FFMPEG_VERSION=4.3.2 \ - AOM_VERSION=v1.0.0 \ - FDKAAC_VERSION=0.1.5 \ - FONTCONFIG_VERSION=2.12.4 \ - FREETYPE_VERSION=2.10.4 \ - FRIBIDI_VERSION=0.19.7 \ - KVAZAAR_VERSION=2.0.0 \ - LAME_VERSION=3.100 \ - LIBASS_VERSION=0.13.7 \ - LIBPTHREAD_STUBS_VERSION=0.4 \ - LIBVIDSTAB_VERSION=1.1.0 \ - LIBXCB_VERSION=1.13.1 \ - XCBPROTO_VERSION=1.13 \ - OGG_VERSION=1.3.2 \ - OPENCOREAMR_VERSION=0.1.5 \ - OPUS_VERSION=1.2 \ - OPENJPEG_VERSION=2.1.2 \ - THEORA_VERSION=1.1.1 \ - VORBIS_VERSION=1.3.5 \ - VPX_VERSION=1.8.0 \ - WEBP_VERSION=1.0.2 \ - X264_VERSION=20170226-2245-stable \ - X265_VERSION=3.4 \ - XAU_VERSION=1.0.9 \ - XORG_MACROS_VERSION=1.19.2 \ - XPROTO_VERSION=7.0.31 \ - XVID_VERSION=1.3.4 \ - LIBXML2_VERSION=2.9.10 \ - LIBBLURAY_VERSION=1.1.2 \ - LIBZMQ_VERSION=4.3.2 \ - LIBSRT_VERSION=1.4.1 \ - LIBARIBB24_VERSION=1.0.3 \ - LIBPNG_VERSION=1.6.9 \ - LIBVMAF_VERSION=2.1.1 \ - SRC=/usr/local + AOM_VERSION=v1.0.0 \ + FDKAAC_VERSION=0.1.5 \ + FONTCONFIG_VERSION=2.12.4 \ + FREETYPE_VERSION=2.10.4 \ + FRIBIDI_VERSION=0.19.7 \ + KVAZAAR_VERSION=2.0.0 \ + LAME_VERSION=3.100 \ + LIBARIBB24_VERSION=1.0.3 \ + LIBASS_VERSION=0.13.7 \ + LIBBLURAY_VERSION=1.1.2 \ + LIBPNG_VERSION=1.6.9 \ + LIBPTHREAD_STUBS_VERSION=0.4 \ + LIBSRT_VERSION=1.4.1 \ + LIBVIDSTAB_VERSION=1.1.0 \ + LIBVMAF_VERSION=2.1.1 \ + LIBXCB_VERSION=1.13.1 \ + LIBXML2_VERSION=2.9.10 \ + LIBZMQ_VERSION=4.3.2 \ + OGG_VERSION=1.3.2 \ + OPENCOREAMR_VERSION=0.1.5 \ + OPENJPEG_VERSION=2.1.2 \ + OPUS_VERSION=1.2 \ + THEORA_VERSION=1.1.1 \ + VORBIS_VERSION=1.3.5 \ + VPX_VERSION=1.8.0 \ + WEBP_VERSION=1.0.2 \ + X264_VERSION=20170226-2245-stable \ + X265_VERSION=3.4 \ + XAU_VERSION=1.0.9 \ + XCBPROTO_VERSION=1.13 \ + XORG_MACROS_VERSION=1.19.2 \ + XPROTO_VERSION=7.0.31 \ + XVID_VERSION=1.3.4 \ + ZIMG_VERSION=3.0.3 \ + SRC=/usr/local ARG FREETYPE_SHA256SUM="5eab795ebb23ac77001cfb68b7d4d50b5d6c7469247b0b01b2c953269f658dac freetype-2.10.4.tar.gz" ARG FRIBIDI_SHA256SUM="3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 0.19.7.tar.gz" @@ -100,24 +101,39 @@ RUN buildDeps="autoconf \ zlib1g-dev" && \ apt-get -yqq update && \ apt-get install -yq --no-install-recommends ${buildDeps} +# zimg https://github.com/sekrit-twc/zimg +RUN \ + DIR=/tmp/zimg && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://github.com/sekrit-twc/zimg/archive/refs/tags/release-${ZIMG_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + ./autogen.sh && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} + + + ## libvmaf https://github.com/Netflix/vmaf RUN \ if which meson || false; then \ - echo "Building VMAF." && \ - DIR=/tmp/vmaf && \ - mkdir -p ${DIR} && \ - cd ${DIR} && \ - curl -sLO https://github.com/Netflix/vmaf/archive/v${LIBVMAF_VERSION}.tar.gz && \ - tar -xz --strip-components=1 -f v${LIBVMAF_VERSION}.tar.gz && \ - cd /tmp/vmaf/libvmaf && \ - meson build --buildtype release --prefix=${PREFIX} && \ - ninja -vC build && \ - ninja -vC build install && \ - mkdir -p ${PREFIX}/share/model/ && \ - cp -r /tmp/vmaf/model/* ${PREFIX}/share/model/ && \ - rm -rf ${DIR}; \ + echo "Building VMAF." && \ + DIR=/tmp/vmaf && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/Netflix/vmaf/archive/v${LIBVMAF_VERSION}.tar.gz && \ + tar -xz --strip-components=1 -f v${LIBVMAF_VERSION}.tar.gz && \ + cd /tmp/vmaf/libvmaf && \ + meson build --buildtype release --prefix=${PREFIX} && \ + ninja -vC build && \ + ninja -vC build install && \ + mkdir -p ${PREFIX}/share/model/ && \ + cp -r /tmp/vmaf/model/* ${PREFIX}/share/model/ && \ + rm -rf ${DIR}; \ else \ - echo "VMAF skipped."; \ + echo "VMAF skipped."; \ fi ## opencore-amr https://sourceforge.net/projects/opencore-amr/ @@ -523,33 +539,34 @@ RUN \ --disable-debug \ --disable-doc \ --disable-ffplay \ - --enable-shared \ --enable-avresample \ - --enable-libopencore-amrnb \ - --enable-libopencore-amrwb \ + --enable-fontconfig \ --enable-gpl \ --enable-libass \ - --enable-fontconfig \ + --enable-libbluray \ + --enable-libfdk_aac \ --enable-libfreetype \ - --enable-libvidstab \ --enable-libmp3lame \ + --enable-libopencore-amrnb \ + --enable-libopencore-amrwb \ --enable-libopus \ --enable-libtheora \ + --enable-libvidstab \ --enable-libvorbis \ --enable-libvpx \ --enable-libwebp \ - --enable-libxcb \ + --enable-libx264 \ --enable-libx265 \ + --enable-libxcb \ --enable-libxvid \ - --enable-libx264 \ + --enable-libzmq \ --enable-nonfree \ --enable-openssl \ - --enable-libfdk_aac \ --enable-postproc \ + --enable-shared \ --enable-small \ --enable-version3 \ - --enable-libbluray \ - --enable-libzmq \ + --enable-zimg \ --extra-libs=-ldl \ --prefix="${PREFIX}" \ --enable-libopenjpeg \ @@ -562,7 +579,7 @@ RUN \ --enable-vaapi \ --extra-cflags="-I${PREFIX}/include" \ --extra-ldflags="-L${PREFIX}/lib" && \ - make && \ +make && \ make install && \ make tools/zmqsend && cp tools/zmqsend ${PREFIX}/bin/ && \ make distclean && \ diff --git a/docker-images/4.4/alpine312/Dockerfile b/docker-images/4.4/alpine312/Dockerfile index e942e4037..4a4552b44 100644 --- a/docker-images/4.4/alpine312/Dockerfile +++ b/docker-images/4.4/alpine312/Dockerfile @@ -14,40 +14,41 @@ FROM base AS build WORKDIR /tmp/workdir ENV FFMPEG_VERSION=4.4 \ - AOM_VERSION=v1.0.0 \ - FDKAAC_VERSION=0.1.5 \ - FONTCONFIG_VERSION=2.12.4 \ - FREETYPE_VERSION=2.10.4 \ - FRIBIDI_VERSION=0.19.7 \ - KVAZAAR_VERSION=2.0.0 \ - LAME_VERSION=3.100 \ - LIBASS_VERSION=0.13.7 \ - LIBPTHREAD_STUBS_VERSION=0.4 \ - LIBVIDSTAB_VERSION=1.1.0 \ - LIBXCB_VERSION=1.13.1 \ - XCBPROTO_VERSION=1.13 \ - OGG_VERSION=1.3.2 \ - OPENCOREAMR_VERSION=0.1.5 \ - OPUS_VERSION=1.2 \ - OPENJPEG_VERSION=2.1.2 \ - THEORA_VERSION=1.1.1 \ - VORBIS_VERSION=1.3.5 \ - VPX_VERSION=1.8.0 \ - WEBP_VERSION=1.0.2 \ - X264_VERSION=20170226-2245-stable \ - X265_VERSION=3.4 \ - XAU_VERSION=1.0.9 \ - XORG_MACROS_VERSION=1.19.2 \ - XPROTO_VERSION=7.0.31 \ - XVID_VERSION=1.3.4 \ - LIBXML2_VERSION=2.9.10 \ - LIBBLURAY_VERSION=1.1.2 \ - LIBZMQ_VERSION=4.3.2 \ - LIBSRT_VERSION=1.4.1 \ - LIBARIBB24_VERSION=1.0.3 \ - LIBPNG_VERSION=1.6.9 \ - LIBVMAF_VERSION=2.1.1 \ - SRC=/usr/local + AOM_VERSION=v1.0.0 \ + FDKAAC_VERSION=0.1.5 \ + FONTCONFIG_VERSION=2.12.4 \ + FREETYPE_VERSION=2.10.4 \ + FRIBIDI_VERSION=0.19.7 \ + KVAZAAR_VERSION=2.0.0 \ + LAME_VERSION=3.100 \ + LIBARIBB24_VERSION=1.0.3 \ + LIBASS_VERSION=0.13.7 \ + LIBBLURAY_VERSION=1.1.2 \ + LIBPNG_VERSION=1.6.9 \ + LIBPTHREAD_STUBS_VERSION=0.4 \ + LIBSRT_VERSION=1.4.1 \ + LIBVIDSTAB_VERSION=1.1.0 \ + LIBVMAF_VERSION=2.1.1 \ + LIBXCB_VERSION=1.13.1 \ + LIBXML2_VERSION=2.9.10 \ + LIBZMQ_VERSION=4.3.2 \ + OGG_VERSION=1.3.2 \ + OPENCOREAMR_VERSION=0.1.5 \ + OPENJPEG_VERSION=2.1.2 \ + OPUS_VERSION=1.2 \ + THEORA_VERSION=1.1.1 \ + VORBIS_VERSION=1.3.5 \ + VPX_VERSION=1.8.0 \ + WEBP_VERSION=1.0.2 \ + X264_VERSION=20170226-2245-stable \ + X265_VERSION=3.4 \ + XAU_VERSION=1.0.9 \ + XCBPROTO_VERSION=1.13 \ + XORG_MACROS_VERSION=1.19.2 \ + XPROTO_VERSION=7.0.31 \ + XVID_VERSION=1.3.4 \ + ZIMG_VERSION=3.0.3 \ + SRC=/usr/local ARG FREETYPE_SHA256SUM="5eab795ebb23ac77001cfb68b7d4d50b5d6c7469247b0b01b2c953269f658dac freetype-2.10.4.tar.gz" ARG FRIBIDI_SHA256SUM="3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 0.19.7.tar.gz" @@ -95,24 +96,39 @@ RUN buildDeps="autoconf \ zlib-dev \ expat-dev" && \ apk add --no-cache --update ${buildDeps} +# zimg https://github.com/sekrit-twc/zimg +RUN \ + DIR=/tmp/zimg && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://github.com/sekrit-twc/zimg/archive/refs/tags/release-${ZIMG_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + ./autogen.sh && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} + + + ## libvmaf https://github.com/Netflix/vmaf RUN \ if which meson || false; then \ - echo "Building VMAF." && \ - DIR=/tmp/vmaf && \ - mkdir -p ${DIR} && \ - cd ${DIR} && \ - curl -sLO https://github.com/Netflix/vmaf/archive/v${LIBVMAF_VERSION}.tar.gz && \ - tar -xz --strip-components=1 -f v${LIBVMAF_VERSION}.tar.gz && \ - cd /tmp/vmaf/libvmaf && \ - meson build --buildtype release --prefix=${PREFIX} && \ - ninja -vC build && \ - ninja -vC build install && \ - mkdir -p ${PREFIX}/share/model/ && \ - cp -r /tmp/vmaf/model/* ${PREFIX}/share/model/ && \ - rm -rf ${DIR}; \ + echo "Building VMAF." && \ + DIR=/tmp/vmaf && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/Netflix/vmaf/archive/v${LIBVMAF_VERSION}.tar.gz && \ + tar -xz --strip-components=1 -f v${LIBVMAF_VERSION}.tar.gz && \ + cd /tmp/vmaf/libvmaf && \ + meson build --buildtype release --prefix=${PREFIX} && \ + ninja -vC build && \ + ninja -vC build install && \ + mkdir -p ${PREFIX}/share/model/ && \ + cp -r /tmp/vmaf/model/* ${PREFIX}/share/model/ && \ + rm -rf ${DIR}; \ else \ - echo "VMAF skipped."; \ + echo "VMAF skipped."; \ fi ## opencore-amr https://sourceforge.net/projects/opencore-amr/ @@ -518,33 +534,34 @@ RUN \ --disable-debug \ --disable-doc \ --disable-ffplay \ - --enable-shared \ --enable-avresample \ - --enable-libopencore-amrnb \ - --enable-libopencore-amrwb \ + --enable-fontconfig \ --enable-gpl \ --enable-libass \ - --enable-fontconfig \ + --enable-libbluray \ + --enable-libfdk_aac \ --enable-libfreetype \ - --enable-libvidstab \ --enable-libmp3lame \ + --enable-libopencore-amrnb \ + --enable-libopencore-amrwb \ --enable-libopus \ --enable-libtheora \ + --enable-libvidstab \ --enable-libvorbis \ --enable-libvpx \ --enable-libwebp \ - --enable-libxcb \ + --enable-libx264 \ --enable-libx265 \ + --enable-libxcb \ --enable-libxvid \ - --enable-libx264 \ + --enable-libzmq \ --enable-nonfree \ --enable-openssl \ - --enable-libfdk_aac \ --enable-postproc \ + --enable-shared \ --enable-small \ --enable-version3 \ - --enable-libbluray \ - --enable-libzmq \ + --enable-zimg \ --extra-libs=-ldl \ --prefix="${PREFIX}" \ --enable-libopenjpeg \ @@ -555,7 +572,7 @@ RUN \ --enable-libaribb24 \ --extra-cflags="-I${PREFIX}/include" \ --extra-ldflags="-L${PREFIX}/lib" && \ - make && \ +make && \ make install && \ make tools/zmqsend && cp tools/zmqsend ${PREFIX}/bin/ && \ make distclean && \ diff --git a/docker-images/4.4/alpine38/Dockerfile b/docker-images/4.4/alpine38/Dockerfile index 4a8d69a33..0169edece 100644 --- a/docker-images/4.4/alpine38/Dockerfile +++ b/docker-images/4.4/alpine38/Dockerfile @@ -14,40 +14,41 @@ FROM base AS build WORKDIR /tmp/workdir ENV FFMPEG_VERSION=4.4 \ - AOM_VERSION=v1.0.0 \ - FDKAAC_VERSION=0.1.5 \ - FONTCONFIG_VERSION=2.12.4 \ - FREETYPE_VERSION=2.10.4 \ - FRIBIDI_VERSION=0.19.7 \ - KVAZAAR_VERSION=2.0.0 \ - LAME_VERSION=3.100 \ - LIBASS_VERSION=0.13.7 \ - LIBPTHREAD_STUBS_VERSION=0.4 \ - LIBVIDSTAB_VERSION=1.1.0 \ - LIBXCB_VERSION=1.13.1 \ - XCBPROTO_VERSION=1.13 \ - OGG_VERSION=1.3.2 \ - OPENCOREAMR_VERSION=0.1.5 \ - OPUS_VERSION=1.2 \ - OPENJPEG_VERSION=2.1.2 \ - THEORA_VERSION=1.1.1 \ - VORBIS_VERSION=1.3.5 \ - VPX_VERSION=1.8.0 \ - WEBP_VERSION=1.0.2 \ - X264_VERSION=20170226-2245-stable \ - X265_VERSION=3.4 \ - XAU_VERSION=1.0.9 \ - XORG_MACROS_VERSION=1.19.2 \ - XPROTO_VERSION=7.0.31 \ - XVID_VERSION=1.3.4 \ - LIBXML2_VERSION=2.9.10 \ - LIBBLURAY_VERSION=1.1.2 \ - LIBZMQ_VERSION=4.3.2 \ - LIBSRT_VERSION=1.4.1 \ - LIBARIBB24_VERSION=1.0.3 \ - LIBPNG_VERSION=1.6.9 \ - LIBVMAF_VERSION=2.1.1 \ - SRC=/usr/local + AOM_VERSION=v1.0.0 \ + FDKAAC_VERSION=0.1.5 \ + FONTCONFIG_VERSION=2.12.4 \ + FREETYPE_VERSION=2.10.4 \ + FRIBIDI_VERSION=0.19.7 \ + KVAZAAR_VERSION=2.0.0 \ + LAME_VERSION=3.100 \ + LIBARIBB24_VERSION=1.0.3 \ + LIBASS_VERSION=0.13.7 \ + LIBBLURAY_VERSION=1.1.2 \ + LIBPNG_VERSION=1.6.9 \ + LIBPTHREAD_STUBS_VERSION=0.4 \ + LIBSRT_VERSION=1.4.1 \ + LIBVIDSTAB_VERSION=1.1.0 \ + LIBVMAF_VERSION=2.1.1 \ + LIBXCB_VERSION=1.13.1 \ + LIBXML2_VERSION=2.9.10 \ + LIBZMQ_VERSION=4.3.2 \ + OGG_VERSION=1.3.2 \ + OPENCOREAMR_VERSION=0.1.5 \ + OPENJPEG_VERSION=2.1.2 \ + OPUS_VERSION=1.2 \ + THEORA_VERSION=1.1.1 \ + VORBIS_VERSION=1.3.5 \ + VPX_VERSION=1.8.0 \ + WEBP_VERSION=1.0.2 \ + X264_VERSION=20170226-2245-stable \ + X265_VERSION=3.4 \ + XAU_VERSION=1.0.9 \ + XCBPROTO_VERSION=1.13 \ + XORG_MACROS_VERSION=1.19.2 \ + XPROTO_VERSION=7.0.31 \ + XVID_VERSION=1.3.4 \ + ZIMG_VERSION=3.0.3 \ + SRC=/usr/local ARG FREETYPE_SHA256SUM="5eab795ebb23ac77001cfb68b7d4d50b5d6c7469247b0b01b2c953269f658dac freetype-2.10.4.tar.gz" ARG FRIBIDI_SHA256SUM="3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 0.19.7.tar.gz" @@ -95,24 +96,39 @@ RUN buildDeps="autoconf \ zlib-dev \ expat-dev" && \ apk add --no-cache --update ${buildDeps} +# zimg https://github.com/sekrit-twc/zimg +RUN \ + DIR=/tmp/zimg && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://github.com/sekrit-twc/zimg/archive/refs/tags/release-${ZIMG_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + ./autogen.sh && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} + + + ## libvmaf https://github.com/Netflix/vmaf RUN \ if which meson || false; then \ - echo "Building VMAF." && \ - DIR=/tmp/vmaf && \ - mkdir -p ${DIR} && \ - cd ${DIR} && \ - curl -sLO https://github.com/Netflix/vmaf/archive/v${LIBVMAF_VERSION}.tar.gz && \ - tar -xz --strip-components=1 -f v${LIBVMAF_VERSION}.tar.gz && \ - cd /tmp/vmaf/libvmaf && \ - meson build --buildtype release --prefix=${PREFIX} && \ - ninja -vC build && \ - ninja -vC build install && \ - mkdir -p ${PREFIX}/share/model/ && \ - cp -r /tmp/vmaf/model/* ${PREFIX}/share/model/ && \ - rm -rf ${DIR}; \ + echo "Building VMAF." && \ + DIR=/tmp/vmaf && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/Netflix/vmaf/archive/v${LIBVMAF_VERSION}.tar.gz && \ + tar -xz --strip-components=1 -f v${LIBVMAF_VERSION}.tar.gz && \ + cd /tmp/vmaf/libvmaf && \ + meson build --buildtype release --prefix=${PREFIX} && \ + ninja -vC build && \ + ninja -vC build install && \ + mkdir -p ${PREFIX}/share/model/ && \ + cp -r /tmp/vmaf/model/* ${PREFIX}/share/model/ && \ + rm -rf ${DIR}; \ else \ - echo "VMAF skipped."; \ + echo "VMAF skipped."; \ fi ## opencore-amr https://sourceforge.net/projects/opencore-amr/ @@ -518,33 +534,34 @@ RUN \ --disable-debug \ --disable-doc \ --disable-ffplay \ - --enable-shared \ --enable-avresample \ - --enable-libopencore-amrnb \ - --enable-libopencore-amrwb \ + --enable-fontconfig \ --enable-gpl \ --enable-libass \ - --enable-fontconfig \ + --enable-libbluray \ + --enable-libfdk_aac \ --enable-libfreetype \ - --enable-libvidstab \ --enable-libmp3lame \ + --enable-libopencore-amrnb \ + --enable-libopencore-amrwb \ --enable-libopus \ --enable-libtheora \ + --enable-libvidstab \ --enable-libvorbis \ --enable-libvpx \ --enable-libwebp \ - --enable-libxcb \ + --enable-libx264 \ --enable-libx265 \ + --enable-libxcb \ --enable-libxvid \ - --enable-libx264 \ + --enable-libzmq \ --enable-nonfree \ --enable-openssl \ - --enable-libfdk_aac \ --enable-postproc \ + --enable-shared \ --enable-small \ --enable-version3 \ - --enable-libbluray \ - --enable-libzmq \ + --enable-zimg \ --extra-libs=-ldl \ --prefix="${PREFIX}" \ --enable-libopenjpeg \ @@ -555,7 +572,7 @@ RUN \ --enable-libaribb24 \ --extra-cflags="-I${PREFIX}/include" \ --extra-ldflags="-L${PREFIX}/lib" && \ - make && \ +make && \ make install && \ make tools/zmqsend && cp tools/zmqsend ${PREFIX}/bin/ && \ make distclean && \ diff --git a/docker-images/4.4/centos7/Dockerfile b/docker-images/4.4/centos7/Dockerfile index 20ec378b0..beb4b8117 100644 --- a/docker-images/4.4/centos7/Dockerfile +++ b/docker-images/4.4/centos7/Dockerfile @@ -16,40 +16,41 @@ FROM base AS build WORKDIR /tmp/workdir ENV FFMPEG_VERSION=4.4 \ - AOM_VERSION=v1.0.0 \ - FDKAAC_VERSION=0.1.5 \ - FONTCONFIG_VERSION=2.12.4 \ - FREETYPE_VERSION=2.10.4 \ - FRIBIDI_VERSION=0.19.7 \ - KVAZAAR_VERSION=2.0.0 \ - LAME_VERSION=3.100 \ - LIBASS_VERSION=0.13.7 \ - LIBPTHREAD_STUBS_VERSION=0.4 \ - LIBVIDSTAB_VERSION=1.1.0 \ - LIBXCB_VERSION=1.13.1 \ - XCBPROTO_VERSION=1.13 \ - OGG_VERSION=1.3.2 \ - OPENCOREAMR_VERSION=0.1.5 \ - OPUS_VERSION=1.2 \ - OPENJPEG_VERSION=2.1.2 \ - THEORA_VERSION=1.1.1 \ - VORBIS_VERSION=1.3.5 \ - VPX_VERSION=1.8.0 \ - WEBP_VERSION=1.0.2 \ - X264_VERSION=20170226-2245-stable \ - X265_VERSION=3.4 \ - XAU_VERSION=1.0.9 \ - XORG_MACROS_VERSION=1.19.2 \ - XPROTO_VERSION=7.0.31 \ - XVID_VERSION=1.3.4 \ - LIBXML2_VERSION=2.9.10 \ - LIBBLURAY_VERSION=1.1.2 \ - LIBZMQ_VERSION=4.3.2 \ - LIBSRT_VERSION=1.4.1 \ - LIBARIBB24_VERSION=1.0.3 \ - LIBPNG_VERSION=1.6.9 \ - LIBVMAF_VERSION=2.1.1 \ - SRC=/usr/local + AOM_VERSION=v1.0.0 \ + FDKAAC_VERSION=0.1.5 \ + FONTCONFIG_VERSION=2.12.4 \ + FREETYPE_VERSION=2.10.4 \ + FRIBIDI_VERSION=0.19.7 \ + KVAZAAR_VERSION=2.0.0 \ + LAME_VERSION=3.100 \ + LIBARIBB24_VERSION=1.0.3 \ + LIBASS_VERSION=0.13.7 \ + LIBBLURAY_VERSION=1.1.2 \ + LIBPNG_VERSION=1.6.9 \ + LIBPTHREAD_STUBS_VERSION=0.4 \ + LIBSRT_VERSION=1.4.1 \ + LIBVIDSTAB_VERSION=1.1.0 \ + LIBVMAF_VERSION=2.1.1 \ + LIBXCB_VERSION=1.13.1 \ + LIBXML2_VERSION=2.9.10 \ + LIBZMQ_VERSION=4.3.2 \ + OGG_VERSION=1.3.2 \ + OPENCOREAMR_VERSION=0.1.5 \ + OPENJPEG_VERSION=2.1.2 \ + OPUS_VERSION=1.2 \ + THEORA_VERSION=1.1.1 \ + VORBIS_VERSION=1.3.5 \ + VPX_VERSION=1.8.0 \ + WEBP_VERSION=1.0.2 \ + X264_VERSION=20170226-2245-stable \ + X265_VERSION=3.4 \ + XAU_VERSION=1.0.9 \ + XCBPROTO_VERSION=1.13 \ + XORG_MACROS_VERSION=1.19.2 \ + XPROTO_VERSION=7.0.31 \ + XVID_VERSION=1.3.4 \ + ZIMG_VERSION=3.0.3 \ + SRC=/usr/local ARG FREETYPE_SHA256SUM="5eab795ebb23ac77001cfb68b7d4d50b5d6c7469247b0b01b2c953269f658dac freetype-2.10.4.tar.gz" ARG FRIBIDI_SHA256SUM="3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 0.19.7.tar.gz" @@ -132,24 +133,39 @@ RUN buildDeps="autoconf \ yum history undo $(yum history info | grep 'Transaction ID' | awk -F: '{print$2}' | tr -d ' ') -y && \ yum autoremove -y +# zimg https://github.com/sekrit-twc/zimg +RUN \ + DIR=/tmp/zimg && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://github.com/sekrit-twc/zimg/archive/refs/tags/release-${ZIMG_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + ./autogen.sh && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} + + + ## libvmaf https://github.com/Netflix/vmaf RUN \ if which meson || false; then \ - echo "Building VMAF." && \ - DIR=/tmp/vmaf && \ - mkdir -p ${DIR} && \ - cd ${DIR} && \ - curl -sLO https://github.com/Netflix/vmaf/archive/v${LIBVMAF_VERSION}.tar.gz && \ - tar -xz --strip-components=1 -f v${LIBVMAF_VERSION}.tar.gz && \ - cd /tmp/vmaf/libvmaf && \ - meson build --buildtype release --prefix=${PREFIX} && \ - ninja -vC build && \ - ninja -vC build install && \ - mkdir -p ${PREFIX}/share/model/ && \ - cp -r /tmp/vmaf/model/* ${PREFIX}/share/model/ && \ - rm -rf ${DIR}; \ + echo "Building VMAF." && \ + DIR=/tmp/vmaf && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/Netflix/vmaf/archive/v${LIBVMAF_VERSION}.tar.gz && \ + tar -xz --strip-components=1 -f v${LIBVMAF_VERSION}.tar.gz && \ + cd /tmp/vmaf/libvmaf && \ + meson build --buildtype release --prefix=${PREFIX} && \ + ninja -vC build && \ + ninja -vC build install && \ + mkdir -p ${PREFIX}/share/model/ && \ + cp -r /tmp/vmaf/model/* ${PREFIX}/share/model/ && \ + rm -rf ${DIR}; \ else \ - echo "VMAF skipped."; \ + echo "VMAF skipped."; \ fi ## opencore-amr https://sourceforge.net/projects/opencore-amr/ @@ -555,33 +571,34 @@ RUN \ --disable-debug \ --disable-doc \ --disable-ffplay \ - --enable-shared \ --enable-avresample \ - --enable-libopencore-amrnb \ - --enable-libopencore-amrwb \ + --enable-fontconfig \ --enable-gpl \ --enable-libass \ - --enable-fontconfig \ + --enable-libbluray \ + --enable-libfdk_aac \ --enable-libfreetype \ - --enable-libvidstab \ --enable-libmp3lame \ + --enable-libopencore-amrnb \ + --enable-libopencore-amrwb \ --enable-libopus \ --enable-libtheora \ + --enable-libvidstab \ --enable-libvorbis \ --enable-libvpx \ --enable-libwebp \ - --enable-libxcb \ + --enable-libx264 \ --enable-libx265 \ + --enable-libxcb \ --enable-libxvid \ - --enable-libx264 \ + --enable-libzmq \ --enable-nonfree \ --enable-openssl \ - --enable-libfdk_aac \ --enable-postproc \ + --enable-shared \ --enable-small \ --enable-version3 \ - --enable-libbluray \ - --enable-libzmq \ + --enable-zimg \ --extra-libs=-ldl \ --prefix="${PREFIX}" \ --enable-libopenjpeg \ @@ -592,7 +609,7 @@ RUN \ --enable-libaribb24 \ --extra-cflags="-I${PREFIX}/include" \ --extra-ldflags="-L${PREFIX}/lib" && \ - make && \ +make && \ make install && \ make tools/zmqsend && cp tools/zmqsend ${PREFIX}/bin/ && \ make distclean && \ diff --git a/docker-images/4.4/centos8/Dockerfile b/docker-images/4.4/centos8/Dockerfile index 29a7d7807..2e31fe188 100644 --- a/docker-images/4.4/centos8/Dockerfile +++ b/docker-images/4.4/centos8/Dockerfile @@ -16,40 +16,41 @@ FROM base AS build WORKDIR /tmp/workdir ENV FFMPEG_VERSION=4.4 \ - AOM_VERSION=v1.0.0 \ - FDKAAC_VERSION=0.1.5 \ - FONTCONFIG_VERSION=2.12.4 \ - FREETYPE_VERSION=2.10.4 \ - FRIBIDI_VERSION=0.19.7 \ - KVAZAAR_VERSION=2.0.0 \ - LAME_VERSION=3.100 \ - LIBASS_VERSION=0.13.7 \ - LIBPTHREAD_STUBS_VERSION=0.4 \ - LIBVIDSTAB_VERSION=1.1.0 \ - LIBXCB_VERSION=1.13.1 \ - XCBPROTO_VERSION=1.13 \ - OGG_VERSION=1.3.2 \ - OPENCOREAMR_VERSION=0.1.5 \ - OPUS_VERSION=1.2 \ - OPENJPEG_VERSION=2.1.2 \ - THEORA_VERSION=1.1.1 \ - VORBIS_VERSION=1.3.5 \ - VPX_VERSION=1.8.0 \ - WEBP_VERSION=1.0.2 \ - X264_VERSION=20170226-2245-stable \ - X265_VERSION=3.4 \ - XAU_VERSION=1.0.9 \ - XORG_MACROS_VERSION=1.19.2 \ - XPROTO_VERSION=7.0.31 \ - XVID_VERSION=1.3.4 \ - LIBXML2_VERSION=2.9.10 \ - LIBBLURAY_VERSION=1.1.2 \ - LIBZMQ_VERSION=4.3.2 \ - LIBSRT_VERSION=1.4.1 \ - LIBARIBB24_VERSION=1.0.3 \ - LIBPNG_VERSION=1.6.9 \ - LIBVMAF_VERSION=2.1.1 \ - SRC=/usr/local + AOM_VERSION=v1.0.0 \ + FDKAAC_VERSION=0.1.5 \ + FONTCONFIG_VERSION=2.12.4 \ + FREETYPE_VERSION=2.10.4 \ + FRIBIDI_VERSION=0.19.7 \ + KVAZAAR_VERSION=2.0.0 \ + LAME_VERSION=3.100 \ + LIBARIBB24_VERSION=1.0.3 \ + LIBASS_VERSION=0.13.7 \ + LIBBLURAY_VERSION=1.1.2 \ + LIBPNG_VERSION=1.6.9 \ + LIBPTHREAD_STUBS_VERSION=0.4 \ + LIBSRT_VERSION=1.4.1 \ + LIBVIDSTAB_VERSION=1.1.0 \ + LIBVMAF_VERSION=2.1.1 \ + LIBXCB_VERSION=1.13.1 \ + LIBXML2_VERSION=2.9.10 \ + LIBZMQ_VERSION=4.3.2 \ + OGG_VERSION=1.3.2 \ + OPENCOREAMR_VERSION=0.1.5 \ + OPENJPEG_VERSION=2.1.2 \ + OPUS_VERSION=1.2 \ + THEORA_VERSION=1.1.1 \ + VORBIS_VERSION=1.3.5 \ + VPX_VERSION=1.8.0 \ + WEBP_VERSION=1.0.2 \ + X264_VERSION=20170226-2245-stable \ + X265_VERSION=3.4 \ + XAU_VERSION=1.0.9 \ + XCBPROTO_VERSION=1.13 \ + XORG_MACROS_VERSION=1.19.2 \ + XPROTO_VERSION=7.0.31 \ + XVID_VERSION=1.3.4 \ + ZIMG_VERSION=3.0.3 \ + SRC=/usr/local ARG FREETYPE_SHA256SUM="5eab795ebb23ac77001cfb68b7d4d50b5d6c7469247b0b01b2c953269f658dac freetype-2.10.4.tar.gz" ARG FRIBIDI_SHA256SUM="3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 0.19.7.tar.gz" @@ -101,24 +102,39 @@ RUN buildDeps="autoconf \ yum config-manager --set-enabled powertools && \ dnf install -y ${buildDeps} && \ alternatives --set python /usr/bin/python3 +# zimg https://github.com/sekrit-twc/zimg +RUN \ + DIR=/tmp/zimg && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://github.com/sekrit-twc/zimg/archive/refs/tags/release-${ZIMG_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + ./autogen.sh && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} + + + ## libvmaf https://github.com/Netflix/vmaf RUN \ if which meson || false; then \ - echo "Building VMAF." && \ - DIR=/tmp/vmaf && \ - mkdir -p ${DIR} && \ - cd ${DIR} && \ - curl -sLO https://github.com/Netflix/vmaf/archive/v${LIBVMAF_VERSION}.tar.gz && \ - tar -xz --strip-components=1 -f v${LIBVMAF_VERSION}.tar.gz && \ - cd /tmp/vmaf/libvmaf && \ - meson build --buildtype release --prefix=${PREFIX} && \ - ninja -vC build && \ - ninja -vC build install && \ - mkdir -p ${PREFIX}/share/model/ && \ - cp -r /tmp/vmaf/model/* ${PREFIX}/share/model/ && \ - rm -rf ${DIR}; \ + echo "Building VMAF." && \ + DIR=/tmp/vmaf && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/Netflix/vmaf/archive/v${LIBVMAF_VERSION}.tar.gz && \ + tar -xz --strip-components=1 -f v${LIBVMAF_VERSION}.tar.gz && \ + cd /tmp/vmaf/libvmaf && \ + meson build --buildtype release --prefix=${PREFIX} && \ + ninja -vC build && \ + ninja -vC build install && \ + mkdir -p ${PREFIX}/share/model/ && \ + cp -r /tmp/vmaf/model/* ${PREFIX}/share/model/ && \ + rm -rf ${DIR}; \ else \ - echo "VMAF skipped."; \ + echo "VMAF skipped."; \ fi ## opencore-amr https://sourceforge.net/projects/opencore-amr/ @@ -524,33 +540,34 @@ RUN \ --disable-debug \ --disable-doc \ --disable-ffplay \ - --enable-shared \ --enable-avresample \ - --enable-libopencore-amrnb \ - --enable-libopencore-amrwb \ + --enable-fontconfig \ --enable-gpl \ --enable-libass \ - --enable-fontconfig \ + --enable-libbluray \ + --enable-libfdk_aac \ --enable-libfreetype \ - --enable-libvidstab \ --enable-libmp3lame \ + --enable-libopencore-amrnb \ + --enable-libopencore-amrwb \ --enable-libopus \ --enable-libtheora \ + --enable-libvidstab \ --enable-libvorbis \ --enable-libvpx \ --enable-libwebp \ - --enable-libxcb \ + --enable-libx264 \ --enable-libx265 \ + --enable-libxcb \ --enable-libxvid \ - --enable-libx264 \ + --enable-libzmq \ --enable-nonfree \ --enable-openssl \ - --enable-libfdk_aac \ --enable-postproc \ + --enable-shared \ --enable-small \ --enable-version3 \ - --enable-libbluray \ - --enable-libzmq \ + --enable-zimg \ --extra-libs=-ldl \ --prefix="${PREFIX}" \ --enable-libopenjpeg \ @@ -561,7 +578,7 @@ RUN \ --enable-libaribb24 \ --extra-cflags="-I${PREFIX}/include" \ --extra-ldflags="-L${PREFIX}/lib" && \ - make && \ +make && \ make install && \ make tools/zmqsend && cp tools/zmqsend ${PREFIX}/bin/ && \ make distclean && \ diff --git a/docker-images/4.4/nvidia2004/Dockerfile b/docker-images/4.4/nvidia2004/Dockerfile index 12daa2783..ba7372847 100644 --- a/docker-images/4.4/nvidia2004/Dockerfile +++ b/docker-images/4.4/nvidia2004/Dockerfile @@ -34,40 +34,41 @@ FROM devel-base as build ENV NVIDIA_HEADERS_VERSION=11.1.5.0 ENV FFMPEG_VERSION=4.4 \ - AOM_VERSION=v1.0.0 \ - FDKAAC_VERSION=0.1.5 \ - FONTCONFIG_VERSION=2.12.4 \ - FREETYPE_VERSION=2.10.4 \ - FRIBIDI_VERSION=0.19.7 \ - KVAZAAR_VERSION=2.0.0 \ - LAME_VERSION=3.100 \ - LIBASS_VERSION=0.13.7 \ - LIBPTHREAD_STUBS_VERSION=0.4 \ - LIBVIDSTAB_VERSION=1.1.0 \ - LIBXCB_VERSION=1.13.1 \ - XCBPROTO_VERSION=1.13 \ - OGG_VERSION=1.3.2 \ - OPENCOREAMR_VERSION=0.1.5 \ - OPUS_VERSION=1.2 \ - OPENJPEG_VERSION=2.1.2 \ - THEORA_VERSION=1.1.1 \ - VORBIS_VERSION=1.3.5 \ - VPX_VERSION=1.8.0 \ - WEBP_VERSION=1.0.2 \ - X264_VERSION=20170226-2245-stable \ - X265_VERSION=3.4 \ - XAU_VERSION=1.0.9 \ - XORG_MACROS_VERSION=1.19.2 \ - XPROTO_VERSION=7.0.31 \ - XVID_VERSION=1.3.4 \ - LIBXML2_VERSION=2.9.10 \ - LIBBLURAY_VERSION=1.1.2 \ - LIBZMQ_VERSION=4.3.2 \ - LIBSRT_VERSION=1.4.1 \ - LIBARIBB24_VERSION=1.0.3 \ - LIBPNG_VERSION=1.6.9 \ - LIBVMAF_VERSION=2.1.1 \ - SRC=/usr/local + AOM_VERSION=v1.0.0 \ + FDKAAC_VERSION=0.1.5 \ + FONTCONFIG_VERSION=2.12.4 \ + FREETYPE_VERSION=2.10.4 \ + FRIBIDI_VERSION=0.19.7 \ + KVAZAAR_VERSION=2.0.0 \ + LAME_VERSION=3.100 \ + LIBARIBB24_VERSION=1.0.3 \ + LIBASS_VERSION=0.13.7 \ + LIBBLURAY_VERSION=1.1.2 \ + LIBPNG_VERSION=1.6.9 \ + LIBPTHREAD_STUBS_VERSION=0.4 \ + LIBSRT_VERSION=1.4.1 \ + LIBVIDSTAB_VERSION=1.1.0 \ + LIBVMAF_VERSION=2.1.1 \ + LIBXCB_VERSION=1.13.1 \ + LIBXML2_VERSION=2.9.10 \ + LIBZMQ_VERSION=4.3.2 \ + OGG_VERSION=1.3.2 \ + OPENCOREAMR_VERSION=0.1.5 \ + OPENJPEG_VERSION=2.1.2 \ + OPUS_VERSION=1.2 \ + THEORA_VERSION=1.1.1 \ + VORBIS_VERSION=1.3.5 \ + VPX_VERSION=1.8.0 \ + WEBP_VERSION=1.0.2 \ + X264_VERSION=20170226-2245-stable \ + X265_VERSION=3.4 \ + XAU_VERSION=1.0.9 \ + XCBPROTO_VERSION=1.13 \ + XORG_MACROS_VERSION=1.19.2 \ + XPROTO_VERSION=7.0.31 \ + XVID_VERSION=1.3.4 \ + ZIMG_VERSION=3.0.3 \ + SRC=/usr/local ARG FREETYPE_SHA256SUM="5eab795ebb23ac77001cfb68b7d4d50b5d6c7469247b0b01b2c953269f658dac freetype-2.10.4.tar.gz" ARG FRIBIDI_SHA256SUM="3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 0.19.7.tar.gz" @@ -123,24 +124,39 @@ RUN \ make install PREFIX="${PREFIX}" && \ rm -rf ${DIR} +# zimg https://github.com/sekrit-twc/zimg +RUN \ + DIR=/tmp/zimg && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://github.com/sekrit-twc/zimg/archive/refs/tags/release-${ZIMG_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + ./autogen.sh && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} + + + ## libvmaf https://github.com/Netflix/vmaf RUN \ if which meson || false; then \ - echo "Building VMAF." && \ - DIR=/tmp/vmaf && \ - mkdir -p ${DIR} && \ - cd ${DIR} && \ - curl -sLO https://github.com/Netflix/vmaf/archive/v${LIBVMAF_VERSION}.tar.gz && \ - tar -xz --strip-components=1 -f v${LIBVMAF_VERSION}.tar.gz && \ - cd /tmp/vmaf/libvmaf && \ - meson build --buildtype release --prefix=${PREFIX} && \ - ninja -vC build && \ - ninja -vC build install && \ - mkdir -p ${PREFIX}/share/model/ && \ - cp -r /tmp/vmaf/model/* ${PREFIX}/share/model/ && \ - rm -rf ${DIR}; \ + echo "Building VMAF." && \ + DIR=/tmp/vmaf && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/Netflix/vmaf/archive/v${LIBVMAF_VERSION}.tar.gz && \ + tar -xz --strip-components=1 -f v${LIBVMAF_VERSION}.tar.gz && \ + cd /tmp/vmaf/libvmaf && \ + meson build --buildtype release --prefix=${PREFIX} && \ + ninja -vC build && \ + ninja -vC build install && \ + mkdir -p ${PREFIX}/share/model/ && \ + cp -r /tmp/vmaf/model/* ${PREFIX}/share/model/ && \ + rm -rf ${DIR}; \ else \ - echo "VMAF skipped."; \ + echo "VMAF skipped."; \ fi ## opencore-amr https://sourceforge.net/projects/opencore-amr/ @@ -546,33 +562,34 @@ RUN \ --disable-debug \ --disable-doc \ --disable-ffplay \ - --enable-shared \ --enable-avresample \ - --enable-libopencore-amrnb \ - --enable-libopencore-amrwb \ + --enable-fontconfig \ --enable-gpl \ --enable-libass \ - --enable-fontconfig \ + --enable-libbluray \ + --enable-libfdk_aac \ --enable-libfreetype \ - --enable-libvidstab \ --enable-libmp3lame \ + --enable-libopencore-amrnb \ + --enable-libopencore-amrwb \ --enable-libopus \ --enable-libtheora \ + --enable-libvidstab \ --enable-libvorbis \ --enable-libvpx \ --enable-libwebp \ - --enable-libxcb \ + --enable-libx264 \ --enable-libx265 \ + --enable-libxcb \ --enable-libxvid \ - --enable-libx264 \ + --enable-libzmq \ --enable-nonfree \ --enable-openssl \ - --enable-libfdk_aac \ --enable-postproc \ + --enable-shared \ --enable-small \ --enable-version3 \ - --enable-libbluray \ - --enable-libzmq \ + --enable-zimg \ --extra-libs=-ldl \ --prefix="${PREFIX}" \ --enable-libopenjpeg \ @@ -587,7 +604,7 @@ RUN \ --enable-libnpp \ --extra-cflags="-I${PREFIX}/include -I${PREFIX}/include/ffnvcodec -I/usr/local/cuda/include/" \ --extra-ldflags="-L${PREFIX}/lib -L/usr/local/cuda/lib64 -L/usr/local/cuda/lib32/" && \ - make && \ +make && \ make install && \ make tools/zmqsend && cp tools/zmqsend ${PREFIX}/bin/ && \ make distclean && \ diff --git a/docker-images/4.4/scratch312/Dockerfile b/docker-images/4.4/scratch312/Dockerfile index 4c7a3bdda..bfd61746c 100644 --- a/docker-images/4.4/scratch312/Dockerfile +++ b/docker-images/4.4/scratch312/Dockerfile @@ -9,40 +9,41 @@ FROM alpine:3.12 AS build WORKDIR /tmp/workdir ENV FFMPEG_VERSION=4.4 \ - AOM_VERSION=v1.0.0 \ - FDKAAC_VERSION=0.1.5 \ - FONTCONFIG_VERSION=2.12.4 \ - FREETYPE_VERSION=2.10.4 \ - FRIBIDI_VERSION=0.19.7 \ - KVAZAAR_VERSION=2.0.0 \ - LAME_VERSION=3.100 \ - LIBASS_VERSION=0.13.7 \ - LIBPTHREAD_STUBS_VERSION=0.4 \ - LIBVIDSTAB_VERSION=1.1.0 \ - LIBXCB_VERSION=1.13.1 \ - XCBPROTO_VERSION=1.13 \ - OGG_VERSION=1.3.2 \ - OPENCOREAMR_VERSION=0.1.5 \ - OPUS_VERSION=1.2 \ - OPENJPEG_VERSION=2.1.2 \ - THEORA_VERSION=1.1.1 \ - VORBIS_VERSION=1.3.5 \ - VPX_VERSION=1.8.0 \ - WEBP_VERSION=1.0.2 \ - X264_VERSION=20170226-2245-stable \ - X265_VERSION=3.4 \ - XAU_VERSION=1.0.9 \ - XORG_MACROS_VERSION=1.19.2 \ - XPROTO_VERSION=7.0.31 \ - XVID_VERSION=1.3.4 \ - LIBXML2_VERSION=2.9.10 \ - LIBBLURAY_VERSION=1.1.2 \ - LIBZMQ_VERSION=4.3.2 \ - LIBSRT_VERSION=1.4.1 \ - LIBARIBB24_VERSION=1.0.3 \ - LIBPNG_VERSION=1.6.9 \ - LIBVMAF_VERSION=2.1.1 \ - SRC=/usr/local + AOM_VERSION=v1.0.0 \ + FDKAAC_VERSION=0.1.5 \ + FONTCONFIG_VERSION=2.12.4 \ + FREETYPE_VERSION=2.10.4 \ + FRIBIDI_VERSION=0.19.7 \ + KVAZAAR_VERSION=2.0.0 \ + LAME_VERSION=3.100 \ + LIBARIBB24_VERSION=1.0.3 \ + LIBASS_VERSION=0.13.7 \ + LIBBLURAY_VERSION=1.1.2 \ + LIBPNG_VERSION=1.6.9 \ + LIBPTHREAD_STUBS_VERSION=0.4 \ + LIBSRT_VERSION=1.4.1 \ + LIBVIDSTAB_VERSION=1.1.0 \ + LIBVMAF_VERSION=2.1.1 \ + LIBXCB_VERSION=1.13.1 \ + LIBXML2_VERSION=2.9.10 \ + LIBZMQ_VERSION=4.3.2 \ + OGG_VERSION=1.3.2 \ + OPENCOREAMR_VERSION=0.1.5 \ + OPENJPEG_VERSION=2.1.2 \ + OPUS_VERSION=1.2 \ + THEORA_VERSION=1.1.1 \ + VORBIS_VERSION=1.3.5 \ + VPX_VERSION=1.8.0 \ + WEBP_VERSION=1.0.2 \ + X264_VERSION=20170226-2245-stable \ + X265_VERSION=3.4 \ + XAU_VERSION=1.0.9 \ + XCBPROTO_VERSION=1.13 \ + XORG_MACROS_VERSION=1.19.2 \ + XPROTO_VERSION=7.0.31 \ + XVID_VERSION=1.3.4 \ + ZIMG_VERSION=3.0.3 \ + SRC=/usr/local ARG FREETYPE_SHA256SUM="5eab795ebb23ac77001cfb68b7d4d50b5d6c7469247b0b01b2c953269f658dac freetype-2.10.4.tar.gz" ARG FRIBIDI_SHA256SUM="3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 0.19.7.tar.gz" @@ -97,24 +98,39 @@ RUN buildDeps="autoconf \ libssl1.1" && \ apk add --update ${buildDeps} +# zimg https://github.com/sekrit-twc/zimg +RUN \ + DIR=/tmp/zimg && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://github.com/sekrit-twc/zimg/archive/refs/tags/release-${ZIMG_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + ./autogen.sh && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} + + + ## libvmaf https://github.com/Netflix/vmaf RUN \ if which meson || false; then \ - echo "Building VMAF." && \ - DIR=/tmp/vmaf && \ - mkdir -p ${DIR} && \ - cd ${DIR} && \ - curl -sLO https://github.com/Netflix/vmaf/archive/v${LIBVMAF_VERSION}.tar.gz && \ - tar -xz --strip-components=1 -f v${LIBVMAF_VERSION}.tar.gz && \ - cd /tmp/vmaf/libvmaf && \ - meson build --buildtype release --prefix=${PREFIX} && \ - ninja -vC build && \ - ninja -vC build install && \ - mkdir -p ${PREFIX}/share/model/ && \ - cp -r /tmp/vmaf/model/* ${PREFIX}/share/model/ && \ - rm -rf ${DIR}; \ + echo "Building VMAF." && \ + DIR=/tmp/vmaf && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/Netflix/vmaf/archive/v${LIBVMAF_VERSION}.tar.gz && \ + tar -xz --strip-components=1 -f v${LIBVMAF_VERSION}.tar.gz && \ + cd /tmp/vmaf/libvmaf && \ + meson build --buildtype release --prefix=${PREFIX} && \ + ninja -vC build && \ + ninja -vC build install && \ + mkdir -p ${PREFIX}/share/model/ && \ + cp -r /tmp/vmaf/model/* ${PREFIX}/share/model/ && \ + rm -rf ${DIR}; \ else \ - echo "VMAF skipped."; \ + echo "VMAF skipped."; \ fi ## opencore-amr https://sourceforge.net/projects/opencore-amr/ @@ -520,33 +536,34 @@ RUN \ --disable-debug \ --disable-doc \ --disable-ffplay \ - --enable-shared \ --enable-avresample \ - --enable-libopencore-amrnb \ - --enable-libopencore-amrwb \ + --enable-fontconfig \ --enable-gpl \ --enable-libass \ - --enable-fontconfig \ + --enable-libbluray \ + --enable-libfdk_aac \ --enable-libfreetype \ - --enable-libvidstab \ --enable-libmp3lame \ + --enable-libopencore-amrnb \ + --enable-libopencore-amrwb \ --enable-libopus \ --enable-libtheora \ + --enable-libvidstab \ --enable-libvorbis \ --enable-libvpx \ --enable-libwebp \ - --enable-libxcb \ + --enable-libx264 \ --enable-libx265 \ + --enable-libxcb \ --enable-libxvid \ - --enable-libx264 \ + --enable-libzmq \ --enable-nonfree \ --enable-openssl \ - --enable-libfdk_aac \ --enable-postproc \ + --enable-shared \ --enable-small \ --enable-version3 \ - --enable-libbluray \ - --enable-libzmq \ + --enable-zimg \ --extra-libs=-ldl \ --prefix="${PREFIX}" \ --enable-libopenjpeg \ @@ -557,7 +574,7 @@ RUN \ --enable-libaribb24 \ --extra-cflags="-I${PREFIX}/include" \ --extra-ldflags="-L${PREFIX}/lib" && \ - make && \ +make && \ make install && \ make tools/zmqsend && cp tools/zmqsend ${PREFIX}/bin/ && \ make distclean && \ diff --git a/docker-images/4.4/scratch38/Dockerfile b/docker-images/4.4/scratch38/Dockerfile index 3aee1aa1e..d6e1ecf91 100644 --- a/docker-images/4.4/scratch38/Dockerfile +++ b/docker-images/4.4/scratch38/Dockerfile @@ -9,40 +9,41 @@ FROM alpine:3.8 AS build WORKDIR /tmp/workdir ENV FFMPEG_VERSION=4.4 \ - AOM_VERSION=v1.0.0 \ - FDKAAC_VERSION=0.1.5 \ - FONTCONFIG_VERSION=2.12.4 \ - FREETYPE_VERSION=2.10.4 \ - FRIBIDI_VERSION=0.19.7 \ - KVAZAAR_VERSION=2.0.0 \ - LAME_VERSION=3.100 \ - LIBASS_VERSION=0.13.7 \ - LIBPTHREAD_STUBS_VERSION=0.4 \ - LIBVIDSTAB_VERSION=1.1.0 \ - LIBXCB_VERSION=1.13.1 \ - XCBPROTO_VERSION=1.13 \ - OGG_VERSION=1.3.2 \ - OPENCOREAMR_VERSION=0.1.5 \ - OPUS_VERSION=1.2 \ - OPENJPEG_VERSION=2.1.2 \ - THEORA_VERSION=1.1.1 \ - VORBIS_VERSION=1.3.5 \ - VPX_VERSION=1.8.0 \ - WEBP_VERSION=1.0.2 \ - X264_VERSION=20170226-2245-stable \ - X265_VERSION=3.4 \ - XAU_VERSION=1.0.9 \ - XORG_MACROS_VERSION=1.19.2 \ - XPROTO_VERSION=7.0.31 \ - XVID_VERSION=1.3.4 \ - LIBXML2_VERSION=2.9.10 \ - LIBBLURAY_VERSION=1.1.2 \ - LIBZMQ_VERSION=4.3.2 \ - LIBSRT_VERSION=1.4.1 \ - LIBARIBB24_VERSION=1.0.3 \ - LIBPNG_VERSION=1.6.9 \ - LIBVMAF_VERSION=2.1.1 \ - SRC=/usr/local + AOM_VERSION=v1.0.0 \ + FDKAAC_VERSION=0.1.5 \ + FONTCONFIG_VERSION=2.12.4 \ + FREETYPE_VERSION=2.10.4 \ + FRIBIDI_VERSION=0.19.7 \ + KVAZAAR_VERSION=2.0.0 \ + LAME_VERSION=3.100 \ + LIBARIBB24_VERSION=1.0.3 \ + LIBASS_VERSION=0.13.7 \ + LIBBLURAY_VERSION=1.1.2 \ + LIBPNG_VERSION=1.6.9 \ + LIBPTHREAD_STUBS_VERSION=0.4 \ + LIBSRT_VERSION=1.4.1 \ + LIBVIDSTAB_VERSION=1.1.0 \ + LIBVMAF_VERSION=2.1.1 \ + LIBXCB_VERSION=1.13.1 \ + LIBXML2_VERSION=2.9.10 \ + LIBZMQ_VERSION=4.3.2 \ + OGG_VERSION=1.3.2 \ + OPENCOREAMR_VERSION=0.1.5 \ + OPENJPEG_VERSION=2.1.2 \ + OPUS_VERSION=1.2 \ + THEORA_VERSION=1.1.1 \ + VORBIS_VERSION=1.3.5 \ + VPX_VERSION=1.8.0 \ + WEBP_VERSION=1.0.2 \ + X264_VERSION=20170226-2245-stable \ + X265_VERSION=3.4 \ + XAU_VERSION=1.0.9 \ + XCBPROTO_VERSION=1.13 \ + XORG_MACROS_VERSION=1.19.2 \ + XPROTO_VERSION=7.0.31 \ + XVID_VERSION=1.3.4 \ + ZIMG_VERSION=3.0.3 \ + SRC=/usr/local ARG FREETYPE_SHA256SUM="5eab795ebb23ac77001cfb68b7d4d50b5d6c7469247b0b01b2c953269f658dac freetype-2.10.4.tar.gz" ARG FRIBIDI_SHA256SUM="3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 0.19.7.tar.gz" @@ -97,24 +98,39 @@ RUN buildDeps="autoconf \ libssl1.0" && \ apk add --update ${buildDeps} +# zimg https://github.com/sekrit-twc/zimg +RUN \ + DIR=/tmp/zimg && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://github.com/sekrit-twc/zimg/archive/refs/tags/release-${ZIMG_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + ./autogen.sh && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} + + + ## libvmaf https://github.com/Netflix/vmaf RUN \ if which meson || false; then \ - echo "Building VMAF." && \ - DIR=/tmp/vmaf && \ - mkdir -p ${DIR} && \ - cd ${DIR} && \ - curl -sLO https://github.com/Netflix/vmaf/archive/v${LIBVMAF_VERSION}.tar.gz && \ - tar -xz --strip-components=1 -f v${LIBVMAF_VERSION}.tar.gz && \ - cd /tmp/vmaf/libvmaf && \ - meson build --buildtype release --prefix=${PREFIX} && \ - ninja -vC build && \ - ninja -vC build install && \ - mkdir -p ${PREFIX}/share/model/ && \ - cp -r /tmp/vmaf/model/* ${PREFIX}/share/model/ && \ - rm -rf ${DIR}; \ + echo "Building VMAF." && \ + DIR=/tmp/vmaf && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/Netflix/vmaf/archive/v${LIBVMAF_VERSION}.tar.gz && \ + tar -xz --strip-components=1 -f v${LIBVMAF_VERSION}.tar.gz && \ + cd /tmp/vmaf/libvmaf && \ + meson build --buildtype release --prefix=${PREFIX} && \ + ninja -vC build && \ + ninja -vC build install && \ + mkdir -p ${PREFIX}/share/model/ && \ + cp -r /tmp/vmaf/model/* ${PREFIX}/share/model/ && \ + rm -rf ${DIR}; \ else \ - echo "VMAF skipped."; \ + echo "VMAF skipped."; \ fi ## opencore-amr https://sourceforge.net/projects/opencore-amr/ @@ -520,33 +536,34 @@ RUN \ --disable-debug \ --disable-doc \ --disable-ffplay \ - --enable-shared \ --enable-avresample \ - --enable-libopencore-amrnb \ - --enable-libopencore-amrwb \ + --enable-fontconfig \ --enable-gpl \ --enable-libass \ - --enable-fontconfig \ + --enable-libbluray \ + --enable-libfdk_aac \ --enable-libfreetype \ - --enable-libvidstab \ --enable-libmp3lame \ + --enable-libopencore-amrnb \ + --enable-libopencore-amrwb \ --enable-libopus \ --enable-libtheora \ + --enable-libvidstab \ --enable-libvorbis \ --enable-libvpx \ --enable-libwebp \ - --enable-libxcb \ + --enable-libx264 \ --enable-libx265 \ + --enable-libxcb \ --enable-libxvid \ - --enable-libx264 \ + --enable-libzmq \ --enable-nonfree \ --enable-openssl \ - --enable-libfdk_aac \ --enable-postproc \ + --enable-shared \ --enable-small \ --enable-version3 \ - --enable-libbluray \ - --enable-libzmq \ + --enable-zimg \ --extra-libs=-ldl \ --prefix="${PREFIX}" \ --enable-libopenjpeg \ @@ -557,7 +574,7 @@ RUN \ --enable-libaribb24 \ --extra-cflags="-I${PREFIX}/include" \ --extra-ldflags="-L${PREFIX}/lib" && \ - make && \ +make && \ make install && \ make tools/zmqsend && cp tools/zmqsend ${PREFIX}/bin/ && \ make distclean && \ diff --git a/docker-images/4.4/ubuntu1804/Dockerfile b/docker-images/4.4/ubuntu1804/Dockerfile index 434e41c43..271c84193 100644 --- a/docker-images/4.4/ubuntu1804/Dockerfile +++ b/docker-images/4.4/ubuntu1804/Dockerfile @@ -17,40 +17,41 @@ RUN apt-get -yqq update && \ FROM base as build ENV FFMPEG_VERSION=4.4 \ - AOM_VERSION=v1.0.0 \ - FDKAAC_VERSION=0.1.5 \ - FONTCONFIG_VERSION=2.12.4 \ - FREETYPE_VERSION=2.10.4 \ - FRIBIDI_VERSION=0.19.7 \ - KVAZAAR_VERSION=2.0.0 \ - LAME_VERSION=3.100 \ - LIBASS_VERSION=0.13.7 \ - LIBPTHREAD_STUBS_VERSION=0.4 \ - LIBVIDSTAB_VERSION=1.1.0 \ - LIBXCB_VERSION=1.13.1 \ - XCBPROTO_VERSION=1.13 \ - OGG_VERSION=1.3.2 \ - OPENCOREAMR_VERSION=0.1.5 \ - OPUS_VERSION=1.2 \ - OPENJPEG_VERSION=2.1.2 \ - THEORA_VERSION=1.1.1 \ - VORBIS_VERSION=1.3.5 \ - VPX_VERSION=1.8.0 \ - WEBP_VERSION=1.0.2 \ - X264_VERSION=20170226-2245-stable \ - X265_VERSION=3.4 \ - XAU_VERSION=1.0.9 \ - XORG_MACROS_VERSION=1.19.2 \ - XPROTO_VERSION=7.0.31 \ - XVID_VERSION=1.3.4 \ - LIBXML2_VERSION=2.9.10 \ - LIBBLURAY_VERSION=1.1.2 \ - LIBZMQ_VERSION=4.3.2 \ - LIBSRT_VERSION=1.4.1 \ - LIBARIBB24_VERSION=1.0.3 \ - LIBPNG_VERSION=1.6.9 \ - LIBVMAF_VERSION=2.1.1 \ - SRC=/usr/local + AOM_VERSION=v1.0.0 \ + FDKAAC_VERSION=0.1.5 \ + FONTCONFIG_VERSION=2.12.4 \ + FREETYPE_VERSION=2.10.4 \ + FRIBIDI_VERSION=0.19.7 \ + KVAZAAR_VERSION=2.0.0 \ + LAME_VERSION=3.100 \ + LIBARIBB24_VERSION=1.0.3 \ + LIBASS_VERSION=0.13.7 \ + LIBBLURAY_VERSION=1.1.2 \ + LIBPNG_VERSION=1.6.9 \ + LIBPTHREAD_STUBS_VERSION=0.4 \ + LIBSRT_VERSION=1.4.1 \ + LIBVIDSTAB_VERSION=1.1.0 \ + LIBVMAF_VERSION=2.1.1 \ + LIBXCB_VERSION=1.13.1 \ + LIBXML2_VERSION=2.9.10 \ + LIBZMQ_VERSION=4.3.2 \ + OGG_VERSION=1.3.2 \ + OPENCOREAMR_VERSION=0.1.5 \ + OPENJPEG_VERSION=2.1.2 \ + OPUS_VERSION=1.2 \ + THEORA_VERSION=1.1.1 \ + VORBIS_VERSION=1.3.5 \ + VPX_VERSION=1.8.0 \ + WEBP_VERSION=1.0.2 \ + X264_VERSION=20170226-2245-stable \ + X265_VERSION=3.4 \ + XAU_VERSION=1.0.9 \ + XCBPROTO_VERSION=1.13 \ + XORG_MACROS_VERSION=1.19.2 \ + XPROTO_VERSION=7.0.31 \ + XVID_VERSION=1.3.4 \ + ZIMG_VERSION=3.0.3 \ + SRC=/usr/local ARG FREETYPE_SHA256SUM="5eab795ebb23ac77001cfb68b7d4d50b5d6c7469247b0b01b2c953269f658dac freetype-2.10.4.tar.gz" ARG FRIBIDI_SHA256SUM="3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 0.19.7.tar.gz" @@ -96,24 +97,39 @@ RUN buildDeps="autoconf \ zlib1g-dev" && \ apt-get -yqq update && \ apt-get install -yq --no-install-recommends ${buildDeps} +# zimg https://github.com/sekrit-twc/zimg +RUN \ + DIR=/tmp/zimg && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://github.com/sekrit-twc/zimg/archive/refs/tags/release-${ZIMG_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + ./autogen.sh && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} + + + ## libvmaf https://github.com/Netflix/vmaf RUN \ if which meson || false; then \ - echo "Building VMAF." && \ - DIR=/tmp/vmaf && \ - mkdir -p ${DIR} && \ - cd ${DIR} && \ - curl -sLO https://github.com/Netflix/vmaf/archive/v${LIBVMAF_VERSION}.tar.gz && \ - tar -xz --strip-components=1 -f v${LIBVMAF_VERSION}.tar.gz && \ - cd /tmp/vmaf/libvmaf && \ - meson build --buildtype release --prefix=${PREFIX} && \ - ninja -vC build && \ - ninja -vC build install && \ - mkdir -p ${PREFIX}/share/model/ && \ - cp -r /tmp/vmaf/model/* ${PREFIX}/share/model/ && \ - rm -rf ${DIR}; \ + echo "Building VMAF." && \ + DIR=/tmp/vmaf && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/Netflix/vmaf/archive/v${LIBVMAF_VERSION}.tar.gz && \ + tar -xz --strip-components=1 -f v${LIBVMAF_VERSION}.tar.gz && \ + cd /tmp/vmaf/libvmaf && \ + meson build --buildtype release --prefix=${PREFIX} && \ + ninja -vC build && \ + ninja -vC build install && \ + mkdir -p ${PREFIX}/share/model/ && \ + cp -r /tmp/vmaf/model/* ${PREFIX}/share/model/ && \ + rm -rf ${DIR}; \ else \ - echo "VMAF skipped."; \ + echo "VMAF skipped."; \ fi ## opencore-amr https://sourceforge.net/projects/opencore-amr/ @@ -519,33 +535,34 @@ RUN \ --disable-debug \ --disable-doc \ --disable-ffplay \ - --enable-shared \ --enable-avresample \ - --enable-libopencore-amrnb \ - --enable-libopencore-amrwb \ + --enable-fontconfig \ --enable-gpl \ --enable-libass \ - --enable-fontconfig \ + --enable-libbluray \ + --enable-libfdk_aac \ --enable-libfreetype \ - --enable-libvidstab \ --enable-libmp3lame \ + --enable-libopencore-amrnb \ + --enable-libopencore-amrwb \ --enable-libopus \ --enable-libtheora \ + --enable-libvidstab \ --enable-libvorbis \ --enable-libvpx \ --enable-libwebp \ - --enable-libxcb \ + --enable-libx264 \ --enable-libx265 \ + --enable-libxcb \ --enable-libxvid \ - --enable-libx264 \ + --enable-libzmq \ --enable-nonfree \ --enable-openssl \ - --enable-libfdk_aac \ --enable-postproc \ + --enable-shared \ --enable-small \ --enable-version3 \ - --enable-libbluray \ - --enable-libzmq \ + --enable-zimg \ --extra-libs=-ldl \ --prefix="${PREFIX}" \ --enable-libopenjpeg \ @@ -556,7 +573,7 @@ RUN \ --enable-libaribb24 \ --extra-cflags="-I${PREFIX}/include" \ --extra-ldflags="-L${PREFIX}/lib" && \ - make && \ +make && \ make install && \ make tools/zmqsend && cp tools/zmqsend ${PREFIX}/bin/ && \ make distclean && \ diff --git a/docker-images/4.4/ubuntu2004/Dockerfile b/docker-images/4.4/ubuntu2004/Dockerfile index 97dd45d56..9e9a4a55a 100644 --- a/docker-images/4.4/ubuntu2004/Dockerfile +++ b/docker-images/4.4/ubuntu2004/Dockerfile @@ -17,40 +17,41 @@ RUN apt-get -yqq update && \ FROM base as build ENV FFMPEG_VERSION=4.4 \ - AOM_VERSION=v1.0.0 \ - FDKAAC_VERSION=0.1.5 \ - FONTCONFIG_VERSION=2.12.4 \ - FREETYPE_VERSION=2.10.4 \ - FRIBIDI_VERSION=0.19.7 \ - KVAZAAR_VERSION=2.0.0 \ - LAME_VERSION=3.100 \ - LIBASS_VERSION=0.13.7 \ - LIBPTHREAD_STUBS_VERSION=0.4 \ - LIBVIDSTAB_VERSION=1.1.0 \ - LIBXCB_VERSION=1.13.1 \ - XCBPROTO_VERSION=1.13 \ - OGG_VERSION=1.3.2 \ - OPENCOREAMR_VERSION=0.1.5 \ - OPUS_VERSION=1.2 \ - OPENJPEG_VERSION=2.1.2 \ - THEORA_VERSION=1.1.1 \ - VORBIS_VERSION=1.3.5 \ - VPX_VERSION=1.8.0 \ - WEBP_VERSION=1.0.2 \ - X264_VERSION=20170226-2245-stable \ - X265_VERSION=3.4 \ - XAU_VERSION=1.0.9 \ - XORG_MACROS_VERSION=1.19.2 \ - XPROTO_VERSION=7.0.31 \ - XVID_VERSION=1.3.4 \ - LIBXML2_VERSION=2.9.10 \ - LIBBLURAY_VERSION=1.1.2 \ - LIBZMQ_VERSION=4.3.2 \ - LIBSRT_VERSION=1.4.1 \ - LIBARIBB24_VERSION=1.0.3 \ - LIBPNG_VERSION=1.6.9 \ - LIBVMAF_VERSION=2.1.1 \ - SRC=/usr/local + AOM_VERSION=v1.0.0 \ + FDKAAC_VERSION=0.1.5 \ + FONTCONFIG_VERSION=2.12.4 \ + FREETYPE_VERSION=2.10.4 \ + FRIBIDI_VERSION=0.19.7 \ + KVAZAAR_VERSION=2.0.0 \ + LAME_VERSION=3.100 \ + LIBARIBB24_VERSION=1.0.3 \ + LIBASS_VERSION=0.13.7 \ + LIBBLURAY_VERSION=1.1.2 \ + LIBPNG_VERSION=1.6.9 \ + LIBPTHREAD_STUBS_VERSION=0.4 \ + LIBSRT_VERSION=1.4.1 \ + LIBVIDSTAB_VERSION=1.1.0 \ + LIBVMAF_VERSION=2.1.1 \ + LIBXCB_VERSION=1.13.1 \ + LIBXML2_VERSION=2.9.10 \ + LIBZMQ_VERSION=4.3.2 \ + OGG_VERSION=1.3.2 \ + OPENCOREAMR_VERSION=0.1.5 \ + OPENJPEG_VERSION=2.1.2 \ + OPUS_VERSION=1.2 \ + THEORA_VERSION=1.1.1 \ + VORBIS_VERSION=1.3.5 \ + VPX_VERSION=1.8.0 \ + WEBP_VERSION=1.0.2 \ + X264_VERSION=20170226-2245-stable \ + X265_VERSION=3.4 \ + XAU_VERSION=1.0.9 \ + XCBPROTO_VERSION=1.13 \ + XORG_MACROS_VERSION=1.19.2 \ + XPROTO_VERSION=7.0.31 \ + XVID_VERSION=1.3.4 \ + ZIMG_VERSION=3.0.3 \ + SRC=/usr/local ARG FREETYPE_SHA256SUM="5eab795ebb23ac77001cfb68b7d4d50b5d6c7469247b0b01b2c953269f658dac freetype-2.10.4.tar.gz" ARG FRIBIDI_SHA256SUM="3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 0.19.7.tar.gz" @@ -99,24 +100,39 @@ RUN buildDeps="autoconf \ zlib1g-dev" && \ apt-get -yqq update && \ apt-get install -yq --no-install-recommends ${buildDeps} +# zimg https://github.com/sekrit-twc/zimg +RUN \ + DIR=/tmp/zimg && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://github.com/sekrit-twc/zimg/archive/refs/tags/release-${ZIMG_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + ./autogen.sh && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} + + + ## libvmaf https://github.com/Netflix/vmaf RUN \ if which meson || false; then \ - echo "Building VMAF." && \ - DIR=/tmp/vmaf && \ - mkdir -p ${DIR} && \ - cd ${DIR} && \ - curl -sLO https://github.com/Netflix/vmaf/archive/v${LIBVMAF_VERSION}.tar.gz && \ - tar -xz --strip-components=1 -f v${LIBVMAF_VERSION}.tar.gz && \ - cd /tmp/vmaf/libvmaf && \ - meson build --buildtype release --prefix=${PREFIX} && \ - ninja -vC build && \ - ninja -vC build install && \ - mkdir -p ${PREFIX}/share/model/ && \ - cp -r /tmp/vmaf/model/* ${PREFIX}/share/model/ && \ - rm -rf ${DIR}; \ + echo "Building VMAF." && \ + DIR=/tmp/vmaf && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/Netflix/vmaf/archive/v${LIBVMAF_VERSION}.tar.gz && \ + tar -xz --strip-components=1 -f v${LIBVMAF_VERSION}.tar.gz && \ + cd /tmp/vmaf/libvmaf && \ + meson build --buildtype release --prefix=${PREFIX} && \ + ninja -vC build && \ + ninja -vC build install && \ + mkdir -p ${PREFIX}/share/model/ && \ + cp -r /tmp/vmaf/model/* ${PREFIX}/share/model/ && \ + rm -rf ${DIR}; \ else \ - echo "VMAF skipped."; \ + echo "VMAF skipped."; \ fi ## opencore-amr https://sourceforge.net/projects/opencore-amr/ @@ -522,33 +538,34 @@ RUN \ --disable-debug \ --disable-doc \ --disable-ffplay \ - --enable-shared \ --enable-avresample \ - --enable-libopencore-amrnb \ - --enable-libopencore-amrwb \ + --enable-fontconfig \ --enable-gpl \ --enable-libass \ - --enable-fontconfig \ + --enable-libbluray \ + --enable-libfdk_aac \ --enable-libfreetype \ - --enable-libvidstab \ --enable-libmp3lame \ + --enable-libopencore-amrnb \ + --enable-libopencore-amrwb \ --enable-libopus \ --enable-libtheora \ + --enable-libvidstab \ --enable-libvorbis \ --enable-libvpx \ --enable-libwebp \ - --enable-libxcb \ + --enable-libx264 \ --enable-libx265 \ + --enable-libxcb \ --enable-libxvid \ - --enable-libx264 \ + --enable-libzmq \ --enable-nonfree \ --enable-openssl \ - --enable-libfdk_aac \ --enable-postproc \ + --enable-shared \ --enable-small \ --enable-version3 \ - --enable-libbluray \ - --enable-libzmq \ + --enable-zimg \ --extra-libs=-ldl \ --prefix="${PREFIX}" \ --enable-libopenjpeg \ @@ -560,7 +577,7 @@ RUN \ --enable-libvmaf \ --extra-cflags="-I${PREFIX}/include" \ --extra-ldflags="-L${PREFIX}/lib" && \ - make && \ +make && \ make install && \ make tools/zmqsend && cp tools/zmqsend ${PREFIX}/bin/ && \ make distclean && \ diff --git a/docker-images/4.4/vaapi1804/Dockerfile b/docker-images/4.4/vaapi1804/Dockerfile index 1d0bd4495..59bc5213f 100644 --- a/docker-images/4.4/vaapi1804/Dockerfile +++ b/docker-images/4.4/vaapi1804/Dockerfile @@ -17,40 +17,41 @@ RUN apt-get -yqq update && \ FROM base as build ENV FFMPEG_VERSION=4.4 \ - AOM_VERSION=v1.0.0 \ - FDKAAC_VERSION=0.1.5 \ - FONTCONFIG_VERSION=2.12.4 \ - FREETYPE_VERSION=2.10.4 \ - FRIBIDI_VERSION=0.19.7 \ - KVAZAAR_VERSION=2.0.0 \ - LAME_VERSION=3.100 \ - LIBASS_VERSION=0.13.7 \ - LIBPTHREAD_STUBS_VERSION=0.4 \ - LIBVIDSTAB_VERSION=1.1.0 \ - LIBXCB_VERSION=1.13.1 \ - XCBPROTO_VERSION=1.13 \ - OGG_VERSION=1.3.2 \ - OPENCOREAMR_VERSION=0.1.5 \ - OPUS_VERSION=1.2 \ - OPENJPEG_VERSION=2.1.2 \ - THEORA_VERSION=1.1.1 \ - VORBIS_VERSION=1.3.5 \ - VPX_VERSION=1.8.0 \ - WEBP_VERSION=1.0.2 \ - X264_VERSION=20170226-2245-stable \ - X265_VERSION=3.4 \ - XAU_VERSION=1.0.9 \ - XORG_MACROS_VERSION=1.19.2 \ - XPROTO_VERSION=7.0.31 \ - XVID_VERSION=1.3.4 \ - LIBXML2_VERSION=2.9.10 \ - LIBBLURAY_VERSION=1.1.2 \ - LIBZMQ_VERSION=4.3.2 \ - LIBSRT_VERSION=1.4.1 \ - LIBARIBB24_VERSION=1.0.3 \ - LIBPNG_VERSION=1.6.9 \ - LIBVMAF_VERSION=2.1.1 \ - SRC=/usr/local + AOM_VERSION=v1.0.0 \ + FDKAAC_VERSION=0.1.5 \ + FONTCONFIG_VERSION=2.12.4 \ + FREETYPE_VERSION=2.10.4 \ + FRIBIDI_VERSION=0.19.7 \ + KVAZAAR_VERSION=2.0.0 \ + LAME_VERSION=3.100 \ + LIBARIBB24_VERSION=1.0.3 \ + LIBASS_VERSION=0.13.7 \ + LIBBLURAY_VERSION=1.1.2 \ + LIBPNG_VERSION=1.6.9 \ + LIBPTHREAD_STUBS_VERSION=0.4 \ + LIBSRT_VERSION=1.4.1 \ + LIBVIDSTAB_VERSION=1.1.0 \ + LIBVMAF_VERSION=2.1.1 \ + LIBXCB_VERSION=1.13.1 \ + LIBXML2_VERSION=2.9.10 \ + LIBZMQ_VERSION=4.3.2 \ + OGG_VERSION=1.3.2 \ + OPENCOREAMR_VERSION=0.1.5 \ + OPENJPEG_VERSION=2.1.2 \ + OPUS_VERSION=1.2 \ + THEORA_VERSION=1.1.1 \ + VORBIS_VERSION=1.3.5 \ + VPX_VERSION=1.8.0 \ + WEBP_VERSION=1.0.2 \ + X264_VERSION=20170226-2245-stable \ + X265_VERSION=3.4 \ + XAU_VERSION=1.0.9 \ + XCBPROTO_VERSION=1.13 \ + XORG_MACROS_VERSION=1.19.2 \ + XPROTO_VERSION=7.0.31 \ + XVID_VERSION=1.3.4 \ + ZIMG_VERSION=3.0.3 \ + SRC=/usr/local ARG FREETYPE_SHA256SUM="5eab795ebb23ac77001cfb68b7d4d50b5d6c7469247b0b01b2c953269f658dac freetype-2.10.4.tar.gz" ARG FRIBIDI_SHA256SUM="3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 0.19.7.tar.gz" @@ -97,24 +98,39 @@ RUN buildDeps="autoconf \ zlib1g-dev" && \ apt-get -yqq update && \ apt-get install -yq --no-install-recommends ${buildDeps} +# zimg https://github.com/sekrit-twc/zimg +RUN \ + DIR=/tmp/zimg && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://github.com/sekrit-twc/zimg/archive/refs/tags/release-${ZIMG_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + ./autogen.sh && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} + + + ## libvmaf https://github.com/Netflix/vmaf RUN \ if which meson || false; then \ - echo "Building VMAF." && \ - DIR=/tmp/vmaf && \ - mkdir -p ${DIR} && \ - cd ${DIR} && \ - curl -sLO https://github.com/Netflix/vmaf/archive/v${LIBVMAF_VERSION}.tar.gz && \ - tar -xz --strip-components=1 -f v${LIBVMAF_VERSION}.tar.gz && \ - cd /tmp/vmaf/libvmaf && \ - meson build --buildtype release --prefix=${PREFIX} && \ - ninja -vC build && \ - ninja -vC build install && \ - mkdir -p ${PREFIX}/share/model/ && \ - cp -r /tmp/vmaf/model/* ${PREFIX}/share/model/ && \ - rm -rf ${DIR}; \ + echo "Building VMAF." && \ + DIR=/tmp/vmaf && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/Netflix/vmaf/archive/v${LIBVMAF_VERSION}.tar.gz && \ + tar -xz --strip-components=1 -f v${LIBVMAF_VERSION}.tar.gz && \ + cd /tmp/vmaf/libvmaf && \ + meson build --buildtype release --prefix=${PREFIX} && \ + ninja -vC build && \ + ninja -vC build install && \ + mkdir -p ${PREFIX}/share/model/ && \ + cp -r /tmp/vmaf/model/* ${PREFIX}/share/model/ && \ + rm -rf ${DIR}; \ else \ - echo "VMAF skipped."; \ + echo "VMAF skipped."; \ fi ## opencore-amr https://sourceforge.net/projects/opencore-amr/ @@ -520,33 +536,34 @@ RUN \ --disable-debug \ --disable-doc \ --disable-ffplay \ - --enable-shared \ --enable-avresample \ - --enable-libopencore-amrnb \ - --enable-libopencore-amrwb \ + --enable-fontconfig \ --enable-gpl \ --enable-libass \ - --enable-fontconfig \ + --enable-libbluray \ + --enable-libfdk_aac \ --enable-libfreetype \ - --enable-libvidstab \ --enable-libmp3lame \ + --enable-libopencore-amrnb \ + --enable-libopencore-amrwb \ --enable-libopus \ --enable-libtheora \ + --enable-libvidstab \ --enable-libvorbis \ --enable-libvpx \ --enable-libwebp \ - --enable-libxcb \ + --enable-libx264 \ --enable-libx265 \ + --enable-libxcb \ --enable-libxvid \ - --enable-libx264 \ + --enable-libzmq \ --enable-nonfree \ --enable-openssl \ - --enable-libfdk_aac \ --enable-postproc \ + --enable-shared \ --enable-small \ --enable-version3 \ - --enable-libbluray \ - --enable-libzmq \ + --enable-zimg \ --extra-libs=-ldl \ --prefix="${PREFIX}" \ --enable-libopenjpeg \ @@ -558,7 +575,7 @@ RUN \ --enable-vaapi \ --extra-cflags="-I${PREFIX}/include" \ --extra-ldflags="-L${PREFIX}/lib" && \ - make && \ +make && \ make install && \ make tools/zmqsend && cp tools/zmqsend ${PREFIX}/bin/ && \ make distclean && \ diff --git a/docker-images/4.4/vaapi2004/Dockerfile b/docker-images/4.4/vaapi2004/Dockerfile index 0063a6af5..7bb4eab79 100644 --- a/docker-images/4.4/vaapi2004/Dockerfile +++ b/docker-images/4.4/vaapi2004/Dockerfile @@ -17,40 +17,41 @@ RUN apt-get -yqq update && \ FROM base as build ENV FFMPEG_VERSION=4.4 \ - AOM_VERSION=v1.0.0 \ - FDKAAC_VERSION=0.1.5 \ - FONTCONFIG_VERSION=2.12.4 \ - FREETYPE_VERSION=2.10.4 \ - FRIBIDI_VERSION=0.19.7 \ - KVAZAAR_VERSION=2.0.0 \ - LAME_VERSION=3.100 \ - LIBASS_VERSION=0.13.7 \ - LIBPTHREAD_STUBS_VERSION=0.4 \ - LIBVIDSTAB_VERSION=1.1.0 \ - LIBXCB_VERSION=1.13.1 \ - XCBPROTO_VERSION=1.13 \ - OGG_VERSION=1.3.2 \ - OPENCOREAMR_VERSION=0.1.5 \ - OPUS_VERSION=1.2 \ - OPENJPEG_VERSION=2.1.2 \ - THEORA_VERSION=1.1.1 \ - VORBIS_VERSION=1.3.5 \ - VPX_VERSION=1.8.0 \ - WEBP_VERSION=1.0.2 \ - X264_VERSION=20170226-2245-stable \ - X265_VERSION=3.4 \ - XAU_VERSION=1.0.9 \ - XORG_MACROS_VERSION=1.19.2 \ - XPROTO_VERSION=7.0.31 \ - XVID_VERSION=1.3.4 \ - LIBXML2_VERSION=2.9.10 \ - LIBBLURAY_VERSION=1.1.2 \ - LIBZMQ_VERSION=4.3.2 \ - LIBSRT_VERSION=1.4.1 \ - LIBARIBB24_VERSION=1.0.3 \ - LIBPNG_VERSION=1.6.9 \ - LIBVMAF_VERSION=2.1.1 \ - SRC=/usr/local + AOM_VERSION=v1.0.0 \ + FDKAAC_VERSION=0.1.5 \ + FONTCONFIG_VERSION=2.12.4 \ + FREETYPE_VERSION=2.10.4 \ + FRIBIDI_VERSION=0.19.7 \ + KVAZAAR_VERSION=2.0.0 \ + LAME_VERSION=3.100 \ + LIBARIBB24_VERSION=1.0.3 \ + LIBASS_VERSION=0.13.7 \ + LIBBLURAY_VERSION=1.1.2 \ + LIBPNG_VERSION=1.6.9 \ + LIBPTHREAD_STUBS_VERSION=0.4 \ + LIBSRT_VERSION=1.4.1 \ + LIBVIDSTAB_VERSION=1.1.0 \ + LIBVMAF_VERSION=2.1.1 \ + LIBXCB_VERSION=1.13.1 \ + LIBXML2_VERSION=2.9.10 \ + LIBZMQ_VERSION=4.3.2 \ + OGG_VERSION=1.3.2 \ + OPENCOREAMR_VERSION=0.1.5 \ + OPENJPEG_VERSION=2.1.2 \ + OPUS_VERSION=1.2 \ + THEORA_VERSION=1.1.1 \ + VORBIS_VERSION=1.3.5 \ + VPX_VERSION=1.8.0 \ + WEBP_VERSION=1.0.2 \ + X264_VERSION=20170226-2245-stable \ + X265_VERSION=3.4 \ + XAU_VERSION=1.0.9 \ + XCBPROTO_VERSION=1.13 \ + XORG_MACROS_VERSION=1.19.2 \ + XPROTO_VERSION=7.0.31 \ + XVID_VERSION=1.3.4 \ + ZIMG_VERSION=3.0.3 \ + SRC=/usr/local ARG FREETYPE_SHA256SUM="5eab795ebb23ac77001cfb68b7d4d50b5d6c7469247b0b01b2c953269f658dac freetype-2.10.4.tar.gz" ARG FRIBIDI_SHA256SUM="3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 0.19.7.tar.gz" @@ -100,24 +101,39 @@ RUN buildDeps="autoconf \ zlib1g-dev" && \ apt-get -yqq update && \ apt-get install -yq --no-install-recommends ${buildDeps} +# zimg https://github.com/sekrit-twc/zimg +RUN \ + DIR=/tmp/zimg && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://github.com/sekrit-twc/zimg/archive/refs/tags/release-${ZIMG_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + ./autogen.sh && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} + + + ## libvmaf https://github.com/Netflix/vmaf RUN \ if which meson || false; then \ - echo "Building VMAF." && \ - DIR=/tmp/vmaf && \ - mkdir -p ${DIR} && \ - cd ${DIR} && \ - curl -sLO https://github.com/Netflix/vmaf/archive/v${LIBVMAF_VERSION}.tar.gz && \ - tar -xz --strip-components=1 -f v${LIBVMAF_VERSION}.tar.gz && \ - cd /tmp/vmaf/libvmaf && \ - meson build --buildtype release --prefix=${PREFIX} && \ - ninja -vC build && \ - ninja -vC build install && \ - mkdir -p ${PREFIX}/share/model/ && \ - cp -r /tmp/vmaf/model/* ${PREFIX}/share/model/ && \ - rm -rf ${DIR}; \ + echo "Building VMAF." && \ + DIR=/tmp/vmaf && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/Netflix/vmaf/archive/v${LIBVMAF_VERSION}.tar.gz && \ + tar -xz --strip-components=1 -f v${LIBVMAF_VERSION}.tar.gz && \ + cd /tmp/vmaf/libvmaf && \ + meson build --buildtype release --prefix=${PREFIX} && \ + ninja -vC build && \ + ninja -vC build install && \ + mkdir -p ${PREFIX}/share/model/ && \ + cp -r /tmp/vmaf/model/* ${PREFIX}/share/model/ && \ + rm -rf ${DIR}; \ else \ - echo "VMAF skipped."; \ + echo "VMAF skipped."; \ fi ## opencore-amr https://sourceforge.net/projects/opencore-amr/ @@ -523,33 +539,34 @@ RUN \ --disable-debug \ --disable-doc \ --disable-ffplay \ - --enable-shared \ --enable-avresample \ - --enable-libopencore-amrnb \ - --enable-libopencore-amrwb \ + --enable-fontconfig \ --enable-gpl \ --enable-libass \ - --enable-fontconfig \ + --enable-libbluray \ + --enable-libfdk_aac \ --enable-libfreetype \ - --enable-libvidstab \ --enable-libmp3lame \ + --enable-libopencore-amrnb \ + --enable-libopencore-amrwb \ --enable-libopus \ --enable-libtheora \ + --enable-libvidstab \ --enable-libvorbis \ --enable-libvpx \ --enable-libwebp \ - --enable-libxcb \ + --enable-libx264 \ --enable-libx265 \ + --enable-libxcb \ --enable-libxvid \ - --enable-libx264 \ + --enable-libzmq \ --enable-nonfree \ --enable-openssl \ - --enable-libfdk_aac \ --enable-postproc \ + --enable-shared \ --enable-small \ --enable-version3 \ - --enable-libbluray \ - --enable-libzmq \ + --enable-zimg \ --extra-libs=-ldl \ --prefix="${PREFIX}" \ --enable-libopenjpeg \ @@ -562,7 +579,7 @@ RUN \ --enable-vaapi \ --extra-cflags="-I${PREFIX}/include" \ --extra-ldflags="-L${PREFIX}/lib" && \ - make && \ +make && \ make install && \ make tools/zmqsend && cp tools/zmqsend ${PREFIX}/bin/ && \ make distclean && \ diff --git a/templates/Dockerfile-env b/templates/Dockerfile-env index 3c211e02a..dfdde7f53 100644 --- a/templates/Dockerfile-env +++ b/templates/Dockerfile-env @@ -1,38 +1,39 @@ FFMPEG_VERSION=%%FFMPEG_VERSION%% \ - AOM_VERSION=v1.0.0 \ - FDKAAC_VERSION=0.1.5 \ - FONTCONFIG_VERSION=2.12.4 \ - FREETYPE_VERSION=2.10.4 \ - FRIBIDI_VERSION=0.19.7 \ - KVAZAAR_VERSION=2.0.0 \ - LAME_VERSION=3.100 \ - LIBASS_VERSION=0.13.7 \ - LIBPTHREAD_STUBS_VERSION=0.4 \ - LIBVIDSTAB_VERSION=1.1.0 \ - LIBXCB_VERSION=1.13.1 \ - XCBPROTO_VERSION=1.13 \ - OGG_VERSION=1.3.2 \ - OPENCOREAMR_VERSION=0.1.5 \ - OPUS_VERSION=1.2 \ - OPENJPEG_VERSION=2.1.2 \ - THEORA_VERSION=1.1.1 \ - VORBIS_VERSION=1.3.5 \ - VPX_VERSION=1.8.0 \ - WEBP_VERSION=1.0.2 \ - X264_VERSION=20170226-2245-stable \ - X265_VERSION=3.4 \ - XAU_VERSION=1.0.9 \ - XORG_MACROS_VERSION=1.19.2 \ - XPROTO_VERSION=7.0.31 \ - XVID_VERSION=1.3.4 \ - LIBXML2_VERSION=2.9.10 \ - LIBBLURAY_VERSION=1.1.2 \ - LIBZMQ_VERSION=4.3.2 \ - LIBSRT_VERSION=1.4.1 \ - LIBARIBB24_VERSION=1.0.3 \ - LIBPNG_VERSION=1.6.9 \ - LIBVMAF_VERSION=2.1.1 \ - SRC=/usr/local + AOM_VERSION=v1.0.0 \ + FDKAAC_VERSION=0.1.5 \ + FONTCONFIG_VERSION=2.12.4 \ + FREETYPE_VERSION=2.10.4 \ + FRIBIDI_VERSION=0.19.7 \ + KVAZAAR_VERSION=2.0.0 \ + LAME_VERSION=3.100 \ + LIBARIBB24_VERSION=1.0.3 \ + LIBASS_VERSION=0.13.7 \ + LIBBLURAY_VERSION=1.1.2 \ + LIBPNG_VERSION=1.6.9 \ + LIBPTHREAD_STUBS_VERSION=0.4 \ + LIBSRT_VERSION=1.4.1 \ + LIBVIDSTAB_VERSION=1.1.0 \ + LIBVMAF_VERSION=2.1.1 \ + LIBXCB_VERSION=1.13.1 \ + LIBXML2_VERSION=2.9.10 \ + LIBZMQ_VERSION=4.3.2 \ + OGG_VERSION=1.3.2 \ + OPENCOREAMR_VERSION=0.1.5 \ + OPENJPEG_VERSION=2.1.2 \ + OPUS_VERSION=1.2 \ + THEORA_VERSION=1.1.1 \ + VORBIS_VERSION=1.3.5 \ + VPX_VERSION=1.8.0 \ + WEBP_VERSION=1.0.2 \ + X264_VERSION=20170226-2245-stable \ + X265_VERSION=3.4 \ + XAU_VERSION=1.0.9 \ + XCBPROTO_VERSION=1.13 \ + XORG_MACROS_VERSION=1.19.2 \ + XPROTO_VERSION=7.0.31 \ + XVID_VERSION=1.3.4 \ + ZIMG_VERSION=3.0.3 \ + SRC=/usr/local ARG FREETYPE_SHA256SUM="5eab795ebb23ac77001cfb68b7d4d50b5d6c7469247b0b01b2c953269f658dac freetype-2.10.4.tar.gz" ARG FRIBIDI_SHA256SUM="3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 0.19.7.tar.gz" diff --git a/templates/Dockerfile-run b/templates/Dockerfile-run index 29c3d00aa..9593ca1ed 100644 --- a/templates/Dockerfile-run +++ b/templates/Dockerfile-run @@ -1,21 +1,36 @@ +# zimg https://github.com/sekrit-twc/zimg +RUN \ + DIR=/tmp/zimg && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sL https://github.com/sekrit-twc/zimg/archive/refs/tags/release-${ZIMG_VERSION}.tar.gz | \ + tar -zx --strip-components=1 && \ + ./autogen.sh && \ + ./configure --prefix="${PREFIX}" --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} + + + ## libvmaf https://github.com/Netflix/vmaf RUN \ if which meson || false; then \ - echo "Building VMAF." && \ - DIR=/tmp/vmaf && \ - mkdir -p ${DIR} && \ - cd ${DIR} && \ - curl -sLO https://github.com/Netflix/vmaf/archive/v${LIBVMAF_VERSION}.tar.gz && \ - tar -xz --strip-components=1 -f v${LIBVMAF_VERSION}.tar.gz && \ - cd /tmp/vmaf/libvmaf && \ - meson build --buildtype release --prefix=${PREFIX} && \ - ninja -vC build && \ - ninja -vC build install && \ - mkdir -p ${PREFIX}/share/model/ && \ - cp -r /tmp/vmaf/model/* ${PREFIX}/share/model/ && \ - rm -rf ${DIR}; \ + echo "Building VMAF." && \ + DIR=/tmp/vmaf && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/Netflix/vmaf/archive/v${LIBVMAF_VERSION}.tar.gz && \ + tar -xz --strip-components=1 -f v${LIBVMAF_VERSION}.tar.gz && \ + cd /tmp/vmaf/libvmaf && \ + meson build --buildtype release --prefix=${PREFIX} && \ + ninja -vC build && \ + ninja -vC build install && \ + mkdir -p ${PREFIX}/share/model/ && \ + cp -r /tmp/vmaf/model/* ${PREFIX}/share/model/ && \ + rm -rf ${DIR}; \ else \ - echo "VMAF skipped."; \ + echo "VMAF skipped."; \ fi ## opencore-amr https://sourceforge.net/projects/opencore-amr/ @@ -419,7 +434,7 @@ RUN \ DIR=/tmp/ffmpeg && mkdir -p ${DIR} && cd ${DIR} && \ ./configure \ %%FFMPEG_CONFIG_FLAGS%% - make && \ +make && \ make install && \ make tools/zmqsend && cp tools/zmqsend ${PREFIX}/bin/ && \ make distclean && \ diff --git a/update.py b/update.py index 45ec5885c..b1e7245c5 100755 --- a/update.py +++ b/update.py @@ -159,33 +159,34 @@ def get_major_version(version): "--disable-debug", "--disable-doc", "--disable-ffplay", - "--enable-shared", "--enable-avresample", - "--enable-libopencore-amrnb", - "--enable-libopencore-amrwb", + "--enable-fontconfig", "--enable-gpl", "--enable-libass", - "--enable-fontconfig", + "--enable-libbluray", + "--enable-libfdk_aac", "--enable-libfreetype", - "--enable-libvidstab", "--enable-libmp3lame", + "--enable-libopencore-amrnb", + "--enable-libopencore-amrwb", "--enable-libopus", "--enable-libtheora", + "--enable-libvidstab", "--enable-libvorbis", "--enable-libvpx", "--enable-libwebp", - "--enable-libxcb", + "--enable-libx264", "--enable-libx265", + "--enable-libxcb", "--enable-libxvid", - "--enable-libx264", + "--enable-libzmq", "--enable-nonfree", "--enable-openssl", - "--enable-libfdk_aac", "--enable-postproc", + "--enable-shared", "--enable-small", "--enable-version3", - "--enable-libbluray", - "--enable-libzmq", + "--enable-zimg", "--extra-libs=-ldl", '--prefix="${PREFIX}"', ]