diff --git a/ports/tracy/build-tools.patch b/ports/tracy/build-tools.patch index 4c2c42010b..8c0cb2ee33 100644 --- a/ports/tracy/build-tools.patch +++ b/ports/tracy/build-tools.patch @@ -1,8 +1,8 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 358266c0..314e878c 100644 +index 72901a8c..365724a8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -179,3 +179,16 @@ if(TRACY_CLIENT_PYTHON) +@@ -193,3 +193,15 @@ if(TRACY_CLIENT_PYTHON) add_subdirectory(python) endif() @@ -12,8 +12,7 @@ index 358266c0..314e878c 100644 +if(VCPKG_CLI_TOOLS) + add_subdirectory(csvexport) + add_subdirectory(capture) -+ add_subdirectory(import-chrome) -+ add_subdirectory(import-fuchsia) ++ add_subdirectory(import) + add_subdirectory(update) +endif() +if(VCPKG_GUI_TOOLS) @@ -29,7 +28,7 @@ index c12a3408..0d55cf91 100644 set(TRACY_COMMON_SOURCES diff --git a/cmake/vendor.cmake b/cmake/vendor.cmake -index bd53a4db..f8836666 100644 +index 29f12cfa..40b3e078 100644 --- a/cmake/vendor.cmake +++ b/cmake/vendor.cmake @@ -1,3 +1,4 @@ diff --git a/ports/tracy/portfile.cmake b/ports/tracy/portfile.cmake index 5cdcc3ec8d..cf798c34d0 100644 --- a/ports/tracy/portfile.cmake +++ b/ports/tracy/portfile.cmake @@ -12,17 +12,20 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES on-demand TRACY_ON_DEMAND fibers TRACY_FIBERS - cli-tools VCPKG_CLI_TOOLS - gui-tools VCPKG_GUI_TOOLS verbose TRACY_VERBOSE INVERTED_FEATURES crash-handler TRACY_NO_CRASH_HANDLER ) -set(EXTRA_OPTIONS "") +vcpkg_check_features(OUT_FEATURE_OPTIONS TOOLS_OPTIONS + FEATURES + cli-tools VCPKG_CLI_TOOLS + gui-tools VCPKG_GUI_TOOLS +) + if("cli-tools" IN_LIST FEATURES OR "gui-tools" IN_LIST FEATURES) vcpkg_find_acquire_program(PKGCONFIG) - list(APPEND EXTRA_OPTIONS "-DPKG_CONFIG_EXECUTABLE=${PKGCONFIG}") + list(APPEND TOOLS_OPTIONS "-DPKG_CONFIG_EXECUTABLE=${PKGCONFIG}") endif() vcpkg_cmake_configure( @@ -31,7 +34,8 @@ vcpkg_cmake_configure( -DDOWNLOAD_CAPSTONE=OFF -DLEGACY=ON ${FEATURE_OPTIONS} - ${EXTRA_OPTIONS} + OPTIONS_RELEASE + ${TOOLS_OPTIONS} MAYBE_UNUSED_VARIABLES DOWNLOAD_CAPSTONE LEGACY @@ -40,27 +44,22 @@ vcpkg_cmake_install() vcpkg_copy_pdbs() vcpkg_cmake_config_fixup(PACKAGE_NAME Tracy) -function(tracy_copy_tool tool_name) +function(tracy_copy_tool tool_name tool_dir) vcpkg_copy_tools( - TOOL_NAMES "tracy-${tool_name}" - SEARCH_DIR "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/${tool_name}" - ) - vcpkg_copy_tools( - TOOL_NAMES "tracy-${tool_name}" - SEARCH_DIR "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/${tool_name}" - DESTINATION ${CURRENT_PACKAGES_DIR}/debug/tools/${PORT} + TOOL_NAMES "${tool_name}" + SEARCH_DIR "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/${tool_dir}" ) endfunction() if("cli-tools" IN_LIST FEATURES) - tracy_copy_tool(capture) - tracy_copy_tool(csvexport) - tracy_copy_tool(import-chrome) - tracy_copy_tool(import-fuchsia) - tracy_copy_tool(update) + tracy_copy_tool(tracy-capture capture) + tracy_copy_tool(tracy-csvexport csvexport) + tracy_copy_tool(tracy-import-chrome import) + tracy_copy_tool(tracy-import-fuchsia import) + tracy_copy_tool(tracy-update update) endif() if("gui-tools" IN_LIST FEATURES) - tracy_copy_tool(profiler) + tracy_copy_tool(tracy-profiler profiler) endif() vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/tracy/vcpkg.json b/ports/tracy/vcpkg.json index 7447285cf0..34c8d45112 100644 --- a/ports/tracy/vcpkg.json +++ b/ports/tracy/vcpkg.json @@ -1,6 +1,7 @@ { "name": "tracy", "version": "0.11.1", + "port-version": 1, "description": "A real time, nanosecond resolution, remote telemetry, hybrid frame and sampling profiler for games and other applications.", "homepage": "https://github.com/wolfpld/tracy", "license": "BSD-3-Clause", diff --git a/versions/baseline.json b/versions/baseline.json index 17328d4a50..9bdc74d0ed 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -8974,7 +8974,7 @@ }, "tracy": { "baseline": "0.11.1", - "port-version": 0 + "port-version": 1 }, "transwarp": { "baseline": "2.2.3", diff --git a/versions/t-/tracy.json b/versions/t-/tracy.json index cca3e9b252..973490c09f 100644 --- a/versions/t-/tracy.json +++ b/versions/t-/tracy.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "10fb0d9b2fef2b399309221859696f08bd047bd7", + "version": "0.11.1", + "port-version": 1 + }, { "git-tree": "b4af568b6d5180007564a094751cb736d136f1e0", "version": "0.11.1",