[arch-commits] Commit in simgear/repos (8 files)

Sergej Pupykin spupykin at nymeria.archlinux.org
Tue Nov 26 09:42:32 UTC 2013


    Date: Tuesday, November 26, 2013 @ 10:42:32
  Author: spupykin
Revision: 101470

archrelease: copy trunk to community-i686, community-x86_64

Added:
  simgear/repos/community-i686/PKGBUILD
    (from rev 101469, simgear/trunk/PKGBUILD)
  simgear/repos/community-i686/osg-3.2.patch
    (from rev 101469, simgear/trunk/osg-3.2.patch)
  simgear/repos/community-x86_64/PKGBUILD
    (from rev 101469, simgear/trunk/PKGBUILD)
  simgear/repos/community-x86_64/osg-3.2.patch
    (from rev 101469, simgear/trunk/osg-3.2.patch)
Deleted:
  simgear/repos/community-i686/PKGBUILD
  simgear/repos/community-i686/osg-3.2.patch
  simgear/repos/community-x86_64/PKGBUILD
  simgear/repos/community-x86_64/osg-3.2.patch

--------------------------------+
 /PKGBUILD                      |   74 +++++++++++++++++++++++++++++++++++++++
 /osg-3.2.patch                 |   44 +++++++++++++++++++++++
 community-i686/PKGBUILD        |   37 -------------------
 community-i686/osg-3.2.patch   |   22 -----------
 community-x86_64/PKGBUILD      |   37 -------------------
 community-x86_64/osg-3.2.patch |   22 -----------
 6 files changed, 118 insertions(+), 118 deletions(-)

Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD	2013-11-26 09:42:17 UTC (rev 101469)
+++ community-i686/PKGBUILD	2013-11-26 09:42:32 UTC (rev 101470)
@@ -1,37 +0,0 @@
-# $Id$
-# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
-# Maintainer: William Rea <sillywilly at gmail.com>
-# Contributor: Hans Janssen <hans at janserv.xs4all.nl>
-
-pkgname=simgear
-pkgver=2.12.0
-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')
-makedepends=('boost' 'cmake' 'mesa')
-license=("GPL")
-#url="http://www.simgear.org"
-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"
-	"osg-3.2.patch")
-md5sums=('dfc752f4759a2f795b7cdc9dad28411e'
-         '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 .
-  make
-}
-
-package() {
-  cd $srcdir/simgear-$pkgver
-  make DESTDIR=$pkgdir install
-}

Copied: simgear/repos/community-i686/PKGBUILD (from rev 101469, simgear/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD	                        (rev 0)
+++ community-i686/PKGBUILD	2013-11-26 09:42:32 UTC (rev 101470)
@@ -0,0 +1,37 @@
+# $Id$
+# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
+# Maintainer: William Rea <sillywilly at gmail.com>
+# Contributor: Hans Janssen <hans at janserv.xs4all.nl>
+
+pkgname=simgear
+pkgver=2.12.1
+pkgrel=1
+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')
+makedepends=('boost' 'cmake' 'mesa')
+license=("GPL")
+#url="http://www.simgear.org"
+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"
+	"osg-3.2.patch")
+md5sums=('8c483e13bce96f1dc27300a087fdb962'
+         '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 .
+  make
+}
+
+package() {
+  cd $srcdir/simgear-$pkgver
+  make DESTDIR=$pkgdir install
+}

Deleted: community-i686/osg-3.2.patch
===================================================================
--- community-i686/osg-3.2.patch	2013-11-26 09:42:17 UTC (rev 101469)
+++ community-i686/osg-3.2.patch	2013-11-26 09:42:32 UTC (rev 101470)
@@ -1,22 +0,0 @@
-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);
-     }
- }
- 

Copied: simgear/repos/community-i686/osg-3.2.patch (from rev 101469, simgear/trunk/osg-3.2.patch)
===================================================================
--- community-i686/osg-3.2.patch	                        (rev 0)
+++ community-i686/osg-3.2.patch	2013-11-26 09:42:32 UTC (rev 101470)
@@ -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);
+     }
+ }
+ 

Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD	2013-11-26 09:42:17 UTC (rev 101469)
+++ community-x86_64/PKGBUILD	2013-11-26 09:42:32 UTC (rev 101470)
@@ -1,37 +0,0 @@
-# $Id$
-# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
-# Maintainer: William Rea <sillywilly at gmail.com>
-# Contributor: Hans Janssen <hans at janserv.xs4all.nl>
-
-pkgname=simgear
-pkgver=2.12.0
-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')
-makedepends=('boost' 'cmake' 'mesa')
-license=("GPL")
-#url="http://www.simgear.org"
-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"
-	"osg-3.2.patch")
-md5sums=('dfc752f4759a2f795b7cdc9dad28411e'
-         '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 .
-  make
-}
-
-package() {
-  cd $srcdir/simgear-$pkgver
-  make DESTDIR=$pkgdir install
-}

Copied: simgear/repos/community-x86_64/PKGBUILD (from rev 101469, simgear/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD	                        (rev 0)
+++ community-x86_64/PKGBUILD	2013-11-26 09:42:32 UTC (rev 101470)
@@ -0,0 +1,37 @@
+# $Id$
+# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
+# Maintainer: William Rea <sillywilly at gmail.com>
+# Contributor: Hans Janssen <hans at janserv.xs4all.nl>
+
+pkgname=simgear
+pkgver=2.12.1
+pkgrel=1
+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')
+makedepends=('boost' 'cmake' 'mesa')
+license=("GPL")
+#url="http://www.simgear.org"
+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"
+	"osg-3.2.patch")
+md5sums=('8c483e13bce96f1dc27300a087fdb962'
+         '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 .
+  make
+}
+
+package() {
+  cd $srcdir/simgear-$pkgver
+  make DESTDIR=$pkgdir install
+}

Deleted: community-x86_64/osg-3.2.patch
===================================================================
--- community-x86_64/osg-3.2.patch	2013-11-26 09:42:17 UTC (rev 101469)
+++ community-x86_64/osg-3.2.patch	2013-11-26 09:42:32 UTC (rev 101470)
@@ -1,22 +0,0 @@
-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);
-     }
- }
- 

Copied: simgear/repos/community-x86_64/osg-3.2.patch (from rev 101469, simgear/trunk/osg-3.2.patch)
===================================================================
--- community-x86_64/osg-3.2.patch	                        (rev 0)
+++ community-x86_64/osg-3.2.patch	2013-11-26 09:42:32 UTC (rev 101470)
@@ -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);
+     }
+ }
+ 




More information about the arch-commits mailing list