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

sebastic-guest pushed a commit to branch master
in repository osgearth.

commit 1f95a31aeaff916a47454b43b6102bc5352941d9
Author: Bas Couwenberg <sebas...@xs4all.nl>
Date:   Sat Dec 7 03:43:30 2013 +0100

    Drop MPGeometry-OpenSceneGraph-3.1.8.patch, included in upstream.
---
 debian/changelog                                   |   1 +
 .../patches/MPGeometry-OpenSceneGraph-3.1.8.patch  | 130 ---------------------
 debian/patches/series                              |   1 -
 3 files changed, 1 insertion(+), 131 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d443eb8..21c761a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ osgearth (2.5.0+dfsg-1) UNRELEASED; urgency=medium
   * Add build dependencies on libv8-dev and libnoise-dev.
   * Refresh soversion.patch.
   * Enable KMZ support with libminizip from libkml.
+  * Drop MPGeometry-OpenSceneGraph-3.1.8.patch, included in upstream.
 
  -- Bas Couwenberg <sebas...@xs4all.nl>  Thu, 16 Jan 2014 22:35:07 +0100
 
diff --git a/debian/patches/MPGeometry-OpenSceneGraph-3.1.8.patch 
b/debian/patches/MPGeometry-OpenSceneGraph-3.1.8.patch
deleted file mode 100644
index 95b2733..0000000
--- a/debian/patches/MPGeometry-OpenSceneGraph-3.1.8.patch
+++ /dev/null
@@ -1,130 +0,0 @@
-Description: Updates to MPGeometry to support changes to OpenSceneGraph 
Geometry class in OSG 3.1.8.
-Origin: 
https://github.com/gwaldron/osgearth/commit/e67deedb2d5275d490dd393ec736a933c2ac48f0
-Author: jasonbeverage <jasonbever...@gmail.com>
-Last-Update: 2013-07-01
---- a/src/osgEarthDrivers/engine_mp/MPGeometry.cpp
-+++ b/src/osgEarthDrivers/engine_mp/MPGeometry.cpp
-@@ -18,6 +18,9 @@
- */
- #include "MPGeometry"
- 
-+#include <osg/Version>
-+
-+using namespace osg;
- using namespace osgEarth_engine_mp;
- using namespace osgEarth;
- 
-@@ -212,18 +215,36 @@ MPGeometry::drawImplementation(osg::Rend
- 
-     arrayDispatchers.reset();
-     
arrayDispatchers.setUseVertexAttribAlias(state.getUseVertexAttributeAliasing());
-+
-+
-+    //Remove 
-+#if OSG_VERSION_LESS_THAN(3,1,8)
-     arrayDispatchers.setUseGLBeginEndAdapter(false);
-+#endif
-+
- 
-+#if OSG_MIN_VERSION_REQUIRED(3,1,8)
-+    arrayDispatchers.activateNormalArray(_normalArray.get());
-+    arrayDispatchers.activateColorArray(_colorArray.get());
-+    arrayDispatchers.activateSecondaryColorArray(_secondaryColorArray.get());
-+    arrayDispatchers.activateFogCoordArray(_fogCoordArray.get());
-+#else
-     arrayDispatchers.activateNormalArray(_normalData.binding, 
_normalData.array.get(), _normalData.indices.get());
-     arrayDispatchers.activateColorArray(_colorData.binding, 
_colorData.array.get(), _colorData.indices.get());
-     arrayDispatchers.activateSecondaryColorArray(_secondaryColorData.binding, 
_secondaryColorData.array.get(), _secondaryColorData.indices.get());
-     arrayDispatchers.activateFogCoordArray(_fogCoordData.binding, 
_fogCoordData.array.get(), _fogCoordData.indices.get());
-+#endif
-+    
- 
-     if (handleVertexAttributes)
-     {
-         for(unsigned int unit=0;unit<_vertexAttribList.size();++unit)
-         {
-+#if OSG_MIN_VERSION_REQUIRED(3,1,8)
-+            arrayDispatchers.activateVertexAttribArray(unit, 
_vertexAttribList[unit].get());
-+#else
-             
arrayDispatchers.activateVertexAttribArray(_vertexAttribList[unit].binding, 
unit, _vertexAttribList[unit].array.get(), 
_vertexAttribList[unit].indices.get());
-+#endif             
-         }
-     }
- 
-@@ -231,7 +252,24 @@ MPGeometry::drawImplementation(osg::Rend
-     arrayDispatchers.dispatch(BIND_OVERALL,0);
-     state.lazyDisablingOfVertexAttributes();
- 
-+
-     // set up arrays
-+#if OSG_MIN_VERSION_REQUIRED( 3, 1, 8 )
-+    if( _vertexArray.valid() )
-+        state.setVertexPointer(_vertexArray.get());
-+
-+    if (_normalArray.valid() && 
_normalArray->getBinding()==osg::Array::BIND_PER_VERTEX)
-+        state.setNormalPointer(_normalArray.get());
-+
-+    if (_colorArray.valid() && 
_colorArray->getBinding()==osg::Array::BIND_PER_VERTEX)
-+        state.setColorPointer(_colorArray.get());
-+
-+    if (_secondaryColorArray.valid() && 
_secondaryColorArray->getBinding()==osg::Array::BIND_PER_VERTEX)
-+        state.setSecondaryColorPointer(_secondaryColorArray.get());
-+
-+    if (_fogCoordArray.valid() && 
_fogCoordArray->getBinding()==osg::Array::BIND_PER_VERTEX)
-+        state.setFogCoordPointer(_fogCoordArray.get());
-+#else
-     if( _vertexData.array.valid() )
-         state.setVertexPointer(_vertexData.array.get());
- 
-@@ -246,23 +284,50 @@ MPGeometry::drawImplementation(osg::Rend
- 
-     if (_fogCoordData.binding==BIND_PER_VERTEX && _fogCoordData.array.valid())
-         state.setFogCoordPointer(_fogCoordData.array.get());
--
-+#endif    
-+        
-     for(unsigned int unit=0;unit<_texCoordList.size();++unit)
-     {
-+#if OSG_MIN_VERSION_REQUIRED( 3, 1, 8)
-+        const Array* array = _texCoordList[unit].get();
-+        if (array)
-+        {
-+            state.setTexCoordPointer(unit,array);
-+        }
-+#else
-         const osg::Array* array = _texCoordList[unit].array.get();
-         if (array) state.setTexCoordPointer(unit,array);
-+#endif        
-     }
- 
-     if( handleVertexAttributes )
-     {
-         for(unsigned int index = 0; index < _vertexAttribList.size(); ++index 
)
-         {
-+#if OSG_MIN_VERSION_REQUIRED( 3, 1, 8)
-+            const Array* array = _vertexAttribList[index].get();
-+            if (array && array->getBinding()==osg::Array::BIND_PER_VERTEX)
-+            {
-+                if (array->getPreserveDataType())
-+                {
-+                    GLenum dataType = array->getDataType();
-+                    if (dataType==GL_FLOAT) state.setVertexAttribPointer( 
index, array );
-+                    else if (dataType==GL_DOUBLE) 
state.setVertexAttribLPointer( index, array );
-+                    else state.setVertexAttribIPointer( index, array );
-+                }
-+                else
-+                {
-+                    state.setVertexAttribPointer( index, array );
-+                }
-+            }
-+#else            
-             const osg::Array* array = _vertexAttribList[index].array.get();
-             const AttributeBinding ab = _vertexAttribList[index].binding;
-             if( ab == BIND_PER_VERTEX && array )
-             {
-                 state.setVertexAttribPointer( index, array, 
_vertexAttribList[index].normalize );
-             }
-+#endif
-         }
-     }
- 
diff --git a/debian/patches/series b/debian/patches/series
index d083043..af06caf 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,4 @@
 soversion.patch
-MPGeometry-OpenSceneGraph-3.1.8.patch
 becuase-typo.patch
 fallback-getCurrentThreadId.patch
 kfreebsd-getCurrentThreadId.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-grass/osgearth.git

_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel

Reply via email to