From 6928714b6486ca22ef2da87e1338a8a73100e5db Mon Sep 17 00:00:00 2001
From: "Igor V. Kovalenko" <igor.v.kovalenko@gmail.com>
Date: Thu, 4 Nov 2021 16:35:19 +0300
Subject: [PATCH] build-sys: meson: change daemon-only to client

Part-of: <https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/merge_requests/659>
---
 man/meson.build                   |  2 +-
 meson.build                       | 14 +++++++-------
 meson_options.txt                 |  6 +++---
 shell-completion/bash/meson.build |  2 +-
 src/meson.build                   |  2 +-
 src/tests/meson.build             |  2 +-
 src/utils/meson.build             |  4 ++--
 7 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/man/meson.build b/man/meson.build
index c12ad5e6a..9b42c2a69 100644
--- a/man/meson.build
+++ b/man/meson.build
@@ -14,7 +14,7 @@ if get_option('daemon')
   ]
 endif
 
-if not get_option('daemon-only')
+if get_option('client')
 manpages += [
   ['pacat', '1', ['paplay', 'parec', 'parecord', 'pamon']],
   ['pactl', '1'],
diff --git a/meson.build b/meson.build
index fea314675..7a4d591f8 100644
--- a/meson.build
+++ b/meson.build
@@ -820,18 +820,18 @@ check_dep = dependency('check', version : '>= 0.9.10', required : get_option('te
 if get_option('doxygen')
   subdir('doxygen')
 endif
-if not get_option('daemon-only')
+if get_option('client')
   subdir('po')
 endif
 if get_option('man')
   subdir('man')
 endif
 subdir('shell-completion/bash')
-if not get_option('daemon-only')
+if get_option('client')
   subdir('shell-completion/zsh')
 endif
 subdir('src')
-if not get_option('daemon-only')
+if get_option('client')
  subdir('vala')
 endif
 
@@ -840,7 +840,7 @@ configure_file(output : 'config.h', configuration : cdata)
 
 # pkg-config files
 
-if not get_option('daemon-only')
+if get_option('client')
 
 pc_cdata = configuration_data()
 
@@ -874,11 +874,11 @@ foreach file : pc_files
     install_dir : pkgconfigdir)
 endforeach
 
-endif # !daemon-only
+endif # client
 
 # CMake files
 
-if not get_option('daemon-only')
+if get_option('client')
 
 m4 = find_program('m4', required: true)
 
@@ -908,7 +908,7 @@ configure_file(
   install_dir : cmakedir,
 )
 
-endif # !daemon-only
+endif # client
 
 ############################################################
 
diff --git a/meson_options.txt b/meson_options.txt
index 8a23865db..ff86d69f7 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -1,9 +1,9 @@
 option('daemon',
        type : 'boolean', value : true,
        description : 'Enable building and installation of pulseaudio daemon and supporting configuration files')
-option('daemon-only',
-       type : 'boolean', value : false,
-       description : 'Build and install only the pulseaudio daemon and supporting configuration files, relying on a system installation of libpulse')
+option('client',
+       type : 'boolean', value : true,
+       description : 'Build and install pulseaudio client libraries and utilities')
 option('doxygen',
        type : 'boolean', value : true,
        description : 'Enable building and installation of documentation generated with doxygen')
diff --git a/shell-completion/bash/meson.build b/shell-completion/bash/meson.build
index 83d90b94b..1d5a8cdab 100644
--- a/shell-completion/bash/meson.build
+++ b/shell-completion/bash/meson.build
@@ -8,7 +8,7 @@ if bashcompletiondir != 'no'
     ]
   endif
 
-  if not get_option('daemon-only')
+  if get_option('client')
   aliases += [
     'pacat',
     'pactl',
diff --git a/src/meson.build b/src/meson.build
index 433131f34..81722ab10 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -188,7 +188,7 @@ else
 endif
 # FIXME: Do SIMD things
 
-if get_option('daemon-only')
+if not get_option('client')
   libpulsecommon_dep = cc.find_library('pulsecommon-' + pa_version_major_minor, dirs : privlibdir, required : true)
   libpulse_dep = dependency('libpulse', required : true)
   libpulse_simple_dep = dependency('libpulse-simple', required : true)
diff --git a/src/tests/meson.build b/src/tests/meson.build
index fec6adcbc..1770ccac3 100644
--- a/src/tests/meson.build
+++ b/src/tests/meson.build
@@ -30,7 +30,7 @@ default_tests += [
     [ check_dep, libm_dep, libpulse_dep, libpulsecommon_dep ] ],
 ]
 
-if not get_option('daemon-only')
+if get_option('client')
   default_tests += [
     [ 'mainloop-test', 'mainloop-test.c',
       [ check_dep, libpulse_dep, libpulsecommon_dep ] ],
diff --git a/src/utils/meson.build b/src/utils/meson.build
index 7ed6e738f..f67cff4a9 100644
--- a/src/utils/meson.build
+++ b/src/utils/meson.build
@@ -1,4 +1,4 @@
-if not get_option('daemon-only')
+if get_option('client')
 pacat_sources = [
   'pacat.c',
 ]
@@ -74,7 +74,7 @@ if get_option('daemon')
   endif
 endif
 
-if not get_option('daemon-only')
+if get_option('client')
 if x11_dep.found()
   pax11publish_sources = [
     'pax11publish.c',