From 92537b1364ed10f4341cbabcbc7401d160c7671b Mon Sep 17 00:00:00 2001 From: Nicolas Dufresne Date: Thu, 22 Jun 2017 10:34:04 -0400 Subject: [PATCH] meson: Re-add pkg-config support for bcm_host Now we just fallback to find_library for Rasbian jessy and older. https://bugzilla.gnome.org/show_bug.cgi?id=784026 --- gst-libs/gst/gl/meson.build | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/gst-libs/gst/gl/meson.build b/gst-libs/gst/gl/meson.build index 62b22380cf..6f88736b6f 100644 --- a/gst-libs/gst/gl/meson.build +++ b/gst-libs/gst/gl/meson.build @@ -516,7 +516,14 @@ endif bcm_host_dep = unneeded_dep if need_win_dispmanx != 'no' - bcm_host_dep = cc.find_library('bcm_host', required : false) + + # Try pkg-config for bcm_host then fallback to find_library to also + # support older distribution + bcm_host_dep = dependency('bcm_host', required : false) + if not bcm_host_dep.found() + bcm_host_dep = cc.find_library('bcm_host', required : false) + endif + if bcm_host_dep.found() if not egl_dep.found() error('dispmanx requires the use of egl')