2 commits - doc/meson.build meson.build meson_options.txt

[GitLab Mirror]

 doc/meson.build   |    2 +-
 meson.build       |    6 ++----
 meson_options.txt |    5 ++++-
 3 files changed, 7 insertions(+), 6 deletions(-)

New commits:
commit c9ae5ab0cb7c1ae257ea3d3cd1945cd364decc5d
Author: Alfred Wingate <parona at protonmail.com>
Date:   Mon Mar 10 20:49:54 2025 +0200

    Use meson feature for lynx
    
    This means you don't have to explicitly disable the lynx option to build
    pavucontrol if you don't have lynx installed.
    
    Signed-off-by: Alfred Wingate <parona at protonmail.com>

diff --git a/doc/meson.build b/doc/meson.build
index 12056d6..c2d09d3 100644
--- a/doc/meson.build
+++ b/doc/meson.build
@@ -15,7 +15,7 @@ if tidy.found()
   test('XHTML documentation uses correct mark-up', tidy, args: ['-e', readme_html])
 endif
 
-if with_lynx
+if lynx.found()
   custom_target(
     'README',
     input: readme_html,
diff --git a/meson.build b/meson.build
index 922ae24..f1c7268 100644
--- a/meson.build
+++ b/meson.build
@@ -4,8 +4,6 @@ project('pavucontrol', 'cpp',
         default_options : [ 'c_std=gnu11', 'cpp_std=c++17' ]
         )
 
-with_lynx = get_option('lynx')
-
 cpp = meson.get_compiler('cpp')
 
 gtkmm_dep = dependency('gtkmm-4.0', version : '>= 4.0', required : true)
@@ -21,7 +19,7 @@ have_pulse_messaging_api = cpp.has_function('pa_context_send_message_to_object',
 
 json_glib_dep = dependency('json-glib-1.0', required : have_pulse_messaging_api)
 
-lynx = find_program('lynx', required: with_lynx)
+lynx = find_program('lynx', required: get_option('lynx'))
 tidy = find_program('tidy', required: false)
 
 configinc = include_directories('.')
diff --git a/meson_options.txt b/meson_options.txt
index 9ddfaff..54d1920 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -1,5 +1,5 @@
 option('lynx',
-       type : 'boolean', value : true,
+       type : 'feature', value : 'auto',
        description : 'Enable building of the README text file for installation')
 option('audio-feedback',
        type : 'feature', value: 'auto',

commit 66a3e147b00db9c400647fea8251668c83201e75
Author: Alfred Wingate <parona at protonmail.com>
Date:   Mon Mar 10 20:44:02 2025 +0200

    Add a option for controlling libcanberra feature
    
    The retains the previous behavior of automagic except it allows the user to
    explicitly enable or disable the feature.
    
    Chose to call the feature a more agnostic "audio-feedback".
    
    Bug: https://bugs.gentoo.org/950761
    See-Also: 22b04fff6e881b4e0a1b8344a6513bdf99a10c65
    Signed-off-by: Alfred Wingate <parona at protonmail.com>

diff --git a/meson.build b/meson.build
index bc1a300..922ae24 100644
--- a/meson.build
+++ b/meson.build
@@ -10,7 +10,7 @@ cpp = meson.get_compiler('cpp')
 
 gtkmm_dep = dependency('gtkmm-4.0', version : '>= 4.0', required : true)
 sigcpp_dep = dependency('sigc++-3.0', required : true)
-canberragtk_dep = dependency('libcanberra', version : '>= 0.16', required : false)
+canberragtk_dep = dependency('libcanberra', version : '>= 0.16', required : get_option('audio-feedback'))
 
 libpulse_dep = dependency('libpulse', version : '>= 5.0', required : true)
 libpulsemlglib_dep = dependency('libpulse-mainloop-glib', version : '>= 0.9.16', required : true)
diff --git a/meson_options.txt b/meson_options.txt
index 31fe3ba..9ddfaff 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -1,3 +1,6 @@
 option('lynx',
        type : 'boolean', value : true,
        description : 'Enable building of the README text file for installation')
+option('audio-feedback',
+       type : 'feature', value: 'auto',
+       description : 'Play a sound when you change the volume of a sink')