meson: add override_dependency when possible

This allows consumers of libdrm as a subproject to use the simpler
`dependency('libdrm', fallback : 'libdrm')` syntax, as the libdrm build
files already tell meson that they override a dependency called
"libdrm".

Signed-off-by: Dylan Baker <dylan@pnwbakers.com>
Reviewed-by: Simon Ser <contact@emersion.fr>

diff --git a/amdgpu/meson.build b/amdgpu/meson.build
index 3301a10..b2d1987 100644 (file)
--- a/amdgpu/meson.build
+++ b/amdgpu/meson.build
@@ -57,6 +57,10 @@ 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
+
 test(
   'amdgpu-symbols-check',
   symbols_check,

diff --git a/etnaviv/meson.build b/etnaviv/meson.build
index 8b82ed0..ffc0a67 100644 (file)
--- a/etnaviv/meson.build
+++ b/etnaviv/meson.build
@@ -52,6 +52,10 @@ 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
+
 test(
   'etnaviv-symbols-check',
   symbols_check,

diff --git a/exynos/meson.build b/exynos/meson.build
index 7d1edfe..bd55a50 100644 (file)
--- a/exynos/meson.build
+++ b/exynos/meson.build
@@ -37,6 +37,10 @@ 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
+
 pkg.generate(
   name : 'libdrm_exynos',
   libraries : libdrm_exynos,

diff --git a/freedreno/meson.build b/freedreno/meson.build
index 49e6659..4fdc814 100644 (file)
--- a/freedreno/meson.build
+++ b/freedreno/meson.build
@@ -55,6 +55,10 @@ 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
+
 install_headers(
   'freedreno_drmif.h', 'freedreno_ringbuffer.h',
   subdir : 'freedreno'

diff --git a/intel/meson.build b/intel/meson.build
index 5fa06c2..75e6bc3 100644 (file)
--- a/intel/meson.build
+++ b/intel/meson.build
@@ -40,6 +40,10 @@ 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
+
 install_headers(
   'intel_bufmgr.h', 'intel_aub.h', 'intel_debug.h',
   subdir : 'libdrm',

diff --git a/libkms/meson.build b/libkms/meson.build
index 8d17bb2..cc48722 100644 (file)
--- a/libkms/meson.build
+++ b/libkms/meson.build
@@ -56,6 +56,10 @@ ext_libkms = declare_dependency(
   include_directories : [libkms_include],
 )
 
+if meson.version().version_compare('>= 0.54.0')
+  meson.override_dependency('kms', ext_libkms)
+endif
+
 install_headers('libkms.h', subdir : 'libkms')
 
 pkg.generate(

diff --git a/meson.build b/meson.build
index 62dec8d..f5704cf 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -340,6 +340,10 @@ 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
+
 install_headers('libsync.h', 'xf86drm.h', 'xf86drmMode.h')
 install_headers(
   'include/drm/drm.h', 'include/drm/drm_fourcc.h', 'include/drm/drm_mode.h',

diff --git a/nouveau/meson.build b/nouveau/meson.build
index af45336..8294795 100644 (file)
--- a/nouveau/meson.build
+++ b/nouveau/meson.build
@@ -35,6 +35,10 @@ 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
+
 install_headers('nouveau.h', subdir : 'libdrm/nouveau')
 install_headers(
   'nvif/class.h', 'nvif/cl0080.h', 'nvif/cl9097.h', 'nvif/if0002.h',

diff --git a/omap/meson.build b/omap/meson.build
index bfd59f0..bcf5b62 100644 (file)
--- a/omap/meson.build
+++ b/omap/meson.build
@@ -34,6 +34,10 @@ 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
+
 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 31fe9cd..abc9be8 100644 (file)
--- a/radeon/meson.build
+++ b/radeon/meson.build
@@ -41,6 +41,10 @@ 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
+
 install_headers(
        'radeon_bo.h', 'radeon_cs.h', 'radeon_surface.h', 'radeon_bo_gem.h',
        'radeon_cs_gem.h', 'radeon_bo_int.h', 'radeon_cs_int.h', 'r600_pci_ids.h',

diff --git a/tegra/meson.build b/tegra/meson.build
index edddf72..51caf67 100644 (file)
--- a/tegra/meson.build
+++ b/tegra/meson.build
@@ -34,6 +34,10 @@ 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
+
 install_headers('tegra.h', subdir : 'libdrm')
 
 pkg.generate(