diff options
| author | Víctor Manuel Jáquez Leal <vjaquez@igalia.com> | 2018-04-25 17:50:14 +0200 |
|---|---|---|
| committer | Víctor Manuel Jáquez Leal <vjaquez@igalia.com> | 2018-04-26 08:35:00 +0200 |
| commit | cf67d6d5676df06cef5a60ffe39e22b1a1e50d99 (patch) | |
| tree | f481a0f2e5bf0b9e714995793a47db49a5d12008 | |
| parent | 1660bd0df1817f2232328c41bb2f5fc54ff41f6b (diff) | |
meson: fix USE_GLES_VERSION_MASK
1. The macro in the code is USE_GLES_VERSION_MASK
2. glesv3 is provided by glesv2 pkg-config, then it's required to
check headers
3. fix syntax error
https://bugzilla.gnome.org/show_bug.cgi?id=795391
| -rw-r--r-- | meson.build | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/meson.build b/meson.build index 063ebcbe..2695f242 100644 --- a/meson.build +++ b/meson.build @@ -48,17 +48,24 @@ libudev_dep = dependency('libudev', required: false) egl_dep = dependency('egl', required: false) gl_dep = dependency('gl', required: false) glesv2_dep = dependency('glesv2', required: false) -glesv3_dep = dependency('glesv3', required: false) -libdl_dep = cc.find_library('dl', rqeuired: false) +libdl_dep = cc.find_library('dl', required: false) wayland_client_dep = dependency('wayland-client', required: false) x11_dep = dependency('x11', required: false) xrandr_dep = dependency('xrandr', required: false) xrender_dep = dependency('xrender', required: false) -GLES_VERSION_MASK = 0 -GLES_VERSION_MASK += gl_dep.found() ? 1 : 0 -GLES_VERSION_MASK += glesv2_dep.found() ? 4 : 0 -GLES_VERSION_MASK += glesv3_dep.found() ? 8 : 0 +GLES_VERSION_MASK = gl_dep.found() ? 1 : 0 +if glesv2_dep.found() + if (cc.has_header('GLES2/gl2.h', dependencies: glesv2_dep) and + cc.has_header('GLES2/gl2ext.h', dependencies: glesv2_dep)) + GLES_VERSION_MASK += 4 + endif + if (cc.has_header('GLES3/gl3.h', dependencies: glesv2_dep) and + cc.has_header('GLES3/gl3ext.h', dependencies: glesv2_dep) and + cc.has_header('GLES2/gl2ext.h', dependencies: glesv2_dep)) + GLES_VERSION_MASK += 8 + endif +endif USE_ENCODERS = libva_dep.version().version_compare('>= 0.34.0') and get_option('with_encoders') != 'no' USE_H265_DECODER = cc.has_header('va/va_dec_hevc.h', dependencies: libva_dep, prefix: '#include <va/va.h>') @@ -103,7 +110,7 @@ cdata.set10('HAVE_XRANDR', xrandr_dep.found()) cdata.set10('HAVE_XRENDER', xrender_dep.found()) cdata.set10('USE_VA_VPP', true) cdata.set10('USE_GST_GL_HELPERS', gstgl_dep.found()) -cdata.set('GLES_VERSION_MASK', GLES_VERSION_MASK) +cdata.set('USE_GLES_VERSION_MASK', GLES_VERSION_MASK) runcmd = run_command('pkg-config', '--variable=driverdir', 'libva') if runcmd.returncode() == 0 cdata.set('VA_DRIVERS_PATH', '"@0@"'.format(runcmd.stdout().strip())) |