meson: use the modern interface for pkg.generate

This produces no differences in the generated output. I've had to
manually add `requires : 'libdrm'` to libdrm_intel, otherwise libdrm
ends up in `Requires.private` instead of `Requires`.

Signed-off-by: Dylan Baker <dylan@pnwbakers.com>
Reviewed-by: Simon Ser <contact@emersion.fr>
main
Dylan Baker 2022-01-19 11:14:17 -08:00
parent 38c568775e
commit cc16120543
11 changed files with 11 additions and 28 deletions

View File

@ -44,11 +44,9 @@ libdrm_amdgpu = library(
install_headers('amdgpu.h', subdir : 'libdrm') install_headers('amdgpu.h', subdir : 'libdrm')
pkg.generate( pkg.generate(
libdrm_amdgpu,
name : 'libdrm_amdgpu', name : 'libdrm_amdgpu',
libraries : libdrm_amdgpu,
subdirs : ['.', 'libdrm'], subdirs : ['.', 'libdrm'],
version : meson.project_version(),
requires_private : 'libdrm',
description : 'Userspace interface to kernel DRM services for amdgpu', description : 'Userspace interface to kernel DRM services for amdgpu',
) )

View File

@ -40,11 +40,9 @@ libdrm_etnaviv = library(
install_headers('etnaviv_drmif.h', subdir : 'libdrm') install_headers('etnaviv_drmif.h', subdir : 'libdrm')
pkg.generate( pkg.generate(
libdrm_etnaviv,
name : 'libdrm_etnaviv', name : 'libdrm_etnaviv',
libraries : libdrm_etnaviv,
subdirs : ['.', 'libdrm'], subdirs : ['.', 'libdrm'],
version : meson.project_version(),
requires_private : 'libdrm',
description : 'Userspace interface to Tegra kernel DRM services', description : 'Userspace interface to Tegra kernel DRM services',
) )

View File

@ -43,11 +43,10 @@ if meson.version().version_compare('>= 0.54.0')
endif endif
pkg.generate( pkg.generate(
libdrm_exynos,
name : 'libdrm_exynos', name : 'libdrm_exynos',
libraries : libdrm_exynos,
subdirs : ['.', 'libdrm', 'exynos'], subdirs : ['.', 'libdrm', 'exynos'],
version : '0.7', version : '0.7',
requires_private : 'libdrm',
description : 'Userspace interface to exynos kernel DRM services', description : 'Userspace interface to exynos kernel DRM services',
) )

View File

@ -65,11 +65,9 @@ install_headers(
) )
pkg.generate( pkg.generate(
libdrm_freedreno,
name : 'libdrm_freedreno', name : 'libdrm_freedreno',
libraries : libdrm_freedreno,
subdirs : ['.', 'libdrm', 'freedreno'], subdirs : ['.', 'libdrm', 'freedreno'],
version : meson.project_version(),
requires_private : 'libdrm',
description : 'Userspace interface to freedreno kernel DRM services', description : 'Userspace interface to freedreno kernel DRM services',
) )

View File

@ -51,10 +51,9 @@ install_headers(
) )
pkg.generate( pkg.generate(
libdrm_intel,
name : 'libdrm_intel', name : 'libdrm_intel',
libraries : libdrm_intel,
subdirs : ['.', 'libdrm'], subdirs : ['.', 'libdrm'],
version : meson.project_version(),
requires : 'libdrm', requires : 'libdrm',
description : 'Userspace interface to intel kernel DRM services', description : 'Userspace interface to intel kernel DRM services',
) )

View File

@ -63,11 +63,10 @@ endif
install_headers('libkms.h', subdir : 'libkms') install_headers('libkms.h', subdir : 'libkms')
pkg.generate( pkg.generate(
libkms,
name : 'libkms', name : 'libkms',
libraries : libkms,
subdirs : ['libkms'], subdirs : ['libkms'],
version : '1.0.0', version : '1.0.0',
requires_private : 'libdrm',
description : 'Library that abstracts away the different mm interfaces for kernel drivers', description : 'Library that abstracts away the different mm interfaces for kernel drivers',
) )

View File

@ -347,10 +347,9 @@ if with_vmwgfx
endif endif
pkg.generate( pkg.generate(
libdrm,
name : 'libdrm', name : 'libdrm',
libraries : libdrm,
subdirs : ['.', 'libdrm'], subdirs : ['.', 'libdrm'],
version : meson.project_version(),
description : 'Userspace interface to kernel DRM services', description : 'Userspace interface to kernel DRM services',
) )

View File

@ -48,11 +48,9 @@ install_headers(
) )
pkg.generate( pkg.generate(
libdrm_nouveau,
name : 'libdrm_nouveau', name : 'libdrm_nouveau',
libraries : libdrm_nouveau,
subdirs : ['.', 'libdrm', 'libdrm/nouveau'], subdirs : ['.', 'libdrm', 'libdrm/nouveau'],
version : meson.project_version(),
requires_private : 'libdrm',
description : 'Userspace interface to nouveau kernel DRM services', description : 'Userspace interface to nouveau kernel DRM services',
) )

View File

@ -43,11 +43,10 @@ install_headers('omap_drmif.h', subdir : 'libdrm')
install_headers('omap_drm.h', subdir : 'omap') install_headers('omap_drm.h', subdir : 'omap')
pkg.generate( pkg.generate(
libdrm_omap,
name : 'libdrm_omap', name : 'libdrm_omap',
libraries : libdrm_omap,
subdirs : ['.', 'libdrm', 'omap'], subdirs : ['.', 'libdrm', 'omap'],
version : '0.6', version : '0.6',
requires_private : 'libdrm',
description : 'Userspace interface to omap kernel DRM services', description : 'Userspace interface to omap kernel DRM services',
) )

View File

@ -53,11 +53,9 @@ install_headers(
) )
pkg.generate( pkg.generate(
libdrm_radeon,
name : 'libdrm_radeon', name : 'libdrm_radeon',
libraries : libdrm_radeon,
subdirs : ['.', 'libdrm'], subdirs : ['.', 'libdrm'],
version : meson.project_version(),
requires_private : 'libdrm',
description : 'Userspace interface to kernel DRM services for radeon', description : 'Userspace interface to kernel DRM services for radeon',
) )

View File

@ -42,11 +42,9 @@ endif
install_headers('tegra.h', subdir : 'libdrm') install_headers('tegra.h', subdir : 'libdrm')
pkg.generate( pkg.generate(
libdrm_tegra,
name : 'libdrm_tegra', name : 'libdrm_tegra',
libraries : libdrm_tegra,
subdirs : ['.', 'libdrm'], subdirs : ['.', 'libdrm'],
version : meson.project_version(),
requires_private : 'libdrm',
description : 'Userspace interface to Tegra kernel DRM services', description : 'Userspace interface to Tegra kernel DRM services',
) )