Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 19 additions & 0 deletions ports/nativefiledialog-extended/fix-version.cmake
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 740b484..e4397a4 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -128,6 +128,14 @@ set_target_properties(${TARGET_NAME} PROPERTIES

if (NFD_INSTALL)
include(GNUInstallDirs)
+ include(CMakePackageConfigHelpers)
+
+ write_basic_package_version_file("${CMAKE_CURRENT_BINARY_DIR}/${TARGET_NAME}-config-version.cmake"
+ VERSION "${PROJECT_VERSION}"
+ COMPATIBILITY SameMajorVersion
+ )
+
+ install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${TARGET_NAME}-config-version.cmake" DESTINATION lib/cmake/${TARGET_NAME})
Comment on lines +9 to +16
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shouldn't this be submitted upstream instead? They choose their compatibility policy. A vcpkg-only version capability is pointless lock-in.


install(TARGETS ${TARGET_NAME} EXPORT ${TARGET_NAME}-export
LIBRARY DESTINATION ${LIB_INSTALL_DIR} ARCHIVE DESTINATION ${LIB_INSTALL_DIR} PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
2 changes: 2 additions & 0 deletions ports/nativefiledialog-extended/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ vcpkg_from_github(
REF v${VERSION}
SHA512 4ec3e174a90354c524d9be2776422740f80b73021df94e1942e60ab4310995245554f83097b9b2dcca04d016a8548d3fc0760f73daf724c5c3d72c15cf776bed
HEAD_REF master
PATCHES
fix-version.cmake
)

vcpkg_cmake_configure(
Expand Down
1 change: 1 addition & 0 deletions ports/nativefiledialog-extended/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"name": "nativefiledialog-extended",
"version": "1.2.1",
"port-version": 1,
"description": "Native File Dialog Extended",
"homepage": "https://github.com/btzy/nativefiledialog-extended",
"license": "Zlib",
Expand Down
18 changes: 18 additions & 0 deletions ports/tidy-html5/fix-version.cmake
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8efec25..6007610 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -700,4 +700,13 @@ install(FILES
DESTINATION "${LIB_INSTALL_DIR}/pkgconfig"
)

+
+include(CMakePackageConfigHelpers)
+
+write_basic_package_version_file("${CMAKE_CURRENT_BINARY_DIR}/unofficial-tidy-html5Config-version.cmake"
+ VERSION "${LIBTIDY_VERSION}"
+ COMPATIBILITY SameMajorVersion
+)
+
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/unofficial-tidy-html5Config-version.cmake DESTINATION ${LIB_INSTALL_DIR}/cmake/unofficial-tidy-html5)
# eof
1 change: 1 addition & 0 deletions ports/tidy-html5/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ vcpkg_from_github(
debug-postfix.patch
fix_unsupport_func_uwp.patch
cmake_find_package_support.patch
fix-version.cmake
)

string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" BUILD_SHARED_LIB)
Expand Down
2 changes: 1 addition & 1 deletion ports/tidy-html5/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "tidy-html5",
"version": "5.8.0",
"port-version": 2,
"port-version": 3,
"description": "Tidy tidies HTML and XML. It can tidy your documents by itself, and developers can easily integrate its features into even more powerful tools.",
"homepage": "https://www.html-tidy.org",
"license": null,
Expand Down
13 changes: 13 additions & 0 deletions ports/tracy/disable-git.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
diff --git a/profiler/CMakeLists.txt b/profiler/CMakeLists.txt
index d01731d3..1d36eee1 100644
--- a/profiler/CMakeLists.txt
+++ b/profiler/CMakeLists.txt
@@ -266,7 +266,7 @@ if(NOT DEFINED GIT_REV)
endif()

find_package(Git)
-if(Git_FOUND)
+if(0)
Comment on lines +8 to +10
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Drop the patch. Configure with -DCMAKE_DISABLE_FIND_PACKAGE_Git=1.

add_custom_target(git-ref
COMMAND ${CMAKE_COMMAND} -E echo "#pragma once" > GitRef.hpp.tmp
COMMAND ${GIT_EXECUTABLE} -C ${CMAKE_CURRENT_SOURCE_DIR} log -1 "--format=namespace tracy { static inline const char* GitRef = %x22%h%x22; }" ${GIT_REV} >> GitRef.hpp.tmp || echo "namespace tracy { static inline const char* GitRef = \"unknown\"; }" >> GitRef.hpp.tmp
74 changes: 74 additions & 0 deletions ports/tracy/downgrade-capstone-5.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,74 @@
diff --git a/profiler/src/profiler/TracySourceView.cpp b/profiler/src/profiler/TracySourceView.cpp
index c79948b8..7bd717b7 100644
--- a/profiler/src/profiler/TracySourceView.cpp
+++ b/profiler/src/profiler/TracySourceView.cpp
@@ -713,7 +713,7 @@ bool SourceView::Disassemble( uint64_t symAddr, const Worker& worker )
rval = cs_open( CS_ARCH_ARM, CS_MODE_ARM, &handle );
break;
case CpuArchArm64:
- rval = cs_open( CS_ARCH_AARCH64, CS_MODE_ARM, &handle );
+ rval = cs_open( CS_ARCH_ARM64, CS_MODE_ARM, &handle );
break;
default:
assert( false );
@@ -778,9 +778,9 @@ bool SourceView::Disassemble( uint64_t symAddr, const Worker& worker )
}
break;
case CpuArchArm64:
- if( detail.aarch64.op_count == 1 && detail.aarch64.operands[0].type == AARCH64_OP_IMM )
+ if( detail.arm64.op_count == 1 && detail.arm64.operands[0].type == ARM64_OP_IMM )
{
- jumpAddr = (uint64_t)detail.aarch64.operands[0].imm;
+ jumpAddr = (uint64_t)detail.arm64.operands[0].imm;
}
break;
default:
@@ -865,18 +865,18 @@ bool SourceView::Disassemble( uint64_t symAddr, const Worker& worker )
}
break;
case CpuArchArm64:
- for( uint8_t i=0; i<detail.aarch64.op_count; i++ )
+ for( uint8_t i=0; i<detail.arm64.op_count; i++ )
{
uint8_t type = 0;
- switch( detail.aarch64.operands[i].type )
+ switch( detail.arm64.operands[i].type )
{
- case AARCH64_OP_IMM:
+ case ARM64_OP_IMM:
type = 0;
break;
- case AARCH64_OP_REG:
+ case ARM64_OP_REG:
type = 1;
break;
- case AARCH64_OP_MEM:
+ case ARM64_OP_MEM:
type = 2;
break;
default:
diff --git a/server/TracyWorker.cpp b/server/TracyWorker.cpp
index b1dffe1a..cb1e179f 100644
--- a/server/TracyWorker.cpp
+++ b/server/TracyWorker.cpp
@@ -3912,7 +3912,7 @@ void Worker::AddSymbolCode( uint64_t ptr, const char* data, size_t sz )
rval = cs_open( CS_ARCH_ARM, CS_MODE_ARM, &handle );
break;
case CpuArchArm64:
- rval = cs_open( CS_ARCH_AARCH64, CS_MODE_ARM, &handle );
+ rval = cs_open( CS_ARCH_ARM64, CS_MODE_ARM, &handle );
break;
default:
assert( false );
@@ -3952,9 +3952,9 @@ void Worker::AddSymbolCode( uint64_t ptr, const char* data, size_t sz )
}
break;
case CpuArchArm64:
- if( detail.aarch64.op_count == 1 && detail.aarch64.operands[0].type == AARCH64_OP_IMM )
+ if( detail.arm64.op_count == 1 && detail.arm64.operands[0].type == ARM64_OP_IMM )
{
- callAddr = (uint64_t)detail.aarch64.operands[0].imm;
+ callAddr = (uint64_t)detail.arm64.operands[0].imm;
}
break;
default:
84 changes: 84 additions & 0 deletions ports/tracy/fix-vendor-versions.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,84 @@
diff --git a/cmake/server.cmake b/cmake/server.cmake
index a76d1c13..d8c1a26f 100644
--- a/cmake/server.cmake
+++ b/cmake/server.cmake
@@ -29,7 +29,7 @@ list(TRANSFORM TRACY_SERVER_SOURCES PREPEND "${TRACY_SERVER_DIR}/")

add_library(TracyServer STATIC EXCLUDE_FROM_ALL ${TRACY_COMMON_SOURCES} ${TRACY_SERVER_SOURCES})
target_include_directories(TracyServer PUBLIC ${TRACY_COMMON_DIR} ${TRACY_SERVER_DIR})
-target_link_libraries(TracyServer PUBLIC TracyCapstone libzstd PPQSort::PPQSort)
+target_link_libraries(TracyServer PUBLIC TracyCapstone zstd::libzstd PPQSort::PPQSort)
if(NO_STATISTICS)
target_compile_definitions(TracyServer PUBLIC TRACY_NO_STATISTICS)
endif()
diff --git a/cmake/vendor.cmake b/cmake/vendor.cmake
index a54f7c53..73b16592 100644
--- a/cmake/vendor.cmake
+++ b/cmake/vendor.cmake
@@ -136,6 +136,7 @@ target_include_directories(TracyGetOpt PUBLIC ${GETOPT_DIR})
CPMAddPackage(
NAME ImGui
GITHUB_REPOSITORY ocornut/imgui
+ FORCE TRUE
GIT_TAG v1.92.1-docking
DOWNLOAD_ONLY TRUE
PATCHES
@@ -153,6 +154,9 @@ set(IMGUI_SOURCES
backends/imgui_impl_opengl3.cpp
)

+# Make ImGui_SOURCE_DIR available to the parent scope
+set(ImGui_SOURCE_DIR "${ImGui_SOURCE_DIR}" PARENT_SCOPE)
+
list(TRANSFORM IMGUI_SOURCES PREPEND "${ImGui_SOURCE_DIR}/")

add_library(TracyImGui STATIC EXCLUDE_FROM_ALL ${IMGUI_SOURCES})
@@ -198,7 +202,7 @@ CPMAddPackage(
# json

CPMAddPackage(
- NAME json
+ NAME nlohmann_json
GITHUB_REPOSITORY nlohmann/json
GIT_TAG v3.12.0
EXCLUDE_FROM_ALL TRUE
@@ -233,7 +237,7 @@ if(NOT EMSCRIPTEN)
# tidy

CPMAddPackage(
- NAME tidy
+ NAME unofficial-tidy-html5
GITHUB_REPOSITORY htacg/tidy-html5
GIT_TAG 5.8.0
PATCHES
@@ -293,4 +297,4 @@ if(NOT EMSCRIPTEN)
target_include_directories(TracyLibcurl INTERFACE ${libcurl_SOURCE_DIR}/include)
endif()

-endif()
\ No newline at end of file
+endif()
diff --git a/profiler/CMakeLists.txt b/profiler/CMakeLists.txt
index d01731d3..9c07e971 100644
--- a/profiler/CMakeLists.txt
+++ b/profiler/CMakeLists.txt
@@ -242,7 +242,7 @@ target_link_libraries(${PROJECT_NAME} PRIVATE
TracyImGui
Threads::Threads
nlohmann_json::nlohmann_json
- md4c
+ md4c::md4c
)
target_include_directories(${PROJECT_NAME} PRIVATE
${tidy_SOURCE_DIR}/include
@@ -254,8 +254,8 @@ target_include_directories(${PROJECT_NAME} PRIVATE
if(NOT EMSCRIPTEN)
target_link_libraries(${PROJECT_NAME} PRIVATE
TracyLibcurl
- base64
- tidy-static
+ aklomp::base64
+ unofficial::tidy-html5::tidy
TracyPugixml
usearch
)
23 changes: 14 additions & 9 deletions ports/tracy/portfile.cmake
Original file line number Diff line number Diff line change
@@ -1,18 +1,14 @@
vcpkg_download_distfile(PATCH_MISSING_CHRONO_INCLUDE
URLS https://github.com/wolfpld/tracy/commit/50ff279aaddfd91dc3cdcfd5b7aec3978e63da25.diff?full_index=1
SHA512 f9594297ea68612b68bd631497cd312ea01b34280a0f098de0d2b99810149345251a8985a6430337d0b55d2f181ceac10d563b64cfe48f78959f79ec7a6ea3b5
FILENAME wolfpld-tracy-PR982.diff
)

vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO wolfpld/tracy
REF "v${VERSION}"
SHA512 d3d99284e3c3172236c3f02b3bc52df111ef650fb8609e54fb3302ece28e55a06cd16713ed532f1e1aad66678ff09639dfc7e01a1e96880fb923b267a1b1b79b
SHA512 ee1c6596e7313bdccb8e2e9354c1e2ec14e78a6252b4f53861256807a09bac19f9ff0d7ffb95e60f1d16f5cec22cb95989a216f5c637d32cee9a8c4257a567fa
HEAD_REF master
PATCHES
build-tools.patch
"${PATCH_MISSING_CHRONO_INCLUDE}"
disable-git.patch
fix-vendor-versions.patch
downgrade-capstone-5.patch
)

vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
Expand Down Expand Up @@ -40,16 +36,25 @@ vcpkg_cmake_configure(
OPTIONS
-DDOWNLOAD_CAPSTONE=OFF
-DLEGACY=ON
-DCPM_USE_LOCAL_PACKAGES=ON
-DCPM_LOCAL_PACKAGES_ONLY=ON
-DCPM_DONT_UPDATE_MODULE_PATH=ON
-DFETCHCONTENT_FULLY_DISCONNECTED=ON
-DFETCHCONTENT_TRY_FIND_PACKAGE_MODE=ALWAYS
${FEATURE_OPTIONS}
OPTIONS_RELEASE
${TOOLS_OPTIONS}
MAYBE_UNUSED_VARIABLES
DOWNLOAD_CAPSTONE
LEGACY
CPM_DONT_UPDATE_MODULE_PATH
CPM_LOCAL_PACKAGES_ONLY
CPM_USE_LOCAL_PACKAGES
FETCHCONTENT_TRY_FIND_PACKAGE_MODE
)
vcpkg_cmake_install()
vcpkg_copy_pdbs()
vcpkg_cmake_config_fixup(PACKAGE_NAME Tracy)
vcpkg_cmake_config_fixup(PACKAGE_NAME Tracy CONFIG_PATH "lib/cmake/Tracy")

function(tracy_copy_tool tool_name tool_dir)
vcpkg_copy_tools(
Expand Down
24 changes: 13 additions & 11 deletions ports/tracy/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,24 +1,31 @@
{
"name": "tracy",
"version": "0.11.1",
"port-version": 2,
"version": "0.13.0",
"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",
"supports": "!(windows & (arm | uwp))",
"dependencies": [
"aklomp-base64",
"curl",
"md4c",
"nlohmann-json",
{
"name": "pthreads",
"platform": "!windows"
},
"pugixml",
"tidy-html5",
"usearch",
{
"name": "vcpkg-cmake",
"host": true
},
{
"name": "vcpkg-cmake-config",
"host": true
}
},
"zstd"
],
"default-features": [
"crash-handler"
Expand All @@ -43,10 +50,7 @@
},
"freetype",
"glfw3",
{
"name": "tbb",
"platform": "!windows"
}
"ppqsort"
]
},
"crash-handler": {
Expand Down Expand Up @@ -74,10 +78,8 @@
},
"freetype",
"glfw3",
{
"name": "tbb",
"platform": "!windows"
}
"nativefiledialog-extended",
"ppqsort"
]
},
"on-demand": {
Expand Down
8 changes: 4 additions & 4 deletions versions/baseline.json
Original file line number Diff line number Diff line change
Expand Up @@ -6758,7 +6758,7 @@
},
"nativefiledialog-extended": {
"baseline": "1.2.1",
"port-version": 0
"port-version": 1
},
"nayuki-qr-code-generator": {
"baseline": "1.8.0",
Expand Down Expand Up @@ -9726,7 +9726,7 @@
},
"tidy-html5": {
"baseline": "5.8.0",
"port-version": 2
"port-version": 3
},
"tiff": {
"baseline": "4.7.1",
Expand Down Expand Up @@ -9897,8 +9897,8 @@
"port-version": 6
},
"tracy": {
"baseline": "0.11.1",
"port-version": 2
"baseline": "0.13.0",
"port-version": 0
},
"transwarp": {
"baseline": "2.2.3",
Expand Down
5 changes: 5 additions & 0 deletions versions/n-/nativefiledialog-extended.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "1aacd6c15763344b3af3b61dd46f740af9d54e17",
"version": "1.2.1",
"port-version": 1
},
{
"git-tree": "de840713bb625f3d94a683f1369105b245d23982",
"version": "1.2.1",
Expand Down
Loading
Loading