Module: Mesa Branch: main Commit: 0ffb828513d0225e3657e21cefb496aba499033f URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=0ffb828513d0225e3657e21cefb496aba499033f
Author: Eric Engestrom <[email protected]> Date: Thu Dec 28 15:39:49 2023 +0000 Revert "meson: add wrap for libdrm" This reverts commit 40b87cde2ac6824d9827d897b9971c004c6c6586. Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26835> --- meson.build | 10 ++-------- subprojects/libdrm.wrap | 18 ------------------ 2 files changed, 2 insertions(+), 26 deletions(-) diff --git a/meson.build b/meson.build index e12e467298c..b2cd74e491d 100644 --- a/meson.build +++ b/meson.build @@ -1657,11 +1657,7 @@ foreach d : _libdrm_checks if d[1] set_variable( 'dep_libdrm_' + d[0], - dependency( - 'libdrm_' + d[0], - version : '>=' + _drm_ver, - allow_fallback: true, - ) + dependency('libdrm_' + d[0], version : '>=' + _drm_ver) ) endif endforeach @@ -1669,9 +1665,7 @@ endforeach with_gallium_drisw_kms = false if system_has_kms_drm dep_libdrm = dependency( - 'libdrm', - version : '>=' + _drm_ver, - allow_fallback: true, + 'libdrm', version : '>=' + _drm_ver, # GNU/Hurd includes egl_dri2, without drm. required : (with_dri2 and host_machine.system() != 'gnu') or with_dri3 ) diff --git a/subprojects/libdrm.wrap b/subprojects/libdrm.wrap deleted file mode 100644 index 7f8fe0f1a35..00000000000 --- a/subprojects/libdrm.wrap +++ /dev/null @@ -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
