Skip to content

Commit e6dab78

Browse files
authored
(#25599) perfetto: add version 48.1, remove older versions
* perfetto: add version 48.0 * drop support msvc 16 on 48.0, remove older versions * update 48.1 * update config.yml
1 parent 0f9f1f9 commit e6dab78

File tree

4 files changed

+11
-74
lines changed

4 files changed

+11
-74
lines changed

recipes/perfetto/all/conandata.yml

+3-40
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
sources:
2+
"48.1":
3+
url: "https://github.com/google/perfetto/archive/refs/tags/v48.1.tar.gz"
4+
sha256: "8d1c6bf44f1bdb098ab70cd60da3ce6b6e731e4eb21dd52b2527cbdcf85d984d"
25
"47.0":
36
url: "https://github.com/google/perfetto/archive/refs/tags/v47.0.tar.gz"
47
sha256: "9bbd38a0f074038bde6ccbcf5f2ff32587eb60faec254932268ecb6f17f18186"
@@ -20,43 +23,3 @@ sources:
2023
"40.0":
2124
url: "https://github.com/google/perfetto/archive/refs/tags/v40.0.tar.gz"
2225
sha256: "bd78f0165e66026c31c8c39221ed2863697a8bba5cd39b12e4b43d0b7f71626f"
23-
"39.0":
24-
url: "https://github.com/google/perfetto/archive/refs/tags/v39.0.tar.gz"
25-
sha256: "241cbaddc9ff4e5d1de2d28497fef40b5510e9ca60808815bf4944d0d2f026db"
26-
"38.0":
27-
url: "https://github.com/google/perfetto/archive/refs/tags/v38.0.tar.gz"
28-
sha256: "92160b0fbeb8c4992cc0690d832dd923cee1dda466f3364ef4ed26a835e55e40"
29-
"37.0":
30-
url: "https://github.com/google/perfetto/archive/refs/tags/v37.0.tar.gz"
31-
sha256: "39d7b3635834398828cfd189bd61afb0657ca2a3a08efbfd9866bfbcd440810b"
32-
"35.0":
33-
url: "https://github.com/google/perfetto/archive/refs/tags/v35.0.tar.gz"
34-
sha256: "224b6552e60ad0fc7c1447bdf719ddd9ceceaf2b6773b71541c21df5890f4166"
35-
"34.0":
36-
url: "https://github.com/google/perfetto/archive/refs/tags/v34.0.tar.gz"
37-
sha256: "81dbf2fac446a0389c80e309b2060dcccd926012ce2a61621a47e3e432aee8c1"
38-
"32.1":
39-
url: "https://github.com/google/perfetto/archive/refs/tags/v32.1.tar.gz"
40-
sha256: "0d1088b4758b3d5f3813178c6de22386329d42407d23aa1479f20dce96e49d78"
41-
"31.0":
42-
url: "https://github.com/google/perfetto/archive/refs/tags/v31.0.tar.gz"
43-
sha256: "544c68293590f53391ea4267d5a9b1a4594e1c8216fc5f5ce9d0f1227797922e"
44-
"30.0":
45-
url: "https://github.com/google/perfetto/archive/refs/tags/v30.0.tar.gz"
46-
sha256: "d1883793a2adb2a4105fc083478bf781badd566d72da45caa99095b61f938a2e"
47-
"27.1":
48-
url: "https://github.com/google/perfetto/archive/refs/tags/v27.1.tar.gz"
49-
sha256: "9edbafd6e2d9feaced4c0153e2f48dbb1da38429c5b1b17dfee70a91fd3101b2"
50-
"27.0":
51-
url: "https://github.com/google/perfetto/archive/refs/tags/v27.0.tar.gz"
52-
sha256: "c22750dd21419cf58132d55d634b88d9947bd0c7244dd98854b0248c7637a98c"
53-
"26.1":
54-
url: "https://github.com/google/perfetto/archive/refs/tags/v26.1.tar.gz"
55-
sha256: "cce387e82e2a137fce2eba927f80f20407764b77637a1a92b9b24065a500ce6d"
56-
patches:
57-
"31.0":
58-
- patch_file: "patches/v31.0/0001-tracing-fix-compile-on-MSVC.patch"
59-
patch_description: "Fix compilation on MSVC"
60-
patch_type: "backport"
61-
patch_source: "https://android-review.googlesource.com/c/platform/external/perfetto/+/2355222"
62-
sha256: "ad253a9bba3941bd8d1f206422d60eb1c06cb6d75d60eff5b5b8ae0f2ec7e15c"

recipes/perfetto/all/conanfile.py

+5-7
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
from conan.errors import ConanInvalidConfiguration
33
from conan.tools.build import check_min_cppstd
44
from conan.tools.cmake import CMake, CMakeToolchain, cmake_layout
5-
from conan.tools.files import apply_conandata_patches, copy, export_conandata_patches, get
5+
from conan.tools.files import copy, get
66
from conan.tools.microsoft import is_msvc
77
from conan.tools.scm import Version
88
import os
@@ -33,21 +33,20 @@ class PerfettoConan(ConanFile):
3333

3434
@property
3535
def _minimum_cpp_standard(self):
36-
return 11 if Version(self.version) < "31.0" else 17
36+
return 17
3737

3838
@property
3939
def _minimum_compilers_version(self):
4040
return {
41-
"Visual Studio": "15" if Version(self.version) < "31.0" else "16",
41+
"Visual Studio": "16" if Version(self.version) < "48.0" else "17",
4242
"msvc": "190",
4343
"gcc": "7",
44-
"clang": "3.3" if Version(self.version) < "31.0" else "5",
45-
"apple-clang": "5.0" if Version(self.version) < "31.0" else "9.1",
44+
"clang": "5",
45+
"apple-clang": "9.1",
4646
}
4747

4848
def export_sources(self):
4949
copy(self, "CMakeLists.txt", src=self.recipe_folder, dst=self.export_sources_folder)
50-
export_conandata_patches(self)
5150

5251
def config_options(self):
5352
if self.settings.os == "Windows":
@@ -88,7 +87,6 @@ def generate(self):
8887
tc.generate()
8988

9089
def build(self):
91-
apply_conandata_patches(self)
9290
cmake = CMake(self)
9391
cmake.configure(build_script_folder=os.path.join(self.source_folder, os.pardir))
9492
cmake.build()

recipes/perfetto/all/test_package/CMakeLists.txt

+1-5
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,5 @@ project(test_package LANGUAGES CXX)
44
find_package(perfetto REQUIRED CONFIG)
55

66
add_executable(${PROJECT_NAME} test_package.cpp)
7-
if(perfetto_VERSION VERSION_LESS "31.0")
8-
target_compile_features(${PROJECT_NAME} PRIVATE cxx_std_11)
9-
else()
10-
target_compile_features(${PROJECT_NAME} PRIVATE cxx_std_17)
11-
endif()
7+
target_compile_features(${PROJECT_NAME} PRIVATE cxx_std_17)
128
target_link_libraries(${PROJECT_NAME} PRIVATE perfetto::perfetto)

recipes/perfetto/config.yml

+2-22
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
versions:
2+
"48.1":
3+
folder: all
24
"47.0":
35
folder: all
46
"45.0":
@@ -13,25 +15,3 @@ versions:
1315
folder: all
1416
"40.0":
1517
folder: all
16-
"39.0":
17-
folder: all
18-
"38.0":
19-
folder: all
20-
"37.0":
21-
folder: all
22-
"35.0":
23-
folder: all
24-
"34.0":
25-
folder: all
26-
"32.1":
27-
folder: all
28-
"31.0":
29-
folder: all
30-
"30.0":
31-
folder: all
32-
"27.1":
33-
folder: all
34-
"27.0":
35-
folder: all
36-
"26.1":
37-
folder: all

0 commit comments

Comments
 (0)