[imgui] Update to 1.90.7 (#39017)

Update imgui port from 1.90.6 to 1.90.7: https://github.com/ocornut/imgui/releases/tag/v1.90.7 - [x] Changes comply with the [maintainer guide](https://github.com/microsoft/vcpkg-docs/blob/main/vcpkg/contributing/maintainer-guide.md). - [x] SHA512s are updated for each updated download. - [ ] ~~The "supports" clause reflects platforms that may be fixed by this new version.~~ - [ ] ~~Any fixed [CI baseline](https://github.com/microsoft/vcpkg/blob/master/scripts/ci.baseline.txt) entries are removed from that file.~~ - [ ] ~~Any patches that are no longer applied are deleted from the port's directory.~~ - [x] The version database is fixed by rerunning `./vcpkg x-add-version --all` and committing the result. - [x] Only one version is added to each modified port's versions file.
2024-12-27 10:21:07 +08:00 · 2024-05-30 19:25:32 +02:00 · 2024-05-30 19:25:32 +02:00 · b108771d0a
commit b108771d0a
parent 6403d9c944
9 changed files with 42 additions and 77 deletions
--- a/ports/imgui/portfile.cmake
+++ b/ports/imgui/portfile.cmake
@ -5,7 +5,7 @@ if ("docking-experimental" IN_LIST FEATURES)
        OUT_SOURCE_PATH SOURCE_PATH
        REPO ocornut/imgui
        REF "v${VERSION}-docking"
-        SHA512 f4e97f8a191276b1deb1510cb9136ab7a9a4abc029727f752dff8c01bb6af4a692b2239de84839aa39aa359220f08ffe9bdff01b57942dd6e01183ec6778cfa7
+        SHA512 a700d6e4daa2f2d2bc0a61f96c813da03f9d0d6508bc077679d1acea08f546c913d2409008437dea5d993657f10a9e7077725d65bc55b7fb14d7ff6b52ff05d4
        HEAD_REF docking
    )
 else()
@ -13,7 +13,7 @@ else()
        OUT_SOURCE_PATH SOURCE_PATH
        REPO ocornut/imgui
        REF "v${VERSION}"
-        SHA512 c9ff56ec6f8eb05b5034bb0b886568e843743a4313e36613db214f6080506703d5ed2ee606c88cd8957e73575e2b0e39deb52e1ac0c1a6e0a9fe38bca5e6dc0e
+        SHA512 8cdec45c8b58b3768a2216af2a1cba3d0e772ac48420b57057a4a8eda5766c121b4a8457a81b5896defe00b822c40d6aac6ee2b31f4133f2b9a02b231b1529d2
        HEAD_REF master
    )
 endif()
@ -63,7 +63,7 @@ if ("test-engine" IN_LIST FEATURES)
        OUT_SOURCE_PATH TEST_ENGINE_SOURCE_PATH
        REPO ocornut/imgui_test_engine
        REF "v${VERSION}"
-        SHA512 809b06076fbeb544cd9544020c336f943f05bc5772df183c94dbdd5057d9b7b8718c72e5b908205cbef06c511b01f7a8e706a23aa668ca9fd12e891ef8ffb48e
+        SHA512 0c3b11f46f7ed259e0bf2b0634848aee1fe0b34609349b30f445dd774c739690df4cf12498895f0734b16084be4d32ae80e9e2ada291dd88f7d4fad8fda49a2b
        HEAD_REF master
    )

