diff --git a/QAT/centos-7/media/dev/Dockerfile b/QAT/centos-7/media/dev/Dockerfile index d26e31591..b0e24a415 100644 --- 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 index df58ff2ac..251d05e97 100644 --- 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 index df58ff2ac..251d05e97 100644 --- 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 index 87ba27806..547704630 100644 --- 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 index 8d10c8ede..c5e6947a5 100644 --- 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 index df58ff2ac..251d05e97 100644 --- 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 index df58ff2ac..251d05e97 100644 --- 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 index b8b281e17..02a3b5a74 100644 --- 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 index 785e95025..ba0e8e984 100644 --- 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 index df58ff2ac..251d05e97 100644 --- 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 index df58ff2ac..251d05e97 100644 --- 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 index 80258a19e..892fd664a 100644 --- 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 index 272b7368b..a5c645314 100644 --- a/SG1/centos-7/media/ffmpeg/Dockerfile +++ b/SG1/centos-7/media/ffmpeg/Dockerfile @@ -285,7 +285,7 @@ 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 @@ -293,7 +293,7 @@ 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 index 64d145c13..14d1a6abc 100644 --- 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 index 283d3b030..23cb7f4a8 100644 --- 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 index a53360deb..ecd3520df 100644 --- 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 index 7bca15ffb..a79e518fb 100644 --- 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 index cf954cdd3..810f51732 100644 --- 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 index e762f758b..bad89f24f 100644 --- 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 index 8c8760da8..f63c5d8e3 100644 --- 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 index decb7610d..f08140b33 100644 --- 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 diff --git a/VCAC-A/ubuntu-20.04/analytics/gst/Dockerfile b/VCAC-A/ubuntu-20.04/analytics/gst/Dockerfile index 5c0a68a8a..40ad5b847 100644 --- a/VCAC-A/ubuntu-20.04/analytics/gst/Dockerfile +++ b/VCAC-A/ubuntu-20.04/analytics/gst/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 @@ -375,13 +387,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 @@ -403,7 +415,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 @@ -432,7 +444,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 @@ -458,7 +470,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 @@ -487,7 +499,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 @@ -548,12 +560,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 @@ -570,7 +582,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/gst/Dockerfile.m4 b/VCAC-A/ubuntu-20.04/analytics/gst/Dockerfile.m4 index f067d4d23..18fbc7f36 100644 --- a/VCAC-A/ubuntu-20.04/analytics/gst/Dockerfile.m4 +++ b/VCAC-A/ubuntu-20.04/analytics/gst/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/Xeon/centos-7/analytics/dev/Dockerfile b/Xeon/centos-7/analytics/dev/Dockerfile index a619f9cd6..d57f90032 100644 --- a/Xeon/centos-7/analytics/dev/Dockerfile +++ b/Xeon/centos-7/analytics/dev/Dockerfile @@ -231,7 +231,7 @@ RUN cd /opt/build && \ 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 @@ -239,7 +239,7 @@ 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 \ @@ -249,7 +249,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 @@ -507,7 +507,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 \ @@ -518,8 +518,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 ) RUN yum install -y wget tar gcc-c++ meson diff --git a/Xeon/centos-7/analytics/ffmpeg/Dockerfile b/Xeon/centos-7/analytics/ffmpeg/Dockerfile index 1f8e09ece..b8f247588 100644 --- a/Xeon/centos-7/analytics/ffmpeg/Dockerfile +++ b/Xeon/centos-7/analytics/ffmpeg/Dockerfile @@ -216,7 +216,7 @@ RUN cd /opt/build && \ 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 @@ -224,7 +224,7 @@ 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 \ @@ -234,7 +234,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 @@ -382,7 +382,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 \ @@ -393,8 +393,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/Xeon/centos-7/analytics/gst/Dockerfile b/Xeon/centos-7/analytics/gst/Dockerfile index 12149ab6b..8c874d27e 100644 --- a/Xeon/centos-7/analytics/gst/Dockerfile +++ b/Xeon/centos-7/analytics/gst/Dockerfile @@ -231,7 +231,7 @@ RUN cd /opt/build && \ 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 @@ -239,7 +239,7 @@ 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 \ @@ -249,7 +249,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 @@ -507,7 +507,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 \ @@ -518,8 +518,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 ) RUN yum install -y wget tar gcc-c++ meson diff --git a/Xeon/centos-7/media/ffmpeg/Dockerfile b/Xeon/centos-7/media/ffmpeg/Dockerfile index eb40993dd..d62430391 100644 --- a/Xeon/centos-7/media/ffmpeg/Dockerfile +++ b/Xeon/centos-7/media/ffmpeg/Dockerfile @@ -220,7 +220,7 @@ RUN cd /opt/build && \ make install DESTDIR=/opt/dist && \ make install -RUN yum install -y cmake3 gcc gcc-c++ make wget python36-numpy ccache eigen3-devel +RUN yum install -y cmake3 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 @@ -228,7 +228,7 @@ 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 && \ - cmake3 \ + (. /opt/rh/devtoolset-9/enable && cmake3 \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr/local \ -DCMAKE_INSTALL_LIBDIR=lib64 \ @@ -238,7 +238,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 @@ -269,7 +269,7 @@ RUN cd /opt/build/FFmpeg-n4.4 && \ RUN cd /opt/build/opencv-4.5.2/build && \ rm -rf ./* && \ - cmake3 \ + (. /opt/rh/devtoolset-9/enable && cmake3 \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr/local \ -DCMAKE_INSTALL_LIBDIR=lib64 \ @@ -280,8 +280,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/Xeon/centos-7/service/owt-dev/Dockerfile b/Xeon/centos-7/service/owt-dev/Dockerfile index 9f3198cb1..42877f1a7 100644 --- a/Xeon/centos-7/service/owt-dev/Dockerfile +++ b/Xeon/centos-7/service/owt-dev/Dockerfile @@ -144,7 +144,7 @@ RUN cd /opt/build && \ make install DESTDIR=/opt/dist && \ make install -RUN yum install -y cmake3 gcc gcc-c++ make wget python36-numpy ccache eigen3-devel +RUN yum install -y cmake3 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 @@ -152,7 +152,7 @@ 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 && \ - cmake3 \ + (. /opt/rh/devtoolset-9/enable && cmake3 \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr/local \ -DCMAKE_INSTALL_LIBDIR=lib64 \ @@ -162,7 +162,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 @@ -304,7 +304,7 @@ RUN cd /opt/build/FFmpeg-n4.4 && \ RUN cd /opt/build/opencv-4.5.2/build && \ rm -rf ./* && \ - cmake3 \ + (. /opt/rh/devtoolset-9/enable && cmake3 \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr/local \ -DCMAKE_INSTALL_LIBDIR=lib64 \ @@ -315,8 +315,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 ) RUN yum install -y meson wget tar gcc-c++ glib2-devel bison flex gobject-introspection-devel @@ -509,7 +509,7 @@ RUN cd /opt/build/gst-python-1.19.1 && \ RUN yum install -y python-devel # build boost -ARG BOOST_REPO=http://iweb.dl.sourceforge.net/project/boost/boost/1.76.0/boost_1_76_0.tar.bz2 +ARG BOOST_REPO=http://iweb.dl.sourceforge.net/project/boost/boost/1.65.0/boost_1_65_0.tar.bz2 RUN cd /opt/build && \ wget -O - ${BOOST_REPO} | tar jx RUN cd /opt/build/boost_1_65_0 && \ diff --git a/Xeon/centos-7/service/owt/Dockerfile b/Xeon/centos-7/service/owt/Dockerfile index 09b4844bd..651a982f0 100644 --- a/Xeon/centos-7/service/owt/Dockerfile +++ b/Xeon/centos-7/service/owt/Dockerfile @@ -145,7 +145,7 @@ RUN cd /opt/build && \ make install DESTDIR=/opt/dist && \ make install -RUN yum install -y cmake3 gcc gcc-c++ make wget python36-numpy ccache eigen3-devel +RUN yum install -y cmake3 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 @@ -153,7 +153,7 @@ 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 && \ - cmake3 \ + (. /opt/rh/devtoolset-9/enable && cmake3 \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr/local \ -DCMAKE_INSTALL_LIBDIR=lib64 \ @@ -163,7 +163,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 @@ -305,7 +305,7 @@ RUN cd /opt/build/FFmpeg-n4.4 && \ RUN cd /opt/build/opencv-4.5.2/build && \ rm -rf ./* && \ - cmake3 \ + (. /opt/rh/devtoolset-9/enable && cmake3 \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr/local \ -DCMAKE_INSTALL_LIBDIR=lib64 \ @@ -316,8 +316,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 ) RUN yum install -y meson wget tar gcc-c++ glib2-devel bison flex gobject-introspection-devel @@ -510,7 +510,7 @@ RUN cd /opt/build/gst-python-1.19.1 && \ RUN yum install -y python-devel # build boost -ARG BOOST_REPO=http://iweb.dl.sourceforge.net/project/boost/boost/1.76.0/boost_1_76_0.tar.bz2 +ARG BOOST_REPO=http://iweb.dl.sourceforge.net/project/boost/boost/1.65.0/boost_1_65_0.tar.bz2 RUN cd /opt/build && \ wget -O - ${BOOST_REPO} | tar jx RUN cd /opt/build/boost_1_65_0 && \ diff --git a/Xeon/centos-7/service/owt360/Dockerfile b/Xeon/centos-7/service/owt360/Dockerfile index 31143bd11..3d09a8958 100644 --- a/Xeon/centos-7/service/owt360/Dockerfile +++ b/Xeon/centos-7/service/owt360/Dockerfile @@ -145,7 +145,7 @@ RUN cd /opt/build && \ make install DESTDIR=/opt/dist && \ make install -RUN yum install -y cmake3 gcc gcc-c++ make wget python36-numpy ccache eigen3-devel +RUN yum install -y cmake3 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 @@ -153,7 +153,7 @@ 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 && \ - cmake3 \ + (. /opt/rh/devtoolset-9/enable && cmake3 \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr/local \ -DCMAKE_INSTALL_LIBDIR=lib64 \ @@ -163,7 +163,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 @@ -288,7 +288,7 @@ RUN cd /opt/build/FFmpeg-n4.4 && \ RUN cd /opt/build/opencv-4.5.2/build && \ rm -rf ./* && \ - cmake3 \ + (. /opt/rh/devtoolset-9/enable && cmake3 \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr/local \ -DCMAKE_INSTALL_LIBDIR=lib64 \ @@ -299,17 +299,17 @@ 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 ) # build 360scvp -ARG SCVP_REPO=https://github.com/OpenVisualCloud/Immersive-Video-Sample/archive/v1.4.0.tar.gz +ARG SCVP_REPO=https://github.com/OpenVisualCloud/Immersive-Video-Sample/archive/v1.0.0.tar.gz ENV PYTHONIOENCODING=UTF-8 RUN cd /opt/build && \ wget -O - ${SCVP_REPO} | tar xz && \ - cd Immersive-Video-Sample-1.4.0/src/360SCVP && \ + cd Immersive-Video-Sample-1.0.0/src/360SCVP && \ mkdir build && \ cd build && \ cmake -DCMAKE_INSTALL_PREFIX=/usr/local -DCMAKE_INSTALL_LIBDIR=/usr/local/lib64 ../ && \ diff --git a/Xeon/ubuntu-18.04/analytics/dev/Dockerfile b/Xeon/ubuntu-18.04/analytics/dev/Dockerfile index 912f4ede7..6a53ab8a0 100644 --- a/Xeon/ubuntu-18.04/analytics/dev/Dockerfile +++ b/Xeon/ubuntu-18.04/analytics/dev/Dockerfile @@ -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 @@ -593,7 +593,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/Xeon/ubuntu-18.04/analytics/ffmpeg/Dockerfile b/Xeon/ubuntu-18.04/analytics/ffmpeg/Dockerfile index 893eef59d..e0fa7ad26 100644 --- a/Xeon/ubuntu-18.04/analytics/ffmpeg/Dockerfile +++ b/Xeon/ubuntu-18.04/analytics/ffmpeg/Dockerfile @@ -288,7 +288,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 @@ -453,7 +453,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/Xeon/ubuntu-18.04/analytics/gst/Dockerfile b/Xeon/ubuntu-18.04/analytics/gst/Dockerfile index e3724b1bc..b7a04e1d5 100644 --- a/Xeon/ubuntu-18.04/analytics/gst/Dockerfile +++ b/Xeon/ubuntu-18.04/analytics/gst/Dockerfile @@ -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 @@ -593,7 +593,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/Xeon/ubuntu-18.04/media/ffmpeg/Dockerfile b/Xeon/ubuntu-18.04/media/ffmpeg/Dockerfile index eb7177779..a2d2e05c6 100644 --- a/Xeon/ubuntu-18.04/media/ffmpeg/Dockerfile +++ b/Xeon/ubuntu-18.04/media/ffmpeg/Dockerfile @@ -292,7 +292,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 @@ -337,7 +337,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/Xeon/ubuntu-18.04/service/owt-dev/Dockerfile b/Xeon/ubuntu-18.04/service/owt-dev/Dockerfile index 986147695..1bb88ce9d 100644 --- a/Xeon/ubuntu-18.04/service/owt-dev/Dockerfile +++ b/Xeon/ubuntu-18.04/service/owt-dev/Dockerfile @@ -185,7 +185,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 @@ -327,7 +327,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/Xeon/ubuntu-18.04/service/owt/Dockerfile b/Xeon/ubuntu-18.04/service/owt/Dockerfile index 3d24bd8fa..6f256db71 100644 --- a/Xeon/ubuntu-18.04/service/owt/Dockerfile +++ b/Xeon/ubuntu-18.04/service/owt/Dockerfile @@ -185,7 +185,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 @@ -327,7 +327,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/Xeon/ubuntu-18.04/service/owt360/Dockerfile b/Xeon/ubuntu-18.04/service/owt360/Dockerfile index d7b70080d..396c81cf4 100644 --- a/Xeon/ubuntu-18.04/service/owt360/Dockerfile +++ b/Xeon/ubuntu-18.04/service/owt360/Dockerfile @@ -186,7 +186,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 @@ -328,17 +328,17 @@ 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 # build 360scvp -ARG SCVP_REPO=https://github.com/OpenVisualCloud/Immersive-Video-Sample/archive/v1.4.0.tar.gz +ARG SCVP_REPO=https://github.com/OpenVisualCloud/Immersive-Video-Sample/archive/v1.0.0.tar.gz ENV PYTHONIOENCODING=UTF-8 RUN cd /opt/build && \ wget -O - ${SCVP_REPO} | tar xz && \ - cd Immersive-Video-Sample-1.4.0/src/360SCVP && \ + cd Immersive-Video-Sample-1.0.0/src/360SCVP && \ mkdir build && \ cd build && \ cmake -DCMAKE_INSTALL_PREFIX=/usr/local -DCMAKE_INSTALL_LIBDIR=/usr/local/lib ../ && \ diff --git a/Xeon/ubuntu-20.04/analytics/dev/Dockerfile b/Xeon/ubuntu-20.04/analytics/dev/Dockerfile index 8fa4e89b7..b3f68a593 100644 --- a/Xeon/ubuntu-20.04/analytics/dev/Dockerfile +++ b/Xeon/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 @@ -300,7 +312,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 @@ -403,7 +415,7 @@ RUN { \ 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 @@ -425,7 +437,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 @@ -454,7 +466,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 @@ -480,7 +492,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 @@ -509,7 +521,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 @@ -567,12 +579,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 @@ -589,7 +601,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 tar g++ wget meson && \ + ca-certificates tar g++ wget && \ rm -rf /var/lib/apt/lists/* RUN cd /opt/build/SVT-HEVC/gstreamer-plugin && \ diff --git a/Xeon/ubuntu-20.04/analytics/dev/Dockerfile.m4 b/Xeon/ubuntu-20.04/analytics/dev/Dockerfile.m4 index 161e8c1a2..91bbade16 100644 --- a/Xeon/ubuntu-20.04/analytics/dev/Dockerfile.m4 +++ b/Xeon/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(libjsonc.m4) include(librdkafka.m4) diff --git a/Xeon/ubuntu-20.04/analytics/ffmpeg/Dockerfile b/Xeon/ubuntu-20.04/analytics/ffmpeg/Dockerfile index 4d8699a3c..dae262c67 100644 --- a/Xeon/ubuntu-20.04/analytics/ffmpeg/Dockerfile +++ b/Xeon/ubuntu-20.04/analytics/ffmpeg/Dockerfile @@ -262,7 +262,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 @@ -427,7 +427,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/Xeon/ubuntu-20.04/analytics/gst/Dockerfile b/Xeon/ubuntu-20.04/analytics/gst/Dockerfile index cde11ace6..e42ff2474 100644 --- a/Xeon/ubuntu-20.04/analytics/gst/Dockerfile +++ b/Xeon/ubuntu-20.04/analytics/gst/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 @@ -277,7 +289,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 @@ -403,7 +415,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 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 @@ -425,7 +437,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 @@ -454,7 +466,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 @@ -480,7 +492,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 @@ -509,7 +521,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 @@ -567,12 +579,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 @@ -589,7 +601,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 tar g++ wget meson && \ + ca-certificates tar g++ wget && \ rm -rf /var/lib/apt/lists/* RUN cd /opt/build/SVT-HEVC/gstreamer-plugin && \ diff --git a/Xeon/ubuntu-20.04/analytics/gst/Dockerfile.m4 b/Xeon/ubuntu-20.04/analytics/gst/Dockerfile.m4 index 63879ac22..89e852e05 100644 --- a/Xeon/ubuntu-20.04/analytics/gst/Dockerfile.m4 +++ b/Xeon/ubuntu-20.04/analytics/gst/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(svt-hevc.m4) include(svt-av1.m4) diff --git a/Xeon/ubuntu-20.04/media/dev/Dockerfile b/Xeon/ubuntu-20.04/media/dev/Dockerfile index e32b1bfb0..5d8f80b12 100644 --- a/Xeon/ubuntu-20.04/media/dev/Dockerfile +++ b/Xeon/ubuntu-20.04/media/dev/Dockerfile @@ -197,7 +197,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 @@ -212,7 +224,7 @@ RUN cd /opt/build/dav1d-0.9.0 && \ RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - ca-certificates meson tar g++ wget pkg-config ninja-build && \ + ca-certificates tar g++ wget pkg-config ninja-build && \ rm -rf /var/lib/apt/lists/* # build VMAF @@ -276,7 +288,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 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 @@ -298,7 +310,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 @@ -327,7 +339,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 @@ -353,7 +365,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 @@ -382,7 +394,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 @@ -429,7 +441,7 @@ RUN cd /opt/build/FFmpeg-n4.4 && \ 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 @@ -446,7 +458,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 tar g++ wget meson && \ + ca-certificates tar g++ wget && \ rm -rf /var/lib/apt/lists/* RUN cd /opt/build/SVT-HEVC/gstreamer-plugin && \ diff --git a/Xeon/ubuntu-20.04/media/dev/Dockerfile.m4 b/Xeon/ubuntu-20.04/media/dev/Dockerfile.m4 index 96bab56eb..be2d9b3a7 100644 --- a/Xeon/ubuntu-20.04/media/dev/Dockerfile.m4 +++ b/Xeon/ubuntu-20.04/media/dev/Dockerfile.m4 @@ -9,6 +9,7 @@ include(libvpx.m4) include(libaom.m4) include(libx264.m4) include(libx265.m4) +include(meson.m4) include(dav1d.m4) include(libvmaf.m4) include(svt-hevc.m4) diff --git a/Xeon/ubuntu-20.04/media/ffmpeg/Dockerfile b/Xeon/ubuntu-20.04/media/ffmpeg/Dockerfile index 18e0dd621..f329c1b49 100644 --- a/Xeon/ubuntu-20.04/media/ffmpeg/Dockerfile +++ b/Xeon/ubuntu-20.04/media/ffmpeg/Dockerfile @@ -280,7 +280,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 @@ -325,7 +325,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/Xeon/ubuntu-20.04/media/gst/Dockerfile b/Xeon/ubuntu-20.04/media/gst/Dockerfile index 44995db68..d0327e6df 100644 --- a/Xeon/ubuntu-20.04/media/gst/Dockerfile +++ b/Xeon/ubuntu-20.04/media/gst/Dockerfile @@ -197,7 +197,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 @@ -259,7 +271,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 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 @@ -281,7 +293,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 @@ -310,7 +322,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 @@ -336,7 +348,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 @@ -365,7 +377,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 @@ -412,7 +424,7 @@ RUN cd /opt/build/FFmpeg-n4.4 && \ 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 @@ -429,7 +441,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 tar g++ wget meson && \ + ca-certificates tar g++ wget && \ rm -rf /var/lib/apt/lists/* RUN cd /opt/build/SVT-HEVC/gstreamer-plugin && \ diff --git a/Xeon/ubuntu-20.04/media/gst/Dockerfile.m4 b/Xeon/ubuntu-20.04/media/gst/Dockerfile.m4 index ca4379824..9bfeeb2be 100644 --- a/Xeon/ubuntu-20.04/media/gst/Dockerfile.m4 +++ b/Xeon/ubuntu-20.04/media/gst/Dockerfile.m4 @@ -9,6 +9,7 @@ include(libvpx.m4) include(libaom.m4) include(libx264.m4) include(libx265.m4) +include(meson.m4) include(dav1d.m4) include(svt-hevc.m4) include(svt-av1.m4) diff --git a/XeonE3/centos-7/analytics/dev/Dockerfile b/XeonE3/centos-7/analytics/dev/Dockerfile index 5407205ab..897154507 100644 --- a/XeonE3/centos-7/analytics/dev/Dockerfile +++ b/XeonE3/centos-7/analytics/dev/Dockerfile @@ -292,7 +292,7 @@ RUN cd /opt/build/MediaSDK-intel-mediasdk-21.1.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 @@ -300,7 +300,7 @@ 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 \ @@ -310,7 +310,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 @@ -562,7 +562,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 \ @@ -573,8 +573,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 ) RUN yum install -y wget tar gcc-c++ meson diff --git a/XeonE3/centos-7/analytics/ffmpeg/Dockerfile b/XeonE3/centos-7/analytics/ffmpeg/Dockerfile index 3fdc8bebd..0ac062474 100644 --- a/XeonE3/centos-7/analytics/ffmpeg/Dockerfile +++ b/XeonE3/centos-7/analytics/ffmpeg/Dockerfile @@ -277,7 +277,7 @@ RUN cd /opt/build/MediaSDK-intel-mediasdk-21.1.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 @@ -285,7 +285,7 @@ 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 \ @@ -295,7 +295,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 @@ -448,7 +448,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 \ @@ -459,8 +459,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/XeonE3/centos-7/analytics/gst/Dockerfile b/XeonE3/centos-7/analytics/gst/Dockerfile index e3913bb3c..fafc8d6ba 100644 --- a/XeonE3/centos-7/analytics/gst/Dockerfile +++ b/XeonE3/centos-7/analytics/gst/Dockerfile @@ -274,7 +274,7 @@ RUN cd /opt/build/media-driver-intel-media-21.1.3 && mkdir build && cd build && 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 @@ -282,7 +282,7 @@ 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 \ @@ -292,7 +292,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 @@ -544,7 +544,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 \ @@ -555,8 +555,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 ) RUN yum install -y wget tar gcc-c++ meson diff --git a/XeonE3/centos-7/media/ffmpeg/Dockerfile b/XeonE3/centos-7/media/ffmpeg/Dockerfile index 692cac29e..296029605 100644 --- a/XeonE3/centos-7/media/ffmpeg/Dockerfile +++ b/XeonE3/centos-7/media/ffmpeg/Dockerfile @@ -285,7 +285,7 @@ RUN cd /opt/build/MediaSDK-intel-mediasdk-21.1.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 @@ -293,7 +293,7 @@ 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/XeonE3/centos-7/service/owt-dev/Dockerfile b/XeonE3/centos-7/service/owt-dev/Dockerfile index 0087d60f8..1bf943c65 100644 --- a/XeonE3/centos-7/service/owt-dev/Dockerfile +++ b/XeonE3/centos-7/service/owt-dev/Dockerfile @@ -209,7 +209,7 @@ RUN cd /opt/build/MediaSDK-intel-mediasdk-21.1.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 @@ -217,7 +217,7 @@ 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 \ @@ -227,7 +227,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 @@ -357,7 +357,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 \ @@ -368,8 +368,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 ) RUN yum install -y meson wget tar gcc-c++ glib2-devel bison flex gobject-introspection-devel @@ -562,7 +562,7 @@ RUN cd /opt/build/gst-python-1.19.1 && \ RUN yum install -y python-devel # build boost -ARG BOOST_REPO=http://iweb.dl.sourceforge.net/project/boost/boost/1.76.0/boost_1_76_0.tar.bz2 +ARG BOOST_REPO=http://iweb.dl.sourceforge.net/project/boost/boost/1.65.0/boost_1_65_0.tar.bz2 RUN cd /opt/build && \ wget -O - ${BOOST_REPO} | tar jx RUN cd /opt/build/boost_1_65_0 && \ diff --git a/XeonE3/centos-7/service/owt/Dockerfile b/XeonE3/centos-7/service/owt/Dockerfile index 5636d3fd6..05450681a 100644 --- a/XeonE3/centos-7/service/owt/Dockerfile +++ b/XeonE3/centos-7/service/owt/Dockerfile @@ -156,7 +156,7 @@ RUN cd /opt/build && \ 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 @@ -164,7 +164,7 @@ 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 \ @@ -174,7 +174,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 @@ -358,7 +358,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 \ @@ -369,8 +369,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 ) RUN yum install -y meson wget tar gcc-c++ glib2-devel bison flex gobject-introspection-devel @@ -563,7 +563,7 @@ RUN cd /opt/build/gst-python-1.19.1 && \ RUN yum install -y python-devel # build boost -ARG BOOST_REPO=http://iweb.dl.sourceforge.net/project/boost/boost/1.76.0/boost_1_76_0.tar.bz2 +ARG BOOST_REPO=http://iweb.dl.sourceforge.net/project/boost/boost/1.65.0/boost_1_65_0.tar.bz2 RUN cd /opt/build && \ wget -O - ${BOOST_REPO} | tar jx RUN cd /opt/build/boost_1_65_0 && \ diff --git a/XeonE3/centos-7/service/owt360/Dockerfile b/XeonE3/centos-7/service/owt360/Dockerfile index ed294c4c0..c10eef208 100644 --- a/XeonE3/centos-7/service/owt360/Dockerfile +++ b/XeonE3/centos-7/service/owt360/Dockerfile @@ -210,7 +210,7 @@ RUN cd /opt/build/MediaSDK-intel-mediasdk-21.1.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 @@ -218,7 +218,7 @@ 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 \ @@ -228,7 +228,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 @@ -358,7 +358,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 \ @@ -369,17 +369,17 @@ 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 ) # build 360scvp -ARG SCVP_REPO=https://github.com/OpenVisualCloud/Immersive-Video-Sample/archive/v1.4.0.tar.gz +ARG SCVP_REPO=https://github.com/OpenVisualCloud/Immersive-Video-Sample/archive/v1.0.0.tar.gz ENV PYTHONIOENCODING=UTF-8 RUN cd /opt/build && \ wget -O - ${SCVP_REPO} | tar xz && \ - cd Immersive-Video-Sample-1.4.0/src/360SCVP && \ + cd Immersive-Video-Sample-1.0.0/src/360SCVP && \ mkdir build && \ cd build && \ cmake -DCMAKE_INSTALL_PREFIX=/usr/local -DCMAKE_INSTALL_LIBDIR=/usr/local/lib64 ../ && \ diff --git a/XeonE3/ubuntu-18.04/analytics/dev/Dockerfile b/XeonE3/ubuntu-18.04/analytics/dev/Dockerfile index 8345d8199..46bb32eaa 100644 --- a/XeonE3/ubuntu-18.04/analytics/dev/Dockerfile +++ b/XeonE3/ubuntu-18.04/analytics/dev/Dockerfile @@ -386,7 +386,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 @@ -681,7 +681,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/XeonE3/ubuntu-18.04/analytics/ffmpeg/Dockerfile b/XeonE3/ubuntu-18.04/analytics/ffmpeg/Dockerfile index 8ac2d518f..f317902ca 100644 --- a/XeonE3/ubuntu-18.04/analytics/ffmpeg/Dockerfile +++ b/XeonE3/ubuntu-18.04/analytics/ffmpeg/Dockerfile @@ -371,7 +371,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 @@ -541,7 +541,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/XeonE3/ubuntu-18.04/analytics/gst/Dockerfile b/XeonE3/ubuntu-18.04/analytics/gst/Dockerfile index 58cff425a..76d53948a 100644 --- a/XeonE3/ubuntu-18.04/analytics/gst/Dockerfile +++ b/XeonE3/ubuntu-18.04/analytics/gst/Dockerfile @@ -365,7 +365,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 @@ -660,7 +660,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/XeonE3/ubuntu-18.04/media/ffmpeg/Dockerfile b/XeonE3/ubuntu-18.04/media/ffmpeg/Dockerfile index 8513efadd..8e46ee188 100644 --- a/XeonE3/ubuntu-18.04/media/ffmpeg/Dockerfile +++ b/XeonE3/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/XeonE3/ubuntu-18.04/service/owt-dev/Dockerfile b/XeonE3/ubuntu-18.04/service/owt-dev/Dockerfile index 78b34c46d..24f0b8e41 100644 --- a/XeonE3/ubuntu-18.04/service/owt-dev/Dockerfile +++ b/XeonE3/ubuntu-18.04/service/owt-dev/Dockerfile @@ -251,7 +251,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 @@ -398,7 +398,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/XeonE3/ubuntu-18.04/service/owt/Dockerfile b/XeonE3/ubuntu-18.04/service/owt/Dockerfile index 2ff279250..d8dad4b84 100644 --- a/XeonE3/ubuntu-18.04/service/owt/Dockerfile +++ b/XeonE3/ubuntu-18.04/service/owt/Dockerfile @@ -251,7 +251,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 @@ -398,7 +398,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/XeonE3/ubuntu-18.04/service/owt360/Dockerfile b/XeonE3/ubuntu-18.04/service/owt360/Dockerfile index f2774ab0a..d3bcbe62e 100644 --- a/XeonE3/ubuntu-18.04/service/owt360/Dockerfile +++ b/XeonE3/ubuntu-18.04/service/owt360/Dockerfile @@ -252,7 +252,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 @@ -399,17 +399,17 @@ 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 # build 360scvp -ARG SCVP_REPO=https://github.com/OpenVisualCloud/Immersive-Video-Sample/archive/v1.4.0.tar.gz +ARG SCVP_REPO=https://github.com/OpenVisualCloud/Immersive-Video-Sample/archive/v1.0.0.tar.gz ENV PYTHONIOENCODING=UTF-8 RUN cd /opt/build && \ wget -O - ${SCVP_REPO} | tar xz && \ - cd Immersive-Video-Sample-1.4.0/src/360SCVP && \ + cd Immersive-Video-Sample-1.0.0/src/360SCVP && \ mkdir build && \ cd build && \ cmake -DCMAKE_INSTALL_PREFIX=/usr/local -DCMAKE_INSTALL_LIBDIR=/usr/local/lib ../ && \ diff --git a/XeonE3/ubuntu-20.04/analytics/dev/Dockerfile b/XeonE3/ubuntu-20.04/analytics/dev/Dockerfile index 7081e00ce..46d6a7e85 100644 --- a/XeonE3/ubuntu-20.04/analytics/dev/Dockerfile +++ b/XeonE3/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 @@ -360,7 +372,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 @@ -486,7 +498,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 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 @@ -508,7 +520,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 @@ -537,7 +549,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 @@ -563,7 +575,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 @@ -592,7 +604,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 @@ -655,12 +667,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 @@ -677,7 +689,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 @@ -711,7 +723,7 @@ RUN cd /opt/build/gstreamer-vaapi-1.19.1 && \ 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/* RUN cd /opt/build/SVT-HEVC/gstreamer-plugin && \ diff --git a/XeonE3/ubuntu-20.04/analytics/dev/Dockerfile.m4 b/XeonE3/ubuntu-20.04/analytics/dev/Dockerfile.m4 index 733ae3959..43fb6e6c2 100644 --- a/XeonE3/ubuntu-20.04/analytics/dev/Dockerfile.m4 +++ b/XeonE3/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(svt-hevc.m4) include(svt-av1.m4) diff --git a/XeonE3/ubuntu-20.04/analytics/ffmpeg/Dockerfile b/XeonE3/ubuntu-20.04/analytics/ffmpeg/Dockerfile index 6e182663a..8a0225e3c 100644 --- a/XeonE3/ubuntu-20.04/analytics/ffmpeg/Dockerfile +++ b/XeonE3/ubuntu-20.04/analytics/ffmpeg/Dockerfile @@ -345,7 +345,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 @@ -515,7 +515,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/XeonE3/ubuntu-20.04/analytics/gst/Dockerfile b/XeonE3/ubuntu-20.04/analytics/gst/Dockerfile index a6017124b..a7946e7bc 100644 --- a/XeonE3/ubuntu-20.04/analytics/gst/Dockerfile +++ b/XeonE3/ubuntu-20.04/analytics/gst/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 @@ -339,7 +351,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 @@ -465,7 +477,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 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 @@ -487,7 +499,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 @@ -516,7 +528,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 @@ -542,7 +554,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 @@ -571,7 +583,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 @@ -634,12 +646,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 @@ -656,7 +668,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 @@ -690,7 +702,7 @@ RUN cd /opt/build/gstreamer-vaapi-1.19.1 && \ 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/* RUN cd /opt/build/SVT-HEVC/gstreamer-plugin && \ diff --git a/XeonE3/ubuntu-20.04/analytics/gst/Dockerfile.m4 b/XeonE3/ubuntu-20.04/analytics/gst/Dockerfile.m4 index 930643983..16138b98e 100644 --- a/XeonE3/ubuntu-20.04/analytics/gst/Dockerfile.m4 +++ b/XeonE3/ubuntu-20.04/analytics/gst/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(svt-hevc.m4) include(svt-av1.m4) diff --git a/XeonE3/ubuntu-20.04/media/dev/Dockerfile b/XeonE3/ubuntu-20.04/media/dev/Dockerfile index a1f2f47f3..148cb2ed7 100644 --- a/XeonE3/ubuntu-20.04/media/dev/Dockerfile +++ b/XeonE3/ubuntu-20.04/media/dev/Dockerfile @@ -197,7 +197,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 @@ -212,7 +224,7 @@ RUN cd /opt/build/dav1d-0.9.0 && \ RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - ca-certificates meson tar g++ wget pkg-config ninja-build && \ + ca-certificates tar g++ wget pkg-config ninja-build && \ rm -rf /var/lib/apt/lists/* # build VMAF @@ -342,7 +354,7 @@ RUN cd /opt/build/MediaSDK-intel-mediasdk-21.1.3 && \ 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 @@ -364,7 +376,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 @@ -393,7 +405,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 @@ -419,7 +431,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 @@ -448,7 +460,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 @@ -500,7 +512,7 @@ RUN cd /opt/build/FFmpeg-n4.4 && \ 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 @@ -517,7 +529,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 tar g++ wget meson && \ + ca-certificates tar g++ wget && \ rm -rf /var/lib/apt/lists/* RUN cd /opt/build/SVT-HEVC/gstreamer-plugin && \ @@ -538,7 +550,7 @@ RUN cd /opt/build/SVT-VP9/gstreamer-plugin && \ 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/XeonE3/ubuntu-20.04/media/dev/Dockerfile.m4 b/XeonE3/ubuntu-20.04/media/dev/Dockerfile.m4 index 7121b064c..0b2c73b13 100644 --- a/XeonE3/ubuntu-20.04/media/dev/Dockerfile.m4 +++ b/XeonE3/ubuntu-20.04/media/dev/Dockerfile.m4 @@ -9,6 +9,7 @@ include(libvpx.m4) include(libaom.m4) include(libx264.m4) include(libx265.m4) +include(meson.m4) include(dav1d.m4) include(libvmaf.m4) include(svt-hevc.m4) diff --git a/XeonE3/ubuntu-20.04/media/ffmpeg/Dockerfile b/XeonE3/ubuntu-20.04/media/ffmpeg/Dockerfile index bd10b44aa..7e11d4515 100644 --- a/XeonE3/ubuntu-20.04/media/ffmpeg/Dockerfile +++ b/XeonE3/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/XeonE3/ubuntu-20.04/media/gst/Dockerfile b/XeonE3/ubuntu-20.04/media/gst/Dockerfile index bf3f2a192..eef017cfb 100644 --- a/XeonE3/ubuntu-20.04/media/gst/Dockerfile +++ b/XeonE3/ubuntu-20.04/media/gst/Dockerfile @@ -197,7 +197,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 @@ -304,7 +316,7 @@ RUN cd /opt/build/media-driver-intel-media-21.1.3 && mkdir build && cd 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 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 @@ -326,7 +338,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 @@ -355,7 +367,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 @@ -381,7 +393,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 @@ -410,7 +422,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 @@ -462,7 +474,7 @@ RUN cd /opt/build/FFmpeg-n4.4 && \ 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 @@ -479,7 +491,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 tar g++ wget meson && \ + ca-certificates tar g++ wget && \ rm -rf /var/lib/apt/lists/* RUN cd /opt/build/SVT-HEVC/gstreamer-plugin && \ @@ -500,7 +512,7 @@ RUN cd /opt/build/SVT-VP9/gstreamer-plugin && \ 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/XeonE3/ubuntu-20.04/media/gst/Dockerfile.m4 b/XeonE3/ubuntu-20.04/media/gst/Dockerfile.m4 index 0f7a9824f..59f4ecdbe 100644 --- a/XeonE3/ubuntu-20.04/media/gst/Dockerfile.m4 +++ b/XeonE3/ubuntu-20.04/media/gst/Dockerfile.m4 @@ -9,6 +9,7 @@ include(libvpx.m4) include(libaom.m4) include(libx264.m4) include(libx265.m4) +include(meson.m4) include(dav1d.m4) include(svt-hevc.m4) include(svt-av1.m4) diff --git a/template/components/boost.m4 b/template/components/boost.m4 index 202fea4b4..c169cc972 100644 --- a/template/components/boost.m4 +++ b/template/components/boost.m4 @@ -30,7 +30,7 @@ dnl OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. dnl include(begin.m4) -DECLARE(`BOOST_VER',1.76.0) +DECLARE(`BOOST_VER',1.65.0) ifelse(OS_NAME,centos,` define(`BOOST_BUILD_DEPS',`python-devel') @@ -38,7 +38,7 @@ define(`BOOST_BUILD_DEPS',`python-devel') define(`BUILD_BOOST',` # build boost -ARG BOOST_REPO=http://iweb.dl.sourceforge.net/project/boost/boost/BOOST_VER/boost_1_76_0.tar.bz2 +ARG BOOST_REPO=http://iweb.dl.sourceforge.net/project/boost/boost/BOOST_VER/boost_1_65_0.tar.bz2 RUN cd BUILD_HOME && \ wget -O - ${BOOST_REPO} | tar jx RUN cd BUILD_HOME/boost_1_65_0 && \ diff --git a/template/components/opencv.m4 b/template/components/opencv.m4 index 7444d3b9e..cbfa22377 100644 --- a/template/components/opencv.m4 +++ b/template/components/opencv.m4 @@ -37,7 +37,7 @@ define(`OPENCV_BUILD_DEPS',`ca-certificates ifdef(`BUILD_CMAKE',,cmake) gcc g++ ') ifelse(OS_NAME,centos,` -define(`OPENCV_BUILD_DEPS',`ifdef(`BUILD_CMAKE',,cmake3) gcc gcc-c++ make wget python36-numpy ccache eigen3-devel') +define(`OPENCV_BUILD_DEPS',`ifdef(`BUILD_CMAKE',,cmake3) gcc gcc-c++ make wget python36-numpy ccache eigen3-devel ifelse(OS_VERSION,7,devtoolset-9)') ') define(`BUILD_OPENCV',` @@ -47,7 +47,7 @@ RUN cd BUILD_HOME && \ wget -O - ${OPENCV_REPO} | tar xz # TODO: file a bug against opencv since they do not accept full libdir RUN cd BUILD_HOME/opencv-OPENCV_VER && mkdir build && cd build && \ - ifdef(`BUILD_CMAKE',cmake,ifelse(OS_NAME,centos,cmake3,cmake)) \ + 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=patsubst(BUILD_LIBDIR,BUILD_PREFIX/) \ @@ -57,7 +57,7 @@ RUN cd BUILD_HOME/opencv-OPENCV_VER && mkdir build && cd build && \ -DBUILD_PERF_TESTS=OFF \ -DBUILD_TESTS=OFF \ .. && \ - make -j "$(nproc)" && \ + make -j $(nproc)ifelse(OS_NAME:OS_VERSION,centos:7,` )') && \ make install DESTDIR=BUILD_DESTDIR && \ make install ') @@ -65,7 +65,7 @@ RUN cd BUILD_HOME/opencv-OPENCV_VER && mkdir build && cd build && \ define(`REBUILD_OPENCV_VIDEOIO',` RUN cd BUILD_HOME/opencv-OPENCV_VER/build && \ rm -rf ./* && \ - ifdef(`BUILD_CMAKE',cmake,ifelse(OS_NAME,centos,cmake3,cmake)) \ + 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=patsubst(BUILD_LIBDIR,BUILD_PREFIX/) \ @@ -76,8 +76,8 @@ RUN cd BUILD_HOME/opencv-OPENCV_VER/build && \ -DBUILD_TESTS=OFF \ .. && \ cd modules/videoio && \ - make -j "$(nproc)" && \ - cp -f ../../lib/libopencv_videoio.so.OPENCV_VER defn(`BUILD_DESTDIR',`BUILD_LIBDIR') + make -j $(nproc) && \ + cp -f ../../lib/libopencv_videoio.so.OPENCV_VER defn(`BUILD_DESTDIR',`BUILD_LIBDIR')ifelse(OS_NAME:OS_VERSION,centos:7,` )') ') REG(OPENCV) diff --git a/template/components/qat-engine.m4 b/template/components/qat-engine.m4 index b21a5d50b..0a1619e61 100644 --- a/template/components/qat-engine.m4 +++ b/template/components/qat-engine.m4 @@ -52,7 +52,7 @@ RUN cd BUILD_HOME && \ cd QAT_Engine* && \ ./autogen.sh && \ export PERL5LIB="$(ls -1 -d BUILD_HOME/openssl-*)" && \ - ./configure --with-qat_dir=/opt/intel/QAT --with-openssl_dir="$PERL5LIB" --with-openssl_install_dir=BUILD_PREFIX/ssl --prefix=/opt/intel/QATengine --disable-qat_ecx --with-cc-opt="-DQAT_DISABLE_NONZERO_MEMFREE ifdef(`BUILD_QAT_CRYPTOMB',-IBUILD_HOME/ipp-crypto-QAT_CRYPTOMB_VER/sources/ippcp/crypto_mb/include)" ifdef(`BUILD_QAT_CRYPTOMB',--enable-multibuff_offload --enable-multibuff_ecx --enable-qat_sw, --enable-qat_hw --with-qat_hw_dir=/opt/intel/QAT) && \ + ./configure --with-qat_dir=/opt/intel/QAT --with-openssl_dir="$PERL5LIB" --with-openssl_install_dir=BUILD_PREFIX/ssl --prefix=/opt/intel/QATengine --disable-qat_ecx --with-cc-opt="-DQAT_DISABLE_NONZERO_MEMFREE ifdef(`BUILD_QAT_CRYPTOMB',-I`'BUILD_HOME/ipp-crypto-QAT_CRYPTOMB_VER/sources/ippcp/crypto_mb/include)" ifdef(`BUILD_QAT_CRYPTOMB',--enable-multibuff_offload --enable-multibuff_ecx --enable-qat_sw, --enable-qat_hw --with-qat_hw_dir=/opt/intel/QAT) && \ make -j8 && \ make install && \ tar cf - BUILD_PREFIX/ssl | (cd BUILD_DESTDIR && tar xf -) diff --git a/template/components/scvp.m4 b/template/components/scvp.m4 index 9d032a4c2..e0d8b5f87 100644 --- a/template/components/scvp.m4 +++ b/template/components/scvp.m4 @@ -30,7 +30,7 @@ dnl OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. dnl include(begin.m4) -DECLARE(`SCVP_VER',1.4.0) +DECLARE(`SCVP_VER',1.0.0) define(`BUILD_SCVP',` # build 360scvp diff --git a/test/dldt_ffmpeg_video_analytics.sh b/test/dldt_ffmpeg_video_analytics.sh deleted file mode 100755 index 29c15f3f2..000000000 --- a/test/dldt_ffmpeg_video_analytics.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/bash -e - -if grep --quiet 'NAME="CentOS Linux"' /etc/os-release; then - yum install -y centos-release-scl wget - yum install -y rh-python36 - source /opt/rh/rh-python36/enable -else - apt-get update - apt-get install -y wget make python3 python3-pip -fi - -pip3 install pyyaml requests - -wget -q -O - https://github.com/opencv/open_model_zoo/archive/2018_R5.tar.gz | tar xz && \ - cd open_model_zoo-2018_R5 && \ - cd model_downloader && \ - ./downloader.py --name vehicle-license-plate-detection-barrier-0106,vehicle-attributes-recognition-barrier-0039 - -dd if=/dev/urandom bs=115200 count=300 of=test.yuv # 10 seconds video -ffmpeg -f rawvideo -vcodec rawvideo -s 320x240 -r 30 -pix_fmt yuv420p -i test.yuv -c:v libx264 -y test.mp4 -ffmpeg -i test.mp4 -vf \ - "detect=model=/home/open_model_zoo-2018_R5/model_downloader/Security/object_detection/barrier/0106/dldt/vehicle-license-plate-detection-barrier-0106.xml:device=CPU, \ - classify=model=/home/open_model_zoo-2018_R5/model_downloader/Security/object_attributes/vehicle/resnet10_update_1/dldt/vehicle-attributes-recognition-barrier-0039.xml:device=CPU" \ - -f null /dev/null diff --git a/test/dldt_ffmpeg_video_analytics_vcaca.sh b/test/dldt_ffmpeg_video_analytics_vcaca.sh deleted file mode 100755 index efca6c531..000000000 --- a/test/dldt_ffmpeg_video_analytics_vcaca.sh +++ /dev/null @@ -1,31 +0,0 @@ -#!/bin/bash -e - -if grep --quiet 'NAME="CentOS Linux"' /etc/os-release; then - yum install -y centos-release-scl wget - yum install -y rh-python36 - source /opt/rh/rh-python36/enable -else - apt-get update - apt-get install -y wget make python3 python3-pip - if grep --quiet 'Ubuntu 18' /etc/os-release; then - apt-get install -y libjson-c3 - elif grep --quiet 'Ubuntu 20' /etc/os-release; then - apt-get install -y libjson-c4 - fi -fi - -pip3 install pyyaml requests - -if grep --quiet 'Ubuntu' /etc/os-release; then - wget https://download.01.org/opencv/2021/openvinotoolkit/2021.1/open_model_zoo/models_bin/2/vehicle-license-plate-detection-barrier-0106/FP16/vehicle-license-plate-detection-barrier-0106.xml - wget https://download.01.org/opencv/2021/openvinotoolkit/2021.1/open_model_zoo/models_bin/2/vehicle-license-plate-detection-barrier-0106/FP16/vehicle-license-plate-detection-barrier-0106.bin - wget https://download.01.org/opencv/2021/openvinotoolkit/2021.1/open_model_zoo/models_bin/2/vehicle-attributes-recognition-barrier-0039/FP16/vehicle-attributes-recognition-barrier-0039.bin - wget https://download.01.org/opencv/2021/openvinotoolkit/2021.1/open_model_zoo/models_bin/2/vehicle-attributes-recognition-barrier-0039/FP16/vehicle-attributes-recognition-barrier-0039.xml - - dd if=/dev/urandom bs=115200 count=300 of=test.yuv # 10 seconds video - ffmpeg -f rawvideo -vcodec rawvideo -s 320x240 -r 30 -pix_fmt yuv420p -i test.yuv -c:v libx264 -y test.mp4 - ffmpeg -i test.mp4 -vf \ - "detect=model=vehicle-license-plate-detection-barrier-0106.xml:device=HDDL, \ - classify=model=vehicle-attributes-recognition-barrier-0039.xml:device=HDDL" \ - -f null /dev/null; -fi diff --git a/test/ffmpeg_flv_hevc.sh b/test/ffmpeg_flv_hevc.sh deleted file mode 100755 index 7a4eba5f1..000000000 --- a/test/ffmpeg_flv_hevc.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash -e - -dd if=/dev/urandom bs=115200 count=300 of=test.yuv # 10 seconds video -ffmpeg -f rawvideo -vcodec rawvideo -s 320x240 -r 30 -pix_fmt yuv420p -i test.yuv -c:v libsvt_hevc -f flv -y test.flv diff --git a/test/ffmpeg_ivf_av1.sh b/test/ffmpeg_ivf_av1.sh index 1c1e85a6f..6342f029b 100755 --- a/test/ffmpeg_ivf_av1.sh +++ b/test/ffmpeg_ivf_av1.sh @@ -1,4 +1,4 @@ #!/bin/bash -e dd if=/dev/urandom bs=115200 count=30 of=test.yuv # 30 frames -ffmpeg -f rawvideo -vcodec rawvideo -s 320x240 -r 30 -pix_fmt yuv420p -i test.yuv -c:v libsvt_av1 -f ivf -y test.ivf +ffmpeg -f rawvideo -vcodec rawvideo -s 320x240 -r 30 -pix_fmt yuv420p -i test.yuv -c:v libsvtav1 -f ivf -y test.ivf diff --git a/test/ffmpeg_svt_av1.sh b/test/ffmpeg_svt_av1.sh index cd378f0cb..cb8bb6e41 100755 --- a/test/ffmpeg_svt_av1.sh +++ b/test/ffmpeg_svt_av1.sh @@ -1,5 +1,5 @@ #!/bin/bash -e dd if=/dev/urandom bs=115200 count=30 of=test.yuv # 30 frames -ffmpeg -f rawvideo -vcodec rawvideo -s 320x240 -r 30 -pix_fmt yuv420p -i test.yuv -c:v libsvt_av1 -y test.mp4 +ffmpeg -f rawvideo -vcodec rawvideo -s 320x240 -r 30 -pix_fmt yuv420p -i test.yuv -c:v libsvtav1 -y test.mp4 ffprobe -v error -show_streams test.mp4 diff --git a/test/nginx_dash_hevc.sh b/test/ffmpeg_svt_dash.sh similarity index 69% rename from test/nginx_dash_hevc.sh rename to test/ffmpeg_svt_dash.sh index 6cd7b0e09..f30b8e882 100755 --- a/test/nginx_dash_hevc.sh +++ b/test/ffmpeg_svt_dash.sh @@ -1,14 +1,11 @@ #!/bin/bash -ve -nginx & - case "$1" in *ubuntu*) apt-get update && apt-get install -y -q --no-install-recommends curl;; *centos*) yum install -y -q curl;; esac - + dd if=/dev/urandom bs=115200 count=300 of=test.yuv # 10 seconds video -ffmpeg -re -f rawvideo -vcodec rawvideo -s 320x240 -r 30 -pix_fmt yuv420p -i test.yuv -c:v libsvt_hevc -f flv rtmp://localhost/dash/test -curl -sSf http://localhost/dash/test/index.mpd +ffmpeg -re -f rawvideo -vcodec rawvideo -s 320x240 -r 30 -pix_fmt yuv420p -i test.yuv -c:v libsvt_hevc -f dash ./test_dash.mpd diff --git a/test/nginx_hls_hevc.sh b/test/ffmpeg_svt_hls.sh similarity index 69% rename from test/nginx_hls_hevc.sh rename to test/ffmpeg_svt_hls.sh index f8355f65f..6f8cd6f51 100755 --- a/test/nginx_hls_hevc.sh +++ b/test/ffmpeg_svt_hls.sh @@ -1,14 +1,11 @@ #!/bin/bash -ve -nginx & - case "$1" in *ubuntu*) apt-get update && apt-get install -y -q --no-install-recommends curl;; *centos*) yum install -y -q curl;; -esac +esac dd if=/dev/urandom bs=115200 count=300 of=test.yuv # 10 seconds video -ffmpeg -re -f rawvideo -vcodec rawvideo -s 320x240 -r 30 -pix_fmt yuv420p -i test.yuv -c:v libsvt_hevc -f flv rtmp://localhost/hls/test -curl -sSf http://localhost/hls/test/index.m3u8 +ffmpeg -re -f rawvideo -vcodec rawvideo -s 320x240 -r 30 -pix_fmt yuv420p -i test.yuv -c:v libsvt_hevc -f hls ./test_hls.m3u8 diff --git a/test/ffmpeg_svt_vp9.sh b/test/ffmpeg_svt_vp9.sh deleted file mode 100755 index bab2dd1c1..000000000 --- a/test/ffmpeg_svt_vp9.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash -e - -dd if=/dev/urandom bs=115200 count=30 of=test.yuv # 30 frames -ffmpeg -f rawvideo -vcodec rawvideo -s 320x240 -r 30 -pix_fmt yuv420p -i test.yuv -c:v libsvt_vp9 -y test.mp4 -ffprobe -v error -show_streams test.mp4 diff --git a/test/gst_svt.sh b/test/gst_svt.sh index 80db9b24e..627462534 100755 --- a/test/gst_svt.sh +++ b/test/gst_svt.sh @@ -8,5 +8,5 @@ gst-launch-1.0 -v filesrc location=test.yuv ! videoparse format=i420 width=320 h gst-launch-1.0 -v filesrc location=test.mkv ! decodebin ! filesink location=test.xx gst-launch-1.0 -v filesrc location=test.yuv ! videoparse format=i420 width=320 height=240 framerate=30 ! svtav1enc ! webmmux ! filesink location=test.mkv -gst-launch-1.0 -v filesrc location=test.mkv ! decodebin ! filesink location=test.xx +gst-launch-1.0 -v filesrc location=test.mkv ! matroskademux ! av1dec ! y4menc ! filesink location=test1.y4m diff --git a/test/nginx_rtmp_hevc.sh b/test/nginx_rtmp_hevc.sh deleted file mode 100755 index 3c0345430..000000000 --- a/test/nginx_rtmp_hevc.sh +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/bash -ve - -sed -i 's/worker_processes auto/worker_processes 1/' /etc/nginx/nginx.conf - -nginx & - -case "$1" in - *ubuntu*) - apt-get update && apt-get install -y -q --no-install-recommends curl;; - *centos*) - yum install -y -q curl;; -esac - -curl -sSf http://localhost/stat -dd if=/dev/urandom bs=115200 count=300 of=test.yuv # 10 seconds video -ffmpeg -i rtmp://localhost/stream/test -vcodec copy -acodec copy -f flv test.flv < /dev/null & -ffmpeg -re -f rawvideo -vcodec rawvideo -s 320x240 -r 30 -pix_fmt yuv420p -i test.yuv -c:v libsvt_hevc -f flv rtmp://localhost/stream/test -sleep 1 -if test -f test.flv; then exit 0; else exit -1; fi - -sed -i 's/worker_processes 1/worker_processes auto/' /etc/nginx/nginx.conf