[libogre-perl] 02/03: preliminary incomplete patch for building with ogre 1.9

Damyan Ivanov dmn at moszumanska.debian.org
Thu Mar 20 20:02:05 UTC 2014


This is an automated email from the git hooks/post-receive script.

dmn pushed a commit to branch master
in repository libogre-perl.

commit c43fdb5e983fe2a4ddfff9c761a41f5d2a0c45a5
Author: Damyan Ivanov <dmn at debian.org>
Date:   Thu Mar 20 19:52:41 2014 +0000

    preliminary incomplete patch for building with ogre 1.9
---
 debian/patches/ogre-1.9.patch | 97 +++++++++++++++++++++++++++++++++++++++++++
 debian/patches/series         |  1 +
 2 files changed, 98 insertions(+)

diff --git a/debian/patches/ogre-1.9.patch b/debian/patches/ogre-1.9.patch
new file mode 100644
index 0000000..3704588
--- /dev/null
+++ b/debian/patches/ogre-1.9.patch
@@ -0,0 +1,97 @@
+--- a/Ogre/RenderWindow.pm
++++ b/Ogre/RenderWindow.pm
+@@ -149,15 +149,7 @@ I<Returns>
+ 
+ =back
+ 
+-=head2 $obj->swapBuffers($waitForVSync=true)
+-
+-I<Parameter types>
+-
+-=over
+-
+-=item $waitForVSync=true : bool
+-
+-=back
++=head2 $obj->swapBuffers()
+ 
+ I<Returns>
+ 
+--- a/xs/RenderWindow.xs
++++ b/xs/RenderWindow.xs
+@@ -39,8 +39,7 @@ bool
+ RenderWindow::isClosed()
+ 
+ void
+-RenderWindow::swapBuffers(waitForVSync=true)
+-    bool  waitForVSync
++RenderWindow::swapBuffers()
+ 
+ 
+ # two versions, one in RenderTarget
+--- a/xs/ResourceManager.xs
++++ b/xs/ResourceManager.xs
+@@ -4,7 +4,7 @@ MODULE = Ogre     PACKAGE = Ogre::Resour
+ Resource *
+ ResourceManager::create(String name, String group, bool isManual=false, ManualResourceLoader *loader=0)
+   CODE:
+-    RETVAL = THIS->create(name, group, isManual, loader).getPointer();
++    RETVAL = THIS->createResource(name, group, isManual, loader).getPointer();
+   OUTPUT:
+     RETVAL
+ 
+@@ -67,7 +67,7 @@ ResourceManager::removeAll()
+ Resource *
+ ResourceManager::getByName(String name)
+   CODE:
+-    RETVAL = THIS->getByName(name).getPointer();
++    RETVAL = THIS->getResourceByName(name).getPointer();
+   OUTPUT:
+     RETVAL
+ 
+--- a/xs/RenderSystem.xs
++++ b/xs/RenderSystem.xs
+@@ -80,12 +80,6 @@ RenderSystem::detachRenderTarget(name)
+ String
+ RenderSystem::getErrorDescription(long errorNumber)
+ 
+-void
+-RenderSystem::setWaitForVerticalBlank(bool enabled)
+-
+-bool
+-RenderSystem::getWaitForVerticalBlank()
+-
+ ## void RenderSystem::convertColourValue(const ColourValue &colour, uint32 *pDest)
+ 
+ int
+@@ -95,9 +89,9 @@ void
+ RenderSystem::setStencilCheckEnabled(bool enabled)
+ 
+ void
+-RenderSystem::setStencilBufferParams(int func=CMPF_ALWAYS_PASS, uint32 refValue, uint32 mask=0xFFFFFFFF, int stencilFailOp=SOP_KEEP, int depthFailOp=SOP_KEEP, int passOp=SOP_KEEP, bool twoSidedOperation=false)
++RenderSystem::setStencilBufferParams(CompareFunction func=CMPF_ALWAYS_PASS, uint32 refValue=0, uint32 compareMask=0xFFFFFFFF, uint32 writeMask=0xFFFFFFFF, StencilOperation stencilFailOp=SOP_KEEP, StencilOperation depthFailOp=SOP_KEEP, StencilOperation passOp=SOP_KEEP, bool twoSidedOperation=false)
+   C_ARGS:
+-    (CompareFunction)func, refValue, mask, (StencilOperation)stencilFailOp, (StencilOperation)depthFailOp, (StencilOperation)passOp, twoSidedOperation
++    (CompareFunction)func, refValue, compareMask, writeMask, (StencilOperation)stencilFailOp, (StencilOperation)depthFailOp, (StencilOperation)passOp, twoSidedOperation
+ 
+ void
+ RenderSystem::setVertexDeclaration(VertexDeclaration *decl)
+--- a/typemap
++++ b/typemap
+@@ -195,6 +195,8 @@ const WorldFragment *	S_WORLDFRAGMENT
+ ManualObjectSection *	S_MANUALOBJECTSECTION
+ const ManualObjectSection *	S_MANUALOBJECTSECTION
+ NameValuePairList	T_MAPSTRSTR
++CompareFunction	T_ENUM
++StencilOperation	T_ENUM
+ 
+ 
+ INPUT
+--- a/Ogre.xs
++++ b/Ogre.xs
+@@ -1,4 +1,5 @@
+ #include <Ogre.h>
++#include <OGRE/Overlay/OgreOverlayManager.h>
+ #include <string>
+ #include <set>
+ #include <vector>
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..4217115
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+ogre-1.9.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libogre-perl.git



More information about the Pkg-perl-cvs-commits mailing list