OpenVisualCloud · dpatel257 · Jun 30, 2021 · Mar 17, 2021 · Mar 24, 2021 · Mar 26, 2021
diff --git a/QAT/centos-7/media/dev/Dockerfile b/QAT/centos-7/media/dev/Dockerfile
@@ -131,7 +131,7 @@ RUN cd /opt/build && \
     cd QAT_Engine* && \
     ./autogen.sh && \
     export PERL5LIB="$(ls -1 -d /opt/build/openssl-*)" && \
-    ./configure --with-qat_dir=/opt/intel/QAT --with-openssl_dir="$PERL5LIB" --with-openssl_install_dir=/usr/local/ssl --prefix=/opt/intel/QATengine --disable-qat_ecx --with-cc-opt="-DQAT_DISABLE_NONZERO_MEMFREE -IBUILD_HOME/ipp-crypto-ippcp_2021.2/sources/ippcp/crypto_mb/include" --enable-multibuff_offload --enable-multibuff_ecx --enable-qat_sw && \
+    ./configure --with-qat_dir=/opt/intel/QAT --with-openssl_dir="$PERL5LIB" --with-openssl_install_dir=/usr/local/ssl --prefix=/opt/intel/QATengine --disable-qat_ecx --with-cc-opt="-DQAT_DISABLE_NONZERO_MEMFREE -I/opt/build/ipp-crypto-ippcp_2021.2/sources/ippcp/crypto_mb/include" --enable-multibuff_offload --enable-multibuff_ecx --enable-qat_sw && \
     make -j8 && \
     make install && \
     tar cf - /usr/local/ssl | (cd /opt/dist && tar xf -)

diff --git a/QAT/centos-7/media/dev/nginx.conf b/QAT/centos-7/media/dev/nginx.conf
@@ -18,7 +18,7 @@ ssl_engine {
         qat_offload_mode async;
         qat_notify_mode poll;
         qat_poll_mode heuristic;
-        qat_sw_fallback on;
+        #qat_sw_fallback on;
     }
 }
 

diff --git a/QAT/centos-7/media/nginx/nginx.conf b/QAT/centos-7/media/nginx/nginx.conf
@@ -18,7 +18,7 @@ ssl_engine {
         qat_offload_mode async;
         qat_notify_mode poll;
         qat_poll_mode heuristic;
-        qat_sw_fallback on;
+        #qat_sw_fallback on;
     }
 }
 

diff --git a/QAT/centos-7/media/nginx_sw/Dockerfile b/QAT/centos-7/media/nginx_sw/Dockerfile
@@ -131,7 +131,7 @@ RUN cd /opt/build && \
     cd QAT_Engine* && \
     ./autogen.sh && \
     export PERL5LIB="$(ls -1 -d /opt/build/openssl-*)" && \
-    ./configure --with-qat_dir=/opt/intel/QAT --with-openssl_dir="$PERL5LIB" --with-openssl_install_dir=/usr/local/ssl --prefix=/opt/intel/QATengine --disable-qat_ecx --with-cc-opt="-DQAT_DISABLE_NONZERO_MEMFREE -IBUILD_HOME/ipp-crypto-ippcp_2021.2/sources/ippcp/crypto_mb/include" --enable-multibuff_offload --enable-multibuff_ecx --enable-qat_sw && \
+    ./configure --with-qat_dir=/opt/intel/QAT --with-openssl_dir="$PERL5LIB" --with-openssl_install_dir=/usr/local/ssl --prefix=/opt/intel/QATengine --disable-qat_ecx --with-cc-opt="-DQAT_DISABLE_NONZERO_MEMFREE -I/opt/build/ipp-crypto-ippcp_2021.2/sources/ippcp/crypto_mb/include" --enable-multibuff_offload --enable-multibuff_ecx --enable-qat_sw && \
     make -j8 && \
     make install && \
     tar cf - /usr/local/ssl | (cd /opt/dist && tar xf -)

diff --git a/QAT/ubuntu-18.04/media/dev/Dockerfile b/QAT/ubuntu-18.04/media/dev/Dockerfile
@@ -141,7 +141,7 @@ RUN cd /opt/build && \
     cd QAT_Engine* && \
     ./autogen.sh && \
     export PERL5LIB="$(ls -1 -d /opt/build/openssl-*)" && \
