mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-22 09:41:07 +00:00
Code Issues 1 Projects Releases Wiki Activity

add libnice as a top-level subproject.

Browse source 
When relying on a system-wide libnice, we end up not building
the nice elements, which means we can't use them, and by extension
webrtcbin, in the uninstalled environment.

This also introduces a way to avoid checking the version of
a given subproject, and makes use of it for libnice and pygobject,
which only passed the version check by chance, as its current
major version is 3.
This commit is contained in:
Mathieu Duponchelle 2019-04-05 15:27:37 +02:00
parent acf83f17c2
commit d3029ec0d6
2 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
meson.build
View file

@ -35,6 +35,7 @@ subprojects = [
['gstreamer', {}], ['gstreamer', {}],
['gst-plugins-base', {}], ['gst-plugins-base', {}],
['gst-plugins-good', {}], ['gst-plugins-good', {}],
['libnice', { 'option': get_option('libnice'), 'match_gst_version': false}],
['gst-plugins-bad', { 'option': get_option('bad') }], ['gst-plugins-bad', { 'option': get_option('bad') }],
['gst-plugins-ugly', { 'option': get_option('ugly') }], ['gst-plugins-ugly', { 'option': get_option('ugly') }],
['gst-libav', { 'option': get_option('libav') }], ['gst-libav', { 'option': get_option('libav') }],
@ -45,7 +46,7 @@ subprojects = [
['gstreamer-vaapi', { 'option': get_option('vaapi') }], ['gstreamer-vaapi', { 'option': get_option('vaapi') }],
['gst-omx', { 'option': get_option('omx'), }], ['gst-omx', { 'option': get_option('omx'), }],
['gstreamer-sharp', { 'option': get_option('sharp') }], ['gstreamer-sharp', { 'option': get_option('sharp') }],
['pygobject', { 'option': get_option('python') }], ['pygobject', { 'option': get_option('python'), 'match_gst_version': false }],
['gst-python', { 'option': get_option('python') }], ['gst-python', { 'option': get_option('python') }],
] ]
@ -69,7 +70,14 @@ foreach sp : subprojects
project_name = sp[0] project_name = sp[0]
build_infos = sp[1] build_infos = sp[1]
is_required = build_infos.get('option', true) is_required = build_infos.get('option', true)
subproj = subproject(project_name, version: gst_version, required: is_required) match_gst_version = build_infos.get('match_gst_version', true)
if match_gst_version
subproj = subproject(project_name, version: gst_version, required: is_required)
else
subproj = subproject(project_name, required: is_required)
endif
if subproj.found() if subproj.found()
subprojects_names += [project_name] subprojects_names += [project_name]
cmdres = run_command(python3, '-c', symlink.format(project_name, meson.current_source_dir())) cmdres = run_command(python3, '-c', symlink.format(project_name, meson.current_source_dir()))

1
meson_options.txt
View file

@ -1,5 +1,6 @@
option('python', type : 'feature', value : 'auto') option('python', type : 'feature', value : 'auto')
option('libav', type : 'feature', value : 'auto') option('libav', type : 'feature', value : 'auto')
option('libnice', type : 'feature', value : 'auto')
option('ugly', type : 'feature', value : 'auto') option('ugly', type : 'feature', value : 'auto')
option('bad', type : 'feature', value : 'auto') option('bad', type : 'feature', value : 'auto')
option('devtools', type : 'feature', value : 'auto') option('devtools', type : 'feature', value : 'auto')