Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
jami-daemon
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
savoirfairelinux
jami-daemon
Commits
a699262e
Commit
a699262e
authored
4 years ago
by
Sébastien Blin
Committed by
Adrien Béraud
4 years ago
Browse files
Options
Downloads
Patches
Plain Diff
build: fix meson for webrtc support
Change-Id: Iedcfe91af40893004c8f640c8a718966db8d7468
parent
61e23026
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
meson.build
+3
-0
3 additions, 0 deletions
meson.build
meson_options.txt
+1
-0
1 addition, 0 deletions
meson_options.txt
src/meson.build
+11
-0
11 additions, 0 deletions
src/meson.build
with
15 additions
and
0 deletions
meson.build
+
3
−
0
View file @
a699262e
...
...
@@ -80,6 +80,9 @@ conf.set10('HAVE_PULSE', deplibpulse.found())
depjack
=
dependency
(
'jack'
,
required
:
get_option
(
'jack'
))
conf
.
set10
(
'HAVE_JACK'
,
depjack
.
found
())
depwebrtcap
=
dependency
(
'webrtc-audio-processing'
,
required
:
get_option
(
'webrtc-audio-processing'
))
conf
.
set10
(
'HAVE_WEBRTC_AP'
,
depwebrtcap
.
found
())
depportaudio
=
dependency
(
'portaudio-2.0'
,
required
:
get_option
(
'portaudio'
))
conf
.
set10
(
'HAVE_PORTAUDIO'
,
depportaudio
.
found
())
...
...
This diff is collapsed.
Click to expand it.
meson_options.txt
+
1
−
0
View file @
a699262e
...
...
@@ -11,6 +11,7 @@ option('jack', type: 'feature', value: 'auto', description: 'Enable support for
option
(
'portaudio'
,
type
:
'feature'
,
value
:
'auto'
,
description
:
'Enable support for PortAudio'
)
option
(
'upnp'
,
type
:
'feature'
,
value
:
'auto'
,
description
:
'Enable support for UPnP'
)
option
(
'natpmp'
,
type
:
'feature'
,
value
:
'auto'
,
description
:
'Enable support for NAT-PMP'
)
option
(
'webrtc-audio-processing'
,
type
:
'feature'
,
value
:
'auto'
,
description
:
'Enable support for WebRtc audio processing'
)
option
(
'natpmp_prefix'
,
type
:
'string'
,
value
:
''
,
description
:
'Override a system directory to search for the library "natpmp"'
)
option
(
'tests'
,
type
:
'boolean'
,
value
:
false
,
description
:
'Build tests'
)
This diff is collapsed.
Click to expand it.
src/meson.build
+
11
−
0
View file @
a699262e
...
...
@@ -45,6 +45,9 @@ libjami_sources = files(
'media/audio/audio_receive_thread.cpp'
,
'media/audio/audio_rtp_session.cpp'
,
'media/audio/audio_sender.cpp'
,
'media/audio/echo-cancel/echo_canceller.h'
,
'media/audio/echo-cancel/null_echo_canceller.h'
,
'media/audio/echo-cancel/null_echo_canceller.cpp'
,
'media/audio/dcblocker.cpp'
,
'media/audio/dsp.cpp'
,
'media/audio/resampler.cpp'
,
...
...
@@ -159,6 +162,14 @@ if conf.get('HAVE_PULSE') == 1
libjami_dependencies
+=
deplibpulse
endif
if
conf
.
get
(
'HAVE_WEBRTC_AP'
)
==
1
libjami_sources
+=
files
(
'media/audio/echo-cancel/webrtc_echo_canceller.h'
,
'media/audio/echo-cancel/webrtc_echo_canceller.cpp'
)
libjami_dependencies
+=
depwebrtcap
endif
if
conf
.
get
(
'HAVE_JACK'
)
==
1
libjami_sources
+=
files
(
'media/audio/jack/jacklayer.cpp'
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment