--- a/Components/Paging/src/OgreGrid3DPageStrategy.cpp	2020-04-28 09:31:06.301940556 +0200
+++ b/Components/Paging/src/OgreGrid3DPageStrategy.cpp	2020-04-28 09:40:51.777904025 +0200
@@ -367,9 +367,9 @@
             {
                 mat = MaterialManager::getSingleton().create(matName, ResourceGroupManager::DEFAULT_RESOURCE_GROUP_NAME);
                 Pass* pass = mat->getTechnique(0)->getPass(0);
-                pass->setLightingEnabled(false);
+                //pass->setLightingEnabled(false);
                 pass->setVertexColourTracking(TVC_AMBIENT);
-                pass->setDepthWriteEnabled(false);
+                //pass->setDepthWriteEnabled(false);
                 mat->load();
             }
 
@@ -383,7 +383,7 @@
             else
             {
                 mo = p->getParentSection()->getSceneManager()->createManualObject();
-                mo->begin(matName, RenderOperation::OT_LINE_STRIP);
+                mo->begin(matName, OperationType::OT_LINE_STRIP);
             }
 
             ColourValue vcol = ColourValue::Green;
--- a/Components/Paging/src/OgreGrid2DPageStrategy.cpp	2020-04-28 09:43:23.119894582 +0200
+++ b/Components/Paging/src/OgreGrid2DPageStrategy.cpp	2020-04-28 09:44:00.844892228 +0200
@@ -405,9 +405,9 @@
             {
                 mat = MaterialManager::getSingleton().create(matName, ResourceGroupManager::DEFAULT_RESOURCE_GROUP_NAME);
                 Pass* pass = mat->getTechnique(0)->getPass(0);
-                pass->setLightingEnabled(false);
+                //pass->setLightingEnabled(false);
                 pass->setVertexColourTracking(TVC_AMBIENT);
-                pass->setDepthWriteEnabled(false);
+                //pass->setDepthWriteEnabled(false);
                 mat->load();
             }
 
@@ -416,7 +416,7 @@
             if (sn->numAttachedObjects() == 0)
             {
                 mo = p->getParentSection()->getSceneManager()->createManualObject();
-                mo->begin(matName, RenderOperation::OT_LINE_STRIP);
+                mo->begin(matName, OperationType::OT_LINE_STRIP);
             }
             else
             {
--- a/OgreMain/src/OgrePVRTCCodec.cpp	2020-04-27 20:00:44.816974345 +0200
+++ b/OgreMain/src/OgrePVRTCCodec.cpp	2020-04-27 20:03:49.186962841 +0200
@@ -33,6 +33,7 @@
 #include "OgreException.h"
 #include "OgreLogManager.h"
 #include "OgreBitwise.h"
+#include "OgreDataStream.h"
 
 #define FOURCC(c0, c1, c2, c3) (c0 | (c1 << 8) | (c2 << 16) | (c3 << 24))
 #define PVR_TEXTURE_FLAG_TYPE_MASK  0xff
--- a/OgreMain/src/OgrePlatformInformation.cpp	2020-08-23 17:39:09.971041355 +0200
+++ b/OgreMain/src/OgrePlatformInformation.cpp	2020-08-23 17:40:11.594044907 +0200
@@ -42,7 +42,7 @@
 #if OGRE_PLATFORM != OGRE_PLATFORM_WIN32
     #if OGRE_PLATFORM == OGRE_PLATFORM_ANDROID
         #include <linux/sysctl.h>
-    #else
+    #elif OGRE_PLATFORM == OGRE_PLATFORM_APPLE || OGRE_PLATFORM == OGRE_PLATFORM_APPLE_IOS
         #include <sys/sysctl.h>
     #endif
 #endif