Incorporate changes proposed by xsmile

2 files changed, 32 insertions, 7 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 60e85c0d141b..61cace930263 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,10 +1,9 @@
 pkgbase = python-dlib
 	pkgdesc = Dlib is a general purpose cross-platform C++ library designed using contract programming and modern C++ techniques.
 	pkgver = 19.2
-	pkgrel = 1
+	pkgrel = 2
 	url = http://www.dlib.net/
-	arch = i686
-	arch = x86_64
+	arch = any
 	license = Boost Software License
 	makedepends = cmake
 	makedepends = boost
@@ -17,4 +16,8 @@ pkgbase = python-dlib
 	md5sums = 12786b3765cc98193c404ccf3c88c900
 
 pkgname = python-dlib
+	depends = python
+
+pkgname = python2-dlib
+	depends = python2
 
diff --git a/PKGBUILD b/PKGBUILD
index 773568817c2a..36607e85cb81 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,13 +1,15 @@
 # Maintainer: Flávio Zavan <flavio dot zavan at gmail dot com>
 # Contributor: pingplug
 # Contributor: perlawk
+# Contributor: xsmile
 
 pkgname=python-dlib
+pkgname=('python-dlib' 'python2-dlib')
 _pkgname=dlib
 pkgver=19.2
-pkgrel=1
+pkgrel=2
 pkgdesc="Dlib is a general purpose cross-platform C++ library designed using contract programming and modern C++ techniques."
-arch=('i686' 'x86_64')
+arch=('any')
 url="http://www.dlib.net/"
 license=('Boost Software License')
 makedepends=('cmake' 'boost')
@@ -19,7 +21,27 @@ optdepends=('cblas: for BLAS support'
 source=(http://downloads.sourceforge.net/project/dclib/${_pkgname}/v${pkgver}/${_pkgname}-${pkgver}.tar.bz2)
 md5sums=('12786b3765cc98193c404ccf3c88c900')
 
-package() {
+avx_available=''
+if grep -q avx /proc/cpuinfo; then
+  avx_available='--yes USE_AVX_INSTRUCTIONS'
+fi
+
+build(){
+  cd "${srcdir}/${_pkgname}-${pkgver}"
+  python setup.py build $avx_available
+  python2 setup.py build $avx_available
+}
+
+package_python-dlib(){
+  depends=('python')
+
+  cd "${srcdir}/${_pkgname}-${pkgver}"
+  python setup.py install --skip-build --prefix=/usr --root="$pkgdir" --optimize=1
+}
+
+package_python2-dlib(){
+  depends=('python2')
+
   cd "${srcdir}/${_pkgname}-${pkgver}"
-  python setup.py install --prefix=/usr --root="$pkgdir"
+  python2 setup.py install --skip-build --prefix=/usr --root="$pkgdir" --optimize=1
 }