diff --git a/ports/tracy/005-fix-imgui-path-legacy.patch b/ports/tracy/005-fix-imgui-path-legacy.patch new file mode 100644 index 00000000000000..a8b5abea241a12 --- /dev/null +++ b/ports/tracy/005-fix-imgui-path-legacy.patch @@ -0,0 +1,13 @@ +diff --git a/profiler/build/unix/legacy.mk b/profiler/build/unix/legacy.mk +index 24765f1a..dc2923c8 100644 +--- a/profiler/build/unix/legacy.mk ++++ b/profiler/build/unix/legacy.mk +@@ -1,7 +1,7 @@ + CFLAGS += + CXXFLAGS := $(CFLAGS) -std=c++17 + DEFINES += -DIMGUI_ENABLE_FREETYPE +-INCLUDES := $(shell pkg-config --cflags glfw3 freetype2 capstone) -I../../../imgui ++INCLUDES := -I../../../imgui $(shell pkg-config --cflags glfw3 freetype2 capstone) + LIBS := $(shell pkg-config --libs glfw3 freetype2 capstone) -lpthread -ldl + + PROJECT := Tracy diff --git a/ports/tracy/portfile.cmake b/ports/tracy/portfile.cmake index 2e1bd15c90b127..33c50cc12b2e21 100644 --- a/ports/tracy/portfile.cmake +++ b/ports/tracy/portfile.cmake @@ -15,6 +15,7 @@ vcpkg_from_github( 002-fix-capstone-5.patch 003-fix-imgui-path.patch 004-fix-missing-threads-dep.patch # https://github.com/wolfpld/tracy/pull/562 + 005-fix-imgui-path-legacy.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS @@ -84,6 +85,7 @@ function(tracy_tool_install_make tracy_TOOL tracy_TOOL_NAME) BASE_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}${short_buildtype}" OUTPUT_VARIABLE relative_path_makefile_dir) + set(ENV{LEGACY} 1) vcpkg_backup_env_variables(VARS PKG_CONFIG_PATH) vcpkg_host_path_list(PREPEND ENV{PKG_CONFIG_PATH} "${CURRENT_INSTALLED_DIR}${path_suffix}/lib/pkgconfig") diff --git a/ports/tracy/vcpkg.json b/ports/tracy/vcpkg.json index 0a7ffdbd85be4a..0353c4cc4f2304 100644 --- a/ports/tracy/vcpkg.json +++ b/ports/tracy/vcpkg.json @@ -1,6 +1,7 @@ { "name": "tracy", "version-semver": "0.9.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 ec1ac7c1a97fb9..a8037e26c11c62 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -8130,7 +8130,7 @@ }, "tracy": { "baseline": "0.9.1", - "port-version": 0 + "port-version": 1 }, "transwarp": { "baseline": "2.2.2", diff --git a/versions/t-/tracy.json b/versions/t-/tracy.json index 380053bc215ac1..48efad1c12aeb3 100644 --- a/versions/t-/tracy.json +++ b/versions/t-/tracy.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "77e2063ccf000ddf44db90335335b0d87efe0bf4", + "version-semver": "0.9.1", + "port-version": 1 + }, { "git-tree": "1dbe1080d7c00eb3aa76f87c8c62511d9d9671a7", "version-semver": "0.9.1",