diff options
| author |   Khem Raj <raj.khem@gmail.com> | 2023-01-29 21:58:51 -0800 |
|---|---|---|
| committer | Khem Raj <raj.khem@gmail.com> | 2023-02-01 09:11:49 -0800 |
| commit | 71d2adfc5f3e55d94d394d48b2adb0e97c8c997d (patch) | |
| tree | ab1fe5b747a7d61ac77a7c47327460e40fbfcd41 | |
| parent | e16db79ffc95d0e1adcfb4b955d6fa708ae19f14 (diff) | |
| download | meta-openembedded-contrib-71d2adfc5f3e55d94d394d48b2adb0e97c8c997d.tar.gz | |
perfetto: Upgrade to 31.0 release
Forward port pc file patch to 0.31 release
Signed-off-by: Khem Raj <raj.khem@gmail.com>
| -rw-r--r-- | meta-oe/recipes-devtools/perfetto/files/0001-meson-add-pc-file-for-lib_perfetto.patch | 25 | ||||
| -rw-r--r-- | meta-oe/recipes-devtools/perfetto/perfetto.inc | 4 |
2 files changed, 12 insertions, 17 deletions
diff --git a/meta-oe/recipes-devtools/perfetto/files/0001-meson-add-pc-file-for-lib_perfetto.patch b/meta-oe/recipes-devtools/perfetto/files/0001-meson-add-pc-file-for-lib_perfetto.patch index 70de44173d..21033eaaa8 100644 --- a/meta-oe/recipes-devtools/perfetto/files/0001-meson-add-pc-file-for-lib_perfetto.patch +++ b/meta-oe/recipes-devtools/perfetto/files/0001-meson-add-pc-file-for-lib_perfetto.patch @@ -7,17 +7,15 @@ Subject: [PATCH] meson: add PC file for lib_perfetto meson.build | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) -diff --git a/meson.build b/meson.build -index 06015141c..752b4d928 100644 --- a/meson.build +++ b/meson.build @@ -19,9 +19,12 @@ project( 'perfetto', - ['c','cpp'], -- default_options: ['c_std=c99', 'cpp_std=c++11'] -+ default_options: ['c_std=c99', 'cpp_std=c++11'], -+ version: '27.1' + ['cpp'], +- default_options: ['cpp_std=c++17'] ++ default_options: ['cpp_std=c++17'], ++ version: '31.0' ) +soversion = meson.project_version() @@ -25,20 +23,20 @@ index 06015141c..752b4d928 100644 fs = import('fs') if not fs.is_dir('sdk') -@@ -30,8 +33,9 @@ endif - - dep_threads = dependency('threads') +@@ -36,8 +39,9 @@ if host_machine.system() == 'android' + deps_perfetto += cpp.find_library('log') + endif -lib_perfetto = static_library( +lib_perfetto = shared_library( 'perfetto', + version: soversion, sources: 'sdk/perfetto.cc', - dependencies: dep_threads, + dependencies: deps_perfetto, install: true, -@@ -39,6 +43,10 @@ lib_perfetto = static_library( +@@ -50,6 +54,10 @@ dir_perfetto_trace = join_paths(meson.cu - inc_perfetto = include_directories('sdk') + install_data(dir_perfetto_trace / 'perfetto_trace.proto') +install_headers('sdk/perfetto.h') +pkg = import('pkgconfig') @@ -47,6 +45,3 @@ index 06015141c..752b4d928 100644 dep_perfetto = declare_dependency( link_with: lib_perfetto, include_directories: inc_perfetto, --- -2.34.1 - diff --git a/meta-oe/recipes-devtools/perfetto/perfetto.inc b/meta-oe/recipes-devtools/perfetto/perfetto.inc index 5cb6f8bb34..de871d4f3d 100644 --- a/meta-oe/recipes-devtools/perfetto/perfetto.inc +++ b/meta-oe/recipes-devtools/perfetto/perfetto.inc @@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/google/perfetto" SRC_URI = "git://github.com/google/perfetto.git;protocol=https;name=perfetto;nobranch=1" -SRCREV_perfetto = "1c52b5e132312aeb007ed180d4ba1d8d66227923" -PV = "27.1" +SRCREV_perfetto = "b8da07095979310818f0efde2ef3c69ea70d62c5" +PV = "31.0" S = "${WORKDIR}/git" |