diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 087b2703..95bb801a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -12,5 +12,5 @@ include: project: QubesOS/qubes-continuous-integration ref: $CI_BRANCH_REF variables: - CI_INSTALL_EXCLUDE: pulseaudio-qubes pulseaudio-qubes-dbgsym + CI_INSTALL_EXCLUDE: pulseaudio-qubes pulseaudio-qubes-dbgsym qubes-vm-pulseaudio CI_INSTALL_EXCLUDE_DOM0: pulseaudio-qubes qubes-gui-agent diff --git a/archlinux/PKGBUILD.in b/archlinux/PKGBUILD.in index 2b4970f0..e9bbf945 100644 --- a/archlinux/PKGBUILD.in +++ b/archlinux/PKGBUILD.in @@ -16,7 +16,7 @@ makedepends=( automake autoconf libtool - 'pulseaudio<=17.0+r43+g3e2bb8a1e' + 'libpulse<=17.0+r43+g3e2bb8a1e' 'pipewire>=1:0.3.53-2' xorg-server-devel xorg-util-macros @@ -86,6 +86,7 @@ package_qubes-vm-pulseaudio() { pkgdesc="Pulseaudio support for Qubes VM" depends=('alsa-lib' 'alsa-utils' 'pulseaudio-alsa' 'pulseaudio<=17.0+r43+g3e2bb8a1e') + replaces=('pipewire-qubes') conflicts=('qubes-core-agent<4.2.5') install=archlinux/PKGBUILD-pulseaudio.install _pa_ver="$( (pkg-config --modversion libpulse 2>/dev/null || echo 0.0) | cut -f 1 -d "-" )" @@ -102,7 +103,7 @@ package_qubes-vm-pulseaudio() { package_pipewire-qubes () { pkgdesc='PipeWire support for Qubes VM. This replaces the legacy PulseAudio module.' - depends=('pipewire>=1:0.3.53-2') + depends=('pipewire>=1:0.3.53-2' 'pipewire-pulse' 'wireplumber') replaces=('qubes-vm-pulseaudio') install=archlinux/PKGBUILD-pipewire-qubes.install