- fix build with ogre 13, rel 8

diff --git a/CEGUI.spec b/CEGUI.spec
index e27e07a95194e99cb1dcb3168169a01810d09e83..b678c398f075948c9fc375e1d842aac9b2d55d06 100644 (file)
--- a/CEGUI.spec
+++ b/CEGUI.spec
@@ -10,7 +10,7 @@ Summary:      CEGUI - a free library providing windowing and widgets
 Summary(pl.UTF-8):     CEGUI - wolnodostępna biblioteka zapewniającą okienka i widgety
 Name:          CEGUI
 Version:       0.8.7
-Release:       7
+Release:       8
 License:       LGPL v2.1+ (with MIT parts)
 Group:         Libraries
 Source0:       http://downloads.sourceforge.net/crayzedsgui/cegui-%{version}.tar.bz2
@@ -23,6 +23,7 @@ Patch3:               x32.patch
 Patch4:                cxx11.patch
 Patch5:                python2.patch
 Patch6:                ogre1.12.patch
+Patch7:                ogre13.patch
 URL:           http://www.cegui.org.uk/
 BuildRequires: DevIL-devel
 %{?with_directfb:BuildRequires:        DirectFB-devel >= 1.2.0}
@@ -466,6 +467,7 @@ Wiązania Pythona do biblioteki CEGUI OpenGLRenderer.
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
+%patch7 -p1
 
 %build
 install -d build

diff --git a/ogre13.patch b/ogre13.patch
new file mode 100644 (file)
index 0000000..3c440a2
--- /dev/null
+++ b/ogre13.patch
@@ -0,0 +1,33 @@
+--- cegui-0.8.7/cegui/include/CEGUI/RendererModules/Ogre/Renderer.h.orig       2016-04-23 20:19:40.000000000 +0200
++++ cegui-0.8.7/cegui/include/CEGUI/RendererModules/Ogre/Renderer.h    2022-03-11 21:36:04.637974284 +0100
+@@ -64,13 +64,13 @@
+ class Matrix4;
+ }
+ 
+-#if (CEGUI_OGRE_VERSION >= (2 << 16))
++#if (CEGUI_OGRE_VERSION >= (20 << 16))
+ // The new Ogre Compositor2 system has to be used since ViewPorts 
+ // no longer have the required functionality
+ #define CEGUI_USE_OGRE_COMPOSITOR2
+ #endif
+ 
+-#if (CEGUI_OGRE_VERSION >= ((2 << 16) | (1 << 8) | 0))
++#if (CEGUI_OGRE_VERSION >= ((20 << 16) | (1 << 8) | 0))
+ // The HLMS has to be used since fixed pipeline is disabled
+ #define CEGUI_USE_OGRE_HLMS
+ #include <OgreRenderOperation.h>
+--- cegui-0.8.7/cegui/src/RendererModules/Ogre/Texture.cpp.orig        2022-03-12 09:40:45.000000000 +0100
++++ cegui-0.8.7/cegui/src/RendererModules/Ogre/Texture.cpp     2022-03-12 09:43:34.620043093 +0100
+@@ -24,10 +24,12 @@
+  *   ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+  *   OTHER DEALINGS IN THE SOFTWARE.
+  ***************************************************************************/
++#include <sstream>
+ #include "CEGUI/RendererModules/Ogre/Texture.h"
+ #include "CEGUI/Exceptions.h"
+ #include "CEGUI/System.h"
+ #include "CEGUI/RendererModules/Ogre/ImageCodec.h"
++#include <OgrePrerequisites.h>
+ #include <OgreTextureManager.h>
+ #include <OgreHardwarePixelBuffer.h>
+