rpms/ember/devel ember-0.5.4-ogre16.patch,1.1,1.2

[Alexey Torkhov]

Author: atorkhov

Update of /cvs/pkgs/rpms/ember/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12181

Modified Files:
	ember-0.5.4-ogre16.patch 
Log Message:
Fixing a patch.

ember-0.5.4-ogre16.patch:

Index: ember-0.5.4-ogre16.patch
===================================================================
RCS file: /cvs/pkgs/rpms/ember/devel/ember-0.5.4-ogre16.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ember-0.5.4-ogre16.patch	2 Oct 2008 18:28:30 -0000	1.1
+++ ember-0.5.4-ogre16.patch	2 Oct 2008 18:44:19 -0000	1.2
@@ -736,60 +736,6 @@
  	/**
  	 *    returns a pointer to the defintion of the Model
  	 * @return 
-diff --git a/src/components/ogre/scripting/bindings/lua/ogre/OgreEntity.pkg b/src/components/ogre/scripting/bindings/lua/ogre/OgreEntity.pkg
-index 066a077..d497b0b 100644
---- a/src/components/ogre/scripting/bindings/lua/ogre/OgreEntity.pkg
-+++ b/src/components/ogre/scripting/bindings/lua/ogre/OgreEntity.pkg
-@@ -257,20 +257,6 @@ namespace Ogre {
- 		/** @copy MovableObject::getWorldBoundingSphere */
- 		const Ogre::Sphere& getWorldBoundingSphere(bool derive = false) const;
- 
--        /** If set to true, this forces normals of this entity to be normalised
--            dynamically by the hardware.
--        @remarks
--            This option can be used to prevent lighting variations when scaling an
--            Entity using a SceneNode - normally because this scaling is hardware
--            based, the normals get scaled too which causes lighting to become inconsistent.
--            However, this has an overhead so only do this if you really need to.
--        */
--        void setNormaliseNormals(bool normalise);
--
--        /** Returns true if this entity has auto-normalisation of normals set. */
--        bool getNormaliseNormals(void) const;
--
--
-         /** Overridden member from ShadowCaster. */
- //         EdgeData* getEdgeList(void);
-         /** Overridden member from ShadowCaster. */
-diff --git a/src/components/ogre/scripting/bindings/lua/ogre/OgreNode.pkg b/src/components/ogre/scripting/bindings/lua/ogre/OgreNode.pkg
-index b1a9016..1097102 100644
---- a/src/components/ogre/scripting/bindings/lua/ogre/OgreNode.pkg
-+++ b/src/components/ogre/scripting/bindings/lua/ogre/OgreNode.pkg
-@@ -484,9 +484,9 @@ namespace Ogre {
-         */
-         void getWorldTransforms(Ogre::Matrix4* xform) const;
-         /** @copydoc Renderable::getWorldOrientation */
--        const Ogre::Quaternion& getWorldOrientation(void) const;
-+        const Ogre::Quaternion& _getDerivedOrientation(void) const;
-         /** @copydoc Renderable::getWorldPosition */
--        const Ogre::Vector3& getWorldPosition(void) const;
-+        const Ogre::Vector3& _getDerivedPosition(void) const;
- 
-         /** Sets the current transform of this node to be the 'initial state' ie that
-             position / orientation / scale to be used as a basis for delta values used
-diff --git a/src/components/ogre/scripting/bindings/lua/ogre/OgreRoot.pkg b/src/components/ogre/scripting/bindings/lua/ogre/OgreRoot.pkg
-index 3d99582..95b1436 100644
---- a/src/components/ogre/scripting/bindings/lua/ogre/OgreRoot.pkg
-+++ b/src/components/ogre/scripting/bindings/lua/ogre/OgreRoot.pkg
-@@ -554,7 +554,7 @@ namespace Ogre
- //         bool _fireFrameEnded();
- 
-         /** Gets the number of the current frame. */
--        unsigned long getCurrentFrameNumber(void) const;
-+        unsigned long getNextFrameNumber(void) const;
- 
-         /** Returns the scene manager currently being used to render a frame.
-         @remarks
 diff --git a/src/components/ogre/scripting/bindings/lua/ogre/lua_Ogre.cpp b/src/components/ogre/scripting/bindings/lua/ogre/lua_Ogre.cpp
 index aa62470..d3e1d6b 100644
 --- a/src/components/ogre/scripting/bindings/lua/ogre/lua_Ogre.cpp