From 708d8250d6eae81bb9a030ff7edef22d2ea1e67c Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Fri, 17 Jan 2020 09:21:16 +0100 Subject: [PATCH] trying to fix ogre osx ci regression --- ports/ogre/CONTROL | 2 +- ports/ogre/osx.patch | 13 +++++++++++++ ports/ogre/portfile.cmake | 1 + 3 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 ports/ogre/osx.patch diff --git a/ports/ogre/CONTROL b/ports/ogre/CONTROL index 3522ff8c5e890b..521f13f1738f14 100644 --- 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 new file mode 100644 index 00000000000000..53a457ee7578b4 --- /dev/null +++ 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 + # 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 index 898077c1e35af0..b6b83c7ac82327 100644 --- 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")