-    ./configure --with-qat_dir=/opt/intel/QAT --with-openssl_dir="$PERL5LIB" --with-openssl_install_dir=/usr/local/ssl --prefix=/opt/intel/QATengine --disable-qat_ecx --with-cc-opt="-DQAT_DISABLE_NONZERO_MEMFREE -IBUILD_HOME/ipp-crypto-ippcp_2021.2/sources/ippcp/crypto_mb/include" --enable-multibuff_offload --enable-multibuff_ecx --enable-qat_sw && \
+    ./configure --with-qat_dir=/opt/intel/QAT --with-openssl_dir="$PERL5LIB" --with-openssl_install_dir=/usr/local/ssl --prefix=/opt/intel/QATengine --disable-qat_ecx --with-cc-opt="-DQAT_DISABLE_NONZERO_MEMFREE -I/opt/build/ipp-crypto-ippcp_2021.2/sources/ippcp/crypto_mb/include" --enable-multibuff_offload --enable-multibuff_ecx --enable-qat_sw && \
     make -j8 && \
     make install && \
     tar cf - /usr/local/ssl | (cd /opt/dist && tar xf -)

diff --git a/QAT/ubuntu-18.04/media/dev/nginx.conf b/QAT/ubuntu-18.04/media/dev/nginx.conf
@@ -18,7 +18,7 @@ ssl_engine {
         qat_offload_mode async;
         qat_notify_mode poll;
         qat_poll_mode heuristic;
-        qat_sw_fallback on;
+        #qat_sw_fallback on;
     }
 }
 

diff --git a/QAT/ubuntu-18.04/media/nginx/nginx.conf b/QAT/ubuntu-18.04/media/nginx/nginx.conf
@@ -18,7 +18,7 @@ ssl_engine {
         qat_offload_mode async;
         qat_notify_mode poll;
         qat_poll_mode heuristic;
-        qat_sw_fallback on;
+        #qat_sw_fallback on;
     }
 }
 

diff --git a/QAT/ubuntu-18.04/media/nginx_sw/Dockerfile b/QAT/ubuntu-18.04/media/nginx_sw/Dockerfile
@@ -141,7 +141,7 @@ RUN cd /opt/build && \
     cd QAT_Engine* && \
     ./autogen.sh && \
     export PERL5LIB="$(ls -1 -d /opt/build/openssl-*)" && \
-    ./configure --with-qat_dir=/opt/intel/QAT --with-openssl_dir="$PERL5LIB" --with-openssl_install_dir=/usr/local/ssl --prefix=/opt/intel/QATengine --disable-qat_ecx --with-cc-opt="-DQAT_DISABLE_NONZERO_MEMFREE -IBUILD_HOME/ipp-crypto-ippcp_2021.2/sources/ippcp/crypto_mb/include" --enable-multibuff_offload --enable-multibuff_ecx --enable-qat_sw && \
+    ./configure --with-qat_dir=/opt/intel/QAT --with-openssl_dir="$PERL5LIB" --with-openssl_install_dir=/usr/local/ssl --prefix=/opt/intel/QATengine --disable-qat_ecx --with-cc-opt="-DQAT_DISABLE_NONZERO_MEMFREE -I/opt/build/ipp-crypto-ippcp_2021.2/sources/ippcp/crypto_mb/include" --enable-multibuff_offload --enable-multibuff_ecx --enable-qat_sw && \
     make -j8 && \
     make install && \
     tar cf - /usr/local/ssl | (cd /opt/dist && tar xf -)

diff --git a/QAT/ubuntu-20.04/media/dev/Dockerfile b/QAT/ubuntu-20.04/media/dev/Dockerfile
@@ -137,7 +137,7 @@ RUN cd /opt/build && \
     cd QAT_Engine* && \
     ./autogen.sh && \
     export PERL5LIB="$(ls -1 -d /opt/build/openssl-*)" && \
