diff options
| author | M.Dinslage <daedra1980@gmail.com> | 2011-10-05 06:44:33 -0500 |
|---|---|---|
| committer | Robby Workman <rworkman@slackbuilds.org> | 2011-10-11 21:20:28 -0500 |
| commit | 1add2af03796f6bc2271d891d997aa006b16d1e7 (patch) | |
| tree | f139f1a2ef4a5ddac54147fef27842644e8a1eda | |
| parent | f097f5393482b8fed448964fdcd3931fe8c4d0ac (diff) | |
libraries/opencv: Updated for version 2.3.1a.
Signed-off-by: Erik Hanson <erik@slackbuilds.org>
| -rw-r--r-- | libraries/opencv/libopencv-2.3.1a-libdir.patch | 15 | ||||
| -rw-r--r-- | libraries/opencv/opencv.SlackBuild | 9 | ||||
| -rw-r--r-- | libraries/opencv/opencv.info | 8 |
3 files changed, 23 insertions, 9 deletions
diff --git a/libraries/opencv/libopencv-2.3.1a-libdir.patch b/libraries/opencv/libopencv-2.3.1a-libdir.patch new file mode 100644 index 000000000000..21238cc4b7d5 --- /dev/null +++ b/libraries/opencv/libopencv-2.3.1a-libdir.patch @@ -0,0 +1,15 @@ +diff -up OpenCV-2.3.1/CMakeLists.txt.00 OpenCV-2.3.1/CMakeLists.txt +--- OpenCV-2.3.1/CMakeLists.txt.00 2011-10-04 23:10:12.177001665 -0500 ++++ OpenCV-2.3.1/CMakeLists.txt 2011-10-04 23:11:39.808001668 -0500 +@@ -665,9 +665,9 @@ if(CMAKE_HOST_UNIX) + OUTPUT_VARIABLE PYTHON_STD_PACKAGES_PATH + OUTPUT_STRIP_TRAILING_WHITESPACE) + if("${PYTHON_STD_PACKAGES_PATH}" MATCHES "site-packages") +- set(PYTHON_PACKAGES_PATH lib/python${PYTHON_VERSION_MAJOR_MINOR}/site-packages CACHE PATH "Where to install the python packages.") ++ set(PYTHON_PACKAGES_PATH lib${LIB_SUFFIX}/python${PYTHON_VERSION_MAJOR_MINOR}/site-packages CACHE PATH "Where to install the python packages.") + else() #debian based assumed, install to the dist-packages. +- set(PYTHON_PACKAGES_PATH lib/python${PYTHON_VERSION_MAJOR_MINOR}/dist-packages CACHE PATH "Where to install the python packages.") ++ set(PYTHON_PACKAGES_PATH lib${LIB_SUFFIX}/python${PYTHON_VERSION_MAJOR_MINOR}/dist-packages CACHE PATH "Where to install the python packages.") + endif() + endif() + if(CMAKE_HOST_WIN32) diff --git a/libraries/opencv/opencv.SlackBuild b/libraries/opencv/opencv.SlackBuild index fdb800d22051..dec8489bf5b2 100644 --- a/libraries/opencv/opencv.SlackBuild +++ b/libraries/opencv/opencv.SlackBuild @@ -6,7 +6,7 @@ PRGNAM=opencv SRCNAM=OpenCV -VERSION=${VERSION:-2.3.0} +VERSION=${VERSION:-2.3.1a} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -44,7 +44,7 @@ mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $SRCNAM-$VERSION tar xvf $CWD/$SRCNAM-$VERSION.tar.bz2 -cd $SRCNAM-$VERSION +cd $SRCNAM-2.3.1 chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ @@ -54,7 +54,7 @@ find . \ # Honor LIB_SUFFIX # rewritten for slackware -patch -p1 < $CWD/libopencv-2.3.0-libdir.patch +patch -p1 < $CWD/libopencv-2.3.1a-libdir.patch mkdir -p build cd build @@ -77,8 +77,7 @@ cd - find $PKG | xargs file | grep -e "executable" -e "shared object" \ | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null -mkdir $PKG/usr/doc -mv $PKG/usr/share/$PRGNAM/doc $PKG/usr/doc/$PRGNAM-$VERSION +mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a README doc/*.pdf $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild diff --git a/libraries/opencv/opencv.info b/libraries/opencv/opencv.info index 35bf2497278e..6843ac8c9d76 100644 --- a/libraries/opencv/opencv.info +++ b/libraries/opencv/opencv.info @@ -1,10 +1,10 @@ PRGNAM="opencv" -VERSION="2.3.0" +VERSION="2.3.1a" HOMEPAGE="http://opencv.willowgarage.com/wiki/" -DOWNLOAD="http://downloads.sourceforge.net/project/opencvlibrary/opencv-unix/2.3/OpenCV-2.3.0.tar.bz2" -MD5SUM="dea5e9df241ac37f4439da16559e420d" +DOWNLOAD="http://sourceforge.net/projects/opencvlibrary/files/opencv-unix/2.3.1/OpenCV-2.3.1a.tar.bz2" +MD5SUM="82e4b6bfa349777233eea09b075e931e" DOWNLOAD_x86_64="" MD5SUM_x86_64="" MAINTAINER="M.Dinslage" EMAIL="daedra1980@gmail.com" -APPROVED="dsomero" +APPROVED="Erik Hanson" |