meson: Specify the maximum required libdrm in dri.pc
authorMatt Turner <mattst88@gmail.com>
Mon, 13 Apr 2020 16:20:18 +0000 (09:20 -0700)
committerMarge Bot <eric+marge@anholt.net>
Mon, 13 Apr 2020 22:07:41 +0000 (22:07 +0000)
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@pnwbakers.com>
Reviewed-by: Eric Engestrom <eric@engestrom.ch>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4534>

src/mesa/drivers/dri/meson.build

index acf7d2eb128849bb88e828fbc36d3abcd6e5e726..b09ca16e38a89f56bbf010d73666c1c0736d4b4a 100644 (file)
@@ -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(