diff options
Diffstat (limited to 'libraries/opencv/opencv.SlackBuild')
| -rw-r--r-- | libraries/opencv/opencv.SlackBuild | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/libraries/opencv/opencv.SlackBuild b/libraries/opencv/opencv.SlackBuild index 70e56b1774..32616f8f9a 100644 --- a/libraries/opencv/opencv.SlackBuild +++ b/libraries/opencv/opencv.SlackBuild @@ -23,7 +23,8 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=opencv -VERSION=${VERSION:-2.4.11} +PRGNAM2=opencv_contrib +VERSION=${VERSION:-3.0.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -60,8 +61,9 @@ rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $PRGNAM-$VERSION -unzip $CWD/$PRGNAM-$VERSION.zip +tar xvf $CWD/$VERSION.tar.gz || tar xvf $CWD/$PRGNAM-$VERSION.tar.gz cd $PRGNAM-$VERSION +unzip $CWD/$VERSION.zip || unzip $CWD/$PRGNAM2-$VERSION.zip chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ @@ -70,10 +72,7 @@ find -L . \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; # http://code.opencv.org/issues/2512 -patch -p1 < $CWD/opencv-2.4.11-fsh.patch - -# https://bugzilla.novell.com/show_bug.cgi?id=853036 -patch -p1 < $CWD/opencv-2.4.11-pkgconfig.patch +patch -p1 < $CWD/fsh.patch mkdir -p build cd build @@ -87,8 +86,10 @@ cd build -DBUILD_SHARED_LIBS=ON \ -DENABLE_PRECOMPILED_HEADERS=OFF \ -DWITH_QT=ON \ + -DWITH_IPP=OFF \ -DLIB_SUFFIX=$LIBDIRSUFFIX \ -DLIB_INSTALL_DIR=/usr/lib$LIBDIRSUFFIX \ + -DOPENCV_EXTRA_MODULES_PATH=$PRGNAM2-$VERSION/modules .. \ .. make VERBOSE=1 make install DESTDIR=$PKG |