diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8d748b7bf..e54304fbb 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -96,7 +96,7 @@ variables: - .skip-git-clone variables: FDO_DISTRIBUTION_VERSION: 40 - BASE_TAG: '2024-08-29.1' + BASE_TAG: '2024-08-29.2' MUTTER_USER: 'meta-user' FDO_DISTRIBUTION_PACKAGES: clang diff --git a/.gitlab-ci/install-common-dependencies.sh b/.gitlab-ci/install-common-dependencies.sh index 752cf0c1d..bfaf004f9 100755 --- a/.gitlab-ci/install-common-dependencies.sh +++ b/.gitlab-ci/install-common-dependencies.sh @@ -56,6 +56,24 @@ done SCRIPTS_DIR="$(dirname $0)" +if ! pkgconf --atleast-version 1.2.3 libpipewire-0.3 +then + ./$SCRIPTS_DIR/install-meson-project.sh \ + "${OPTIONS[@]}" \ + -Dalsa=disabled \ + -Dbluez5=disabled \ + -Dexamples=disabled \ + -Dgstreamer=disabled \ + -Djack=disabled \ + -Dman=disabled \ + -Dpipewire-alsa=disabled \ + -Dpipewire-jack=disabled \ + -Dsystemd=enabled \ + -Dtests=disabled \ + https://gitlab.freedesktop.org/pipewire/pipewire.git \ + 1.2.3 +fi + if ! pkgconf --atleast-version 1.23.0 wayland-server then ./$SCRIPTS_DIR/install-meson-project.sh \ diff --git a/meson.build b/meson.build index 3bda91219..e873680e5 100644 --- a/meson.build +++ b/meson.build @@ -54,7 +54,7 @@ gbm_req = '>= 21.3' libdrm_req = '>= 2.4.118' # screen cast version requirements -libpipewire_req = '>= 0.3.33' +libpipewire_req = '>= 1.2.0' # profiler requirements sysprof_req = '>= 3.37.2'