[Mesa-dev] [PATCH mesa] meson: fix pl111 dependency on vc4

[Eric Engestrom]

src/gallium/winsys/pl111/drm/libpl111winsys.a(pl111_drm_winsys.c.o): In function `pl111_drm_screen_create':
pl111_drm_winsys.c:(.text+0x33): undefined reference to `vc4_drm_screen_create_renderonly'

Signed-off-by: Eric Engestrom <eric.engestrom at imgtec.com>
---
 meson.build                              | 4 ++++
 src/gallium/meson.build                  | 6 +++---
 src/gallium/winsys/pl111/drm/meson.build | 1 +
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/meson.build b/meson.build
index f227bc3e018dc39f9f79..f134ede15ce72dda7df6 100644
--- a/meson.build
+++ b/meson.build
@@ -158,6 +158,10 @@ if _drivers != ''
   with_gallium = true
 endif
 
+if with_gallium_pl111 and not with_gallium_vc4
+  error('Gallium pl111 depends on vc4')
+endif
+
 with_intel_vk = false
 with_amd_vk = false
 with_any_vk = false
diff --git a/src/gallium/meson.build b/src/gallium/meson.build
index 8e60c7f328856017fc35..563905478d4d4f6e9fb4 100644
--- a/src/gallium/meson.build
+++ b/src/gallium/meson.build
@@ -60,13 +60,13 @@ if with_gallium_freedreno
   subdir('drivers/freedreno')
   subdir('winsys/freedreno/drm')
 endif
-if with_gallium_pl111
-  subdir('winsys/pl111/drm')
-endif
 if with_gallium_vc4
   subdir('drivers/vc4')
   subdir('winsys/vc4/drm')
 endif
+if with_gallium_pl111
+  subdir('winsys/pl111/drm')
+endif
 if with_gallium_vc5
   subdir('drivers/vc5')
   subdir('winsys/vc5/drm')
diff --git a/src/gallium/winsys/pl111/drm/meson.build b/src/gallium/winsys/pl111/drm/meson.build
index 952c0b46700f5ddcf7e9..02b176a5c85ee67ff94a 100644
--- a/src/gallium/winsys/pl111/drm/meson.build
+++ b/src/gallium/winsys/pl111/drm/meson.build
@@ -27,4 +27,5 @@ libpl111winsys = static_library(
   ],
   c_args : [c_vis_args],
   dependencies: dep_libdrm,
+  link_with : libvc4winsys,
 )
-- 
Cheers,
  Eric