From da70827656757cd070faac7aff5ca057f1e7fb8a Mon Sep 17 00:00:00 2001 From: Eric Engestrom Date: Tue, 27 Aug 2024 21:43:33 +0900 Subject: [PATCH] vc4: Add missing libvc4_neon build dependencies Duplicates the libvc4 dependencies. Fixes: ebcb4c2156e9 ("meson: Enable VC4's NEON assembly support.") Reviewed-by: Juan A. Suarez Co-authored-by: David Heidelberg Part-of: (cherry picked from commit fda6f8638a6cb3410dc402e5e38cef78b11fad79) --- .pick_status.json | 2 +- src/gallium/drivers/vc4/meson.build | 11 +++++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 6ac71ac0cdf..defc9283487 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -534,7 +534,7 @@ "description": "vc4: Add missing libvc4_neon build dependencies", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "ebcb4c2156e9c0900fce6ee9ce6e3bd7894f7953", "notes": null diff --git a/src/gallium/drivers/vc4/meson.build b/src/gallium/drivers/vc4/meson.build index f4f5c9f4bc1..fd7f37a62f3 100644 --- a/src/gallium/drivers/vc4/meson.build +++ b/src/gallium/drivers/vc4/meson.build @@ -66,6 +66,11 @@ files_libvc4 = files( vc4_c_args = [] +vc4_deps = [ + dep_simpenrose, dep_libdrm, dep_valgrind, + idep_nir_headers, idep_mesautil, +] + libvc4_neon = [] if host_machine.cpu_family() == 'arm' libvc4_neon = static_library( @@ -75,6 +80,7 @@ if host_machine.cpu_family() == 'arm' inc_src, inc_include, inc_gallium, inc_gallium_aux, inc_broadcom ], c_args : '-mfpu=neon', + dependencies : vc4_deps, ) vc4_c_args += '-DUSE_ARM_ASM' endif @@ -93,10 +99,7 @@ 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, idep_mesautil, - ], + dependencies : vc4_deps, build_by_default : false, )