Merge pull request anholt#259 from lanodan/bugfix/opengl_glvnd

meson.build: Fallback from libGL to libOpenGL when GLX is disabled

Author: ebassi

meson.build

@@ -165,6 +165,9 @@ endif
 # Dependencies
 dl_dep = cc.find_library('dl', required: false)
 gl_dep = dependency('gl', required: false)
+if not gl_dep.found() and not build_glx
+  gl_dep = dependency('opengl', required: false)
+endif
 egl_dep = dependency('egl', required: false)
 elg_headers_dep = egl_dep.partial_dependency(compile_args: true, includes: true)
 

src/meson.build

@@ -100,7 +100,7 @@ meson.override_dependency('epoxy', libepoxy_dep)
 # pkg-config file, for consumers of Epoxy
 gl_reqs = []
 if gl_dep.found() and gl_dep.type_name() == 'pkgconfig'
-  gl_reqs += 'gl'
+  gl_reqs += gl_dep.name()
 endif
 if build_egl and egl_dep.found() and egl_dep.type_name() == 'pkgconfig'
   gl_reqs += 'egl'