Mesa (staging/19.1): meson: Only error building gallium video without libdrm when the platform is drm

[GitLab Mirror]

Module: Mesa
Branch: staging/19.1
Commit: 7e3d9424034116d3abc47eb92c04da1861d91aab
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=7e3d9424034116d3abc47eb92c04da1861d91aab

Author: Dylan Baker <dylan at pnwbakers.com>
Date:   Thu Oct  3 10:17:08 2019 -0700

meson: Only error building gallium video without libdrm when the platform is drm

Fixes: 3b265f61f5f61f08718fe5bb4b2726f9b8e016cc
       ("meson: gallium media state trackers require libdrm with x11")
Closes: https://gitlab.freedesktop.org/mesa/mesa/issues/1878
Tested-by: Vinson Lee <vlee at freedesktop.org>
(cherry picked from commit 1481d0540987cca11cb76c39f7c0fa84983d9e3b)

---

 meson.build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meson.build b/meson.build
index 08c72f1b70b..abd27142b03 100644
--- a/meson.build
+++ b/meson.build
@@ -1435,7 +1435,7 @@ if with_platform_x11
         with_gallium_omx != 'disabled'))
     dep_xcb = dependency('xcb')
     dep_x11_xcb = dependency('x11-xcb')
-    if not dep_libdrm.found()
+    if with_dri_platform == 'drm' and not dep_libdrm.found()
       error('libdrm required for gallium video statetrackers when using x11')
     endif
   endif