diff --git a/ports/ogre/cmake4.patch b/ports/ogre/cmake4.patch index 993f9a422f..490af6c57f 100644 --- a/ports/ogre/cmake4.patch +++ b/ports/ogre/cmake4.patch @@ -16,7 +16,7 @@ index 15edbe3917..206d532ddb 100644 endif() @@ -65,6 +60,13 @@ endif () - project(OGRE VERSION 14.3.2) + project(OGRE VERSION 14.5.0) +if (APPLE AND NOT ANDROID AND NOT EMSCRIPTEN AND NOT ANDROID_PLATFORM) + if(${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.16.0") diff --git a/ports/ogre/fix-dependencies.patch b/ports/ogre/fix-dependencies.patch index a90a652fb3..b4576ec91c 100644 --- a/ports/ogre/fix-dependencies.patch +++ b/ports/ogre/fix-dependencies.patch @@ -146,7 +146,7 @@ index 41bd634..87f1406 100644 if(OGRE_BUILD_COMPONENT_OVERLAY_IMGUI) + find_package(imgui CONFIG REQUIRED) +elseif(0) - set(IMGUI_DIR "${PROJECT_BINARY_DIR}/imgui-1.91.2" CACHE PATH "") + set(IMGUI_DIR "${PROJECT_BINARY_DIR}/imgui-1.91.9b" CACHE PATH "") if(NOT EXISTS ${IMGUI_DIR}) message(STATUS "Downloading imgui") @@ -63,6 +65,8 @@ elseif(UNIX) diff --git a/ports/ogre/portfile.cmake b/ports/ogre/portfile.cmake index 41830bd5c2..41c0bc0c74 100644 --- a/ports/ogre/portfile.cmake +++ b/ports/ogre/portfile.cmake @@ -14,7 +14,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO OGRECave/ogre REF "v${VERSION}" - SHA512 637dfa427c2094688fda850a46746734dafb29eaee4d28c7f294db9ccfc2b53eb05f4d34460926807658db3c8cb614b7669d3fb190e7c8a9ee9bd1d68adf0a64 + SHA512 25ccda2278bd6a82d84fbad183e04efc33b42b43cf18e05fdfd6a3579f90673e11f5ae474e497f8ddffd54a5c58931abb1cb34dac607e85548909d4defe8a59a HEAD_REF master PATCHES fix-dependencies.patch diff --git a/ports/ogre/vcpkg.json b/ports/ogre/vcpkg.json index 69badf4213..ce79c9c847 100644 --- a/ports/ogre/vcpkg.json +++ b/ports/ogre/vcpkg.json @@ -1,7 +1,6 @@ { "name": "ogre", - "version": "14.3.2", - "port-version": 1, + "version": "14.5.0", "description": "3D Object-Oriented Graphics Rendering Engine", "homepage": "https://github.com/OGRECave/ogre", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index 31bd14cd84..2d842f23fd 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7077,8 +7077,8 @@ "port-version": 3 }, "ogre": { - "baseline": "14.3.2", - "port-version": 1 + "baseline": "14.5.0", + "port-version": 0 }, "ogre-next": { "baseline": "2.3.3", diff --git a/versions/o-/ogre.json b/versions/o-/ogre.json index fabe89fd81..b44dd86d54 100644 --- a/versions/o-/ogre.json +++ b/versions/o-/ogre.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "71dfe3a5c10e8a6751770c22f7f34388c948a7d6", + "version": "14.5.0", + "port-version": 0 + }, { "git-tree": "02f0e1642a29a2b9ba7f6b5373408dfe867528f4", "version": "14.3.2",