[ogre-next] Fixup 2.3.3 (#35344)

ports/glslang/portfile.cmake

@@ -40,11 +40,16 @@ vcpkg_cmake_configure(
 
 vcpkg_cmake_install()
 vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/glslang DO_NOT_DELETE_PARENT_CONFIG_PATH)
-vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake)
 vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/${PORT}/glslang-config.cmake"
-    "${PACKAGE_PREFIX_DIR}/lib/cmake/glslang/glslang-targets.cmake"
-    "${PACKAGE_PREFIX_DIR}/share/${PORT}/glslang-targets.cmake"
+    [[${PACKAGE_PREFIX_DIR}/lib/cmake/glslang/glslang-targets.cmake]]
+    [[${CMAKE_CURRENT_LIST_DIR}/glslang-targets.cmake]]
 )
+file(REMOVE_RECURSE CONFIG_PATH "${CURRENT_PACKAGES_DIR}/lib/cmake" "${CURRENT_PACKAGES_DIR}/debug/lib/cmake")
+
+if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
+    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/glslang/Public/ShaderLang.h" "ifdef GLSLANG_IS_SHARED_LIBRARY" "if 1")
+    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/glslang/Include/glslang_c_interface.h" "ifdef GLSLANG_IS_SHARED_LIBRARY" "if 1")
+endif()
 
 vcpkg_copy_pdbs()
 

ports/glslang/vcpkg.json

