From: Emil Velikov <emil.l.velikov@gmail.com>
Date: Sat, 18 Aug 2018 12:23:11 +0000 (+0100)
Subject: meson: egl: group dri2 bits separately from haiku
X-Git-Url: https://git.libre-soc.org/?p=mesa.git;a=commitdiff_plain;h=83c7fbb4e4c0adcd0d3f2177725e78904a90e3c1;hp=c7cc135e2326f7a6ac08aed1e0a974c1585fdbc7

meson: egl: group dri2 bits separately from haiku

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@collabora.com>
Reviewed-by: Dylan Baker <dylan@pnwbakers.com>
---

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',