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
acfbf582
Commit
acfbf582
authored
2 years ago
by
Vladimir Stoiakin
Committed by
Adrien Béraud
2 years ago
Browse files
Options
Downloads
Patches
Plain Diff
meson: add support for tracepoints
Change-Id: If19db447c903478ac07c852b03aede50508608f1
parent
d15248f4
No related branches found
No related tags found
No related merge requests found
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
meson.build
+8
-0
8 additions, 0 deletions
meson.build
meson_options.txt
+1
-0
1 addition, 0 deletions
meson_options.txt
src/meson.build
+14
-6
14 additions, 6 deletions
src/meson.build
with
23 additions
and
6 deletions
meson.build
+
8
−
0
View file @
acfbf582
...
@@ -155,6 +155,14 @@ else
...
@@ -155,6 +155,14 @@ else
conf
.
set
(
'ENABLE_PLUGIN'
,
false
)
conf
.
set
(
'ENABLE_PLUGIN'
,
false
)
endif
endif
if
get_option
(
'tracepoints'
)
conf
.
set
(
'ENABLE_TRACEPOINTS'
,
true
)
deplttngust
=
dependency
(
'lttng-ust'
,
version
:
'>= 2.13'
)
#depliburcu = dependency('liburcu', version: '>= 0.13.1')
else
conf
.
set
(
'ENABLE_TRACEPOINTS'
,
false
)
endif
conf
.
set10
(
'HAVE_COREAUDIO'
,
host_machine
.
system
()
==
'darwin'
)
conf
.
set10
(
'HAVE_COREAUDIO'
,
host_machine
.
system
()
==
'darwin'
)
conf
.
set
(
'ENABLE_SHM'
,
get_option
(
'interfaces'
).
contains
(
'dbus'
))
conf
.
set
(
'ENABLE_SHM'
,
get_option
(
'interfaces'
).
contains
(
'dbus'
))
configure_file
(
configure_file
(
...
...
This diff is collapsed.
Click to expand it.
meson_options.txt
+
1
−
0
View file @
acfbf582
...
@@ -15,3 +15,4 @@ option('aec', type: 'feature', value: 'auto', description: 'Enable Acoustic Echo
...
@@ -15,3 +15,4 @@ option('aec', type: 'feature', value: 'auto', description: 'Enable Acoustic Echo
option
(
'natpmp_prefix'
,
type
:
'string'
,
value
:
''
,
description
:
'Override a system directory to search for the library "natpmp"'
)
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'
)
option
(
'tests'
,
type
:
'boolean'
,
value
:
false
,
description
:
'Build tests'
)
option
(
'tracepoints'
,
type
:
'boolean'
,
value
:
false
,
description
:
'Enable tracepoints'
)
This diff is collapsed.
Click to expand it.
src/meson.build
+
14
−
6
View file @
acfbf582
...
@@ -47,14 +47,14 @@ libjami_sources = files(
...
@@ -47,14 +47,14 @@ libjami_sources = files(
'media/audio/sound/dtmfgenerator.cpp'
,
'media/audio/sound/dtmfgenerator.cpp'
,
'media/audio/sound/tone.cpp'
,
'media/audio/sound/tone.cpp'
,
'media/audio/sound/tonelist.cpp'
,
'media/audio/sound/tonelist.cpp'
,
'media/audio/audiobuffer.cpp'
,
'media/audio/audio_frame_resizer.cpp'
,
'media/audio/audio_frame_resizer.cpp'
,
'media/audio/audio_input.cpp'
,
'media/audio/audio_input.cpp'
,
'media/audio/audiolayer.cpp'
,
'media/audio/audioloop.cpp'
,
'media/audio/audio_receive_thread.cpp'
,
'media/audio/audio_receive_thread.cpp'
,
'media/audio/audio_rtp_session.cpp'
,
'media/audio/audio_rtp_session.cpp'
,
'media/audio/audio_sender.cpp'
,
'media/audio/audio_sender.cpp'
,
'media/audio/audiobuffer.cpp'
,
'media/audio/audiolayer.cpp'
,
'media/audio/audioloop.cpp'
,
'media/audio/dcblocker.cpp'
,
'media/audio/dcblocker.cpp'
,
'media/audio/dsp.cpp'
,
'media/audio/dsp.cpp'
,
'media/audio/resampler.cpp'
,
'media/audio/resampler.cpp'
,
...
@@ -293,15 +293,15 @@ endif
...
@@ -293,15 +293,15 @@ endif
if
conf
.
get
(
'ENABLE_PLUGIN'
)
if
conf
.
get
(
'ENABLE_PLUGIN'
)
libjami_sources
+=
files
(
libjami_sources
+=
files
(
'client/plugin_manager_interface.cpp'
,
'client/plugin_manager_interface.cpp'
,
'plugin/preferenceservicesmanager.cpp'
,
'plugin/callservicesmanager.cpp'
,
'plugin/callservicesmanager.cpp'
,
'plugin/chatservicesmanager.cpp'
,
'plugin/chatservicesmanager.cpp'
,
'plugin/webviewservicesmanager.cpp'
,
'plugin/jamipluginmanager.cpp'
,
'plugin/jamipluginmanager.cpp'
,
'plugin/pluginloader.cpp'
,
'plugin/pluginloader.cpp'
,
'plugin/pluginmanager.cpp'
,
'plugin/pluginmanager.cpp'
,
'plugin/pluginpreferencesutils.cpp'
,
'plugin/pluginpreferencesutils.cpp'
,
'plugin/pluginsutils.cpp'
'plugin/pluginsutils.cpp'
,
'plugin/preferenceservicesmanager.cpp'
,
'plugin/webviewservicesmanager.cpp'
)
)
if
host_machine
.
system
()
==
'darwin'
if
host_machine
.
system
()
==
'darwin'
libjami_dependencies
+=
depminizip
libjami_dependencies
+=
depminizip
...
@@ -311,6 +311,13 @@ if conf.get('ENABLE_PLUGIN')
...
@@ -311,6 +311,13 @@ if conf.get('ENABLE_PLUGIN')
libjami_dependencies
+=
depdl
libjami_dependencies
+=
depdl
endif
endif
if
conf
.
get
(
'ENABLE_TRACEPOINTS'
)
libjami_sources
+=
files
(
'jami/tracepoint.c'
)
libjami_dependencies
+=
deplttngust
endif
# https://ffmpeg.org/platform.html#Advanced-linking-configuration
# https://ffmpeg.org/platform.html#Advanced-linking-configuration
libjami_linkargs
=
meson
.
get_compiler
(
'cpp'
).
get_supported_link_arguments
(
libjami_linkargs
=
meson
.
get_compiler
(
'cpp'
).
get_supported_link_arguments
(
'-Wl,-Bsymbolic'
'-Wl,-Bsymbolic'
...
@@ -348,6 +355,7 @@ if get_option('interfaces').contains('library')
...
@@ -348,6 +355,7 @@ if get_option('interfaces').contains('library')
'jami/presence_const.h'
,
'jami/presence_const.h'
,
'jami/presencemanager_interface.h'
,
'jami/presencemanager_interface.h'
,
'jami/security_const.h'
,
'jami/security_const.h'
,
'jami/trace-tools.h'
,
subdir
:
'jami'
subdir
:
'jami'
)
)
if
conf
.
get
(
'ENABLE_VIDEO'
)
if
conf
.
get
(
'ENABLE_VIDEO'
)
...
...
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