fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-20 11:40:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

meson: egl: Do not build platform_drm for Android

Browse source 
'platform_android' wasn't designed to coexist with 'platform_drm' within
single build, therefore a lot of conflicts appears during compile-time.

Signed-off-by: Roman Stratiienko <r.stratiienko@gmail.com>
Reviewed-by: Eric Engestrom <eric@engestrom.ch>
Acked-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Tested-by: Mauro Rossi <issor.oruam@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10183>
This commit is contained in:
Roman Stratiienko 2021-04-20 18:37:21 +03:00 • committed by Marge Bot
parent 45814b58c1
commit 016e932cda
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
meson.build
View file

@ -883,7 +883,7 @@ else
pre_args += '-DEGL_NO_X11' pre_args += '-DEGL_NO_X11'
gl_pkgconfig_c_flags += '-DEGL_NO_X11' gl_pkgconfig_c_flags += '-DEGL_NO_X11'
endif endif
if with_gbm if with_gbm and not with_platform_android
pre_args += '-DHAVE_DRM_PLATFORM' pre_args += '-DHAVE_DRM_PLATFORM'
endif endif
@ -2135,7 +2135,7 @@ endif
lines += 'GBM: ' + (with_gbm ? 'yes' : 'no') lines += 'GBM: ' + (with_gbm ? 'yes' : 'no')
if with_egl or with_any_vk if with_egl or with_any_vk
_platforms += 'surfaceless' _platforms += 'surfaceless'
if with_gbm if with_gbm and not with_platform_android
_platforms += 'drm' _platforms += 'drm'
endif endif
lines += 'EGL/Vulkan/VL platforms: ' + ' '.join(_platforms) lines += 'EGL/Vulkan/VL platforms: ' + ' '.join(_platforms)

2
src/egl/meson.build
View file

@ -105,7 +105,7 @@ if with_dri2
endif endif
deps_for_egl += [dep_x11_xcb, dep_xcb_dri2, dep_xcb_xfixes] deps_for_egl += [dep_x11_xcb, dep_xcb_dri2, dep_xcb_xfixes]
endif endif
if with_gbm if with_gbm and not with_platform_android
files_egl += files('drivers/dri2/platform_drm.c') files_egl += files('drivers/dri2/platform_drm.c')
link_for_egl += libgbm link_for_egl += libgbm
incs_for_egl += [inc_gbm, include_directories('../gbm/main')] incs_for_egl += [inc_gbm, include_directories('../gbm/main')]