[v216] Some clean up due to merge artifacts (#761)

* 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 <[email protected]> * [master] Upgrade Meson for Ubuntu-20.04 (#748) * Update Docker image README (#704) * update README * Update dockerfiles * meson version fix Co-authored-by: jhou5 <[email protected]> * [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 <[email protected]> * [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 <[email protected]> * [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 <[email protected]> Co-authored-by: jhou5 <[email protected]>
OpenVisualCloud · Jul 1, 2021 · a79caa9 · a79caa9
1 parent dce3b3d
commit a79caa9
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 25 deletions.
diff --git a/template/components/opencv.m4 b/template/components/opencv.m4
@@ -40,9 +40,6 @@ ifelse(OS_NAME,centos,`
 define(`OPENCV_BUILD_DEPS',`ifdef(`BUILD_CMAKE',,cmake3) gcc gcc-c++ make wget python36-numpy ccache eigen3-devel ifelse(OS_VERSION,7,devtoolset-9)')
 ')
 
- ifelse(OS_NAME:OS_VERSION,centos:7,`(. /opt/rh/devtoolset-9/enable && ')ifdef(`BUILD_CMAKE',cmake,ifelse(OS_NAME,centos,cmake3,cmake)) -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=BUILD_PREFIX -DCMAKE_INSTALL_LIBDIR=BUILD_LIBDIR -DCMAKE_ASM_NASM_COMPILER=yasm ../.. && \
-    make -j $(nproc)ifelse(OS_NAME:OS_VERSION,centos:7,` )') && \
-
 define(`BUILD_OPENCV',`
 # build opencv
 ARG OPENCV_REPO=https://github.com/opencv/opencv/archive/OPENCV_VER.tar.gz

diff --git a/test/ffmpeg_dash.sh b/test/ffmpeg_dash.sh
diff --git a/test/ffmpeg_hls.sh b/test/ffmpeg_hls.sh