upgraded to 19.20

2 files changed, 12 insertions, 50 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e315b7e69e37..a0c579bcfedb 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = python-dlib
 	pkgdesc = Dlib is a general purpose cross-platform C++ library designed using contract programming and modern C++ techniques.
-	pkgver = 19.18
+	pkgver = 19.20
 	pkgrel = 1
 	url = http://www.dlib.net/
 	arch = x86_64
@@ -9,7 +9,6 @@ pkgbase = python-dlib
 	makedepends = cmake
 	makedepends = boost
 	makedepends = python-setuptools
-	makedepends = python2-setuptools
 	depends = cblas
 	depends = giflib
 	depends = lapack
@@ -17,8 +16,8 @@ pkgbase = python-dlib
 	depends = libpng
 	depends = libx11
 	optdepends = sqlite
-	source = http://www.dlib.net//files/dlib-19.18.tar.bz2
-	md5sums = b605c7e5d484346093d9de5a7ff0117f
+	source = http://www.dlib.net//files/dlib-19.20.tar.bz2
+	md5sums = aba1817d9ad3cfa8be9d052c2319335d
 
 pkgname = python-dlib
 	depends = cblas
@@ -29,12 +28,3 @@ pkgname = python-dlib
 	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 1df0ed72da95..a7ddc5369b63 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,11 +5,11 @@
 # Contributor: perlawk
 # Contributor: xsmile
 
-pkgname=python-dlib
-pkgname=('python-dlib' 'python2-dlib')
-#pkgname+=('python-dlib-cuda' 'python2-dlib-cuda')
+pkgbase=python-dlib
+pkgname=('python-dlib')
+#pkgname+=('python-dlib-cuda')
 _pkgname=dlib
-pkgver=19.18
+pkgver=19.20
 pkgrel=1
 pkgdesc="Dlib is a general purpose cross-platform C++ library designed using contract programming and modern C++ techniques."
 arch=('x86_64')
@@ -18,37 +18,23 @@ 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')
+makedepends=(${optdepends[@]} 'cmake' 'boost' 'python-setuptools')
 source=("$url/files/${_pkgname}-${pkgver}.tar.bz2")
-md5sums=('b605c7e5d484346093d9de5a7ff0117f')
+md5sums=('aba1817d9ad3cfa8be9d052c2319335d')
 
 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 --no DLIB_USE_CUDA
 
-	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"
-	#python setup.py build $cuda_flags --yes 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=/opt/cuda/bin/gcc'
 
-	#cd "${srcdir}/${_pkgname}-${pkgver}-py2-cuda"
-	#python2 setup.py build $cuda_flags --yes DLIB_USE_CUDA
+#	cd "${srcdir}/${_pkgname}-${pkgver}-cuda"
+#	python setup.py build $cuda_flags --yes DLIB_USE_CUDA
 }
 
 
@@ -58,11 +44,6 @@ package_python-dlib(){
 	python setup.py install --skip-build --prefix=/usr --root="$pkgdir" --optimize=1
 }
 
-package_python2-dlib(){
-	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')
 	conflicts=('python-dlib')
@@ -71,12 +52,3 @@ package_python-dlib-cuda(){
 	cd "${srcdir}/${_pkgname}-${pkgver}-cuda"
 	python setup.py install --skip-build --prefix=/usr --root="$pkgdir" --optimize=1
 }
-
-package_python2-dlib-cuda(){
-	depends+=('cuda' 'cudnn' 'python2')
-	conflicts=('python2-dlib')
-	provides=('python2-dlib')
-	replaces=('python2-dlib')
-	cd "${srcdir}/${_pkgname}-${pkgver}-py2-cuda"
-	python2 setup.py install --skip-build --prefix=/usr --root="$pkgdir" --optimize=1
-}