diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2013-01-12 13:04:54 +0100 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2013-01-12 13:04:54 +0100 |
| commit | 24633b6f6af8dc77ca77224448d226d8e99c9ce1 (patch) | |
| tree | 0e862445be6a105957104f94f7e4f2668e1fdbba /extra/opencv | |
| parent | d28ed89b1e41f7e71045a5c2e898aa3b369eda47 (diff) | |
| parent | 8c2563c3c13cb7a279544f6926cbdd2eb902cc9a (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/cdemu-daemon/PKGBUILD
community/chmsee/PKGBUILD
community/fceux/PKGBUILD
community/ginac/PKGBUILD
community/gstreamermm/PKGBUILD
community/gtksourceviewmm/PKGBUILD
community/lgi/PKGBUILD
community/libmirage/PKGBUILD
core/gawk/PKGBUILD
core/gettext/PKGBUILD
extra/enca/PKGBUILD
extra/gnutls/PKGBUILD
extra/hdf5/PKGBUILD
extra/kdebase/PKGBUILD
extra/libass/PKGBUILD
extra/libdiscid/PKGBUILD
extra/libxcomposite/PKGBUILD
extra/libxdamage/PKGBUILD
extra/maxima/PKGBUILD
extra/nx/PKGBUILD
extra/opencv/PKGBUILD
extra/pidgin/PKGBUILD
extra/redland/PKGBUILD
extra/sharutils/PKGBUILD
extra/soundtouch/PKGBUILD
extra/sqlite/PKGBUILD
extra/twisted/PKGBUILD
libre/dpkg/PKGBUILD
Diffstat (limited to 'extra/opencv')
| -rw-r--r-- | extra/opencv/PKGBUILD | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/extra/opencv/PKGBUILD b/extra/opencv/PKGBUILD index 0cdcffd61..9344dd309 100644 --- a/extra/opencv/PKGBUILD +++ b/extra/opencv/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 171611 2012-11-20 13:12:19Z schiv $ +# $Id: PKGBUILD 174304 2013-01-04 05:15:04Z schiv $ # Maintainer: Ray Rashif <schiv@archlinux.org> # Contributor: Tobias Powalowski <tpowa@archlinux.org> @@ -6,7 +6,7 @@ pkgbase=opencv pkgname=('opencv' 'opencv-docs' 'opencv-samples') _realname=OpenCV pkgver=2.4.3 -pkgrel=3 +pkgrel=4 pkgdesc="Open Source Computer Vision Library" arch=('i686' 'x86_64' 'mips64el') license=('BSD') @@ -20,9 +20,8 @@ optdepends=('opencv-docs' 'eigen2' 'python2-numpy: Python 2.x interface') if [ "$CARCH" != "mips64el" ]; then - depends+=('intel-tbb') - makedepends+=('libcl' 'opencl-headers') - optdepends+=('libcl') + depends+=('intel-tbb' 'libcl') + makedepends+=('opencl-headers') fi source=("http://downloads.sourceforge.net/opencvlibrary/$_realname-${pkgver}.tar.bz2" 'pkgconfig.patch' @@ -116,6 +115,7 @@ package_opencv-samples() { mkdir -p "$pkgdir/usr/share/opencv" cp -r opencv-samples "$pkgdir/usr/share/opencv/samples" + # Do we really need licenses for these minor splits? # install license file #install -Dm644 "$srcdir/$_realname-$pkgver/doc/license.txt" \ # "$pkgdir/usr/share/licenses/$pkgname/LICENSE" |