[Mesa-dev] [PATCH 7/7] meson: egl: group dri2 bits separately from haiku

[Dylan Baker]

Quoting Emil Velikov (2018-10-03 07:02:47)
> One cannot have haiku and dri2 - surfaceless,x11,etc.
> 
> Group things up, which will make the addition of platform_device a bit
> easier.
> 
> Signed-off-by: Emil Velikov <emil.velikov at collabora.com>
> ---
> View with git show -w to omit the whitespace changes.
> ---
>  src/egl/meson.build | 71 ++++++++++++++++++++++-----------------------
>  1 file changed, 35 insertions(+), 36 deletions(-)
> 
> diff --git a/src/egl/meson.build b/src/egl/meson.build
> index 80dbcae0fd3..8c0ffea8b40 100644
> --- a/src/egl/meson.build
> +++ b/src/egl/meson.build
> @@ -96,44 +96,43 @@ if with_dri2
>    c_args_for_egl += [
>      '-DDEFAULT_DRIVER_DIR="@0@"'.format(dri_search_path),
>    ]
> -endif
>  
> -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
> +  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
> +    endif
> +    deps_for_egl += [dep_x11_xcb, dep_xcb_dri2, dep_xcb_xfixes]
>    endif
> -  deps_for_egl += [dep_x11_xcb, dep_xcb_dri2, dep_xcb_xfixes]
> -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')]
> -  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]
> -  link_for_egl += libwayland_drm
> -  files_egl += files('drivers/dri2/platform_wayland.c')
> -  files_egl += [
> -    linux_dmabuf_unstable_v1_protocol_c,
> -    linux_dmabuf_unstable_v1_client_protocol_h,
> -    wayland_drm_client_protocol_h,
> -  ]
> -  incs_for_egl += include_directories('wayland/wayland-drm')
> -endif
> -if with_platform_android
> -  deps_for_egl += dep_android
> -  files_egl += files('drivers/dri2/platform_android.c')
> -  incs_for_egl += [inc_loader]
> -endif
> -if with_platform_haiku
> +  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')]
> +    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]
> +    link_for_egl += libwayland_drm
> +    files_egl += files('drivers/dri2/platform_wayland.c')
> +    files_egl += [
> +      linux_dmabuf_unstable_v1_protocol_c,
> +      linux_dmabuf_unstable_v1_client_protocol_h,
> +      wayland_drm_client_protocol_h,
> +    ]
> +    incs_for_egl += include_directories('wayland/wayland-drm')
> +  endif
> +  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
>    c_args_for_egl += [
>      '-D_EGL_BUILT_IN_DRIVER_HAIKU',
> -- 
> 2.19.0
> 

For this patch:
Reviewed-by: Dylan Baker <dylan at pnwbakers.com>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 228 bytes
Desc: signature
URL: <https://lists.freedesktop.org/archives/mesa-dev/attachments/20181003/813d3bf8/attachment.sig>