Updated to 6.6

2 files changed, 45 insertions, 56 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 20fb2b2a8fa6..03c627507b7b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = orfeo-toolbox
 	pkgdesc = ORFEO Toolbox (OTB) is an open source library of image processing algorithms
-	pkgver = 6.4.0
+	pkgver = 6.6.0
 	pkgrel = 1
 	url = http://www.orfeo-toolbox.org/otb/
 	arch = x86_64
@@ -9,6 +9,7 @@ pkgbase = orfeo-toolbox
 	makedepends = boost
 	makedepends = swig
 	makedepends = cmake
+	makedepends = qt4
 	depends = gdal
 	depends = agg
 	depends = freeglut
@@ -30,9 +31,9 @@ pkgbase = orfeo-toolbox
 	depends = opencv
 	depends = glfw
 	depends = openmpi
-	source = https://www.orfeo-toolbox.org/packages/OTB-6.4.0.tar.gz
+	source = https://www.orfeo-toolbox.org/packages/OTB-6.6.0.tar.gz
 	source = git://github.com/jmichel-otb/GKSVM.git
-	md5sums = 8ee478aa279f427fd1c38613b1e01978
+	md5sums = 0c5cf6ab4d41db83489eb2dd05a833b1
 	md5sums = SKIP
 
 pkgname = orfeo-toolbox
diff --git a/PKGBUILD b/PKGBUILD
index 877f7c62b3c2..4741a28b3ff4 100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,8 +2,8 @@
 # Contributor: Samuel Mesa <samuelmesa@linuxmail.org>
 
 pkgname=orfeo-toolbox
-pkgver=6.4.0
-_pkgver=6.4
+pkgver=6.6.0
+_pkgver=6.6
 minorver=0
 pkgrel=1
 pkgdesc="ORFEO Toolbox (OTB) is an open source library of image processing algorithms"
@@ -13,7 +13,7 @@ license=('CeCILL')
 groups=()
 depends=('gdal' 'agg' 'freeglut' 'curl' 'fftw' 'tinyxml' 'muparser' 'fltk' 'python2' 'openthreads' 'boost'
 		'hdf5'  'insight-toolkit' 'libkml' 'ossim' 'libsvm' 'mapnik' 'qwt-qt4' 'opencv' 'glfw' 'openmpi')
-makedepends=('boost' 'swig' 'cmake')
+makedepends=('boost' 'swig' 'cmake' 'qt4')
 optdepends=()
 provides=()
 conflicts=()
