summaryrefslogtreecommitdiffstats
path: root/libraries/opencv/opencv.SlackBuild
diff options
context:
space:
mode:
Diffstat (limited to 'libraries/opencv/opencv.SlackBuild')
-rw-r--r--libraries/opencv/opencv.SlackBuild22
1 files changed, 11 insertions, 11 deletions
diff --git a/libraries/opencv/opencv.SlackBuild b/libraries/opencv/opencv.SlackBuild
index 525dd6f62a..5ba0adf481 100644
--- a/libraries/opencv/opencv.SlackBuild
+++ b/libraries/opencv/opencv.SlackBuild
@@ -2,7 +2,7 @@
# Slackware build script for opencv
-# Copyright 2012 Matt Dinslage, Springfield, MO USA
+# Copyright 2012-2014 Matt Dinslage, Springfield, MO USA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=opencv
-VERSION=${VERSION:-2.4.8}
+VERSION=${VERSION:-2.4.9}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -64,16 +64,16 @@ tar xvf $CWD/$PRGNAM-$VERSION.tar.gz || tar xvf $CWD/$VERSION.tar.gz
cd $PRGNAM-$VERSION
chown -R root:root .
find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+ -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
# http://code.opencv.org/issues/2512
-patch -p1 < $CWD/opencv-2.4.7-fsh.patch
+patch -p1 < $CWD/opencv-2.4.9-fsh.patch
# https://bugzilla.novell.com/show_bug.cgi?id=853036
-patch -p1 < $CWD/opencv-2.4.7-pkgconfig.patch
+patch -p1 < $CWD/opencv-2.4.9-pkgconfig.patch
mkdir -p build
cd build
@@ -94,11 +94,11 @@ cd build
make install DESTDIR=$PKG
cd ..
-find $PKG | xargs file | grep -e "executable" -e "shared object" \
- | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+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
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a README.md doc/license.txt $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a README.md $PKG/usr/doc/$PRGNAM-$VERSION
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
mkdir -p $PKG/install