From ceeaf6c2f923c68289a3c9f9710db9be8a54a5c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nikl=C4=81vs=20Ko=C4=BCes=C5=86ikovs?= <89q1r14hd@relay.firefox.com> Date: Fri, 12 Nov 2021 21:16:52 +0200 Subject: [PATCH] meson: add -Draop switch for OpenSSL dep control Even though OpenSSL is very common, automagic dependencies are still not great, so let's have a raop switch to control that. --- meson.build | 4 ++-- meson_options.txt | 4 ++++ src/modules/meson.build | 4 ++-- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/meson.build b/meson.build index e8249ed45..4a572bd42 100644 --- a/meson.build +++ b/meson.build @@ -427,8 +427,8 @@ need_alsa = get_option('pipewire-alsa').enabled() or 'media-session' in get_opti alsa_dep = dependency('alsa', version : '>=1.1.7', required: need_alsa) summary({'pipewire-alsa': alsa_dep.found()}, bool_yn: true) -openssl_lib = dependency('openssl', required: false) -summary({'openssl': openssl_lib.found()}, bool_yn: true) +openssl_lib = dependency('openssl', required: get_option('raop')) +summary({'OpenSSL (for raop-sink)': openssl_lib.found()}, bool_yn: true) installed_tests_metadir = pipewire_datadir / 'installed-tests' / pipewire_name installed_tests_execdir = pipewire_libexecdir / 'installed-tests' / pipewire_name diff --git a/meson_options.txt b/meson_options.txt index 06d964316..75d8cd7b0 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -214,3 +214,7 @@ option('session-managers', description : 'Session managers to build (can be [] for none or an absolute path)', type : 'array', value : ['media-session']) +option('raop', + description: 'Enable module for Remote Audio Output Protocol', + type: 'feature', + value: 'auto') diff --git a/src/modules/meson.build b/src/modules/meson.build index 5ee4aa732..fa8441f65 100644 --- a/src/modules/meson.build +++ b/src/modules/meson.build @@ -442,7 +442,7 @@ pipewire_module_raop_discover = shared_library('pipewire-module-raop-discover', dependencies : [mathlib, dl_lib, rt_lib, pipewire_dep, avahi_dep], ) endif -summary({'raop-discover': build_module_raop_discover}, bool_yn: true, section: 'Optional Modules') +summary({'raop-discover (needs Avahi)': build_module_raop_discover}, bool_yn: true, section: 'Optional Modules') build_module_raop = openssl_lib.found() if build_module_raop @@ -456,7 +456,7 @@ pipewire_module_raop_sink = shared_library('pipewire-module-raop-sink', dependencies : [mathlib, dl_lib, rt_lib, pipewire_dep, openssl_lib], ) endif -summary({'raop-sink': build_module_raop}, bool_yn: true, section: 'Optional Modules') +summary({'raop-sink (requires OpenSSL)': build_module_raop}, bool_yn: true, section: 'Optional Modules') build_module_roc = roc_lib.found() if build_module_roc