From 42c763c14d51431c287a563c44296a0e13551e89 Mon Sep 17 00:00:00 2001 From: Daniel Stone Date: Mon, 16 Aug 2021 16:49:23 +0100 Subject: [PATCH] ci: Use a non-conflicting directory for PipeWire clone Rather than aliasing it with our existing 'pipewire' directory. Signed-off-by: Daniel Stone --- .gitlab-ci/build-deps.sh | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci/build-deps.sh b/.gitlab-ci/build-deps.sh index 38ece37f..b4d2ab95 100755 --- a/.gitlab-ci/build-deps.sh +++ b/.gitlab-ci/build-deps.sh @@ -137,14 +137,13 @@ rm -rf mesa # stable, so again we lock it to a fixed version. # # ... the version chosen is 0.3.32 with a small Clang-specific build fix. -rm -rf pipewire -git clone --single-branch --branch master https://gitlab.freedesktop.org/pipewire/pipewire.git pipewire -cd pipewire +git clone --single-branch --branch master https://gitlab.freedesktop.org/pipewire/pipewire.git pipewire-src +cd pipewire-src git checkout -b snapshot bf112940d0bf8f526dd6229a619c1283835b49c2 meson build ninja ${NINJAFLAGS} -C build install cd .. -rm -rf pipewire +rm -rf pipewire-src # seatd lets us avoid the pain of handling VTs manually through weston-launch # or open-coding TTY assignment within Weston. We use this for our tests using