diff options
| author | Ricardson Williams <ricardsonwilliams@yahoo.com.br> | 2010-05-13 00:32:34 +0200 |
|---|---|---|
| committer | Michiel van Wessem <michiel@slackbuilds.org> | 2010-05-13 00:32:34 +0200 |
| commit | 7426eeed75f1f879650c74e071461da6c00269cb (patch) | |
| tree | 08a2bfcc7170bd2f87b572555c0bd12b0e8c8649 /libraries/opencv | |
| parent | a6dbaecefcc3da7c827f12345b0eebe77241489d (diff) | |
libraries/opencv: Updated for version 1.1.0
Diffstat (limited to 'libraries/opencv')
| -rw-r--r-- | libraries/opencv/opencv.SlackBuild | 8 | ||||
| -rw-r--r-- | libraries/opencv/opencv.info | 4 |
2 files changed, 10 insertions, 2 deletions
diff --git a/libraries/opencv/opencv.SlackBuild b/libraries/opencv/opencv.SlackBuild index 5265814a64a7f..3cb0e52b94cfd 100644 --- a/libraries/opencv/opencv.SlackBuild +++ b/libraries/opencv/opencv.SlackBuild @@ -35,8 +35,13 @@ OUTPUT=${OUTPUT:-/tmp} if [ "$ARCH" = "i486" ]; then SLKCFLAGS="-O2 -march=i486 -mtune=i686" + LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" fi rm -rf $PKG @@ -53,6 +58,7 @@ CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ --sysconfdir=/etc \ --localstatedir=/var \ --build=$ARCH-slackware-linux \ @@ -74,4 +80,4 @@ mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc cd $PKG -/sbin/makepkg -c n -l y -p $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.tgz +/sbin/makepkg -c n -l y -p $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/libraries/opencv/opencv.info b/libraries/opencv/opencv.info index ee0034e5d0f3c..04dc2e60a183b 100644 --- a/libraries/opencv/opencv.info +++ b/libraries/opencv/opencv.info @@ -1,8 +1,10 @@ PRGNAM="opencv" VERSION="1.1.0" HOMEPAGE="http://opencv.willowgarage.com" -DOWNLOAD="http://nchc.dl.sourceforge.net/sourceforge/opencvlibrary/opencv-1.1pre1.tar.gz" +DOWNLOAD="http://downloads.sourceforge.net/opencvlibrary/opencv-1.1pre1.tar.gz" +DOWNLOAD_x86_64="" MD5SUM="b147b7cd3c059831c415c5a2bcecdf95" +MD5SUM_x86_64="" MAINTAINER="Ricardson Williams" EMAIL="ricardsonwilliams@yahoo.com.br" APPROVED="michiel" |