mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-04-26 04:36:20 +00:00
Code Issues 1 Projects Releases Wiki Activity

Add glib-networking as a subproject when glib is a subproject

Browse source 
We need gio modules for tls when building gstwebrtcbin, gstsoup, etc.

Control it via a new 'tls' option, since it requires either gnutls or
openssl.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-build/-/merge_requests/180>
This commit is contained in:
Nirbheek Chauhan 2020-07-23 16:31:07 +05:30 committed by GStreamer Merge Bot
parent e9261b7f50
commit 237f5cc4ee
3 changed files with 18 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
meson.build
View file

@ -129,6 +129,13 @@ foreach sp : subprojects
endif endif
endforeach endforeach
# Check if we need to also build glib-networking for TLS modules
glib_dep = dependency('glib-2.0')
if glib_dep.type_name() == 'internal'
subproject('glib-networking', required : get_option('tls'),
default_options: ['gnutls=auto', 'openssl=auto'])
endif
plugins_doc_dep = custom_target('plugins-doc-cache', plugins_doc_dep = custom_target('plugins-doc-cache',
command: [python3, '-c', 'print("Built all doc caches")'], command: [python3, '-c', 'print("Built all doc caches")'],
input: plugins_doc_caches, input: plugins_doc_caches,

8
meson_options.txt
View file

@ -1,3 +1,4 @@
# Subproject options
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('libnice', type : 'feature', value : 'auto')
@ -9,9 +10,12 @@ option('rtsp_server', type : 'feature', value : 'auto')
option('omx', type : 'feature', value : 'disabled') option('omx', type : 'feature', value : 'disabled')
option('vaapi', type : 'feature', value : 'disabled') option('vaapi', type : 'feature', value : 'disabled')
option('sharp', type : 'feature', value : 'disabled') option('sharp', type : 'feature', value : 'disabled')
option('custom_subprojects', type : 'string', value : '', description : 'Comma-separated project names')
option('gst-examples', type : 'feature', value : 'auto', description : 'Build gst-examples')
option('rs', type : 'feature', value : 'disabled') option('rs', type : 'feature', value : 'disabled')
option('gst-examples', type : 'feature', value : 'auto', description : 'Build gst-examples')
option('tls', type : 'feature', value : 'auto', description : 'TLS support using glib-networking')
# Other options
option('custom_subprojects', type : 'string', value : '', description : 'Comma-separated project names')
option('gst-full-libraries', type : 'array', value : [], option('gst-full-libraries', type : 'array', value : [],
description : '''List of libraries to expose in gstreamer-full's ABI. gstreamer, glib and gobject are always included.''') description : '''List of libraries to expose in gstreamer-full's ABI. gstreamer, glib and gobject are always included.''')

5
subprojects/glib-networking.wrap Normal file
View file

@ -0,0 +1,5 @@
[wrap-git]
directory=glib-networking
url=https://gitlab.gnome.org/GNOME/glib-networking.git
push-url=git@gitlab.gnome.org:GNOME/glib-networking.git
revision=glib-2-62