Updated omplapp to 1.4.2, still need to work on opt dependencies

3 files changed, 52 insertions, 69 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b87718f1dbb3..bb328612a4f7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,31 +1,24 @@
 pkgbase = omplapp
-	pkgdesc = The Open Motion Planning Library (OMPL) consists of many state-of-the-art sampling-based motion planning algorithms
-	pkgver = 0.14.2
+	pkgdesc = The Open Motion Planning Library App (OMPL.app) is an extended version of OMPL that adds support for mesh loading and collision checking along with a GUI
+	pkgver = 1.4.2
 	pkgrel = 1
 	url = http://ompl.kavrakilab.org/
 	arch = i686
 	arch = x86_64
 	license = BSD
 	makedepends = cmake
-	depends = boost
-	depends = python
-	depends = pyqt
-	depends = python-opengl
 	depends = assimp
-	depends = pqp
-	depends = libccd
+	depends = boost
+	depends = eigen
 	depends = fcl
+	optdepends = doxygen
+	optdepends = ode
+	optdepends = pyqt
+	optdepends = python-opengl
+	optdepends = py++
 	provides = ompl
-	source = https://bitbucket.org/ompl/ompl/downloads/omplapp-0.14.2-Source.tar.gz
-	source = boost_1_56.patch
-	md5sums = c4cd3527630156f284b06d4a33690601
-	md5sums = 8087bef2cfce7d95edee33ae85d3864f
-	sha256sums = 980baf8c8c0ba33d95cc04d7aa33d6a11bf8941dcc78811b51b5466543ca332a
-	sha256sums = 87da05e25991a663a619917b944c6f37623a70e4af700eeb4069a38623ed4558
-	sha384sums = e6b5d5ee11410256e5665a05cd0839a1351e3c37a77b287775fe76c3a2a14e9059a40b161a1cd3a7cc77bc025c979156
-	sha384sums = 080a77a1ee40a9e066ec4d11d53f83d1dce120f601bbb9f4d4324a817e62479a6b8037aa76040ffc6a83ce90fbfa927f
-	sha512sums = 9ab893f702f63e876f58c12558bd2c07194c5c627e981b3990063f8500f70a9fe833dd506f405bdb96bc874936cd3022bb865687a3b18eb3f8f0ddf16cc92747
-	sha512sums = f02e23c6c825577cc8e40eaeab5d9c5420df7923b6d91dbc37244a6e2b149c4e76e4d3b102807e0bcc9777cfd9a6102e7137d46a6b8e131e14c72261b285889a
+	source = https://bitbucket.org/ompl/ompl/downloads/omplapp-1.4.2-Source.tar.gz
+	sha512sums = 04812a659fd81c2c541907911cbf4e5987be034546e8e48ed3d11b2b2f9ad3f7931f15d30a32ce3b64deb66b13875970797ac5072e92bfa0841e8d27d85fcb18
 
 pkgname = omplapp
 
diff --git a/PKGBUILD b/PKGBUILD
index 8690c8e48f5c..c0abe863369f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,57 +1,59 @@
-# Maintainer: Sven Schneider <archlinux.sandmann@googlemail.com>
-
+# Previous Maintainer: Sven Schneider <archlinux.sandmann@googlemail.com>
+# Maintainer: acxz <akashpatel2008 at yahoo dot com>
 pkgname=omplapp
-pkgver=0.14.2
+pkgver=1.4.2
 pkgrel=1
-pkgdesc="The Open Motion Planning Library (OMPL) consists of many state-of-the-art sampling-based motion planning algorithms"
+pkgdesc="The Open Motion Planning Library App (OMPL.app) is an extended version
+of OMPL that adds support for mesh loading and collision checking along with a
+GUI"
 arch=('i686' 'x86_64')
 url="http://ompl.kavrakilab.org/"
 license=('BSD')
-depends=('boost' 'python' 'pyqt' 'python-opengl' 'assimp' 'pqp' 'libccd' 'fcl')
+depends=('assimp'
+         'boost'
+         'eigen'
+         'fcl')
+optdepends=('doxygen'
+            'ode'
+            'pyqt'
+            'python-opengl'
+            'py++')
 makedepends=('cmake')
 provides=(ompl)
