From fa32c6acbd629ea4b06882aa170d2a571ea29430 Mon Sep 17 00:00:00 2001 From: Sergei Kachkov Date: Wed, 4 Jan 2023 23:58:42 +0300 Subject: [PATCH] [tracy] Fix imgui search path for Linux build (#28643) * [tracy] Fix imgui search path for Linux build * update port-version --- ports/tracy/003-fix-imgui-path.patch | 13 +++++++++++++ ports/tracy/portfile.cmake | 1 + ports/tracy/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/t-/tracy.json | 5 +++++ 5 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 ports/tracy/003-fix-imgui-path.patch diff --git a/ports/tracy/003-fix-imgui-path.patch b/ports/tracy/003-fix-imgui-path.patch new file mode 100644 index 0000000000..9e6d94ef84 --- /dev/null +++ b/ports/tracy/003-fix-imgui-path.patch @@ -0,0 +1,13 @@ +diff --git a/profiler/build/unix/build.mk b/profiler/build/unix/build.mk +index 24765f1a..dc2923c8 100644 +--- a/profiler/build/unix/build.mk ++++ b/profiler/build/unix/build.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 d989364fd0..627a624f12 100644 --- a/ports/tracy/portfile.cmake +++ b/ports/tracy/portfile.cmake @@ -13,6 +13,7 @@ vcpkg_from_github( PATCHES 001-fix-vcxproj-vcpkg.patch 002-fix-capstone-5.patch + 003-fix-imgui-path.patch ) vcpkg_cmake_configure( diff --git a/ports/tracy/vcpkg.json b/ports/tracy/vcpkg.json index 52cbba3056..d4bd2e4b5a 100644 --- a/ports/tracy/vcpkg.json +++ b/ports/tracy/vcpkg.json @@ -1,6 +1,7 @@ { "name": "tracy", "version-semver": "0.9.0", + "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 9d9817e6c9..de81c0dcc9 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7650,7 +7650,7 @@ }, "tracy": { "baseline": "0.9.0", - "port-version": 0 + "port-version": 1 }, "transwarp": { "baseline": "2.2.2", diff --git a/versions/t-/tracy.json b/versions/t-/tracy.json index 8263ec15b9..065e887f1b 100644 --- a/versions/t-/tracy.json +++ b/versions/t-/tracy.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ed78af871d0cb41933e62e1daf455ca02453139d", + "version-semver": "0.9.0", + "port-version": 1 + }, { "git-tree": "d7c6276fc6867dd978b2e49047027da3466d7ef3", "version-semver": "0.9.0",