mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-11-03 09:01:54 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

pulse-server: always compile ROC modules

Browse source 
The module-roc-{sink,source} modules simply load the corresponding
native pipewire modules, they have no dependency on ROC.
So always compile them. This way these modules are
compile tested, and if the corresponding pipewire
modules are added to the system later, they will work
with no changes to the protocol-pulse module.
This commit is contained in:
Barnabás Pőcze 2021-11-05 16:51:58 +01:00 • committed by Wim Taymans
parent ac376106d9
commit 6aba315b82
2 changed files with 5 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/modules/meson.build
View file

@ -253,6 +253,8 @@ pipewire_module_protocol_pulse_sources = [
'module-protocol-pulse/modules/module-raop-discover.c', 'module-protocol-pulse/modules/module-raop-discover.c',
'module-protocol-pulse/modules/module-remap-sink.c', 'module-protocol-pulse/modules/module-remap-sink.c',
'module-protocol-pulse/modules/module-remap-source.c', 'module-protocol-pulse/modules/module-remap-source.c',
'module-protocol-pulse/modules/module-roc-sink.c',
'module-protocol-pulse/modules/module-roc-source.c',
'module-protocol-pulse/modules/module-simple-protocol-tcp.c', 'module-protocol-pulse/modules/module-simple-protocol-tcp.c',
'module-protocol-pulse/modules/module-switch-on-connect.c', 'module-protocol-pulse/modules/module-switch-on-connect.c',
'module-protocol-pulse/modules/module-tunnel-sink.c', 'module-protocol-pulse/modules/module-tunnel-sink.c',
@ -277,17 +279,6 @@ if avahi_dep.found()
cdata.set('HAVE_AVAHI', 1) cdata.set('HAVE_AVAHI', 1)
endif endif
roc_lib = cc.find_library('roc', required: get_option('roc'))
summary({'ROC': roc_lib.found()}, bool_yn: true, section: 'Streaming between daemons')
if roc_lib.found()
pipewire_module_protocol_pulse_sources += [
'module-protocol-pulse/modules/module-roc-sink.c',
'module-protocol-pulse/modules/module-roc-source.c',
]
pipewire_module_protocol_pulse_deps += roc_lib
cdata.set('HAVE_ROC', 1)
endif
pipewire_module_protocol_pulse = shared_library('pipewire-module-protocol-pulse', pipewire_module_protocol_pulse = shared_library('pipewire-module-protocol-pulse',
pipewire_module_protocol_pulse_sources, pipewire_module_protocol_pulse_sources,
include_directories : [configinc], include_directories : [configinc],
@ -472,6 +463,9 @@ pipewire_module_raop_sink = shared_library('pipewire-module-raop-sink',
endif endif
summary({'raop-sink (requires OpenSSL)': build_module_raop}, bool_yn: true, section: 'Optional Modules') summary({'raop-sink (requires OpenSSL)': build_module_raop}, bool_yn: true, section: 'Optional Modules')
roc_lib = cc.find_library('roc', required: get_option('roc'))
summary({'ROC': roc_lib.found()}, bool_yn: true, section: 'Streaming between daemons')
build_module_roc = roc_lib.found() build_module_roc = roc_lib.found()
if build_module_roc if build_module_roc
pipewire_module_roc_sink = shared_library('pipewire-module-roc-sink', pipewire_module_roc_sink = shared_library('pipewire-module-roc-sink',

2
src/modules/module-protocol-pulse/module.c
View file

@ -265,10 +265,8 @@ static const struct module_info module_list[] = {
#ifdef HAVE_AVAHI #ifdef HAVE_AVAHI
{ "module-zeroconf-publish", create_module_zeroconf_publish, }, { "module-zeroconf-publish", create_module_zeroconf_publish, },
#endif #endif
#ifdef HAVE_ROC
{ "module-roc-sink", create_module_roc_sink, }, { "module-roc-sink", create_module_roc_sink, },
{ "module-roc-source", create_module_roc_source, }, { "module-roc-source", create_module_roc_source, },
#endif
{ NULL, } { NULL, }
}; };