[ogre] Fix usage of ogre[core] (#34301)

* [ogre] Fix usage of ogre[core]

* version

ports/ogre/portfile.cmake

@@ -10,8 +10,6 @@ if(VCPKG_TARGET_IS_ANDROID OR VCPKG_TARGET_IS_IOS OR VCPKG_TARGET_IS_EMSCRIPTEN)
     vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 endif()
 
-set(PATCHLIB fix-dependencies.patch cfg-rel-paths.patch swig-python-polyfill.patch pkgconfig.patch same-install-rules-all-platforms.patch)
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO OGRECave/ogre
@@ -19,7 +17,11 @@ vcpkg_from_github(
     SHA512 adadf0ce8510515c7519b87b502090c4a8d6694af0850ebd4a030d2dda497978eeb811746c74aa0cd1dc41adc0bf5f04fe38d02eb4ff03a56999c6635efe1e0e
     HEAD_REF master
     PATCHES
-        ${PATCHLIB}       
+        fix-dependencies.patch
+        cfg-rel-paths.patch
+        swig-python-polyfill.patch
+        pkgconfig.patch
+        same-install-rules-all-platforms.patch
 )
 
 file(REMOVE "${SOURCE_PATH}/CMake/Packages/FindOpenEXR.cmake")
@@ -28,26 +30,29 @@ string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" OGRE_STATIC)
 string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" OGRE_CONFIG_STATIC_LINK_CRT)
 
 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
-  FEATURES
-    assimp   OGRE_BUILD_PLUGIN_ASSIMP
-    assimp   CMAKE_REQUIRE_FIND_PACKAGE_assimp
-    bullet   OGRE_BUILD_COMPONENT_BULLET
-    bullet   CMAKE_REQUIRE_FIND_PACKAGE_Bullet
-    d3d9     OGRE_BUILD_RENDERSYSTEM_D3D9
-    freeimage OGRE_BUILD_PLUGIN_FREEIMAGE
-    freeimage CMAKE_REQUIRE_FIND_PACKAGE_FreeImage
-    java     OGRE_BUILD_COMPONENT_JAVA
-    openexr  OGRE_BUILD_PLUGIN_EXRCODEC
-    openexr  CMAKE_REQUIRE_FIND_PACKAGE_OpenEXR
-    python   OGRE_BUILD_COMPONENT_PYTHON
-    python   CMAKE_REQUIRE_FIND_PACKAGE_Python3
-    csharp   OGRE_BUILD_COMPONENT_CSHARP
-    overlay  OGRE_BUILD_COMPONENT_OVERLAY
-    overlay  CMAKE_REQUIRE_FIND_PACKAGE_FREETYPE
-    zip      OGRE_CONFIG_ENABLE_ZIP
-    strict   OGRE_RESOURCEMANAGER_STRICT
-    tools    OGRE_BUILD_TOOLS
-    tools    OGRE_INSTALL_TOOLS
+    FEATURES
+        assimp   OGRE_BUILD_PLUGIN_ASSIMP
+        assimp   CMAKE_REQUIRE_FIND_PACKAGE_assimp
+        bullet   OGRE_BUILD_COMPONENT_BULLET
+        bullet   CMAKE_REQUIRE_FIND_PACKAGE_Bullet
+        d3d9     OGRE_BUILD_RENDERSYSTEM_D3D9
+        freeimage OGRE_BUILD_PLUGIN_FREEIMAGE
+        freeimage CMAKE_REQUIRE_FIND_PACKAGE_FreeImage
+        java     OGRE_BUILD_COMPONENT_JAVA
+        openexr  OGRE_BUILD_PLUGIN_EXRCODEC
+        openexr  CMAKE_REQUIRE_FIND_PACKAGE_OpenEXR
+        python   OGRE_BUILD_COMPONENT_PYTHON
+        python   CMAKE_REQUIRE_FIND_PACKAGE_Python3
+        csharp   OGRE_BUILD_COMPONENT_CSHARP
+        overlay  OGRE_BUILD_COMPONENT_OVERLAY
+        zip      OGRE_CONFIG_ENABLE_ZIP
+        strict   OGRE_RESOURCEMANAGER_STRICT
+        tools    OGRE_BUILD_TOOLS
+        tools    OGRE_INSTALL_TOOLS
+    INVERTED_FEATURES
+        assimp   CMAKE_DISABLE_FIND_PACKAGE_assimp
+        bullet   CMAKE_DISABLE_FIND_PACKAGE_Bullet
+        python   CMAKE_DISABLE_FIND_PACKAGE_Python3
 )
 
 if("java" IN_LIST FEATURES OR "python" IN_LIST FEATURES OR "csharp" IN_LIST FEATURES)
@@ -92,6 +97,8 @@ vcpkg_cmake_configure(
         -DOGRE_BUILD_RENDERSYSTEM_GL3PLUS=ON
         -DOGRE_BUILD_RENDERSYSTEM_GLES=OFF
         -DOGRE_BUILD_RENDERSYSTEM_GLES2=OFF
+        -DCMAKE_REQUIRE_FIND_PACKAGE_FREETYPE=ON
+        -DCMAKE_REQUIRE_FIND_PACKAGE_pugixml=ON
         -DCMAKE_REQUIRE_FIND_PACKAGE_ZLIB=ON
         -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON
         -DCMAKE_DISABLE_FIND_PACKAGE_QT=ON

ports/ogre/vcpkg.json

@@ -1,12 +1,16 @@
 {
   "name": "ogre",
   "version": "14.0.1",
-  "port-version": 1,
+  "port-version": 2,
   "description": "3D Object-Oriented Graphics Rendering Engine",
   "homepage": "https://github.com/OGRECave/ogre",
   "license": "MIT",
   "supports": "!uwp",
   "dependencies": [
+    {
+      "name": "freetype",
+      "default-features": false
+    },
     "pugixml",
     {
       "name": "sdl2",
@@ -72,10 +76,6 @@
     "overlay": {
       "description": "Build overlay component",
       "dependencies": [
-        {
-          "name": "freetype",
-          "default-features": false
-        },
         {
           "name": "imgui",
           "features": [

versions/baseline.json

@@ -6018,7 +6018,7 @@
     },
     "ogre": {
       "baseline": "14.0.1",
-      "port-version": 1
+      "port-version": 2
     },
     "ogre-next": {
       "baseline": "2.3.1",

versions/o-/ogre.json

@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "a445b3c7be57d018422e139945ff622292cd5cff",
+      "version": "14.0.1",
+      "port-version": 2
+    },
     {
       "git-tree": "ba65238d3998c84df40961d63f7c254fbac7639d",
       "version": "14.0.1",