From 6aba315b82a07a93e24893623dca517ef6ebf025 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Barnab=C3=A1s=20P=C5=91cze?= <pobrn@protonmail.com>
Date: Fri, 5 Nov 2021 16:51:58 +0100
Subject: [PATCH] pulse-server: always compile ROC modules

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.
---
 src/modules/meson.build                    | 16 +++++-----------
 src/modules/module-protocol-pulse/module.c |  2 --
 2 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/src/modules/meson.build b/src/modules/meson.build
index 242914ec2..93dc70173 100644
--- a/src/modules/meson.build
+++ b/src/modules/meson.build
@@ -253,6 +253,8 @@ pipewire_module_protocol_pulse_sources = [
   'module-protocol-pulse/modules/module-raop-discover.c',
   'module-protocol-pulse/modules/module-remap-sink.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-switch-on-connect.c',
   'module-protocol-pulse/modules/module-tunnel-sink.c',
@@ -277,17 +279,6 @@ if avahi_dep.found()
   cdata.set('HAVE_AVAHI', 1)
 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_sources,
   include_directories : [configinc],
@@ -472,6 +463,9 @@ pipewire_module_raop_sink = shared_library('pipewire-module-raop-sink',
 endif
 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()
 if build_module_roc
 pipewire_module_roc_sink = shared_library('pipewire-module-roc-sink',
diff --git a/src/modules/module-protocol-pulse/module.c b/src/modules/module-protocol-pulse/module.c
index 820a0dbed..656f473f2 100644
--- a/src/modules/module-protocol-pulse/module.c
+++ b/src/modules/module-protocol-pulse/module.c
@@ -265,10 +265,8 @@ static const struct module_info module_list[] = {
 #ifdef HAVE_AVAHI
 	{ "module-zeroconf-publish", create_module_zeroconf_publish, },
 #endif
-#ifdef HAVE_ROC
 	{ "module-roc-sink", create_module_roc_sink, },
 	{ "module-roc-source", create_module_roc_source, },
-#endif
 	{ NULL, }
 };