-    ./configure --with-qat_dir=/opt/intel/QAT --with-openssl_dir="$PERL5LIB" --with-openssl_install_dir=/usr/local/ssl --prefix=/opt/intel/QATengine --disable-qat_ecx --with-cc-opt="-DQAT_DISABLE_NONZERO_MEMFREE -IBUILD_HOME/ipp-crypto-ippcp_2021.2/sources/ippcp/crypto_mb/include" --enable-multibuff_offload --enable-multibuff_ecx --enable-qat_sw && \
+    ./configure --with-qat_dir=/opt/intel/QAT --with-openssl_dir="$PERL5LIB" --with-openssl_install_dir=/usr/local/ssl --prefix=/opt/intel/QATengine --disable-qat_ecx --with-cc-opt="-DQAT_DISABLE_NONZERO_MEMFREE -I/opt/build/ipp-crypto-ippcp_2021.2/sources/ippcp/crypto_mb/include" --enable-multibuff_offload --enable-multibuff_ecx --enable-qat_sw && \
     make -j8 && \
     make install && \
     tar cf - /usr/local/ssl | (cd /opt/dist && tar xf -)

diff --git a/QAT/ubuntu-20.04/media/dev/nginx.conf b/QAT/ubuntu-20.04/media/dev/nginx.conf
@@ -18,7 +18,7 @@ ssl_engine {
         qat_offload_mode async;
         qat_notify_mode poll;
         qat_poll_mode heuristic;
-        qat_sw_fallback on;
+        #qat_sw_fallback on;
     }
 }
 

diff --git a/QAT/ubuntu-20.04/media/nginx/nginx.conf b/QAT/ubuntu-20.04/media/nginx/nginx.conf
@@ -18,7 +18,7 @@ ssl_engine {
         qat_offload_mode async;
         qat_notify_mode poll;
         qat_poll_mode heuristic;
-        qat_sw_fallback on;
+        #qat_sw_fallback on;
     }
 }
 

diff --git a/QAT/ubuntu-20.04/media/nginx_sw/Dockerfile b/QAT/ubuntu-20.04/media/nginx_sw/Dockerfile
@@ -137,7 +137,7 @@ RUN cd /opt/build && \
     cd QAT_Engine* && \
     ./autogen.sh && \
     export PERL5LIB="$(ls -1 -d /opt/build/openssl-*)" && \
-    ./configure --with-qat_dir=/opt/intel/QAT --with-openssl_dir="$PERL5LIB" --with-openssl_install_dir=/usr/local/ssl --prefix=/opt/intel/QATengine --disable-qat_ecx --with-cc-opt="-DQAT_DISABLE_NONZERO_MEMFREE -IBUILD_HOME/ipp-crypto-ippcp_2021.2/sources/ippcp/crypto_mb/include" --enable-multibuff_offload --enable-multibuff_ecx --enable-qat_sw && \
+    ./configure --with-qat_dir=/opt/intel/QAT --with-openssl_dir="$PERL5LIB" --with-openssl_install_dir=/usr/local/ssl --prefix=/opt/intel/QATengine --disable-qat_ecx --with-cc-opt="-DQAT_DISABLE_NONZERO_MEMFREE -I/opt/build/ipp-crypto-ippcp_2021.2/sources/ippcp/crypto_mb/include" --enable-multibuff_offload --enable-multibuff_ecx --enable-qat_sw && \
     make -j8 && \
     make install && \
     tar cf - /usr/local/ssl | (cd /opt/dist && tar xf -)

diff --git a/SG1/centos-7/media/ffmpeg/Dockerfile b/SG1/centos-7/media/ffmpeg/Dockerfile
@@ -285,15 +285,15 @@ RUN cd /opt/build/MediaSDK-intel-media-sg1-pv1.3 && \
     make install DESTDIR=/opt/dist && \
     make install
 
-RUN yum install -y gcc gcc-c++ make wget python36-numpy ccache eigen3-devel
+RUN yum install -y gcc gcc-c++ make wget python36-numpy ccache eigen3-devel devtoolset-9
 
 # build opencv
 ARG OPENCV_REPO=https://github.com/opencv/opencv/archive/4.5.2.tar.gz
 RUN cd /opt/build && \
   wget -O - ${OPENCV_REPO} | tar xz
 # TODO: file a bug against opencv since they do not accept full libdir
 RUN cd /opt/build/opencv-4.5.2 && mkdir build && cd build && \
-  cmake \
+  (. /opt/rh/devtoolset-9/enable && cmake \
     -DCMAKE_BUILD_TYPE=Release \
     -DCMAKE_INSTALL_PREFIX=/usr/local \
     -DCMAKE_INSTALL_LIBDIR=lib64 \
@@ -303,7 +303,7 @@ RUN cd /opt/build/opencv-4.5.2 && mkdir build && cd build && \
     -DBUILD_PERF_TESTS=OFF \
     -DBUILD_TESTS=OFF \
     .. && \
-  make -j "$(nproc)" && \
+  make -j $(nproc) ) && \
   make install DESTDIR=/opt/dist && \
   make install
 
