Fix lib path in meson
Some checks are pending
continuous-integration/drone/push Build is running

This commit is contained in:
DataHoarder 2023-11-03 06:54:56 +01:00
parent a14500af6a
commit 5c517cc597
Signed by: DataHoarder
SSH key fingerprint: SHA256:OLTRf6Fl87G52SiR7sWLGNzlJt4WOX+tfI2yxo0z7xk
4 changed files with 8 additions and 8 deletions

View file

@ -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 ..

View file

@ -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 / && \

View file

@ -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 / && \

View file

@ -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 / && \