From eb60015903be29fb7c64b3234c1526346fafacc0 Mon Sep 17 00:00:00 2001 From: dpatel257 Date: Mon, 26 Jul 2021 13:17:32 -0700 Subject: [PATCH] [v21.6] Enable Nonfree for ffmpeg when fdkaac is enabled (#782) * Update Docker image README (#704) * update README * Update dockerfiles * [master] Fix Opencv 4.5.2 build with Toolset on Centos 7 (#746) * Update Docker image README (#704) * update README * Update dockerfiles * fix opencv 4.5.2 build with toolset Co-authored-by: jhou5 * [master] Upgrade Meson for Ubuntu-20.04 (#748) * Update Docker image README (#704) * update README * Update dockerfiles * meson version fix Co-authored-by: jhou5 * [master] Test fixes for Release v21.6 - part 1 (#750) * Update Docker image README (#704) * update README * Update dockerfiles * v216 tests update - part 1 Co-authored-by: jhou5 * [master] Test fixes for Release v21.6 - part 2 (#755) * Update Docker image README (#704) * update README * Update dockerfiles * v216 tests update - part 1 * Test fixes for Release v21.6 - part 2 Co-authored-by: jhou5 * [master] Bug fixes for Release v21.6 (#757) * Update Docker image README (#704) * update README * Update dockerfiles * Bug fixes for v21.6. See details - QAT Engine build param fix - revert scvp change for owt360 - test name change for proper injection of tests - devoolset opencv fix - nginx conf sw_fallback off * revert accidental fdkaac change Co-authored-by: jhou5 * [master] Owt boost revert (#759) * Update Docker image README (#704) * update README * Update dockerfiles * revert boost for owt on centos7 Co-authored-by: jhou5 * [master] Fix Ipsec caused u2004 bug (#762) * Update Docker image README (#704) * update README * Update dockerfiles * fix ipsecmb caused system fault in u2004 Co-authored-by: jhou5 * [master] Dldt Video Analytics test fix (#764) * Update Docker image README (#704) * update README * Update dockerfiles * fix dldt gva tests broken by links Co-authored-by: jhou5 * Ubuntu 20.04 fix for vaapi failures (#766) * Update Docker image README (#704) * update README * Update dockerfiles * fix u2004 images for vaapi due to lib change Co-authored-by: jhou5 * [master] License Triggered changes from PDT feedback (#768) * Update Docker image README (#704) * update README * Update dockerfiles * ffmpeg/openssl/libvmaf license related changes * ffmpeg-nonfree change * restructure gpl flag * gpl changes for 264/265 properly * re-add the components needed for 264/265 building & test changes Co-authored-by: jhou5 * [master] Fix test config for vmaf (#770) * Update Docker image README (#704) * update README * Update dockerfiles * vmaf test config fix Co-authored-by: jhou5 * [master] Don't Load 264 tests for nginx dev images (#772) * Update Docker image README (#704) * update README * Update dockerfiles * nginx test load change for dev images Co-authored-by: jhou5 * Doc changes for 21.6 * [master] Document updates for release 216 (#774) * Update Docker image README (#704) * update README * Update dockerfiles * Doc changes for 21.6 Co-authored-by: jhou5 * push dockerfiles remaining changes * [master] Push left over changes to master (#776) * Update Docker image README (#704) * update README * Update dockerfiles * Doc changes for 21.6 * push dockerfiles remaining changes Co-authored-by: jhou5 * [master] QAT readme update & yasm repo change (#777) * Update Docker image README (#704) * update README * Update dockerfiles * Doc changes for 21.6 * push dockerfiles remaining changes * QAT readme change and yasm fix Co-authored-by: jhou5 * README version changes for 21.6 * [master] Readme version update for 216 (#779) * Update Docker image README (#704) * update README * Update dockerfiles * Doc changes for 21.6 * push dockerfiles remaining changes * README version changes for 21.6 * adding links to QAT NGINX_SW Images Co-authored-by: jhou5 * enable non-free if fdkaac is enabled Co-authored-by: jhou5 --- SG1/centos-7/media/dev/Dockerfile | 2 +- SG1/centos-7/media/ffmpeg/Dockerfile | 2 +- SG1/ubuntu-18.04/media/dev/Dockerfile | 2 +- SG1/ubuntu-18.04/media/ffmpeg-vmaf/Dockerfile | 2 +- SG1/ubuntu-18.04/media/ffmpeg/Dockerfile | 2 +- SG1/ubuntu-20.04/media/dev/Dockerfile | 2 +- SG1/ubuntu-20.04/media/ffmpeg/Dockerfile | 2 +- VCAC-A/ubuntu-18.04/analytics/dev/Dockerfile | 2 +- VCAC-A/ubuntu-18.04/analytics/ffmpeg/Dockerfile | 2 +- VCAC-A/ubuntu-18.04/analytics/gst/Dockerfile | 2 +- VCAC-A/ubuntu-20.04/analytics/dev/Dockerfile | 2 +- VCAC-A/ubuntu-20.04/analytics/ffmpeg/Dockerfile | 2 +- VCAC-A/ubuntu-20.04/analytics/gst/Dockerfile | 2 +- Xeon/centos-7/analytics/dev/Dockerfile | 2 +- Xeon/centos-7/analytics/ffmpeg/Dockerfile | 2 +- Xeon/centos-7/analytics/gst/Dockerfile | 2 +- Xeon/centos-7/media/dev/Dockerfile | 2 +- Xeon/centos-7/media/ffmpeg/Dockerfile | 2 +- Xeon/centos-7/media/gst/Dockerfile | 2 +- Xeon/centos-7/service/owt-dev/Dockerfile | 2 +- Xeon/centos-7/service/owt/Dockerfile | 2 +- Xeon/centos-7/service/owt360/Dockerfile | 2 +- Xeon/ubuntu-18.04/analytics/dev/Dockerfile | 2 +- Xeon/ubuntu-18.04/analytics/ffmpeg/Dockerfile | 2 +- Xeon/ubuntu-18.04/analytics/gst/Dockerfile | 2 +- Xeon/ubuntu-18.04/media/dev/Dockerfile | 2 +- Xeon/ubuntu-18.04/media/ffmpeg-vmaf/Dockerfile | 2 +- Xeon/ubuntu-18.04/media/ffmpeg/Dockerfile | 2 +- Xeon/ubuntu-18.04/media/gst/Dockerfile | 2 +- Xeon/ubuntu-18.04/service/owt-dev/Dockerfile | 2 +- Xeon/ubuntu-18.04/service/owt/Dockerfile | 2 +- Xeon/ubuntu-18.04/service/owt360/Dockerfile | 2 +- Xeon/ubuntu-20.04/analytics/dev/Dockerfile | 2 +- Xeon/ubuntu-20.04/analytics/ffmpeg/Dockerfile | 2 +- Xeon/ubuntu-20.04/analytics/gst/Dockerfile | 2 +- Xeon/ubuntu-20.04/media/dev/Dockerfile | 2 +- Xeon/ubuntu-20.04/media/ffmpeg/Dockerfile | 2 +- Xeon/ubuntu-20.04/media/gst/Dockerfile | 2 +- XeonE3/centos-7/analytics/dev/Dockerfile | 2 +- XeonE3/centos-7/analytics/ffmpeg/Dockerfile | 2 +- XeonE3/centos-7/analytics/gst/Dockerfile | 2 +- XeonE3/centos-7/media/dev/Dockerfile | 2 +- XeonE3/centos-7/media/ffmpeg/Dockerfile | 2 +- XeonE3/centos-7/media/gst/Dockerfile | 2 +- XeonE3/centos-7/service/owt-dev/Dockerfile | 2 +- XeonE3/centos-7/service/owt/Dockerfile | 2 +- XeonE3/centos-7/service/owt360/Dockerfile | 2 +- XeonE3/ubuntu-18.04/analytics/dev/Dockerfile | 2 +- XeonE3/ubuntu-18.04/analytics/ffmpeg/Dockerfile | 2 +- XeonE3/ubuntu-18.04/analytics/gst/Dockerfile | 2 +- XeonE3/ubuntu-18.04/media/dev/Dockerfile | 2 +- XeonE3/ubuntu-18.04/media/ffmpeg-vmaf/Dockerfile | 2 +- XeonE3/ubuntu-18.04/media/ffmpeg/Dockerfile | 2 +- XeonE3/ubuntu-18.04/media/gst/Dockerfile | 2 +- XeonE3/ubuntu-18.04/service/owt-dev/Dockerfile | 2 +- XeonE3/ubuntu-18.04/service/owt/Dockerfile | 2 +- XeonE3/ubuntu-18.04/service/owt360/Dockerfile | 2 +- XeonE3/ubuntu-20.04/analytics/dev/Dockerfile | 2 +- XeonE3/ubuntu-20.04/analytics/ffmpeg/Dockerfile | 2 +- XeonE3/ubuntu-20.04/analytics/gst/Dockerfile | 2 +- XeonE3/ubuntu-20.04/media/dev/Dockerfile | 2 +- XeonE3/ubuntu-20.04/media/ffmpeg/Dockerfile | 2 +- XeonE3/ubuntu-20.04/media/gst/Dockerfile | 2 +- template/components/ffmpeg.m4 | 2 +- 64 files changed, 64 insertions(+), 64 deletions(-) diff --git a/SG1/centos-7/media/dev/Dockerfile b/SG1/centos-7/media/dev/Dockerfile index b857af632..e665d7757 100644 --- a/SG1/centos-7/media/dev/Dockerfile +++ b/SG1/centos-7/media/dev/Dockerfile @@ -302,7 +302,7 @@ RUN cd /opt/build/FFmpeg-n4.4 && \ RUN cd /opt/build/FFmpeg-n4.4 && \ ./configure --prefix=/usr/local --libdir=/usr/local/lib64 --enable-shared --disable-static --disable-doc --disable-htmlpages \ --disable-manpages --disable-podpages --disable-txtpages \ - --extra-cflags=-w --enable-libass --enable-libfreetype --disable-xlib --disable-sdl2 --enable-libmfx --enable-vaapi --enable-libv4l2 --enable-indev=v4l2 --enable-openssl --extra-ldflags=-Wl,-rpath=/usr/local/ssl/lib --enable-libfdk-aac --enable-libopus --enable-libvpx --enable-libvorbis --enable-libsvtav1 --enable-libsvthevc --enable-libaom --enable-libdav1d && make -j$(nproc) && \ + --extra-cflags=-w --enable-nonfree --enable-libass --enable-libfreetype --disable-xlib --disable-sdl2 --enable-libmfx --enable-vaapi --enable-libv4l2 --enable-indev=v4l2 --enable-openssl --extra-ldflags=-Wl,-rpath=/usr/local/ssl/lib --enable-libfdk-aac --enable-libopus --enable-libvpx --enable-libvorbis --enable-libsvtav1 --enable-libsvthevc --enable-libaom --enable-libdav1d && make -j$(nproc) && \ make install DESTDIR=/opt/dist && \ make install diff --git a/SG1/centos-7/media/ffmpeg/Dockerfile b/SG1/centos-7/media/ffmpeg/Dockerfile index b3c2f7a6e..8b3b66dc9 100644 --- a/SG1/centos-7/media/ffmpeg/Dockerfile +++ b/SG1/centos-7/media/ffmpeg/Dockerfile @@ -322,7 +322,7 @@ RUN cd /opt/build/FFmpeg-n4.4 && \ RUN cd /opt/build/FFmpeg-n4.4 && \ ./configure --prefix=/usr/local --libdir=/usr/local/lib64 --enable-shared --disable-static --disable-doc --disable-htmlpages \ --disable-manpages --disable-podpages --disable-txtpages \ - --extra-cflags=-w --enable-libass --enable-libfreetype --disable-xlib --disable-sdl2 --enable-libmfx --enable-vaapi --enable-libv4l2 --enable-indev=v4l2 --enable-libfdk-aac --enable-libopus --enable-libvpx --enable-libvorbis --enable-gpl --enable-libx264 --enable-gpl --enable-libx265 --enable-libsvtav1 --enable-libsvthevc --enable-libdav1d && make -j$(nproc) && \ + --extra-cflags=-w --enable-nonfree --enable-libass --enable-libfreetype --disable-xlib --disable-sdl2 --enable-libmfx --enable-vaapi --enable-libv4l2 --enable-indev=v4l2 --enable-libfdk-aac --enable-libopus --enable-libvpx --enable-libvorbis --enable-gpl --enable-libx264 --enable-gpl --enable-libx265 --enable-libsvtav1 --enable-libsvthevc --enable-libdav1d && make -j$(nproc) && \ make install DESTDIR=/opt/dist && \ make install diff --git a/SG1/ubuntu-18.04/media/dev/Dockerfile b/SG1/ubuntu-18.04/media/dev/Dockerfile index d64434531..b6f6ba3f6 100644 --- a/SG1/ubuntu-18.04/media/dev/Dockerfile +++ b/SG1/ubuntu-18.04/media/dev/Dockerfile @@ -354,7 +354,7 @@ RUN cd /opt/build/FFmpeg-n4.4 && \ RUN cd /opt/build/FFmpeg-n4.4 && \ ./configure --prefix=/usr/local --libdir=/usr/local/lib --enable-shared --disable-static --disable-doc --disable-htmlpages \ --disable-manpages --disable-podpages --disable-txtpages \ - --extra-cflags=-w --enable-libass --enable-libfreetype --disable-xlib --disable-sdl2 --enable-libmfx --enable-vaapi --enable-libv4l2 --enable-indev=v4l2 --enable-openssl --extra-ldflags=-Wl,-rpath=/usr/local/ssl/lib --enable-libfdk-aac --enable-libopus --enable-libvpx --enable-libvorbis --enable-libsvtav1 --enable-libsvthevc --enable-libaom --enable-libdav1d && make -j$(nproc) && \ + --extra-cflags=-w --enable-nonfree --enable-libass --enable-libfreetype --disable-xlib --disable-sdl2 --enable-libmfx --enable-vaapi --enable-libv4l2 --enable-indev=v4l2 --enable-openssl --extra-ldflags=-Wl,-rpath=/usr/local/ssl/lib --enable-libfdk-aac --enable-libopus --enable-libvpx --enable-libvorbis --enable-libsvtav1 --enable-libsvthevc --enable-libaom --enable-libdav1d && make -j$(nproc) && \ make install DESTDIR=/opt/dist && \ make install diff --git a/SG1/ubuntu-18.04/media/ffmpeg-vmaf/Dockerfile b/SG1/ubuntu-18.04/media/ffmpeg-vmaf/Dockerfile index bfc48428c..996b2bb52 100644 --- a/SG1/ubuntu-18.04/media/ffmpeg-vmaf/Dockerfile +++ b/SG1/ubuntu-18.04/media/ffmpeg-vmaf/Dockerfile @@ -394,7 +394,7 @@ RUN cd /opt/build/FFmpeg-n4.4 && \ RUN cd /opt/build/FFmpeg-n4.4 && \ ./configure --prefix=/usr/local --libdir=/usr/local/lib --enable-shared --disable-static --disable-doc --disable-htmlpages \ --disable-manpages --disable-podpages --disable-txtpages \ - --extra-cflags=-w --enable-libass --enable-libfreetype --disable-xlib --disable-sdl2 --enable-libmfx --enable-vaapi --enable-libv4l2 --enable-indev=v4l2 --enable-libfdk-aac --enable-libopus --enable-libvpx --enable-libvorbis --enable-gpl --enable-libx264 --enable-gpl --enable-libx265 --enable-libsvtav1 --enable-libsvthevc --enable-libvmaf --enable-version3 --enable-libdav1d && make -j$(nproc) && \ + --extra-cflags=-w --enable-nonfree --enable-libass --enable-libfreetype --disable-xlib --disable-sdl2 --enable-libmfx --enable-vaapi --enable-libv4l2 --enable-indev=v4l2 --enable-libfdk-aac --enable-libopus --enable-libvpx --enable-libvorbis --enable-gpl --enable-libx264 --enable-gpl --enable-libx265 --enable-libsvtav1 --enable-libsvthevc --enable-libvmaf --enable-version3 --enable-libdav1d && make -j$(nproc) && \ make install DESTDIR=/opt/dist && \ make install diff --git a/SG1/ubuntu-18.04/media/ffmpeg/Dockerfile b/SG1/ubuntu-18.04/media/ffmpeg/Dockerfile index e008f42d3..fc34b4746 100644 --- a/SG1/ubuntu-18.04/media/ffmpeg/Dockerfile +++ b/SG1/ubuntu-18.04/media/ffmpeg/Dockerfile @@ -377,7 +377,7 @@ RUN cd /opt/build/FFmpeg-n4.4 && \ RUN cd /opt/build/FFmpeg-n4.4 && \ ./configure --prefix=/usr/local --libdir=/usr/local/lib --enable-shared --disable-static --disable-doc --disable-htmlpages \ --disable-manpages --disable-podpages --disable-txtpages \ - --extra-cflags=-w --enable-libass --enable-libfreetype --disable-xlib --disable-sdl2 --enable-libmfx --enable-vaapi --enable-libv4l2 --enable-indev=v4l2 --enable-libfdk-aac --enable-libopus --enable-libvpx --enable-libvorbis --enable-gpl --enable-libx264 --enable-gpl --enable-libx265 --enable-libsvtav1 --enable-libsvthevc --enable-libdav1d && make -j$(nproc) && \ + --extra-cflags=-w --enable-nonfree --enable-libass --enable-libfreetype --disable-xlib --disable-sdl2 --enable-libmfx --enable-vaapi --enable-libv4l2 --enable-indev=v4l2 --enable-libfdk-aac --enable-libopus --enable-libvpx --enable-libvorbis --enable-gpl --enable-libx264 --enable-gpl --enable-libx265 --enable-libsvtav1 --enable-libsvthevc --enable-libdav1d && make -j$(nproc) && \ make install DESTDIR=/opt/dist && \ make install diff --git a/SG1/ubuntu-20.04/media/dev/Dockerfile b/SG1/ubuntu-20.04/media/dev/Dockerfile index 5a1d65bec..863acc4df 100644 --- a/SG1/ubuntu-20.04/media/dev/Dockerfile +++ b/SG1/ubuntu-20.04/media/dev/Dockerfile @@ -342,7 +342,7 @@ RUN cd /opt/build/FFmpeg-n4.4 && \ RUN cd /opt/build/FFmpeg-n4.4 && \ ./configure --prefix=/usr/local --libdir=/usr/local/lib --enable-shared --disable-static --disable-doc --disable-htmlpages \ --disable-manpages --disable-podpages --disable-txtpages \ - --extra-cflags=-w --enable-libass --enable-libfreetype --disable-xlib --disable-sdl2 --enable-libmfx --enable-vaapi --enable-libv4l2 --enable-indev=v4l2 --enable-openssl --extra-ldflags=-Wl,-rpath=/usr/local/ssl/lib --enable-libfdk-aac --enable-libopus --enable-libvpx --enable-libvorbis --enable-libsvtav1 --enable-libsvthevc --enable-libaom --enable-libdav1d && make -j$(nproc) && \ + --extra-cflags=-w --enable-nonfree --enable-libass --enable-libfreetype --disable-xlib --disable-sdl2 --enable-libmfx --enable-vaapi --enable-libv4l2 --enable-indev=v4l2 --enable-openssl --extra-ldflags=-Wl,-rpath=/usr/local/ssl/lib --enable-libfdk-aac --enable-libopus --enable-libvpx --enable-libvorbis --enable-libsvtav1 --enable-libsvthevc --enable-libaom --enable-libdav1d && make -j$(nproc) && \ make install DESTDIR=/opt/dist && \ make install diff --git a/SG1/ubuntu-20.04/media/ffmpeg/Dockerfile b/SG1/ubuntu-20.04/media/ffmpeg/Dockerfile index 41a78b2fa..9249a2857 100644 --- a/SG1/ubuntu-20.04/media/ffmpeg/Dockerfile +++ b/SG1/ubuntu-20.04/media/ffmpeg/Dockerfile @@ -365,7 +365,7 @@ RUN cd /opt/build/FFmpeg-n4.4 && \ RUN cd /opt/build/FFmpeg-n4.4 && \ ./configure --prefix=/usr/local --libdir=/usr/local/lib --enable-shared --disable-static --disable-doc --disable-htmlpages \ --disable-manpages --disable-podpages --disable-txtpages \ - --extra-cflags=-w --enable-libass --enable-libfreetype --disable-xlib --disable-sdl2 --enable-libmfx --enable-vaapi --enable-libv4l2 --enable-indev=v4l2 --enable-libfdk-aac --enable-libopus --enable-libvpx --enable-libvorbis --enable-gpl --enable-libx264 --enable-gpl --enable-libx265 --enable-libsvtav1 --enable-libsvthevc --enable-libdav1d && make -j$(nproc) && \ + --extra-cflags=-w --enable-nonfree --enable-libass --enable-libfreetype --disable-xlib --disable-sdl2 --enable-libmfx --enable-vaapi --enable-libv4l2 --enable-indev=v4l2 --enable-libfdk-aac --enable-libopus --enable-libvpx --enable-libvorbis --enable-gpl --enable-libx264 --enable-gpl --enable-libx265 --enable-libsvtav1 --enable-libsvthevc --enable-libdav1d && make -j$(nproc) && \ make install DESTDIR=/opt/dist && \ make install diff --git a/VCAC-A/ubuntu-18.04/analytics/dev/Dockerfile b/VCAC-A/ubuntu-18.04/analytics/dev/Dockerfile index 1f1a11791..1c86ff48b 100644 --- a/VCAC-A/ubuntu-18.04/analytics/dev/Dockerfile +++ b/VCAC-A/ubuntu-18.04/analytics/dev/Dockerfile @@ -549,7 +549,7 @@ RUN cd /opt/build/FFmpeg-n4.4 && \ RUN cd /opt/build/FFmpeg-n4.4 && \ ./configure --prefix=/usr/local --libdir=/usr/local/lib --enable-shared --disable-static --disable-doc --disable-htmlpages \ --disable-manpages --disable-podpages --disable-txtpages \ - --extra-cflags=-w --enable-libass --enable-libfreetype --disable-xlib --disable-sdl2 --enable-libmfx --enable-vaapi --enable-libv4l2 --enable-indev=v4l2 --enable-openssl --extra-ldflags=-Wl,-rpath=/usr/local/ssl/lib --enable-libfdk-aac --enable-libopus --enable-libvpx --enable-libvorbis --enable-libaom --enable-libdav1d && make -j$(nproc) && \ + --extra-cflags=-w --enable-nonfree --enable-libass --enable-libfreetype --disable-xlib --disable-sdl2 --enable-libmfx --enable-vaapi --enable-libv4l2 --enable-indev=v4l2 --enable-openssl --extra-ldflags=-Wl,-rpath=/usr/local/ssl/lib --enable-libfdk-aac --enable-libopus --enable-libvpx --enable-libvorbis --enable-libaom --enable-libdav1d && make -j$(nproc) && \ make install DESTDIR=/opt/dist && \ make install diff --git a/VCAC-A/ubuntu-18.04/analytics/ffmpeg/Dockerfile b/VCAC-A/ubuntu-18.04/analytics/ffmpeg/Dockerfile index 15ce9e9d8..60c725039 100644 --- a/VCAC-A/ubuntu-18.04/analytics/ffmpeg/Dockerfile +++ b/VCAC-A/ubuntu-18.04/analytics/ffmpeg/Dockerfile @@ -441,7 +441,7 @@ RUN cd /opt/build/FFmpeg-n4.4 && \ RUN cd /opt/build/FFmpeg-n4.4 && \ ./configure --prefix=/usr/local --libdir=/usr/local/lib --enable-shared --disable-static --disable-doc --disable-htmlpages \ --disable-manpages --disable-podpages --disable-txtpages \ - --extra-cflags=-w --enable-libass --enable-libfreetype --disable-xlib --disable-sdl2 --enable-libmfx --enable-vaapi --enable-libv4l2 --enable-indev=v4l2 --enable-libfdk-aac --enable-libopus --enable-libvpx --enable-libvorbis --enable-gpl --enable-libx264 --enable-gpl --enable-libx265 --enable-libdav1d && make -j$(nproc) && \ + --extra-cflags=-w --enable-nonfree --enable-libass --enable-libfreetype --disable-xlib --disable-sdl2 --enable-libmfx --enable-vaapi --enable-libv4l2 --enable-indev=v4l2 --enable-libfdk-aac --enable-libopus --enable-libvpx --enable-libvorbis --enable-gpl --enable-libx264 --enable-gpl --enable-libx265 --enable-libdav1d && make -j$(nproc) && \ make install DESTDIR=/opt/dist && \ make install diff --git a/VCAC-A/ubuntu-18.04/analytics/gst/Dockerfile b/VCAC-A/ubuntu-18.04/analytics/gst/Dockerfile index 3ac6c2701..e52c493b6 100644 --- a/VCAC-A/ubuntu-18.04/analytics/gst/Dockerfile +++ b/VCAC-A/ubuntu-18.04/analytics/gst/Dockerfile @@ -560,7 +560,7 @@ RUN cd /opt/build/FFmpeg-n4.4 && \ RUN cd /opt/build/FFmpeg-n4.4 && \ ./configure --prefix=/usr/local --libdir=/usr/local/lib --enable-shared --disable-static --disable-doc --disable-htmlpages \ --disable-manpages --disable-podpages --disable-txtpages \ - --extra-cflags=-w --enable-libass --enable-libfreetype --disable-xlib --disable-sdl2 --enable-vaapi --enable-libv4l2 --enable-indev=v4l2 --enable-libfdk-aac --enable-libopus --enable-libvpx --enable-libvorbis --enable-gpl --enable-libx264 --enable-gpl --enable-libx265 --enable-libaom --enable-libdav1d && make -j$(nproc) && \ + --extra-cflags=-w --enable-nonfree --enable-libass --enable-libfreetype --disable-xlib --disable-sdl2 --enable-vaapi --enable-libv4l2 --enable-indev=v4l2 --enable-libfdk-aac --enable-libopus --enable-libvpx --enable-libvorbis --enable-gpl --enable-libx264 --enable-gpl --enable-libx265 --enable-libaom --enable-libdav1d && make -j$(nproc) && \ make install DESTDIR=/opt/dist && \ make install diff --git a/VCAC-A/ubuntu-20.04/analytics/dev/Dockerfile b/VCAC-A/ubuntu-20.04/analytics/dev/Dockerfile index 7ed220c3c..6e7937e30 100644 --- a/VCAC-A/ubuntu-20.04/analytics/dev/Dockerfile +++ b/VCAC-A/ubuntu-20.04/analytics/dev/Dockerfile @@ -535,7 +535,7 @@ RUN cd /opt/build/FFmpeg-n4.4 && \ RUN cd /opt/build/FFmpeg-n4.4 && \ ./configure --prefix=/usr/local --libdir=/usr/local/lib --enable-shared --disable-static --disable-doc --disable-htmlpages \ --disable-manpages --disable-podpages --disable-txtpages \ - --extra-cflags=-w --enable-libass --enable-libfreetype --disable-xlib --disable-sdl2 --enable-libmfx --enable-vaapi --enable-libv4l2 --enable-indev=v4l2 --enable-openssl --extra-ldflags=-Wl,-rpath=/usr/local/ssl/lib --enable-libfdk-aac --enable-libopus --enable-libvpx --enable-libvorbis --enable-libaom --enable-libdav1d && make -j$(nproc) && \ + --extra-cflags=-w --enable-nonfree --enable-libass --enable-libfreetype --disable-xlib --disable-sdl2 --enable-libmfx --enable-vaapi --enable-libv4l2 --enable-indev=v4l2 --enable-openssl --extra-ldflags=-Wl,-rpath=/usr/local/ssl/lib --enable-libfdk-aac --enable-libopus --enable-libvpx --enable-libvorbis --enable-libaom --enable-libdav1d && make -j$(nproc) && \ make install DESTDIR=/opt/dist && \ make install diff --git a/VCAC-A/ubuntu-20.04/analytics/ffmpeg/Dockerfile b/VCAC-A/ubuntu-20.04/analytics/ffmpeg/Dockerfile index 1ee0437bf..554b50c1c 100644 --- a/VCAC-A/ubuntu-20.04/analytics/ffmpeg/Dockerfile +++ b/VCAC-A/ubuntu-20.04/analytics/ffmpeg/Dockerfile @@ -415,7 +415,7 @@ RUN cd /opt/build/FFmpeg-n4.4 && \ RUN cd /opt/build/FFmpeg-n4.4 && \ ./configure --prefix=/usr/local --libdir=/usr/local/lib --enable-shared --disable-static --disable-doc --disable-htmlpages \ --disable-manpages --disable-podpages --disable-txtpages \ - --extra-cflags=-w --enable-libass --enable-libfreetype --disable-xlib --disable-sdl2 --enable-libmfx --enable-vaapi --enable-libv4l2 --enable-indev=v4l2 --enable-libfdk-aac --enable-libopus --enable-libvpx --enable-libvorbis --enable-gpl --enable-libx264 --enable-gpl --enable-libx265 --enable-libdav1d && make -j$(nproc) && \ + --extra-cflags=-w --enable-nonfree --enable-libass --enable-libfreetype --disable-xlib --disable-sdl2 --enable-libmfx --enable-vaapi --enable-libv4l2 --enable-indev=v4l2 --enable-libfdk-aac --enable-libopus --enable-libvpx --enable-libvorbis --enable-gpl --enable-libx264 --enable-gpl --enable-libx265 --enable-libdav1d && make -j$(nproc) && \ make install DESTDIR=/opt/dist && \ make install diff --git a/VCAC-A/ubuntu-20.04/analytics/gst/Dockerfile b/VCAC-A/ubuntu-20.04/analytics/gst/Dockerfile index a2ee7375e..883dcb3a2 100644 --- a/VCAC-A/ubuntu-20.04/analytics/gst/Dockerfile +++ b/VCAC-A/ubuntu-20.04/analytics/gst/Dockerfile @@ -546,7 +546,7 @@ RUN cd /opt/build/FFmpeg-n4.4 && \ RUN cd /opt/build/FFmpeg-n4.4 && \ ./configure --prefix=/usr/local --libdir=/usr/local/lib --enable-shared --disable-static --disable-doc --disable-htmlpages \ --disable-manpages --disable-podpages --disable-txtpages \ - --extra-cflags=-w --enable-libass --enable-libfreetype --disable-xlib --disable-sdl2 --enable-vaapi --enable-libv4l2 --enable-indev=v4l2 --enable-libfdk-aac --enable-libopus --enable-libvpx --enable-libvorbis --enable-gpl --enable-libx264 --enable-gpl --enable-libx265 --enable-libaom --enable-libdav1d && make -j$(nproc) && \ + --extra-cflags=-w --enable-nonfree --enable-libass --enable-libfreetype --disable-xlib --disable-sdl2 --enable-vaapi --enable-libv4l2 --enable-indev=v4l2 --enable-libfdk-aac --enable-libopus --enable-libvpx --enable-libvorbis --enable-gpl --enable-libx264 --enable-gpl --enable-libx265 --enable-libaom --enable-libdav1d && make -j$(nproc) && \ make install DESTDIR=/opt/dist && \ make install diff --git a/Xeon/centos-7/analytics/dev/Dockerfile b/Xeon/centos-7/analytics/dev/Dockerfile index 58990b52b..7aed93047 100644 --- a/Xeon/centos-7/analytics/dev/Dockerfile +++ b/Xeon/centos-7/analytics/dev/Dockerfile @@ -494,7 +494,7 @@ RUN cd /opt/build/FFmpeg-n4.4 && \ RUN cd /opt/build/FFmpeg-n4.4 && \ ./configure --prefix=/usr/local --libdir=/usr/local/lib64 --enable-shared --disable-static --disable-doc --disable-htmlpages \ --disable-manpages --disable-podpages --disable-txtpages \ - --extra-cflags=-w --enable-libass --enable-libfreetype --disable-xlib --disable-sdl2 --disable-hwaccels --disable-vaapi --enable-libv4l2 --enable-indev=v4l2 --enable-openssl --extra-ldflags=-Wl,-rpath=/usr/local/ssl/lib --enable-libfdk-aac --enable-libopus --enable-libvpx --enable-libvorbis --enable-libsvtav1 --enable-libsvthevc --enable-libaom --enable-libdav1d && make -j$(nproc) && \ + --extra-cflags=-w --enable-nonfree --enable-libass --enable-libfreetype --disable-xlib --disable-sdl2 --disable-hwaccels --disable-vaapi --enable-libv4l2 --enable-indev=v4l2 --enable-openssl --extra-ldflags=-Wl,-rpath=/usr/local/ssl/lib --enable-libfdk-aac --enable-libopus --enable-libvpx --enable-libvorbis --enable-libsvtav1 --enable-libsvthevc --enable-libaom --enable-libdav1d && make -j$(nproc) && \ make install DESTDIR=/opt/dist && \ make install diff --git a/Xeon/centos-7/analytics/ffmpeg/Dockerfile b/Xeon/centos-7/analytics/ffmpeg/Dockerfile index 922bfb0ae..64d9f65e9 100644 --- a/Xeon/centos-7/analytics/ffmpeg/Dockerfile +++ b/Xeon/centos-7/analytics/ffmpeg/Dockerfile @@ -379,7 +379,7 @@ RUN cd /opt/build/FFmpeg-n4.4 && \ RUN cd /opt/build/FFmpeg-n4.4 && \ ./configure --prefix=/usr/local --libdir=/usr/local/lib64 --enable-shared --disable-static --disable-doc --disable-htmlpages \ --disable-manpages --disable-podpages --disable-txtpages \ - --extra-cflags=-w --enable-libass --enable-libfreetype --disable-xlib --disable-sdl2 --disable-hwaccels --disable-vaapi --enable-libv4l2 --enable-indev=v4l2 --enable-libfdk-aac --enable-libopus --enable-libvpx --enable-libvorbis --enable-gpl --enable-libx264 --enable-gpl --enable-libx265 --enable-libsvtav1 --enable-libsvthevc --enable-libdav1d && make -j$(nproc) && \ + --extra-cflags=-w --enable-nonfree --enable-libass --enable-libfreetype --disable-xlib --disable-sdl2 --disable-hwaccels --disable-vaapi --enable-libv4l2 --enable-indev=v4l2 --enable-libfdk-aac --enable-libopus --enable-libvpx --enable-libvorbis --enable-gpl --enable-libx264 --enable-gpl --enable-libx265 --enable-libsvtav1 --enable-libsvthevc --enable-libdav1d && make -j$(nproc) && \ make install DESTDIR=/opt/dist && \ make install diff --git a/Xeon/centos-7/analytics/gst/Dockerfile b/Xeon/centos-7/analytics/gst/Dockerfile index 456c0c068..90ed98750 100644 --- a/Xeon/centos-7/analytics/gst/Dockerfile +++ b/Xeon/centos-7/analytics/gst/Dockerfile @@ -504,7 +504,7 @@ RUN cd /opt/build/FFmpeg-n4.4 && \ RUN cd /opt/build/FFmpeg-n4.4 && \ ./configure --prefix=/usr/local --libdir=/usr/local/lib64 --enable-shared --disable-static --disable-doc --disable-htmlpages \ --disable-manpages --disable-podpages --disable-txtpages \ - --extra-cflags=-w --enable-libass --enable-libfreetype --disable-xlib --disable-sdl2 --disable-hwaccels --disable-vaapi --enable-libv4l2 --enable-indev=v4l2 --enable-libfdk-aac --enable-libopus --enable-libvpx --enable-libvorbis --enable-gpl --enable-libx264 --enable-gpl --enable-libx265 --enable-libsvtav1 --enable-libsvthevc --enable-libaom --enable-libdav1d && make -j$(nproc) && \ + --extra-cflags=-w --enable-nonfree --enable-libass --enable-libfreetype --disable-xlib --disable-sdl2 --disable-hwaccels --disable-vaapi --enable-libv4l2 --enable-indev=v4l2 --enable-libfdk-aac --enable-libopus --enable-libvpx --enable-libvorbis --enable-gpl --enable-libx264 --enable-gpl --enable-libx265 --enable-libsvtav1 --enable-libsvthevc --enable-libaom --enable-libdav1d && make -j$(nproc) && \ make install DESTDIR=/opt/dist && \ make install diff --git a/Xeon/centos-7/media/dev/Dockerfile b/Xeon/centos-7/media/dev/Dockerfile index 0c0069fc6..b14b65c43 100644 --- a/Xeon/centos-7/media/dev/Dockerfile +++ b/Xeon/centos-7/media/dev/Dockerfile @@ -356,7 +356,7 @@ RUN cd /opt/build/FFmpeg-n4.4 && \ RUN cd /opt/build/FFmpeg-n4.4 && \ ./configure --prefix=/usr/local --libdir=/usr/local/lib64 --enable-shared --disable-static --disable-doc --disable-htmlpages \ --disable-manpages --disable-podpages --disable-txtpages \ - --extra-cflags=-w --enable-libass --enable-libfreetype --disable-xlib --disable-sdl2 --disable-hwaccels --disable-vaapi --enable-libv4l2 --enable-indev=v4l2 --enable-openssl --extra-ldflags=-Wl,-rpath=/usr/local/ssl/lib --enable-libfdk-aac --enable-libopus --enable-libvpx --enable-libvorbis --enable-libsvtav1 --enable-libsvthevc --enable-libaom --enable-libdav1d && make -j$(nproc) && \ + --extra-cflags=-w --enable-nonfree --enable-libass --enable-libfreetype --disable-xlib --disable-sdl2 --disable-hwaccels --disable-vaapi --enable-libv4l2 --enable-indev=v4l2 --enable-openssl --extra-ldflags=-Wl,-rpath=/usr/local/ssl/lib --enable-libfdk-aac --enable-libopus --enable-libvpx --enable-libvorbis --enable-libsvtav1 --enable-libsvthevc --enable-libaom --enable-libdav1d && make -j$(nproc) && \ make install DESTDIR=/opt/dist && \ make install diff --git a/Xeon/centos-7/media/ffmpeg/Dockerfile b/Xeon/centos-7/media/ffmpeg/Dockerfile index 5a5941a9a..f88673e22 100644 --- a/Xeon/centos-7/media/ffmpeg/Dockerfile +++ b/Xeon/centos-7/media/ffmpeg/Dockerfile @@ -252,7 +252,7 @@ RUN cd /opt/build/FFmpeg-n4.4 && \ RUN cd /opt/build/FFmpeg-n4.4 && \ ./configure --prefix=/usr/local --libdir=/usr/local/lib64 --enable-shared --disable-static --disable-doc --disable-htmlpages \ --disable-manpages --disable-podpages --disable-txtpages \ - --extra-cflags=-w --enable-libass --enable-libfreetype --disable-xlib --disable-sdl2 --disable-hwaccels --disable-vaapi --enable-libv4l2 --enable-indev=v4l2 --enable-libfdk-aac --enable-libopus --enable-libvpx --enable-libvorbis --enable-gpl --enable-libx264 --enable-gpl --enable-libx265 --enable-libsvtav1 --enable-libsvthevc --enable-libdav1d && make -j$(nproc) && \ + --extra-cflags=-w --enable-nonfree --enable-libass --enable-libfreetype --disable-xlib --disable-sdl2 --disable-hwaccels --disable-vaapi --enable-libv4l2 --enable-indev=v4l2 --enable-libfdk-aac --enable-libopus --enable-libvpx --enable-libvorbis --enable-gpl --enable-libx264 --enable-gpl --enable-libx265 --enable-libsvtav1 --enable-libsvthevc --enable-libdav1d && make -j$(nproc) && \ make install DESTDIR=/opt/dist && \ make install diff --git a/Xeon/centos-7/media/gst/Dockerfile b/Xeon/centos-7/media/gst/Dockerfile index 42cae10bb..fe0a62061 100644 --- a/Xeon/centos-7/media/gst/Dockerfile +++ b/Xeon/centos-7/media/gst/Dockerfile @@ -366,7 +366,7 @@ RUN cd /opt/build/FFmpeg-n4.4 && \ RUN cd /opt/build/FFmpeg-n4.4 && \ ./configure --prefix=/usr/local --libdir=/usr/local/lib64 --enable-shared --disable-static --disable-doc --disable-htmlpages \ --disable-manpages --disable-podpages --disable-txtpages \ - --extra-cflags=-w --enable-libass --enable-libfreetype --disable-xlib --disable-sdl2 --disable-hwaccels --disable-vaapi --enable-libv4l2 --enable-indev=v4l2 --enable-libfdk-aac --enable-libopus --enable-libvpx --enable-libvorbis --enable-gpl --enable-libx264 --enable-gpl --enable-libx265 --enable-libsvtav1 --enable-libsvthevc --enable-libaom --enable-libdav1d && make -j$(nproc) && \ + --extra-cflags=-w --enable-nonfree --enable-libass --enable-libfreetype --disable-xlib --disable-sdl2 --disable-hwaccels --disable-vaapi --enable-libv4l2 --enable-indev=v4l2 --enable-libfdk-aac --enable-libopus --enable-libvpx --enable-libvorbis --enable-gpl --enable-libx264 --enable-gpl --enable-libx265 --enable-libsvtav1 --enable-libsvthevc --enable-libaom --enable-libdav1d && make -j$(nproc) && \ make install DESTDIR=/opt/dist && \ make install diff --git a/Xeon/centos-7/service/owt-dev/Dockerfile b/Xeon/centos-7/service/owt-dev/Dockerfile index 4fb6951b1..a583b97c4 100644 --- a/Xeon/centos-7/service/owt-dev/Dockerfile +++ b/Xeon/centos-7/service/owt-dev/Dockerfile @@ -301,7 +301,7 @@ RUN cd /opt/build/FFmpeg-n4.4 && \ RUN cd /opt/build/FFmpeg-n4.4 && \ ./configure --prefix=/usr/local --libdir=/usr/local/lib64 --enable-shared --disable-static --disable-doc --disable-htmlpages \ --disable-manpages --disable-podpages --disable-txtpages \ - --extra-cflags=-w --enable-libass --disable-xlib --disable-sdl2 --enable-vaapi --enable-libfdk-aac --enable-libvpx --enable-gpl --enable-libx264 --enable-libsvthevc && make -j$(nproc) && \ + --extra-cflags=-w --enable-nonfree --enable-libass --disable-xlib --disable-sdl2 --enable-vaapi --enable-libfdk-aac --enable-libvpx --enable-gpl --enable-libx264 --enable-libsvthevc && make -j$(nproc) && \ make install DESTDIR=/opt/dist && \ make install diff --git a/Xeon/centos-7/service/owt/Dockerfile b/Xeon/centos-7/service/owt/Dockerfile index 99ba73887..65eaf65e8 100644 --- a/Xeon/centos-7/service/owt/Dockerfile +++ b/Xeon/centos-7/service/owt/Dockerfile @@ -302,7 +302,7 @@ RUN cd /opt/build/FFmpeg-n4.4 && \ RUN cd /opt/build/FFmpeg-n4.4 && \ ./configure --prefix=/usr/local --libdir=/usr/local/lib64 --enable-shared --disable-static --disable-doc --disable-htmlpages \ --disable-manpages --disable-podpages --disable-txtpages \ - --extra-cflags=-w --enable-libass --disable-xlib --disable-sdl2 --enable-vaapi --enable-libfdk-aac --enable-libvpx --enable-gpl --enable-libx264 --enable-libsvthevc && make -j$(nproc) && \ + --extra-cflags=-w --enable-nonfree --enable-libass --disable-xlib --disable-sdl2 --enable-vaapi --enable-libfdk-aac --enable-libvpx --enable-gpl --enable-libx264 --enable-libsvthevc && make -j$(nproc) && \ make install DESTDIR=/opt/dist && \ make install diff --git a/Xeon/centos-7/service/owt360/Dockerfile b/Xeon/centos-7/service/owt360/Dockerfile index d1441e4db..978f49662 100644 --- a/Xeon/centos-7/service/owt360/Dockerfile +++ b/Xeon/centos-7/service/owt360/Dockerfile @@ -285,7 +285,7 @@ RUN cd /opt/build/FFmpeg-n4.4 && \ RUN cd /opt/build/FFmpeg-n4.4 && \ ./configure --prefix=/usr/local --libdir=/usr/local/lib64 --enable-shared --disable-static --disable-doc --disable-htmlpages \ --disable-manpages --disable-podpages --disable-txtpages \ - --extra-cflags=-w --enable-libass --disable-xlib --disable-sdl2 --disable-hwaccels --disable-vaapi --enable-libfdk-aac --enable-libvpx --enable-gpl --enable-libx264 --enable-libsvthevc && make -j$(nproc) && \ + --extra-cflags=-w --enable-nonfree --enable-libass --disable-xlib --disable-sdl2 --disable-hwaccels --disable-vaapi --enable-libfdk-aac --enable-libvpx --enable-gpl --enable-libx264 --enable-libsvthevc && make -j$(nproc) && \ make install DESTDIR=/opt/dist && \ make install diff --git a/Xeon/ubuntu-18.04/analytics/dev/Dockerfile b/Xeon/ubuntu-18.04/analytics/dev/Dockerfile index de2212c7b..ccb18ec13 100644 --- a/Xeon/ubuntu-18.04/analytics/dev/Dockerfile +++ b/Xeon/ubuntu-18.04/analytics/dev/Dockerfile @@ -566,7 +566,7 @@ RUN cd /opt/build/FFmpeg-n4.4 && \ RUN cd /opt/build/FFmpeg-n4.4 && \ ./configure --prefix=/usr/local --libdir=/usr/local/lib --enable-shared --disable-static --disable-doc --disable-htmlpages \ --disable-manpages --disable-podpages --disable-txtpages \ - --extra-cflags=-w --enable-libass --enable-libfreetype --disable-xlib --disable-sdl2 --disable-hwaccels --disable-vaapi --enable-libv4l2 --enable-indev=v4l2 --enable-openssl --extra-ldflags=-Wl,-rpath=/usr/local/ssl/lib --enable-libfdk-aac --enable-libopus --enable-libvpx --enable-libvorbis --enable-libsvtav1 --enable-libsvthevc --enable-libaom --enable-libdav1d && make -j$(nproc) && \ + --extra-cflags=-w --enable-nonfree --enable-libass --enable-libfreetype --disable-xlib --disable-sdl2 --disable-hwaccels --disable-vaapi --enable-libv4l2 --enable-indev=v4l2 --enable-openssl --extra-ldflags=-Wl,-rpath=/usr/local/ssl/lib --enable-libfdk-aac --enable-libopus --enable-libvpx --enable-libvorbis --enable-libsvtav1 --enable-libsvthevc --enable-libaom --enable-libdav1d && make -j$(nproc) && \ make install DESTDIR=/opt/dist && \ make install diff --git a/Xeon/ubuntu-18.04/analytics/ffmpeg/Dockerfile b/Xeon/ubuntu-18.04/analytics/ffmpeg/Dockerfile index 293367e71..13cb9082d 100644 --- a/Xeon/ubuntu-18.04/analytics/ffmpeg/Dockerfile +++ b/Xeon/ubuntu-18.04/analytics/ffmpeg/Dockerfile @@ -439,7 +439,7 @@ RUN cd /opt/build/FFmpeg-n4.4 && \ RUN cd /opt/build/FFmpeg-n4.4 && \ ./configure --prefix=/usr/local --libdir=/usr/local/lib --enable-shared --disable-static --disable-doc --disable-htmlpages \ --disable-manpages --disable-podpages --disable-txtpages \ - --extra-cflags=-w --enable-libass --enable-libfreetype --disable-xlib --disable-sdl2 --disable-hwaccels --disable-vaapi --enable-libv4l2 --enable-indev=v4l2 --enable-libfdk-aac --enable-libopus --enable-libvpx --enable-libvorbis --enable-gpl --enable-libx264 --enable-gpl --enable-libx265 --enable-libsvtav1 --enable-libsvthevc --enable-libdav1d && make -j$(nproc) && \ + --extra-cflags=-w --enable-nonfree --enable-libass --enable-libfreetype --disable-xlib --disable-sdl2 --disable-hwaccels --disable-vaapi --enable-libv4l2 --enable-indev=v4l2 --enable-libfdk-aac --enable-libopus --enable-libvpx --enable-libvorbis --enable-gpl --enable-libx264 --enable-gpl --enable-libx265 --enable-libsvtav1 --enable-libsvthevc --enable-libdav1d && make -j$(nproc) && \ make install DESTDIR=/opt/dist && \ make install diff --git a/Xeon/ubuntu-18.04/analytics/gst/Dockerfile b/Xeon/ubuntu-18.04/analytics/gst/Dockerfile index d50d75cf4..1e5e79cf4 100644 --- a/Xeon/ubuntu-18.04/analytics/gst/Dockerfile +++ b/Xeon/ubuntu-18.04/analytics/gst/Dockerfile @@ -579,7 +579,7 @@ RUN cd /opt/build/FFmpeg-n4.4 && \ RUN cd /opt/build/FFmpeg-n4.4 && \ ./configure --prefix=/usr/local --libdir=/usr/local/lib --enable-shared --disable-static --disable-doc --disable-htmlpages \ --disable-manpages --disable-podpages --disable-txtpages \ - --extra-cflags=-w --enable-libass --enable-libfreetype --disable-xlib --disable-sdl2 --disable-hwaccels --disable-vaapi --enable-libv4l2 --enable-indev=v4l2 --enable-libfdk-aac --enable-libopus --enable-libvpx --enable-libvorbis --enable-gpl --enable-libx264 --enable-gpl --enable-libx265 --enable-libsvtav1 --enable-libsvthevc --enable-libaom --enable-libdav1d && make -j$(nproc) && \ + --extra-cflags=-w --enable-nonfree --enable-libass --enable-libfreetype --disable-xlib --disable-sdl2 --disable-hwaccels --disable-vaapi --enable-libv4l2 --enable-indev=v4l2 --enable-libfdk-aac --enable-libopus --enable-libvpx --enable-libvorbis --enable-gpl --enable-libx264 --enable-gpl --enable-libx265 --enable-libsvtav1 --enable-libsvthevc --enable-libaom --enable-libdav1d && make -j$(nproc) && \ make install DESTDIR=/opt/dist && \ make install diff --git a/Xeon/ubuntu-18.04/media/dev/Dockerfile b/Xeon/ubuntu-18.04/media/dev/Dockerfile index 4138907b7..fc49d24fc 100644 --- a/Xeon/ubuntu-18.04/media/dev/Dockerfile +++ b/Xeon/ubuntu-18.04/media/dev/Dockerfile @@ -408,7 +408,7 @@ RUN cd /opt/build/FFmpeg-n4.4 && \ RUN cd /opt/build/FFmpeg-n4.4 && \ ./configure --prefix=/usr/local --libdir=/usr/local/lib --enable-shared --disable-static --disable-doc --disable-htmlpages \ --disable-manpages --disable-podpages --disable-txtpages \ - --extra-cflags=-w --enable-libass --enable-libfreetype --disable-xlib --disable-sdl2 --disable-hwaccels --disable-vaapi --enable-libv4l2 --enable-indev=v4l2 --enable-openssl --extra-ldflags=-Wl,-rpath=/usr/local/ssl/lib --enable-libfdk-aac --enable-libopus --enable-libvpx --enable-libvorbis --enable-libsvtav1 --enable-libsvthevc --enable-libaom --enable-libdav1d && make -j$(nproc) && \ + --extra-cflags=-w --enable-nonfree --enable-libass --enable-libfreetype --disable-xlib --disable-sdl2 --disable-hwaccels --disable-vaapi --enable-libv4l2 --enable-indev=v4l2 --enable-openssl --extra-ldflags=-Wl,-rpath=/usr/local/ssl/lib --enable-libfdk-aac --enable-libopus --enable-libvpx --enable-libvorbis --enable-libsvtav1 --enable-libsvthevc --enable-libaom --enable-libdav1d && make -j$(nproc) && \ make install DESTDIR=/opt/dist && \ make install diff --git a/Xeon/ubuntu-18.04/media/ffmpeg-vmaf/Dockerfile b/Xeon/ubuntu-18.04/media/ffmpeg-vmaf/Dockerfile index 76334928a..06423f1fa 100644 --- a/Xeon/ubuntu-18.04/media/ffmpeg-vmaf/Dockerfile +++ b/Xeon/ubuntu-18.04/media/ffmpeg-vmaf/Dockerfile @@ -323,7 +323,7 @@ RUN cd /opt/build/FFmpeg-n4.4 && \ RUN cd /opt/build/FFmpeg-n4.4 && \ ./configure --prefix=/usr/local --libdir=/usr/local/lib --enable-shared --disable-static --disable-doc --disable-htmlpages \ --disable-manpages --disable-podpages --disable-txtpages \ - --extra-cflags=-w --enable-libass --enable-libfreetype --disable-xlib --disable-sdl2 --disable-hwaccels --disable-vaapi --enable-libv4l2 --enable-indev=v4l2 --enable-libfdk-aac --enable-libopus --enable-libvpx --enable-libvorbis --enable-gpl --enable-libx264 --enable-gpl --enable-libx265 --enable-libsvtav1 --enable-libsvthevc --enable-libvmaf --enable-version3 --enable-libdav1d && make -j$(nproc) && \ + --extra-cflags=-w --enable-nonfree --enable-libass --enable-libfreetype --disable-xlib --disable-sdl2 --disable-hwaccels --disable-vaapi --enable-libv4l2 --enable-indev=v4l2 --enable-libfdk-aac --enable-libopus --enable-libvpx --enable-libvorbis --enable-gpl --enable-libx264 --enable-gpl --enable-libx265 --enable-libsvtav1 --enable-libsvthevc --enable-libvmaf --enable-version3 --enable-libdav1d && make -j$(nproc) && \ make install DESTDIR=/opt/dist && \ make install diff --git a/Xeon/ubuntu-18.04/media/ffmpeg/Dockerfile b/Xeon/ubuntu-18.04/media/ffmpeg/Dockerfile index 53cf06062..4ec65c3d1 100644 --- a/Xeon/ubuntu-18.04/media/ffmpeg/Dockerfile +++ b/Xeon/ubuntu-18.04/media/ffmpeg/Dockerfile @@ -306,7 +306,7 @@ RUN cd /opt/build/FFmpeg-n4.4 && \ RUN cd /opt/build/FFmpeg-n4.4 && \ ./configure --prefix=/usr/local --libdir=/usr/local/lib --enable-shared --disable-static --disable-doc --disable-htmlpages \ --disable-manpages --disable-podpages --disable-txtpages \ - --extra-cflags=-w --enable-libass --enable-libfreetype --disable-xlib --disable-sdl2 --disable-hwaccels --disable-vaapi --enable-libv4l2 --enable-indev=v4l2 --enable-libfdk-aac --enable-libopus --enable-libvpx --enable-libvorbis --enable-gpl --enable-libx264 --enable-gpl --enable-libx265 --enable-libsvtav1 --enable-libsvthevc --enable-libdav1d && make -j$(nproc) && \ + --extra-cflags=-w --enable-nonfree --enable-libass --enable-libfreetype --disable-xlib --disable-sdl2 --disable-hwaccels --disable-vaapi --enable-libv4l2 --enable-indev=v4l2 --enable-libfdk-aac --enable-libopus --enable-libvpx --enable-libvorbis --enable-gpl --enable-libx264 --enable-gpl --enable-libx265 --enable-libsvtav1 --enable-libsvthevc --enable-libdav1d && make -j$(nproc) && \ make install DESTDIR=/opt/dist && \ make install diff --git a/Xeon/ubuntu-18.04/media/gst/Dockerfile b/Xeon/ubuntu-18.04/media/gst/Dockerfile index bd52e1358..3123c963b 100644 --- a/Xeon/ubuntu-18.04/media/gst/Dockerfile +++ b/Xeon/ubuntu-18.04/media/gst/Dockerfile @@ -421,7 +421,7 @@ RUN cd /opt/build/FFmpeg-n4.4 && \ RUN cd /opt/build/FFmpeg-n4.4 && \ ./configure --prefix=/usr/local --libdir=/usr/local/lib --enable-shared --disable-static --disable-doc --disable-htmlpages \ --disable-manpages --disable-podpages --disable-txtpages \ - --extra-cflags=-w --enable-libass --enable-libfreetype --disable-xlib --disable-sdl2 --disable-hwaccels --disable-vaapi --enable-libv4l2 --enable-indev=v4l2 --enable-libfdk-aac --enable-libopus --enable-libvpx --enable-libvorbis --enable-gpl --enable-libx264 --enable-gpl --enable-libx265 --enable-libsvtav1 --enable-libsvthevc --enable-libaom --enable-libdav1d && make -j$(nproc) && \ + --extra-cflags=-w --enable-nonfree --enable-libass --enable-libfreetype --disable-xlib --disable-sdl2 --disable-hwaccels --disable-vaapi --enable-libv4l2 --enable-indev=v4l2 --enable-libfdk-aac --enable-libopus --enable-libvpx --enable-libvorbis --enable-gpl --enable-libx264 --enable-gpl --enable-libx265 --enable-libsvtav1 --enable-libsvthevc --enable-libaom --enable-libdav1d && make -j$(nproc) && \ make install DESTDIR=/opt/dist && \ make install diff --git a/Xeon/ubuntu-18.04/service/owt-dev/Dockerfile b/Xeon/ubuntu-18.04/service/owt-dev/Dockerfile index e155fbe21..5a59bc9e9 100644 --- a/Xeon/ubuntu-18.04/service/owt-dev/Dockerfile +++ b/Xeon/ubuntu-18.04/service/owt-dev/Dockerfile @@ -313,7 +313,7 @@ RUN cd /opt/build/FFmpeg-n4.4 && \ RUN cd /opt/build/FFmpeg-n4.4 && \ ./configure --prefix=/usr/local --libdir=/usr/local/lib --enable-shared --disable-static --disable-doc --disable-htmlpages \ --disable-manpages --disable-podpages --disable-txtpages \ - --extra-cflags=-w --enable-libass --disable-xlib --disable-sdl2 --disable-hwaccels --disable-vaapi --enable-libfdk-aac --enable-libvpx --enable-gpl --enable-libx264 --enable-libsvthevc && make -j$(nproc) && \ + --extra-cflags=-w --enable-nonfree --enable-libass --disable-xlib --disable-sdl2 --disable-hwaccels --disable-vaapi --enable-libfdk-aac --enable-libvpx --enable-gpl --enable-libx264 --enable-libsvthevc && make -j$(nproc) && \ make install DESTDIR=/opt/dist && \ make install diff --git a/Xeon/ubuntu-18.04/service/owt/Dockerfile b/Xeon/ubuntu-18.04/service/owt/Dockerfile index 0d96d1e00..2376e98b8 100644 --- a/Xeon/ubuntu-18.04/service/owt/Dockerfile +++ b/Xeon/ubuntu-18.04/service/owt/Dockerfile @@ -313,7 +313,7 @@ RUN cd /opt/build/FFmpeg-n4.4 && \ RUN cd /opt/build/FFmpeg-n4.4 && \ ./configure --prefix=/usr/local --libdir=/usr/local/lib --enable-shared --disable-static --disable-doc --disable-htmlpages \ --disable-manpages --disable-podpages --disable-txtpages \ - --extra-cflags=-w --enable-libass --disable-xlib --disable-sdl2 --disable-hwaccels --disable-vaapi --enable-libfdk-aac --enable-libvpx --enable-gpl --enable-libx264 --enable-libsvthevc && make -j$(nproc) && \ + --extra-cflags=-w --enable-nonfree --enable-libass --disable-xlib --disable-sdl2 --disable-hwaccels --disable-vaapi --enable-libfdk-aac --enable-libvpx --enable-gpl --enable-libx264 --enable-libsvthevc && make -j$(nproc) && \ make install DESTDIR=/opt/dist && \ make install diff --git a/Xeon/ubuntu-18.04/service/owt360/Dockerfile b/Xeon/ubuntu-18.04/service/owt360/Dockerfile index cf07ba31b..24d4e69e9 100644 --- a/Xeon/ubuntu-18.04/service/owt360/Dockerfile +++ b/Xeon/ubuntu-18.04/service/owt360/Dockerfile @@ -314,7 +314,7 @@ RUN cd /opt/build/FFmpeg-n4.4 && \ RUN cd /opt/build/FFmpeg-n4.4 && \ ./configure --prefix=/usr/local --libdir=/usr/local/lib --enable-shared --disable-static --disable-doc --disable-htmlpages \ --disable-manpages --disable-podpages --disable-txtpages \ - --extra-cflags=-w --enable-libass --disable-xlib --disable-sdl2 --disable-hwaccels --disable-vaapi --enable-libfdk-aac --enable-libvpx --enable-gpl --enable-libx264 --enable-libsvthevc && make -j$(nproc) && \ + --extra-cflags=-w --enable-nonfree --enable-libass --disable-xlib --disable-sdl2 --disable-hwaccels --disable-vaapi --enable-libfdk-aac --enable-libvpx --enable-gpl --enable-libx264 --enable-libsvthevc && make -j$(nproc) && \ make install DESTDIR=/opt/dist && \ make install diff --git a/Xeon/ubuntu-20.04/analytics/dev/Dockerfile b/Xeon/ubuntu-20.04/analytics/dev/Dockerfile index 2c9abc1a3..7a9eec679 100644 --- a/Xeon/ubuntu-20.04/analytics/dev/Dockerfile +++ b/Xeon/ubuntu-20.04/analytics/dev/Dockerfile @@ -552,7 +552,7 @@ RUN cd /opt/build/FFmpeg-n4.4 && \ RUN cd /opt/build/FFmpeg-n4.4 && \ ./configure --prefix=/usr/local --libdir=/usr/local/lib --enable-shared --disable-static --disable-doc --disable-htmlpages \ --disable-manpages --disable-podpages --disable-txtpages \ - --extra-cflags=-w --enable-libass --enable-libfreetype --disable-xlib --disable-sdl2 --disable-hwaccels --disable-vaapi --enable-libv4l2 --enable-indev=v4l2 --enable-openssl --extra-ldflags=-Wl,-rpath=/usr/local/ssl/lib --enable-libfdk-aac --enable-libopus --enable-libvpx --enable-libvorbis --enable-libsvtav1 --enable-libsvthevc --enable-libaom --enable-libdav1d && make -j$(nproc) && \ + --extra-cflags=-w --enable-nonfree --enable-libass --enable-libfreetype --disable-xlib --disable-sdl2 --disable-hwaccels --disable-vaapi --enable-libv4l2 --enable-indev=v4l2 --enable-openssl --extra-ldflags=-Wl,-rpath=/usr/local/ssl/lib --enable-libfdk-aac --enable-libopus --enable-libvpx --enable-libvorbis --enable-libsvtav1 --enable-libsvthevc --enable-libaom --enable-libdav1d && make -j$(nproc) && \ make install DESTDIR=/opt/dist && \ make install diff --git a/Xeon/ubuntu-20.04/analytics/ffmpeg/Dockerfile b/Xeon/ubuntu-20.04/analytics/ffmpeg/Dockerfile index f138d3dcd..97ad549ff 100644 --- a/Xeon/ubuntu-20.04/analytics/ffmpeg/Dockerfile +++ b/Xeon/ubuntu-20.04/analytics/ffmpeg/Dockerfile @@ -413,7 +413,7 @@ RUN cd /opt/build/FFmpeg-n4.4 && \ RUN cd /opt/build/FFmpeg-n4.4 && \ ./configure --prefix=/usr/local --libdir=/usr/local/lib --enable-shared --disable-static --disable-doc --disable-htmlpages \ --disable-manpages --disable-podpages --disable-txtpages \ - --extra-cflags=-w --enable-libass --enable-libfreetype --disable-xlib --disable-sdl2 --disable-hwaccels --disable-vaapi --enable-libv4l2 --enable-indev=v4l2 --enable-libfdk-aac --enable-libopus --enable-libvpx --enable-libvorbis --enable-gpl --enable-libx264 --enable-gpl --enable-libx265 --enable-libsvtav1 --enable-libsvthevc --enable-libdav1d && make -j$(nproc) && \ + --extra-cflags=-w --enable-nonfree --enable-libass --enable-libfreetype --disable-xlib --disable-sdl2 --disable-hwaccels --disable-vaapi --enable-libv4l2 --enable-indev=v4l2 --enable-libfdk-aac --enable-libopus --enable-libvpx --enable-libvorbis --enable-gpl --enable-libx264 --enable-gpl --enable-libx265 --enable-libsvtav1 --enable-libsvthevc --enable-libdav1d && make -j$(nproc) && \ make install DESTDIR=/opt/dist && \ make install diff --git a/Xeon/ubuntu-20.04/analytics/gst/Dockerfile b/Xeon/ubuntu-20.04/analytics/gst/Dockerfile index b224e3ad5..dbb72174d 100644 --- a/Xeon/ubuntu-20.04/analytics/gst/Dockerfile +++ b/Xeon/ubuntu-20.04/analytics/gst/Dockerfile @@ -565,7 +565,7 @@ RUN cd /opt/build/FFmpeg-n4.4 && \ RUN cd /opt/build/FFmpeg-n4.4 && \ ./configure --prefix=/usr/local --libdir=/usr/local/lib --enable-shared --disable-static --disable-doc --disable-htmlpages \ --disable-manpages --disable-podpages --disable-txtpages \ - --extra-cflags=-w --enable-libass --enable-libfreetype --disable-xlib --disable-sdl2 --disable-hwaccels --disable-vaapi --enable-libv4l2 --enable-indev=v4l2 --enable-libfdk-aac --enable-libopus --enable-libvpx --enable-libvorbis --enable-gpl --enable-libx264 --enable-gpl --enable-libx265 --enable-libsvtav1 --enable-libsvthevc --enable-libaom --enable-libdav1d && make -j$(nproc) && \ + --extra-cflags=-w --enable-nonfree --enable-libass --enable-libfreetype --disable-xlib --disable-sdl2 --disable-hwaccels --disable-vaapi --enable-libv4l2 --enable-indev=v4l2 --enable-libfdk-aac --enable-libopus --enable-libvpx --enable-libvorbis --enable-gpl --enable-libx264 --enable-gpl --enable-libx265 --enable-libsvtav1 --enable-libsvthevc --enable-libaom --enable-libdav1d && make -j$(nproc) && \ make install DESTDIR=/opt/dist && \ make install diff --git a/Xeon/ubuntu-20.04/media/dev/Dockerfile b/Xeon/ubuntu-20.04/media/dev/Dockerfile index 627f5a49b..0bf1bae98 100644 --- a/Xeon/ubuntu-20.04/media/dev/Dockerfile +++ b/Xeon/ubuntu-20.04/media/dev/Dockerfile @@ -408,7 +408,7 @@ RUN cd /opt/build/FFmpeg-n4.4 && \ RUN cd /opt/build/FFmpeg-n4.4 && \ ./configure --prefix=/usr/local --libdir=/usr/local/lib --enable-shared --disable-static --disable-doc --disable-htmlpages \ --disable-manpages --disable-podpages --disable-txtpages \ - --extra-cflags=-w --enable-libass --enable-libfreetype --disable-xlib --disable-sdl2 --disable-hwaccels --disable-vaapi --enable-libv4l2 --enable-indev=v4l2 --enable-openssl --extra-ldflags=-Wl,-rpath=/usr/local/ssl/lib --enable-libfdk-aac --enable-libopus --enable-libvpx --enable-libvorbis --enable-libsvtav1 --enable-libsvthevc --enable-libaom --enable-libdav1d && make -j$(nproc) && \ + --extra-cflags=-w --enable-nonfree --enable-libass --enable-libfreetype --disable-xlib --disable-sdl2 --disable-hwaccels --disable-vaapi --enable-libv4l2 --enable-indev=v4l2 --enable-openssl --extra-ldflags=-Wl,-rpath=/usr/local/ssl/lib --enable-libfdk-aac --enable-libopus --enable-libvpx --enable-libvorbis --enable-libsvtav1 --enable-libsvthevc --enable-libaom --enable-libdav1d && make -j$(nproc) && \ make install DESTDIR=/opt/dist && \ make install diff --git a/Xeon/ubuntu-20.04/media/ffmpeg/Dockerfile b/Xeon/ubuntu-20.04/media/ffmpeg/Dockerfile index 5264c86b5..9546ed6ac 100644 --- a/Xeon/ubuntu-20.04/media/ffmpeg/Dockerfile +++ b/Xeon/ubuntu-20.04/media/ffmpeg/Dockerfile @@ -294,7 +294,7 @@ RUN cd /opt/build/FFmpeg-n4.4 && \ RUN cd /opt/build/FFmpeg-n4.4 && \ ./configure --prefix=/usr/local --libdir=/usr/local/lib --enable-shared --disable-static --disable-doc --disable-htmlpages \ --disable-manpages --disable-podpages --disable-txtpages \ - --extra-cflags=-w --enable-libass --enable-libfreetype --disable-xlib --disable-sdl2 --disable-hwaccels --disable-vaapi --enable-libv4l2 --enable-indev=v4l2 --enable-libfdk-aac --enable-libopus --enable-libvpx --enable-libvorbis --enable-gpl --enable-libx264 --enable-gpl --enable-libx265 --enable-libsvtav1 --enable-libsvthevc --enable-libdav1d && make -j$(nproc) && \ + --extra-cflags=-w --enable-nonfree --enable-libass --enable-libfreetype --disable-xlib --disable-sdl2 --disable-hwaccels --disable-vaapi --enable-libv4l2 --enable-indev=v4l2 --enable-libfdk-aac --enable-libopus --enable-libvpx --enable-libvorbis --enable-gpl --enable-libx264 --enable-gpl --enable-libx265 --enable-libsvtav1 --enable-libsvthevc --enable-libdav1d && make -j$(nproc) && \ make install DESTDIR=/opt/dist && \ make install diff --git a/Xeon/ubuntu-20.04/media/gst/Dockerfile b/Xeon/ubuntu-20.04/media/gst/Dockerfile index 5ff32355a..d73dc6c7b 100644 --- a/Xeon/ubuntu-20.04/media/gst/Dockerfile +++ b/Xeon/ubuntu-20.04/media/gst/Dockerfile @@ -421,7 +421,7 @@ RUN cd /opt/build/FFmpeg-n4.4 && \ RUN cd /opt/build/FFmpeg-n4.4 && \ ./configure --prefix=/usr/local --libdir=/usr/local/lib --enable-shared --disable-static --disable-doc --disable-htmlpages \ --disable-manpages --disable-podpages --disable-txtpages \ - --extra-cflags=-w --enable-libass --enable-libfreetype --disable-xlib --disable-sdl2 --disable-hwaccels --disable-vaapi --enable-libv4l2 --enable-indev=v4l2 --enable-libfdk-aac --enable-libopus --enable-libvpx --enable-libvorbis --enable-gpl --enable-libx264 --enable-gpl --enable-libx265 --enable-libsvtav1 --enable-libsvthevc --enable-libaom --enable-libdav1d && make -j$(nproc) && \ + --extra-cflags=-w --enable-nonfree --enable-libass --enable-libfreetype --disable-xlib --disable-sdl2 --disable-hwaccels --disable-vaapi --enable-libv4l2 --enable-indev=v4l2 --enable-libfdk-aac --enable-libopus --enable-libvpx --enable-libvorbis --enable-gpl --enable-libx264 --enable-gpl --enable-libx265 --enable-libsvtav1 --enable-libsvthevc --enable-libaom --enable-libdav1d && make -j$(nproc) && \ make install DESTDIR=/opt/dist && \ make install diff --git a/XeonE3/centos-7/analytics/dev/Dockerfile b/XeonE3/centos-7/analytics/dev/Dockerfile index 0b075e6d5..4b69c74cd 100644 --- a/XeonE3/centos-7/analytics/dev/Dockerfile +++ b/XeonE3/centos-7/analytics/dev/Dockerfile @@ -549,7 +549,7 @@ RUN cd /opt/build/FFmpeg-n4.4 && \ RUN cd /opt/build/FFmpeg-n4.4 && \ ./configure --prefix=/usr/local --libdir=/usr/local/lib64 --enable-shared --disable-static --disable-doc --disable-htmlpages \ --disable-manpages --disable-podpages --disable-txtpages \ - --extra-cflags=-w --enable-libass --enable-libfreetype --disable-xlib --disable-sdl2 --enable-libmfx --enable-vaapi --enable-libv4l2 --enable-indev=v4l2 --enable-openssl --extra-ldflags=-Wl,-rpath=/usr/local/ssl/lib --enable-libfdk-aac --enable-libopus --enable-libvpx --enable-libvorbis --enable-libsvtav1 --enable-libsvthevc --enable-libaom --enable-libdav1d && make -j$(nproc) && \ + --extra-cflags=-w --enable-nonfree --enable-libass --enable-libfreetype --disable-xlib --disable-sdl2 --enable-libmfx --enable-vaapi --enable-libv4l2 --enable-indev=v4l2 --enable-openssl --extra-ldflags=-Wl,-rpath=/usr/local/ssl/lib --enable-libfdk-aac --enable-libopus --enable-libvpx --enable-libvorbis --enable-libsvtav1 --enable-libsvthevc --enable-libaom --enable-libdav1d && make -j$(nproc) && \ make install DESTDIR=/opt/dist && \ make install diff --git a/XeonE3/centos-7/analytics/ffmpeg/Dockerfile b/XeonE3/centos-7/analytics/ffmpeg/Dockerfile index 3d3275878..e99e4c47e 100644 --- a/XeonE3/centos-7/analytics/ffmpeg/Dockerfile +++ b/XeonE3/centos-7/analytics/ffmpeg/Dockerfile @@ -445,7 +445,7 @@ RUN cd /opt/build/FFmpeg-n4.4 && \ RUN cd /opt/build/FFmpeg-n4.4 && \ ./configure --prefix=/usr/local --libdir=/usr/local/lib64 --enable-shared --disable-static --disable-doc --disable-htmlpages \ --disable-manpages --disable-podpages --disable-txtpages \ - --extra-cflags=-w --enable-libass --enable-libfreetype --disable-xlib --disable-sdl2 --enable-libmfx --enable-vaapi --enable-libv4l2 --enable-indev=v4l2 --enable-libfdk-aac --enable-libopus --enable-libvpx --enable-libvorbis --enable-gpl --enable-libx264 --enable-gpl --enable-libx265 --enable-libsvtav1 --enable-libsvthevc --enable-libdav1d && make -j$(nproc) && \ + --extra-cflags=-w --enable-nonfree --enable-libass --enable-libfreetype --disable-xlib --disable-sdl2 --enable-libmfx --enable-vaapi --enable-libv4l2 --enable-indev=v4l2 --enable-libfdk-aac --enable-libopus --enable-libvpx --enable-libvorbis --enable-gpl --enable-libx264 --enable-gpl --enable-libx265 --enable-libsvtav1 --enable-libsvthevc --enable-libdav1d && make -j$(nproc) && \ make install DESTDIR=/opt/dist && \ make install diff --git a/XeonE3/centos-7/analytics/gst/Dockerfile b/XeonE3/centos-7/analytics/gst/Dockerfile index 288bcfb33..ff55b5a48 100644 --- a/XeonE3/centos-7/analytics/gst/Dockerfile +++ b/XeonE3/centos-7/analytics/gst/Dockerfile @@ -541,7 +541,7 @@ RUN cd /opt/build/FFmpeg-n4.4 && \ RUN cd /opt/build/FFmpeg-n4.4 && \ ./configure --prefix=/usr/local --libdir=/usr/local/lib64 --enable-shared --disable-static --disable-doc --disable-htmlpages \ --disable-manpages --disable-podpages --disable-txtpages \ - --extra-cflags=-w --enable-libass --enable-libfreetype --disable-xlib --disable-sdl2 --enable-vaapi --enable-libv4l2 --enable-indev=v4l2 --enable-libfdk-aac --enable-libopus --enable-libvpx --enable-libvorbis --enable-gpl --enable-libx264 --enable-gpl --enable-libx265 --enable-libsvtav1 --enable-libsvthevc --enable-libaom --enable-libdav1d && make -j$(nproc) && \ + --extra-cflags=-w --enable-nonfree --enable-libass --enable-libfreetype --disable-xlib --disable-sdl2 --enable-vaapi --enable-libv4l2 --enable-indev=v4l2 --enable-libfdk-aac --enable-libopus --enable-libvpx --enable-libvorbis --enable-gpl --enable-libx264 --enable-gpl --enable-libx265 --enable-libsvtav1 --enable-libsvthevc --enable-libaom --enable-libdav1d && make -j$(nproc) && \ make install DESTDIR=/opt/dist && \ make install diff --git a/XeonE3/centos-7/media/dev/Dockerfile b/XeonE3/centos-7/media/dev/Dockerfile index c96ce216e..602b187a2 100644 --- a/XeonE3/centos-7/media/dev/Dockerfile +++ b/XeonE3/centos-7/media/dev/Dockerfile @@ -415,7 +415,7 @@ RUN cd /opt/build/FFmpeg-n4.4 && \ RUN cd /opt/build/FFmpeg-n4.4 && \ ./configure --prefix=/usr/local --libdir=/usr/local/lib64 --enable-shared --disable-static --disable-doc --disable-htmlpages \ --disable-manpages --disable-podpages --disable-txtpages \ - --extra-cflags=-w --enable-libass --enable-libfreetype --disable-xlib --disable-sdl2 --enable-libmfx --enable-vaapi --enable-libv4l2 --enable-indev=v4l2 --enable-openssl --extra-ldflags=-Wl,-rpath=/usr/local/ssl/lib --enable-libfdk-aac --enable-libopus --enable-libvpx --enable-libvorbis --enable-libsvtav1 --enable-libsvthevc --enable-libaom --enable-libdav1d && make -j$(nproc) && \ + --extra-cflags=-w --enable-nonfree --enable-libass --enable-libfreetype --disable-xlib --disable-sdl2 --enable-libmfx --enable-vaapi --enable-libv4l2 --enable-indev=v4l2 --enable-openssl --extra-ldflags=-Wl,-rpath=/usr/local/ssl/lib --enable-libfdk-aac --enable-libopus --enable-libvpx --enable-libvorbis --enable-libsvtav1 --enable-libsvthevc --enable-libaom --enable-libdav1d && make -j$(nproc) && \ make install DESTDIR=/opt/dist && \ make install diff --git a/XeonE3/centos-7/media/ffmpeg/Dockerfile b/XeonE3/centos-7/media/ffmpeg/Dockerfile index 5aa310067..228c94ab9 100644 --- a/XeonE3/centos-7/media/ffmpeg/Dockerfile +++ b/XeonE3/centos-7/media/ffmpeg/Dockerfile @@ -322,7 +322,7 @@ RUN cd /opt/build/FFmpeg-n4.4 && \ RUN cd /opt/build/FFmpeg-n4.4 && \ ./configure --prefix=/usr/local --libdir=/usr/local/lib64 --enable-shared --disable-static --disable-doc --disable-htmlpages \ --disable-manpages --disable-podpages --disable-txtpages \ - --extra-cflags=-w --enable-libass --enable-libfreetype --disable-xlib --disable-sdl2 --enable-libmfx --enable-vaapi --enable-libv4l2 --enable-indev=v4l2 --enable-libfdk-aac --enable-libopus --enable-libvpx --enable-libvorbis --enable-gpl --enable-libx264 --enable-gpl --enable-libx265 --enable-libsvtav1 --enable-libsvthevc --enable-libdav1d && make -j$(nproc) && \ + --extra-cflags=-w --enable-nonfree --enable-libass --enable-libfreetype --disable-xlib --disable-sdl2 --enable-libmfx --enable-vaapi --enable-libv4l2 --enable-indev=v4l2 --enable-libfdk-aac --enable-libopus --enable-libvpx --enable-libvorbis --enable-gpl --enable-libx264 --enable-gpl --enable-libx265 --enable-libsvtav1 --enable-libsvthevc --enable-libdav1d && make -j$(nproc) && \ make install DESTDIR=/opt/dist && \ make install diff --git a/XeonE3/centos-7/media/gst/Dockerfile b/XeonE3/centos-7/media/gst/Dockerfile index 4d7a7dd11..6bf95ba2f 100644 --- a/XeonE3/centos-7/media/gst/Dockerfile +++ b/XeonE3/centos-7/media/gst/Dockerfile @@ -407,7 +407,7 @@ RUN cd /opt/build/FFmpeg-n4.4 && \ RUN cd /opt/build/FFmpeg-n4.4 && \ ./configure --prefix=/usr/local --libdir=/usr/local/lib64 --enable-shared --disable-static --disable-doc --disable-htmlpages \ --disable-manpages --disable-podpages --disable-txtpages \ - --extra-cflags=-w --enable-libass --enable-libfreetype --disable-xlib --disable-sdl2 --enable-vaapi --enable-libv4l2 --enable-indev=v4l2 --enable-libfdk-aac --enable-libopus --enable-libvpx --enable-libvorbis --enable-gpl --enable-libx264 --enable-gpl --enable-libx265 --enable-libsvtav1 --enable-libsvthevc --enable-libaom --enable-libdav1d && make -j$(nproc) && \ + --extra-cflags=-w --enable-nonfree --enable-libass --enable-libfreetype --disable-xlib --disable-sdl2 --enable-vaapi --enable-libv4l2 --enable-indev=v4l2 --enable-libfdk-aac --enable-libopus --enable-libvpx --enable-libvorbis --enable-gpl --enable-libx264 --enable-gpl --enable-libx265 --enable-libsvtav1 --enable-libsvthevc --enable-libaom --enable-libdav1d && make -j$(nproc) && \ make install DESTDIR=/opt/dist && \ make install diff --git a/XeonE3/centos-7/service/owt-dev/Dockerfile b/XeonE3/centos-7/service/owt-dev/Dockerfile index 5fb0c213e..b25d7ee9f 100644 --- a/XeonE3/centos-7/service/owt-dev/Dockerfile +++ b/XeonE3/centos-7/service/owt-dev/Dockerfile @@ -354,7 +354,7 @@ RUN cd /opt/build/FFmpeg-n4.4 && \ RUN cd /opt/build/FFmpeg-n4.4 && \ ./configure --prefix=/usr/local --libdir=/usr/local/lib64 --enable-shared --disable-static --disable-doc --disable-htmlpages \ --disable-manpages --disable-podpages --disable-txtpages \ - --extra-cflags=-w --enable-libass --disable-xlib --disable-sdl2 --enable-libmfx --enable-vaapi --enable-libfdk-aac --enable-libvpx --enable-gpl --enable-libx264 --enable-libsvthevc && make -j$(nproc) && \ + --extra-cflags=-w --enable-nonfree --enable-libass --disable-xlib --disable-sdl2 --enable-libmfx --enable-vaapi --enable-libfdk-aac --enable-libvpx --enable-gpl --enable-libx264 --enable-libsvthevc && make -j$(nproc) && \ make install DESTDIR=/opt/dist && \ make install diff --git a/XeonE3/centos-7/service/owt/Dockerfile b/XeonE3/centos-7/service/owt/Dockerfile index 949239ebf..421d98622 100644 --- a/XeonE3/centos-7/service/owt/Dockerfile +++ b/XeonE3/centos-7/service/owt/Dockerfile @@ -355,7 +355,7 @@ RUN cd /opt/build/FFmpeg-n4.4 && \ RUN cd /opt/build/FFmpeg-n4.4 && \ ./configure --prefix=/usr/local --libdir=/usr/local/lib64 --enable-shared --disable-static --disable-doc --disable-htmlpages \ --disable-manpages --disable-podpages --disable-txtpages \ - --extra-cflags=-w --enable-libass --disable-xlib --disable-sdl2 --enable-libmfx --enable-vaapi --enable-libfdk-aac --enable-libvpx --enable-gpl --enable-libx264 --enable-libsvthevc && make -j$(nproc) && \ + --extra-cflags=-w --enable-nonfree --enable-libass --disable-xlib --disable-sdl2 --enable-libmfx --enable-vaapi --enable-libfdk-aac --enable-libvpx --enable-gpl --enable-libx264 --enable-libsvthevc && make -j$(nproc) && \ make install DESTDIR=/opt/dist && \ make install diff --git a/XeonE3/centos-7/service/owt360/Dockerfile b/XeonE3/centos-7/service/owt360/Dockerfile index 7858e2aab..a1e6cc6ab 100644 --- a/XeonE3/centos-7/service/owt360/Dockerfile +++ b/XeonE3/centos-7/service/owt360/Dockerfile @@ -355,7 +355,7 @@ RUN cd /opt/build/FFmpeg-n4.4 && \ RUN cd /opt/build/FFmpeg-n4.4 && \ ./configure --prefix=/usr/local --libdir=/usr/local/lib64 --enable-shared --disable-static --disable-doc --disable-htmlpages \ --disable-manpages --disable-podpages --disable-txtpages \ - --extra-cflags=-w --enable-libass --disable-xlib --disable-sdl2 --enable-libmfx --enable-vaapi --enable-libfdk-aac --enable-libvpx --enable-gpl --enable-libx264 --enable-libsvthevc && make -j$(nproc) && \ + --extra-cflags=-w --enable-nonfree --enable-libass --disable-xlib --disable-sdl2 --enable-libmfx --enable-vaapi --enable-libfdk-aac --enable-libvpx --enable-gpl --enable-libx264 --enable-libsvthevc && make -j$(nproc) && \ make install DESTDIR=/opt/dist && \ make install diff --git a/XeonE3/ubuntu-18.04/analytics/dev/Dockerfile b/XeonE3/ubuntu-18.04/analytics/dev/Dockerfile index 3d3b3594b..e5d06a801 100644 --- a/XeonE3/ubuntu-18.04/analytics/dev/Dockerfile +++ b/XeonE3/ubuntu-18.04/analytics/dev/Dockerfile @@ -654,7 +654,7 @@ RUN cd /opt/build/FFmpeg-n4.4 && \ RUN cd /opt/build/FFmpeg-n4.4 && \ ./configure --prefix=/usr/local --libdir=/usr/local/lib --enable-shared --disable-static --disable-doc --disable-htmlpages \ --disable-manpages --disable-podpages --disable-txtpages \ - --extra-cflags=-w --enable-libass --enable-libfreetype --disable-xlib --disable-sdl2 --enable-libmfx --enable-vaapi --enable-libv4l2 --enable-indev=v4l2 --enable-openssl --extra-ldflags=-Wl,-rpath=/usr/local/ssl/lib --enable-libfdk-aac --enable-libopus --enable-libvpx --enable-libvorbis --enable-libsvtav1 --enable-libsvthevc --enable-libaom --enable-libdav1d && make -j$(nproc) && \ + --extra-cflags=-w --enable-nonfree --enable-libass --enable-libfreetype --disable-xlib --disable-sdl2 --enable-libmfx --enable-vaapi --enable-libv4l2 --enable-indev=v4l2 --enable-openssl --extra-ldflags=-Wl,-rpath=/usr/local/ssl/lib --enable-libfdk-aac --enable-libopus --enable-libvpx --enable-libvorbis --enable-libsvtav1 --enable-libsvthevc --enable-libaom --enable-libdav1d && make -j$(nproc) && \ make install DESTDIR=/opt/dist && \ make install diff --git a/XeonE3/ubuntu-18.04/analytics/ffmpeg/Dockerfile b/XeonE3/ubuntu-18.04/analytics/ffmpeg/Dockerfile index bd8488d53..a405a3369 100644 --- a/XeonE3/ubuntu-18.04/analytics/ffmpeg/Dockerfile +++ b/XeonE3/ubuntu-18.04/analytics/ffmpeg/Dockerfile @@ -527,7 +527,7 @@ RUN cd /opt/build/FFmpeg-n4.4 && \ RUN cd /opt/build/FFmpeg-n4.4 && \ ./configure --prefix=/usr/local --libdir=/usr/local/lib --enable-shared --disable-static --disable-doc --disable-htmlpages \ --disable-manpages --disable-podpages --disable-txtpages \ - --extra-cflags=-w --enable-libass --enable-libfreetype --disable-xlib --disable-sdl2 --enable-libmfx --enable-vaapi --enable-libv4l2 --enable-indev=v4l2 --enable-libfdk-aac --enable-libopus --enable-libvpx --enable-libvorbis --enable-gpl --enable-libx264 --enable-gpl --enable-libx265 --enable-libsvtav1 --enable-libsvthevc --enable-libdav1d && make -j$(nproc) && \ + --extra-cflags=-w --enable-nonfree --enable-libass --enable-libfreetype --disable-xlib --disable-sdl2 --enable-libmfx --enable-vaapi --enable-libv4l2 --enable-indev=v4l2 --enable-libfdk-aac --enable-libopus --enable-libvpx --enable-libvorbis --enable-gpl --enable-libx264 --enable-gpl --enable-libx265 --enable-libsvtav1 --enable-libsvthevc --enable-libdav1d && make -j$(nproc) && \ make install DESTDIR=/opt/dist && \ make install diff --git a/XeonE3/ubuntu-18.04/analytics/gst/Dockerfile b/XeonE3/ubuntu-18.04/analytics/gst/Dockerfile index 8a7423001..9d523994b 100644 --- a/XeonE3/ubuntu-18.04/analytics/gst/Dockerfile +++ b/XeonE3/ubuntu-18.04/analytics/gst/Dockerfile @@ -646,7 +646,7 @@ RUN cd /opt/build/FFmpeg-n4.4 && \ RUN cd /opt/build/FFmpeg-n4.4 && \ ./configure --prefix=/usr/local --libdir=/usr/local/lib --enable-shared --disable-static --disable-doc --disable-htmlpages \ --disable-manpages --disable-podpages --disable-txtpages \ - --extra-cflags=-w --enable-libass --enable-libfreetype --disable-xlib --disable-sdl2 --enable-vaapi --enable-libv4l2 --enable-indev=v4l2 --enable-libfdk-aac --enable-libopus --enable-libvpx --enable-libvorbis --enable-gpl --enable-libx264 --enable-gpl --enable-libx265 --enable-libsvtav1 --enable-libsvthevc --enable-libaom --enable-libdav1d && make -j$(nproc) && \ + --extra-cflags=-w --enable-nonfree --enable-libass --enable-libfreetype --disable-xlib --disable-sdl2 --enable-vaapi --enable-libv4l2 --enable-indev=v4l2 --enable-libfdk-aac --enable-libopus --enable-libvpx --enable-libvorbis --enable-gpl --enable-libx264 --enable-gpl --enable-libx265 --enable-libsvtav1 --enable-libsvthevc --enable-libaom --enable-libdav1d && make -j$(nproc) && \ make install DESTDIR=/opt/dist && \ make install diff --git a/XeonE3/ubuntu-18.04/media/dev/Dockerfile b/XeonE3/ubuntu-18.04/media/dev/Dockerfile index 80e86342c..b6a5a9ec5 100644 --- a/XeonE3/ubuntu-18.04/media/dev/Dockerfile +++ b/XeonE3/ubuntu-18.04/media/dev/Dockerfile @@ -479,7 +479,7 @@ RUN cd /opt/build/FFmpeg-n4.4 && \ RUN cd /opt/build/FFmpeg-n4.4 && \ ./configure --prefix=/usr/local --libdir=/usr/local/lib --enable-shared --disable-static --disable-doc --disable-htmlpages \ --disable-manpages --disable-podpages --disable-txtpages \ - --extra-cflags=-w --enable-libass --enable-libfreetype --disable-xlib --disable-sdl2 --enable-libmfx --enable-vaapi --enable-libv4l2 --enable-indev=v4l2 --enable-openssl --extra-ldflags=-Wl,-rpath=/usr/local/ssl/lib --enable-libfdk-aac --enable-libopus --enable-libvpx --enable-libvorbis --enable-libsvtav1 --enable-libsvthevc --enable-libaom --enable-libdav1d && make -j$(nproc) && \ + --extra-cflags=-w --enable-nonfree --enable-libass --enable-libfreetype --disable-xlib --disable-sdl2 --enable-libmfx --enable-vaapi --enable-libv4l2 --enable-indev=v4l2 --enable-openssl --extra-ldflags=-Wl,-rpath=/usr/local/ssl/lib --enable-libfdk-aac --enable-libopus --enable-libvpx --enable-libvorbis --enable-libsvtav1 --enable-libsvthevc --enable-libaom --enable-libdav1d && make -j$(nproc) && \ make install DESTDIR=/opt/dist && \ make install diff --git a/XeonE3/ubuntu-18.04/media/ffmpeg-vmaf/Dockerfile b/XeonE3/ubuntu-18.04/media/ffmpeg-vmaf/Dockerfile index 5116be05f..dfdcbf4e8 100644 --- a/XeonE3/ubuntu-18.04/media/ffmpeg-vmaf/Dockerfile +++ b/XeonE3/ubuntu-18.04/media/ffmpeg-vmaf/Dockerfile @@ -394,7 +394,7 @@ RUN cd /opt/build/FFmpeg-n4.4 && \ RUN cd /opt/build/FFmpeg-n4.4 && \ ./configure --prefix=/usr/local --libdir=/usr/local/lib --enable-shared --disable-static --disable-doc --disable-htmlpages \ --disable-manpages --disable-podpages --disable-txtpages \ - --extra-cflags=-w --enable-libass --enable-libfreetype --disable-xlib --disable-sdl2 --enable-libmfx --enable-vaapi --enable-libv4l2 --enable-indev=v4l2 --enable-libfdk-aac --enable-libopus --enable-libvpx --enable-libvorbis --enable-gpl --enable-libx264 --enable-gpl --enable-libx265 --enable-libsvtav1 --enable-libsvthevc --enable-libvmaf --enable-version3 --enable-libdav1d && make -j$(nproc) && \ + --extra-cflags=-w --enable-nonfree --enable-libass --enable-libfreetype --disable-xlib --disable-sdl2 --enable-libmfx --enable-vaapi --enable-libv4l2 --enable-indev=v4l2 --enable-libfdk-aac --enable-libopus --enable-libvpx --enable-libvorbis --enable-gpl --enable-libx264 --enable-gpl --enable-libx265 --enable-libsvtav1 --enable-libsvthevc --enable-libvmaf --enable-version3 --enable-libdav1d && make -j$(nproc) && \ make install DESTDIR=/opt/dist && \ make install diff --git a/XeonE3/ubuntu-18.04/media/ffmpeg/Dockerfile b/XeonE3/ubuntu-18.04/media/ffmpeg/Dockerfile index 5399f7e6f..7b74278d5 100644 --- a/XeonE3/ubuntu-18.04/media/ffmpeg/Dockerfile +++ b/XeonE3/ubuntu-18.04/media/ffmpeg/Dockerfile @@ -377,7 +377,7 @@ RUN cd /opt/build/FFmpeg-n4.4 && \ RUN cd /opt/build/FFmpeg-n4.4 && \ ./configure --prefix=/usr/local --libdir=/usr/local/lib --enable-shared --disable-static --disable-doc --disable-htmlpages \ --disable-manpages --disable-podpages --disable-txtpages \ - --extra-cflags=-w --enable-libass --enable-libfreetype --disable-xlib --disable-sdl2 --enable-libmfx --enable-vaapi --enable-libv4l2 --enable-indev=v4l2 --enable-libfdk-aac --enable-libopus --enable-libvpx --enable-libvorbis --enable-gpl --enable-libx264 --enable-gpl --enable-libx265 --enable-libsvtav1 --enable-libsvthevc --enable-libdav1d && make -j$(nproc) && \ + --extra-cflags=-w --enable-nonfree --enable-libass --enable-libfreetype --disable-xlib --disable-sdl2 --enable-libmfx --enable-vaapi --enable-libv4l2 --enable-indev=v4l2 --enable-libfdk-aac --enable-libopus --enable-libvpx --enable-libvorbis --enable-gpl --enable-libx264 --enable-gpl --enable-libx265 --enable-libsvtav1 --enable-libsvthevc --enable-libdav1d && make -j$(nproc) && \ make install DESTDIR=/opt/dist && \ make install diff --git a/XeonE3/ubuntu-18.04/media/gst/Dockerfile b/XeonE3/ubuntu-18.04/media/gst/Dockerfile index fc5d9f70e..7d2fce042 100644 --- a/XeonE3/ubuntu-18.04/media/gst/Dockerfile +++ b/XeonE3/ubuntu-18.04/media/gst/Dockerfile @@ -471,7 +471,7 @@ RUN cd /opt/build/FFmpeg-n4.4 && \ RUN cd /opt/build/FFmpeg-n4.4 && \ ./configure --prefix=/usr/local --libdir=/usr/local/lib --enable-shared --disable-static --disable-doc --disable-htmlpages \ --disable-manpages --disable-podpages --disable-txtpages \ - --extra-cflags=-w --enable-libass --enable-libfreetype --disable-xlib --disable-sdl2 --enable-vaapi --enable-libv4l2 --enable-indev=v4l2 --enable-libfdk-aac --enable-libopus --enable-libvpx --enable-libvorbis --enable-gpl --enable-libx264 --enable-gpl --enable-libx265 --enable-libsvtav1 --enable-libsvthevc --enable-libaom --enable-libdav1d && make -j$(nproc) && \ + --extra-cflags=-w --enable-nonfree --enable-libass --enable-libfreetype --disable-xlib --disable-sdl2 --enable-vaapi --enable-libv4l2 --enable-indev=v4l2 --enable-libfdk-aac --enable-libopus --enable-libvpx --enable-libvorbis --enable-gpl --enable-libx264 --enable-gpl --enable-libx265 --enable-libsvtav1 --enable-libsvthevc --enable-libaom --enable-libdav1d && make -j$(nproc) && \ make install DESTDIR=/opt/dist && \ make install diff --git a/XeonE3/ubuntu-18.04/service/owt-dev/Dockerfile b/XeonE3/ubuntu-18.04/service/owt-dev/Dockerfile index 71fa5ecdc..d59da7201 100644 --- a/XeonE3/ubuntu-18.04/service/owt-dev/Dockerfile +++ b/XeonE3/ubuntu-18.04/service/owt-dev/Dockerfile @@ -384,7 +384,7 @@ RUN cd /opt/build/FFmpeg-n4.4 && \ RUN cd /opt/build/FFmpeg-n4.4 && \ ./configure --prefix=/usr/local --libdir=/usr/local/lib --enable-shared --disable-static --disable-doc --disable-htmlpages \ --disable-manpages --disable-podpages --disable-txtpages \ - --extra-cflags=-w --enable-libass --disable-xlib --disable-sdl2 --enable-libmfx --enable-vaapi --enable-libfdk-aac --enable-libvpx --enable-gpl --enable-libx264 --enable-libsvthevc && make -j$(nproc) && \ + --extra-cflags=-w --enable-nonfree --enable-libass --disable-xlib --disable-sdl2 --enable-libmfx --enable-vaapi --enable-libfdk-aac --enable-libvpx --enable-gpl --enable-libx264 --enable-libsvthevc && make -j$(nproc) && \ make install DESTDIR=/opt/dist && \ make install diff --git a/XeonE3/ubuntu-18.04/service/owt/Dockerfile b/XeonE3/ubuntu-18.04/service/owt/Dockerfile index 190dc5ae9..c98f2d99a 100644 --- a/XeonE3/ubuntu-18.04/service/owt/Dockerfile +++ b/XeonE3/ubuntu-18.04/service/owt/Dockerfile @@ -384,7 +384,7 @@ RUN cd /opt/build/FFmpeg-n4.4 && \ RUN cd /opt/build/FFmpeg-n4.4 && \ ./configure --prefix=/usr/local --libdir=/usr/local/lib --enable-shared --disable-static --disable-doc --disable-htmlpages \ --disable-manpages --disable-podpages --disable-txtpages \ - --extra-cflags=-w --enable-libass --disable-xlib --disable-sdl2 --enable-libmfx --enable-vaapi --enable-libfdk-aac --enable-libvpx --enable-gpl --enable-libx264 --enable-libsvthevc && make -j$(nproc) && \ + --extra-cflags=-w --enable-nonfree --enable-libass --disable-xlib --disable-sdl2 --enable-libmfx --enable-vaapi --enable-libfdk-aac --enable-libvpx --enable-gpl --enable-libx264 --enable-libsvthevc && make -j$(nproc) && \ make install DESTDIR=/opt/dist && \ make install diff --git a/XeonE3/ubuntu-18.04/service/owt360/Dockerfile b/XeonE3/ubuntu-18.04/service/owt360/Dockerfile index 2fe100c8b..eb2e0c62e 100644 --- a/XeonE3/ubuntu-18.04/service/owt360/Dockerfile +++ b/XeonE3/ubuntu-18.04/service/owt360/Dockerfile @@ -385,7 +385,7 @@ RUN cd /opt/build/FFmpeg-n4.4 && \ RUN cd /opt/build/FFmpeg-n4.4 && \ ./configure --prefix=/usr/local --libdir=/usr/local/lib --enable-shared --disable-static --disable-doc --disable-htmlpages \ --disable-manpages --disable-podpages --disable-txtpages \ - --extra-cflags=-w --enable-libass --disable-xlib --disable-sdl2 --enable-libmfx --enable-vaapi --enable-libfdk-aac --enable-libvpx --enable-gpl --enable-libx264 --enable-libsvthevc && make -j$(nproc) && \ + --extra-cflags=-w --enable-nonfree --enable-libass --disable-xlib --disable-sdl2 --enable-libmfx --enable-vaapi --enable-libfdk-aac --enable-libvpx --enable-gpl --enable-libx264 --enable-libsvthevc && make -j$(nproc) && \ make install DESTDIR=/opt/dist && \ make install diff --git a/XeonE3/ubuntu-20.04/analytics/dev/Dockerfile b/XeonE3/ubuntu-20.04/analytics/dev/Dockerfile index 849abfd6f..9df9297ed 100644 --- a/XeonE3/ubuntu-20.04/analytics/dev/Dockerfile +++ b/XeonE3/ubuntu-20.04/analytics/dev/Dockerfile @@ -640,7 +640,7 @@ RUN cd /opt/build/FFmpeg-n4.4 && \ RUN cd /opt/build/FFmpeg-n4.4 && \ ./configure --prefix=/usr/local --libdir=/usr/local/lib --enable-shared --disable-static --disable-doc --disable-htmlpages \ --disable-manpages --disable-podpages --disable-txtpages \ - --extra-cflags=-w --enable-libass --enable-libfreetype --disable-xlib --disable-sdl2 --enable-libmfx --enable-vaapi --enable-libv4l2 --enable-indev=v4l2 --enable-openssl --extra-ldflags=-Wl,-rpath=/usr/local/ssl/lib --enable-libfdk-aac --enable-libopus --enable-libvpx --enable-libvorbis --enable-libsvtav1 --enable-libsvthevc --enable-libaom --enable-libdav1d && make -j$(nproc) && \ + --extra-cflags=-w --enable-nonfree --enable-libass --enable-libfreetype --disable-xlib --disable-sdl2 --enable-libmfx --enable-vaapi --enable-libv4l2 --enable-indev=v4l2 --enable-openssl --extra-ldflags=-Wl,-rpath=/usr/local/ssl/lib --enable-libfdk-aac --enable-libopus --enable-libvpx --enable-libvorbis --enable-libsvtav1 --enable-libsvthevc --enable-libaom --enable-libdav1d && make -j$(nproc) && \ make install DESTDIR=/opt/dist && \ make install diff --git a/XeonE3/ubuntu-20.04/analytics/ffmpeg/Dockerfile b/XeonE3/ubuntu-20.04/analytics/ffmpeg/Dockerfile index 8ad015cc7..0f7d7174c 100644 --- a/XeonE3/ubuntu-20.04/analytics/ffmpeg/Dockerfile +++ b/XeonE3/ubuntu-20.04/analytics/ffmpeg/Dockerfile @@ -501,7 +501,7 @@ RUN cd /opt/build/FFmpeg-n4.4 && \ RUN cd /opt/build/FFmpeg-n4.4 && \ ./configure --prefix=/usr/local --libdir=/usr/local/lib --enable-shared --disable-static --disable-doc --disable-htmlpages \ --disable-manpages --disable-podpages --disable-txtpages \ - --extra-cflags=-w --enable-libass --enable-libfreetype --disable-xlib --disable-sdl2 --enable-libmfx --enable-vaapi --enable-libv4l2 --enable-indev=v4l2 --enable-libfdk-aac --enable-libopus --enable-libvpx --enable-libvorbis --enable-gpl --enable-libx264 --enable-gpl --enable-libx265 --enable-libsvtav1 --enable-libsvthevc --enable-libdav1d && make -j$(nproc) && \ + --extra-cflags=-w --enable-nonfree --enable-libass --enable-libfreetype --disable-xlib --disable-sdl2 --enable-libmfx --enable-vaapi --enable-libv4l2 --enable-indev=v4l2 --enable-libfdk-aac --enable-libopus --enable-libvpx --enable-libvorbis --enable-gpl --enable-libx264 --enable-gpl --enable-libx265 --enable-libsvtav1 --enable-libsvthevc --enable-libdav1d && make -j$(nproc) && \ make install DESTDIR=/opt/dist && \ make install diff --git a/XeonE3/ubuntu-20.04/analytics/gst/Dockerfile b/XeonE3/ubuntu-20.04/analytics/gst/Dockerfile index 696cf09e2..8cd059007 100644 --- a/XeonE3/ubuntu-20.04/analytics/gst/Dockerfile +++ b/XeonE3/ubuntu-20.04/analytics/gst/Dockerfile @@ -632,7 +632,7 @@ RUN cd /opt/build/FFmpeg-n4.4 && \ RUN cd /opt/build/FFmpeg-n4.4 && \ ./configure --prefix=/usr/local --libdir=/usr/local/lib --enable-shared --disable-static --disable-doc --disable-htmlpages \ --disable-manpages --disable-podpages --disable-txtpages \ - --extra-cflags=-w --enable-libass --enable-libfreetype --disable-xlib --disable-sdl2 --enable-vaapi --enable-libv4l2 --enable-indev=v4l2 --enable-libfdk-aac --enable-libopus --enable-libvpx --enable-libvorbis --enable-gpl --enable-libx264 --enable-gpl --enable-libx265 --enable-libsvtav1 --enable-libsvthevc --enable-libaom --enable-libdav1d && make -j$(nproc) && \ + --extra-cflags=-w --enable-nonfree --enable-libass --enable-libfreetype --disable-xlib --disable-sdl2 --enable-vaapi --enable-libv4l2 --enable-indev=v4l2 --enable-libfdk-aac --enable-libopus --enable-libvpx --enable-libvorbis --enable-gpl --enable-libx264 --enable-gpl --enable-libx265 --enable-libsvtav1 --enable-libsvthevc --enable-libaom --enable-libdav1d && make -j$(nproc) && \ make install DESTDIR=/opt/dist && \ make install diff --git a/XeonE3/ubuntu-20.04/media/dev/Dockerfile b/XeonE3/ubuntu-20.04/media/dev/Dockerfile index 489487f52..6c94b76f1 100644 --- a/XeonE3/ubuntu-20.04/media/dev/Dockerfile +++ b/XeonE3/ubuntu-20.04/media/dev/Dockerfile @@ -496,7 +496,7 @@ RUN cd /opt/build/FFmpeg-n4.4 && \ RUN cd /opt/build/FFmpeg-n4.4 && \ ./configure --prefix=/usr/local --libdir=/usr/local/lib --enable-shared --disable-static --disable-doc --disable-htmlpages \ --disable-manpages --disable-podpages --disable-txtpages \ - --extra-cflags=-w --enable-libass --enable-libfreetype --disable-xlib --disable-sdl2 --enable-libmfx --enable-vaapi --enable-libv4l2 --enable-indev=v4l2 --enable-openssl --extra-ldflags=-Wl,-rpath=/usr/local/ssl/lib --enable-libfdk-aac --enable-libopus --enable-libvpx --enable-libvorbis --enable-libsvtav1 --enable-libsvthevc --enable-libaom --enable-libvmaf --enable-version3 --enable-libdav1d && make -j$(nproc) && \ + --extra-cflags=-w --enable-nonfree --enable-libass --enable-libfreetype --disable-xlib --disable-sdl2 --enable-libmfx --enable-vaapi --enable-libv4l2 --enable-indev=v4l2 --enable-openssl --extra-ldflags=-Wl,-rpath=/usr/local/ssl/lib --enable-libfdk-aac --enable-libopus --enable-libvpx --enable-libvorbis --enable-libsvtav1 --enable-libsvthevc --enable-libaom --enable-libvmaf --enable-version3 --enable-libdav1d && make -j$(nproc) && \ make install DESTDIR=/opt/dist && \ make install diff --git a/XeonE3/ubuntu-20.04/media/ffmpeg/Dockerfile b/XeonE3/ubuntu-20.04/media/ffmpeg/Dockerfile index 9bd156605..ae553c9b7 100644 --- a/XeonE3/ubuntu-20.04/media/ffmpeg/Dockerfile +++ b/XeonE3/ubuntu-20.04/media/ffmpeg/Dockerfile @@ -365,7 +365,7 @@ RUN cd /opt/build/FFmpeg-n4.4 && \ RUN cd /opt/build/FFmpeg-n4.4 && \ ./configure --prefix=/usr/local --libdir=/usr/local/lib --enable-shared --disable-static --disable-doc --disable-htmlpages \ --disable-manpages --disable-podpages --disable-txtpages \ - --extra-cflags=-w --enable-libass --enable-libfreetype --disable-xlib --disable-sdl2 --enable-libmfx --enable-vaapi --enable-libv4l2 --enable-indev=v4l2 --enable-libfdk-aac --enable-libopus --enable-libvpx --enable-libvorbis --enable-gpl --enable-libx264 --enable-gpl --enable-libx265 --enable-libsvtav1 --enable-libsvthevc --enable-libdav1d && make -j$(nproc) && \ + --extra-cflags=-w --enable-nonfree --enable-libass --enable-libfreetype --disable-xlib --disable-sdl2 --enable-libmfx --enable-vaapi --enable-libv4l2 --enable-indev=v4l2 --enable-libfdk-aac --enable-libopus --enable-libvpx --enable-libvorbis --enable-gpl --enable-libx264 --enable-gpl --enable-libx265 --enable-libsvtav1 --enable-libsvthevc --enable-libdav1d && make -j$(nproc) && \ make install DESTDIR=/opt/dist && \ make install diff --git a/XeonE3/ubuntu-20.04/media/gst/Dockerfile b/XeonE3/ubuntu-20.04/media/gst/Dockerfile index b057fb86a..9b8d0c2fb 100644 --- a/XeonE3/ubuntu-20.04/media/gst/Dockerfile +++ b/XeonE3/ubuntu-20.04/media/gst/Dockerfile @@ -471,7 +471,7 @@ RUN cd /opt/build/FFmpeg-n4.4 && \ RUN cd /opt/build/FFmpeg-n4.4 && \ ./configure --prefix=/usr/local --libdir=/usr/local/lib --enable-shared --disable-static --disable-doc --disable-htmlpages \ --disable-manpages --disable-podpages --disable-txtpages \ - --extra-cflags=-w --enable-libass --enable-libfreetype --disable-xlib --disable-sdl2 --enable-vaapi --enable-libv4l2 --enable-indev=v4l2 --enable-libfdk-aac --enable-libopus --enable-libvpx --enable-libvorbis --enable-gpl --enable-libx264 --enable-gpl --enable-libx265 --enable-libsvtav1 --enable-libsvthevc --enable-libaom --enable-libdav1d && make -j$(nproc) && \ + --extra-cflags=-w --enable-nonfree --enable-libass --enable-libfreetype --disable-xlib --disable-sdl2 --enable-vaapi --enable-libv4l2 --enable-indev=v4l2 --enable-libfdk-aac --enable-libopus --enable-libvpx --enable-libvorbis --enable-gpl --enable-libx264 --enable-gpl --enable-libx265 --enable-libsvtav1 --enable-libsvthevc --enable-libaom --enable-libdav1d && make -j$(nproc) && \ make install DESTDIR=/opt/dist && \ make install diff --git a/template/components/ffmpeg.m4 b/template/components/ffmpeg.m4 index 057a821e4..1bde02362 100644 --- a/template/components/ffmpeg.m4 +++ b/template/components/ffmpeg.m4 @@ -34,7 +34,7 @@ DECLARE(`FFMPEG_VER',n4.4) DECLARE(`FFMPEG_ENABLE_LIBASS',true) DECLARE(`FFMPEG_ENABLE_LIBFREETYPE',true) DECLARE(`FFMPEG_ENABLE_X11',false) -DECLARE(`FFMPEG_ENABLE_NONFREE',false) +DECLARE(`FFMPEG_ENABLE_NONFREE',ifdef(`BUILD_LIBFDKAAC',true,false)) DECLARE(`FFMPEG_ENABLE_V4L2',true) DECLARE(`FFMPEG_ENABLE_HWACCELS',ifdef(`ENABLE_INTEL_GFX_REPO',true,ifdef(`BUILD_LIBVA2',true,false))) DECLARE(`FFMPEG_ENABLE_LIBMFX',ifdef(`BUILD_MSDK',FFMPEG_ENABLE_HWACCELS,false))