From 1bbcffd4d516809c5b1700bf319037601897da14 Mon Sep 17 00:00:00 2001
From: autoantwort <41973254+autoantwort@users.noreply.github.com>
Date: Sat, 22 Apr 2023 00:47:17 +0200
Subject: [PATCH] [ogre] fix feature tools on osx (#31000)

---
 ports/ogre/portfile.cmake                         |  1 +
 ports/ogre/same-install-rules-all-platforms.patch | 14 ++++++++++++++
 ports/ogre/vcpkg.json                             |  1 +
 versions/baseline.json                            |  2 +-
 versions/o-/ogre.json                             |  5 +++++
 5 files changed, 22 insertions(+), 1 deletion(-)
 create mode 100644 ports/ogre/same-install-rules-all-platforms.patch

diff --git a/ports/ogre/portfile.cmake b/ports/ogre/portfile.cmake
index ffd6c9057c..19188d1a20 100644
--- a/ports/ogre/portfile.cmake
+++ b/ports/ogre/portfile.cmake
@@ -21,6 +21,7 @@ vcpkg_from_github(
         cfg-rel-paths.patch
         swig-python-polyfill.patch
         pkgconfig.patch
+        same-install-rules-all-platforms.patch
 )
 
 file(REMOVE "${SOURCE_PATH}/CMake/Packages/FindOpenEXR.cmake")
diff --git a/ports/ogre/same-install-rules-all-platforms.patch b/ports/ogre/same-install-rules-all-platforms.patch
new file mode 100644
index 0000000000..06f72bad73
--- /dev/null
+++ b/ports/ogre/same-install-rules-all-platforms.patch
@@ -0,0 +1,14 @@
+diff --git a/CMake/Utils/OgreConfigTargets.cmake b/CMake/Utils/OgreConfigTargets.cmake
+index c4e6de8..e92da59 100644
+--- a/CMake/Utils/OgreConfigTargets.cmake
++++ b/CMake/Utils/OgreConfigTargets.cmake
+@@ -56,9 +56,6 @@ elseif (UNIX)
+   set(OGRE_LIB_RELEASE_PATH "")
+   set(OGRE_LIB_RELWDBG_PATH "")
+   set(OGRE_LIB_DEBUG_PATH "")
+-  if(APPLE AND NOT APPLE_IOS)
+-    set(OGRE_RELEASE_PATH "/${PLATFORM_NAME}")
+-  endif()
+   if(APPLE AND APPLE_IOS)
+     set(OGRE_LIB_RELEASE_PATH "/Release")
+   endif(APPLE AND APPLE_IOS)
diff --git a/ports/ogre/vcpkg.json b/ports/ogre/vcpkg.json
index 13e5a393ba..3450d66e16 100644
--- a/ports/ogre/vcpkg.json
+++ b/ports/ogre/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "ogre",
   "version": "13.6.2",
+  "port-version": 1,
   "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 cf749533d8..7c0bf4a3c4 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -5702,7 +5702,7 @@
     },
     "ogre": {
       "baseline": "13.6.2",
-      "port-version": 0
+      "port-version": 1
     },
     "ogre-next": {
       "baseline": "2.3.1",
diff --git a/versions/o-/ogre.json b/versions/o-/ogre.json
index 028117c838..af4c702683 100644
--- a/versions/o-/ogre.json
+++ b/versions/o-/ogre.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "b7ec525c0cd854d1da91a5a11cd05109693b9333",
+      "version": "13.6.2",
+      "port-version": 1
+    },
     {
       "git-tree": "dda1cee749cebb6fc251073a702e6a698fd4521e",
       "version": "13.6.2",