From 1ab5e0b963547e45241cb4793736ff5b05917d7f Mon Sep 17 00:00:00 2001 From: Carlos Bentzen Date: Fri, 28 Feb 2025 13:52:37 +0100 Subject: [PATCH] ci: fix vvdec lib install prefix Set CMAKE_INSTALL_LIBDIR directly so that the x86_64-linux-gnu suffix is correctly set. Part-of: --- ci/images_template.yml | 2 +- ci/install-vvdec.sh | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ci/images_template.yml b/ci/images_template.yml index 7a249574e..667d7b98f 100644 --- a/ci/images_template.yml +++ b/ci/images_template.yml @@ -1,5 +1,5 @@ variables: - GST_RS_IMG_TAG: "2025-02-23.0" + GST_RS_IMG_TAG: "2025-02-28.0" GST_RS_IMG_WINDOWS_TAG: "2025-02-23.0" GST_RS_STABLE: "1.85.0" GST_RS_MSRV: "1.80.1" diff --git a/ci/install-vvdec.sh b/ci/install-vvdec.sh index 80db34e53..0472e392f 100644 --- a/ci/install-vvdec.sh +++ b/ci/install-vvdec.sh @@ -7,6 +7,7 @@ cd vvdec git checkout $RELEASE cmake -S . -B build -GNinja \ -DCMAKE_INSTALL_PREFIX=/usr/local \ + -DCMAKE_INSTALL_LIBDIR=/usr/local/lib/$(dpkg-architecture -qDEB_HOST_MULTIARCH) \ -DBUILD_SHARED_LIBS=ON \ -DVVDEC_TOPLEVEL_OUTPUT_DIRS=OFF ninja -C build