summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorJingbei Li2018-07-16 11:03:21 +0800
committerJingbei Li2018-07-16 11:03:21 +0800
commitd2f4f8a6b49ce47e0fbe38dcf4afc236866bf5b6 (patch)
tree3194593ea97a23ac5c0c61220f166bb7b63992ca
parentfb524825638008968f284aec117c93be4eb2fd03 (diff)
downloadaur-d2f4f8a6b49ce47e0fbe38dcf4afc236866bf5b6.tar.gz
upgraded to 19.15
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD10
2 files changed, 11 insertions, 5 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 51227d0041de..6d5c1402113a 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.13
+ pkgver = 19.15
pkgrel = 1
url = http://www.dlib.net/
arch = x86_64
@@ -20,8 +20,8 @@ pkgbase = python-dlib
optdepends = libjpeg-turbo
optdepends = libpng
optdepends = sqlite
- source = http://www.dlib.net//files/dlib-19.13.tar.bz2
- md5sums = 69d806dea72789f1c0f43843f4007776
+ source = http://www.dlib.net//files/dlib-19.15.tar.bz2
+ md5sums = 7f168578b024689be707d6dde5cfa0e9
pkgname = python-dlib
depends = libx11
diff --git a/PKGBUILD b/PKGBUILD
index ab07f81f6da5..cda4878234a3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -9,7 +9,7 @@ pkgname=python-dlib
#pkgname=('python-dlib' 'python2-dlib' 'python-dlib-cuda' 'python2-dlib-cuda')
pkgname=('python-dlib' 'python2-dlib')
_pkgname=dlib
-pkgver=19.13
+pkgver=19.15
pkgrel=1
pkgdesc="Dlib is a general purpose cross-platform C++ library designed using contract programming and modern C++ techniques."
arch=('x86_64')
@@ -20,7 +20,7 @@ depends=('libx11')
optdepends=('cblas' 'lapack' 'libjpeg-turbo' 'libpng' 'sqlite')
makedepends=(${optdepends[@]} 'cmake' 'boost' 'python-setuptools' 'python2-setuptools')
source=("$url/files/${_pkgname}-${pkgver}.tar.bz2")
-md5sums=('69d806dea72789f1c0f43843f4007776')
+md5sums=('7f168578b024689be707d6dde5cfa0e9')
prepare() {
cd "$srcdir/"
@@ -63,12 +63,18 @@ package_python2-dlib(){
}
package_python-dlib-cuda(){
depends+=('cuda' 'cudnn' 'python')
+ conflicts=('python-dlib')
+ provides=('python-dlib')
+ replaces=('python-dlib')
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
}