From 5c517cc59747a77bce3ac6ba7e8c862076d8b093 Mon Sep 17 00:00:00 2001
From: WeebDataHoarder <57538841+WeebDataHoarder@users.noreply.github.com>
Date: Fri, 3 Nov 2023 06:54:56 +0100
Subject: [PATCH] Fix lib path in meson

---
 .drone.yml                     | 4 ++--
 build/alpine/Dockerfile        | 4 ++--
 build/debian-shared/Dockerfile | 4 ++--
 build/debian/Dockerfile        | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index 1f6235f..0517730 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -210,7 +210,7 @@ steps:
       - cd /tmp
       - >-
         git clone --depth 1 --branch $VMAF_TAG https://github.com/Netflix/vmaf.git && cd vmaf/libvmaf && 
-        meson setup build . --prefix /drone/src/build_deps --buildtype release --default-library=static
+        meson setup build . --prefix /drone/src/build_deps --libdir=lib --buildtype release --default-library=static
         -Denable_float=true -Dbuilt_in_models=true -Denable_tests=false -Denable_docs=false && 
         ninja -vC build && 
         ninja -vC build install && 
@@ -238,7 +238,7 @@ steps:
       - cd /tmp
       - >-
         git clone --depth 1 --branch $DAV1D_TAG https://code.videolan.org/videolan/dav1d.git && cd dav1d && 
-        meson setup build . --prefix /drone/src/build_deps --buildtype release --default-library=static && 
+        meson setup build . --prefix /drone/src/build_deps--libdir=lib  --buildtype release --default-library=static && 
         ninja -vC build && 
         ninja -vC build install 
         && cd ..
diff --git a/build/alpine/Dockerfile b/build/alpine/Dockerfile
index 0b7385e..ca1c992 100644
--- a/build/alpine/Dockerfile
+++ b/build/alpine/Dockerfile
@@ -21,7 +21,7 @@ RUN git clone --depth 1 --branch "${X264_TAG}" https://code.videolan.org/videola
     rm -rf /tmp/x264
 
 RUN git clone --depth 1 --branch "${VMAF_TAG}" https://github.com/Netflix/vmaf.git /tmp/vmaf && cd /tmp/vmaf/libvmaf && \
-    meson setup build . --prefix /usr --buildtype release --default-library=static \
+    meson setup build . --prefix /usr --libdir=lib --buildtype release --default-library=static \
     -Denable_float=true -Dbuilt_in_models=true -Denable_tests=false -Denable_docs=false  && \
     ninja -vC build && \
     ninja -vC build install && \
@@ -39,7 +39,7 @@ RUN git clone --depth 1 --branch "${AOM_TAG}" https://aomedia.googlesource.com/a
     rm -rf /tmp/aom
 
 RUN git clone --depth 1 --branch "${DAV1D_TAG}" https://code.videolan.org/videolan/dav1d.git /tmp/dav1d && cd /tmp/dav1d && \
-    meson setup build . --prefix /usr --buildtype release --default-library=static && \
+    meson setup build . --prefix /usr --libdir=lib --buildtype release --default-library=static && \
     ninja -vC build && \
     ninja -vC build install && \
     cd / && \
diff --git a/build/debian-shared/Dockerfile b/build/debian-shared/Dockerfile
index 0a555f3..424e5ae 100644
--- a/build/debian-shared/Dockerfile
+++ b/build/debian-shared/Dockerfile
@@ -22,7 +22,7 @@ RUN git clone --depth 1 --branch "${X264_TAG}" https://code.videolan.org/videola
 
 ARG VMAF_TAG="v2.3.1"
 RUN git clone --depth 1 --branch "${VMAF_TAG}" https://github.com/Netflix/vmaf.git /tmp/vmaf && cd /tmp/vmaf/libvmaf && \
-    meson setup build . --prefix /usr --buildtype release --default-library=static \
+    meson setup build . --prefix /usr --libdir=lib --buildtype release --default-library=static \
     -Denable_float=true -Dbuilt_in_models=true -Denable_tests=false -Denable_docs=false  && \
     ninja -vC build && \
     ninja -vC build install && \
@@ -31,7 +31,7 @@ RUN git clone --depth 1 --branch "${VMAF_TAG}" https://github.com/Netflix/vmaf.g
 
 ARG DAV1D_TAG="1.3.0"
 RUN git clone --depth 1 --branch "${DAV1D_TAG}" https://code.videolan.org/videolan/dav1d.git /tmp/dav1d && cd /tmp/dav1d && \
-    meson setup build . --prefix /usr --buildtype release --default-library=shared && \
+    meson setup build . --prefix /usr --libdir=lib --buildtype release --default-library=shared && \
     ninja -vC build && \
     ninja -vC build install && \
     cd / && \
diff --git a/build/debian/Dockerfile b/build/debian/Dockerfile
index 31f10c6..9a8366e 100644
--- a/build/debian/Dockerfile
+++ b/build/debian/Dockerfile
@@ -25,7 +25,7 @@ RUN git clone --depth 1 --branch "${X264_TAG}" https://code.videolan.org/videola
     rm -rf /tmp/x264
 
 RUN git clone --depth 1 --branch "${VMAF_TAG}" https://github.com/Netflix/vmaf.git /tmp/vmaf && cd /tmp/vmaf/libvmaf && \
-    meson setup build . --prefix /usr --buildtype release --default-library=static \
+    meson setup build . --prefix /usr --libdir=lib --buildtype release --default-library=static \
     -Denable_float=true -Dbuilt_in_models=true -Denable_tests=false -Denable_docs=false  && \
     ninja -vC build && \
     ninja -vC build install && \
@@ -43,7 +43,7 @@ RUN git clone --depth 1 --branch "${AOM_TAG}" https://aomedia.googlesource.com/a
     rm -rf /tmp/aom
 
 RUN git clone --depth 1 --branch "${DAV1D_TAG}" https://code.videolan.org/videolan/dav1d.git /tmp/dav1d && cd /tmp/dav1d && \
-    meson setup build . --prefix /usr --buildtype release --default-library=static && \
+    meson setup build . --prefix /usr --libdir=lib --buildtype release --default-library=static && \
     ninja -vC build && \
     ninja -vC build install && \
     cd / && \