diff --git a/.github/ci_vcpkg_package_tests/run_ci_vcpkg_package_tests.py b/.github/ci_vcpkg_package_tests/run_ci_vcpkg_package_tests.py index 6692e763..9a81a95b 100644 --- a/.github/ci_vcpkg_package_tests/run_ci_vcpkg_package_tests.py +++ b/.github/ci_vcpkg_package_tests/run_ci_vcpkg_package_tests.py @@ -78,9 +78,9 @@ def run_test_with_rendering_backend(rendering_backend: str) -> bool: } # Only run app with selected platform backends - is_vulkan = rendering_backend == "vulkan-binding" + is_vulkan = rendering_backend == "experimental-vulkan-binding" is_macos = platform.system() == "Darwin" - is_dx12_on_windows = rendering_backend == "dx12-binding" and platform.system() == "Windows" + is_dx12_on_windows = rendering_backend == "experimental-dx12-binding" and platform.system() == "Windows" if not (is_vulkan or is_macos): cmds[f"run test app (Glfw - {rendering_backend})"] = test_app_glfw_cmd if not is_dx12_on_windows: @@ -148,7 +148,7 @@ def run_tests(): prepare_display() rendering_backends = ["opengl3-binding"] if platform.system() != "Darwin": - rendering_backends.append("vulkan-binding") + rendering_backends.append("experimental-vulkan-binding") """ Note: CI hangs on this step under macOS (spirv-tools) -- @@ -163,8 +163,8 @@ def run_tests(): -- Building x64-osx-dbg """ if platform.system() == "Windows": - rendering_backends.append("dx11-binding") - rendering_backends.append("dx12-binding") + rendering_backends.append("experimental-dx11-binding") + rendering_backends.append("experimental-dx12-binding") elif platform.system() == "Darwin": rendering_backends.append("metal-binding") diff --git a/hello_imgui_cmake/overlay_vcpkg/hello-imgui/portfile.cmake b/hello_imgui_cmake/overlay_vcpkg/hello-imgui/portfile.cmake index 4a5a6fe6..8f1d4a24 100644 --- a/hello_imgui_cmake/overlay_vcpkg/hello-imgui/portfile.cmake +++ b/hello_imgui_cmake/overlay_vcpkg/hello-imgui/portfile.cmake @@ -8,8 +8,8 @@ if(production_mode) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO pthom/hello_imgui - REF v1.3.0 - SHA512 b601828303515a7385d9bbe9e959e0c62f1efa32a99d7e28b1213bbf0e90d51a9d6f8dc5fdda2f077a9fe3ffe9f8f7b9917385848f57c9ec641c3af7432bd03d + REF 0c9254b1d78c33617ce47090ec62bda8ca564450 + SHA512 9b02754a5ff1459b3751ddf5bb477f661016be2f6902bbecf29207d2b62e78b43a5ce801e1d322219747b6087a3931d339a3715697dd042765939927ac7a66b6 HEAD_REF master ) else() @@ -28,9 +28,9 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES "opengl3-binding" FEATURE_OPENGL3_BINDING "metal-binding" FEATURE_METAL_BINDING - "vulkan-binding" FEATURE_VULKAN_BINDING - "dx11-binding" FEATURE_DX11_BINDING - "dx12-binding" FEATURE_DX12_BINDING + "experimental-vulkan-binding" FEATURE_VULKAN_BINDING + "experimental-dx11-binding" FEATURE_DX11_BINDING + "experimental-dx12-binding" FEATURE_DX12_BINDING "glfw-binding" FEATURE_GLFW_BINDING "sdl2-binding" FEATURE_SDL2_BINDING "freetype-lunasvg" FEATURE_FREETYPE_LUNASVG diff --git a/hello_imgui_cmake/overlay_vcpkg/hello-imgui/vcpkg.json b/hello_imgui_cmake/overlay_vcpkg/hello-imgui/vcpkg.json index 11a1d689..7ff3fdab 100644 --- a/hello_imgui_cmake/overlay_vcpkg/hello-imgui/vcpkg.json +++ b/hello_imgui_cmake/overlay_vcpkg/hello-imgui/vcpkg.json @@ -1,121 +1,127 @@ { "name": "hello-imgui", "version": "1.4.0", - "homepage": "https://pthom.github.io/hello_imgui/", + "port-version": 1, "description": "Hello, Dear ImGui: unleash your creativity in app development and prototyping", + "homepage": "https://pthom.github.io/hello_imgui/", "license": "MIT", "dependencies": [ { - "name": "vcpkg-cmake", - "host": true - }, - { - "name" : "vcpkg-cmake-config", - "host" : true + "name": "imgui", + "features": [ + "docking-experimental" + ] }, + "stb", { - "name": "imgui", - "features": ["docking-experimental"] + "name": "vcpkg-cmake", + "host": true }, { - "name": "stb" + "name": "vcpkg-cmake-config", + "host": true } ], - - "default-features": ["opengl3-binding", "glfw-binding", "freetype-lunasvg"], - + "default-features": [ + "freetype-lunasvg", + "glfw-binding", + "opengl3-binding" + ], "features": { - "opengl3-binding": - { - "description": "Use OpenGL3/ES2 renderer backend (default)", + "experimental-dx11-binding": { + "description": "Use DirectX11 renderer backend (Windows only, experimental)", "dependencies": [ { "name": "imgui", - "features": ["opengl3-binding"] - }, - { - "name": "glad", - "features": ["gl-api-43"] + "features": [ + "dx11-binding" + ] } ] }, - - "metal-binding": - { - "description": "Use Metal renderer backend (macOS/iOS only)", + "experimental-dx12-binding": { + "description": "Use DirectX12 renderer backend (Windows only, experimental)", "dependencies": [ { "name": "imgui", - "features": ["metal-binding"] + "features": [ + "dx12-binding" + ] } ] }, - - "vulkan-binding": - { + "experimental-vulkan-binding": { "description": "Use Vulkan renderer backend (Windows/Linux/macOS, experimental)", "dependencies": [ { "name": "imgui", - "features": ["vulkan-binding"] + "features": [ + "vulkan-binding" + ] } ] }, - - "dx11-binding": - { - "description": "Use DirectX11 renderer backend (Windows only, experimental)", + "freetype-lunasvg": { + "description": "Improve font rendering and use colored fonts with freetype and lunasvg", "dependencies": [ { "name": "imgui", - "features": ["dx11-binding"] + "features": [ + "freetype", + "freetype-lunasvg" + ] } ] }, - - "dx12-binding": - { - "description": "Use DirectX12 renderer backend (Windows only, experimental)", + "glfw-binding": { + "description": "Use GLFW platform backend (default)", "dependencies": [ { "name": "imgui", - "features": ["dx12-binding"] + "features": [ + "glfw-binding" + ] } ] }, - - "glfw-binding": - { - "description": "Use GLFW platform backend (default)", + "metal-binding": { + "description": "Use Metal renderer backend (macOS/iOS only)", "dependencies": [ { "name": "imgui", - "features": ["glfw-binding"] + "features": [ + "metal-binding" + ] } ] }, - - "sdl2-binding": - { - "description": "Use SDL2 platform backend", + "opengl3-binding": { + "description": "Use OpenGL3/ES2 renderer backend (default)", "dependencies": [ + { + "name": "glad", + "features": [ + "gl-api-43" + ] + }, { "name": "imgui", - "features": ["sdl2-binding"] + "features": [ + "opengl3-binding" + ] } ] }, - - "freetype-lunasvg": - { - "description": "Improve font rendering and use colored fonts with freetype and lunasvg", + "sdl2-binding": { + "description": "Use SDL2 platform backend", "dependencies": [ { "name": "imgui", - "features": ["freetype", "freetype-lunasvg"] + "features": [ + "sdl2-binding" + ] } ] } - } }