From 8308e1dbbfaca19d8ffb310ec1b19fac2aea889e Mon Sep 17 00:00:00 2001 From: Arnaud Ferraris Date: Tue, 13 Oct 2020 02:44:47 +0200 Subject: [PATCH] src: meson.build: remove librem5-hack option and depend on libcallaudio --- meson_options.txt | 4 ---- src/meson.build | 4 +--- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/meson_options.txt b/meson_options.txt index 2e15500..03e955e 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -9,7 +9,3 @@ option('tests', option('wayland', type: 'feature', value: 'enabled', description: 'Whether to support Wayland lockscreen interaction') - -option('librem5-hack', - type: 'boolean', value: true, - description: 'Whether to use hacky code to support audio output switching (Speaker)') diff --git a/src/meson.build b/src/meson.build index 2df7d66..e5d2813 100644 --- a/src/meson.build +++ b/src/meson.build @@ -36,6 +36,7 @@ calls_deps = [ dependency('gobject-2.0', version: '>= 2.58'), dependency('gom-1.0'), dependency('libebook-contacts-1.2'), dependency('folks'), + dependency('libcallaudio-0'), ] if wl_scanner.found() @@ -95,9 +96,6 @@ calls_config_data = config_data calls_config_data.set_quoted('VCS_TAG', '@VCS_TAG@') calls_config_data.set10('WL_SCANNER_FOUND', wl_scanner.found()) -use_l5_hacks = get_option('librem5-hack') -calls_config_data.set('CALLS_USE_UGLY_CODE', use_l5_hacks) - config_h_in = configure_file( output: 'config.h.in', configuration: calls_config_data