From c4ef527c444b7814c4bd3ac0f0c7cb6023bd1cfd Mon Sep 17 00:00:00 2001 From: Arno Date: Sun, 5 Apr 2020 01:10:38 +0200 Subject: [PATCH 1/4] Adding SRT protocol support (templates) --- templates/Dockerfile-env | 4 ++++ templates/Dockerfile-run | 13 +++++++++++++ templates/Dockerfile-template.alpine311 | 1 + templates/Dockerfile-template.alpine38 | 1 + templates/Dockerfile-template.centos7 | 1 + templates/Dockerfile-template.centos8 | 1 + templates/Dockerfile-template.nvidia1604 | 1 + templates/Dockerfile-template.nvidia1804 | 1 + templates/Dockerfile-template.scratch311 | 1 + templates/Dockerfile-template.scratch38 | 1 + templates/Dockerfile-template.ubuntu1604 | 1 + templates/Dockerfile-template.ubuntu1804 | 1 + templates/Dockerfile-template.vaapi1604 | 1 + templates/Dockerfile-template.vaapi1804 | 1 + update.py | 1 + 15 files changed, 30 insertions(+) mode change 100755 => 100644 update.py diff --git a/templates/Dockerfile-env b/templates/Dockerfile-env index 2494b55f6..e966cec19 100644 --- a/templates/Dockerfile-env +++ b/templates/Dockerfile-env @@ -15,6 +15,7 @@ FFMPEG_VERSION=%%FFMPEG_VERSION%% \ OPENCOREAMR_VERSION=0.1.5 \ OPUS_VERSION=1.2 \ OPENJPEG_VERSION=2.1.2 \ + SRT_VERSION=1.3.2 \ THEORA_VERSION=1.1.1 \ VORBIS_VERSION=1.3.5 \ VPX_VERSION=1.8.0 \ @@ -47,3 +48,6 @@ ARG MAKEFLAGS="-j2" ARG PKG_CONFIG_PATH="/opt/ffmpeg/share/pkgconfig:/opt/ffmpeg/lib/pkgconfig:/opt/ffmpeg/lib64/pkgconfig" ARG PREFIX=/opt/ffmpeg ARG LD_LIBRARY_PATH="/opt/ffmpeg/lib:/opt/ffmpeg/lib64:/usr/lib64:/usr/lib:/lib64:/lib" + +# Fix issues when installing tzdata on Ubuntu +ARG DEBIAN_FRONTEND=noninteractive diff --git a/templates/Dockerfile-run b/templates/Dockerfile-run index b7d2c40fa..3ae4d33a6 100644 --- a/templates/Dockerfile-run +++ b/templates/Dockerfile-run @@ -335,6 +335,19 @@ RUN \ make install && \ rm -rf ${DIR} +## libsrt - to allow receiving and pushing SRT streams +RUN \ + DIR=/tmp/libsrt && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/Haivision/srt/archive/v${SRT_VERSION}.tar.gz && \ + tar -xz --strip-components=1 -f v${SRT_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} + + ## ffmpeg https://ffmpeg.org/ RUN \ DIR=/tmp/ffmpeg && mkdir -p ${DIR} && cd ${DIR} && \ diff --git a/templates/Dockerfile-template.alpine311 b/templates/Dockerfile-template.alpine311 index 5eb04c04e..2af2124f5 100644 --- a/templates/Dockerfile-template.alpine311 +++ b/templates/Dockerfile-template.alpine311 @@ -33,6 +33,7 @@ RUN buildDeps="autoconf \ python \ openssl-dev \ tar \ + tcl \ yasm \ nasm \ zlib-dev \ diff --git a/templates/Dockerfile-template.alpine38 b/templates/Dockerfile-template.alpine38 index ff8ba5756..cd3bd3705 100644 --- a/templates/Dockerfile-template.alpine38 +++ b/templates/Dockerfile-template.alpine38 @@ -33,6 +33,7 @@ RUN buildDeps="autoconf \ python \ openssl-dev \ tar \ + tcl \ yasm \ nasm \ zlib-dev \ diff --git a/templates/Dockerfile-template.centos7 b/templates/Dockerfile-template.centos7 index 60a0de17c..71dac4a15 100644 --- a/templates/Dockerfile-template.centos7 +++ b/templates/Dockerfile-template.centos7 @@ -34,6 +34,7 @@ RUN buildDeps="autoconf \ python3 \ openssl-devel \ tar \ + tcl \ yasm \ which \ zlib-devel" && \ diff --git a/templates/Dockerfile-template.centos8 b/templates/Dockerfile-template.centos8 index e2abf885b..a4cdeb44d 100644 --- a/templates/Dockerfile-template.centos8 +++ b/templates/Dockerfile-template.centos8 @@ -34,6 +34,7 @@ RUN buildDeps="autoconf \ python3 \ openssl-devel \ tar \ + tcl \ yasm \ which \ zlib-devel" && \ diff --git a/templates/Dockerfile-template.nvidia1604 b/templates/Dockerfile-template.nvidia1604 index 29e4ee8e2..5c3bef032 100644 --- a/templates/Dockerfile-template.nvidia1604 +++ b/templates/Dockerfile-template.nvidia1604 @@ -50,6 +50,7 @@ RUN buildDeps="autoconf \ pkg-config \ python \ libssl-dev \ + tclsh \ yasm \ zlib1g-dev" && \ apt-get -yqq update && \ diff --git a/templates/Dockerfile-template.nvidia1804 b/templates/Dockerfile-template.nvidia1804 index 32dabdf2e..9cb23bbf1 100644 --- a/templates/Dockerfile-template.nvidia1804 +++ b/templates/Dockerfile-template.nvidia1804 @@ -50,6 +50,7 @@ RUN buildDeps="autoconf \ pkg-config \ python \ libssl-dev \ + tclsh \ yasm \ zlib1g-dev" && \ apt-get -yqq update && \ diff --git a/templates/Dockerfile-template.scratch311 b/templates/Dockerfile-template.scratch311 index ee494b295..26b3bb7ac 100644 --- a/templates/Dockerfile-template.scratch311 +++ b/templates/Dockerfile-template.scratch311 @@ -29,6 +29,7 @@ RUN buildDeps="autoconf \ python \ openssl-dev \ tar \ + tcl \ yasm \ nasm \ zlib-dev \ diff --git a/templates/Dockerfile-template.scratch38 b/templates/Dockerfile-template.scratch38 index f31d37c10..b4e50dad2 100644 --- a/templates/Dockerfile-template.scratch38 +++ b/templates/Dockerfile-template.scratch38 @@ -29,6 +29,7 @@ RUN buildDeps="autoconf \ python \ openssl-dev \ tar \ + tcl \ yasm \ nasm \ zlib-dev \ diff --git a/templates/Dockerfile-template.ubuntu1604 b/templates/Dockerfile-template.ubuntu1604 index 924b47cfe..c17fcf4f3 100644 --- a/templates/Dockerfile-template.ubuntu1604 +++ b/templates/Dockerfile-template.ubuntu1604 @@ -35,6 +35,7 @@ RUN buildDeps="autoconf \ pkg-config \ python \ libssl-dev \ + tcl \ yasm \ zlib1g-dev" && \ apt-get -yqq update && \ diff --git a/templates/Dockerfile-template.ubuntu1804 b/templates/Dockerfile-template.ubuntu1804 index 6a8901bbe..a049020fe 100644 --- a/templates/Dockerfile-template.ubuntu1804 +++ b/templates/Dockerfile-template.ubuntu1804 @@ -35,6 +35,7 @@ RUN buildDeps="autoconf \ pkg-config \ python \ libssl-dev \ + tcl \ yasm \ zlib1g-dev" && \ apt-get -yqq update && \ diff --git a/templates/Dockerfile-template.vaapi1604 b/templates/Dockerfile-template.vaapi1604 index 23844e74d..3f05b152a 100644 --- a/templates/Dockerfile-template.vaapi1604 +++ b/templates/Dockerfile-template.vaapi1604 @@ -35,6 +35,7 @@ RUN buildDeps="autoconf \ pkg-config \ python \ libssl-dev \ + tcl \ yasm \ libva-dev \ zlib1g-dev" && \ diff --git a/templates/Dockerfile-template.vaapi1804 b/templates/Dockerfile-template.vaapi1804 index e08a8fbba..f290cba6e 100644 --- a/templates/Dockerfile-template.vaapi1804 +++ b/templates/Dockerfile-template.vaapi1804 @@ -35,6 +35,7 @@ RUN buildDeps="autoconf \ pkg-config \ python \ libssl-dev \ + tcl \ yasm \ libva-dev \ zlib1g-dev" && \ diff --git a/update.py b/update.py old mode 100755 new mode 100644 index b32b60a9a..5e5d89275 --- a/update.py +++ b/update.py @@ -213,6 +213,7 @@ def shorten_version(version): FFMPEG_CONFIG_FLAGS.append('--enable-libopenjpeg') FFMPEG_CONFIG_FLAGS.append('--enable-libkvazaar') if (version == "snapshot" or int(version[0]) > 3): + FFMPEG_CONFIG_FLAGS.append('--enable-libsrt') FFMPEG_CONFIG_FLAGS.append('--enable-libaom') FFMPEG_CONFIG_FLAGS.append('--extra-libs=-lpthread') From 6905f6accbb97b9d77bce01b71110aa9afcc3081 Mon Sep 17 00:00:00 2001 From: Arno Date: Sun, 5 Apr 2020 01:11:03 +0200 Subject: [PATCH 2/4] Generating templates for SRT --- docker-images/3.2/alpine38/Dockerfile | 18 ++++++++++++++++++ docker-images/3.2/centos7/Dockerfile | 18 ++++++++++++++++++ docker-images/3.2/nvidia1604/Dockerfile | 18 ++++++++++++++++++ docker-images/3.2/scratch38/Dockerfile | 18 ++++++++++++++++++ docker-images/3.2/ubuntu1604/Dockerfile | 18 ++++++++++++++++++ docker-images/3.2/vaapi1604/Dockerfile | 18 ++++++++++++++++++ docker-images/3.3/alpine311/Dockerfile | 18 ++++++++++++++++++ docker-images/3.3/centos7/Dockerfile | 18 ++++++++++++++++++ docker-images/3.3/centos8/Dockerfile | 18 ++++++++++++++++++ docker-images/3.3/nvidia1804/Dockerfile | 18 ++++++++++++++++++ docker-images/3.3/scratch311/Dockerfile | 18 ++++++++++++++++++ docker-images/3.3/ubuntu1604/Dockerfile | 18 ++++++++++++++++++ docker-images/3.3/ubuntu1804/Dockerfile | 18 ++++++++++++++++++ docker-images/3.3/vaapi1804/Dockerfile | 18 ++++++++++++++++++ docker-images/3.4/alpine311/Dockerfile | 18 ++++++++++++++++++ docker-images/3.4/centos7/Dockerfile | 18 ++++++++++++++++++ docker-images/3.4/centos8/Dockerfile | 18 ++++++++++++++++++ docker-images/3.4/nvidia1804/Dockerfile | 18 ++++++++++++++++++ docker-images/3.4/scratch311/Dockerfile | 18 ++++++++++++++++++ docker-images/3.4/ubuntu1604/Dockerfile | 18 ++++++++++++++++++ docker-images/3.4/ubuntu1804/Dockerfile | 18 ++++++++++++++++++ docker-images/3.4/vaapi1804/Dockerfile | 18 ++++++++++++++++++ docker-images/4.0/alpine311/Dockerfile | 19 +++++++++++++++++++ docker-images/4.0/centos7/Dockerfile | 19 +++++++++++++++++++ docker-images/4.0/centos8/Dockerfile | 19 +++++++++++++++++++ docker-images/4.0/nvidia1804/Dockerfile | 19 +++++++++++++++++++ docker-images/4.0/scratch311/Dockerfile | 19 +++++++++++++++++++ docker-images/4.0/ubuntu1604/Dockerfile | 19 +++++++++++++++++++ docker-images/4.0/ubuntu1804/Dockerfile | 19 +++++++++++++++++++ docker-images/4.0/vaapi1804/Dockerfile | 19 +++++++++++++++++++ docker-images/4.1/alpine311/Dockerfile | 19 +++++++++++++++++++ docker-images/4.1/centos7/Dockerfile | 19 +++++++++++++++++++ docker-images/4.1/centos8/Dockerfile | 19 +++++++++++++++++++ docker-images/4.1/nvidia1804/Dockerfile | 19 +++++++++++++++++++ docker-images/4.1/scratch311/Dockerfile | 19 +++++++++++++++++++ docker-images/4.1/ubuntu1604/Dockerfile | 19 +++++++++++++++++++ docker-images/4.1/ubuntu1804/Dockerfile | 19 +++++++++++++++++++ docker-images/4.1/vaapi1804/Dockerfile | 19 +++++++++++++++++++ docker-images/4.2/alpine311/Dockerfile | 19 +++++++++++++++++++ docker-images/4.2/centos7/Dockerfile | 19 +++++++++++++++++++ docker-images/4.2/centos8/Dockerfile | 19 +++++++++++++++++++ docker-images/4.2/nvidia1804/Dockerfile | 19 +++++++++++++++++++ docker-images/4.2/scratch311/Dockerfile | 19 +++++++++++++++++++ docker-images/4.2/ubuntu1604/Dockerfile | 19 +++++++++++++++++++ docker-images/4.2/ubuntu1804/Dockerfile | 19 +++++++++++++++++++ docker-images/4.2/vaapi1804/Dockerfile | 19 +++++++++++++++++++ docker-images/snapshot/alpine311/Dockerfile | 19 +++++++++++++++++++ docker-images/snapshot/centos7/Dockerfile | 19 +++++++++++++++++++ docker-images/snapshot/centos8/Dockerfile | 19 +++++++++++++++++++ docker-images/snapshot/nvidia1804/Dockerfile | 19 +++++++++++++++++++ docker-images/snapshot/scratch311/Dockerfile | 19 +++++++++++++++++++ docker-images/snapshot/ubuntu1604/Dockerfile | 19 +++++++++++++++++++ docker-images/snapshot/ubuntu1804/Dockerfile | 19 +++++++++++++++++++ docker-images/snapshot/vaapi1804/Dockerfile | 19 +++++++++++++++++++ 54 files changed, 1004 insertions(+) diff --git a/docker-images/3.2/alpine38/Dockerfile b/docker-images/3.2/alpine38/Dockerfile index c166df19d..ce313bea9 100644 --- a/docker-images/3.2/alpine38/Dockerfile +++ b/docker-images/3.2/alpine38/Dockerfile @@ -30,6 +30,7 @@ ENV FFMPEG_VERSION=3.2.14 \ OPENCOREAMR_VERSION=0.1.5 \ OPUS_VERSION=1.2 \ OPENJPEG_VERSION=2.1.2 \ + SRT_VERSION=1.3.2 \ THEORA_VERSION=1.1.1 \ VORBIS_VERSION=1.3.5 \ VPX_VERSION=1.8.0 \ @@ -63,6 +64,9 @@ ARG PKG_CONFIG_PATH="/opt/ffmpeg/share/pkgconfig:/opt/ffmpeg/lib/pkgconf ARG PREFIX=/opt/ffmpeg ARG LD_LIBRARY_PATH="/opt/ffmpeg/lib:/opt/ffmpeg/lib64:/usr/lib64:/usr/lib:/lib64:/lib" +# Fix issues when installing tzdata on Ubuntu +ARG DEBIAN_FRONTEND=noninteractive + RUN buildDeps="autoconf \ automake \ @@ -82,6 +86,7 @@ RUN buildDeps="autoconf \ python \ openssl-dev \ tar \ + tcl \ yasm \ nasm \ zlib-dev \ @@ -424,6 +429,19 @@ RUN \ make install && \ rm -rf ${DIR} +## libsrt - to allow receiving and pushing SRT streams +RUN \ + DIR=/tmp/libsrt && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/Haivision/srt/archive/v${SRT_VERSION}.tar.gz && \ + tar -xz --strip-components=1 -f v${SRT_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} + + ## ffmpeg https://ffmpeg.org/ RUN \ DIR=/tmp/ffmpeg && mkdir -p ${DIR} && cd ${DIR} && \ diff --git a/docker-images/3.2/centos7/Dockerfile b/docker-images/3.2/centos7/Dockerfile index e9aec5a68..1a978d01b 100644 --- a/docker-images/3.2/centos7/Dockerfile +++ b/docker-images/3.2/centos7/Dockerfile @@ -32,6 +32,7 @@ ENV FFMPEG_VERSION=3.2.14 \ OPENCOREAMR_VERSION=0.1.5 \ OPUS_VERSION=1.2 \ OPENJPEG_VERSION=2.1.2 \ + SRT_VERSION=1.3.2 \ THEORA_VERSION=1.1.1 \ VORBIS_VERSION=1.3.5 \ VPX_VERSION=1.8.0 \ @@ -65,6 +66,9 @@ ARG PKG_CONFIG_PATH="/opt/ffmpeg/share/pkgconfig:/opt/ffmpeg/lib/pkgconf ARG PREFIX=/opt/ffmpeg ARG LD_LIBRARY_PATH="/opt/ffmpeg/lib:/opt/ffmpeg/lib64:/usr/lib64:/usr/lib:/lib64:/lib" +# Fix issues when installing tzdata on Ubuntu +ARG DEBIAN_FRONTEND=noninteractive + RUN buildDeps="autoconf \ automake \ @@ -83,6 +87,7 @@ RUN buildDeps="autoconf \ python3 \ openssl-devel \ tar \ + tcl \ yasm \ which \ zlib-devel" && \ @@ -461,6 +466,19 @@ RUN \ make install && \ rm -rf ${DIR} +## libsrt - to allow receiving and pushing SRT streams +RUN \ + DIR=/tmp/libsrt && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/Haivision/srt/archive/v${SRT_VERSION}.tar.gz && \ + tar -xz --strip-components=1 -f v${SRT_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} + + ## ffmpeg https://ffmpeg.org/ RUN \ DIR=/tmp/ffmpeg && mkdir -p ${DIR} && cd ${DIR} && \ diff --git a/docker-images/3.2/nvidia1604/Dockerfile b/docker-images/3.2/nvidia1604/Dockerfile index a938588c7..6472218a0 100644 --- a/docker-images/3.2/nvidia1604/Dockerfile +++ b/docker-images/3.2/nvidia1604/Dockerfile @@ -48,6 +48,7 @@ ENV FFMPEG_VERSION=3.2.14 \ OPENCOREAMR_VERSION=0.1.5 \ OPUS_VERSION=1.2 \ OPENJPEG_VERSION=2.1.2 \ + SRT_VERSION=1.3.2 \ THEORA_VERSION=1.1.1 \ VORBIS_VERSION=1.3.5 \ VPX_VERSION=1.8.0 \ @@ -81,6 +82,9 @@ ARG PKG_CONFIG_PATH="/opt/ffmpeg/share/pkgconfig:/opt/ffmpeg/lib/pkgconf ARG PREFIX=/opt/ffmpeg ARG LD_LIBRARY_PATH="/opt/ffmpeg/lib:/opt/ffmpeg/lib64:/usr/lib64:/usr/lib:/lib64:/lib" +# Fix issues when installing tzdata on Ubuntu +ARG DEBIAN_FRONTEND=noninteractive + RUN buildDeps="autoconf \ automake \ @@ -99,6 +103,7 @@ RUN buildDeps="autoconf \ pkg-config \ python \ libssl-dev \ + tclsh \ yasm \ zlib1g-dev" && \ apt-get -yqq update && \ @@ -450,6 +455,19 @@ RUN \ make install && \ rm -rf ${DIR} +## libsrt - to allow receiving and pushing SRT streams +RUN \ + DIR=/tmp/libsrt && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/Haivision/srt/archive/v${SRT_VERSION}.tar.gz && \ + tar -xz --strip-components=1 -f v${SRT_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} + + ## ffmpeg https://ffmpeg.org/ RUN \ DIR=/tmp/ffmpeg && mkdir -p ${DIR} && cd ${DIR} && \ diff --git a/docker-images/3.2/scratch38/Dockerfile b/docker-images/3.2/scratch38/Dockerfile index 633c1faf5..6b59fd2bb 100644 --- a/docker-images/3.2/scratch38/Dockerfile +++ b/docker-images/3.2/scratch38/Dockerfile @@ -25,6 +25,7 @@ ENV FFMPEG_VERSION=3.2.14 \ OPENCOREAMR_VERSION=0.1.5 \ OPUS_VERSION=1.2 \ OPENJPEG_VERSION=2.1.2 \ + SRT_VERSION=1.3.2 \ THEORA_VERSION=1.1.1 \ VORBIS_VERSION=1.3.5 \ VPX_VERSION=1.8.0 \ @@ -58,6 +59,9 @@ ARG PKG_CONFIG_PATH="/opt/ffmpeg/share/pkgconfig:/opt/ffmpeg/lib/pkgconf ARG PREFIX=/opt/ffmpeg ARG LD_LIBRARY_PATH="/opt/ffmpeg/lib:/opt/ffmpeg/lib64:/usr/lib64:/usr/lib:/lib64:/lib" +# Fix issues when installing tzdata on Ubuntu +ARG DEBIAN_FRONTEND=noninteractive + RUN buildDeps="autoconf \ automake \ @@ -78,6 +82,7 @@ RUN buildDeps="autoconf \ python \ openssl-dev \ tar \ + tcl \ yasm \ nasm \ zlib-dev \ @@ -426,6 +431,19 @@ RUN \ make install && \ rm -rf ${DIR} +## libsrt - to allow receiving and pushing SRT streams +RUN \ + DIR=/tmp/libsrt && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/Haivision/srt/archive/v${SRT_VERSION}.tar.gz && \ + tar -xz --strip-components=1 -f v${SRT_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} + + ## ffmpeg https://ffmpeg.org/ RUN \ DIR=/tmp/ffmpeg && mkdir -p ${DIR} && cd ${DIR} && \ diff --git a/docker-images/3.2/ubuntu1604/Dockerfile b/docker-images/3.2/ubuntu1604/Dockerfile index 6822f6837..0e44dafa9 100644 --- a/docker-images/3.2/ubuntu1604/Dockerfile +++ b/docker-images/3.2/ubuntu1604/Dockerfile @@ -33,6 +33,7 @@ ENV FFMPEG_VERSION=3.2.14 \ OPENCOREAMR_VERSION=0.1.5 \ OPUS_VERSION=1.2 \ OPENJPEG_VERSION=2.1.2 \ + SRT_VERSION=1.3.2 \ THEORA_VERSION=1.1.1 \ VORBIS_VERSION=1.3.5 \ VPX_VERSION=1.8.0 \ @@ -66,6 +67,9 @@ ARG PKG_CONFIG_PATH="/opt/ffmpeg/share/pkgconfig:/opt/ffmpeg/lib/pkgconf ARG PREFIX=/opt/ffmpeg ARG LD_LIBRARY_PATH="/opt/ffmpeg/lib:/opt/ffmpeg/lib64:/usr/lib64:/usr/lib:/lib64:/lib" +# Fix issues when installing tzdata on Ubuntu +ARG DEBIAN_FRONTEND=noninteractive + RUN buildDeps="autoconf \ automake \ @@ -84,6 +88,7 @@ RUN buildDeps="autoconf \ pkg-config \ python \ libssl-dev \ + tcl \ yasm \ zlib1g-dev" && \ apt-get -yqq update && \ @@ -425,6 +430,19 @@ RUN \ make install && \ rm -rf ${DIR} +## libsrt - to allow receiving and pushing SRT streams +RUN \ + DIR=/tmp/libsrt && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/Haivision/srt/archive/v${SRT_VERSION}.tar.gz && \ + tar -xz --strip-components=1 -f v${SRT_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} + + ## ffmpeg https://ffmpeg.org/ RUN \ DIR=/tmp/ffmpeg && mkdir -p ${DIR} && cd ${DIR} && \ diff --git a/docker-images/3.2/vaapi1604/Dockerfile b/docker-images/3.2/vaapi1604/Dockerfile index 402452878..03621a82e 100644 --- a/docker-images/3.2/vaapi1604/Dockerfile +++ b/docker-images/3.2/vaapi1604/Dockerfile @@ -33,6 +33,7 @@ ENV FFMPEG_VERSION=3.2.14 \ OPENCOREAMR_VERSION=0.1.5 \ OPUS_VERSION=1.2 \ OPENJPEG_VERSION=2.1.2 \ + SRT_VERSION=1.3.2 \ THEORA_VERSION=1.1.1 \ VORBIS_VERSION=1.3.5 \ VPX_VERSION=1.8.0 \ @@ -66,6 +67,9 @@ ARG PKG_CONFIG_PATH="/opt/ffmpeg/share/pkgconfig:/opt/ffmpeg/lib/pkgconf ARG PREFIX=/opt/ffmpeg ARG LD_LIBRARY_PATH="/opt/ffmpeg/lib:/opt/ffmpeg/lib64:/usr/lib64:/usr/lib:/lib64:/lib" +# Fix issues when installing tzdata on Ubuntu +ARG DEBIAN_FRONTEND=noninteractive + RUN buildDeps="autoconf \ automake \ @@ -84,6 +88,7 @@ RUN buildDeps="autoconf \ pkg-config \ python \ libssl-dev \ + tcl \ yasm \ libva-dev \ zlib1g-dev" && \ @@ -426,6 +431,19 @@ RUN \ make install && \ rm -rf ${DIR} +## libsrt - to allow receiving and pushing SRT streams +RUN \ + DIR=/tmp/libsrt && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/Haivision/srt/archive/v${SRT_VERSION}.tar.gz && \ + tar -xz --strip-components=1 -f v${SRT_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} + + ## ffmpeg https://ffmpeg.org/ RUN \ DIR=/tmp/ffmpeg && mkdir -p ${DIR} && cd ${DIR} && \ diff --git a/docker-images/3.3/alpine311/Dockerfile b/docker-images/3.3/alpine311/Dockerfile index 38d5ecd39..142a790e0 100644 --- a/docker-images/3.3/alpine311/Dockerfile +++ b/docker-images/3.3/alpine311/Dockerfile @@ -30,6 +30,7 @@ ENV FFMPEG_VERSION=3.3.9 \ OPENCOREAMR_VERSION=0.1.5 \ OPUS_VERSION=1.2 \ OPENJPEG_VERSION=2.1.2 \ + SRT_VERSION=1.3.2 \ THEORA_VERSION=1.1.1 \ VORBIS_VERSION=1.3.5 \ VPX_VERSION=1.8.0 \ @@ -63,6 +64,9 @@ ARG PKG_CONFIG_PATH="/opt/ffmpeg/share/pkgconfig:/opt/ffmpeg/lib/pkgconf ARG PREFIX=/opt/ffmpeg ARG LD_LIBRARY_PATH="/opt/ffmpeg/lib:/opt/ffmpeg/lib64:/usr/lib64:/usr/lib:/lib64:/lib" +# Fix issues when installing tzdata on Ubuntu +ARG DEBIAN_FRONTEND=noninteractive + RUN buildDeps="autoconf \ automake \ @@ -82,6 +86,7 @@ RUN buildDeps="autoconf \ python \ openssl-dev \ tar \ + tcl \ yasm \ nasm \ zlib-dev \ @@ -424,6 +429,19 @@ RUN \ make install && \ rm -rf ${DIR} +## libsrt - to allow receiving and pushing SRT streams +RUN \ + DIR=/tmp/libsrt && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/Haivision/srt/archive/v${SRT_VERSION}.tar.gz && \ + tar -xz --strip-components=1 -f v${SRT_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} + + ## ffmpeg https://ffmpeg.org/ RUN \ DIR=/tmp/ffmpeg && mkdir -p ${DIR} && cd ${DIR} && \ diff --git a/docker-images/3.3/centos7/Dockerfile b/docker-images/3.3/centos7/Dockerfile index 073f81331..2e727f08f 100644 --- a/docker-images/3.3/centos7/Dockerfile +++ b/docker-images/3.3/centos7/Dockerfile @@ -32,6 +32,7 @@ ENV FFMPEG_VERSION=3.3.9 \ OPENCOREAMR_VERSION=0.1.5 \ OPUS_VERSION=1.2 \ OPENJPEG_VERSION=2.1.2 \ + SRT_VERSION=1.3.2 \ THEORA_VERSION=1.1.1 \ VORBIS_VERSION=1.3.5 \ VPX_VERSION=1.8.0 \ @@ -65,6 +66,9 @@ ARG PKG_CONFIG_PATH="/opt/ffmpeg/share/pkgconfig:/opt/ffmpeg/lib/pkgconf ARG PREFIX=/opt/ffmpeg ARG LD_LIBRARY_PATH="/opt/ffmpeg/lib:/opt/ffmpeg/lib64:/usr/lib64:/usr/lib:/lib64:/lib" +# Fix issues when installing tzdata on Ubuntu +ARG DEBIAN_FRONTEND=noninteractive + RUN buildDeps="autoconf \ automake \ @@ -83,6 +87,7 @@ RUN buildDeps="autoconf \ python3 \ openssl-devel \ tar \ + tcl \ yasm \ which \ zlib-devel" && \ @@ -461,6 +466,19 @@ RUN \ make install && \ rm -rf ${DIR} +## libsrt - to allow receiving and pushing SRT streams +RUN \ + DIR=/tmp/libsrt && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/Haivision/srt/archive/v${SRT_VERSION}.tar.gz && \ + tar -xz --strip-components=1 -f v${SRT_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} + + ## ffmpeg https://ffmpeg.org/ RUN \ DIR=/tmp/ffmpeg && mkdir -p ${DIR} && cd ${DIR} && \ diff --git a/docker-images/3.3/centos8/Dockerfile b/docker-images/3.3/centos8/Dockerfile index 5e3ddac76..350cf32b7 100644 --- a/docker-images/3.3/centos8/Dockerfile +++ b/docker-images/3.3/centos8/Dockerfile @@ -32,6 +32,7 @@ ENV FFMPEG_VERSION=3.3.9 \ OPENCOREAMR_VERSION=0.1.5 \ OPUS_VERSION=1.2 \ OPENJPEG_VERSION=2.1.2 \ + SRT_VERSION=1.3.2 \ THEORA_VERSION=1.1.1 \ VORBIS_VERSION=1.3.5 \ VPX_VERSION=1.8.0 \ @@ -65,6 +66,9 @@ ARG PKG_CONFIG_PATH="/opt/ffmpeg/share/pkgconfig:/opt/ffmpeg/lib/pkgconf ARG PREFIX=/opt/ffmpeg ARG LD_LIBRARY_PATH="/opt/ffmpeg/lib:/opt/ffmpeg/lib64:/usr/lib64:/usr/lib:/lib64:/lib" +# Fix issues when installing tzdata on Ubuntu +ARG DEBIAN_FRONTEND=noninteractive + RUN buildDeps="autoconf \ automake \ @@ -83,6 +87,7 @@ RUN buildDeps="autoconf \ python3 \ openssl-devel \ tar \ + tcl \ yasm \ which \ zlib-devel" && \ @@ -427,6 +432,19 @@ RUN \ make install && \ rm -rf ${DIR} +## libsrt - to allow receiving and pushing SRT streams +RUN \ + DIR=/tmp/libsrt && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/Haivision/srt/archive/v${SRT_VERSION}.tar.gz && \ + tar -xz --strip-components=1 -f v${SRT_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} + + ## ffmpeg https://ffmpeg.org/ RUN \ DIR=/tmp/ffmpeg && mkdir -p ${DIR} && cd ${DIR} && \ diff --git a/docker-images/3.3/nvidia1804/Dockerfile b/docker-images/3.3/nvidia1804/Dockerfile index 2b367559d..c7474913c 100644 --- a/docker-images/3.3/nvidia1804/Dockerfile +++ b/docker-images/3.3/nvidia1804/Dockerfile @@ -48,6 +48,7 @@ ENV FFMPEG_VERSION=3.3.9 \ OPENCOREAMR_VERSION=0.1.5 \ OPUS_VERSION=1.2 \ OPENJPEG_VERSION=2.1.2 \ + SRT_VERSION=1.3.2 \ THEORA_VERSION=1.1.1 \ VORBIS_VERSION=1.3.5 \ VPX_VERSION=1.8.0 \ @@ -81,6 +82,9 @@ ARG PKG_CONFIG_PATH="/opt/ffmpeg/share/pkgconfig:/opt/ffmpeg/lib/pkgconf ARG PREFIX=/opt/ffmpeg ARG LD_LIBRARY_PATH="/opt/ffmpeg/lib:/opt/ffmpeg/lib64:/usr/lib64:/usr/lib:/lib64:/lib" +# Fix issues when installing tzdata on Ubuntu +ARG DEBIAN_FRONTEND=noninteractive + RUN buildDeps="autoconf \ automake \ @@ -99,6 +103,7 @@ RUN buildDeps="autoconf \ pkg-config \ python \ libssl-dev \ + tclsh \ yasm \ zlib1g-dev" && \ apt-get -yqq update && \ @@ -450,6 +455,19 @@ RUN \ make install && \ rm -rf ${DIR} +## libsrt - to allow receiving and pushing SRT streams +RUN \ + DIR=/tmp/libsrt && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/Haivision/srt/archive/v${SRT_VERSION}.tar.gz && \ + tar -xz --strip-components=1 -f v${SRT_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} + + ## ffmpeg https://ffmpeg.org/ RUN \ DIR=/tmp/ffmpeg && mkdir -p ${DIR} && cd ${DIR} && \ diff --git a/docker-images/3.3/scratch311/Dockerfile b/docker-images/3.3/scratch311/Dockerfile index 0f8b79ab8..42bfad68b 100644 --- a/docker-images/3.3/scratch311/Dockerfile +++ b/docker-images/3.3/scratch311/Dockerfile @@ -25,6 +25,7 @@ ENV FFMPEG_VERSION=3.3.9 \ OPENCOREAMR_VERSION=0.1.5 \ OPUS_VERSION=1.2 \ OPENJPEG_VERSION=2.1.2 \ + SRT_VERSION=1.3.2 \ THEORA_VERSION=1.1.1 \ VORBIS_VERSION=1.3.5 \ VPX_VERSION=1.8.0 \ @@ -58,6 +59,9 @@ ARG PKG_CONFIG_PATH="/opt/ffmpeg/share/pkgconfig:/opt/ffmpeg/lib/pkgconf ARG PREFIX=/opt/ffmpeg ARG LD_LIBRARY_PATH="/opt/ffmpeg/lib:/opt/ffmpeg/lib64:/usr/lib64:/usr/lib:/lib64:/lib" +# Fix issues when installing tzdata on Ubuntu +ARG DEBIAN_FRONTEND=noninteractive + RUN buildDeps="autoconf \ automake \ @@ -78,6 +82,7 @@ RUN buildDeps="autoconf \ python \ openssl-dev \ tar \ + tcl \ yasm \ nasm \ zlib-dev \ @@ -426,6 +431,19 @@ RUN \ make install && \ rm -rf ${DIR} +## libsrt - to allow receiving and pushing SRT streams +RUN \ + DIR=/tmp/libsrt && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/Haivision/srt/archive/v${SRT_VERSION}.tar.gz && \ + tar -xz --strip-components=1 -f v${SRT_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} + + ## ffmpeg https://ffmpeg.org/ RUN \ DIR=/tmp/ffmpeg && mkdir -p ${DIR} && cd ${DIR} && \ diff --git a/docker-images/3.3/ubuntu1604/Dockerfile b/docker-images/3.3/ubuntu1604/Dockerfile index 58ce0144a..aaa92468d 100644 --- a/docker-images/3.3/ubuntu1604/Dockerfile +++ b/docker-images/3.3/ubuntu1604/Dockerfile @@ -33,6 +33,7 @@ ENV FFMPEG_VERSION=3.3.9 \ OPENCOREAMR_VERSION=0.1.5 \ OPUS_VERSION=1.2 \ OPENJPEG_VERSION=2.1.2 \ + SRT_VERSION=1.3.2 \ THEORA_VERSION=1.1.1 \ VORBIS_VERSION=1.3.5 \ VPX_VERSION=1.8.0 \ @@ -66,6 +67,9 @@ ARG PKG_CONFIG_PATH="/opt/ffmpeg/share/pkgconfig:/opt/ffmpeg/lib/pkgconf ARG PREFIX=/opt/ffmpeg ARG LD_LIBRARY_PATH="/opt/ffmpeg/lib:/opt/ffmpeg/lib64:/usr/lib64:/usr/lib:/lib64:/lib" +# Fix issues when installing tzdata on Ubuntu +ARG DEBIAN_FRONTEND=noninteractive + RUN buildDeps="autoconf \ automake \ @@ -84,6 +88,7 @@ RUN buildDeps="autoconf \ pkg-config \ python \ libssl-dev \ + tcl \ yasm \ zlib1g-dev" && \ apt-get -yqq update && \ @@ -425,6 +430,19 @@ RUN \ make install && \ rm -rf ${DIR} +## libsrt - to allow receiving and pushing SRT streams +RUN \ + DIR=/tmp/libsrt && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/Haivision/srt/archive/v${SRT_VERSION}.tar.gz && \ + tar -xz --strip-components=1 -f v${SRT_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} + + ## ffmpeg https://ffmpeg.org/ RUN \ DIR=/tmp/ffmpeg && mkdir -p ${DIR} && cd ${DIR} && \ diff --git a/docker-images/3.3/ubuntu1804/Dockerfile b/docker-images/3.3/ubuntu1804/Dockerfile index 5173d7a59..bbbed7248 100644 --- a/docker-images/3.3/ubuntu1804/Dockerfile +++ b/docker-images/3.3/ubuntu1804/Dockerfile @@ -33,6 +33,7 @@ ENV FFMPEG_VERSION=3.3.9 \ OPENCOREAMR_VERSION=0.1.5 \ OPUS_VERSION=1.2 \ OPENJPEG_VERSION=2.1.2 \ + SRT_VERSION=1.3.2 \ THEORA_VERSION=1.1.1 \ VORBIS_VERSION=1.3.5 \ VPX_VERSION=1.8.0 \ @@ -66,6 +67,9 @@ ARG PKG_CONFIG_PATH="/opt/ffmpeg/share/pkgconfig:/opt/ffmpeg/lib/pkgconf ARG PREFIX=/opt/ffmpeg ARG LD_LIBRARY_PATH="/opt/ffmpeg/lib:/opt/ffmpeg/lib64:/usr/lib64:/usr/lib:/lib64:/lib" +# Fix issues when installing tzdata on Ubuntu +ARG DEBIAN_FRONTEND=noninteractive + RUN buildDeps="autoconf \ automake \ @@ -84,6 +88,7 @@ RUN buildDeps="autoconf \ pkg-config \ python \ libssl-dev \ + tcl \ yasm \ zlib1g-dev" && \ apt-get -yqq update && \ @@ -425,6 +430,19 @@ RUN \ make install && \ rm -rf ${DIR} +## libsrt - to allow receiving and pushing SRT streams +RUN \ + DIR=/tmp/libsrt && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/Haivision/srt/archive/v${SRT_VERSION}.tar.gz && \ + tar -xz --strip-components=1 -f v${SRT_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} + + ## ffmpeg https://ffmpeg.org/ RUN \ DIR=/tmp/ffmpeg && mkdir -p ${DIR} && cd ${DIR} && \ diff --git a/docker-images/3.3/vaapi1804/Dockerfile b/docker-images/3.3/vaapi1804/Dockerfile index 644b40352..37a2ee507 100644 --- a/docker-images/3.3/vaapi1804/Dockerfile +++ b/docker-images/3.3/vaapi1804/Dockerfile @@ -33,6 +33,7 @@ ENV FFMPEG_VERSION=3.3.9 \ OPENCOREAMR_VERSION=0.1.5 \ OPUS_VERSION=1.2 \ OPENJPEG_VERSION=2.1.2 \ + SRT_VERSION=1.3.2 \ THEORA_VERSION=1.1.1 \ VORBIS_VERSION=1.3.5 \ VPX_VERSION=1.8.0 \ @@ -66,6 +67,9 @@ ARG PKG_CONFIG_PATH="/opt/ffmpeg/share/pkgconfig:/opt/ffmpeg/lib/pkgconf ARG PREFIX=/opt/ffmpeg ARG LD_LIBRARY_PATH="/opt/ffmpeg/lib:/opt/ffmpeg/lib64:/usr/lib64:/usr/lib:/lib64:/lib" +# Fix issues when installing tzdata on Ubuntu +ARG DEBIAN_FRONTEND=noninteractive + RUN buildDeps="autoconf \ automake \ @@ -84,6 +88,7 @@ RUN buildDeps="autoconf \ pkg-config \ python \ libssl-dev \ + tcl \ yasm \ libva-dev \ zlib1g-dev" && \ @@ -426,6 +431,19 @@ RUN \ make install && \ rm -rf ${DIR} +## libsrt - to allow receiving and pushing SRT streams +RUN \ + DIR=/tmp/libsrt && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/Haivision/srt/archive/v${SRT_VERSION}.tar.gz && \ + tar -xz --strip-components=1 -f v${SRT_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} + + ## ffmpeg https://ffmpeg.org/ RUN \ DIR=/tmp/ffmpeg && mkdir -p ${DIR} && cd ${DIR} && \ diff --git a/docker-images/3.4/alpine311/Dockerfile b/docker-images/3.4/alpine311/Dockerfile index d6e2ce5d2..378211e32 100644 --- a/docker-images/3.4/alpine311/Dockerfile +++ b/docker-images/3.4/alpine311/Dockerfile @@ -30,6 +30,7 @@ ENV FFMPEG_VERSION=3.4.7 \ OPENCOREAMR_VERSION=0.1.5 \ OPUS_VERSION=1.2 \ OPENJPEG_VERSION=2.1.2 \ + SRT_VERSION=1.3.2 \ THEORA_VERSION=1.1.1 \ VORBIS_VERSION=1.3.5 \ VPX_VERSION=1.8.0 \ @@ -63,6 +64,9 @@ ARG PKG_CONFIG_PATH="/opt/ffmpeg/share/pkgconfig:/opt/ffmpeg/lib/pkgconf ARG PREFIX=/opt/ffmpeg ARG LD_LIBRARY_PATH="/opt/ffmpeg/lib:/opt/ffmpeg/lib64:/usr/lib64:/usr/lib:/lib64:/lib" +# Fix issues when installing tzdata on Ubuntu +ARG DEBIAN_FRONTEND=noninteractive + RUN buildDeps="autoconf \ automake \ @@ -82,6 +86,7 @@ RUN buildDeps="autoconf \ python \ openssl-dev \ tar \ + tcl \ yasm \ nasm \ zlib-dev \ @@ -424,6 +429,19 @@ RUN \ make install && \ rm -rf ${DIR} +## libsrt - to allow receiving and pushing SRT streams +RUN \ + DIR=/tmp/libsrt && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/Haivision/srt/archive/v${SRT_VERSION}.tar.gz && \ + tar -xz --strip-components=1 -f v${SRT_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} + + ## ffmpeg https://ffmpeg.org/ RUN \ DIR=/tmp/ffmpeg && mkdir -p ${DIR} && cd ${DIR} && \ diff --git a/docker-images/3.4/centos7/Dockerfile b/docker-images/3.4/centos7/Dockerfile index ad966d114..5e7aa9c6d 100644 --- a/docker-images/3.4/centos7/Dockerfile +++ b/docker-images/3.4/centos7/Dockerfile @@ -32,6 +32,7 @@ ENV FFMPEG_VERSION=3.4.7 \ OPENCOREAMR_VERSION=0.1.5 \ OPUS_VERSION=1.2 \ OPENJPEG_VERSION=2.1.2 \ + SRT_VERSION=1.3.2 \ THEORA_VERSION=1.1.1 \ VORBIS_VERSION=1.3.5 \ VPX_VERSION=1.8.0 \ @@ -65,6 +66,9 @@ ARG PKG_CONFIG_PATH="/opt/ffmpeg/share/pkgconfig:/opt/ffmpeg/lib/pkgconf ARG PREFIX=/opt/ffmpeg ARG LD_LIBRARY_PATH="/opt/ffmpeg/lib:/opt/ffmpeg/lib64:/usr/lib64:/usr/lib:/lib64:/lib" +# Fix issues when installing tzdata on Ubuntu +ARG DEBIAN_FRONTEND=noninteractive + RUN buildDeps="autoconf \ automake \ @@ -83,6 +87,7 @@ RUN buildDeps="autoconf \ python3 \ openssl-devel \ tar \ + tcl \ yasm \ which \ zlib-devel" && \ @@ -461,6 +466,19 @@ RUN \ make install && \ rm -rf ${DIR} +## libsrt - to allow receiving and pushing SRT streams +RUN \ + DIR=/tmp/libsrt && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/Haivision/srt/archive/v${SRT_VERSION}.tar.gz && \ + tar -xz --strip-components=1 -f v${SRT_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} + + ## ffmpeg https://ffmpeg.org/ RUN \ DIR=/tmp/ffmpeg && mkdir -p ${DIR} && cd ${DIR} && \ diff --git a/docker-images/3.4/centos8/Dockerfile b/docker-images/3.4/centos8/Dockerfile index e65aec5d2..1dba01312 100644 --- a/docker-images/3.4/centos8/Dockerfile +++ b/docker-images/3.4/centos8/Dockerfile @@ -32,6 +32,7 @@ ENV FFMPEG_VERSION=3.4.7 \ OPENCOREAMR_VERSION=0.1.5 \ OPUS_VERSION=1.2 \ OPENJPEG_VERSION=2.1.2 \ + SRT_VERSION=1.3.2 \ THEORA_VERSION=1.1.1 \ VORBIS_VERSION=1.3.5 \ VPX_VERSION=1.8.0 \ @@ -65,6 +66,9 @@ ARG PKG_CONFIG_PATH="/opt/ffmpeg/share/pkgconfig:/opt/ffmpeg/lib/pkgconf ARG PREFIX=/opt/ffmpeg ARG LD_LIBRARY_PATH="/opt/ffmpeg/lib:/opt/ffmpeg/lib64:/usr/lib64:/usr/lib:/lib64:/lib" +# Fix issues when installing tzdata on Ubuntu +ARG DEBIAN_FRONTEND=noninteractive + RUN buildDeps="autoconf \ automake \ @@ -83,6 +87,7 @@ RUN buildDeps="autoconf \ python3 \ openssl-devel \ tar \ + tcl \ yasm \ which \ zlib-devel" && \ @@ -427,6 +432,19 @@ RUN \ make install && \ rm -rf ${DIR} +## libsrt - to allow receiving and pushing SRT streams +RUN \ + DIR=/tmp/libsrt && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/Haivision/srt/archive/v${SRT_VERSION}.tar.gz && \ + tar -xz --strip-components=1 -f v${SRT_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} + + ## ffmpeg https://ffmpeg.org/ RUN \ DIR=/tmp/ffmpeg && mkdir -p ${DIR} && cd ${DIR} && \ diff --git a/docker-images/3.4/nvidia1804/Dockerfile b/docker-images/3.4/nvidia1804/Dockerfile index 54e7e3654..b37bffd0c 100644 --- a/docker-images/3.4/nvidia1804/Dockerfile +++ b/docker-images/3.4/nvidia1804/Dockerfile @@ -48,6 +48,7 @@ ENV FFMPEG_VERSION=3.4.7 \ OPENCOREAMR_VERSION=0.1.5 \ OPUS_VERSION=1.2 \ OPENJPEG_VERSION=2.1.2 \ + SRT_VERSION=1.3.2 \ THEORA_VERSION=1.1.1 \ VORBIS_VERSION=1.3.5 \ VPX_VERSION=1.8.0 \ @@ -81,6 +82,9 @@ ARG PKG_CONFIG_PATH="/opt/ffmpeg/share/pkgconfig:/opt/ffmpeg/lib/pkgconf ARG PREFIX=/opt/ffmpeg ARG LD_LIBRARY_PATH="/opt/ffmpeg/lib:/opt/ffmpeg/lib64:/usr/lib64:/usr/lib:/lib64:/lib" +# Fix issues when installing tzdata on Ubuntu +ARG DEBIAN_FRONTEND=noninteractive + RUN buildDeps="autoconf \ automake \ @@ -99,6 +103,7 @@ RUN buildDeps="autoconf \ pkg-config \ python \ libssl-dev \ + tclsh \ yasm \ zlib1g-dev" && \ apt-get -yqq update && \ @@ -450,6 +455,19 @@ RUN \ make install && \ rm -rf ${DIR} +## libsrt - to allow receiving and pushing SRT streams +RUN \ + DIR=/tmp/libsrt && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/Haivision/srt/archive/v${SRT_VERSION}.tar.gz && \ + tar -xz --strip-components=1 -f v${SRT_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} + + ## ffmpeg https://ffmpeg.org/ RUN \ DIR=/tmp/ffmpeg && mkdir -p ${DIR} && cd ${DIR} && \ diff --git a/docker-images/3.4/scratch311/Dockerfile b/docker-images/3.4/scratch311/Dockerfile index 271582f65..a5a9a8f67 100644 --- a/docker-images/3.4/scratch311/Dockerfile +++ b/docker-images/3.4/scratch311/Dockerfile @@ -25,6 +25,7 @@ ENV FFMPEG_VERSION=3.4.7 \ OPENCOREAMR_VERSION=0.1.5 \ OPUS_VERSION=1.2 \ OPENJPEG_VERSION=2.1.2 \ + SRT_VERSION=1.3.2 \ THEORA_VERSION=1.1.1 \ VORBIS_VERSION=1.3.5 \ VPX_VERSION=1.8.0 \ @@ -58,6 +59,9 @@ ARG PKG_CONFIG_PATH="/opt/ffmpeg/share/pkgconfig:/opt/ffmpeg/lib/pkgconf ARG PREFIX=/opt/ffmpeg ARG LD_LIBRARY_PATH="/opt/ffmpeg/lib:/opt/ffmpeg/lib64:/usr/lib64:/usr/lib:/lib64:/lib" +# Fix issues when installing tzdata on Ubuntu +ARG DEBIAN_FRONTEND=noninteractive + RUN buildDeps="autoconf \ automake \ @@ -78,6 +82,7 @@ RUN buildDeps="autoconf \ python \ openssl-dev \ tar \ + tcl \ yasm \ nasm \ zlib-dev \ @@ -426,6 +431,19 @@ RUN \ make install && \ rm -rf ${DIR} +## libsrt - to allow receiving and pushing SRT streams +RUN \ + DIR=/tmp/libsrt && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/Haivision/srt/archive/v${SRT_VERSION}.tar.gz && \ + tar -xz --strip-components=1 -f v${SRT_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} + + ## ffmpeg https://ffmpeg.org/ RUN \ DIR=/tmp/ffmpeg && mkdir -p ${DIR} && cd ${DIR} && \ diff --git a/docker-images/3.4/ubuntu1604/Dockerfile b/docker-images/3.4/ubuntu1604/Dockerfile index a7e67b20a..f73bce04f 100644 --- a/docker-images/3.4/ubuntu1604/Dockerfile +++ b/docker-images/3.4/ubuntu1604/Dockerfile @@ -33,6 +33,7 @@ ENV FFMPEG_VERSION=3.4.7 \ OPENCOREAMR_VERSION=0.1.5 \ OPUS_VERSION=1.2 \ OPENJPEG_VERSION=2.1.2 \ + SRT_VERSION=1.3.2 \ THEORA_VERSION=1.1.1 \ VORBIS_VERSION=1.3.5 \ VPX_VERSION=1.8.0 \ @@ -66,6 +67,9 @@ ARG PKG_CONFIG_PATH="/opt/ffmpeg/share/pkgconfig:/opt/ffmpeg/lib/pkgconf ARG PREFIX=/opt/ffmpeg ARG LD_LIBRARY_PATH="/opt/ffmpeg/lib:/opt/ffmpeg/lib64:/usr/lib64:/usr/lib:/lib64:/lib" +# Fix issues when installing tzdata on Ubuntu +ARG DEBIAN_FRONTEND=noninteractive + RUN buildDeps="autoconf \ automake \ @@ -84,6 +88,7 @@ RUN buildDeps="autoconf \ pkg-config \ python \ libssl-dev \ + tcl \ yasm \ zlib1g-dev" && \ apt-get -yqq update && \ @@ -425,6 +430,19 @@ RUN \ make install && \ rm -rf ${DIR} +## libsrt - to allow receiving and pushing SRT streams +RUN \ + DIR=/tmp/libsrt && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/Haivision/srt/archive/v${SRT_VERSION}.tar.gz && \ + tar -xz --strip-components=1 -f v${SRT_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} + + ## ffmpeg https://ffmpeg.org/ RUN \ DIR=/tmp/ffmpeg && mkdir -p ${DIR} && cd ${DIR} && \ diff --git a/docker-images/3.4/ubuntu1804/Dockerfile b/docker-images/3.4/ubuntu1804/Dockerfile index 89a04a928..4a388cc23 100644 --- a/docker-images/3.4/ubuntu1804/Dockerfile +++ b/docker-images/3.4/ubuntu1804/Dockerfile @@ -33,6 +33,7 @@ ENV FFMPEG_VERSION=3.4.7 \ OPENCOREAMR_VERSION=0.1.5 \ OPUS_VERSION=1.2 \ OPENJPEG_VERSION=2.1.2 \ + SRT_VERSION=1.3.2 \ THEORA_VERSION=1.1.1 \ VORBIS_VERSION=1.3.5 \ VPX_VERSION=1.8.0 \ @@ -66,6 +67,9 @@ ARG PKG_CONFIG_PATH="/opt/ffmpeg/share/pkgconfig:/opt/ffmpeg/lib/pkgconf ARG PREFIX=/opt/ffmpeg ARG LD_LIBRARY_PATH="/opt/ffmpeg/lib:/opt/ffmpeg/lib64:/usr/lib64:/usr/lib:/lib64:/lib" +# Fix issues when installing tzdata on Ubuntu +ARG DEBIAN_FRONTEND=noninteractive + RUN buildDeps="autoconf \ automake \ @@ -84,6 +88,7 @@ RUN buildDeps="autoconf \ pkg-config \ python \ libssl-dev \ + tcl \ yasm \ zlib1g-dev" && \ apt-get -yqq update && \ @@ -425,6 +430,19 @@ RUN \ make install && \ rm -rf ${DIR} +## libsrt - to allow receiving and pushing SRT streams +RUN \ + DIR=/tmp/libsrt && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/Haivision/srt/archive/v${SRT_VERSION}.tar.gz && \ + tar -xz --strip-components=1 -f v${SRT_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} + + ## ffmpeg https://ffmpeg.org/ RUN \ DIR=/tmp/ffmpeg && mkdir -p ${DIR} && cd ${DIR} && \ diff --git a/docker-images/3.4/vaapi1804/Dockerfile b/docker-images/3.4/vaapi1804/Dockerfile index 95c6d5184..27628937c 100644 --- a/docker-images/3.4/vaapi1804/Dockerfile +++ b/docker-images/3.4/vaapi1804/Dockerfile @@ -33,6 +33,7 @@ ENV FFMPEG_VERSION=3.4.7 \ OPENCOREAMR_VERSION=0.1.5 \ OPUS_VERSION=1.2 \ OPENJPEG_VERSION=2.1.2 \ + SRT_VERSION=1.3.2 \ THEORA_VERSION=1.1.1 \ VORBIS_VERSION=1.3.5 \ VPX_VERSION=1.8.0 \ @@ -66,6 +67,9 @@ ARG PKG_CONFIG_PATH="/opt/ffmpeg/share/pkgconfig:/opt/ffmpeg/lib/pkgconf ARG PREFIX=/opt/ffmpeg ARG LD_LIBRARY_PATH="/opt/ffmpeg/lib:/opt/ffmpeg/lib64:/usr/lib64:/usr/lib:/lib64:/lib" +# Fix issues when installing tzdata on Ubuntu +ARG DEBIAN_FRONTEND=noninteractive + RUN buildDeps="autoconf \ automake \ @@ -84,6 +88,7 @@ RUN buildDeps="autoconf \ pkg-config \ python \ libssl-dev \ + tcl \ yasm \ libva-dev \ zlib1g-dev" && \ @@ -426,6 +431,19 @@ RUN \ make install && \ rm -rf ${DIR} +## libsrt - to allow receiving and pushing SRT streams +RUN \ + DIR=/tmp/libsrt && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/Haivision/srt/archive/v${SRT_VERSION}.tar.gz && \ + tar -xz --strip-components=1 -f v${SRT_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} + + ## ffmpeg https://ffmpeg.org/ RUN \ DIR=/tmp/ffmpeg && mkdir -p ${DIR} && cd ${DIR} && \ diff --git a/docker-images/4.0/alpine311/Dockerfile b/docker-images/4.0/alpine311/Dockerfile index fff268ae7..5bfaf311d 100644 --- a/docker-images/4.0/alpine311/Dockerfile +++ b/docker-images/4.0/alpine311/Dockerfile @@ -30,6 +30,7 @@ ENV FFMPEG_VERSION=4.0.5 \ OPENCOREAMR_VERSION=0.1.5 \ OPUS_VERSION=1.2 \ OPENJPEG_VERSION=2.1.2 \ + SRT_VERSION=1.3.2 \ THEORA_VERSION=1.1.1 \ VORBIS_VERSION=1.3.5 \ VPX_VERSION=1.8.0 \ @@ -63,6 +64,9 @@ ARG PKG_CONFIG_PATH="/opt/ffmpeg/share/pkgconfig:/opt/ffmpeg/lib/pkgconf ARG PREFIX=/opt/ffmpeg ARG LD_LIBRARY_PATH="/opt/ffmpeg/lib:/opt/ffmpeg/lib64:/usr/lib64:/usr/lib:/lib64:/lib" +# Fix issues when installing tzdata on Ubuntu +ARG DEBIAN_FRONTEND=noninteractive + RUN buildDeps="autoconf \ automake \ @@ -82,6 +86,7 @@ RUN buildDeps="autoconf \ python \ openssl-dev \ tar \ + tcl \ yasm \ nasm \ zlib-dev \ @@ -424,6 +429,19 @@ RUN \ make install && \ rm -rf ${DIR} +## libsrt - to allow receiving and pushing SRT streams +RUN \ + DIR=/tmp/libsrt && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/Haivision/srt/archive/v${SRT_VERSION}.tar.gz && \ + tar -xz --strip-components=1 -f v${SRT_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} + + ## ffmpeg https://ffmpeg.org/ RUN \ DIR=/tmp/ffmpeg && mkdir -p ${DIR} && cd ${DIR} && \ @@ -468,6 +486,7 @@ RUN \ --prefix="${PREFIX}" \ --enable-libopenjpeg \ --enable-libkvazaar \ + --enable-libsrt \ --enable-libaom \ --extra-libs=-lpthread \ --extra-cflags="-I${PREFIX}/include" \ diff --git a/docker-images/4.0/centos7/Dockerfile b/docker-images/4.0/centos7/Dockerfile index 06a1f1803..a6e7d0031 100644 --- a/docker-images/4.0/centos7/Dockerfile +++ b/docker-images/4.0/centos7/Dockerfile @@ -32,6 +32,7 @@ ENV FFMPEG_VERSION=4.0.5 \ OPENCOREAMR_VERSION=0.1.5 \ OPUS_VERSION=1.2 \ OPENJPEG_VERSION=2.1.2 \ + SRT_VERSION=1.3.2 \ THEORA_VERSION=1.1.1 \ VORBIS_VERSION=1.3.5 \ VPX_VERSION=1.8.0 \ @@ -65,6 +66,9 @@ ARG PKG_CONFIG_PATH="/opt/ffmpeg/share/pkgconfig:/opt/ffmpeg/lib/pkgconf ARG PREFIX=/opt/ffmpeg ARG LD_LIBRARY_PATH="/opt/ffmpeg/lib:/opt/ffmpeg/lib64:/usr/lib64:/usr/lib:/lib64:/lib" +# Fix issues when installing tzdata on Ubuntu +ARG DEBIAN_FRONTEND=noninteractive + RUN buildDeps="autoconf \ automake \ @@ -83,6 +87,7 @@ RUN buildDeps="autoconf \ python3 \ openssl-devel \ tar \ + tcl \ yasm \ which \ zlib-devel" && \ @@ -461,6 +466,19 @@ RUN \ make install && \ rm -rf ${DIR} +## libsrt - to allow receiving and pushing SRT streams +RUN \ + DIR=/tmp/libsrt && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/Haivision/srt/archive/v${SRT_VERSION}.tar.gz && \ + tar -xz --strip-components=1 -f v${SRT_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} + + ## ffmpeg https://ffmpeg.org/ RUN \ DIR=/tmp/ffmpeg && mkdir -p ${DIR} && cd ${DIR} && \ @@ -505,6 +523,7 @@ RUN \ --prefix="${PREFIX}" \ --enable-libopenjpeg \ --enable-libkvazaar \ + --enable-libsrt \ --enable-libaom \ --extra-libs=-lpthread \ --extra-cflags="-I${PREFIX}/include" \ diff --git a/docker-images/4.0/centos8/Dockerfile b/docker-images/4.0/centos8/Dockerfile index ba6950b67..8543c15cb 100644 --- a/docker-images/4.0/centos8/Dockerfile +++ b/docker-images/4.0/centos8/Dockerfile @@ -32,6 +32,7 @@ ENV FFMPEG_VERSION=4.0.5 \ OPENCOREAMR_VERSION=0.1.5 \ OPUS_VERSION=1.2 \ OPENJPEG_VERSION=2.1.2 \ + SRT_VERSION=1.3.2 \ THEORA_VERSION=1.1.1 \ VORBIS_VERSION=1.3.5 \ VPX_VERSION=1.8.0 \ @@ -65,6 +66,9 @@ ARG PKG_CONFIG_PATH="/opt/ffmpeg/share/pkgconfig:/opt/ffmpeg/lib/pkgconf ARG PREFIX=/opt/ffmpeg ARG LD_LIBRARY_PATH="/opt/ffmpeg/lib:/opt/ffmpeg/lib64:/usr/lib64:/usr/lib:/lib64:/lib" +# Fix issues when installing tzdata on Ubuntu +ARG DEBIAN_FRONTEND=noninteractive + RUN buildDeps="autoconf \ automake \ @@ -83,6 +87,7 @@ RUN buildDeps="autoconf \ python3 \ openssl-devel \ tar \ + tcl \ yasm \ which \ zlib-devel" && \ @@ -427,6 +432,19 @@ RUN \ make install && \ rm -rf ${DIR} +## libsrt - to allow receiving and pushing SRT streams +RUN \ + DIR=/tmp/libsrt && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/Haivision/srt/archive/v${SRT_VERSION}.tar.gz && \ + tar -xz --strip-components=1 -f v${SRT_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} + + ## ffmpeg https://ffmpeg.org/ RUN \ DIR=/tmp/ffmpeg && mkdir -p ${DIR} && cd ${DIR} && \ @@ -471,6 +489,7 @@ RUN \ --prefix="${PREFIX}" \ --enable-libopenjpeg \ --enable-libkvazaar \ + --enable-libsrt \ --enable-libaom \ --extra-libs=-lpthread \ --extra-cflags="-I${PREFIX}/include" \ diff --git a/docker-images/4.0/nvidia1804/Dockerfile b/docker-images/4.0/nvidia1804/Dockerfile index 5cb1283a2..6a7465b19 100644 --- a/docker-images/4.0/nvidia1804/Dockerfile +++ b/docker-images/4.0/nvidia1804/Dockerfile @@ -48,6 +48,7 @@ ENV FFMPEG_VERSION=4.0.5 \ OPENCOREAMR_VERSION=0.1.5 \ OPUS_VERSION=1.2 \ OPENJPEG_VERSION=2.1.2 \ + SRT_VERSION=1.3.2 \ THEORA_VERSION=1.1.1 \ VORBIS_VERSION=1.3.5 \ VPX_VERSION=1.8.0 \ @@ -81,6 +82,9 @@ ARG PKG_CONFIG_PATH="/opt/ffmpeg/share/pkgconfig:/opt/ffmpeg/lib/pkgconf ARG PREFIX=/opt/ffmpeg ARG LD_LIBRARY_PATH="/opt/ffmpeg/lib:/opt/ffmpeg/lib64:/usr/lib64:/usr/lib:/lib64:/lib" +# Fix issues when installing tzdata on Ubuntu +ARG DEBIAN_FRONTEND=noninteractive + RUN buildDeps="autoconf \ automake \ @@ -99,6 +103,7 @@ RUN buildDeps="autoconf \ pkg-config \ python \ libssl-dev \ + tclsh \ yasm \ zlib1g-dev" && \ apt-get -yqq update && \ @@ -450,6 +455,19 @@ RUN \ make install && \ rm -rf ${DIR} +## libsrt - to allow receiving and pushing SRT streams +RUN \ + DIR=/tmp/libsrt && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/Haivision/srt/archive/v${SRT_VERSION}.tar.gz && \ + tar -xz --strip-components=1 -f v${SRT_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} + + ## ffmpeg https://ffmpeg.org/ RUN \ DIR=/tmp/ffmpeg && mkdir -p ${DIR} && cd ${DIR} && \ @@ -494,6 +512,7 @@ RUN \ --prefix="${PREFIX}" \ --enable-libopenjpeg \ --enable-libkvazaar \ + --enable-libsrt \ --enable-libaom \ --extra-libs=-lpthread \ --enable-nvenc \ diff --git a/docker-images/4.0/scratch311/Dockerfile b/docker-images/4.0/scratch311/Dockerfile index 35a2a56b6..1a5756cbd 100644 --- a/docker-images/4.0/scratch311/Dockerfile +++ b/docker-images/4.0/scratch311/Dockerfile @@ -25,6 +25,7 @@ ENV FFMPEG_VERSION=4.0.5 \ OPENCOREAMR_VERSION=0.1.5 \ OPUS_VERSION=1.2 \ OPENJPEG_VERSION=2.1.2 \ + SRT_VERSION=1.3.2 \ THEORA_VERSION=1.1.1 \ VORBIS_VERSION=1.3.5 \ VPX_VERSION=1.8.0 \ @@ -58,6 +59,9 @@ ARG PKG_CONFIG_PATH="/opt/ffmpeg/share/pkgconfig:/opt/ffmpeg/lib/pkgconf ARG PREFIX=/opt/ffmpeg ARG LD_LIBRARY_PATH="/opt/ffmpeg/lib:/opt/ffmpeg/lib64:/usr/lib64:/usr/lib:/lib64:/lib" +# Fix issues when installing tzdata on Ubuntu +ARG DEBIAN_FRONTEND=noninteractive + RUN buildDeps="autoconf \ automake \ @@ -78,6 +82,7 @@ RUN buildDeps="autoconf \ python \ openssl-dev \ tar \ + tcl \ yasm \ nasm \ zlib-dev \ @@ -426,6 +431,19 @@ RUN \ make install && \ rm -rf ${DIR} +## libsrt - to allow receiving and pushing SRT streams +RUN \ + DIR=/tmp/libsrt && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/Haivision/srt/archive/v${SRT_VERSION}.tar.gz && \ + tar -xz --strip-components=1 -f v${SRT_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} + + ## ffmpeg https://ffmpeg.org/ RUN \ DIR=/tmp/ffmpeg && mkdir -p ${DIR} && cd ${DIR} && \ @@ -470,6 +488,7 @@ RUN \ --prefix="${PREFIX}" \ --enable-libopenjpeg \ --enable-libkvazaar \ + --enable-libsrt \ --enable-libaom \ --extra-libs=-lpthread \ --extra-cflags="-I${PREFIX}/include" \ diff --git a/docker-images/4.0/ubuntu1604/Dockerfile b/docker-images/4.0/ubuntu1604/Dockerfile index 2bfce9cd6..884bb0ef9 100644 --- a/docker-images/4.0/ubuntu1604/Dockerfile +++ b/docker-images/4.0/ubuntu1604/Dockerfile @@ -33,6 +33,7 @@ ENV FFMPEG_VERSION=4.0.5 \ OPENCOREAMR_VERSION=0.1.5 \ OPUS_VERSION=1.2 \ OPENJPEG_VERSION=2.1.2 \ + SRT_VERSION=1.3.2 \ THEORA_VERSION=1.1.1 \ VORBIS_VERSION=1.3.5 \ VPX_VERSION=1.8.0 \ @@ -66,6 +67,9 @@ ARG PKG_CONFIG_PATH="/opt/ffmpeg/share/pkgconfig:/opt/ffmpeg/lib/pkgconf ARG PREFIX=/opt/ffmpeg ARG LD_LIBRARY_PATH="/opt/ffmpeg/lib:/opt/ffmpeg/lib64:/usr/lib64:/usr/lib:/lib64:/lib" +# Fix issues when installing tzdata on Ubuntu +ARG DEBIAN_FRONTEND=noninteractive + RUN buildDeps="autoconf \ automake \ @@ -84,6 +88,7 @@ RUN buildDeps="autoconf \ pkg-config \ python \ libssl-dev \ + tcl \ yasm \ zlib1g-dev" && \ apt-get -yqq update && \ @@ -425,6 +430,19 @@ RUN \ make install && \ rm -rf ${DIR} +## libsrt - to allow receiving and pushing SRT streams +RUN \ + DIR=/tmp/libsrt && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/Haivision/srt/archive/v${SRT_VERSION}.tar.gz && \ + tar -xz --strip-components=1 -f v${SRT_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} + + ## ffmpeg https://ffmpeg.org/ RUN \ DIR=/tmp/ffmpeg && mkdir -p ${DIR} && cd ${DIR} && \ @@ -469,6 +487,7 @@ RUN \ --prefix="${PREFIX}" \ --enable-libopenjpeg \ --enable-libkvazaar \ + --enable-libsrt \ --enable-libaom \ --extra-libs=-lpthread \ --extra-cflags="-I${PREFIX}/include" \ diff --git a/docker-images/4.0/ubuntu1804/Dockerfile b/docker-images/4.0/ubuntu1804/Dockerfile index 88cbf157d..26d681618 100644 --- a/docker-images/4.0/ubuntu1804/Dockerfile +++ b/docker-images/4.0/ubuntu1804/Dockerfile @@ -33,6 +33,7 @@ ENV FFMPEG_VERSION=4.0.5 \ OPENCOREAMR_VERSION=0.1.5 \ OPUS_VERSION=1.2 \ OPENJPEG_VERSION=2.1.2 \ + SRT_VERSION=1.3.2 \ THEORA_VERSION=1.1.1 \ VORBIS_VERSION=1.3.5 \ VPX_VERSION=1.8.0 \ @@ -66,6 +67,9 @@ ARG PKG_CONFIG_PATH="/opt/ffmpeg/share/pkgconfig:/opt/ffmpeg/lib/pkgconf ARG PREFIX=/opt/ffmpeg ARG LD_LIBRARY_PATH="/opt/ffmpeg/lib:/opt/ffmpeg/lib64:/usr/lib64:/usr/lib:/lib64:/lib" +# Fix issues when installing tzdata on Ubuntu +ARG DEBIAN_FRONTEND=noninteractive + RUN buildDeps="autoconf \ automake \ @@ -84,6 +88,7 @@ RUN buildDeps="autoconf \ pkg-config \ python \ libssl-dev \ + tcl \ yasm \ zlib1g-dev" && \ apt-get -yqq update && \ @@ -425,6 +430,19 @@ RUN \ make install && \ rm -rf ${DIR} +## libsrt - to allow receiving and pushing SRT streams +RUN \ + DIR=/tmp/libsrt && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/Haivision/srt/archive/v${SRT_VERSION}.tar.gz && \ + tar -xz --strip-components=1 -f v${SRT_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} + + ## ffmpeg https://ffmpeg.org/ RUN \ DIR=/tmp/ffmpeg && mkdir -p ${DIR} && cd ${DIR} && \ @@ -469,6 +487,7 @@ RUN \ --prefix="${PREFIX}" \ --enable-libopenjpeg \ --enable-libkvazaar \ + --enable-libsrt \ --enable-libaom \ --extra-libs=-lpthread \ --extra-cflags="-I${PREFIX}/include" \ diff --git a/docker-images/4.0/vaapi1804/Dockerfile b/docker-images/4.0/vaapi1804/Dockerfile index fd083e8c5..975a4ae2c 100644 --- a/docker-images/4.0/vaapi1804/Dockerfile +++ b/docker-images/4.0/vaapi1804/Dockerfile @@ -33,6 +33,7 @@ ENV FFMPEG_VERSION=4.0.5 \ OPENCOREAMR_VERSION=0.1.5 \ OPUS_VERSION=1.2 \ OPENJPEG_VERSION=2.1.2 \ + SRT_VERSION=1.3.2 \ THEORA_VERSION=1.1.1 \ VORBIS_VERSION=1.3.5 \ VPX_VERSION=1.8.0 \ @@ -66,6 +67,9 @@ ARG PKG_CONFIG_PATH="/opt/ffmpeg/share/pkgconfig:/opt/ffmpeg/lib/pkgconf ARG PREFIX=/opt/ffmpeg ARG LD_LIBRARY_PATH="/opt/ffmpeg/lib:/opt/ffmpeg/lib64:/usr/lib64:/usr/lib:/lib64:/lib" +# Fix issues when installing tzdata on Ubuntu +ARG DEBIAN_FRONTEND=noninteractive + RUN buildDeps="autoconf \ automake \ @@ -84,6 +88,7 @@ RUN buildDeps="autoconf \ pkg-config \ python \ libssl-dev \ + tcl \ yasm \ libva-dev \ zlib1g-dev" && \ @@ -426,6 +431,19 @@ RUN \ make install && \ rm -rf ${DIR} +## libsrt - to allow receiving and pushing SRT streams +RUN \ + DIR=/tmp/libsrt && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/Haivision/srt/archive/v${SRT_VERSION}.tar.gz && \ + tar -xz --strip-components=1 -f v${SRT_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} + + ## ffmpeg https://ffmpeg.org/ RUN \ DIR=/tmp/ffmpeg && mkdir -p ${DIR} && cd ${DIR} && \ @@ -470,6 +488,7 @@ RUN \ --prefix="${PREFIX}" \ --enable-libopenjpeg \ --enable-libkvazaar \ + --enable-libsrt \ --enable-libaom \ --extra-libs=-lpthread \ --enable-vaapi \ diff --git a/docker-images/4.1/alpine311/Dockerfile b/docker-images/4.1/alpine311/Dockerfile index 8d54fc120..d4f7282b1 100644 --- a/docker-images/4.1/alpine311/Dockerfile +++ b/docker-images/4.1/alpine311/Dockerfile @@ -30,6 +30,7 @@ ENV FFMPEG_VERSION=4.1.5 \ OPENCOREAMR_VERSION=0.1.5 \ OPUS_VERSION=1.2 \ OPENJPEG_VERSION=2.1.2 \ + SRT_VERSION=1.3.2 \ THEORA_VERSION=1.1.1 \ VORBIS_VERSION=1.3.5 \ VPX_VERSION=1.8.0 \ @@ -63,6 +64,9 @@ ARG PKG_CONFIG_PATH="/opt/ffmpeg/share/pkgconfig:/opt/ffmpeg/lib/pkgconf ARG PREFIX=/opt/ffmpeg ARG LD_LIBRARY_PATH="/opt/ffmpeg/lib:/opt/ffmpeg/lib64:/usr/lib64:/usr/lib:/lib64:/lib" +# Fix issues when installing tzdata on Ubuntu +ARG DEBIAN_FRONTEND=noninteractive + RUN buildDeps="autoconf \ automake \ @@ -82,6 +86,7 @@ RUN buildDeps="autoconf \ python \ openssl-dev \ tar \ + tcl \ yasm \ nasm \ zlib-dev \ @@ -424,6 +429,19 @@ RUN \ make install && \ rm -rf ${DIR} +## libsrt - to allow receiving and pushing SRT streams +RUN \ + DIR=/tmp/libsrt && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/Haivision/srt/archive/v${SRT_VERSION}.tar.gz && \ + tar -xz --strip-components=1 -f v${SRT_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} + + ## ffmpeg https://ffmpeg.org/ RUN \ DIR=/tmp/ffmpeg && mkdir -p ${DIR} && cd ${DIR} && \ @@ -468,6 +486,7 @@ RUN \ --prefix="${PREFIX}" \ --enable-libopenjpeg \ --enable-libkvazaar \ + --enable-libsrt \ --enable-libaom \ --extra-libs=-lpthread \ --extra-cflags="-I${PREFIX}/include" \ diff --git a/docker-images/4.1/centos7/Dockerfile b/docker-images/4.1/centos7/Dockerfile index 48eff691d..21f1c48d4 100644 --- a/docker-images/4.1/centos7/Dockerfile +++ b/docker-images/4.1/centos7/Dockerfile @@ -32,6 +32,7 @@ ENV FFMPEG_VERSION=4.1.5 \ OPENCOREAMR_VERSION=0.1.5 \ OPUS_VERSION=1.2 \ OPENJPEG_VERSION=2.1.2 \ + SRT_VERSION=1.3.2 \ THEORA_VERSION=1.1.1 \ VORBIS_VERSION=1.3.5 \ VPX_VERSION=1.8.0 \ @@ -65,6 +66,9 @@ ARG PKG_CONFIG_PATH="/opt/ffmpeg/share/pkgconfig:/opt/ffmpeg/lib/pkgconf ARG PREFIX=/opt/ffmpeg ARG LD_LIBRARY_PATH="/opt/ffmpeg/lib:/opt/ffmpeg/lib64:/usr/lib64:/usr/lib:/lib64:/lib" +# Fix issues when installing tzdata on Ubuntu +ARG DEBIAN_FRONTEND=noninteractive + RUN buildDeps="autoconf \ automake \ @@ -83,6 +87,7 @@ RUN buildDeps="autoconf \ python3 \ openssl-devel \ tar \ + tcl \ yasm \ which \ zlib-devel" && \ @@ -461,6 +466,19 @@ RUN \ make install && \ rm -rf ${DIR} +## libsrt - to allow receiving and pushing SRT streams +RUN \ + DIR=/tmp/libsrt && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/Haivision/srt/archive/v${SRT_VERSION}.tar.gz && \ + tar -xz --strip-components=1 -f v${SRT_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} + + ## ffmpeg https://ffmpeg.org/ RUN \ DIR=/tmp/ffmpeg && mkdir -p ${DIR} && cd ${DIR} && \ @@ -505,6 +523,7 @@ RUN \ --prefix="${PREFIX}" \ --enable-libopenjpeg \ --enable-libkvazaar \ + --enable-libsrt \ --enable-libaom \ --extra-libs=-lpthread \ --extra-cflags="-I${PREFIX}/include" \ diff --git a/docker-images/4.1/centos8/Dockerfile b/docker-images/4.1/centos8/Dockerfile index b27037152..e214d2239 100644 --- a/docker-images/4.1/centos8/Dockerfile +++ b/docker-images/4.1/centos8/Dockerfile @@ -32,6 +32,7 @@ ENV FFMPEG_VERSION=4.1.5 \ OPENCOREAMR_VERSION=0.1.5 \ OPUS_VERSION=1.2 \ OPENJPEG_VERSION=2.1.2 \ + SRT_VERSION=1.3.2 \ THEORA_VERSION=1.1.1 \ VORBIS_VERSION=1.3.5 \ VPX_VERSION=1.8.0 \ @@ -65,6 +66,9 @@ ARG PKG_CONFIG_PATH="/opt/ffmpeg/share/pkgconfig:/opt/ffmpeg/lib/pkgconf ARG PREFIX=/opt/ffmpeg ARG LD_LIBRARY_PATH="/opt/ffmpeg/lib:/opt/ffmpeg/lib64:/usr/lib64:/usr/lib:/lib64:/lib" +# Fix issues when installing tzdata on Ubuntu +ARG DEBIAN_FRONTEND=noninteractive + RUN buildDeps="autoconf \ automake \ @@ -83,6 +87,7 @@ RUN buildDeps="autoconf \ python3 \ openssl-devel \ tar \ + tcl \ yasm \ which \ zlib-devel" && \ @@ -427,6 +432,19 @@ RUN \ make install && \ rm -rf ${DIR} +## libsrt - to allow receiving and pushing SRT streams +RUN \ + DIR=/tmp/libsrt && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/Haivision/srt/archive/v${SRT_VERSION}.tar.gz && \ + tar -xz --strip-components=1 -f v${SRT_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} + + ## ffmpeg https://ffmpeg.org/ RUN \ DIR=/tmp/ffmpeg && mkdir -p ${DIR} && cd ${DIR} && \ @@ -471,6 +489,7 @@ RUN \ --prefix="${PREFIX}" \ --enable-libopenjpeg \ --enable-libkvazaar \ + --enable-libsrt \ --enable-libaom \ --extra-libs=-lpthread \ --extra-cflags="-I${PREFIX}/include" \ diff --git a/docker-images/4.1/nvidia1804/Dockerfile b/docker-images/4.1/nvidia1804/Dockerfile index 572f93bc9..443ec7344 100644 --- a/docker-images/4.1/nvidia1804/Dockerfile +++ b/docker-images/4.1/nvidia1804/Dockerfile @@ -48,6 +48,7 @@ ENV FFMPEG_VERSION=4.1.5 \ OPENCOREAMR_VERSION=0.1.5 \ OPUS_VERSION=1.2 \ OPENJPEG_VERSION=2.1.2 \ + SRT_VERSION=1.3.2 \ THEORA_VERSION=1.1.1 \ VORBIS_VERSION=1.3.5 \ VPX_VERSION=1.8.0 \ @@ -81,6 +82,9 @@ ARG PKG_CONFIG_PATH="/opt/ffmpeg/share/pkgconfig:/opt/ffmpeg/lib/pkgconf ARG PREFIX=/opt/ffmpeg ARG LD_LIBRARY_PATH="/opt/ffmpeg/lib:/opt/ffmpeg/lib64:/usr/lib64:/usr/lib:/lib64:/lib" +# Fix issues when installing tzdata on Ubuntu +ARG DEBIAN_FRONTEND=noninteractive + RUN buildDeps="autoconf \ automake \ @@ -99,6 +103,7 @@ RUN buildDeps="autoconf \ pkg-config \ python \ libssl-dev \ + tclsh \ yasm \ zlib1g-dev" && \ apt-get -yqq update && \ @@ -450,6 +455,19 @@ RUN \ make install && \ rm -rf ${DIR} +## libsrt - to allow receiving and pushing SRT streams +RUN \ + DIR=/tmp/libsrt && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/Haivision/srt/archive/v${SRT_VERSION}.tar.gz && \ + tar -xz --strip-components=1 -f v${SRT_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} + + ## ffmpeg https://ffmpeg.org/ RUN \ DIR=/tmp/ffmpeg && mkdir -p ${DIR} && cd ${DIR} && \ @@ -494,6 +512,7 @@ RUN \ --prefix="${PREFIX}" \ --enable-libopenjpeg \ --enable-libkvazaar \ + --enable-libsrt \ --enable-libaom \ --extra-libs=-lpthread \ --enable-nvenc \ diff --git a/docker-images/4.1/scratch311/Dockerfile b/docker-images/4.1/scratch311/Dockerfile index 49d743ede..ba514a982 100644 --- a/docker-images/4.1/scratch311/Dockerfile +++ b/docker-images/4.1/scratch311/Dockerfile @@ -25,6 +25,7 @@ ENV FFMPEG_VERSION=4.1.5 \ OPENCOREAMR_VERSION=0.1.5 \ OPUS_VERSION=1.2 \ OPENJPEG_VERSION=2.1.2 \ + SRT_VERSION=1.3.2 \ THEORA_VERSION=1.1.1 \ VORBIS_VERSION=1.3.5 \ VPX_VERSION=1.8.0 \ @@ -58,6 +59,9 @@ ARG PKG_CONFIG_PATH="/opt/ffmpeg/share/pkgconfig:/opt/ffmpeg/lib/pkgconf ARG PREFIX=/opt/ffmpeg ARG LD_LIBRARY_PATH="/opt/ffmpeg/lib:/opt/ffmpeg/lib64:/usr/lib64:/usr/lib:/lib64:/lib" +# Fix issues when installing tzdata on Ubuntu +ARG DEBIAN_FRONTEND=noninteractive + RUN buildDeps="autoconf \ automake \ @@ -78,6 +82,7 @@ RUN buildDeps="autoconf \ python \ openssl-dev \ tar \ + tcl \ yasm \ nasm \ zlib-dev \ @@ -426,6 +431,19 @@ RUN \ make install && \ rm -rf ${DIR} +## libsrt - to allow receiving and pushing SRT streams +RUN \ + DIR=/tmp/libsrt && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/Haivision/srt/archive/v${SRT_VERSION}.tar.gz && \ + tar -xz --strip-components=1 -f v${SRT_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} + + ## ffmpeg https://ffmpeg.org/ RUN \ DIR=/tmp/ffmpeg && mkdir -p ${DIR} && cd ${DIR} && \ @@ -470,6 +488,7 @@ RUN \ --prefix="${PREFIX}" \ --enable-libopenjpeg \ --enable-libkvazaar \ + --enable-libsrt \ --enable-libaom \ --extra-libs=-lpthread \ --extra-cflags="-I${PREFIX}/include" \ diff --git a/docker-images/4.1/ubuntu1604/Dockerfile b/docker-images/4.1/ubuntu1604/Dockerfile index e7d2125f0..8dd59fb59 100644 --- a/docker-images/4.1/ubuntu1604/Dockerfile +++ b/docker-images/4.1/ubuntu1604/Dockerfile @@ -33,6 +33,7 @@ ENV FFMPEG_VERSION=4.1.5 \ OPENCOREAMR_VERSION=0.1.5 \ OPUS_VERSION=1.2 \ OPENJPEG_VERSION=2.1.2 \ + SRT_VERSION=1.3.2 \ THEORA_VERSION=1.1.1 \ VORBIS_VERSION=1.3.5 \ VPX_VERSION=1.8.0 \ @@ -66,6 +67,9 @@ ARG PKG_CONFIG_PATH="/opt/ffmpeg/share/pkgconfig:/opt/ffmpeg/lib/pkgconf ARG PREFIX=/opt/ffmpeg ARG LD_LIBRARY_PATH="/opt/ffmpeg/lib:/opt/ffmpeg/lib64:/usr/lib64:/usr/lib:/lib64:/lib" +# Fix issues when installing tzdata on Ubuntu +ARG DEBIAN_FRONTEND=noninteractive + RUN buildDeps="autoconf \ automake \ @@ -84,6 +88,7 @@ RUN buildDeps="autoconf \ pkg-config \ python \ libssl-dev \ + tcl \ yasm \ zlib1g-dev" && \ apt-get -yqq update && \ @@ -425,6 +430,19 @@ RUN \ make install && \ rm -rf ${DIR} +## libsrt - to allow receiving and pushing SRT streams +RUN \ + DIR=/tmp/libsrt && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/Haivision/srt/archive/v${SRT_VERSION}.tar.gz && \ + tar -xz --strip-components=1 -f v${SRT_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} + + ## ffmpeg https://ffmpeg.org/ RUN \ DIR=/tmp/ffmpeg && mkdir -p ${DIR} && cd ${DIR} && \ @@ -469,6 +487,7 @@ RUN \ --prefix="${PREFIX}" \ --enable-libopenjpeg \ --enable-libkvazaar \ + --enable-libsrt \ --enable-libaom \ --extra-libs=-lpthread \ --extra-cflags="-I${PREFIX}/include" \ diff --git a/docker-images/4.1/ubuntu1804/Dockerfile b/docker-images/4.1/ubuntu1804/Dockerfile index 9afe7ba26..9f17e2582 100644 --- a/docker-images/4.1/ubuntu1804/Dockerfile +++ b/docker-images/4.1/ubuntu1804/Dockerfile @@ -33,6 +33,7 @@ ENV FFMPEG_VERSION=4.1.5 \ OPENCOREAMR_VERSION=0.1.5 \ OPUS_VERSION=1.2 \ OPENJPEG_VERSION=2.1.2 \ + SRT_VERSION=1.3.2 \ THEORA_VERSION=1.1.1 \ VORBIS_VERSION=1.3.5 \ VPX_VERSION=1.8.0 \ @@ -66,6 +67,9 @@ ARG PKG_CONFIG_PATH="/opt/ffmpeg/share/pkgconfig:/opt/ffmpeg/lib/pkgconf ARG PREFIX=/opt/ffmpeg ARG LD_LIBRARY_PATH="/opt/ffmpeg/lib:/opt/ffmpeg/lib64:/usr/lib64:/usr/lib:/lib64:/lib" +# Fix issues when installing tzdata on Ubuntu +ARG DEBIAN_FRONTEND=noninteractive + RUN buildDeps="autoconf \ automake \ @@ -84,6 +88,7 @@ RUN buildDeps="autoconf \ pkg-config \ python \ libssl-dev \ + tcl \ yasm \ zlib1g-dev" && \ apt-get -yqq update && \ @@ -425,6 +430,19 @@ RUN \ make install && \ rm -rf ${DIR} +## libsrt - to allow receiving and pushing SRT streams +RUN \ + DIR=/tmp/libsrt && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/Haivision/srt/archive/v${SRT_VERSION}.tar.gz && \ + tar -xz --strip-components=1 -f v${SRT_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} + + ## ffmpeg https://ffmpeg.org/ RUN \ DIR=/tmp/ffmpeg && mkdir -p ${DIR} && cd ${DIR} && \ @@ -469,6 +487,7 @@ RUN \ --prefix="${PREFIX}" \ --enable-libopenjpeg \ --enable-libkvazaar \ + --enable-libsrt \ --enable-libaom \ --extra-libs=-lpthread \ --extra-cflags="-I${PREFIX}/include" \ diff --git a/docker-images/4.1/vaapi1804/Dockerfile b/docker-images/4.1/vaapi1804/Dockerfile index abdad3ddf..2dd38e813 100644 --- a/docker-images/4.1/vaapi1804/Dockerfile +++ b/docker-images/4.1/vaapi1804/Dockerfile @@ -33,6 +33,7 @@ ENV FFMPEG_VERSION=4.1.5 \ OPENCOREAMR_VERSION=0.1.5 \ OPUS_VERSION=1.2 \ OPENJPEG_VERSION=2.1.2 \ + SRT_VERSION=1.3.2 \ THEORA_VERSION=1.1.1 \ VORBIS_VERSION=1.3.5 \ VPX_VERSION=1.8.0 \ @@ -66,6 +67,9 @@ ARG PKG_CONFIG_PATH="/opt/ffmpeg/share/pkgconfig:/opt/ffmpeg/lib/pkgconf ARG PREFIX=/opt/ffmpeg ARG LD_LIBRARY_PATH="/opt/ffmpeg/lib:/opt/ffmpeg/lib64:/usr/lib64:/usr/lib:/lib64:/lib" +# Fix issues when installing tzdata on Ubuntu +ARG DEBIAN_FRONTEND=noninteractive + RUN buildDeps="autoconf \ automake \ @@ -84,6 +88,7 @@ RUN buildDeps="autoconf \ pkg-config \ python \ libssl-dev \ + tcl \ yasm \ libva-dev \ zlib1g-dev" && \ @@ -426,6 +431,19 @@ RUN \ make install && \ rm -rf ${DIR} +## libsrt - to allow receiving and pushing SRT streams +RUN \ + DIR=/tmp/libsrt && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/Haivision/srt/archive/v${SRT_VERSION}.tar.gz && \ + tar -xz --strip-components=1 -f v${SRT_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} + + ## ffmpeg https://ffmpeg.org/ RUN \ DIR=/tmp/ffmpeg && mkdir -p ${DIR} && cd ${DIR} && \ @@ -470,6 +488,7 @@ RUN \ --prefix="${PREFIX}" \ --enable-libopenjpeg \ --enable-libkvazaar \ + --enable-libsrt \ --enable-libaom \ --extra-libs=-lpthread \ --enable-vaapi \ diff --git a/docker-images/4.2/alpine311/Dockerfile b/docker-images/4.2/alpine311/Dockerfile index 74dde57b5..6b33142aa 100644 --- a/docker-images/4.2/alpine311/Dockerfile +++ b/docker-images/4.2/alpine311/Dockerfile @@ -30,6 +30,7 @@ ENV FFMPEG_VERSION=4.2.2 \ OPENCOREAMR_VERSION=0.1.5 \ OPUS_VERSION=1.2 \ OPENJPEG_VERSION=2.1.2 \ + SRT_VERSION=1.3.2 \ THEORA_VERSION=1.1.1 \ VORBIS_VERSION=1.3.5 \ VPX_VERSION=1.8.0 \ @@ -63,6 +64,9 @@ ARG PKG_CONFIG_PATH="/opt/ffmpeg/share/pkgconfig:/opt/ffmpeg/lib/pkgconf ARG PREFIX=/opt/ffmpeg ARG LD_LIBRARY_PATH="/opt/ffmpeg/lib:/opt/ffmpeg/lib64:/usr/lib64:/usr/lib:/lib64:/lib" +# Fix issues when installing tzdata on Ubuntu +ARG DEBIAN_FRONTEND=noninteractive + RUN buildDeps="autoconf \ automake \ @@ -82,6 +86,7 @@ RUN buildDeps="autoconf \ python \ openssl-dev \ tar \ + tcl \ yasm \ nasm \ zlib-dev \ @@ -424,6 +429,19 @@ RUN \ make install && \ rm -rf ${DIR} +## libsrt - to allow receiving and pushing SRT streams +RUN \ + DIR=/tmp/libsrt && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/Haivision/srt/archive/v${SRT_VERSION}.tar.gz && \ + tar -xz --strip-components=1 -f v${SRT_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} + + ## ffmpeg https://ffmpeg.org/ RUN \ DIR=/tmp/ffmpeg && mkdir -p ${DIR} && cd ${DIR} && \ @@ -468,6 +486,7 @@ RUN \ --prefix="${PREFIX}" \ --enable-libopenjpeg \ --enable-libkvazaar \ + --enable-libsrt \ --enable-libaom \ --extra-libs=-lpthread \ --extra-cflags="-I${PREFIX}/include" \ diff --git a/docker-images/4.2/centos7/Dockerfile b/docker-images/4.2/centos7/Dockerfile index 27b050f54..cdfd0ee1b 100644 --- a/docker-images/4.2/centos7/Dockerfile +++ b/docker-images/4.2/centos7/Dockerfile @@ -32,6 +32,7 @@ ENV FFMPEG_VERSION=4.2.2 \ OPENCOREAMR_VERSION=0.1.5 \ OPUS_VERSION=1.2 \ OPENJPEG_VERSION=2.1.2 \ + SRT_VERSION=1.3.2 \ THEORA_VERSION=1.1.1 \ VORBIS_VERSION=1.3.5 \ VPX_VERSION=1.8.0 \ @@ -65,6 +66,9 @@ ARG PKG_CONFIG_PATH="/opt/ffmpeg/share/pkgconfig:/opt/ffmpeg/lib/pkgconf ARG PREFIX=/opt/ffmpeg ARG LD_LIBRARY_PATH="/opt/ffmpeg/lib:/opt/ffmpeg/lib64:/usr/lib64:/usr/lib:/lib64:/lib" +# Fix issues when installing tzdata on Ubuntu +ARG DEBIAN_FRONTEND=noninteractive + RUN buildDeps="autoconf \ automake \ @@ -83,6 +87,7 @@ RUN buildDeps="autoconf \ python3 \ openssl-devel \ tar \ + tcl \ yasm \ which \ zlib-devel" && \ @@ -461,6 +466,19 @@ RUN \ make install && \ rm -rf ${DIR} +## libsrt - to allow receiving and pushing SRT streams +RUN \ + DIR=/tmp/libsrt && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/Haivision/srt/archive/v${SRT_VERSION}.tar.gz && \ + tar -xz --strip-components=1 -f v${SRT_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} + + ## ffmpeg https://ffmpeg.org/ RUN \ DIR=/tmp/ffmpeg && mkdir -p ${DIR} && cd ${DIR} && \ @@ -505,6 +523,7 @@ RUN \ --prefix="${PREFIX}" \ --enable-libopenjpeg \ --enable-libkvazaar \ + --enable-libsrt \ --enable-libaom \ --extra-libs=-lpthread \ --extra-cflags="-I${PREFIX}/include" \ diff --git a/docker-images/4.2/centos8/Dockerfile b/docker-images/4.2/centos8/Dockerfile index 6a4b7669f..163a2742b 100644 --- a/docker-images/4.2/centos8/Dockerfile +++ b/docker-images/4.2/centos8/Dockerfile @@ -32,6 +32,7 @@ ENV FFMPEG_VERSION=4.2.2 \ OPENCOREAMR_VERSION=0.1.5 \ OPUS_VERSION=1.2 \ OPENJPEG_VERSION=2.1.2 \ + SRT_VERSION=1.3.2 \ THEORA_VERSION=1.1.1 \ VORBIS_VERSION=1.3.5 \ VPX_VERSION=1.8.0 \ @@ -65,6 +66,9 @@ ARG PKG_CONFIG_PATH="/opt/ffmpeg/share/pkgconfig:/opt/ffmpeg/lib/pkgconf ARG PREFIX=/opt/ffmpeg ARG LD_LIBRARY_PATH="/opt/ffmpeg/lib:/opt/ffmpeg/lib64:/usr/lib64:/usr/lib:/lib64:/lib" +# Fix issues when installing tzdata on Ubuntu +ARG DEBIAN_FRONTEND=noninteractive + RUN buildDeps="autoconf \ automake \ @@ -83,6 +87,7 @@ RUN buildDeps="autoconf \ python3 \ openssl-devel \ tar \ + tcl \ yasm \ which \ zlib-devel" && \ @@ -427,6 +432,19 @@ RUN \ make install && \ rm -rf ${DIR} +## libsrt - to allow receiving and pushing SRT streams +RUN \ + DIR=/tmp/libsrt && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/Haivision/srt/archive/v${SRT_VERSION}.tar.gz && \ + tar -xz --strip-components=1 -f v${SRT_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} + + ## ffmpeg https://ffmpeg.org/ RUN \ DIR=/tmp/ffmpeg && mkdir -p ${DIR} && cd ${DIR} && \ @@ -471,6 +489,7 @@ RUN \ --prefix="${PREFIX}" \ --enable-libopenjpeg \ --enable-libkvazaar \ + --enable-libsrt \ --enable-libaom \ --extra-libs=-lpthread \ --extra-cflags="-I${PREFIX}/include" \ diff --git a/docker-images/4.2/nvidia1804/Dockerfile b/docker-images/4.2/nvidia1804/Dockerfile index e6f67f606..f74c07a07 100644 --- a/docker-images/4.2/nvidia1804/Dockerfile +++ b/docker-images/4.2/nvidia1804/Dockerfile @@ -48,6 +48,7 @@ ENV FFMPEG_VERSION=4.2.2 \ OPENCOREAMR_VERSION=0.1.5 \ OPUS_VERSION=1.2 \ OPENJPEG_VERSION=2.1.2 \ + SRT_VERSION=1.3.2 \ THEORA_VERSION=1.1.1 \ VORBIS_VERSION=1.3.5 \ VPX_VERSION=1.8.0 \ @@ -81,6 +82,9 @@ ARG PKG_CONFIG_PATH="/opt/ffmpeg/share/pkgconfig:/opt/ffmpeg/lib/pkgconf ARG PREFIX=/opt/ffmpeg ARG LD_LIBRARY_PATH="/opt/ffmpeg/lib:/opt/ffmpeg/lib64:/usr/lib64:/usr/lib:/lib64:/lib" +# Fix issues when installing tzdata on Ubuntu +ARG DEBIAN_FRONTEND=noninteractive + RUN buildDeps="autoconf \ automake \ @@ -99,6 +103,7 @@ RUN buildDeps="autoconf \ pkg-config \ python \ libssl-dev \ + tclsh \ yasm \ zlib1g-dev" && \ apt-get -yqq update && \ @@ -450,6 +455,19 @@ RUN \ make install && \ rm -rf ${DIR} +## libsrt - to allow receiving and pushing SRT streams +RUN \ + DIR=/tmp/libsrt && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/Haivision/srt/archive/v${SRT_VERSION}.tar.gz && \ + tar -xz --strip-components=1 -f v${SRT_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} + + ## ffmpeg https://ffmpeg.org/ RUN \ DIR=/tmp/ffmpeg && mkdir -p ${DIR} && cd ${DIR} && \ @@ -494,6 +512,7 @@ RUN \ --prefix="${PREFIX}" \ --enable-libopenjpeg \ --enable-libkvazaar \ + --enable-libsrt \ --enable-libaom \ --extra-libs=-lpthread \ --enable-nvenc \ diff --git a/docker-images/4.2/scratch311/Dockerfile b/docker-images/4.2/scratch311/Dockerfile index 3918851bd..94d6dd119 100644 --- a/docker-images/4.2/scratch311/Dockerfile +++ b/docker-images/4.2/scratch311/Dockerfile @@ -25,6 +25,7 @@ ENV FFMPEG_VERSION=4.2.2 \ OPENCOREAMR_VERSION=0.1.5 \ OPUS_VERSION=1.2 \ OPENJPEG_VERSION=2.1.2 \ + SRT_VERSION=1.3.2 \ THEORA_VERSION=1.1.1 \ VORBIS_VERSION=1.3.5 \ VPX_VERSION=1.8.0 \ @@ -58,6 +59,9 @@ ARG PKG_CONFIG_PATH="/opt/ffmpeg/share/pkgconfig:/opt/ffmpeg/lib/pkgconf ARG PREFIX=/opt/ffmpeg ARG LD_LIBRARY_PATH="/opt/ffmpeg/lib:/opt/ffmpeg/lib64:/usr/lib64:/usr/lib:/lib64:/lib" +# Fix issues when installing tzdata on Ubuntu +ARG DEBIAN_FRONTEND=noninteractive + RUN buildDeps="autoconf \ automake \ @@ -78,6 +82,7 @@ RUN buildDeps="autoconf \ python \ openssl-dev \ tar \ + tcl \ yasm \ nasm \ zlib-dev \ @@ -426,6 +431,19 @@ RUN \ make install && \ rm -rf ${DIR} +## libsrt - to allow receiving and pushing SRT streams +RUN \ + DIR=/tmp/libsrt && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/Haivision/srt/archive/v${SRT_VERSION}.tar.gz && \ + tar -xz --strip-components=1 -f v${SRT_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} + + ## ffmpeg https://ffmpeg.org/ RUN \ DIR=/tmp/ffmpeg && mkdir -p ${DIR} && cd ${DIR} && \ @@ -470,6 +488,7 @@ RUN \ --prefix="${PREFIX}" \ --enable-libopenjpeg \ --enable-libkvazaar \ + --enable-libsrt \ --enable-libaom \ --extra-libs=-lpthread \ --extra-cflags="-I${PREFIX}/include" \ diff --git a/docker-images/4.2/ubuntu1604/Dockerfile b/docker-images/4.2/ubuntu1604/Dockerfile index 90141c16c..617c139d1 100644 --- a/docker-images/4.2/ubuntu1604/Dockerfile +++ b/docker-images/4.2/ubuntu1604/Dockerfile @@ -33,6 +33,7 @@ ENV FFMPEG_VERSION=4.2.2 \ OPENCOREAMR_VERSION=0.1.5 \ OPUS_VERSION=1.2 \ OPENJPEG_VERSION=2.1.2 \ + SRT_VERSION=1.3.2 \ THEORA_VERSION=1.1.1 \ VORBIS_VERSION=1.3.5 \ VPX_VERSION=1.8.0 \ @@ -66,6 +67,9 @@ ARG PKG_CONFIG_PATH="/opt/ffmpeg/share/pkgconfig:/opt/ffmpeg/lib/pkgconf ARG PREFIX=/opt/ffmpeg ARG LD_LIBRARY_PATH="/opt/ffmpeg/lib:/opt/ffmpeg/lib64:/usr/lib64:/usr/lib:/lib64:/lib" +# Fix issues when installing tzdata on Ubuntu +ARG DEBIAN_FRONTEND=noninteractive + RUN buildDeps="autoconf \ automake \ @@ -84,6 +88,7 @@ RUN buildDeps="autoconf \ pkg-config \ python \ libssl-dev \ + tcl \ yasm \ zlib1g-dev" && \ apt-get -yqq update && \ @@ -425,6 +430,19 @@ RUN \ make install && \ rm -rf ${DIR} +## libsrt - to allow receiving and pushing SRT streams +RUN \ + DIR=/tmp/libsrt && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/Haivision/srt/archive/v${SRT_VERSION}.tar.gz && \ + tar -xz --strip-components=1 -f v${SRT_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} + + ## ffmpeg https://ffmpeg.org/ RUN \ DIR=/tmp/ffmpeg && mkdir -p ${DIR} && cd ${DIR} && \ @@ -469,6 +487,7 @@ RUN \ --prefix="${PREFIX}" \ --enable-libopenjpeg \ --enable-libkvazaar \ + --enable-libsrt \ --enable-libaom \ --extra-libs=-lpthread \ --extra-cflags="-I${PREFIX}/include" \ diff --git a/docker-images/4.2/ubuntu1804/Dockerfile b/docker-images/4.2/ubuntu1804/Dockerfile index 9b07063dd..139831e06 100644 --- a/docker-images/4.2/ubuntu1804/Dockerfile +++ b/docker-images/4.2/ubuntu1804/Dockerfile @@ -33,6 +33,7 @@ ENV FFMPEG_VERSION=4.2.2 \ OPENCOREAMR_VERSION=0.1.5 \ OPUS_VERSION=1.2 \ OPENJPEG_VERSION=2.1.2 \ + SRT_VERSION=1.3.2 \ THEORA_VERSION=1.1.1 \ VORBIS_VERSION=1.3.5 \ VPX_VERSION=1.8.0 \ @@ -66,6 +67,9 @@ ARG PKG_CONFIG_PATH="/opt/ffmpeg/share/pkgconfig:/opt/ffmpeg/lib/pkgconf ARG PREFIX=/opt/ffmpeg ARG LD_LIBRARY_PATH="/opt/ffmpeg/lib:/opt/ffmpeg/lib64:/usr/lib64:/usr/lib:/lib64:/lib" +# Fix issues when installing tzdata on Ubuntu +ARG DEBIAN_FRONTEND=noninteractive + RUN buildDeps="autoconf \ automake \ @@ -84,6 +88,7 @@ RUN buildDeps="autoconf \ pkg-config \ python \ libssl-dev \ + tcl \ yasm \ zlib1g-dev" && \ apt-get -yqq update && \ @@ -425,6 +430,19 @@ RUN \ make install && \ rm -rf ${DIR} +## libsrt - to allow receiving and pushing SRT streams +RUN \ + DIR=/tmp/libsrt && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/Haivision/srt/archive/v${SRT_VERSION}.tar.gz && \ + tar -xz --strip-components=1 -f v${SRT_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} + + ## ffmpeg https://ffmpeg.org/ RUN \ DIR=/tmp/ffmpeg && mkdir -p ${DIR} && cd ${DIR} && \ @@ -469,6 +487,7 @@ RUN \ --prefix="${PREFIX}" \ --enable-libopenjpeg \ --enable-libkvazaar \ + --enable-libsrt \ --enable-libaom \ --extra-libs=-lpthread \ --extra-cflags="-I${PREFIX}/include" \ diff --git a/docker-images/4.2/vaapi1804/Dockerfile b/docker-images/4.2/vaapi1804/Dockerfile index 5617af1fd..545e071c5 100644 --- a/docker-images/4.2/vaapi1804/Dockerfile +++ b/docker-images/4.2/vaapi1804/Dockerfile @@ -33,6 +33,7 @@ ENV FFMPEG_VERSION=4.2.2 \ OPENCOREAMR_VERSION=0.1.5 \ OPUS_VERSION=1.2 \ OPENJPEG_VERSION=2.1.2 \ + SRT_VERSION=1.3.2 \ THEORA_VERSION=1.1.1 \ VORBIS_VERSION=1.3.5 \ VPX_VERSION=1.8.0 \ @@ -66,6 +67,9 @@ ARG PKG_CONFIG_PATH="/opt/ffmpeg/share/pkgconfig:/opt/ffmpeg/lib/pkgconf ARG PREFIX=/opt/ffmpeg ARG LD_LIBRARY_PATH="/opt/ffmpeg/lib:/opt/ffmpeg/lib64:/usr/lib64:/usr/lib:/lib64:/lib" +# Fix issues when installing tzdata on Ubuntu +ARG DEBIAN_FRONTEND=noninteractive + RUN buildDeps="autoconf \ automake \ @@ -84,6 +88,7 @@ RUN buildDeps="autoconf \ pkg-config \ python \ libssl-dev \ + tcl \ yasm \ libva-dev \ zlib1g-dev" && \ @@ -426,6 +431,19 @@ RUN \ make install && \ rm -rf ${DIR} +## libsrt - to allow receiving and pushing SRT streams +RUN \ + DIR=/tmp/libsrt && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/Haivision/srt/archive/v${SRT_VERSION}.tar.gz && \ + tar -xz --strip-components=1 -f v${SRT_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} + + ## ffmpeg https://ffmpeg.org/ RUN \ DIR=/tmp/ffmpeg && mkdir -p ${DIR} && cd ${DIR} && \ @@ -470,6 +488,7 @@ RUN \ --prefix="${PREFIX}" \ --enable-libopenjpeg \ --enable-libkvazaar \ + --enable-libsrt \ --enable-libaom \ --extra-libs=-lpthread \ --enable-vaapi \ diff --git a/docker-images/snapshot/alpine311/Dockerfile b/docker-images/snapshot/alpine311/Dockerfile index d55a05bf8..7d885fdc6 100644 --- a/docker-images/snapshot/alpine311/Dockerfile +++ b/docker-images/snapshot/alpine311/Dockerfile @@ -30,6 +30,7 @@ ENV FFMPEG_VERSION=snapshot \ OPENCOREAMR_VERSION=0.1.5 \ OPUS_VERSION=1.2 \ OPENJPEG_VERSION=2.1.2 \ + SRT_VERSION=1.3.2 \ THEORA_VERSION=1.1.1 \ VORBIS_VERSION=1.3.5 \ VPX_VERSION=1.8.0 \ @@ -63,6 +64,9 @@ ARG PKG_CONFIG_PATH="/opt/ffmpeg/share/pkgconfig:/opt/ffmpeg/lib/pkgconf ARG PREFIX=/opt/ffmpeg ARG LD_LIBRARY_PATH="/opt/ffmpeg/lib:/opt/ffmpeg/lib64:/usr/lib64:/usr/lib:/lib64:/lib" +# Fix issues when installing tzdata on Ubuntu +ARG DEBIAN_FRONTEND=noninteractive + RUN buildDeps="autoconf \ automake \ @@ -82,6 +86,7 @@ RUN buildDeps="autoconf \ python \ openssl-dev \ tar \ + tcl \ yasm \ nasm \ zlib-dev \ @@ -424,6 +429,19 @@ RUN \ make install && \ rm -rf ${DIR} +## libsrt - to allow receiving and pushing SRT streams +RUN \ + DIR=/tmp/libsrt && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/Haivision/srt/archive/v${SRT_VERSION}.tar.gz && \ + tar -xz --strip-components=1 -f v${SRT_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} + + ## ffmpeg https://ffmpeg.org/ RUN \ DIR=/tmp/ffmpeg && mkdir -p ${DIR} && cd ${DIR} && \ @@ -468,6 +486,7 @@ RUN \ --prefix="${PREFIX}" \ --enable-libopenjpeg \ --enable-libkvazaar \ + --enable-libsrt \ --enable-libaom \ --extra-libs=-lpthread \ --extra-cflags="-I${PREFIX}/include" \ diff --git a/docker-images/snapshot/centos7/Dockerfile b/docker-images/snapshot/centos7/Dockerfile index 53b79734c..eb830b54a 100644 --- a/docker-images/snapshot/centos7/Dockerfile +++ b/docker-images/snapshot/centos7/Dockerfile @@ -32,6 +32,7 @@ ENV FFMPEG_VERSION=snapshot \ OPENCOREAMR_VERSION=0.1.5 \ OPUS_VERSION=1.2 \ OPENJPEG_VERSION=2.1.2 \ + SRT_VERSION=1.3.2 \ THEORA_VERSION=1.1.1 \ VORBIS_VERSION=1.3.5 \ VPX_VERSION=1.8.0 \ @@ -65,6 +66,9 @@ ARG PKG_CONFIG_PATH="/opt/ffmpeg/share/pkgconfig:/opt/ffmpeg/lib/pkgconf ARG PREFIX=/opt/ffmpeg ARG LD_LIBRARY_PATH="/opt/ffmpeg/lib:/opt/ffmpeg/lib64:/usr/lib64:/usr/lib:/lib64:/lib" +# Fix issues when installing tzdata on Ubuntu +ARG DEBIAN_FRONTEND=noninteractive + RUN buildDeps="autoconf \ automake \ @@ -83,6 +87,7 @@ RUN buildDeps="autoconf \ python3 \ openssl-devel \ tar \ + tcl \ yasm \ which \ zlib-devel" && \ @@ -461,6 +466,19 @@ RUN \ make install && \ rm -rf ${DIR} +## libsrt - to allow receiving and pushing SRT streams +RUN \ + DIR=/tmp/libsrt && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/Haivision/srt/archive/v${SRT_VERSION}.tar.gz && \ + tar -xz --strip-components=1 -f v${SRT_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} + + ## ffmpeg https://ffmpeg.org/ RUN \ DIR=/tmp/ffmpeg && mkdir -p ${DIR} && cd ${DIR} && \ @@ -505,6 +523,7 @@ RUN \ --prefix="${PREFIX}" \ --enable-libopenjpeg \ --enable-libkvazaar \ + --enable-libsrt \ --enable-libaom \ --extra-libs=-lpthread \ --extra-cflags="-I${PREFIX}/include" \ diff --git a/docker-images/snapshot/centos8/Dockerfile b/docker-images/snapshot/centos8/Dockerfile index c6a51d80a..4283a4a46 100644 --- a/docker-images/snapshot/centos8/Dockerfile +++ b/docker-images/snapshot/centos8/Dockerfile @@ -32,6 +32,7 @@ ENV FFMPEG_VERSION=snapshot \ OPENCOREAMR_VERSION=0.1.5 \ OPUS_VERSION=1.2 \ OPENJPEG_VERSION=2.1.2 \ + SRT_VERSION=1.3.2 \ THEORA_VERSION=1.1.1 \ VORBIS_VERSION=1.3.5 \ VPX_VERSION=1.8.0 \ @@ -65,6 +66,9 @@ ARG PKG_CONFIG_PATH="/opt/ffmpeg/share/pkgconfig:/opt/ffmpeg/lib/pkgconf ARG PREFIX=/opt/ffmpeg ARG LD_LIBRARY_PATH="/opt/ffmpeg/lib:/opt/ffmpeg/lib64:/usr/lib64:/usr/lib:/lib64:/lib" +# Fix issues when installing tzdata on Ubuntu +ARG DEBIAN_FRONTEND=noninteractive + RUN buildDeps="autoconf \ automake \ @@ -83,6 +87,7 @@ RUN buildDeps="autoconf \ python3 \ openssl-devel \ tar \ + tcl \ yasm \ which \ zlib-devel" && \ @@ -427,6 +432,19 @@ RUN \ make install && \ rm -rf ${DIR} +## libsrt - to allow receiving and pushing SRT streams +RUN \ + DIR=/tmp/libsrt && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/Haivision/srt/archive/v${SRT_VERSION}.tar.gz && \ + tar -xz --strip-components=1 -f v${SRT_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} + + ## ffmpeg https://ffmpeg.org/ RUN \ DIR=/tmp/ffmpeg && mkdir -p ${DIR} && cd ${DIR} && \ @@ -471,6 +489,7 @@ RUN \ --prefix="${PREFIX}" \ --enable-libopenjpeg \ --enable-libkvazaar \ + --enable-libsrt \ --enable-libaom \ --extra-libs=-lpthread \ --extra-cflags="-I${PREFIX}/include" \ diff --git a/docker-images/snapshot/nvidia1804/Dockerfile b/docker-images/snapshot/nvidia1804/Dockerfile index f11009f9f..09c2372a0 100644 --- a/docker-images/snapshot/nvidia1804/Dockerfile +++ b/docker-images/snapshot/nvidia1804/Dockerfile @@ -48,6 +48,7 @@ ENV FFMPEG_VERSION=snapshot \ OPENCOREAMR_VERSION=0.1.5 \ OPUS_VERSION=1.2 \ OPENJPEG_VERSION=2.1.2 \ + SRT_VERSION=1.3.2 \ THEORA_VERSION=1.1.1 \ VORBIS_VERSION=1.3.5 \ VPX_VERSION=1.8.0 \ @@ -81,6 +82,9 @@ ARG PKG_CONFIG_PATH="/opt/ffmpeg/share/pkgconfig:/opt/ffmpeg/lib/pkgconf ARG PREFIX=/opt/ffmpeg ARG LD_LIBRARY_PATH="/opt/ffmpeg/lib:/opt/ffmpeg/lib64:/usr/lib64:/usr/lib:/lib64:/lib" +# Fix issues when installing tzdata on Ubuntu +ARG DEBIAN_FRONTEND=noninteractive + RUN buildDeps="autoconf \ automake \ @@ -99,6 +103,7 @@ RUN buildDeps="autoconf \ pkg-config \ python \ libssl-dev \ + tclsh \ yasm \ zlib1g-dev" && \ apt-get -yqq update && \ @@ -450,6 +455,19 @@ RUN \ make install && \ rm -rf ${DIR} +## libsrt - to allow receiving and pushing SRT streams +RUN \ + DIR=/tmp/libsrt && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/Haivision/srt/archive/v${SRT_VERSION}.tar.gz && \ + tar -xz --strip-components=1 -f v${SRT_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} + + ## ffmpeg https://ffmpeg.org/ RUN \ DIR=/tmp/ffmpeg && mkdir -p ${DIR} && cd ${DIR} && \ @@ -494,6 +512,7 @@ RUN \ --prefix="${PREFIX}" \ --enable-libopenjpeg \ --enable-libkvazaar \ + --enable-libsrt \ --enable-libaom \ --extra-libs=-lpthread \ --enable-nvenc \ diff --git a/docker-images/snapshot/scratch311/Dockerfile b/docker-images/snapshot/scratch311/Dockerfile index e805de4f1..8f1062c4c 100644 --- a/docker-images/snapshot/scratch311/Dockerfile +++ b/docker-images/snapshot/scratch311/Dockerfile @@ -25,6 +25,7 @@ ENV FFMPEG_VERSION=snapshot \ OPENCOREAMR_VERSION=0.1.5 \ OPUS_VERSION=1.2 \ OPENJPEG_VERSION=2.1.2 \ + SRT_VERSION=1.3.2 \ THEORA_VERSION=1.1.1 \ VORBIS_VERSION=1.3.5 \ VPX_VERSION=1.8.0 \ @@ -58,6 +59,9 @@ ARG PKG_CONFIG_PATH="/opt/ffmpeg/share/pkgconfig:/opt/ffmpeg/lib/pkgconf ARG PREFIX=/opt/ffmpeg ARG LD_LIBRARY_PATH="/opt/ffmpeg/lib:/opt/ffmpeg/lib64:/usr/lib64:/usr/lib:/lib64:/lib" +# Fix issues when installing tzdata on Ubuntu +ARG DEBIAN_FRONTEND=noninteractive + RUN buildDeps="autoconf \ automake \ @@ -78,6 +82,7 @@ RUN buildDeps="autoconf \ python \ openssl-dev \ tar \ + tcl \ yasm \ nasm \ zlib-dev \ @@ -426,6 +431,19 @@ RUN \ make install && \ rm -rf ${DIR} +## libsrt - to allow receiving and pushing SRT streams +RUN \ + DIR=/tmp/libsrt && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/Haivision/srt/archive/v${SRT_VERSION}.tar.gz && \ + tar -xz --strip-components=1 -f v${SRT_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} + + ## ffmpeg https://ffmpeg.org/ RUN \ DIR=/tmp/ffmpeg && mkdir -p ${DIR} && cd ${DIR} && \ @@ -470,6 +488,7 @@ RUN \ --prefix="${PREFIX}" \ --enable-libopenjpeg \ --enable-libkvazaar \ + --enable-libsrt \ --enable-libaom \ --extra-libs=-lpthread \ --extra-cflags="-I${PREFIX}/include" \ diff --git a/docker-images/snapshot/ubuntu1604/Dockerfile b/docker-images/snapshot/ubuntu1604/Dockerfile index 6b23fdbb3..000472863 100644 --- a/docker-images/snapshot/ubuntu1604/Dockerfile +++ b/docker-images/snapshot/ubuntu1604/Dockerfile @@ -33,6 +33,7 @@ ENV FFMPEG_VERSION=snapshot \ OPENCOREAMR_VERSION=0.1.5 \ OPUS_VERSION=1.2 \ OPENJPEG_VERSION=2.1.2 \ + SRT_VERSION=1.3.2 \ THEORA_VERSION=1.1.1 \ VORBIS_VERSION=1.3.5 \ VPX_VERSION=1.8.0 \ @@ -66,6 +67,9 @@ ARG PKG_CONFIG_PATH="/opt/ffmpeg/share/pkgconfig:/opt/ffmpeg/lib/pkgconf ARG PREFIX=/opt/ffmpeg ARG LD_LIBRARY_PATH="/opt/ffmpeg/lib:/opt/ffmpeg/lib64:/usr/lib64:/usr/lib:/lib64:/lib" +# Fix issues when installing tzdata on Ubuntu +ARG DEBIAN_FRONTEND=noninteractive + RUN buildDeps="autoconf \ automake \ @@ -84,6 +88,7 @@ RUN buildDeps="autoconf \ pkg-config \ python \ libssl-dev \ + tcl \ yasm \ zlib1g-dev" && \ apt-get -yqq update && \ @@ -425,6 +430,19 @@ RUN \ make install && \ rm -rf ${DIR} +## libsrt - to allow receiving and pushing SRT streams +RUN \ + DIR=/tmp/libsrt && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/Haivision/srt/archive/v${SRT_VERSION}.tar.gz && \ + tar -xz --strip-components=1 -f v${SRT_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} + + ## ffmpeg https://ffmpeg.org/ RUN \ DIR=/tmp/ffmpeg && mkdir -p ${DIR} && cd ${DIR} && \ @@ -469,6 +487,7 @@ RUN \ --prefix="${PREFIX}" \ --enable-libopenjpeg \ --enable-libkvazaar \ + --enable-libsrt \ --enable-libaom \ --extra-libs=-lpthread \ --extra-cflags="-I${PREFIX}/include" \ diff --git a/docker-images/snapshot/ubuntu1804/Dockerfile b/docker-images/snapshot/ubuntu1804/Dockerfile index 6235175ed..9d0d11c5c 100644 --- a/docker-images/snapshot/ubuntu1804/Dockerfile +++ b/docker-images/snapshot/ubuntu1804/Dockerfile @@ -33,6 +33,7 @@ ENV FFMPEG_VERSION=snapshot \ OPENCOREAMR_VERSION=0.1.5 \ OPUS_VERSION=1.2 \ OPENJPEG_VERSION=2.1.2 \ + SRT_VERSION=1.3.2 \ THEORA_VERSION=1.1.1 \ VORBIS_VERSION=1.3.5 \ VPX_VERSION=1.8.0 \ @@ -66,6 +67,9 @@ ARG PKG_CONFIG_PATH="/opt/ffmpeg/share/pkgconfig:/opt/ffmpeg/lib/pkgconf ARG PREFIX=/opt/ffmpeg ARG LD_LIBRARY_PATH="/opt/ffmpeg/lib:/opt/ffmpeg/lib64:/usr/lib64:/usr/lib:/lib64:/lib" +# Fix issues when installing tzdata on Ubuntu +ARG DEBIAN_FRONTEND=noninteractive + RUN buildDeps="autoconf \ automake \ @@ -84,6 +88,7 @@ RUN buildDeps="autoconf \ pkg-config \ python \ libssl-dev \ + tcl \ yasm \ zlib1g-dev" && \ apt-get -yqq update && \ @@ -425,6 +430,19 @@ RUN \ make install && \ rm -rf ${DIR} +## libsrt - to allow receiving and pushing SRT streams +RUN \ + DIR=/tmp/libsrt && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/Haivision/srt/archive/v${SRT_VERSION}.tar.gz && \ + tar -xz --strip-components=1 -f v${SRT_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} + + ## ffmpeg https://ffmpeg.org/ RUN \ DIR=/tmp/ffmpeg && mkdir -p ${DIR} && cd ${DIR} && \ @@ -469,6 +487,7 @@ RUN \ --prefix="${PREFIX}" \ --enable-libopenjpeg \ --enable-libkvazaar \ + --enable-libsrt \ --enable-libaom \ --extra-libs=-lpthread \ --extra-cflags="-I${PREFIX}/include" \ diff --git a/docker-images/snapshot/vaapi1804/Dockerfile b/docker-images/snapshot/vaapi1804/Dockerfile index 97b335c3e..567347b40 100644 --- a/docker-images/snapshot/vaapi1804/Dockerfile +++ b/docker-images/snapshot/vaapi1804/Dockerfile @@ -33,6 +33,7 @@ ENV FFMPEG_VERSION=snapshot \ OPENCOREAMR_VERSION=0.1.5 \ OPUS_VERSION=1.2 \ OPENJPEG_VERSION=2.1.2 \ + SRT_VERSION=1.3.2 \ THEORA_VERSION=1.1.1 \ VORBIS_VERSION=1.3.5 \ VPX_VERSION=1.8.0 \ @@ -66,6 +67,9 @@ ARG PKG_CONFIG_PATH="/opt/ffmpeg/share/pkgconfig:/opt/ffmpeg/lib/pkgconf ARG PREFIX=/opt/ffmpeg ARG LD_LIBRARY_PATH="/opt/ffmpeg/lib:/opt/ffmpeg/lib64:/usr/lib64:/usr/lib:/lib64:/lib" +# Fix issues when installing tzdata on Ubuntu +ARG DEBIAN_FRONTEND=noninteractive + RUN buildDeps="autoconf \ automake \ @@ -84,6 +88,7 @@ RUN buildDeps="autoconf \ pkg-config \ python \ libssl-dev \ + tcl \ yasm \ libva-dev \ zlib1g-dev" && \ @@ -426,6 +431,19 @@ RUN \ make install && \ rm -rf ${DIR} +## libsrt - to allow receiving and pushing SRT streams +RUN \ + DIR=/tmp/libsrt && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ + curl -sLO https://github.com/Haivision/srt/archive/v${SRT_VERSION}.tar.gz && \ + tar -xz --strip-components=1 -f v${SRT_VERSION}.tar.gz && \ + ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ + make && \ + make install && \ + rm -rf ${DIR} + + ## ffmpeg https://ffmpeg.org/ RUN \ DIR=/tmp/ffmpeg && mkdir -p ${DIR} && cd ${DIR} && \ @@ -470,6 +488,7 @@ RUN \ --prefix="${PREFIX}" \ --enable-libopenjpeg \ --enable-libkvazaar \ + --enable-libsrt \ --enable-libaom \ --extra-libs=-lpthread \ --enable-vaapi \ From b29532ec6e9c651a04a950ce00edea658145c315 Mon Sep 17 00:00:00 2001 From: Arno Date: Sun, 5 Apr 2020 01:13:18 +0200 Subject: [PATCH 3/4] Upgrading template to latest libsrt 1.4.1 --- templates/Dockerfile-env | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/Dockerfile-env b/templates/Dockerfile-env index e966cec19..7c1bcc768 100644 --- a/templates/Dockerfile-env +++ b/templates/Dockerfile-env @@ -15,7 +15,7 @@ FFMPEG_VERSION=%%FFMPEG_VERSION%% \ OPENCOREAMR_VERSION=0.1.5 \ OPUS_VERSION=1.2 \ OPENJPEG_VERSION=2.1.2 \ - SRT_VERSION=1.3.2 \ + SRT_VERSION=1.4.1 \ THEORA_VERSION=1.1.1 \ VORBIS_VERSION=1.3.5 \ VPX_VERSION=1.8.0 \ From 2c5f9afb8b20837697c8f298f002fe2559d1fc22 Mon Sep 17 00:00:00 2001 From: Arno Date: Sun, 5 Apr 2020 01:13:32 +0200 Subject: [PATCH 4/4] Regenerated templates --- docker-images/3.2/alpine38/Dockerfile | 2 +- docker-images/3.2/centos7/Dockerfile | 2 +- docker-images/3.2/nvidia1604/Dockerfile | 2 +- docker-images/3.2/scratch38/Dockerfile | 2 +- docker-images/3.2/ubuntu1604/Dockerfile | 2 +- docker-images/3.2/vaapi1604/Dockerfile | 2 +- docker-images/3.3/alpine311/Dockerfile | 2 +- docker-images/3.3/centos7/Dockerfile | 2 +- docker-images/3.3/centos8/Dockerfile | 2 +- docker-images/3.3/nvidia1804/Dockerfile | 2 +- docker-images/3.3/scratch311/Dockerfile | 2 +- docker-images/3.3/ubuntu1604/Dockerfile | 2 +- docker-images/3.3/ubuntu1804/Dockerfile | 2 +- docker-images/3.3/vaapi1804/Dockerfile | 2 +- docker-images/3.4/alpine311/Dockerfile | 2 +- docker-images/3.4/centos7/Dockerfile | 2 +- docker-images/3.4/centos8/Dockerfile | 2 +- docker-images/3.4/nvidia1804/Dockerfile | 2 +- docker-images/3.4/scratch311/Dockerfile | 2 +- docker-images/3.4/ubuntu1604/Dockerfile | 2 +- docker-images/3.4/ubuntu1804/Dockerfile | 2 +- docker-images/3.4/vaapi1804/Dockerfile | 2 +- docker-images/4.0/alpine311/Dockerfile | 2 +- docker-images/4.0/centos7/Dockerfile | 2 +- docker-images/4.0/centos8/Dockerfile | 2 +- docker-images/4.0/nvidia1804/Dockerfile | 2 +- docker-images/4.0/scratch311/Dockerfile | 2 +- docker-images/4.0/ubuntu1604/Dockerfile | 2 +- docker-images/4.0/ubuntu1804/Dockerfile | 2 +- docker-images/4.0/vaapi1804/Dockerfile | 2 +- docker-images/4.1/alpine311/Dockerfile | 2 +- docker-images/4.1/centos7/Dockerfile | 2 +- docker-images/4.1/centos8/Dockerfile | 2 +- docker-images/4.1/nvidia1804/Dockerfile | 2 +- docker-images/4.1/scratch311/Dockerfile | 2 +- docker-images/4.1/ubuntu1604/Dockerfile | 2 +- docker-images/4.1/ubuntu1804/Dockerfile | 2 +- docker-images/4.1/vaapi1804/Dockerfile | 2 +- docker-images/4.2/alpine311/Dockerfile | 2 +- docker-images/4.2/centos7/Dockerfile | 2 +- docker-images/4.2/centos8/Dockerfile | 2 +- docker-images/4.2/nvidia1804/Dockerfile | 2 +- docker-images/4.2/scratch311/Dockerfile | 2 +- docker-images/4.2/ubuntu1604/Dockerfile | 2 +- docker-images/4.2/ubuntu1804/Dockerfile | 2 +- docker-images/4.2/vaapi1804/Dockerfile | 2 +- docker-images/snapshot/alpine311/Dockerfile | 2 +- docker-images/snapshot/centos7/Dockerfile | 2 +- docker-images/snapshot/centos8/Dockerfile | 2 +- docker-images/snapshot/nvidia1804/Dockerfile | 2 +- docker-images/snapshot/scratch311/Dockerfile | 2 +- docker-images/snapshot/ubuntu1604/Dockerfile | 2 +- docker-images/snapshot/ubuntu1804/Dockerfile | 2 +- docker-images/snapshot/vaapi1804/Dockerfile | 2 +- 54 files changed, 54 insertions(+), 54 deletions(-) diff --git a/docker-images/3.2/alpine38/Dockerfile b/docker-images/3.2/alpine38/Dockerfile index ce313bea9..162fdb2c7 100644 --- a/docker-images/3.2/alpine38/Dockerfile +++ b/docker-images/3.2/alpine38/Dockerfile @@ -30,7 +30,7 @@ ENV FFMPEG_VERSION=3.2.14 \ OPENCOREAMR_VERSION=0.1.5 \ OPUS_VERSION=1.2 \ OPENJPEG_VERSION=2.1.2 \ - SRT_VERSION=1.3.2 \ + SRT_VERSION=1.4.1 \ THEORA_VERSION=1.1.1 \ VORBIS_VERSION=1.3.5 \ VPX_VERSION=1.8.0 \ diff --git a/docker-images/3.2/centos7/Dockerfile b/docker-images/3.2/centos7/Dockerfile index 1a978d01b..8291d74b1 100644 --- a/docker-images/3.2/centos7/Dockerfile +++ b/docker-images/3.2/centos7/Dockerfile @@ -32,7 +32,7 @@ ENV FFMPEG_VERSION=3.2.14 \ OPENCOREAMR_VERSION=0.1.5 \ OPUS_VERSION=1.2 \ OPENJPEG_VERSION=2.1.2 \ - SRT_VERSION=1.3.2 \ + SRT_VERSION=1.4.1 \ THEORA_VERSION=1.1.1 \ VORBIS_VERSION=1.3.5 \ VPX_VERSION=1.8.0 \ diff --git a/docker-images/3.2/nvidia1604/Dockerfile b/docker-images/3.2/nvidia1604/Dockerfile index 6472218a0..9a4f968cc 100644 --- a/docker-images/3.2/nvidia1604/Dockerfile +++ b/docker-images/3.2/nvidia1604/Dockerfile @@ -48,7 +48,7 @@ ENV FFMPEG_VERSION=3.2.14 \ OPENCOREAMR_VERSION=0.1.5 \ OPUS_VERSION=1.2 \ OPENJPEG_VERSION=2.1.2 \ - SRT_VERSION=1.3.2 \ + SRT_VERSION=1.4.1 \ THEORA_VERSION=1.1.1 \ VORBIS_VERSION=1.3.5 \ VPX_VERSION=1.8.0 \ diff --git a/docker-images/3.2/scratch38/Dockerfile b/docker-images/3.2/scratch38/Dockerfile index 6b59fd2bb..9c0edb8b2 100644 --- a/docker-images/3.2/scratch38/Dockerfile +++ b/docker-images/3.2/scratch38/Dockerfile @@ -25,7 +25,7 @@ ENV FFMPEG_VERSION=3.2.14 \ OPENCOREAMR_VERSION=0.1.5 \ OPUS_VERSION=1.2 \ OPENJPEG_VERSION=2.1.2 \ - SRT_VERSION=1.3.2 \ + SRT_VERSION=1.4.1 \ THEORA_VERSION=1.1.1 \ VORBIS_VERSION=1.3.5 \ VPX_VERSION=1.8.0 \ diff --git a/docker-images/3.2/ubuntu1604/Dockerfile b/docker-images/3.2/ubuntu1604/Dockerfile index 0e44dafa9..874c8261c 100644 --- a/docker-images/3.2/ubuntu1604/Dockerfile +++ b/docker-images/3.2/ubuntu1604/Dockerfile @@ -33,7 +33,7 @@ ENV FFMPEG_VERSION=3.2.14 \ OPENCOREAMR_VERSION=0.1.5 \ OPUS_VERSION=1.2 \ OPENJPEG_VERSION=2.1.2 \ - SRT_VERSION=1.3.2 \ + SRT_VERSION=1.4.1 \ THEORA_VERSION=1.1.1 \ VORBIS_VERSION=1.3.5 \ VPX_VERSION=1.8.0 \ diff --git a/docker-images/3.2/vaapi1604/Dockerfile b/docker-images/3.2/vaapi1604/Dockerfile index 03621a82e..c63ca57fd 100644 --- a/docker-images/3.2/vaapi1604/Dockerfile +++ b/docker-images/3.2/vaapi1604/Dockerfile @@ -33,7 +33,7 @@ ENV FFMPEG_VERSION=3.2.14 \ OPENCOREAMR_VERSION=0.1.5 \ OPUS_VERSION=1.2 \ OPENJPEG_VERSION=2.1.2 \ - SRT_VERSION=1.3.2 \ + SRT_VERSION=1.4.1 \ THEORA_VERSION=1.1.1 \ VORBIS_VERSION=1.3.5 \ VPX_VERSION=1.8.0 \ diff --git a/docker-images/3.3/alpine311/Dockerfile b/docker-images/3.3/alpine311/Dockerfile index 142a790e0..a1da50927 100644 --- a/docker-images/3.3/alpine311/Dockerfile +++ b/docker-images/3.3/alpine311/Dockerfile @@ -30,7 +30,7 @@ ENV FFMPEG_VERSION=3.3.9 \ OPENCOREAMR_VERSION=0.1.5 \ OPUS_VERSION=1.2 \ OPENJPEG_VERSION=2.1.2 \ - SRT_VERSION=1.3.2 \ + SRT_VERSION=1.4.1 \ THEORA_VERSION=1.1.1 \ VORBIS_VERSION=1.3.5 \ VPX_VERSION=1.8.0 \ diff --git a/docker-images/3.3/centos7/Dockerfile b/docker-images/3.3/centos7/Dockerfile index 2e727f08f..6e1387ada 100644 --- a/docker-images/3.3/centos7/Dockerfile +++ b/docker-images/3.3/centos7/Dockerfile @@ -32,7 +32,7 @@ ENV FFMPEG_VERSION=3.3.9 \ OPENCOREAMR_VERSION=0.1.5 \ OPUS_VERSION=1.2 \ OPENJPEG_VERSION=2.1.2 \ - SRT_VERSION=1.3.2 \ + SRT_VERSION=1.4.1 \ THEORA_VERSION=1.1.1 \ VORBIS_VERSION=1.3.5 \ VPX_VERSION=1.8.0 \ diff --git a/docker-images/3.3/centos8/Dockerfile b/docker-images/3.3/centos8/Dockerfile index 350cf32b7..0ab4fb2eb 100644 --- a/docker-images/3.3/centos8/Dockerfile +++ b/docker-images/3.3/centos8/Dockerfile @@ -32,7 +32,7 @@ ENV FFMPEG_VERSION=3.3.9 \ OPENCOREAMR_VERSION=0.1.5 \ OPUS_VERSION=1.2 \ OPENJPEG_VERSION=2.1.2 \ - SRT_VERSION=1.3.2 \ + SRT_VERSION=1.4.1 \ THEORA_VERSION=1.1.1 \ VORBIS_VERSION=1.3.5 \ VPX_VERSION=1.8.0 \ diff --git a/docker-images/3.3/nvidia1804/Dockerfile b/docker-images/3.3/nvidia1804/Dockerfile index c7474913c..a4f2332ed 100644 --- a/docker-images/3.3/nvidia1804/Dockerfile +++ b/docker-images/3.3/nvidia1804/Dockerfile @@ -48,7 +48,7 @@ ENV FFMPEG_VERSION=3.3.9 \ OPENCOREAMR_VERSION=0.1.5 \ OPUS_VERSION=1.2 \ OPENJPEG_VERSION=2.1.2 \ - SRT_VERSION=1.3.2 \ + SRT_VERSION=1.4.1 \ THEORA_VERSION=1.1.1 \ VORBIS_VERSION=1.3.5 \ VPX_VERSION=1.8.0 \ diff --git a/docker-images/3.3/scratch311/Dockerfile b/docker-images/3.3/scratch311/Dockerfile index 42bfad68b..a7895ff66 100644 --- a/docker-images/3.3/scratch311/Dockerfile +++ b/docker-images/3.3/scratch311/Dockerfile @@ -25,7 +25,7 @@ ENV FFMPEG_VERSION=3.3.9 \ OPENCOREAMR_VERSION=0.1.5 \ OPUS_VERSION=1.2 \ OPENJPEG_VERSION=2.1.2 \ - SRT_VERSION=1.3.2 \ + SRT_VERSION=1.4.1 \ THEORA_VERSION=1.1.1 \ VORBIS_VERSION=1.3.5 \ VPX_VERSION=1.8.0 \ diff --git a/docker-images/3.3/ubuntu1604/Dockerfile b/docker-images/3.3/ubuntu1604/Dockerfile index aaa92468d..5cbb4a3c7 100644 --- a/docker-images/3.3/ubuntu1604/Dockerfile +++ b/docker-images/3.3/ubuntu1604/Dockerfile @@ -33,7 +33,7 @@ ENV FFMPEG_VERSION=3.3.9 \ OPENCOREAMR_VERSION=0.1.5 \ OPUS_VERSION=1.2 \ OPENJPEG_VERSION=2.1.2 \ - SRT_VERSION=1.3.2 \ + SRT_VERSION=1.4.1 \ THEORA_VERSION=1.1.1 \ VORBIS_VERSION=1.3.5 \ VPX_VERSION=1.8.0 \ diff --git a/docker-images/3.3/ubuntu1804/Dockerfile b/docker-images/3.3/ubuntu1804/Dockerfile index bbbed7248..52ccca063 100644 --- a/docker-images/3.3/ubuntu1804/Dockerfile +++ b/docker-images/3.3/ubuntu1804/Dockerfile @@ -33,7 +33,7 @@ ENV FFMPEG_VERSION=3.3.9 \ OPENCOREAMR_VERSION=0.1.5 \ OPUS_VERSION=1.2 \ OPENJPEG_VERSION=2.1.2 \ - SRT_VERSION=1.3.2 \ + SRT_VERSION=1.4.1 \ THEORA_VERSION=1.1.1 \ VORBIS_VERSION=1.3.5 \ VPX_VERSION=1.8.0 \ diff --git a/docker-images/3.3/vaapi1804/Dockerfile b/docker-images/3.3/vaapi1804/Dockerfile index 37a2ee507..8017ac5a5 100644 --- a/docker-images/3.3/vaapi1804/Dockerfile +++ b/docker-images/3.3/vaapi1804/Dockerfile @@ -33,7 +33,7 @@ ENV FFMPEG_VERSION=3.3.9 \ OPENCOREAMR_VERSION=0.1.5 \ OPUS_VERSION=1.2 \ OPENJPEG_VERSION=2.1.2 \ - SRT_VERSION=1.3.2 \ + SRT_VERSION=1.4.1 \ THEORA_VERSION=1.1.1 \ VORBIS_VERSION=1.3.5 \ VPX_VERSION=1.8.0 \ diff --git a/docker-images/3.4/alpine311/Dockerfile b/docker-images/3.4/alpine311/Dockerfile index 378211e32..21e713716 100644 --- a/docker-images/3.4/alpine311/Dockerfile +++ b/docker-images/3.4/alpine311/Dockerfile @@ -30,7 +30,7 @@ ENV FFMPEG_VERSION=3.4.7 \ OPENCOREAMR_VERSION=0.1.5 \ OPUS_VERSION=1.2 \ OPENJPEG_VERSION=2.1.2 \ - SRT_VERSION=1.3.2 \ + SRT_VERSION=1.4.1 \ THEORA_VERSION=1.1.1 \ VORBIS_VERSION=1.3.5 \ VPX_VERSION=1.8.0 \ diff --git a/docker-images/3.4/centos7/Dockerfile b/docker-images/3.4/centos7/Dockerfile index 5e7aa9c6d..af6d0eeef 100644 --- a/docker-images/3.4/centos7/Dockerfile +++ b/docker-images/3.4/centos7/Dockerfile @@ -32,7 +32,7 @@ ENV FFMPEG_VERSION=3.4.7 \ OPENCOREAMR_VERSION=0.1.5 \ OPUS_VERSION=1.2 \ OPENJPEG_VERSION=2.1.2 \ - SRT_VERSION=1.3.2 \ + SRT_VERSION=1.4.1 \ THEORA_VERSION=1.1.1 \ VORBIS_VERSION=1.3.5 \ VPX_VERSION=1.8.0 \ diff --git a/docker-images/3.4/centos8/Dockerfile b/docker-images/3.4/centos8/Dockerfile index 1dba01312..cf1029f3f 100644 --- a/docker-images/3.4/centos8/Dockerfile +++ b/docker-images/3.4/centos8/Dockerfile @@ -32,7 +32,7 @@ ENV FFMPEG_VERSION=3.4.7 \ OPENCOREAMR_VERSION=0.1.5 \ OPUS_VERSION=1.2 \ OPENJPEG_VERSION=2.1.2 \ - SRT_VERSION=1.3.2 \ + SRT_VERSION=1.4.1 \ THEORA_VERSION=1.1.1 \ VORBIS_VERSION=1.3.5 \ VPX_VERSION=1.8.0 \ diff --git a/docker-images/3.4/nvidia1804/Dockerfile b/docker-images/3.4/nvidia1804/Dockerfile index b37bffd0c..9d142fa8f 100644 --- a/docker-images/3.4/nvidia1804/Dockerfile +++ b/docker-images/3.4/nvidia1804/Dockerfile @@ -48,7 +48,7 @@ ENV FFMPEG_VERSION=3.4.7 \ OPENCOREAMR_VERSION=0.1.5 \ OPUS_VERSION=1.2 \ OPENJPEG_VERSION=2.1.2 \ - SRT_VERSION=1.3.2 \ + SRT_VERSION=1.4.1 \ THEORA_VERSION=1.1.1 \ VORBIS_VERSION=1.3.5 \ VPX_VERSION=1.8.0 \ diff --git a/docker-images/3.4/scratch311/Dockerfile b/docker-images/3.4/scratch311/Dockerfile index a5a9a8f67..a982daf8f 100644 --- a/docker-images/3.4/scratch311/Dockerfile +++ b/docker-images/3.4/scratch311/Dockerfile @@ -25,7 +25,7 @@ ENV FFMPEG_VERSION=3.4.7 \ OPENCOREAMR_VERSION=0.1.5 \ OPUS_VERSION=1.2 \ OPENJPEG_VERSION=2.1.2 \ - SRT_VERSION=1.3.2 \ + SRT_VERSION=1.4.1 \ THEORA_VERSION=1.1.1 \ VORBIS_VERSION=1.3.5 \ VPX_VERSION=1.8.0 \ diff --git a/docker-images/3.4/ubuntu1604/Dockerfile b/docker-images/3.4/ubuntu1604/Dockerfile index f73bce04f..0d492a16a 100644 --- a/docker-images/3.4/ubuntu1604/Dockerfile +++ b/docker-images/3.4/ubuntu1604/Dockerfile @@ -33,7 +33,7 @@ ENV FFMPEG_VERSION=3.4.7 \ OPENCOREAMR_VERSION=0.1.5 \ OPUS_VERSION=1.2 \ OPENJPEG_VERSION=2.1.2 \ - SRT_VERSION=1.3.2 \ + SRT_VERSION=1.4.1 \ THEORA_VERSION=1.1.1 \ VORBIS_VERSION=1.3.5 \ VPX_VERSION=1.8.0 \ diff --git a/docker-images/3.4/ubuntu1804/Dockerfile b/docker-images/3.4/ubuntu1804/Dockerfile index 4a388cc23..660b1c36c 100644 --- a/docker-images/3.4/ubuntu1804/Dockerfile +++ b/docker-images/3.4/ubuntu1804/Dockerfile @@ -33,7 +33,7 @@ ENV FFMPEG_VERSION=3.4.7 \ OPENCOREAMR_VERSION=0.1.5 \ OPUS_VERSION=1.2 \ OPENJPEG_VERSION=2.1.2 \ - SRT_VERSION=1.3.2 \ + SRT_VERSION=1.4.1 \ THEORA_VERSION=1.1.1 \ VORBIS_VERSION=1.3.5 \ VPX_VERSION=1.8.0 \ diff --git a/docker-images/3.4/vaapi1804/Dockerfile b/docker-images/3.4/vaapi1804/Dockerfile index 27628937c..6c80696f4 100644 --- a/docker-images/3.4/vaapi1804/Dockerfile +++ b/docker-images/3.4/vaapi1804/Dockerfile @@ -33,7 +33,7 @@ ENV FFMPEG_VERSION=3.4.7 \ OPENCOREAMR_VERSION=0.1.5 \ OPUS_VERSION=1.2 \ OPENJPEG_VERSION=2.1.2 \ - SRT_VERSION=1.3.2 \ + SRT_VERSION=1.4.1 \ THEORA_VERSION=1.1.1 \ VORBIS_VERSION=1.3.5 \ VPX_VERSION=1.8.0 \ diff --git a/docker-images/4.0/alpine311/Dockerfile b/docker-images/4.0/alpine311/Dockerfile index 5bfaf311d..34fc6ae34 100644 --- a/docker-images/4.0/alpine311/Dockerfile +++ b/docker-images/4.0/alpine311/Dockerfile @@ -30,7 +30,7 @@ ENV FFMPEG_VERSION=4.0.5 \ OPENCOREAMR_VERSION=0.1.5 \ OPUS_VERSION=1.2 \ OPENJPEG_VERSION=2.1.2 \ - SRT_VERSION=1.3.2 \ + SRT_VERSION=1.4.1 \ THEORA_VERSION=1.1.1 \ VORBIS_VERSION=1.3.5 \ VPX_VERSION=1.8.0 \ diff --git a/docker-images/4.0/centos7/Dockerfile b/docker-images/4.0/centos7/Dockerfile index a6e7d0031..5a212ba52 100644 --- a/docker-images/4.0/centos7/Dockerfile +++ b/docker-images/4.0/centos7/Dockerfile @@ -32,7 +32,7 @@ ENV FFMPEG_VERSION=4.0.5 \ OPENCOREAMR_VERSION=0.1.5 \ OPUS_VERSION=1.2 \ OPENJPEG_VERSION=2.1.2 \ - SRT_VERSION=1.3.2 \ + SRT_VERSION=1.4.1 \ THEORA_VERSION=1.1.1 \ VORBIS_VERSION=1.3.5 \ VPX_VERSION=1.8.0 \ diff --git a/docker-images/4.0/centos8/Dockerfile b/docker-images/4.0/centos8/Dockerfile index 8543c15cb..5c12484d4 100644 --- a/docker-images/4.0/centos8/Dockerfile +++ b/docker-images/4.0/centos8/Dockerfile @@ -32,7 +32,7 @@ ENV FFMPEG_VERSION=4.0.5 \ OPENCOREAMR_VERSION=0.1.5 \ OPUS_VERSION=1.2 \ OPENJPEG_VERSION=2.1.2 \ - SRT_VERSION=1.3.2 \ + SRT_VERSION=1.4.1 \ THEORA_VERSION=1.1.1 \ VORBIS_VERSION=1.3.5 \ VPX_VERSION=1.8.0 \ diff --git a/docker-images/4.0/nvidia1804/Dockerfile b/docker-images/4.0/nvidia1804/Dockerfile index 6a7465b19..c20a7cefb 100644 --- a/docker-images/4.0/nvidia1804/Dockerfile +++ b/docker-images/4.0/nvidia1804/Dockerfile @@ -48,7 +48,7 @@ ENV FFMPEG_VERSION=4.0.5 \ OPENCOREAMR_VERSION=0.1.5 \ OPUS_VERSION=1.2 \ OPENJPEG_VERSION=2.1.2 \ - SRT_VERSION=1.3.2 \ + SRT_VERSION=1.4.1 \ THEORA_VERSION=1.1.1 \ VORBIS_VERSION=1.3.5 \ VPX_VERSION=1.8.0 \ diff --git a/docker-images/4.0/scratch311/Dockerfile b/docker-images/4.0/scratch311/Dockerfile index 1a5756cbd..d97acc93f 100644 --- a/docker-images/4.0/scratch311/Dockerfile +++ b/docker-images/4.0/scratch311/Dockerfile @@ -25,7 +25,7 @@ ENV FFMPEG_VERSION=4.0.5 \ OPENCOREAMR_VERSION=0.1.5 \ OPUS_VERSION=1.2 \ OPENJPEG_VERSION=2.1.2 \ - SRT_VERSION=1.3.2 \ + SRT_VERSION=1.4.1 \ THEORA_VERSION=1.1.1 \ VORBIS_VERSION=1.3.5 \ VPX_VERSION=1.8.0 \ diff --git a/docker-images/4.0/ubuntu1604/Dockerfile b/docker-images/4.0/ubuntu1604/Dockerfile index 884bb0ef9..24781d23e 100644 --- a/docker-images/4.0/ubuntu1604/Dockerfile +++ b/docker-images/4.0/ubuntu1604/Dockerfile @@ -33,7 +33,7 @@ ENV FFMPEG_VERSION=4.0.5 \ OPENCOREAMR_VERSION=0.1.5 \ OPUS_VERSION=1.2 \ OPENJPEG_VERSION=2.1.2 \ - SRT_VERSION=1.3.2 \ + SRT_VERSION=1.4.1 \ THEORA_VERSION=1.1.1 \ VORBIS_VERSION=1.3.5 \ VPX_VERSION=1.8.0 \ diff --git a/docker-images/4.0/ubuntu1804/Dockerfile b/docker-images/4.0/ubuntu1804/Dockerfile index 26d681618..02df409bc 100644 --- a/docker-images/4.0/ubuntu1804/Dockerfile +++ b/docker-images/4.0/ubuntu1804/Dockerfile @@ -33,7 +33,7 @@ ENV FFMPEG_VERSION=4.0.5 \ OPENCOREAMR_VERSION=0.1.5 \ OPUS_VERSION=1.2 \ OPENJPEG_VERSION=2.1.2 \ - SRT_VERSION=1.3.2 \ + SRT_VERSION=1.4.1 \ THEORA_VERSION=1.1.1 \ VORBIS_VERSION=1.3.5 \ VPX_VERSION=1.8.0 \ diff --git a/docker-images/4.0/vaapi1804/Dockerfile b/docker-images/4.0/vaapi1804/Dockerfile index 975a4ae2c..8b3b83afe 100644 --- a/docker-images/4.0/vaapi1804/Dockerfile +++ b/docker-images/4.0/vaapi1804/Dockerfile @@ -33,7 +33,7 @@ ENV FFMPEG_VERSION=4.0.5 \ OPENCOREAMR_VERSION=0.1.5 \ OPUS_VERSION=1.2 \ OPENJPEG_VERSION=2.1.2 \ - SRT_VERSION=1.3.2 \ + SRT_VERSION=1.4.1 \ THEORA_VERSION=1.1.1 \ VORBIS_VERSION=1.3.5 \ VPX_VERSION=1.8.0 \ diff --git a/docker-images/4.1/alpine311/Dockerfile b/docker-images/4.1/alpine311/Dockerfile index d4f7282b1..cfec3b06f 100644 --- a/docker-images/4.1/alpine311/Dockerfile +++ b/docker-images/4.1/alpine311/Dockerfile @@ -30,7 +30,7 @@ ENV FFMPEG_VERSION=4.1.5 \ OPENCOREAMR_VERSION=0.1.5 \ OPUS_VERSION=1.2 \ OPENJPEG_VERSION=2.1.2 \ - SRT_VERSION=1.3.2 \ + SRT_VERSION=1.4.1 \ THEORA_VERSION=1.1.1 \ VORBIS_VERSION=1.3.5 \ VPX_VERSION=1.8.0 \ diff --git a/docker-images/4.1/centos7/Dockerfile b/docker-images/4.1/centos7/Dockerfile index 21f1c48d4..b0b6d4009 100644 --- a/docker-images/4.1/centos7/Dockerfile +++ b/docker-images/4.1/centos7/Dockerfile @@ -32,7 +32,7 @@ ENV FFMPEG_VERSION=4.1.5 \ OPENCOREAMR_VERSION=0.1.5 \ OPUS_VERSION=1.2 \ OPENJPEG_VERSION=2.1.2 \ - SRT_VERSION=1.3.2 \ + SRT_VERSION=1.4.1 \ THEORA_VERSION=1.1.1 \ VORBIS_VERSION=1.3.5 \ VPX_VERSION=1.8.0 \ diff --git a/docker-images/4.1/centos8/Dockerfile b/docker-images/4.1/centos8/Dockerfile index e214d2239..e89894ce0 100644 --- a/docker-images/4.1/centos8/Dockerfile +++ b/docker-images/4.1/centos8/Dockerfile @@ -32,7 +32,7 @@ ENV FFMPEG_VERSION=4.1.5 \ OPENCOREAMR_VERSION=0.1.5 \ OPUS_VERSION=1.2 \ OPENJPEG_VERSION=2.1.2 \ - SRT_VERSION=1.3.2 \ + SRT_VERSION=1.4.1 \ THEORA_VERSION=1.1.1 \ VORBIS_VERSION=1.3.5 \ VPX_VERSION=1.8.0 \ diff --git a/docker-images/4.1/nvidia1804/Dockerfile b/docker-images/4.1/nvidia1804/Dockerfile index 443ec7344..9e8dd558e 100644 --- a/docker-images/4.1/nvidia1804/Dockerfile +++ b/docker-images/4.1/nvidia1804/Dockerfile @@ -48,7 +48,7 @@ ENV FFMPEG_VERSION=4.1.5 \ OPENCOREAMR_VERSION=0.1.5 \ OPUS_VERSION=1.2 \ OPENJPEG_VERSION=2.1.2 \ - SRT_VERSION=1.3.2 \ + SRT_VERSION=1.4.1 \ THEORA_VERSION=1.1.1 \ VORBIS_VERSION=1.3.5 \ VPX_VERSION=1.8.0 \ diff --git a/docker-images/4.1/scratch311/Dockerfile b/docker-images/4.1/scratch311/Dockerfile index ba514a982..7396a3f71 100644 --- a/docker-images/4.1/scratch311/Dockerfile +++ b/docker-images/4.1/scratch311/Dockerfile @@ -25,7 +25,7 @@ ENV FFMPEG_VERSION=4.1.5 \ OPENCOREAMR_VERSION=0.1.5 \ OPUS_VERSION=1.2 \ OPENJPEG_VERSION=2.1.2 \ - SRT_VERSION=1.3.2 \ + SRT_VERSION=1.4.1 \ THEORA_VERSION=1.1.1 \ VORBIS_VERSION=1.3.5 \ VPX_VERSION=1.8.0 \ diff --git a/docker-images/4.1/ubuntu1604/Dockerfile b/docker-images/4.1/ubuntu1604/Dockerfile index 8dd59fb59..fa32b3409 100644 --- a/docker-images/4.1/ubuntu1604/Dockerfile +++ b/docker-images/4.1/ubuntu1604/Dockerfile @@ -33,7 +33,7 @@ ENV FFMPEG_VERSION=4.1.5 \ OPENCOREAMR_VERSION=0.1.5 \ OPUS_VERSION=1.2 \ OPENJPEG_VERSION=2.1.2 \ - SRT_VERSION=1.3.2 \ + SRT_VERSION=1.4.1 \ THEORA_VERSION=1.1.1 \ VORBIS_VERSION=1.3.5 \ VPX_VERSION=1.8.0 \ diff --git a/docker-images/4.1/ubuntu1804/Dockerfile b/docker-images/4.1/ubuntu1804/Dockerfile index 9f17e2582..da559f927 100644 --- a/docker-images/4.1/ubuntu1804/Dockerfile +++ b/docker-images/4.1/ubuntu1804/Dockerfile @@ -33,7 +33,7 @@ ENV FFMPEG_VERSION=4.1.5 \ OPENCOREAMR_VERSION=0.1.5 \ OPUS_VERSION=1.2 \ OPENJPEG_VERSION=2.1.2 \ - SRT_VERSION=1.3.2 \ + SRT_VERSION=1.4.1 \ THEORA_VERSION=1.1.1 \ VORBIS_VERSION=1.3.5 \ VPX_VERSION=1.8.0 \ diff --git a/docker-images/4.1/vaapi1804/Dockerfile b/docker-images/4.1/vaapi1804/Dockerfile index 2dd38e813..74cfbfcbf 100644 --- a/docker-images/4.1/vaapi1804/Dockerfile +++ b/docker-images/4.1/vaapi1804/Dockerfile @@ -33,7 +33,7 @@ ENV FFMPEG_VERSION=4.1.5 \ OPENCOREAMR_VERSION=0.1.5 \ OPUS_VERSION=1.2 \ OPENJPEG_VERSION=2.1.2 \ - SRT_VERSION=1.3.2 \ + SRT_VERSION=1.4.1 \ THEORA_VERSION=1.1.1 \ VORBIS_VERSION=1.3.5 \ VPX_VERSION=1.8.0 \ diff --git a/docker-images/4.2/alpine311/Dockerfile b/docker-images/4.2/alpine311/Dockerfile index 6b33142aa..09ccaef67 100644 --- a/docker-images/4.2/alpine311/Dockerfile +++ b/docker-images/4.2/alpine311/Dockerfile @@ -30,7 +30,7 @@ ENV FFMPEG_VERSION=4.2.2 \ OPENCOREAMR_VERSION=0.1.5 \ OPUS_VERSION=1.2 \ OPENJPEG_VERSION=2.1.2 \ - SRT_VERSION=1.3.2 \ + SRT_VERSION=1.4.1 \ THEORA_VERSION=1.1.1 \ VORBIS_VERSION=1.3.5 \ VPX_VERSION=1.8.0 \ diff --git a/docker-images/4.2/centos7/Dockerfile b/docker-images/4.2/centos7/Dockerfile index cdfd0ee1b..491a625c8 100644 --- a/docker-images/4.2/centos7/Dockerfile +++ b/docker-images/4.2/centos7/Dockerfile @@ -32,7 +32,7 @@ ENV FFMPEG_VERSION=4.2.2 \ OPENCOREAMR_VERSION=0.1.5 \ OPUS_VERSION=1.2 \ OPENJPEG_VERSION=2.1.2 \ - SRT_VERSION=1.3.2 \ + SRT_VERSION=1.4.1 \ THEORA_VERSION=1.1.1 \ VORBIS_VERSION=1.3.5 \ VPX_VERSION=1.8.0 \ diff --git a/docker-images/4.2/centos8/Dockerfile b/docker-images/4.2/centos8/Dockerfile index 163a2742b..f1a2370f6 100644 --- a/docker-images/4.2/centos8/Dockerfile +++ b/docker-images/4.2/centos8/Dockerfile @@ -32,7 +32,7 @@ ENV FFMPEG_VERSION=4.2.2 \ OPENCOREAMR_VERSION=0.1.5 \ OPUS_VERSION=1.2 \ OPENJPEG_VERSION=2.1.2 \ - SRT_VERSION=1.3.2 \ + SRT_VERSION=1.4.1 \ THEORA_VERSION=1.1.1 \ VORBIS_VERSION=1.3.5 \ VPX_VERSION=1.8.0 \ diff --git a/docker-images/4.2/nvidia1804/Dockerfile b/docker-images/4.2/nvidia1804/Dockerfile index f74c07a07..0189246b0 100644 --- a/docker-images/4.2/nvidia1804/Dockerfile +++ b/docker-images/4.2/nvidia1804/Dockerfile @@ -48,7 +48,7 @@ ENV FFMPEG_VERSION=4.2.2 \ OPENCOREAMR_VERSION=0.1.5 \ OPUS_VERSION=1.2 \ OPENJPEG_VERSION=2.1.2 \ - SRT_VERSION=1.3.2 \ + SRT_VERSION=1.4.1 \ THEORA_VERSION=1.1.1 \ VORBIS_VERSION=1.3.5 \ VPX_VERSION=1.8.0 \ diff --git a/docker-images/4.2/scratch311/Dockerfile b/docker-images/4.2/scratch311/Dockerfile index 94d6dd119..07d7e0f88 100644 --- a/docker-images/4.2/scratch311/Dockerfile +++ b/docker-images/4.2/scratch311/Dockerfile @@ -25,7 +25,7 @@ ENV FFMPEG_VERSION=4.2.2 \ OPENCOREAMR_VERSION=0.1.5 \ OPUS_VERSION=1.2 \ OPENJPEG_VERSION=2.1.2 \ - SRT_VERSION=1.3.2 \ + SRT_VERSION=1.4.1 \ THEORA_VERSION=1.1.1 \ VORBIS_VERSION=1.3.5 \ VPX_VERSION=1.8.0 \ diff --git a/docker-images/4.2/ubuntu1604/Dockerfile b/docker-images/4.2/ubuntu1604/Dockerfile index 617c139d1..c53c261f8 100644 --- a/docker-images/4.2/ubuntu1604/Dockerfile +++ b/docker-images/4.2/ubuntu1604/Dockerfile @@ -33,7 +33,7 @@ ENV FFMPEG_VERSION=4.2.2 \ OPENCOREAMR_VERSION=0.1.5 \ OPUS_VERSION=1.2 \ OPENJPEG_VERSION=2.1.2 \ - SRT_VERSION=1.3.2 \ + SRT_VERSION=1.4.1 \ THEORA_VERSION=1.1.1 \ VORBIS_VERSION=1.3.5 \ VPX_VERSION=1.8.0 \ diff --git a/docker-images/4.2/ubuntu1804/Dockerfile b/docker-images/4.2/ubuntu1804/Dockerfile index 139831e06..894634966 100644 --- a/docker-images/4.2/ubuntu1804/Dockerfile +++ b/docker-images/4.2/ubuntu1804/Dockerfile @@ -33,7 +33,7 @@ ENV FFMPEG_VERSION=4.2.2 \ OPENCOREAMR_VERSION=0.1.5 \ OPUS_VERSION=1.2 \ OPENJPEG_VERSION=2.1.2 \ - SRT_VERSION=1.3.2 \ + SRT_VERSION=1.4.1 \ THEORA_VERSION=1.1.1 \ VORBIS_VERSION=1.3.5 \ VPX_VERSION=1.8.0 \ diff --git a/docker-images/4.2/vaapi1804/Dockerfile b/docker-images/4.2/vaapi1804/Dockerfile index 545e071c5..1badc85fd 100644 --- a/docker-images/4.2/vaapi1804/Dockerfile +++ b/docker-images/4.2/vaapi1804/Dockerfile @@ -33,7 +33,7 @@ ENV FFMPEG_VERSION=4.2.2 \ OPENCOREAMR_VERSION=0.1.5 \ OPUS_VERSION=1.2 \ OPENJPEG_VERSION=2.1.2 \ - SRT_VERSION=1.3.2 \ + SRT_VERSION=1.4.1 \ THEORA_VERSION=1.1.1 \ VORBIS_VERSION=1.3.5 \ VPX_VERSION=1.8.0 \ diff --git a/docker-images/snapshot/alpine311/Dockerfile b/docker-images/snapshot/alpine311/Dockerfile index 7d885fdc6..02be3853e 100644 --- a/docker-images/snapshot/alpine311/Dockerfile +++ b/docker-images/snapshot/alpine311/Dockerfile @@ -30,7 +30,7 @@ ENV FFMPEG_VERSION=snapshot \ OPENCOREAMR_VERSION=0.1.5 \ OPUS_VERSION=1.2 \ OPENJPEG_VERSION=2.1.2 \ - SRT_VERSION=1.3.2 \ + SRT_VERSION=1.4.1 \ THEORA_VERSION=1.1.1 \ VORBIS_VERSION=1.3.5 \ VPX_VERSION=1.8.0 \ diff --git a/docker-images/snapshot/centos7/Dockerfile b/docker-images/snapshot/centos7/Dockerfile index eb830b54a..0aa0443c8 100644 --- a/docker-images/snapshot/centos7/Dockerfile +++ b/docker-images/snapshot/centos7/Dockerfile @@ -32,7 +32,7 @@ ENV FFMPEG_VERSION=snapshot \ OPENCOREAMR_VERSION=0.1.5 \ OPUS_VERSION=1.2 \ OPENJPEG_VERSION=2.1.2 \ - SRT_VERSION=1.3.2 \ + SRT_VERSION=1.4.1 \ THEORA_VERSION=1.1.1 \ VORBIS_VERSION=1.3.5 \ VPX_VERSION=1.8.0 \ diff --git a/docker-images/snapshot/centos8/Dockerfile b/docker-images/snapshot/centos8/Dockerfile index 4283a4a46..1f5e77943 100644 --- a/docker-images/snapshot/centos8/Dockerfile +++ b/docker-images/snapshot/centos8/Dockerfile @@ -32,7 +32,7 @@ ENV FFMPEG_VERSION=snapshot \ OPENCOREAMR_VERSION=0.1.5 \ OPUS_VERSION=1.2 \ OPENJPEG_VERSION=2.1.2 \ - SRT_VERSION=1.3.2 \ + SRT_VERSION=1.4.1 \ THEORA_VERSION=1.1.1 \ VORBIS_VERSION=1.3.5 \ VPX_VERSION=1.8.0 \ diff --git a/docker-images/snapshot/nvidia1804/Dockerfile b/docker-images/snapshot/nvidia1804/Dockerfile index 09c2372a0..aee515d68 100644 --- a/docker-images/snapshot/nvidia1804/Dockerfile +++ b/docker-images/snapshot/nvidia1804/Dockerfile @@ -48,7 +48,7 @@ ENV FFMPEG_VERSION=snapshot \ OPENCOREAMR_VERSION=0.1.5 \ OPUS_VERSION=1.2 \ OPENJPEG_VERSION=2.1.2 \ - SRT_VERSION=1.3.2 \ + SRT_VERSION=1.4.1 \ THEORA_VERSION=1.1.1 \ VORBIS_VERSION=1.3.5 \ VPX_VERSION=1.8.0 \ diff --git a/docker-images/snapshot/scratch311/Dockerfile b/docker-images/snapshot/scratch311/Dockerfile index 8f1062c4c..a33eae78d 100644 --- a/docker-images/snapshot/scratch311/Dockerfile +++ b/docker-images/snapshot/scratch311/Dockerfile @@ -25,7 +25,7 @@ ENV FFMPEG_VERSION=snapshot \ OPENCOREAMR_VERSION=0.1.5 \ OPUS_VERSION=1.2 \ OPENJPEG_VERSION=2.1.2 \ - SRT_VERSION=1.3.2 \ + SRT_VERSION=1.4.1 \ THEORA_VERSION=1.1.1 \ VORBIS_VERSION=1.3.5 \ VPX_VERSION=1.8.0 \ diff --git a/docker-images/snapshot/ubuntu1604/Dockerfile b/docker-images/snapshot/ubuntu1604/Dockerfile index 000472863..b4e2608a3 100644 --- a/docker-images/snapshot/ubuntu1604/Dockerfile +++ b/docker-images/snapshot/ubuntu1604/Dockerfile @@ -33,7 +33,7 @@ ENV FFMPEG_VERSION=snapshot \ OPENCOREAMR_VERSION=0.1.5 \ OPUS_VERSION=1.2 \ OPENJPEG_VERSION=2.1.2 \ - SRT_VERSION=1.3.2 \ + SRT_VERSION=1.4.1 \ THEORA_VERSION=1.1.1 \ VORBIS_VERSION=1.3.5 \ VPX_VERSION=1.8.0 \ diff --git a/docker-images/snapshot/ubuntu1804/Dockerfile b/docker-images/snapshot/ubuntu1804/Dockerfile index 9d0d11c5c..5dc68224e 100644 --- a/docker-images/snapshot/ubuntu1804/Dockerfile +++ b/docker-images/snapshot/ubuntu1804/Dockerfile @@ -33,7 +33,7 @@ ENV FFMPEG_VERSION=snapshot \ OPENCOREAMR_VERSION=0.1.5 \ OPUS_VERSION=1.2 \ OPENJPEG_VERSION=2.1.2 \ - SRT_VERSION=1.3.2 \ + SRT_VERSION=1.4.1 \ THEORA_VERSION=1.1.1 \ VORBIS_VERSION=1.3.5 \ VPX_VERSION=1.8.0 \ diff --git a/docker-images/snapshot/vaapi1804/Dockerfile b/docker-images/snapshot/vaapi1804/Dockerfile index 567347b40..442b423f5 100644 --- a/docker-images/snapshot/vaapi1804/Dockerfile +++ b/docker-images/snapshot/vaapi1804/Dockerfile @@ -33,7 +33,7 @@ ENV FFMPEG_VERSION=snapshot \ OPENCOREAMR_VERSION=0.1.5 \ OPUS_VERSION=1.2 \ OPENJPEG_VERSION=2.1.2 \ - SRT_VERSION=1.3.2 \ + SRT_VERSION=1.4.1 \ THEORA_VERSION=1.1.1 \ VORBIS_VERSION=1.3.5 \ VPX_VERSION=1.8.0 \