From 32e567d411fc75ecf5de4b9f233f52ebc21e4ede Mon Sep 17 00:00:00 2001 From: Eric Engestrom Date: Thu, 5 Jan 2023 10:56:24 +0000 Subject: [PATCH] meson: add missing dependency Now that renderonly.h includes util/simple_mtx.h, which itself includes valgrind.h, dep_valgrind is required by any module that includes renderonly.h. In file included from ../src/gallium/auxiliary/renderonly/renderonly.h:33, from ../src/gallium/winsys/kmsro/drm/kmsro_drm_winsys.c:39: ../src/util/simple_mtx.h:34:12: fatal error: valgrind.h: No such file or directory 34 | # include | ^~~~~~~~~~~~ compilation terminated. dep_valgrind is part of idep_mesautil, which should be used instead of copying the list of deps for each util header included (which would have to be updated every time a util header changes its own includes), so let's add idep_mesautil everywhere that includes renderonly.h. Fixes: ad4d7ca8332488be8a75 ("kmsro: Fix renderonly_scanout BO aliasing") Tested-by: Asahi Lina Part-of: (cherry picked from commit aab4a260db6563d676a8e43fcdf7c653e61bf698) --- .pick_status.json | 2 +- src/gallium/drivers/asahi/meson.build | 2 +- src/gallium/drivers/v3d/meson.build | 5 ++++- src/gallium/drivers/vc4/meson.build | 5 ++++- src/gallium/winsys/asahi/drm/meson.build | 2 +- src/gallium/winsys/kmsro/drm/meson.build | 2 +- src/gallium/winsys/panfrost/drm/meson.build | 2 +- src/panfrost/lib/meson.build | 2 +- 8 files changed, 14 insertions(+), 8 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 68230e0..b08e0d2 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -1849,7 +1849,7 @@ "description": "meson: add missing dependency", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "ad4d7ca8332488be8a75aff001f00306a9f6402e" }, diff --git a/src/gallium/drivers/asahi/meson.build b/src/gallium/drivers/asahi/meson.build index 0e7bad9..d754d76 100644 --- a/src/gallium/drivers/asahi/meson.build +++ b/src/gallium/drivers/asahi/meson.build @@ -32,7 +32,7 @@ libasahi = static_library( include_directories : [inc_gallium_aux, inc_gallium, inc_include, inc_src], c_args : [c_msvc_compat_args], gnu_symbol_visibility : 'hidden', - dependencies : [idep_nir, idep_agx_pack], + dependencies : [idep_nir, idep_mesautil, idep_agx_pack], ) driver_asahi = declare_dependency( diff --git a/src/gallium/drivers/v3d/meson.build b/src/gallium/drivers/v3d/meson.build index d716c3b..ad4c154 100644 --- a/src/gallium/drivers/v3d/meson.build +++ b/src/gallium/drivers/v3d/meson.build @@ -94,7 +94,10 @@ libv3d = static_library( c_args : [v3d_args], cpp_args : [v3d_args], gnu_symbol_visibility : 'hidden', - dependencies : [dep_v3dv3, dep_libdrm, dep_valgrind, idep_nir_headers], + dependencies : [ + dep_v3dv3, dep_libdrm, dep_valgrind, + idep_nir_headers, idep_mesautil, + ], link_with: [per_version_libs], ) diff --git a/src/gallium/drivers/vc4/meson.build b/src/gallium/drivers/vc4/meson.build index 90a772d..84da951 100644 --- a/src/gallium/drivers/vc4/meson.build +++ b/src/gallium/drivers/vc4/meson.build @@ -110,7 +110,10 @@ libvc4 = static_library( link_with: libvc4_neon, c_args : [vc4_c_args], gnu_symbol_visibility : 'hidden', - dependencies : [dep_simpenrose, dep_libdrm, dep_valgrind, idep_nir_headers], + dependencies : [ + dep_simpenrose, dep_libdrm, dep_valgrind, + idep_nir_headers, idep_mesautil, + ], build_by_default : false, ) diff --git a/src/gallium/winsys/asahi/drm/meson.build b/src/gallium/winsys/asahi/drm/meson.build index 225ed79..69a5614 100644 --- a/src/gallium/winsys/asahi/drm/meson.build +++ b/src/gallium/winsys/asahi/drm/meson.build @@ -26,5 +26,5 @@ libasahiwinsys = static_library( inc_gallium, inc_gallium_aux, inc_gallium_drivers, ], gnu_symbol_visibility : 'hidden', - dependencies: dep_libdrm, + dependencies: [dep_libdrm, idep_mesautil], ) diff --git a/src/gallium/winsys/kmsro/drm/meson.build b/src/gallium/winsys/kmsro/drm/meson.build index 9b47841..324435a 100644 --- a/src/gallium/winsys/kmsro/drm/meson.build +++ b/src/gallium/winsys/kmsro/drm/meson.build @@ -50,7 +50,7 @@ libkmsrowinsys = static_library( ], c_args : [kmsro_c_args], gnu_symbol_visibility : 'hidden', - dependencies: dep_libdrm, + dependencies: [dep_libdrm, idep_mesautil], ) driver_kmsro = declare_dependency( diff --git a/src/gallium/winsys/panfrost/drm/meson.build b/src/gallium/winsys/panfrost/drm/meson.build index 71abfae..ac132c0 100644 --- a/src/gallium/winsys/panfrost/drm/meson.build +++ b/src/gallium/winsys/panfrost/drm/meson.build @@ -26,5 +26,5 @@ libpanfrostwinsys = static_library( inc_gallium, inc_gallium_aux, inc_gallium_drivers, ], gnu_symbol_visibility : 'hidden', - dependencies: dep_libdrm, + dependencies: [dep_libdrm, idep_mesautil], ) diff --git a/src/panfrost/lib/meson.build b/src/panfrost/lib/meson.build index f8c34cb..ba2506b 100644 --- a/src/panfrost/lib/meson.build +++ b/src/panfrost/lib/meson.build @@ -93,7 +93,7 @@ libpanfrost_lib = static_library( include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_panfrost_hw], c_args : [no_override_init_args], gnu_symbol_visibility : 'hidden', - dependencies: [dep_libdrm, idep_nir], + dependencies: [dep_libdrm, idep_nir, idep_mesautil], build_by_default : false, link_with: [libpanfrost_pixel_format, libpanfrost_per_arch], ) -- 2.7.4