From 732fe31f8b29d17d0ee0faf398a6818e89d653cd Mon Sep 17 00:00:00 2001
From: Cameron Gutman <aicommander@gmail.com>
Date: Wed, 5 Feb 2020 18:20:52 -0800
Subject: [PATCH] Use libnvmpi1.0.0 package instead of building it ourselves

---
 .gitmodules               |  3 ---
 Dockerfile.bionic.aarch64 | 12 ++++++------
 jetson-ffmpeg             |  1 -
 scripts/build-deps.sh     |  9 +--------
 4 files changed, 7 insertions(+), 18 deletions(-)
 delete mode 160000 jetson-ffmpeg

diff --git a/.gitmodules b/.gitmodules
index 6804178..e5d5c9c 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -4,6 +4,3 @@
 [submodule "nv-codec-headers"]
 	path = nv-codec-headers
 	url = https://git.videolan.org/git/ffmpeg/nv-codec-headers.git
-[submodule "jetson-ffmpeg"]
-	path = jetson-ffmpeg
-	url = https://github.com/cgutman/jetson-ffmpeg.git
diff --git a/Dockerfile.bionic.aarch64 b/Dockerfile.bionic.aarch64
index 4a47d52..889ffcb 100644
--- a/Dockerfile.bionic.aarch64
+++ b/Dockerfile.bionic.aarch64
@@ -2,20 +2,20 @@ FROM nvcr.io/nvidia/l4t-base:r32.3.1
 
 RUN set -ex && \
     export DEBIAN_FRONTEND=noninteractive && \
+    echo "deb https://dl.bintray.com/cgutman/moonlight-l4t bionic main" >> /etc/apt/sources.list && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 379CE192D401AB61 && \
     apt-get update && \
-    apt-get install -y g++ make devscripts debhelper coreutils git wget nasm cmake libv4l-dev && \
-    apt-get install -y libssl-dev qtbase5-dev qtquickcontrols2-5-dev qtdeclarative5-dev libqt5svg5-dev libgl1-mesa-dev libegl1-mesa-dev libxkbcommon-dev wayland-protocols libopus-dev libva-dev libvdpau-dev libsdl2-dev libsdl2-ttf-dev && \
+    apt-get install -y libnvmpi1.0.0 && \
+    apt-get install -y g++ make devscripts debhelper git nasm && \
+    apt-get install -y --no-install-recommends libssl-dev qtbase5-dev qtquickcontrols2-5-dev qtdeclarative5-dev libqt5svg5-dev libgl1-mesa-dev libegl1-mesa-dev libxkbcommon-dev wayland-protocols libopus-dev libva-dev libvdpau-dev libsdl2-dev libsdl2-ttf-dev && \
     apt-get clean -y && \
     rm -rf /var/lib/apt/lists/*
 
 COPY FFmpeg /opt/FFmpeg
-COPY jetson-ffmpeg /opt/jetson-ffmpeg
 
 COPY scripts/build-deps.sh /opt/scripts/
-RUN /bin/bash -c /opt/scripts/build-deps.sh
-
 COPY scripts/build-package.sh /opt/scripts/
 COPY debian /opt/debian
 
 VOLUME "/out"
-ENTRYPOINT [ "/bin/bash", "-c", "/opt/scripts/build-package.sh" ]
+ENTRYPOINT [ "/bin/bash", "-c", "/opt/scripts/build-deps.sh && /opt/scripts/build-package.sh" ]
diff --git a/jetson-ffmpeg b/jetson-ffmpeg
deleted file mode 160000
index caac989..0000000
--- a/jetson-ffmpeg
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit caac989993476b92c8a571e466a080167eba96dd
diff --git a/scripts/build-deps.sh b/scripts/build-deps.sh
index ca4e6bb..915b2f4 100755
--- a/scripts/build-deps.sh
+++ b/scripts/build-deps.sh
@@ -8,14 +8,6 @@ if [ "$ARCH" == "armv7l" ]; then
     # Enable MMAL decoders
     EXTRA_FFMPEG_ARGS="--enable-mmal --enable-decoder=h264_mmal"
 elif [ "$ARCH" == "aarch64" ]; then
-    # We need to build libnvmpi
-    cd /opt/jetson-ffmpeg
-    mkdir build
-    cd build
-    cmake ..
-    make -j$(nproc)
-    make install
-
     # Enable NVMPI decoders
     EXTRA_FFMPEG_ARGS="--enable-nvmpi --enable-decoder=h264_nvmpi --enable-decoder=hevc_nvmpi"
 elif [ "$ARCH" == "x86_64" ]; then
@@ -23,6 +15,7 @@ elif [ "$ARCH" == "x86_64" ]; then
     cd /opt/nv-codec-headers
     make install PREFIX=/usr
 
+    # Enable NVDEC decoders
     EXTRA_FFMPEG_ARGS="--enable-nvdec --enable-hwaccel=h264_nvdec --enable-hwaccel=hevc_nvdec"
 else
     echo "Unrecognized architecture: $ARCH"