sci-libs/dlib: fixed more cuda stuff

Package-Manager: Portage-2.3.6, Repoman-2.3.3

diff --git a/sci-libs/dlib/dlib-19.4.ebuild b/sci-libs/dlib/dlib-19.4.ebuild
index 9d44e7177a757e8e648feffdb8bd1022fdf94e37..c6116343a93b5568835ae6426153ba1d53cbec90 100644 (file)
--- a/sci-libs/dlib/dlib-19.4.ebuild
+++ b/sci-libs/dlib/dlib-19.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit cmake-utils
+inherit cmake-utils cuda
 
 DESCRIPTION="Numerical and networking C++ library"
 HOMEPAGE="http://dlib.net/"
@@ -19,20 +19,22 @@ IUSE="cblas debug cuda examples gif jpeg lapack mkl png
 
 RDEPEND="
        cblas? ( virtual/cblas:= )
-       cuda? ( >=dev-util/nvidia-cuda-toolkit-7 )
+       cuda? ( dev-libs/cudnn:= )
        jpeg? ( virtual/jpeg:0= )
        lapack? ( virtual/lapack:= )
-       mkl? ( sci-libs/mkl )
+       mkl? ( sci-libs/mkl:= )
        png? ( media-libs/libpng:0= )
        sqlite? ( dev-db/sqlite:3= )
-       X? ( x11-libs/libX11 )
+       X? ( x11-libs/libX11:= )
 "
 DEPEND="test? ( ${RDEPEND} )"
 
 src_prepare() {
+       use cuda && cuda_src_prepare
        cmake-utils_src_prepare
        sed -i -e '/LICENSE.txt/d' dlib/CMakeLists.txt || die
 }
+
 src_configure() {
        local mycmakeargs=(
                -DLIB_INSTALL_DIR="$(get_libdir)"

diff --git a/sci-libs/dlib/metadata.xml b/sci-libs/dlib/metadata.xml
index 3d2eccafb59b6fa2949bdd3ec7e3fca6f34aa63d..422f29c52e5ae4b15c08283e14a2be4a2f6843b5 100644 (file)
--- a/sci-libs/dlib/metadata.xml
+++ b/sci-libs/dlib/metadata.xml
@@ -13,7 +13,7 @@
   </longdescription>
   <use>
     <flag name="cblas">Build with CBLAS <pkg>virtual/cblas</pkg></flag>
-    <flag name="cuda">Enable support for CUDA for GPU (cuDNN)</flag>
+    <flag name="cuda">Enable support for CUDA for Deep Neural Networks (cuDNN) on GPU (experimental)</flag>
     <flag name="mkl">Enable support for Intel FFT <pkg>sci-libs/mkl</pkg></flag>
   </use>
   <upstream>