summaryrefslogtreecommitdiff
path: root/community/simgear
diff options
context:
space:
mode:
authorroot <root@rshg054.dnsready.net>2013-07-26 01:14:24 -0700
committerroot <root@rshg054.dnsready.net>2013-07-26 01:14:24 -0700
commit09c5dbb237be55059b6816f81295f2f122742a0a (patch)
tree1e175dc5bb6de2e61d52b8fba36b6fea52517685 /community/simgear
parentd184897bb273331edc2aa9c37f6514f9956c58f4 (diff)
Fri Jul 26 01:13:58 PDT 2013
Diffstat (limited to 'community/simgear')
-rw-r--r--community/simgear/PKGBUILD15
-rw-r--r--community/simgear/osg-3.2.patch22
2 files changed, 33 insertions, 4 deletions
diff --git a/community/simgear/PKGBUILD b/community/simgear/PKGBUILD
index 1e2c8dfc2..af8420930 100644
--- a/community/simgear/PKGBUILD
+++ b/community/simgear/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 84416 2013-02-18 20:14:11Z spupykin $
+# $Id: PKGBUILD 94470 2013-07-25 12:34:11Z spupykin $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Maintainer: William Rea <sillywilly@gmail.com>
# Contributor: Hans Janssen <hans@janserv.xs4all.nl>
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,8 +15,15 @@ license=("GPL")
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
diff --git a/community/simgear/osg-3.2.patch b/community/simgear/osg-3.2.patch
new file mode 100644
index 000000000..30d732ad6
--- /dev/null
+++ b/community/simgear/osg-3.2.patch
@@ -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);
+ }
+ }
+