From 8df62e4016ebb633ab281c9dce4583422a070cfa Mon Sep 17 00:00:00 2001 From: Simon Ser Date: Thu, 2 Feb 2023 11:58:07 +0100 Subject: [PATCH] backend/drm: require hwdata pkg-config file The hardcoded fallback "/usr/share/hwdata/pnp.ids" was only a temporary solution to get things working while distributions were still working on shipping it. --- backend/drm/meson.build | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/backend/drm/meson.build b/backend/drm/meson.build index fc4d84d6f..9abf13501 100644 --- a/backend/drm/meson.build +++ b/backend/drm/meson.build @@ -1,19 +1,19 @@ -if not features['session'] +hwdata = dependency( + 'hwdata', + required: 'drm' in backends, + native: true, + not_found_message: 'Required for the DRM backend.', +) + +if not (hwdata.found() and features['session']) subdir_done() endif -hwdata = dependency('hwdata', required: false, native: true) -if hwdata.found() - hwdata_dir = hwdata.get_variable(pkgconfig: 'pkgdatadir') - pnp_ids = files(hwdata_dir / 'pnp.ids') -else - pnp_ids = files('/usr/share/hwdata/pnp.ids') -endif - +hwdata_dir = hwdata.get_variable(pkgconfig: 'pkgdatadir') pnpids_c = custom_target( 'pnpids.c', output: 'pnpids.c', - input: pnp_ids, + input: files(hwdata_dir / 'pnp.ids'), feed: true, capture: true, command: files('gen_pnpids.sh'),