[arch-commits] Commit in simgear/trunk (PKGBUILD osg-3.2.patch)

[Sergej Pupykin]

    Date: Thursday, July 25, 2013 @ 14:33:44
  Author: spupykin
Revision: 94469

upgpkg: simgear 2.10.0-2

upd

Added:
  simgear/trunk/osg-3.2.patch
Modified:
  simgear/trunk/PKGBUILD

---------------+
 PKGBUILD      |   13 ++++++++++---
 osg-3.2.patch |   22 ++++++++++++++++++++++
 2 files changed, 32 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-07-25 11:24:19 UTC (rev 94468)
+++ PKGBUILD	2013-07-25 12:33:44 UTC (rev 94469)
@@ -5,7 +5,7 @@
 
 pkgname=simgear
 pkgver=2.10.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A set of open-source libraries designed to be used as building blocks for quickly assembling 3d simulations, games, and visualization applications."
 arch=(i686 x86_64)
 depends=('glut' 'freealut' 'plib' 'openscenegraph')
@@ -15,9 +15,16 @@
 url="https://gitorious.org/fg"
 options=('!makeflags')
 #source=("SimGear-$pkgver.tar.gz::https://gitorious.org/fg/simgear/archive-tarball/release/$pkgver")
-source=("http://mirrors.ibiblio.org/pub/mirrors/simgear/ftp/Source/simgear-$pkgver.tar.bz2")
-md5sums=('0ec974d3778f777d5c99c89db671fcc7')
+source=("http://mirrors.ibiblio.org/pub/mirrors/simgear/ftp/Source/simgear-$pkgver.tar.bz2"
+	"osg-3.2.patch")
+md5sums=('0ec974d3778f777d5c99c89db671fcc7'
+         'd7f35f02d88c6ef9c58e07b8431811e6')
 
+prepare() {
+  cd $srcdir/simgear-$pkgver
+  patch -p1 <$srcdir/osg-3.2.patch
+}
+
 build() {
   cd $srcdir/simgear-$pkgver
   cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_INSTALL_LIBDIR=lib .

Added: osg-3.2.patch
===================================================================
--- osg-3.2.patch	                        (rev 0)
+++ osg-3.2.patch	2013-07-25 12:33:44 UTC (rev 94469)
@@ -0,0 +1,22 @@
+diff -wbBur simgear-2.10.0/simgear/scene/material/EffectGeode.cxx simgear-2.10.0.q/simgear/scene/material/EffectGeode.cxx
+--- simgear-2.10.0/simgear/scene/material/EffectGeode.cxx	2011-06-29 18:58:56.000000000 +0400
++++ simgear-2.10.0.q/simgear/scene/material/EffectGeode.cxx	2013-07-25 16:14:24.268934729 +0400
+@@ -80,15 +80,15 @@
+         int n = _effect->getGenerator(Effect::TANGENT);
+         tsg->generate(geometry, 0);  // 0 is normal_unit, but I have no idea what that is!
+         if (n != -1 && !geometry->getVertexAttribArray(n))
+-            geometry->setVertexAttribData(n, osg::Geometry::ArrayData(tsg->getTangentArray(), osg::Geometry::BIND_PER_VERTEX,GL_FALSE));
++            geometry->setVertexAttribArray(n, tsg->getTangentArray(), osg::Array::BIND_PER_VERTEX);
+ 
+         n = _effect->getGenerator(Effect::BINORMAL);
+         if (n != -1 && !geometry->getVertexAttribArray(n))
+-            geometry->setVertexAttribData(n, osg::Geometry::ArrayData(tsg->getBinormalArray(), osg::Geometry::BIND_PER_VERTEX,GL_FALSE));
++            geometry->setVertexAttribArray(n, tsg->getBinormalArray(), osg::Array::BIND_PER_VERTEX);
+ 
+         n = _effect->getGenerator(Effect::NORMAL);
+         if (n != -1 && !geometry->getVertexAttribArray(n))
+-            geometry->setVertexAttribData(n, osg::Geometry::ArrayData(tsg->getNormalArray(), osg::Geometry::BIND_PER_VERTEX,GL_FALSE));
++            geometry->setVertexAttribArray(n, tsg->getNormalArray(), osg::Array::BIND_PER_VERTEX);
+     }
+ }
+