Sun Aug 14 23:14:32 UTC 2011

2 files changed, 86 insertions, 10 deletions

diff --git a/community/simgear/PKGBUILD b/community/simgear/PKGBUILD
index 1aac5c75d..970dbf82b 100644
--- a/community/simgear/PKGBUILD
+++ b/community/simgear/PKGBUILD
@@ -1,28 +1,33 @@
-# $Id: PKGBUILD 50327 2011-06-28 11:35:39Z spupykin $
+# $Id: PKGBUILD 54019 2011-08-11 20:22:33Z 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.0.0
-pkgrel=3
+pkgver=2.4.0
+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')
 license=("GPL")
-url="http://www.simgear.org"
+#url="http://www.simgear.org"
+url="https://gitorious.org/fg"
 options=('!makeflags')
-source=(ftp://mirrors.ibiblio.org/pub/mirrors/simgear/ftp/Source/SimGear-$pkgver.tar.gz)
-md5sums=('414bea545ea1e8ce17e4aa0809159cec')
+source=("SimGear-$pkgver.tar.gz::https://gitorious.org/fg/simgear/archive-tarball/release/$pkgver"
+	build-fix.patch)
+md5sums=('e2c6fab13a74cd42992f8cfd5ad46cde'
+         '905a05cc1364c067b3b9574d41cef7fa')
 
 build() {
-  cd $startdir/src/SimGear-$pkgver
-  ./configure --prefix=/usr
+  cd $srcdir/fg-simgear
+#  patch -p1 <$srcdir/build-fix.patch
+  [ -x configure ] || ./autogen.sh
+  [ -f Makefile ] || ./configure --prefix=/usr
   make
 }
 
 package() {
-  cd $startdir/src/SimGear-$pkgver
-  make DESTDIR=$startdir/pkg install
+  cd $srcdir/fg-simgear
+  make DESTDIR=$pkgdir install
 }
diff --git a/community/simgear/build-fix.patch b/community/simgear/build-fix.patch
new file mode 100644
index 000000000..da4ba81f8
--- /dev/null
+++ b/community/simgear/build-fix.patch
@@ -0,0 +1,71 @@
+diff -wbBur SimGear-2.0.0/simgear/scene/model/SGClipGroup.cxx SimGear-2.0.0.my/simgear/scene/model/SGClipGroup.cxx
+--- SimGear-2.0.0/simgear/scene/model/SGClipGroup.cxx	2010-02-17 18:39:21.000000000 +0300
++++ SimGear-2.0.0.my/simgear/scene/model/SGClipGroup.cxx	2011-07-04 13:02:57.000000000 +0400
+@@ -70,9 +70,6 @@
+   osg::ref_ptr<osg::RefMatrix> mModelView;
+ };
+ 
+-osgUtil::RegisterRenderBinProxy
+-SGClipGroup::clipBinProxy("ClipRenderBin", new SGClipGroup::ClipRenderBin);
+-
+ class SGClipGroup::CullCallback : public osg::NodeCallback {
+ public:
+   virtual void operator()(osg::Node* node, osg::NodeVisitor* nv)
+diff -wbBur SimGear-2.0.0/simgear/scene/model/SGClipGroup.hxx SimGear-2.0.0.my/simgear/scene/model/SGClipGroup.hxx
+--- SimGear-2.0.0/simgear/scene/model/SGClipGroup.hxx	2010-02-17 18:39:21.000000000 +0300
++++ SimGear-2.0.0.my/simgear/scene/model/SGClipGroup.hxx	2011-07-04 13:03:01.000000000 +0400
+@@ -51,8 +51,6 @@
+   class ClipRenderBin;
+ 
+   std::vector<osg::ref_ptr<osg::ClipPlane> > mClipPlanes;
+-
+-  static osgUtil::RegisterRenderBinProxy clipBinProxy;
+ };
+ 
+ #endif
+diff -wbBur SimGear-2.0.0/simgear/scene/model/SGPagedLOD.cxx SimGear-2.0.0.my/simgear/scene/model/SGPagedLOD.cxx
+--- SimGear-2.0.0/simgear/scene/model/SGPagedLOD.cxx	2010-02-17 18:39:21.000000000 +0300
++++ SimGear-2.0.0.my/simgear/scene/model/SGPagedLOD.cxx	2011-07-12 15:12:21.000000000 +0400
+@@ -21,6 +21,7 @@
+ #include <osgDB/ReadFile>
+ #include <osgDB/Input>
+ #include <osgDB/ParameterOutput>
++#include <osgDB/DatabasePager>
+ 
+ #include <simgear/debug/logstream.hxx>
+ #include <simgear/structure/OSGVersion.hxx>
+@@ -67,9 +68,12 @@
+     unsigned childNum = getNumChildren();
+     setTimeStamp(childNum, 0);
+     double priority=1.0;
++/*
++FIXME:!!!
+     dbp->requestNodeFile(getFileName(childNum),this,priority,0,
+                          getDatabaseRequest(childNum),
+                          _readerWriterOptions.get());
++*/
+ }
+ 
+ bool SGPagedLOD_writeLocalData(const Object& obj, osgDB::Output& fw)
+diff -wbBur SimGear-2.0.0/simgear/scene/sky/bbcache.cxx SimGear-2.0.0.my/simgear/scene/sky/bbcache.cxx
+--- SimGear-2.0.0/simgear/scene/sky/bbcache.cxx	2010-02-17 18:39:21.000000000 +0300
++++ SimGear-2.0.0.my/simgear/scene/sky/bbcache.cxx	2011-07-12 15:14:16.000000000 +0400
+@@ -31,6 +31,7 @@
+ #include <simgear/screen/extensions.hxx>
+ #include <simgear/screen/RenderTexture.h>
+ #include <osg/GLU>
++#include <GL/glu.h>
+ 
+ #include "bbcache.hxx"
+ 
+diff -wbBur SimGear-2.0.0/simgear/screen/tr.cxx SimGear-2.0.0.my/simgear/screen/tr.cxx
+--- SimGear-2.0.0/simgear/screen/tr.cxx	2010-02-17 18:39:22.000000000 +0300
++++ SimGear-2.0.0.my/simgear/screen/tr.cxx	2011-07-12 15:16:01.000000000 +0400
+@@ -145,6 +145,7 @@
+ #endif
+ 
+ #include <osg/GLU>
++#include <GL/glu.h>
+ 
+ #include "tr.h"
+