trying to fix ogre osx ci regression

Neumann-A · Jan 17, 2020 · 708d825 · 708d825
1 parent 728e9bd
commit 708d825
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 1 deletion.
diff --git a/ports/ogre/CONTROL b/ports/ogre/CONTROL
@@ -1,5 +1,5 @@
 Source: ogre
-Version: 1.12.1
+Version: 1.12.1-1
 Build-Depends: freeimage, freetype, zlib, zziplib
 Homepage: https://github.com/OGRECave/ogre
 Description: 3D Object-Oriented Graphics Rendering Engine

diff --git a/ports/ogre/osx.patch b/ports/ogre/osx.patch
@@ -0,0 +1,13 @@
+diff --git a/OgreMain/include/OgrePlatform.h b/OgreMain/include/OgrePlatform.h
+index 50e396eba..d74dcc8fd 100644
+--- a/OgreMain/include/OgrePlatform.h
++++ b/OgreMain/include/OgrePlatform.h
+@@ -147,7 +147,7 @@ namespace Ogre {
+ #elif defined(__EMSCRIPTEN__)
+ #   define OGRE_PLATFORM OGRE_PLATFORM_EMSCRIPTEN
+ #elif defined( __APPLE_CC__)
+-#   include "Availability.h"
++#   include <Availability.h>
+ #   ifdef __IPHONE_OS_VERSION_MIN_REQUIRED
+ #       define OGRE_PLATFORM OGRE_PLATFORM_APPLE_IOS
+ #   else
diff --git a/ports/ogre/portfile.cmake b/ports/ogre/portfile.cmake
@@ -12,6 +12,7 @@ vcpkg_from_github(
     HEAD_REF master
     PATCHES
         toolchain_fixes.patch
+        osx.patch
 )
 
 file(REMOVE "${SOURCE_PATH}/CMake/Packages/FindOpenEXR.cmake")