@@ -27,7 +27,7 @@ source=(https://www.orfeo-toolbox.org/packages/OTB-$pkgver.tar.gz
 		git://github.com/jmichel-otb/GKSVM.git)
 noextract=()
 
-md5sums=('8ee478aa279f427fd1c38613b1e01978'
+md5sums=('0c5cf6ab4d41db83489eb2dd05a833b1'
          'SKIP')
 
 
@@ -41,62 +41,50 @@ prepare() {
 
 build() {  
   cd $srcdir/  
-  msg "Extracting archive..." 
+  msg "Extracting archive..."
   msg "starting make..."
-  
+ 
   if  [ -d "$srcdir/build/" ]; then
-   rm -rf $srcdir/build/
-  fi
-  
- mkdir $srcdir/build/
-
- cd $srcdir/build
-
- cmake ../OTB-release-$_pkgver \
--DCMAKE_BUILD_TYPE=Release \
--DCMAKE_CXX_FLAGS="$CXXFLAGS -fPIC -O3" \
--DCMAKE_C_FLAGS="$CFLAGS -fPIC -O3" \
--DCMAKE_INSTALL_PREFIX=/usr \
--DOTB_USE_CURL=ON \
--DBUILD_EXAMPLES=OFF \
--DBUILD_TESTING=OFF \
--DOTB_WRAP_PYTHON=ON \
--DPYTHON_EXECUTABLE=/usr/bin/python2 \
--DPYTHON_LIBRARIES=/usr/lib/libpython2.7.so \
--DPYTHON_INCLUDE_PATH=/usr/include/python2.7/ \
--DOTB_INSTALL_PYTHON_DIR=/usr/lib/python2.7/site-packages/ \
--DBUILD_SHARED_LIBS=ON \
--DOTB_USE_QT4=ON \
--DOTB_USE_MAPNIK=OFF \
--DOTB_USE_OPENCV=ON \
--DOTB_USE_MUPARSER=ON \
--DOTB_USE_LIBKML=ON \
--DOTB_USE_LIBSVM=ON \
--DOTB_USE_OPENGL=ON \
--DOTB_USE_GLUT=ON \
--DOTB_DATA_USE_LARGEINPUT=ON \
--DOTB_BUILD_ALL_MODULES_FOR_TESTS=ON \
--DOTB_USE_GLEW=ON \
--DOTB_USE_QWT=ON \
--DOTB_USE_GLFW=ON \
--DOTB_USE_MPI=ON \
--DOTB_USE_MUPARSERX=OFF \
--DQWT_INCLUDE_DIR=/usr/include/qwt-qt4 \
--DQWT_LIBRARY=/usr/lib/libqwt-qt4.so
-
-make   
+    rm -rf $srcdir/build/
+   fi
+  mkdir $srcdir/build/
+ 
+   cd $srcdir/build
+ 
+  cmake ../OTB-release-$_pkgver \
+  -DCMAKE_BUILD_TYPE=Release \
+      -DCMAKE_CXX_FLAGS="$CXXFLAGS -fPIC" \
+      -DCMAKE_C_FLAGS="$CFLAGS -fPIC" \
+          -DCMAKE_INSTALL_PREFIX=/usr \
+          -DOTB_USE_CURL=ON \
+          -DBUILD_EXAMPLES=OFF \
+          -DBUILD_TESTING=OFF \
+          -DOTB_WRAP_PYTHON=ON \
+          -DPYTHON_EXECUTABLE=/usr/bin/python2 \
+          -DPYTHON_LIBRARIES=/usr/lib/libpython2.7.so \
+          -DPYTHON_INCLUDE_PATH=/usr/include/python2.7/ \
+          -DOTB_INSTALL_PYTHON_DIR=/usr/lib/python2.7/site-packages/ \
+          -DITK_DIR=/usr/lib64/cmake/ITK-4.8 \
+          -DBUILD_SHARED_LIBS=ON \
+          -DOTB_USE_QT4=ON \
+          -DOTB_USE_MAPNIK=OFF \
+          -DOTB_USE_OPENCV=ON \
+          -DOTB_USE_MUPARSER=ON \
+          -DOTB_USE_LIBKML=ON \
+          -DOTB_USE_LIBSVM=ON \
+          -DOTB_DATA_USE_LARGEINPUT=ON
+         
+  make
+ 
 }
-
+ 
 package() {
   # Install an ldconfig conf for Orfeo libs to be visible on the
   # system. Arch runs `ldconfig' after install automatically:
-  echo "/usr/lib/otb  /usr/lib/otb/applications" > "${srcdir}/${pkgname}.conf"
-  echo "export OTB_APPLICATION_PATH=/usr/lib/otb/applications/" > "${srcdir}/${pkgname}.sh"
-
-  
+  echo "/usr/lib/otb
+ /usr/lib/otb/applications" > "${srcdir}/${pkgname}.conf"
   install -D -m644 "${srcdir}/${pkgname}.conf" "${pkgdir}/etc/ld.so.conf.d/${pkgname}.conf"
-  install -D -m755 "${srcdir}/${pkgname}.sh" "${pkgdir}/etc/profile.d/${pkgname}.sh"
-  
+ 
   cd "$srcdir/"build
   make DESTDIR="$pkgdir" install
 }