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

Revert "meson: add wrap for libdrm"

Browse Source 
This reverts commit 40b87cde2a.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26835>
This commit is contained in:
Eric Engestrom
2023-12-28 15:39:49 +00:00
committed by Marge Bot
parent 666f27d228
commit 0ffb828513
2 changed files with 2 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
meson.build
View File

@@ -1657,11 +1657,7 @@ foreach d : _libdrm_checks
if d[1] if d[1]
set_variable( set_variable(
'dep_libdrm_' + d[0], 'dep_libdrm_' + d[0],
dependency( dependency('libdrm_' + d[0], version : '>=' + _drm_ver)
'libdrm_' + d[0],
version : '>=' + _drm_ver,
allow_fallback: true,
)
) )
endif endif
endforeach endforeach
@@ -1669,9 +1665,7 @@ endforeach
with_gallium_drisw_kms = false with_gallium_drisw_kms = false
if system_has_kms_drm if system_has_kms_drm
dep_libdrm = dependency( dep_libdrm = dependency(
'libdrm', 'libdrm', version : '>=' + _drm_ver,
version : '>=' + _drm_ver,
allow_fallback: true,
# GNU/Hurd includes egl_dri2, without drm. # GNU/Hurd includes egl_dri2, without drm.
required : (with_dri2 and host_machine.system() != 'gnu') or with_dri3 required : (with_dri2 and host_machine.system() != 'gnu') or with_dri3
) )

18
subprojects/libdrm.wrap
View File

@@ -1,18 +0,0 @@
[wrap-file]
directory = libdrm-2.4.114
source_url = https://dri.freedesktop.org/libdrm/libdrm-2.4.114.tar.xz
source_filename = libdrm-2.4.114.tar.xz
source_hash = 3049cf843a47d12e5eeefbc3be3496d782fa09f42346bf0b7defe3d1e598d026
wrapdb_version = 2.4.114-1
[provide]
libdrm = ext_libdrm
libdrm_amdgpu = ext_libdrm_amdgpu
libdrm_etnaviv = ext_libdrm_etnaviv
libdrm_exynos = ext_libdrm_exynos
libdrm_freedreno = ext_libdrm_freedreno
libdrm_intel = ext_libdrm_intel
libdrm_nouveau = ext_libdrm_nouveau
libdrm_omap = ext_libdrm_omap
libdrm_radeon = ext_libdrm_radeon
libdrm_tegra = ext_libdrm_tegra