@@ -339,7 +339,7 @@ RUN cd /opt/build/FFmpeg-n4.4 && \
 
 RUN cd /opt/build/opencv-4.5.2/build && \
   rm -rf ./* && \
-  cmake \
+  (. /opt/rh/devtoolset-9/enable && cmake \
     -DCMAKE_BUILD_TYPE=Release \
     -DCMAKE_INSTALL_PREFIX=/usr/local \
     -DCMAKE_INSTALL_LIBDIR=lib64 \
@@ -350,8 +350,8 @@ RUN cd /opt/build/opencv-4.5.2/build && \
     -DBUILD_TESTS=OFF \
     .. && \
   cd modules/videoio && \
-  make -j "$(nproc)" && \
-  cp -f ../../lib/libopencv_videoio.so.4.5.2 /opt/dist/usr/local/lib64
+  make -j $(nproc) && \
+  cp -f ../../lib/libopencv_videoio.so.4.5.2 /opt/dist/usr/local/lib64 )
 
 # cleanup
 RUN rm -rf /opt/dist/usr/local/include && \

diff --git a/SG1/ubuntu-18.04/media/ffmpeg/Dockerfile b/SG1/ubuntu-18.04/media/ffmpeg/Dockerfile
@@ -358,7 +358,7 @@ RUN cd /opt/build/opencv-4.5.2 && mkdir build && cd build && \
     -DBUILD_PERF_TESTS=OFF \
     -DBUILD_TESTS=OFF \
     .. && \
-  make -j "$(nproc)" && \
+  make -j $(nproc) && \
   make install DESTDIR=/opt/dist && \
   make install
 
@@ -408,7 +408,7 @@ RUN cd /opt/build/opencv-4.5.2/build && \
     -DBUILD_TESTS=OFF \
     .. && \
   cd modules/videoio && \
-  make -j "$(nproc)" && \
+  make -j $(nproc) && \
   cp -f ../../lib/libopencv_videoio.so.4.5.2 /opt/dist/usr/local/lib
 
 # cleanup

diff --git a/SG1/ubuntu-20.04/media/ffmpeg/Dockerfile b/SG1/ubuntu-20.04/media/ffmpeg/Dockerfile
@@ -346,7 +346,7 @@ RUN cd /opt/build/opencv-4.5.2 && mkdir build && cd build && \
     -DBUILD_PERF_TESTS=OFF \
     -DBUILD_TESTS=OFF \
     .. && \
-  make -j "$(nproc)" && \
+  make -j $(nproc) && \
   make install DESTDIR=/opt/dist && \
   make install
 
@@ -396,7 +396,7 @@ RUN cd /opt/build/opencv-4.5.2/build && \
     -DBUILD_TESTS=OFF \
     .. && \
   cd modules/videoio && \
-  make -j "$(nproc)" && \
+  make -j $(nproc) && \
   cp -f ../../lib/libopencv_videoio.so.4.5.2 /opt/dist/usr/local/lib
 
 # cleanup

diff --git a/VCAC-A/ubuntu-18.04/analytics/dev/Dockerfile b/VCAC-A/ubuntu-18.04/analytics/dev/Dockerfile
@@ -422,7 +422,7 @@ RUN cd /opt/build/opencv-4.5.2 && mkdir build && cd build && \
     -DBUILD_PERF_TESTS=OFF \
     -DBUILD_TESTS=OFF \
     .. && \
-  make -j "$(nproc)" && \
+  make -j $(nproc) && \
   make install DESTDIR=/opt/dist && \
   make install
 
@@ -595,7 +595,7 @@ RUN cd /opt/build/opencv-4.5.2/build && \
     -DBUILD_TESTS=OFF \
     .. && \
   cd modules/videoio && \
-  make -j "$(nproc)" && \
+  make -j $(nproc) && \
   cp -f ../../lib/libopencv_videoio.so.4.5.2 /opt/dist/usr/local/lib
 
 RUN apt-get update && \

diff --git a/VCAC-A/ubuntu-18.04/analytics/ffmpeg/Dockerfile b/VCAC-A/ubuntu-18.04/analytics/ffmpeg/Dockerfile
@@ -407,7 +407,7 @@ RUN cd /opt/build/opencv-4.5.2 && mkdir build && cd build && \
     -DBUILD_PERF_TESTS=OFF \
     -DBUILD_TESTS=OFF \
     .. && \
-  make -j "$(nproc)" && \
+  make -j $(nproc) && \
   make install DESTDIR=/opt/dist && \
   make install
 
@@ -455,7 +455,7 @@ RUN cd /opt/build/opencv-4.5.2/build && \
     -DBUILD_TESTS=OFF \
     .. && \
   cd modules/videoio && \
-  make -j "$(nproc)" && \
+  make -j $(nproc) && \
   cp -f ../../lib/libopencv_videoio.so.4.5.2 /opt/dist/usr/local/lib
 
 # cleanup

diff --git a/VCAC-A/ubuntu-18.04/analytics/gst/Dockerfile b/VCAC-A/ubuntu-18.04/analytics/gst/Dockerfile
@@ -401,7 +401,7 @@ RUN cd /opt/build/opencv-4.5.2 && mkdir build && cd build && \
     -DBUILD_PERF_TESTS=OFF \
     -DBUILD_TESTS=OFF \
     .. && \
-  make -j "$(nproc)" && \
+  make -j $(nproc) && \
   make install DESTDIR=/opt/dist && \
   make install
 
@@ -574,7 +574,7 @@ RUN cd /opt/build/opencv-4.5.2/build && \
     -DBUILD_TESTS=OFF \
     .. && \
   cd modules/videoio && \
-  make -j "$(nproc)" && \
+  make -j $(nproc) && \
   cp -f ../../lib/libopencv_videoio.so.4.5.2 /opt/dist/usr/local/lib
 
 RUN apt-get update && \

diff --git a/VCAC-A/ubuntu-20.04/analytics/dev/Dockerfile b/VCAC-A/ubuntu-20.04/analytics/dev/Dockerfile
@@ -196,7 +196,19 @@ RUN cd /opt/build && \
 
 RUN apt-get update && \
   DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
-    ca-certificates meson tar g++ wget pkg-config && \
+    python3-pip ninja-build python3-setuptools && \
+  rm -rf /var/lib/apt/lists/*
+
+# build meson
+ARG MESON_REPO=https://github.com/mesonbuild/meson
+RUN git clone ${MESON_REPO}; \
+    cd meson; \
+    git checkout 0.58.1; \
+    python3 setup.py install;
+
+RUN apt-get update && \
+  DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
+    ca-certificates tar g++ wget pkg-config && \
   rm -rf /var/lib/apt/lists/*
 
 # build dav1d
@@ -396,13 +408,13 @@ RUN cd /opt/build/opencv-4.5.2 && mkdir build && cd build && \
     -DBUILD_PERF_TESTS=OFF \
     -DBUILD_TESTS=OFF \
     .. && \
-  make -j "$(nproc)" && \
+  make -j $(nproc) && \
   make install DESTDIR=/opt/dist && \
   make install
 
 RUN apt-get update && \
   DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
-    ca-certificates meson tar g++ wget pkg-config libglib2.0-dev flex bison gobject-introspection libgirepository1.0-dev && \
+    ca-certificates tar g++ wget pkg-config libglib2.0-dev flex bison gobject-introspection libgirepository1.0-dev && \
   rm -rf /var/lib/apt/lists/*
 
 # build gst-core
@@ -424,7 +436,7 @@ RUN cd /opt/build/gstreamer-1.19.1 && \
 
 RUN apt-get update && \
   DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
-    ca-certificates meson tar g++ gobjc wget pkg-config libglib2.0-dev flex bison gobject-introspection libgirepository1.0-dev libx11-dev libxv-dev libxt-dev libasound2-dev libpango1.0-dev libtheora-dev libvisual-0.4-dev libgl1-mesa-dev libx11-xcb-dev && \
+    ca-certificates tar g++ gobjc wget pkg-config libglib2.0-dev flex bison gobject-introspection libgirepository1.0-dev libx11-dev libxv-dev libxt-dev libasound2-dev libpango1.0-dev libtheora-dev libvisual-0.4-dev libgl1-mesa-dev libx11-xcb-dev && \
   rm -rf /var/lib/apt/lists/*
 
 # build gst-plugin-base
@@ -453,7 +465,7 @@ RUN cd /opt/build/gst-plugins-base-1.19.1 && \
 
 RUN apt-get update && \
   DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
-    git ca-certificates meson tar g++ wget pkg-config libglib2.0-dev flex bison libx11-dev libxv-dev libxt-dev libgdk-pixbuf2.0-dev libjpeg-turbo8-dev libpng-dev zlib1g-dev libsoup2.4-dev  && \
+    git ca-certificates tar g++ wget pkg-config libglib2.0-dev flex bison libx11-dev libxv-dev libxt-dev libgdk-pixbuf2.0-dev libjpeg-turbo8-dev libpng-dev zlib1g-dev libsoup2.4-dev  && \
   rm -rf /var/lib/apt/lists/*
 
 # build gst-plugin-good
@@ -479,7 +491,7 @@ RUN cd /opt/build/gst-plugins-good-1.19.1 && \
 
 RUN apt-get update && \
   DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
-    ca-certificates meson tar g++ wget pkg-config libglib2.0-dev flex bison gobject-introspection libgirepository1.0-dev openssl libcurl4-gnutls-dev librtmp-dev mjpegtools libde265-dev  && \
+    ca-certificates tar g++ wget pkg-config libglib2.0-dev flex bison gobject-introspection libgirepository1.0-dev openssl libcurl4-gnutls-dev librtmp-dev mjpegtools libde265-dev  && \
   rm -rf /var/lib/apt/lists/*
 
 # build gst-plugin-bad
@@ -508,7 +520,7 @@ RUN cd /opt/build && \
 
 RUN apt-get update && \
   DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
-    ca-certificates meson tar g++ wget pkg-config libglib2.0-dev flex bison  && \
+    ca-certificates tar g++ wget pkg-config libglib2.0-dev flex bison  && \
   rm -rf /var/lib/apt/lists/*
 
 # build gst-plugin-ugly
@@ -569,12 +581,12 @@ RUN cd /opt/build/opencv-4.5.2/build && \
     -DBUILD_TESTS=OFF \
     .. && \
   cd modules/videoio && \
-  make -j "$(nproc)" && \
+  make -j $(nproc) && \
   cp -f ../../lib/libopencv_videoio.so.4.5.2 /opt/dist/usr/local/lib
 
 RUN apt-get update && \
   DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
-    ca-certificates tar g++ wget meson && \
+    ca-certificates tar g++ wget  && \
   rm -rf /var/lib/apt/lists/*
 
 # build gst-plugin-libav
@@ -591,7 +603,7 @@ RUN cd /opt/build/gst-libav-1.19.1 && \
 
 RUN apt-get update && \
   DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
-    ca-certificates meson tar g++ wget pkg-config libdrm-dev libglib2.0-dev libudev-dev flex bison  && \
+    ca-certificates tar g++ wget pkg-config libdrm-dev libglib2.0-dev libudev-dev flex bison  && \
   rm -rf /var/lib/apt/lists/*
 
 # patch gst-vaapi with gst-video-analytics patch

diff --git a/VCAC-A/ubuntu-20.04/analytics/dev/Dockerfile.m4 b/VCAC-A/ubuntu-20.04/analytics/dev/Dockerfile.m4
@@ -8,6 +8,7 @@ include(libvpx.m4)
 include(libaom.m4)
 include(libx264.m4)
 include(libx265.m4)
+include(meson.m4)
 include(dav1d.m4)
 include(gmmlib.m4)
 include(libva2.m4)

diff --git a/VCAC-A/ubuntu-20.04/analytics/ffmpeg/Dockerfile b/VCAC-A/ubuntu-20.04/analytics/ffmpeg/Dockerfile
@@ -381,7 +381,7 @@ RUN cd /opt/build/opencv-4.5.2 && mkdir build && cd build && \
     -DBUILD_PERF_TESTS=OFF \
     -DBUILD_TESTS=OFF \
     .. && \
-  make -j "$(nproc)" && \
+  make -j $(nproc) && \
   make install DESTDIR=/opt/dist && \
   make install
 
@@ -429,7 +429,7 @@ RUN cd /opt/build/opencv-4.5.2/build && \
     -DBUILD_TESTS=OFF \
     .. && \
   cd modules/videoio && \
-  make -j "$(nproc)" && \
+  make -j $(nproc) && \
   cp -f ../../lib/libopencv_videoio.so.4.5.2 /opt/dist/usr/local/lib
 
 # cleanup