Skip to content
This repository was archived by the owner on Sep 16, 2024. It is now read-only.

Commit eb60015

Browse files
dpatel257jhou5
dpatel257
and
jhou5
authored
[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 <jingdu.hou@intel.com> * [master] Upgrade Meson for Ubuntu-20.04 (#748) * Update Docker image README (#704) * update README * Update dockerfiles * meson version fix Co-authored-by: jhou5 <jingdu.hou@intel.com> * [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 <jingdu.hou@intel.com> * [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 <jingdu.hou@intel.com> * [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 <jingdu.hou@intel.com> * [master] Owt boost revert (#759) * Update Docker image README (#704) * update README * Update dockerfiles * revert boost for owt on centos7 Co-authored-by: jhou5 <jingdu.hou@intel.com> * [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 <jingdu.hou@intel.com> * [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 <jingdu.hou@intel.com> * 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 <jingdu.hou@intel.com> * [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 <jingdu.hou@intel.com> * [master] Fix test config for vmaf (#770) * Update Docker image README (#704) * update README * Update dockerfiles * vmaf test config fix Co-authored-by: jhou5 <jingdu.hou@intel.com> * [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 <jingdu.hou@intel.com> * 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 <jingdu.hou@intel.com> * 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 <jingdu.hou@intel.com> * [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 <jingdu.hou@intel.com> * 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 <jingdu.hou@intel.com> * enable non-free if fdkaac is enabled Co-authored-by: jhou5 <jingdu.hou@intel.com>
1 parent 5533a12 commit eb60015

File tree

64 files changed

+64
-64
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

64 files changed

+64
-64
lines changed

‎SG1/centos-7/media/dev/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -302,7 +302,7 @@ RUN cd /opt/build/FFmpeg-n4.4 && \
302302
RUN cd /opt/build/FFmpeg-n4.4 && \
303303
./configure --prefix=/usr/local --libdir=/usr/local/lib64 --enable-shared --disable-static --disable-doc --disable-htmlpages \
304304
--disable-manpages --disable-podpages --disable-txtpages \
305-
--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) && \
305+
--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) && \
306306
make install DESTDIR=/opt/dist && \
307307
make install
308308

‎SG1/centos-7/media/ffmpeg/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -322,7 +322,7 @@ RUN cd /opt/build/FFmpeg-n4.4 && \
322322
RUN cd /opt/build/FFmpeg-n4.4 && \
323323
./configure --prefix=/usr/local --libdir=/usr/local/lib64 --enable-shared --disable-static --disable-doc --disable-htmlpages \
324324
--disable-manpages --disable-podpages --disable-txtpages \
325-
--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) && \
325+
--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) && \
326326
make install DESTDIR=/opt/dist && \
327327
make install
328328

‎SG1/ubuntu-18.04/media/dev/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -354,7 +354,7 @@ RUN cd /opt/build/FFmpeg-n4.4 && \
354354
RUN cd /opt/build/FFmpeg-n4.4 && \
355355
./configure --prefix=/usr/local --libdir=/usr/local/lib --enable-shared --disable-static --disable-doc --disable-htmlpages \
356356
--disable-manpages --disable-podpages --disable-txtpages \
357-
--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) && \
357+
--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) && \
358358
make install DESTDIR=/opt/dist && \
359359
make install
360360

‎SG1/ubuntu-18.04/media/ffmpeg-vmaf/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -394,7 +394,7 @@ RUN cd /opt/build/FFmpeg-n4.4 && \
394394
RUN cd /opt/build/FFmpeg-n4.4 && \
395395
./configure --prefix=/usr/local --libdir=/usr/local/lib --enable-shared --disable-static --disable-doc --disable-htmlpages \
396396
--disable-manpages --disable-podpages --disable-txtpages \
397-
--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) && \
397+
--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) && \
398398
make install DESTDIR=/opt/dist && \
399399
make install
400400

‎SG1/ubuntu-18.04/media/ffmpeg/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -377,7 +377,7 @@ RUN cd /opt/build/FFmpeg-n4.4 && \
377377
RUN cd /opt/build/FFmpeg-n4.4 && \
378378
./configure --prefix=/usr/local --libdir=/usr/local/lib --enable-shared --disable-static --disable-doc --disable-htmlpages \
379379
--disable-manpages --disable-podpages --disable-txtpages \
380-
--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) && \
380+
--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) && \
381381
make install DESTDIR=/opt/dist && \
382382
make install
383383

‎SG1/ubuntu-20.04/media/dev/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -342,7 +342,7 @@ RUN cd /opt/build/FFmpeg-n4.4 && \
342342
RUN cd /opt/build/FFmpeg-n4.4 && \
343343
./configure --prefix=/usr/local --libdir=/usr/local/lib --enable-shared --disable-static --disable-doc --disable-htmlpages \
344344
--disable-manpages --disable-podpages --disable-txtpages \
345-
--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) && \
345+
--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) && \
346346
make install DESTDIR=/opt/dist && \
347347
make install
348348

‎SG1/ubuntu-20.04/media/ffmpeg/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -365,7 +365,7 @@ RUN cd /opt/build/FFmpeg-n4.4 && \
365365
RUN cd /opt/build/FFmpeg-n4.4 && \
366366
./configure --prefix=/usr/local --libdir=/usr/local/lib --enable-shared --disable-static --disable-doc --disable-htmlpages \
367367
--disable-manpages --disable-podpages --disable-txtpages \
368-
--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) && \
368+
--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) && \
369369
make install DESTDIR=/opt/dist && \
370370
make install
371371

‎VCAC-A/ubuntu-18.04/analytics/dev/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -549,7 +549,7 @@ RUN cd /opt/build/FFmpeg-n4.4 && \
549549
RUN cd /opt/build/FFmpeg-n4.4 && \
550550
./configure --prefix=/usr/local --libdir=/usr/local/lib --enable-shared --disable-static --disable-doc --disable-htmlpages \
551551
--disable-manpages --disable-podpages --disable-txtpages \
552-
--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) && \
552+
--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) && \
553553
make install DESTDIR=/opt/dist && \
554554
make install
555555

‎VCAC-A/ubuntu-18.04/analytics/ffmpeg/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -441,7 +441,7 @@ RUN cd /opt/build/FFmpeg-n4.4 && \
441441
RUN cd /opt/build/FFmpeg-n4.4 && \
442442
./configure --prefix=/usr/local --libdir=/usr/local/lib --enable-shared --disable-static --disable-doc --disable-htmlpages \
443443
--disable-manpages --disable-podpages --disable-txtpages \
444-
--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) && \
444+
--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) && \
445445
make install DESTDIR=/opt/dist && \
446446
make install
447447

‎VCAC-A/ubuntu-18.04/analytics/gst/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -560,7 +560,7 @@ RUN cd /opt/build/FFmpeg-n4.4 && \
560560
RUN cd /opt/build/FFmpeg-n4.4 && \
561561
./configure --prefix=/usr/local --libdir=/usr/local/lib --enable-shared --disable-static --disable-doc --disable-htmlpages \
562562
--disable-manpages --disable-podpages --disable-txtpages \
563-
--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) && \
563+
--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) && \
564564
make install DESTDIR=/opt/dist && \
565565
make install
566566

0 commit comments

Comments
 (0)