diff --git a/ports/hello-imgui/portfile.cmake b/ports/hello-imgui/portfile.cmake index 64926f2767c5d7..7a630397a8ed2b 100644 --- a/ports/hello-imgui/portfile.cmake +++ b/ports/hello-imgui/portfile.cmake @@ -8,6 +8,7 @@ vcpkg_from_github( HEAD_REF master PATCHES fix-upw.patch + use-new-imguiimagebutton.patch # Upstream commit: https://github.com/pthom/hello_imgui/commit/3ba369ad5b9bc281f01a2b2ee78d64ecef7d632a ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS @@ -56,6 +57,7 @@ endif() vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" + DISABLE_PARALLEL_CONFIGURE OPTIONS -DHELLOIMGUI_BUILD_DEMOS=OFF -DHELLOIMGUI_BUILD_DOCS=OFF diff --git a/ports/hello-imgui/use-new-imguiimagebutton.patch b/ports/hello-imgui/use-new-imguiimagebutton.patch new file mode 100644 index 00000000000000..061ad102a7b3f0 --- /dev/null +++ b/ports/hello-imgui/use-new-imguiimagebutton.patch @@ -0,0 +1,28 @@ +diff --git a/src/hello_imgui/internal/image_from_asset.cpp b/src/hello_imgui/internal/image_from_asset.cpp +index 7416a69..7151e2f 100644 +--- a/src/hello_imgui/internal/image_from_asset.cpp ++++ b/src/hello_imgui/internal/image_from_asset.cpp +@@ -116,7 +116,7 @@ namespace HelloImGui + auto textureId = cachedImage->TextureID(); + auto imageSize = ImVec2((float)cachedImage->Width, (float)cachedImage->Height); + ImVec2 displayedSize = ImageProportionalSize(size, imageSize); +- bool clicked = ImGui::ImageButton(textureId, displayedSize, uv0, uv1, frame_padding, bg_col, tint_col); ++ bool clicked = ImGui::ImageButton(assetPath, textureId, displayedSize, uv0, uv1, bg_col, tint_col); + return clicked; + } + +diff --git a/src/hello_imgui/internal/image_gl_deprecated.cpp b/src/hello_imgui/internal/image_gl_deprecated.cpp +index 5c66c24..98d21d5 100644 +--- a/src/hello_imgui/internal/image_gl_deprecated.cpp ++++ b/src/hello_imgui/internal/image_gl_deprecated.cpp +@@ -67,7 +67,9 @@ bool ImageGl::DrawButton( + const ImVec4& tint_col) + { + ImVec2 displayedSize = ImageProportionalSize(size, this->imageSize); +- return ImGui::ImageButton(this->imTextureId, displayedSize, uv0, uv1, frame_padding, bg_col, tint_col); ++ char str_id[64]; ++ snprintf(str_id, 64, "ImageButton_%p", this->imTextureId); ++ return ImGui::ImageButton(str_id, this->imTextureId, displayedSize, uv0, uv1, bg_col, tint_col); + } + + ImageGlPtr ImageGl::FactorImage(const char *assetPath) diff --git a/ports/hello-imgui/vcpkg.json b/ports/hello-imgui/vcpkg.json index 4e4636a811c192..2668dafe4b05a0 100644 --- a/ports/hello-imgui/vcpkg.json +++ b/ports/hello-imgui/vcpkg.json @@ -1,6 +1,7 @@ { "name": "hello-imgui", "version": "1.5.2", + "port-version": 1, "description": "Hello ImGui: unleash your creativity in app development and prototyping", "homepage": "https://pthom.github.io/hello_imgui/", "license": "MIT", diff --git a/ports/imgui/portfile.cmake b/ports/imgui/portfile.cmake index 2a6b111b0116a5..d519ec197494b0 100644 --- 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 07492ef56d0518b1a941d8da6ccb1cfe9a8253db3057f2875a033b144047065f43240e0cb8f4ef5d3cad76ccd84fd26fc673c673f4a484d10d2c8545ec286bdb + SHA512 3ec43488ea786348992125220b18ded1945fe3f2984f0317be712daceca12590e6466c89fb720ebf87d883839fb5ca938fa65e769d7436856255a4fb01d608e4 HEAD_REF docking ) else() @@ -13,7 +13,7 @@ else() OUT_SOURCE_PATH SOURCE_PATH REPO ocornut/imgui REF "v${VERSION}" - SHA512 dbf0ce45dc6fb100c02bb4fda3d95e0bed615ae9d91b269ad6f42b11fb5aa6a22ec7649ac8c96eb260bed454db56e975de33cd6ab55fa8b7e249f9c87b07a90e + SHA512 8db4aeafa7e447d56423a129a623f3fadcfd4df394c8d9bb2eef158cc437252fc6c5d7394e6320a75389fa98da7b7b177fa6a2465b2a25fc27a075b39fe4d725 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 4c4d7fd32504c1a56a5f1816f5032e4390ea9eb5d56c1ee2293950c808e23c1b94df9edf524fcc4122d27fa86d749454862ddb0d1a83633c014fe33f900836b5 + SHA512 321d38cf97faf51c76685dd8df43725f431fddccd5064120d456867ea69d1303332f42191fc339718a76461ecf217cbc4dccb1b0e50c9f147e7f6ca7a3f2f0d4 HEAD_REF master ) diff --git a/ports/imgui/vcpkg.json b/ports/imgui/vcpkg.json index f6813d9c3b8132..3b1a3349487a55 100644 --- a/ports/imgui/vcpkg.json +++ b/ports/imgui/vcpkg.json @@ -1,6 +1,6 @@ { "name": "imgui", - "version": "1.91.0", + "version": "1.91.4", "description": "Bloat-free Immediate Mode Graphical User interface for C++ with minimal dependencies.", "homepage": "https://github.com/ocornut/imgui", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index 6b55a1761d367a..b7151531eb637f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3446,7 +3446,7 @@ }, "hello-imgui": { "baseline": "1.5.2", - "port-version": 0 + "port-version": 1 }, "hexl": { "baseline": "1.2.5", @@ -3669,7 +3669,7 @@ "port-version": 0 }, "imgui": { - "baseline": "1.91.0", + "baseline": "1.91.4", "port-version": 0 }, "imgui-node-editor": { diff --git a/versions/h-/hello-imgui.json b/versions/h-/hello-imgui.json index eb9a64ae4f92a9..f87fdabc67eccd 100644 --- a/versions/h-/hello-imgui.json +++ b/versions/h-/hello-imgui.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d7e8d2c3f41030f6a1ddcd3f65093ba6c0c0b2dc", + "version": "1.5.2", + "port-version": 1 + }, { "git-tree": "965296e927e1e09280992d52cd0330ce2c966cc6", "version": "1.5.2", diff --git a/versions/i-/imgui.json b/versions/i-/imgui.json index 357b6ff7217bd1..8bc4255f73975a 100644 --- a/versions/i-/imgui.json +++ b/versions/i-/imgui.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5b2d5cff4fcd4ca3908958e725ded5ffd6055256", + "version": "1.91.4", + "port-version": 0 + }, { "git-tree": "09b0e91307c74efecc2b8860b3a25f4e11aa96d3", "version": "1.91.0",