upgraded to 19.16

2 files changed, 30 insertions, 21 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6d5c1402113a..eca188a0c642 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,33 +1,40 @@
 pkgbase = python-dlib
 	pkgdesc = Dlib is a general purpose cross-platform C++ library designed using contract programming and modern C++ techniques.
-	pkgver = 19.15
+	pkgver = 19.16
 	pkgrel = 1
 	url = http://www.dlib.net/
 	arch = x86_64
-	license = Boost Software License
-	makedepends = cblas
-	makedepends = lapack
-	makedepends = libjpeg-turbo
-	makedepends = libpng
+	license = Boost
 	makedepends = sqlite
 	makedepends = cmake
 	makedepends = boost
 	makedepends = python-setuptools
 	makedepends = python2-setuptools
+	depends = cblas
+	depends = giflib
+	depends = lapack
+	depends = libjpeg-turbo
+	depends = libpng
 	depends = libx11
-	optdepends = cblas
-	optdepends = lapack
-	optdepends = libjpeg-turbo
-	optdepends = libpng
 	optdepends = sqlite
-	source = http://www.dlib.net//files/dlib-19.15.tar.bz2
-	md5sums = 7f168578b024689be707d6dde5cfa0e9
+	source = http://www.dlib.net//files/dlib-19.16.tar.bz2
+	md5sums = 39c2b238de3eff6aa90a96120d63ebfc
 
 pkgname = python-dlib
+	depends = cblas
+	depends = giflib
+	depends = lapack
+	depends = libjpeg-turbo
+	depends = libpng
 	depends = libx11
 	depends = python
 
 pkgname = python2-dlib
+	depends = cblas
+	depends = giflib
+	depends = lapack
+	depends = libjpeg-turbo
+	depends = libpng
 	depends = libx11
 	depends = python2
 
diff --git a/PKGBUILD b/PKGBUILD
index cda4878234a3..a886fb1e2096 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,21 +6,21 @@
 # Contributor: xsmile
 
 pkgname=python-dlib
-#pkgname=('python-dlib' 'python2-dlib' 'python-dlib-cuda' 'python2-dlib-cuda')
 pkgname=('python-dlib' 'python2-dlib')
+#pkgname+=('python-dlib-cuda' 'python2-dlib-cuda')
 _pkgname=dlib
-pkgver=19.15
+pkgver=19.16
 pkgrel=1
 pkgdesc="Dlib is a general purpose cross-platform C++ library designed using contract programming and modern C++ techniques."
 arch=('x86_64')
 url="http://www.dlib.net/"
-license=('Boost Software License')
-depends=('libx11')
-#optdepends=('cblas' 'cuda' 'cudnn' 'lapack' 'libjpeg-turbo' 'libpng' 'sqlite')
-optdepends=('cblas' 'lapack' 'libjpeg-turbo' 'libpng' 'sqlite')
+license=('Boost')
+depends=('cblas' 'giflib' 'lapack' 'libjpeg-turbo' 'libpng' 'libx11')
+optdepends=('sqlite')
+#optdepends+=('cuda' 'cudnn' 'ccache-ext')
 makedepends=(${optdepends[@]} 'cmake' 'boost' 'python-setuptools' 'python2-setuptools')
 source=("$url/files/${_pkgname}-${pkgver}.tar.bz2")
-md5sums=('7f168578b024689be707d6dde5cfa0e9')
+md5sums=('39c2b238de3eff6aa90a96120d63ebfc')
 
 prepare() {
 	cd "$srcdir/"
@@ -42,11 +42,13 @@ build(){
 	cd "${srcdir}/${_pkgname}-${pkgver}-py2"
 	python2 setup.py build --no DLIB_USE_CUDA
 
+	#cuda_flags='--set CUDA_HOST_COMPILER=/opt/cuda/bin/gcc --set CUDA_NVCC_EXECUTABLE=/usr/lib/ccache/bin/nvcc-ccache --set CUDA_HOST_COMPILER=/usr/lib/ccache/bin/gcc-7'
+
 	#cd "${srcdir}/${_pkgname}-${pkgver}-cuda"
-	#CC=gcc-7 CXX=g++-7 python setup.py build --yes DLIB_USE_CUDA
+	#python setup.py build $cuda_flags --yes DLIB_USE_CUDA
 
 	#cd "${srcdir}/${_pkgname}-${pkgver}-py2-cuda"
-	#CC=gcc-7 CXX=g++-7 python2 setup.py build --yes DLIB_USE_CUDA
+	#python2 setup.py build $cuda_flags --yes DLIB_USE_CUDA
 }