-source=(https://bitbucket.org/ompl/ompl/downloads/${pkgname}-${pkgver}-Source.tar.gz
-        boost_1_56.patch)
-md5sums=('c4cd3527630156f284b06d4a33690601'
-         '8087bef2cfce7d95edee33ae85d3864f')
-sha256sums=('980baf8c8c0ba33d95cc04d7aa33d6a11bf8941dcc78811b51b5466543ca332a'
-            '87da05e25991a663a619917b944c6f37623a70e4af700eeb4069a38623ed4558')
-sha384sums=('e6b5d5ee11410256e5665a05cd0839a1351e3c37a77b287775fe76c3a2a14e9059a40b161a1cd3a7cc77bc025c979156'
-            '080a77a1ee40a9e066ec4d11d53f83d1dce120f601bbb9f4d4324a817e62479a6b8037aa76040ffc6a83ce90fbfa927f')
-sha512sums=('9ab893f702f63e876f58c12558bd2c07194c5c627e981b3990063f8500f70a9fe833dd506f405bdb96bc874936cd3022bb865687a3b18eb3f8f0ddf16cc92747'
-            'f02e23c6c825577cc8e40eaeab5d9c5420df7923b6d91dbc37244a6e2b149c4e76e4d3b102807e0bcc9777cfd9a6102e7137d46a6b8e131e14c72261b285889a')
+source=(https://bitbucket.org/ompl/ompl/downloads/omplapp-${pkgver}-Source.tar.gz)
+sha512sums=('04812a659fd81c2c541907911cbf4e5987be034546e8e48ed3d11b2b2f9ad3f7931f15d30a32ce3b64deb66b13875970797ac5072e92bfa0841e8d27d85fcb18')
+
+_buildtype="Release"
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}-Source"
 
-  patch -p 0 -d ompl < ${srcdir}/boost_1_56.patch
-
-  # pkg-config provides <LIB>_INCLUDEDIR instead of <LIB>_INCLUDE_DIRS
-  sed 's/# Check for FCL and CCD installation, otherwise download them./set(CCD_INCLUDE_DIRS ${CCD_INCLUDEDIR})\nset(FCL_INCLUDE_DIRS ${FCL_INCLUDEDIR})/g' -i CMakeModules/UseFCL.cmake
-
-  rm -rf build
-  mkdir build
-  cd build
-	
-  cmake -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DOMPL_BUILD_PYBINDINGS=yes \
-    -DPYTHON_EXEC=/usr/bin/python2 \
-    -DOMPL_REGISTRATION=Off ..
-  make
-}
+  msg "Starting CMake (build type: ${_buildtype})"
 
-check() {
-  cd "${srcdir}/${pkgname}-${pkgver}-Source"
+  # Create a build directory
+  mkdir -p "${srcdir}/${pkgname}-${pkgver}-Source/build"
+  cd "${srcdir}/${pkgname}-${pkgver}-Source/build"
 
-  cd build
-  #make test
+  cmake \
+    -DCMAKE_BUILD_TYPE="${_buildtype}" \
+    -DCMAKE_INSTALL_PREFIX="/usr" \
+    -DCMAKE_INSTALL_LIBDIR="lib" \
+    -DOMPL_REGISTRATION=Off \
+    "${srcdir}/${pkgname}-${pkgver}-Source"
+
+  msg "Building the project"
+  make -j4
 }
 
+#check() {
+#  cd "${srcdir}/${pkgname}-${pkgver}-Source/build"
+#  msg "Running unit tests"
+#  make test
+#}
+
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}-Source"
+  cd "${srcdir}/${pkgname}-${pkgver}-Source/build"
 
-  cd build
-  make DESTDIR=${pkgdir} install
+  msg "Installing files"
+  make DESTDIR="${pkgdir}/" install
 }
-
diff --git a/boost_1_56.patch b/boost_1_56.patch
deleted file mode 100644
index 764ef6605545..000000000000
--- a/boost_1_56.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/ompl/control/ODESolver.h

-+++ src/ompl/control/ODESolver.h

-@@ -318,7 +318,9 @@ namespace ompl

-             {

-                 ODESolver::ODEFunctor odefunc (ode_, control);

- 

--                odeint::controlled_runge_kutta< Solver > solver (odeint::default_error_checker<double>(maxError_, maxEpsilonError_));

-+                odeint::controlled_runge_kutta< Solver > solver (

-+                  odeint::default_error_checker<double,odeint::range_algebra,odeint::default_operations>(maxError_, maxEpsilonError_)

-+                );

-                 odeint::integrate_adaptive (solver, odefunc, state, 0.0, duration, intStep_);

-             }
\ No newline at end of file