From a9817a434f7cb240c3e27eabe2456b931564e322 Mon Sep 17 00:00:00 2001 From: Tim Dawson Date: Thu, 14 Oct 2021 21:40:03 +1300 Subject: [PATCH 1/2] Added libsvtav1, updated libaom. --- docker-images/3.2/alpine38/Dockerfile | 78 +++++++++++++---------- docker-images/3.2/centos7/Dockerfile | 78 +++++++++++++---------- docker-images/3.2/scratch38/Dockerfile | 78 +++++++++++++---------- docker-images/3.2/ubuntu2004/Dockerfile | 78 +++++++++++++---------- docker-images/3.2/vaapi2004/Dockerfile | 78 +++++++++++++---------- docker-images/3.3/alpine312/Dockerfile | 80 ++++++++++++++---------- docker-images/3.3/centos7/Dockerfile | 78 +++++++++++++---------- docker-images/3.3/centos8/Dockerfile | 78 +++++++++++++---------- docker-images/3.3/nvidia2004/Dockerfile | 78 +++++++++++++---------- docker-images/3.3/scratch312/Dockerfile | 78 +++++++++++++---------- docker-images/3.3/ubuntu1804/Dockerfile | 78 +++++++++++++---------- docker-images/3.3/ubuntu2004/Dockerfile | 78 +++++++++++++---------- docker-images/3.3/vaapi2004/Dockerfile | 78 +++++++++++++---------- docker-images/3.4/alpine312/Dockerfile | 82 +++++++++++++++---------- docker-images/3.4/centos7/Dockerfile | 80 ++++++++++++++---------- docker-images/3.4/centos8/Dockerfile | 80 ++++++++++++++---------- docker-images/3.4/nvidia2004/Dockerfile | 80 ++++++++++++++---------- docker-images/3.4/scratch312/Dockerfile | 80 ++++++++++++++---------- docker-images/3.4/ubuntu1804/Dockerfile | 80 ++++++++++++++---------- docker-images/3.4/ubuntu2004/Dockerfile | 80 ++++++++++++++---------- docker-images/3.4/vaapi2004/Dockerfile | 80 ++++++++++++++---------- docker-images/4.0/alpine312/Dockerfile | 81 ++++++++++++++---------- docker-images/4.0/centos7/Dockerfile | 79 ++++++++++++++---------- docker-images/4.0/centos8/Dockerfile | 79 ++++++++++++++---------- docker-images/4.0/nvidia2004/Dockerfile | 79 ++++++++++++++---------- docker-images/4.0/scratch312/Dockerfile | 79 ++++++++++++++---------- docker-images/4.0/ubuntu1804/Dockerfile | 79 ++++++++++++++---------- docker-images/4.0/ubuntu2004/Dockerfile | 79 ++++++++++++++---------- docker-images/4.0/vaapi2004/Dockerfile | 79 ++++++++++++++---------- docker-images/4.1/alpine312/Dockerfile | 81 ++++++++++++++---------- docker-images/4.1/centos7/Dockerfile | 79 ++++++++++++++---------- docker-images/4.1/centos8/Dockerfile | 79 ++++++++++++++---------- docker-images/4.1/nvidia2004/Dockerfile | 79 ++++++++++++++---------- docker-images/4.1/scratch312/Dockerfile | 79 ++++++++++++++---------- docker-images/4.1/ubuntu1804/Dockerfile | 79 ++++++++++++++---------- docker-images/4.1/ubuntu2004/Dockerfile | 79 ++++++++++++++---------- docker-images/4.1/vaapi2004/Dockerfile | 79 ++++++++++++++---------- docker-images/4.2/alpine312/Dockerfile | 81 ++++++++++++++---------- docker-images/4.2/centos7/Dockerfile | 79 ++++++++++++++---------- docker-images/4.2/centos8/Dockerfile | 79 ++++++++++++++---------- docker-images/4.2/nvidia2004/Dockerfile | 79 ++++++++++++++---------- docker-images/4.2/scratch312/Dockerfile | 79 ++++++++++++++---------- docker-images/4.2/ubuntu1804/Dockerfile | 79 ++++++++++++++---------- docker-images/4.2/ubuntu2004/Dockerfile | 79 ++++++++++++++---------- docker-images/4.2/vaapi2004/Dockerfile | 79 ++++++++++++++---------- docker-images/4.3/alpine312/Dockerfile | 82 +++++++++++++++---------- docker-images/4.3/alpine38/Dockerfile | 79 ++++++++++++++---------- docker-images/4.3/centos7/Dockerfile | 79 ++++++++++++++---------- docker-images/4.3/centos8/Dockerfile | 79 ++++++++++++++---------- docker-images/4.3/nvidia2004/Dockerfile | 79 ++++++++++++++---------- docker-images/4.3/scratch312/Dockerfile | 79 ++++++++++++++---------- docker-images/4.3/scratch38/Dockerfile | 79 ++++++++++++++---------- docker-images/4.3/ubuntu1804/Dockerfile | 79 ++++++++++++++---------- docker-images/4.3/ubuntu2004/Dockerfile | 79 ++++++++++++++---------- docker-images/4.3/vaapi1804/Dockerfile | 79 ++++++++++++++---------- docker-images/4.3/vaapi2004/Dockerfile | 79 ++++++++++++++---------- docker-images/4.4/alpine312/Dockerfile | 82 +++++++++++++++---------- docker-images/4.4/alpine38/Dockerfile | 79 ++++++++++++++---------- docker-images/4.4/centos7/Dockerfile | 79 ++++++++++++++---------- docker-images/4.4/centos8/Dockerfile | 79 ++++++++++++++---------- docker-images/4.4/nvidia2004/Dockerfile | 79 ++++++++++++++---------- docker-images/4.4/scratch312/Dockerfile | 79 ++++++++++++++---------- docker-images/4.4/scratch38/Dockerfile | 79 ++++++++++++++---------- docker-images/4.4/ubuntu1804/Dockerfile | 79 ++++++++++++++---------- docker-images/4.4/ubuntu2004/Dockerfile | 79 ++++++++++++++---------- docker-images/4.4/vaapi1804/Dockerfile | 79 ++++++++++++++---------- docker-images/4.4/vaapi2004/Dockerfile | 79 ++++++++++++++---------- docker-images/azure-jobs.yml | 32 +++++----- docker-images/gitlab-ci.yml | 32 +++++----- templates/Dockerfile-env | 3 +- templates/Dockerfile-run | 75 ++++++++++++---------- templates/Dockerfile-template.alpine312 | 2 + update.py | 1 + 73 files changed, 3233 insertions(+), 2216 deletions(-) diff --git a/docker-images/3.2/alpine38/Dockerfile b/docker-images/3.2/alpine38/Dockerfile index e192081a2..2d6c2a5c6 100644 --- a/docker-images/3.2/alpine38/Dockerfile +++ b/docker-images/3.2/alpine38/Dockerfile @@ -14,7 +14,8 @@ FROM base AS build WORKDIR /tmp/workdir ENV FFMPEG_VERSION=3.2.15 \ - AOM_VERSION=v1.0.0 \ + LIBSTVAV1_VERSION=v0.8.7 \ + AOM_VERSION=v3.1.3 \ FDKAAC_VERSION=0.1.5 \ FONTCONFIG_VERSION=2.12.4 \ FREETYPE_VERSION=2.10.4 \ @@ -123,7 +124,7 @@ RUN \ curl -sL https://versaweb.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${OPENCOREAMR_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## x264 http://www.videolan.org/developers/x264.html @@ -134,7 +135,7 @@ RUN \ curl -sL https://download.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-${X264_VERSION}.tar.bz2 | \ tar -jx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared --enable-pic --disable-cli && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### x265 http://x265.org/ @@ -148,7 +149,7 @@ RUN \ sed -i "/-DEXTRA_LIB/ s/$/ -DCMAKE_INSTALL_PREFIX=\${PREFIX}/" multilib.sh && \ sed -i "/^cmake/ s/$/ -DENABLE_CLI=OFF/" multilib.sh && \ ./multilib.sh && \ - make -C 8bit install && \ + make -C 8bit -j $(nproc) install && \ rm -rf ${DIR} ### libogg https://www.xiph.org/ogg/ RUN \ @@ -159,7 +160,7 @@ RUN \ echo ${OGG_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f libogg-${OGG_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libopus https://www.opus-codec.org/ @@ -172,7 +173,7 @@ RUN \ tar -zx --strip-components=1 -f opus-${OPUS_VERSION}.tar.gz && \ autoreconf -fiv && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libvorbis https://xiph.org/vorbis/ @@ -184,7 +185,7 @@ RUN \ echo ${VORBIS_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f libvorbis-${VORBIS_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libtheora http://www.theora.org/ @@ -196,7 +197,7 @@ RUN \ echo ${THEORA_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f libtheora-${THEORA_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libvpx https://www.webmproject.org/code/ @@ -208,7 +209,7 @@ RUN \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-vp8 --enable-vp9 --enable-vp9-highbitdepth --enable-pic --enable-shared \ --disable-debug --disable-examples --disable-docs --disable-install-bins && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libwebp https://developers.google.com/speed/webp/ @@ -219,7 +220,7 @@ RUN \ curl -sL https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-${WEBP_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libmp3lame http://lame.sourceforge.net/ @@ -230,7 +231,7 @@ RUN \ curl -sL https://versaweb.dl.sourceforge.net/project/lame/lame/$(echo ${LAME_VERSION} | sed -e 's/[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)/\1.\2/')/lame-${LAME_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" --enable-shared --enable-nasm --disable-frontend && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### xvid https://www.xvid.com/ @@ -243,7 +244,7 @@ RUN \ tar -zx -f xvidcore-${XVID_VERSION}.tar.gz && \ cd xvidcore/build/generic && \ ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### fdk-aac https://github.com/mstorsjo/fdk-aac @@ -255,7 +256,7 @@ RUN \ tar -zx --strip-components=1 && \ autoreconf -fiv && \ ./configure --prefix="${PREFIX}" --enable-shared --datadir="${DIR}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## openjpeg https://github.com/uclouvain/openjpeg @@ -266,7 +267,7 @@ RUN \ curl -sL https://github.com/uclouvain/openjpeg/archive/v${OPENJPEG_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ cmake -DBUILD_THIRDPARTY:BOOL=ON -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## freetype https://www.freetype.org/ @@ -278,7 +279,7 @@ RUN \ echo ${FREETYPE_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f freetype-${FREETYPE_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## libvstab https://github.com/georgmartius/vid.stab @@ -290,7 +291,7 @@ RUN \ echo ${LIBVIDSTAB_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f v${LIBVIDSTAB_VERSION}.tar.gz && \ cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## fridibi https://www.fribidi.org/ @@ -315,7 +316,7 @@ RUN \ curl -sLO https://www.freedesktop.org/software/fontconfig/release/fontconfig-${FONTCONFIG_VERSION}.tar.bz2 && \ tar -jx --strip-components=1 -f fontconfig-${FONTCONFIG_VERSION}.tar.bz2 && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## libass https://github.com/libass/libass @@ -328,7 +329,7 @@ RUN \ tar -zx --strip-components=1 -f ${LIBASS_VERSION}.tar.gz && \ ./autogen.sh && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## kvazaar https://github.com/ultravideo/kvazaar @@ -352,7 +353,7 @@ RUN \ mkdir -p ./aom_build ; \ cd ./aom_build ; \ cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" -DBUILD_SHARED_LIBS=1 ..; \ - make ; \ + make -j $(nproc); \ make install ; \ rm -rf ${DIR} @@ -364,7 +365,7 @@ RUN \ curl -sLO https://www.x.org/archive//individual/util/util-macros-${XORG_MACROS_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f util-macros-${XORG_MACROS_VERSION}.tar.gz && \ ./configure --srcdir=${DIR} --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -375,7 +376,7 @@ RUN \ curl -sLO https://www.x.org/archive/individual/proto/xproto-${XPROTO_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f xproto-${XPROTO_VERSION}.tar.gz && \ ./configure --srcdir=${DIR} --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -386,7 +387,7 @@ RUN \ curl -sLO https://www.x.org/archive/individual/lib/libXau-${XAU_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f libXau-${XAU_VERSION}.tar.gz && \ ./configure --srcdir=${DIR} --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -397,7 +398,7 @@ RUN \ curl -sLO https://xcb.freedesktop.org/dist/libpthread-stubs-${LIBPTHREAD_STUBS_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f libpthread-stubs-${LIBPTHREAD_STUBS_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -409,7 +410,7 @@ RUN \ tar -zx --strip-components=1 -f xcb-proto-${XCBPROTO_VERSION}.tar.gz && \ ACLOCAL_PATH="${PREFIX}/share/aclocal" ./autogen.sh && \ ./configure --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -421,7 +422,7 @@ RUN \ tar -zx --strip-components=1 -f libxcb-${LIBXCB_VERSION}.tar.gz && \ ACLOCAL_PATH="${PREFIX}/share/aclocal" ./autogen.sh && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -434,7 +435,7 @@ RUN \ echo ${LIBXML2_SHA256SUM} | sha256sum --check && \ tar -xz --strip-components=1 -f libxml2-v${LIBXML2_VERSION}.tar.gz && \ ./autogen.sh --prefix="${PREFIX}" --with-ftp=no --with-http=no --with-python=no && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -447,7 +448,7 @@ RUN \ echo ${LIBBLURAY_SHA256SUM} | sha256sum --check && \ tar -jx --strip-components=1 -f libbluray-${LIBBLURAY_VERSION}.tar.bz2 && \ ./configure --prefix="${PREFIX}" --disable-examples --disable-bdjava-jar --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -461,7 +462,7 @@ RUN \ tar -xz --strip-components=1 -f v${LIBZMQ_VERSION}.tar.gz && \ ./autogen.sh && \ ./configure --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make check && \ make install && \ rm -rf ${DIR} @@ -474,7 +475,7 @@ RUN \ curl -sLO https://github.com/Haivision/srt/archive/v${LIBSRT_VERSION}.tar.gz && \ tar -xz --strip-components=1 -f v${LIBSRT_VERSION}.tar.gz && \ cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -486,7 +487,7 @@ RUN \ git clone https://git.code.sf.net/p/libpng/code ${DIR} -b v${LIBPNG_VERSION} --depth 1 && \ ./autogen.sh && \ ./configure --prefix="${PREFIX}" && \ - make check && \ + make check -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -500,7 +501,20 @@ RUN \ tar -xz --strip-components=1 -f v${LIBARIBB24_VERSION}.tar.gz && \ autoreconf -fiv && \ ./configure CFLAGS="-I${PREFIX}/include -fPIC" --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ + make install && \ + rm -rf ${DIR} + + +## libsvtav1 +RUN \ + DIR=/tmp/svtav1 && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + git clone https://gitlab.com/AOMediaCodec/SVT-AV1.git ${DIR} --depth=1 -b ${LIBSTVAV1_VERSION} &&\ + cd Build && \ + cmake .. -G"Unix Makefiles" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="${PREFIX}" && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -551,7 +565,7 @@ RUN \ --enable-libkvazaar \ --extra-cflags="-I${PREFIX}/include" \ --extra-ldflags="-L${PREFIX}/lib" && \ - make && \ + make -j $(nproc) && \ 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..cd2f4ac81 100644 --- a/docker-images/3.2/centos7/Dockerfile +++ b/docker-images/3.2/centos7/Dockerfile @@ -16,7 +16,8 @@ FROM base AS build WORKDIR /tmp/workdir ENV FFMPEG_VERSION=3.2.15 \ - AOM_VERSION=v1.0.0 \ + LIBSTVAV1_VERSION=v0.8.7 \ + AOM_VERSION=v3.1.3 \ FDKAAC_VERSION=0.1.5 \ FONTCONFIG_VERSION=2.12.4 \ FREETYPE_VERSION=2.10.4 \ @@ -160,7 +161,7 @@ RUN \ curl -sL https://versaweb.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${OPENCOREAMR_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## x264 http://www.videolan.org/developers/x264.html @@ -171,7 +172,7 @@ RUN \ curl -sL https://download.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-${X264_VERSION}.tar.bz2 | \ tar -jx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared --enable-pic --disable-cli && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### x265 http://x265.org/ @@ -185,7 +186,7 @@ RUN \ sed -i "/-DEXTRA_LIB/ s/$/ -DCMAKE_INSTALL_PREFIX=\${PREFIX}/" multilib.sh && \ sed -i "/^cmake/ s/$/ -DENABLE_CLI=OFF/" multilib.sh && \ ./multilib.sh && \ - make -C 8bit install && \ + make -C 8bit -j $(nproc) install && \ rm -rf ${DIR} ### libogg https://www.xiph.org/ogg/ RUN \ @@ -196,7 +197,7 @@ RUN \ echo ${OGG_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f libogg-${OGG_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libopus https://www.opus-codec.org/ @@ -209,7 +210,7 @@ RUN \ tar -zx --strip-components=1 -f opus-${OPUS_VERSION}.tar.gz && \ autoreconf -fiv && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libvorbis https://xiph.org/vorbis/ @@ -221,7 +222,7 @@ RUN \ echo ${VORBIS_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f libvorbis-${VORBIS_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libtheora http://www.theora.org/ @@ -233,7 +234,7 @@ RUN \ echo ${THEORA_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f libtheora-${THEORA_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libvpx https://www.webmproject.org/code/ @@ -245,7 +246,7 @@ RUN \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-vp8 --enable-vp9 --enable-vp9-highbitdepth --enable-pic --enable-shared \ --disable-debug --disable-examples --disable-docs --disable-install-bins && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libwebp https://developers.google.com/speed/webp/ @@ -256,7 +257,7 @@ RUN \ curl -sL https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-${WEBP_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libmp3lame http://lame.sourceforge.net/ @@ -267,7 +268,7 @@ RUN \ curl -sL https://versaweb.dl.sourceforge.net/project/lame/lame/$(echo ${LAME_VERSION} | sed -e 's/[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)/\1.\2/')/lame-${LAME_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" --enable-shared --enable-nasm --disable-frontend && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### xvid https://www.xvid.com/ @@ -280,7 +281,7 @@ RUN \ tar -zx -f xvidcore-${XVID_VERSION}.tar.gz && \ cd xvidcore/build/generic && \ ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### fdk-aac https://github.com/mstorsjo/fdk-aac @@ -292,7 +293,7 @@ RUN \ tar -zx --strip-components=1 && \ autoreconf -fiv && \ ./configure --prefix="${PREFIX}" --enable-shared --datadir="${DIR}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## openjpeg https://github.com/uclouvain/openjpeg @@ -303,7 +304,7 @@ RUN \ curl -sL https://github.com/uclouvain/openjpeg/archive/v${OPENJPEG_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ cmake -DBUILD_THIRDPARTY:BOOL=ON -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## freetype https://www.freetype.org/ @@ -315,7 +316,7 @@ RUN \ echo ${FREETYPE_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f freetype-${FREETYPE_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## libvstab https://github.com/georgmartius/vid.stab @@ -327,7 +328,7 @@ RUN \ echo ${LIBVIDSTAB_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f v${LIBVIDSTAB_VERSION}.tar.gz && \ cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## fridibi https://www.fribidi.org/ @@ -352,7 +353,7 @@ RUN \ curl -sLO https://www.freedesktop.org/software/fontconfig/release/fontconfig-${FONTCONFIG_VERSION}.tar.bz2 && \ tar -jx --strip-components=1 -f fontconfig-${FONTCONFIG_VERSION}.tar.bz2 && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## libass https://github.com/libass/libass @@ -365,7 +366,7 @@ RUN \ tar -zx --strip-components=1 -f ${LIBASS_VERSION}.tar.gz && \ ./autogen.sh && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## kvazaar https://github.com/ultravideo/kvazaar @@ -389,7 +390,7 @@ RUN \ mkdir -p ./aom_build ; \ cd ./aom_build ; \ cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" -DBUILD_SHARED_LIBS=1 ..; \ - make ; \ + make -j $(nproc); \ make install ; \ rm -rf ${DIR} @@ -401,7 +402,7 @@ RUN \ curl -sLO https://www.x.org/archive//individual/util/util-macros-${XORG_MACROS_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f util-macros-${XORG_MACROS_VERSION}.tar.gz && \ ./configure --srcdir=${DIR} --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -412,7 +413,7 @@ RUN \ curl -sLO https://www.x.org/archive/individual/proto/xproto-${XPROTO_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f xproto-${XPROTO_VERSION}.tar.gz && \ ./configure --srcdir=${DIR} --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -423,7 +424,7 @@ RUN \ curl -sLO https://www.x.org/archive/individual/lib/libXau-${XAU_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f libXau-${XAU_VERSION}.tar.gz && \ ./configure --srcdir=${DIR} --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -434,7 +435,7 @@ RUN \ curl -sLO https://xcb.freedesktop.org/dist/libpthread-stubs-${LIBPTHREAD_STUBS_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f libpthread-stubs-${LIBPTHREAD_STUBS_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -446,7 +447,7 @@ RUN \ tar -zx --strip-components=1 -f xcb-proto-${XCBPROTO_VERSION}.tar.gz && \ ACLOCAL_PATH="${PREFIX}/share/aclocal" ./autogen.sh && \ ./configure --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -458,7 +459,7 @@ RUN \ tar -zx --strip-components=1 -f libxcb-${LIBXCB_VERSION}.tar.gz && \ ACLOCAL_PATH="${PREFIX}/share/aclocal" ./autogen.sh && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -471,7 +472,7 @@ RUN \ echo ${LIBXML2_SHA256SUM} | sha256sum --check && \ tar -xz --strip-components=1 -f libxml2-v${LIBXML2_VERSION}.tar.gz && \ ./autogen.sh --prefix="${PREFIX}" --with-ftp=no --with-http=no --with-python=no && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -484,7 +485,7 @@ RUN \ echo ${LIBBLURAY_SHA256SUM} | sha256sum --check && \ tar -jx --strip-components=1 -f libbluray-${LIBBLURAY_VERSION}.tar.bz2 && \ ./configure --prefix="${PREFIX}" --disable-examples --disable-bdjava-jar --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -498,7 +499,7 @@ RUN \ tar -xz --strip-components=1 -f v${LIBZMQ_VERSION}.tar.gz && \ ./autogen.sh && \ ./configure --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make check && \ make install && \ rm -rf ${DIR} @@ -511,7 +512,7 @@ RUN \ curl -sLO https://github.com/Haivision/srt/archive/v${LIBSRT_VERSION}.tar.gz && \ tar -xz --strip-components=1 -f v${LIBSRT_VERSION}.tar.gz && \ cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -523,7 +524,7 @@ RUN \ git clone https://git.code.sf.net/p/libpng/code ${DIR} -b v${LIBPNG_VERSION} --depth 1 && \ ./autogen.sh && \ ./configure --prefix="${PREFIX}" && \ - make check && \ + make check -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -537,7 +538,20 @@ RUN \ tar -xz --strip-components=1 -f v${LIBARIBB24_VERSION}.tar.gz && \ autoreconf -fiv && \ ./configure CFLAGS="-I${PREFIX}/include -fPIC" --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ + make install && \ + rm -rf ${DIR} + + +## libsvtav1 +RUN \ + DIR=/tmp/svtav1 && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + git clone https://gitlab.com/AOMediaCodec/SVT-AV1.git ${DIR} --depth=1 -b ${LIBSTVAV1_VERSION} &&\ + cd Build && \ + cmake .. -G"Unix Makefiles" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="${PREFIX}" && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -588,7 +602,7 @@ RUN \ --enable-libkvazaar \ --extra-cflags="-I${PREFIX}/include" \ --extra-ldflags="-L${PREFIX}/lib" && \ - make && \ + make -j $(nproc) && \ 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..ed2782d76 100644 --- a/docker-images/3.2/scratch38/Dockerfile +++ b/docker-images/3.2/scratch38/Dockerfile @@ -9,7 +9,8 @@ FROM alpine:3.8 AS build WORKDIR /tmp/workdir ENV FFMPEG_VERSION=3.2.15 \ - AOM_VERSION=v1.0.0 \ + LIBSTVAV1_VERSION=v0.8.7 \ + AOM_VERSION=v3.1.3 \ FDKAAC_VERSION=0.1.5 \ FONTCONFIG_VERSION=2.12.4 \ FREETYPE_VERSION=2.10.4 \ @@ -125,7 +126,7 @@ RUN \ curl -sL https://versaweb.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${OPENCOREAMR_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## x264 http://www.videolan.org/developers/x264.html @@ -136,7 +137,7 @@ RUN \ curl -sL https://download.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-${X264_VERSION}.tar.bz2 | \ tar -jx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared --enable-pic --disable-cli && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### x265 http://x265.org/ @@ -150,7 +151,7 @@ RUN \ sed -i "/-DEXTRA_LIB/ s/$/ -DCMAKE_INSTALL_PREFIX=\${PREFIX}/" multilib.sh && \ sed -i "/^cmake/ s/$/ -DENABLE_CLI=OFF/" multilib.sh && \ ./multilib.sh && \ - make -C 8bit install && \ + make -C 8bit -j $(nproc) install && \ rm -rf ${DIR} ### libogg https://www.xiph.org/ogg/ RUN \ @@ -161,7 +162,7 @@ RUN \ echo ${OGG_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f libogg-${OGG_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libopus https://www.opus-codec.org/ @@ -174,7 +175,7 @@ RUN \ tar -zx --strip-components=1 -f opus-${OPUS_VERSION}.tar.gz && \ autoreconf -fiv && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libvorbis https://xiph.org/vorbis/ @@ -186,7 +187,7 @@ RUN \ echo ${VORBIS_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f libvorbis-${VORBIS_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libtheora http://www.theora.org/ @@ -198,7 +199,7 @@ RUN \ echo ${THEORA_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f libtheora-${THEORA_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libvpx https://www.webmproject.org/code/ @@ -210,7 +211,7 @@ RUN \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-vp8 --enable-vp9 --enable-vp9-highbitdepth --enable-pic --enable-shared \ --disable-debug --disable-examples --disable-docs --disable-install-bins && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libwebp https://developers.google.com/speed/webp/ @@ -221,7 +222,7 @@ RUN \ curl -sL https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-${WEBP_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libmp3lame http://lame.sourceforge.net/ @@ -232,7 +233,7 @@ RUN \ curl -sL https://versaweb.dl.sourceforge.net/project/lame/lame/$(echo ${LAME_VERSION} | sed -e 's/[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)/\1.\2/')/lame-${LAME_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" --enable-shared --enable-nasm --disable-frontend && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### xvid https://www.xvid.com/ @@ -245,7 +246,7 @@ RUN \ tar -zx -f xvidcore-${XVID_VERSION}.tar.gz && \ cd xvidcore/build/generic && \ ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### fdk-aac https://github.com/mstorsjo/fdk-aac @@ -257,7 +258,7 @@ RUN \ tar -zx --strip-components=1 && \ autoreconf -fiv && \ ./configure --prefix="${PREFIX}" --enable-shared --datadir="${DIR}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## openjpeg https://github.com/uclouvain/openjpeg @@ -268,7 +269,7 @@ RUN \ curl -sL https://github.com/uclouvain/openjpeg/archive/v${OPENJPEG_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ cmake -DBUILD_THIRDPARTY:BOOL=ON -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## freetype https://www.freetype.org/ @@ -280,7 +281,7 @@ RUN \ echo ${FREETYPE_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f freetype-${FREETYPE_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## libvstab https://github.com/georgmartius/vid.stab @@ -292,7 +293,7 @@ RUN \ echo ${LIBVIDSTAB_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f v${LIBVIDSTAB_VERSION}.tar.gz && \ cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## fridibi https://www.fribidi.org/ @@ -317,7 +318,7 @@ RUN \ curl -sLO https://www.freedesktop.org/software/fontconfig/release/fontconfig-${FONTCONFIG_VERSION}.tar.bz2 && \ tar -jx --strip-components=1 -f fontconfig-${FONTCONFIG_VERSION}.tar.bz2 && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## libass https://github.com/libass/libass @@ -330,7 +331,7 @@ RUN \ tar -zx --strip-components=1 -f ${LIBASS_VERSION}.tar.gz && \ ./autogen.sh && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## kvazaar https://github.com/ultravideo/kvazaar @@ -354,7 +355,7 @@ RUN \ mkdir -p ./aom_build ; \ cd ./aom_build ; \ cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" -DBUILD_SHARED_LIBS=1 ..; \ - make ; \ + make -j $(nproc); \ make install ; \ rm -rf ${DIR} @@ -366,7 +367,7 @@ RUN \ curl -sLO https://www.x.org/archive//individual/util/util-macros-${XORG_MACROS_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f util-macros-${XORG_MACROS_VERSION}.tar.gz && \ ./configure --srcdir=${DIR} --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -377,7 +378,7 @@ RUN \ curl -sLO https://www.x.org/archive/individual/proto/xproto-${XPROTO_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f xproto-${XPROTO_VERSION}.tar.gz && \ ./configure --srcdir=${DIR} --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -388,7 +389,7 @@ RUN \ curl -sLO https://www.x.org/archive/individual/lib/libXau-${XAU_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f libXau-${XAU_VERSION}.tar.gz && \ ./configure --srcdir=${DIR} --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -399,7 +400,7 @@ RUN \ curl -sLO https://xcb.freedesktop.org/dist/libpthread-stubs-${LIBPTHREAD_STUBS_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f libpthread-stubs-${LIBPTHREAD_STUBS_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -411,7 +412,7 @@ RUN \ tar -zx --strip-components=1 -f xcb-proto-${XCBPROTO_VERSION}.tar.gz && \ ACLOCAL_PATH="${PREFIX}/share/aclocal" ./autogen.sh && \ ./configure --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -423,7 +424,7 @@ RUN \ tar -zx --strip-components=1 -f libxcb-${LIBXCB_VERSION}.tar.gz && \ ACLOCAL_PATH="${PREFIX}/share/aclocal" ./autogen.sh && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -436,7 +437,7 @@ RUN \ echo ${LIBXML2_SHA256SUM} | sha256sum --check && \ tar -xz --strip-components=1 -f libxml2-v${LIBXML2_VERSION}.tar.gz && \ ./autogen.sh --prefix="${PREFIX}" --with-ftp=no --with-http=no --with-python=no && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -449,7 +450,7 @@ RUN \ echo ${LIBBLURAY_SHA256SUM} | sha256sum --check && \ tar -jx --strip-components=1 -f libbluray-${LIBBLURAY_VERSION}.tar.bz2 && \ ./configure --prefix="${PREFIX}" --disable-examples --disable-bdjava-jar --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -463,7 +464,7 @@ RUN \ tar -xz --strip-components=1 -f v${LIBZMQ_VERSION}.tar.gz && \ ./autogen.sh && \ ./configure --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make check && \ make install && \ rm -rf ${DIR} @@ -476,7 +477,7 @@ RUN \ curl -sLO https://github.com/Haivision/srt/archive/v${LIBSRT_VERSION}.tar.gz && \ tar -xz --strip-components=1 -f v${LIBSRT_VERSION}.tar.gz && \ cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -488,7 +489,7 @@ RUN \ git clone https://git.code.sf.net/p/libpng/code ${DIR} -b v${LIBPNG_VERSION} --depth 1 && \ ./autogen.sh && \ ./configure --prefix="${PREFIX}" && \ - make check && \ + make check -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -502,7 +503,20 @@ RUN \ tar -xz --strip-components=1 -f v${LIBARIBB24_VERSION}.tar.gz && \ autoreconf -fiv && \ ./configure CFLAGS="-I${PREFIX}/include -fPIC" --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ + make install && \ + rm -rf ${DIR} + + +## libsvtav1 +RUN \ + DIR=/tmp/svtav1 && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + git clone https://gitlab.com/AOMediaCodec/SVT-AV1.git ${DIR} --depth=1 -b ${LIBSTVAV1_VERSION} &&\ + cd Build && \ + cmake .. -G"Unix Makefiles" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="${PREFIX}" && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -553,7 +567,7 @@ RUN \ --enable-libkvazaar \ --extra-cflags="-I${PREFIX}/include" \ --extra-ldflags="-L${PREFIX}/lib" && \ - make && \ + make -j $(nproc) && \ 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..2fbd0444b 100644 --- a/docker-images/3.2/ubuntu2004/Dockerfile +++ b/docker-images/3.2/ubuntu2004/Dockerfile @@ -17,7 +17,8 @@ RUN apt-get -yqq update && \ FROM base as build ENV FFMPEG_VERSION=3.2.15 \ - AOM_VERSION=v1.0.0 \ + LIBSTVAV1_VERSION=v0.8.7 \ + AOM_VERSION=v3.1.3 \ FDKAAC_VERSION=0.1.5 \ FONTCONFIG_VERSION=2.12.4 \ FREETYPE_VERSION=2.10.4 \ @@ -127,7 +128,7 @@ RUN \ curl -sL https://versaweb.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${OPENCOREAMR_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## x264 http://www.videolan.org/developers/x264.html @@ -138,7 +139,7 @@ RUN \ curl -sL https://download.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-${X264_VERSION}.tar.bz2 | \ tar -jx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared --enable-pic --disable-cli && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### x265 http://x265.org/ @@ -152,7 +153,7 @@ RUN \ sed -i "/-DEXTRA_LIB/ s/$/ -DCMAKE_INSTALL_PREFIX=\${PREFIX}/" multilib.sh && \ sed -i "/^cmake/ s/$/ -DENABLE_CLI=OFF/" multilib.sh && \ ./multilib.sh && \ - make -C 8bit install && \ + make -C 8bit -j $(nproc) install && \ rm -rf ${DIR} ### libogg https://www.xiph.org/ogg/ RUN \ @@ -163,7 +164,7 @@ RUN \ echo ${OGG_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f libogg-${OGG_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libopus https://www.opus-codec.org/ @@ -176,7 +177,7 @@ RUN \ tar -zx --strip-components=1 -f opus-${OPUS_VERSION}.tar.gz && \ autoreconf -fiv && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libvorbis https://xiph.org/vorbis/ @@ -188,7 +189,7 @@ RUN \ echo ${VORBIS_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f libvorbis-${VORBIS_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libtheora http://www.theora.org/ @@ -200,7 +201,7 @@ RUN \ echo ${THEORA_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f libtheora-${THEORA_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libvpx https://www.webmproject.org/code/ @@ -212,7 +213,7 @@ RUN \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-vp8 --enable-vp9 --enable-vp9-highbitdepth --enable-pic --enable-shared \ --disable-debug --disable-examples --disable-docs --disable-install-bins && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libwebp https://developers.google.com/speed/webp/ @@ -223,7 +224,7 @@ RUN \ curl -sL https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-${WEBP_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libmp3lame http://lame.sourceforge.net/ @@ -234,7 +235,7 @@ RUN \ curl -sL https://versaweb.dl.sourceforge.net/project/lame/lame/$(echo ${LAME_VERSION} | sed -e 's/[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)/\1.\2/')/lame-${LAME_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" --enable-shared --enable-nasm --disable-frontend && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### xvid https://www.xvid.com/ @@ -247,7 +248,7 @@ RUN \ tar -zx -f xvidcore-${XVID_VERSION}.tar.gz && \ cd xvidcore/build/generic && \ ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### fdk-aac https://github.com/mstorsjo/fdk-aac @@ -259,7 +260,7 @@ RUN \ tar -zx --strip-components=1 && \ autoreconf -fiv && \ ./configure --prefix="${PREFIX}" --enable-shared --datadir="${DIR}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## openjpeg https://github.com/uclouvain/openjpeg @@ -270,7 +271,7 @@ RUN \ curl -sL https://github.com/uclouvain/openjpeg/archive/v${OPENJPEG_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ cmake -DBUILD_THIRDPARTY:BOOL=ON -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## freetype https://www.freetype.org/ @@ -282,7 +283,7 @@ RUN \ echo ${FREETYPE_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f freetype-${FREETYPE_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## libvstab https://github.com/georgmartius/vid.stab @@ -294,7 +295,7 @@ RUN \ echo ${LIBVIDSTAB_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f v${LIBVIDSTAB_VERSION}.tar.gz && \ cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## fridibi https://www.fribidi.org/ @@ -319,7 +320,7 @@ RUN \ curl -sLO https://www.freedesktop.org/software/fontconfig/release/fontconfig-${FONTCONFIG_VERSION}.tar.bz2 && \ tar -jx --strip-components=1 -f fontconfig-${FONTCONFIG_VERSION}.tar.bz2 && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## libass https://github.com/libass/libass @@ -332,7 +333,7 @@ RUN \ tar -zx --strip-components=1 -f ${LIBASS_VERSION}.tar.gz && \ ./autogen.sh && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## kvazaar https://github.com/ultravideo/kvazaar @@ -356,7 +357,7 @@ RUN \ mkdir -p ./aom_build ; \ cd ./aom_build ; \ cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" -DBUILD_SHARED_LIBS=1 ..; \ - make ; \ + make -j $(nproc); \ make install ; \ rm -rf ${DIR} @@ -368,7 +369,7 @@ RUN \ curl -sLO https://www.x.org/archive//individual/util/util-macros-${XORG_MACROS_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f util-macros-${XORG_MACROS_VERSION}.tar.gz && \ ./configure --srcdir=${DIR} --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -379,7 +380,7 @@ RUN \ curl -sLO https://www.x.org/archive/individual/proto/xproto-${XPROTO_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f xproto-${XPROTO_VERSION}.tar.gz && \ ./configure --srcdir=${DIR} --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -390,7 +391,7 @@ RUN \ curl -sLO https://www.x.org/archive/individual/lib/libXau-${XAU_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f libXau-${XAU_VERSION}.tar.gz && \ ./configure --srcdir=${DIR} --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -401,7 +402,7 @@ RUN \ curl -sLO https://xcb.freedesktop.org/dist/libpthread-stubs-${LIBPTHREAD_STUBS_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f libpthread-stubs-${LIBPTHREAD_STUBS_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -413,7 +414,7 @@ RUN \ tar -zx --strip-components=1 -f xcb-proto-${XCBPROTO_VERSION}.tar.gz && \ ACLOCAL_PATH="${PREFIX}/share/aclocal" ./autogen.sh && \ ./configure --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -425,7 +426,7 @@ RUN \ tar -zx --strip-components=1 -f libxcb-${LIBXCB_VERSION}.tar.gz && \ ACLOCAL_PATH="${PREFIX}/share/aclocal" ./autogen.sh && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -438,7 +439,7 @@ RUN \ echo ${LIBXML2_SHA256SUM} | sha256sum --check && \ tar -xz --strip-components=1 -f libxml2-v${LIBXML2_VERSION}.tar.gz && \ ./autogen.sh --prefix="${PREFIX}" --with-ftp=no --with-http=no --with-python=no && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -451,7 +452,7 @@ RUN \ echo ${LIBBLURAY_SHA256SUM} | sha256sum --check && \ tar -jx --strip-components=1 -f libbluray-${LIBBLURAY_VERSION}.tar.bz2 && \ ./configure --prefix="${PREFIX}" --disable-examples --disable-bdjava-jar --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -465,7 +466,7 @@ RUN \ tar -xz --strip-components=1 -f v${LIBZMQ_VERSION}.tar.gz && \ ./autogen.sh && \ ./configure --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make check && \ make install && \ rm -rf ${DIR} @@ -478,7 +479,7 @@ RUN \ curl -sLO https://github.com/Haivision/srt/archive/v${LIBSRT_VERSION}.tar.gz && \ tar -xz --strip-components=1 -f v${LIBSRT_VERSION}.tar.gz && \ cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -490,7 +491,7 @@ RUN \ git clone https://git.code.sf.net/p/libpng/code ${DIR} -b v${LIBPNG_VERSION} --depth 1 && \ ./autogen.sh && \ ./configure --prefix="${PREFIX}" && \ - make check && \ + make check -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -504,7 +505,20 @@ RUN \ tar -xz --strip-components=1 -f v${LIBARIBB24_VERSION}.tar.gz && \ autoreconf -fiv && \ ./configure CFLAGS="-I${PREFIX}/include -fPIC" --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ + make install && \ + rm -rf ${DIR} + + +## libsvtav1 +RUN \ + DIR=/tmp/svtav1 && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + git clone https://gitlab.com/AOMediaCodec/SVT-AV1.git ${DIR} --depth=1 -b ${LIBSTVAV1_VERSION} &&\ + cd Build && \ + cmake .. -G"Unix Makefiles" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="${PREFIX}" && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -555,7 +569,7 @@ RUN \ --enable-libkvazaar \ --extra-cflags="-I${PREFIX}/include" \ --extra-ldflags="-L${PREFIX}/lib" && \ - make && \ + make -j $(nproc) && \ 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..617c61e8d 100644 --- a/docker-images/3.2/vaapi2004/Dockerfile +++ b/docker-images/3.2/vaapi2004/Dockerfile @@ -17,7 +17,8 @@ RUN apt-get -yqq update && \ FROM base as build ENV FFMPEG_VERSION=3.2.15 \ - AOM_VERSION=v1.0.0 \ + LIBSTVAV1_VERSION=v0.8.7 \ + AOM_VERSION=v3.1.3 \ FDKAAC_VERSION=0.1.5 \ FONTCONFIG_VERSION=2.12.4 \ FREETYPE_VERSION=2.10.4 \ @@ -128,7 +129,7 @@ RUN \ curl -sL https://versaweb.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${OPENCOREAMR_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## x264 http://www.videolan.org/developers/x264.html @@ -139,7 +140,7 @@ RUN \ curl -sL https://download.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-${X264_VERSION}.tar.bz2 | \ tar -jx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared --enable-pic --disable-cli && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### x265 http://x265.org/ @@ -153,7 +154,7 @@ RUN \ sed -i "/-DEXTRA_LIB/ s/$/ -DCMAKE_INSTALL_PREFIX=\${PREFIX}/" multilib.sh && \ sed -i "/^cmake/ s/$/ -DENABLE_CLI=OFF/" multilib.sh && \ ./multilib.sh && \ - make -C 8bit install && \ + make -C 8bit -j $(nproc) install && \ rm -rf ${DIR} ### libogg https://www.xiph.org/ogg/ RUN \ @@ -164,7 +165,7 @@ RUN \ echo ${OGG_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f libogg-${OGG_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libopus https://www.opus-codec.org/ @@ -177,7 +178,7 @@ RUN \ tar -zx --strip-components=1 -f opus-${OPUS_VERSION}.tar.gz && \ autoreconf -fiv && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libvorbis https://xiph.org/vorbis/ @@ -189,7 +190,7 @@ RUN \ echo ${VORBIS_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f libvorbis-${VORBIS_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libtheora http://www.theora.org/ @@ -201,7 +202,7 @@ RUN \ echo ${THEORA_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f libtheora-${THEORA_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libvpx https://www.webmproject.org/code/ @@ -213,7 +214,7 @@ RUN \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-vp8 --enable-vp9 --enable-vp9-highbitdepth --enable-pic --enable-shared \ --disable-debug --disable-examples --disable-docs --disable-install-bins && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libwebp https://developers.google.com/speed/webp/ @@ -224,7 +225,7 @@ RUN \ curl -sL https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-${WEBP_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libmp3lame http://lame.sourceforge.net/ @@ -235,7 +236,7 @@ RUN \ curl -sL https://versaweb.dl.sourceforge.net/project/lame/lame/$(echo ${LAME_VERSION} | sed -e 's/[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)/\1.\2/')/lame-${LAME_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" --enable-shared --enable-nasm --disable-frontend && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### xvid https://www.xvid.com/ @@ -248,7 +249,7 @@ RUN \ tar -zx -f xvidcore-${XVID_VERSION}.tar.gz && \ cd xvidcore/build/generic && \ ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### fdk-aac https://github.com/mstorsjo/fdk-aac @@ -260,7 +261,7 @@ RUN \ tar -zx --strip-components=1 && \ autoreconf -fiv && \ ./configure --prefix="${PREFIX}" --enable-shared --datadir="${DIR}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## openjpeg https://github.com/uclouvain/openjpeg @@ -271,7 +272,7 @@ RUN \ curl -sL https://github.com/uclouvain/openjpeg/archive/v${OPENJPEG_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ cmake -DBUILD_THIRDPARTY:BOOL=ON -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## freetype https://www.freetype.org/ @@ -283,7 +284,7 @@ RUN \ echo ${FREETYPE_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f freetype-${FREETYPE_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## libvstab https://github.com/georgmartius/vid.stab @@ -295,7 +296,7 @@ RUN \ echo ${LIBVIDSTAB_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f v${LIBVIDSTAB_VERSION}.tar.gz && \ cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## fridibi https://www.fribidi.org/ @@ -320,7 +321,7 @@ RUN \ curl -sLO https://www.freedesktop.org/software/fontconfig/release/fontconfig-${FONTCONFIG_VERSION}.tar.bz2 && \ tar -jx --strip-components=1 -f fontconfig-${FONTCONFIG_VERSION}.tar.bz2 && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## libass https://github.com/libass/libass @@ -333,7 +334,7 @@ RUN \ tar -zx --strip-components=1 -f ${LIBASS_VERSION}.tar.gz && \ ./autogen.sh && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## kvazaar https://github.com/ultravideo/kvazaar @@ -357,7 +358,7 @@ RUN \ mkdir -p ./aom_build ; \ cd ./aom_build ; \ cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" -DBUILD_SHARED_LIBS=1 ..; \ - make ; \ + make -j $(nproc); \ make install ; \ rm -rf ${DIR} @@ -369,7 +370,7 @@ RUN \ curl -sLO https://www.x.org/archive//individual/util/util-macros-${XORG_MACROS_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f util-macros-${XORG_MACROS_VERSION}.tar.gz && \ ./configure --srcdir=${DIR} --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -380,7 +381,7 @@ RUN \ curl -sLO https://www.x.org/archive/individual/proto/xproto-${XPROTO_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f xproto-${XPROTO_VERSION}.tar.gz && \ ./configure --srcdir=${DIR} --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -391,7 +392,7 @@ RUN \ curl -sLO https://www.x.org/archive/individual/lib/libXau-${XAU_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f libXau-${XAU_VERSION}.tar.gz && \ ./configure --srcdir=${DIR} --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -402,7 +403,7 @@ RUN \ curl -sLO https://xcb.freedesktop.org/dist/libpthread-stubs-${LIBPTHREAD_STUBS_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f libpthread-stubs-${LIBPTHREAD_STUBS_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -414,7 +415,7 @@ RUN \ tar -zx --strip-components=1 -f xcb-proto-${XCBPROTO_VERSION}.tar.gz && \ ACLOCAL_PATH="${PREFIX}/share/aclocal" ./autogen.sh && \ ./configure --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -426,7 +427,7 @@ RUN \ tar -zx --strip-components=1 -f libxcb-${LIBXCB_VERSION}.tar.gz && \ ACLOCAL_PATH="${PREFIX}/share/aclocal" ./autogen.sh && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -439,7 +440,7 @@ RUN \ echo ${LIBXML2_SHA256SUM} | sha256sum --check && \ tar -xz --strip-components=1 -f libxml2-v${LIBXML2_VERSION}.tar.gz && \ ./autogen.sh --prefix="${PREFIX}" --with-ftp=no --with-http=no --with-python=no && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -452,7 +453,7 @@ RUN \ echo ${LIBBLURAY_SHA256SUM} | sha256sum --check && \ tar -jx --strip-components=1 -f libbluray-${LIBBLURAY_VERSION}.tar.bz2 && \ ./configure --prefix="${PREFIX}" --disable-examples --disable-bdjava-jar --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -466,7 +467,7 @@ RUN \ tar -xz --strip-components=1 -f v${LIBZMQ_VERSION}.tar.gz && \ ./autogen.sh && \ ./configure --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make check && \ make install && \ rm -rf ${DIR} @@ -479,7 +480,7 @@ RUN \ curl -sLO https://github.com/Haivision/srt/archive/v${LIBSRT_VERSION}.tar.gz && \ tar -xz --strip-components=1 -f v${LIBSRT_VERSION}.tar.gz && \ cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -491,7 +492,7 @@ RUN \ git clone https://git.code.sf.net/p/libpng/code ${DIR} -b v${LIBPNG_VERSION} --depth 1 && \ ./autogen.sh && \ ./configure --prefix="${PREFIX}" && \ - make check && \ + make check -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -505,7 +506,20 @@ RUN \ tar -xz --strip-components=1 -f v${LIBARIBB24_VERSION}.tar.gz && \ autoreconf -fiv && \ ./configure CFLAGS="-I${PREFIX}/include -fPIC" --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ + make install && \ + rm -rf ${DIR} + + +## libsvtav1 +RUN \ + DIR=/tmp/svtav1 && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + git clone https://gitlab.com/AOMediaCodec/SVT-AV1.git ${DIR} --depth=1 -b ${LIBSTVAV1_VERSION} &&\ + cd Build && \ + cmake .. -G"Unix Makefiles" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="${PREFIX}" && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -557,7 +571,7 @@ RUN \ --enable-vaapi \ --extra-cflags="-I${PREFIX}/include" \ --extra-ldflags="-L${PREFIX}/lib" && \ - make && \ + make -j $(nproc) && \ 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..cce3db193 100644 --- a/docker-images/3.3/alpine312/Dockerfile +++ b/docker-images/3.3/alpine312/Dockerfile @@ -14,7 +14,8 @@ FROM base AS build WORKDIR /tmp/workdir ENV FFMPEG_VERSION=3.3.9 \ - AOM_VERSION=v1.0.0 \ + LIBSTVAV1_VERSION=v0.8.7 \ + AOM_VERSION=v3.1.3 \ FDKAAC_VERSION=0.1.5 \ FONTCONFIG_VERSION=2.12.4 \ FREETYPE_VERSION=2.10.4 \ @@ -93,6 +94,8 @@ RUN buildDeps="autoconf \ yasm \ nasm \ zlib-dev \ + meson \ + xxd \ expat-dev" && \ apk add --no-cache --update ${buildDeps} ## libvmaf https://github.com/Netflix/vmaf @@ -123,7 +126,7 @@ RUN \ curl -sL https://versaweb.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${OPENCOREAMR_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## x264 http://www.videolan.org/developers/x264.html @@ -134,7 +137,7 @@ RUN \ curl -sL https://download.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-${X264_VERSION}.tar.bz2 | \ tar -jx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared --enable-pic --disable-cli && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### x265 http://x265.org/ @@ -148,7 +151,7 @@ RUN \ sed -i "/-DEXTRA_LIB/ s/$/ -DCMAKE_INSTALL_PREFIX=\${PREFIX}/" multilib.sh && \ sed -i "/^cmake/ s/$/ -DENABLE_CLI=OFF/" multilib.sh && \ ./multilib.sh && \ - make -C 8bit install && \ + make -C 8bit -j $(nproc) install && \ rm -rf ${DIR} ### libogg https://www.xiph.org/ogg/ RUN \ @@ -159,7 +162,7 @@ RUN \ echo ${OGG_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f libogg-${OGG_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libopus https://www.opus-codec.org/ @@ -172,7 +175,7 @@ RUN \ tar -zx --strip-components=1 -f opus-${OPUS_VERSION}.tar.gz && \ autoreconf -fiv && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libvorbis https://xiph.org/vorbis/ @@ -184,7 +187,7 @@ RUN \ echo ${VORBIS_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f libvorbis-${VORBIS_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libtheora http://www.theora.org/ @@ -196,7 +199,7 @@ RUN \ echo ${THEORA_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f libtheora-${THEORA_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libvpx https://www.webmproject.org/code/ @@ -208,7 +211,7 @@ RUN \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-vp8 --enable-vp9 --enable-vp9-highbitdepth --enable-pic --enable-shared \ --disable-debug --disable-examples --disable-docs --disable-install-bins && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libwebp https://developers.google.com/speed/webp/ @@ -219,7 +222,7 @@ RUN \ curl -sL https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-${WEBP_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libmp3lame http://lame.sourceforge.net/ @@ -230,7 +233,7 @@ RUN \ curl -sL https://versaweb.dl.sourceforge.net/project/lame/lame/$(echo ${LAME_VERSION} | sed -e 's/[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)/\1.\2/')/lame-${LAME_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" --enable-shared --enable-nasm --disable-frontend && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### xvid https://www.xvid.com/ @@ -243,7 +246,7 @@ RUN \ tar -zx -f xvidcore-${XVID_VERSION}.tar.gz && \ cd xvidcore/build/generic && \ ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### fdk-aac https://github.com/mstorsjo/fdk-aac @@ -255,7 +258,7 @@ RUN \ tar -zx --strip-components=1 && \ autoreconf -fiv && \ ./configure --prefix="${PREFIX}" --enable-shared --datadir="${DIR}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## openjpeg https://github.com/uclouvain/openjpeg @@ -266,7 +269,7 @@ RUN \ curl -sL https://github.com/uclouvain/openjpeg/archive/v${OPENJPEG_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ cmake -DBUILD_THIRDPARTY:BOOL=ON -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## freetype https://www.freetype.org/ @@ -278,7 +281,7 @@ RUN \ echo ${FREETYPE_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f freetype-${FREETYPE_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## libvstab https://github.com/georgmartius/vid.stab @@ -290,7 +293,7 @@ RUN \ echo ${LIBVIDSTAB_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f v${LIBVIDSTAB_VERSION}.tar.gz && \ cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## fridibi https://www.fribidi.org/ @@ -315,7 +318,7 @@ RUN \ curl -sLO https://www.freedesktop.org/software/fontconfig/release/fontconfig-${FONTCONFIG_VERSION}.tar.bz2 && \ tar -jx --strip-components=1 -f fontconfig-${FONTCONFIG_VERSION}.tar.bz2 && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## libass https://github.com/libass/libass @@ -328,7 +331,7 @@ RUN \ tar -zx --strip-components=1 -f ${LIBASS_VERSION}.tar.gz && \ ./autogen.sh && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## kvazaar https://github.com/ultravideo/kvazaar @@ -352,7 +355,7 @@ RUN \ mkdir -p ./aom_build ; \ cd ./aom_build ; \ cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" -DBUILD_SHARED_LIBS=1 ..; \ - make ; \ + make -j $(nproc); \ make install ; \ rm -rf ${DIR} @@ -364,7 +367,7 @@ RUN \ curl -sLO https://www.x.org/archive//individual/util/util-macros-${XORG_MACROS_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f util-macros-${XORG_MACROS_VERSION}.tar.gz && \ ./configure --srcdir=${DIR} --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -375,7 +378,7 @@ RUN \ curl -sLO https://www.x.org/archive/individual/proto/xproto-${XPROTO_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f xproto-${XPROTO_VERSION}.tar.gz && \ ./configure --srcdir=${DIR} --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -386,7 +389,7 @@ RUN \ curl -sLO https://www.x.org/archive/individual/lib/libXau-${XAU_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f libXau-${XAU_VERSION}.tar.gz && \ ./configure --srcdir=${DIR} --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -397,7 +400,7 @@ RUN \ curl -sLO https://xcb.freedesktop.org/dist/libpthread-stubs-${LIBPTHREAD_STUBS_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f libpthread-stubs-${LIBPTHREAD_STUBS_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -409,7 +412,7 @@ RUN \ tar -zx --strip-components=1 -f xcb-proto-${XCBPROTO_VERSION}.tar.gz && \ ACLOCAL_PATH="${PREFIX}/share/aclocal" ./autogen.sh && \ ./configure --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -421,7 +424,7 @@ RUN \ tar -zx --strip-components=1 -f libxcb-${LIBXCB_VERSION}.tar.gz && \ ACLOCAL_PATH="${PREFIX}/share/aclocal" ./autogen.sh && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -434,7 +437,7 @@ RUN \ echo ${LIBXML2_SHA256SUM} | sha256sum --check && \ tar -xz --strip-components=1 -f libxml2-v${LIBXML2_VERSION}.tar.gz && \ ./autogen.sh --prefix="${PREFIX}" --with-ftp=no --with-http=no --with-python=no && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -447,7 +450,7 @@ RUN \ echo ${LIBBLURAY_SHA256SUM} | sha256sum --check && \ tar -jx --strip-components=1 -f libbluray-${LIBBLURAY_VERSION}.tar.bz2 && \ ./configure --prefix="${PREFIX}" --disable-examples --disable-bdjava-jar --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -461,7 +464,7 @@ RUN \ tar -xz --strip-components=1 -f v${LIBZMQ_VERSION}.tar.gz && \ ./autogen.sh && \ ./configure --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make check && \ make install && \ rm -rf ${DIR} @@ -474,7 +477,7 @@ RUN \ curl -sLO https://github.com/Haivision/srt/archive/v${LIBSRT_VERSION}.tar.gz && \ tar -xz --strip-components=1 -f v${LIBSRT_VERSION}.tar.gz && \ cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -486,7 +489,7 @@ RUN \ git clone https://git.code.sf.net/p/libpng/code ${DIR} -b v${LIBPNG_VERSION} --depth 1 && \ ./autogen.sh && \ ./configure --prefix="${PREFIX}" && \ - make check && \ + make check -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -500,7 +503,20 @@ RUN \ tar -xz --strip-components=1 -f v${LIBARIBB24_VERSION}.tar.gz && \ autoreconf -fiv && \ ./configure CFLAGS="-I${PREFIX}/include -fPIC" --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ + make install && \ + rm -rf ${DIR} + + +## libsvtav1 +RUN \ + DIR=/tmp/svtav1 && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + git clone https://gitlab.com/AOMediaCodec/SVT-AV1.git ${DIR} --depth=1 -b ${LIBSTVAV1_VERSION} &&\ + cd Build && \ + cmake .. -G"Unix Makefiles" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="${PREFIX}" && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -551,7 +567,7 @@ RUN \ --enable-libkvazaar \ --extra-cflags="-I${PREFIX}/include" \ --extra-ldflags="-L${PREFIX}/lib" && \ - make && \ + make -j $(nproc) && \ 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..d0cb1bb08 100644 --- a/docker-images/3.3/centos7/Dockerfile +++ b/docker-images/3.3/centos7/Dockerfile @@ -16,7 +16,8 @@ FROM base AS build WORKDIR /tmp/workdir ENV FFMPEG_VERSION=3.3.9 \ - AOM_VERSION=v1.0.0 \ + LIBSTVAV1_VERSION=v0.8.7 \ + AOM_VERSION=v3.1.3 \ FDKAAC_VERSION=0.1.5 \ FONTCONFIG_VERSION=2.12.4 \ FREETYPE_VERSION=2.10.4 \ @@ -160,7 +161,7 @@ RUN \ curl -sL https://versaweb.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${OPENCOREAMR_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## x264 http://www.videolan.org/developers/x264.html @@ -171,7 +172,7 @@ RUN \ curl -sL https://download.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-${X264_VERSION}.tar.bz2 | \ tar -jx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared --enable-pic --disable-cli && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### x265 http://x265.org/ @@ -185,7 +186,7 @@ RUN \ sed -i "/-DEXTRA_LIB/ s/$/ -DCMAKE_INSTALL_PREFIX=\${PREFIX}/" multilib.sh && \ sed -i "/^cmake/ s/$/ -DENABLE_CLI=OFF/" multilib.sh && \ ./multilib.sh && \ - make -C 8bit install && \ + make -C 8bit -j $(nproc) install && \ rm -rf ${DIR} ### libogg https://www.xiph.org/ogg/ RUN \ @@ -196,7 +197,7 @@ RUN \ echo ${OGG_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f libogg-${OGG_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libopus https://www.opus-codec.org/ @@ -209,7 +210,7 @@ RUN \ tar -zx --strip-components=1 -f opus-${OPUS_VERSION}.tar.gz && \ autoreconf -fiv && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libvorbis https://xiph.org/vorbis/ @@ -221,7 +222,7 @@ RUN \ echo ${VORBIS_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f libvorbis-${VORBIS_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libtheora http://www.theora.org/ @@ -233,7 +234,7 @@ RUN \ echo ${THEORA_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f libtheora-${THEORA_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libvpx https://www.webmproject.org/code/ @@ -245,7 +246,7 @@ RUN \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-vp8 --enable-vp9 --enable-vp9-highbitdepth --enable-pic --enable-shared \ --disable-debug --disable-examples --disable-docs --disable-install-bins && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libwebp https://developers.google.com/speed/webp/ @@ -256,7 +257,7 @@ RUN \ curl -sL https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-${WEBP_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libmp3lame http://lame.sourceforge.net/ @@ -267,7 +268,7 @@ RUN \ curl -sL https://versaweb.dl.sourceforge.net/project/lame/lame/$(echo ${LAME_VERSION} | sed -e 's/[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)/\1.\2/')/lame-${LAME_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" --enable-shared --enable-nasm --disable-frontend && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### xvid https://www.xvid.com/ @@ -280,7 +281,7 @@ RUN \ tar -zx -f xvidcore-${XVID_VERSION}.tar.gz && \ cd xvidcore/build/generic && \ ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### fdk-aac https://github.com/mstorsjo/fdk-aac @@ -292,7 +293,7 @@ RUN \ tar -zx --strip-components=1 && \ autoreconf -fiv && \ ./configure --prefix="${PREFIX}" --enable-shared --datadir="${DIR}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## openjpeg https://github.com/uclouvain/openjpeg @@ -303,7 +304,7 @@ RUN \ curl -sL https://github.com/uclouvain/openjpeg/archive/v${OPENJPEG_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ cmake -DBUILD_THIRDPARTY:BOOL=ON -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## freetype https://www.freetype.org/ @@ -315,7 +316,7 @@ RUN \ echo ${FREETYPE_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f freetype-${FREETYPE_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## libvstab https://github.com/georgmartius/vid.stab @@ -327,7 +328,7 @@ RUN \ echo ${LIBVIDSTAB_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f v${LIBVIDSTAB_VERSION}.tar.gz && \ cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## fridibi https://www.fribidi.org/ @@ -352,7 +353,7 @@ RUN \ curl -sLO https://www.freedesktop.org/software/fontconfig/release/fontconfig-${FONTCONFIG_VERSION}.tar.bz2 && \ tar -jx --strip-components=1 -f fontconfig-${FONTCONFIG_VERSION}.tar.bz2 && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## libass https://github.com/libass/libass @@ -365,7 +366,7 @@ RUN \ tar -zx --strip-components=1 -f ${LIBASS_VERSION}.tar.gz && \ ./autogen.sh && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## kvazaar https://github.com/ultravideo/kvazaar @@ -389,7 +390,7 @@ RUN \ mkdir -p ./aom_build ; \ cd ./aom_build ; \ cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" -DBUILD_SHARED_LIBS=1 ..; \ - make ; \ + make -j $(nproc); \ make install ; \ rm -rf ${DIR} @@ -401,7 +402,7 @@ RUN \ curl -sLO https://www.x.org/archive//individual/util/util-macros-${XORG_MACROS_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f util-macros-${XORG_MACROS_VERSION}.tar.gz && \ ./configure --srcdir=${DIR} --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -412,7 +413,7 @@ RUN \ curl -sLO https://www.x.org/archive/individual/proto/xproto-${XPROTO_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f xproto-${XPROTO_VERSION}.tar.gz && \ ./configure --srcdir=${DIR} --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -423,7 +424,7 @@ RUN \ curl -sLO https://www.x.org/archive/individual/lib/libXau-${XAU_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f libXau-${XAU_VERSION}.tar.gz && \ ./configure --srcdir=${DIR} --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -434,7 +435,7 @@ RUN \ curl -sLO https://xcb.freedesktop.org/dist/libpthread-stubs-${LIBPTHREAD_STUBS_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f libpthread-stubs-${LIBPTHREAD_STUBS_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -446,7 +447,7 @@ RUN \ tar -zx --strip-components=1 -f xcb-proto-${XCBPROTO_VERSION}.tar.gz && \ ACLOCAL_PATH="${PREFIX}/share/aclocal" ./autogen.sh && \ ./configure --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -458,7 +459,7 @@ RUN \ tar -zx --strip-components=1 -f libxcb-${LIBXCB_VERSION}.tar.gz && \ ACLOCAL_PATH="${PREFIX}/share/aclocal" ./autogen.sh && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -471,7 +472,7 @@ RUN \ echo ${LIBXML2_SHA256SUM} | sha256sum --check && \ tar -xz --strip-components=1 -f libxml2-v${LIBXML2_VERSION}.tar.gz && \ ./autogen.sh --prefix="${PREFIX}" --with-ftp=no --with-http=no --with-python=no && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -484,7 +485,7 @@ RUN \ echo ${LIBBLURAY_SHA256SUM} | sha256sum --check && \ tar -jx --strip-components=1 -f libbluray-${LIBBLURAY_VERSION}.tar.bz2 && \ ./configure --prefix="${PREFIX}" --disable-examples --disable-bdjava-jar --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -498,7 +499,7 @@ RUN \ tar -xz --strip-components=1 -f v${LIBZMQ_VERSION}.tar.gz && \ ./autogen.sh && \ ./configure --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make check && \ make install && \ rm -rf ${DIR} @@ -511,7 +512,7 @@ RUN \ curl -sLO https://github.com/Haivision/srt/archive/v${LIBSRT_VERSION}.tar.gz && \ tar -xz --strip-components=1 -f v${LIBSRT_VERSION}.tar.gz && \ cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -523,7 +524,7 @@ RUN \ git clone https://git.code.sf.net/p/libpng/code ${DIR} -b v${LIBPNG_VERSION} --depth 1 && \ ./autogen.sh && \ ./configure --prefix="${PREFIX}" && \ - make check && \ + make check -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -537,7 +538,20 @@ RUN \ tar -xz --strip-components=1 -f v${LIBARIBB24_VERSION}.tar.gz && \ autoreconf -fiv && \ ./configure CFLAGS="-I${PREFIX}/include -fPIC" --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ + make install && \ + rm -rf ${DIR} + + +## libsvtav1 +RUN \ + DIR=/tmp/svtav1 && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + git clone https://gitlab.com/AOMediaCodec/SVT-AV1.git ${DIR} --depth=1 -b ${LIBSTVAV1_VERSION} &&\ + cd Build && \ + cmake .. -G"Unix Makefiles" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="${PREFIX}" && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -588,7 +602,7 @@ RUN \ --enable-libkvazaar \ --extra-cflags="-I${PREFIX}/include" \ --extra-ldflags="-L${PREFIX}/lib" && \ - make && \ + make -j $(nproc) && \ 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..9a13822b8 100644 --- a/docker-images/3.3/centos8/Dockerfile +++ b/docker-images/3.3/centos8/Dockerfile @@ -16,7 +16,8 @@ FROM base AS build WORKDIR /tmp/workdir ENV FFMPEG_VERSION=3.3.9 \ - AOM_VERSION=v1.0.0 \ + LIBSTVAV1_VERSION=v0.8.7 \ + AOM_VERSION=v3.1.3 \ FDKAAC_VERSION=0.1.5 \ FONTCONFIG_VERSION=2.12.4 \ FREETYPE_VERSION=2.10.4 \ @@ -129,7 +130,7 @@ RUN \ curl -sL https://versaweb.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${OPENCOREAMR_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## x264 http://www.videolan.org/developers/x264.html @@ -140,7 +141,7 @@ RUN \ curl -sL https://download.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-${X264_VERSION}.tar.bz2 | \ tar -jx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared --enable-pic --disable-cli && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### x265 http://x265.org/ @@ -154,7 +155,7 @@ RUN \ sed -i "/-DEXTRA_LIB/ s/$/ -DCMAKE_INSTALL_PREFIX=\${PREFIX}/" multilib.sh && \ sed -i "/^cmake/ s/$/ -DENABLE_CLI=OFF/" multilib.sh && \ ./multilib.sh && \ - make -C 8bit install && \ + make -C 8bit -j $(nproc) install && \ rm -rf ${DIR} ### libogg https://www.xiph.org/ogg/ RUN \ @@ -165,7 +166,7 @@ RUN \ echo ${OGG_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f libogg-${OGG_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libopus https://www.opus-codec.org/ @@ -178,7 +179,7 @@ RUN \ tar -zx --strip-components=1 -f opus-${OPUS_VERSION}.tar.gz && \ autoreconf -fiv && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libvorbis https://xiph.org/vorbis/ @@ -190,7 +191,7 @@ RUN \ echo ${VORBIS_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f libvorbis-${VORBIS_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libtheora http://www.theora.org/ @@ -202,7 +203,7 @@ RUN \ echo ${THEORA_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f libtheora-${THEORA_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libvpx https://www.webmproject.org/code/ @@ -214,7 +215,7 @@ RUN \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-vp8 --enable-vp9 --enable-vp9-highbitdepth --enable-pic --enable-shared \ --disable-debug --disable-examples --disable-docs --disable-install-bins && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libwebp https://developers.google.com/speed/webp/ @@ -225,7 +226,7 @@ RUN \ curl -sL https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-${WEBP_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libmp3lame http://lame.sourceforge.net/ @@ -236,7 +237,7 @@ RUN \ curl -sL https://versaweb.dl.sourceforge.net/project/lame/lame/$(echo ${LAME_VERSION} | sed -e 's/[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)/\1.\2/')/lame-${LAME_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" --enable-shared --enable-nasm --disable-frontend && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### xvid https://www.xvid.com/ @@ -249,7 +250,7 @@ RUN \ tar -zx -f xvidcore-${XVID_VERSION}.tar.gz && \ cd xvidcore/build/generic && \ ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### fdk-aac https://github.com/mstorsjo/fdk-aac @@ -261,7 +262,7 @@ RUN \ tar -zx --strip-components=1 && \ autoreconf -fiv && \ ./configure --prefix="${PREFIX}" --enable-shared --datadir="${DIR}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## openjpeg https://github.com/uclouvain/openjpeg @@ -272,7 +273,7 @@ RUN \ curl -sL https://github.com/uclouvain/openjpeg/archive/v${OPENJPEG_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ cmake -DBUILD_THIRDPARTY:BOOL=ON -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## freetype https://www.freetype.org/ @@ -284,7 +285,7 @@ RUN \ echo ${FREETYPE_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f freetype-${FREETYPE_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## libvstab https://github.com/georgmartius/vid.stab @@ -296,7 +297,7 @@ RUN \ echo ${LIBVIDSTAB_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f v${LIBVIDSTAB_VERSION}.tar.gz && \ cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## fridibi https://www.fribidi.org/ @@ -321,7 +322,7 @@ RUN \ curl -sLO https://www.freedesktop.org/software/fontconfig/release/fontconfig-${FONTCONFIG_VERSION}.tar.bz2 && \ tar -jx --strip-components=1 -f fontconfig-${FONTCONFIG_VERSION}.tar.bz2 && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## libass https://github.com/libass/libass @@ -334,7 +335,7 @@ RUN \ tar -zx --strip-components=1 -f ${LIBASS_VERSION}.tar.gz && \ ./autogen.sh && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## kvazaar https://github.com/ultravideo/kvazaar @@ -358,7 +359,7 @@ RUN \ mkdir -p ./aom_build ; \ cd ./aom_build ; \ cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" -DBUILD_SHARED_LIBS=1 ..; \ - make ; \ + make -j $(nproc); \ make install ; \ rm -rf ${DIR} @@ -370,7 +371,7 @@ RUN \ curl -sLO https://www.x.org/archive//individual/util/util-macros-${XORG_MACROS_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f util-macros-${XORG_MACROS_VERSION}.tar.gz && \ ./configure --srcdir=${DIR} --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -381,7 +382,7 @@ RUN \ curl -sLO https://www.x.org/archive/individual/proto/xproto-${XPROTO_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f xproto-${XPROTO_VERSION}.tar.gz && \ ./configure --srcdir=${DIR} --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -392,7 +393,7 @@ RUN \ curl -sLO https://www.x.org/archive/individual/lib/libXau-${XAU_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f libXau-${XAU_VERSION}.tar.gz && \ ./configure --srcdir=${DIR} --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -403,7 +404,7 @@ RUN \ curl -sLO https://xcb.freedesktop.org/dist/libpthread-stubs-${LIBPTHREAD_STUBS_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f libpthread-stubs-${LIBPTHREAD_STUBS_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -415,7 +416,7 @@ RUN \ tar -zx --strip-components=1 -f xcb-proto-${XCBPROTO_VERSION}.tar.gz && \ ACLOCAL_PATH="${PREFIX}/share/aclocal" ./autogen.sh && \ ./configure --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -427,7 +428,7 @@ RUN \ tar -zx --strip-components=1 -f libxcb-${LIBXCB_VERSION}.tar.gz && \ ACLOCAL_PATH="${PREFIX}/share/aclocal" ./autogen.sh && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -440,7 +441,7 @@ RUN \ echo ${LIBXML2_SHA256SUM} | sha256sum --check && \ tar -xz --strip-components=1 -f libxml2-v${LIBXML2_VERSION}.tar.gz && \ ./autogen.sh --prefix="${PREFIX}" --with-ftp=no --with-http=no --with-python=no && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -453,7 +454,7 @@ RUN \ echo ${LIBBLURAY_SHA256SUM} | sha256sum --check && \ tar -jx --strip-components=1 -f libbluray-${LIBBLURAY_VERSION}.tar.bz2 && \ ./configure --prefix="${PREFIX}" --disable-examples --disable-bdjava-jar --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -467,7 +468,7 @@ RUN \ tar -xz --strip-components=1 -f v${LIBZMQ_VERSION}.tar.gz && \ ./autogen.sh && \ ./configure --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make check && \ make install && \ rm -rf ${DIR} @@ -480,7 +481,7 @@ RUN \ curl -sLO https://github.com/Haivision/srt/archive/v${LIBSRT_VERSION}.tar.gz && \ tar -xz --strip-components=1 -f v${LIBSRT_VERSION}.tar.gz && \ cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -492,7 +493,7 @@ RUN \ git clone https://git.code.sf.net/p/libpng/code ${DIR} -b v${LIBPNG_VERSION} --depth 1 && \ ./autogen.sh && \ ./configure --prefix="${PREFIX}" && \ - make check && \ + make check -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -506,7 +507,20 @@ RUN \ tar -xz --strip-components=1 -f v${LIBARIBB24_VERSION}.tar.gz && \ autoreconf -fiv && \ ./configure CFLAGS="-I${PREFIX}/include -fPIC" --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ + make install && \ + rm -rf ${DIR} + + +## libsvtav1 +RUN \ + DIR=/tmp/svtav1 && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + git clone https://gitlab.com/AOMediaCodec/SVT-AV1.git ${DIR} --depth=1 -b ${LIBSTVAV1_VERSION} &&\ + cd Build && \ + cmake .. -G"Unix Makefiles" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="${PREFIX}" && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -557,7 +571,7 @@ RUN \ --enable-libkvazaar \ --extra-cflags="-I${PREFIX}/include" \ --extra-ldflags="-L${PREFIX}/lib" && \ - make && \ + make -j $(nproc) && \ 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..b9245f0cf 100644 --- a/docker-images/3.3/nvidia2004/Dockerfile +++ b/docker-images/3.3/nvidia2004/Dockerfile @@ -34,7 +34,8 @@ FROM devel-base as build ENV NVIDIA_HEADERS_VERSION=11.1.5.0 ENV FFMPEG_VERSION=3.3.9 \ - AOM_VERSION=v1.0.0 \ + LIBSTVAV1_VERSION=v0.8.7 \ + AOM_VERSION=v3.1.3 \ FDKAAC_VERSION=0.1.5 \ FONTCONFIG_VERSION=2.12.4 \ FREETYPE_VERSION=2.10.4 \ @@ -151,7 +152,7 @@ RUN \ curl -sL https://versaweb.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${OPENCOREAMR_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## x264 http://www.videolan.org/developers/x264.html @@ -162,7 +163,7 @@ RUN \ curl -sL https://download.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-${X264_VERSION}.tar.bz2 | \ tar -jx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared --enable-pic --disable-cli && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### x265 http://x265.org/ @@ -176,7 +177,7 @@ RUN \ sed -i "/-DEXTRA_LIB/ s/$/ -DCMAKE_INSTALL_PREFIX=\${PREFIX}/" multilib.sh && \ sed -i "/^cmake/ s/$/ -DENABLE_CLI=OFF/" multilib.sh && \ ./multilib.sh && \ - make -C 8bit install && \ + make -C 8bit -j $(nproc) install && \ rm -rf ${DIR} ### libogg https://www.xiph.org/ogg/ RUN \ @@ -187,7 +188,7 @@ RUN \ echo ${OGG_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f libogg-${OGG_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libopus https://www.opus-codec.org/ @@ -200,7 +201,7 @@ RUN \ tar -zx --strip-components=1 -f opus-${OPUS_VERSION}.tar.gz && \ autoreconf -fiv && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libvorbis https://xiph.org/vorbis/ @@ -212,7 +213,7 @@ RUN \ echo ${VORBIS_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f libvorbis-${VORBIS_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libtheora http://www.theora.org/ @@ -224,7 +225,7 @@ RUN \ echo ${THEORA_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f libtheora-${THEORA_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libvpx https://www.webmproject.org/code/ @@ -236,7 +237,7 @@ RUN \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-vp8 --enable-vp9 --enable-vp9-highbitdepth --enable-pic --enable-shared \ --disable-debug --disable-examples --disable-docs --disable-install-bins && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libwebp https://developers.google.com/speed/webp/ @@ -247,7 +248,7 @@ RUN \ curl -sL https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-${WEBP_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libmp3lame http://lame.sourceforge.net/ @@ -258,7 +259,7 @@ RUN \ curl -sL https://versaweb.dl.sourceforge.net/project/lame/lame/$(echo ${LAME_VERSION} | sed -e 's/[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)/\1.\2/')/lame-${LAME_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" --enable-shared --enable-nasm --disable-frontend && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### xvid https://www.xvid.com/ @@ -271,7 +272,7 @@ RUN \ tar -zx -f xvidcore-${XVID_VERSION}.tar.gz && \ cd xvidcore/build/generic && \ ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### fdk-aac https://github.com/mstorsjo/fdk-aac @@ -283,7 +284,7 @@ RUN \ tar -zx --strip-components=1 && \ autoreconf -fiv && \ ./configure --prefix="${PREFIX}" --enable-shared --datadir="${DIR}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## openjpeg https://github.com/uclouvain/openjpeg @@ -294,7 +295,7 @@ RUN \ curl -sL https://github.com/uclouvain/openjpeg/archive/v${OPENJPEG_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ cmake -DBUILD_THIRDPARTY:BOOL=ON -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## freetype https://www.freetype.org/ @@ -306,7 +307,7 @@ RUN \ echo ${FREETYPE_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f freetype-${FREETYPE_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## libvstab https://github.com/georgmartius/vid.stab @@ -318,7 +319,7 @@ RUN \ echo ${LIBVIDSTAB_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f v${LIBVIDSTAB_VERSION}.tar.gz && \ cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## fridibi https://www.fribidi.org/ @@ -343,7 +344,7 @@ RUN \ curl -sLO https://www.freedesktop.org/software/fontconfig/release/fontconfig-${FONTCONFIG_VERSION}.tar.bz2 && \ tar -jx --strip-components=1 -f fontconfig-${FONTCONFIG_VERSION}.tar.bz2 && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## libass https://github.com/libass/libass @@ -356,7 +357,7 @@ RUN \ tar -zx --strip-components=1 -f ${LIBASS_VERSION}.tar.gz && \ ./autogen.sh && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## kvazaar https://github.com/ultravideo/kvazaar @@ -380,7 +381,7 @@ RUN \ mkdir -p ./aom_build ; \ cd ./aom_build ; \ cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" -DBUILD_SHARED_LIBS=1 ..; \ - make ; \ + make -j $(nproc); \ make install ; \ rm -rf ${DIR} @@ -392,7 +393,7 @@ RUN \ curl -sLO https://www.x.org/archive//individual/util/util-macros-${XORG_MACROS_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f util-macros-${XORG_MACROS_VERSION}.tar.gz && \ ./configure --srcdir=${DIR} --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -403,7 +404,7 @@ RUN \ curl -sLO https://www.x.org/archive/individual/proto/xproto-${XPROTO_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f xproto-${XPROTO_VERSION}.tar.gz && \ ./configure --srcdir=${DIR} --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -414,7 +415,7 @@ RUN \ curl -sLO https://www.x.org/archive/individual/lib/libXau-${XAU_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f libXau-${XAU_VERSION}.tar.gz && \ ./configure --srcdir=${DIR} --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -425,7 +426,7 @@ RUN \ curl -sLO https://xcb.freedesktop.org/dist/libpthread-stubs-${LIBPTHREAD_STUBS_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f libpthread-stubs-${LIBPTHREAD_STUBS_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -437,7 +438,7 @@ RUN \ tar -zx --strip-components=1 -f xcb-proto-${XCBPROTO_VERSION}.tar.gz && \ ACLOCAL_PATH="${PREFIX}/share/aclocal" ./autogen.sh && \ ./configure --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -449,7 +450,7 @@ RUN \ tar -zx --strip-components=1 -f libxcb-${LIBXCB_VERSION}.tar.gz && \ ACLOCAL_PATH="${PREFIX}/share/aclocal" ./autogen.sh && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -462,7 +463,7 @@ RUN \ echo ${LIBXML2_SHA256SUM} | sha256sum --check && \ tar -xz --strip-components=1 -f libxml2-v${LIBXML2_VERSION}.tar.gz && \ ./autogen.sh --prefix="${PREFIX}" --with-ftp=no --with-http=no --with-python=no && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -475,7 +476,7 @@ RUN \ echo ${LIBBLURAY_SHA256SUM} | sha256sum --check && \ tar -jx --strip-components=1 -f libbluray-${LIBBLURAY_VERSION}.tar.bz2 && \ ./configure --prefix="${PREFIX}" --disable-examples --disable-bdjava-jar --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -489,7 +490,7 @@ RUN \ tar -xz --strip-components=1 -f v${LIBZMQ_VERSION}.tar.gz && \ ./autogen.sh && \ ./configure --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make check && \ make install && \ rm -rf ${DIR} @@ -502,7 +503,7 @@ RUN \ curl -sLO https://github.com/Haivision/srt/archive/v${LIBSRT_VERSION}.tar.gz && \ tar -xz --strip-components=1 -f v${LIBSRT_VERSION}.tar.gz && \ cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -514,7 +515,7 @@ RUN \ git clone https://git.code.sf.net/p/libpng/code ${DIR} -b v${LIBPNG_VERSION} --depth 1 && \ ./autogen.sh && \ ./configure --prefix="${PREFIX}" && \ - make check && \ + make check -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -528,7 +529,20 @@ RUN \ tar -xz --strip-components=1 -f v${LIBARIBB24_VERSION}.tar.gz && \ autoreconf -fiv && \ ./configure CFLAGS="-I${PREFIX}/include -fPIC" --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ + make install && \ + rm -rf ${DIR} + + +## libsvtav1 +RUN \ + DIR=/tmp/svtav1 && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + git clone https://gitlab.com/AOMediaCodec/SVT-AV1.git ${DIR} --depth=1 -b ${LIBSTVAV1_VERSION} &&\ + cd Build && \ + cmake .. -G"Unix Makefiles" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="${PREFIX}" && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -580,7 +594,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 -j $(nproc) && \ 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..b76e3bc7d 100644 --- a/docker-images/3.3/scratch312/Dockerfile +++ b/docker-images/3.3/scratch312/Dockerfile @@ -9,7 +9,8 @@ FROM alpine:3.12 AS build WORKDIR /tmp/workdir ENV FFMPEG_VERSION=3.3.9 \ - AOM_VERSION=v1.0.0 \ + LIBSTVAV1_VERSION=v0.8.7 \ + AOM_VERSION=v3.1.3 \ FDKAAC_VERSION=0.1.5 \ FONTCONFIG_VERSION=2.12.4 \ FREETYPE_VERSION=2.10.4 \ @@ -125,7 +126,7 @@ RUN \ curl -sL https://versaweb.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${OPENCOREAMR_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## x264 http://www.videolan.org/developers/x264.html @@ -136,7 +137,7 @@ RUN \ curl -sL https://download.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-${X264_VERSION}.tar.bz2 | \ tar -jx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared --enable-pic --disable-cli && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### x265 http://x265.org/ @@ -150,7 +151,7 @@ RUN \ sed -i "/-DEXTRA_LIB/ s/$/ -DCMAKE_INSTALL_PREFIX=\${PREFIX}/" multilib.sh && \ sed -i "/^cmake/ s/$/ -DENABLE_CLI=OFF/" multilib.sh && \ ./multilib.sh && \ - make -C 8bit install && \ + make -C 8bit -j $(nproc) install && \ rm -rf ${DIR} ### libogg https://www.xiph.org/ogg/ RUN \ @@ -161,7 +162,7 @@ RUN \ echo ${OGG_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f libogg-${OGG_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libopus https://www.opus-codec.org/ @@ -174,7 +175,7 @@ RUN \ tar -zx --strip-components=1 -f opus-${OPUS_VERSION}.tar.gz && \ autoreconf -fiv && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libvorbis https://xiph.org/vorbis/ @@ -186,7 +187,7 @@ RUN \ echo ${VORBIS_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f libvorbis-${VORBIS_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libtheora http://www.theora.org/ @@ -198,7 +199,7 @@ RUN \ echo ${THEORA_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f libtheora-${THEORA_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libvpx https://www.webmproject.org/code/ @@ -210,7 +211,7 @@ RUN \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-vp8 --enable-vp9 --enable-vp9-highbitdepth --enable-pic --enable-shared \ --disable-debug --disable-examples --disable-docs --disable-install-bins && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libwebp https://developers.google.com/speed/webp/ @@ -221,7 +222,7 @@ RUN \ curl -sL https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-${WEBP_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libmp3lame http://lame.sourceforge.net/ @@ -232,7 +233,7 @@ RUN \ curl -sL https://versaweb.dl.sourceforge.net/project/lame/lame/$(echo ${LAME_VERSION} | sed -e 's/[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)/\1.\2/')/lame-${LAME_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" --enable-shared --enable-nasm --disable-frontend && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### xvid https://www.xvid.com/ @@ -245,7 +246,7 @@ RUN \ tar -zx -f xvidcore-${XVID_VERSION}.tar.gz && \ cd xvidcore/build/generic && \ ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### fdk-aac https://github.com/mstorsjo/fdk-aac @@ -257,7 +258,7 @@ RUN \ tar -zx --strip-components=1 && \ autoreconf -fiv && \ ./configure --prefix="${PREFIX}" --enable-shared --datadir="${DIR}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## openjpeg https://github.com/uclouvain/openjpeg @@ -268,7 +269,7 @@ RUN \ curl -sL https://github.com/uclouvain/openjpeg/archive/v${OPENJPEG_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ cmake -DBUILD_THIRDPARTY:BOOL=ON -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## freetype https://www.freetype.org/ @@ -280,7 +281,7 @@ RUN \ echo ${FREETYPE_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f freetype-${FREETYPE_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## libvstab https://github.com/georgmartius/vid.stab @@ -292,7 +293,7 @@ RUN \ echo ${LIBVIDSTAB_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f v${LIBVIDSTAB_VERSION}.tar.gz && \ cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## fridibi https://www.fribidi.org/ @@ -317,7 +318,7 @@ RUN \ curl -sLO https://www.freedesktop.org/software/fontconfig/release/fontconfig-${FONTCONFIG_VERSION}.tar.bz2 && \ tar -jx --strip-components=1 -f fontconfig-${FONTCONFIG_VERSION}.tar.bz2 && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## libass https://github.com/libass/libass @@ -330,7 +331,7 @@ RUN \ tar -zx --strip-components=1 -f ${LIBASS_VERSION}.tar.gz && \ ./autogen.sh && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## kvazaar https://github.com/ultravideo/kvazaar @@ -354,7 +355,7 @@ RUN \ mkdir -p ./aom_build ; \ cd ./aom_build ; \ cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" -DBUILD_SHARED_LIBS=1 ..; \ - make ; \ + make -j $(nproc); \ make install ; \ rm -rf ${DIR} @@ -366,7 +367,7 @@ RUN \ curl -sLO https://www.x.org/archive//individual/util/util-macros-${XORG_MACROS_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f util-macros-${XORG_MACROS_VERSION}.tar.gz && \ ./configure --srcdir=${DIR} --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -377,7 +378,7 @@ RUN \ curl -sLO https://www.x.org/archive/individual/proto/xproto-${XPROTO_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f xproto-${XPROTO_VERSION}.tar.gz && \ ./configure --srcdir=${DIR} --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -388,7 +389,7 @@ RUN \ curl -sLO https://www.x.org/archive/individual/lib/libXau-${XAU_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f libXau-${XAU_VERSION}.tar.gz && \ ./configure --srcdir=${DIR} --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -399,7 +400,7 @@ RUN \ curl -sLO https://xcb.freedesktop.org/dist/libpthread-stubs-${LIBPTHREAD_STUBS_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f libpthread-stubs-${LIBPTHREAD_STUBS_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -411,7 +412,7 @@ RUN \ tar -zx --strip-components=1 -f xcb-proto-${XCBPROTO_VERSION}.tar.gz && \ ACLOCAL_PATH="${PREFIX}/share/aclocal" ./autogen.sh && \ ./configure --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -423,7 +424,7 @@ RUN \ tar -zx --strip-components=1 -f libxcb-${LIBXCB_VERSION}.tar.gz && \ ACLOCAL_PATH="${PREFIX}/share/aclocal" ./autogen.sh && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -436,7 +437,7 @@ RUN \ echo ${LIBXML2_SHA256SUM} | sha256sum --check && \ tar -xz --strip-components=1 -f libxml2-v${LIBXML2_VERSION}.tar.gz && \ ./autogen.sh --prefix="${PREFIX}" --with-ftp=no --with-http=no --with-python=no && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -449,7 +450,7 @@ RUN \ echo ${LIBBLURAY_SHA256SUM} | sha256sum --check && \ tar -jx --strip-components=1 -f libbluray-${LIBBLURAY_VERSION}.tar.bz2 && \ ./configure --prefix="${PREFIX}" --disable-examples --disable-bdjava-jar --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -463,7 +464,7 @@ RUN \ tar -xz --strip-components=1 -f v${LIBZMQ_VERSION}.tar.gz && \ ./autogen.sh && \ ./configure --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make check && \ make install && \ rm -rf ${DIR} @@ -476,7 +477,7 @@ RUN \ curl -sLO https://github.com/Haivision/srt/archive/v${LIBSRT_VERSION}.tar.gz && \ tar -xz --strip-components=1 -f v${LIBSRT_VERSION}.tar.gz && \ cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -488,7 +489,7 @@ RUN \ git clone https://git.code.sf.net/p/libpng/code ${DIR} -b v${LIBPNG_VERSION} --depth 1 && \ ./autogen.sh && \ ./configure --prefix="${PREFIX}" && \ - make check && \ + make check -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -502,7 +503,20 @@ RUN \ tar -xz --strip-components=1 -f v${LIBARIBB24_VERSION}.tar.gz && \ autoreconf -fiv && \ ./configure CFLAGS="-I${PREFIX}/include -fPIC" --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ + make install && \ + rm -rf ${DIR} + + +## libsvtav1 +RUN \ + DIR=/tmp/svtav1 && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + git clone https://gitlab.com/AOMediaCodec/SVT-AV1.git ${DIR} --depth=1 -b ${LIBSTVAV1_VERSION} &&\ + cd Build && \ + cmake .. -G"Unix Makefiles" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="${PREFIX}" && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -553,7 +567,7 @@ RUN \ --enable-libkvazaar \ --extra-cflags="-I${PREFIX}/include" \ --extra-ldflags="-L${PREFIX}/lib" && \ - make && \ + make -j $(nproc) && \ 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..9870662be 100644 --- a/docker-images/3.3/ubuntu1804/Dockerfile +++ b/docker-images/3.3/ubuntu1804/Dockerfile @@ -17,7 +17,8 @@ RUN apt-get -yqq update && \ FROM base as build ENV FFMPEG_VERSION=3.3.9 \ - AOM_VERSION=v1.0.0 \ + LIBSTVAV1_VERSION=v0.8.7 \ + AOM_VERSION=v3.1.3 \ FDKAAC_VERSION=0.1.5 \ FONTCONFIG_VERSION=2.12.4 \ FREETYPE_VERSION=2.10.4 \ @@ -124,7 +125,7 @@ RUN \ curl -sL https://versaweb.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${OPENCOREAMR_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## x264 http://www.videolan.org/developers/x264.html @@ -135,7 +136,7 @@ RUN \ curl -sL https://download.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-${X264_VERSION}.tar.bz2 | \ tar -jx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared --enable-pic --disable-cli && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### x265 http://x265.org/ @@ -149,7 +150,7 @@ RUN \ sed -i "/-DEXTRA_LIB/ s/$/ -DCMAKE_INSTALL_PREFIX=\${PREFIX}/" multilib.sh && \ sed -i "/^cmake/ s/$/ -DENABLE_CLI=OFF/" multilib.sh && \ ./multilib.sh && \ - make -C 8bit install && \ + make -C 8bit -j $(nproc) install && \ rm -rf ${DIR} ### libogg https://www.xiph.org/ogg/ RUN \ @@ -160,7 +161,7 @@ RUN \ echo ${OGG_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f libogg-${OGG_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libopus https://www.opus-codec.org/ @@ -173,7 +174,7 @@ RUN \ tar -zx --strip-components=1 -f opus-${OPUS_VERSION}.tar.gz && \ autoreconf -fiv && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libvorbis https://xiph.org/vorbis/ @@ -185,7 +186,7 @@ RUN \ echo ${VORBIS_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f libvorbis-${VORBIS_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libtheora http://www.theora.org/ @@ -197,7 +198,7 @@ RUN \ echo ${THEORA_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f libtheora-${THEORA_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libvpx https://www.webmproject.org/code/ @@ -209,7 +210,7 @@ RUN \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-vp8 --enable-vp9 --enable-vp9-highbitdepth --enable-pic --enable-shared \ --disable-debug --disable-examples --disable-docs --disable-install-bins && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libwebp https://developers.google.com/speed/webp/ @@ -220,7 +221,7 @@ RUN \ curl -sL https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-${WEBP_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libmp3lame http://lame.sourceforge.net/ @@ -231,7 +232,7 @@ RUN \ curl -sL https://versaweb.dl.sourceforge.net/project/lame/lame/$(echo ${LAME_VERSION} | sed -e 's/[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)/\1.\2/')/lame-${LAME_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" --enable-shared --enable-nasm --disable-frontend && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### xvid https://www.xvid.com/ @@ -244,7 +245,7 @@ RUN \ tar -zx -f xvidcore-${XVID_VERSION}.tar.gz && \ cd xvidcore/build/generic && \ ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### fdk-aac https://github.com/mstorsjo/fdk-aac @@ -256,7 +257,7 @@ RUN \ tar -zx --strip-components=1 && \ autoreconf -fiv && \ ./configure --prefix="${PREFIX}" --enable-shared --datadir="${DIR}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## openjpeg https://github.com/uclouvain/openjpeg @@ -267,7 +268,7 @@ RUN \ curl -sL https://github.com/uclouvain/openjpeg/archive/v${OPENJPEG_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ cmake -DBUILD_THIRDPARTY:BOOL=ON -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## freetype https://www.freetype.org/ @@ -279,7 +280,7 @@ RUN \ echo ${FREETYPE_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f freetype-${FREETYPE_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## libvstab https://github.com/georgmartius/vid.stab @@ -291,7 +292,7 @@ RUN \ echo ${LIBVIDSTAB_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f v${LIBVIDSTAB_VERSION}.tar.gz && \ cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## fridibi https://www.fribidi.org/ @@ -316,7 +317,7 @@ RUN \ curl -sLO https://www.freedesktop.org/software/fontconfig/release/fontconfig-${FONTCONFIG_VERSION}.tar.bz2 && \ tar -jx --strip-components=1 -f fontconfig-${FONTCONFIG_VERSION}.tar.bz2 && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## libass https://github.com/libass/libass @@ -329,7 +330,7 @@ RUN \ tar -zx --strip-components=1 -f ${LIBASS_VERSION}.tar.gz && \ ./autogen.sh && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## kvazaar https://github.com/ultravideo/kvazaar @@ -353,7 +354,7 @@ RUN \ mkdir -p ./aom_build ; \ cd ./aom_build ; \ cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" -DBUILD_SHARED_LIBS=1 ..; \ - make ; \ + make -j $(nproc); \ make install ; \ rm -rf ${DIR} @@ -365,7 +366,7 @@ RUN \ curl -sLO https://www.x.org/archive//individual/util/util-macros-${XORG_MACROS_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f util-macros-${XORG_MACROS_VERSION}.tar.gz && \ ./configure --srcdir=${DIR} --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -376,7 +377,7 @@ RUN \ curl -sLO https://www.x.org/archive/individual/proto/xproto-${XPROTO_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f xproto-${XPROTO_VERSION}.tar.gz && \ ./configure --srcdir=${DIR} --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -387,7 +388,7 @@ RUN \ curl -sLO https://www.x.org/archive/individual/lib/libXau-${XAU_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f libXau-${XAU_VERSION}.tar.gz && \ ./configure --srcdir=${DIR} --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -398,7 +399,7 @@ RUN \ curl -sLO https://xcb.freedesktop.org/dist/libpthread-stubs-${LIBPTHREAD_STUBS_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f libpthread-stubs-${LIBPTHREAD_STUBS_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -410,7 +411,7 @@ RUN \ tar -zx --strip-components=1 -f xcb-proto-${XCBPROTO_VERSION}.tar.gz && \ ACLOCAL_PATH="${PREFIX}/share/aclocal" ./autogen.sh && \ ./configure --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -422,7 +423,7 @@ RUN \ tar -zx --strip-components=1 -f libxcb-${LIBXCB_VERSION}.tar.gz && \ ACLOCAL_PATH="${PREFIX}/share/aclocal" ./autogen.sh && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -435,7 +436,7 @@ RUN \ echo ${LIBXML2_SHA256SUM} | sha256sum --check && \ tar -xz --strip-components=1 -f libxml2-v${LIBXML2_VERSION}.tar.gz && \ ./autogen.sh --prefix="${PREFIX}" --with-ftp=no --with-http=no --with-python=no && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -448,7 +449,7 @@ RUN \ echo ${LIBBLURAY_SHA256SUM} | sha256sum --check && \ tar -jx --strip-components=1 -f libbluray-${LIBBLURAY_VERSION}.tar.bz2 && \ ./configure --prefix="${PREFIX}" --disable-examples --disable-bdjava-jar --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -462,7 +463,7 @@ RUN \ tar -xz --strip-components=1 -f v${LIBZMQ_VERSION}.tar.gz && \ ./autogen.sh && \ ./configure --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make check && \ make install && \ rm -rf ${DIR} @@ -475,7 +476,7 @@ RUN \ curl -sLO https://github.com/Haivision/srt/archive/v${LIBSRT_VERSION}.tar.gz && \ tar -xz --strip-components=1 -f v${LIBSRT_VERSION}.tar.gz && \ cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -487,7 +488,7 @@ RUN \ git clone https://git.code.sf.net/p/libpng/code ${DIR} -b v${LIBPNG_VERSION} --depth 1 && \ ./autogen.sh && \ ./configure --prefix="${PREFIX}" && \ - make check && \ + make check -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -501,7 +502,20 @@ RUN \ tar -xz --strip-components=1 -f v${LIBARIBB24_VERSION}.tar.gz && \ autoreconf -fiv && \ ./configure CFLAGS="-I${PREFIX}/include -fPIC" --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ + make install && \ + rm -rf ${DIR} + + +## libsvtav1 +RUN \ + DIR=/tmp/svtav1 && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + git clone https://gitlab.com/AOMediaCodec/SVT-AV1.git ${DIR} --depth=1 -b ${LIBSTVAV1_VERSION} &&\ + cd Build && \ + cmake .. -G"Unix Makefiles" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="${PREFIX}" && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -552,7 +566,7 @@ RUN \ --enable-libkvazaar \ --extra-cflags="-I${PREFIX}/include" \ --extra-ldflags="-L${PREFIX}/lib" && \ - make && \ + make -j $(nproc) && \ 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..d66663f9a 100644 --- a/docker-images/3.3/ubuntu2004/Dockerfile +++ b/docker-images/3.3/ubuntu2004/Dockerfile @@ -17,7 +17,8 @@ RUN apt-get -yqq update && \ FROM base as build ENV FFMPEG_VERSION=3.3.9 \ - AOM_VERSION=v1.0.0 \ + LIBSTVAV1_VERSION=v0.8.7 \ + AOM_VERSION=v3.1.3 \ FDKAAC_VERSION=0.1.5 \ FONTCONFIG_VERSION=2.12.4 \ FREETYPE_VERSION=2.10.4 \ @@ -127,7 +128,7 @@ RUN \ curl -sL https://versaweb.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${OPENCOREAMR_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## x264 http://www.videolan.org/developers/x264.html @@ -138,7 +139,7 @@ RUN \ curl -sL https://download.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-${X264_VERSION}.tar.bz2 | \ tar -jx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared --enable-pic --disable-cli && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### x265 http://x265.org/ @@ -152,7 +153,7 @@ RUN \ sed -i "/-DEXTRA_LIB/ s/$/ -DCMAKE_INSTALL_PREFIX=\${PREFIX}/" multilib.sh && \ sed -i "/^cmake/ s/$/ -DENABLE_CLI=OFF/" multilib.sh && \ ./multilib.sh && \ - make -C 8bit install && \ + make -C 8bit -j $(nproc) install && \ rm -rf ${DIR} ### libogg https://www.xiph.org/ogg/ RUN \ @@ -163,7 +164,7 @@ RUN \ echo ${OGG_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f libogg-${OGG_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libopus https://www.opus-codec.org/ @@ -176,7 +177,7 @@ RUN \ tar -zx --strip-components=1 -f opus-${OPUS_VERSION}.tar.gz && \ autoreconf -fiv && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libvorbis https://xiph.org/vorbis/ @@ -188,7 +189,7 @@ RUN \ echo ${VORBIS_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f libvorbis-${VORBIS_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libtheora http://www.theora.org/ @@ -200,7 +201,7 @@ RUN \ echo ${THEORA_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f libtheora-${THEORA_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libvpx https://www.webmproject.org/code/ @@ -212,7 +213,7 @@ RUN \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-vp8 --enable-vp9 --enable-vp9-highbitdepth --enable-pic --enable-shared \ --disable-debug --disable-examples --disable-docs --disable-install-bins && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libwebp https://developers.google.com/speed/webp/ @@ -223,7 +224,7 @@ RUN \ curl -sL https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-${WEBP_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libmp3lame http://lame.sourceforge.net/ @@ -234,7 +235,7 @@ RUN \ curl -sL https://versaweb.dl.sourceforge.net/project/lame/lame/$(echo ${LAME_VERSION} | sed -e 's/[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)/\1.\2/')/lame-${LAME_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" --enable-shared --enable-nasm --disable-frontend && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### xvid https://www.xvid.com/ @@ -247,7 +248,7 @@ RUN \ tar -zx -f xvidcore-${XVID_VERSION}.tar.gz && \ cd xvidcore/build/generic && \ ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### fdk-aac https://github.com/mstorsjo/fdk-aac @@ -259,7 +260,7 @@ RUN \ tar -zx --strip-components=1 && \ autoreconf -fiv && \ ./configure --prefix="${PREFIX}" --enable-shared --datadir="${DIR}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## openjpeg https://github.com/uclouvain/openjpeg @@ -270,7 +271,7 @@ RUN \ curl -sL https://github.com/uclouvain/openjpeg/archive/v${OPENJPEG_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ cmake -DBUILD_THIRDPARTY:BOOL=ON -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## freetype https://www.freetype.org/ @@ -282,7 +283,7 @@ RUN \ echo ${FREETYPE_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f freetype-${FREETYPE_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## libvstab https://github.com/georgmartius/vid.stab @@ -294,7 +295,7 @@ RUN \ echo ${LIBVIDSTAB_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f v${LIBVIDSTAB_VERSION}.tar.gz && \ cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## fridibi https://www.fribidi.org/ @@ -319,7 +320,7 @@ RUN \ curl -sLO https://www.freedesktop.org/software/fontconfig/release/fontconfig-${FONTCONFIG_VERSION}.tar.bz2 && \ tar -jx --strip-components=1 -f fontconfig-${FONTCONFIG_VERSION}.tar.bz2 && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## libass https://github.com/libass/libass @@ -332,7 +333,7 @@ RUN \ tar -zx --strip-components=1 -f ${LIBASS_VERSION}.tar.gz && \ ./autogen.sh && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## kvazaar https://github.com/ultravideo/kvazaar @@ -356,7 +357,7 @@ RUN \ mkdir -p ./aom_build ; \ cd ./aom_build ; \ cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" -DBUILD_SHARED_LIBS=1 ..; \ - make ; \ + make -j $(nproc); \ make install ; \ rm -rf ${DIR} @@ -368,7 +369,7 @@ RUN \ curl -sLO https://www.x.org/archive//individual/util/util-macros-${XORG_MACROS_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f util-macros-${XORG_MACROS_VERSION}.tar.gz && \ ./configure --srcdir=${DIR} --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -379,7 +380,7 @@ RUN \ curl -sLO https://www.x.org/archive/individual/proto/xproto-${XPROTO_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f xproto-${XPROTO_VERSION}.tar.gz && \ ./configure --srcdir=${DIR} --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -390,7 +391,7 @@ RUN \ curl -sLO https://www.x.org/archive/individual/lib/libXau-${XAU_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f libXau-${XAU_VERSION}.tar.gz && \ ./configure --srcdir=${DIR} --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -401,7 +402,7 @@ RUN \ curl -sLO https://xcb.freedesktop.org/dist/libpthread-stubs-${LIBPTHREAD_STUBS_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f libpthread-stubs-${LIBPTHREAD_STUBS_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -413,7 +414,7 @@ RUN \ tar -zx --strip-components=1 -f xcb-proto-${XCBPROTO_VERSION}.tar.gz && \ ACLOCAL_PATH="${PREFIX}/share/aclocal" ./autogen.sh && \ ./configure --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -425,7 +426,7 @@ RUN \ tar -zx --strip-components=1 -f libxcb-${LIBXCB_VERSION}.tar.gz && \ ACLOCAL_PATH="${PREFIX}/share/aclocal" ./autogen.sh && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -438,7 +439,7 @@ RUN \ echo ${LIBXML2_SHA256SUM} | sha256sum --check && \ tar -xz --strip-components=1 -f libxml2-v${LIBXML2_VERSION}.tar.gz && \ ./autogen.sh --prefix="${PREFIX}" --with-ftp=no --with-http=no --with-python=no && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -451,7 +452,7 @@ RUN \ echo ${LIBBLURAY_SHA256SUM} | sha256sum --check && \ tar -jx --strip-components=1 -f libbluray-${LIBBLURAY_VERSION}.tar.bz2 && \ ./configure --prefix="${PREFIX}" --disable-examples --disable-bdjava-jar --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -465,7 +466,7 @@ RUN \ tar -xz --strip-components=1 -f v${LIBZMQ_VERSION}.tar.gz && \ ./autogen.sh && \ ./configure --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make check && \ make install && \ rm -rf ${DIR} @@ -478,7 +479,7 @@ RUN \ curl -sLO https://github.com/Haivision/srt/archive/v${LIBSRT_VERSION}.tar.gz && \ tar -xz --strip-components=1 -f v${LIBSRT_VERSION}.tar.gz && \ cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -490,7 +491,7 @@ RUN \ git clone https://git.code.sf.net/p/libpng/code ${DIR} -b v${LIBPNG_VERSION} --depth 1 && \ ./autogen.sh && \ ./configure --prefix="${PREFIX}" && \ - make check && \ + make check -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -504,7 +505,20 @@ RUN \ tar -xz --strip-components=1 -f v${LIBARIBB24_VERSION}.tar.gz && \ autoreconf -fiv && \ ./configure CFLAGS="-I${PREFIX}/include -fPIC" --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ + make install && \ + rm -rf ${DIR} + + +## libsvtav1 +RUN \ + DIR=/tmp/svtav1 && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + git clone https://gitlab.com/AOMediaCodec/SVT-AV1.git ${DIR} --depth=1 -b ${LIBSTVAV1_VERSION} &&\ + cd Build && \ + cmake .. -G"Unix Makefiles" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="${PREFIX}" && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -555,7 +569,7 @@ RUN \ --enable-libkvazaar \ --extra-cflags="-I${PREFIX}/include" \ --extra-ldflags="-L${PREFIX}/lib" && \ - make && \ + make -j $(nproc) && \ 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..ff8380def 100644 --- a/docker-images/3.3/vaapi2004/Dockerfile +++ b/docker-images/3.3/vaapi2004/Dockerfile @@ -17,7 +17,8 @@ RUN apt-get -yqq update && \ FROM base as build ENV FFMPEG_VERSION=3.3.9 \ - AOM_VERSION=v1.0.0 \ + LIBSTVAV1_VERSION=v0.8.7 \ + AOM_VERSION=v3.1.3 \ FDKAAC_VERSION=0.1.5 \ FONTCONFIG_VERSION=2.12.4 \ FREETYPE_VERSION=2.10.4 \ @@ -128,7 +129,7 @@ RUN \ curl -sL https://versaweb.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${OPENCOREAMR_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## x264 http://www.videolan.org/developers/x264.html @@ -139,7 +140,7 @@ RUN \ curl -sL https://download.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-${X264_VERSION}.tar.bz2 | \ tar -jx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared --enable-pic --disable-cli && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### x265 http://x265.org/ @@ -153,7 +154,7 @@ RUN \ sed -i "/-DEXTRA_LIB/ s/$/ -DCMAKE_INSTALL_PREFIX=\${PREFIX}/" multilib.sh && \ sed -i "/^cmake/ s/$/ -DENABLE_CLI=OFF/" multilib.sh && \ ./multilib.sh && \ - make -C 8bit install && \ + make -C 8bit -j $(nproc) install && \ rm -rf ${DIR} ### libogg https://www.xiph.org/ogg/ RUN \ @@ -164,7 +165,7 @@ RUN \ echo ${OGG_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f libogg-${OGG_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libopus https://www.opus-codec.org/ @@ -177,7 +178,7 @@ RUN \ tar -zx --strip-components=1 -f opus-${OPUS_VERSION}.tar.gz && \ autoreconf -fiv && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libvorbis https://xiph.org/vorbis/ @@ -189,7 +190,7 @@ RUN \ echo ${VORBIS_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f libvorbis-${VORBIS_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libtheora http://www.theora.org/ @@ -201,7 +202,7 @@ RUN \ echo ${THEORA_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f libtheora-${THEORA_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libvpx https://www.webmproject.org/code/ @@ -213,7 +214,7 @@ RUN \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-vp8 --enable-vp9 --enable-vp9-highbitdepth --enable-pic --enable-shared \ --disable-debug --disable-examples --disable-docs --disable-install-bins && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libwebp https://developers.google.com/speed/webp/ @@ -224,7 +225,7 @@ RUN \ curl -sL https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-${WEBP_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libmp3lame http://lame.sourceforge.net/ @@ -235,7 +236,7 @@ RUN \ curl -sL https://versaweb.dl.sourceforge.net/project/lame/lame/$(echo ${LAME_VERSION} | sed -e 's/[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)/\1.\2/')/lame-${LAME_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" --enable-shared --enable-nasm --disable-frontend && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### xvid https://www.xvid.com/ @@ -248,7 +249,7 @@ RUN \ tar -zx -f xvidcore-${XVID_VERSION}.tar.gz && \ cd xvidcore/build/generic && \ ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### fdk-aac https://github.com/mstorsjo/fdk-aac @@ -260,7 +261,7 @@ RUN \ tar -zx --strip-components=1 && \ autoreconf -fiv && \ ./configure --prefix="${PREFIX}" --enable-shared --datadir="${DIR}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## openjpeg https://github.com/uclouvain/openjpeg @@ -271,7 +272,7 @@ RUN \ curl -sL https://github.com/uclouvain/openjpeg/archive/v${OPENJPEG_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ cmake -DBUILD_THIRDPARTY:BOOL=ON -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## freetype https://www.freetype.org/ @@ -283,7 +284,7 @@ RUN \ echo ${FREETYPE_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f freetype-${FREETYPE_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## libvstab https://github.com/georgmartius/vid.stab @@ -295,7 +296,7 @@ RUN \ echo ${LIBVIDSTAB_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f v${LIBVIDSTAB_VERSION}.tar.gz && \ cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## fridibi https://www.fribidi.org/ @@ -320,7 +321,7 @@ RUN \ curl -sLO https://www.freedesktop.org/software/fontconfig/release/fontconfig-${FONTCONFIG_VERSION}.tar.bz2 && \ tar -jx --strip-components=1 -f fontconfig-${FONTCONFIG_VERSION}.tar.bz2 && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## libass https://github.com/libass/libass @@ -333,7 +334,7 @@ RUN \ tar -zx --strip-components=1 -f ${LIBASS_VERSION}.tar.gz && \ ./autogen.sh && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## kvazaar https://github.com/ultravideo/kvazaar @@ -357,7 +358,7 @@ RUN \ mkdir -p ./aom_build ; \ cd ./aom_build ; \ cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" -DBUILD_SHARED_LIBS=1 ..; \ - make ; \ + make -j $(nproc); \ make install ; \ rm -rf ${DIR} @@ -369,7 +370,7 @@ RUN \ curl -sLO https://www.x.org/archive//individual/util/util-macros-${XORG_MACROS_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f util-macros-${XORG_MACROS_VERSION}.tar.gz && \ ./configure --srcdir=${DIR} --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -380,7 +381,7 @@ RUN \ curl -sLO https://www.x.org/archive/individual/proto/xproto-${XPROTO_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f xproto-${XPROTO_VERSION}.tar.gz && \ ./configure --srcdir=${DIR} --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -391,7 +392,7 @@ RUN \ curl -sLO https://www.x.org/archive/individual/lib/libXau-${XAU_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f libXau-${XAU_VERSION}.tar.gz && \ ./configure --srcdir=${DIR} --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -402,7 +403,7 @@ RUN \ curl -sLO https://xcb.freedesktop.org/dist/libpthread-stubs-${LIBPTHREAD_STUBS_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f libpthread-stubs-${LIBPTHREAD_STUBS_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -414,7 +415,7 @@ RUN \ tar -zx --strip-components=1 -f xcb-proto-${XCBPROTO_VERSION}.tar.gz && \ ACLOCAL_PATH="${PREFIX}/share/aclocal" ./autogen.sh && \ ./configure --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -426,7 +427,7 @@ RUN \ tar -zx --strip-components=1 -f libxcb-${LIBXCB_VERSION}.tar.gz && \ ACLOCAL_PATH="${PREFIX}/share/aclocal" ./autogen.sh && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -439,7 +440,7 @@ RUN \ echo ${LIBXML2_SHA256SUM} | sha256sum --check && \ tar -xz --strip-components=1 -f libxml2-v${LIBXML2_VERSION}.tar.gz && \ ./autogen.sh --prefix="${PREFIX}" --with-ftp=no --with-http=no --with-python=no && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -452,7 +453,7 @@ RUN \ echo ${LIBBLURAY_SHA256SUM} | sha256sum --check && \ tar -jx --strip-components=1 -f libbluray-${LIBBLURAY_VERSION}.tar.bz2 && \ ./configure --prefix="${PREFIX}" --disable-examples --disable-bdjava-jar --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -466,7 +467,7 @@ RUN \ tar -xz --strip-components=1 -f v${LIBZMQ_VERSION}.tar.gz && \ ./autogen.sh && \ ./configure --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make check && \ make install && \ rm -rf ${DIR} @@ -479,7 +480,7 @@ RUN \ curl -sLO https://github.com/Haivision/srt/archive/v${LIBSRT_VERSION}.tar.gz && \ tar -xz --strip-components=1 -f v${LIBSRT_VERSION}.tar.gz && \ cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -491,7 +492,7 @@ RUN \ git clone https://git.code.sf.net/p/libpng/code ${DIR} -b v${LIBPNG_VERSION} --depth 1 && \ ./autogen.sh && \ ./configure --prefix="${PREFIX}" && \ - make check && \ + make check -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -505,7 +506,20 @@ RUN \ tar -xz --strip-components=1 -f v${LIBARIBB24_VERSION}.tar.gz && \ autoreconf -fiv && \ ./configure CFLAGS="-I${PREFIX}/include -fPIC" --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ + make install && \ + rm -rf ${DIR} + + +## libsvtav1 +RUN \ + DIR=/tmp/svtav1 && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + git clone https://gitlab.com/AOMediaCodec/SVT-AV1.git ${DIR} --depth=1 -b ${LIBSTVAV1_VERSION} &&\ + cd Build && \ + cmake .. -G"Unix Makefiles" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="${PREFIX}" && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -557,7 +571,7 @@ RUN \ --enable-vaapi \ --extra-cflags="-I${PREFIX}/include" \ --extra-ldflags="-L${PREFIX}/lib" && \ - make && \ + make -j $(nproc) && \ 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..6023589b5 100644 --- a/docker-images/3.4/alpine312/Dockerfile +++ b/docker-images/3.4/alpine312/Dockerfile @@ -13,8 +13,9 @@ FROM base AS build WORKDIR /tmp/workdir -ENV FFMPEG_VERSION=3.4.8 \ - AOM_VERSION=v1.0.0 \ +ENV FFMPEG_VERSION=3.4.9 \ + LIBSTVAV1_VERSION=v0.8.7 \ + AOM_VERSION=v3.1.3 \ FDKAAC_VERSION=0.1.5 \ FONTCONFIG_VERSION=2.12.4 \ FREETYPE_VERSION=2.10.4 \ @@ -93,6 +94,8 @@ RUN buildDeps="autoconf \ yasm \ nasm \ zlib-dev \ + meson \ + xxd \ expat-dev" && \ apk add --no-cache --update ${buildDeps} ## libvmaf https://github.com/Netflix/vmaf @@ -123,7 +126,7 @@ RUN \ curl -sL https://versaweb.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${OPENCOREAMR_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## x264 http://www.videolan.org/developers/x264.html @@ -134,7 +137,7 @@ RUN \ curl -sL https://download.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-${X264_VERSION}.tar.bz2 | \ tar -jx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared --enable-pic --disable-cli && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### x265 http://x265.org/ @@ -148,7 +151,7 @@ RUN \ sed -i "/-DEXTRA_LIB/ s/$/ -DCMAKE_INSTALL_PREFIX=\${PREFIX}/" multilib.sh && \ sed -i "/^cmake/ s/$/ -DENABLE_CLI=OFF/" multilib.sh && \ ./multilib.sh && \ - make -C 8bit install && \ + make -C 8bit -j $(nproc) install && \ rm -rf ${DIR} ### libogg https://www.xiph.org/ogg/ RUN \ @@ -159,7 +162,7 @@ RUN \ echo ${OGG_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f libogg-${OGG_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libopus https://www.opus-codec.org/ @@ -172,7 +175,7 @@ RUN \ tar -zx --strip-components=1 -f opus-${OPUS_VERSION}.tar.gz && \ autoreconf -fiv && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libvorbis https://xiph.org/vorbis/ @@ -184,7 +187,7 @@ RUN \ echo ${VORBIS_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f libvorbis-${VORBIS_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libtheora http://www.theora.org/ @@ -196,7 +199,7 @@ RUN \ echo ${THEORA_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f libtheora-${THEORA_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libvpx https://www.webmproject.org/code/ @@ -208,7 +211,7 @@ RUN \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-vp8 --enable-vp9 --enable-vp9-highbitdepth --enable-pic --enable-shared \ --disable-debug --disable-examples --disable-docs --disable-install-bins && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libwebp https://developers.google.com/speed/webp/ @@ -219,7 +222,7 @@ RUN \ curl -sL https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-${WEBP_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libmp3lame http://lame.sourceforge.net/ @@ -230,7 +233,7 @@ RUN \ curl -sL https://versaweb.dl.sourceforge.net/project/lame/lame/$(echo ${LAME_VERSION} | sed -e 's/[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)/\1.\2/')/lame-${LAME_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" --enable-shared --enable-nasm --disable-frontend && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### xvid https://www.xvid.com/ @@ -243,7 +246,7 @@ RUN \ tar -zx -f xvidcore-${XVID_VERSION}.tar.gz && \ cd xvidcore/build/generic && \ ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### fdk-aac https://github.com/mstorsjo/fdk-aac @@ -255,7 +258,7 @@ RUN \ tar -zx --strip-components=1 && \ autoreconf -fiv && \ ./configure --prefix="${PREFIX}" --enable-shared --datadir="${DIR}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## openjpeg https://github.com/uclouvain/openjpeg @@ -266,7 +269,7 @@ RUN \ curl -sL https://github.com/uclouvain/openjpeg/archive/v${OPENJPEG_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ cmake -DBUILD_THIRDPARTY:BOOL=ON -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## freetype https://www.freetype.org/ @@ -278,7 +281,7 @@ RUN \ echo ${FREETYPE_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f freetype-${FREETYPE_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## libvstab https://github.com/georgmartius/vid.stab @@ -290,7 +293,7 @@ RUN \ echo ${LIBVIDSTAB_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f v${LIBVIDSTAB_VERSION}.tar.gz && \ cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## fridibi https://www.fribidi.org/ @@ -315,7 +318,7 @@ RUN \ curl -sLO https://www.freedesktop.org/software/fontconfig/release/fontconfig-${FONTCONFIG_VERSION}.tar.bz2 && \ tar -jx --strip-components=1 -f fontconfig-${FONTCONFIG_VERSION}.tar.bz2 && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## libass https://github.com/libass/libass @@ -328,7 +331,7 @@ RUN \ tar -zx --strip-components=1 -f ${LIBASS_VERSION}.tar.gz && \ ./autogen.sh && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## kvazaar https://github.com/ultravideo/kvazaar @@ -352,7 +355,7 @@ RUN \ mkdir -p ./aom_build ; \ cd ./aom_build ; \ cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" -DBUILD_SHARED_LIBS=1 ..; \ - make ; \ + make -j $(nproc); \ make install ; \ rm -rf ${DIR} @@ -364,7 +367,7 @@ RUN \ curl -sLO https://www.x.org/archive//individual/util/util-macros-${XORG_MACROS_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f util-macros-${XORG_MACROS_VERSION}.tar.gz && \ ./configure --srcdir=${DIR} --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -375,7 +378,7 @@ RUN \ curl -sLO https://www.x.org/archive/individual/proto/xproto-${XPROTO_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f xproto-${XPROTO_VERSION}.tar.gz && \ ./configure --srcdir=${DIR} --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -386,7 +389,7 @@ RUN \ curl -sLO https://www.x.org/archive/individual/lib/libXau-${XAU_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f libXau-${XAU_VERSION}.tar.gz && \ ./configure --srcdir=${DIR} --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -397,7 +400,7 @@ RUN \ curl -sLO https://xcb.freedesktop.org/dist/libpthread-stubs-${LIBPTHREAD_STUBS_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f libpthread-stubs-${LIBPTHREAD_STUBS_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -409,7 +412,7 @@ RUN \ tar -zx --strip-components=1 -f xcb-proto-${XCBPROTO_VERSION}.tar.gz && \ ACLOCAL_PATH="${PREFIX}/share/aclocal" ./autogen.sh && \ ./configure --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -421,7 +424,7 @@ RUN \ tar -zx --strip-components=1 -f libxcb-${LIBXCB_VERSION}.tar.gz && \ ACLOCAL_PATH="${PREFIX}/share/aclocal" ./autogen.sh && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -434,7 +437,7 @@ RUN \ echo ${LIBXML2_SHA256SUM} | sha256sum --check && \ tar -xz --strip-components=1 -f libxml2-v${LIBXML2_VERSION}.tar.gz && \ ./autogen.sh --prefix="${PREFIX}" --with-ftp=no --with-http=no --with-python=no && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -447,7 +450,7 @@ RUN \ echo ${LIBBLURAY_SHA256SUM} | sha256sum --check && \ tar -jx --strip-components=1 -f libbluray-${LIBBLURAY_VERSION}.tar.bz2 && \ ./configure --prefix="${PREFIX}" --disable-examples --disable-bdjava-jar --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -461,7 +464,7 @@ RUN \ tar -xz --strip-components=1 -f v${LIBZMQ_VERSION}.tar.gz && \ ./autogen.sh && \ ./configure --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make check && \ make install && \ rm -rf ${DIR} @@ -474,7 +477,7 @@ RUN \ curl -sLO https://github.com/Haivision/srt/archive/v${LIBSRT_VERSION}.tar.gz && \ tar -xz --strip-components=1 -f v${LIBSRT_VERSION}.tar.gz && \ cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -486,7 +489,7 @@ RUN \ git clone https://git.code.sf.net/p/libpng/code ${DIR} -b v${LIBPNG_VERSION} --depth 1 && \ ./autogen.sh && \ ./configure --prefix="${PREFIX}" && \ - make check && \ + make check -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -500,7 +503,20 @@ RUN \ tar -xz --strip-components=1 -f v${LIBARIBB24_VERSION}.tar.gz && \ autoreconf -fiv && \ ./configure CFLAGS="-I${PREFIX}/include -fPIC" --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ + make install && \ + rm -rf ${DIR} + + +## libsvtav1 +RUN \ + DIR=/tmp/svtav1 && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + git clone https://gitlab.com/AOMediaCodec/SVT-AV1.git ${DIR} --depth=1 -b ${LIBSTVAV1_VERSION} &&\ + cd Build && \ + cmake .. -G"Unix Makefiles" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="${PREFIX}" && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -551,7 +567,7 @@ RUN \ --enable-libkvazaar \ --extra-cflags="-I${PREFIX}/include" \ --extra-ldflags="-L${PREFIX}/lib" && \ - make && \ + make -j $(nproc) && \ 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..af97c3840 100644 --- a/docker-images/3.4/centos7/Dockerfile +++ b/docker-images/3.4/centos7/Dockerfile @@ -15,8 +15,9 @@ FROM base AS build WORKDIR /tmp/workdir -ENV FFMPEG_VERSION=3.4.8 \ - AOM_VERSION=v1.0.0 \ +ENV FFMPEG_VERSION=3.4.9 \ + LIBSTVAV1_VERSION=v0.8.7 \ + AOM_VERSION=v3.1.3 \ FDKAAC_VERSION=0.1.5 \ FONTCONFIG_VERSION=2.12.4 \ FREETYPE_VERSION=2.10.4 \ @@ -160,7 +161,7 @@ RUN \ curl -sL https://versaweb.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${OPENCOREAMR_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## x264 http://www.videolan.org/developers/x264.html @@ -171,7 +172,7 @@ RUN \ curl -sL https://download.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-${X264_VERSION}.tar.bz2 | \ tar -jx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared --enable-pic --disable-cli && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### x265 http://x265.org/ @@ -185,7 +186,7 @@ RUN \ sed -i "/-DEXTRA_LIB/ s/$/ -DCMAKE_INSTALL_PREFIX=\${PREFIX}/" multilib.sh && \ sed -i "/^cmake/ s/$/ -DENABLE_CLI=OFF/" multilib.sh && \ ./multilib.sh && \ - make -C 8bit install && \ + make -C 8bit -j $(nproc) install && \ rm -rf ${DIR} ### libogg https://www.xiph.org/ogg/ RUN \ @@ -196,7 +197,7 @@ RUN \ echo ${OGG_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f libogg-${OGG_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libopus https://www.opus-codec.org/ @@ -209,7 +210,7 @@ RUN \ tar -zx --strip-components=1 -f opus-${OPUS_VERSION}.tar.gz && \ autoreconf -fiv && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libvorbis https://xiph.org/vorbis/ @@ -221,7 +222,7 @@ RUN \ echo ${VORBIS_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f libvorbis-${VORBIS_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libtheora http://www.theora.org/ @@ -233,7 +234,7 @@ RUN \ echo ${THEORA_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f libtheora-${THEORA_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libvpx https://www.webmproject.org/code/ @@ -245,7 +246,7 @@ RUN \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-vp8 --enable-vp9 --enable-vp9-highbitdepth --enable-pic --enable-shared \ --disable-debug --disable-examples --disable-docs --disable-install-bins && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libwebp https://developers.google.com/speed/webp/ @@ -256,7 +257,7 @@ RUN \ curl -sL https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-${WEBP_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libmp3lame http://lame.sourceforge.net/ @@ -267,7 +268,7 @@ RUN \ curl -sL https://versaweb.dl.sourceforge.net/project/lame/lame/$(echo ${LAME_VERSION} | sed -e 's/[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)/\1.\2/')/lame-${LAME_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" --enable-shared --enable-nasm --disable-frontend && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### xvid https://www.xvid.com/ @@ -280,7 +281,7 @@ RUN \ tar -zx -f xvidcore-${XVID_VERSION}.tar.gz && \ cd xvidcore/build/generic && \ ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### fdk-aac https://github.com/mstorsjo/fdk-aac @@ -292,7 +293,7 @@ RUN \ tar -zx --strip-components=1 && \ autoreconf -fiv && \ ./configure --prefix="${PREFIX}" --enable-shared --datadir="${DIR}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## openjpeg https://github.com/uclouvain/openjpeg @@ -303,7 +304,7 @@ RUN \ curl -sL https://github.com/uclouvain/openjpeg/archive/v${OPENJPEG_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ cmake -DBUILD_THIRDPARTY:BOOL=ON -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## freetype https://www.freetype.org/ @@ -315,7 +316,7 @@ RUN \ echo ${FREETYPE_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f freetype-${FREETYPE_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## libvstab https://github.com/georgmartius/vid.stab @@ -327,7 +328,7 @@ RUN \ echo ${LIBVIDSTAB_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f v${LIBVIDSTAB_VERSION}.tar.gz && \ cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## fridibi https://www.fribidi.org/ @@ -352,7 +353,7 @@ RUN \ curl -sLO https://www.freedesktop.org/software/fontconfig/release/fontconfig-${FONTCONFIG_VERSION}.tar.bz2 && \ tar -jx --strip-components=1 -f fontconfig-${FONTCONFIG_VERSION}.tar.bz2 && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## libass https://github.com/libass/libass @@ -365,7 +366,7 @@ RUN \ tar -zx --strip-components=1 -f ${LIBASS_VERSION}.tar.gz && \ ./autogen.sh && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## kvazaar https://github.com/ultravideo/kvazaar @@ -389,7 +390,7 @@ RUN \ mkdir -p ./aom_build ; \ cd ./aom_build ; \ cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" -DBUILD_SHARED_LIBS=1 ..; \ - make ; \ + make -j $(nproc); \ make install ; \ rm -rf ${DIR} @@ -401,7 +402,7 @@ RUN \ curl -sLO https://www.x.org/archive//individual/util/util-macros-${XORG_MACROS_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f util-macros-${XORG_MACROS_VERSION}.tar.gz && \ ./configure --srcdir=${DIR} --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -412,7 +413,7 @@ RUN \ curl -sLO https://www.x.org/archive/individual/proto/xproto-${XPROTO_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f xproto-${XPROTO_VERSION}.tar.gz && \ ./configure --srcdir=${DIR} --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -423,7 +424,7 @@ RUN \ curl -sLO https://www.x.org/archive/individual/lib/libXau-${XAU_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f libXau-${XAU_VERSION}.tar.gz && \ ./configure --srcdir=${DIR} --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -434,7 +435,7 @@ RUN \ curl -sLO https://xcb.freedesktop.org/dist/libpthread-stubs-${LIBPTHREAD_STUBS_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f libpthread-stubs-${LIBPTHREAD_STUBS_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -446,7 +447,7 @@ RUN \ tar -zx --strip-components=1 -f xcb-proto-${XCBPROTO_VERSION}.tar.gz && \ ACLOCAL_PATH="${PREFIX}/share/aclocal" ./autogen.sh && \ ./configure --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -458,7 +459,7 @@ RUN \ tar -zx --strip-components=1 -f libxcb-${LIBXCB_VERSION}.tar.gz && \ ACLOCAL_PATH="${PREFIX}/share/aclocal" ./autogen.sh && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -471,7 +472,7 @@ RUN \ echo ${LIBXML2_SHA256SUM} | sha256sum --check && \ tar -xz --strip-components=1 -f libxml2-v${LIBXML2_VERSION}.tar.gz && \ ./autogen.sh --prefix="${PREFIX}" --with-ftp=no --with-http=no --with-python=no && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -484,7 +485,7 @@ RUN \ echo ${LIBBLURAY_SHA256SUM} | sha256sum --check && \ tar -jx --strip-components=1 -f libbluray-${LIBBLURAY_VERSION}.tar.bz2 && \ ./configure --prefix="${PREFIX}" --disable-examples --disable-bdjava-jar --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -498,7 +499,7 @@ RUN \ tar -xz --strip-components=1 -f v${LIBZMQ_VERSION}.tar.gz && \ ./autogen.sh && \ ./configure --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make check && \ make install && \ rm -rf ${DIR} @@ -511,7 +512,7 @@ RUN \ curl -sLO https://github.com/Haivision/srt/archive/v${LIBSRT_VERSION}.tar.gz && \ tar -xz --strip-components=1 -f v${LIBSRT_VERSION}.tar.gz && \ cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -523,7 +524,7 @@ RUN \ git clone https://git.code.sf.net/p/libpng/code ${DIR} -b v${LIBPNG_VERSION} --depth 1 && \ ./autogen.sh && \ ./configure --prefix="${PREFIX}" && \ - make check && \ + make check -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -537,7 +538,20 @@ RUN \ tar -xz --strip-components=1 -f v${LIBARIBB24_VERSION}.tar.gz && \ autoreconf -fiv && \ ./configure CFLAGS="-I${PREFIX}/include -fPIC" --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ + make install && \ + rm -rf ${DIR} + + +## libsvtav1 +RUN \ + DIR=/tmp/svtav1 && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + git clone https://gitlab.com/AOMediaCodec/SVT-AV1.git ${DIR} --depth=1 -b ${LIBSTVAV1_VERSION} &&\ + cd Build && \ + cmake .. -G"Unix Makefiles" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="${PREFIX}" && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -588,7 +602,7 @@ RUN \ --enable-libkvazaar \ --extra-cflags="-I${PREFIX}/include" \ --extra-ldflags="-L${PREFIX}/lib" && \ - make && \ + make -j $(nproc) && \ 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..dc1ff5e68 100644 --- a/docker-images/3.4/centos8/Dockerfile +++ b/docker-images/3.4/centos8/Dockerfile @@ -15,8 +15,9 @@ FROM base AS build WORKDIR /tmp/workdir -ENV FFMPEG_VERSION=3.4.8 \ - AOM_VERSION=v1.0.0 \ +ENV FFMPEG_VERSION=3.4.9 \ + LIBSTVAV1_VERSION=v0.8.7 \ + AOM_VERSION=v3.1.3 \ FDKAAC_VERSION=0.1.5 \ FONTCONFIG_VERSION=2.12.4 \ FREETYPE_VERSION=2.10.4 \ @@ -129,7 +130,7 @@ RUN \ curl -sL https://versaweb.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${OPENCOREAMR_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## x264 http://www.videolan.org/developers/x264.html @@ -140,7 +141,7 @@ RUN \ curl -sL https://download.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-${X264_VERSION}.tar.bz2 | \ tar -jx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared --enable-pic --disable-cli && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### x265 http://x265.org/ @@ -154,7 +155,7 @@ RUN \ sed -i "/-DEXTRA_LIB/ s/$/ -DCMAKE_INSTALL_PREFIX=\${PREFIX}/" multilib.sh && \ sed -i "/^cmake/ s/$/ -DENABLE_CLI=OFF/" multilib.sh && \ ./multilib.sh && \ - make -C 8bit install && \ + make -C 8bit -j $(nproc) install && \ rm -rf ${DIR} ### libogg https://www.xiph.org/ogg/ RUN \ @@ -165,7 +166,7 @@ RUN \ echo ${OGG_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f libogg-${OGG_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libopus https://www.opus-codec.org/ @@ -178,7 +179,7 @@ RUN \ tar -zx --strip-components=1 -f opus-${OPUS_VERSION}.tar.gz && \ autoreconf -fiv && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libvorbis https://xiph.org/vorbis/ @@ -190,7 +191,7 @@ RUN \ echo ${VORBIS_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f libvorbis-${VORBIS_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libtheora http://www.theora.org/ @@ -202,7 +203,7 @@ RUN \ echo ${THEORA_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f libtheora-${THEORA_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libvpx https://www.webmproject.org/code/ @@ -214,7 +215,7 @@ RUN \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-vp8 --enable-vp9 --enable-vp9-highbitdepth --enable-pic --enable-shared \ --disable-debug --disable-examples --disable-docs --disable-install-bins && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libwebp https://developers.google.com/speed/webp/ @@ -225,7 +226,7 @@ RUN \ curl -sL https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-${WEBP_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libmp3lame http://lame.sourceforge.net/ @@ -236,7 +237,7 @@ RUN \ curl -sL https://versaweb.dl.sourceforge.net/project/lame/lame/$(echo ${LAME_VERSION} | sed -e 's/[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)/\1.\2/')/lame-${LAME_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" --enable-shared --enable-nasm --disable-frontend && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### xvid https://www.xvid.com/ @@ -249,7 +250,7 @@ RUN \ tar -zx -f xvidcore-${XVID_VERSION}.tar.gz && \ cd xvidcore/build/generic && \ ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### fdk-aac https://github.com/mstorsjo/fdk-aac @@ -261,7 +262,7 @@ RUN \ tar -zx --strip-components=1 && \ autoreconf -fiv && \ ./configure --prefix="${PREFIX}" --enable-shared --datadir="${DIR}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## openjpeg https://github.com/uclouvain/openjpeg @@ -272,7 +273,7 @@ RUN \ curl -sL https://github.com/uclouvain/openjpeg/archive/v${OPENJPEG_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ cmake -DBUILD_THIRDPARTY:BOOL=ON -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## freetype https://www.freetype.org/ @@ -284,7 +285,7 @@ RUN \ echo ${FREETYPE_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f freetype-${FREETYPE_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## libvstab https://github.com/georgmartius/vid.stab @@ -296,7 +297,7 @@ RUN \ echo ${LIBVIDSTAB_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f v${LIBVIDSTAB_VERSION}.tar.gz && \ cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## fridibi https://www.fribidi.org/ @@ -321,7 +322,7 @@ RUN \ curl -sLO https://www.freedesktop.org/software/fontconfig/release/fontconfig-${FONTCONFIG_VERSION}.tar.bz2 && \ tar -jx --strip-components=1 -f fontconfig-${FONTCONFIG_VERSION}.tar.bz2 && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## libass https://github.com/libass/libass @@ -334,7 +335,7 @@ RUN \ tar -zx --strip-components=1 -f ${LIBASS_VERSION}.tar.gz && \ ./autogen.sh && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## kvazaar https://github.com/ultravideo/kvazaar @@ -358,7 +359,7 @@ RUN \ mkdir -p ./aom_build ; \ cd ./aom_build ; \ cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" -DBUILD_SHARED_LIBS=1 ..; \ - make ; \ + make -j $(nproc); \ make install ; \ rm -rf ${DIR} @@ -370,7 +371,7 @@ RUN \ curl -sLO https://www.x.org/archive//individual/util/util-macros-${XORG_MACROS_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f util-macros-${XORG_MACROS_VERSION}.tar.gz && \ ./configure --srcdir=${DIR} --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -381,7 +382,7 @@ RUN \ curl -sLO https://www.x.org/archive/individual/proto/xproto-${XPROTO_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f xproto-${XPROTO_VERSION}.tar.gz && \ ./configure --srcdir=${DIR} --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -392,7 +393,7 @@ RUN \ curl -sLO https://www.x.org/archive/individual/lib/libXau-${XAU_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f libXau-${XAU_VERSION}.tar.gz && \ ./configure --srcdir=${DIR} --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -403,7 +404,7 @@ RUN \ curl -sLO https://xcb.freedesktop.org/dist/libpthread-stubs-${LIBPTHREAD_STUBS_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f libpthread-stubs-${LIBPTHREAD_STUBS_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -415,7 +416,7 @@ RUN \ tar -zx --strip-components=1 -f xcb-proto-${XCBPROTO_VERSION}.tar.gz && \ ACLOCAL_PATH="${PREFIX}/share/aclocal" ./autogen.sh && \ ./configure --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -427,7 +428,7 @@ RUN \ tar -zx --strip-components=1 -f libxcb-${LIBXCB_VERSION}.tar.gz && \ ACLOCAL_PATH="${PREFIX}/share/aclocal" ./autogen.sh && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -440,7 +441,7 @@ RUN \ echo ${LIBXML2_SHA256SUM} | sha256sum --check && \ tar -xz --strip-components=1 -f libxml2-v${LIBXML2_VERSION}.tar.gz && \ ./autogen.sh --prefix="${PREFIX}" --with-ftp=no --with-http=no --with-python=no && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -453,7 +454,7 @@ RUN \ echo ${LIBBLURAY_SHA256SUM} | sha256sum --check && \ tar -jx --strip-components=1 -f libbluray-${LIBBLURAY_VERSION}.tar.bz2 && \ ./configure --prefix="${PREFIX}" --disable-examples --disable-bdjava-jar --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -467,7 +468,7 @@ RUN \ tar -xz --strip-components=1 -f v${LIBZMQ_VERSION}.tar.gz && \ ./autogen.sh && \ ./configure --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make check && \ make install && \ rm -rf ${DIR} @@ -480,7 +481,7 @@ RUN \ curl -sLO https://github.com/Haivision/srt/archive/v${LIBSRT_VERSION}.tar.gz && \ tar -xz --strip-components=1 -f v${LIBSRT_VERSION}.tar.gz && \ cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -492,7 +493,7 @@ RUN \ git clone https://git.code.sf.net/p/libpng/code ${DIR} -b v${LIBPNG_VERSION} --depth 1 && \ ./autogen.sh && \ ./configure --prefix="${PREFIX}" && \ - make check && \ + make check -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -506,7 +507,20 @@ RUN \ tar -xz --strip-components=1 -f v${LIBARIBB24_VERSION}.tar.gz && \ autoreconf -fiv && \ ./configure CFLAGS="-I${PREFIX}/include -fPIC" --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ + make install && \ + rm -rf ${DIR} + + +## libsvtav1 +RUN \ + DIR=/tmp/svtav1 && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + git clone https://gitlab.com/AOMediaCodec/SVT-AV1.git ${DIR} --depth=1 -b ${LIBSTVAV1_VERSION} &&\ + cd Build && \ + cmake .. -G"Unix Makefiles" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="${PREFIX}" && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -557,7 +571,7 @@ RUN \ --enable-libkvazaar \ --extra-cflags="-I${PREFIX}/include" \ --extra-ldflags="-L${PREFIX}/lib" && \ - make && \ + make -j $(nproc) && \ 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..ae8e61f2a 100644 --- a/docker-images/3.4/nvidia2004/Dockerfile +++ b/docker-images/3.4/nvidia2004/Dockerfile @@ -33,8 +33,9 @@ FROM devel-base as build ENV NVIDIA_HEADERS_VERSION=11.1.5.0 -ENV FFMPEG_VERSION=3.4.8 \ - AOM_VERSION=v1.0.0 \ +ENV FFMPEG_VERSION=3.4.9 \ + LIBSTVAV1_VERSION=v0.8.7 \ + AOM_VERSION=v3.1.3 \ FDKAAC_VERSION=0.1.5 \ FONTCONFIG_VERSION=2.12.4 \ FREETYPE_VERSION=2.10.4 \ @@ -151,7 +152,7 @@ RUN \ curl -sL https://versaweb.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${OPENCOREAMR_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## x264 http://www.videolan.org/developers/x264.html @@ -162,7 +163,7 @@ RUN \ curl -sL https://download.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-${X264_VERSION}.tar.bz2 | \ tar -jx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared --enable-pic --disable-cli && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### x265 http://x265.org/ @@ -176,7 +177,7 @@ RUN \ sed -i "/-DEXTRA_LIB/ s/$/ -DCMAKE_INSTALL_PREFIX=\${PREFIX}/" multilib.sh && \ sed -i "/^cmake/ s/$/ -DENABLE_CLI=OFF/" multilib.sh && \ ./multilib.sh && \ - make -C 8bit install && \ + make -C 8bit -j $(nproc) install && \ rm -rf ${DIR} ### libogg https://www.xiph.org/ogg/ RUN \ @@ -187,7 +188,7 @@ RUN \ echo ${OGG_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f libogg-${OGG_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libopus https://www.opus-codec.org/ @@ -200,7 +201,7 @@ RUN \ tar -zx --strip-components=1 -f opus-${OPUS_VERSION}.tar.gz && \ autoreconf -fiv && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libvorbis https://xiph.org/vorbis/ @@ -212,7 +213,7 @@ RUN \ echo ${VORBIS_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f libvorbis-${VORBIS_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libtheora http://www.theora.org/ @@ -224,7 +225,7 @@ RUN \ echo ${THEORA_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f libtheora-${THEORA_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libvpx https://www.webmproject.org/code/ @@ -236,7 +237,7 @@ RUN \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-vp8 --enable-vp9 --enable-vp9-highbitdepth --enable-pic --enable-shared \ --disable-debug --disable-examples --disable-docs --disable-install-bins && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libwebp https://developers.google.com/speed/webp/ @@ -247,7 +248,7 @@ RUN \ curl -sL https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-${WEBP_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libmp3lame http://lame.sourceforge.net/ @@ -258,7 +259,7 @@ RUN \ curl -sL https://versaweb.dl.sourceforge.net/project/lame/lame/$(echo ${LAME_VERSION} | sed -e 's/[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)/\1.\2/')/lame-${LAME_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" --enable-shared --enable-nasm --disable-frontend && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### xvid https://www.xvid.com/ @@ -271,7 +272,7 @@ RUN \ tar -zx -f xvidcore-${XVID_VERSION}.tar.gz && \ cd xvidcore/build/generic && \ ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### fdk-aac https://github.com/mstorsjo/fdk-aac @@ -283,7 +284,7 @@ RUN \ tar -zx --strip-components=1 && \ autoreconf -fiv && \ ./configure --prefix="${PREFIX}" --enable-shared --datadir="${DIR}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## openjpeg https://github.com/uclouvain/openjpeg @@ -294,7 +295,7 @@ RUN \ curl -sL https://github.com/uclouvain/openjpeg/archive/v${OPENJPEG_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ cmake -DBUILD_THIRDPARTY:BOOL=ON -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## freetype https://www.freetype.org/ @@ -306,7 +307,7 @@ RUN \ echo ${FREETYPE_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f freetype-${FREETYPE_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## libvstab https://github.com/georgmartius/vid.stab @@ -318,7 +319,7 @@ RUN \ echo ${LIBVIDSTAB_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f v${LIBVIDSTAB_VERSION}.tar.gz && \ cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## fridibi https://www.fribidi.org/ @@ -343,7 +344,7 @@ RUN \ curl -sLO https://www.freedesktop.org/software/fontconfig/release/fontconfig-${FONTCONFIG_VERSION}.tar.bz2 && \ tar -jx --strip-components=1 -f fontconfig-${FONTCONFIG_VERSION}.tar.bz2 && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## libass https://github.com/libass/libass @@ -356,7 +357,7 @@ RUN \ tar -zx --strip-components=1 -f ${LIBASS_VERSION}.tar.gz && \ ./autogen.sh && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## kvazaar https://github.com/ultravideo/kvazaar @@ -380,7 +381,7 @@ RUN \ mkdir -p ./aom_build ; \ cd ./aom_build ; \ cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" -DBUILD_SHARED_LIBS=1 ..; \ - make ; \ + make -j $(nproc); \ make install ; \ rm -rf ${DIR} @@ -392,7 +393,7 @@ RUN \ curl -sLO https://www.x.org/archive//individual/util/util-macros-${XORG_MACROS_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f util-macros-${XORG_MACROS_VERSION}.tar.gz && \ ./configure --srcdir=${DIR} --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -403,7 +404,7 @@ RUN \ curl -sLO https://www.x.org/archive/individual/proto/xproto-${XPROTO_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f xproto-${XPROTO_VERSION}.tar.gz && \ ./configure --srcdir=${DIR} --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -414,7 +415,7 @@ RUN \ curl -sLO https://www.x.org/archive/individual/lib/libXau-${XAU_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f libXau-${XAU_VERSION}.tar.gz && \ ./configure --srcdir=${DIR} --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -425,7 +426,7 @@ RUN \ curl -sLO https://xcb.freedesktop.org/dist/libpthread-stubs-${LIBPTHREAD_STUBS_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f libpthread-stubs-${LIBPTHREAD_STUBS_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -437,7 +438,7 @@ RUN \ tar -zx --strip-components=1 -f xcb-proto-${XCBPROTO_VERSION}.tar.gz && \ ACLOCAL_PATH="${PREFIX}/share/aclocal" ./autogen.sh && \ ./configure --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -449,7 +450,7 @@ RUN \ tar -zx --strip-components=1 -f libxcb-${LIBXCB_VERSION}.tar.gz && \ ACLOCAL_PATH="${PREFIX}/share/aclocal" ./autogen.sh && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -462,7 +463,7 @@ RUN \ echo ${LIBXML2_SHA256SUM} | sha256sum --check && \ tar -xz --strip-components=1 -f libxml2-v${LIBXML2_VERSION}.tar.gz && \ ./autogen.sh --prefix="${PREFIX}" --with-ftp=no --with-http=no --with-python=no && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -475,7 +476,7 @@ RUN \ echo ${LIBBLURAY_SHA256SUM} | sha256sum --check && \ tar -jx --strip-components=1 -f libbluray-${LIBBLURAY_VERSION}.tar.bz2 && \ ./configure --prefix="${PREFIX}" --disable-examples --disable-bdjava-jar --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -489,7 +490,7 @@ RUN \ tar -xz --strip-components=1 -f v${LIBZMQ_VERSION}.tar.gz && \ ./autogen.sh && \ ./configure --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make check && \ make install && \ rm -rf ${DIR} @@ -502,7 +503,7 @@ RUN \ curl -sLO https://github.com/Haivision/srt/archive/v${LIBSRT_VERSION}.tar.gz && \ tar -xz --strip-components=1 -f v${LIBSRT_VERSION}.tar.gz && \ cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -514,7 +515,7 @@ RUN \ git clone https://git.code.sf.net/p/libpng/code ${DIR} -b v${LIBPNG_VERSION} --depth 1 && \ ./autogen.sh && \ ./configure --prefix="${PREFIX}" && \ - make check && \ + make check -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -528,7 +529,20 @@ RUN \ tar -xz --strip-components=1 -f v${LIBARIBB24_VERSION}.tar.gz && \ autoreconf -fiv && \ ./configure CFLAGS="-I${PREFIX}/include -fPIC" --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ + make install && \ + rm -rf ${DIR} + + +## libsvtav1 +RUN \ + DIR=/tmp/svtav1 && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + git clone https://gitlab.com/AOMediaCodec/SVT-AV1.git ${DIR} --depth=1 -b ${LIBSTVAV1_VERSION} &&\ + cd Build && \ + cmake .. -G"Unix Makefiles" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="${PREFIX}" && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -580,7 +594,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 -j $(nproc) && \ 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..199eefeb6 100644 --- a/docker-images/3.4/scratch312/Dockerfile +++ b/docker-images/3.4/scratch312/Dockerfile @@ -8,8 +8,9 @@ FROM alpine:3.12 AS build WORKDIR /tmp/workdir -ENV FFMPEG_VERSION=3.4.8 \ - AOM_VERSION=v1.0.0 \ +ENV FFMPEG_VERSION=3.4.9 \ + LIBSTVAV1_VERSION=v0.8.7 \ + AOM_VERSION=v3.1.3 \ FDKAAC_VERSION=0.1.5 \ FONTCONFIG_VERSION=2.12.4 \ FREETYPE_VERSION=2.10.4 \ @@ -125,7 +126,7 @@ RUN \ curl -sL https://versaweb.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${OPENCOREAMR_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## x264 http://www.videolan.org/developers/x264.html @@ -136,7 +137,7 @@ RUN \ curl -sL https://download.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-${X264_VERSION}.tar.bz2 | \ tar -jx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared --enable-pic --disable-cli && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### x265 http://x265.org/ @@ -150,7 +151,7 @@ RUN \ sed -i "/-DEXTRA_LIB/ s/$/ -DCMAKE_INSTALL_PREFIX=\${PREFIX}/" multilib.sh && \ sed -i "/^cmake/ s/$/ -DENABLE_CLI=OFF/" multilib.sh && \ ./multilib.sh && \ - make -C 8bit install && \ + make -C 8bit -j $(nproc) install && \ rm -rf ${DIR} ### libogg https://www.xiph.org/ogg/ RUN \ @@ -161,7 +162,7 @@ RUN \ echo ${OGG_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f libogg-${OGG_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libopus https://www.opus-codec.org/ @@ -174,7 +175,7 @@ RUN \ tar -zx --strip-components=1 -f opus-${OPUS_VERSION}.tar.gz && \ autoreconf -fiv && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libvorbis https://xiph.org/vorbis/ @@ -186,7 +187,7 @@ RUN \ echo ${VORBIS_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f libvorbis-${VORBIS_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libtheora http://www.theora.org/ @@ -198,7 +199,7 @@ RUN \ echo ${THEORA_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f libtheora-${THEORA_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libvpx https://www.webmproject.org/code/ @@ -210,7 +211,7 @@ RUN \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-vp8 --enable-vp9 --enable-vp9-highbitdepth --enable-pic --enable-shared \ --disable-debug --disable-examples --disable-docs --disable-install-bins && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libwebp https://developers.google.com/speed/webp/ @@ -221,7 +222,7 @@ RUN \ curl -sL https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-${WEBP_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libmp3lame http://lame.sourceforge.net/ @@ -232,7 +233,7 @@ RUN \ curl -sL https://versaweb.dl.sourceforge.net/project/lame/lame/$(echo ${LAME_VERSION} | sed -e 's/[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)/\1.\2/')/lame-${LAME_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" --enable-shared --enable-nasm --disable-frontend && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### xvid https://www.xvid.com/ @@ -245,7 +246,7 @@ RUN \ tar -zx -f xvidcore-${XVID_VERSION}.tar.gz && \ cd xvidcore/build/generic && \ ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### fdk-aac https://github.com/mstorsjo/fdk-aac @@ -257,7 +258,7 @@ RUN \ tar -zx --strip-components=1 && \ autoreconf -fiv && \ ./configure --prefix="${PREFIX}" --enable-shared --datadir="${DIR}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## openjpeg https://github.com/uclouvain/openjpeg @@ -268,7 +269,7 @@ RUN \ curl -sL https://github.com/uclouvain/openjpeg/archive/v${OPENJPEG_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ cmake -DBUILD_THIRDPARTY:BOOL=ON -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## freetype https://www.freetype.org/ @@ -280,7 +281,7 @@ RUN \ echo ${FREETYPE_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f freetype-${FREETYPE_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## libvstab https://github.com/georgmartius/vid.stab @@ -292,7 +293,7 @@ RUN \ echo ${LIBVIDSTAB_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f v${LIBVIDSTAB_VERSION}.tar.gz && \ cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## fridibi https://www.fribidi.org/ @@ -317,7 +318,7 @@ RUN \ curl -sLO https://www.freedesktop.org/software/fontconfig/release/fontconfig-${FONTCONFIG_VERSION}.tar.bz2 && \ tar -jx --strip-components=1 -f fontconfig-${FONTCONFIG_VERSION}.tar.bz2 && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## libass https://github.com/libass/libass @@ -330,7 +331,7 @@ RUN \ tar -zx --strip-components=1 -f ${LIBASS_VERSION}.tar.gz && \ ./autogen.sh && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## kvazaar https://github.com/ultravideo/kvazaar @@ -354,7 +355,7 @@ RUN \ mkdir -p ./aom_build ; \ cd ./aom_build ; \ cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" -DBUILD_SHARED_LIBS=1 ..; \ - make ; \ + make -j $(nproc); \ make install ; \ rm -rf ${DIR} @@ -366,7 +367,7 @@ RUN \ curl -sLO https://www.x.org/archive//individual/util/util-macros-${XORG_MACROS_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f util-macros-${XORG_MACROS_VERSION}.tar.gz && \ ./configure --srcdir=${DIR} --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -377,7 +378,7 @@ RUN \ curl -sLO https://www.x.org/archive/individual/proto/xproto-${XPROTO_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f xproto-${XPROTO_VERSION}.tar.gz && \ ./configure --srcdir=${DIR} --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -388,7 +389,7 @@ RUN \ curl -sLO https://www.x.org/archive/individual/lib/libXau-${XAU_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f libXau-${XAU_VERSION}.tar.gz && \ ./configure --srcdir=${DIR} --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -399,7 +400,7 @@ RUN \ curl -sLO https://xcb.freedesktop.org/dist/libpthread-stubs-${LIBPTHREAD_STUBS_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f libpthread-stubs-${LIBPTHREAD_STUBS_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -411,7 +412,7 @@ RUN \ tar -zx --strip-components=1 -f xcb-proto-${XCBPROTO_VERSION}.tar.gz && \ ACLOCAL_PATH="${PREFIX}/share/aclocal" ./autogen.sh && \ ./configure --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -423,7 +424,7 @@ RUN \ tar -zx --strip-components=1 -f libxcb-${LIBXCB_VERSION}.tar.gz && \ ACLOCAL_PATH="${PREFIX}/share/aclocal" ./autogen.sh && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -436,7 +437,7 @@ RUN \ echo ${LIBXML2_SHA256SUM} | sha256sum --check && \ tar -xz --strip-components=1 -f libxml2-v${LIBXML2_VERSION}.tar.gz && \ ./autogen.sh --prefix="${PREFIX}" --with-ftp=no --with-http=no --with-python=no && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -449,7 +450,7 @@ RUN \ echo ${LIBBLURAY_SHA256SUM} | sha256sum --check && \ tar -jx --strip-components=1 -f libbluray-${LIBBLURAY_VERSION}.tar.bz2 && \ ./configure --prefix="${PREFIX}" --disable-examples --disable-bdjava-jar --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -463,7 +464,7 @@ RUN \ tar -xz --strip-components=1 -f v${LIBZMQ_VERSION}.tar.gz && \ ./autogen.sh && \ ./configure --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make check && \ make install && \ rm -rf ${DIR} @@ -476,7 +477,7 @@ RUN \ curl -sLO https://github.com/Haivision/srt/archive/v${LIBSRT_VERSION}.tar.gz && \ tar -xz --strip-components=1 -f v${LIBSRT_VERSION}.tar.gz && \ cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -488,7 +489,7 @@ RUN \ git clone https://git.code.sf.net/p/libpng/code ${DIR} -b v${LIBPNG_VERSION} --depth 1 && \ ./autogen.sh && \ ./configure --prefix="${PREFIX}" && \ - make check && \ + make check -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -502,7 +503,20 @@ RUN \ tar -xz --strip-components=1 -f v${LIBARIBB24_VERSION}.tar.gz && \ autoreconf -fiv && \ ./configure CFLAGS="-I${PREFIX}/include -fPIC" --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ + make install && \ + rm -rf ${DIR} + + +## libsvtav1 +RUN \ + DIR=/tmp/svtav1 && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + git clone https://gitlab.com/AOMediaCodec/SVT-AV1.git ${DIR} --depth=1 -b ${LIBSTVAV1_VERSION} &&\ + cd Build && \ + cmake .. -G"Unix Makefiles" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="${PREFIX}" && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -553,7 +567,7 @@ RUN \ --enable-libkvazaar \ --extra-cflags="-I${PREFIX}/include" \ --extra-ldflags="-L${PREFIX}/lib" && \ - make && \ + make -j $(nproc) && \ 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..48731e058 100644 --- a/docker-images/3.4/ubuntu1804/Dockerfile +++ b/docker-images/3.4/ubuntu1804/Dockerfile @@ -16,8 +16,9 @@ RUN apt-get -yqq update && \ FROM base as build -ENV FFMPEG_VERSION=3.4.8 \ - AOM_VERSION=v1.0.0 \ +ENV FFMPEG_VERSION=3.4.9 \ + LIBSTVAV1_VERSION=v0.8.7 \ + AOM_VERSION=v3.1.3 \ FDKAAC_VERSION=0.1.5 \ FONTCONFIG_VERSION=2.12.4 \ FREETYPE_VERSION=2.10.4 \ @@ -124,7 +125,7 @@ RUN \ curl -sL https://versaweb.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${OPENCOREAMR_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## x264 http://www.videolan.org/developers/x264.html @@ -135,7 +136,7 @@ RUN \ curl -sL https://download.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-${X264_VERSION}.tar.bz2 | \ tar -jx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared --enable-pic --disable-cli && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### x265 http://x265.org/ @@ -149,7 +150,7 @@ RUN \ sed -i "/-DEXTRA_LIB/ s/$/ -DCMAKE_INSTALL_PREFIX=\${PREFIX}/" multilib.sh && \ sed -i "/^cmake/ s/$/ -DENABLE_CLI=OFF/" multilib.sh && \ ./multilib.sh && \ - make -C 8bit install && \ + make -C 8bit -j $(nproc) install && \ rm -rf ${DIR} ### libogg https://www.xiph.org/ogg/ RUN \ @@ -160,7 +161,7 @@ RUN \ echo ${OGG_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f libogg-${OGG_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libopus https://www.opus-codec.org/ @@ -173,7 +174,7 @@ RUN \ tar -zx --strip-components=1 -f opus-${OPUS_VERSION}.tar.gz && \ autoreconf -fiv && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libvorbis https://xiph.org/vorbis/ @@ -185,7 +186,7 @@ RUN \ echo ${VORBIS_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f libvorbis-${VORBIS_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libtheora http://www.theora.org/ @@ -197,7 +198,7 @@ RUN \ echo ${THEORA_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f libtheora-${THEORA_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libvpx https://www.webmproject.org/code/ @@ -209,7 +210,7 @@ RUN \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-vp8 --enable-vp9 --enable-vp9-highbitdepth --enable-pic --enable-shared \ --disable-debug --disable-examples --disable-docs --disable-install-bins && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libwebp https://developers.google.com/speed/webp/ @@ -220,7 +221,7 @@ RUN \ curl -sL https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-${WEBP_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libmp3lame http://lame.sourceforge.net/ @@ -231,7 +232,7 @@ RUN \ curl -sL https://versaweb.dl.sourceforge.net/project/lame/lame/$(echo ${LAME_VERSION} | sed -e 's/[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)/\1.\2/')/lame-${LAME_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" --enable-shared --enable-nasm --disable-frontend && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### xvid https://www.xvid.com/ @@ -244,7 +245,7 @@ RUN \ tar -zx -f xvidcore-${XVID_VERSION}.tar.gz && \ cd xvidcore/build/generic && \ ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### fdk-aac https://github.com/mstorsjo/fdk-aac @@ -256,7 +257,7 @@ RUN \ tar -zx --strip-components=1 && \ autoreconf -fiv && \ ./configure --prefix="${PREFIX}" --enable-shared --datadir="${DIR}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## openjpeg https://github.com/uclouvain/openjpeg @@ -267,7 +268,7 @@ RUN \ curl -sL https://github.com/uclouvain/openjpeg/archive/v${OPENJPEG_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ cmake -DBUILD_THIRDPARTY:BOOL=ON -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## freetype https://www.freetype.org/ @@ -279,7 +280,7 @@ RUN \ echo ${FREETYPE_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f freetype-${FREETYPE_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## libvstab https://github.com/georgmartius/vid.stab @@ -291,7 +292,7 @@ RUN \ echo ${LIBVIDSTAB_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f v${LIBVIDSTAB_VERSION}.tar.gz && \ cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## fridibi https://www.fribidi.org/ @@ -316,7 +317,7 @@ RUN \ curl -sLO https://www.freedesktop.org/software/fontconfig/release/fontconfig-${FONTCONFIG_VERSION}.tar.bz2 && \ tar -jx --strip-components=1 -f fontconfig-${FONTCONFIG_VERSION}.tar.bz2 && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## libass https://github.com/libass/libass @@ -329,7 +330,7 @@ RUN \ tar -zx --strip-components=1 -f ${LIBASS_VERSION}.tar.gz && \ ./autogen.sh && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## kvazaar https://github.com/ultravideo/kvazaar @@ -353,7 +354,7 @@ RUN \ mkdir -p ./aom_build ; \ cd ./aom_build ; \ cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" -DBUILD_SHARED_LIBS=1 ..; \ - make ; \ + make -j $(nproc); \ make install ; \ rm -rf ${DIR} @@ -365,7 +366,7 @@ RUN \ curl -sLO https://www.x.org/archive//individual/util/util-macros-${XORG_MACROS_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f util-macros-${XORG_MACROS_VERSION}.tar.gz && \ ./configure --srcdir=${DIR} --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -376,7 +377,7 @@ RUN \ curl -sLO https://www.x.org/archive/individual/proto/xproto-${XPROTO_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f xproto-${XPROTO_VERSION}.tar.gz && \ ./configure --srcdir=${DIR} --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -387,7 +388,7 @@ RUN \ curl -sLO https://www.x.org/archive/individual/lib/libXau-${XAU_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f libXau-${XAU_VERSION}.tar.gz && \ ./configure --srcdir=${DIR} --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -398,7 +399,7 @@ RUN \ curl -sLO https://xcb.freedesktop.org/dist/libpthread-stubs-${LIBPTHREAD_STUBS_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f libpthread-stubs-${LIBPTHREAD_STUBS_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -410,7 +411,7 @@ RUN \ tar -zx --strip-components=1 -f xcb-proto-${XCBPROTO_VERSION}.tar.gz && \ ACLOCAL_PATH="${PREFIX}/share/aclocal" ./autogen.sh && \ ./configure --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -422,7 +423,7 @@ RUN \ tar -zx --strip-components=1 -f libxcb-${LIBXCB_VERSION}.tar.gz && \ ACLOCAL_PATH="${PREFIX}/share/aclocal" ./autogen.sh && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -435,7 +436,7 @@ RUN \ echo ${LIBXML2_SHA256SUM} | sha256sum --check && \ tar -xz --strip-components=1 -f libxml2-v${LIBXML2_VERSION}.tar.gz && \ ./autogen.sh --prefix="${PREFIX}" --with-ftp=no --with-http=no --with-python=no && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -448,7 +449,7 @@ RUN \ echo ${LIBBLURAY_SHA256SUM} | sha256sum --check && \ tar -jx --strip-components=1 -f libbluray-${LIBBLURAY_VERSION}.tar.bz2 && \ ./configure --prefix="${PREFIX}" --disable-examples --disable-bdjava-jar --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -462,7 +463,7 @@ RUN \ tar -xz --strip-components=1 -f v${LIBZMQ_VERSION}.tar.gz && \ ./autogen.sh && \ ./configure --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make check && \ make install && \ rm -rf ${DIR} @@ -475,7 +476,7 @@ RUN \ curl -sLO https://github.com/Haivision/srt/archive/v${LIBSRT_VERSION}.tar.gz && \ tar -xz --strip-components=1 -f v${LIBSRT_VERSION}.tar.gz && \ cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -487,7 +488,7 @@ RUN \ git clone https://git.code.sf.net/p/libpng/code ${DIR} -b v${LIBPNG_VERSION} --depth 1 && \ ./autogen.sh && \ ./configure --prefix="${PREFIX}" && \ - make check && \ + make check -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -501,7 +502,20 @@ RUN \ tar -xz --strip-components=1 -f v${LIBARIBB24_VERSION}.tar.gz && \ autoreconf -fiv && \ ./configure CFLAGS="-I${PREFIX}/include -fPIC" --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ + make install && \ + rm -rf ${DIR} + + +## libsvtav1 +RUN \ + DIR=/tmp/svtav1 && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + git clone https://gitlab.com/AOMediaCodec/SVT-AV1.git ${DIR} --depth=1 -b ${LIBSTVAV1_VERSION} &&\ + cd Build && \ + cmake .. -G"Unix Makefiles" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="${PREFIX}" && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -552,7 +566,7 @@ RUN \ --enable-libkvazaar \ --extra-cflags="-I${PREFIX}/include" \ --extra-ldflags="-L${PREFIX}/lib" && \ - make && \ + make -j $(nproc) && \ 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..087baef48 100644 --- a/docker-images/3.4/ubuntu2004/Dockerfile +++ b/docker-images/3.4/ubuntu2004/Dockerfile @@ -16,8 +16,9 @@ RUN apt-get -yqq update && \ FROM base as build -ENV FFMPEG_VERSION=3.4.8 \ - AOM_VERSION=v1.0.0 \ +ENV FFMPEG_VERSION=3.4.9 \ + LIBSTVAV1_VERSION=v0.8.7 \ + AOM_VERSION=v3.1.3 \ FDKAAC_VERSION=0.1.5 \ FONTCONFIG_VERSION=2.12.4 \ FREETYPE_VERSION=2.10.4 \ @@ -127,7 +128,7 @@ RUN \ curl -sL https://versaweb.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${OPENCOREAMR_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## x264 http://www.videolan.org/developers/x264.html @@ -138,7 +139,7 @@ RUN \ curl -sL https://download.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-${X264_VERSION}.tar.bz2 | \ tar -jx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared --enable-pic --disable-cli && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### x265 http://x265.org/ @@ -152,7 +153,7 @@ RUN \ sed -i "/-DEXTRA_LIB/ s/$/ -DCMAKE_INSTALL_PREFIX=\${PREFIX}/" multilib.sh && \ sed -i "/^cmake/ s/$/ -DENABLE_CLI=OFF/" multilib.sh && \ ./multilib.sh && \ - make -C 8bit install && \ + make -C 8bit -j $(nproc) install && \ rm -rf ${DIR} ### libogg https://www.xiph.org/ogg/ RUN \ @@ -163,7 +164,7 @@ RUN \ echo ${OGG_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f libogg-${OGG_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libopus https://www.opus-codec.org/ @@ -176,7 +177,7 @@ RUN \ tar -zx --strip-components=1 -f opus-${OPUS_VERSION}.tar.gz && \ autoreconf -fiv && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libvorbis https://xiph.org/vorbis/ @@ -188,7 +189,7 @@ RUN \ echo ${VORBIS_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f libvorbis-${VORBIS_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libtheora http://www.theora.org/ @@ -200,7 +201,7 @@ RUN \ echo ${THEORA_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f libtheora-${THEORA_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libvpx https://www.webmproject.org/code/ @@ -212,7 +213,7 @@ RUN \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-vp8 --enable-vp9 --enable-vp9-highbitdepth --enable-pic --enable-shared \ --disable-debug --disable-examples --disable-docs --disable-install-bins && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libwebp https://developers.google.com/speed/webp/ @@ -223,7 +224,7 @@ RUN \ curl -sL https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-${WEBP_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libmp3lame http://lame.sourceforge.net/ @@ -234,7 +235,7 @@ RUN \ curl -sL https://versaweb.dl.sourceforge.net/project/lame/lame/$(echo ${LAME_VERSION} | sed -e 's/[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)/\1.\2/')/lame-${LAME_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" --enable-shared --enable-nasm --disable-frontend && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### xvid https://www.xvid.com/ @@ -247,7 +248,7 @@ RUN \ tar -zx -f xvidcore-${XVID_VERSION}.tar.gz && \ cd xvidcore/build/generic && \ ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### fdk-aac https://github.com/mstorsjo/fdk-aac @@ -259,7 +260,7 @@ RUN \ tar -zx --strip-components=1 && \ autoreconf -fiv && \ ./configure --prefix="${PREFIX}" --enable-shared --datadir="${DIR}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## openjpeg https://github.com/uclouvain/openjpeg @@ -270,7 +271,7 @@ RUN \ curl -sL https://github.com/uclouvain/openjpeg/archive/v${OPENJPEG_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ cmake -DBUILD_THIRDPARTY:BOOL=ON -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## freetype https://www.freetype.org/ @@ -282,7 +283,7 @@ RUN \ echo ${FREETYPE_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f freetype-${FREETYPE_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## libvstab https://github.com/georgmartius/vid.stab @@ -294,7 +295,7 @@ RUN \ echo ${LIBVIDSTAB_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f v${LIBVIDSTAB_VERSION}.tar.gz && \ cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## fridibi https://www.fribidi.org/ @@ -319,7 +320,7 @@ RUN \ curl -sLO https://www.freedesktop.org/software/fontconfig/release/fontconfig-${FONTCONFIG_VERSION}.tar.bz2 && \ tar -jx --strip-components=1 -f fontconfig-${FONTCONFIG_VERSION}.tar.bz2 && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## libass https://github.com/libass/libass @@ -332,7 +333,7 @@ RUN \ tar -zx --strip-components=1 -f ${LIBASS_VERSION}.tar.gz && \ ./autogen.sh && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## kvazaar https://github.com/ultravideo/kvazaar @@ -356,7 +357,7 @@ RUN \ mkdir -p ./aom_build ; \ cd ./aom_build ; \ cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" -DBUILD_SHARED_LIBS=1 ..; \ - make ; \ + make -j $(nproc); \ make install ; \ rm -rf ${DIR} @@ -368,7 +369,7 @@ RUN \ curl -sLO https://www.x.org/archive//individual/util/util-macros-${XORG_MACROS_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f util-macros-${XORG_MACROS_VERSION}.tar.gz && \ ./configure --srcdir=${DIR} --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -379,7 +380,7 @@ RUN \ curl -sLO https://www.x.org/archive/individual/proto/xproto-${XPROTO_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f xproto-${XPROTO_VERSION}.tar.gz && \ ./configure --srcdir=${DIR} --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -390,7 +391,7 @@ RUN \ curl -sLO https://www.x.org/archive/individual/lib/libXau-${XAU_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f libXau-${XAU_VERSION}.tar.gz && \ ./configure --srcdir=${DIR} --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -401,7 +402,7 @@ RUN \ curl -sLO https://xcb.freedesktop.org/dist/libpthread-stubs-${LIBPTHREAD_STUBS_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f libpthread-stubs-${LIBPTHREAD_STUBS_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -413,7 +414,7 @@ RUN \ tar -zx --strip-components=1 -f xcb-proto-${XCBPROTO_VERSION}.tar.gz && \ ACLOCAL_PATH="${PREFIX}/share/aclocal" ./autogen.sh && \ ./configure --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -425,7 +426,7 @@ RUN \ tar -zx --strip-components=1 -f libxcb-${LIBXCB_VERSION}.tar.gz && \ ACLOCAL_PATH="${PREFIX}/share/aclocal" ./autogen.sh && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -438,7 +439,7 @@ RUN \ echo ${LIBXML2_SHA256SUM} | sha256sum --check && \ tar -xz --strip-components=1 -f libxml2-v${LIBXML2_VERSION}.tar.gz && \ ./autogen.sh --prefix="${PREFIX}" --with-ftp=no --with-http=no --with-python=no && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -451,7 +452,7 @@ RUN \ echo ${LIBBLURAY_SHA256SUM} | sha256sum --check && \ tar -jx --strip-components=1 -f libbluray-${LIBBLURAY_VERSION}.tar.bz2 && \ ./configure --prefix="${PREFIX}" --disable-examples --disable-bdjava-jar --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -465,7 +466,7 @@ RUN \ tar -xz --strip-components=1 -f v${LIBZMQ_VERSION}.tar.gz && \ ./autogen.sh && \ ./configure --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make check && \ make install && \ rm -rf ${DIR} @@ -478,7 +479,7 @@ RUN \ curl -sLO https://github.com/Haivision/srt/archive/v${LIBSRT_VERSION}.tar.gz && \ tar -xz --strip-components=1 -f v${LIBSRT_VERSION}.tar.gz && \ cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -490,7 +491,7 @@ RUN \ git clone https://git.code.sf.net/p/libpng/code ${DIR} -b v${LIBPNG_VERSION} --depth 1 && \ ./autogen.sh && \ ./configure --prefix="${PREFIX}" && \ - make check && \ + make check -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -504,7 +505,20 @@ RUN \ tar -xz --strip-components=1 -f v${LIBARIBB24_VERSION}.tar.gz && \ autoreconf -fiv && \ ./configure CFLAGS="-I${PREFIX}/include -fPIC" --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ + make install && \ + rm -rf ${DIR} + + +## libsvtav1 +RUN \ + DIR=/tmp/svtav1 && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + git clone https://gitlab.com/AOMediaCodec/SVT-AV1.git ${DIR} --depth=1 -b ${LIBSTVAV1_VERSION} &&\ + cd Build && \ + cmake .. -G"Unix Makefiles" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="${PREFIX}" && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -555,7 +569,7 @@ RUN \ --enable-libkvazaar \ --extra-cflags="-I${PREFIX}/include" \ --extra-ldflags="-L${PREFIX}/lib" && \ - make && \ + make -j $(nproc) && \ 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..19e412174 100644 --- a/docker-images/3.4/vaapi2004/Dockerfile +++ b/docker-images/3.4/vaapi2004/Dockerfile @@ -16,8 +16,9 @@ RUN apt-get -yqq update && \ FROM base as build -ENV FFMPEG_VERSION=3.4.8 \ - AOM_VERSION=v1.0.0 \ +ENV FFMPEG_VERSION=3.4.9 \ + LIBSTVAV1_VERSION=v0.8.7 \ + AOM_VERSION=v3.1.3 \ FDKAAC_VERSION=0.1.5 \ FONTCONFIG_VERSION=2.12.4 \ FREETYPE_VERSION=2.10.4 \ @@ -128,7 +129,7 @@ RUN \ curl -sL https://versaweb.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${OPENCOREAMR_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## x264 http://www.videolan.org/developers/x264.html @@ -139,7 +140,7 @@ RUN \ curl -sL https://download.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-${X264_VERSION}.tar.bz2 | \ tar -jx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared --enable-pic --disable-cli && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### x265 http://x265.org/ @@ -153,7 +154,7 @@ RUN \ sed -i "/-DEXTRA_LIB/ s/$/ -DCMAKE_INSTALL_PREFIX=\${PREFIX}/" multilib.sh && \ sed -i "/^cmake/ s/$/ -DENABLE_CLI=OFF/" multilib.sh && \ ./multilib.sh && \ - make -C 8bit install && \ + make -C 8bit -j $(nproc) install && \ rm -rf ${DIR} ### libogg https://www.xiph.org/ogg/ RUN \ @@ -164,7 +165,7 @@ RUN \ echo ${OGG_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f libogg-${OGG_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libopus https://www.opus-codec.org/ @@ -177,7 +178,7 @@ RUN \ tar -zx --strip-components=1 -f opus-${OPUS_VERSION}.tar.gz && \ autoreconf -fiv && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libvorbis https://xiph.org/vorbis/ @@ -189,7 +190,7 @@ RUN \ echo ${VORBIS_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f libvorbis-${VORBIS_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libtheora http://www.theora.org/ @@ -201,7 +202,7 @@ RUN \ echo ${THEORA_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f libtheora-${THEORA_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libvpx https://www.webmproject.org/code/ @@ -213,7 +214,7 @@ RUN \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-vp8 --enable-vp9 --enable-vp9-highbitdepth --enable-pic --enable-shared \ --disable-debug --disable-examples --disable-docs --disable-install-bins && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libwebp https://developers.google.com/speed/webp/ @@ -224,7 +225,7 @@ RUN \ curl -sL https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-${WEBP_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libmp3lame http://lame.sourceforge.net/ @@ -235,7 +236,7 @@ RUN \ curl -sL https://versaweb.dl.sourceforge.net/project/lame/lame/$(echo ${LAME_VERSION} | sed -e 's/[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)/\1.\2/')/lame-${LAME_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" --enable-shared --enable-nasm --disable-frontend && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### xvid https://www.xvid.com/ @@ -248,7 +249,7 @@ RUN \ tar -zx -f xvidcore-${XVID_VERSION}.tar.gz && \ cd xvidcore/build/generic && \ ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### fdk-aac https://github.com/mstorsjo/fdk-aac @@ -260,7 +261,7 @@ RUN \ tar -zx --strip-components=1 && \ autoreconf -fiv && \ ./configure --prefix="${PREFIX}" --enable-shared --datadir="${DIR}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## openjpeg https://github.com/uclouvain/openjpeg @@ -271,7 +272,7 @@ RUN \ curl -sL https://github.com/uclouvain/openjpeg/archive/v${OPENJPEG_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ cmake -DBUILD_THIRDPARTY:BOOL=ON -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## freetype https://www.freetype.org/ @@ -283,7 +284,7 @@ RUN \ echo ${FREETYPE_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f freetype-${FREETYPE_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## libvstab https://github.com/georgmartius/vid.stab @@ -295,7 +296,7 @@ RUN \ echo ${LIBVIDSTAB_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f v${LIBVIDSTAB_VERSION}.tar.gz && \ cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## fridibi https://www.fribidi.org/ @@ -320,7 +321,7 @@ RUN \ curl -sLO https://www.freedesktop.org/software/fontconfig/release/fontconfig-${FONTCONFIG_VERSION}.tar.bz2 && \ tar -jx --strip-components=1 -f fontconfig-${FONTCONFIG_VERSION}.tar.bz2 && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## libass https://github.com/libass/libass @@ -333,7 +334,7 @@ RUN \ tar -zx --strip-components=1 -f ${LIBASS_VERSION}.tar.gz && \ ./autogen.sh && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## kvazaar https://github.com/ultravideo/kvazaar @@ -357,7 +358,7 @@ RUN \ mkdir -p ./aom_build ; \ cd ./aom_build ; \ cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" -DBUILD_SHARED_LIBS=1 ..; \ - make ; \ + make -j $(nproc); \ make install ; \ rm -rf ${DIR} @@ -369,7 +370,7 @@ RUN \ curl -sLO https://www.x.org/archive//individual/util/util-macros-${XORG_MACROS_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f util-macros-${XORG_MACROS_VERSION}.tar.gz && \ ./configure --srcdir=${DIR} --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -380,7 +381,7 @@ RUN \ curl -sLO https://www.x.org/archive/individual/proto/xproto-${XPROTO_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f xproto-${XPROTO_VERSION}.tar.gz && \ ./configure --srcdir=${DIR} --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -391,7 +392,7 @@ RUN \ curl -sLO https://www.x.org/archive/individual/lib/libXau-${XAU_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f libXau-${XAU_VERSION}.tar.gz && \ ./configure --srcdir=${DIR} --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -402,7 +403,7 @@ RUN \ curl -sLO https://xcb.freedesktop.org/dist/libpthread-stubs-${LIBPTHREAD_STUBS_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f libpthread-stubs-${LIBPTHREAD_STUBS_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -414,7 +415,7 @@ RUN \ tar -zx --strip-components=1 -f xcb-proto-${XCBPROTO_VERSION}.tar.gz && \ ACLOCAL_PATH="${PREFIX}/share/aclocal" ./autogen.sh && \ ./configure --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -426,7 +427,7 @@ RUN \ tar -zx --strip-components=1 -f libxcb-${LIBXCB_VERSION}.tar.gz && \ ACLOCAL_PATH="${PREFIX}/share/aclocal" ./autogen.sh && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -439,7 +440,7 @@ RUN \ echo ${LIBXML2_SHA256SUM} | sha256sum --check && \ tar -xz --strip-components=1 -f libxml2-v${LIBXML2_VERSION}.tar.gz && \ ./autogen.sh --prefix="${PREFIX}" --with-ftp=no --with-http=no --with-python=no && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -452,7 +453,7 @@ RUN \ echo ${LIBBLURAY_SHA256SUM} | sha256sum --check && \ tar -jx --strip-components=1 -f libbluray-${LIBBLURAY_VERSION}.tar.bz2 && \ ./configure --prefix="${PREFIX}" --disable-examples --disable-bdjava-jar --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -466,7 +467,7 @@ RUN \ tar -xz --strip-components=1 -f v${LIBZMQ_VERSION}.tar.gz && \ ./autogen.sh && \ ./configure --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make check && \ make install && \ rm -rf ${DIR} @@ -479,7 +480,7 @@ RUN \ curl -sLO https://github.com/Haivision/srt/archive/v${LIBSRT_VERSION}.tar.gz && \ tar -xz --strip-components=1 -f v${LIBSRT_VERSION}.tar.gz && \ cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -491,7 +492,7 @@ RUN \ git clone https://git.code.sf.net/p/libpng/code ${DIR} -b v${LIBPNG_VERSION} --depth 1 && \ ./autogen.sh && \ ./configure --prefix="${PREFIX}" && \ - make check && \ + make check -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -505,7 +506,20 @@ RUN \ tar -xz --strip-components=1 -f v${LIBARIBB24_VERSION}.tar.gz && \ autoreconf -fiv && \ ./configure CFLAGS="-I${PREFIX}/include -fPIC" --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ + make install && \ + rm -rf ${DIR} + + +## libsvtav1 +RUN \ + DIR=/tmp/svtav1 && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + git clone https://gitlab.com/AOMediaCodec/SVT-AV1.git ${DIR} --depth=1 -b ${LIBSTVAV1_VERSION} &&\ + cd Build && \ + cmake .. -G"Unix Makefiles" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="${PREFIX}" && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -557,7 +571,7 @@ RUN \ --enable-vaapi \ --extra-cflags="-I${PREFIX}/include" \ --extra-ldflags="-L${PREFIX}/lib" && \ - make && \ + make -j $(nproc) && \ 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..04d1ce677 100644 --- a/docker-images/4.0/alpine312/Dockerfile +++ b/docker-images/4.0/alpine312/Dockerfile @@ -14,7 +14,8 @@ FROM base AS build WORKDIR /tmp/workdir ENV FFMPEG_VERSION=4.0.6 \ - AOM_VERSION=v1.0.0 \ + LIBSTVAV1_VERSION=v0.8.7 \ + AOM_VERSION=v3.1.3 \ FDKAAC_VERSION=0.1.5 \ FONTCONFIG_VERSION=2.12.4 \ FREETYPE_VERSION=2.10.4 \ @@ -93,6 +94,8 @@ RUN buildDeps="autoconf \ yasm \ nasm \ zlib-dev \ + meson \ + xxd \ expat-dev" && \ apk add --no-cache --update ${buildDeps} ## libvmaf https://github.com/Netflix/vmaf @@ -123,7 +126,7 @@ RUN \ curl -sL https://versaweb.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${OPENCOREAMR_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## x264 http://www.videolan.org/developers/x264.html @@ -134,7 +137,7 @@ RUN \ curl -sL https://download.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-${X264_VERSION}.tar.bz2 | \ tar -jx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared --enable-pic --disable-cli && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### x265 http://x265.org/ @@ -148,7 +151,7 @@ RUN \ sed -i "/-DEXTRA_LIB/ s/$/ -DCMAKE_INSTALL_PREFIX=\${PREFIX}/" multilib.sh && \ sed -i "/^cmake/ s/$/ -DENABLE_CLI=OFF/" multilib.sh && \ ./multilib.sh && \ - make -C 8bit install && \ + make -C 8bit -j $(nproc) install && \ rm -rf ${DIR} ### libogg https://www.xiph.org/ogg/ RUN \ @@ -159,7 +162,7 @@ RUN \ echo ${OGG_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f libogg-${OGG_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libopus https://www.opus-codec.org/ @@ -172,7 +175,7 @@ RUN \ tar -zx --strip-components=1 -f opus-${OPUS_VERSION}.tar.gz && \ autoreconf -fiv && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libvorbis https://xiph.org/vorbis/ @@ -184,7 +187,7 @@ RUN \ echo ${VORBIS_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f libvorbis-${VORBIS_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libtheora http://www.theora.org/ @@ -196,7 +199,7 @@ RUN \ echo ${THEORA_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f libtheora-${THEORA_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libvpx https://www.webmproject.org/code/ @@ -208,7 +211,7 @@ RUN \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-vp8 --enable-vp9 --enable-vp9-highbitdepth --enable-pic --enable-shared \ --disable-debug --disable-examples --disable-docs --disable-install-bins && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libwebp https://developers.google.com/speed/webp/ @@ -219,7 +222,7 @@ RUN \ curl -sL https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-${WEBP_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libmp3lame http://lame.sourceforge.net/ @@ -230,7 +233,7 @@ RUN \ curl -sL https://versaweb.dl.sourceforge.net/project/lame/lame/$(echo ${LAME_VERSION} | sed -e 's/[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)/\1.\2/')/lame-${LAME_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" --enable-shared --enable-nasm --disable-frontend && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### xvid https://www.xvid.com/ @@ -243,7 +246,7 @@ RUN \ tar -zx -f xvidcore-${XVID_VERSION}.tar.gz && \ cd xvidcore/build/generic && \ ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### fdk-aac https://github.com/mstorsjo/fdk-aac @@ -255,7 +258,7 @@ RUN \ tar -zx --strip-components=1 && \ autoreconf -fiv && \ ./configure --prefix="${PREFIX}" --enable-shared --datadir="${DIR}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## openjpeg https://github.com/uclouvain/openjpeg @@ -266,7 +269,7 @@ RUN \ curl -sL https://github.com/uclouvain/openjpeg/archive/v${OPENJPEG_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ cmake -DBUILD_THIRDPARTY:BOOL=ON -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## freetype https://www.freetype.org/ @@ -278,7 +281,7 @@ RUN \ echo ${FREETYPE_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f freetype-${FREETYPE_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## libvstab https://github.com/georgmartius/vid.stab @@ -290,7 +293,7 @@ RUN \ echo ${LIBVIDSTAB_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f v${LIBVIDSTAB_VERSION}.tar.gz && \ cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## fridibi https://www.fribidi.org/ @@ -315,7 +318,7 @@ RUN \ curl -sLO https://www.freedesktop.org/software/fontconfig/release/fontconfig-${FONTCONFIG_VERSION}.tar.bz2 && \ tar -jx --strip-components=1 -f fontconfig-${FONTCONFIG_VERSION}.tar.bz2 && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## libass https://github.com/libass/libass @@ -328,7 +331,7 @@ RUN \ tar -zx --strip-components=1 -f ${LIBASS_VERSION}.tar.gz && \ ./autogen.sh && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## kvazaar https://github.com/ultravideo/kvazaar @@ -352,7 +355,7 @@ RUN \ mkdir -p ./aom_build ; \ cd ./aom_build ; \ cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" -DBUILD_SHARED_LIBS=1 ..; \ - make ; \ + make -j $(nproc); \ make install ; \ rm -rf ${DIR} @@ -364,7 +367,7 @@ RUN \ curl -sLO https://www.x.org/archive//individual/util/util-macros-${XORG_MACROS_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f util-macros-${XORG_MACROS_VERSION}.tar.gz && \ ./configure --srcdir=${DIR} --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -375,7 +378,7 @@ RUN \ curl -sLO https://www.x.org/archive/individual/proto/xproto-${XPROTO_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f xproto-${XPROTO_VERSION}.tar.gz && \ ./configure --srcdir=${DIR} --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -386,7 +389,7 @@ RUN \ curl -sLO https://www.x.org/archive/individual/lib/libXau-${XAU_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f libXau-${XAU_VERSION}.tar.gz && \ ./configure --srcdir=${DIR} --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -397,7 +400,7 @@ RUN \ curl -sLO https://xcb.freedesktop.org/dist/libpthread-stubs-${LIBPTHREAD_STUBS_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f libpthread-stubs-${LIBPTHREAD_STUBS_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -409,7 +412,7 @@ RUN \ tar -zx --strip-components=1 -f xcb-proto-${XCBPROTO_VERSION}.tar.gz && \ ACLOCAL_PATH="${PREFIX}/share/aclocal" ./autogen.sh && \ ./configure --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -421,7 +424,7 @@ RUN \ tar -zx --strip-components=1 -f libxcb-${LIBXCB_VERSION}.tar.gz && \ ACLOCAL_PATH="${PREFIX}/share/aclocal" ./autogen.sh && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -434,7 +437,7 @@ RUN \ echo ${LIBXML2_SHA256SUM} | sha256sum --check && \ tar -xz --strip-components=1 -f libxml2-v${LIBXML2_VERSION}.tar.gz && \ ./autogen.sh --prefix="${PREFIX}" --with-ftp=no --with-http=no --with-python=no && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -447,7 +450,7 @@ RUN \ echo ${LIBBLURAY_SHA256SUM} | sha256sum --check && \ tar -jx --strip-components=1 -f libbluray-${LIBBLURAY_VERSION}.tar.bz2 && \ ./configure --prefix="${PREFIX}" --disable-examples --disable-bdjava-jar --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -461,7 +464,7 @@ RUN \ tar -xz --strip-components=1 -f v${LIBZMQ_VERSION}.tar.gz && \ ./autogen.sh && \ ./configure --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make check && \ make install && \ rm -rf ${DIR} @@ -474,7 +477,7 @@ RUN \ curl -sLO https://github.com/Haivision/srt/archive/v${LIBSRT_VERSION}.tar.gz && \ tar -xz --strip-components=1 -f v${LIBSRT_VERSION}.tar.gz && \ cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -486,7 +489,7 @@ RUN \ git clone https://git.code.sf.net/p/libpng/code ${DIR} -b v${LIBPNG_VERSION} --depth 1 && \ ./autogen.sh && \ ./configure --prefix="${PREFIX}" && \ - make check && \ + make check -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -500,7 +503,20 @@ RUN \ tar -xz --strip-components=1 -f v${LIBARIBB24_VERSION}.tar.gz && \ autoreconf -fiv && \ ./configure CFLAGS="-I${PREFIX}/include -fPIC" --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ + make install && \ + rm -rf ${DIR} + + +## libsvtav1 +RUN \ + DIR=/tmp/svtav1 && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + git clone https://gitlab.com/AOMediaCodec/SVT-AV1.git ${DIR} --depth=1 -b ${LIBSTVAV1_VERSION} &&\ + cd Build && \ + cmake .. -G"Unix Makefiles" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="${PREFIX}" && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -550,11 +566,12 @@ RUN \ --enable-libopenjpeg \ --enable-libkvazaar \ --enable-libaom \ + --enable-libsvtav1 \ --extra-libs=-lpthread \ --enable-libsrt \ --extra-cflags="-I${PREFIX}/include" \ --extra-ldflags="-L${PREFIX}/lib" && \ - make && \ + make -j $(nproc) && \ 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..3eb1ce6ad 100644 --- a/docker-images/4.0/centos7/Dockerfile +++ b/docker-images/4.0/centos7/Dockerfile @@ -16,7 +16,8 @@ FROM base AS build WORKDIR /tmp/workdir ENV FFMPEG_VERSION=4.0.6 \ - AOM_VERSION=v1.0.0 \ + LIBSTVAV1_VERSION=v0.8.7 \ + AOM_VERSION=v3.1.3 \ FDKAAC_VERSION=0.1.5 \ FONTCONFIG_VERSION=2.12.4 \ FREETYPE_VERSION=2.10.4 \ @@ -160,7 +161,7 @@ RUN \ curl -sL https://versaweb.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${OPENCOREAMR_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## x264 http://www.videolan.org/developers/x264.html @@ -171,7 +172,7 @@ RUN \ curl -sL https://download.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-${X264_VERSION}.tar.bz2 | \ tar -jx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared --enable-pic --disable-cli && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### x265 http://x265.org/ @@ -185,7 +186,7 @@ RUN \ sed -i "/-DEXTRA_LIB/ s/$/ -DCMAKE_INSTALL_PREFIX=\${PREFIX}/" multilib.sh && \ sed -i "/^cmake/ s/$/ -DENABLE_CLI=OFF/" multilib.sh && \ ./multilib.sh && \ - make -C 8bit install && \ + make -C 8bit -j $(nproc) install && \ rm -rf ${DIR} ### libogg https://www.xiph.org/ogg/ RUN \ @@ -196,7 +197,7 @@ RUN \ echo ${OGG_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f libogg-${OGG_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libopus https://www.opus-codec.org/ @@ -209,7 +210,7 @@ RUN \ tar -zx --strip-components=1 -f opus-${OPUS_VERSION}.tar.gz && \ autoreconf -fiv && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libvorbis https://xiph.org/vorbis/ @@ -221,7 +222,7 @@ RUN \ echo ${VORBIS_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f libvorbis-${VORBIS_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libtheora http://www.theora.org/ @@ -233,7 +234,7 @@ RUN \ echo ${THEORA_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f libtheora-${THEORA_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libvpx https://www.webmproject.org/code/ @@ -245,7 +246,7 @@ RUN \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-vp8 --enable-vp9 --enable-vp9-highbitdepth --enable-pic --enable-shared \ --disable-debug --disable-examples --disable-docs --disable-install-bins && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libwebp https://developers.google.com/speed/webp/ @@ -256,7 +257,7 @@ RUN \ curl -sL https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-${WEBP_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libmp3lame http://lame.sourceforge.net/ @@ -267,7 +268,7 @@ RUN \ curl -sL https://versaweb.dl.sourceforge.net/project/lame/lame/$(echo ${LAME_VERSION} | sed -e 's/[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)/\1.\2/')/lame-${LAME_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" --enable-shared --enable-nasm --disable-frontend && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### xvid https://www.xvid.com/ @@ -280,7 +281,7 @@ RUN \ tar -zx -f xvidcore-${XVID_VERSION}.tar.gz && \ cd xvidcore/build/generic && \ ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### fdk-aac https://github.com/mstorsjo/fdk-aac @@ -292,7 +293,7 @@ RUN \ tar -zx --strip-components=1 && \ autoreconf -fiv && \ ./configure --prefix="${PREFIX}" --enable-shared --datadir="${DIR}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## openjpeg https://github.com/uclouvain/openjpeg @@ -303,7 +304,7 @@ RUN \ curl -sL https://github.com/uclouvain/openjpeg/archive/v${OPENJPEG_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ cmake -DBUILD_THIRDPARTY:BOOL=ON -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## freetype https://www.freetype.org/ @@ -315,7 +316,7 @@ RUN \ echo ${FREETYPE_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f freetype-${FREETYPE_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## libvstab https://github.com/georgmartius/vid.stab @@ -327,7 +328,7 @@ RUN \ echo ${LIBVIDSTAB_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f v${LIBVIDSTAB_VERSION}.tar.gz && \ cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## fridibi https://www.fribidi.org/ @@ -352,7 +353,7 @@ RUN \ curl -sLO https://www.freedesktop.org/software/fontconfig/release/fontconfig-${FONTCONFIG_VERSION}.tar.bz2 && \ tar -jx --strip-components=1 -f fontconfig-${FONTCONFIG_VERSION}.tar.bz2 && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## libass https://github.com/libass/libass @@ -365,7 +366,7 @@ RUN \ tar -zx --strip-components=1 -f ${LIBASS_VERSION}.tar.gz && \ ./autogen.sh && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## kvazaar https://github.com/ultravideo/kvazaar @@ -389,7 +390,7 @@ RUN \ mkdir -p ./aom_build ; \ cd ./aom_build ; \ cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" -DBUILD_SHARED_LIBS=1 ..; \ - make ; \ + make -j $(nproc); \ make install ; \ rm -rf ${DIR} @@ -401,7 +402,7 @@ RUN \ curl -sLO https://www.x.org/archive//individual/util/util-macros-${XORG_MACROS_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f util-macros-${XORG_MACROS_VERSION}.tar.gz && \ ./configure --srcdir=${DIR} --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -412,7 +413,7 @@ RUN \ curl -sLO https://www.x.org/archive/individual/proto/xproto-${XPROTO_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f xproto-${XPROTO_VERSION}.tar.gz && \ ./configure --srcdir=${DIR} --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -423,7 +424,7 @@ RUN \ curl -sLO https://www.x.org/archive/individual/lib/libXau-${XAU_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f libXau-${XAU_VERSION}.tar.gz && \ ./configure --srcdir=${DIR} --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -434,7 +435,7 @@ RUN \ curl -sLO https://xcb.freedesktop.org/dist/libpthread-stubs-${LIBPTHREAD_STUBS_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f libpthread-stubs-${LIBPTHREAD_STUBS_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -446,7 +447,7 @@ RUN \ tar -zx --strip-components=1 -f xcb-proto-${XCBPROTO_VERSION}.tar.gz && \ ACLOCAL_PATH="${PREFIX}/share/aclocal" ./autogen.sh && \ ./configure --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -458,7 +459,7 @@ RUN \ tar -zx --strip-components=1 -f libxcb-${LIBXCB_VERSION}.tar.gz && \ ACLOCAL_PATH="${PREFIX}/share/aclocal" ./autogen.sh && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -471,7 +472,7 @@ RUN \ echo ${LIBXML2_SHA256SUM} | sha256sum --check && \ tar -xz --strip-components=1 -f libxml2-v${LIBXML2_VERSION}.tar.gz && \ ./autogen.sh --prefix="${PREFIX}" --with-ftp=no --with-http=no --with-python=no && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -484,7 +485,7 @@ RUN \ echo ${LIBBLURAY_SHA256SUM} | sha256sum --check && \ tar -jx --strip-components=1 -f libbluray-${LIBBLURAY_VERSION}.tar.bz2 && \ ./configure --prefix="${PREFIX}" --disable-examples --disable-bdjava-jar --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -498,7 +499,7 @@ RUN \ tar -xz --strip-components=1 -f v${LIBZMQ_VERSION}.tar.gz && \ ./autogen.sh && \ ./configure --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make check && \ make install && \ rm -rf ${DIR} @@ -511,7 +512,7 @@ RUN \ curl -sLO https://github.com/Haivision/srt/archive/v${LIBSRT_VERSION}.tar.gz && \ tar -xz --strip-components=1 -f v${LIBSRT_VERSION}.tar.gz && \ cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -523,7 +524,7 @@ RUN \ git clone https://git.code.sf.net/p/libpng/code ${DIR} -b v${LIBPNG_VERSION} --depth 1 && \ ./autogen.sh && \ ./configure --prefix="${PREFIX}" && \ - make check && \ + make check -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -537,7 +538,20 @@ RUN \ tar -xz --strip-components=1 -f v${LIBARIBB24_VERSION}.tar.gz && \ autoreconf -fiv && \ ./configure CFLAGS="-I${PREFIX}/include -fPIC" --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ + make install && \ + rm -rf ${DIR} + + +## libsvtav1 +RUN \ + DIR=/tmp/svtav1 && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + git clone https://gitlab.com/AOMediaCodec/SVT-AV1.git ${DIR} --depth=1 -b ${LIBSTVAV1_VERSION} &&\ + cd Build && \ + cmake .. -G"Unix Makefiles" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="${PREFIX}" && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -587,11 +601,12 @@ RUN \ --enable-libopenjpeg \ --enable-libkvazaar \ --enable-libaom \ + --enable-libsvtav1 \ --extra-libs=-lpthread \ --enable-libsrt \ --extra-cflags="-I${PREFIX}/include" \ --extra-ldflags="-L${PREFIX}/lib" && \ - make && \ + make -j $(nproc) && \ 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..7f6c5db5d 100644 --- a/docker-images/4.0/centos8/Dockerfile +++ b/docker-images/4.0/centos8/Dockerfile @@ -16,7 +16,8 @@ FROM base AS build WORKDIR /tmp/workdir ENV FFMPEG_VERSION=4.0.6 \ - AOM_VERSION=v1.0.0 \ + LIBSTVAV1_VERSION=v0.8.7 \ + AOM_VERSION=v3.1.3 \ FDKAAC_VERSION=0.1.5 \ FONTCONFIG_VERSION=2.12.4 \ FREETYPE_VERSION=2.10.4 \ @@ -129,7 +130,7 @@ RUN \ curl -sL https://versaweb.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${OPENCOREAMR_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## x264 http://www.videolan.org/developers/x264.html @@ -140,7 +141,7 @@ RUN \ curl -sL https://download.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-${X264_VERSION}.tar.bz2 | \ tar -jx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared --enable-pic --disable-cli && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### x265 http://x265.org/ @@ -154,7 +155,7 @@ RUN \ sed -i "/-DEXTRA_LIB/ s/$/ -DCMAKE_INSTALL_PREFIX=\${PREFIX}/" multilib.sh && \ sed -i "/^cmake/ s/$/ -DENABLE_CLI=OFF/" multilib.sh && \ ./multilib.sh && \ - make -C 8bit install && \ + make -C 8bit -j $(nproc) install && \ rm -rf ${DIR} ### libogg https://www.xiph.org/ogg/ RUN \ @@ -165,7 +166,7 @@ RUN \ echo ${OGG_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f libogg-${OGG_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libopus https://www.opus-codec.org/ @@ -178,7 +179,7 @@ RUN \ tar -zx --strip-components=1 -f opus-${OPUS_VERSION}.tar.gz && \ autoreconf -fiv && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libvorbis https://xiph.org/vorbis/ @@ -190,7 +191,7 @@ RUN \ echo ${VORBIS_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f libvorbis-${VORBIS_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libtheora http://www.theora.org/ @@ -202,7 +203,7 @@ RUN \ echo ${THEORA_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f libtheora-${THEORA_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libvpx https://www.webmproject.org/code/ @@ -214,7 +215,7 @@ RUN \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-vp8 --enable-vp9 --enable-vp9-highbitdepth --enable-pic --enable-shared \ --disable-debug --disable-examples --disable-docs --disable-install-bins && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libwebp https://developers.google.com/speed/webp/ @@ -225,7 +226,7 @@ RUN \ curl -sL https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-${WEBP_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libmp3lame http://lame.sourceforge.net/ @@ -236,7 +237,7 @@ RUN \ curl -sL https://versaweb.dl.sourceforge.net/project/lame/lame/$(echo ${LAME_VERSION} | sed -e 's/[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)/\1.\2/')/lame-${LAME_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" --enable-shared --enable-nasm --disable-frontend && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### xvid https://www.xvid.com/ @@ -249,7 +250,7 @@ RUN \ tar -zx -f xvidcore-${XVID_VERSION}.tar.gz && \ cd xvidcore/build/generic && \ ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### fdk-aac https://github.com/mstorsjo/fdk-aac @@ -261,7 +262,7 @@ RUN \ tar -zx --strip-components=1 && \ autoreconf -fiv && \ ./configure --prefix="${PREFIX}" --enable-shared --datadir="${DIR}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## openjpeg https://github.com/uclouvain/openjpeg @@ -272,7 +273,7 @@ RUN \ curl -sL https://github.com/uclouvain/openjpeg/archive/v${OPENJPEG_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ cmake -DBUILD_THIRDPARTY:BOOL=ON -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## freetype https://www.freetype.org/ @@ -284,7 +285,7 @@ RUN \ echo ${FREETYPE_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f freetype-${FREETYPE_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## libvstab https://github.com/georgmartius/vid.stab @@ -296,7 +297,7 @@ RUN \ echo ${LIBVIDSTAB_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f v${LIBVIDSTAB_VERSION}.tar.gz && \ cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## fridibi https://www.fribidi.org/ @@ -321,7 +322,7 @@ RUN \ curl -sLO https://www.freedesktop.org/software/fontconfig/release/fontconfig-${FONTCONFIG_VERSION}.tar.bz2 && \ tar -jx --strip-components=1 -f fontconfig-${FONTCONFIG_VERSION}.tar.bz2 && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## libass https://github.com/libass/libass @@ -334,7 +335,7 @@ RUN \ tar -zx --strip-components=1 -f ${LIBASS_VERSION}.tar.gz && \ ./autogen.sh && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## kvazaar https://github.com/ultravideo/kvazaar @@ -358,7 +359,7 @@ RUN \ mkdir -p ./aom_build ; \ cd ./aom_build ; \ cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" -DBUILD_SHARED_LIBS=1 ..; \ - make ; \ + make -j $(nproc); \ make install ; \ rm -rf ${DIR} @@ -370,7 +371,7 @@ RUN \ curl -sLO https://www.x.org/archive//individual/util/util-macros-${XORG_MACROS_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f util-macros-${XORG_MACROS_VERSION}.tar.gz && \ ./configure --srcdir=${DIR} --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -381,7 +382,7 @@ RUN \ curl -sLO https://www.x.org/archive/individual/proto/xproto-${XPROTO_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f xproto-${XPROTO_VERSION}.tar.gz && \ ./configure --srcdir=${DIR} --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -392,7 +393,7 @@ RUN \ curl -sLO https://www.x.org/archive/individual/lib/libXau-${XAU_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f libXau-${XAU_VERSION}.tar.gz && \ ./configure --srcdir=${DIR} --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -403,7 +404,7 @@ RUN \ curl -sLO https://xcb.freedesktop.org/dist/libpthread-stubs-${LIBPTHREAD_STUBS_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f libpthread-stubs-${LIBPTHREAD_STUBS_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -415,7 +416,7 @@ RUN \ tar -zx --strip-components=1 -f xcb-proto-${XCBPROTO_VERSION}.tar.gz && \ ACLOCAL_PATH="${PREFIX}/share/aclocal" ./autogen.sh && \ ./configure --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -427,7 +428,7 @@ RUN \ tar -zx --strip-components=1 -f libxcb-${LIBXCB_VERSION}.tar.gz && \ ACLOCAL_PATH="${PREFIX}/share/aclocal" ./autogen.sh && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -440,7 +441,7 @@ RUN \ echo ${LIBXML2_SHA256SUM} | sha256sum --check && \ tar -xz --strip-components=1 -f libxml2-v${LIBXML2_VERSION}.tar.gz && \ ./autogen.sh --prefix="${PREFIX}" --with-ftp=no --with-http=no --with-python=no && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -453,7 +454,7 @@ RUN \ echo ${LIBBLURAY_SHA256SUM} | sha256sum --check && \ tar -jx --strip-components=1 -f libbluray-${LIBBLURAY_VERSION}.tar.bz2 && \ ./configure --prefix="${PREFIX}" --disable-examples --disable-bdjava-jar --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -467,7 +468,7 @@ RUN \ tar -xz --strip-components=1 -f v${LIBZMQ_VERSION}.tar.gz && \ ./autogen.sh && \ ./configure --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make check && \ make install && \ rm -rf ${DIR} @@ -480,7 +481,7 @@ RUN \ curl -sLO https://github.com/Haivision/srt/archive/v${LIBSRT_VERSION}.tar.gz && \ tar -xz --strip-components=1 -f v${LIBSRT_VERSION}.tar.gz && \ cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -492,7 +493,7 @@ RUN \ git clone https://git.code.sf.net/p/libpng/code ${DIR} -b v${LIBPNG_VERSION} --depth 1 && \ ./autogen.sh && \ ./configure --prefix="${PREFIX}" && \ - make check && \ + make check -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -506,7 +507,20 @@ RUN \ tar -xz --strip-components=1 -f v${LIBARIBB24_VERSION}.tar.gz && \ autoreconf -fiv && \ ./configure CFLAGS="-I${PREFIX}/include -fPIC" --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ + make install && \ + rm -rf ${DIR} + + +## libsvtav1 +RUN \ + DIR=/tmp/svtav1 && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + git clone https://gitlab.com/AOMediaCodec/SVT-AV1.git ${DIR} --depth=1 -b ${LIBSTVAV1_VERSION} &&\ + cd Build && \ + cmake .. -G"Unix Makefiles" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="${PREFIX}" && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -556,11 +570,12 @@ RUN \ --enable-libopenjpeg \ --enable-libkvazaar \ --enable-libaom \ + --enable-libsvtav1 \ --extra-libs=-lpthread \ --enable-libsrt \ --extra-cflags="-I${PREFIX}/include" \ --extra-ldflags="-L${PREFIX}/lib" && \ - make && \ + make -j $(nproc) && \ 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..7f18a5431 100644 --- a/docker-images/4.0/nvidia2004/Dockerfile +++ b/docker-images/4.0/nvidia2004/Dockerfile @@ -34,7 +34,8 @@ FROM devel-base as build ENV NVIDIA_HEADERS_VERSION=11.1.5.0 ENV FFMPEG_VERSION=4.0.6 \ - AOM_VERSION=v1.0.0 \ + LIBSTVAV1_VERSION=v0.8.7 \ + AOM_VERSION=v3.1.3 \ FDKAAC_VERSION=0.1.5 \ FONTCONFIG_VERSION=2.12.4 \ FREETYPE_VERSION=2.10.4 \ @@ -151,7 +152,7 @@ RUN \ curl -sL https://versaweb.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${OPENCOREAMR_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## x264 http://www.videolan.org/developers/x264.html @@ -162,7 +163,7 @@ RUN \ curl -sL https://download.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-${X264_VERSION}.tar.bz2 | \ tar -jx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared --enable-pic --disable-cli && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### x265 http://x265.org/ @@ -176,7 +177,7 @@ RUN \ sed -i "/-DEXTRA_LIB/ s/$/ -DCMAKE_INSTALL_PREFIX=\${PREFIX}/" multilib.sh && \ sed -i "/^cmake/ s/$/ -DENABLE_CLI=OFF/" multilib.sh && \ ./multilib.sh && \ - make -C 8bit install && \ + make -C 8bit -j $(nproc) install && \ rm -rf ${DIR} ### libogg https://www.xiph.org/ogg/ RUN \ @@ -187,7 +188,7 @@ RUN \ echo ${OGG_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f libogg-${OGG_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libopus https://www.opus-codec.org/ @@ -200,7 +201,7 @@ RUN \ tar -zx --strip-components=1 -f opus-${OPUS_VERSION}.tar.gz && \ autoreconf -fiv && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libvorbis https://xiph.org/vorbis/ @@ -212,7 +213,7 @@ RUN \ echo ${VORBIS_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f libvorbis-${VORBIS_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libtheora http://www.theora.org/ @@ -224,7 +225,7 @@ RUN \ echo ${THEORA_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f libtheora-${THEORA_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libvpx https://www.webmproject.org/code/ @@ -236,7 +237,7 @@ RUN \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-vp8 --enable-vp9 --enable-vp9-highbitdepth --enable-pic --enable-shared \ --disable-debug --disable-examples --disable-docs --disable-install-bins && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libwebp https://developers.google.com/speed/webp/ @@ -247,7 +248,7 @@ RUN \ curl -sL https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-${WEBP_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libmp3lame http://lame.sourceforge.net/ @@ -258,7 +259,7 @@ RUN \ curl -sL https://versaweb.dl.sourceforge.net/project/lame/lame/$(echo ${LAME_VERSION} | sed -e 's/[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)/\1.\2/')/lame-${LAME_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" --enable-shared --enable-nasm --disable-frontend && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### xvid https://www.xvid.com/ @@ -271,7 +272,7 @@ RUN \ tar -zx -f xvidcore-${XVID_VERSION}.tar.gz && \ cd xvidcore/build/generic && \ ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### fdk-aac https://github.com/mstorsjo/fdk-aac @@ -283,7 +284,7 @@ RUN \ tar -zx --strip-components=1 && \ autoreconf -fiv && \ ./configure --prefix="${PREFIX}" --enable-shared --datadir="${DIR}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## openjpeg https://github.com/uclouvain/openjpeg @@ -294,7 +295,7 @@ RUN \ curl -sL https://github.com/uclouvain/openjpeg/archive/v${OPENJPEG_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ cmake -DBUILD_THIRDPARTY:BOOL=ON -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## freetype https://www.freetype.org/ @@ -306,7 +307,7 @@ RUN \ echo ${FREETYPE_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f freetype-${FREETYPE_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## libvstab https://github.com/georgmartius/vid.stab @@ -318,7 +319,7 @@ RUN \ echo ${LIBVIDSTAB_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f v${LIBVIDSTAB_VERSION}.tar.gz && \ cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## fridibi https://www.fribidi.org/ @@ -343,7 +344,7 @@ RUN \ curl -sLO https://www.freedesktop.org/software/fontconfig/release/fontconfig-${FONTCONFIG_VERSION}.tar.bz2 && \ tar -jx --strip-components=1 -f fontconfig-${FONTCONFIG_VERSION}.tar.bz2 && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## libass https://github.com/libass/libass @@ -356,7 +357,7 @@ RUN \ tar -zx --strip-components=1 -f ${LIBASS_VERSION}.tar.gz && \ ./autogen.sh && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## kvazaar https://github.com/ultravideo/kvazaar @@ -380,7 +381,7 @@ RUN \ mkdir -p ./aom_build ; \ cd ./aom_build ; \ cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" -DBUILD_SHARED_LIBS=1 ..; \ - make ; \ + make -j $(nproc); \ make install ; \ rm -rf ${DIR} @@ -392,7 +393,7 @@ RUN \ curl -sLO https://www.x.org/archive//individual/util/util-macros-${XORG_MACROS_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f util-macros-${XORG_MACROS_VERSION}.tar.gz && \ ./configure --srcdir=${DIR} --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -403,7 +404,7 @@ RUN \ curl -sLO https://www.x.org/archive/individual/proto/xproto-${XPROTO_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f xproto-${XPROTO_VERSION}.tar.gz && \ ./configure --srcdir=${DIR} --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -414,7 +415,7 @@ RUN \ curl -sLO https://www.x.org/archive/individual/lib/libXau-${XAU_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f libXau-${XAU_VERSION}.tar.gz && \ ./configure --srcdir=${DIR} --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -425,7 +426,7 @@ RUN \ curl -sLO https://xcb.freedesktop.org/dist/libpthread-stubs-${LIBPTHREAD_STUBS_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f libpthread-stubs-${LIBPTHREAD_STUBS_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -437,7 +438,7 @@ RUN \ tar -zx --strip-components=1 -f xcb-proto-${XCBPROTO_VERSION}.tar.gz && \ ACLOCAL_PATH="${PREFIX}/share/aclocal" ./autogen.sh && \ ./configure --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -449,7 +450,7 @@ RUN \ tar -zx --strip-components=1 -f libxcb-${LIBXCB_VERSION}.tar.gz && \ ACLOCAL_PATH="${PREFIX}/share/aclocal" ./autogen.sh && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -462,7 +463,7 @@ RUN \ echo ${LIBXML2_SHA256SUM} | sha256sum --check && \ tar -xz --strip-components=1 -f libxml2-v${LIBXML2_VERSION}.tar.gz && \ ./autogen.sh --prefix="${PREFIX}" --with-ftp=no --with-http=no --with-python=no && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -475,7 +476,7 @@ RUN \ echo ${LIBBLURAY_SHA256SUM} | sha256sum --check && \ tar -jx --strip-components=1 -f libbluray-${LIBBLURAY_VERSION}.tar.bz2 && \ ./configure --prefix="${PREFIX}" --disable-examples --disable-bdjava-jar --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -489,7 +490,7 @@ RUN \ tar -xz --strip-components=1 -f v${LIBZMQ_VERSION}.tar.gz && \ ./autogen.sh && \ ./configure --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make check && \ make install && \ rm -rf ${DIR} @@ -502,7 +503,7 @@ RUN \ curl -sLO https://github.com/Haivision/srt/archive/v${LIBSRT_VERSION}.tar.gz && \ tar -xz --strip-components=1 -f v${LIBSRT_VERSION}.tar.gz && \ cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -514,7 +515,7 @@ RUN \ git clone https://git.code.sf.net/p/libpng/code ${DIR} -b v${LIBPNG_VERSION} --depth 1 && \ ./autogen.sh && \ ./configure --prefix="${PREFIX}" && \ - make check && \ + make check -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -528,7 +529,20 @@ RUN \ tar -xz --strip-components=1 -f v${LIBARIBB24_VERSION}.tar.gz && \ autoreconf -fiv && \ ./configure CFLAGS="-I${PREFIX}/include -fPIC" --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ + make install && \ + rm -rf ${DIR} + + +## libsvtav1 +RUN \ + DIR=/tmp/svtav1 && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + git clone https://gitlab.com/AOMediaCodec/SVT-AV1.git ${DIR} --depth=1 -b ${LIBSTVAV1_VERSION} &&\ + cd Build && \ + cmake .. -G"Unix Makefiles" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="${PREFIX}" && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -578,6 +592,7 @@ RUN \ --enable-libopenjpeg \ --enable-libkvazaar \ --enable-libaom \ + --enable-libsvtav1 \ --extra-libs=-lpthread \ --enable-libsrt \ --enable-nvenc \ @@ -586,7 +601,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 -j $(nproc) && \ 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..23ca981fc 100644 --- a/docker-images/4.0/scratch312/Dockerfile +++ b/docker-images/4.0/scratch312/Dockerfile @@ -9,7 +9,8 @@ FROM alpine:3.12 AS build WORKDIR /tmp/workdir ENV FFMPEG_VERSION=4.0.6 \ - AOM_VERSION=v1.0.0 \ + LIBSTVAV1_VERSION=v0.8.7 \ + AOM_VERSION=v3.1.3 \ FDKAAC_VERSION=0.1.5 \ FONTCONFIG_VERSION=2.12.4 \ FREETYPE_VERSION=2.10.4 \ @@ -125,7 +126,7 @@ RUN \ curl -sL https://versaweb.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${OPENCOREAMR_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## x264 http://www.videolan.org/developers/x264.html @@ -136,7 +137,7 @@ RUN \ curl -sL https://download.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-${X264_VERSION}.tar.bz2 | \ tar -jx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared --enable-pic --disable-cli && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### x265 http://x265.org/ @@ -150,7 +151,7 @@ RUN \ sed -i "/-DEXTRA_LIB/ s/$/ -DCMAKE_INSTALL_PREFIX=\${PREFIX}/" multilib.sh && \ sed -i "/^cmake/ s/$/ -DENABLE_CLI=OFF/" multilib.sh && \ ./multilib.sh && \ - make -C 8bit install && \ + make -C 8bit -j $(nproc) install && \ rm -rf ${DIR} ### libogg https://www.xiph.org/ogg/ RUN \ @@ -161,7 +162,7 @@ RUN \ echo ${OGG_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f libogg-${OGG_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libopus https://www.opus-codec.org/ @@ -174,7 +175,7 @@ RUN \ tar -zx --strip-components=1 -f opus-${OPUS_VERSION}.tar.gz && \ autoreconf -fiv && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libvorbis https://xiph.org/vorbis/ @@ -186,7 +187,7 @@ RUN \ echo ${VORBIS_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f libvorbis-${VORBIS_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libtheora http://www.theora.org/ @@ -198,7 +199,7 @@ RUN \ echo ${THEORA_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f libtheora-${THEORA_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libvpx https://www.webmproject.org/code/ @@ -210,7 +211,7 @@ RUN \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-vp8 --enable-vp9 --enable-vp9-highbitdepth --enable-pic --enable-shared \ --disable-debug --disable-examples --disable-docs --disable-install-bins && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libwebp https://developers.google.com/speed/webp/ @@ -221,7 +222,7 @@ RUN \ curl -sL https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-${WEBP_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libmp3lame http://lame.sourceforge.net/ @@ -232,7 +233,7 @@ RUN \ curl -sL https://versaweb.dl.sourceforge.net/project/lame/lame/$(echo ${LAME_VERSION} | sed -e 's/[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)/\1.\2/')/lame-${LAME_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" --enable-shared --enable-nasm --disable-frontend && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### xvid https://www.xvid.com/ @@ -245,7 +246,7 @@ RUN \ tar -zx -f xvidcore-${XVID_VERSION}.tar.gz && \ cd xvidcore/build/generic && \ ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### fdk-aac https://github.com/mstorsjo/fdk-aac @@ -257,7 +258,7 @@ RUN \ tar -zx --strip-components=1 && \ autoreconf -fiv && \ ./configure --prefix="${PREFIX}" --enable-shared --datadir="${DIR}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## openjpeg https://github.com/uclouvain/openjpeg @@ -268,7 +269,7 @@ RUN \ curl -sL https://github.com/uclouvain/openjpeg/archive/v${OPENJPEG_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ cmake -DBUILD_THIRDPARTY:BOOL=ON -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## freetype https://www.freetype.org/ @@ -280,7 +281,7 @@ RUN \ echo ${FREETYPE_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f freetype-${FREETYPE_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## libvstab https://github.com/georgmartius/vid.stab @@ -292,7 +293,7 @@ RUN \ echo ${LIBVIDSTAB_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f v${LIBVIDSTAB_VERSION}.tar.gz && \ cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## fridibi https://www.fribidi.org/ @@ -317,7 +318,7 @@ RUN \ curl -sLO https://www.freedesktop.org/software/fontconfig/release/fontconfig-${FONTCONFIG_VERSION}.tar.bz2 && \ tar -jx --strip-components=1 -f fontconfig-${FONTCONFIG_VERSION}.tar.bz2 && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## libass https://github.com/libass/libass @@ -330,7 +331,7 @@ RUN \ tar -zx --strip-components=1 -f ${LIBASS_VERSION}.tar.gz && \ ./autogen.sh && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## kvazaar https://github.com/ultravideo/kvazaar @@ -354,7 +355,7 @@ RUN \ mkdir -p ./aom_build ; \ cd ./aom_build ; \ cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" -DBUILD_SHARED_LIBS=1 ..; \ - make ; \ + make -j $(nproc); \ make install ; \ rm -rf ${DIR} @@ -366,7 +367,7 @@ RUN \ curl -sLO https://www.x.org/archive//individual/util/util-macros-${XORG_MACROS_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f util-macros-${XORG_MACROS_VERSION}.tar.gz && \ ./configure --srcdir=${DIR} --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -377,7 +378,7 @@ RUN \ curl -sLO https://www.x.org/archive/individual/proto/xproto-${XPROTO_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f xproto-${XPROTO_VERSION}.tar.gz && \ ./configure --srcdir=${DIR} --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -388,7 +389,7 @@ RUN \ curl -sLO https://www.x.org/archive/individual/lib/libXau-${XAU_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f libXau-${XAU_VERSION}.tar.gz && \ ./configure --srcdir=${DIR} --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -399,7 +400,7 @@ RUN \ curl -sLO https://xcb.freedesktop.org/dist/libpthread-stubs-${LIBPTHREAD_STUBS_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f libpthread-stubs-${LIBPTHREAD_STUBS_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -411,7 +412,7 @@ RUN \ tar -zx --strip-components=1 -f xcb-proto-${XCBPROTO_VERSION}.tar.gz && \ ACLOCAL_PATH="${PREFIX}/share/aclocal" ./autogen.sh && \ ./configure --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -423,7 +424,7 @@ RUN \ tar -zx --strip-components=1 -f libxcb-${LIBXCB_VERSION}.tar.gz && \ ACLOCAL_PATH="${PREFIX}/share/aclocal" ./autogen.sh && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -436,7 +437,7 @@ RUN \ echo ${LIBXML2_SHA256SUM} | sha256sum --check && \ tar -xz --strip-components=1 -f libxml2-v${LIBXML2_VERSION}.tar.gz && \ ./autogen.sh --prefix="${PREFIX}" --with-ftp=no --with-http=no --with-python=no && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -449,7 +450,7 @@ RUN \ echo ${LIBBLURAY_SHA256SUM} | sha256sum --check && \ tar -jx --strip-components=1 -f libbluray-${LIBBLURAY_VERSION}.tar.bz2 && \ ./configure --prefix="${PREFIX}" --disable-examples --disable-bdjava-jar --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -463,7 +464,7 @@ RUN \ tar -xz --strip-components=1 -f v${LIBZMQ_VERSION}.tar.gz && \ ./autogen.sh && \ ./configure --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make check && \ make install && \ rm -rf ${DIR} @@ -476,7 +477,7 @@ RUN \ curl -sLO https://github.com/Haivision/srt/archive/v${LIBSRT_VERSION}.tar.gz && \ tar -xz --strip-components=1 -f v${LIBSRT_VERSION}.tar.gz && \ cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -488,7 +489,7 @@ RUN \ git clone https://git.code.sf.net/p/libpng/code ${DIR} -b v${LIBPNG_VERSION} --depth 1 && \ ./autogen.sh && \ ./configure --prefix="${PREFIX}" && \ - make check && \ + make check -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -502,7 +503,20 @@ RUN \ tar -xz --strip-components=1 -f v${LIBARIBB24_VERSION}.tar.gz && \ autoreconf -fiv && \ ./configure CFLAGS="-I${PREFIX}/include -fPIC" --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ + make install && \ + rm -rf ${DIR} + + +## libsvtav1 +RUN \ + DIR=/tmp/svtav1 && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + git clone https://gitlab.com/AOMediaCodec/SVT-AV1.git ${DIR} --depth=1 -b ${LIBSTVAV1_VERSION} &&\ + cd Build && \ + cmake .. -G"Unix Makefiles" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="${PREFIX}" && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -552,11 +566,12 @@ RUN \ --enable-libopenjpeg \ --enable-libkvazaar \ --enable-libaom \ + --enable-libsvtav1 \ --extra-libs=-lpthread \ --enable-libsrt \ --extra-cflags="-I${PREFIX}/include" \ --extra-ldflags="-L${PREFIX}/lib" && \ - make && \ + make -j $(nproc) && \ 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..b2c142b1f 100644 --- a/docker-images/4.0/ubuntu1804/Dockerfile +++ b/docker-images/4.0/ubuntu1804/Dockerfile @@ -17,7 +17,8 @@ RUN apt-get -yqq update && \ FROM base as build ENV FFMPEG_VERSION=4.0.6 \ - AOM_VERSION=v1.0.0 \ + LIBSTVAV1_VERSION=v0.8.7 \ + AOM_VERSION=v3.1.3 \ FDKAAC_VERSION=0.1.5 \ FONTCONFIG_VERSION=2.12.4 \ FREETYPE_VERSION=2.10.4 \ @@ -124,7 +125,7 @@ RUN \ curl -sL https://versaweb.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${OPENCOREAMR_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## x264 http://www.videolan.org/developers/x264.html @@ -135,7 +136,7 @@ RUN \ curl -sL https://download.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-${X264_VERSION}.tar.bz2 | \ tar -jx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared --enable-pic --disable-cli && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### x265 http://x265.org/ @@ -149,7 +150,7 @@ RUN \ sed -i "/-DEXTRA_LIB/ s/$/ -DCMAKE_INSTALL_PREFIX=\${PREFIX}/" multilib.sh && \ sed -i "/^cmake/ s/$/ -DENABLE_CLI=OFF/" multilib.sh && \ ./multilib.sh && \ - make -C 8bit install && \ + make -C 8bit -j $(nproc) install && \ rm -rf ${DIR} ### libogg https://www.xiph.org/ogg/ RUN \ @@ -160,7 +161,7 @@ RUN \ echo ${OGG_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f libogg-${OGG_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libopus https://www.opus-codec.org/ @@ -173,7 +174,7 @@ RUN \ tar -zx --strip-components=1 -f opus-${OPUS_VERSION}.tar.gz && \ autoreconf -fiv && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libvorbis https://xiph.org/vorbis/ @@ -185,7 +186,7 @@ RUN \ echo ${VORBIS_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f libvorbis-${VORBIS_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libtheora http://www.theora.org/ @@ -197,7 +198,7 @@ RUN \ echo ${THEORA_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f libtheora-${THEORA_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libvpx https://www.webmproject.org/code/ @@ -209,7 +210,7 @@ RUN \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-vp8 --enable-vp9 --enable-vp9-highbitdepth --enable-pic --enable-shared \ --disable-debug --disable-examples --disable-docs --disable-install-bins && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libwebp https://developers.google.com/speed/webp/ @@ -220,7 +221,7 @@ RUN \ curl -sL https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-${WEBP_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libmp3lame http://lame.sourceforge.net/ @@ -231,7 +232,7 @@ RUN \ curl -sL https://versaweb.dl.sourceforge.net/project/lame/lame/$(echo ${LAME_VERSION} | sed -e 's/[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)/\1.\2/')/lame-${LAME_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" --enable-shared --enable-nasm --disable-frontend && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### xvid https://www.xvid.com/ @@ -244,7 +245,7 @@ RUN \ tar -zx -f xvidcore-${XVID_VERSION}.tar.gz && \ cd xvidcore/build/generic && \ ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### fdk-aac https://github.com/mstorsjo/fdk-aac @@ -256,7 +257,7 @@ RUN \ tar -zx --strip-components=1 && \ autoreconf -fiv && \ ./configure --prefix="${PREFIX}" --enable-shared --datadir="${DIR}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## openjpeg https://github.com/uclouvain/openjpeg @@ -267,7 +268,7 @@ RUN \ curl -sL https://github.com/uclouvain/openjpeg/archive/v${OPENJPEG_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ cmake -DBUILD_THIRDPARTY:BOOL=ON -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## freetype https://www.freetype.org/ @@ -279,7 +280,7 @@ RUN \ echo ${FREETYPE_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f freetype-${FREETYPE_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## libvstab https://github.com/georgmartius/vid.stab @@ -291,7 +292,7 @@ RUN \ echo ${LIBVIDSTAB_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f v${LIBVIDSTAB_VERSION}.tar.gz && \ cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## fridibi https://www.fribidi.org/ @@ -316,7 +317,7 @@ RUN \ curl -sLO https://www.freedesktop.org/software/fontconfig/release/fontconfig-${FONTCONFIG_VERSION}.tar.bz2 && \ tar -jx --strip-components=1 -f fontconfig-${FONTCONFIG_VERSION}.tar.bz2 && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## libass https://github.com/libass/libass @@ -329,7 +330,7 @@ RUN \ tar -zx --strip-components=1 -f ${LIBASS_VERSION}.tar.gz && \ ./autogen.sh && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## kvazaar https://github.com/ultravideo/kvazaar @@ -353,7 +354,7 @@ RUN \ mkdir -p ./aom_build ; \ cd ./aom_build ; \ cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" -DBUILD_SHARED_LIBS=1 ..; \ - make ; \ + make -j $(nproc); \ make install ; \ rm -rf ${DIR} @@ -365,7 +366,7 @@ RUN \ curl -sLO https://www.x.org/archive//individual/util/util-macros-${XORG_MACROS_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f util-macros-${XORG_MACROS_VERSION}.tar.gz && \ ./configure --srcdir=${DIR} --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -376,7 +377,7 @@ RUN \ curl -sLO https://www.x.org/archive/individual/proto/xproto-${XPROTO_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f xproto-${XPROTO_VERSION}.tar.gz && \ ./configure --srcdir=${DIR} --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -387,7 +388,7 @@ RUN \ curl -sLO https://www.x.org/archive/individual/lib/libXau-${XAU_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f libXau-${XAU_VERSION}.tar.gz && \ ./configure --srcdir=${DIR} --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -398,7 +399,7 @@ RUN \ curl -sLO https://xcb.freedesktop.org/dist/libpthread-stubs-${LIBPTHREAD_STUBS_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f libpthread-stubs-${LIBPTHREAD_STUBS_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -410,7 +411,7 @@ RUN \ tar -zx --strip-components=1 -f xcb-proto-${XCBPROTO_VERSION}.tar.gz && \ ACLOCAL_PATH="${PREFIX}/share/aclocal" ./autogen.sh && \ ./configure --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -422,7 +423,7 @@ RUN \ tar -zx --strip-components=1 -f libxcb-${LIBXCB_VERSION}.tar.gz && \ ACLOCAL_PATH="${PREFIX}/share/aclocal" ./autogen.sh && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -435,7 +436,7 @@ RUN \ echo ${LIBXML2_SHA256SUM} | sha256sum --check && \ tar -xz --strip-components=1 -f libxml2-v${LIBXML2_VERSION}.tar.gz && \ ./autogen.sh --prefix="${PREFIX}" --with-ftp=no --with-http=no --with-python=no && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -448,7 +449,7 @@ RUN \ echo ${LIBBLURAY_SHA256SUM} | sha256sum --check && \ tar -jx --strip-components=1 -f libbluray-${LIBBLURAY_VERSION}.tar.bz2 && \ ./configure --prefix="${PREFIX}" --disable-examples --disable-bdjava-jar --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -462,7 +463,7 @@ RUN \ tar -xz --strip-components=1 -f v${LIBZMQ_VERSION}.tar.gz && \ ./autogen.sh && \ ./configure --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make check && \ make install && \ rm -rf ${DIR} @@ -475,7 +476,7 @@ RUN \ curl -sLO https://github.com/Haivision/srt/archive/v${LIBSRT_VERSION}.tar.gz && \ tar -xz --strip-components=1 -f v${LIBSRT_VERSION}.tar.gz && \ cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -487,7 +488,7 @@ RUN \ git clone https://git.code.sf.net/p/libpng/code ${DIR} -b v${LIBPNG_VERSION} --depth 1 && \ ./autogen.sh && \ ./configure --prefix="${PREFIX}" && \ - make check && \ + make check -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -501,7 +502,20 @@ RUN \ tar -xz --strip-components=1 -f v${LIBARIBB24_VERSION}.tar.gz && \ autoreconf -fiv && \ ./configure CFLAGS="-I${PREFIX}/include -fPIC" --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ + make install && \ + rm -rf ${DIR} + + +## libsvtav1 +RUN \ + DIR=/tmp/svtav1 && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + git clone https://gitlab.com/AOMediaCodec/SVT-AV1.git ${DIR} --depth=1 -b ${LIBSTVAV1_VERSION} &&\ + cd Build && \ + cmake .. -G"Unix Makefiles" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="${PREFIX}" && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -551,11 +565,12 @@ RUN \ --enable-libopenjpeg \ --enable-libkvazaar \ --enable-libaom \ + --enable-libsvtav1 \ --extra-libs=-lpthread \ --enable-libsrt \ --extra-cflags="-I${PREFIX}/include" \ --extra-ldflags="-L${PREFIX}/lib" && \ - make && \ + make -j $(nproc) && \ 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..ea0d18845 100644 --- a/docker-images/4.0/ubuntu2004/Dockerfile +++ b/docker-images/4.0/ubuntu2004/Dockerfile @@ -17,7 +17,8 @@ RUN apt-get -yqq update && \ FROM base as build ENV FFMPEG_VERSION=4.0.6 \ - AOM_VERSION=v1.0.0 \ + LIBSTVAV1_VERSION=v0.8.7 \ + AOM_VERSION=v3.1.3 \ FDKAAC_VERSION=0.1.5 \ FONTCONFIG_VERSION=2.12.4 \ FREETYPE_VERSION=2.10.4 \ @@ -127,7 +128,7 @@ RUN \ curl -sL https://versaweb.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${OPENCOREAMR_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## x264 http://www.videolan.org/developers/x264.html @@ -138,7 +139,7 @@ RUN \ curl -sL https://download.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-${X264_VERSION}.tar.bz2 | \ tar -jx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared --enable-pic --disable-cli && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### x265 http://x265.org/ @@ -152,7 +153,7 @@ RUN \ sed -i "/-DEXTRA_LIB/ s/$/ -DCMAKE_INSTALL_PREFIX=\${PREFIX}/" multilib.sh && \ sed -i "/^cmake/ s/$/ -DENABLE_CLI=OFF/" multilib.sh && \ ./multilib.sh && \ - make -C 8bit install && \ + make -C 8bit -j $(nproc) install && \ rm -rf ${DIR} ### libogg https://www.xiph.org/ogg/ RUN \ @@ -163,7 +164,7 @@ RUN \ echo ${OGG_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f libogg-${OGG_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libopus https://www.opus-codec.org/ @@ -176,7 +177,7 @@ RUN \ tar -zx --strip-components=1 -f opus-${OPUS_VERSION}.tar.gz && \ autoreconf -fiv && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libvorbis https://xiph.org/vorbis/ @@ -188,7 +189,7 @@ RUN \ echo ${VORBIS_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f libvorbis-${VORBIS_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libtheora http://www.theora.org/ @@ -200,7 +201,7 @@ RUN \ echo ${THEORA_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f libtheora-${THEORA_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libvpx https://www.webmproject.org/code/ @@ -212,7 +213,7 @@ RUN \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-vp8 --enable-vp9 --enable-vp9-highbitdepth --enable-pic --enable-shared \ --disable-debug --disable-examples --disable-docs --disable-install-bins && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libwebp https://developers.google.com/speed/webp/ @@ -223,7 +224,7 @@ RUN \ curl -sL https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-${WEBP_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libmp3lame http://lame.sourceforge.net/ @@ -234,7 +235,7 @@ RUN \ curl -sL https://versaweb.dl.sourceforge.net/project/lame/lame/$(echo ${LAME_VERSION} | sed -e 's/[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)/\1.\2/')/lame-${LAME_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" --enable-shared --enable-nasm --disable-frontend && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### xvid https://www.xvid.com/ @@ -247,7 +248,7 @@ RUN \ tar -zx -f xvidcore-${XVID_VERSION}.tar.gz && \ cd xvidcore/build/generic && \ ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### fdk-aac https://github.com/mstorsjo/fdk-aac @@ -259,7 +260,7 @@ RUN \ tar -zx --strip-components=1 && \ autoreconf -fiv && \ ./configure --prefix="${PREFIX}" --enable-shared --datadir="${DIR}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## openjpeg https://github.com/uclouvain/openjpeg @@ -270,7 +271,7 @@ RUN \ curl -sL https://github.com/uclouvain/openjpeg/archive/v${OPENJPEG_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ cmake -DBUILD_THIRDPARTY:BOOL=ON -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## freetype https://www.freetype.org/ @@ -282,7 +283,7 @@ RUN \ echo ${FREETYPE_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f freetype-${FREETYPE_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## libvstab https://github.com/georgmartius/vid.stab @@ -294,7 +295,7 @@ RUN \ echo ${LIBVIDSTAB_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f v${LIBVIDSTAB_VERSION}.tar.gz && \ cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## fridibi https://www.fribidi.org/ @@ -319,7 +320,7 @@ RUN \ curl -sLO https://www.freedesktop.org/software/fontconfig/release/fontconfig-${FONTCONFIG_VERSION}.tar.bz2 && \ tar -jx --strip-components=1 -f fontconfig-${FONTCONFIG_VERSION}.tar.bz2 && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## libass https://github.com/libass/libass @@ -332,7 +333,7 @@ RUN \ tar -zx --strip-components=1 -f ${LIBASS_VERSION}.tar.gz && \ ./autogen.sh && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## kvazaar https://github.com/ultravideo/kvazaar @@ -356,7 +357,7 @@ RUN \ mkdir -p ./aom_build ; \ cd ./aom_build ; \ cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" -DBUILD_SHARED_LIBS=1 ..; \ - make ; \ + make -j $(nproc); \ make install ; \ rm -rf ${DIR} @@ -368,7 +369,7 @@ RUN \ curl -sLO https://www.x.org/archive//individual/util/util-macros-${XORG_MACROS_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f util-macros-${XORG_MACROS_VERSION}.tar.gz && \ ./configure --srcdir=${DIR} --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -379,7 +380,7 @@ RUN \ curl -sLO https://www.x.org/archive/individual/proto/xproto-${XPROTO_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f xproto-${XPROTO_VERSION}.tar.gz && \ ./configure --srcdir=${DIR} --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -390,7 +391,7 @@ RUN \ curl -sLO https://www.x.org/archive/individual/lib/libXau-${XAU_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f libXau-${XAU_VERSION}.tar.gz && \ ./configure --srcdir=${DIR} --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -401,7 +402,7 @@ RUN \ curl -sLO https://xcb.freedesktop.org/dist/libpthread-stubs-${LIBPTHREAD_STUBS_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f libpthread-stubs-${LIBPTHREAD_STUBS_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -413,7 +414,7 @@ RUN \ tar -zx --strip-components=1 -f xcb-proto-${XCBPROTO_VERSION}.tar.gz && \ ACLOCAL_PATH="${PREFIX}/share/aclocal" ./autogen.sh && \ ./configure --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -425,7 +426,7 @@ RUN \ tar -zx --strip-components=1 -f libxcb-${LIBXCB_VERSION}.tar.gz && \ ACLOCAL_PATH="${PREFIX}/share/aclocal" ./autogen.sh && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -438,7 +439,7 @@ RUN \ echo ${LIBXML2_SHA256SUM} | sha256sum --check && \ tar -xz --strip-components=1 -f libxml2-v${LIBXML2_VERSION}.tar.gz && \ ./autogen.sh --prefix="${PREFIX}" --with-ftp=no --with-http=no --with-python=no && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -451,7 +452,7 @@ RUN \ echo ${LIBBLURAY_SHA256SUM} | sha256sum --check && \ tar -jx --strip-components=1 -f libbluray-${LIBBLURAY_VERSION}.tar.bz2 && \ ./configure --prefix="${PREFIX}" --disable-examples --disable-bdjava-jar --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -465,7 +466,7 @@ RUN \ tar -xz --strip-components=1 -f v${LIBZMQ_VERSION}.tar.gz && \ ./autogen.sh && \ ./configure --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make check && \ make install && \ rm -rf ${DIR} @@ -478,7 +479,7 @@ RUN \ curl -sLO https://github.com/Haivision/srt/archive/v${LIBSRT_VERSION}.tar.gz && \ tar -xz --strip-components=1 -f v${LIBSRT_VERSION}.tar.gz && \ cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -490,7 +491,7 @@ RUN \ git clone https://git.code.sf.net/p/libpng/code ${DIR} -b v${LIBPNG_VERSION} --depth 1 && \ ./autogen.sh && \ ./configure --prefix="${PREFIX}" && \ - make check && \ + make check -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -504,7 +505,20 @@ RUN \ tar -xz --strip-components=1 -f v${LIBARIBB24_VERSION}.tar.gz && \ autoreconf -fiv && \ ./configure CFLAGS="-I${PREFIX}/include -fPIC" --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ + make install && \ + rm -rf ${DIR} + + +## libsvtav1 +RUN \ + DIR=/tmp/svtav1 && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + git clone https://gitlab.com/AOMediaCodec/SVT-AV1.git ${DIR} --depth=1 -b ${LIBSTVAV1_VERSION} &&\ + cd Build && \ + cmake .. -G"Unix Makefiles" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="${PREFIX}" && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -554,11 +568,12 @@ RUN \ --enable-libopenjpeg \ --enable-libkvazaar \ --enable-libaom \ + --enable-libsvtav1 \ --extra-libs=-lpthread \ --enable-libsrt \ --extra-cflags="-I${PREFIX}/include" \ --extra-ldflags="-L${PREFIX}/lib" && \ - make && \ + make -j $(nproc) && \ 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..f0e2a6088 100644 --- a/docker-images/4.0/vaapi2004/Dockerfile +++ b/docker-images/4.0/vaapi2004/Dockerfile @@ -17,7 +17,8 @@ RUN apt-get -yqq update && \ FROM base as build ENV FFMPEG_VERSION=4.0.6 \ - AOM_VERSION=v1.0.0 \ + LIBSTVAV1_VERSION=v0.8.7 \ + AOM_VERSION=v3.1.3 \ FDKAAC_VERSION=0.1.5 \ FONTCONFIG_VERSION=2.12.4 \ FREETYPE_VERSION=2.10.4 \ @@ -128,7 +129,7 @@ RUN \ curl -sL https://versaweb.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${OPENCOREAMR_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## x264 http://www.videolan.org/developers/x264.html @@ -139,7 +140,7 @@ RUN \ curl -sL https://download.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-${X264_VERSION}.tar.bz2 | \ tar -jx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared --enable-pic --disable-cli && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### x265 http://x265.org/ @@ -153,7 +154,7 @@ RUN \ sed -i "/-DEXTRA_LIB/ s/$/ -DCMAKE_INSTALL_PREFIX=\${PREFIX}/" multilib.sh && \ sed -i "/^cmake/ s/$/ -DENABLE_CLI=OFF/" multilib.sh && \ ./multilib.sh && \ - make -C 8bit install && \ + make -C 8bit -j $(nproc) install && \ rm -rf ${DIR} ### libogg https://www.xiph.org/ogg/ RUN \ @@ -164,7 +165,7 @@ RUN \ echo ${OGG_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f libogg-${OGG_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libopus https://www.opus-codec.org/ @@ -177,7 +178,7 @@ RUN \ tar -zx --strip-components=1 -f opus-${OPUS_VERSION}.tar.gz && \ autoreconf -fiv && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libvorbis https://xiph.org/vorbis/ @@ -189,7 +190,7 @@ RUN \ echo ${VORBIS_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f libvorbis-${VORBIS_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libtheora http://www.theora.org/ @@ -201,7 +202,7 @@ RUN \ echo ${THEORA_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f libtheora-${THEORA_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libvpx https://www.webmproject.org/code/ @@ -213,7 +214,7 @@ RUN \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-vp8 --enable-vp9 --enable-vp9-highbitdepth --enable-pic --enable-shared \ --disable-debug --disable-examples --disable-docs --disable-install-bins && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libwebp https://developers.google.com/speed/webp/ @@ -224,7 +225,7 @@ RUN \ curl -sL https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-${WEBP_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libmp3lame http://lame.sourceforge.net/ @@ -235,7 +236,7 @@ RUN \ curl -sL https://versaweb.dl.sourceforge.net/project/lame/lame/$(echo ${LAME_VERSION} | sed -e 's/[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)/\1.\2/')/lame-${LAME_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" --enable-shared --enable-nasm --disable-frontend && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### xvid https://www.xvid.com/ @@ -248,7 +249,7 @@ RUN \ tar -zx -f xvidcore-${XVID_VERSION}.tar.gz && \ cd xvidcore/build/generic && \ ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### fdk-aac https://github.com/mstorsjo/fdk-aac @@ -260,7 +261,7 @@ RUN \ tar -zx --strip-components=1 && \ autoreconf -fiv && \ ./configure --prefix="${PREFIX}" --enable-shared --datadir="${DIR}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## openjpeg https://github.com/uclouvain/openjpeg @@ -271,7 +272,7 @@ RUN \ curl -sL https://github.com/uclouvain/openjpeg/archive/v${OPENJPEG_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ cmake -DBUILD_THIRDPARTY:BOOL=ON -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## freetype https://www.freetype.org/ @@ -283,7 +284,7 @@ RUN \ echo ${FREETYPE_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f freetype-${FREETYPE_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## libvstab https://github.com/georgmartius/vid.stab @@ -295,7 +296,7 @@ RUN \ echo ${LIBVIDSTAB_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f v${LIBVIDSTAB_VERSION}.tar.gz && \ cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## fridibi https://www.fribidi.org/ @@ -320,7 +321,7 @@ RUN \ curl -sLO https://www.freedesktop.org/software/fontconfig/release/fontconfig-${FONTCONFIG_VERSION}.tar.bz2 && \ tar -jx --strip-components=1 -f fontconfig-${FONTCONFIG_VERSION}.tar.bz2 && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## libass https://github.com/libass/libass @@ -333,7 +334,7 @@ RUN \ tar -zx --strip-components=1 -f ${LIBASS_VERSION}.tar.gz && \ ./autogen.sh && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## kvazaar https://github.com/ultravideo/kvazaar @@ -357,7 +358,7 @@ RUN \ mkdir -p ./aom_build ; \ cd ./aom_build ; \ cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" -DBUILD_SHARED_LIBS=1 ..; \ - make ; \ + make -j $(nproc); \ make install ; \ rm -rf ${DIR} @@ -369,7 +370,7 @@ RUN \ curl -sLO https://www.x.org/archive//individual/util/util-macros-${XORG_MACROS_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f util-macros-${XORG_MACROS_VERSION}.tar.gz && \ ./configure --srcdir=${DIR} --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -380,7 +381,7 @@ RUN \ curl -sLO https://www.x.org/archive/individual/proto/xproto-${XPROTO_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f xproto-${XPROTO_VERSION}.tar.gz && \ ./configure --srcdir=${DIR} --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -391,7 +392,7 @@ RUN \ curl -sLO https://www.x.org/archive/individual/lib/libXau-${XAU_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f libXau-${XAU_VERSION}.tar.gz && \ ./configure --srcdir=${DIR} --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -402,7 +403,7 @@ RUN \ curl -sLO https://xcb.freedesktop.org/dist/libpthread-stubs-${LIBPTHREAD_STUBS_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f libpthread-stubs-${LIBPTHREAD_STUBS_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -414,7 +415,7 @@ RUN \ tar -zx --strip-components=1 -f xcb-proto-${XCBPROTO_VERSION}.tar.gz && \ ACLOCAL_PATH="${PREFIX}/share/aclocal" ./autogen.sh && \ ./configure --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -426,7 +427,7 @@ RUN \ tar -zx --strip-components=1 -f libxcb-${LIBXCB_VERSION}.tar.gz && \ ACLOCAL_PATH="${PREFIX}/share/aclocal" ./autogen.sh && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -439,7 +440,7 @@ RUN \ echo ${LIBXML2_SHA256SUM} | sha256sum --check && \ tar -xz --strip-components=1 -f libxml2-v${LIBXML2_VERSION}.tar.gz && \ ./autogen.sh --prefix="${PREFIX}" --with-ftp=no --with-http=no --with-python=no && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -452,7 +453,7 @@ RUN \ echo ${LIBBLURAY_SHA256SUM} | sha256sum --check && \ tar -jx --strip-components=1 -f libbluray-${LIBBLURAY_VERSION}.tar.bz2 && \ ./configure --prefix="${PREFIX}" --disable-examples --disable-bdjava-jar --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -466,7 +467,7 @@ RUN \ tar -xz --strip-components=1 -f v${LIBZMQ_VERSION}.tar.gz && \ ./autogen.sh && \ ./configure --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make check && \ make install && \ rm -rf ${DIR} @@ -479,7 +480,7 @@ RUN \ curl -sLO https://github.com/Haivision/srt/archive/v${LIBSRT_VERSION}.tar.gz && \ tar -xz --strip-components=1 -f v${LIBSRT_VERSION}.tar.gz && \ cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -491,7 +492,7 @@ RUN \ git clone https://git.code.sf.net/p/libpng/code ${DIR} -b v${LIBPNG_VERSION} --depth 1 && \ ./autogen.sh && \ ./configure --prefix="${PREFIX}" && \ - make check && \ + make check -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -505,7 +506,20 @@ RUN \ tar -xz --strip-components=1 -f v${LIBARIBB24_VERSION}.tar.gz && \ autoreconf -fiv && \ ./configure CFLAGS="-I${PREFIX}/include -fPIC" --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ + make install && \ + rm -rf ${DIR} + + +## libsvtav1 +RUN \ + DIR=/tmp/svtav1 && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + git clone https://gitlab.com/AOMediaCodec/SVT-AV1.git ${DIR} --depth=1 -b ${LIBSTVAV1_VERSION} &&\ + cd Build && \ + cmake .. -G"Unix Makefiles" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="${PREFIX}" && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -555,12 +569,13 @@ RUN \ --enable-libopenjpeg \ --enable-libkvazaar \ --enable-libaom \ + --enable-libsvtav1 \ --extra-libs=-lpthread \ --enable-libsrt \ --enable-vaapi \ --extra-cflags="-I${PREFIX}/include" \ --extra-ldflags="-L${PREFIX}/lib" && \ - make && \ + make -j $(nproc) && \ 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..630261749 100644 --- a/docker-images/4.1/alpine312/Dockerfile +++ b/docker-images/4.1/alpine312/Dockerfile @@ -14,7 +14,8 @@ FROM base AS build WORKDIR /tmp/workdir ENV FFMPEG_VERSION=4.1.7 \ - AOM_VERSION=v1.0.0 \ + LIBSTVAV1_VERSION=v0.8.7 \ + AOM_VERSION=v3.1.3 \ FDKAAC_VERSION=0.1.5 \ FONTCONFIG_VERSION=2.12.4 \ FREETYPE_VERSION=2.10.4 \ @@ -93,6 +94,8 @@ RUN buildDeps="autoconf \ yasm \ nasm \ zlib-dev \ + meson \ + xxd \ expat-dev" && \ apk add --no-cache --update ${buildDeps} ## libvmaf https://github.com/Netflix/vmaf @@ -123,7 +126,7 @@ RUN \ curl -sL https://versaweb.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${OPENCOREAMR_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## x264 http://www.videolan.org/developers/x264.html @@ -134,7 +137,7 @@ RUN \ curl -sL https://download.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-${X264_VERSION}.tar.bz2 | \ tar -jx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared --enable-pic --disable-cli && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### x265 http://x265.org/ @@ -148,7 +151,7 @@ RUN \ sed -i "/-DEXTRA_LIB/ s/$/ -DCMAKE_INSTALL_PREFIX=\${PREFIX}/" multilib.sh && \ sed -i "/^cmake/ s/$/ -DENABLE_CLI=OFF/" multilib.sh && \ ./multilib.sh && \ - make -C 8bit install && \ + make -C 8bit -j $(nproc) install && \ rm -rf ${DIR} ### libogg https://www.xiph.org/ogg/ RUN \ @@ -159,7 +162,7 @@ RUN \ echo ${OGG_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f libogg-${OGG_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libopus https://www.opus-codec.org/ @@ -172,7 +175,7 @@ RUN \ tar -zx --strip-components=1 -f opus-${OPUS_VERSION}.tar.gz && \ autoreconf -fiv && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libvorbis https://xiph.org/vorbis/ @@ -184,7 +187,7 @@ RUN \ echo ${VORBIS_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f libvorbis-${VORBIS_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libtheora http://www.theora.org/ @@ -196,7 +199,7 @@ RUN \ echo ${THEORA_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f libtheora-${THEORA_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libvpx https://www.webmproject.org/code/ @@ -208,7 +211,7 @@ RUN \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-vp8 --enable-vp9 --enable-vp9-highbitdepth --enable-pic --enable-shared \ --disable-debug --disable-examples --disable-docs --disable-install-bins && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libwebp https://developers.google.com/speed/webp/ @@ -219,7 +222,7 @@ RUN \ curl -sL https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-${WEBP_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libmp3lame http://lame.sourceforge.net/ @@ -230,7 +233,7 @@ RUN \ curl -sL https://versaweb.dl.sourceforge.net/project/lame/lame/$(echo ${LAME_VERSION} | sed -e 's/[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)/\1.\2/')/lame-${LAME_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" --enable-shared --enable-nasm --disable-frontend && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### xvid https://www.xvid.com/ @@ -243,7 +246,7 @@ RUN \ tar -zx -f xvidcore-${XVID_VERSION}.tar.gz && \ cd xvidcore/build/generic && \ ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### fdk-aac https://github.com/mstorsjo/fdk-aac @@ -255,7 +258,7 @@ RUN \ tar -zx --strip-components=1 && \ autoreconf -fiv && \ ./configure --prefix="${PREFIX}" --enable-shared --datadir="${DIR}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## openjpeg https://github.com/uclouvain/openjpeg @@ -266,7 +269,7 @@ RUN \ curl -sL https://github.com/uclouvain/openjpeg/archive/v${OPENJPEG_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ cmake -DBUILD_THIRDPARTY:BOOL=ON -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## freetype https://www.freetype.org/ @@ -278,7 +281,7 @@ RUN \ echo ${FREETYPE_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f freetype-${FREETYPE_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## libvstab https://github.com/georgmartius/vid.stab @@ -290,7 +293,7 @@ RUN \ echo ${LIBVIDSTAB_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f v${LIBVIDSTAB_VERSION}.tar.gz && \ cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## fridibi https://www.fribidi.org/ @@ -315,7 +318,7 @@ RUN \ curl -sLO https://www.freedesktop.org/software/fontconfig/release/fontconfig-${FONTCONFIG_VERSION}.tar.bz2 && \ tar -jx --strip-components=1 -f fontconfig-${FONTCONFIG_VERSION}.tar.bz2 && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## libass https://github.com/libass/libass @@ -328,7 +331,7 @@ RUN \ tar -zx --strip-components=1 -f ${LIBASS_VERSION}.tar.gz && \ ./autogen.sh && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## kvazaar https://github.com/ultravideo/kvazaar @@ -352,7 +355,7 @@ RUN \ mkdir -p ./aom_build ; \ cd ./aom_build ; \ cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" -DBUILD_SHARED_LIBS=1 ..; \ - make ; \ + make -j $(nproc); \ make install ; \ rm -rf ${DIR} @@ -364,7 +367,7 @@ RUN \ curl -sLO https://www.x.org/archive//individual/util/util-macros-${XORG_MACROS_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f util-macros-${XORG_MACROS_VERSION}.tar.gz && \ ./configure --srcdir=${DIR} --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -375,7 +378,7 @@ RUN \ curl -sLO https://www.x.org/archive/individual/proto/xproto-${XPROTO_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f xproto-${XPROTO_VERSION}.tar.gz && \ ./configure --srcdir=${DIR} --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -386,7 +389,7 @@ RUN \ curl -sLO https://www.x.org/archive/individual/lib/libXau-${XAU_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f libXau-${XAU_VERSION}.tar.gz && \ ./configure --srcdir=${DIR} --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -397,7 +400,7 @@ RUN \ curl -sLO https://xcb.freedesktop.org/dist/libpthread-stubs-${LIBPTHREAD_STUBS_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f libpthread-stubs-${LIBPTHREAD_STUBS_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -409,7 +412,7 @@ RUN \ tar -zx --strip-components=1 -f xcb-proto-${XCBPROTO_VERSION}.tar.gz && \ ACLOCAL_PATH="${PREFIX}/share/aclocal" ./autogen.sh && \ ./configure --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -421,7 +424,7 @@ RUN \ tar -zx --strip-components=1 -f libxcb-${LIBXCB_VERSION}.tar.gz && \ ACLOCAL_PATH="${PREFIX}/share/aclocal" ./autogen.sh && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -434,7 +437,7 @@ RUN \ echo ${LIBXML2_SHA256SUM} | sha256sum --check && \ tar -xz --strip-components=1 -f libxml2-v${LIBXML2_VERSION}.tar.gz && \ ./autogen.sh --prefix="${PREFIX}" --with-ftp=no --with-http=no --with-python=no && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -447,7 +450,7 @@ RUN \ echo ${LIBBLURAY_SHA256SUM} | sha256sum --check && \ tar -jx --strip-components=1 -f libbluray-${LIBBLURAY_VERSION}.tar.bz2 && \ ./configure --prefix="${PREFIX}" --disable-examples --disable-bdjava-jar --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -461,7 +464,7 @@ RUN \ tar -xz --strip-components=1 -f v${LIBZMQ_VERSION}.tar.gz && \ ./autogen.sh && \ ./configure --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make check && \ make install && \ rm -rf ${DIR} @@ -474,7 +477,7 @@ RUN \ curl -sLO https://github.com/Haivision/srt/archive/v${LIBSRT_VERSION}.tar.gz && \ tar -xz --strip-components=1 -f v${LIBSRT_VERSION}.tar.gz && \ cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -486,7 +489,7 @@ RUN \ git clone https://git.code.sf.net/p/libpng/code ${DIR} -b v${LIBPNG_VERSION} --depth 1 && \ ./autogen.sh && \ ./configure --prefix="${PREFIX}" && \ - make check && \ + make check -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -500,7 +503,20 @@ RUN \ tar -xz --strip-components=1 -f v${LIBARIBB24_VERSION}.tar.gz && \ autoreconf -fiv && \ ./configure CFLAGS="-I${PREFIX}/include -fPIC" --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ + make install && \ + rm -rf ${DIR} + + +## libsvtav1 +RUN \ + DIR=/tmp/svtav1 && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + git clone https://gitlab.com/AOMediaCodec/SVT-AV1.git ${DIR} --depth=1 -b ${LIBSTVAV1_VERSION} &&\ + cd Build && \ + cmake .. -G"Unix Makefiles" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="${PREFIX}" && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -550,11 +566,12 @@ RUN \ --enable-libopenjpeg \ --enable-libkvazaar \ --enable-libaom \ + --enable-libsvtav1 \ --extra-libs=-lpthread \ --enable-libsrt \ --extra-cflags="-I${PREFIX}/include" \ --extra-ldflags="-L${PREFIX}/lib" && \ - make && \ + make -j $(nproc) && \ 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..316d6e9c0 100644 --- a/docker-images/4.1/centos7/Dockerfile +++ b/docker-images/4.1/centos7/Dockerfile @@ -16,7 +16,8 @@ FROM base AS build WORKDIR /tmp/workdir ENV FFMPEG_VERSION=4.1.7 \ - AOM_VERSION=v1.0.0 \ + LIBSTVAV1_VERSION=v0.8.7 \ + AOM_VERSION=v3.1.3 \ FDKAAC_VERSION=0.1.5 \ FONTCONFIG_VERSION=2.12.4 \ FREETYPE_VERSION=2.10.4 \ @@ -160,7 +161,7 @@ RUN \ curl -sL https://versaweb.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${OPENCOREAMR_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## x264 http://www.videolan.org/developers/x264.html @@ -171,7 +172,7 @@ RUN \ curl -sL https://download.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-${X264_VERSION}.tar.bz2 | \ tar -jx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared --enable-pic --disable-cli && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### x265 http://x265.org/ @@ -185,7 +186,7 @@ RUN \ sed -i "/-DEXTRA_LIB/ s/$/ -DCMAKE_INSTALL_PREFIX=\${PREFIX}/" multilib.sh && \ sed -i "/^cmake/ s/$/ -DENABLE_CLI=OFF/" multilib.sh && \ ./multilib.sh && \ - make -C 8bit install && \ + make -C 8bit -j $(nproc) install && \ rm -rf ${DIR} ### libogg https://www.xiph.org/ogg/ RUN \ @@ -196,7 +197,7 @@ RUN \ echo ${OGG_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f libogg-${OGG_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libopus https://www.opus-codec.org/ @@ -209,7 +210,7 @@ RUN \ tar -zx --strip-components=1 -f opus-${OPUS_VERSION}.tar.gz && \ autoreconf -fiv && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libvorbis https://xiph.org/vorbis/ @@ -221,7 +222,7 @@ RUN \ echo ${VORBIS_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f libvorbis-${VORBIS_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libtheora http://www.theora.org/ @@ -233,7 +234,7 @@ RUN \ echo ${THEORA_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f libtheora-${THEORA_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libvpx https://www.webmproject.org/code/ @@ -245,7 +246,7 @@ RUN \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-vp8 --enable-vp9 --enable-vp9-highbitdepth --enable-pic --enable-shared \ --disable-debug --disable-examples --disable-docs --disable-install-bins && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libwebp https://developers.google.com/speed/webp/ @@ -256,7 +257,7 @@ RUN \ curl -sL https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-${WEBP_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libmp3lame http://lame.sourceforge.net/ @@ -267,7 +268,7 @@ RUN \ curl -sL https://versaweb.dl.sourceforge.net/project/lame/lame/$(echo ${LAME_VERSION} | sed -e 's/[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)/\1.\2/')/lame-${LAME_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" --enable-shared --enable-nasm --disable-frontend && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### xvid https://www.xvid.com/ @@ -280,7 +281,7 @@ RUN \ tar -zx -f xvidcore-${XVID_VERSION}.tar.gz && \ cd xvidcore/build/generic && \ ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### fdk-aac https://github.com/mstorsjo/fdk-aac @@ -292,7 +293,7 @@ RUN \ tar -zx --strip-components=1 && \ autoreconf -fiv && \ ./configure --prefix="${PREFIX}" --enable-shared --datadir="${DIR}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## openjpeg https://github.com/uclouvain/openjpeg @@ -303,7 +304,7 @@ RUN \ curl -sL https://github.com/uclouvain/openjpeg/archive/v${OPENJPEG_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ cmake -DBUILD_THIRDPARTY:BOOL=ON -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## freetype https://www.freetype.org/ @@ -315,7 +316,7 @@ RUN \ echo ${FREETYPE_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f freetype-${FREETYPE_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## libvstab https://github.com/georgmartius/vid.stab @@ -327,7 +328,7 @@ RUN \ echo ${LIBVIDSTAB_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f v${LIBVIDSTAB_VERSION}.tar.gz && \ cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## fridibi https://www.fribidi.org/ @@ -352,7 +353,7 @@ RUN \ curl -sLO https://www.freedesktop.org/software/fontconfig/release/fontconfig-${FONTCONFIG_VERSION}.tar.bz2 && \ tar -jx --strip-components=1 -f fontconfig-${FONTCONFIG_VERSION}.tar.bz2 && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## libass https://github.com/libass/libass @@ -365,7 +366,7 @@ RUN \ tar -zx --strip-components=1 -f ${LIBASS_VERSION}.tar.gz && \ ./autogen.sh && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## kvazaar https://github.com/ultravideo/kvazaar @@ -389,7 +390,7 @@ RUN \ mkdir -p ./aom_build ; \ cd ./aom_build ; \ cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" -DBUILD_SHARED_LIBS=1 ..; \ - make ; \ + make -j $(nproc); \ make install ; \ rm -rf ${DIR} @@ -401,7 +402,7 @@ RUN \ curl -sLO https://www.x.org/archive//individual/util/util-macros-${XORG_MACROS_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f util-macros-${XORG_MACROS_VERSION}.tar.gz && \ ./configure --srcdir=${DIR} --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -412,7 +413,7 @@ RUN \ curl -sLO https://www.x.org/archive/individual/proto/xproto-${XPROTO_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f xproto-${XPROTO_VERSION}.tar.gz && \ ./configure --srcdir=${DIR} --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -423,7 +424,7 @@ RUN \ curl -sLO https://www.x.org/archive/individual/lib/libXau-${XAU_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f libXau-${XAU_VERSION}.tar.gz && \ ./configure --srcdir=${DIR} --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -434,7 +435,7 @@ RUN \ curl -sLO https://xcb.freedesktop.org/dist/libpthread-stubs-${LIBPTHREAD_STUBS_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f libpthread-stubs-${LIBPTHREAD_STUBS_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -446,7 +447,7 @@ RUN \ tar -zx --strip-components=1 -f xcb-proto-${XCBPROTO_VERSION}.tar.gz && \ ACLOCAL_PATH="${PREFIX}/share/aclocal" ./autogen.sh && \ ./configure --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -458,7 +459,7 @@ RUN \ tar -zx --strip-components=1 -f libxcb-${LIBXCB_VERSION}.tar.gz && \ ACLOCAL_PATH="${PREFIX}/share/aclocal" ./autogen.sh && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -471,7 +472,7 @@ RUN \ echo ${LIBXML2_SHA256SUM} | sha256sum --check && \ tar -xz --strip-components=1 -f libxml2-v${LIBXML2_VERSION}.tar.gz && \ ./autogen.sh --prefix="${PREFIX}" --with-ftp=no --with-http=no --with-python=no && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -484,7 +485,7 @@ RUN \ echo ${LIBBLURAY_SHA256SUM} | sha256sum --check && \ tar -jx --strip-components=1 -f libbluray-${LIBBLURAY_VERSION}.tar.bz2 && \ ./configure --prefix="${PREFIX}" --disable-examples --disable-bdjava-jar --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -498,7 +499,7 @@ RUN \ tar -xz --strip-components=1 -f v${LIBZMQ_VERSION}.tar.gz && \ ./autogen.sh && \ ./configure --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make check && \ make install && \ rm -rf ${DIR} @@ -511,7 +512,7 @@ RUN \ curl -sLO https://github.com/Haivision/srt/archive/v${LIBSRT_VERSION}.tar.gz && \ tar -xz --strip-components=1 -f v${LIBSRT_VERSION}.tar.gz && \ cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -523,7 +524,7 @@ RUN \ git clone https://git.code.sf.net/p/libpng/code ${DIR} -b v${LIBPNG_VERSION} --depth 1 && \ ./autogen.sh && \ ./configure --prefix="${PREFIX}" && \ - make check && \ + make check -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -537,7 +538,20 @@ RUN \ tar -xz --strip-components=1 -f v${LIBARIBB24_VERSION}.tar.gz && \ autoreconf -fiv && \ ./configure CFLAGS="-I${PREFIX}/include -fPIC" --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ + make install && \ + rm -rf ${DIR} + + +## libsvtav1 +RUN \ + DIR=/tmp/svtav1 && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + git clone https://gitlab.com/AOMediaCodec/SVT-AV1.git ${DIR} --depth=1 -b ${LIBSTVAV1_VERSION} &&\ + cd Build && \ + cmake .. -G"Unix Makefiles" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="${PREFIX}" && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -587,11 +601,12 @@ RUN \ --enable-libopenjpeg \ --enable-libkvazaar \ --enable-libaom \ + --enable-libsvtav1 \ --extra-libs=-lpthread \ --enable-libsrt \ --extra-cflags="-I${PREFIX}/include" \ --extra-ldflags="-L${PREFIX}/lib" && \ - make && \ + make -j $(nproc) && \ 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..475470a6f 100644 --- a/docker-images/4.1/centos8/Dockerfile +++ b/docker-images/4.1/centos8/Dockerfile @@ -16,7 +16,8 @@ FROM base AS build WORKDIR /tmp/workdir ENV FFMPEG_VERSION=4.1.7 \ - AOM_VERSION=v1.0.0 \ + LIBSTVAV1_VERSION=v0.8.7 \ + AOM_VERSION=v3.1.3 \ FDKAAC_VERSION=0.1.5 \ FONTCONFIG_VERSION=2.12.4 \ FREETYPE_VERSION=2.10.4 \ @@ -129,7 +130,7 @@ RUN \ curl -sL https://versaweb.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${OPENCOREAMR_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## x264 http://www.videolan.org/developers/x264.html @@ -140,7 +141,7 @@ RUN \ curl -sL https://download.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-${X264_VERSION}.tar.bz2 | \ tar -jx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared --enable-pic --disable-cli && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### x265 http://x265.org/ @@ -154,7 +155,7 @@ RUN \ sed -i "/-DEXTRA_LIB/ s/$/ -DCMAKE_INSTALL_PREFIX=\${PREFIX}/" multilib.sh && \ sed -i "/^cmake/ s/$/ -DENABLE_CLI=OFF/" multilib.sh && \ ./multilib.sh && \ - make -C 8bit install && \ + make -C 8bit -j $(nproc) install && \ rm -rf ${DIR} ### libogg https://www.xiph.org/ogg/ RUN \ @@ -165,7 +166,7 @@ RUN \ echo ${OGG_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f libogg-${OGG_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libopus https://www.opus-codec.org/ @@ -178,7 +179,7 @@ RUN \ tar -zx --strip-components=1 -f opus-${OPUS_VERSION}.tar.gz && \ autoreconf -fiv && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libvorbis https://xiph.org/vorbis/ @@ -190,7 +191,7 @@ RUN \ echo ${VORBIS_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f libvorbis-${VORBIS_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libtheora http://www.theora.org/ @@ -202,7 +203,7 @@ RUN \ echo ${THEORA_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f libtheora-${THEORA_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libvpx https://www.webmproject.org/code/ @@ -214,7 +215,7 @@ RUN \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-vp8 --enable-vp9 --enable-vp9-highbitdepth --enable-pic --enable-shared \ --disable-debug --disable-examples --disable-docs --disable-install-bins && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libwebp https://developers.google.com/speed/webp/ @@ -225,7 +226,7 @@ RUN \ curl -sL https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-${WEBP_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libmp3lame http://lame.sourceforge.net/ @@ -236,7 +237,7 @@ RUN \ curl -sL https://versaweb.dl.sourceforge.net/project/lame/lame/$(echo ${LAME_VERSION} | sed -e 's/[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)/\1.\2/')/lame-${LAME_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" --enable-shared --enable-nasm --disable-frontend && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### xvid https://www.xvid.com/ @@ -249,7 +250,7 @@ RUN \ tar -zx -f xvidcore-${XVID_VERSION}.tar.gz && \ cd xvidcore/build/generic && \ ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### fdk-aac https://github.com/mstorsjo/fdk-aac @@ -261,7 +262,7 @@ RUN \ tar -zx --strip-components=1 && \ autoreconf -fiv && \ ./configure --prefix="${PREFIX}" --enable-shared --datadir="${DIR}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## openjpeg https://github.com/uclouvain/openjpeg @@ -272,7 +273,7 @@ RUN \ curl -sL https://github.com/uclouvain/openjpeg/archive/v${OPENJPEG_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ cmake -DBUILD_THIRDPARTY:BOOL=ON -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## freetype https://www.freetype.org/ @@ -284,7 +285,7 @@ RUN \ echo ${FREETYPE_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f freetype-${FREETYPE_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## libvstab https://github.com/georgmartius/vid.stab @@ -296,7 +297,7 @@ RUN \ echo ${LIBVIDSTAB_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f v${LIBVIDSTAB_VERSION}.tar.gz && \ cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## fridibi https://www.fribidi.org/ @@ -321,7 +322,7 @@ RUN \ curl -sLO https://www.freedesktop.org/software/fontconfig/release/fontconfig-${FONTCONFIG_VERSION}.tar.bz2 && \ tar -jx --strip-components=1 -f fontconfig-${FONTCONFIG_VERSION}.tar.bz2 && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## libass https://github.com/libass/libass @@ -334,7 +335,7 @@ RUN \ tar -zx --strip-components=1 -f ${LIBASS_VERSION}.tar.gz && \ ./autogen.sh && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## kvazaar https://github.com/ultravideo/kvazaar @@ -358,7 +359,7 @@ RUN \ mkdir -p ./aom_build ; \ cd ./aom_build ; \ cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" -DBUILD_SHARED_LIBS=1 ..; \ - make ; \ + make -j $(nproc); \ make install ; \ rm -rf ${DIR} @@ -370,7 +371,7 @@ RUN \ curl -sLO https://www.x.org/archive//individual/util/util-macros-${XORG_MACROS_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f util-macros-${XORG_MACROS_VERSION}.tar.gz && \ ./configure --srcdir=${DIR} --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -381,7 +382,7 @@ RUN \ curl -sLO https://www.x.org/archive/individual/proto/xproto-${XPROTO_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f xproto-${XPROTO_VERSION}.tar.gz && \ ./configure --srcdir=${DIR} --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -392,7 +393,7 @@ RUN \ curl -sLO https://www.x.org/archive/individual/lib/libXau-${XAU_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f libXau-${XAU_VERSION}.tar.gz && \ ./configure --srcdir=${DIR} --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -403,7 +404,7 @@ RUN \ curl -sLO https://xcb.freedesktop.org/dist/libpthread-stubs-${LIBPTHREAD_STUBS_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f libpthread-stubs-${LIBPTHREAD_STUBS_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -415,7 +416,7 @@ RUN \ tar -zx --strip-components=1 -f xcb-proto-${XCBPROTO_VERSION}.tar.gz && \ ACLOCAL_PATH="${PREFIX}/share/aclocal" ./autogen.sh && \ ./configure --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -427,7 +428,7 @@ RUN \ tar -zx --strip-components=1 -f libxcb-${LIBXCB_VERSION}.tar.gz && \ ACLOCAL_PATH="${PREFIX}/share/aclocal" ./autogen.sh && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -440,7 +441,7 @@ RUN \ echo ${LIBXML2_SHA256SUM} | sha256sum --check && \ tar -xz --strip-components=1 -f libxml2-v${LIBXML2_VERSION}.tar.gz && \ ./autogen.sh --prefix="${PREFIX}" --with-ftp=no --with-http=no --with-python=no && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -453,7 +454,7 @@ RUN \ echo ${LIBBLURAY_SHA256SUM} | sha256sum --check && \ tar -jx --strip-components=1 -f libbluray-${LIBBLURAY_VERSION}.tar.bz2 && \ ./configure --prefix="${PREFIX}" --disable-examples --disable-bdjava-jar --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -467,7 +468,7 @@ RUN \ tar -xz --strip-components=1 -f v${LIBZMQ_VERSION}.tar.gz && \ ./autogen.sh && \ ./configure --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make check && \ make install && \ rm -rf ${DIR} @@ -480,7 +481,7 @@ RUN \ curl -sLO https://github.com/Haivision/srt/archive/v${LIBSRT_VERSION}.tar.gz && \ tar -xz --strip-components=1 -f v${LIBSRT_VERSION}.tar.gz && \ cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -492,7 +493,7 @@ RUN \ git clone https://git.code.sf.net/p/libpng/code ${DIR} -b v${LIBPNG_VERSION} --depth 1 && \ ./autogen.sh && \ ./configure --prefix="${PREFIX}" && \ - make check && \ + make check -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -506,7 +507,20 @@ RUN \ tar -xz --strip-components=1 -f v${LIBARIBB24_VERSION}.tar.gz && \ autoreconf -fiv && \ ./configure CFLAGS="-I${PREFIX}/include -fPIC" --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ + make install && \ + rm -rf ${DIR} + + +## libsvtav1 +RUN \ + DIR=/tmp/svtav1 && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + git clone https://gitlab.com/AOMediaCodec/SVT-AV1.git ${DIR} --depth=1 -b ${LIBSTVAV1_VERSION} &&\ + cd Build && \ + cmake .. -G"Unix Makefiles" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="${PREFIX}" && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -556,11 +570,12 @@ RUN \ --enable-libopenjpeg \ --enable-libkvazaar \ --enable-libaom \ + --enable-libsvtav1 \ --extra-libs=-lpthread \ --enable-libsrt \ --extra-cflags="-I${PREFIX}/include" \ --extra-ldflags="-L${PREFIX}/lib" && \ - make && \ + make -j $(nproc) && \ 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..9f6720676 100644 --- a/docker-images/4.1/nvidia2004/Dockerfile +++ b/docker-images/4.1/nvidia2004/Dockerfile @@ -34,7 +34,8 @@ FROM devel-base as build ENV NVIDIA_HEADERS_VERSION=11.1.5.0 ENV FFMPEG_VERSION=4.1.7 \ - AOM_VERSION=v1.0.0 \ + LIBSTVAV1_VERSION=v0.8.7 \ + AOM_VERSION=v3.1.3 \ FDKAAC_VERSION=0.1.5 \ FONTCONFIG_VERSION=2.12.4 \ FREETYPE_VERSION=2.10.4 \ @@ -151,7 +152,7 @@ RUN \ curl -sL https://versaweb.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${OPENCOREAMR_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## x264 http://www.videolan.org/developers/x264.html @@ -162,7 +163,7 @@ RUN \ curl -sL https://download.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-${X264_VERSION}.tar.bz2 | \ tar -jx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared --enable-pic --disable-cli && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### x265 http://x265.org/ @@ -176,7 +177,7 @@ RUN \ sed -i "/-DEXTRA_LIB/ s/$/ -DCMAKE_INSTALL_PREFIX=\${PREFIX}/" multilib.sh && \ sed -i "/^cmake/ s/$/ -DENABLE_CLI=OFF/" multilib.sh && \ ./multilib.sh && \ - make -C 8bit install && \ + make -C 8bit -j $(nproc) install && \ rm -rf ${DIR} ### libogg https://www.xiph.org/ogg/ RUN \ @@ -187,7 +188,7 @@ RUN \ echo ${OGG_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f libogg-${OGG_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libopus https://www.opus-codec.org/ @@ -200,7 +201,7 @@ RUN \ tar -zx --strip-components=1 -f opus-${OPUS_VERSION}.tar.gz && \ autoreconf -fiv && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libvorbis https://xiph.org/vorbis/ @@ -212,7 +213,7 @@ RUN \ echo ${VORBIS_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f libvorbis-${VORBIS_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libtheora http://www.theora.org/ @@ -224,7 +225,7 @@ RUN \ echo ${THEORA_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f libtheora-${THEORA_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libvpx https://www.webmproject.org/code/ @@ -236,7 +237,7 @@ RUN \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-vp8 --enable-vp9 --enable-vp9-highbitdepth --enable-pic --enable-shared \ --disable-debug --disable-examples --disable-docs --disable-install-bins && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libwebp https://developers.google.com/speed/webp/ @@ -247,7 +248,7 @@ RUN \ curl -sL https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-${WEBP_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libmp3lame http://lame.sourceforge.net/ @@ -258,7 +259,7 @@ RUN \ curl -sL https://versaweb.dl.sourceforge.net/project/lame/lame/$(echo ${LAME_VERSION} | sed -e 's/[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)/\1.\2/')/lame-${LAME_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" --enable-shared --enable-nasm --disable-frontend && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### xvid https://www.xvid.com/ @@ -271,7 +272,7 @@ RUN \ tar -zx -f xvidcore-${XVID_VERSION}.tar.gz && \ cd xvidcore/build/generic && \ ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### fdk-aac https://github.com/mstorsjo/fdk-aac @@ -283,7 +284,7 @@ RUN \ tar -zx --strip-components=1 && \ autoreconf -fiv && \ ./configure --prefix="${PREFIX}" --enable-shared --datadir="${DIR}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## openjpeg https://github.com/uclouvain/openjpeg @@ -294,7 +295,7 @@ RUN \ curl -sL https://github.com/uclouvain/openjpeg/archive/v${OPENJPEG_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ cmake -DBUILD_THIRDPARTY:BOOL=ON -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## freetype https://www.freetype.org/ @@ -306,7 +307,7 @@ RUN \ echo ${FREETYPE_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f freetype-${FREETYPE_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## libvstab https://github.com/georgmartius/vid.stab @@ -318,7 +319,7 @@ RUN \ echo ${LIBVIDSTAB_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f v${LIBVIDSTAB_VERSION}.tar.gz && \ cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## fridibi https://www.fribidi.org/ @@ -343,7 +344,7 @@ RUN \ curl -sLO https://www.freedesktop.org/software/fontconfig/release/fontconfig-${FONTCONFIG_VERSION}.tar.bz2 && \ tar -jx --strip-components=1 -f fontconfig-${FONTCONFIG_VERSION}.tar.bz2 && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## libass https://github.com/libass/libass @@ -356,7 +357,7 @@ RUN \ tar -zx --strip-components=1 -f ${LIBASS_VERSION}.tar.gz && \ ./autogen.sh && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## kvazaar https://github.com/ultravideo/kvazaar @@ -380,7 +381,7 @@ RUN \ mkdir -p ./aom_build ; \ cd ./aom_build ; \ cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" -DBUILD_SHARED_LIBS=1 ..; \ - make ; \ + make -j $(nproc); \ make install ; \ rm -rf ${DIR} @@ -392,7 +393,7 @@ RUN \ curl -sLO https://www.x.org/archive//individual/util/util-macros-${XORG_MACROS_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f util-macros-${XORG_MACROS_VERSION}.tar.gz && \ ./configure --srcdir=${DIR} --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -403,7 +404,7 @@ RUN \ curl -sLO https://www.x.org/archive/individual/proto/xproto-${XPROTO_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f xproto-${XPROTO_VERSION}.tar.gz && \ ./configure --srcdir=${DIR} --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -414,7 +415,7 @@ RUN \ curl -sLO https://www.x.org/archive/individual/lib/libXau-${XAU_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f libXau-${XAU_VERSION}.tar.gz && \ ./configure --srcdir=${DIR} --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -425,7 +426,7 @@ RUN \ curl -sLO https://xcb.freedesktop.org/dist/libpthread-stubs-${LIBPTHREAD_STUBS_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f libpthread-stubs-${LIBPTHREAD_STUBS_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -437,7 +438,7 @@ RUN \ tar -zx --strip-components=1 -f xcb-proto-${XCBPROTO_VERSION}.tar.gz && \ ACLOCAL_PATH="${PREFIX}/share/aclocal" ./autogen.sh && \ ./configure --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -449,7 +450,7 @@ RUN \ tar -zx --strip-components=1 -f libxcb-${LIBXCB_VERSION}.tar.gz && \ ACLOCAL_PATH="${PREFIX}/share/aclocal" ./autogen.sh && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -462,7 +463,7 @@ RUN \ echo ${LIBXML2_SHA256SUM} | sha256sum --check && \ tar -xz --strip-components=1 -f libxml2-v${LIBXML2_VERSION}.tar.gz && \ ./autogen.sh --prefix="${PREFIX}" --with-ftp=no --with-http=no --with-python=no && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -475,7 +476,7 @@ RUN \ echo ${LIBBLURAY_SHA256SUM} | sha256sum --check && \ tar -jx --strip-components=1 -f libbluray-${LIBBLURAY_VERSION}.tar.bz2 && \ ./configure --prefix="${PREFIX}" --disable-examples --disable-bdjava-jar --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -489,7 +490,7 @@ RUN \ tar -xz --strip-components=1 -f v${LIBZMQ_VERSION}.tar.gz && \ ./autogen.sh && \ ./configure --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make check && \ make install && \ rm -rf ${DIR} @@ -502,7 +503,7 @@ RUN \ curl -sLO https://github.com/Haivision/srt/archive/v${LIBSRT_VERSION}.tar.gz && \ tar -xz --strip-components=1 -f v${LIBSRT_VERSION}.tar.gz && \ cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -514,7 +515,7 @@ RUN \ git clone https://git.code.sf.net/p/libpng/code ${DIR} -b v${LIBPNG_VERSION} --depth 1 && \ ./autogen.sh && \ ./configure --prefix="${PREFIX}" && \ - make check && \ + make check -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -528,7 +529,20 @@ RUN \ tar -xz --strip-components=1 -f v${LIBARIBB24_VERSION}.tar.gz && \ autoreconf -fiv && \ ./configure CFLAGS="-I${PREFIX}/include -fPIC" --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ + make install && \ + rm -rf ${DIR} + + +## libsvtav1 +RUN \ + DIR=/tmp/svtav1 && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + git clone https://gitlab.com/AOMediaCodec/SVT-AV1.git ${DIR} --depth=1 -b ${LIBSTVAV1_VERSION} &&\ + cd Build && \ + cmake .. -G"Unix Makefiles" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="${PREFIX}" && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -578,6 +592,7 @@ RUN \ --enable-libopenjpeg \ --enable-libkvazaar \ --enable-libaom \ + --enable-libsvtav1 \ --extra-libs=-lpthread \ --enable-libsrt \ --enable-nvenc \ @@ -586,7 +601,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 -j $(nproc) && \ 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..78821d2ae 100644 --- a/docker-images/4.1/scratch312/Dockerfile +++ b/docker-images/4.1/scratch312/Dockerfile @@ -9,7 +9,8 @@ FROM alpine:3.12 AS build WORKDIR /tmp/workdir ENV FFMPEG_VERSION=4.1.7 \ - AOM_VERSION=v1.0.0 \ + LIBSTVAV1_VERSION=v0.8.7 \ + AOM_VERSION=v3.1.3 \ FDKAAC_VERSION=0.1.5 \ FONTCONFIG_VERSION=2.12.4 \ FREETYPE_VERSION=2.10.4 \ @@ -125,7 +126,7 @@ RUN \ curl -sL https://versaweb.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${OPENCOREAMR_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## x264 http://www.videolan.org/developers/x264.html @@ -136,7 +137,7 @@ RUN \ curl -sL https://download.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-${X264_VERSION}.tar.bz2 | \ tar -jx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared --enable-pic --disable-cli && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### x265 http://x265.org/ @@ -150,7 +151,7 @@ RUN \ sed -i "/-DEXTRA_LIB/ s/$/ -DCMAKE_INSTALL_PREFIX=\${PREFIX}/" multilib.sh && \ sed -i "/^cmake/ s/$/ -DENABLE_CLI=OFF/" multilib.sh && \ ./multilib.sh && \ - make -C 8bit install && \ + make -C 8bit -j $(nproc) install && \ rm -rf ${DIR} ### libogg https://www.xiph.org/ogg/ RUN \ @@ -161,7 +162,7 @@ RUN \ echo ${OGG_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f libogg-${OGG_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libopus https://www.opus-codec.org/ @@ -174,7 +175,7 @@ RUN \ tar -zx --strip-components=1 -f opus-${OPUS_VERSION}.tar.gz && \ autoreconf -fiv && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libvorbis https://xiph.org/vorbis/ @@ -186,7 +187,7 @@ RUN \ echo ${VORBIS_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f libvorbis-${VORBIS_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libtheora http://www.theora.org/ @@ -198,7 +199,7 @@ RUN \ echo ${THEORA_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f libtheora-${THEORA_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libvpx https://www.webmproject.org/code/ @@ -210,7 +211,7 @@ RUN \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-vp8 --enable-vp9 --enable-vp9-highbitdepth --enable-pic --enable-shared \ --disable-debug --disable-examples --disable-docs --disable-install-bins && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libwebp https://developers.google.com/speed/webp/ @@ -221,7 +222,7 @@ RUN \ curl -sL https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-${WEBP_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libmp3lame http://lame.sourceforge.net/ @@ -232,7 +233,7 @@ RUN \ curl -sL https://versaweb.dl.sourceforge.net/project/lame/lame/$(echo ${LAME_VERSION} | sed -e 's/[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)/\1.\2/')/lame-${LAME_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" --enable-shared --enable-nasm --disable-frontend && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### xvid https://www.xvid.com/ @@ -245,7 +246,7 @@ RUN \ tar -zx -f xvidcore-${XVID_VERSION}.tar.gz && \ cd xvidcore/build/generic && \ ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### fdk-aac https://github.com/mstorsjo/fdk-aac @@ -257,7 +258,7 @@ RUN \ tar -zx --strip-components=1 && \ autoreconf -fiv && \ ./configure --prefix="${PREFIX}" --enable-shared --datadir="${DIR}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## openjpeg https://github.com/uclouvain/openjpeg @@ -268,7 +269,7 @@ RUN \ curl -sL https://github.com/uclouvain/openjpeg/archive/v${OPENJPEG_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ cmake -DBUILD_THIRDPARTY:BOOL=ON -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## freetype https://www.freetype.org/ @@ -280,7 +281,7 @@ RUN \ echo ${FREETYPE_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f freetype-${FREETYPE_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## libvstab https://github.com/georgmartius/vid.stab @@ -292,7 +293,7 @@ RUN \ echo ${LIBVIDSTAB_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f v${LIBVIDSTAB_VERSION}.tar.gz && \ cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## fridibi https://www.fribidi.org/ @@ -317,7 +318,7 @@ RUN \ curl -sLO https://www.freedesktop.org/software/fontconfig/release/fontconfig-${FONTCONFIG_VERSION}.tar.bz2 && \ tar -jx --strip-components=1 -f fontconfig-${FONTCONFIG_VERSION}.tar.bz2 && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## libass https://github.com/libass/libass @@ -330,7 +331,7 @@ RUN \ tar -zx --strip-components=1 -f ${LIBASS_VERSION}.tar.gz && \ ./autogen.sh && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## kvazaar https://github.com/ultravideo/kvazaar @@ -354,7 +355,7 @@ RUN \ mkdir -p ./aom_build ; \ cd ./aom_build ; \ cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" -DBUILD_SHARED_LIBS=1 ..; \ - make ; \ + make -j $(nproc); \ make install ; \ rm -rf ${DIR} @@ -366,7 +367,7 @@ RUN \ curl -sLO https://www.x.org/archive//individual/util/util-macros-${XORG_MACROS_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f util-macros-${XORG_MACROS_VERSION}.tar.gz && \ ./configure --srcdir=${DIR} --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -377,7 +378,7 @@ RUN \ curl -sLO https://www.x.org/archive/individual/proto/xproto-${XPROTO_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f xproto-${XPROTO_VERSION}.tar.gz && \ ./configure --srcdir=${DIR} --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -388,7 +389,7 @@ RUN \ curl -sLO https://www.x.org/archive/individual/lib/libXau-${XAU_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f libXau-${XAU_VERSION}.tar.gz && \ ./configure --srcdir=${DIR} --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -399,7 +400,7 @@ RUN \ curl -sLO https://xcb.freedesktop.org/dist/libpthread-stubs-${LIBPTHREAD_STUBS_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f libpthread-stubs-${LIBPTHREAD_STUBS_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -411,7 +412,7 @@ RUN \ tar -zx --strip-components=1 -f xcb-proto-${XCBPROTO_VERSION}.tar.gz && \ ACLOCAL_PATH="${PREFIX}/share/aclocal" ./autogen.sh && \ ./configure --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -423,7 +424,7 @@ RUN \ tar -zx --strip-components=1 -f libxcb-${LIBXCB_VERSION}.tar.gz && \ ACLOCAL_PATH="${PREFIX}/share/aclocal" ./autogen.sh && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -436,7 +437,7 @@ RUN \ echo ${LIBXML2_SHA256SUM} | sha256sum --check && \ tar -xz --strip-components=1 -f libxml2-v${LIBXML2_VERSION}.tar.gz && \ ./autogen.sh --prefix="${PREFIX}" --with-ftp=no --with-http=no --with-python=no && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -449,7 +450,7 @@ RUN \ echo ${LIBBLURAY_SHA256SUM} | sha256sum --check && \ tar -jx --strip-components=1 -f libbluray-${LIBBLURAY_VERSION}.tar.bz2 && \ ./configure --prefix="${PREFIX}" --disable-examples --disable-bdjava-jar --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -463,7 +464,7 @@ RUN \ tar -xz --strip-components=1 -f v${LIBZMQ_VERSION}.tar.gz && \ ./autogen.sh && \ ./configure --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make check && \ make install && \ rm -rf ${DIR} @@ -476,7 +477,7 @@ RUN \ curl -sLO https://github.com/Haivision/srt/archive/v${LIBSRT_VERSION}.tar.gz && \ tar -xz --strip-components=1 -f v${LIBSRT_VERSION}.tar.gz && \ cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -488,7 +489,7 @@ RUN \ git clone https://git.code.sf.net/p/libpng/code ${DIR} -b v${LIBPNG_VERSION} --depth 1 && \ ./autogen.sh && \ ./configure --prefix="${PREFIX}" && \ - make check && \ + make check -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -502,7 +503,20 @@ RUN \ tar -xz --strip-components=1 -f v${LIBARIBB24_VERSION}.tar.gz && \ autoreconf -fiv && \ ./configure CFLAGS="-I${PREFIX}/include -fPIC" --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ + make install && \ + rm -rf ${DIR} + + +## libsvtav1 +RUN \ + DIR=/tmp/svtav1 && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + git clone https://gitlab.com/AOMediaCodec/SVT-AV1.git ${DIR} --depth=1 -b ${LIBSTVAV1_VERSION} &&\ + cd Build && \ + cmake .. -G"Unix Makefiles" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="${PREFIX}" && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -552,11 +566,12 @@ RUN \ --enable-libopenjpeg \ --enable-libkvazaar \ --enable-libaom \ + --enable-libsvtav1 \ --extra-libs=-lpthread \ --enable-libsrt \ --extra-cflags="-I${PREFIX}/include" \ --extra-ldflags="-L${PREFIX}/lib" && \ - make && \ + make -j $(nproc) && \ 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..f0f625de5 100644 --- a/docker-images/4.1/ubuntu1804/Dockerfile +++ b/docker-images/4.1/ubuntu1804/Dockerfile @@ -17,7 +17,8 @@ RUN apt-get -yqq update && \ FROM base as build ENV FFMPEG_VERSION=4.1.7 \ - AOM_VERSION=v1.0.0 \ + LIBSTVAV1_VERSION=v0.8.7 \ + AOM_VERSION=v3.1.3 \ FDKAAC_VERSION=0.1.5 \ FONTCONFIG_VERSION=2.12.4 \ FREETYPE_VERSION=2.10.4 \ @@ -124,7 +125,7 @@ RUN \ curl -sL https://versaweb.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${OPENCOREAMR_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## x264 http://www.videolan.org/developers/x264.html @@ -135,7 +136,7 @@ RUN \ curl -sL https://download.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-${X264_VERSION}.tar.bz2 | \ tar -jx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared --enable-pic --disable-cli && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### x265 http://x265.org/ @@ -149,7 +150,7 @@ RUN \ sed -i "/-DEXTRA_LIB/ s/$/ -DCMAKE_INSTALL_PREFIX=\${PREFIX}/" multilib.sh && \ sed -i "/^cmake/ s/$/ -DENABLE_CLI=OFF/" multilib.sh && \ ./multilib.sh && \ - make -C 8bit install && \ + make -C 8bit -j $(nproc) install && \ rm -rf ${DIR} ### libogg https://www.xiph.org/ogg/ RUN \ @@ -160,7 +161,7 @@ RUN \ echo ${OGG_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f libogg-${OGG_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libopus https://www.opus-codec.org/ @@ -173,7 +174,7 @@ RUN \ tar -zx --strip-components=1 -f opus-${OPUS_VERSION}.tar.gz && \ autoreconf -fiv && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libvorbis https://xiph.org/vorbis/ @@ -185,7 +186,7 @@ RUN \ echo ${VORBIS_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f libvorbis-${VORBIS_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libtheora http://www.theora.org/ @@ -197,7 +198,7 @@ RUN \ echo ${THEORA_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f libtheora-${THEORA_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libvpx https://www.webmproject.org/code/ @@ -209,7 +210,7 @@ RUN \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-vp8 --enable-vp9 --enable-vp9-highbitdepth --enable-pic --enable-shared \ --disable-debug --disable-examples --disable-docs --disable-install-bins && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libwebp https://developers.google.com/speed/webp/ @@ -220,7 +221,7 @@ RUN \ curl -sL https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-${WEBP_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libmp3lame http://lame.sourceforge.net/ @@ -231,7 +232,7 @@ RUN \ curl -sL https://versaweb.dl.sourceforge.net/project/lame/lame/$(echo ${LAME_VERSION} | sed -e 's/[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)/\1.\2/')/lame-${LAME_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" --enable-shared --enable-nasm --disable-frontend && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### xvid https://www.xvid.com/ @@ -244,7 +245,7 @@ RUN \ tar -zx -f xvidcore-${XVID_VERSION}.tar.gz && \ cd xvidcore/build/generic && \ ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### fdk-aac https://github.com/mstorsjo/fdk-aac @@ -256,7 +257,7 @@ RUN \ tar -zx --strip-components=1 && \ autoreconf -fiv && \ ./configure --prefix="${PREFIX}" --enable-shared --datadir="${DIR}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## openjpeg https://github.com/uclouvain/openjpeg @@ -267,7 +268,7 @@ RUN \ curl -sL https://github.com/uclouvain/openjpeg/archive/v${OPENJPEG_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ cmake -DBUILD_THIRDPARTY:BOOL=ON -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## freetype https://www.freetype.org/ @@ -279,7 +280,7 @@ RUN \ echo ${FREETYPE_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f freetype-${FREETYPE_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## libvstab https://github.com/georgmartius/vid.stab @@ -291,7 +292,7 @@ RUN \ echo ${LIBVIDSTAB_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f v${LIBVIDSTAB_VERSION}.tar.gz && \ cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## fridibi https://www.fribidi.org/ @@ -316,7 +317,7 @@ RUN \ curl -sLO https://www.freedesktop.org/software/fontconfig/release/fontconfig-${FONTCONFIG_VERSION}.tar.bz2 && \ tar -jx --strip-components=1 -f fontconfig-${FONTCONFIG_VERSION}.tar.bz2 && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## libass https://github.com/libass/libass @@ -329,7 +330,7 @@ RUN \ tar -zx --strip-components=1 -f ${LIBASS_VERSION}.tar.gz && \ ./autogen.sh && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## kvazaar https://github.com/ultravideo/kvazaar @@ -353,7 +354,7 @@ RUN \ mkdir -p ./aom_build ; \ cd ./aom_build ; \ cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" -DBUILD_SHARED_LIBS=1 ..; \ - make ; \ + make -j $(nproc); \ make install ; \ rm -rf ${DIR} @@ -365,7 +366,7 @@ RUN \ curl -sLO https://www.x.org/archive//individual/util/util-macros-${XORG_MACROS_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f util-macros-${XORG_MACROS_VERSION}.tar.gz && \ ./configure --srcdir=${DIR} --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -376,7 +377,7 @@ RUN \ curl -sLO https://www.x.org/archive/individual/proto/xproto-${XPROTO_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f xproto-${XPROTO_VERSION}.tar.gz && \ ./configure --srcdir=${DIR} --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -387,7 +388,7 @@ RUN \ curl -sLO https://www.x.org/archive/individual/lib/libXau-${XAU_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f libXau-${XAU_VERSION}.tar.gz && \ ./configure --srcdir=${DIR} --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -398,7 +399,7 @@ RUN \ curl -sLO https://xcb.freedesktop.org/dist/libpthread-stubs-${LIBPTHREAD_STUBS_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f libpthread-stubs-${LIBPTHREAD_STUBS_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -410,7 +411,7 @@ RUN \ tar -zx --strip-components=1 -f xcb-proto-${XCBPROTO_VERSION}.tar.gz && \ ACLOCAL_PATH="${PREFIX}/share/aclocal" ./autogen.sh && \ ./configure --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -422,7 +423,7 @@ RUN \ tar -zx --strip-components=1 -f libxcb-${LIBXCB_VERSION}.tar.gz && \ ACLOCAL_PATH="${PREFIX}/share/aclocal" ./autogen.sh && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -435,7 +436,7 @@ RUN \ echo ${LIBXML2_SHA256SUM} | sha256sum --check && \ tar -xz --strip-components=1 -f libxml2-v${LIBXML2_VERSION}.tar.gz && \ ./autogen.sh --prefix="${PREFIX}" --with-ftp=no --with-http=no --with-python=no && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -448,7 +449,7 @@ RUN \ echo ${LIBBLURAY_SHA256SUM} | sha256sum --check && \ tar -jx --strip-components=1 -f libbluray-${LIBBLURAY_VERSION}.tar.bz2 && \ ./configure --prefix="${PREFIX}" --disable-examples --disable-bdjava-jar --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -462,7 +463,7 @@ RUN \ tar -xz --strip-components=1 -f v${LIBZMQ_VERSION}.tar.gz && \ ./autogen.sh && \ ./configure --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make check && \ make install && \ rm -rf ${DIR} @@ -475,7 +476,7 @@ RUN \ curl -sLO https://github.com/Haivision/srt/archive/v${LIBSRT_VERSION}.tar.gz && \ tar -xz --strip-components=1 -f v${LIBSRT_VERSION}.tar.gz && \ cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -487,7 +488,7 @@ RUN \ git clone https://git.code.sf.net/p/libpng/code ${DIR} -b v${LIBPNG_VERSION} --depth 1 && \ ./autogen.sh && \ ./configure --prefix="${PREFIX}" && \ - make check && \ + make check -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -501,7 +502,20 @@ RUN \ tar -xz --strip-components=1 -f v${LIBARIBB24_VERSION}.tar.gz && \ autoreconf -fiv && \ ./configure CFLAGS="-I${PREFIX}/include -fPIC" --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ + make install && \ + rm -rf ${DIR} + + +## libsvtav1 +RUN \ + DIR=/tmp/svtav1 && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + git clone https://gitlab.com/AOMediaCodec/SVT-AV1.git ${DIR} --depth=1 -b ${LIBSTVAV1_VERSION} &&\ + cd Build && \ + cmake .. -G"Unix Makefiles" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="${PREFIX}" && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -551,11 +565,12 @@ RUN \ --enable-libopenjpeg \ --enable-libkvazaar \ --enable-libaom \ + --enable-libsvtav1 \ --extra-libs=-lpthread \ --enable-libsrt \ --extra-cflags="-I${PREFIX}/include" \ --extra-ldflags="-L${PREFIX}/lib" && \ - make && \ + make -j $(nproc) && \ 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..1d27cf7e7 100644 --- a/docker-images/4.1/ubuntu2004/Dockerfile +++ b/docker-images/4.1/ubuntu2004/Dockerfile @@ -17,7 +17,8 @@ RUN apt-get -yqq update && \ FROM base as build ENV FFMPEG_VERSION=4.1.7 \ - AOM_VERSION=v1.0.0 \ + LIBSTVAV1_VERSION=v0.8.7 \ + AOM_VERSION=v3.1.3 \ FDKAAC_VERSION=0.1.5 \ FONTCONFIG_VERSION=2.12.4 \ FREETYPE_VERSION=2.10.4 \ @@ -127,7 +128,7 @@ RUN \ curl -sL https://versaweb.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${OPENCOREAMR_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## x264 http://www.videolan.org/developers/x264.html @@ -138,7 +139,7 @@ RUN \ curl -sL https://download.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-${X264_VERSION}.tar.bz2 | \ tar -jx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared --enable-pic --disable-cli && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### x265 http://x265.org/ @@ -152,7 +153,7 @@ RUN \ sed -i "/-DEXTRA_LIB/ s/$/ -DCMAKE_INSTALL_PREFIX=\${PREFIX}/" multilib.sh && \ sed -i "/^cmake/ s/$/ -DENABLE_CLI=OFF/" multilib.sh && \ ./multilib.sh && \ - make -C 8bit install && \ + make -C 8bit -j $(nproc) install && \ rm -rf ${DIR} ### libogg https://www.xiph.org/ogg/ RUN \ @@ -163,7 +164,7 @@ RUN \ echo ${OGG_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f libogg-${OGG_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libopus https://www.opus-codec.org/ @@ -176,7 +177,7 @@ RUN \ tar -zx --strip-components=1 -f opus-${OPUS_VERSION}.tar.gz && \ autoreconf -fiv && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libvorbis https://xiph.org/vorbis/ @@ -188,7 +189,7 @@ RUN \ echo ${VORBIS_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f libvorbis-${VORBIS_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libtheora http://www.theora.org/ @@ -200,7 +201,7 @@ RUN \ echo ${THEORA_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f libtheora-${THEORA_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libvpx https://www.webmproject.org/code/ @@ -212,7 +213,7 @@ RUN \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-vp8 --enable-vp9 --enable-vp9-highbitdepth --enable-pic --enable-shared \ --disable-debug --disable-examples --disable-docs --disable-install-bins && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libwebp https://developers.google.com/speed/webp/ @@ -223,7 +224,7 @@ RUN \ curl -sL https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-${WEBP_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libmp3lame http://lame.sourceforge.net/ @@ -234,7 +235,7 @@ RUN \ curl -sL https://versaweb.dl.sourceforge.net/project/lame/lame/$(echo ${LAME_VERSION} | sed -e 's/[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)/\1.\2/')/lame-${LAME_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" --enable-shared --enable-nasm --disable-frontend && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### xvid https://www.xvid.com/ @@ -247,7 +248,7 @@ RUN \ tar -zx -f xvidcore-${XVID_VERSION}.tar.gz && \ cd xvidcore/build/generic && \ ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### fdk-aac https://github.com/mstorsjo/fdk-aac @@ -259,7 +260,7 @@ RUN \ tar -zx --strip-components=1 && \ autoreconf -fiv && \ ./configure --prefix="${PREFIX}" --enable-shared --datadir="${DIR}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## openjpeg https://github.com/uclouvain/openjpeg @@ -270,7 +271,7 @@ RUN \ curl -sL https://github.com/uclouvain/openjpeg/archive/v${OPENJPEG_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ cmake -DBUILD_THIRDPARTY:BOOL=ON -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## freetype https://www.freetype.org/ @@ -282,7 +283,7 @@ RUN \ echo ${FREETYPE_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f freetype-${FREETYPE_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## libvstab https://github.com/georgmartius/vid.stab @@ -294,7 +295,7 @@ RUN \ echo ${LIBVIDSTAB_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f v${LIBVIDSTAB_VERSION}.tar.gz && \ cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## fridibi https://www.fribidi.org/ @@ -319,7 +320,7 @@ RUN \ curl -sLO https://www.freedesktop.org/software/fontconfig/release/fontconfig-${FONTCONFIG_VERSION}.tar.bz2 && \ tar -jx --strip-components=1 -f fontconfig-${FONTCONFIG_VERSION}.tar.bz2 && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## libass https://github.com/libass/libass @@ -332,7 +333,7 @@ RUN \ tar -zx --strip-components=1 -f ${LIBASS_VERSION}.tar.gz && \ ./autogen.sh && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## kvazaar https://github.com/ultravideo/kvazaar @@ -356,7 +357,7 @@ RUN \ mkdir -p ./aom_build ; \ cd ./aom_build ; \ cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" -DBUILD_SHARED_LIBS=1 ..; \ - make ; \ + make -j $(nproc); \ make install ; \ rm -rf ${DIR} @@ -368,7 +369,7 @@ RUN \ curl -sLO https://www.x.org/archive//individual/util/util-macros-${XORG_MACROS_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f util-macros-${XORG_MACROS_VERSION}.tar.gz && \ ./configure --srcdir=${DIR} --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -379,7 +380,7 @@ RUN \ curl -sLO https://www.x.org/archive/individual/proto/xproto-${XPROTO_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f xproto-${XPROTO_VERSION}.tar.gz && \ ./configure --srcdir=${DIR} --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -390,7 +391,7 @@ RUN \ curl -sLO https://www.x.org/archive/individual/lib/libXau-${XAU_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f libXau-${XAU_VERSION}.tar.gz && \ ./configure --srcdir=${DIR} --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -401,7 +402,7 @@ RUN \ curl -sLO https://xcb.freedesktop.org/dist/libpthread-stubs-${LIBPTHREAD_STUBS_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f libpthread-stubs-${LIBPTHREAD_STUBS_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -413,7 +414,7 @@ RUN \ tar -zx --strip-components=1 -f xcb-proto-${XCBPROTO_VERSION}.tar.gz && \ ACLOCAL_PATH="${PREFIX}/share/aclocal" ./autogen.sh && \ ./configure --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -425,7 +426,7 @@ RUN \ tar -zx --strip-components=1 -f libxcb-${LIBXCB_VERSION}.tar.gz && \ ACLOCAL_PATH="${PREFIX}/share/aclocal" ./autogen.sh && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -438,7 +439,7 @@ RUN \ echo ${LIBXML2_SHA256SUM} | sha256sum --check && \ tar -xz --strip-components=1 -f libxml2-v${LIBXML2_VERSION}.tar.gz && \ ./autogen.sh --prefix="${PREFIX}" --with-ftp=no --with-http=no --with-python=no && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -451,7 +452,7 @@ RUN \ echo ${LIBBLURAY_SHA256SUM} | sha256sum --check && \ tar -jx --strip-components=1 -f libbluray-${LIBBLURAY_VERSION}.tar.bz2 && \ ./configure --prefix="${PREFIX}" --disable-examples --disable-bdjava-jar --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -465,7 +466,7 @@ RUN \ tar -xz --strip-components=1 -f v${LIBZMQ_VERSION}.tar.gz && \ ./autogen.sh && \ ./configure --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make check && \ make install && \ rm -rf ${DIR} @@ -478,7 +479,7 @@ RUN \ curl -sLO https://github.com/Haivision/srt/archive/v${LIBSRT_VERSION}.tar.gz && \ tar -xz --strip-components=1 -f v${LIBSRT_VERSION}.tar.gz && \ cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -490,7 +491,7 @@ RUN \ git clone https://git.code.sf.net/p/libpng/code ${DIR} -b v${LIBPNG_VERSION} --depth 1 && \ ./autogen.sh && \ ./configure --prefix="${PREFIX}" && \ - make check && \ + make check -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -504,7 +505,20 @@ RUN \ tar -xz --strip-components=1 -f v${LIBARIBB24_VERSION}.tar.gz && \ autoreconf -fiv && \ ./configure CFLAGS="-I${PREFIX}/include -fPIC" --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ + make install && \ + rm -rf ${DIR} + + +## libsvtav1 +RUN \ + DIR=/tmp/svtav1 && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + git clone https://gitlab.com/AOMediaCodec/SVT-AV1.git ${DIR} --depth=1 -b ${LIBSTVAV1_VERSION} &&\ + cd Build && \ + cmake .. -G"Unix Makefiles" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="${PREFIX}" && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -554,11 +568,12 @@ RUN \ --enable-libopenjpeg \ --enable-libkvazaar \ --enable-libaom \ + --enable-libsvtav1 \ --extra-libs=-lpthread \ --enable-libsrt \ --extra-cflags="-I${PREFIX}/include" \ --extra-ldflags="-L${PREFIX}/lib" && \ - make && \ + make -j $(nproc) && \ 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..ba1aba1f8 100644 --- a/docker-images/4.1/vaapi2004/Dockerfile +++ b/docker-images/4.1/vaapi2004/Dockerfile @@ -17,7 +17,8 @@ RUN apt-get -yqq update && \ FROM base as build ENV FFMPEG_VERSION=4.1.7 \ - AOM_VERSION=v1.0.0 \ + LIBSTVAV1_VERSION=v0.8.7 \ + AOM_VERSION=v3.1.3 \ FDKAAC_VERSION=0.1.5 \ FONTCONFIG_VERSION=2.12.4 \ FREETYPE_VERSION=2.10.4 \ @@ -128,7 +129,7 @@ RUN \ curl -sL https://versaweb.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${OPENCOREAMR_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## x264 http://www.videolan.org/developers/x264.html @@ -139,7 +140,7 @@ RUN \ curl -sL https://download.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-${X264_VERSION}.tar.bz2 | \ tar -jx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared --enable-pic --disable-cli && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### x265 http://x265.org/ @@ -153,7 +154,7 @@ RUN \ sed -i "/-DEXTRA_LIB/ s/$/ -DCMAKE_INSTALL_PREFIX=\${PREFIX}/" multilib.sh && \ sed -i "/^cmake/ s/$/ -DENABLE_CLI=OFF/" multilib.sh && \ ./multilib.sh && \ - make -C 8bit install && \ + make -C 8bit -j $(nproc) install && \ rm -rf ${DIR} ### libogg https://www.xiph.org/ogg/ RUN \ @@ -164,7 +165,7 @@ RUN \ echo ${OGG_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f libogg-${OGG_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libopus https://www.opus-codec.org/ @@ -177,7 +178,7 @@ RUN \ tar -zx --strip-components=1 -f opus-${OPUS_VERSION}.tar.gz && \ autoreconf -fiv && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libvorbis https://xiph.org/vorbis/ @@ -189,7 +190,7 @@ RUN \ echo ${VORBIS_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f libvorbis-${VORBIS_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libtheora http://www.theora.org/ @@ -201,7 +202,7 @@ RUN \ echo ${THEORA_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f libtheora-${THEORA_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libvpx https://www.webmproject.org/code/ @@ -213,7 +214,7 @@ RUN \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-vp8 --enable-vp9 --enable-vp9-highbitdepth --enable-pic --enable-shared \ --disable-debug --disable-examples --disable-docs --disable-install-bins && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libwebp https://developers.google.com/speed/webp/ @@ -224,7 +225,7 @@ RUN \ curl -sL https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-${WEBP_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libmp3lame http://lame.sourceforge.net/ @@ -235,7 +236,7 @@ RUN \ curl -sL https://versaweb.dl.sourceforge.net/project/lame/lame/$(echo ${LAME_VERSION} | sed -e 's/[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)/\1.\2/')/lame-${LAME_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" --enable-shared --enable-nasm --disable-frontend && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### xvid https://www.xvid.com/ @@ -248,7 +249,7 @@ RUN \ tar -zx -f xvidcore-${XVID_VERSION}.tar.gz && \ cd xvidcore/build/generic && \ ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### fdk-aac https://github.com/mstorsjo/fdk-aac @@ -260,7 +261,7 @@ RUN \ tar -zx --strip-components=1 && \ autoreconf -fiv && \ ./configure --prefix="${PREFIX}" --enable-shared --datadir="${DIR}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## openjpeg https://github.com/uclouvain/openjpeg @@ -271,7 +272,7 @@ RUN \ curl -sL https://github.com/uclouvain/openjpeg/archive/v${OPENJPEG_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ cmake -DBUILD_THIRDPARTY:BOOL=ON -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## freetype https://www.freetype.org/ @@ -283,7 +284,7 @@ RUN \ echo ${FREETYPE_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f freetype-${FREETYPE_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## libvstab https://github.com/georgmartius/vid.stab @@ -295,7 +296,7 @@ RUN \ echo ${LIBVIDSTAB_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f v${LIBVIDSTAB_VERSION}.tar.gz && \ cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## fridibi https://www.fribidi.org/ @@ -320,7 +321,7 @@ RUN \ curl -sLO https://www.freedesktop.org/software/fontconfig/release/fontconfig-${FONTCONFIG_VERSION}.tar.bz2 && \ tar -jx --strip-components=1 -f fontconfig-${FONTCONFIG_VERSION}.tar.bz2 && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## libass https://github.com/libass/libass @@ -333,7 +334,7 @@ RUN \ tar -zx --strip-components=1 -f ${LIBASS_VERSION}.tar.gz && \ ./autogen.sh && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## kvazaar https://github.com/ultravideo/kvazaar @@ -357,7 +358,7 @@ RUN \ mkdir -p ./aom_build ; \ cd ./aom_build ; \ cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" -DBUILD_SHARED_LIBS=1 ..; \ - make ; \ + make -j $(nproc); \ make install ; \ rm -rf ${DIR} @@ -369,7 +370,7 @@ RUN \ curl -sLO https://www.x.org/archive//individual/util/util-macros-${XORG_MACROS_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f util-macros-${XORG_MACROS_VERSION}.tar.gz && \ ./configure --srcdir=${DIR} --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -380,7 +381,7 @@ RUN \ curl -sLO https://www.x.org/archive/individual/proto/xproto-${XPROTO_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f xproto-${XPROTO_VERSION}.tar.gz && \ ./configure --srcdir=${DIR} --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -391,7 +392,7 @@ RUN \ curl -sLO https://www.x.org/archive/individual/lib/libXau-${XAU_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f libXau-${XAU_VERSION}.tar.gz && \ ./configure --srcdir=${DIR} --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -402,7 +403,7 @@ RUN \ curl -sLO https://xcb.freedesktop.org/dist/libpthread-stubs-${LIBPTHREAD_STUBS_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f libpthread-stubs-${LIBPTHREAD_STUBS_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -414,7 +415,7 @@ RUN \ tar -zx --strip-components=1 -f xcb-proto-${XCBPROTO_VERSION}.tar.gz && \ ACLOCAL_PATH="${PREFIX}/share/aclocal" ./autogen.sh && \ ./configure --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -426,7 +427,7 @@ RUN \ tar -zx --strip-components=1 -f libxcb-${LIBXCB_VERSION}.tar.gz && \ ACLOCAL_PATH="${PREFIX}/share/aclocal" ./autogen.sh && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -439,7 +440,7 @@ RUN \ echo ${LIBXML2_SHA256SUM} | sha256sum --check && \ tar -xz --strip-components=1 -f libxml2-v${LIBXML2_VERSION}.tar.gz && \ ./autogen.sh --prefix="${PREFIX}" --with-ftp=no --with-http=no --with-python=no && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -452,7 +453,7 @@ RUN \ echo ${LIBBLURAY_SHA256SUM} | sha256sum --check && \ tar -jx --strip-components=1 -f libbluray-${LIBBLURAY_VERSION}.tar.bz2 && \ ./configure --prefix="${PREFIX}" --disable-examples --disable-bdjava-jar --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -466,7 +467,7 @@ RUN \ tar -xz --strip-components=1 -f v${LIBZMQ_VERSION}.tar.gz && \ ./autogen.sh && \ ./configure --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make check && \ make install && \ rm -rf ${DIR} @@ -479,7 +480,7 @@ RUN \ curl -sLO https://github.com/Haivision/srt/archive/v${LIBSRT_VERSION}.tar.gz && \ tar -xz --strip-components=1 -f v${LIBSRT_VERSION}.tar.gz && \ cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -491,7 +492,7 @@ RUN \ git clone https://git.code.sf.net/p/libpng/code ${DIR} -b v${LIBPNG_VERSION} --depth 1 && \ ./autogen.sh && \ ./configure --prefix="${PREFIX}" && \ - make check && \ + make check -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -505,7 +506,20 @@ RUN \ tar -xz --strip-components=1 -f v${LIBARIBB24_VERSION}.tar.gz && \ autoreconf -fiv && \ ./configure CFLAGS="-I${PREFIX}/include -fPIC" --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ + make install && \ + rm -rf ${DIR} + + +## libsvtav1 +RUN \ + DIR=/tmp/svtav1 && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + git clone https://gitlab.com/AOMediaCodec/SVT-AV1.git ${DIR} --depth=1 -b ${LIBSTVAV1_VERSION} &&\ + cd Build && \ + cmake .. -G"Unix Makefiles" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="${PREFIX}" && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -555,12 +569,13 @@ RUN \ --enable-libopenjpeg \ --enable-libkvazaar \ --enable-libaom \ + --enable-libsvtav1 \ --extra-libs=-lpthread \ --enable-libsrt \ --enable-vaapi \ --extra-cflags="-I${PREFIX}/include" \ --extra-ldflags="-L${PREFIX}/lib" && \ - make && \ + make -j $(nproc) && \ 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..a4fc04746 100644 --- a/docker-images/4.2/alpine312/Dockerfile +++ b/docker-images/4.2/alpine312/Dockerfile @@ -14,7 +14,8 @@ FROM base AS build WORKDIR /tmp/workdir ENV FFMPEG_VERSION=4.2.4 \ - AOM_VERSION=v1.0.0 \ + LIBSTVAV1_VERSION=v0.8.7 \ + AOM_VERSION=v3.1.3 \ FDKAAC_VERSION=0.1.5 \ FONTCONFIG_VERSION=2.12.4 \ FREETYPE_VERSION=2.10.4 \ @@ -93,6 +94,8 @@ RUN buildDeps="autoconf \ yasm \ nasm \ zlib-dev \ + meson \ + xxd \ expat-dev" && \ apk add --no-cache --update ${buildDeps} ## libvmaf https://github.com/Netflix/vmaf @@ -123,7 +126,7 @@ RUN \ curl -sL https://versaweb.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${OPENCOREAMR_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## x264 http://www.videolan.org/developers/x264.html @@ -134,7 +137,7 @@ RUN \ curl -sL https://download.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-${X264_VERSION}.tar.bz2 | \ tar -jx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared --enable-pic --disable-cli && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### x265 http://x265.org/ @@ -148,7 +151,7 @@ RUN \ sed -i "/-DEXTRA_LIB/ s/$/ -DCMAKE_INSTALL_PREFIX=\${PREFIX}/" multilib.sh && \ sed -i "/^cmake/ s/$/ -DENABLE_CLI=OFF/" multilib.sh && \ ./multilib.sh && \ - make -C 8bit install && \ + make -C 8bit -j $(nproc) install && \ rm -rf ${DIR} ### libogg https://www.xiph.org/ogg/ RUN \ @@ -159,7 +162,7 @@ RUN \ echo ${OGG_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f libogg-${OGG_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libopus https://www.opus-codec.org/ @@ -172,7 +175,7 @@ RUN \ tar -zx --strip-components=1 -f opus-${OPUS_VERSION}.tar.gz && \ autoreconf -fiv && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libvorbis https://xiph.org/vorbis/ @@ -184,7 +187,7 @@ RUN \ echo ${VORBIS_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f libvorbis-${VORBIS_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libtheora http://www.theora.org/ @@ -196,7 +199,7 @@ RUN \ echo ${THEORA_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f libtheora-${THEORA_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libvpx https://www.webmproject.org/code/ @@ -208,7 +211,7 @@ RUN \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-vp8 --enable-vp9 --enable-vp9-highbitdepth --enable-pic --enable-shared \ --disable-debug --disable-examples --disable-docs --disable-install-bins && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libwebp https://developers.google.com/speed/webp/ @@ -219,7 +222,7 @@ RUN \ curl -sL https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-${WEBP_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libmp3lame http://lame.sourceforge.net/ @@ -230,7 +233,7 @@ RUN \ curl -sL https://versaweb.dl.sourceforge.net/project/lame/lame/$(echo ${LAME_VERSION} | sed -e 's/[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)/\1.\2/')/lame-${LAME_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" --enable-shared --enable-nasm --disable-frontend && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### xvid https://www.xvid.com/ @@ -243,7 +246,7 @@ RUN \ tar -zx -f xvidcore-${XVID_VERSION}.tar.gz && \ cd xvidcore/build/generic && \ ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### fdk-aac https://github.com/mstorsjo/fdk-aac @@ -255,7 +258,7 @@ RUN \ tar -zx --strip-components=1 && \ autoreconf -fiv && \ ./configure --prefix="${PREFIX}" --enable-shared --datadir="${DIR}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## openjpeg https://github.com/uclouvain/openjpeg @@ -266,7 +269,7 @@ RUN \ curl -sL https://github.com/uclouvain/openjpeg/archive/v${OPENJPEG_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ cmake -DBUILD_THIRDPARTY:BOOL=ON -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## freetype https://www.freetype.org/ @@ -278,7 +281,7 @@ RUN \ echo ${FREETYPE_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f freetype-${FREETYPE_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## libvstab https://github.com/georgmartius/vid.stab @@ -290,7 +293,7 @@ RUN \ echo ${LIBVIDSTAB_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f v${LIBVIDSTAB_VERSION}.tar.gz && \ cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## fridibi https://www.fribidi.org/ @@ -315,7 +318,7 @@ RUN \ curl -sLO https://www.freedesktop.org/software/fontconfig/release/fontconfig-${FONTCONFIG_VERSION}.tar.bz2 && \ tar -jx --strip-components=1 -f fontconfig-${FONTCONFIG_VERSION}.tar.bz2 && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## libass https://github.com/libass/libass @@ -328,7 +331,7 @@ RUN \ tar -zx --strip-components=1 -f ${LIBASS_VERSION}.tar.gz && \ ./autogen.sh && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## kvazaar https://github.com/ultravideo/kvazaar @@ -352,7 +355,7 @@ RUN \ mkdir -p ./aom_build ; \ cd ./aom_build ; \ cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" -DBUILD_SHARED_LIBS=1 ..; \ - make ; \ + make -j $(nproc); \ make install ; \ rm -rf ${DIR} @@ -364,7 +367,7 @@ RUN \ curl -sLO https://www.x.org/archive//individual/util/util-macros-${XORG_MACROS_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f util-macros-${XORG_MACROS_VERSION}.tar.gz && \ ./configure --srcdir=${DIR} --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -375,7 +378,7 @@ RUN \ curl -sLO https://www.x.org/archive/individual/proto/xproto-${XPROTO_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f xproto-${XPROTO_VERSION}.tar.gz && \ ./configure --srcdir=${DIR} --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -386,7 +389,7 @@ RUN \ curl -sLO https://www.x.org/archive/individual/lib/libXau-${XAU_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f libXau-${XAU_VERSION}.tar.gz && \ ./configure --srcdir=${DIR} --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -397,7 +400,7 @@ RUN \ curl -sLO https://xcb.freedesktop.org/dist/libpthread-stubs-${LIBPTHREAD_STUBS_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f libpthread-stubs-${LIBPTHREAD_STUBS_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -409,7 +412,7 @@ RUN \ tar -zx --strip-components=1 -f xcb-proto-${XCBPROTO_VERSION}.tar.gz && \ ACLOCAL_PATH="${PREFIX}/share/aclocal" ./autogen.sh && \ ./configure --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -421,7 +424,7 @@ RUN \ tar -zx --strip-components=1 -f libxcb-${LIBXCB_VERSION}.tar.gz && \ ACLOCAL_PATH="${PREFIX}/share/aclocal" ./autogen.sh && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -434,7 +437,7 @@ RUN \ echo ${LIBXML2_SHA256SUM} | sha256sum --check && \ tar -xz --strip-components=1 -f libxml2-v${LIBXML2_VERSION}.tar.gz && \ ./autogen.sh --prefix="${PREFIX}" --with-ftp=no --with-http=no --with-python=no && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -447,7 +450,7 @@ RUN \ echo ${LIBBLURAY_SHA256SUM} | sha256sum --check && \ tar -jx --strip-components=1 -f libbluray-${LIBBLURAY_VERSION}.tar.bz2 && \ ./configure --prefix="${PREFIX}" --disable-examples --disable-bdjava-jar --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -461,7 +464,7 @@ RUN \ tar -xz --strip-components=1 -f v${LIBZMQ_VERSION}.tar.gz && \ ./autogen.sh && \ ./configure --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make check && \ make install && \ rm -rf ${DIR} @@ -474,7 +477,7 @@ RUN \ curl -sLO https://github.com/Haivision/srt/archive/v${LIBSRT_VERSION}.tar.gz && \ tar -xz --strip-components=1 -f v${LIBSRT_VERSION}.tar.gz && \ cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -486,7 +489,7 @@ RUN \ git clone https://git.code.sf.net/p/libpng/code ${DIR} -b v${LIBPNG_VERSION} --depth 1 && \ ./autogen.sh && \ ./configure --prefix="${PREFIX}" && \ - make check && \ + make check -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -500,7 +503,20 @@ RUN \ tar -xz --strip-components=1 -f v${LIBARIBB24_VERSION}.tar.gz && \ autoreconf -fiv && \ ./configure CFLAGS="-I${PREFIX}/include -fPIC" --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ + make install && \ + rm -rf ${DIR} + + +## libsvtav1 +RUN \ + DIR=/tmp/svtav1 && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + git clone https://gitlab.com/AOMediaCodec/SVT-AV1.git ${DIR} --depth=1 -b ${LIBSTVAV1_VERSION} &&\ + cd Build && \ + cmake .. -G"Unix Makefiles" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="${PREFIX}" && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -550,12 +566,13 @@ RUN \ --enable-libopenjpeg \ --enable-libkvazaar \ --enable-libaom \ + --enable-libsvtav1 \ --extra-libs=-lpthread \ --enable-libsrt \ --enable-libaribb24 \ --extra-cflags="-I${PREFIX}/include" \ --extra-ldflags="-L${PREFIX}/lib" && \ - make && \ + make -j $(nproc) && \ 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..29d9f374f 100644 --- a/docker-images/4.2/centos7/Dockerfile +++ b/docker-images/4.2/centos7/Dockerfile @@ -16,7 +16,8 @@ FROM base AS build WORKDIR /tmp/workdir ENV FFMPEG_VERSION=4.2.4 \ - AOM_VERSION=v1.0.0 \ + LIBSTVAV1_VERSION=v0.8.7 \ + AOM_VERSION=v3.1.3 \ FDKAAC_VERSION=0.1.5 \ FONTCONFIG_VERSION=2.12.4 \ FREETYPE_VERSION=2.10.4 \ @@ -160,7 +161,7 @@ RUN \ curl -sL https://versaweb.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${OPENCOREAMR_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## x264 http://www.videolan.org/developers/x264.html @@ -171,7 +172,7 @@ RUN \ curl -sL https://download.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-${X264_VERSION}.tar.bz2 | \ tar -jx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared --enable-pic --disable-cli && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### x265 http://x265.org/ @@ -185,7 +186,7 @@ RUN \ sed -i "/-DEXTRA_LIB/ s/$/ -DCMAKE_INSTALL_PREFIX=\${PREFIX}/" multilib.sh && \ sed -i "/^cmake/ s/$/ -DENABLE_CLI=OFF/" multilib.sh && \ ./multilib.sh && \ - make -C 8bit install && \ + make -C 8bit -j $(nproc) install && \ rm -rf ${DIR} ### libogg https://www.xiph.org/ogg/ RUN \ @@ -196,7 +197,7 @@ RUN \ echo ${OGG_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f libogg-${OGG_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libopus https://www.opus-codec.org/ @@ -209,7 +210,7 @@ RUN \ tar -zx --strip-components=1 -f opus-${OPUS_VERSION}.tar.gz && \ autoreconf -fiv && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libvorbis https://xiph.org/vorbis/ @@ -221,7 +222,7 @@ RUN \ echo ${VORBIS_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f libvorbis-${VORBIS_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libtheora http://www.theora.org/ @@ -233,7 +234,7 @@ RUN \ echo ${THEORA_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f libtheora-${THEORA_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libvpx https://www.webmproject.org/code/ @@ -245,7 +246,7 @@ RUN \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-vp8 --enable-vp9 --enable-vp9-highbitdepth --enable-pic --enable-shared \ --disable-debug --disable-examples --disable-docs --disable-install-bins && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libwebp https://developers.google.com/speed/webp/ @@ -256,7 +257,7 @@ RUN \ curl -sL https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-${WEBP_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libmp3lame http://lame.sourceforge.net/ @@ -267,7 +268,7 @@ RUN \ curl -sL https://versaweb.dl.sourceforge.net/project/lame/lame/$(echo ${LAME_VERSION} | sed -e 's/[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)/\1.\2/')/lame-${LAME_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" --enable-shared --enable-nasm --disable-frontend && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### xvid https://www.xvid.com/ @@ -280,7 +281,7 @@ RUN \ tar -zx -f xvidcore-${XVID_VERSION}.tar.gz && \ cd xvidcore/build/generic && \ ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### fdk-aac https://github.com/mstorsjo/fdk-aac @@ -292,7 +293,7 @@ RUN \ tar -zx --strip-components=1 && \ autoreconf -fiv && \ ./configure --prefix="${PREFIX}" --enable-shared --datadir="${DIR}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## openjpeg https://github.com/uclouvain/openjpeg @@ -303,7 +304,7 @@ RUN \ curl -sL https://github.com/uclouvain/openjpeg/archive/v${OPENJPEG_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ cmake -DBUILD_THIRDPARTY:BOOL=ON -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## freetype https://www.freetype.org/ @@ -315,7 +316,7 @@ RUN \ echo ${FREETYPE_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f freetype-${FREETYPE_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## libvstab https://github.com/georgmartius/vid.stab @@ -327,7 +328,7 @@ RUN \ echo ${LIBVIDSTAB_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f v${LIBVIDSTAB_VERSION}.tar.gz && \ cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## fridibi https://www.fribidi.org/ @@ -352,7 +353,7 @@ RUN \ curl -sLO https://www.freedesktop.org/software/fontconfig/release/fontconfig-${FONTCONFIG_VERSION}.tar.bz2 && \ tar -jx --strip-components=1 -f fontconfig-${FONTCONFIG_VERSION}.tar.bz2 && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## libass https://github.com/libass/libass @@ -365,7 +366,7 @@ RUN \ tar -zx --strip-components=1 -f ${LIBASS_VERSION}.tar.gz && \ ./autogen.sh && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## kvazaar https://github.com/ultravideo/kvazaar @@ -389,7 +390,7 @@ RUN \ mkdir -p ./aom_build ; \ cd ./aom_build ; \ cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" -DBUILD_SHARED_LIBS=1 ..; \ - make ; \ + make -j $(nproc); \ make install ; \ rm -rf ${DIR} @@ -401,7 +402,7 @@ RUN \ curl -sLO https://www.x.org/archive//individual/util/util-macros-${XORG_MACROS_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f util-macros-${XORG_MACROS_VERSION}.tar.gz && \ ./configure --srcdir=${DIR} --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -412,7 +413,7 @@ RUN \ curl -sLO https://www.x.org/archive/individual/proto/xproto-${XPROTO_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f xproto-${XPROTO_VERSION}.tar.gz && \ ./configure --srcdir=${DIR} --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -423,7 +424,7 @@ RUN \ curl -sLO https://www.x.org/archive/individual/lib/libXau-${XAU_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f libXau-${XAU_VERSION}.tar.gz && \ ./configure --srcdir=${DIR} --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -434,7 +435,7 @@ RUN \ curl -sLO https://xcb.freedesktop.org/dist/libpthread-stubs-${LIBPTHREAD_STUBS_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f libpthread-stubs-${LIBPTHREAD_STUBS_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -446,7 +447,7 @@ RUN \ tar -zx --strip-components=1 -f xcb-proto-${XCBPROTO_VERSION}.tar.gz && \ ACLOCAL_PATH="${PREFIX}/share/aclocal" ./autogen.sh && \ ./configure --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -458,7 +459,7 @@ RUN \ tar -zx --strip-components=1 -f libxcb-${LIBXCB_VERSION}.tar.gz && \ ACLOCAL_PATH="${PREFIX}/share/aclocal" ./autogen.sh && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -471,7 +472,7 @@ RUN \ echo ${LIBXML2_SHA256SUM} | sha256sum --check && \ tar -xz --strip-components=1 -f libxml2-v${LIBXML2_VERSION}.tar.gz && \ ./autogen.sh --prefix="${PREFIX}" --with-ftp=no --with-http=no --with-python=no && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -484,7 +485,7 @@ RUN \ echo ${LIBBLURAY_SHA256SUM} | sha256sum --check && \ tar -jx --strip-components=1 -f libbluray-${LIBBLURAY_VERSION}.tar.bz2 && \ ./configure --prefix="${PREFIX}" --disable-examples --disable-bdjava-jar --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -498,7 +499,7 @@ RUN \ tar -xz --strip-components=1 -f v${LIBZMQ_VERSION}.tar.gz && \ ./autogen.sh && \ ./configure --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make check && \ make install && \ rm -rf ${DIR} @@ -511,7 +512,7 @@ RUN \ curl -sLO https://github.com/Haivision/srt/archive/v${LIBSRT_VERSION}.tar.gz && \ tar -xz --strip-components=1 -f v${LIBSRT_VERSION}.tar.gz && \ cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -523,7 +524,7 @@ RUN \ git clone https://git.code.sf.net/p/libpng/code ${DIR} -b v${LIBPNG_VERSION} --depth 1 && \ ./autogen.sh && \ ./configure --prefix="${PREFIX}" && \ - make check && \ + make check -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -537,7 +538,20 @@ RUN \ tar -xz --strip-components=1 -f v${LIBARIBB24_VERSION}.tar.gz && \ autoreconf -fiv && \ ./configure CFLAGS="-I${PREFIX}/include -fPIC" --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ + make install && \ + rm -rf ${DIR} + + +## libsvtav1 +RUN \ + DIR=/tmp/svtav1 && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + git clone https://gitlab.com/AOMediaCodec/SVT-AV1.git ${DIR} --depth=1 -b ${LIBSTVAV1_VERSION} &&\ + cd Build && \ + cmake .. -G"Unix Makefiles" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="${PREFIX}" && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -587,12 +601,13 @@ RUN \ --enable-libopenjpeg \ --enable-libkvazaar \ --enable-libaom \ + --enable-libsvtav1 \ --extra-libs=-lpthread \ --enable-libsrt \ --enable-libaribb24 \ --extra-cflags="-I${PREFIX}/include" \ --extra-ldflags="-L${PREFIX}/lib" && \ - make && \ + make -j $(nproc) && \ 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..c5f50aeb8 100644 --- a/docker-images/4.2/centos8/Dockerfile +++ b/docker-images/4.2/centos8/Dockerfile @@ -16,7 +16,8 @@ FROM base AS build WORKDIR /tmp/workdir ENV FFMPEG_VERSION=4.2.4 \ - AOM_VERSION=v1.0.0 \ + LIBSTVAV1_VERSION=v0.8.7 \ + AOM_VERSION=v3.1.3 \ FDKAAC_VERSION=0.1.5 \ FONTCONFIG_VERSION=2.12.4 \ FREETYPE_VERSION=2.10.4 \ @@ -129,7 +130,7 @@ RUN \ curl -sL https://versaweb.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${OPENCOREAMR_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## x264 http://www.videolan.org/developers/x264.html @@ -140,7 +141,7 @@ RUN \ curl -sL https://download.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-${X264_VERSION}.tar.bz2 | \ tar -jx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared --enable-pic --disable-cli && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### x265 http://x265.org/ @@ -154,7 +155,7 @@ RUN \ sed -i "/-DEXTRA_LIB/ s/$/ -DCMAKE_INSTALL_PREFIX=\${PREFIX}/" multilib.sh && \ sed -i "/^cmake/ s/$/ -DENABLE_CLI=OFF/" multilib.sh && \ ./multilib.sh && \ - make -C 8bit install && \ + make -C 8bit -j $(nproc) install && \ rm -rf ${DIR} ### libogg https://www.xiph.org/ogg/ RUN \ @@ -165,7 +166,7 @@ RUN \ echo ${OGG_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f libogg-${OGG_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libopus https://www.opus-codec.org/ @@ -178,7 +179,7 @@ RUN \ tar -zx --strip-components=1 -f opus-${OPUS_VERSION}.tar.gz && \ autoreconf -fiv && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libvorbis https://xiph.org/vorbis/ @@ -190,7 +191,7 @@ RUN \ echo ${VORBIS_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f libvorbis-${VORBIS_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libtheora http://www.theora.org/ @@ -202,7 +203,7 @@ RUN \ echo ${THEORA_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f libtheora-${THEORA_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libvpx https://www.webmproject.org/code/ @@ -214,7 +215,7 @@ RUN \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-vp8 --enable-vp9 --enable-vp9-highbitdepth --enable-pic --enable-shared \ --disable-debug --disable-examples --disable-docs --disable-install-bins && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libwebp https://developers.google.com/speed/webp/ @@ -225,7 +226,7 @@ RUN \ curl -sL https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-${WEBP_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libmp3lame http://lame.sourceforge.net/ @@ -236,7 +237,7 @@ RUN \ curl -sL https://versaweb.dl.sourceforge.net/project/lame/lame/$(echo ${LAME_VERSION} | sed -e 's/[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)/\1.\2/')/lame-${LAME_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" --enable-shared --enable-nasm --disable-frontend && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### xvid https://www.xvid.com/ @@ -249,7 +250,7 @@ RUN \ tar -zx -f xvidcore-${XVID_VERSION}.tar.gz && \ cd xvidcore/build/generic && \ ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### fdk-aac https://github.com/mstorsjo/fdk-aac @@ -261,7 +262,7 @@ RUN \ tar -zx --strip-components=1 && \ autoreconf -fiv && \ ./configure --prefix="${PREFIX}" --enable-shared --datadir="${DIR}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## openjpeg https://github.com/uclouvain/openjpeg @@ -272,7 +273,7 @@ RUN \ curl -sL https://github.com/uclouvain/openjpeg/archive/v${OPENJPEG_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ cmake -DBUILD_THIRDPARTY:BOOL=ON -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## freetype https://www.freetype.org/ @@ -284,7 +285,7 @@ RUN \ echo ${FREETYPE_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f freetype-${FREETYPE_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## libvstab https://github.com/georgmartius/vid.stab @@ -296,7 +297,7 @@ RUN \ echo ${LIBVIDSTAB_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f v${LIBVIDSTAB_VERSION}.tar.gz && \ cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## fridibi https://www.fribidi.org/ @@ -321,7 +322,7 @@ RUN \ curl -sLO https://www.freedesktop.org/software/fontconfig/release/fontconfig-${FONTCONFIG_VERSION}.tar.bz2 && \ tar -jx --strip-components=1 -f fontconfig-${FONTCONFIG_VERSION}.tar.bz2 && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## libass https://github.com/libass/libass @@ -334,7 +335,7 @@ RUN \ tar -zx --strip-components=1 -f ${LIBASS_VERSION}.tar.gz && \ ./autogen.sh && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## kvazaar https://github.com/ultravideo/kvazaar @@ -358,7 +359,7 @@ RUN \ mkdir -p ./aom_build ; \ cd ./aom_build ; \ cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" -DBUILD_SHARED_LIBS=1 ..; \ - make ; \ + make -j $(nproc); \ make install ; \ rm -rf ${DIR} @@ -370,7 +371,7 @@ RUN \ curl -sLO https://www.x.org/archive//individual/util/util-macros-${XORG_MACROS_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f util-macros-${XORG_MACROS_VERSION}.tar.gz && \ ./configure --srcdir=${DIR} --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -381,7 +382,7 @@ RUN \ curl -sLO https://www.x.org/archive/individual/proto/xproto-${XPROTO_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f xproto-${XPROTO_VERSION}.tar.gz && \ ./configure --srcdir=${DIR} --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -392,7 +393,7 @@ RUN \ curl -sLO https://www.x.org/archive/individual/lib/libXau-${XAU_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f libXau-${XAU_VERSION}.tar.gz && \ ./configure --srcdir=${DIR} --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -403,7 +404,7 @@ RUN \ curl -sLO https://xcb.freedesktop.org/dist/libpthread-stubs-${LIBPTHREAD_STUBS_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f libpthread-stubs-${LIBPTHREAD_STUBS_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -415,7 +416,7 @@ RUN \ tar -zx --strip-components=1 -f xcb-proto-${XCBPROTO_VERSION}.tar.gz && \ ACLOCAL_PATH="${PREFIX}/share/aclocal" ./autogen.sh && \ ./configure --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -427,7 +428,7 @@ RUN \ tar -zx --strip-components=1 -f libxcb-${LIBXCB_VERSION}.tar.gz && \ ACLOCAL_PATH="${PREFIX}/share/aclocal" ./autogen.sh && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -440,7 +441,7 @@ RUN \ echo ${LIBXML2_SHA256SUM} | sha256sum --check && \ tar -xz --strip-components=1 -f libxml2-v${LIBXML2_VERSION}.tar.gz && \ ./autogen.sh --prefix="${PREFIX}" --with-ftp=no --with-http=no --with-python=no && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -453,7 +454,7 @@ RUN \ echo ${LIBBLURAY_SHA256SUM} | sha256sum --check && \ tar -jx --strip-components=1 -f libbluray-${LIBBLURAY_VERSION}.tar.bz2 && \ ./configure --prefix="${PREFIX}" --disable-examples --disable-bdjava-jar --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -467,7 +468,7 @@ RUN \ tar -xz --strip-components=1 -f v${LIBZMQ_VERSION}.tar.gz && \ ./autogen.sh && \ ./configure --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make check && \ make install && \ rm -rf ${DIR} @@ -480,7 +481,7 @@ RUN \ curl -sLO https://github.com/Haivision/srt/archive/v${LIBSRT_VERSION}.tar.gz && \ tar -xz --strip-components=1 -f v${LIBSRT_VERSION}.tar.gz && \ cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -492,7 +493,7 @@ RUN \ git clone https://git.code.sf.net/p/libpng/code ${DIR} -b v${LIBPNG_VERSION} --depth 1 && \ ./autogen.sh && \ ./configure --prefix="${PREFIX}" && \ - make check && \ + make check -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -506,7 +507,20 @@ RUN \ tar -xz --strip-components=1 -f v${LIBARIBB24_VERSION}.tar.gz && \ autoreconf -fiv && \ ./configure CFLAGS="-I${PREFIX}/include -fPIC" --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ + make install && \ + rm -rf ${DIR} + + +## libsvtav1 +RUN \ + DIR=/tmp/svtav1 && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + git clone https://gitlab.com/AOMediaCodec/SVT-AV1.git ${DIR} --depth=1 -b ${LIBSTVAV1_VERSION} &&\ + cd Build && \ + cmake .. -G"Unix Makefiles" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="${PREFIX}" && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -556,12 +570,13 @@ RUN \ --enable-libopenjpeg \ --enable-libkvazaar \ --enable-libaom \ + --enable-libsvtav1 \ --extra-libs=-lpthread \ --enable-libsrt \ --enable-libaribb24 \ --extra-cflags="-I${PREFIX}/include" \ --extra-ldflags="-L${PREFIX}/lib" && \ - make && \ + make -j $(nproc) && \ 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..bf8fb0c30 100644 --- a/docker-images/4.2/nvidia2004/Dockerfile +++ b/docker-images/4.2/nvidia2004/Dockerfile @@ -34,7 +34,8 @@ FROM devel-base as build ENV NVIDIA_HEADERS_VERSION=11.1.5.0 ENV FFMPEG_VERSION=4.2.4 \ - AOM_VERSION=v1.0.0 \ + LIBSTVAV1_VERSION=v0.8.7 \ + AOM_VERSION=v3.1.3 \ FDKAAC_VERSION=0.1.5 \ FONTCONFIG_VERSION=2.12.4 \ FREETYPE_VERSION=2.10.4 \ @@ -151,7 +152,7 @@ RUN \ curl -sL https://versaweb.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${OPENCOREAMR_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## x264 http://www.videolan.org/developers/x264.html @@ -162,7 +163,7 @@ RUN \ curl -sL https://download.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-${X264_VERSION}.tar.bz2 | \ tar -jx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared --enable-pic --disable-cli && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### x265 http://x265.org/ @@ -176,7 +177,7 @@ RUN \ sed -i "/-DEXTRA_LIB/ s/$/ -DCMAKE_INSTALL_PREFIX=\${PREFIX}/" multilib.sh && \ sed -i "/^cmake/ s/$/ -DENABLE_CLI=OFF/" multilib.sh && \ ./multilib.sh && \ - make -C 8bit install && \ + make -C 8bit -j $(nproc) install && \ rm -rf ${DIR} ### libogg https://www.xiph.org/ogg/ RUN \ @@ -187,7 +188,7 @@ RUN \ echo ${OGG_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f libogg-${OGG_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libopus https://www.opus-codec.org/ @@ -200,7 +201,7 @@ RUN \ tar -zx --strip-components=1 -f opus-${OPUS_VERSION}.tar.gz && \ autoreconf -fiv && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libvorbis https://xiph.org/vorbis/ @@ -212,7 +213,7 @@ RUN \ echo ${VORBIS_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f libvorbis-${VORBIS_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libtheora http://www.theora.org/ @@ -224,7 +225,7 @@ RUN \ echo ${THEORA_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f libtheora-${THEORA_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libvpx https://www.webmproject.org/code/ @@ -236,7 +237,7 @@ RUN \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-vp8 --enable-vp9 --enable-vp9-highbitdepth --enable-pic --enable-shared \ --disable-debug --disable-examples --disable-docs --disable-install-bins && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libwebp https://developers.google.com/speed/webp/ @@ -247,7 +248,7 @@ RUN \ curl -sL https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-${WEBP_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libmp3lame http://lame.sourceforge.net/ @@ -258,7 +259,7 @@ RUN \ curl -sL https://versaweb.dl.sourceforge.net/project/lame/lame/$(echo ${LAME_VERSION} | sed -e 's/[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)/\1.\2/')/lame-${LAME_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" --enable-shared --enable-nasm --disable-frontend && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### xvid https://www.xvid.com/ @@ -271,7 +272,7 @@ RUN \ tar -zx -f xvidcore-${XVID_VERSION}.tar.gz && \ cd xvidcore/build/generic && \ ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### fdk-aac https://github.com/mstorsjo/fdk-aac @@ -283,7 +284,7 @@ RUN \ tar -zx --strip-components=1 && \ autoreconf -fiv && \ ./configure --prefix="${PREFIX}" --enable-shared --datadir="${DIR}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## openjpeg https://github.com/uclouvain/openjpeg @@ -294,7 +295,7 @@ RUN \ curl -sL https://github.com/uclouvain/openjpeg/archive/v${OPENJPEG_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ cmake -DBUILD_THIRDPARTY:BOOL=ON -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## freetype https://www.freetype.org/ @@ -306,7 +307,7 @@ RUN \ echo ${FREETYPE_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f freetype-${FREETYPE_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## libvstab https://github.com/georgmartius/vid.stab @@ -318,7 +319,7 @@ RUN \ echo ${LIBVIDSTAB_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f v${LIBVIDSTAB_VERSION}.tar.gz && \ cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## fridibi https://www.fribidi.org/ @@ -343,7 +344,7 @@ RUN \ curl -sLO https://www.freedesktop.org/software/fontconfig/release/fontconfig-${FONTCONFIG_VERSION}.tar.bz2 && \ tar -jx --strip-components=1 -f fontconfig-${FONTCONFIG_VERSION}.tar.bz2 && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## libass https://github.com/libass/libass @@ -356,7 +357,7 @@ RUN \ tar -zx --strip-components=1 -f ${LIBASS_VERSION}.tar.gz && \ ./autogen.sh && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## kvazaar https://github.com/ultravideo/kvazaar @@ -380,7 +381,7 @@ RUN \ mkdir -p ./aom_build ; \ cd ./aom_build ; \ cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" -DBUILD_SHARED_LIBS=1 ..; \ - make ; \ + make -j $(nproc); \ make install ; \ rm -rf ${DIR} @@ -392,7 +393,7 @@ RUN \ curl -sLO https://www.x.org/archive//individual/util/util-macros-${XORG_MACROS_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f util-macros-${XORG_MACROS_VERSION}.tar.gz && \ ./configure --srcdir=${DIR} --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -403,7 +404,7 @@ RUN \ curl -sLO https://www.x.org/archive/individual/proto/xproto-${XPROTO_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f xproto-${XPROTO_VERSION}.tar.gz && \ ./configure --srcdir=${DIR} --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -414,7 +415,7 @@ RUN \ curl -sLO https://www.x.org/archive/individual/lib/libXau-${XAU_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f libXau-${XAU_VERSION}.tar.gz && \ ./configure --srcdir=${DIR} --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -425,7 +426,7 @@ RUN \ curl -sLO https://xcb.freedesktop.org/dist/libpthread-stubs-${LIBPTHREAD_STUBS_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f libpthread-stubs-${LIBPTHREAD_STUBS_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -437,7 +438,7 @@ RUN \ tar -zx --strip-components=1 -f xcb-proto-${XCBPROTO_VERSION}.tar.gz && \ ACLOCAL_PATH="${PREFIX}/share/aclocal" ./autogen.sh && \ ./configure --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -449,7 +450,7 @@ RUN \ tar -zx --strip-components=1 -f libxcb-${LIBXCB_VERSION}.tar.gz && \ ACLOCAL_PATH="${PREFIX}/share/aclocal" ./autogen.sh && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -462,7 +463,7 @@ RUN \ echo ${LIBXML2_SHA256SUM} | sha256sum --check && \ tar -xz --strip-components=1 -f libxml2-v${LIBXML2_VERSION}.tar.gz && \ ./autogen.sh --prefix="${PREFIX}" --with-ftp=no --with-http=no --with-python=no && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -475,7 +476,7 @@ RUN \ echo ${LIBBLURAY_SHA256SUM} | sha256sum --check && \ tar -jx --strip-components=1 -f libbluray-${LIBBLURAY_VERSION}.tar.bz2 && \ ./configure --prefix="${PREFIX}" --disable-examples --disable-bdjava-jar --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -489,7 +490,7 @@ RUN \ tar -xz --strip-components=1 -f v${LIBZMQ_VERSION}.tar.gz && \ ./autogen.sh && \ ./configure --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make check && \ make install && \ rm -rf ${DIR} @@ -502,7 +503,7 @@ RUN \ curl -sLO https://github.com/Haivision/srt/archive/v${LIBSRT_VERSION}.tar.gz && \ tar -xz --strip-components=1 -f v${LIBSRT_VERSION}.tar.gz && \ cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -514,7 +515,7 @@ RUN \ git clone https://git.code.sf.net/p/libpng/code ${DIR} -b v${LIBPNG_VERSION} --depth 1 && \ ./autogen.sh && \ ./configure --prefix="${PREFIX}" && \ - make check && \ + make check -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -528,7 +529,20 @@ RUN \ tar -xz --strip-components=1 -f v${LIBARIBB24_VERSION}.tar.gz && \ autoreconf -fiv && \ ./configure CFLAGS="-I${PREFIX}/include -fPIC" --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ + make install && \ + rm -rf ${DIR} + + +## libsvtav1 +RUN \ + DIR=/tmp/svtav1 && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + git clone https://gitlab.com/AOMediaCodec/SVT-AV1.git ${DIR} --depth=1 -b ${LIBSTVAV1_VERSION} &&\ + cd Build && \ + cmake .. -G"Unix Makefiles" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="${PREFIX}" && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -578,6 +592,7 @@ RUN \ --enable-libopenjpeg \ --enable-libkvazaar \ --enable-libaom \ + --enable-libsvtav1 \ --extra-libs=-lpthread \ --enable-libsrt \ --enable-libaribb24 \ @@ -587,7 +602,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 -j $(nproc) && \ 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..322bfdbad 100644 --- a/docker-images/4.2/scratch312/Dockerfile +++ b/docker-images/4.2/scratch312/Dockerfile @@ -9,7 +9,8 @@ FROM alpine:3.12 AS build WORKDIR /tmp/workdir ENV FFMPEG_VERSION=4.2.4 \ - AOM_VERSION=v1.0.0 \ + LIBSTVAV1_VERSION=v0.8.7 \ + AOM_VERSION=v3.1.3 \ FDKAAC_VERSION=0.1.5 \ FONTCONFIG_VERSION=2.12.4 \ FREETYPE_VERSION=2.10.4 \ @@ -125,7 +126,7 @@ RUN \ curl -sL https://versaweb.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${OPENCOREAMR_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## x264 http://www.videolan.org/developers/x264.html @@ -136,7 +137,7 @@ RUN \ curl -sL https://download.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-${X264_VERSION}.tar.bz2 | \ tar -jx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared --enable-pic --disable-cli && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### x265 http://x265.org/ @@ -150,7 +151,7 @@ RUN \ sed -i "/-DEXTRA_LIB/ s/$/ -DCMAKE_INSTALL_PREFIX=\${PREFIX}/" multilib.sh && \ sed -i "/^cmake/ s/$/ -DENABLE_CLI=OFF/" multilib.sh && \ ./multilib.sh && \ - make -C 8bit install && \ + make -C 8bit -j $(nproc) install && \ rm -rf ${DIR} ### libogg https://www.xiph.org/ogg/ RUN \ @@ -161,7 +162,7 @@ RUN \ echo ${OGG_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f libogg-${OGG_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libopus https://www.opus-codec.org/ @@ -174,7 +175,7 @@ RUN \ tar -zx --strip-components=1 -f opus-${OPUS_VERSION}.tar.gz && \ autoreconf -fiv && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libvorbis https://xiph.org/vorbis/ @@ -186,7 +187,7 @@ RUN \ echo ${VORBIS_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f libvorbis-${VORBIS_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libtheora http://www.theora.org/ @@ -198,7 +199,7 @@ RUN \ echo ${THEORA_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f libtheora-${THEORA_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libvpx https://www.webmproject.org/code/ @@ -210,7 +211,7 @@ RUN \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-vp8 --enable-vp9 --enable-vp9-highbitdepth --enable-pic --enable-shared \ --disable-debug --disable-examples --disable-docs --disable-install-bins && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libwebp https://developers.google.com/speed/webp/ @@ -221,7 +222,7 @@ RUN \ curl -sL https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-${WEBP_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libmp3lame http://lame.sourceforge.net/ @@ -232,7 +233,7 @@ RUN \ curl -sL https://versaweb.dl.sourceforge.net/project/lame/lame/$(echo ${LAME_VERSION} | sed -e 's/[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)/\1.\2/')/lame-${LAME_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" --enable-shared --enable-nasm --disable-frontend && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### xvid https://www.xvid.com/ @@ -245,7 +246,7 @@ RUN \ tar -zx -f xvidcore-${XVID_VERSION}.tar.gz && \ cd xvidcore/build/generic && \ ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### fdk-aac https://github.com/mstorsjo/fdk-aac @@ -257,7 +258,7 @@ RUN \ tar -zx --strip-components=1 && \ autoreconf -fiv && \ ./configure --prefix="${PREFIX}" --enable-shared --datadir="${DIR}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## openjpeg https://github.com/uclouvain/openjpeg @@ -268,7 +269,7 @@ RUN \ curl -sL https://github.com/uclouvain/openjpeg/archive/v${OPENJPEG_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ cmake -DBUILD_THIRDPARTY:BOOL=ON -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## freetype https://www.freetype.org/ @@ -280,7 +281,7 @@ RUN \ echo ${FREETYPE_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f freetype-${FREETYPE_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## libvstab https://github.com/georgmartius/vid.stab @@ -292,7 +293,7 @@ RUN \ echo ${LIBVIDSTAB_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f v${LIBVIDSTAB_VERSION}.tar.gz && \ cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## fridibi https://www.fribidi.org/ @@ -317,7 +318,7 @@ RUN \ curl -sLO https://www.freedesktop.org/software/fontconfig/release/fontconfig-${FONTCONFIG_VERSION}.tar.bz2 && \ tar -jx --strip-components=1 -f fontconfig-${FONTCONFIG_VERSION}.tar.bz2 && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## libass https://github.com/libass/libass @@ -330,7 +331,7 @@ RUN \ tar -zx --strip-components=1 -f ${LIBASS_VERSION}.tar.gz && \ ./autogen.sh && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## kvazaar https://github.com/ultravideo/kvazaar @@ -354,7 +355,7 @@ RUN \ mkdir -p ./aom_build ; \ cd ./aom_build ; \ cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" -DBUILD_SHARED_LIBS=1 ..; \ - make ; \ + make -j $(nproc); \ make install ; \ rm -rf ${DIR} @@ -366,7 +367,7 @@ RUN \ curl -sLO https://www.x.org/archive//individual/util/util-macros-${XORG_MACROS_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f util-macros-${XORG_MACROS_VERSION}.tar.gz && \ ./configure --srcdir=${DIR} --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -377,7 +378,7 @@ RUN \ curl -sLO https://www.x.org/archive/individual/proto/xproto-${XPROTO_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f xproto-${XPROTO_VERSION}.tar.gz && \ ./configure --srcdir=${DIR} --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -388,7 +389,7 @@ RUN \ curl -sLO https://www.x.org/archive/individual/lib/libXau-${XAU_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f libXau-${XAU_VERSION}.tar.gz && \ ./configure --srcdir=${DIR} --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -399,7 +400,7 @@ RUN \ curl -sLO https://xcb.freedesktop.org/dist/libpthread-stubs-${LIBPTHREAD_STUBS_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f libpthread-stubs-${LIBPTHREAD_STUBS_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -411,7 +412,7 @@ RUN \ tar -zx --strip-components=1 -f xcb-proto-${XCBPROTO_VERSION}.tar.gz && \ ACLOCAL_PATH="${PREFIX}/share/aclocal" ./autogen.sh && \ ./configure --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -423,7 +424,7 @@ RUN \ tar -zx --strip-components=1 -f libxcb-${LIBXCB_VERSION}.tar.gz && \ ACLOCAL_PATH="${PREFIX}/share/aclocal" ./autogen.sh && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -436,7 +437,7 @@ RUN \ echo ${LIBXML2_SHA256SUM} | sha256sum --check && \ tar -xz --strip-components=1 -f libxml2-v${LIBXML2_VERSION}.tar.gz && \ ./autogen.sh --prefix="${PREFIX}" --with-ftp=no --with-http=no --with-python=no && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -449,7 +450,7 @@ RUN \ echo ${LIBBLURAY_SHA256SUM} | sha256sum --check && \ tar -jx --strip-components=1 -f libbluray-${LIBBLURAY_VERSION}.tar.bz2 && \ ./configure --prefix="${PREFIX}" --disable-examples --disable-bdjava-jar --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -463,7 +464,7 @@ RUN \ tar -xz --strip-components=1 -f v${LIBZMQ_VERSION}.tar.gz && \ ./autogen.sh && \ ./configure --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make check && \ make install && \ rm -rf ${DIR} @@ -476,7 +477,7 @@ RUN \ curl -sLO https://github.com/Haivision/srt/archive/v${LIBSRT_VERSION}.tar.gz && \ tar -xz --strip-components=1 -f v${LIBSRT_VERSION}.tar.gz && \ cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -488,7 +489,7 @@ RUN \ git clone https://git.code.sf.net/p/libpng/code ${DIR} -b v${LIBPNG_VERSION} --depth 1 && \ ./autogen.sh && \ ./configure --prefix="${PREFIX}" && \ - make check && \ + make check -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -502,7 +503,20 @@ RUN \ tar -xz --strip-components=1 -f v${LIBARIBB24_VERSION}.tar.gz && \ autoreconf -fiv && \ ./configure CFLAGS="-I${PREFIX}/include -fPIC" --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ + make install && \ + rm -rf ${DIR} + + +## libsvtav1 +RUN \ + DIR=/tmp/svtav1 && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + git clone https://gitlab.com/AOMediaCodec/SVT-AV1.git ${DIR} --depth=1 -b ${LIBSTVAV1_VERSION} &&\ + cd Build && \ + cmake .. -G"Unix Makefiles" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="${PREFIX}" && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -552,12 +566,13 @@ RUN \ --enable-libopenjpeg \ --enable-libkvazaar \ --enable-libaom \ + --enable-libsvtav1 \ --extra-libs=-lpthread \ --enable-libsrt \ --enable-libaribb24 \ --extra-cflags="-I${PREFIX}/include" \ --extra-ldflags="-L${PREFIX}/lib" && \ - make && \ + make -j $(nproc) && \ 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..7f745bf94 100644 --- a/docker-images/4.2/ubuntu1804/Dockerfile +++ b/docker-images/4.2/ubuntu1804/Dockerfile @@ -17,7 +17,8 @@ RUN apt-get -yqq update && \ FROM base as build ENV FFMPEG_VERSION=4.2.4 \ - AOM_VERSION=v1.0.0 \ + LIBSTVAV1_VERSION=v0.8.7 \ + AOM_VERSION=v3.1.3 \ FDKAAC_VERSION=0.1.5 \ FONTCONFIG_VERSION=2.12.4 \ FREETYPE_VERSION=2.10.4 \ @@ -124,7 +125,7 @@ RUN \ curl -sL https://versaweb.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${OPENCOREAMR_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## x264 http://www.videolan.org/developers/x264.html @@ -135,7 +136,7 @@ RUN \ curl -sL https://download.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-${X264_VERSION}.tar.bz2 | \ tar -jx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared --enable-pic --disable-cli && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### x265 http://x265.org/ @@ -149,7 +150,7 @@ RUN \ sed -i "/-DEXTRA_LIB/ s/$/ -DCMAKE_INSTALL_PREFIX=\${PREFIX}/" multilib.sh && \ sed -i "/^cmake/ s/$/ -DENABLE_CLI=OFF/" multilib.sh && \ ./multilib.sh && \ - make -C 8bit install && \ + make -C 8bit -j $(nproc) install && \ rm -rf ${DIR} ### libogg https://www.xiph.org/ogg/ RUN \ @@ -160,7 +161,7 @@ RUN \ echo ${OGG_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f libogg-${OGG_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libopus https://www.opus-codec.org/ @@ -173,7 +174,7 @@ RUN \ tar -zx --strip-components=1 -f opus-${OPUS_VERSION}.tar.gz && \ autoreconf -fiv && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libvorbis https://xiph.org/vorbis/ @@ -185,7 +186,7 @@ RUN \ echo ${VORBIS_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f libvorbis-${VORBIS_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libtheora http://www.theora.org/ @@ -197,7 +198,7 @@ RUN \ echo ${THEORA_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f libtheora-${THEORA_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libvpx https://www.webmproject.org/code/ @@ -209,7 +210,7 @@ RUN \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-vp8 --enable-vp9 --enable-vp9-highbitdepth --enable-pic --enable-shared \ --disable-debug --disable-examples --disable-docs --disable-install-bins && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libwebp https://developers.google.com/speed/webp/ @@ -220,7 +221,7 @@ RUN \ curl -sL https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-${WEBP_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libmp3lame http://lame.sourceforge.net/ @@ -231,7 +232,7 @@ RUN \ curl -sL https://versaweb.dl.sourceforge.net/project/lame/lame/$(echo ${LAME_VERSION} | sed -e 's/[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)/\1.\2/')/lame-${LAME_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" --enable-shared --enable-nasm --disable-frontend && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### xvid https://www.xvid.com/ @@ -244,7 +245,7 @@ RUN \ tar -zx -f xvidcore-${XVID_VERSION}.tar.gz && \ cd xvidcore/build/generic && \ ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### fdk-aac https://github.com/mstorsjo/fdk-aac @@ -256,7 +257,7 @@ RUN \ tar -zx --strip-components=1 && \ autoreconf -fiv && \ ./configure --prefix="${PREFIX}" --enable-shared --datadir="${DIR}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## openjpeg https://github.com/uclouvain/openjpeg @@ -267,7 +268,7 @@ RUN \ curl -sL https://github.com/uclouvain/openjpeg/archive/v${OPENJPEG_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ cmake -DBUILD_THIRDPARTY:BOOL=ON -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## freetype https://www.freetype.org/ @@ -279,7 +280,7 @@ RUN \ echo ${FREETYPE_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f freetype-${FREETYPE_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## libvstab https://github.com/georgmartius/vid.stab @@ -291,7 +292,7 @@ RUN \ echo ${LIBVIDSTAB_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f v${LIBVIDSTAB_VERSION}.tar.gz && \ cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## fridibi https://www.fribidi.org/ @@ -316,7 +317,7 @@ RUN \ curl -sLO https://www.freedesktop.org/software/fontconfig/release/fontconfig-${FONTCONFIG_VERSION}.tar.bz2 && \ tar -jx --strip-components=1 -f fontconfig-${FONTCONFIG_VERSION}.tar.bz2 && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## libass https://github.com/libass/libass @@ -329,7 +330,7 @@ RUN \ tar -zx --strip-components=1 -f ${LIBASS_VERSION}.tar.gz && \ ./autogen.sh && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## kvazaar https://github.com/ultravideo/kvazaar @@ -353,7 +354,7 @@ RUN \ mkdir -p ./aom_build ; \ cd ./aom_build ; \ cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" -DBUILD_SHARED_LIBS=1 ..; \ - make ; \ + make -j $(nproc); \ make install ; \ rm -rf ${DIR} @@ -365,7 +366,7 @@ RUN \ curl -sLO https://www.x.org/archive//individual/util/util-macros-${XORG_MACROS_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f util-macros-${XORG_MACROS_VERSION}.tar.gz && \ ./configure --srcdir=${DIR} --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -376,7 +377,7 @@ RUN \ curl -sLO https://www.x.org/archive/individual/proto/xproto-${XPROTO_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f xproto-${XPROTO_VERSION}.tar.gz && \ ./configure --srcdir=${DIR} --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -387,7 +388,7 @@ RUN \ curl -sLO https://www.x.org/archive/individual/lib/libXau-${XAU_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f libXau-${XAU_VERSION}.tar.gz && \ ./configure --srcdir=${DIR} --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -398,7 +399,7 @@ RUN \ curl -sLO https://xcb.freedesktop.org/dist/libpthread-stubs-${LIBPTHREAD_STUBS_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f libpthread-stubs-${LIBPTHREAD_STUBS_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -410,7 +411,7 @@ RUN \ tar -zx --strip-components=1 -f xcb-proto-${XCBPROTO_VERSION}.tar.gz && \ ACLOCAL_PATH="${PREFIX}/share/aclocal" ./autogen.sh && \ ./configure --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -422,7 +423,7 @@ RUN \ tar -zx --strip-components=1 -f libxcb-${LIBXCB_VERSION}.tar.gz && \ ACLOCAL_PATH="${PREFIX}/share/aclocal" ./autogen.sh && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -435,7 +436,7 @@ RUN \ echo ${LIBXML2_SHA256SUM} | sha256sum --check && \ tar -xz --strip-components=1 -f libxml2-v${LIBXML2_VERSION}.tar.gz && \ ./autogen.sh --prefix="${PREFIX}" --with-ftp=no --with-http=no --with-python=no && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -448,7 +449,7 @@ RUN \ echo ${LIBBLURAY_SHA256SUM} | sha256sum --check && \ tar -jx --strip-components=1 -f libbluray-${LIBBLURAY_VERSION}.tar.bz2 && \ ./configure --prefix="${PREFIX}" --disable-examples --disable-bdjava-jar --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -462,7 +463,7 @@ RUN \ tar -xz --strip-components=1 -f v${LIBZMQ_VERSION}.tar.gz && \ ./autogen.sh && \ ./configure --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make check && \ make install && \ rm -rf ${DIR} @@ -475,7 +476,7 @@ RUN \ curl -sLO https://github.com/Haivision/srt/archive/v${LIBSRT_VERSION}.tar.gz && \ tar -xz --strip-components=1 -f v${LIBSRT_VERSION}.tar.gz && \ cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -487,7 +488,7 @@ RUN \ git clone https://git.code.sf.net/p/libpng/code ${DIR} -b v${LIBPNG_VERSION} --depth 1 && \ ./autogen.sh && \ ./configure --prefix="${PREFIX}" && \ - make check && \ + make check -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -501,7 +502,20 @@ RUN \ tar -xz --strip-components=1 -f v${LIBARIBB24_VERSION}.tar.gz && \ autoreconf -fiv && \ ./configure CFLAGS="-I${PREFIX}/include -fPIC" --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ + make install && \ + rm -rf ${DIR} + + +## libsvtav1 +RUN \ + DIR=/tmp/svtav1 && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + git clone https://gitlab.com/AOMediaCodec/SVT-AV1.git ${DIR} --depth=1 -b ${LIBSTVAV1_VERSION} &&\ + cd Build && \ + cmake .. -G"Unix Makefiles" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="${PREFIX}" && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -551,12 +565,13 @@ RUN \ --enable-libopenjpeg \ --enable-libkvazaar \ --enable-libaom \ + --enable-libsvtav1 \ --extra-libs=-lpthread \ --enable-libsrt \ --enable-libaribb24 \ --extra-cflags="-I${PREFIX}/include" \ --extra-ldflags="-L${PREFIX}/lib" && \ - make && \ + make -j $(nproc) && \ 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..022c5578d 100644 --- a/docker-images/4.2/ubuntu2004/Dockerfile +++ b/docker-images/4.2/ubuntu2004/Dockerfile @@ -17,7 +17,8 @@ RUN apt-get -yqq update && \ FROM base as build ENV FFMPEG_VERSION=4.2.4 \ - AOM_VERSION=v1.0.0 \ + LIBSTVAV1_VERSION=v0.8.7 \ + AOM_VERSION=v3.1.3 \ FDKAAC_VERSION=0.1.5 \ FONTCONFIG_VERSION=2.12.4 \ FREETYPE_VERSION=2.10.4 \ @@ -127,7 +128,7 @@ RUN \ curl -sL https://versaweb.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${OPENCOREAMR_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## x264 http://www.videolan.org/developers/x264.html @@ -138,7 +139,7 @@ RUN \ curl -sL https://download.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-${X264_VERSION}.tar.bz2 | \ tar -jx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared --enable-pic --disable-cli && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### x265 http://x265.org/ @@ -152,7 +153,7 @@ RUN \ sed -i "/-DEXTRA_LIB/ s/$/ -DCMAKE_INSTALL_PREFIX=\${PREFIX}/" multilib.sh && \ sed -i "/^cmake/ s/$/ -DENABLE_CLI=OFF/" multilib.sh && \ ./multilib.sh && \ - make -C 8bit install && \ + make -C 8bit -j $(nproc) install && \ rm -rf ${DIR} ### libogg https://www.xiph.org/ogg/ RUN \ @@ -163,7 +164,7 @@ RUN \ echo ${OGG_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f libogg-${OGG_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libopus https://www.opus-codec.org/ @@ -176,7 +177,7 @@ RUN \ tar -zx --strip-components=1 -f opus-${OPUS_VERSION}.tar.gz && \ autoreconf -fiv && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libvorbis https://xiph.org/vorbis/ @@ -188,7 +189,7 @@ RUN \ echo ${VORBIS_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f libvorbis-${VORBIS_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libtheora http://www.theora.org/ @@ -200,7 +201,7 @@ RUN \ echo ${THEORA_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f libtheora-${THEORA_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libvpx https://www.webmproject.org/code/ @@ -212,7 +213,7 @@ RUN \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-vp8 --enable-vp9 --enable-vp9-highbitdepth --enable-pic --enable-shared \ --disable-debug --disable-examples --disable-docs --disable-install-bins && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libwebp https://developers.google.com/speed/webp/ @@ -223,7 +224,7 @@ RUN \ curl -sL https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-${WEBP_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libmp3lame http://lame.sourceforge.net/ @@ -234,7 +235,7 @@ RUN \ curl -sL https://versaweb.dl.sourceforge.net/project/lame/lame/$(echo ${LAME_VERSION} | sed -e 's/[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)/\1.\2/')/lame-${LAME_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" --enable-shared --enable-nasm --disable-frontend && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### xvid https://www.xvid.com/ @@ -247,7 +248,7 @@ RUN \ tar -zx -f xvidcore-${XVID_VERSION}.tar.gz && \ cd xvidcore/build/generic && \ ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### fdk-aac https://github.com/mstorsjo/fdk-aac @@ -259,7 +260,7 @@ RUN \ tar -zx --strip-components=1 && \ autoreconf -fiv && \ ./configure --prefix="${PREFIX}" --enable-shared --datadir="${DIR}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## openjpeg https://github.com/uclouvain/openjpeg @@ -270,7 +271,7 @@ RUN \ curl -sL https://github.com/uclouvain/openjpeg/archive/v${OPENJPEG_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ cmake -DBUILD_THIRDPARTY:BOOL=ON -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## freetype https://www.freetype.org/ @@ -282,7 +283,7 @@ RUN \ echo ${FREETYPE_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f freetype-${FREETYPE_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## libvstab https://github.com/georgmartius/vid.stab @@ -294,7 +295,7 @@ RUN \ echo ${LIBVIDSTAB_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f v${LIBVIDSTAB_VERSION}.tar.gz && \ cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## fridibi https://www.fribidi.org/ @@ -319,7 +320,7 @@ RUN \ curl -sLO https://www.freedesktop.org/software/fontconfig/release/fontconfig-${FONTCONFIG_VERSION}.tar.bz2 && \ tar -jx --strip-components=1 -f fontconfig-${FONTCONFIG_VERSION}.tar.bz2 && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## libass https://github.com/libass/libass @@ -332,7 +333,7 @@ RUN \ tar -zx --strip-components=1 -f ${LIBASS_VERSION}.tar.gz && \ ./autogen.sh && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## kvazaar https://github.com/ultravideo/kvazaar @@ -356,7 +357,7 @@ RUN \ mkdir -p ./aom_build ; \ cd ./aom_build ; \ cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" -DBUILD_SHARED_LIBS=1 ..; \ - make ; \ + make -j $(nproc); \ make install ; \ rm -rf ${DIR} @@ -368,7 +369,7 @@ RUN \ curl -sLO https://www.x.org/archive//individual/util/util-macros-${XORG_MACROS_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f util-macros-${XORG_MACROS_VERSION}.tar.gz && \ ./configure --srcdir=${DIR} --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -379,7 +380,7 @@ RUN \ curl -sLO https://www.x.org/archive/individual/proto/xproto-${XPROTO_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f xproto-${XPROTO_VERSION}.tar.gz && \ ./configure --srcdir=${DIR} --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -390,7 +391,7 @@ RUN \ curl -sLO https://www.x.org/archive/individual/lib/libXau-${XAU_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f libXau-${XAU_VERSION}.tar.gz && \ ./configure --srcdir=${DIR} --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -401,7 +402,7 @@ RUN \ curl -sLO https://xcb.freedesktop.org/dist/libpthread-stubs-${LIBPTHREAD_STUBS_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f libpthread-stubs-${LIBPTHREAD_STUBS_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -413,7 +414,7 @@ RUN \ tar -zx --strip-components=1 -f xcb-proto-${XCBPROTO_VERSION}.tar.gz && \ ACLOCAL_PATH="${PREFIX}/share/aclocal" ./autogen.sh && \ ./configure --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -425,7 +426,7 @@ RUN \ tar -zx --strip-components=1 -f libxcb-${LIBXCB_VERSION}.tar.gz && \ ACLOCAL_PATH="${PREFIX}/share/aclocal" ./autogen.sh && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -438,7 +439,7 @@ RUN \ echo ${LIBXML2_SHA256SUM} | sha256sum --check && \ tar -xz --strip-components=1 -f libxml2-v${LIBXML2_VERSION}.tar.gz && \ ./autogen.sh --prefix="${PREFIX}" --with-ftp=no --with-http=no --with-python=no && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -451,7 +452,7 @@ RUN \ echo ${LIBBLURAY_SHA256SUM} | sha256sum --check && \ tar -jx --strip-components=1 -f libbluray-${LIBBLURAY_VERSION}.tar.bz2 && \ ./configure --prefix="${PREFIX}" --disable-examples --disable-bdjava-jar --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -465,7 +466,7 @@ RUN \ tar -xz --strip-components=1 -f v${LIBZMQ_VERSION}.tar.gz && \ ./autogen.sh && \ ./configure --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make check && \ make install && \ rm -rf ${DIR} @@ -478,7 +479,7 @@ RUN \ curl -sLO https://github.com/Haivision/srt/archive/v${LIBSRT_VERSION}.tar.gz && \ tar -xz --strip-components=1 -f v${LIBSRT_VERSION}.tar.gz && \ cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -490,7 +491,7 @@ RUN \ git clone https://git.code.sf.net/p/libpng/code ${DIR} -b v${LIBPNG_VERSION} --depth 1 && \ ./autogen.sh && \ ./configure --prefix="${PREFIX}" && \ - make check && \ + make check -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -504,7 +505,20 @@ RUN \ tar -xz --strip-components=1 -f v${LIBARIBB24_VERSION}.tar.gz && \ autoreconf -fiv && \ ./configure CFLAGS="-I${PREFIX}/include -fPIC" --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ + make install && \ + rm -rf ${DIR} + + +## libsvtav1 +RUN \ + DIR=/tmp/svtav1 && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + git clone https://gitlab.com/AOMediaCodec/SVT-AV1.git ${DIR} --depth=1 -b ${LIBSTVAV1_VERSION} &&\ + cd Build && \ + cmake .. -G"Unix Makefiles" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="${PREFIX}" && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -554,12 +568,13 @@ RUN \ --enable-libopenjpeg \ --enable-libkvazaar \ --enable-libaom \ + --enable-libsvtav1 \ --extra-libs=-lpthread \ --enable-libsrt \ --enable-libaribb24 \ --extra-cflags="-I${PREFIX}/include" \ --extra-ldflags="-L${PREFIX}/lib" && \ - make && \ + make -j $(nproc) && \ 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..dc1dd6830 100644 --- a/docker-images/4.2/vaapi2004/Dockerfile +++ b/docker-images/4.2/vaapi2004/Dockerfile @@ -17,7 +17,8 @@ RUN apt-get -yqq update && \ FROM base as build ENV FFMPEG_VERSION=4.2.4 \ - AOM_VERSION=v1.0.0 \ + LIBSTVAV1_VERSION=v0.8.7 \ + AOM_VERSION=v3.1.3 \ FDKAAC_VERSION=0.1.5 \ FONTCONFIG_VERSION=2.12.4 \ FREETYPE_VERSION=2.10.4 \ @@ -128,7 +129,7 @@ RUN \ curl -sL https://versaweb.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${OPENCOREAMR_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## x264 http://www.videolan.org/developers/x264.html @@ -139,7 +140,7 @@ RUN \ curl -sL https://download.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-${X264_VERSION}.tar.bz2 | \ tar -jx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared --enable-pic --disable-cli && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### x265 http://x265.org/ @@ -153,7 +154,7 @@ RUN \ sed -i "/-DEXTRA_LIB/ s/$/ -DCMAKE_INSTALL_PREFIX=\${PREFIX}/" multilib.sh && \ sed -i "/^cmake/ s/$/ -DENABLE_CLI=OFF/" multilib.sh && \ ./multilib.sh && \ - make -C 8bit install && \ + make -C 8bit -j $(nproc) install && \ rm -rf ${DIR} ### libogg https://www.xiph.org/ogg/ RUN \ @@ -164,7 +165,7 @@ RUN \ echo ${OGG_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f libogg-${OGG_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libopus https://www.opus-codec.org/ @@ -177,7 +178,7 @@ RUN \ tar -zx --strip-components=1 -f opus-${OPUS_VERSION}.tar.gz && \ autoreconf -fiv && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libvorbis https://xiph.org/vorbis/ @@ -189,7 +190,7 @@ RUN \ echo ${VORBIS_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f libvorbis-${VORBIS_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libtheora http://www.theora.org/ @@ -201,7 +202,7 @@ RUN \ echo ${THEORA_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f libtheora-${THEORA_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libvpx https://www.webmproject.org/code/ @@ -213,7 +214,7 @@ RUN \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-vp8 --enable-vp9 --enable-vp9-highbitdepth --enable-pic --enable-shared \ --disable-debug --disable-examples --disable-docs --disable-install-bins && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libwebp https://developers.google.com/speed/webp/ @@ -224,7 +225,7 @@ RUN \ curl -sL https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-${WEBP_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libmp3lame http://lame.sourceforge.net/ @@ -235,7 +236,7 @@ RUN \ curl -sL https://versaweb.dl.sourceforge.net/project/lame/lame/$(echo ${LAME_VERSION} | sed -e 's/[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)/\1.\2/')/lame-${LAME_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" --enable-shared --enable-nasm --disable-frontend && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### xvid https://www.xvid.com/ @@ -248,7 +249,7 @@ RUN \ tar -zx -f xvidcore-${XVID_VERSION}.tar.gz && \ cd xvidcore/build/generic && \ ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### fdk-aac https://github.com/mstorsjo/fdk-aac @@ -260,7 +261,7 @@ RUN \ tar -zx --strip-components=1 && \ autoreconf -fiv && \ ./configure --prefix="${PREFIX}" --enable-shared --datadir="${DIR}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## openjpeg https://github.com/uclouvain/openjpeg @@ -271,7 +272,7 @@ RUN \ curl -sL https://github.com/uclouvain/openjpeg/archive/v${OPENJPEG_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ cmake -DBUILD_THIRDPARTY:BOOL=ON -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## freetype https://www.freetype.org/ @@ -283,7 +284,7 @@ RUN \ echo ${FREETYPE_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f freetype-${FREETYPE_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## libvstab https://github.com/georgmartius/vid.stab @@ -295,7 +296,7 @@ RUN \ echo ${LIBVIDSTAB_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f v${LIBVIDSTAB_VERSION}.tar.gz && \ cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## fridibi https://www.fribidi.org/ @@ -320,7 +321,7 @@ RUN \ curl -sLO https://www.freedesktop.org/software/fontconfig/release/fontconfig-${FONTCONFIG_VERSION}.tar.bz2 && \ tar -jx --strip-components=1 -f fontconfig-${FONTCONFIG_VERSION}.tar.bz2 && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## libass https://github.com/libass/libass @@ -333,7 +334,7 @@ RUN \ tar -zx --strip-components=1 -f ${LIBASS_VERSION}.tar.gz && \ ./autogen.sh && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## kvazaar https://github.com/ultravideo/kvazaar @@ -357,7 +358,7 @@ RUN \ mkdir -p ./aom_build ; \ cd ./aom_build ; \ cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" -DBUILD_SHARED_LIBS=1 ..; \ - make ; \ + make -j $(nproc); \ make install ; \ rm -rf ${DIR} @@ -369,7 +370,7 @@ RUN \ curl -sLO https://www.x.org/archive//individual/util/util-macros-${XORG_MACROS_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f util-macros-${XORG_MACROS_VERSION}.tar.gz && \ ./configure --srcdir=${DIR} --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -380,7 +381,7 @@ RUN \ curl -sLO https://www.x.org/archive/individual/proto/xproto-${XPROTO_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f xproto-${XPROTO_VERSION}.tar.gz && \ ./configure --srcdir=${DIR} --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -391,7 +392,7 @@ RUN \ curl -sLO https://www.x.org/archive/individual/lib/libXau-${XAU_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f libXau-${XAU_VERSION}.tar.gz && \ ./configure --srcdir=${DIR} --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -402,7 +403,7 @@ RUN \ curl -sLO https://xcb.freedesktop.org/dist/libpthread-stubs-${LIBPTHREAD_STUBS_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f libpthread-stubs-${LIBPTHREAD_STUBS_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -414,7 +415,7 @@ RUN \ tar -zx --strip-components=1 -f xcb-proto-${XCBPROTO_VERSION}.tar.gz && \ ACLOCAL_PATH="${PREFIX}/share/aclocal" ./autogen.sh && \ ./configure --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -426,7 +427,7 @@ RUN \ tar -zx --strip-components=1 -f libxcb-${LIBXCB_VERSION}.tar.gz && \ ACLOCAL_PATH="${PREFIX}/share/aclocal" ./autogen.sh && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -439,7 +440,7 @@ RUN \ echo ${LIBXML2_SHA256SUM} | sha256sum --check && \ tar -xz --strip-components=1 -f libxml2-v${LIBXML2_VERSION}.tar.gz && \ ./autogen.sh --prefix="${PREFIX}" --with-ftp=no --with-http=no --with-python=no && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -452,7 +453,7 @@ RUN \ echo ${LIBBLURAY_SHA256SUM} | sha256sum --check && \ tar -jx --strip-components=1 -f libbluray-${LIBBLURAY_VERSION}.tar.bz2 && \ ./configure --prefix="${PREFIX}" --disable-examples --disable-bdjava-jar --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -466,7 +467,7 @@ RUN \ tar -xz --strip-components=1 -f v${LIBZMQ_VERSION}.tar.gz && \ ./autogen.sh && \ ./configure --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make check && \ make install && \ rm -rf ${DIR} @@ -479,7 +480,7 @@ RUN \ curl -sLO https://github.com/Haivision/srt/archive/v${LIBSRT_VERSION}.tar.gz && \ tar -xz --strip-components=1 -f v${LIBSRT_VERSION}.tar.gz && \ cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -491,7 +492,7 @@ RUN \ git clone https://git.code.sf.net/p/libpng/code ${DIR} -b v${LIBPNG_VERSION} --depth 1 && \ ./autogen.sh && \ ./configure --prefix="${PREFIX}" && \ - make check && \ + make check -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -505,7 +506,20 @@ RUN \ tar -xz --strip-components=1 -f v${LIBARIBB24_VERSION}.tar.gz && \ autoreconf -fiv && \ ./configure CFLAGS="-I${PREFIX}/include -fPIC" --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ + make install && \ + rm -rf ${DIR} + + +## libsvtav1 +RUN \ + DIR=/tmp/svtav1 && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + git clone https://gitlab.com/AOMediaCodec/SVT-AV1.git ${DIR} --depth=1 -b ${LIBSTVAV1_VERSION} &&\ + cd Build && \ + cmake .. -G"Unix Makefiles" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="${PREFIX}" && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -555,13 +569,14 @@ RUN \ --enable-libopenjpeg \ --enable-libkvazaar \ --enable-libaom \ + --enable-libsvtav1 \ --extra-libs=-lpthread \ --enable-libsrt \ --enable-libaribb24 \ --enable-vaapi \ --extra-cflags="-I${PREFIX}/include" \ --extra-ldflags="-L${PREFIX}/lib" && \ - make && \ + make -j $(nproc) && \ 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..38fb6f7af 100644 --- a/docker-images/4.3/alpine312/Dockerfile +++ b/docker-images/4.3/alpine312/Dockerfile @@ -14,7 +14,8 @@ FROM base AS build WORKDIR /tmp/workdir ENV FFMPEG_VERSION=4.3.2 \ - AOM_VERSION=v1.0.0 \ + LIBSTVAV1_VERSION=v0.8.7 \ + AOM_VERSION=v3.1.3 \ FDKAAC_VERSION=0.1.5 \ FONTCONFIG_VERSION=2.12.4 \ FREETYPE_VERSION=2.10.4 \ @@ -93,6 +94,8 @@ RUN buildDeps="autoconf \ yasm \ nasm \ zlib-dev \ + meson \ + xxd \ expat-dev" && \ apk add --no-cache --update ${buildDeps} ## libvmaf https://github.com/Netflix/vmaf @@ -123,7 +126,7 @@ RUN \ curl -sL https://versaweb.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${OPENCOREAMR_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## x264 http://www.videolan.org/developers/x264.html @@ -134,7 +137,7 @@ RUN \ curl -sL https://download.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-${X264_VERSION}.tar.bz2 | \ tar -jx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared --enable-pic --disable-cli && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### x265 http://x265.org/ @@ -148,7 +151,7 @@ RUN \ sed -i "/-DEXTRA_LIB/ s/$/ -DCMAKE_INSTALL_PREFIX=\${PREFIX}/" multilib.sh && \ sed -i "/^cmake/ s/$/ -DENABLE_CLI=OFF/" multilib.sh && \ ./multilib.sh && \ - make -C 8bit install && \ + make -C 8bit -j $(nproc) install && \ rm -rf ${DIR} ### libogg https://www.xiph.org/ogg/ RUN \ @@ -159,7 +162,7 @@ RUN \ echo ${OGG_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f libogg-${OGG_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libopus https://www.opus-codec.org/ @@ -172,7 +175,7 @@ RUN \ tar -zx --strip-components=1 -f opus-${OPUS_VERSION}.tar.gz && \ autoreconf -fiv && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libvorbis https://xiph.org/vorbis/ @@ -184,7 +187,7 @@ RUN \ echo ${VORBIS_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f libvorbis-${VORBIS_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libtheora http://www.theora.org/ @@ -196,7 +199,7 @@ RUN \ echo ${THEORA_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f libtheora-${THEORA_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libvpx https://www.webmproject.org/code/ @@ -208,7 +211,7 @@ RUN \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-vp8 --enable-vp9 --enable-vp9-highbitdepth --enable-pic --enable-shared \ --disable-debug --disable-examples --disable-docs --disable-install-bins && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libwebp https://developers.google.com/speed/webp/ @@ -219,7 +222,7 @@ RUN \ curl -sL https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-${WEBP_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libmp3lame http://lame.sourceforge.net/ @@ -230,7 +233,7 @@ RUN \ curl -sL https://versaweb.dl.sourceforge.net/project/lame/lame/$(echo ${LAME_VERSION} | sed -e 's/[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)/\1.\2/')/lame-${LAME_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" --enable-shared --enable-nasm --disable-frontend && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### xvid https://www.xvid.com/ @@ -243,7 +246,7 @@ RUN \ tar -zx -f xvidcore-${XVID_VERSION}.tar.gz && \ cd xvidcore/build/generic && \ ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### fdk-aac https://github.com/mstorsjo/fdk-aac @@ -255,7 +258,7 @@ RUN \ tar -zx --strip-components=1 && \ autoreconf -fiv && \ ./configure --prefix="${PREFIX}" --enable-shared --datadir="${DIR}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## openjpeg https://github.com/uclouvain/openjpeg @@ -266,7 +269,7 @@ RUN \ curl -sL https://github.com/uclouvain/openjpeg/archive/v${OPENJPEG_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ cmake -DBUILD_THIRDPARTY:BOOL=ON -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## freetype https://www.freetype.org/ @@ -278,7 +281,7 @@ RUN \ echo ${FREETYPE_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f freetype-${FREETYPE_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## libvstab https://github.com/georgmartius/vid.stab @@ -290,7 +293,7 @@ RUN \ echo ${LIBVIDSTAB_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f v${LIBVIDSTAB_VERSION}.tar.gz && \ cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## fridibi https://www.fribidi.org/ @@ -315,7 +318,7 @@ RUN \ curl -sLO https://www.freedesktop.org/software/fontconfig/release/fontconfig-${FONTCONFIG_VERSION}.tar.bz2 && \ tar -jx --strip-components=1 -f fontconfig-${FONTCONFIG_VERSION}.tar.bz2 && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## libass https://github.com/libass/libass @@ -328,7 +331,7 @@ RUN \ tar -zx --strip-components=1 -f ${LIBASS_VERSION}.tar.gz && \ ./autogen.sh && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## kvazaar https://github.com/ultravideo/kvazaar @@ -352,7 +355,7 @@ RUN \ mkdir -p ./aom_build ; \ cd ./aom_build ; \ cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" -DBUILD_SHARED_LIBS=1 ..; \ - make ; \ + make -j $(nproc); \ make install ; \ rm -rf ${DIR} @@ -364,7 +367,7 @@ RUN \ curl -sLO https://www.x.org/archive//individual/util/util-macros-${XORG_MACROS_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f util-macros-${XORG_MACROS_VERSION}.tar.gz && \ ./configure --srcdir=${DIR} --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -375,7 +378,7 @@ RUN \ curl -sLO https://www.x.org/archive/individual/proto/xproto-${XPROTO_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f xproto-${XPROTO_VERSION}.tar.gz && \ ./configure --srcdir=${DIR} --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -386,7 +389,7 @@ RUN \ curl -sLO https://www.x.org/archive/individual/lib/libXau-${XAU_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f libXau-${XAU_VERSION}.tar.gz && \ ./configure --srcdir=${DIR} --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -397,7 +400,7 @@ RUN \ curl -sLO https://xcb.freedesktop.org/dist/libpthread-stubs-${LIBPTHREAD_STUBS_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f libpthread-stubs-${LIBPTHREAD_STUBS_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -409,7 +412,7 @@ RUN \ tar -zx --strip-components=1 -f xcb-proto-${XCBPROTO_VERSION}.tar.gz && \ ACLOCAL_PATH="${PREFIX}/share/aclocal" ./autogen.sh && \ ./configure --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -421,7 +424,7 @@ RUN \ tar -zx --strip-components=1 -f libxcb-${LIBXCB_VERSION}.tar.gz && \ ACLOCAL_PATH="${PREFIX}/share/aclocal" ./autogen.sh && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -434,7 +437,7 @@ RUN \ echo ${LIBXML2_SHA256SUM} | sha256sum --check && \ tar -xz --strip-components=1 -f libxml2-v${LIBXML2_VERSION}.tar.gz && \ ./autogen.sh --prefix="${PREFIX}" --with-ftp=no --with-http=no --with-python=no && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -447,7 +450,7 @@ RUN \ echo ${LIBBLURAY_SHA256SUM} | sha256sum --check && \ tar -jx --strip-components=1 -f libbluray-${LIBBLURAY_VERSION}.tar.bz2 && \ ./configure --prefix="${PREFIX}" --disable-examples --disable-bdjava-jar --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -461,7 +464,7 @@ RUN \ tar -xz --strip-components=1 -f v${LIBZMQ_VERSION}.tar.gz && \ ./autogen.sh && \ ./configure --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make check && \ make install && \ rm -rf ${DIR} @@ -474,7 +477,7 @@ RUN \ curl -sLO https://github.com/Haivision/srt/archive/v${LIBSRT_VERSION}.tar.gz && \ tar -xz --strip-components=1 -f v${LIBSRT_VERSION}.tar.gz && \ cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -486,7 +489,7 @@ RUN \ git clone https://git.code.sf.net/p/libpng/code ${DIR} -b v${LIBPNG_VERSION} --depth 1 && \ ./autogen.sh && \ ./configure --prefix="${PREFIX}" && \ - make check && \ + make check -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -500,7 +503,20 @@ RUN \ tar -xz --strip-components=1 -f v${LIBARIBB24_VERSION}.tar.gz && \ autoreconf -fiv && \ ./configure CFLAGS="-I${PREFIX}/include -fPIC" --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ + make install && \ + rm -rf ${DIR} + + +## libsvtav1 +RUN \ + DIR=/tmp/svtav1 && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + git clone https://gitlab.com/AOMediaCodec/SVT-AV1.git ${DIR} --depth=1 -b ${LIBSTVAV1_VERSION} &&\ + cd Build && \ + cmake .. -G"Unix Makefiles" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="${PREFIX}" && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -550,12 +566,14 @@ RUN \ --enable-libopenjpeg \ --enable-libkvazaar \ --enable-libaom \ + --enable-libsvtav1 \ --extra-libs=-lpthread \ --enable-libsrt \ --enable-libaribb24 \ + --enable-libvmaf \ --extra-cflags="-I${PREFIX}/include" \ --extra-ldflags="-L${PREFIX}/lib" && \ - make && \ + make -j $(nproc) && \ 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..ba7736c8e 100644 --- a/docker-images/4.3/alpine38/Dockerfile +++ b/docker-images/4.3/alpine38/Dockerfile @@ -14,7 +14,8 @@ FROM base AS build WORKDIR /tmp/workdir ENV FFMPEG_VERSION=4.3.2 \ - AOM_VERSION=v1.0.0 \ + LIBSTVAV1_VERSION=v0.8.7 \ + AOM_VERSION=v3.1.3 \ FDKAAC_VERSION=0.1.5 \ FONTCONFIG_VERSION=2.12.4 \ FREETYPE_VERSION=2.10.4 \ @@ -123,7 +124,7 @@ RUN \ curl -sL https://versaweb.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${OPENCOREAMR_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## x264 http://www.videolan.org/developers/x264.html @@ -134,7 +135,7 @@ RUN \ curl -sL https://download.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-${X264_VERSION}.tar.bz2 | \ tar -jx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared --enable-pic --disable-cli && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### x265 http://x265.org/ @@ -148,7 +149,7 @@ RUN \ sed -i "/-DEXTRA_LIB/ s/$/ -DCMAKE_INSTALL_PREFIX=\${PREFIX}/" multilib.sh && \ sed -i "/^cmake/ s/$/ -DENABLE_CLI=OFF/" multilib.sh && \ ./multilib.sh && \ - make -C 8bit install && \ + make -C 8bit -j $(nproc) install && \ rm -rf ${DIR} ### libogg https://www.xiph.org/ogg/ RUN \ @@ -159,7 +160,7 @@ RUN \ echo ${OGG_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f libogg-${OGG_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libopus https://www.opus-codec.org/ @@ -172,7 +173,7 @@ RUN \ tar -zx --strip-components=1 -f opus-${OPUS_VERSION}.tar.gz && \ autoreconf -fiv && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libvorbis https://xiph.org/vorbis/ @@ -184,7 +185,7 @@ RUN \ echo ${VORBIS_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f libvorbis-${VORBIS_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libtheora http://www.theora.org/ @@ -196,7 +197,7 @@ RUN \ echo ${THEORA_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f libtheora-${THEORA_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libvpx https://www.webmproject.org/code/ @@ -208,7 +209,7 @@ RUN \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-vp8 --enable-vp9 --enable-vp9-highbitdepth --enable-pic --enable-shared \ --disable-debug --disable-examples --disable-docs --disable-install-bins && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libwebp https://developers.google.com/speed/webp/ @@ -219,7 +220,7 @@ RUN \ curl -sL https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-${WEBP_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libmp3lame http://lame.sourceforge.net/ @@ -230,7 +231,7 @@ RUN \ curl -sL https://versaweb.dl.sourceforge.net/project/lame/lame/$(echo ${LAME_VERSION} | sed -e 's/[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)/\1.\2/')/lame-${LAME_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" --enable-shared --enable-nasm --disable-frontend && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### xvid https://www.xvid.com/ @@ -243,7 +244,7 @@ RUN \ tar -zx -f xvidcore-${XVID_VERSION}.tar.gz && \ cd xvidcore/build/generic && \ ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### fdk-aac https://github.com/mstorsjo/fdk-aac @@ -255,7 +256,7 @@ RUN \ tar -zx --strip-components=1 && \ autoreconf -fiv && \ ./configure --prefix="${PREFIX}" --enable-shared --datadir="${DIR}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## openjpeg https://github.com/uclouvain/openjpeg @@ -266,7 +267,7 @@ RUN \ curl -sL https://github.com/uclouvain/openjpeg/archive/v${OPENJPEG_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ cmake -DBUILD_THIRDPARTY:BOOL=ON -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## freetype https://www.freetype.org/ @@ -278,7 +279,7 @@ RUN \ echo ${FREETYPE_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f freetype-${FREETYPE_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## libvstab https://github.com/georgmartius/vid.stab @@ -290,7 +291,7 @@ RUN \ echo ${LIBVIDSTAB_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f v${LIBVIDSTAB_VERSION}.tar.gz && \ cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## fridibi https://www.fribidi.org/ @@ -315,7 +316,7 @@ RUN \ curl -sLO https://www.freedesktop.org/software/fontconfig/release/fontconfig-${FONTCONFIG_VERSION}.tar.bz2 && \ tar -jx --strip-components=1 -f fontconfig-${FONTCONFIG_VERSION}.tar.bz2 && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## libass https://github.com/libass/libass @@ -328,7 +329,7 @@ RUN \ tar -zx --strip-components=1 -f ${LIBASS_VERSION}.tar.gz && \ ./autogen.sh && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## kvazaar https://github.com/ultravideo/kvazaar @@ -352,7 +353,7 @@ RUN \ mkdir -p ./aom_build ; \ cd ./aom_build ; \ cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" -DBUILD_SHARED_LIBS=1 ..; \ - make ; \ + make -j $(nproc); \ make install ; \ rm -rf ${DIR} @@ -364,7 +365,7 @@ RUN \ curl -sLO https://www.x.org/archive//individual/util/util-macros-${XORG_MACROS_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f util-macros-${XORG_MACROS_VERSION}.tar.gz && \ ./configure --srcdir=${DIR} --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -375,7 +376,7 @@ RUN \ curl -sLO https://www.x.org/archive/individual/proto/xproto-${XPROTO_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f xproto-${XPROTO_VERSION}.tar.gz && \ ./configure --srcdir=${DIR} --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -386,7 +387,7 @@ RUN \ curl -sLO https://www.x.org/archive/individual/lib/libXau-${XAU_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f libXau-${XAU_VERSION}.tar.gz && \ ./configure --srcdir=${DIR} --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -397,7 +398,7 @@ RUN \ curl -sLO https://xcb.freedesktop.org/dist/libpthread-stubs-${LIBPTHREAD_STUBS_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f libpthread-stubs-${LIBPTHREAD_STUBS_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -409,7 +410,7 @@ RUN \ tar -zx --strip-components=1 -f xcb-proto-${XCBPROTO_VERSION}.tar.gz && \ ACLOCAL_PATH="${PREFIX}/share/aclocal" ./autogen.sh && \ ./configure --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -421,7 +422,7 @@ RUN \ tar -zx --strip-components=1 -f libxcb-${LIBXCB_VERSION}.tar.gz && \ ACLOCAL_PATH="${PREFIX}/share/aclocal" ./autogen.sh && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -434,7 +435,7 @@ RUN \ echo ${LIBXML2_SHA256SUM} | sha256sum --check && \ tar -xz --strip-components=1 -f libxml2-v${LIBXML2_VERSION}.tar.gz && \ ./autogen.sh --prefix="${PREFIX}" --with-ftp=no --with-http=no --with-python=no && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -447,7 +448,7 @@ RUN \ echo ${LIBBLURAY_SHA256SUM} | sha256sum --check && \ tar -jx --strip-components=1 -f libbluray-${LIBBLURAY_VERSION}.tar.bz2 && \ ./configure --prefix="${PREFIX}" --disable-examples --disable-bdjava-jar --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -461,7 +462,7 @@ RUN \ tar -xz --strip-components=1 -f v${LIBZMQ_VERSION}.tar.gz && \ ./autogen.sh && \ ./configure --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make check && \ make install && \ rm -rf ${DIR} @@ -474,7 +475,7 @@ RUN \ curl -sLO https://github.com/Haivision/srt/archive/v${LIBSRT_VERSION}.tar.gz && \ tar -xz --strip-components=1 -f v${LIBSRT_VERSION}.tar.gz && \ cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -486,7 +487,7 @@ RUN \ git clone https://git.code.sf.net/p/libpng/code ${DIR} -b v${LIBPNG_VERSION} --depth 1 && \ ./autogen.sh && \ ./configure --prefix="${PREFIX}" && \ - make check && \ + make check -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -500,7 +501,20 @@ RUN \ tar -xz --strip-components=1 -f v${LIBARIBB24_VERSION}.tar.gz && \ autoreconf -fiv && \ ./configure CFLAGS="-I${PREFIX}/include -fPIC" --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ + make install && \ + rm -rf ${DIR} + + +## libsvtav1 +RUN \ + DIR=/tmp/svtav1 && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + git clone https://gitlab.com/AOMediaCodec/SVT-AV1.git ${DIR} --depth=1 -b ${LIBSTVAV1_VERSION} &&\ + cd Build && \ + cmake .. -G"Unix Makefiles" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="${PREFIX}" && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -550,12 +564,13 @@ RUN \ --enable-libopenjpeg \ --enable-libkvazaar \ --enable-libaom \ + --enable-libsvtav1 \ --extra-libs=-lpthread \ --enable-libsrt \ --enable-libaribb24 \ --extra-cflags="-I${PREFIX}/include" \ --extra-ldflags="-L${PREFIX}/lib" && \ - make && \ + make -j $(nproc) && \ 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..e1d480879 100644 --- a/docker-images/4.3/centos7/Dockerfile +++ b/docker-images/4.3/centos7/Dockerfile @@ -16,7 +16,8 @@ FROM base AS build WORKDIR /tmp/workdir ENV FFMPEG_VERSION=4.3.2 \ - AOM_VERSION=v1.0.0 \ + LIBSTVAV1_VERSION=v0.8.7 \ + AOM_VERSION=v3.1.3 \ FDKAAC_VERSION=0.1.5 \ FONTCONFIG_VERSION=2.12.4 \ FREETYPE_VERSION=2.10.4 \ @@ -160,7 +161,7 @@ RUN \ curl -sL https://versaweb.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${OPENCOREAMR_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## x264 http://www.videolan.org/developers/x264.html @@ -171,7 +172,7 @@ RUN \ curl -sL https://download.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-${X264_VERSION}.tar.bz2 | \ tar -jx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared --enable-pic --disable-cli && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### x265 http://x265.org/ @@ -185,7 +186,7 @@ RUN \ sed -i "/-DEXTRA_LIB/ s/$/ -DCMAKE_INSTALL_PREFIX=\${PREFIX}/" multilib.sh && \ sed -i "/^cmake/ s/$/ -DENABLE_CLI=OFF/" multilib.sh && \ ./multilib.sh && \ - make -C 8bit install && \ + make -C 8bit -j $(nproc) install && \ rm -rf ${DIR} ### libogg https://www.xiph.org/ogg/ RUN \ @@ -196,7 +197,7 @@ RUN \ echo ${OGG_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f libogg-${OGG_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libopus https://www.opus-codec.org/ @@ -209,7 +210,7 @@ RUN \ tar -zx --strip-components=1 -f opus-${OPUS_VERSION}.tar.gz && \ autoreconf -fiv && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libvorbis https://xiph.org/vorbis/ @@ -221,7 +222,7 @@ RUN \ echo ${VORBIS_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f libvorbis-${VORBIS_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libtheora http://www.theora.org/ @@ -233,7 +234,7 @@ RUN \ echo ${THEORA_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f libtheora-${THEORA_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libvpx https://www.webmproject.org/code/ @@ -245,7 +246,7 @@ RUN \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-vp8 --enable-vp9 --enable-vp9-highbitdepth --enable-pic --enable-shared \ --disable-debug --disable-examples --disable-docs --disable-install-bins && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libwebp https://developers.google.com/speed/webp/ @@ -256,7 +257,7 @@ RUN \ curl -sL https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-${WEBP_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libmp3lame http://lame.sourceforge.net/ @@ -267,7 +268,7 @@ RUN \ curl -sL https://versaweb.dl.sourceforge.net/project/lame/lame/$(echo ${LAME_VERSION} | sed -e 's/[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)/\1.\2/')/lame-${LAME_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" --enable-shared --enable-nasm --disable-frontend && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### xvid https://www.xvid.com/ @@ -280,7 +281,7 @@ RUN \ tar -zx -f xvidcore-${XVID_VERSION}.tar.gz && \ cd xvidcore/build/generic && \ ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### fdk-aac https://github.com/mstorsjo/fdk-aac @@ -292,7 +293,7 @@ RUN \ tar -zx --strip-components=1 && \ autoreconf -fiv && \ ./configure --prefix="${PREFIX}" --enable-shared --datadir="${DIR}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## openjpeg https://github.com/uclouvain/openjpeg @@ -303,7 +304,7 @@ RUN \ curl -sL https://github.com/uclouvain/openjpeg/archive/v${OPENJPEG_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ cmake -DBUILD_THIRDPARTY:BOOL=ON -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## freetype https://www.freetype.org/ @@ -315,7 +316,7 @@ RUN \ echo ${FREETYPE_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f freetype-${FREETYPE_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## libvstab https://github.com/georgmartius/vid.stab @@ -327,7 +328,7 @@ RUN \ echo ${LIBVIDSTAB_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f v${LIBVIDSTAB_VERSION}.tar.gz && \ cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## fridibi https://www.fribidi.org/ @@ -352,7 +353,7 @@ RUN \ curl -sLO https://www.freedesktop.org/software/fontconfig/release/fontconfig-${FONTCONFIG_VERSION}.tar.bz2 && \ tar -jx --strip-components=1 -f fontconfig-${FONTCONFIG_VERSION}.tar.bz2 && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## libass https://github.com/libass/libass @@ -365,7 +366,7 @@ RUN \ tar -zx --strip-components=1 -f ${LIBASS_VERSION}.tar.gz && \ ./autogen.sh && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## kvazaar https://github.com/ultravideo/kvazaar @@ -389,7 +390,7 @@ RUN \ mkdir -p ./aom_build ; \ cd ./aom_build ; \ cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" -DBUILD_SHARED_LIBS=1 ..; \ - make ; \ + make -j $(nproc); \ make install ; \ rm -rf ${DIR} @@ -401,7 +402,7 @@ RUN \ curl -sLO https://www.x.org/archive//individual/util/util-macros-${XORG_MACROS_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f util-macros-${XORG_MACROS_VERSION}.tar.gz && \ ./configure --srcdir=${DIR} --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -412,7 +413,7 @@ RUN \ curl -sLO https://www.x.org/archive/individual/proto/xproto-${XPROTO_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f xproto-${XPROTO_VERSION}.tar.gz && \ ./configure --srcdir=${DIR} --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -423,7 +424,7 @@ RUN \ curl -sLO https://www.x.org/archive/individual/lib/libXau-${XAU_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f libXau-${XAU_VERSION}.tar.gz && \ ./configure --srcdir=${DIR} --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -434,7 +435,7 @@ RUN \ curl -sLO https://xcb.freedesktop.org/dist/libpthread-stubs-${LIBPTHREAD_STUBS_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f libpthread-stubs-${LIBPTHREAD_STUBS_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -446,7 +447,7 @@ RUN \ tar -zx --strip-components=1 -f xcb-proto-${XCBPROTO_VERSION}.tar.gz && \ ACLOCAL_PATH="${PREFIX}/share/aclocal" ./autogen.sh && \ ./configure --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -458,7 +459,7 @@ RUN \ tar -zx --strip-components=1 -f libxcb-${LIBXCB_VERSION}.tar.gz && \ ACLOCAL_PATH="${PREFIX}/share/aclocal" ./autogen.sh && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -471,7 +472,7 @@ RUN \ echo ${LIBXML2_SHA256SUM} | sha256sum --check && \ tar -xz --strip-components=1 -f libxml2-v${LIBXML2_VERSION}.tar.gz && \ ./autogen.sh --prefix="${PREFIX}" --with-ftp=no --with-http=no --with-python=no && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -484,7 +485,7 @@ RUN \ echo ${LIBBLURAY_SHA256SUM} | sha256sum --check && \ tar -jx --strip-components=1 -f libbluray-${LIBBLURAY_VERSION}.tar.bz2 && \ ./configure --prefix="${PREFIX}" --disable-examples --disable-bdjava-jar --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -498,7 +499,7 @@ RUN \ tar -xz --strip-components=1 -f v${LIBZMQ_VERSION}.tar.gz && \ ./autogen.sh && \ ./configure --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make check && \ make install && \ rm -rf ${DIR} @@ -511,7 +512,7 @@ RUN \ curl -sLO https://github.com/Haivision/srt/archive/v${LIBSRT_VERSION}.tar.gz && \ tar -xz --strip-components=1 -f v${LIBSRT_VERSION}.tar.gz && \ cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -523,7 +524,7 @@ RUN \ git clone https://git.code.sf.net/p/libpng/code ${DIR} -b v${LIBPNG_VERSION} --depth 1 && \ ./autogen.sh && \ ./configure --prefix="${PREFIX}" && \ - make check && \ + make check -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -537,7 +538,20 @@ RUN \ tar -xz --strip-components=1 -f v${LIBARIBB24_VERSION}.tar.gz && \ autoreconf -fiv && \ ./configure CFLAGS="-I${PREFIX}/include -fPIC" --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ + make install && \ + rm -rf ${DIR} + + +## libsvtav1 +RUN \ + DIR=/tmp/svtav1 && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + git clone https://gitlab.com/AOMediaCodec/SVT-AV1.git ${DIR} --depth=1 -b ${LIBSTVAV1_VERSION} &&\ + cd Build && \ + cmake .. -G"Unix Makefiles" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="${PREFIX}" && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -587,12 +601,13 @@ RUN \ --enable-libopenjpeg \ --enable-libkvazaar \ --enable-libaom \ + --enable-libsvtav1 \ --extra-libs=-lpthread \ --enable-libsrt \ --enable-libaribb24 \ --extra-cflags="-I${PREFIX}/include" \ --extra-ldflags="-L${PREFIX}/lib" && \ - make && \ + make -j $(nproc) && \ 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..f3b7d02aa 100644 --- a/docker-images/4.3/centos8/Dockerfile +++ b/docker-images/4.3/centos8/Dockerfile @@ -16,7 +16,8 @@ FROM base AS build WORKDIR /tmp/workdir ENV FFMPEG_VERSION=4.3.2 \ - AOM_VERSION=v1.0.0 \ + LIBSTVAV1_VERSION=v0.8.7 \ + AOM_VERSION=v3.1.3 \ FDKAAC_VERSION=0.1.5 \ FONTCONFIG_VERSION=2.12.4 \ FREETYPE_VERSION=2.10.4 \ @@ -129,7 +130,7 @@ RUN \ curl -sL https://versaweb.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${OPENCOREAMR_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## x264 http://www.videolan.org/developers/x264.html @@ -140,7 +141,7 @@ RUN \ curl -sL https://download.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-${X264_VERSION}.tar.bz2 | \ tar -jx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared --enable-pic --disable-cli && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### x265 http://x265.org/ @@ -154,7 +155,7 @@ RUN \ sed -i "/-DEXTRA_LIB/ s/$/ -DCMAKE_INSTALL_PREFIX=\${PREFIX}/" multilib.sh && \ sed -i "/^cmake/ s/$/ -DENABLE_CLI=OFF/" multilib.sh && \ ./multilib.sh && \ - make -C 8bit install && \ + make -C 8bit -j $(nproc) install && \ rm -rf ${DIR} ### libogg https://www.xiph.org/ogg/ RUN \ @@ -165,7 +166,7 @@ RUN \ echo ${OGG_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f libogg-${OGG_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libopus https://www.opus-codec.org/ @@ -178,7 +179,7 @@ RUN \ tar -zx --strip-components=1 -f opus-${OPUS_VERSION}.tar.gz && \ autoreconf -fiv && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libvorbis https://xiph.org/vorbis/ @@ -190,7 +191,7 @@ RUN \ echo ${VORBIS_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f libvorbis-${VORBIS_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libtheora http://www.theora.org/ @@ -202,7 +203,7 @@ RUN \ echo ${THEORA_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f libtheora-${THEORA_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libvpx https://www.webmproject.org/code/ @@ -214,7 +215,7 @@ RUN \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-vp8 --enable-vp9 --enable-vp9-highbitdepth --enable-pic --enable-shared \ --disable-debug --disable-examples --disable-docs --disable-install-bins && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libwebp https://developers.google.com/speed/webp/ @@ -225,7 +226,7 @@ RUN \ curl -sL https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-${WEBP_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libmp3lame http://lame.sourceforge.net/ @@ -236,7 +237,7 @@ RUN \ curl -sL https://versaweb.dl.sourceforge.net/project/lame/lame/$(echo ${LAME_VERSION} | sed -e 's/[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)/\1.\2/')/lame-${LAME_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" --enable-shared --enable-nasm --disable-frontend && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### xvid https://www.xvid.com/ @@ -249,7 +250,7 @@ RUN \ tar -zx -f xvidcore-${XVID_VERSION}.tar.gz && \ cd xvidcore/build/generic && \ ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### fdk-aac https://github.com/mstorsjo/fdk-aac @@ -261,7 +262,7 @@ RUN \ tar -zx --strip-components=1 && \ autoreconf -fiv && \ ./configure --prefix="${PREFIX}" --enable-shared --datadir="${DIR}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## openjpeg https://github.com/uclouvain/openjpeg @@ -272,7 +273,7 @@ RUN \ curl -sL https://github.com/uclouvain/openjpeg/archive/v${OPENJPEG_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ cmake -DBUILD_THIRDPARTY:BOOL=ON -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## freetype https://www.freetype.org/ @@ -284,7 +285,7 @@ RUN \ echo ${FREETYPE_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f freetype-${FREETYPE_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## libvstab https://github.com/georgmartius/vid.stab @@ -296,7 +297,7 @@ RUN \ echo ${LIBVIDSTAB_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f v${LIBVIDSTAB_VERSION}.tar.gz && \ cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## fridibi https://www.fribidi.org/ @@ -321,7 +322,7 @@ RUN \ curl -sLO https://www.freedesktop.org/software/fontconfig/release/fontconfig-${FONTCONFIG_VERSION}.tar.bz2 && \ tar -jx --strip-components=1 -f fontconfig-${FONTCONFIG_VERSION}.tar.bz2 && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## libass https://github.com/libass/libass @@ -334,7 +335,7 @@ RUN \ tar -zx --strip-components=1 -f ${LIBASS_VERSION}.tar.gz && \ ./autogen.sh && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## kvazaar https://github.com/ultravideo/kvazaar @@ -358,7 +359,7 @@ RUN \ mkdir -p ./aom_build ; \ cd ./aom_build ; \ cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" -DBUILD_SHARED_LIBS=1 ..; \ - make ; \ + make -j $(nproc); \ make install ; \ rm -rf ${DIR} @@ -370,7 +371,7 @@ RUN \ curl -sLO https://www.x.org/archive//individual/util/util-macros-${XORG_MACROS_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f util-macros-${XORG_MACROS_VERSION}.tar.gz && \ ./configure --srcdir=${DIR} --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -381,7 +382,7 @@ RUN \ curl -sLO https://www.x.org/archive/individual/proto/xproto-${XPROTO_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f xproto-${XPROTO_VERSION}.tar.gz && \ ./configure --srcdir=${DIR} --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -392,7 +393,7 @@ RUN \ curl -sLO https://www.x.org/archive/individual/lib/libXau-${XAU_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f libXau-${XAU_VERSION}.tar.gz && \ ./configure --srcdir=${DIR} --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -403,7 +404,7 @@ RUN \ curl -sLO https://xcb.freedesktop.org/dist/libpthread-stubs-${LIBPTHREAD_STUBS_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f libpthread-stubs-${LIBPTHREAD_STUBS_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -415,7 +416,7 @@ RUN \ tar -zx --strip-components=1 -f xcb-proto-${XCBPROTO_VERSION}.tar.gz && \ ACLOCAL_PATH="${PREFIX}/share/aclocal" ./autogen.sh && \ ./configure --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -427,7 +428,7 @@ RUN \ tar -zx --strip-components=1 -f libxcb-${LIBXCB_VERSION}.tar.gz && \ ACLOCAL_PATH="${PREFIX}/share/aclocal" ./autogen.sh && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -440,7 +441,7 @@ RUN \ echo ${LIBXML2_SHA256SUM} | sha256sum --check && \ tar -xz --strip-components=1 -f libxml2-v${LIBXML2_VERSION}.tar.gz && \ ./autogen.sh --prefix="${PREFIX}" --with-ftp=no --with-http=no --with-python=no && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -453,7 +454,7 @@ RUN \ echo ${LIBBLURAY_SHA256SUM} | sha256sum --check && \ tar -jx --strip-components=1 -f libbluray-${LIBBLURAY_VERSION}.tar.bz2 && \ ./configure --prefix="${PREFIX}" --disable-examples --disable-bdjava-jar --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -467,7 +468,7 @@ RUN \ tar -xz --strip-components=1 -f v${LIBZMQ_VERSION}.tar.gz && \ ./autogen.sh && \ ./configure --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make check && \ make install && \ rm -rf ${DIR} @@ -480,7 +481,7 @@ RUN \ curl -sLO https://github.com/Haivision/srt/archive/v${LIBSRT_VERSION}.tar.gz && \ tar -xz --strip-components=1 -f v${LIBSRT_VERSION}.tar.gz && \ cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -492,7 +493,7 @@ RUN \ git clone https://git.code.sf.net/p/libpng/code ${DIR} -b v${LIBPNG_VERSION} --depth 1 && \ ./autogen.sh && \ ./configure --prefix="${PREFIX}" && \ - make check && \ + make check -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -506,7 +507,20 @@ RUN \ tar -xz --strip-components=1 -f v${LIBARIBB24_VERSION}.tar.gz && \ autoreconf -fiv && \ ./configure CFLAGS="-I${PREFIX}/include -fPIC" --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ + make install && \ + rm -rf ${DIR} + + +## libsvtav1 +RUN \ + DIR=/tmp/svtav1 && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + git clone https://gitlab.com/AOMediaCodec/SVT-AV1.git ${DIR} --depth=1 -b ${LIBSTVAV1_VERSION} &&\ + cd Build && \ + cmake .. -G"Unix Makefiles" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="${PREFIX}" && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -556,12 +570,13 @@ RUN \ --enable-libopenjpeg \ --enable-libkvazaar \ --enable-libaom \ + --enable-libsvtav1 \ --extra-libs=-lpthread \ --enable-libsrt \ --enable-libaribb24 \ --extra-cflags="-I${PREFIX}/include" \ --extra-ldflags="-L${PREFIX}/lib" && \ - make && \ + make -j $(nproc) && \ 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..44e894446 100644 --- a/docker-images/4.3/nvidia2004/Dockerfile +++ b/docker-images/4.3/nvidia2004/Dockerfile @@ -34,7 +34,8 @@ FROM devel-base as build ENV NVIDIA_HEADERS_VERSION=11.1.5.0 ENV FFMPEG_VERSION=4.3.2 \ - AOM_VERSION=v1.0.0 \ + LIBSTVAV1_VERSION=v0.8.7 \ + AOM_VERSION=v3.1.3 \ FDKAAC_VERSION=0.1.5 \ FONTCONFIG_VERSION=2.12.4 \ FREETYPE_VERSION=2.10.4 \ @@ -151,7 +152,7 @@ RUN \ curl -sL https://versaweb.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${OPENCOREAMR_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## x264 http://www.videolan.org/developers/x264.html @@ -162,7 +163,7 @@ RUN \ curl -sL https://download.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-${X264_VERSION}.tar.bz2 | \ tar -jx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared --enable-pic --disable-cli && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### x265 http://x265.org/ @@ -176,7 +177,7 @@ RUN \ sed -i "/-DEXTRA_LIB/ s/$/ -DCMAKE_INSTALL_PREFIX=\${PREFIX}/" multilib.sh && \ sed -i "/^cmake/ s/$/ -DENABLE_CLI=OFF/" multilib.sh && \ ./multilib.sh && \ - make -C 8bit install && \ + make -C 8bit -j $(nproc) install && \ rm -rf ${DIR} ### libogg https://www.xiph.org/ogg/ RUN \ @@ -187,7 +188,7 @@ RUN \ echo ${OGG_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f libogg-${OGG_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libopus https://www.opus-codec.org/ @@ -200,7 +201,7 @@ RUN \ tar -zx --strip-components=1 -f opus-${OPUS_VERSION}.tar.gz && \ autoreconf -fiv && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libvorbis https://xiph.org/vorbis/ @@ -212,7 +213,7 @@ RUN \ echo ${VORBIS_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f libvorbis-${VORBIS_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libtheora http://www.theora.org/ @@ -224,7 +225,7 @@ RUN \ echo ${THEORA_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f libtheora-${THEORA_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libvpx https://www.webmproject.org/code/ @@ -236,7 +237,7 @@ RUN \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-vp8 --enable-vp9 --enable-vp9-highbitdepth --enable-pic --enable-shared \ --disable-debug --disable-examples --disable-docs --disable-install-bins && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libwebp https://developers.google.com/speed/webp/ @@ -247,7 +248,7 @@ RUN \ curl -sL https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-${WEBP_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libmp3lame http://lame.sourceforge.net/ @@ -258,7 +259,7 @@ RUN \ curl -sL https://versaweb.dl.sourceforge.net/project/lame/lame/$(echo ${LAME_VERSION} | sed -e 's/[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)/\1.\2/')/lame-${LAME_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" --enable-shared --enable-nasm --disable-frontend && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### xvid https://www.xvid.com/ @@ -271,7 +272,7 @@ RUN \ tar -zx -f xvidcore-${XVID_VERSION}.tar.gz && \ cd xvidcore/build/generic && \ ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### fdk-aac https://github.com/mstorsjo/fdk-aac @@ -283,7 +284,7 @@ RUN \ tar -zx --strip-components=1 && \ autoreconf -fiv && \ ./configure --prefix="${PREFIX}" --enable-shared --datadir="${DIR}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## openjpeg https://github.com/uclouvain/openjpeg @@ -294,7 +295,7 @@ RUN \ curl -sL https://github.com/uclouvain/openjpeg/archive/v${OPENJPEG_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ cmake -DBUILD_THIRDPARTY:BOOL=ON -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## freetype https://www.freetype.org/ @@ -306,7 +307,7 @@ RUN \ echo ${FREETYPE_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f freetype-${FREETYPE_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## libvstab https://github.com/georgmartius/vid.stab @@ -318,7 +319,7 @@ RUN \ echo ${LIBVIDSTAB_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f v${LIBVIDSTAB_VERSION}.tar.gz && \ cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## fridibi https://www.fribidi.org/ @@ -343,7 +344,7 @@ RUN \ curl -sLO https://www.freedesktop.org/software/fontconfig/release/fontconfig-${FONTCONFIG_VERSION}.tar.bz2 && \ tar -jx --strip-components=1 -f fontconfig-${FONTCONFIG_VERSION}.tar.bz2 && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## libass https://github.com/libass/libass @@ -356,7 +357,7 @@ RUN \ tar -zx --strip-components=1 -f ${LIBASS_VERSION}.tar.gz && \ ./autogen.sh && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## kvazaar https://github.com/ultravideo/kvazaar @@ -380,7 +381,7 @@ RUN \ mkdir -p ./aom_build ; \ cd ./aom_build ; \ cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" -DBUILD_SHARED_LIBS=1 ..; \ - make ; \ + make -j $(nproc); \ make install ; \ rm -rf ${DIR} @@ -392,7 +393,7 @@ RUN \ curl -sLO https://www.x.org/archive//individual/util/util-macros-${XORG_MACROS_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f util-macros-${XORG_MACROS_VERSION}.tar.gz && \ ./configure --srcdir=${DIR} --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -403,7 +404,7 @@ RUN \ curl -sLO https://www.x.org/archive/individual/proto/xproto-${XPROTO_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f xproto-${XPROTO_VERSION}.tar.gz && \ ./configure --srcdir=${DIR} --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -414,7 +415,7 @@ RUN \ curl -sLO https://www.x.org/archive/individual/lib/libXau-${XAU_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f libXau-${XAU_VERSION}.tar.gz && \ ./configure --srcdir=${DIR} --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -425,7 +426,7 @@ RUN \ curl -sLO https://xcb.freedesktop.org/dist/libpthread-stubs-${LIBPTHREAD_STUBS_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f libpthread-stubs-${LIBPTHREAD_STUBS_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -437,7 +438,7 @@ RUN \ tar -zx --strip-components=1 -f xcb-proto-${XCBPROTO_VERSION}.tar.gz && \ ACLOCAL_PATH="${PREFIX}/share/aclocal" ./autogen.sh && \ ./configure --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -449,7 +450,7 @@ RUN \ tar -zx --strip-components=1 -f libxcb-${LIBXCB_VERSION}.tar.gz && \ ACLOCAL_PATH="${PREFIX}/share/aclocal" ./autogen.sh && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -462,7 +463,7 @@ RUN \ echo ${LIBXML2_SHA256SUM} | sha256sum --check && \ tar -xz --strip-components=1 -f libxml2-v${LIBXML2_VERSION}.tar.gz && \ ./autogen.sh --prefix="${PREFIX}" --with-ftp=no --with-http=no --with-python=no && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -475,7 +476,7 @@ RUN \ echo ${LIBBLURAY_SHA256SUM} | sha256sum --check && \ tar -jx --strip-components=1 -f libbluray-${LIBBLURAY_VERSION}.tar.bz2 && \ ./configure --prefix="${PREFIX}" --disable-examples --disable-bdjava-jar --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -489,7 +490,7 @@ RUN \ tar -xz --strip-components=1 -f v${LIBZMQ_VERSION}.tar.gz && \ ./autogen.sh && \ ./configure --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make check && \ make install && \ rm -rf ${DIR} @@ -502,7 +503,7 @@ RUN \ curl -sLO https://github.com/Haivision/srt/archive/v${LIBSRT_VERSION}.tar.gz && \ tar -xz --strip-components=1 -f v${LIBSRT_VERSION}.tar.gz && \ cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -514,7 +515,7 @@ RUN \ git clone https://git.code.sf.net/p/libpng/code ${DIR} -b v${LIBPNG_VERSION} --depth 1 && \ ./autogen.sh && \ ./configure --prefix="${PREFIX}" && \ - make check && \ + make check -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -528,7 +529,20 @@ RUN \ tar -xz --strip-components=1 -f v${LIBARIBB24_VERSION}.tar.gz && \ autoreconf -fiv && \ ./configure CFLAGS="-I${PREFIX}/include -fPIC" --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ + make install && \ + rm -rf ${DIR} + + +## libsvtav1 +RUN \ + DIR=/tmp/svtav1 && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + git clone https://gitlab.com/AOMediaCodec/SVT-AV1.git ${DIR} --depth=1 -b ${LIBSTVAV1_VERSION} &&\ + cd Build && \ + cmake .. -G"Unix Makefiles" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="${PREFIX}" && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -578,6 +592,7 @@ RUN \ --enable-libopenjpeg \ --enable-libkvazaar \ --enable-libaom \ + --enable-libsvtav1 \ --extra-libs=-lpthread \ --enable-libsrt \ --enable-libaribb24 \ @@ -587,7 +602,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 -j $(nproc) && \ 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..5d0bb0ea7 100644 --- a/docker-images/4.3/scratch312/Dockerfile +++ b/docker-images/4.3/scratch312/Dockerfile @@ -9,7 +9,8 @@ FROM alpine:3.12 AS build WORKDIR /tmp/workdir ENV FFMPEG_VERSION=4.3.2 \ - AOM_VERSION=v1.0.0 \ + LIBSTVAV1_VERSION=v0.8.7 \ + AOM_VERSION=v3.1.3 \ FDKAAC_VERSION=0.1.5 \ FONTCONFIG_VERSION=2.12.4 \ FREETYPE_VERSION=2.10.4 \ @@ -125,7 +126,7 @@ RUN \ curl -sL https://versaweb.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${OPENCOREAMR_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## x264 http://www.videolan.org/developers/x264.html @@ -136,7 +137,7 @@ RUN \ curl -sL https://download.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-${X264_VERSION}.tar.bz2 | \ tar -jx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared --enable-pic --disable-cli && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### x265 http://x265.org/ @@ -150,7 +151,7 @@ RUN \ sed -i "/-DEXTRA_LIB/ s/$/ -DCMAKE_INSTALL_PREFIX=\${PREFIX}/" multilib.sh && \ sed -i "/^cmake/ s/$/ -DENABLE_CLI=OFF/" multilib.sh && \ ./multilib.sh && \ - make -C 8bit install && \ + make -C 8bit -j $(nproc) install && \ rm -rf ${DIR} ### libogg https://www.xiph.org/ogg/ RUN \ @@ -161,7 +162,7 @@ RUN \ echo ${OGG_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f libogg-${OGG_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libopus https://www.opus-codec.org/ @@ -174,7 +175,7 @@ RUN \ tar -zx --strip-components=1 -f opus-${OPUS_VERSION}.tar.gz && \ autoreconf -fiv && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libvorbis https://xiph.org/vorbis/ @@ -186,7 +187,7 @@ RUN \ echo ${VORBIS_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f libvorbis-${VORBIS_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libtheora http://www.theora.org/ @@ -198,7 +199,7 @@ RUN \ echo ${THEORA_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f libtheora-${THEORA_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libvpx https://www.webmproject.org/code/ @@ -210,7 +211,7 @@ RUN \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-vp8 --enable-vp9 --enable-vp9-highbitdepth --enable-pic --enable-shared \ --disable-debug --disable-examples --disable-docs --disable-install-bins && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libwebp https://developers.google.com/speed/webp/ @@ -221,7 +222,7 @@ RUN \ curl -sL https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-${WEBP_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libmp3lame http://lame.sourceforge.net/ @@ -232,7 +233,7 @@ RUN \ curl -sL https://versaweb.dl.sourceforge.net/project/lame/lame/$(echo ${LAME_VERSION} | sed -e 's/[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)/\1.\2/')/lame-${LAME_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" --enable-shared --enable-nasm --disable-frontend && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### xvid https://www.xvid.com/ @@ -245,7 +246,7 @@ RUN \ tar -zx -f xvidcore-${XVID_VERSION}.tar.gz && \ cd xvidcore/build/generic && \ ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### fdk-aac https://github.com/mstorsjo/fdk-aac @@ -257,7 +258,7 @@ RUN \ tar -zx --strip-components=1 && \ autoreconf -fiv && \ ./configure --prefix="${PREFIX}" --enable-shared --datadir="${DIR}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## openjpeg https://github.com/uclouvain/openjpeg @@ -268,7 +269,7 @@ RUN \ curl -sL https://github.com/uclouvain/openjpeg/archive/v${OPENJPEG_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ cmake -DBUILD_THIRDPARTY:BOOL=ON -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## freetype https://www.freetype.org/ @@ -280,7 +281,7 @@ RUN \ echo ${FREETYPE_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f freetype-${FREETYPE_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## libvstab https://github.com/georgmartius/vid.stab @@ -292,7 +293,7 @@ RUN \ echo ${LIBVIDSTAB_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f v${LIBVIDSTAB_VERSION}.tar.gz && \ cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## fridibi https://www.fribidi.org/ @@ -317,7 +318,7 @@ RUN \ curl -sLO https://www.freedesktop.org/software/fontconfig/release/fontconfig-${FONTCONFIG_VERSION}.tar.bz2 && \ tar -jx --strip-components=1 -f fontconfig-${FONTCONFIG_VERSION}.tar.bz2 && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## libass https://github.com/libass/libass @@ -330,7 +331,7 @@ RUN \ tar -zx --strip-components=1 -f ${LIBASS_VERSION}.tar.gz && \ ./autogen.sh && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## kvazaar https://github.com/ultravideo/kvazaar @@ -354,7 +355,7 @@ RUN \ mkdir -p ./aom_build ; \ cd ./aom_build ; \ cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" -DBUILD_SHARED_LIBS=1 ..; \ - make ; \ + make -j $(nproc); \ make install ; \ rm -rf ${DIR} @@ -366,7 +367,7 @@ RUN \ curl -sLO https://www.x.org/archive//individual/util/util-macros-${XORG_MACROS_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f util-macros-${XORG_MACROS_VERSION}.tar.gz && \ ./configure --srcdir=${DIR} --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -377,7 +378,7 @@ RUN \ curl -sLO https://www.x.org/archive/individual/proto/xproto-${XPROTO_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f xproto-${XPROTO_VERSION}.tar.gz && \ ./configure --srcdir=${DIR} --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -388,7 +389,7 @@ RUN \ curl -sLO https://www.x.org/archive/individual/lib/libXau-${XAU_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f libXau-${XAU_VERSION}.tar.gz && \ ./configure --srcdir=${DIR} --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -399,7 +400,7 @@ RUN \ curl -sLO https://xcb.freedesktop.org/dist/libpthread-stubs-${LIBPTHREAD_STUBS_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f libpthread-stubs-${LIBPTHREAD_STUBS_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -411,7 +412,7 @@ RUN \ tar -zx --strip-components=1 -f xcb-proto-${XCBPROTO_VERSION}.tar.gz && \ ACLOCAL_PATH="${PREFIX}/share/aclocal" ./autogen.sh && \ ./configure --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -423,7 +424,7 @@ RUN \ tar -zx --strip-components=1 -f libxcb-${LIBXCB_VERSION}.tar.gz && \ ACLOCAL_PATH="${PREFIX}/share/aclocal" ./autogen.sh && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -436,7 +437,7 @@ RUN \ echo ${LIBXML2_SHA256SUM} | sha256sum --check && \ tar -xz --strip-components=1 -f libxml2-v${LIBXML2_VERSION}.tar.gz && \ ./autogen.sh --prefix="${PREFIX}" --with-ftp=no --with-http=no --with-python=no && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -449,7 +450,7 @@ RUN \ echo ${LIBBLURAY_SHA256SUM} | sha256sum --check && \ tar -jx --strip-components=1 -f libbluray-${LIBBLURAY_VERSION}.tar.bz2 && \ ./configure --prefix="${PREFIX}" --disable-examples --disable-bdjava-jar --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -463,7 +464,7 @@ RUN \ tar -xz --strip-components=1 -f v${LIBZMQ_VERSION}.tar.gz && \ ./autogen.sh && \ ./configure --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make check && \ make install && \ rm -rf ${DIR} @@ -476,7 +477,7 @@ RUN \ curl -sLO https://github.com/Haivision/srt/archive/v${LIBSRT_VERSION}.tar.gz && \ tar -xz --strip-components=1 -f v${LIBSRT_VERSION}.tar.gz && \ cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -488,7 +489,7 @@ RUN \ git clone https://git.code.sf.net/p/libpng/code ${DIR} -b v${LIBPNG_VERSION} --depth 1 && \ ./autogen.sh && \ ./configure --prefix="${PREFIX}" && \ - make check && \ + make check -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -502,7 +503,20 @@ RUN \ tar -xz --strip-components=1 -f v${LIBARIBB24_VERSION}.tar.gz && \ autoreconf -fiv && \ ./configure CFLAGS="-I${PREFIX}/include -fPIC" --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ + make install && \ + rm -rf ${DIR} + + +## libsvtav1 +RUN \ + DIR=/tmp/svtav1 && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + git clone https://gitlab.com/AOMediaCodec/SVT-AV1.git ${DIR} --depth=1 -b ${LIBSTVAV1_VERSION} &&\ + cd Build && \ + cmake .. -G"Unix Makefiles" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="${PREFIX}" && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -552,12 +566,13 @@ RUN \ --enable-libopenjpeg \ --enable-libkvazaar \ --enable-libaom \ + --enable-libsvtav1 \ --extra-libs=-lpthread \ --enable-libsrt \ --enable-libaribb24 \ --extra-cflags="-I${PREFIX}/include" \ --extra-ldflags="-L${PREFIX}/lib" && \ - make && \ + make -j $(nproc) && \ 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..a47104e2d 100644 --- a/docker-images/4.3/scratch38/Dockerfile +++ b/docker-images/4.3/scratch38/Dockerfile @@ -9,7 +9,8 @@ FROM alpine:3.8 AS build WORKDIR /tmp/workdir ENV FFMPEG_VERSION=4.3.2 \ - AOM_VERSION=v1.0.0 \ + LIBSTVAV1_VERSION=v0.8.7 \ + AOM_VERSION=v3.1.3 \ FDKAAC_VERSION=0.1.5 \ FONTCONFIG_VERSION=2.12.4 \ FREETYPE_VERSION=2.10.4 \ @@ -125,7 +126,7 @@ RUN \ curl -sL https://versaweb.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${OPENCOREAMR_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## x264 http://www.videolan.org/developers/x264.html @@ -136,7 +137,7 @@ RUN \ curl -sL https://download.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-${X264_VERSION}.tar.bz2 | \ tar -jx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared --enable-pic --disable-cli && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### x265 http://x265.org/ @@ -150,7 +151,7 @@ RUN \ sed -i "/-DEXTRA_LIB/ s/$/ -DCMAKE_INSTALL_PREFIX=\${PREFIX}/" multilib.sh && \ sed -i "/^cmake/ s/$/ -DENABLE_CLI=OFF/" multilib.sh && \ ./multilib.sh && \ - make -C 8bit install && \ + make -C 8bit -j $(nproc) install && \ rm -rf ${DIR} ### libogg https://www.xiph.org/ogg/ RUN \ @@ -161,7 +162,7 @@ RUN \ echo ${OGG_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f libogg-${OGG_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libopus https://www.opus-codec.org/ @@ -174,7 +175,7 @@ RUN \ tar -zx --strip-components=1 -f opus-${OPUS_VERSION}.tar.gz && \ autoreconf -fiv && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libvorbis https://xiph.org/vorbis/ @@ -186,7 +187,7 @@ RUN \ echo ${VORBIS_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f libvorbis-${VORBIS_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libtheora http://www.theora.org/ @@ -198,7 +199,7 @@ RUN \ echo ${THEORA_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f libtheora-${THEORA_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libvpx https://www.webmproject.org/code/ @@ -210,7 +211,7 @@ RUN \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-vp8 --enable-vp9 --enable-vp9-highbitdepth --enable-pic --enable-shared \ --disable-debug --disable-examples --disable-docs --disable-install-bins && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libwebp https://developers.google.com/speed/webp/ @@ -221,7 +222,7 @@ RUN \ curl -sL https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-${WEBP_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libmp3lame http://lame.sourceforge.net/ @@ -232,7 +233,7 @@ RUN \ curl -sL https://versaweb.dl.sourceforge.net/project/lame/lame/$(echo ${LAME_VERSION} | sed -e 's/[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)/\1.\2/')/lame-${LAME_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" --enable-shared --enable-nasm --disable-frontend && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### xvid https://www.xvid.com/ @@ -245,7 +246,7 @@ RUN \ tar -zx -f xvidcore-${XVID_VERSION}.tar.gz && \ cd xvidcore/build/generic && \ ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### fdk-aac https://github.com/mstorsjo/fdk-aac @@ -257,7 +258,7 @@ RUN \ tar -zx --strip-components=1 && \ autoreconf -fiv && \ ./configure --prefix="${PREFIX}" --enable-shared --datadir="${DIR}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## openjpeg https://github.com/uclouvain/openjpeg @@ -268,7 +269,7 @@ RUN \ curl -sL https://github.com/uclouvain/openjpeg/archive/v${OPENJPEG_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ cmake -DBUILD_THIRDPARTY:BOOL=ON -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## freetype https://www.freetype.org/ @@ -280,7 +281,7 @@ RUN \ echo ${FREETYPE_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f freetype-${FREETYPE_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## libvstab https://github.com/georgmartius/vid.stab @@ -292,7 +293,7 @@ RUN \ echo ${LIBVIDSTAB_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f v${LIBVIDSTAB_VERSION}.tar.gz && \ cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## fridibi https://www.fribidi.org/ @@ -317,7 +318,7 @@ RUN \ curl -sLO https://www.freedesktop.org/software/fontconfig/release/fontconfig-${FONTCONFIG_VERSION}.tar.bz2 && \ tar -jx --strip-components=1 -f fontconfig-${FONTCONFIG_VERSION}.tar.bz2 && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## libass https://github.com/libass/libass @@ -330,7 +331,7 @@ RUN \ tar -zx --strip-components=1 -f ${LIBASS_VERSION}.tar.gz && \ ./autogen.sh && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## kvazaar https://github.com/ultravideo/kvazaar @@ -354,7 +355,7 @@ RUN \ mkdir -p ./aom_build ; \ cd ./aom_build ; \ cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" -DBUILD_SHARED_LIBS=1 ..; \ - make ; \ + make -j $(nproc); \ make install ; \ rm -rf ${DIR} @@ -366,7 +367,7 @@ RUN \ curl -sLO https://www.x.org/archive//individual/util/util-macros-${XORG_MACROS_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f util-macros-${XORG_MACROS_VERSION}.tar.gz && \ ./configure --srcdir=${DIR} --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -377,7 +378,7 @@ RUN \ curl -sLO https://www.x.org/archive/individual/proto/xproto-${XPROTO_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f xproto-${XPROTO_VERSION}.tar.gz && \ ./configure --srcdir=${DIR} --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -388,7 +389,7 @@ RUN \ curl -sLO https://www.x.org/archive/individual/lib/libXau-${XAU_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f libXau-${XAU_VERSION}.tar.gz && \ ./configure --srcdir=${DIR} --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -399,7 +400,7 @@ RUN \ curl -sLO https://xcb.freedesktop.org/dist/libpthread-stubs-${LIBPTHREAD_STUBS_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f libpthread-stubs-${LIBPTHREAD_STUBS_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -411,7 +412,7 @@ RUN \ tar -zx --strip-components=1 -f xcb-proto-${XCBPROTO_VERSION}.tar.gz && \ ACLOCAL_PATH="${PREFIX}/share/aclocal" ./autogen.sh && \ ./configure --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -423,7 +424,7 @@ RUN \ tar -zx --strip-components=1 -f libxcb-${LIBXCB_VERSION}.tar.gz && \ ACLOCAL_PATH="${PREFIX}/share/aclocal" ./autogen.sh && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -436,7 +437,7 @@ RUN \ echo ${LIBXML2_SHA256SUM} | sha256sum --check && \ tar -xz --strip-components=1 -f libxml2-v${LIBXML2_VERSION}.tar.gz && \ ./autogen.sh --prefix="${PREFIX}" --with-ftp=no --with-http=no --with-python=no && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -449,7 +450,7 @@ RUN \ echo ${LIBBLURAY_SHA256SUM} | sha256sum --check && \ tar -jx --strip-components=1 -f libbluray-${LIBBLURAY_VERSION}.tar.bz2 && \ ./configure --prefix="${PREFIX}" --disable-examples --disable-bdjava-jar --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -463,7 +464,7 @@ RUN \ tar -xz --strip-components=1 -f v${LIBZMQ_VERSION}.tar.gz && \ ./autogen.sh && \ ./configure --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make check && \ make install && \ rm -rf ${DIR} @@ -476,7 +477,7 @@ RUN \ curl -sLO https://github.com/Haivision/srt/archive/v${LIBSRT_VERSION}.tar.gz && \ tar -xz --strip-components=1 -f v${LIBSRT_VERSION}.tar.gz && \ cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -488,7 +489,7 @@ RUN \ git clone https://git.code.sf.net/p/libpng/code ${DIR} -b v${LIBPNG_VERSION} --depth 1 && \ ./autogen.sh && \ ./configure --prefix="${PREFIX}" && \ - make check && \ + make check -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -502,7 +503,20 @@ RUN \ tar -xz --strip-components=1 -f v${LIBARIBB24_VERSION}.tar.gz && \ autoreconf -fiv && \ ./configure CFLAGS="-I${PREFIX}/include -fPIC" --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ + make install && \ + rm -rf ${DIR} + + +## libsvtav1 +RUN \ + DIR=/tmp/svtav1 && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + git clone https://gitlab.com/AOMediaCodec/SVT-AV1.git ${DIR} --depth=1 -b ${LIBSTVAV1_VERSION} &&\ + cd Build && \ + cmake .. -G"Unix Makefiles" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="${PREFIX}" && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -552,12 +566,13 @@ RUN \ --enable-libopenjpeg \ --enable-libkvazaar \ --enable-libaom \ + --enable-libsvtav1 \ --extra-libs=-lpthread \ --enable-libsrt \ --enable-libaribb24 \ --extra-cflags="-I${PREFIX}/include" \ --extra-ldflags="-L${PREFIX}/lib" && \ - make && \ + make -j $(nproc) && \ 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..42eea81c8 100644 --- a/docker-images/4.3/ubuntu1804/Dockerfile +++ b/docker-images/4.3/ubuntu1804/Dockerfile @@ -17,7 +17,8 @@ RUN apt-get -yqq update && \ FROM base as build ENV FFMPEG_VERSION=4.3.2 \ - AOM_VERSION=v1.0.0 \ + LIBSTVAV1_VERSION=v0.8.7 \ + AOM_VERSION=v3.1.3 \ FDKAAC_VERSION=0.1.5 \ FONTCONFIG_VERSION=2.12.4 \ FREETYPE_VERSION=2.10.4 \ @@ -124,7 +125,7 @@ RUN \ curl -sL https://versaweb.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${OPENCOREAMR_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## x264 http://www.videolan.org/developers/x264.html @@ -135,7 +136,7 @@ RUN \ curl -sL https://download.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-${X264_VERSION}.tar.bz2 | \ tar -jx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared --enable-pic --disable-cli && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### x265 http://x265.org/ @@ -149,7 +150,7 @@ RUN \ sed -i "/-DEXTRA_LIB/ s/$/ -DCMAKE_INSTALL_PREFIX=\${PREFIX}/" multilib.sh && \ sed -i "/^cmake/ s/$/ -DENABLE_CLI=OFF/" multilib.sh && \ ./multilib.sh && \ - make -C 8bit install && \ + make -C 8bit -j $(nproc) install && \ rm -rf ${DIR} ### libogg https://www.xiph.org/ogg/ RUN \ @@ -160,7 +161,7 @@ RUN \ echo ${OGG_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f libogg-${OGG_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libopus https://www.opus-codec.org/ @@ -173,7 +174,7 @@ RUN \ tar -zx --strip-components=1 -f opus-${OPUS_VERSION}.tar.gz && \ autoreconf -fiv && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libvorbis https://xiph.org/vorbis/ @@ -185,7 +186,7 @@ RUN \ echo ${VORBIS_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f libvorbis-${VORBIS_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libtheora http://www.theora.org/ @@ -197,7 +198,7 @@ RUN \ echo ${THEORA_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f libtheora-${THEORA_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libvpx https://www.webmproject.org/code/ @@ -209,7 +210,7 @@ RUN \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-vp8 --enable-vp9 --enable-vp9-highbitdepth --enable-pic --enable-shared \ --disable-debug --disable-examples --disable-docs --disable-install-bins && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libwebp https://developers.google.com/speed/webp/ @@ -220,7 +221,7 @@ RUN \ curl -sL https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-${WEBP_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libmp3lame http://lame.sourceforge.net/ @@ -231,7 +232,7 @@ RUN \ curl -sL https://versaweb.dl.sourceforge.net/project/lame/lame/$(echo ${LAME_VERSION} | sed -e 's/[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)/\1.\2/')/lame-${LAME_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" --enable-shared --enable-nasm --disable-frontend && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### xvid https://www.xvid.com/ @@ -244,7 +245,7 @@ RUN \ tar -zx -f xvidcore-${XVID_VERSION}.tar.gz && \ cd xvidcore/build/generic && \ ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### fdk-aac https://github.com/mstorsjo/fdk-aac @@ -256,7 +257,7 @@ RUN \ tar -zx --strip-components=1 && \ autoreconf -fiv && \ ./configure --prefix="${PREFIX}" --enable-shared --datadir="${DIR}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## openjpeg https://github.com/uclouvain/openjpeg @@ -267,7 +268,7 @@ RUN \ curl -sL https://github.com/uclouvain/openjpeg/archive/v${OPENJPEG_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ cmake -DBUILD_THIRDPARTY:BOOL=ON -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## freetype https://www.freetype.org/ @@ -279,7 +280,7 @@ RUN \ echo ${FREETYPE_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f freetype-${FREETYPE_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## libvstab https://github.com/georgmartius/vid.stab @@ -291,7 +292,7 @@ RUN \ echo ${LIBVIDSTAB_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f v${LIBVIDSTAB_VERSION}.tar.gz && \ cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## fridibi https://www.fribidi.org/ @@ -316,7 +317,7 @@ RUN \ curl -sLO https://www.freedesktop.org/software/fontconfig/release/fontconfig-${FONTCONFIG_VERSION}.tar.bz2 && \ tar -jx --strip-components=1 -f fontconfig-${FONTCONFIG_VERSION}.tar.bz2 && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## libass https://github.com/libass/libass @@ -329,7 +330,7 @@ RUN \ tar -zx --strip-components=1 -f ${LIBASS_VERSION}.tar.gz && \ ./autogen.sh && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## kvazaar https://github.com/ultravideo/kvazaar @@ -353,7 +354,7 @@ RUN \ mkdir -p ./aom_build ; \ cd ./aom_build ; \ cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" -DBUILD_SHARED_LIBS=1 ..; \ - make ; \ + make -j $(nproc); \ make install ; \ rm -rf ${DIR} @@ -365,7 +366,7 @@ RUN \ curl -sLO https://www.x.org/archive//individual/util/util-macros-${XORG_MACROS_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f util-macros-${XORG_MACROS_VERSION}.tar.gz && \ ./configure --srcdir=${DIR} --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -376,7 +377,7 @@ RUN \ curl -sLO https://www.x.org/archive/individual/proto/xproto-${XPROTO_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f xproto-${XPROTO_VERSION}.tar.gz && \ ./configure --srcdir=${DIR} --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -387,7 +388,7 @@ RUN \ curl -sLO https://www.x.org/archive/individual/lib/libXau-${XAU_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f libXau-${XAU_VERSION}.tar.gz && \ ./configure --srcdir=${DIR} --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -398,7 +399,7 @@ RUN \ curl -sLO https://xcb.freedesktop.org/dist/libpthread-stubs-${LIBPTHREAD_STUBS_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f libpthread-stubs-${LIBPTHREAD_STUBS_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -410,7 +411,7 @@ RUN \ tar -zx --strip-components=1 -f xcb-proto-${XCBPROTO_VERSION}.tar.gz && \ ACLOCAL_PATH="${PREFIX}/share/aclocal" ./autogen.sh && \ ./configure --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -422,7 +423,7 @@ RUN \ tar -zx --strip-components=1 -f libxcb-${LIBXCB_VERSION}.tar.gz && \ ACLOCAL_PATH="${PREFIX}/share/aclocal" ./autogen.sh && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -435,7 +436,7 @@ RUN \ echo ${LIBXML2_SHA256SUM} | sha256sum --check && \ tar -xz --strip-components=1 -f libxml2-v${LIBXML2_VERSION}.tar.gz && \ ./autogen.sh --prefix="${PREFIX}" --with-ftp=no --with-http=no --with-python=no && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -448,7 +449,7 @@ RUN \ echo ${LIBBLURAY_SHA256SUM} | sha256sum --check && \ tar -jx --strip-components=1 -f libbluray-${LIBBLURAY_VERSION}.tar.bz2 && \ ./configure --prefix="${PREFIX}" --disable-examples --disable-bdjava-jar --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -462,7 +463,7 @@ RUN \ tar -xz --strip-components=1 -f v${LIBZMQ_VERSION}.tar.gz && \ ./autogen.sh && \ ./configure --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make check && \ make install && \ rm -rf ${DIR} @@ -475,7 +476,7 @@ RUN \ curl -sLO https://github.com/Haivision/srt/archive/v${LIBSRT_VERSION}.tar.gz && \ tar -xz --strip-components=1 -f v${LIBSRT_VERSION}.tar.gz && \ cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -487,7 +488,7 @@ RUN \ git clone https://git.code.sf.net/p/libpng/code ${DIR} -b v${LIBPNG_VERSION} --depth 1 && \ ./autogen.sh && \ ./configure --prefix="${PREFIX}" && \ - make check && \ + make check -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -501,7 +502,20 @@ RUN \ tar -xz --strip-components=1 -f v${LIBARIBB24_VERSION}.tar.gz && \ autoreconf -fiv && \ ./configure CFLAGS="-I${PREFIX}/include -fPIC" --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ + make install && \ + rm -rf ${DIR} + + +## libsvtav1 +RUN \ + DIR=/tmp/svtav1 && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + git clone https://gitlab.com/AOMediaCodec/SVT-AV1.git ${DIR} --depth=1 -b ${LIBSTVAV1_VERSION} &&\ + cd Build && \ + cmake .. -G"Unix Makefiles" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="${PREFIX}" && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -551,12 +565,13 @@ RUN \ --enable-libopenjpeg \ --enable-libkvazaar \ --enable-libaom \ + --enable-libsvtav1 \ --extra-libs=-lpthread \ --enable-libsrt \ --enable-libaribb24 \ --extra-cflags="-I${PREFIX}/include" \ --extra-ldflags="-L${PREFIX}/lib" && \ - make && \ + make -j $(nproc) && \ 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..443c64cd7 100644 --- a/docker-images/4.3/ubuntu2004/Dockerfile +++ b/docker-images/4.3/ubuntu2004/Dockerfile @@ -17,7 +17,8 @@ RUN apt-get -yqq update && \ FROM base as build ENV FFMPEG_VERSION=4.3.2 \ - AOM_VERSION=v1.0.0 \ + LIBSTVAV1_VERSION=v0.8.7 \ + AOM_VERSION=v3.1.3 \ FDKAAC_VERSION=0.1.5 \ FONTCONFIG_VERSION=2.12.4 \ FREETYPE_VERSION=2.10.4 \ @@ -127,7 +128,7 @@ RUN \ curl -sL https://versaweb.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${OPENCOREAMR_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## x264 http://www.videolan.org/developers/x264.html @@ -138,7 +139,7 @@ RUN \ curl -sL https://download.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-${X264_VERSION}.tar.bz2 | \ tar -jx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared --enable-pic --disable-cli && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### x265 http://x265.org/ @@ -152,7 +153,7 @@ RUN \ sed -i "/-DEXTRA_LIB/ s/$/ -DCMAKE_INSTALL_PREFIX=\${PREFIX}/" multilib.sh && \ sed -i "/^cmake/ s/$/ -DENABLE_CLI=OFF/" multilib.sh && \ ./multilib.sh && \ - make -C 8bit install && \ + make -C 8bit -j $(nproc) install && \ rm -rf ${DIR} ### libogg https://www.xiph.org/ogg/ RUN \ @@ -163,7 +164,7 @@ RUN \ echo ${OGG_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f libogg-${OGG_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libopus https://www.opus-codec.org/ @@ -176,7 +177,7 @@ RUN \ tar -zx --strip-components=1 -f opus-${OPUS_VERSION}.tar.gz && \ autoreconf -fiv && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libvorbis https://xiph.org/vorbis/ @@ -188,7 +189,7 @@ RUN \ echo ${VORBIS_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f libvorbis-${VORBIS_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libtheora http://www.theora.org/ @@ -200,7 +201,7 @@ RUN \ echo ${THEORA_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f libtheora-${THEORA_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libvpx https://www.webmproject.org/code/ @@ -212,7 +213,7 @@ RUN \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-vp8 --enable-vp9 --enable-vp9-highbitdepth --enable-pic --enable-shared \ --disable-debug --disable-examples --disable-docs --disable-install-bins && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libwebp https://developers.google.com/speed/webp/ @@ -223,7 +224,7 @@ RUN \ curl -sL https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-${WEBP_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libmp3lame http://lame.sourceforge.net/ @@ -234,7 +235,7 @@ RUN \ curl -sL https://versaweb.dl.sourceforge.net/project/lame/lame/$(echo ${LAME_VERSION} | sed -e 's/[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)/\1.\2/')/lame-${LAME_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" --enable-shared --enable-nasm --disable-frontend && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### xvid https://www.xvid.com/ @@ -247,7 +248,7 @@ RUN \ tar -zx -f xvidcore-${XVID_VERSION}.tar.gz && \ cd xvidcore/build/generic && \ ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### fdk-aac https://github.com/mstorsjo/fdk-aac @@ -259,7 +260,7 @@ RUN \ tar -zx --strip-components=1 && \ autoreconf -fiv && \ ./configure --prefix="${PREFIX}" --enable-shared --datadir="${DIR}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## openjpeg https://github.com/uclouvain/openjpeg @@ -270,7 +271,7 @@ RUN \ curl -sL https://github.com/uclouvain/openjpeg/archive/v${OPENJPEG_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ cmake -DBUILD_THIRDPARTY:BOOL=ON -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## freetype https://www.freetype.org/ @@ -282,7 +283,7 @@ RUN \ echo ${FREETYPE_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f freetype-${FREETYPE_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## libvstab https://github.com/georgmartius/vid.stab @@ -294,7 +295,7 @@ RUN \ echo ${LIBVIDSTAB_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f v${LIBVIDSTAB_VERSION}.tar.gz && \ cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## fridibi https://www.fribidi.org/ @@ -319,7 +320,7 @@ RUN \ curl -sLO https://www.freedesktop.org/software/fontconfig/release/fontconfig-${FONTCONFIG_VERSION}.tar.bz2 && \ tar -jx --strip-components=1 -f fontconfig-${FONTCONFIG_VERSION}.tar.bz2 && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## libass https://github.com/libass/libass @@ -332,7 +333,7 @@ RUN \ tar -zx --strip-components=1 -f ${LIBASS_VERSION}.tar.gz && \ ./autogen.sh && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## kvazaar https://github.com/ultravideo/kvazaar @@ -356,7 +357,7 @@ RUN \ mkdir -p ./aom_build ; \ cd ./aom_build ; \ cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" -DBUILD_SHARED_LIBS=1 ..; \ - make ; \ + make -j $(nproc); \ make install ; \ rm -rf ${DIR} @@ -368,7 +369,7 @@ RUN \ curl -sLO https://www.x.org/archive//individual/util/util-macros-${XORG_MACROS_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f util-macros-${XORG_MACROS_VERSION}.tar.gz && \ ./configure --srcdir=${DIR} --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -379,7 +380,7 @@ RUN \ curl -sLO https://www.x.org/archive/individual/proto/xproto-${XPROTO_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f xproto-${XPROTO_VERSION}.tar.gz && \ ./configure --srcdir=${DIR} --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -390,7 +391,7 @@ RUN \ curl -sLO https://www.x.org/archive/individual/lib/libXau-${XAU_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f libXau-${XAU_VERSION}.tar.gz && \ ./configure --srcdir=${DIR} --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -401,7 +402,7 @@ RUN \ curl -sLO https://xcb.freedesktop.org/dist/libpthread-stubs-${LIBPTHREAD_STUBS_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f libpthread-stubs-${LIBPTHREAD_STUBS_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -413,7 +414,7 @@ RUN \ tar -zx --strip-components=1 -f xcb-proto-${XCBPROTO_VERSION}.tar.gz && \ ACLOCAL_PATH="${PREFIX}/share/aclocal" ./autogen.sh && \ ./configure --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -425,7 +426,7 @@ RUN \ tar -zx --strip-components=1 -f libxcb-${LIBXCB_VERSION}.tar.gz && \ ACLOCAL_PATH="${PREFIX}/share/aclocal" ./autogen.sh && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -438,7 +439,7 @@ RUN \ echo ${LIBXML2_SHA256SUM} | sha256sum --check && \ tar -xz --strip-components=1 -f libxml2-v${LIBXML2_VERSION}.tar.gz && \ ./autogen.sh --prefix="${PREFIX}" --with-ftp=no --with-http=no --with-python=no && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -451,7 +452,7 @@ RUN \ echo ${LIBBLURAY_SHA256SUM} | sha256sum --check && \ tar -jx --strip-components=1 -f libbluray-${LIBBLURAY_VERSION}.tar.bz2 && \ ./configure --prefix="${PREFIX}" --disable-examples --disable-bdjava-jar --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -465,7 +466,7 @@ RUN \ tar -xz --strip-components=1 -f v${LIBZMQ_VERSION}.tar.gz && \ ./autogen.sh && \ ./configure --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make check && \ make install && \ rm -rf ${DIR} @@ -478,7 +479,7 @@ RUN \ curl -sLO https://github.com/Haivision/srt/archive/v${LIBSRT_VERSION}.tar.gz && \ tar -xz --strip-components=1 -f v${LIBSRT_VERSION}.tar.gz && \ cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -490,7 +491,7 @@ RUN \ git clone https://git.code.sf.net/p/libpng/code ${DIR} -b v${LIBPNG_VERSION} --depth 1 && \ ./autogen.sh && \ ./configure --prefix="${PREFIX}" && \ - make check && \ + make check -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -504,7 +505,20 @@ RUN \ tar -xz --strip-components=1 -f v${LIBARIBB24_VERSION}.tar.gz && \ autoreconf -fiv && \ ./configure CFLAGS="-I${PREFIX}/include -fPIC" --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ + make install && \ + rm -rf ${DIR} + + +## libsvtav1 +RUN \ + DIR=/tmp/svtav1 && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + git clone https://gitlab.com/AOMediaCodec/SVT-AV1.git ${DIR} --depth=1 -b ${LIBSTVAV1_VERSION} &&\ + cd Build && \ + cmake .. -G"Unix Makefiles" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="${PREFIX}" && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -554,13 +568,14 @@ RUN \ --enable-libopenjpeg \ --enable-libkvazaar \ --enable-libaom \ + --enable-libsvtav1 \ --extra-libs=-lpthread \ --enable-libsrt \ --enable-libaribb24 \ --enable-libvmaf \ --extra-cflags="-I${PREFIX}/include" \ --extra-ldflags="-L${PREFIX}/lib" && \ - make && \ + make -j $(nproc) && \ 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..62a0678d9 100644 --- a/docker-images/4.3/vaapi1804/Dockerfile +++ b/docker-images/4.3/vaapi1804/Dockerfile @@ -17,7 +17,8 @@ RUN apt-get -yqq update && \ FROM base as build ENV FFMPEG_VERSION=4.3.2 \ - AOM_VERSION=v1.0.0 \ + LIBSTVAV1_VERSION=v0.8.7 \ + AOM_VERSION=v3.1.3 \ FDKAAC_VERSION=0.1.5 \ FONTCONFIG_VERSION=2.12.4 \ FREETYPE_VERSION=2.10.4 \ @@ -125,7 +126,7 @@ RUN \ curl -sL https://versaweb.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${OPENCOREAMR_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## x264 http://www.videolan.org/developers/x264.html @@ -136,7 +137,7 @@ RUN \ curl -sL https://download.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-${X264_VERSION}.tar.bz2 | \ tar -jx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared --enable-pic --disable-cli && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### x265 http://x265.org/ @@ -150,7 +151,7 @@ RUN \ sed -i "/-DEXTRA_LIB/ s/$/ -DCMAKE_INSTALL_PREFIX=\${PREFIX}/" multilib.sh && \ sed -i "/^cmake/ s/$/ -DENABLE_CLI=OFF/" multilib.sh && \ ./multilib.sh && \ - make -C 8bit install && \ + make -C 8bit -j $(nproc) install && \ rm -rf ${DIR} ### libogg https://www.xiph.org/ogg/ RUN \ @@ -161,7 +162,7 @@ RUN \ echo ${OGG_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f libogg-${OGG_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libopus https://www.opus-codec.org/ @@ -174,7 +175,7 @@ RUN \ tar -zx --strip-components=1 -f opus-${OPUS_VERSION}.tar.gz && \ autoreconf -fiv && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libvorbis https://xiph.org/vorbis/ @@ -186,7 +187,7 @@ RUN \ echo ${VORBIS_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f libvorbis-${VORBIS_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libtheora http://www.theora.org/ @@ -198,7 +199,7 @@ RUN \ echo ${THEORA_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f libtheora-${THEORA_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libvpx https://www.webmproject.org/code/ @@ -210,7 +211,7 @@ RUN \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-vp8 --enable-vp9 --enable-vp9-highbitdepth --enable-pic --enable-shared \ --disable-debug --disable-examples --disable-docs --disable-install-bins && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libwebp https://developers.google.com/speed/webp/ @@ -221,7 +222,7 @@ RUN \ curl -sL https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-${WEBP_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libmp3lame http://lame.sourceforge.net/ @@ -232,7 +233,7 @@ RUN \ curl -sL https://versaweb.dl.sourceforge.net/project/lame/lame/$(echo ${LAME_VERSION} | sed -e 's/[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)/\1.\2/')/lame-${LAME_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" --enable-shared --enable-nasm --disable-frontend && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### xvid https://www.xvid.com/ @@ -245,7 +246,7 @@ RUN \ tar -zx -f xvidcore-${XVID_VERSION}.tar.gz && \ cd xvidcore/build/generic && \ ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### fdk-aac https://github.com/mstorsjo/fdk-aac @@ -257,7 +258,7 @@ RUN \ tar -zx --strip-components=1 && \ autoreconf -fiv && \ ./configure --prefix="${PREFIX}" --enable-shared --datadir="${DIR}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## openjpeg https://github.com/uclouvain/openjpeg @@ -268,7 +269,7 @@ RUN \ curl -sL https://github.com/uclouvain/openjpeg/archive/v${OPENJPEG_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ cmake -DBUILD_THIRDPARTY:BOOL=ON -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## freetype https://www.freetype.org/ @@ -280,7 +281,7 @@ RUN \ echo ${FREETYPE_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f freetype-${FREETYPE_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## libvstab https://github.com/georgmartius/vid.stab @@ -292,7 +293,7 @@ RUN \ echo ${LIBVIDSTAB_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f v${LIBVIDSTAB_VERSION}.tar.gz && \ cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## fridibi https://www.fribidi.org/ @@ -317,7 +318,7 @@ RUN \ curl -sLO https://www.freedesktop.org/software/fontconfig/release/fontconfig-${FONTCONFIG_VERSION}.tar.bz2 && \ tar -jx --strip-components=1 -f fontconfig-${FONTCONFIG_VERSION}.tar.bz2 && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## libass https://github.com/libass/libass @@ -330,7 +331,7 @@ RUN \ tar -zx --strip-components=1 -f ${LIBASS_VERSION}.tar.gz && \ ./autogen.sh && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## kvazaar https://github.com/ultravideo/kvazaar @@ -354,7 +355,7 @@ RUN \ mkdir -p ./aom_build ; \ cd ./aom_build ; \ cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" -DBUILD_SHARED_LIBS=1 ..; \ - make ; \ + make -j $(nproc); \ make install ; \ rm -rf ${DIR} @@ -366,7 +367,7 @@ RUN \ curl -sLO https://www.x.org/archive//individual/util/util-macros-${XORG_MACROS_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f util-macros-${XORG_MACROS_VERSION}.tar.gz && \ ./configure --srcdir=${DIR} --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -377,7 +378,7 @@ RUN \ curl -sLO https://www.x.org/archive/individual/proto/xproto-${XPROTO_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f xproto-${XPROTO_VERSION}.tar.gz && \ ./configure --srcdir=${DIR} --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -388,7 +389,7 @@ RUN \ curl -sLO https://www.x.org/archive/individual/lib/libXau-${XAU_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f libXau-${XAU_VERSION}.tar.gz && \ ./configure --srcdir=${DIR} --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -399,7 +400,7 @@ RUN \ curl -sLO https://xcb.freedesktop.org/dist/libpthread-stubs-${LIBPTHREAD_STUBS_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f libpthread-stubs-${LIBPTHREAD_STUBS_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -411,7 +412,7 @@ RUN \ tar -zx --strip-components=1 -f xcb-proto-${XCBPROTO_VERSION}.tar.gz && \ ACLOCAL_PATH="${PREFIX}/share/aclocal" ./autogen.sh && \ ./configure --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -423,7 +424,7 @@ RUN \ tar -zx --strip-components=1 -f libxcb-${LIBXCB_VERSION}.tar.gz && \ ACLOCAL_PATH="${PREFIX}/share/aclocal" ./autogen.sh && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -436,7 +437,7 @@ RUN \ echo ${LIBXML2_SHA256SUM} | sha256sum --check && \ tar -xz --strip-components=1 -f libxml2-v${LIBXML2_VERSION}.tar.gz && \ ./autogen.sh --prefix="${PREFIX}" --with-ftp=no --with-http=no --with-python=no && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -449,7 +450,7 @@ RUN \ echo ${LIBBLURAY_SHA256SUM} | sha256sum --check && \ tar -jx --strip-components=1 -f libbluray-${LIBBLURAY_VERSION}.tar.bz2 && \ ./configure --prefix="${PREFIX}" --disable-examples --disable-bdjava-jar --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -463,7 +464,7 @@ RUN \ tar -xz --strip-components=1 -f v${LIBZMQ_VERSION}.tar.gz && \ ./autogen.sh && \ ./configure --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make check && \ make install && \ rm -rf ${DIR} @@ -476,7 +477,7 @@ RUN \ curl -sLO https://github.com/Haivision/srt/archive/v${LIBSRT_VERSION}.tar.gz && \ tar -xz --strip-components=1 -f v${LIBSRT_VERSION}.tar.gz && \ cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -488,7 +489,7 @@ RUN \ git clone https://git.code.sf.net/p/libpng/code ${DIR} -b v${LIBPNG_VERSION} --depth 1 && \ ./autogen.sh && \ ./configure --prefix="${PREFIX}" && \ - make check && \ + make check -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -502,7 +503,20 @@ RUN \ tar -xz --strip-components=1 -f v${LIBARIBB24_VERSION}.tar.gz && \ autoreconf -fiv && \ ./configure CFLAGS="-I${PREFIX}/include -fPIC" --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ + make install && \ + rm -rf ${DIR} + + +## libsvtav1 +RUN \ + DIR=/tmp/svtav1 && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + git clone https://gitlab.com/AOMediaCodec/SVT-AV1.git ${DIR} --depth=1 -b ${LIBSTVAV1_VERSION} &&\ + cd Build && \ + cmake .. -G"Unix Makefiles" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="${PREFIX}" && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -552,13 +566,14 @@ RUN \ --enable-libopenjpeg \ --enable-libkvazaar \ --enable-libaom \ + --enable-libsvtav1 \ --extra-libs=-lpthread \ --enable-libsrt \ --enable-libaribb24 \ --enable-vaapi \ --extra-cflags="-I${PREFIX}/include" \ --extra-ldflags="-L${PREFIX}/lib" && \ - make && \ + make -j $(nproc) && \ 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..ec9237ec3 100644 --- a/docker-images/4.3/vaapi2004/Dockerfile +++ b/docker-images/4.3/vaapi2004/Dockerfile @@ -17,7 +17,8 @@ RUN apt-get -yqq update && \ FROM base as build ENV FFMPEG_VERSION=4.3.2 \ - AOM_VERSION=v1.0.0 \ + LIBSTVAV1_VERSION=v0.8.7 \ + AOM_VERSION=v3.1.3 \ FDKAAC_VERSION=0.1.5 \ FONTCONFIG_VERSION=2.12.4 \ FREETYPE_VERSION=2.10.4 \ @@ -128,7 +129,7 @@ RUN \ curl -sL https://versaweb.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${OPENCOREAMR_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## x264 http://www.videolan.org/developers/x264.html @@ -139,7 +140,7 @@ RUN \ curl -sL https://download.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-${X264_VERSION}.tar.bz2 | \ tar -jx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared --enable-pic --disable-cli && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### x265 http://x265.org/ @@ -153,7 +154,7 @@ RUN \ sed -i "/-DEXTRA_LIB/ s/$/ -DCMAKE_INSTALL_PREFIX=\${PREFIX}/" multilib.sh && \ sed -i "/^cmake/ s/$/ -DENABLE_CLI=OFF/" multilib.sh && \ ./multilib.sh && \ - make -C 8bit install && \ + make -C 8bit -j $(nproc) install && \ rm -rf ${DIR} ### libogg https://www.xiph.org/ogg/ RUN \ @@ -164,7 +165,7 @@ RUN \ echo ${OGG_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f libogg-${OGG_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libopus https://www.opus-codec.org/ @@ -177,7 +178,7 @@ RUN \ tar -zx --strip-components=1 -f opus-${OPUS_VERSION}.tar.gz && \ autoreconf -fiv && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libvorbis https://xiph.org/vorbis/ @@ -189,7 +190,7 @@ RUN \ echo ${VORBIS_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f libvorbis-${VORBIS_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libtheora http://www.theora.org/ @@ -201,7 +202,7 @@ RUN \ echo ${THEORA_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f libtheora-${THEORA_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libvpx https://www.webmproject.org/code/ @@ -213,7 +214,7 @@ RUN \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-vp8 --enable-vp9 --enable-vp9-highbitdepth --enable-pic --enable-shared \ --disable-debug --disable-examples --disable-docs --disable-install-bins && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libwebp https://developers.google.com/speed/webp/ @@ -224,7 +225,7 @@ RUN \ curl -sL https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-${WEBP_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libmp3lame http://lame.sourceforge.net/ @@ -235,7 +236,7 @@ RUN \ curl -sL https://versaweb.dl.sourceforge.net/project/lame/lame/$(echo ${LAME_VERSION} | sed -e 's/[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)/\1.\2/')/lame-${LAME_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" --enable-shared --enable-nasm --disable-frontend && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### xvid https://www.xvid.com/ @@ -248,7 +249,7 @@ RUN \ tar -zx -f xvidcore-${XVID_VERSION}.tar.gz && \ cd xvidcore/build/generic && \ ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### fdk-aac https://github.com/mstorsjo/fdk-aac @@ -260,7 +261,7 @@ RUN \ tar -zx --strip-components=1 && \ autoreconf -fiv && \ ./configure --prefix="${PREFIX}" --enable-shared --datadir="${DIR}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## openjpeg https://github.com/uclouvain/openjpeg @@ -271,7 +272,7 @@ RUN \ curl -sL https://github.com/uclouvain/openjpeg/archive/v${OPENJPEG_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ cmake -DBUILD_THIRDPARTY:BOOL=ON -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## freetype https://www.freetype.org/ @@ -283,7 +284,7 @@ RUN \ echo ${FREETYPE_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f freetype-${FREETYPE_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## libvstab https://github.com/georgmartius/vid.stab @@ -295,7 +296,7 @@ RUN \ echo ${LIBVIDSTAB_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f v${LIBVIDSTAB_VERSION}.tar.gz && \ cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## fridibi https://www.fribidi.org/ @@ -320,7 +321,7 @@ RUN \ curl -sLO https://www.freedesktop.org/software/fontconfig/release/fontconfig-${FONTCONFIG_VERSION}.tar.bz2 && \ tar -jx --strip-components=1 -f fontconfig-${FONTCONFIG_VERSION}.tar.bz2 && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## libass https://github.com/libass/libass @@ -333,7 +334,7 @@ RUN \ tar -zx --strip-components=1 -f ${LIBASS_VERSION}.tar.gz && \ ./autogen.sh && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## kvazaar https://github.com/ultravideo/kvazaar @@ -357,7 +358,7 @@ RUN \ mkdir -p ./aom_build ; \ cd ./aom_build ; \ cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" -DBUILD_SHARED_LIBS=1 ..; \ - make ; \ + make -j $(nproc); \ make install ; \ rm -rf ${DIR} @@ -369,7 +370,7 @@ RUN \ curl -sLO https://www.x.org/archive//individual/util/util-macros-${XORG_MACROS_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f util-macros-${XORG_MACROS_VERSION}.tar.gz && \ ./configure --srcdir=${DIR} --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -380,7 +381,7 @@ RUN \ curl -sLO https://www.x.org/archive/individual/proto/xproto-${XPROTO_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f xproto-${XPROTO_VERSION}.tar.gz && \ ./configure --srcdir=${DIR} --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -391,7 +392,7 @@ RUN \ curl -sLO https://www.x.org/archive/individual/lib/libXau-${XAU_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f libXau-${XAU_VERSION}.tar.gz && \ ./configure --srcdir=${DIR} --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -402,7 +403,7 @@ RUN \ curl -sLO https://xcb.freedesktop.org/dist/libpthread-stubs-${LIBPTHREAD_STUBS_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f libpthread-stubs-${LIBPTHREAD_STUBS_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -414,7 +415,7 @@ RUN \ tar -zx --strip-components=1 -f xcb-proto-${XCBPROTO_VERSION}.tar.gz && \ ACLOCAL_PATH="${PREFIX}/share/aclocal" ./autogen.sh && \ ./configure --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -426,7 +427,7 @@ RUN \ tar -zx --strip-components=1 -f libxcb-${LIBXCB_VERSION}.tar.gz && \ ACLOCAL_PATH="${PREFIX}/share/aclocal" ./autogen.sh && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -439,7 +440,7 @@ RUN \ echo ${LIBXML2_SHA256SUM} | sha256sum --check && \ tar -xz --strip-components=1 -f libxml2-v${LIBXML2_VERSION}.tar.gz && \ ./autogen.sh --prefix="${PREFIX}" --with-ftp=no --with-http=no --with-python=no && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -452,7 +453,7 @@ RUN \ echo ${LIBBLURAY_SHA256SUM} | sha256sum --check && \ tar -jx --strip-components=1 -f libbluray-${LIBBLURAY_VERSION}.tar.bz2 && \ ./configure --prefix="${PREFIX}" --disable-examples --disable-bdjava-jar --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -466,7 +467,7 @@ RUN \ tar -xz --strip-components=1 -f v${LIBZMQ_VERSION}.tar.gz && \ ./autogen.sh && \ ./configure --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make check && \ make install && \ rm -rf ${DIR} @@ -479,7 +480,7 @@ RUN \ curl -sLO https://github.com/Haivision/srt/archive/v${LIBSRT_VERSION}.tar.gz && \ tar -xz --strip-components=1 -f v${LIBSRT_VERSION}.tar.gz && \ cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -491,7 +492,7 @@ RUN \ git clone https://git.code.sf.net/p/libpng/code ${DIR} -b v${LIBPNG_VERSION} --depth 1 && \ ./autogen.sh && \ ./configure --prefix="${PREFIX}" && \ - make check && \ + make check -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -505,7 +506,20 @@ RUN \ tar -xz --strip-components=1 -f v${LIBARIBB24_VERSION}.tar.gz && \ autoreconf -fiv && \ ./configure CFLAGS="-I${PREFIX}/include -fPIC" --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ + make install && \ + rm -rf ${DIR} + + +## libsvtav1 +RUN \ + DIR=/tmp/svtav1 && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + git clone https://gitlab.com/AOMediaCodec/SVT-AV1.git ${DIR} --depth=1 -b ${LIBSTVAV1_VERSION} &&\ + cd Build && \ + cmake .. -G"Unix Makefiles" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="${PREFIX}" && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -555,6 +569,7 @@ RUN \ --enable-libopenjpeg \ --enable-libkvazaar \ --enable-libaom \ + --enable-libsvtav1 \ --extra-libs=-lpthread \ --enable-libsrt \ --enable-libaribb24 \ @@ -562,7 +577,7 @@ RUN \ --enable-vaapi \ --extra-cflags="-I${PREFIX}/include" \ --extra-ldflags="-L${PREFIX}/lib" && \ - make && \ + make -j $(nproc) && \ 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..c524a978d 100644 --- a/docker-images/4.4/alpine312/Dockerfile +++ b/docker-images/4.4/alpine312/Dockerfile @@ -14,7 +14,8 @@ FROM base AS build WORKDIR /tmp/workdir ENV FFMPEG_VERSION=4.4 \ - AOM_VERSION=v1.0.0 \ + LIBSTVAV1_VERSION=v0.8.7 \ + AOM_VERSION=v3.1.3 \ FDKAAC_VERSION=0.1.5 \ FONTCONFIG_VERSION=2.12.4 \ FREETYPE_VERSION=2.10.4 \ @@ -93,6 +94,8 @@ RUN buildDeps="autoconf \ yasm \ nasm \ zlib-dev \ + meson \ + xxd \ expat-dev" && \ apk add --no-cache --update ${buildDeps} ## libvmaf https://github.com/Netflix/vmaf @@ -123,7 +126,7 @@ RUN \ curl -sL https://versaweb.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${OPENCOREAMR_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## x264 http://www.videolan.org/developers/x264.html @@ -134,7 +137,7 @@ RUN \ curl -sL https://download.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-${X264_VERSION}.tar.bz2 | \ tar -jx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared --enable-pic --disable-cli && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### x265 http://x265.org/ @@ -148,7 +151,7 @@ RUN \ sed -i "/-DEXTRA_LIB/ s/$/ -DCMAKE_INSTALL_PREFIX=\${PREFIX}/" multilib.sh && \ sed -i "/^cmake/ s/$/ -DENABLE_CLI=OFF/" multilib.sh && \ ./multilib.sh && \ - make -C 8bit install && \ + make -C 8bit -j $(nproc) install && \ rm -rf ${DIR} ### libogg https://www.xiph.org/ogg/ RUN \ @@ -159,7 +162,7 @@ RUN \ echo ${OGG_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f libogg-${OGG_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libopus https://www.opus-codec.org/ @@ -172,7 +175,7 @@ RUN \ tar -zx --strip-components=1 -f opus-${OPUS_VERSION}.tar.gz && \ autoreconf -fiv && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libvorbis https://xiph.org/vorbis/ @@ -184,7 +187,7 @@ RUN \ echo ${VORBIS_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f libvorbis-${VORBIS_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libtheora http://www.theora.org/ @@ -196,7 +199,7 @@ RUN \ echo ${THEORA_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f libtheora-${THEORA_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libvpx https://www.webmproject.org/code/ @@ -208,7 +211,7 @@ RUN \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-vp8 --enable-vp9 --enable-vp9-highbitdepth --enable-pic --enable-shared \ --disable-debug --disable-examples --disable-docs --disable-install-bins && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libwebp https://developers.google.com/speed/webp/ @@ -219,7 +222,7 @@ RUN \ curl -sL https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-${WEBP_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libmp3lame http://lame.sourceforge.net/ @@ -230,7 +233,7 @@ RUN \ curl -sL https://versaweb.dl.sourceforge.net/project/lame/lame/$(echo ${LAME_VERSION} | sed -e 's/[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)/\1.\2/')/lame-${LAME_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" --enable-shared --enable-nasm --disable-frontend && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### xvid https://www.xvid.com/ @@ -243,7 +246,7 @@ RUN \ tar -zx -f xvidcore-${XVID_VERSION}.tar.gz && \ cd xvidcore/build/generic && \ ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### fdk-aac https://github.com/mstorsjo/fdk-aac @@ -255,7 +258,7 @@ RUN \ tar -zx --strip-components=1 && \ autoreconf -fiv && \ ./configure --prefix="${PREFIX}" --enable-shared --datadir="${DIR}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## openjpeg https://github.com/uclouvain/openjpeg @@ -266,7 +269,7 @@ RUN \ curl -sL https://github.com/uclouvain/openjpeg/archive/v${OPENJPEG_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ cmake -DBUILD_THIRDPARTY:BOOL=ON -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## freetype https://www.freetype.org/ @@ -278,7 +281,7 @@ RUN \ echo ${FREETYPE_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f freetype-${FREETYPE_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## libvstab https://github.com/georgmartius/vid.stab @@ -290,7 +293,7 @@ RUN \ echo ${LIBVIDSTAB_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f v${LIBVIDSTAB_VERSION}.tar.gz && \ cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## fridibi https://www.fribidi.org/ @@ -315,7 +318,7 @@ RUN \ curl -sLO https://www.freedesktop.org/software/fontconfig/release/fontconfig-${FONTCONFIG_VERSION}.tar.bz2 && \ tar -jx --strip-components=1 -f fontconfig-${FONTCONFIG_VERSION}.tar.bz2 && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## libass https://github.com/libass/libass @@ -328,7 +331,7 @@ RUN \ tar -zx --strip-components=1 -f ${LIBASS_VERSION}.tar.gz && \ ./autogen.sh && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## kvazaar https://github.com/ultravideo/kvazaar @@ -352,7 +355,7 @@ RUN \ mkdir -p ./aom_build ; \ cd ./aom_build ; \ cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" -DBUILD_SHARED_LIBS=1 ..; \ - make ; \ + make -j $(nproc); \ make install ; \ rm -rf ${DIR} @@ -364,7 +367,7 @@ RUN \ curl -sLO https://www.x.org/archive//individual/util/util-macros-${XORG_MACROS_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f util-macros-${XORG_MACROS_VERSION}.tar.gz && \ ./configure --srcdir=${DIR} --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -375,7 +378,7 @@ RUN \ curl -sLO https://www.x.org/archive/individual/proto/xproto-${XPROTO_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f xproto-${XPROTO_VERSION}.tar.gz && \ ./configure --srcdir=${DIR} --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -386,7 +389,7 @@ RUN \ curl -sLO https://www.x.org/archive/individual/lib/libXau-${XAU_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f libXau-${XAU_VERSION}.tar.gz && \ ./configure --srcdir=${DIR} --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -397,7 +400,7 @@ RUN \ curl -sLO https://xcb.freedesktop.org/dist/libpthread-stubs-${LIBPTHREAD_STUBS_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f libpthread-stubs-${LIBPTHREAD_STUBS_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -409,7 +412,7 @@ RUN \ tar -zx --strip-components=1 -f xcb-proto-${XCBPROTO_VERSION}.tar.gz && \ ACLOCAL_PATH="${PREFIX}/share/aclocal" ./autogen.sh && \ ./configure --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -421,7 +424,7 @@ RUN \ tar -zx --strip-components=1 -f libxcb-${LIBXCB_VERSION}.tar.gz && \ ACLOCAL_PATH="${PREFIX}/share/aclocal" ./autogen.sh && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -434,7 +437,7 @@ RUN \ echo ${LIBXML2_SHA256SUM} | sha256sum --check && \ tar -xz --strip-components=1 -f libxml2-v${LIBXML2_VERSION}.tar.gz && \ ./autogen.sh --prefix="${PREFIX}" --with-ftp=no --with-http=no --with-python=no && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -447,7 +450,7 @@ RUN \ echo ${LIBBLURAY_SHA256SUM} | sha256sum --check && \ tar -jx --strip-components=1 -f libbluray-${LIBBLURAY_VERSION}.tar.bz2 && \ ./configure --prefix="${PREFIX}" --disable-examples --disable-bdjava-jar --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -461,7 +464,7 @@ RUN \ tar -xz --strip-components=1 -f v${LIBZMQ_VERSION}.tar.gz && \ ./autogen.sh && \ ./configure --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make check && \ make install && \ rm -rf ${DIR} @@ -474,7 +477,7 @@ RUN \ curl -sLO https://github.com/Haivision/srt/archive/v${LIBSRT_VERSION}.tar.gz && \ tar -xz --strip-components=1 -f v${LIBSRT_VERSION}.tar.gz && \ cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -486,7 +489,7 @@ RUN \ git clone https://git.code.sf.net/p/libpng/code ${DIR} -b v${LIBPNG_VERSION} --depth 1 && \ ./autogen.sh && \ ./configure --prefix="${PREFIX}" && \ - make check && \ + make check -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -500,7 +503,20 @@ RUN \ tar -xz --strip-components=1 -f v${LIBARIBB24_VERSION}.tar.gz && \ autoreconf -fiv && \ ./configure CFLAGS="-I${PREFIX}/include -fPIC" --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ + make install && \ + rm -rf ${DIR} + + +## libsvtav1 +RUN \ + DIR=/tmp/svtav1 && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + git clone https://gitlab.com/AOMediaCodec/SVT-AV1.git ${DIR} --depth=1 -b ${LIBSTVAV1_VERSION} &&\ + cd Build && \ + cmake .. -G"Unix Makefiles" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="${PREFIX}" && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -550,12 +566,14 @@ RUN \ --enable-libopenjpeg \ --enable-libkvazaar \ --enable-libaom \ + --enable-libsvtav1 \ --extra-libs=-lpthread \ --enable-libsrt \ --enable-libaribb24 \ + --enable-libvmaf \ --extra-cflags="-I${PREFIX}/include" \ --extra-ldflags="-L${PREFIX}/lib" && \ - make && \ + make -j $(nproc) && \ 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..680057eed 100644 --- a/docker-images/4.4/alpine38/Dockerfile +++ b/docker-images/4.4/alpine38/Dockerfile @@ -14,7 +14,8 @@ FROM base AS build WORKDIR /tmp/workdir ENV FFMPEG_VERSION=4.4 \ - AOM_VERSION=v1.0.0 \ + LIBSTVAV1_VERSION=v0.8.7 \ + AOM_VERSION=v3.1.3 \ FDKAAC_VERSION=0.1.5 \ FONTCONFIG_VERSION=2.12.4 \ FREETYPE_VERSION=2.10.4 \ @@ -123,7 +124,7 @@ RUN \ curl -sL https://versaweb.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${OPENCOREAMR_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## x264 http://www.videolan.org/developers/x264.html @@ -134,7 +135,7 @@ RUN \ curl -sL https://download.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-${X264_VERSION}.tar.bz2 | \ tar -jx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared --enable-pic --disable-cli && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### x265 http://x265.org/ @@ -148,7 +149,7 @@ RUN \ sed -i "/-DEXTRA_LIB/ s/$/ -DCMAKE_INSTALL_PREFIX=\${PREFIX}/" multilib.sh && \ sed -i "/^cmake/ s/$/ -DENABLE_CLI=OFF/" multilib.sh && \ ./multilib.sh && \ - make -C 8bit install && \ + make -C 8bit -j $(nproc) install && \ rm -rf ${DIR} ### libogg https://www.xiph.org/ogg/ RUN \ @@ -159,7 +160,7 @@ RUN \ echo ${OGG_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f libogg-${OGG_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libopus https://www.opus-codec.org/ @@ -172,7 +173,7 @@ RUN \ tar -zx --strip-components=1 -f opus-${OPUS_VERSION}.tar.gz && \ autoreconf -fiv && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libvorbis https://xiph.org/vorbis/ @@ -184,7 +185,7 @@ RUN \ echo ${VORBIS_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f libvorbis-${VORBIS_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libtheora http://www.theora.org/ @@ -196,7 +197,7 @@ RUN \ echo ${THEORA_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f libtheora-${THEORA_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libvpx https://www.webmproject.org/code/ @@ -208,7 +209,7 @@ RUN \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-vp8 --enable-vp9 --enable-vp9-highbitdepth --enable-pic --enable-shared \ --disable-debug --disable-examples --disable-docs --disable-install-bins && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libwebp https://developers.google.com/speed/webp/ @@ -219,7 +220,7 @@ RUN \ curl -sL https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-${WEBP_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libmp3lame http://lame.sourceforge.net/ @@ -230,7 +231,7 @@ RUN \ curl -sL https://versaweb.dl.sourceforge.net/project/lame/lame/$(echo ${LAME_VERSION} | sed -e 's/[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)/\1.\2/')/lame-${LAME_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" --enable-shared --enable-nasm --disable-frontend && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### xvid https://www.xvid.com/ @@ -243,7 +244,7 @@ RUN \ tar -zx -f xvidcore-${XVID_VERSION}.tar.gz && \ cd xvidcore/build/generic && \ ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### fdk-aac https://github.com/mstorsjo/fdk-aac @@ -255,7 +256,7 @@ RUN \ tar -zx --strip-components=1 && \ autoreconf -fiv && \ ./configure --prefix="${PREFIX}" --enable-shared --datadir="${DIR}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## openjpeg https://github.com/uclouvain/openjpeg @@ -266,7 +267,7 @@ RUN \ curl -sL https://github.com/uclouvain/openjpeg/archive/v${OPENJPEG_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ cmake -DBUILD_THIRDPARTY:BOOL=ON -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## freetype https://www.freetype.org/ @@ -278,7 +279,7 @@ RUN \ echo ${FREETYPE_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f freetype-${FREETYPE_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## libvstab https://github.com/georgmartius/vid.stab @@ -290,7 +291,7 @@ RUN \ echo ${LIBVIDSTAB_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f v${LIBVIDSTAB_VERSION}.tar.gz && \ cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## fridibi https://www.fribidi.org/ @@ -315,7 +316,7 @@ RUN \ curl -sLO https://www.freedesktop.org/software/fontconfig/release/fontconfig-${FONTCONFIG_VERSION}.tar.bz2 && \ tar -jx --strip-components=1 -f fontconfig-${FONTCONFIG_VERSION}.tar.bz2 && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## libass https://github.com/libass/libass @@ -328,7 +329,7 @@ RUN \ tar -zx --strip-components=1 -f ${LIBASS_VERSION}.tar.gz && \ ./autogen.sh && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## kvazaar https://github.com/ultravideo/kvazaar @@ -352,7 +353,7 @@ RUN \ mkdir -p ./aom_build ; \ cd ./aom_build ; \ cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" -DBUILD_SHARED_LIBS=1 ..; \ - make ; \ + make -j $(nproc); \ make install ; \ rm -rf ${DIR} @@ -364,7 +365,7 @@ RUN \ curl -sLO https://www.x.org/archive//individual/util/util-macros-${XORG_MACROS_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f util-macros-${XORG_MACROS_VERSION}.tar.gz && \ ./configure --srcdir=${DIR} --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -375,7 +376,7 @@ RUN \ curl -sLO https://www.x.org/archive/individual/proto/xproto-${XPROTO_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f xproto-${XPROTO_VERSION}.tar.gz && \ ./configure --srcdir=${DIR} --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -386,7 +387,7 @@ RUN \ curl -sLO https://www.x.org/archive/individual/lib/libXau-${XAU_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f libXau-${XAU_VERSION}.tar.gz && \ ./configure --srcdir=${DIR} --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -397,7 +398,7 @@ RUN \ curl -sLO https://xcb.freedesktop.org/dist/libpthread-stubs-${LIBPTHREAD_STUBS_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f libpthread-stubs-${LIBPTHREAD_STUBS_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -409,7 +410,7 @@ RUN \ tar -zx --strip-components=1 -f xcb-proto-${XCBPROTO_VERSION}.tar.gz && \ ACLOCAL_PATH="${PREFIX}/share/aclocal" ./autogen.sh && \ ./configure --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -421,7 +422,7 @@ RUN \ tar -zx --strip-components=1 -f libxcb-${LIBXCB_VERSION}.tar.gz && \ ACLOCAL_PATH="${PREFIX}/share/aclocal" ./autogen.sh && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -434,7 +435,7 @@ RUN \ echo ${LIBXML2_SHA256SUM} | sha256sum --check && \ tar -xz --strip-components=1 -f libxml2-v${LIBXML2_VERSION}.tar.gz && \ ./autogen.sh --prefix="${PREFIX}" --with-ftp=no --with-http=no --with-python=no && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -447,7 +448,7 @@ RUN \ echo ${LIBBLURAY_SHA256SUM} | sha256sum --check && \ tar -jx --strip-components=1 -f libbluray-${LIBBLURAY_VERSION}.tar.bz2 && \ ./configure --prefix="${PREFIX}" --disable-examples --disable-bdjava-jar --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -461,7 +462,7 @@ RUN \ tar -xz --strip-components=1 -f v${LIBZMQ_VERSION}.tar.gz && \ ./autogen.sh && \ ./configure --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make check && \ make install && \ rm -rf ${DIR} @@ -474,7 +475,7 @@ RUN \ curl -sLO https://github.com/Haivision/srt/archive/v${LIBSRT_VERSION}.tar.gz && \ tar -xz --strip-components=1 -f v${LIBSRT_VERSION}.tar.gz && \ cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -486,7 +487,7 @@ RUN \ git clone https://git.code.sf.net/p/libpng/code ${DIR} -b v${LIBPNG_VERSION} --depth 1 && \ ./autogen.sh && \ ./configure --prefix="${PREFIX}" && \ - make check && \ + make check -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -500,7 +501,20 @@ RUN \ tar -xz --strip-components=1 -f v${LIBARIBB24_VERSION}.tar.gz && \ autoreconf -fiv && \ ./configure CFLAGS="-I${PREFIX}/include -fPIC" --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ + make install && \ + rm -rf ${DIR} + + +## libsvtav1 +RUN \ + DIR=/tmp/svtav1 && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + git clone https://gitlab.com/AOMediaCodec/SVT-AV1.git ${DIR} --depth=1 -b ${LIBSTVAV1_VERSION} &&\ + cd Build && \ + cmake .. -G"Unix Makefiles" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="${PREFIX}" && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -550,12 +564,13 @@ RUN \ --enable-libopenjpeg \ --enable-libkvazaar \ --enable-libaom \ + --enable-libsvtav1 \ --extra-libs=-lpthread \ --enable-libsrt \ --enable-libaribb24 \ --extra-cflags="-I${PREFIX}/include" \ --extra-ldflags="-L${PREFIX}/lib" && \ - make && \ + make -j $(nproc) && \ 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..69818e42a 100644 --- a/docker-images/4.4/centos7/Dockerfile +++ b/docker-images/4.4/centos7/Dockerfile @@ -16,7 +16,8 @@ FROM base AS build WORKDIR /tmp/workdir ENV FFMPEG_VERSION=4.4 \ - AOM_VERSION=v1.0.0 \ + LIBSTVAV1_VERSION=v0.8.7 \ + AOM_VERSION=v3.1.3 \ FDKAAC_VERSION=0.1.5 \ FONTCONFIG_VERSION=2.12.4 \ FREETYPE_VERSION=2.10.4 \ @@ -160,7 +161,7 @@ RUN \ curl -sL https://versaweb.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${OPENCOREAMR_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## x264 http://www.videolan.org/developers/x264.html @@ -171,7 +172,7 @@ RUN \ curl -sL https://download.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-${X264_VERSION}.tar.bz2 | \ tar -jx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared --enable-pic --disable-cli && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### x265 http://x265.org/ @@ -185,7 +186,7 @@ RUN \ sed -i "/-DEXTRA_LIB/ s/$/ -DCMAKE_INSTALL_PREFIX=\${PREFIX}/" multilib.sh && \ sed -i "/^cmake/ s/$/ -DENABLE_CLI=OFF/" multilib.sh && \ ./multilib.sh && \ - make -C 8bit install && \ + make -C 8bit -j $(nproc) install && \ rm -rf ${DIR} ### libogg https://www.xiph.org/ogg/ RUN \ @@ -196,7 +197,7 @@ RUN \ echo ${OGG_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f libogg-${OGG_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libopus https://www.opus-codec.org/ @@ -209,7 +210,7 @@ RUN \ tar -zx --strip-components=1 -f opus-${OPUS_VERSION}.tar.gz && \ autoreconf -fiv && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libvorbis https://xiph.org/vorbis/ @@ -221,7 +222,7 @@ RUN \ echo ${VORBIS_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f libvorbis-${VORBIS_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libtheora http://www.theora.org/ @@ -233,7 +234,7 @@ RUN \ echo ${THEORA_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f libtheora-${THEORA_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libvpx https://www.webmproject.org/code/ @@ -245,7 +246,7 @@ RUN \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-vp8 --enable-vp9 --enable-vp9-highbitdepth --enable-pic --enable-shared \ --disable-debug --disable-examples --disable-docs --disable-install-bins && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libwebp https://developers.google.com/speed/webp/ @@ -256,7 +257,7 @@ RUN \ curl -sL https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-${WEBP_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libmp3lame http://lame.sourceforge.net/ @@ -267,7 +268,7 @@ RUN \ curl -sL https://versaweb.dl.sourceforge.net/project/lame/lame/$(echo ${LAME_VERSION} | sed -e 's/[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)/\1.\2/')/lame-${LAME_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" --enable-shared --enable-nasm --disable-frontend && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### xvid https://www.xvid.com/ @@ -280,7 +281,7 @@ RUN \ tar -zx -f xvidcore-${XVID_VERSION}.tar.gz && \ cd xvidcore/build/generic && \ ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### fdk-aac https://github.com/mstorsjo/fdk-aac @@ -292,7 +293,7 @@ RUN \ tar -zx --strip-components=1 && \ autoreconf -fiv && \ ./configure --prefix="${PREFIX}" --enable-shared --datadir="${DIR}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## openjpeg https://github.com/uclouvain/openjpeg @@ -303,7 +304,7 @@ RUN \ curl -sL https://github.com/uclouvain/openjpeg/archive/v${OPENJPEG_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ cmake -DBUILD_THIRDPARTY:BOOL=ON -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## freetype https://www.freetype.org/ @@ -315,7 +316,7 @@ RUN \ echo ${FREETYPE_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f freetype-${FREETYPE_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## libvstab https://github.com/georgmartius/vid.stab @@ -327,7 +328,7 @@ RUN \ echo ${LIBVIDSTAB_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f v${LIBVIDSTAB_VERSION}.tar.gz && \ cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## fridibi https://www.fribidi.org/ @@ -352,7 +353,7 @@ RUN \ curl -sLO https://www.freedesktop.org/software/fontconfig/release/fontconfig-${FONTCONFIG_VERSION}.tar.bz2 && \ tar -jx --strip-components=1 -f fontconfig-${FONTCONFIG_VERSION}.tar.bz2 && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## libass https://github.com/libass/libass @@ -365,7 +366,7 @@ RUN \ tar -zx --strip-components=1 -f ${LIBASS_VERSION}.tar.gz && \ ./autogen.sh && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## kvazaar https://github.com/ultravideo/kvazaar @@ -389,7 +390,7 @@ RUN \ mkdir -p ./aom_build ; \ cd ./aom_build ; \ cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" -DBUILD_SHARED_LIBS=1 ..; \ - make ; \ + make -j $(nproc); \ make install ; \ rm -rf ${DIR} @@ -401,7 +402,7 @@ RUN \ curl -sLO https://www.x.org/archive//individual/util/util-macros-${XORG_MACROS_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f util-macros-${XORG_MACROS_VERSION}.tar.gz && \ ./configure --srcdir=${DIR} --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -412,7 +413,7 @@ RUN \ curl -sLO https://www.x.org/archive/individual/proto/xproto-${XPROTO_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f xproto-${XPROTO_VERSION}.tar.gz && \ ./configure --srcdir=${DIR} --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -423,7 +424,7 @@ RUN \ curl -sLO https://www.x.org/archive/individual/lib/libXau-${XAU_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f libXau-${XAU_VERSION}.tar.gz && \ ./configure --srcdir=${DIR} --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -434,7 +435,7 @@ RUN \ curl -sLO https://xcb.freedesktop.org/dist/libpthread-stubs-${LIBPTHREAD_STUBS_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f libpthread-stubs-${LIBPTHREAD_STUBS_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -446,7 +447,7 @@ RUN \ tar -zx --strip-components=1 -f xcb-proto-${XCBPROTO_VERSION}.tar.gz && \ ACLOCAL_PATH="${PREFIX}/share/aclocal" ./autogen.sh && \ ./configure --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -458,7 +459,7 @@ RUN \ tar -zx --strip-components=1 -f libxcb-${LIBXCB_VERSION}.tar.gz && \ ACLOCAL_PATH="${PREFIX}/share/aclocal" ./autogen.sh && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -471,7 +472,7 @@ RUN \ echo ${LIBXML2_SHA256SUM} | sha256sum --check && \ tar -xz --strip-components=1 -f libxml2-v${LIBXML2_VERSION}.tar.gz && \ ./autogen.sh --prefix="${PREFIX}" --with-ftp=no --with-http=no --with-python=no && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -484,7 +485,7 @@ RUN \ echo ${LIBBLURAY_SHA256SUM} | sha256sum --check && \ tar -jx --strip-components=1 -f libbluray-${LIBBLURAY_VERSION}.tar.bz2 && \ ./configure --prefix="${PREFIX}" --disable-examples --disable-bdjava-jar --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -498,7 +499,7 @@ RUN \ tar -xz --strip-components=1 -f v${LIBZMQ_VERSION}.tar.gz && \ ./autogen.sh && \ ./configure --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make check && \ make install && \ rm -rf ${DIR} @@ -511,7 +512,7 @@ RUN \ curl -sLO https://github.com/Haivision/srt/archive/v${LIBSRT_VERSION}.tar.gz && \ tar -xz --strip-components=1 -f v${LIBSRT_VERSION}.tar.gz && \ cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -523,7 +524,7 @@ RUN \ git clone https://git.code.sf.net/p/libpng/code ${DIR} -b v${LIBPNG_VERSION} --depth 1 && \ ./autogen.sh && \ ./configure --prefix="${PREFIX}" && \ - make check && \ + make check -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -537,7 +538,20 @@ RUN \ tar -xz --strip-components=1 -f v${LIBARIBB24_VERSION}.tar.gz && \ autoreconf -fiv && \ ./configure CFLAGS="-I${PREFIX}/include -fPIC" --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ + make install && \ + rm -rf ${DIR} + + +## libsvtav1 +RUN \ + DIR=/tmp/svtav1 && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + git clone https://gitlab.com/AOMediaCodec/SVT-AV1.git ${DIR} --depth=1 -b ${LIBSTVAV1_VERSION} &&\ + cd Build && \ + cmake .. -G"Unix Makefiles" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="${PREFIX}" && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -587,12 +601,13 @@ RUN \ --enable-libopenjpeg \ --enable-libkvazaar \ --enable-libaom \ + --enable-libsvtav1 \ --extra-libs=-lpthread \ --enable-libsrt \ --enable-libaribb24 \ --extra-cflags="-I${PREFIX}/include" \ --extra-ldflags="-L${PREFIX}/lib" && \ - make && \ + make -j $(nproc) && \ 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..0f965a20e 100644 --- a/docker-images/4.4/centos8/Dockerfile +++ b/docker-images/4.4/centos8/Dockerfile @@ -16,7 +16,8 @@ FROM base AS build WORKDIR /tmp/workdir ENV FFMPEG_VERSION=4.4 \ - AOM_VERSION=v1.0.0 \ + LIBSTVAV1_VERSION=v0.8.7 \ + AOM_VERSION=v3.1.3 \ FDKAAC_VERSION=0.1.5 \ FONTCONFIG_VERSION=2.12.4 \ FREETYPE_VERSION=2.10.4 \ @@ -129,7 +130,7 @@ RUN \ curl -sL https://versaweb.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${OPENCOREAMR_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## x264 http://www.videolan.org/developers/x264.html @@ -140,7 +141,7 @@ RUN \ curl -sL https://download.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-${X264_VERSION}.tar.bz2 | \ tar -jx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared --enable-pic --disable-cli && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### x265 http://x265.org/ @@ -154,7 +155,7 @@ RUN \ sed -i "/-DEXTRA_LIB/ s/$/ -DCMAKE_INSTALL_PREFIX=\${PREFIX}/" multilib.sh && \ sed -i "/^cmake/ s/$/ -DENABLE_CLI=OFF/" multilib.sh && \ ./multilib.sh && \ - make -C 8bit install && \ + make -C 8bit -j $(nproc) install && \ rm -rf ${DIR} ### libogg https://www.xiph.org/ogg/ RUN \ @@ -165,7 +166,7 @@ RUN \ echo ${OGG_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f libogg-${OGG_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libopus https://www.opus-codec.org/ @@ -178,7 +179,7 @@ RUN \ tar -zx --strip-components=1 -f opus-${OPUS_VERSION}.tar.gz && \ autoreconf -fiv && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libvorbis https://xiph.org/vorbis/ @@ -190,7 +191,7 @@ RUN \ echo ${VORBIS_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f libvorbis-${VORBIS_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libtheora http://www.theora.org/ @@ -202,7 +203,7 @@ RUN \ echo ${THEORA_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f libtheora-${THEORA_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libvpx https://www.webmproject.org/code/ @@ -214,7 +215,7 @@ RUN \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-vp8 --enable-vp9 --enable-vp9-highbitdepth --enable-pic --enable-shared \ --disable-debug --disable-examples --disable-docs --disable-install-bins && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libwebp https://developers.google.com/speed/webp/ @@ -225,7 +226,7 @@ RUN \ curl -sL https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-${WEBP_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libmp3lame http://lame.sourceforge.net/ @@ -236,7 +237,7 @@ RUN \ curl -sL https://versaweb.dl.sourceforge.net/project/lame/lame/$(echo ${LAME_VERSION} | sed -e 's/[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)/\1.\2/')/lame-${LAME_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" --enable-shared --enable-nasm --disable-frontend && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### xvid https://www.xvid.com/ @@ -249,7 +250,7 @@ RUN \ tar -zx -f xvidcore-${XVID_VERSION}.tar.gz && \ cd xvidcore/build/generic && \ ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### fdk-aac https://github.com/mstorsjo/fdk-aac @@ -261,7 +262,7 @@ RUN \ tar -zx --strip-components=1 && \ autoreconf -fiv && \ ./configure --prefix="${PREFIX}" --enable-shared --datadir="${DIR}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## openjpeg https://github.com/uclouvain/openjpeg @@ -272,7 +273,7 @@ RUN \ curl -sL https://github.com/uclouvain/openjpeg/archive/v${OPENJPEG_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ cmake -DBUILD_THIRDPARTY:BOOL=ON -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## freetype https://www.freetype.org/ @@ -284,7 +285,7 @@ RUN \ echo ${FREETYPE_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f freetype-${FREETYPE_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## libvstab https://github.com/georgmartius/vid.stab @@ -296,7 +297,7 @@ RUN \ echo ${LIBVIDSTAB_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f v${LIBVIDSTAB_VERSION}.tar.gz && \ cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## fridibi https://www.fribidi.org/ @@ -321,7 +322,7 @@ RUN \ curl -sLO https://www.freedesktop.org/software/fontconfig/release/fontconfig-${FONTCONFIG_VERSION}.tar.bz2 && \ tar -jx --strip-components=1 -f fontconfig-${FONTCONFIG_VERSION}.tar.bz2 && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## libass https://github.com/libass/libass @@ -334,7 +335,7 @@ RUN \ tar -zx --strip-components=1 -f ${LIBASS_VERSION}.tar.gz && \ ./autogen.sh && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## kvazaar https://github.com/ultravideo/kvazaar @@ -358,7 +359,7 @@ RUN \ mkdir -p ./aom_build ; \ cd ./aom_build ; \ cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" -DBUILD_SHARED_LIBS=1 ..; \ - make ; \ + make -j $(nproc); \ make install ; \ rm -rf ${DIR} @@ -370,7 +371,7 @@ RUN \ curl -sLO https://www.x.org/archive//individual/util/util-macros-${XORG_MACROS_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f util-macros-${XORG_MACROS_VERSION}.tar.gz && \ ./configure --srcdir=${DIR} --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -381,7 +382,7 @@ RUN \ curl -sLO https://www.x.org/archive/individual/proto/xproto-${XPROTO_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f xproto-${XPROTO_VERSION}.tar.gz && \ ./configure --srcdir=${DIR} --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -392,7 +393,7 @@ RUN \ curl -sLO https://www.x.org/archive/individual/lib/libXau-${XAU_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f libXau-${XAU_VERSION}.tar.gz && \ ./configure --srcdir=${DIR} --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -403,7 +404,7 @@ RUN \ curl -sLO https://xcb.freedesktop.org/dist/libpthread-stubs-${LIBPTHREAD_STUBS_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f libpthread-stubs-${LIBPTHREAD_STUBS_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -415,7 +416,7 @@ RUN \ tar -zx --strip-components=1 -f xcb-proto-${XCBPROTO_VERSION}.tar.gz && \ ACLOCAL_PATH="${PREFIX}/share/aclocal" ./autogen.sh && \ ./configure --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -427,7 +428,7 @@ RUN \ tar -zx --strip-components=1 -f libxcb-${LIBXCB_VERSION}.tar.gz && \ ACLOCAL_PATH="${PREFIX}/share/aclocal" ./autogen.sh && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -440,7 +441,7 @@ RUN \ echo ${LIBXML2_SHA256SUM} | sha256sum --check && \ tar -xz --strip-components=1 -f libxml2-v${LIBXML2_VERSION}.tar.gz && \ ./autogen.sh --prefix="${PREFIX}" --with-ftp=no --with-http=no --with-python=no && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -453,7 +454,7 @@ RUN \ echo ${LIBBLURAY_SHA256SUM} | sha256sum --check && \ tar -jx --strip-components=1 -f libbluray-${LIBBLURAY_VERSION}.tar.bz2 && \ ./configure --prefix="${PREFIX}" --disable-examples --disable-bdjava-jar --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -467,7 +468,7 @@ RUN \ tar -xz --strip-components=1 -f v${LIBZMQ_VERSION}.tar.gz && \ ./autogen.sh && \ ./configure --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make check && \ make install && \ rm -rf ${DIR} @@ -480,7 +481,7 @@ RUN \ curl -sLO https://github.com/Haivision/srt/archive/v${LIBSRT_VERSION}.tar.gz && \ tar -xz --strip-components=1 -f v${LIBSRT_VERSION}.tar.gz && \ cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -492,7 +493,7 @@ RUN \ git clone https://git.code.sf.net/p/libpng/code ${DIR} -b v${LIBPNG_VERSION} --depth 1 && \ ./autogen.sh && \ ./configure --prefix="${PREFIX}" && \ - make check && \ + make check -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -506,7 +507,20 @@ RUN \ tar -xz --strip-components=1 -f v${LIBARIBB24_VERSION}.tar.gz && \ autoreconf -fiv && \ ./configure CFLAGS="-I${PREFIX}/include -fPIC" --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ + make install && \ + rm -rf ${DIR} + + +## libsvtav1 +RUN \ + DIR=/tmp/svtav1 && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + git clone https://gitlab.com/AOMediaCodec/SVT-AV1.git ${DIR} --depth=1 -b ${LIBSTVAV1_VERSION} &&\ + cd Build && \ + cmake .. -G"Unix Makefiles" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="${PREFIX}" && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -556,12 +570,13 @@ RUN \ --enable-libopenjpeg \ --enable-libkvazaar \ --enable-libaom \ + --enable-libsvtav1 \ --extra-libs=-lpthread \ --enable-libsrt \ --enable-libaribb24 \ --extra-cflags="-I${PREFIX}/include" \ --extra-ldflags="-L${PREFIX}/lib" && \ - make && \ + make -j $(nproc) && \ 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..355ed76cf 100644 --- a/docker-images/4.4/nvidia2004/Dockerfile +++ b/docker-images/4.4/nvidia2004/Dockerfile @@ -34,7 +34,8 @@ FROM devel-base as build ENV NVIDIA_HEADERS_VERSION=11.1.5.0 ENV FFMPEG_VERSION=4.4 \ - AOM_VERSION=v1.0.0 \ + LIBSTVAV1_VERSION=v0.8.7 \ + AOM_VERSION=v3.1.3 \ FDKAAC_VERSION=0.1.5 \ FONTCONFIG_VERSION=2.12.4 \ FREETYPE_VERSION=2.10.4 \ @@ -151,7 +152,7 @@ RUN \ curl -sL https://versaweb.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${OPENCOREAMR_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## x264 http://www.videolan.org/developers/x264.html @@ -162,7 +163,7 @@ RUN \ curl -sL https://download.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-${X264_VERSION}.tar.bz2 | \ tar -jx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared --enable-pic --disable-cli && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### x265 http://x265.org/ @@ -176,7 +177,7 @@ RUN \ sed -i "/-DEXTRA_LIB/ s/$/ -DCMAKE_INSTALL_PREFIX=\${PREFIX}/" multilib.sh && \ sed -i "/^cmake/ s/$/ -DENABLE_CLI=OFF/" multilib.sh && \ ./multilib.sh && \ - make -C 8bit install && \ + make -C 8bit -j $(nproc) install && \ rm -rf ${DIR} ### libogg https://www.xiph.org/ogg/ RUN \ @@ -187,7 +188,7 @@ RUN \ echo ${OGG_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f libogg-${OGG_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libopus https://www.opus-codec.org/ @@ -200,7 +201,7 @@ RUN \ tar -zx --strip-components=1 -f opus-${OPUS_VERSION}.tar.gz && \ autoreconf -fiv && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libvorbis https://xiph.org/vorbis/ @@ -212,7 +213,7 @@ RUN \ echo ${VORBIS_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f libvorbis-${VORBIS_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libtheora http://www.theora.org/ @@ -224,7 +225,7 @@ RUN \ echo ${THEORA_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f libtheora-${THEORA_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libvpx https://www.webmproject.org/code/ @@ -236,7 +237,7 @@ RUN \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-vp8 --enable-vp9 --enable-vp9-highbitdepth --enable-pic --enable-shared \ --disable-debug --disable-examples --disable-docs --disable-install-bins && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libwebp https://developers.google.com/speed/webp/ @@ -247,7 +248,7 @@ RUN \ curl -sL https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-${WEBP_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libmp3lame http://lame.sourceforge.net/ @@ -258,7 +259,7 @@ RUN \ curl -sL https://versaweb.dl.sourceforge.net/project/lame/lame/$(echo ${LAME_VERSION} | sed -e 's/[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)/\1.\2/')/lame-${LAME_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" --enable-shared --enable-nasm --disable-frontend && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### xvid https://www.xvid.com/ @@ -271,7 +272,7 @@ RUN \ tar -zx -f xvidcore-${XVID_VERSION}.tar.gz && \ cd xvidcore/build/generic && \ ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### fdk-aac https://github.com/mstorsjo/fdk-aac @@ -283,7 +284,7 @@ RUN \ tar -zx --strip-components=1 && \ autoreconf -fiv && \ ./configure --prefix="${PREFIX}" --enable-shared --datadir="${DIR}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## openjpeg https://github.com/uclouvain/openjpeg @@ -294,7 +295,7 @@ RUN \ curl -sL https://github.com/uclouvain/openjpeg/archive/v${OPENJPEG_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ cmake -DBUILD_THIRDPARTY:BOOL=ON -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## freetype https://www.freetype.org/ @@ -306,7 +307,7 @@ RUN \ echo ${FREETYPE_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f freetype-${FREETYPE_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## libvstab https://github.com/georgmartius/vid.stab @@ -318,7 +319,7 @@ RUN \ echo ${LIBVIDSTAB_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f v${LIBVIDSTAB_VERSION}.tar.gz && \ cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## fridibi https://www.fribidi.org/ @@ -343,7 +344,7 @@ RUN \ curl -sLO https://www.freedesktop.org/software/fontconfig/release/fontconfig-${FONTCONFIG_VERSION}.tar.bz2 && \ tar -jx --strip-components=1 -f fontconfig-${FONTCONFIG_VERSION}.tar.bz2 && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## libass https://github.com/libass/libass @@ -356,7 +357,7 @@ RUN \ tar -zx --strip-components=1 -f ${LIBASS_VERSION}.tar.gz && \ ./autogen.sh && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## kvazaar https://github.com/ultravideo/kvazaar @@ -380,7 +381,7 @@ RUN \ mkdir -p ./aom_build ; \ cd ./aom_build ; \ cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" -DBUILD_SHARED_LIBS=1 ..; \ - make ; \ + make -j $(nproc); \ make install ; \ rm -rf ${DIR} @@ -392,7 +393,7 @@ RUN \ curl -sLO https://www.x.org/archive//individual/util/util-macros-${XORG_MACROS_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f util-macros-${XORG_MACROS_VERSION}.tar.gz && \ ./configure --srcdir=${DIR} --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -403,7 +404,7 @@ RUN \ curl -sLO https://www.x.org/archive/individual/proto/xproto-${XPROTO_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f xproto-${XPROTO_VERSION}.tar.gz && \ ./configure --srcdir=${DIR} --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -414,7 +415,7 @@ RUN \ curl -sLO https://www.x.org/archive/individual/lib/libXau-${XAU_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f libXau-${XAU_VERSION}.tar.gz && \ ./configure --srcdir=${DIR} --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -425,7 +426,7 @@ RUN \ curl -sLO https://xcb.freedesktop.org/dist/libpthread-stubs-${LIBPTHREAD_STUBS_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f libpthread-stubs-${LIBPTHREAD_STUBS_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -437,7 +438,7 @@ RUN \ tar -zx --strip-components=1 -f xcb-proto-${XCBPROTO_VERSION}.tar.gz && \ ACLOCAL_PATH="${PREFIX}/share/aclocal" ./autogen.sh && \ ./configure --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -449,7 +450,7 @@ RUN \ tar -zx --strip-components=1 -f libxcb-${LIBXCB_VERSION}.tar.gz && \ ACLOCAL_PATH="${PREFIX}/share/aclocal" ./autogen.sh && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -462,7 +463,7 @@ RUN \ echo ${LIBXML2_SHA256SUM} | sha256sum --check && \ tar -xz --strip-components=1 -f libxml2-v${LIBXML2_VERSION}.tar.gz && \ ./autogen.sh --prefix="${PREFIX}" --with-ftp=no --with-http=no --with-python=no && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -475,7 +476,7 @@ RUN \ echo ${LIBBLURAY_SHA256SUM} | sha256sum --check && \ tar -jx --strip-components=1 -f libbluray-${LIBBLURAY_VERSION}.tar.bz2 && \ ./configure --prefix="${PREFIX}" --disable-examples --disable-bdjava-jar --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -489,7 +490,7 @@ RUN \ tar -xz --strip-components=1 -f v${LIBZMQ_VERSION}.tar.gz && \ ./autogen.sh && \ ./configure --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make check && \ make install && \ rm -rf ${DIR} @@ -502,7 +503,7 @@ RUN \ curl -sLO https://github.com/Haivision/srt/archive/v${LIBSRT_VERSION}.tar.gz && \ tar -xz --strip-components=1 -f v${LIBSRT_VERSION}.tar.gz && \ cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -514,7 +515,7 @@ RUN \ git clone https://git.code.sf.net/p/libpng/code ${DIR} -b v${LIBPNG_VERSION} --depth 1 && \ ./autogen.sh && \ ./configure --prefix="${PREFIX}" && \ - make check && \ + make check -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -528,7 +529,20 @@ RUN \ tar -xz --strip-components=1 -f v${LIBARIBB24_VERSION}.tar.gz && \ autoreconf -fiv && \ ./configure CFLAGS="-I${PREFIX}/include -fPIC" --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ + make install && \ + rm -rf ${DIR} + + +## libsvtav1 +RUN \ + DIR=/tmp/svtav1 && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + git clone https://gitlab.com/AOMediaCodec/SVT-AV1.git ${DIR} --depth=1 -b ${LIBSTVAV1_VERSION} &&\ + cd Build && \ + cmake .. -G"Unix Makefiles" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="${PREFIX}" && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -578,6 +592,7 @@ RUN \ --enable-libopenjpeg \ --enable-libkvazaar \ --enable-libaom \ + --enable-libsvtav1 \ --extra-libs=-lpthread \ --enable-libsrt \ --enable-libaribb24 \ @@ -587,7 +602,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 -j $(nproc) && \ 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..e88fe8854 100644 --- a/docker-images/4.4/scratch312/Dockerfile +++ b/docker-images/4.4/scratch312/Dockerfile @@ -9,7 +9,8 @@ FROM alpine:3.12 AS build WORKDIR /tmp/workdir ENV FFMPEG_VERSION=4.4 \ - AOM_VERSION=v1.0.0 \ + LIBSTVAV1_VERSION=v0.8.7 \ + AOM_VERSION=v3.1.3 \ FDKAAC_VERSION=0.1.5 \ FONTCONFIG_VERSION=2.12.4 \ FREETYPE_VERSION=2.10.4 \ @@ -125,7 +126,7 @@ RUN \ curl -sL https://versaweb.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${OPENCOREAMR_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## x264 http://www.videolan.org/developers/x264.html @@ -136,7 +137,7 @@ RUN \ curl -sL https://download.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-${X264_VERSION}.tar.bz2 | \ tar -jx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared --enable-pic --disable-cli && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### x265 http://x265.org/ @@ -150,7 +151,7 @@ RUN \ sed -i "/-DEXTRA_LIB/ s/$/ -DCMAKE_INSTALL_PREFIX=\${PREFIX}/" multilib.sh && \ sed -i "/^cmake/ s/$/ -DENABLE_CLI=OFF/" multilib.sh && \ ./multilib.sh && \ - make -C 8bit install && \ + make -C 8bit -j $(nproc) install && \ rm -rf ${DIR} ### libogg https://www.xiph.org/ogg/ RUN \ @@ -161,7 +162,7 @@ RUN \ echo ${OGG_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f libogg-${OGG_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libopus https://www.opus-codec.org/ @@ -174,7 +175,7 @@ RUN \ tar -zx --strip-components=1 -f opus-${OPUS_VERSION}.tar.gz && \ autoreconf -fiv && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libvorbis https://xiph.org/vorbis/ @@ -186,7 +187,7 @@ RUN \ echo ${VORBIS_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f libvorbis-${VORBIS_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libtheora http://www.theora.org/ @@ -198,7 +199,7 @@ RUN \ echo ${THEORA_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f libtheora-${THEORA_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libvpx https://www.webmproject.org/code/ @@ -210,7 +211,7 @@ RUN \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-vp8 --enable-vp9 --enable-vp9-highbitdepth --enable-pic --enable-shared \ --disable-debug --disable-examples --disable-docs --disable-install-bins && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libwebp https://developers.google.com/speed/webp/ @@ -221,7 +222,7 @@ RUN \ curl -sL https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-${WEBP_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libmp3lame http://lame.sourceforge.net/ @@ -232,7 +233,7 @@ RUN \ curl -sL https://versaweb.dl.sourceforge.net/project/lame/lame/$(echo ${LAME_VERSION} | sed -e 's/[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)/\1.\2/')/lame-${LAME_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" --enable-shared --enable-nasm --disable-frontend && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### xvid https://www.xvid.com/ @@ -245,7 +246,7 @@ RUN \ tar -zx -f xvidcore-${XVID_VERSION}.tar.gz && \ cd xvidcore/build/generic && \ ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### fdk-aac https://github.com/mstorsjo/fdk-aac @@ -257,7 +258,7 @@ RUN \ tar -zx --strip-components=1 && \ autoreconf -fiv && \ ./configure --prefix="${PREFIX}" --enable-shared --datadir="${DIR}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## openjpeg https://github.com/uclouvain/openjpeg @@ -268,7 +269,7 @@ RUN \ curl -sL https://github.com/uclouvain/openjpeg/archive/v${OPENJPEG_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ cmake -DBUILD_THIRDPARTY:BOOL=ON -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## freetype https://www.freetype.org/ @@ -280,7 +281,7 @@ RUN \ echo ${FREETYPE_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f freetype-${FREETYPE_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## libvstab https://github.com/georgmartius/vid.stab @@ -292,7 +293,7 @@ RUN \ echo ${LIBVIDSTAB_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f v${LIBVIDSTAB_VERSION}.tar.gz && \ cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## fridibi https://www.fribidi.org/ @@ -317,7 +318,7 @@ RUN \ curl -sLO https://www.freedesktop.org/software/fontconfig/release/fontconfig-${FONTCONFIG_VERSION}.tar.bz2 && \ tar -jx --strip-components=1 -f fontconfig-${FONTCONFIG_VERSION}.tar.bz2 && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## libass https://github.com/libass/libass @@ -330,7 +331,7 @@ RUN \ tar -zx --strip-components=1 -f ${LIBASS_VERSION}.tar.gz && \ ./autogen.sh && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## kvazaar https://github.com/ultravideo/kvazaar @@ -354,7 +355,7 @@ RUN \ mkdir -p ./aom_build ; \ cd ./aom_build ; \ cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" -DBUILD_SHARED_LIBS=1 ..; \ - make ; \ + make -j $(nproc); \ make install ; \ rm -rf ${DIR} @@ -366,7 +367,7 @@ RUN \ curl -sLO https://www.x.org/archive//individual/util/util-macros-${XORG_MACROS_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f util-macros-${XORG_MACROS_VERSION}.tar.gz && \ ./configure --srcdir=${DIR} --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -377,7 +378,7 @@ RUN \ curl -sLO https://www.x.org/archive/individual/proto/xproto-${XPROTO_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f xproto-${XPROTO_VERSION}.tar.gz && \ ./configure --srcdir=${DIR} --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -388,7 +389,7 @@ RUN \ curl -sLO https://www.x.org/archive/individual/lib/libXau-${XAU_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f libXau-${XAU_VERSION}.tar.gz && \ ./configure --srcdir=${DIR} --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -399,7 +400,7 @@ RUN \ curl -sLO https://xcb.freedesktop.org/dist/libpthread-stubs-${LIBPTHREAD_STUBS_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f libpthread-stubs-${LIBPTHREAD_STUBS_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -411,7 +412,7 @@ RUN \ tar -zx --strip-components=1 -f xcb-proto-${XCBPROTO_VERSION}.tar.gz && \ ACLOCAL_PATH="${PREFIX}/share/aclocal" ./autogen.sh && \ ./configure --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -423,7 +424,7 @@ RUN \ tar -zx --strip-components=1 -f libxcb-${LIBXCB_VERSION}.tar.gz && \ ACLOCAL_PATH="${PREFIX}/share/aclocal" ./autogen.sh && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -436,7 +437,7 @@ RUN \ echo ${LIBXML2_SHA256SUM} | sha256sum --check && \ tar -xz --strip-components=1 -f libxml2-v${LIBXML2_VERSION}.tar.gz && \ ./autogen.sh --prefix="${PREFIX}" --with-ftp=no --with-http=no --with-python=no && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -449,7 +450,7 @@ RUN \ echo ${LIBBLURAY_SHA256SUM} | sha256sum --check && \ tar -jx --strip-components=1 -f libbluray-${LIBBLURAY_VERSION}.tar.bz2 && \ ./configure --prefix="${PREFIX}" --disable-examples --disable-bdjava-jar --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -463,7 +464,7 @@ RUN \ tar -xz --strip-components=1 -f v${LIBZMQ_VERSION}.tar.gz && \ ./autogen.sh && \ ./configure --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make check && \ make install && \ rm -rf ${DIR} @@ -476,7 +477,7 @@ RUN \ curl -sLO https://github.com/Haivision/srt/archive/v${LIBSRT_VERSION}.tar.gz && \ tar -xz --strip-components=1 -f v${LIBSRT_VERSION}.tar.gz && \ cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -488,7 +489,7 @@ RUN \ git clone https://git.code.sf.net/p/libpng/code ${DIR} -b v${LIBPNG_VERSION} --depth 1 && \ ./autogen.sh && \ ./configure --prefix="${PREFIX}" && \ - make check && \ + make check -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -502,7 +503,20 @@ RUN \ tar -xz --strip-components=1 -f v${LIBARIBB24_VERSION}.tar.gz && \ autoreconf -fiv && \ ./configure CFLAGS="-I${PREFIX}/include -fPIC" --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ + make install && \ + rm -rf ${DIR} + + +## libsvtav1 +RUN \ + DIR=/tmp/svtav1 && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + git clone https://gitlab.com/AOMediaCodec/SVT-AV1.git ${DIR} --depth=1 -b ${LIBSTVAV1_VERSION} &&\ + cd Build && \ + cmake .. -G"Unix Makefiles" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="${PREFIX}" && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -552,12 +566,13 @@ RUN \ --enable-libopenjpeg \ --enable-libkvazaar \ --enable-libaom \ + --enable-libsvtav1 \ --extra-libs=-lpthread \ --enable-libsrt \ --enable-libaribb24 \ --extra-cflags="-I${PREFIX}/include" \ --extra-ldflags="-L${PREFIX}/lib" && \ - make && \ + make -j $(nproc) && \ 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..63df646d0 100644 --- a/docker-images/4.4/scratch38/Dockerfile +++ b/docker-images/4.4/scratch38/Dockerfile @@ -9,7 +9,8 @@ FROM alpine:3.8 AS build WORKDIR /tmp/workdir ENV FFMPEG_VERSION=4.4 \ - AOM_VERSION=v1.0.0 \ + LIBSTVAV1_VERSION=v0.8.7 \ + AOM_VERSION=v3.1.3 \ FDKAAC_VERSION=0.1.5 \ FONTCONFIG_VERSION=2.12.4 \ FREETYPE_VERSION=2.10.4 \ @@ -125,7 +126,7 @@ RUN \ curl -sL https://versaweb.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${OPENCOREAMR_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## x264 http://www.videolan.org/developers/x264.html @@ -136,7 +137,7 @@ RUN \ curl -sL https://download.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-${X264_VERSION}.tar.bz2 | \ tar -jx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared --enable-pic --disable-cli && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### x265 http://x265.org/ @@ -150,7 +151,7 @@ RUN \ sed -i "/-DEXTRA_LIB/ s/$/ -DCMAKE_INSTALL_PREFIX=\${PREFIX}/" multilib.sh && \ sed -i "/^cmake/ s/$/ -DENABLE_CLI=OFF/" multilib.sh && \ ./multilib.sh && \ - make -C 8bit install && \ + make -C 8bit -j $(nproc) install && \ rm -rf ${DIR} ### libogg https://www.xiph.org/ogg/ RUN \ @@ -161,7 +162,7 @@ RUN \ echo ${OGG_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f libogg-${OGG_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libopus https://www.opus-codec.org/ @@ -174,7 +175,7 @@ RUN \ tar -zx --strip-components=1 -f opus-${OPUS_VERSION}.tar.gz && \ autoreconf -fiv && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libvorbis https://xiph.org/vorbis/ @@ -186,7 +187,7 @@ RUN \ echo ${VORBIS_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f libvorbis-${VORBIS_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libtheora http://www.theora.org/ @@ -198,7 +199,7 @@ RUN \ echo ${THEORA_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f libtheora-${THEORA_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libvpx https://www.webmproject.org/code/ @@ -210,7 +211,7 @@ RUN \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-vp8 --enable-vp9 --enable-vp9-highbitdepth --enable-pic --enable-shared \ --disable-debug --disable-examples --disable-docs --disable-install-bins && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libwebp https://developers.google.com/speed/webp/ @@ -221,7 +222,7 @@ RUN \ curl -sL https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-${WEBP_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libmp3lame http://lame.sourceforge.net/ @@ -232,7 +233,7 @@ RUN \ curl -sL https://versaweb.dl.sourceforge.net/project/lame/lame/$(echo ${LAME_VERSION} | sed -e 's/[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)/\1.\2/')/lame-${LAME_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" --enable-shared --enable-nasm --disable-frontend && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### xvid https://www.xvid.com/ @@ -245,7 +246,7 @@ RUN \ tar -zx -f xvidcore-${XVID_VERSION}.tar.gz && \ cd xvidcore/build/generic && \ ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### fdk-aac https://github.com/mstorsjo/fdk-aac @@ -257,7 +258,7 @@ RUN \ tar -zx --strip-components=1 && \ autoreconf -fiv && \ ./configure --prefix="${PREFIX}" --enable-shared --datadir="${DIR}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## openjpeg https://github.com/uclouvain/openjpeg @@ -268,7 +269,7 @@ RUN \ curl -sL https://github.com/uclouvain/openjpeg/archive/v${OPENJPEG_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ cmake -DBUILD_THIRDPARTY:BOOL=ON -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## freetype https://www.freetype.org/ @@ -280,7 +281,7 @@ RUN \ echo ${FREETYPE_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f freetype-${FREETYPE_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## libvstab https://github.com/georgmartius/vid.stab @@ -292,7 +293,7 @@ RUN \ echo ${LIBVIDSTAB_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f v${LIBVIDSTAB_VERSION}.tar.gz && \ cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## fridibi https://www.fribidi.org/ @@ -317,7 +318,7 @@ RUN \ curl -sLO https://www.freedesktop.org/software/fontconfig/release/fontconfig-${FONTCONFIG_VERSION}.tar.bz2 && \ tar -jx --strip-components=1 -f fontconfig-${FONTCONFIG_VERSION}.tar.bz2 && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## libass https://github.com/libass/libass @@ -330,7 +331,7 @@ RUN \ tar -zx --strip-components=1 -f ${LIBASS_VERSION}.tar.gz && \ ./autogen.sh && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## kvazaar https://github.com/ultravideo/kvazaar @@ -354,7 +355,7 @@ RUN \ mkdir -p ./aom_build ; \ cd ./aom_build ; \ cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" -DBUILD_SHARED_LIBS=1 ..; \ - make ; \ + make -j $(nproc); \ make install ; \ rm -rf ${DIR} @@ -366,7 +367,7 @@ RUN \ curl -sLO https://www.x.org/archive//individual/util/util-macros-${XORG_MACROS_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f util-macros-${XORG_MACROS_VERSION}.tar.gz && \ ./configure --srcdir=${DIR} --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -377,7 +378,7 @@ RUN \ curl -sLO https://www.x.org/archive/individual/proto/xproto-${XPROTO_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f xproto-${XPROTO_VERSION}.tar.gz && \ ./configure --srcdir=${DIR} --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -388,7 +389,7 @@ RUN \ curl -sLO https://www.x.org/archive/individual/lib/libXau-${XAU_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f libXau-${XAU_VERSION}.tar.gz && \ ./configure --srcdir=${DIR} --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -399,7 +400,7 @@ RUN \ curl -sLO https://xcb.freedesktop.org/dist/libpthread-stubs-${LIBPTHREAD_STUBS_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f libpthread-stubs-${LIBPTHREAD_STUBS_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -411,7 +412,7 @@ RUN \ tar -zx --strip-components=1 -f xcb-proto-${XCBPROTO_VERSION}.tar.gz && \ ACLOCAL_PATH="${PREFIX}/share/aclocal" ./autogen.sh && \ ./configure --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -423,7 +424,7 @@ RUN \ tar -zx --strip-components=1 -f libxcb-${LIBXCB_VERSION}.tar.gz && \ ACLOCAL_PATH="${PREFIX}/share/aclocal" ./autogen.sh && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -436,7 +437,7 @@ RUN \ echo ${LIBXML2_SHA256SUM} | sha256sum --check && \ tar -xz --strip-components=1 -f libxml2-v${LIBXML2_VERSION}.tar.gz && \ ./autogen.sh --prefix="${PREFIX}" --with-ftp=no --with-http=no --with-python=no && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -449,7 +450,7 @@ RUN \ echo ${LIBBLURAY_SHA256SUM} | sha256sum --check && \ tar -jx --strip-components=1 -f libbluray-${LIBBLURAY_VERSION}.tar.bz2 && \ ./configure --prefix="${PREFIX}" --disable-examples --disable-bdjava-jar --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -463,7 +464,7 @@ RUN \ tar -xz --strip-components=1 -f v${LIBZMQ_VERSION}.tar.gz && \ ./autogen.sh && \ ./configure --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make check && \ make install && \ rm -rf ${DIR} @@ -476,7 +477,7 @@ RUN \ curl -sLO https://github.com/Haivision/srt/archive/v${LIBSRT_VERSION}.tar.gz && \ tar -xz --strip-components=1 -f v${LIBSRT_VERSION}.tar.gz && \ cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -488,7 +489,7 @@ RUN \ git clone https://git.code.sf.net/p/libpng/code ${DIR} -b v${LIBPNG_VERSION} --depth 1 && \ ./autogen.sh && \ ./configure --prefix="${PREFIX}" && \ - make check && \ + make check -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -502,7 +503,20 @@ RUN \ tar -xz --strip-components=1 -f v${LIBARIBB24_VERSION}.tar.gz && \ autoreconf -fiv && \ ./configure CFLAGS="-I${PREFIX}/include -fPIC" --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ + make install && \ + rm -rf ${DIR} + + +## libsvtav1 +RUN \ + DIR=/tmp/svtav1 && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + git clone https://gitlab.com/AOMediaCodec/SVT-AV1.git ${DIR} --depth=1 -b ${LIBSTVAV1_VERSION} &&\ + cd Build && \ + cmake .. -G"Unix Makefiles" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="${PREFIX}" && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -552,12 +566,13 @@ RUN \ --enable-libopenjpeg \ --enable-libkvazaar \ --enable-libaom \ + --enable-libsvtav1 \ --extra-libs=-lpthread \ --enable-libsrt \ --enable-libaribb24 \ --extra-cflags="-I${PREFIX}/include" \ --extra-ldflags="-L${PREFIX}/lib" && \ - make && \ + make -j $(nproc) && \ 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..9d5fd6093 100644 --- a/docker-images/4.4/ubuntu1804/Dockerfile +++ b/docker-images/4.4/ubuntu1804/Dockerfile @@ -17,7 +17,8 @@ RUN apt-get -yqq update && \ FROM base as build ENV FFMPEG_VERSION=4.4 \ - AOM_VERSION=v1.0.0 \ + LIBSTVAV1_VERSION=v0.8.7 \ + AOM_VERSION=v3.1.3 \ FDKAAC_VERSION=0.1.5 \ FONTCONFIG_VERSION=2.12.4 \ FREETYPE_VERSION=2.10.4 \ @@ -124,7 +125,7 @@ RUN \ curl -sL https://versaweb.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${OPENCOREAMR_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## x264 http://www.videolan.org/developers/x264.html @@ -135,7 +136,7 @@ RUN \ curl -sL https://download.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-${X264_VERSION}.tar.bz2 | \ tar -jx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared --enable-pic --disable-cli && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### x265 http://x265.org/ @@ -149,7 +150,7 @@ RUN \ sed -i "/-DEXTRA_LIB/ s/$/ -DCMAKE_INSTALL_PREFIX=\${PREFIX}/" multilib.sh && \ sed -i "/^cmake/ s/$/ -DENABLE_CLI=OFF/" multilib.sh && \ ./multilib.sh && \ - make -C 8bit install && \ + make -C 8bit -j $(nproc) install && \ rm -rf ${DIR} ### libogg https://www.xiph.org/ogg/ RUN \ @@ -160,7 +161,7 @@ RUN \ echo ${OGG_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f libogg-${OGG_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libopus https://www.opus-codec.org/ @@ -173,7 +174,7 @@ RUN \ tar -zx --strip-components=1 -f opus-${OPUS_VERSION}.tar.gz && \ autoreconf -fiv && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libvorbis https://xiph.org/vorbis/ @@ -185,7 +186,7 @@ RUN \ echo ${VORBIS_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f libvorbis-${VORBIS_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libtheora http://www.theora.org/ @@ -197,7 +198,7 @@ RUN \ echo ${THEORA_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f libtheora-${THEORA_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libvpx https://www.webmproject.org/code/ @@ -209,7 +210,7 @@ RUN \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-vp8 --enable-vp9 --enable-vp9-highbitdepth --enable-pic --enable-shared \ --disable-debug --disable-examples --disable-docs --disable-install-bins && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libwebp https://developers.google.com/speed/webp/ @@ -220,7 +221,7 @@ RUN \ curl -sL https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-${WEBP_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libmp3lame http://lame.sourceforge.net/ @@ -231,7 +232,7 @@ RUN \ curl -sL https://versaweb.dl.sourceforge.net/project/lame/lame/$(echo ${LAME_VERSION} | sed -e 's/[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)/\1.\2/')/lame-${LAME_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" --enable-shared --enable-nasm --disable-frontend && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### xvid https://www.xvid.com/ @@ -244,7 +245,7 @@ RUN \ tar -zx -f xvidcore-${XVID_VERSION}.tar.gz && \ cd xvidcore/build/generic && \ ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### fdk-aac https://github.com/mstorsjo/fdk-aac @@ -256,7 +257,7 @@ RUN \ tar -zx --strip-components=1 && \ autoreconf -fiv && \ ./configure --prefix="${PREFIX}" --enable-shared --datadir="${DIR}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## openjpeg https://github.com/uclouvain/openjpeg @@ -267,7 +268,7 @@ RUN \ curl -sL https://github.com/uclouvain/openjpeg/archive/v${OPENJPEG_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ cmake -DBUILD_THIRDPARTY:BOOL=ON -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## freetype https://www.freetype.org/ @@ -279,7 +280,7 @@ RUN \ echo ${FREETYPE_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f freetype-${FREETYPE_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## libvstab https://github.com/georgmartius/vid.stab @@ -291,7 +292,7 @@ RUN \ echo ${LIBVIDSTAB_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f v${LIBVIDSTAB_VERSION}.tar.gz && \ cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## fridibi https://www.fribidi.org/ @@ -316,7 +317,7 @@ RUN \ curl -sLO https://www.freedesktop.org/software/fontconfig/release/fontconfig-${FONTCONFIG_VERSION}.tar.bz2 && \ tar -jx --strip-components=1 -f fontconfig-${FONTCONFIG_VERSION}.tar.bz2 && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## libass https://github.com/libass/libass @@ -329,7 +330,7 @@ RUN \ tar -zx --strip-components=1 -f ${LIBASS_VERSION}.tar.gz && \ ./autogen.sh && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## kvazaar https://github.com/ultravideo/kvazaar @@ -353,7 +354,7 @@ RUN \ mkdir -p ./aom_build ; \ cd ./aom_build ; \ cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" -DBUILD_SHARED_LIBS=1 ..; \ - make ; \ + make -j $(nproc); \ make install ; \ rm -rf ${DIR} @@ -365,7 +366,7 @@ RUN \ curl -sLO https://www.x.org/archive//individual/util/util-macros-${XORG_MACROS_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f util-macros-${XORG_MACROS_VERSION}.tar.gz && \ ./configure --srcdir=${DIR} --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -376,7 +377,7 @@ RUN \ curl -sLO https://www.x.org/archive/individual/proto/xproto-${XPROTO_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f xproto-${XPROTO_VERSION}.tar.gz && \ ./configure --srcdir=${DIR} --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -387,7 +388,7 @@ RUN \ curl -sLO https://www.x.org/archive/individual/lib/libXau-${XAU_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f libXau-${XAU_VERSION}.tar.gz && \ ./configure --srcdir=${DIR} --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -398,7 +399,7 @@ RUN \ curl -sLO https://xcb.freedesktop.org/dist/libpthread-stubs-${LIBPTHREAD_STUBS_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f libpthread-stubs-${LIBPTHREAD_STUBS_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -410,7 +411,7 @@ RUN \ tar -zx --strip-components=1 -f xcb-proto-${XCBPROTO_VERSION}.tar.gz && \ ACLOCAL_PATH="${PREFIX}/share/aclocal" ./autogen.sh && \ ./configure --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -422,7 +423,7 @@ RUN \ tar -zx --strip-components=1 -f libxcb-${LIBXCB_VERSION}.tar.gz && \ ACLOCAL_PATH="${PREFIX}/share/aclocal" ./autogen.sh && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -435,7 +436,7 @@ RUN \ echo ${LIBXML2_SHA256SUM} | sha256sum --check && \ tar -xz --strip-components=1 -f libxml2-v${LIBXML2_VERSION}.tar.gz && \ ./autogen.sh --prefix="${PREFIX}" --with-ftp=no --with-http=no --with-python=no && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -448,7 +449,7 @@ RUN \ echo ${LIBBLURAY_SHA256SUM} | sha256sum --check && \ tar -jx --strip-components=1 -f libbluray-${LIBBLURAY_VERSION}.tar.bz2 && \ ./configure --prefix="${PREFIX}" --disable-examples --disable-bdjava-jar --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -462,7 +463,7 @@ RUN \ tar -xz --strip-components=1 -f v${LIBZMQ_VERSION}.tar.gz && \ ./autogen.sh && \ ./configure --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make check && \ make install && \ rm -rf ${DIR} @@ -475,7 +476,7 @@ RUN \ curl -sLO https://github.com/Haivision/srt/archive/v${LIBSRT_VERSION}.tar.gz && \ tar -xz --strip-components=1 -f v${LIBSRT_VERSION}.tar.gz && \ cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -487,7 +488,7 @@ RUN \ git clone https://git.code.sf.net/p/libpng/code ${DIR} -b v${LIBPNG_VERSION} --depth 1 && \ ./autogen.sh && \ ./configure --prefix="${PREFIX}" && \ - make check && \ + make check -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -501,7 +502,20 @@ RUN \ tar -xz --strip-components=1 -f v${LIBARIBB24_VERSION}.tar.gz && \ autoreconf -fiv && \ ./configure CFLAGS="-I${PREFIX}/include -fPIC" --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ + make install && \ + rm -rf ${DIR} + + +## libsvtav1 +RUN \ + DIR=/tmp/svtav1 && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + git clone https://gitlab.com/AOMediaCodec/SVT-AV1.git ${DIR} --depth=1 -b ${LIBSTVAV1_VERSION} &&\ + cd Build && \ + cmake .. -G"Unix Makefiles" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="${PREFIX}" && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -551,12 +565,13 @@ RUN \ --enable-libopenjpeg \ --enable-libkvazaar \ --enable-libaom \ + --enable-libsvtav1 \ --extra-libs=-lpthread \ --enable-libsrt \ --enable-libaribb24 \ --extra-cflags="-I${PREFIX}/include" \ --extra-ldflags="-L${PREFIX}/lib" && \ - make && \ + make -j $(nproc) && \ 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..9ffe2ca8b 100644 --- a/docker-images/4.4/ubuntu2004/Dockerfile +++ b/docker-images/4.4/ubuntu2004/Dockerfile @@ -17,7 +17,8 @@ RUN apt-get -yqq update && \ FROM base as build ENV FFMPEG_VERSION=4.4 \ - AOM_VERSION=v1.0.0 \ + LIBSTVAV1_VERSION=v0.8.7 \ + AOM_VERSION=v3.1.3 \ FDKAAC_VERSION=0.1.5 \ FONTCONFIG_VERSION=2.12.4 \ FREETYPE_VERSION=2.10.4 \ @@ -127,7 +128,7 @@ RUN \ curl -sL https://versaweb.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${OPENCOREAMR_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## x264 http://www.videolan.org/developers/x264.html @@ -138,7 +139,7 @@ RUN \ curl -sL https://download.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-${X264_VERSION}.tar.bz2 | \ tar -jx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared --enable-pic --disable-cli && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### x265 http://x265.org/ @@ -152,7 +153,7 @@ RUN \ sed -i "/-DEXTRA_LIB/ s/$/ -DCMAKE_INSTALL_PREFIX=\${PREFIX}/" multilib.sh && \ sed -i "/^cmake/ s/$/ -DENABLE_CLI=OFF/" multilib.sh && \ ./multilib.sh && \ - make -C 8bit install && \ + make -C 8bit -j $(nproc) install && \ rm -rf ${DIR} ### libogg https://www.xiph.org/ogg/ RUN \ @@ -163,7 +164,7 @@ RUN \ echo ${OGG_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f libogg-${OGG_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libopus https://www.opus-codec.org/ @@ -176,7 +177,7 @@ RUN \ tar -zx --strip-components=1 -f opus-${OPUS_VERSION}.tar.gz && \ autoreconf -fiv && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libvorbis https://xiph.org/vorbis/ @@ -188,7 +189,7 @@ RUN \ echo ${VORBIS_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f libvorbis-${VORBIS_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libtheora http://www.theora.org/ @@ -200,7 +201,7 @@ RUN \ echo ${THEORA_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f libtheora-${THEORA_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libvpx https://www.webmproject.org/code/ @@ -212,7 +213,7 @@ RUN \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-vp8 --enable-vp9 --enable-vp9-highbitdepth --enable-pic --enable-shared \ --disable-debug --disable-examples --disable-docs --disable-install-bins && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libwebp https://developers.google.com/speed/webp/ @@ -223,7 +224,7 @@ RUN \ curl -sL https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-${WEBP_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libmp3lame http://lame.sourceforge.net/ @@ -234,7 +235,7 @@ RUN \ curl -sL https://versaweb.dl.sourceforge.net/project/lame/lame/$(echo ${LAME_VERSION} | sed -e 's/[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)/\1.\2/')/lame-${LAME_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" --enable-shared --enable-nasm --disable-frontend && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### xvid https://www.xvid.com/ @@ -247,7 +248,7 @@ RUN \ tar -zx -f xvidcore-${XVID_VERSION}.tar.gz && \ cd xvidcore/build/generic && \ ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### fdk-aac https://github.com/mstorsjo/fdk-aac @@ -259,7 +260,7 @@ RUN \ tar -zx --strip-components=1 && \ autoreconf -fiv && \ ./configure --prefix="${PREFIX}" --enable-shared --datadir="${DIR}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## openjpeg https://github.com/uclouvain/openjpeg @@ -270,7 +271,7 @@ RUN \ curl -sL https://github.com/uclouvain/openjpeg/archive/v${OPENJPEG_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ cmake -DBUILD_THIRDPARTY:BOOL=ON -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## freetype https://www.freetype.org/ @@ -282,7 +283,7 @@ RUN \ echo ${FREETYPE_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f freetype-${FREETYPE_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## libvstab https://github.com/georgmartius/vid.stab @@ -294,7 +295,7 @@ RUN \ echo ${LIBVIDSTAB_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f v${LIBVIDSTAB_VERSION}.tar.gz && \ cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## fridibi https://www.fribidi.org/ @@ -319,7 +320,7 @@ RUN \ curl -sLO https://www.freedesktop.org/software/fontconfig/release/fontconfig-${FONTCONFIG_VERSION}.tar.bz2 && \ tar -jx --strip-components=1 -f fontconfig-${FONTCONFIG_VERSION}.tar.bz2 && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## libass https://github.com/libass/libass @@ -332,7 +333,7 @@ RUN \ tar -zx --strip-components=1 -f ${LIBASS_VERSION}.tar.gz && \ ./autogen.sh && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## kvazaar https://github.com/ultravideo/kvazaar @@ -356,7 +357,7 @@ RUN \ mkdir -p ./aom_build ; \ cd ./aom_build ; \ cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" -DBUILD_SHARED_LIBS=1 ..; \ - make ; \ + make -j $(nproc); \ make install ; \ rm -rf ${DIR} @@ -368,7 +369,7 @@ RUN \ curl -sLO https://www.x.org/archive//individual/util/util-macros-${XORG_MACROS_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f util-macros-${XORG_MACROS_VERSION}.tar.gz && \ ./configure --srcdir=${DIR} --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -379,7 +380,7 @@ RUN \ curl -sLO https://www.x.org/archive/individual/proto/xproto-${XPROTO_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f xproto-${XPROTO_VERSION}.tar.gz && \ ./configure --srcdir=${DIR} --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -390,7 +391,7 @@ RUN \ curl -sLO https://www.x.org/archive/individual/lib/libXau-${XAU_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f libXau-${XAU_VERSION}.tar.gz && \ ./configure --srcdir=${DIR} --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -401,7 +402,7 @@ RUN \ curl -sLO https://xcb.freedesktop.org/dist/libpthread-stubs-${LIBPTHREAD_STUBS_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f libpthread-stubs-${LIBPTHREAD_STUBS_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -413,7 +414,7 @@ RUN \ tar -zx --strip-components=1 -f xcb-proto-${XCBPROTO_VERSION}.tar.gz && \ ACLOCAL_PATH="${PREFIX}/share/aclocal" ./autogen.sh && \ ./configure --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -425,7 +426,7 @@ RUN \ tar -zx --strip-components=1 -f libxcb-${LIBXCB_VERSION}.tar.gz && \ ACLOCAL_PATH="${PREFIX}/share/aclocal" ./autogen.sh && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -438,7 +439,7 @@ RUN \ echo ${LIBXML2_SHA256SUM} | sha256sum --check && \ tar -xz --strip-components=1 -f libxml2-v${LIBXML2_VERSION}.tar.gz && \ ./autogen.sh --prefix="${PREFIX}" --with-ftp=no --with-http=no --with-python=no && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -451,7 +452,7 @@ RUN \ echo ${LIBBLURAY_SHA256SUM} | sha256sum --check && \ tar -jx --strip-components=1 -f libbluray-${LIBBLURAY_VERSION}.tar.bz2 && \ ./configure --prefix="${PREFIX}" --disable-examples --disable-bdjava-jar --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -465,7 +466,7 @@ RUN \ tar -xz --strip-components=1 -f v${LIBZMQ_VERSION}.tar.gz && \ ./autogen.sh && \ ./configure --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make check && \ make install && \ rm -rf ${DIR} @@ -478,7 +479,7 @@ RUN \ curl -sLO https://github.com/Haivision/srt/archive/v${LIBSRT_VERSION}.tar.gz && \ tar -xz --strip-components=1 -f v${LIBSRT_VERSION}.tar.gz && \ cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -490,7 +491,7 @@ RUN \ git clone https://git.code.sf.net/p/libpng/code ${DIR} -b v${LIBPNG_VERSION} --depth 1 && \ ./autogen.sh && \ ./configure --prefix="${PREFIX}" && \ - make check && \ + make check -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -504,7 +505,20 @@ RUN \ tar -xz --strip-components=1 -f v${LIBARIBB24_VERSION}.tar.gz && \ autoreconf -fiv && \ ./configure CFLAGS="-I${PREFIX}/include -fPIC" --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ + make install && \ + rm -rf ${DIR} + + +## libsvtav1 +RUN \ + DIR=/tmp/svtav1 && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + git clone https://gitlab.com/AOMediaCodec/SVT-AV1.git ${DIR} --depth=1 -b ${LIBSTVAV1_VERSION} &&\ + cd Build && \ + cmake .. -G"Unix Makefiles" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="${PREFIX}" && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -554,13 +568,14 @@ RUN \ --enable-libopenjpeg \ --enable-libkvazaar \ --enable-libaom \ + --enable-libsvtav1 \ --extra-libs=-lpthread \ --enable-libsrt \ --enable-libaribb24 \ --enable-libvmaf \ --extra-cflags="-I${PREFIX}/include" \ --extra-ldflags="-L${PREFIX}/lib" && \ - make && \ + make -j $(nproc) && \ 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..cca2e8330 100644 --- a/docker-images/4.4/vaapi1804/Dockerfile +++ b/docker-images/4.4/vaapi1804/Dockerfile @@ -17,7 +17,8 @@ RUN apt-get -yqq update && \ FROM base as build ENV FFMPEG_VERSION=4.4 \ - AOM_VERSION=v1.0.0 \ + LIBSTVAV1_VERSION=v0.8.7 \ + AOM_VERSION=v3.1.3 \ FDKAAC_VERSION=0.1.5 \ FONTCONFIG_VERSION=2.12.4 \ FREETYPE_VERSION=2.10.4 \ @@ -125,7 +126,7 @@ RUN \ curl -sL https://versaweb.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${OPENCOREAMR_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## x264 http://www.videolan.org/developers/x264.html @@ -136,7 +137,7 @@ RUN \ curl -sL https://download.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-${X264_VERSION}.tar.bz2 | \ tar -jx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared --enable-pic --disable-cli && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### x265 http://x265.org/ @@ -150,7 +151,7 @@ RUN \ sed -i "/-DEXTRA_LIB/ s/$/ -DCMAKE_INSTALL_PREFIX=\${PREFIX}/" multilib.sh && \ sed -i "/^cmake/ s/$/ -DENABLE_CLI=OFF/" multilib.sh && \ ./multilib.sh && \ - make -C 8bit install && \ + make -C 8bit -j $(nproc) install && \ rm -rf ${DIR} ### libogg https://www.xiph.org/ogg/ RUN \ @@ -161,7 +162,7 @@ RUN \ echo ${OGG_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f libogg-${OGG_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libopus https://www.opus-codec.org/ @@ -174,7 +175,7 @@ RUN \ tar -zx --strip-components=1 -f opus-${OPUS_VERSION}.tar.gz && \ autoreconf -fiv && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libvorbis https://xiph.org/vorbis/ @@ -186,7 +187,7 @@ RUN \ echo ${VORBIS_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f libvorbis-${VORBIS_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libtheora http://www.theora.org/ @@ -198,7 +199,7 @@ RUN \ echo ${THEORA_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f libtheora-${THEORA_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libvpx https://www.webmproject.org/code/ @@ -210,7 +211,7 @@ RUN \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-vp8 --enable-vp9 --enable-vp9-highbitdepth --enable-pic --enable-shared \ --disable-debug --disable-examples --disable-docs --disable-install-bins && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libwebp https://developers.google.com/speed/webp/ @@ -221,7 +222,7 @@ RUN \ curl -sL https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-${WEBP_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libmp3lame http://lame.sourceforge.net/ @@ -232,7 +233,7 @@ RUN \ curl -sL https://versaweb.dl.sourceforge.net/project/lame/lame/$(echo ${LAME_VERSION} | sed -e 's/[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)/\1.\2/')/lame-${LAME_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" --enable-shared --enable-nasm --disable-frontend && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### xvid https://www.xvid.com/ @@ -245,7 +246,7 @@ RUN \ tar -zx -f xvidcore-${XVID_VERSION}.tar.gz && \ cd xvidcore/build/generic && \ ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### fdk-aac https://github.com/mstorsjo/fdk-aac @@ -257,7 +258,7 @@ RUN \ tar -zx --strip-components=1 && \ autoreconf -fiv && \ ./configure --prefix="${PREFIX}" --enable-shared --datadir="${DIR}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## openjpeg https://github.com/uclouvain/openjpeg @@ -268,7 +269,7 @@ RUN \ curl -sL https://github.com/uclouvain/openjpeg/archive/v${OPENJPEG_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ cmake -DBUILD_THIRDPARTY:BOOL=ON -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## freetype https://www.freetype.org/ @@ -280,7 +281,7 @@ RUN \ echo ${FREETYPE_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f freetype-${FREETYPE_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## libvstab https://github.com/georgmartius/vid.stab @@ -292,7 +293,7 @@ RUN \ echo ${LIBVIDSTAB_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f v${LIBVIDSTAB_VERSION}.tar.gz && \ cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## fridibi https://www.fribidi.org/ @@ -317,7 +318,7 @@ RUN \ curl -sLO https://www.freedesktop.org/software/fontconfig/release/fontconfig-${FONTCONFIG_VERSION}.tar.bz2 && \ tar -jx --strip-components=1 -f fontconfig-${FONTCONFIG_VERSION}.tar.bz2 && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## libass https://github.com/libass/libass @@ -330,7 +331,7 @@ RUN \ tar -zx --strip-components=1 -f ${LIBASS_VERSION}.tar.gz && \ ./autogen.sh && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## kvazaar https://github.com/ultravideo/kvazaar @@ -354,7 +355,7 @@ RUN \ mkdir -p ./aom_build ; \ cd ./aom_build ; \ cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" -DBUILD_SHARED_LIBS=1 ..; \ - make ; \ + make -j $(nproc); \ make install ; \ rm -rf ${DIR} @@ -366,7 +367,7 @@ RUN \ curl -sLO https://www.x.org/archive//individual/util/util-macros-${XORG_MACROS_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f util-macros-${XORG_MACROS_VERSION}.tar.gz && \ ./configure --srcdir=${DIR} --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -377,7 +378,7 @@ RUN \ curl -sLO https://www.x.org/archive/individual/proto/xproto-${XPROTO_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f xproto-${XPROTO_VERSION}.tar.gz && \ ./configure --srcdir=${DIR} --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -388,7 +389,7 @@ RUN \ curl -sLO https://www.x.org/archive/individual/lib/libXau-${XAU_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f libXau-${XAU_VERSION}.tar.gz && \ ./configure --srcdir=${DIR} --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -399,7 +400,7 @@ RUN \ curl -sLO https://xcb.freedesktop.org/dist/libpthread-stubs-${LIBPTHREAD_STUBS_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f libpthread-stubs-${LIBPTHREAD_STUBS_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -411,7 +412,7 @@ RUN \ tar -zx --strip-components=1 -f xcb-proto-${XCBPROTO_VERSION}.tar.gz && \ ACLOCAL_PATH="${PREFIX}/share/aclocal" ./autogen.sh && \ ./configure --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -423,7 +424,7 @@ RUN \ tar -zx --strip-components=1 -f libxcb-${LIBXCB_VERSION}.tar.gz && \ ACLOCAL_PATH="${PREFIX}/share/aclocal" ./autogen.sh && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -436,7 +437,7 @@ RUN \ echo ${LIBXML2_SHA256SUM} | sha256sum --check && \ tar -xz --strip-components=1 -f libxml2-v${LIBXML2_VERSION}.tar.gz && \ ./autogen.sh --prefix="${PREFIX}" --with-ftp=no --with-http=no --with-python=no && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -449,7 +450,7 @@ RUN \ echo ${LIBBLURAY_SHA256SUM} | sha256sum --check && \ tar -jx --strip-components=1 -f libbluray-${LIBBLURAY_VERSION}.tar.bz2 && \ ./configure --prefix="${PREFIX}" --disable-examples --disable-bdjava-jar --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -463,7 +464,7 @@ RUN \ tar -xz --strip-components=1 -f v${LIBZMQ_VERSION}.tar.gz && \ ./autogen.sh && \ ./configure --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make check && \ make install && \ rm -rf ${DIR} @@ -476,7 +477,7 @@ RUN \ curl -sLO https://github.com/Haivision/srt/archive/v${LIBSRT_VERSION}.tar.gz && \ tar -xz --strip-components=1 -f v${LIBSRT_VERSION}.tar.gz && \ cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -488,7 +489,7 @@ RUN \ git clone https://git.code.sf.net/p/libpng/code ${DIR} -b v${LIBPNG_VERSION} --depth 1 && \ ./autogen.sh && \ ./configure --prefix="${PREFIX}" && \ - make check && \ + make check -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -502,7 +503,20 @@ RUN \ tar -xz --strip-components=1 -f v${LIBARIBB24_VERSION}.tar.gz && \ autoreconf -fiv && \ ./configure CFLAGS="-I${PREFIX}/include -fPIC" --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ + make install && \ + rm -rf ${DIR} + + +## libsvtav1 +RUN \ + DIR=/tmp/svtav1 && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + git clone https://gitlab.com/AOMediaCodec/SVT-AV1.git ${DIR} --depth=1 -b ${LIBSTVAV1_VERSION} &&\ + cd Build && \ + cmake .. -G"Unix Makefiles" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="${PREFIX}" && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -552,13 +566,14 @@ RUN \ --enable-libopenjpeg \ --enable-libkvazaar \ --enable-libaom \ + --enable-libsvtav1 \ --extra-libs=-lpthread \ --enable-libsrt \ --enable-libaribb24 \ --enable-vaapi \ --extra-cflags="-I${PREFIX}/include" \ --extra-ldflags="-L${PREFIX}/lib" && \ - make && \ + make -j $(nproc) && \ 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..fb979a55b 100644 --- a/docker-images/4.4/vaapi2004/Dockerfile +++ b/docker-images/4.4/vaapi2004/Dockerfile @@ -17,7 +17,8 @@ RUN apt-get -yqq update && \ FROM base as build ENV FFMPEG_VERSION=4.4 \ - AOM_VERSION=v1.0.0 \ + LIBSTVAV1_VERSION=v0.8.7 \ + AOM_VERSION=v3.1.3 \ FDKAAC_VERSION=0.1.5 \ FONTCONFIG_VERSION=2.12.4 \ FREETYPE_VERSION=2.10.4 \ @@ -128,7 +129,7 @@ RUN \ curl -sL https://versaweb.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${OPENCOREAMR_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## x264 http://www.videolan.org/developers/x264.html @@ -139,7 +140,7 @@ RUN \ curl -sL https://download.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-${X264_VERSION}.tar.bz2 | \ tar -jx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared --enable-pic --disable-cli && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### x265 http://x265.org/ @@ -153,7 +154,7 @@ RUN \ sed -i "/-DEXTRA_LIB/ s/$/ -DCMAKE_INSTALL_PREFIX=\${PREFIX}/" multilib.sh && \ sed -i "/^cmake/ s/$/ -DENABLE_CLI=OFF/" multilib.sh && \ ./multilib.sh && \ - make -C 8bit install && \ + make -C 8bit -j $(nproc) install && \ rm -rf ${DIR} ### libogg https://www.xiph.org/ogg/ RUN \ @@ -164,7 +165,7 @@ RUN \ echo ${OGG_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f libogg-${OGG_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libopus https://www.opus-codec.org/ @@ -177,7 +178,7 @@ RUN \ tar -zx --strip-components=1 -f opus-${OPUS_VERSION}.tar.gz && \ autoreconf -fiv && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libvorbis https://xiph.org/vorbis/ @@ -189,7 +190,7 @@ RUN \ echo ${VORBIS_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f libvorbis-${VORBIS_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libtheora http://www.theora.org/ @@ -201,7 +202,7 @@ RUN \ echo ${THEORA_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f libtheora-${THEORA_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libvpx https://www.webmproject.org/code/ @@ -213,7 +214,7 @@ RUN \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-vp8 --enable-vp9 --enable-vp9-highbitdepth --enable-pic --enable-shared \ --disable-debug --disable-examples --disable-docs --disable-install-bins && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libwebp https://developers.google.com/speed/webp/ @@ -224,7 +225,7 @@ RUN \ curl -sL https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-${WEBP_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libmp3lame http://lame.sourceforge.net/ @@ -235,7 +236,7 @@ RUN \ curl -sL https://versaweb.dl.sourceforge.net/project/lame/lame/$(echo ${LAME_VERSION} | sed -e 's/[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)/\1.\2/')/lame-${LAME_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" --enable-shared --enable-nasm --disable-frontend && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### xvid https://www.xvid.com/ @@ -248,7 +249,7 @@ RUN \ tar -zx -f xvidcore-${XVID_VERSION}.tar.gz && \ cd xvidcore/build/generic && \ ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### fdk-aac https://github.com/mstorsjo/fdk-aac @@ -260,7 +261,7 @@ RUN \ tar -zx --strip-components=1 && \ autoreconf -fiv && \ ./configure --prefix="${PREFIX}" --enable-shared --datadir="${DIR}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## openjpeg https://github.com/uclouvain/openjpeg @@ -271,7 +272,7 @@ RUN \ curl -sL https://github.com/uclouvain/openjpeg/archive/v${OPENJPEG_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ cmake -DBUILD_THIRDPARTY:BOOL=ON -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## freetype https://www.freetype.org/ @@ -283,7 +284,7 @@ RUN \ echo ${FREETYPE_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f freetype-${FREETYPE_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## libvstab https://github.com/georgmartius/vid.stab @@ -295,7 +296,7 @@ RUN \ echo ${LIBVIDSTAB_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f v${LIBVIDSTAB_VERSION}.tar.gz && \ cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## fridibi https://www.fribidi.org/ @@ -320,7 +321,7 @@ RUN \ curl -sLO https://www.freedesktop.org/software/fontconfig/release/fontconfig-${FONTCONFIG_VERSION}.tar.bz2 && \ tar -jx --strip-components=1 -f fontconfig-${FONTCONFIG_VERSION}.tar.bz2 && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## libass https://github.com/libass/libass @@ -333,7 +334,7 @@ RUN \ tar -zx --strip-components=1 -f ${LIBASS_VERSION}.tar.gz && \ ./autogen.sh && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## kvazaar https://github.com/ultravideo/kvazaar @@ -357,7 +358,7 @@ RUN \ mkdir -p ./aom_build ; \ cd ./aom_build ; \ cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" -DBUILD_SHARED_LIBS=1 ..; \ - make ; \ + make -j $(nproc); \ make install ; \ rm -rf ${DIR} @@ -369,7 +370,7 @@ RUN \ curl -sLO https://www.x.org/archive//individual/util/util-macros-${XORG_MACROS_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f util-macros-${XORG_MACROS_VERSION}.tar.gz && \ ./configure --srcdir=${DIR} --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -380,7 +381,7 @@ RUN \ curl -sLO https://www.x.org/archive/individual/proto/xproto-${XPROTO_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f xproto-${XPROTO_VERSION}.tar.gz && \ ./configure --srcdir=${DIR} --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -391,7 +392,7 @@ RUN \ curl -sLO https://www.x.org/archive/individual/lib/libXau-${XAU_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f libXau-${XAU_VERSION}.tar.gz && \ ./configure --srcdir=${DIR} --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -402,7 +403,7 @@ RUN \ curl -sLO https://xcb.freedesktop.org/dist/libpthread-stubs-${LIBPTHREAD_STUBS_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f libpthread-stubs-${LIBPTHREAD_STUBS_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -414,7 +415,7 @@ RUN \ tar -zx --strip-components=1 -f xcb-proto-${XCBPROTO_VERSION}.tar.gz && \ ACLOCAL_PATH="${PREFIX}/share/aclocal" ./autogen.sh && \ ./configure --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -426,7 +427,7 @@ RUN \ tar -zx --strip-components=1 -f libxcb-${LIBXCB_VERSION}.tar.gz && \ ACLOCAL_PATH="${PREFIX}/share/aclocal" ./autogen.sh && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -439,7 +440,7 @@ RUN \ echo ${LIBXML2_SHA256SUM} | sha256sum --check && \ tar -xz --strip-components=1 -f libxml2-v${LIBXML2_VERSION}.tar.gz && \ ./autogen.sh --prefix="${PREFIX}" --with-ftp=no --with-http=no --with-python=no && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -452,7 +453,7 @@ RUN \ echo ${LIBBLURAY_SHA256SUM} | sha256sum --check && \ tar -jx --strip-components=1 -f libbluray-${LIBBLURAY_VERSION}.tar.bz2 && \ ./configure --prefix="${PREFIX}" --disable-examples --disable-bdjava-jar --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -466,7 +467,7 @@ RUN \ tar -xz --strip-components=1 -f v${LIBZMQ_VERSION}.tar.gz && \ ./autogen.sh && \ ./configure --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make check && \ make install && \ rm -rf ${DIR} @@ -479,7 +480,7 @@ RUN \ curl -sLO https://github.com/Haivision/srt/archive/v${LIBSRT_VERSION}.tar.gz && \ tar -xz --strip-components=1 -f v${LIBSRT_VERSION}.tar.gz && \ cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -491,7 +492,7 @@ RUN \ git clone https://git.code.sf.net/p/libpng/code ${DIR} -b v${LIBPNG_VERSION} --depth 1 && \ ./autogen.sh && \ ./configure --prefix="${PREFIX}" && \ - make check && \ + make check -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -505,7 +506,20 @@ RUN \ tar -xz --strip-components=1 -f v${LIBARIBB24_VERSION}.tar.gz && \ autoreconf -fiv && \ ./configure CFLAGS="-I${PREFIX}/include -fPIC" --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ + make install && \ + rm -rf ${DIR} + + +## libsvtav1 +RUN \ + DIR=/tmp/svtav1 && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + git clone https://gitlab.com/AOMediaCodec/SVT-AV1.git ${DIR} --depth=1 -b ${LIBSTVAV1_VERSION} &&\ + cd Build && \ + cmake .. -G"Unix Makefiles" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="${PREFIX}" && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -555,6 +569,7 @@ RUN \ --enable-libopenjpeg \ --enable-libkvazaar \ --enable-libaom \ + --enable-libsvtav1 \ --extra-libs=-lpthread \ --enable-libsrt \ --enable-libaribb24 \ @@ -562,7 +577,7 @@ RUN \ --enable-vaapi \ --extra-cflags="-I${PREFIX}/include" \ --extra-ldflags="-L${PREFIX}/lib" && \ - make && \ + make -j $(nproc) && \ make install && \ make tools/zmqsend && cp tools/zmqsend ${PREFIX}/bin/ && \ make distclean && \ diff --git a/docker-images/azure-jobs.yml b/docker-images/azure-jobs.yml index b55693fd0..481588d60 100644 --- a/docker-images/azure-jobs.yml +++ b/docker-images/azure-jobs.yml @@ -421,73 +421,73 @@ jobs: ISPARENT: True - ubuntu1804_3.4.8: + ubuntu1804_3.4.9: MAJOR_VERSION: 3 VERSION: 3.4 - LONG_VERSION: 3.4.8 + LONG_VERSION: 3.4.9 VARIANT: ubuntu1804 PARENT: ubuntu ISPARENT: False - ubuntu2004_3.4.8: + ubuntu2004_3.4.9: MAJOR_VERSION: 3 VERSION: 3.4 - LONG_VERSION: 3.4.8 + LONG_VERSION: 3.4.9 VARIANT: ubuntu2004 PARENT: ubuntu ISPARENT: True - alpine312_3.4.8: + alpine312_3.4.9: MAJOR_VERSION: 3 VERSION: 3.4 - LONG_VERSION: 3.4.8 + LONG_VERSION: 3.4.9 VARIANT: alpine312 PARENT: alpine ISPARENT: True - centos7_3.4.8: + centos7_3.4.9: MAJOR_VERSION: 3 VERSION: 3.4 - LONG_VERSION: 3.4.8 + LONG_VERSION: 3.4.9 VARIANT: centos7 PARENT: centos ISPARENT: False - centos8_3.4.8: + centos8_3.4.9: MAJOR_VERSION: 3 VERSION: 3.4 - LONG_VERSION: 3.4.8 + LONG_VERSION: 3.4.9 VARIANT: centos8 PARENT: centos ISPARENT: True - scratch312_3.4.8: + scratch312_3.4.9: MAJOR_VERSION: 3 VERSION: 3.4 - LONG_VERSION: 3.4.8 + LONG_VERSION: 3.4.9 VARIANT: scratch312 PARENT: scratch ISPARENT: True - vaapi2004_3.4.8: + vaapi2004_3.4.9: MAJOR_VERSION: 3 VERSION: 3.4 - LONG_VERSION: 3.4.8 + LONG_VERSION: 3.4.9 VARIANT: vaapi2004 PARENT: vaapi ISPARENT: True - nvidia2004_3.4.8: + nvidia2004_3.4.9: MAJOR_VERSION: 3 VERSION: 3.4 - LONG_VERSION: 3.4.8 + LONG_VERSION: 3.4.9 VARIANT: nvidia2004 PARENT: nvidia ISPARENT: True diff --git a/docker-images/gitlab-ci.yml b/docker-images/gitlab-ci.yml index efd1e1c17..3bb26dea6 100644 --- a/docker-images/gitlab-ci.yml +++ b/docker-images/gitlab-ci.yml @@ -505,90 +505,90 @@ PARENT: "nvidia" ISPARENT: "True" -3.4.8-ubuntu1804: +3.4.9-ubuntu1804: extends: .docker stage: ubuntu1804 variables: MAJOR_VERSION: 3 VERSION: "3.4" - LONG_VERSION: "3.4.8" + LONG_VERSION: "3.4.9" VARIANT: ubuntu1804 PARENT: "ubuntu" ISPARENT: "False" -3.4.8-ubuntu2004: +3.4.9-ubuntu2004: extends: .docker stage: ubuntu2004 variables: MAJOR_VERSION: 3 VERSION: "3.4" - LONG_VERSION: "3.4.8" + LONG_VERSION: "3.4.9" VARIANT: ubuntu2004 PARENT: "ubuntu" ISPARENT: "True" -3.4.8-alpine312: +3.4.9-alpine312: extends: .docker stage: alpine312 variables: MAJOR_VERSION: 3 VERSION: "3.4" - LONG_VERSION: "3.4.8" + LONG_VERSION: "3.4.9" VARIANT: alpine312 PARENT: "alpine" ISPARENT: "True" -3.4.8-centos7: +3.4.9-centos7: extends: .docker stage: centos7 variables: MAJOR_VERSION: 3 VERSION: "3.4" - LONG_VERSION: "3.4.8" + LONG_VERSION: "3.4.9" VARIANT: centos7 PARENT: "centos" ISPARENT: "False" -3.4.8-centos8: +3.4.9-centos8: extends: .docker stage: centos8 variables: MAJOR_VERSION: 3 VERSION: "3.4" - LONG_VERSION: "3.4.8" + LONG_VERSION: "3.4.9" VARIANT: centos8 PARENT: "centos" ISPARENT: "True" -3.4.8-scratch312: +3.4.9-scratch312: extends: .docker stage: scratch312 variables: MAJOR_VERSION: 3 VERSION: "3.4" - LONG_VERSION: "3.4.8" + LONG_VERSION: "3.4.9" VARIANT: scratch312 PARENT: "scratch" ISPARENT: "True" -3.4.8-vaapi2004: +3.4.9-vaapi2004: extends: .docker stage: vaapi2004 variables: MAJOR_VERSION: 3 VERSION: "3.4" - LONG_VERSION: "3.4.8" + LONG_VERSION: "3.4.9" VARIANT: vaapi2004 PARENT: "vaapi" ISPARENT: "True" -3.4.8-nvidia2004: +3.4.9-nvidia2004: extends: .docker stage: nvidia2004 variables: MAJOR_VERSION: 3 VERSION: "3.4" - LONG_VERSION: "3.4.8" + LONG_VERSION: "3.4.9" VARIANT: nvidia2004 PARENT: "nvidia" ISPARENT: "True" diff --git a/templates/Dockerfile-env b/templates/Dockerfile-env index 3c211e02a..11a7f4b32 100644 --- a/templates/Dockerfile-env +++ b/templates/Dockerfile-env @@ -1,5 +1,6 @@ FFMPEG_VERSION=%%FFMPEG_VERSION%% \ - AOM_VERSION=v1.0.0 \ + LIBSTVAV1_VERSION=v0.8.7 \ + AOM_VERSION=v3.1.3 \ FDKAAC_VERSION=0.1.5 \ FONTCONFIG_VERSION=2.12.4 \ FREETYPE_VERSION=2.10.4 \ diff --git a/templates/Dockerfile-run b/templates/Dockerfile-run index 29c3d00aa..3daeefb8e 100644 --- a/templates/Dockerfile-run +++ b/templates/Dockerfile-run @@ -26,7 +26,7 @@ RUN \ curl -sL https://versaweb.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${OPENCOREAMR_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## x264 http://www.videolan.org/developers/x264.html @@ -37,7 +37,7 @@ RUN \ curl -sL https://download.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-${X264_VERSION}.tar.bz2 | \ tar -jx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared --enable-pic --disable-cli && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### x265 http://x265.org/ @@ -51,7 +51,7 @@ RUN \ sed -i "/-DEXTRA_LIB/ s/$/ -DCMAKE_INSTALL_PREFIX=\${PREFIX}/" multilib.sh && \ sed -i "/^cmake/ s/$/ -DENABLE_CLI=OFF/" multilib.sh && \ ./multilib.sh && \ - make -C 8bit install && \ + make -C 8bit -j $(nproc) install && \ rm -rf ${DIR} ### libogg https://www.xiph.org/ogg/ RUN \ @@ -62,7 +62,7 @@ RUN \ echo ${OGG_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f libogg-${OGG_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libopus https://www.opus-codec.org/ @@ -75,7 +75,7 @@ RUN \ tar -zx --strip-components=1 -f opus-${OPUS_VERSION}.tar.gz && \ autoreconf -fiv && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libvorbis https://xiph.org/vorbis/ @@ -87,7 +87,7 @@ RUN \ echo ${VORBIS_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f libvorbis-${VORBIS_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libtheora http://www.theora.org/ @@ -99,7 +99,7 @@ RUN \ echo ${THEORA_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f libtheora-${THEORA_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libvpx https://www.webmproject.org/code/ @@ -111,7 +111,7 @@ RUN \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-vp8 --enable-vp9 --enable-vp9-highbitdepth --enable-pic --enable-shared \ --disable-debug --disable-examples --disable-docs --disable-install-bins && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libwebp https://developers.google.com/speed/webp/ @@ -122,7 +122,7 @@ RUN \ curl -sL https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-${WEBP_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### libmp3lame http://lame.sourceforge.net/ @@ -133,7 +133,7 @@ RUN \ curl -sL https://versaweb.dl.sourceforge.net/project/lame/lame/$(echo ${LAME_VERSION} | sed -e 's/[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)/\1.\2/')/lame-${LAME_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" --enable-shared --enable-nasm --disable-frontend && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### xvid https://www.xvid.com/ @@ -146,7 +146,7 @@ RUN \ tar -zx -f xvidcore-${XVID_VERSION}.tar.gz && \ cd xvidcore/build/generic && \ ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ### fdk-aac https://github.com/mstorsjo/fdk-aac @@ -158,7 +158,7 @@ RUN \ tar -zx --strip-components=1 && \ autoreconf -fiv && \ ./configure --prefix="${PREFIX}" --enable-shared --datadir="${DIR}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## openjpeg https://github.com/uclouvain/openjpeg @@ -169,7 +169,7 @@ RUN \ curl -sL https://github.com/uclouvain/openjpeg/archive/v${OPENJPEG_VERSION}.tar.gz | \ tar -zx --strip-components=1 && \ cmake -DBUILD_THIRDPARTY:BOOL=ON -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## freetype https://www.freetype.org/ @@ -181,7 +181,7 @@ RUN \ echo ${FREETYPE_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f freetype-${FREETYPE_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## libvstab https://github.com/georgmartius/vid.stab @@ -193,7 +193,7 @@ RUN \ echo ${LIBVIDSTAB_SHA256SUM} | sha256sum --check && \ tar -zx --strip-components=1 -f v${LIBVIDSTAB_VERSION}.tar.gz && \ cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## fridibi https://www.fribidi.org/ @@ -218,7 +218,7 @@ RUN \ curl -sLO https://www.freedesktop.org/software/fontconfig/release/fontconfig-${FONTCONFIG_VERSION}.tar.bz2 && \ tar -jx --strip-components=1 -f fontconfig-${FONTCONFIG_VERSION}.tar.bz2 && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## libass https://github.com/libass/libass @@ -231,7 +231,7 @@ RUN \ tar -zx --strip-components=1 -f ${LIBASS_VERSION}.tar.gz && \ ./autogen.sh && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} ## kvazaar https://github.com/ultravideo/kvazaar @@ -255,7 +255,7 @@ RUN \ mkdir -p ./aom_build ; \ cd ./aom_build ; \ cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" -DBUILD_SHARED_LIBS=1 ..; \ - make ; \ + make -j $(nproc); \ make install ; \ rm -rf ${DIR} @@ -267,7 +267,7 @@ RUN \ curl -sLO https://www.x.org/archive//individual/util/util-macros-${XORG_MACROS_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f util-macros-${XORG_MACROS_VERSION}.tar.gz && \ ./configure --srcdir=${DIR} --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -278,7 +278,7 @@ RUN \ curl -sLO https://www.x.org/archive/individual/proto/xproto-${XPROTO_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f xproto-${XPROTO_VERSION}.tar.gz && \ ./configure --srcdir=${DIR} --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -289,7 +289,7 @@ RUN \ curl -sLO https://www.x.org/archive/individual/lib/libXau-${XAU_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f libXau-${XAU_VERSION}.tar.gz && \ ./configure --srcdir=${DIR} --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -300,7 +300,7 @@ RUN \ curl -sLO https://xcb.freedesktop.org/dist/libpthread-stubs-${LIBPTHREAD_STUBS_VERSION}.tar.gz && \ tar -zx --strip-components=1 -f libpthread-stubs-${LIBPTHREAD_STUBS_VERSION}.tar.gz && \ ./configure --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -312,7 +312,7 @@ RUN \ tar -zx --strip-components=1 -f xcb-proto-${XCBPROTO_VERSION}.tar.gz && \ ACLOCAL_PATH="${PREFIX}/share/aclocal" ./autogen.sh && \ ./configure --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -324,7 +324,7 @@ RUN \ tar -zx --strip-components=1 -f libxcb-${LIBXCB_VERSION}.tar.gz && \ ACLOCAL_PATH="${PREFIX}/share/aclocal" ./autogen.sh && \ ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -337,7 +337,7 @@ RUN \ echo ${LIBXML2_SHA256SUM} | sha256sum --check && \ tar -xz --strip-components=1 -f libxml2-v${LIBXML2_VERSION}.tar.gz && \ ./autogen.sh --prefix="${PREFIX}" --with-ftp=no --with-http=no --with-python=no && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -350,7 +350,7 @@ RUN \ echo ${LIBBLURAY_SHA256SUM} | sha256sum --check && \ tar -jx --strip-components=1 -f libbluray-${LIBBLURAY_VERSION}.tar.bz2 && \ ./configure --prefix="${PREFIX}" --disable-examples --disable-bdjava-jar --disable-static --enable-shared && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -364,7 +364,7 @@ RUN \ tar -xz --strip-components=1 -f v${LIBZMQ_VERSION}.tar.gz && \ ./autogen.sh && \ ./configure --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ make check && \ make install && \ rm -rf ${DIR} @@ -377,7 +377,7 @@ RUN \ curl -sLO https://github.com/Haivision/srt/archive/v${LIBSRT_VERSION}.tar.gz && \ tar -xz --strip-components=1 -f v${LIBSRT_VERSION}.tar.gz && \ cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ - make && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -389,7 +389,7 @@ RUN \ git clone https://git.code.sf.net/p/libpng/code ${DIR} -b v${LIBPNG_VERSION} --depth 1 && \ ./autogen.sh && \ ./configure --prefix="${PREFIX}" && \ - make check && \ + make check -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -403,7 +403,20 @@ RUN \ tar -xz --strip-components=1 -f v${LIBARIBB24_VERSION}.tar.gz && \ autoreconf -fiv && \ ./configure CFLAGS="-I${PREFIX}/include -fPIC" --prefix="${PREFIX}" && \ - make && \ + make -j $(nproc) && \ + make install && \ + rm -rf ${DIR} + + +## libsvtav1 +RUN \ + DIR=/tmp/svtav1 && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + git clone https://gitlab.com/AOMediaCodec/SVT-AV1.git ${DIR} --depth=1 -b ${LIBSTVAV1_VERSION} &&\ + cd Build && \ + cmake .. -G"Unix Makefiles" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="${PREFIX}" && \ + make -j $(nproc) && \ make install && \ rm -rf ${DIR} @@ -419,7 +432,7 @@ RUN \ DIR=/tmp/ffmpeg && mkdir -p ${DIR} && cd ${DIR} && \ ./configure \ %%FFMPEG_CONFIG_FLAGS%% - make && \ + make -j $(nproc) && \ make install && \ make tools/zmqsend && cp tools/zmqsend ${PREFIX}/bin/ && \ make distclean && \ diff --git a/templates/Dockerfile-template.alpine312 b/templates/Dockerfile-template.alpine312 index 5a9be2fcb..fffb936b8 100644 --- a/templates/Dockerfile-template.alpine312 +++ b/templates/Dockerfile-template.alpine312 @@ -36,6 +36,8 @@ RUN buildDeps="autoconf \ yasm \ nasm \ zlib-dev \ + meson \ + xxd \ expat-dev" && \ apk add --no-cache --update ${buildDeps} %%RUN%% diff --git a/update.py b/update.py index 45ec5885c..07a1406a9 100755 --- a/update.py +++ b/update.py @@ -202,6 +202,7 @@ def get_major_version(version): FFMPEG_CONFIG_FLAGS.append("--enable-libkvazaar") if version == "snapshot" or int(version[0]) > 3: FFMPEG_CONFIG_FLAGS.append("--enable-libaom") + FFMPEG_CONFIG_FLAGS.append("--enable-libsvtav1") FFMPEG_CONFIG_FLAGS.append("--extra-libs=-lpthread") # LibSRT is supported from 4.0 From 89d6159cbb04a64e1f3e7785068e3baf9e45b04b Mon Sep 17 00:00:00 2001 From: Tim Dawson Date: Fri, 15 Oct 2021 00:50:07 +1300 Subject: [PATCH 2/2] Build with no parallel build in ffmpeg reslved segfault --- docker-images/4.4/alpine312/Dockerfile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/docker-images/4.4/alpine312/Dockerfile b/docker-images/4.4/alpine312/Dockerfile index c524a978d..33cbc369d 100644 --- a/docker-images/4.4/alpine312/Dockerfile +++ b/docker-images/4.4/alpine312/Dockerfile @@ -573,7 +573,7 @@ RUN \ --enable-libvmaf \ --extra-cflags="-I${PREFIX}/include" \ --extra-ldflags="-L${PREFIX}/lib" && \ - make -j $(nproc) && \ + make && \ make install && \ make tools/zmqsend && cp tools/zmqsend ${PREFIX}/bin/ && \ make distclean && \ @@ -601,10 +601,11 @@ MAINTAINER Julien Rottenberg ENV LD_LIBRARY_PATH=/usr/local/lib:/usr/local/lib64 -CMD ["--help"] -ENTRYPOINT ["ffmpeg"] +#CMD ["--help"] +#ENTRYPOINT ["ffmpeg"] COPY --from=build /usr/local /usr/local +RUN apk add -U bash strace # Let's make sure the app built correctly # Convenient to verify on https://hub.docker.com/r/jrottenberg/ffmpeg/builds/ console output