Update version 2.12.0

4 files changed, 14 insertions, 14 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 5b56d4945208..3bb282804edb 100644..100755
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = ossim
 	pkgdesc = OSSIM is a powerful suite of geospatial libraries and applications used to process imagery, maps, terrain, and vector data.
-	pkgver = 2.11.1
+	pkgver = 2.12.0
 	pkgrel = 1
 	url = http://www.ossim.org
 	install = ossim.install
@@ -20,7 +20,7 @@ pkgbase = ossim
 	depends = minizip
 	depends = expat
 	depends = ffmpeg
-	depends = qt4
+	depends = qt5-base
 	depends = podofo
 	depends = bzip2
 	depends = freetype2
@@ -28,9 +28,9 @@ pkgbase = ossim
 	optdepends = java-environment-common
 	optdepends = openmpi
 	optdepends = gpstk-bin
-	source = https://github.com/ossimlabs/ossim/archive/OrchidIsland-2.11.1.tar.gz
+	source = https://github.com/ossimlabs/ossim/archive/2.12.0.tar.gz
 	source = ossim.sh
-	md5sums = 7a24fe73e990e0d0f286b5675c0ab6e7
+	md5sums = 6b5930d3eca47555f4031480f8dc8847
 	md5sums = cb85c216a099b10f057cddeeae4a57fb
 
 pkgname = ossim
diff --git a/PKGBUILD b/PKGBUILD
index 8431f9f76bd5..424f8ee082e0 100644..100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,21 +3,21 @@
 # Contributor: Christian Wygoda <accounts@wygoda.net>
 
 pkgname=ossim
-_pkgname=OrchidIsland
-pkgver=2.11.1
+_pkgname=ossim
+pkgver=2.12.0
 pkgrel=1
 pkgdesc="OSSIM is a powerful suite of geospatial libraries and applications used to process imagery, maps, terrain, and vector data."
 url="http://www.ossim.org"
 license=('LGPL')
 arch=('i686' 'x86_64')
 depends=('freetype2' 'gdal' 'libgeotiff' 'libjpeg' 'libtiff' 'openthreads' 'openjpeg'  'doxygen' 
-'hdf5-cpp-fortran' 'minizip' 'expat' 'ffmpeg' 'qt4' 'podofo' 'bzip2' 'freetype2' 'pdal')
+'hdf5-cpp-fortran' 'minizip' 'expat' 'ffmpeg' 'qt5-base' 'podofo' 'bzip2' 'freetype2' 'pdal')
 makedepends=('cmake')
 optdepends=( 'java-environment-common' 'openmpi' 'gpstk-bin' )
-source=(https://github.com/ossimlabs/ossim/archive/${_pkgname}-${pkgver}.tar.gz
+source=(https://github.com/ossimlabs/ossim/archive/${pkgver}.tar.gz
         ossim.sh )
 install=ossim.install
-md5sums=('7a24fe73e990e0d0f286b5675c0ab6e7'
+md5sums=('6b5930d3eca47555f4031480f8dc8847'
          'cb85c216a099b10f057cddeeae4a57fb')
 
 build() {
@@ -31,8 +31,8 @@ build() {
   mkdir $srcdir/build
   cd $srcdir/build
 
-  OSSIM_DEV_HOME="$srcdir/${pkgname}-${_pkgname}-${pkgver}";
-  buildir="$srcdir/${pkgname}-${_pkgname}-${pkgver}";
+  OSSIM_DEV_HOME="$srcdir/${pkgname}-${pkgver}";
+  buildir="$srcdir/${pkgname}-${pkgver}";
 
   cmake -G "Unix Makefiles" \
   -DCMAKE_BUILD_TYPE=Release \
@@ -56,16 +56,16 @@ build() {
   -DBUILD_OSSIM_WMS=ON \
   -DBUILD_SHARED_LIBS=ON \
   -DBUILD_PDAL_PLUGIN=ON \
-  $srcdir/${pkgname}-${_pkgname}-${pkgver} \
+  $buildir \
 
-  make
+  make -j$(nproc)
 }
 
 
 package() {
 
   cd $srcdir/build
-  buildir="$srcdir/${pkgname}-${_pkgname}-${pkgver}";
+  buildir="$srcdir/${pkgname}-${pkgver}";
   make DESTDIR=${pkgdir} install || return 1  
 
   sed -i -e 's|epsg_database_file1: $(OSSIM_DATA)/ossim/share/ossim/projection/ossim_epsg_projections-v7_4.csv|epsg_database_file1: $(OSSIM_DATA)/projection/ossim_epsg_projections-v7_4.csv|g' \
diff --git a/ossim.install b/ossim.install
index 4777ffa67d45..4777ffa67d45 100644..100755
--- a/ossim.install
+++ b/ossim.install
diff --git a/ossim.sh b/ossim.sh
index 986f8e9cc7a4..986f8e9cc7a4 100644..100755
--- a/ossim.sh
+++ b/ossim.sh