From 23cc02d7c3c9a07ab3b9ca3e38794fecad2b8c2b Mon Sep 17 00:00:00 2001 From: Nirbheek Chauhan Date: Fri, 14 Jan 2022 19:53:29 +0530 Subject: [PATCH] meson: Build cairo subproject when unavailable on the system Fixes https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/952 Part-of: --- subprojects/cairo.wrap | 4 ++++ subprojects/gst-plugins-good/ext/cairo/meson.build | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/subprojects/cairo.wrap b/subprojects/cairo.wrap index 478a19f043..7a85b81337 100644 --- a/subprojects/cairo.wrap +++ b/subprojects/cairo.wrap @@ -3,3 +3,7 @@ directory=cairo url=https://gitlab.freedesktop.org/cairo/cairo.git depth=1 revision=a04786b9330109ce54bf7f65c7068281419cec6a + +[provide] +cairo = libcairo_dep +cairo-gobject = libcairogobject_dep diff --git a/subprojects/gst-plugins-good/ext/cairo/meson.build b/subprojects/gst-plugins-good/ext/cairo/meson.build index ffb2ed8da9..06ea881a9f 100644 --- a/subprojects/gst-plugins-good/ext/cairo/meson.build +++ b/subprojects/gst-plugins-good/ext/cairo/meson.build @@ -1,4 +1,5 @@ -cairo_dep = dependency('cairo-gobject', version : '>=1.10.0', required : get_option('cairo')) +cairo_dep = dependency('cairo-gobject', version : '>=1.10.0', required : get_option('cairo'), + default_options: ['glib=enabled']) if cairo_dep.found() gstcairo = library('gstcairo',