On Thu, 14 Feb 2019 11:43:13 +0000
Emil Velikov <emil.l.veli...@gmail.com> wrote:
> From: Emil Velikov <emil.veli...@collabora.com>
>
> Earlier commit introduced support for haiku yet did not properly
> annotate the loader/xmlconfig dependencies.
>
> Thus we ended up adding inc_loader for each !haiku platform - see
> 659910eda01 9a96bf0ecd0 731508b988 cec6cb01e216.
>
> One piece remained though - the wayland platform. Hence the following
> would fail:
>
> meson -Dgallium-drivers=etnaviv -Ddri-drivers=''\
> -Dtools=etnaviv -Dplatforms=wayland -Dglx=disabled \
> build/
>
> Cc: Alexander von Gluck IV <kallis...@unixzen.com>
> Cc: Dylan Baker <dy...@pnwbakers.com>
> Cc: Boris Brezillon <boris.brezil...@collabora.com>
> Reported-by: Boris Brezillon <boris.brezil...@collabora.com>
> Fixes: 834d221512f ("meson: Add Haiku platform support v4")
> Signed-off-by: Emil Velikov <emil.veli...@collabora.com>
Tested-by: Boris Brezillon <boris.brezil...@collabora.com>
Thanks,
Boris
> ---
> src/egl/meson.build | 11 +++++------
> 1 file changed, 5 insertions(+), 6 deletions(-)
>
> diff --git a/src/egl/meson.build b/src/egl/meson.build
> index a23cc36fc2b..b7ff09e9fed 100644
> --- a/src/egl/meson.build
> +++ b/src/egl/meson.build
> @@ -93,10 +93,11 @@ if with_dri2
> 'drivers/dri2/egl_dri2.h',
> 'drivers/dri2/egl_dri2_fallbacks.h',
> )
> + link_for_egl += [libloader, libxmlconfig]
> + incs_for_egl += inc_loader
>
> if with_platform_x11
> files_egl += files('drivers/dri2/platform_x11.c')
> - incs_for_egl += inc_loader
> if with_dri3
> files_egl += files('drivers/dri2/platform_x11_dri3.c')
> link_for_egl += libloader_dri3_helper
> @@ -105,13 +106,12 @@ if with_dri2
> endif
> if with_platform_drm
> files_egl += files('drivers/dri2/platform_drm.c')
> - link_for_egl += [libloader, libgbm, libxmlconfig]
> - incs_for_egl += [inc_loader, inc_gbm, include_directories('../gbm/main')]
> + link_for_egl += libgbm
> + incs_for_egl += [inc_gbm, include_directories('../gbm/main')]
> deps_for_egl += dep_libdrm
> endif
> if with_platform_surfaceless
> files_egl += files('drivers/dri2/platform_surfaceless.c')
> - incs_for_egl += [inc_loader]
> endif
> if with_platform_wayland
> deps_for_egl += [dep_wayland_client, dep_wayland_server,
> dep_wayland_egl_headers]
> @@ -127,7 +127,6 @@ if with_dri2
> if with_platform_android
> deps_for_egl += dep_android
> files_egl += files('drivers/dri2/platform_android.c')
> - incs_for_egl += [inc_loader]
> endif
> elif with_platform_haiku
> incs_for_egl += inc_haikugl
> @@ -166,7 +165,7 @@ libegl = shared_library(
>
> '-D_EGL_NATIVE_PLATFORM=_EGL_PLATFORM_@0@'.format(egl_native_platform.to_upper()),
> ],
> include_directories : incs_for_egl,
> - link_with : [link_for_egl, libloader, libxmlconfig, libglapi,
> libmesa_util],
> + link_with : [link_for_egl, libglapi, libmesa_util],
> link_args : [ld_args_bsymbolic, ld_args_gc_sections],
> dependencies : [deps_for_egl, dep_dl, dep_libdrm, dep_clock, dep_thread],
> install : true,
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
