From 7559a9f8f6d18b0c9ad182621491e19618abc5ef Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Mon, 14 Mar 2022 13:41:28 +0100 Subject: [PATCH] meson: restore private requires to libdrm in dri.pc file Due to a typo the private requires to libdrm were lost in dri.pc. Fixed another typo: Infastructure --> Infrastructure Fixes: 3ae3569d822 ("meson: restore dri.pc file") Signed-off-by: Stefan Dirsch Tested-by: Stefan Dirsch Part-of: (cherry picked from commit c287ed4f398b43204af397a377b1a55bc2b03ff7) --- .pick_status.json | 2 +- src/gallium/frontends/dri/meson.build | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 04d992a35da..7593a6dcf4e 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -229,7 +229,7 @@ "description": "meson: restore private requires to libdrm in dri.pc file", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "3ae3569d822c2546c4c748090f8a6c8016f763ea" }, diff --git a/src/gallium/frontends/dri/meson.build b/src/gallium/frontends/dri/meson.build index a0ae961c5fc..139707ea719 100644 --- a/src/gallium/frontends/dri/meson.build +++ b/src/gallium/frontends/dri/meson.build @@ -68,13 +68,13 @@ libdri = static_library( if with_dri dri_req_private = [] if dep_libdrm.found() - dir_req_private = ['libdrm >= @0@'.format(_drm_ver)] + dri_req_private = ['libdrm >= @0@'.format(_drm_ver)] endif pkg.generate( name : 'dri', filebase : 'dri', - description : 'Direct Rendering Infastructure', + description : 'Direct Rendering Infrastructure', version : meson.project_version(), variables : ['dridriverdir=@0@'.format(dri_drivers_path)], requires_private : dri_req_private,