[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[gnunet] branch master updated: meson: try to detect conversation
From: |
gnunet |
Subject: |
[gnunet] branch master updated: meson: try to detect conversation |
Date: |
Sun, 15 Oct 2023 11:34:39 +0200 |
This is an automated email from the git hooks/post-receive script.
martin-schanzenbach pushed a commit to branch master
in repository gnunet.
The following commit(s) were added to refs/heads/master by this push:
new 7a0051133 meson: try to detect conversation
7a0051133 is described below
commit 7a0051133779916453d25dd32582b0f6005b7dee
Author: Martin Schanzenbach <schanzen@gnunet.org>
AuthorDate: Sun Oct 15 11:34:35 2023 +0200
meson: try to detect conversation
---
meson.build | 21 +++++++++++++--------
src/conversation/meson.build | 44 +++++++++++++++++++++++++++++++++++++++++---
src/meson.build | 4 +++-
3 files changed, 57 insertions(+), 12 deletions(-)
diff --git a/meson.build b/meson.build
index 50556948f..523645c88 100644
--- a/meson.build
+++ b/meson.build
@@ -263,14 +263,19 @@ if ogg_dep.found()
add_project_arguments('-DHAVE_OGG', language : 'c')
endif
-if pulse_dep.found() or ogg_dep.found() or opus_dep.found()
- gst_dep = dependency('libgst', required : false)
- if not gst_dep.found()
- gst_dep = cc.find_library('gstreamer', required : false)
- endif
- if gst_dep.found()
- add_project_arguments('-DHAVE_GST', language : 'c')
- endif
+gst_dep = dependency('libgst', required : false)
+if not gst_dep.found()
+ gst_dep = cc.find_library('gstreamer', required : false)
+endif
+if gst_dep.found()
+ add_project_arguments('-DHAVE_GST', language : 'c')
+endif
+
+conversation_backend = 'none'
+if pulse_dep.found() and opus_dep.found() and ogg_dep.found()
+ conversation_backend = 'pulse'
+elif gst_dep.found()
+ conversation_backend = 'gst'
endif
## END conversation
diff --git a/src/conversation/meson.build b/src/conversation/meson.build
index 95d27072c..824a850d1 100644
--- a/src/conversation/meson.build
+++ b/src/conversation/meson.build
@@ -1,8 +1,6 @@
libgnunetconversation_src = ['conversation_api.c', 'conversation_api_call.c']
-gnunetserviceconversation_src = ['gnunet-service-conversation.c',
- 'gnunet-service-conversation_resolver.c',
- 'gnunet-service-conversation_interceptor.c']
+gnunetserviceconversation_src = ['gnunet-service-conversation.c']
gnunetconversationproxy_src = ['gnunet-conversation-proxy.c']
@@ -84,9 +82,11 @@ executable ('gnunet-conversation',
include_directories: [incdir, configuration_inc],
install: true,
install_dir: get_option('bindir'))
+
executable ('gnunet-service-conversation',
gnunetserviceconversation_src,
dependencies: [libgnunetconversation_dep,
+ libgnunetutil_dep,
libgnunetspeaker_dep,
libgnunetmicrophone_dep,
libgnunetidentity_dep,
@@ -94,3 +94,41 @@ executable ('gnunet-service-conversation',
include_directories: [incdir, configuration_inc],
install: true,
install_dir: get_option('libdir') / 'gnunet' / 'libexec')
+
+helperrecord_src = ['gnunet-helper-audio-record.c']
+helperplayback_src = ['gnunet-helper-audio-record.c']
+if conversation_backend == 'gst'
+ helperrecord_src = ['gnunet-helper-audio-record-gst.c']
+ helperplayback_src = ['gnunet-helper-audio-playback-gst.c']
+endif
+
+executable ('gnunet-helper-audio-record',
+ helperrecord_src,
+ dependencies: [libgnunetconversation_dep,
+ libgnunetutil_dep,
+ libgnunetspeaker_dep,
+ libgnunetmicrophone_dep,
+ gst_dep,
+ ogg_dep,
+ pulse_dep,
+ opus_dep
+ ],
+ include_directories: [incdir, configuration_inc],
+ install: true,
+ install_dir: get_option('libdir') / 'gnunet' / 'libexec')
+
+executable ('gnunet-helper-audio-playback',
+ helperplayback_src,
+ dependencies: [libgnunetconversation_dep,
+ libgnunetutil_dep,
+ libgnunetspeaker_dep,
+ libgnunetmicrophone_dep,
+ gst_dep,
+ ogg_dep,
+ pulse_dep,
+ opus_dep
+ ],
+ include_directories: [incdir, configuration_inc],
+ install: true,
+ install_dir: get_option('libdir') / 'gnunet' / 'libexec')
+
diff --git a/src/meson.build b/src/meson.build
index 2e3ee2df2..251e135f4 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -46,7 +46,9 @@ subdir('revocation')
subdir('vpn')
subdir('gns')
subdir('zonemaster')
-#subdir('$(CONVERSATION_DIR)')
+if conversation_backend != 'none'
+ subdir('conversation')
+endif
subdir('fs')
subdir('exit')
subdir('pt')
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [gnunet] branch master updated: meson: try to detect conversation,
gnunet <=