From 08501e77af55dc2ac6bc438b45a6506d2bf3a355 Mon Sep 17 00:00:00 2001 From: Dylan Baker Date: Thu, 10 Oct 2019 15:10:56 -0700 Subject: meson: Add dep_glvnd to egl deps when building with glvnd Otherwise if glvnd is not installed systemwide, but only in a prefix, it's headers wont be found. This happens because if it's headers are in /usr/include/ then another dependence will provide the necessary -I arguments and compilation will work. Fixes: 035ec7a2bb2d5e413ac945b8f012185a0e187d5e ("meson: Add support for EGL glvnd") Acked-by: Eric Engestrom (cherry picked from commit 5d085ad052aac1f35cef7b60c0e6ecad65a6807b) --- src/egl/meson.build | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/egl/meson.build b/src/egl/meson.build index 9c2c055c3eb..dfc78acd919 100644 --- a/src/egl/meson.build +++ b/src/egl/meson.build @@ -1,4 +1,4 @@ -# Copyright © 2017 Intel Corporation +# Copyright © 2017-2019 Intel Corporation # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal @@ -149,6 +149,7 @@ if not with_glvnd else egl_lib_name = 'EGL_mesa' egl_lib_version = '0.0.0' + deps_for_egl += dep_glvnd files_egl += [g_egldispatchstubs_h, g_egldispatchstubs_c] files_egl += files('main/eglglvnd.c', 'main/egldispatchstubs.c') install_data( -- cgit v1.2.3