--- a/ports/imgui/vcpkg.json
+++ b/ports/imgui/vcpkg.json
@ -1,7 +1,6 @@
 {
  "name": "imgui",
-  "version": "1.90.6",
-  "port-version": 1,
+  "version": "1.90.7",
  "description": "Bloat-free Immediate Mode Graphical User interface for C++ with minimal dependencies.",
  "homepage": "https://github.com/ocornut/imgui",
  "license": "MIT",
--- a/ports/imguizmo/CMakeLists.txt
+++ b/ports/imguizmo/CMakeLists.txt
@ -1,15 +1,14 @@
 cmake_minimum_required(VERSION 3.8)
 project(imguizmo)

+set(CMAKE_CXX_STANDARD 11)
+
 find_package(imgui CONFIG REQUIRED)
 get_target_property(IMGUI_INCLUDE_DIRS imgui::imgui
    INTERFACE_INCLUDE_DIRECTORIES
 )

 add_library(${PROJECT_NAME} "")
-add_library(${PROJECT_NAME}::${PROJECT_NAME} ALIAS ${PROJECT_NAME})
-
-target_compile_options(${PROJECT_NAME} PRIVATE "-std=c++11")

 target_include_directories(
 	${PROJECT_NAME}
@ -23,16 +22,16 @@ target_include_directories(
 target_sources(
    ${PROJECT_NAME}
    PRIVATE
-        ${CMAKE_CURRENT_SOURCE_DIR}/GraphEditor.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/ImCurveEdit.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/ImGradient.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/ImGuizmo.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/ImSequencer.cpp
+        GraphEditor.cpp
+        ImCurveEdit.cpp
+        ImGradient.cpp
+        ImGuizmo.cpp
+        ImSequencer.cpp
 )

 install(
    TARGETS ${PROJECT_NAME}
-    EXPORT ${PROJECT_NAME}_target
+    EXPORT unofficial-${PROJECT_NAME}-target
    ARCHIVE DESTINATION lib
    ARCHIVE DESTINATION lib
    RUNTIME DESTINATION bin
@ -41,19 +40,19 @@ install(
 if (NOT IMGUIZMO_SKIP_HEADERS)
    install(
        FILES
-            ${CMAKE_CURRENT_SOURCE_DIR}/GraphEditor.h
-            ${CMAKE_CURRENT_SOURCE_DIR}/ImCurveEdit.h
-            ${CMAKE_CURRENT_SOURCE_DIR}/ImGradient.h
-            ${CMAKE_CURRENT_SOURCE_DIR}/ImGuizmo.h
-            ${CMAKE_CURRENT_SOURCE_DIR}/ImSequencer.h
-            ${CMAKE_CURRENT_SOURCE_DIR}/ImZoomSlider.h
+            GraphEditor.h
+            ImCurveEdit.h
+            ImGradient.h
+            ImGuizmo.h
+            ImSequencer.h
+            ImZoomSlider.h
        DESTINATION include
    )
 endif()

 install(
-    EXPORT ${PROJECT_NAME}_target
-    NAMESPACE ${PROJECT_NAME}::
-    FILE ${PROJECT_NAME}-config.cmake
-    DESTINATION share/${PROJECT_NAME}
-)
+    EXPORT unofficial-${PROJECT_NAME}-target
+    NAMESPACE unofficial::${PROJECT_NAME}::
+    FILE unofficial-${PROJECT_NAME}-config.cmake
+    DESTINATION share/unofficial-${PROJECT_NAME}
+)
--- a/ports/imguizmo/fix-build.patch
+++ b/ports/imguizmo/fix-build.patch
@ -1,41 +0,0 @@
-diff --git a/GraphEditor.cpp b/GraphEditor.cpp
-index 0f45a40..3a09390 100644
--- a/GraphEditor.cpp
-+++ b/GraphEditor.cpp
-@@ -24,8 +24,8 @@
- // SOFTWARE.
- //
- 
-#include "imgui.h"
- #define IMGUI_DEFINE_MATH_OPERATORS
-+#include "imgui.h"
- #include "imgui_internal.h"
- #include <math.h>
- #include <vector>
-@@ -186,8 +186,8 @@ static void DisplayLinks(Delegate& delegate,
-         if (options.mDisplayLinksAsCurves)
-         {
-             // curves
-             drawList->AddBezierCurve(p1, p1 + ImVec2(50, 0) * factor, p2 + ImVec2(-50, 0) * factor, p2, 0xFF000000, options.mLineThickness * 1.5f * factor);
-             drawList->AddBezierCurve(p1, p1 + ImVec2(50, 0) * factor, p2 + ImVec2(-50, 0) * factor, p2, col, options.mLineThickness * 1.5f * factor);
-+             drawList->AddBezierCubic(p1, p1 + ImVec2(50, 0) * factor, p2 + ImVec2(-50, 0) * factor, p2, 0xFF000000, options.mLineThickness * 1.5f * factor);
-+             drawList->AddBezierCubic(p1, p1 + ImVec2(50, 0) * factor, p2 + ImVec2(-50, 0) * factor, p2, col, options.mLineThickness * 1.5f * factor);
-              /*
-             ImVec2 p10 = p1 + ImVec2(20.f * factor, 0.f);
-             ImVec2 p20 = p2 - ImVec2(20.f * factor, 0.f);
-diff --git a/ImGuizmo.cpp b/ImGuizmo.cpp
-index ed05fd8..74f0a0b 100644
--- a/ImGuizmo.cpp
-+++ b/ImGuizmo.cpp
-@@ -24,10 +24,10 @@
- // SOFTWARE.
- //
- 
-#include "imgui.h"
- #ifndef IMGUI_DEFINE_MATH_OPERATORS
- #define IMGUI_DEFINE_MATH_OPERATORS
- #endif
-+#include "imgui.h"
- #include "imgui_internal.h"
- #include "ImGuizmo.h"
- 
--- a/ports/imguizmo/portfile.cmake
+++ b/ports/imguizmo/portfile.cmake
@ -3,11 +3,9 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 vcpkg_from_github(
    OUT_SOURCE_PATH SOURCE_PATH
    REPO CedricGuillemet/ImGuizmo
-    REF ${VERSION}
-    SHA512 23285398688b4cdf3128ecb918b70c9a52f06c8e911da57430442b838cecf653e233d8cdfefc6acd3e4da381869ffc6fb74bcaaafc8e33657d6060a645517363
+    REF ba662b119d64f9ab700bb2cd7b2781f9044f5565
+    SHA512 682d785b582379914d525985de3a0bc04932b4ed715607127b1803ffba4d9b85165255dca1c18d2fd0934bab43de5d6c9c2d9909ac84d0ddaea12dad1871bcf8
    HEAD_REF master
-    PATCHES
-        fix-build.patch
 )

 file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}")
@ -21,6 +19,6 @@ vcpkg_cmake_configure(
 vcpkg_cmake_install()

 vcpkg_copy_pdbs()
-vcpkg_cmake_config_fixup()
+vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-${PORT} CONFIG_PATH share/unofficial-${PORT})

 vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
--- a/ports/imguizmo/vcpkg.json
+++ b/ports/imguizmo/vcpkg.json
@ -1,9 +1,9 @@
 {
  "name": "imguizmo",
-  "version": "1.83",
-  "port-version": 1,
+  "version-date": "2024-05-29",
  "description": "Immediate mode 3D gizmo for scene editing and other controls based on Dear ImGui",
  "homepage": "https://github.com/CedricGuillemet/ImGuizmo",
+  "license": "MIT",
  "dependencies": [
    "imgui",
    {
--- a/versions/baseline.json
+++ b/versions/baseline.json
@ -3601,8 +3601,8 @@
      "port-version": 0
    },
    "imgui": {
-      "baseline": "1.90.6",
-      "port-version": 1
+      "baseline": "1.90.7",
+      "port-version": 0
    },
    "imgui-node-editor": {
      "baseline": "0.9.3",
@ -3613,8 +3613,8 @@
      "port-version": 0
    },
    "imguizmo": {
-      "baseline": "1.83",
-      "port-version": 1
+      "baseline": "2024-05-29",
+      "port-version": 0
    },
    "immer": {
      "baseline": "0.8.1",
--- a/versions/i-/imgui.json
+++ b/versions/i-/imgui.json
@ -1,5 +1,10 @@
 {
  "versions": [
+    {
+      "git-tree": "2010bff23a4b5a3c9e4c1f174460abcc659ef681",
+      "version": "1.90.7",
+      "port-version": 0
+    },
    {
      "git-tree": "af958fee35b0e48dd0397a6f807e28a3f7bb99ce",
      "version": "1.90.6",
--- a/versions/i-/imguizmo.json
+++ b/versions/i-/imguizmo.json
@ -1,5 +1,10 @@
 {
  "versions": [
+    {
+      "git-tree": "be2cf5fafba779840d87110933298add1dcb60f5",
+      "version-date": "2024-05-29",
+      "port-version": 0
+    },
    {
      "git-tree": "65d6fab1371929e15b7198e139462218eb179abf",
      "version": "1.83",