Merge pull request #644 from jhou5/new_template

fix #610: dav1d build failed due to old version meson
OpenVisualCloud · Jan 28, 2021 · 85af837 · 85af837
2 parents 2a72621 + 5c5f966
commit 85af837
Show file tree

Hide file tree

Showing 29 changed files with 518 additions and 94 deletions.
diff --git a/SG1/ubuntu-18.04/media/dev/Dockerfile b/SG1/ubuntu-18.04/media/dev/Dockerfile
@@ -152,6 +152,29 @@ RUN cd /opt/build && \
     make install DESTDIR=/opt/dist && \
     make install
 
+RUN apt-get update && \
+  DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
+    python3-setuptools && \
+  rm -rf /var/lib/apt/lists/*
+ARG MESON_REPO=https://github.com/mesonbuild/meson
+RUN git clone ${MESON_REPO}; \
+    cd meson; \
+    git checkout 0.53.1; \
+    python3 setup.py install;
+
+RUN apt-get update && \
+  DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
+    ca-certificates meson tar g++ wget pkg-config && \
+  rm -rf /var/lib/apt/lists/*
+ARG DAV1D_REPO=https://code.videolan.org/videolan/dav1d/-/archive/0.7.1/dav1d-0.7.1.tar.gz
+RUN cd /opt/build && \
+  wget -O - ${DAV1D_REPO} | tar xz
+RUN cd /opt/build/dav1d-0.7.1 && \
+  meson build --prefix=/usr/local --libdir /usr/local/lib --buildtype=plain && \
+  cd build && \
+  ninja install && \
+  DESTDIR=/opt/dist ninja install
+
 RUN apt-get update && \
   DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
     ca-certificates wget tar g++ make cmake git && \
@@ -276,7 +299,7 @@ RUN cd /opt/build/FFmpeg-n4.2.2 && \
 RUN cd /opt/build/FFmpeg-n4.2.2 && \
     ./configure --prefix=/usr/local --libdir=/usr/local/lib --enable-shared --disable-static --disable-doc --disable-htmlpages \
     --disable-manpages --disable-podpages --disable-txtpages \
-    --enable-gpl     --enable-nonfree     --enable-libass     --enable-libfreetype     --disable-xlib --disable-sdl2         --enable-libmfx     --enable-vaapi     --enable-libv4l2 --enable-indev=v4l2         --enable-libfdk-aac     --enable-libopus     --enable-libvpx     --enable-libvorbis     --enable-libx264     --enable-libx265     --enable-libsvtav1     --enable-libsvthevc     --enable-libsvtvp9     --enable-libaom         && make -j$(nproc) && \
+    --enable-gpl     --enable-nonfree     --enable-libass     --enable-libfreetype     --disable-xlib --disable-sdl2         --enable-libmfx     --enable-vaapi     --enable-libv4l2 --enable-indev=v4l2         --enable-libfdk-aac     --enable-libopus     --enable-libvpx     --enable-libvorbis     --enable-libx264     --enable-libx265     --enable-libsvtav1     --enable-libsvthevc     --enable-libsvtvp9     --enable-libaom     --enable-libdav1d     && make -j$(nproc) && \
     make install DESTDIR=/opt/dist && \
     make install
 

diff --git a/SG1/ubuntu-18.04/media/dev/Dockerfile.m4 b/SG1/ubuntu-18.04/media/dev/Dockerfile.m4
@@ -9,7 +9,7 @@ include(libvpx.m4)
 include(libaom.m4)
 include(libx264.m4)
 include(libx265.m4)
-#include(dav1d.m4)
+include(dav1d.m4)
 include(svt-hevc.m4)
 include(svt-av1.m4)
 include(svt-vp9.m4)

diff --git a/SG1/ubuntu-18.04/media/ffmpeg/Dockerfile b/SG1/ubuntu-18.04/media/ffmpeg/Dockerfile
@@ -138,6 +138,29 @@ RUN cd /opt/build && \
     make install DESTDIR=/opt/dist && \
     make install
 
+RUN apt-get update && \
+  DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
+    python3-setuptools && \
+  rm -rf /var/lib/apt/lists/*
+ARG MESON_REPO=https://github.com/mesonbuild/meson
+RUN git clone ${MESON_REPO}; \
+    cd meson; \
+    git checkout 0.53.1; \
+    python3 setup.py install;
+
+RUN apt-get update && \
+  DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
+    ca-certificates meson tar g++ wget pkg-config && \
+  rm -rf /var/lib/apt/lists/*
+ARG DAV1D_REPO=https://code.videolan.org/videolan/dav1d/-/archive/0.7.1/dav1d-0.7.1.tar.gz
+RUN cd /opt/build && \
+  wget -O - ${DAV1D_REPO} | tar xz
+RUN cd /opt/build/dav1d-0.7.1 && \
+  meson build --prefix=/usr/local --libdir /usr/local/lib --buildtype=plain && \
+  cd build && \
+  ninja install && \
+  DESTDIR=/opt/dist ninja install
+
 RUN apt-get update && \
   DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
     ca-certificates wget tar g++ make cmake git && \
@@ -262,7 +285,7 @@ RUN cd /opt/build/FFmpeg-n4.2.2 && \
 RUN cd /opt/build/FFmpeg-n4.2.2 && \
     ./configure --prefix=/usr/local --libdir=/usr/local/lib --enable-shared --disable-static --disable-doc --disable-htmlpages \
     --disable-manpages --disable-podpages --disable-txtpages \
-    --enable-gpl     --enable-nonfree     --enable-libass     --enable-libfreetype     --disable-xlib --disable-sdl2         --enable-libmfx     --enable-vaapi     --enable-libv4l2 --enable-indev=v4l2         --enable-libfdk-aac     --enable-libopus     --enable-libvpx     --enable-libvorbis     --enable-libx264     --enable-libx265     --enable-libsvtav1     --enable-libsvthevc     --enable-libsvtvp9             && make -j$(nproc) && \
+    --enable-gpl     --enable-nonfree     --enable-libass     --enable-libfreetype     --disable-xlib --disable-sdl2         --enable-libmfx     --enable-vaapi     --enable-libv4l2 --enable-indev=v4l2         --enable-libfdk-aac     --enable-libopus     --enable-libvpx     --enable-libvorbis     --enable-libx264     --enable-libx265     --enable-libsvtav1     --enable-libsvthevc     --enable-libsvtvp9         --enable-libdav1d     && make -j$(nproc) && \
     make install DESTDIR=/opt/dist && \
     make install
 

diff --git a/SG1/ubuntu-18.04/media/ffmpeg/Dockerfile.m4 b/SG1/ubuntu-18.04/media/ffmpeg/Dockerfile.m4
@@ -8,7 +8,7 @@ include(libopus.m4)
 include(libvpx.m4)
 include(libx264.m4)
 include(libx265.m4)
-#include(dav1d.m4)
+include(dav1d.m4)
 include(svt-hevc.m4)
 include(svt-av1.m4)
 include(svt-vp9.m4)

diff --git a/SG1/ubuntu-20.04/media/dev/Dockerfile b/SG1/ubuntu-20.04/media/dev/Dockerfile
@@ -152,6 +152,19 @@ RUN cd /opt/build && \
     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 && \
+  rm -rf /var/lib/apt/lists/*
+ARG DAV1D_REPO=https://code.videolan.org/videolan/dav1d/-/archive/0.7.1/dav1d-0.7.1.tar.gz
+RUN cd /opt/build && \
+  wget -O - ${DAV1D_REPO} | tar xz
+RUN cd /opt/build/dav1d-0.7.1 && \
+  meson build --prefix=/usr/local --libdir /usr/local/lib --buildtype=plain && \
+  cd build && \
+  ninja install && \
+  DESTDIR=/opt/dist ninja install
+
 RUN apt-get update && \
   DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
     ca-certificates wget tar g++ make cmake git && \
@@ -276,7 +289,7 @@ RUN cd /opt/build/FFmpeg-n4.2.2 && \
 RUN cd /opt/build/FFmpeg-n4.2.2 && \
     ./configure --prefix=/usr/local --libdir=/usr/local/lib --enable-shared --disable-static --disable-doc --disable-htmlpages \
     --disable-manpages --disable-podpages --disable-txtpages \
-    --enable-gpl     --enable-nonfree     --enable-libass     --enable-libfreetype     --disable-xlib --disable-sdl2         --enable-libmfx     --enable-vaapi     --enable-libv4l2 --enable-indev=v4l2         --enable-libfdk-aac     --enable-libopus     --enable-libvpx     --enable-libvorbis     --enable-libx264     --enable-libx265     --enable-libsvtav1     --enable-libsvthevc     --enable-libsvtvp9     --enable-libaom         && make -j$(nproc) && \
+    --enable-gpl     --enable-nonfree     --enable-libass     --enable-libfreetype     --disable-xlib --disable-sdl2         --enable-libmfx     --enable-vaapi     --enable-libv4l2 --enable-indev=v4l2         --enable-libfdk-aac     --enable-libopus     --enable-libvpx     --enable-libvorbis     --enable-libx264     --enable-libx265     --enable-libsvtav1     --enable-libsvthevc     --enable-libsvtvp9     --enable-libaom     --enable-libdav1d     && make -j$(nproc) && \
     make install DESTDIR=/opt/dist && \
     make install
 

diff --git a/SG1/ubuntu-20.04/media/dev/Dockerfile.m4 b/SG1/ubuntu-20.04/media/dev/Dockerfile.m4
@@ -9,7 +9,7 @@ include(libvpx.m4)
 include(libaom.m4)
 include(libx264.m4)
 include(libx265.m4)
-#include(dav1d.m4)
+include(dav1d.m4)
 include(svt-hevc.m4)
 include(svt-av1.m4)
 include(svt-vp9.m4)

diff --git a/Xeon/ubuntu-18.04/analytics/dev/Dockerfile b/Xeon/ubuntu-18.04/analytics/dev/Dockerfile
@@ -151,6 +151,29 @@ RUN cd /opt/build && \
     make install DESTDIR=/opt/dist && \
     make install
 
+RUN apt-get update && \
+  DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
+    python3-setuptools && \
+  rm -rf /var/lib/apt/lists/*
+ARG MESON_REPO=https://github.com/mesonbuild/meson
+RUN git clone ${MESON_REPO}; \
+    cd meson; \
+    git checkout 0.53.1; \
+    python3 setup.py install;
+
+RUN apt-get update && \
+  DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
+    ca-certificates meson tar g++ wget pkg-config && \
+  rm -rf /var/lib/apt/lists/*
+ARG DAV1D_REPO=https://code.videolan.org/videolan/dav1d/-/archive/0.7.1/dav1d-0.7.1.tar.gz
+RUN cd /opt/build && \
+  wget -O - ${DAV1D_REPO} | tar xz
+RUN cd /opt/build/dav1d-0.7.1 && \
+  meson build --prefix=/usr/local --libdir /usr/local/lib --buildtype=plain && \
+  cd build && \
+  ninja install && \
+  DESTDIR=/opt/dist ninja install
+
 RUN apt-get update && \
   DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
     ca-certificates wget tar g++ make cmake git && \
@@ -181,13 +204,16 @@ RUN cd /opt/build && \
 
 RUN apt-get update && \
   DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
-    python3-setuptools && \
+    ca-certificates wget tar g++ make cmake git && \
   rm -rf /var/lib/apt/lists/*
-ARG MESON_REPO=https://github.com/mesonbuild/meson
-RUN git clone ${MESON_REPO}; \
-    cd meson; \
-    git checkout 0.53.1; \
-    python3 setup.py install;
+ARG SVT_VP9_REPO=https://github.com/OpenVisualCloud/SVT-VP9
+RUN cd /opt/build && \
+    git clone ${SVT_VP9_REPO} -b v0.2.1 --depth 1 && \
+    cd SVT-VP9/Build/linux && \
+    cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr/local -DCMAKE_INSTALL_LIBDIR=/usr/local/lib -DCMAKE_ASM_NASM_COMPILER=yasm ../.. && \
+    make -j $(nproc) && \
+    make install DESTDIR=/opt/dist && \
+    make install 
 
 RUN apt-get update && \
   DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
@@ -283,10 +309,13 @@ RUN cd /opt/build && \
 RUN cd /opt/build/FFmpeg-n4.2.2 && \
     patch -p1 < /opt/build/SVT-HEVC/ffmpeg_plugin/0001-lavc-svt_hevc-add-libsvt-hevc-encoder-wrapper.patch || true
 
+RUN cd /opt/build/FFmpeg-n4.2.2 && \
+    patch -p1 < ../SVT-VP9/ffmpeg_plugin/0001-Add-ability-for-ffmpeg-to-run-svt-vp9.patch || true
+
 RUN cd /opt/build/FFmpeg-n4.2.2 && \
     ./configure --prefix=/usr/local --libdir=/usr/local/lib --enable-shared --disable-static --disable-doc --disable-htmlpages \
     --disable-manpages --disable-podpages --disable-txtpages \
-    --enable-gpl     --enable-nonfree     --enable-libass     --enable-libfreetype     --disable-xlib --disable-sdl2             --disable-vaapi     --enable-libv4l2 --enable-indev=v4l2         --enable-libfdk-aac     --enable-libopus     --enable-libvpx     --enable-libvorbis     --enable-libx264     --enable-libx265     --enable-libsvtav1     --enable-libsvthevc     --enable-libaom         && make -j$(nproc) && \
+    --enable-gpl     --enable-nonfree     --enable-libass     --enable-libfreetype     --disable-xlib --disable-sdl2             --disable-vaapi     --enable-libv4l2 --enable-indev=v4l2         --enable-libfdk-aac     --enable-libopus     --enable-libvpx     --enable-libvorbis     --enable-libx264     --enable-libx265     --enable-libsvtav1     --enable-libsvthevc     --enable-libsvtvp9     --enable-libaom     --enable-libdav1d     && make -j$(nproc) && \
     make install DESTDIR=/opt/dist && \
     make install
 

diff --git a/Xeon/ubuntu-18.04/analytics/dev/Dockerfile.m4 b/Xeon/ubuntu-18.04/analytics/dev/Dockerfile.m4
@@ -8,10 +8,10 @@ include(libvpx.m4)
 include(libaom.m4)
 include(libx264.m4)
 include(libx265.m4)
-#include(dav1d.m4)
+include(dav1d.m4)
 include(svt-hevc.m4)
 include(svt-av1.m4)
-#include(svt-vp9.m4)
+include(svt-vp9.m4)
 include(gst-core.m4)
 include(gst-plugins-base.m4)
 include(gst-plugins-good.m4)