From a0fbf455fa9c076444b65febc5729f443e96bf19 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Corentin=20No=C3=ABl?= Date: Tue, 20 May 2025 11:05:27 +0200 Subject: [PATCH] meson: Do not check for meson version >=0.54 Meson version 0.59 is already required. --- amdgpu/meson.build | 4 +--- etnaviv/meson.build | 4 +--- exynos/meson.build | 4 +--- freedreno/meson.build | 4 +--- intel/meson.build | 4 +--- meson.build | 4 +--- nouveau/meson.build | 4 +--- omap/meson.build | 4 +--- radeon/meson.build | 4 +--- tegra/meson.build | 4 +--- 10 files changed, 10 insertions(+), 30 deletions(-) diff --git a/amdgpu/meson.build b/amdgpu/meson.build index a98b983a..3962d32c 100644 --- a/amdgpu/meson.build +++ b/amdgpu/meson.build @@ -56,9 +56,7 @@ ext_libdrm_amdgpu = declare_dependency( include_directories : [inc_drm, include_directories('.')], ) -if meson.version().version_compare('>= 0.54.0') - meson.override_dependency('libdrm_amdgpu', ext_libdrm_amdgpu) -endif +meson.override_dependency('libdrm_amdgpu', ext_libdrm_amdgpu) test( 'amdgpu-symbols-check', diff --git a/etnaviv/meson.build b/etnaviv/meson.build index 10861351..7d56bce2 100644 --- a/etnaviv/meson.build +++ b/etnaviv/meson.build @@ -51,9 +51,7 @@ ext_libdrm_etnaviv = declare_dependency( include_directories : [inc_drm, include_directories('.')], ) -if meson.version().version_compare('>= 0.54.0') - meson.override_dependency('libdrm_etnaviv', ext_libdrm_etnaviv) -endif +meson.override_dependency('libdrm_etnaviv', ext_libdrm_etnaviv) test( 'etnaviv-symbols-check', diff --git a/exynos/meson.build b/exynos/meson.build index 6a790f49..64f76eab 100644 --- a/exynos/meson.build +++ b/exynos/meson.build @@ -38,9 +38,7 @@ ext_libdrm_exynos = declare_dependency( include_directories : [inc_drm, include_directories('.')], ) -if meson.version().version_compare('>= 0.54.0') - meson.override_dependency('libdrm_exynos', ext_libdrm_exynos) -endif +meson.override_dependency('libdrm_exynos', ext_libdrm_exynos) pkg.generate( libdrm_exynos, diff --git a/freedreno/meson.build b/freedreno/meson.build index 311f5794..156362ef 100644 --- a/freedreno/meson.build +++ b/freedreno/meson.build @@ -55,9 +55,7 @@ ext_libdrm_freedreno = declare_dependency( include_directories : [inc_drm, include_directories('.')], ) -if meson.version().version_compare('>= 0.54.0') - meson.override_dependency('libdrm_freedreno', ext_libdrm_freedreno) -endif +meson.override_dependency('libdrm_freedreno', ext_libdrm_freedreno) install_headers( 'freedreno_drmif.h', 'freedreno_ringbuffer.h', diff --git a/intel/meson.build b/intel/meson.build index 2aa9c288..5622b597 100644 --- a/intel/meson.build +++ b/intel/meson.build @@ -41,9 +41,7 @@ ext_libdrm_intel = declare_dependency( include_directories : [inc_drm, include_directories('.')], ) -if meson.version().version_compare('>= 0.54.0') - meson.override_dependency('libdrm_intel', ext_libdrm_intel) -endif +meson.override_dependency('libdrm_intel', ext_libdrm_intel) install_headers( 'intel_bufmgr.h', 'intel_aub.h', 'intel_debug.h', diff --git a/meson.build b/meson.build index 3a42b570..b89f451f 100644 --- a/meson.build +++ b/meson.build @@ -296,9 +296,7 @@ ext_libdrm = declare_dependency( include_directories : [inc_root, inc_drm], ) -if meson.version().version_compare('>= 0.54.0') - meson.override_dependency('libdrm', ext_libdrm) -endif +meson.override_dependency('libdrm', ext_libdrm) install_headers('libsync.h', 'xf86drm.h', 'xf86drmMode.h') install_headers( diff --git a/nouveau/meson.build b/nouveau/meson.build index ec28dd2d..1b541f4d 100644 --- a/nouveau/meson.build +++ b/nouveau/meson.build @@ -36,9 +36,7 @@ ext_libdrm_nouveau = declare_dependency( include_directories : [inc_drm, include_directories('.')], ) -if meson.version().version_compare('>= 0.54.0') - meson.override_dependency('libdrm_nouveau', ext_libdrm_nouveau) -endif +meson.override_dependency('libdrm_nouveau', ext_libdrm_nouveau) install_headers('nouveau.h', subdir : 'libdrm/nouveau') install_headers( diff --git a/omap/meson.build b/omap/meson.build index 8187825a..145fc3dd 100644 --- a/omap/meson.build +++ b/omap/meson.build @@ -35,9 +35,7 @@ ext_libdrm_omap = declare_dependency( include_directories : [inc_drm, include_directories('.')], ) -if meson.version().version_compare('>= 0.54.0') - meson.override_dependency('libdrm_omap', ext_libdrm_omap) -endif +meson.override_dependency('libdrm_omap', ext_libdrm_omap) install_headers('omap_drmif.h', subdir : 'libdrm') install_headers('omap_drm.h', subdir : 'omap') diff --git a/radeon/meson.build b/radeon/meson.build index bcf3239c..2d2e8854 100644 --- a/radeon/meson.build +++ b/radeon/meson.build @@ -42,9 +42,7 @@ ext_libdrm_radeon = declare_dependency( include_directories : [inc_drm, include_directories('.')], ) -if meson.version().version_compare('>= 0.54.0') - meson.override_dependency('libdrm_radeon', ext_libdrm_radeon) -endif +meson.override_dependency('libdrm_radeon', ext_libdrm_radeon) install_headers( 'radeon_bo.h', 'radeon_cs.h', 'radeon_surface.h', 'radeon_bo_gem.h', diff --git a/tegra/meson.build b/tegra/meson.build index dfec91d0..bd1e08f8 100644 --- a/tegra/meson.build +++ b/tegra/meson.build @@ -40,9 +40,7 @@ ext_libdrm_tegra = declare_dependency( include_directories : [inc_drm, include_directories('.')], ) -if meson.version().version_compare('>= 0.54.0') - meson.override_dependency('libdrm_tegra', ext_libdrm_tegra) -endif +meson.override_dependency('libdrm_tegra', ext_libdrm_tegra) install_headers('tegra.h', subdir : 'libdrm')