From 1091457530d196e40a562ded54e417eff444fa42 Mon Sep 17 00:00:00 2001
From: Simon Bruder <simon@sbruder.de>
Date: Sat, 16 May 2020 21:58:07 +0200
Subject: [PATCH] Update getnative (now packaged as python module)

---
 Dockerfile | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 1d03a23..525672c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -58,13 +58,13 @@ RUN cd /tmp \
     && cd .. \
     && rm -rf VS-ContinuityFixer
 
-# double speed for getnative
+# TODO: Remove when newer version is in deb-multimedia
 RUN cd /tmp \
-    && git clone --depth=1 https://github.com/OrangeChannel/vapoursynth-descale \
+    && git clone --depth=1 https://github.com/Irrational-Encoding-Wizardry/vapoursynth-descale \
     && cd vapoursynth-descale \
-    && g++ -std=c++17 -shared -fPIC -O2 descale.cpp -o libdescale_getnative.so \
-    && cp descale.py /usr/lib/python3/dist-packages/descale_getnative.py \
-    && cp libdescale_getnative.so /usr/lib/x86_64-linux-gnu/vapoursynth/ \
+    && meson build \
+    && ninja -C build \
+    && cp build/libdescale.so /usr/lib/x86_64-linux-gnu/vapoursynth/ \
     && cd .. \
     && rm -rf vapoursynth-descale
 
@@ -104,7 +104,6 @@ RUN apt-get -y install \
 RUN cp -r /usr/share/vapoursynth-waifu2x-models/ /usr/lib/x86_64-linux-gnu/vapoursynth/models/
 
 RUN pip3 --no-cache-dir install \
-        matplotlib \
         tqdm \
         yuuno 'prompt-toolkit<2.1.0,>=2.0.0' \
     && yuuno jupyter install
@@ -131,9 +130,14 @@ RUN mkdir /usr/local/lib/vapoursynth-scripts/ \
         https://github.com/theChaosCoder/lostfunc/raw/master/lostfunc.py \
     && chmod 755 /usr/local/lib/vapoursynth-scripts/*
 
-RUN git clone --depth=1 https://github.com/Infiziert90/getnative /usr/local/lib/vapoursynth-scripts/getnative \
-    && echo "#!/bin/sh\npython3 /usr/local/lib/vapoursynth-scripts/getnative/getnative.py \$@" >> /usr/local/bin/getnative \
-    && chmod +x /usr/local/bin/getnative
+# Installing that way because I use the system (dmo) VapourSynth and want to
+# avoid conflicts
+RUN git clone --depth=1 https://github.com/Infiziert90/getnative \
+    && cd getnative \
+    && sed -i -e 's/VapourSynth.*//' requirements.txt \
+    && pip3 install . \
+    && cd .. \
+    && rm -rf getnative
 
 RUN adduser --disabled-password --gecos '' vapoursynth
 USER vapoursynth