From 904f300ead936eca71978fd80e581311660c8c00 Mon Sep 17 00:00:00 2001 From: Kristian Ollikainen <14197772+DatCaptainHorse@users.noreply.github.com> Date: Thu, 20 Jun 2024 19:07:48 +0300 Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20fix(base):=20Use=20meson=20for?= =?UTF-8?q?=20gpu-screen-recorder=20(#83)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## Description The `gpu-screen-recorder` project switched to using meson instead of a custom build script (see [commit](https://git.dec05eba.com/gpu-screen-recorder/commit/?id=dfa7dc6659755b7a8385aad5003fd80483dd4ffe)) Rather than using the `install.sh` which is now deprecated, I switched to using meson and ninja to build & install. My text-editor wanted to format the end of the file as well, but that is hopefully no issue :sweat_smile: Signed-off-by: Kristian Ollikainen Co-authored-by: Kristian Ollikainen Co-authored-by: Wanjohi <71614375+wanjohiryan@users.noreply.github.com> --- base.Dockerfile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/base.Dockerfile b/base.Dockerfile index 2917ef21..e1c16c0e 100644 --- a/base.Dockerfile +++ b/base.Dockerfile @@ -253,8 +253,9 @@ RUN apt-get update -y \ && find . -maxdepth 1 -type f -name "*libnvrtc.so.*" -exec sh -c 'ln -snf $(basename {}) libnvrtc.so' \; \ && mkdir -p /usr/local/nvidia/lib && mv -f libnvrtc* /usr/local/nvidia/lib \ && git clone https://repo.dec05eba.com/gpu-screen-recorder && cd gpu-screen-recorder \ - && chmod +x ./build.sh ./install.sh \ - && ./install.sh + && meson setup build \ + && meson configure --prefix=/usr --buildtype=release -Dsystemd=true -Dstrip=true build \ + && ninja -C build install # #Try building shadow-cast # RUN git clone https://github.com/gmbeard/shadow-cast && cd shadow-cast \ @@ -285,4 +286,4 @@ RUN apt-get update \ libelf-dev \ pkg-config \ xorg \ - && rm -rf /var/lib/apt/lists/* \ No newline at end of file + && rm -rf /var/lib/apt/lists/*