summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArnaud Rebillout <arnaud.rebillout@collabora.com>2018-09-20 17:05:06 +0700
committerArun Raghavan <arun@arunraghavan.net>2018-10-04 08:44:18 +0530
commit4c9b6370d1369bcb8b18e0ddde8be47ec1d50e8d (patch)
tree7ccd61f4ab8fe09373cfee6ee796c191f847f753
parent83b6903849f7ae2c7501c329ccfc1d313bd00d1a (diff)
meson: Enable raop-sink module, add raop lib, add openssl dependency
Signed-off-by: Arnaud Rebillout <arnaud.rebillout@collabora.com>
-rw-r--r--meson.build5
-rw-r--r--src/modules/meson.build11
-rw-r--r--src/modules/raop/meson.build24
-rw-r--r--src/modules/rtp/meson.build2
4 files changed, 40 insertions, 2 deletions
diff --git a/meson.build b/meson.build
index b49043fcd..70ff5be61 100644
--- a/meson.build
+++ b/meson.build
@@ -238,6 +238,11 @@ if fftw_dep.found()
cdata.set('HAVE_FFTW', 1)
endif
+openssl_dep = dependency('openssl', version : '>= 0.9', required : false)
+if openssl_dep.found()
+ cdata.set('HAVE_OPENSSL', 1)
+endif
+
udev_dep = dependency('libudev', version : '>= 143', required : false)
if udev_dep.found()
cdata.set('HAVE_UDEV', 1)
diff --git a/src/modules/meson.build b/src/modules/meson.build
index dab6d8207..463aae5e3 100644
--- a/src/modules/meson.build
+++ b/src/modules/meson.build
@@ -1,4 +1,6 @@
+# Order matters! raop needs rtp!
subdir('rtp')
+subdir('raop')
# module name, sources, [headers, extra flags, extra deps, extra libs]
all_modules = [
@@ -52,8 +54,6 @@ all_modules = [
[ 'module-pipe-sink', 'module-pipe-sink.c' ],
[ 'module-pipe-source', 'module-pipe-source.c' ],
[ 'module-position-event-sounds', 'module-position-event-sounds.c' ],
-# [ 'module-raop-discover', 'raop/module-raop-discover.c' ],
-# [ 'module-raop-sink', 'raop/module-raop-sink.c' ],
[ 'module-remap-sink', 'module-remap-sink.c' ],
[ 'module-remap-source', 'module-remap-source.c' ],
[ 'module-rescue-streams', 'module-rescue-streams.c' ],
@@ -117,6 +117,13 @@ if jack_dep.found()
]
endif
+if openssl_dep.found()
+ all_modules += [
+# [ 'module-raop-discover', 'raop/module-raop-discover.c' ],
+ [ 'module-raop-sink', 'raop/module-raop-sink.c', [], [], [], libraop ],
+ ]
+endif
+
if systemd_dep.found()
all_modules += [
[ 'module-systemd-login', 'module-systemd-login.c', [], [], [systemd_dep] ],
diff --git a/src/modules/raop/meson.build b/src/modules/raop/meson.build
new file mode 100644
index 000000000..63a03d9d8
--- /dev/null
+++ b/src/modules/raop/meson.build
@@ -0,0 +1,24 @@
+libraop_sources = [
+ 'raop-client.c',
+ 'raop-crypto.c',
+ 'raop-packet-buffer.c',
+ 'raop-sink.c',
+ 'raop-util.c',
+]
+
+libraop_headers = [
+ 'raop-client.h',
+ 'raop-crypto.h',
+ 'raop-packet-buffer.h',
+ 'raop-sink.h',
+ 'raop-util.h',
+]
+
+libraop = shared_library('libraop',
+ libraop_sources,
+ libraop_headers,
+ c_args : [pa_c_args, server_c_args],
+ include_directories : [configinc, topinc],
+ dependencies : [libpulse_dep, libpulsecommon_dep, libpulsecore_dep, librtp_dep, openssl_dep],
+ install : true
+)
diff --git a/src/modules/rtp/meson.build b/src/modules/rtp/meson.build
index 52a19e3f1..7fdd02fa9 100644
--- a/src/modules/rtp/meson.build
+++ b/src/modules/rtp/meson.build
@@ -22,3 +22,5 @@ librtp = shared_library('librtp',
dependencies : [libpulse_dep, libpulsecommon_dep, libpulsecore_dep],
install : true
)
+
+librtp_dep = declare_dependency(link_with: librtp)