Mesa (master): meson: Specify the maximum required libdrm in dri.pc

GitLab Mirror gitlab-mirror at kemper.freedesktop.org
Mon Apr 13 22:29:59 UTC 2020


Module: Mesa
Branch: master
Commit: e4268ffb99279f46d9785bdccb6617022924a6c2
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=e4268ffb99279f46d9785bdccb6617022924a6c2

Author: Matt Turner <mattst88 at gmail.com>
Date:   Mon Apr 13 09:20:18 2020 -0700

meson: Specify the maximum required libdrm in dri.pc

When dealing with a regression in libdrm-2.4.101, I masked the package
in Gentoo. In doing so, we discovered that Mesa's dri.pc specifies a
version requirement in dri.pc for >= the version of libdrm Mesa was
built against, thus preventing packages from being rebuilt with the
older version of libdrm installed.

Let's reduce this version requirement to the latest libdrm required by
Mesa instead, since libdrm is backward compatible.

Fixes: a3a16d4aa7e ("meson: use dep_libdrm version for pkg-config")
Reviewed-by: Dylan Baker <dylan at pnwbakers.com>
Reviewed-by: Eric Engestrom <eric at engestrom.ch>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4534>

---

 src/mesa/drivers/dri/meson.build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/mesa/drivers/dri/meson.build b/src/mesa/drivers/dri/meson.build
index acf7d2eb128..b09ca16e38a 100644
--- a/src/mesa/drivers/dri/meson.build
+++ b/src/mesa/drivers/dri/meson.build
@@ -86,7 +86,7 @@ endif
 if with_dri
   dri_req_private = []
   if dep_libdrm.found()
-    dri_req_private = ['libdrm >= ' + dep_libdrm.version()]
+    dri_req_private = ['libdrm >= ' + _drm_ver]
   endif
 
   pkg.generate(



More information about the mesa-commit mailing list