From 7175c4189521d3c25e54d593c6ff4dffb4dc18fc Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@collabora.com>
Date: Thu, 9 Jan 2020 13:42:45 +0000
Subject: [PATCH] graphics: Search for extra drivers in libQUAL/dri, not in
 libQUAL

When we found a loader library in ${prefix}/libQUAL, we were
correctly looking in ${prefix}/libQUAL/dri.

However, when we found a Debian-style loader library in
${prefix}/lib/${multiarch}, we were correctly looking for preferred
drivers in ${prefix}/lib/${multiarch}/dri, but we were looking for extra
drivers in ${prefix}/lib and ${prefix}/libQUAL, not in ${prefix}/lib/dri
and ${prefix}/libQUAL/dri as we should.

Signed-off-by: Simon McVittie <smcv@collabora.com>
---
 steam-runtime-tools/graphics.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/steam-runtime-tools/graphics.c b/steam-runtime-tools/graphics.c
index 90bcdecc1..3ffaf0268 100644
--- a/steam-runtime-tools/graphics.c
+++ b/steam-runtime-tools/graphics.c
@@ -2454,8 +2454,8 @@ _srt_get_extra_modules_directory (const gchar *library_search_path,
         g_return_val_if_reached (NULL);
     }
 
-  ret = g_list_prepend (ret, g_build_filename (dir, "lib", NULL));
-  ret = g_list_prepend (ret, g_build_filename (dir, libqual, NULL));
+  ret = g_list_prepend (ret, g_build_filename (dir, "lib", "dri", NULL));
+  ret = g_list_prepend (ret, g_build_filename (dir, libqual, "dri", NULL));
 
 out:
   g_free (lib_multiarch);
-- 
GitLab