Date: Wednesday, December 23, 2009 @ 15:28:54 Author: ibiru Revision: 61785
Merged revisions 61716 via svnmerge from svn+ssh://gerolde.archlinux.org/srv/svn-packages/opencv/trunk ........ r61716 | andrea | 2009-12-22 15:34:09 +0200 (Tue, 22 Dec 2009) | 2 lines upgpkg: opencv 2.0.0-2 rebuilt using cmake (FS#17574) ........ Modified: opencv/repos/extra-x86_64/ (properties) opencv/repos/extra-x86_64/PKGBUILD ----------+ PKGBUILD | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) Property changes on: opencv/repos/extra-x86_64 ___________________________________________________________________ Modified: svnmerge-integrated - /opencv/trunk:1-61689 + /opencv/trunk:1-61784 Modified: extra-x86_64/PKGBUILD =================================================================== --- extra-x86_64/PKGBUILD 2009-12-23 20:12:47 UTC (rev 61784) +++ extra-x86_64/PKGBUILD 2009-12-23 20:28:54 UTC (rev 61785) @@ -3,21 +3,30 @@ pkgname=opencv pkgver=2.0.0 -pkgrel=1 +pkgrel=2 pkgdesc="Intel(R) Open Source Computer Vision Library" arch=('i686' 'x86_64') license=('custom') url="http://opencv.willowgarage.com" -depends=('jasper' 'gtk2' 'python') +depends=('jasper' 'gtk2' 'python' 'libtiff' 'libpng' 'xine-lib' 'gstreamer0.10-base' 'libdc1394' 'libv4l') +makedepends=('cmake' 'pkgconfig') options=('!libtool') source=(http://downloads.sourceforge.net/opencvlibrary/OpenCV-${pkgver}.tar.bz2) md5sums=('ed27520514baacc5edad7b06ad24130e') build() { - cd ${srcdir}/OpenCV-${pkgver} - ./configure --prefix=/usr || return 1 + cd ${srcdir} + mkdir build + cd build + cmake ../OpenCV-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_SKIP_RPATH=ON \ + -DWITH_UNICAP=OFF || return 1 make || return 1 make DESTDIR=$pkgdir install || return 1 + # install license file - install -D -m644 COPYING ${pkgdir}/usr/share/licenses/$pkgname/LICENSE || return 1 + install -D -m644 ${srcdir}/OpenCV-${pkgver}/doc/license.txt \ + ${pkgdir}/usr/share/licenses/$pkgname/LICENSE || return 1 }