OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

meson: forcefully disable libdrm when host doesn't have it

Browse Source 
Signed-off-by: Mark Collins <mark@igalia.com>
Reviewed-by: Eric Engestrom <eric@igalia.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/21724>
This commit is contained in:
Mark Collins
2023-03-06 11:27:28 +00:00
committed by Marge Bot
parent 952bd63d6d
commit 66d2ae0386
2 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
meson.build
View File

@@ -1567,11 +1567,17 @@ foreach d : _libdrm_checks
endforeach endforeach
with_gallium_drisw_kms = false with_gallium_drisw_kms = false
dep_libdrm = dependency( if system_has_kms_drm
'libdrm', version : '>=' + _drm_ver, dep_libdrm = dependency(
# GNU/Hurd includes egl_dri2, without drm. 'libdrm', version : '>=' + _drm_ver,
required : (with_dri2 and host_machine.system() != 'gnu') or with_dri3 # GNU/Hurd includes egl_dri2, without drm.
) required : (with_dri2 and host_machine.system() != 'gnu') or with_dri3
)
else
# We should prevent libdrm from being available when the target doesn't have it to avoid transitive
# dependencies (such as vk-runtime) linking to it
dep_libdrm = null_dep
endif
if dep_libdrm.found() if dep_libdrm.found()
pre_args += '-DHAVE_LIBDRM' pre_args += '-DHAVE_LIBDRM'
if with_dri_platform == 'drm' and with_dri if with_dri_platform == 'drm' and with_dri

5
src/freedreno/vulkan/meson.build
View File

@@ -67,11 +67,6 @@ if with_xlib_lease
tu_deps += [dep_xlib_xrandr] tu_deps += [dep_xlib_xrandr]
endif endif
if not system_has_kms_drm
# Even if libdrm is available we shouldn't use it in KGSL-only build
tu_flags += '-UHAVE_LIBDRM'
endif
if freedreno_kmds.contains('kgsl') if freedreno_kmds.contains('kgsl')
tu_flags += '-DTU_HAS_KGSL' tu_flags += '-DTU_HAS_KGSL'
libtu_files += files('tu_knl_kgsl.c') libtu_files += files('tu_knl_kgsl.c')