From 536c08d6170ea2e26e16501e79f7585ba34b57d0 Mon Sep 17 00:00:00 2001
From: FrankXie <v-frankxie@microsoft.com>
Date: Sun, 26 Jan 2025 06:17:55 +0000
Subject: [PATCH] [llgi] Fix dependencies usage

---
 ports/llgi/fix-cmake-use-vcpkg.patch | 72 +++++++++++-----------------
 ports/llgi/vcpkg.json                |  1 +
 2 files changed, 30 insertions(+), 43 deletions(-)

diff --git a/ports/llgi/fix-cmake-use-vcpkg.patch b/ports/llgi/fix-cmake-use-vcpkg.patch
index d5205d41c1b232..0deaba52a9c40b 100644
--- a/ports/llgi/fix-cmake-use-vcpkg.patch
+++ b/ports/llgi/fix-cmake-use-vcpkg.patch
@@ -1,49 +1,35 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 30cb2da..dbc051b 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -232,8 +232,13 @@ if(BUILD_VULKAN_COMPILER OR BUILD_TOOL)
-       spirv-cross-util)
- 
-   else()
--    list(APPEND LLGI_THIRDPARTY_INCLUDES ${GLSLANG_INCLUDE_DIR}
--         ${SPIRVCROSS_INCLUDE_DIR})
-+    # from vcpkg
-+    find_package(glslang CONFIG REQUIRED)
-+    find_package(spirv_cross_core CONFIG REQUIRED)
-+    find_package(spirv_cross_glsl CONFIG REQUIRED)
-+    find_package(spirv_cross_hlsl CONFIG REQUIRED)
-+    find_package(spirv_cross_msl CONFIG REQUIRED)
-+    find_package(spirv_cross_cpp CONFIG REQUIRED)
- 
-   endif()
- 
-diff --git a/tools/ShaderTranspilerCore/CMakeLists.txt b/tools/ShaderTranspilerCore/CMakeLists.txt
-index 4ce40d4..d4950ce 100644
---- a/tools/ShaderTranspilerCore/CMakeLists.txt
-+++ b/tools/ShaderTranspilerCore/CMakeLists.txt
-@@ -24,6 +24,10 @@ else()
- 
- endif()
- 
-+target_link_libraries(ShaderTranspilerCore PUBLIC
-+  glslang::glslang glslang::SPIRV glslang::OSDependent glslang::MachineIndependent glslang::GenericCodeGen glslang::glslang-default-resource-limits glslang::OGLCompiler glslang::SPVRemapper glslang::HLSL
-+  spirv-cross-cpp spirv-cross-glsl spirv-cross-msl spirv-cross-hlsl
-+)
- if(USE_THIRDPARTY_DIRECTORY)
-   add_dependencies(ShaderTranspilerCore EP_glslang EP_SPIRV-Cross)
- endif()
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index dbc051b..b898b4c 100644
+index 5fd2ce0..976b845 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -27,9 +27,6 @@ option(SPIRVCROSS_WITHOUT_INSTALL "Compile with spirv-cross without install"
-        OFF)
- option(USE_CREATE_COMPILER_FUNCTION "Whether LLGI::CreateCompiler is used." ON)
+@@ -234,8 +234,13 @@ if(BUILD_VULKAN_COMPILER OR BUILD_TOOL)
+       spirv-cross-util)
  
--if(LINUX)
--  set(BUILD_VULKAN TRUE)
--endif()
+   else()
+-    list(APPEND LLGI_THIRDPARTY_INCLUDES ${GLSLANG_INCLUDE_DIR}
+-         ${SPIRVCROSS_INCLUDE_DIR})
++    # from vcpkg
++    find_package(glslang CONFIG REQUIRED)
++    find_package(spirv_cross_core CONFIG REQUIRED)
++    find_package(spirv_cross_glsl CONFIG REQUIRED)
++    find_package(spirv_cross_hlsl CONFIG REQUIRED)
++    find_package(spirv_cross_msl CONFIG REQUIRED)
++    find_package(spirv_cross_cpp CONFIG REQUIRED)
  
- option(USE_MSVC_RUNTIME_LIBRARY_DLL "compile as multithreaded DLL" ON)
+   endif()
  
+diff --git a/tools/ShaderTranspilerCore/CMakeLists.txt b/tools/ShaderTranspilerCore/CMakeLists.txt
+index bf34437..09e428d 100644
+--- a/tools/ShaderTranspilerCore/CMakeLists.txt
++++ b/tools/ShaderTranspilerCore/CMakeLists.txt
+@@ -24,6 +24,10 @@ else()
+ 
+ endif()
+ 
++target_link_libraries(ShaderTranspilerCore PUBLIC
++  glslang::glslang glslang::glslang-default-resource-limits glslang::SPIRV glslang::SPVRemapper spirv-cross-cpp spirv-cross-glsl spirv-cross-msl spirv-cross-hlsl
++)
++
+ if(USE_THIRDPARTY_DIRECTORY)
+   add_dependencies(ShaderTranspilerCore EP_glslang EP_SPIRV-Cross)
+ endif()
diff --git a/ports/llgi/vcpkg.json b/ports/llgi/vcpkg.json
index 8bc8e525bc723e..e4d5bb8da479c1 100644
--- a/ports/llgi/vcpkg.json
+++ b/ports/llgi/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "llgi",
   "version-date": "2023-12-19",
+  "port-version": 1,
   "homepage": "https://github.com/altseed/LLGI",
   "license": null,
   "supports": "!(uwp | android)",