[Mesa-dev] [PATCH 06/18] glx/test: meson: assorted include fixes

[Juan A. Suarez Romero]

On Thu, 2018-12-13 at 16:05 +0000, Emil Velikov wrote:
> From: Emil Velikov <emil.velikov at collabora.com>
> 
> Swap '..' with the symbolic inc_glx and add glproto as dependency. That
> will pull the correct include, effectively fixing the tests on macOS.
> 
> Fixes: a47c525f328 ("meson: build glx")
> Signed-off-by: Emil Velikov <emil.velikov at collabora.com>
> ---

I've applied this patch in 18.2, but it didn't apply cleanly. I've fixed the
conflicts; you can find the fixed patch at :

https://gitlab.freedesktop.org/mesa/mesa/commit/22340dd92c2577ab951d46e44501c8e5646480ea


>  src/glx/tests/meson.build | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/src/glx/tests/meson.build b/src/glx/tests/meson.build
> index 2420c90c437..68e1ca59c22 100644
> --- a/src/glx/tests/meson.build
> +++ b/src/glx/tests/meson.build
> @@ -46,9 +46,9 @@ if with_shared_glapi
>        link_with : [libglx, libglapi],
>        include_directories : [
>          inc_src, inc_include, inc_mesa, inc_mapi, inc_gl_internal,
> -        include_directories('..'),
> +        inc_glx,
>        ],
> -      dependencies : [dep_libdrm, dep_thread, idep_gtest]
> +      dependencies : [dep_libdrm, dep_glproto, dep_thread, idep_gtest]
>      ),
>      suite : ['glx'],
>    )