From cf6566dd6460166719c15e4126bb7469a6eccb57 Mon Sep 17 00:00:00 2001 From: Christoph Willing Date: Fri, 2 Dec 2016 22:33:37 +1000 Subject: libraries/opencv: Include samples only if CVDOS is set Signed-off-by: Christoph Willing Signed-off-by: Willy Sudiarto Raharjo --- libraries/opencv/opencv.SlackBuild | 8 +++++--- libraries/opencv/opencv.info | 4 ++-- 2 files changed, 7 insertions(+), 5 deletions(-) (limited to 'libraries/opencv') diff --git a/libraries/opencv/opencv.SlackBuild b/libraries/opencv/opencv.SlackBuild index c1e8c716f753..8aef68edb519 100644 --- a/libraries/opencv/opencv.SlackBuild +++ b/libraries/opencv/opencv.SlackBuild @@ -27,7 +27,7 @@ PRGNAM=opencv PRGNAM2=opencv_contrib VERSION=${VERSION:-3.1.0} -BUILD=${BUILD:-2} +BUILD=${BUILD:-3} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then @@ -118,8 +118,10 @@ cd .. find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true -cp -a samples/java* samples/opencl* samples/opengl* $PKG/usr/share/opencv/samples -chmod -R 0755 $PKG/usr/share/opencv/samples/{python*,opencl*,opengl*} +[ "${CVDOCS:-yes}" = "yes" ] && { + cp -a samples/java* samples/opencl* samples/opengl* $PKG/usr/share/opencv/samples + chmod -R 0755 $PKG/usr/share/opencv/samples +} mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a README.md $PKG/usr/doc/$PRGNAM-$VERSION diff --git a/libraries/opencv/opencv.info b/libraries/opencv/opencv.info index c92d8bd72f40..98089398139e 100644 --- a/libraries/opencv/opencv.info +++ b/libraries/opencv/opencv.info @@ -3,10 +3,10 @@ VERSION="3.1.0" HOMEPAGE="http://opencv.org/" DOWNLOAD="https://github.com/Itseez/opencv/archive/3.1.0/opencv-3.1.0.tar.gz \ https://github.com/Itseez/opencv_contrib/archive/3.1.0/opencv_contrib-3.1.0.zip \ - http://sourceforge.net/projects/plantuml/files/plantuml.jar" + http://sourceforge.net/projects/plantuml/files/plantuml.8051.jar" MD5SUM="70e1dd07f0aa06606f1bc0e3fa15abd3 \ 0d0bfeabe539542791b465ec1c7c90e6 \ - cf7cf91a910eeee1a0a9bbff9ca00e22" + 6ee8103fed6ad731fff2323cb28da848" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" -- cgit v1.2.3