OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

freedreno: Find curses properly for building fdperf

Browse Source 
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 <jami.kettunen@protonmail.com>
Reviewed-by: Chia-I Wu <olvaffe@gmail.com>
Reviewed-by: Rob Clark <robdclark@chromium.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/19664>
This commit is contained in:
Jami Kettunen
2022-11-11 01:46:10 +02:00
committed by Marge Bot
parent d1e1911d82
commit f3a9076e51
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
meson.build
View File

@@ -26,7 +26,7 @@ project(
check : true check : true
).stdout(), ).stdout(),
license : 'MIT', 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'] default_options : ['buildtype=debugoptimized', 'b_ndebug=if-release', 'c_std=c11', 'cpp_std=c++17', 'rust_std=2021']
) )

6
src/freedreno/perfcntrs/meson.build
View File

@@ -39,9 +39,9 @@ libfreedreno_perfcntrs = static_library(
) )
dep_libconfig = dependency('libconfig', required : false) 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 = executable(
'fdperf', 'fdperf',
['fdperf.c', freedreno_xml_header_files], ['fdperf.c', freedreno_xml_header_files],
@@ -61,7 +61,7 @@ if dep_libconfig.found() and dep_ncurses.found()
dependencies : [ dependencies : [
dep_libconfig, dep_libconfig,
dep_libdrm, dep_libdrm,
dep_ncurses, dep_curses,
idep_mesautil, idep_mesautil,
], ],
build_by_default : with_tools.contains('freedreno'), build_by_default : with_tools.contains('freedreno'),