upgraded to 19.13

3 files changed, 78 insertions, 35 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 5c02398ccebb..e326eada79d2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,23 +1,37 @@
 pkgbase = python-dlib
 	pkgdesc = Dlib is a general purpose cross-platform C++ library designed using contract programming and modern C++ techniques.
-	pkgver = 19.4
+	pkgver = 19.13
 	pkgrel = 1
 	url = http://www.dlib.net/
-	arch = any
+	arch = x84_64
 	license = Boost Software License
+	makedepends = cblas
+	makedepends = cuda
+	makedepends = cudnn
+	makedepends = lapack
+	makedepends = libjpeg-turbo
+	makedepends = libpng
+	makedepends = sqlite
 	makedepends = cmake
 	makedepends = boost
-	optdepends = cblas: for BLAS support
-	optdepends = lapack: for LAPACK support
-	optdepends = libjpeg-turbo: for JPEG support
-	optdepends = libpng: for PNG support
-	optdepends = sqlite: for sqlite support
-	source = http://downloads.sourceforge.net/project/dclib/dlib/v19.4/dlib-19.4.tar.bz2
-	md5sums = 8999c4cbc71e92325fcdbe222e2bf327
+	makedepends = python-setuptools
+	makedepends = python2-setuptools
+	depends = libx11
+	optdepends = cblas
+	optdepends = cuda
+	optdepends = cudnn
+	optdepends = lapack
+	optdepends = libjpeg-turbo
+	optdepends = libpng
+	optdepends = sqlite
+	source = http://www.dlib.net//files/dlib-19.13.tar.bz2
+	md5sums = 69d806dea72789f1c0f43843f4007776
 
 pkgname = python-dlib
+	depends = libx11
 	depends = python
 
 pkgname = python2-dlib
+	depends = libx11
 	depends = python2
 
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..147300718820
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,3 @@
+*/
+*.log
+*.tar*
diff --git a/PKGBUILD b/PKGBUILD
index b493e45d577f..5a1df7a72c63 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,47 +1,73 @@
-# Maintainer: Flávio Zavan <flavio dot zavan at gmail dot com>
+# Maintainer: Jingbei Li <i@jingbei.li>
+# Contributor: Lev Velykoivanenko <velykoivanenko dot lev at gmail dot com>
+# Contributor: Flávio Zavan <flavio dot zavan at gmail dot com>
 # Contributor: pingplug
 # Contributor: perlawk
 # Contributor: xsmile
 
 pkgname=python-dlib
+#pkgname=('python-dlib' 'python2-dlib' 'python-dlib-cuda' 'python2-dlib-cuda')
 pkgname=('python-dlib' 'python2-dlib')
 _pkgname=dlib
-pkgver=19.4
+pkgver=19.13
 pkgrel=1
 pkgdesc="Dlib is a general purpose cross-platform C++ library designed using contract programming and modern C++ techniques."
-arch=('any')
+arch=('x84_64')
 url="http://www.dlib.net/"
 license=('Boost Software License')
-makedepends=('cmake' 'boost')
-optdepends=('cblas: for BLAS support'
-            'lapack: for LAPACK support'
-            'libjpeg-turbo: for JPEG support'
-            'libpng: for PNG support'
-            'sqlite: for sqlite support')
-source=(http://downloads.sourceforge.net/project/dclib/${_pkgname}/v${pkgver}/${_pkgname}-${pkgver}.tar.bz2)
-md5sums=('8999c4cbc71e92325fcdbe222e2bf327')
-
-avx_available=''
-if grep -q avx /proc/cpuinfo; then
-  avx_available='--yes USE_AVX_INSTRUCTIONS'
-fi
+depends=('libx11')
+optdepends=('cblas' 'cuda' 'cudnn' 'lapack' 'libjpeg-turbo' 'libpng' 'sqlite')
+makedepends=(${optdepends[@]} 'cmake' 'boost' 'python-setuptools' 'python2-setuptools')
+source=("$url/files/${_pkgname}-${pkgver}.tar.bz2")
+md5sums=('69d806dea72789f1c0f43843f4007776')
+
+prepare() {
+	cd "$srcdir/"
+	cp -a "${_pkgname}-${pkgver}" "${_pkgname}-${pkgver}-cuda"
+
+	cp -a "${_pkgname}-${pkgver}" "${_pkgname}-${pkgver}-py2"
+	sed -e "s|#![ ]*/usr/bin/python$|#!/usr/bin/python2|" \
+	-e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" \
+	-e "s|#![ ]*/bin/env python$|#!/usr/bin/env python2|" \
+	-i $(find "${_pkgname}-${pkgver}-py2" -name '*.py')
+
+	cp -a "${_pkgname}-${pkgver}-py2" "${_pkgname}-${pkgver}-py2-cuda"
+}
 
 build(){
-  cd "${srcdir}/${_pkgname}-${pkgver}"
-  python setup.py build $avx_available
-  python2 setup.py build $avx_available
+	cd "${srcdir}/${_pkgname}-${pkgver}"
+	python setup.py build --no DLIB_USE_CUDA
+
+	cd "${srcdir}/${_pkgname}-${pkgver}-py2"
+	python2 setup.py build --no DLIB_USE_CUDA
+
+	cd "${srcdir}/${_pkgname}-${pkgver}-cuda"
+	CC=gcc-7 CXX=g++-7 python setup.py build --yes DLIB_USE_CUDA
+
+	cd "${srcdir}/${_pkgname}-${pkgver}-py2-cuda"
+	CC=gcc-7 CXX=g++-7 python2 setup.py build --yes DLIB_USE_CUDA
 }
 
-package_python-dlib(){
-  depends=('python')
 
-  cd "${srcdir}/${_pkgname}-${pkgver}"
-  python setup.py install --skip-build --prefix=/usr --root="$pkgdir" --optimize=1
+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')
+	depends+=('python2')
+	cd "${srcdir}/${_pkgname}-${pkgver}-py2"
+	python2 setup.py install --skip-build --prefix=/usr --root="$pkgdir" --optimize=1
+}
+package_python-dlib-cuda(){
+	depends+=('cuda' 'cudnn' 'python')
+	cd "${srcdir}/${_pkgname}-${pkgver}-cuda"
+	python setup.py install --skip-build --prefix=/usr --root="$pkgdir" --optimize=1
+}
 
-  cd "${srcdir}/${_pkgname}-${pkgver}"
-  python2 setup.py install --skip-build --prefix=/usr --root="$pkgdir" --optimize=1
+package_python2-dlib-cuda(){
+	depends+=('cuda' 'cudnn' 'python2')
+	cd "${srcdir}/${_pkgname}-${pkgver}-py2-cuda"
+	python2 setup.py install --skip-build --prefix=/usr --root="$pkgdir" --optimize=1
 }