1*4882a593SmuzhiyunFrom 1923c97fbd0b3d8cacdb72386886f860c818bccf Mon Sep 17 00:00:00 2001
2*4882a593SmuzhiyunFrom: James Hilliard <james.hilliard1@gmail.com>
3*4882a593SmuzhiyunDate: Wed, 10 Nov 2021 08:54:06 -0700
4*4882a593SmuzhiyunSubject: [PATCH] meson: remove session-managers option check.
5*4882a593Smuzhiyun
6*4882a593SmuzhiyunThis option no longer exists and causes a build failure if building
7*4882a593Smuzhiyunwith the systemd system service enabled.
8*4882a593Smuzhiyun
9*4882a593SmuzhiyunSigned-off-by: James Hilliard <james.hilliard1@gmail.com>
10*4882a593Smuzhiyun[Upstream status:
11*4882a593Smuzhiyunhttps://gitlab.freedesktop.org/pipewire/media-session/-/merge_requests/24]
12*4882a593Smuzhiyun---
13*4882a593Smuzhiyun systemd/system/meson.build | 10 ++++------
14*4882a593Smuzhiyun 1 file changed, 4 insertions(+), 6 deletions(-)
15*4882a593Smuzhiyun
16*4882a593Smuzhiyundiff --git a/systemd/system/meson.build b/systemd/system/meson.build
17*4882a593Smuzhiyunindex ab0d49064..0e9885b0f 100644
18*4882a593Smuzhiyun--- a/systemd/system/meson.build
19*4882a593Smuzhiyun+++ b/systemd/system/meson.build
20*4882a593Smuzhiyun@@ -4,9 +4,7 @@ systemd_system_services_dir = systemd.get_variable(pkgconfig: 'systemdsystemunit
21*4882a593Smuzhiyun systemd_config = configuration_data()
22*4882a593Smuzhiyun systemd_config.set('PW_MEDIA_SESSION_BINARY', media_session_bindir / 'pipewire-media-session')
23*4882a593Smuzhiyun
24*4882a593Smuzhiyun-if get_option('session-managers').contains('media-session')
25*4882a593Smuzhiyun-  configure_file(input : 'pipewire-media-session.service.in',
26*4882a593Smuzhiyun-               output : 'pipewire-media-session.service',
27*4882a593Smuzhiyun-               configuration : systemd_config,
28*4882a593Smuzhiyun-               install_dir : systemd_system_services_dir)
29*4882a593Smuzhiyun-endif
30*4882a593Smuzhiyun+configure_file(input : 'pipewire-media-session.service.in',
31*4882a593Smuzhiyun+             output : 'pipewire-media-session.service',
32*4882a593Smuzhiyun+             configuration : systemd_config,
33*4882a593Smuzhiyun+             install_dir : systemd_system_services_dir)
34*4882a593Smuzhiyun--
35*4882a593Smuzhiyun2.25.1
36*4882a593Smuzhiyun
37