Arun Raghavan pushed to branch master at PulseAudio / pavucontrol Commits: 66a3e147 by Alfred Wingate at 2025-06-26T00:34:03+00:00 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 <[email protected]> - - - - - c9ae5ab0 by Alfred Wingate at 2025-06-26T00:34:03+00:00 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 <[email protected]> - - - - - 3 changed files: - doc/meson.build - meson.build - meson_options.txt Changes: ===================================== 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, ===================================== meson.build ===================================== @@ -4,13 +4,11 @@ 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) 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) @@ -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('.') ===================================== meson_options.txt ===================================== @@ -1,3 +1,6 @@ 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', + description : 'Play a sound when you change the volume of a sink') View it on GitLab: https://gitlab.freedesktop.org/pulseaudio/pavucontrol/-/compare/ce48aec45ffc551c6456f74a5134f23153f322f5...c9ae5ab0cb7c1ae257ea3d3cd1945cd364decc5d -- View it on GitLab: https://gitlab.freedesktop.org/pulseaudio/pavucontrol/-/compare/ce48aec45ffc551c6456f74a5134f23153f322f5...c9ae5ab0cb7c1ae257ea3d3cd1945cd364decc5d You're receiving this email because of your account on gitlab.freedesktop.org.
