[ogre] Feature/dependency control fixes (#27239)

* Add bullet feature control * Disable Qt * Update versions * Remove obsolete qt patch junk * Update versions
microsoft · Oct 17, 2022 · a53829c · a53829c
1 parent 3bf9bee
commit a53829c
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 9 deletions.
diff --git a/ports/ogre/fix-dependencies.patch b/ports/ogre/fix-dependencies.patch
@@ -76,14 +76,6 @@ index b0c5ba3..27d7bd2 100644
    macro_log_feature(SDL2_FOUND "SDL2" "Simple DirectMedia Library needed for input handling in samples" "https://www.libsdl.org/")
    if(SDL2_FOUND AND NOT TARGET SDL2::SDL2)
      add_library(SDL2::SDL2 INTERFACE IMPORTED)
-@@ -315,6 +324,7 @@ if(NOT ANDROID AND NOT EMSCRIPTEN)
-   find_package(QT NAMES Qt6 Qt5 COMPONENTS Core Gui QUIET CONFIG)
-   find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Core Gui QUIET CONFIG)
-
-+  set(QT_FOUND FALSE)
-   macro_log_feature(QT_FOUND "Qt" "optional integration with the Qt Library for window creation and input" "http://www.qt.io/")
- endif()
-
 diff --git a/CMake/Templates/OGREConfig.cmake.in b/CMake/Templates/OGREConfig.cmake.in
 index 2047f66..a5c7cd0 100644
 --- a/CMake/Templates/OGREConfig.cmake.in

diff --git a/ports/ogre/portfile.cmake b/ports/ogre/portfile.cmake
@@ -32,6 +32,8 @@ 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
@@ -92,6 +94,8 @@ vcpkg_cmake_configure(
         -DOGRE_BUILD_RENDERSYSTEM_GLES2=OFF
         -DCMAKE_REQUIRE_FIND_PACKAGE_ZLIB=ON
         -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON
+        -DCMAKE_DISABLE_FIND_PACKAGE_Qt5=ON
+        -DCMAKE_DISABLE_FIND_PACKAGE_Qt6=ON
     OPTIONS_DEBUG
         -DOGRE_BUILD_TOOLS=OFF
         -DOGRE_INSTALL_TOOLS=OFF

diff --git a/ports/ogre/vcpkg.json b/ports/ogre/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "ogre",
   "version": "13.4.4",
+  "port-version": 1,
   "description": "3D Object-Oriented Graphics Rendering Engine",
   "homepage": "https://github.com/OGRECave/ogre",
   "license": "MIT",
@@ -34,6 +35,12 @@
         "assimp"
       ]
     },
+    "bullet": {
+      "description": "Build with bullet physics support",
+      "dependencies": [
+        "bullet3"
+      ]
+    },
     "csharp": {
       "description": "Build csharp bindings",
       "supports": "!static & !android & !ios & !emscripten"

diff --git a/versions/baseline.json b/versions/baseline.json
@@ -5302,7 +5302,7 @@
     },
     "ogre": {
       "baseline": "13.4.4",
-      "port-version": 0
+      "port-version": 1
     },
     "ogre-next": {
       "baseline": "2.3.1",

diff --git a/versions/o-/ogre.json b/versions/o-/ogre.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "065b62dee8ef6dd907c606decc1afe0953c4ad15",
+      "version": "13.4.4",
+      "port-version": 1
+    },
     {
       "git-tree": "558eff8cc61b6d9a5638bf10e6e4ade7ad178ee7",
       "version": "13.4.4",