From: Matthew Waters <matthew@centricular.com>
Date: Wed, 6 Jun 2018 07:24:26 +0000 (+1000)
Subject: gl/meson: force the gl dependency to use pkg-config
X-Git-Tag: 1.19.3~511^2~1641
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1ceccb5b58a080c00fb521cee5c5fc13b46d73cb;p=platform%2Fupstream%2Fgstreamer.git

gl/meson: force the gl dependency to use pkg-config

Meson has an internal override for dependency('gl') which we do not want
to use as it assumes too many things.  Force meson to only search for
gl.pc.
---

diff --git a/gst-libs/gst/gl/meson.build b/gst-libs/gst/gl/meson.build
index 05e9498..4b6a5f0 100644
--- a/gst-libs/gst/gl/meson.build
+++ b/gst-libs/gst/gl/meson.build
@@ -268,7 +268,9 @@ gl_include_header = '''
 gl_dep = unneeded_dep
 glx_dep = unneeded_dep
 if need_api_opengl != 'no' or need_platform_glx != 'no'
-  gl_dep = dependency('gl', required : false)
+  # override meson's braindead gl detection on osx/windows/etc by forcing pkg-config
+  gl_dep = dependency('gl', method: 'pkg-config', required : false)
+
   if not gl_dep.found()
     if host_machine.system() == 'windows'
       gl_dep = cc.find_library('opengl32', required : false)