Update to v2.7.0

2 files changed, 31 insertions, 59 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0bf6fb04f3d8..f68838b57556 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,24 +1,20 @@
 pkgbase = osgearth
 	pkgdesc = A terrain rendering toolkit for OpenSceneGraph
-	pkgver = 2.5
-	pkgrel = 2
+	pkgver = 2.7
+	pkgrel = 1
 	url = http://www.osgearth.org
 	arch = i686
 	arch = x86_64
 	license = LGPL
-	makedepends = git
 	makedepends = cmake
 	depends = openscenegraph
 	depends = gdal
-	depends = expat
-	depends = curl
 	depends = minizip
-	optdepends = geos: Imrpoved vector support
-	optdepends = sqlite: Flat file cache
-	optdepends = libzip: Archive support
-	optdepends = v8
+	depends = qt5-base
 	provides = osgearth
 	conflicts = osgearth-qt5
+	source = https://github.com/gwaldron/osgearth/archive/osgearth-2.7.tar.gz
+	md5sums = f3b90d719b23b9e636d3e78d86370ad1
 
 pkgname = osgearth
 
diff --git a/PKGBUILD b/PKGBUILD
index 4efd6d5b76ea..9e9098215582 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,71 +1,47 @@
-# Maintainer: A. Weiss <adam [at] archlinux.us>
-# Maintainer: Samuel Mesa <samuelmesa [at] linuxmail.org>
+# Maintainer: Samuel Fernando Mesa Giraldo <samuelmesa@linuxmail.org>
+# Contributor: James Duley <jagduley gmail>
+# Contributor: A. Weiss <adam [at] archlinux.us>
 
 pkgname=osgearth
-pkgver=2.5
-pkgrel=2
+pkgver=2.7
+pkgrel=1
 pkgdesc="A terrain rendering toolkit for OpenSceneGraph"
 arch=('i686' 'x86_64')
 url=('http://www.osgearth.org')
 license=('LGPL')
-depends=('openscenegraph' 'gdal' 'expat' 'curl' 'minizip')
-optdepends=('geos: Imrpoved vector support'
-            'sqlite: Flat file cache'
-            'libzip: Archive support' 'v8')
-makedepends=('git' 'cmake')
+depends=('openscenegraph' 'gdal' 'minizip' 'qt5-base')
+makedepends=('cmake')
 provides=('osgearth')
 conflicts=('osgearth-qt5')
-
-_gitroot='git://github.com/gwaldron/osgearth.git'
-_gitname='osgearth'
-_gitbranch="osgearth-2.5"
+source=("https://github.com/gwaldron/osgearth/archive/${pkgname}-${pkgver}.tar.gz")
+md5sums=('f3b90d719b23b9e636d3e78d86370ad1')        
 
 build() {
+  cd ${srcdir}/${pkgname}-${pkgname}-${pkgver}
 
-  cd ${srcdir}
-
-  msg "Connecting to ${_gitnam}e GIT server...."
-
-  if [[ -d ${_gitname} ]] ; then
-  	 cd ${_gitname} && git pull origin ${_gitbranch}
-  	 msg "The local files are updated."
-  else
-	   git clone ${_gitroot} --branch ${_gitbranch}
+  #Build
+  if [[ -d "build" ]]; then
+    (rm -rf build)
   fi
 
-  msg "GIT checkout done or server timeout"
-
-  cd ${srcdir}
-  
-  if [ -d "build" ]; then
-    rm -rf build
-  fi
-  
   mkdir build
   cd build
 
-  msg "Starting make..."
-
-  cmake ../${_gitname} \
-  -DMINIZIP_INCLUDE_DIR=/usr/include/minizip \
-  -DOSGEARTH_USE_QT:BOOL=OFF
+  cmake \
+  -DLIB_POSTFIX= \
+  -DCMAKE_INSTALL_PREFIX=/usr \
+  ..
 
-  make -j10
-  
+  make -j5
 }
 
 package() {
-   cd build
-   make DESTDIR=${pkgdir} install
-   mkdir -p ${pkgdir}/usr/local/share/osgearth
-   cp -r $srcdir/${_gitname}/tests ${pkgdir}/usr/local/share/osgearth
-   cp -r $srcdir/${_gitname}/data ${pkgdir}/usr/local/share/osgearth
-   
-   mkdir -p ${startdir}/pkg/${pkgname}/etc/ld.so.conf.d
+  cd ${srcdir}/${pkgname}-${pkgname}-${pkgver}/build
+  make DESTDIR=$pkgdir install
   
-   if [ "$CARCH" = "x86_64" ]; then
-     echo /usr/local/lib64 > "${pkgdir}/etc/ld.so.conf.d/osgearth.conf"
-   else
-     echo /usr/local/lib > "${pkgdir}/etc/ld.so.conf.d/osgearth.conf"
-   fi
-}
+  install -d ${pkgdir}/usr/share/osgearth
+  install -d ${pkgdir}/usr/share/osgearth/test
+  install -d ${pkgdir}/usr/share/osgearth/data
+  install -Dm644 ${srcdir}/${pkgname}-${pkgname}-${pkgver}/tests/* ${pkgdir}/usr/share/osgearth/test
+  cp -rfv ${srcdir}/${pkgname}-${pkgname}-${pkgver}/data/* ${pkgdir}/usr/share/osgearth/data
+}
\ No newline at end of file