From c42ec82de60c822871af7e9bd63e72c71cc0290e Mon Sep 17 00:00:00 2001 From: Mathieu Duponchelle Date: Sat, 27 Oct 2018 17:58:44 +0200 Subject: [PATCH] Add pygobject and pycairo as subprojects --- .gitignore | 2 ++ meson.build | 5 ++++- subprojects/pycairo.wrap | 4 ++++ subprojects/pygobject.wrap | 5 +++++ 4 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 subprojects/pycairo.wrap create mode 100644 subprojects/pygobject.wrap diff --git a/.gitignore b/.gitignore index f29aa9ae8f..f90d69f333 100644 --- a/.gitignore +++ b/.gitignore @@ -38,4 +38,6 @@ subprojects/libunwind/ subprojects/proxy-libintl/ subprojects/zlib/ subprojects/openh264/ +subprojects/pygobject/ +subprojects/pycairo/ prefix/ diff --git a/meson.build b/meson.build index dbfa0fa3e1..59c5bc78cd 100644 --- a/meson.build +++ b/meson.build @@ -63,7 +63,10 @@ subprojects = { 'gst-plugins-good': {}, 'gst-plugins-bad': { 'option': get_option('bad') }, 'gst-plugins-ugly': { 'option': get_option('ugly') }, - 'gst-python': { 'option': python_opt, 'dependencies': [dependency('pygobject-3.0', required : python_opt)] }, + 'gst-python': { + 'option': python_opt, + 'dependencies': [dependency('pygobject-3.0', fallback: ['pygobject', 'pygobject_dep'], required : python_opt)] + }, 'gst-omx': { 'option': get_option('omx'), }, 'gst-libav': { 'option': get_option('libav'), 'dependencies': libav_deps}, 'gstreamer-vaapi': { diff --git a/subprojects/pycairo.wrap b/subprojects/pycairo.wrap new file mode 100644 index 0000000000..87eac571ed --- /dev/null +++ b/subprojects/pycairo.wrap @@ -0,0 +1,4 @@ +[wrap-git] +directory=pycairo +url=https://github.com/pygobject/pycairo.git +revision=master diff --git a/subprojects/pygobject.wrap b/subprojects/pygobject.wrap new file mode 100644 index 0000000000..1a4e7bedf8 --- /dev/null +++ b/subprojects/pygobject.wrap @@ -0,0 +1,5 @@ +[wrap-git] +directory=pygobject +url=https://gitlab.gnome.org/GNOME/pygobject.git +push-url=git@gitlab.gnome.org:GNOME/pygobject.git +revision=master