@@ -1,6 +1,7 @@
 {
   "name": "glslang",
   "version": "13.1.1",
+  "port-version": 1,
   "description": "Khronos-reference front end for GLSL/ESSL, partial front end for HLSL, and a SPIR-V generator.",
   "homepage": "https://github.com/KhronosGroup/glslang",
   "license": "Apache-2.0 AND BSD-3-Clause AND MIT AND GPL-3.0-or-later",

ports/ogre-next/fix-dependencies.patch

@@ -1,7 +1,37 @@
+diff --git a/CMake/CMakeLists.txt b/CMake/CMakeLists.txt
+index cdb097a..967d33b 100644
+--- a/CMake/CMakeLists.txt
++++ b/CMake/CMakeLists.txt
+@@ -21,9 +21,7 @@ endif()
+ set(OGRE_CMAKE_DIR "share/ogre-next")
+
+ set(INST_FILES
+-  Packages/FindRapidjson.cmake
+   Packages/FindRemotery.cmake
+-  Packages/FindSDL2.cmake
+   Packages/FindOGRE.cmake
+   Utils/FindPkgMacros.cmake
+   Utils/MacroLogFeature.cmake
+@@ -45,12 +43,8 @@ endif ()
+
+ set(STATIC_INST_FILES
+   Packages/FindDirectX.cmake
+-  Packages/FindFreeImage.cmake
+-  Packages/FindFreetype.cmake
+   Packages/FindOpenGLES.cmake
+   Packages/FindOpenGLES2.cmake
+-  Packages/FindZLIB.cmake
+-  Packages/FindZZip.cmake
+   Packages/FindSoftimage.cmake
+ )
+ if (WIN32)
 diff --git a/CMake/Dependencies.cmake b/CMake/Dependencies.cmake
+index 74cb0f4..2cad26a 100644
 --- a/CMake/Dependencies.cmake
 +++ b/CMake/Dependencies.cmake
-@@ -76,17 +76,20 @@
+@@ -74,21 +74,24 @@ set(CMAKE_FRAMEWORK_PATH ${OGRE_DEP_SEARCH_PATH} ${CMAKE_FRAMEWORK_PATH})
+ #######################################################################
+
  # Find zlib
 -find_package(ZLIB)
 +find_package(ZLIB REQUIRED)
@@ -26,81 +56,14 @@ diff --git a/CMake/Dependencies.cmake b/CMake/Dependencies.cmake
 +find_package(FREETYPE NAMES freetype REQUIRED)
 +set(FREETYPE_LIBRARIES freetype)
  macro_log_feature(FREETYPE_FOUND "freetype" "Portable font engine" "http://www.freetype.org" FALSE "" "")
-@@ -107,3 +111,3 @@
+
+ find_package(Vulkan)
+@@ -105,7 +108,7 @@ if (UNIX AND NOT APPLE AND NOT ANDROID AND NOT EMSCRIPTEN)
+ endif ()
+
  # Find rapidjson
 -find_package(Rapidjson)
 +find_package(Rapidjson NAMES RapidJSON CONFIG REQUIRED)
  macro_log_feature(Rapidjson_FOUND "rapidjson" "C++ JSON parser" "https://rapidjson.org/" FALSE "" "")
-@@ -257,3 +261,3 @@
- # ThreadingBuildingBlocks
--find_package(TBB)
-+find_package(TBB CONFIG REQUIRED)
- macro_log_feature(TBB_FOUND "tbb" "Threading Building Blocks" "http://www.threadingbuildingblocks.org/" FALSE "" "")
-@@ -279,5 +283,5 @@
- # Find sdl2
--find_package(SDL2)
-+find_package(SDL2 CONFIG REQUIRED)
- macro_log_feature(SDL2_FOUND "SDL2" "Simple DirectMedia Library" "https://www.libsdl.org/" FALSE "" "")
-
- #######################################################################
-diff --git a/CMake/CMakeLists.txt b/CMake/CMakeLists.txt
---- a/CMake/CMakeLists.txt
-+++ b/CMake/CMakeLists.txt
-@@ -21,9 +21,7 @@
-
- set(INST_FILES
--  Packages/FindRapidjson.cmake
-   Packages/FindRemotery.cmake
--  Packages/FindSDL2.cmake
-   Packages/FindOGRE.cmake
-   Utils/FindPkgMacros.cmake
-   Utils/MacroLogFeature.cmake
-   Utils/PreprocessorUtils.cmake
-@@ -37,18 +35,12 @@
- if (OGRE_CONFIG_THREAD_PROVIDER STREQUAL "poco")
-   set(INST_FILES ${INST_FILES} Packages/FindPOCO.cmake)
- endif ()
 
--if (OGRE_CONFIG_THREAD_PROVIDER STREQUAL "tbb")
--  set(INST_FILES ${INST_FILES} Packages/FindTBB.cmake)
--endif ()
-
-+
- set(STATIC_INST_FILES
-   Packages/FindDirectX.cmake
--  Packages/FindFreeImage.cmake
--  Packages/FindFreetype.cmake
-   Packages/FindOpenGLES.cmake
-   Packages/FindOpenGLES2.cmake
--  Packages/FindZLIB.cmake
--  Packages/FindZZip.cmake
-   Packages/FindSoftimage.cmake
- )
-diff --git a/CMake/Packages/FindZLIB.cmake b/CMake/Packages/FindZLIB_NOTUSE.cmake
-similarity index 100%
-rename from CMake/Packages/FindZLIB.cmake
-rename to CMake/Packages/FindZLIB_NOTUSE.cmake
-diff --git a/CMake/Packages/FindZZip.cmake b/CMake/Packages/FindZZip_NOTUSE.cmake
-similarity index 100%
-rename from CMake/Packages/FindZZip.cmake
-rename to CMake/Packages/FindZZip_NOTUSE.cmake
-diff --git a/CMake/Packages/FindFreeImage.cmake b/CMake/Packages/FindFreeImage_NOTUSE.cmake
-similarity index 100%
-rename from CMake/Packages/FindFreeImage.cmake
-rename to CMake/Packages/FindFreeImage_NOTUSE.cmake
-diff --git a/CMake/Packages/FindFreetype.cmake b/CMake/Packages/FindFreetype_NOTUSE.cmake
-similarity index 100%
-rename from CMake/Packages/FindFreetype.cmake
-rename to CMake/Packages/FindFreetype_NOTUSE.cmake
-diff --git a/CMake/Packages/FindSDL2.cmake b/CMake/Packages/FindSDL2_NOTUSE.cmake
-similarity index 100%
-rename from CMake/Packages/FindSDL2.cmake
-rename to CMake/Packages/FindSDL2_NOTUSE.cmake
-diff --git a/CMake/Packages/FindTBB.cmake b/CMake/Packages/FindTBB_NOTUSE.cmake
-similarity index 100%
-rename from CMake/Packages/FindTBB.cmake
-rename to CMake/Packages/FindTBB_NOTUSE.cmake
-diff --git a/CMake/Packages/FindRapidjson.cmake b/CMake/Packages/FindRapidjson_NOTUSE.cmake
-similarity index 100%
-rename from CMake/Packages/FindRapidjson.cmake
-rename to CMake/Packages/FindRapidjson_NOTUSE.cmake
+ find_package(RenderDoc)