From f872f86bd73f244d767874b4d2f55c3029a3e5be Mon Sep 17 00:00:00 2001 From: Jonliu1993 <13720414433@163.com> Date: Tue, 16 Nov 2021 18:44:08 +0800 Subject: [PATCH 1/2] [imgui-sfml] update to v2.4 --- ports/imgui-sfml/0002-fix_imgui_config.patch | 10 ---------- ports/imgui-sfml/portfile.cmake | 5 ++--- ports/imgui-sfml/vcpkg.json | 2 +- 3 files changed, 3 insertions(+), 14 deletions(-) delete mode 100644 ports/imgui-sfml/0002-fix_imgui_config.patch diff --git a/ports/imgui-sfml/0002-fix_imgui_config.patch b/ports/imgui-sfml/0002-fix_imgui_config.patch deleted file mode 100644 index f5b7c7fc37d8ea..00000000000000 --- a/ports/imgui-sfml/0002-fix_imgui_config.patch +++ /dev/null @@ -1,10 +0,0 @@ -diff --git a/imconfig-SFML.h b/imconfig-SFML.h -index ddfe05d..4e7634e 100644 ---- a/imconfig-SFML.h -+++ b/imconfig-SFML.h -@@ -23,5 +23,3 @@ - return sf::Color(static_cast(x * 255.f), static_cast(y * 255.f), \ - static_cast(z * 255.f), static_cast(w * 255.f)); \ - } -- --#define ImTextureID unsigned int diff --git a/ports/imgui-sfml/portfile.cmake b/ports/imgui-sfml/portfile.cmake index be89c847ca3d9f..290278406ca94b 100644 --- a/ports/imgui-sfml/portfile.cmake +++ b/ports/imgui-sfml/portfile.cmake @@ -3,12 +3,11 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO eliasdaler/imgui-sfml - REF 82dc2033e51b8323857c3ae1cf1f458b3a933c35 #v2.3 - SHA512 f27a0e65aa20229c73b27c4232269908dfeb5d78b1cef7299a179ecac6194d9829e148e95ed54b4500ffd36ada09fdbfadf67588c78bee87aff446ae80347bcf + REF 9cc8c57a4565551087be0d9aeb3ae55490aa1207 #v2.4 + SHA512 d44d85e44d17d05c4e21f71acbf5bf544364a9bbe4871be896edd29f9926948cd1ea7627b7d54524f7da64c494638fc126744ced57ea7997a4b712dd26eb6183 HEAD_REF master PATCHES 0001-fix_find_package.patch - 0002-fix_imgui_config.patch 004-fix-find-sfml.patch ) diff --git a/ports/imgui-sfml/vcpkg.json b/ports/imgui-sfml/vcpkg.json index 807fdd125c005d..5fb0c04043560b 100644 --- a/ports/imgui-sfml/vcpkg.json +++ b/ports/imgui-sfml/vcpkg.json @@ -1,6 +1,6 @@ { "name": "imgui-sfml", - "version": "2.3", + "version": "2.4", "description": "ImGui binding for use with SFML", "homepage": "https://github.com/eliasdaler/imgui-sfml", "dependencies": [ From 1878ce4b2191f5e41f89c7790b74eb281a1bef0f Mon Sep 17 00:00:00 2001 From: Jonliu1993 <13720414433@163.com> Date: Tue, 16 Nov 2021 18:44:44 +0800 Subject: [PATCH 2/2] update version --- versions/baseline.json | 2 +- versions/i-/imgui-sfml.json | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/versions/baseline.json b/versions/baseline.json index 7ef8e9240129c4..7e6fff0599946d 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2829,7 +2829,7 @@ "port-version": 0 }, "imgui-sfml": { - "baseline": "2.3", + "baseline": "2.4", "port-version": 0 }, "imguizmo": { diff --git a/versions/i-/imgui-sfml.json b/versions/i-/imgui-sfml.json index f801f774d0b7ea..22476de960bc8e 100644 --- a/versions/i-/imgui-sfml.json +++ b/versions/i-/imgui-sfml.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c81a9d0362c06279990e889cb56f9ebf71bde380", + "version": "2.4", + "port-version": 0 + }, { "git-tree": "2ece5bd925368d6ef9b7295b31f7f2de86179f4e", "version": "2.3",