[pulseaudio-commits] [Git][pulseaudio/pulseaudio][master] build-sys: meson: require GIO dependency for RTP-GStreamer

[PulseAudio Marge Bot (@pulseaudio-merge-bot)]

PulseAudio Marge Bot pushed to branch master at PulseAudio / pulseaudio


Commits:
58052e0e by Igor V. Kovalenko at 2021-06-21T03:25:32+03:00
build-sys: meson: require GIO dependency for RTP-GStreamer

Part-of: <https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/merge_requests/584>

- - - - -


2 changed files:

- meson.build
- src/modules/meson.build


Changes:

=====================================
meson.build
=====================================
@@ -614,8 +614,9 @@ if dbus_dep.found()
   cdata.set('HAVE_DBUS', 1)
 endif
 
-gio_dep = dependency('gio-2.0', version : '>= 2.26.0', required : get_option('gsettings'))
-if gio_dep.found()
+gio_dep = dependency('gio-2.0', version : '>= 2.26.0')
+if get_option('gsettings').enabled()
+  assert(gio_dep.found(), 'GSettings support needs glib I/O library (GIO)')
   cdata.set('HAVE_GSETTINGS', 1)
 endif
 
@@ -760,6 +761,7 @@ gstrtp_dep = dependency('gstreamer-rtp-1.0', required : get_option('gstreamer'))
 
 have_gstreamer = false
 if gst_dep.found() and gstapp_dep.found() and gstrtp_dep.found()
+  assert(gio_dep.found(), 'GStreamer-based RTP needs glib I/O library (GIO)')
   have_gstreamer = true
 endif
 


=====================================
src/modules/meson.build
=====================================
@@ -161,7 +161,7 @@ if dbus_dep.found() and fftw_dep.found()
   ]
 endif
 
-if gio_dep.found()
+if get_option('gsettings').enabled() and gio_dep.found()
   subdir('gsettings')
   all_modules += [
     [ 'module-gsettings',



View it on GitLab: https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/commit/58052e0e04ee1b5fdb1027ebc19717e7766825ec

-- 
View it on GitLab: https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/commit/58052e0e04ee1b5fdb1027ebc19717e7766825ec
You're receiving this email because of your account on gitlab.freedesktop.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.freedesktop.org/archives/pulseaudio-commits/attachments/20210621/2206d910/attachment.htm>