freeglut is now optdep

2 files changed, 28 insertions, 26 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 9ac9291bf540..2496d204a193 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = libdart
 	pkgdesc = Dynamic Animation and Robotics Toolkit
 	pkgver = 6.9.1
-	pkgrel = 2
+	pkgrel = 3
 	url = https://dartsim.github.io
 	arch = i686
 	arch = x86_64
@@ -12,10 +12,8 @@ pkgbase = libdart
 	depends = eigen
 	depends = fcl
 	depends = libccd
-	depends = freeglut
 	optdepends = bullet: Bullet collision detection support
 	optdepends = coin-or-ipopt: Ipopt optimizer support
-	optdepends = doxygen: required for building documentation
 	optdepends = flann: planning module support
 	optdepends = nlopt: NLopt optimizer support
 	optdepends = octomap: voxel grid shape support
@@ -24,6 +22,9 @@ pkgbase = libdart
 	optdepends = pagmo: pagmo optimizer support
 	optdepends = tinyxml2: parser support
 	optdepends = urdfdom: urdf parser support
+	optdepends = freeglut: GLUT GUI support
+	optdepends = libxi: GLUT GUI support
+	optdepends = libxmu: GLUT GUI support
 	source = https://github.com/dartsim/dart/archive/v6.9.1.tar.gz
 	sha256sums = 9e2954aaf2d4538a7e4aab5188f1061c3e216c8c0b72483c2d0b9e814525acd1
 
diff --git a/PKGBUILD b/PKGBUILD
index 54f27f8ae6fb..0f33d6ece971 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,18 +1,18 @@
-# Previous Maintainer: Benjamin Chretien <chretien at lirmm dot fr>
-# Previous Maintainer: Gonçalo Camelo Neves Pereira <goncalo_pereira@outlook.pt>
-# Previous Maintainer: midgard <arch dot midgard "at symbol" janmaes "youknowwhat" com>
 # Maintainer: acxz <akashpatel2008 at yahoo dot com>
+# Contributor: Benjamin Chretien <chretien at lirmm dot fr>
+# Contributor: Gonçalo Camelo Neves Pereira <goncalo_pereira@outlook.pt>
+# Contributor: midgard <arch dot midgard "at symbol" janmaes "youknowwhat" com>
+
 pkgname=libdart
 pkgver=6.9.1
-pkgrel=2
+pkgrel=3
 pkgdesc="Dynamic Animation and Robotics Toolkit"
 arch=('i686' 'x86_64')
 url="https://dartsim.github.io"
 license=('BSD')
-depends=('assimp' 'boost' 'eigen' 'fcl' 'libccd' 'freeglut')
+depends=('assimp' 'boost' 'eigen' 'fcl' 'libccd')
 optdepends=('bullet: Bullet collision detection support'
             'coin-or-ipopt: Ipopt optimizer support'
-            'doxygen: required for building documentation'
             'flann: planning module support'
             'nlopt: NLopt optimizer support'
             'octomap: voxel grid shape support'
@@ -20,7 +20,10 @@ optdepends=('bullet: Bullet collision detection support'
             'openscenegraph: required for dart-gui-osg'
             'pagmo: pagmo optimizer support'
             'tinyxml2: parser support'
-            'urdfdom: urdf parser support')
+            'urdfdom: urdf parser support'
+            'freeglut: GLUT GUI support'
+            'libxi: GLUT GUI support'
+            'libxmu: GLUT GUI support')
 makedepends=('cmake')
 _name=dart
 source=(https://github.com/dartsim/${_name}/archive/v${pkgver}.tar.gz)
@@ -29,22 +32,21 @@ sha256sums=('9e2954aaf2d4538a7e4aab5188f1061c3e216c8c0b72483c2d0b9e814525acd1')
 _buildtype="Release"
 
 build() {
-	cd "${srcdir}/${_name}-${pkgver}"
+    cd "${srcdir}/${_name}-${pkgver}"
 
-	msg "Starting CMake (build type: ${_buildtype})"
+    msg "Starting CMake (build type: ${_buildtype})"
 
-	# Create a build directory
-	mkdir -p "${srcdir}/${_name}-${pkgver}/build"
-	cd "${srcdir}/${_name}-${pkgver}/build"
+    # Create a build directory
+    mkdir -p "${srcdir}/${_name}-${pkgver}/build"
+    cd "${srcdir}/${_name}-${pkgver}/build"
 
-	cmake \
-		-DCMAKE_BUILD_TYPE="${_buildtype}" \
-		-DCMAKE_INSTALL_PREFIX="/usr" \
-    -DCMAKE_INSTALL_LIBDIR="lib" \
-    "${srcdir}/${_name}-${pkgver}"
+    cmake .. \
+        -DCMAKE_BUILD_TYPE="${_buildtype}" \
+        -DCMAKE_INSTALL_PREFIX="/usr" \
+        -DCMAKE_INSTALL_LIBDIR="lib" \
 
-	msg "Building the project"
-	make
+    msg "Building the project"
+    make
 }
 
 #check() {
@@ -56,9 +58,8 @@ build() {
 #}
 
 package() {
-	cd "${srcdir}/${_name}-${pkgver}/build"
-
-	msg "Installing files"
-	make DESTDIR="${pkgdir}/" install
+    cd "${srcdir}/${_name}-${pkgver}/build"
 
+    msg "Installing files"
+    make DESTDIR="${pkgdir}/" install
 }