From 27fb564a1915fd594d037119955fc39456496820 Mon Sep 17 00:00:00 2001 From: Michael Olbrich Date: Wed, 15 Jul 2020 11:01:04 +0200 Subject: [PATCH] backend-drm: build DRM virtual support when the pipewire plugin is enabled The pipewire plugin uses this API as well, not just the remoting plugin. So enable it if either is enabled. And disable pipewire in the no-gl-renderer CI build. The virtual outputs don't work without it. Signed-off-by: Michael Olbrich --- .gitlab-ci.yml | 1 + libweston/backend-drm/meson.build | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 02c38b96..9c24dd80 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -92,6 +92,7 @@ build-native-meson-no-gl-renderer: -Dsimple-clients=damage,im,shm,touch,dmabuf-v4l -Drenderer-gl=false -Dremoting=false + -Dpipewire=false -Dwerror=true extends: .build-native-meson diff --git a/libweston/backend-drm/meson.build b/libweston/backend-drm/meson.build index a7f62965..8faedde9 100644 --- a/libweston/backend-drm/meson.build +++ b/libweston/backend-drm/meson.build @@ -71,7 +71,7 @@ if get_option('backend-drm-screencast-vaapi') config_h.set('BUILD_VAAPI_RECORDER', '1') endif -if get_option('remoting') +if get_option('remoting') or get_option('pipewire') if not get_option('renderer-gl') warning('DRM virtual requires renderer-gl.') endif