From f3a9076e51d43f76e0aee81659d661b5b60c0756 Mon Sep 17 00:00:00 2001 From: Jami Kettunen Date: Fri, 11 Nov 2022 01:46:10 +0200 Subject: [PATCH] freedreno: Find curses properly for building fdperf Upstream ncurses doesn't ship any legacy ncurses.pc pkg-config symlinks (just ncursesw.pc) which Void Linux strictly follows[1] for example. Meson (since 0.54) has a generic curses dependency which works perfectly in this case[2], thus also bump the toplevel minimum meson version from 0.53. [1] https://github.com/void-linux/void-packages/tree/master/srcpkgs/ncurses [2] https://mesonbuild.com/Dependencies.html#curses Signed-off-by: Jami Kettunen Reviewed-by: Chia-I Wu Reviewed-by: Rob Clark Part-of: --- meson.build | 2 +- src/freedreno/perfcntrs/meson.build | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/meson.build b/meson.build index bda3d736992..1aebd04e5d7 100644 --- a/meson.build +++ b/meson.build @@ -26,7 +26,7 @@ project( check : true ).stdout(), license : 'MIT', - meson_version : '>= 0.53', + meson_version : '>= 0.54', default_options : ['buildtype=debugoptimized', 'b_ndebug=if-release', 'c_std=c11', 'cpp_std=c++17', 'rust_std=2021'] ) diff --git a/src/freedreno/perfcntrs/meson.build b/src/freedreno/perfcntrs/meson.build index be55df14171..f2e5d625459 100644 --- a/src/freedreno/perfcntrs/meson.build +++ b/src/freedreno/perfcntrs/meson.build @@ -39,9 +39,9 @@ libfreedreno_perfcntrs = static_library( ) dep_libconfig = dependency('libconfig', required : false) -dep_ncurses = dependency('ncurses', required : false) +dep_curses = dependency('curses', required : false) -if dep_libconfig.found() and dep_ncurses.found() +if dep_libconfig.found() and dep_curses.found() fdperf = executable( 'fdperf', ['fdperf.c', freedreno_xml_header_files], @@ -61,7 +61,7 @@ if dep_libconfig.found() and dep_ncurses.found() dependencies : [ dep_libconfig, dep_libdrm, - dep_ncurses, + dep_curses, idep_mesautil, ], build_by_default : with_tools.contains('freedreno'),