Update opencv, fix build.

1 files changed, 11 insertions, 8 deletions

diff --git a/extra/opencv/PKGBUILD b/extra/opencv/PKGBUILD
index 5a9817691..d80149274 100644
--- a/extra/opencv/PKGBUILD
+++ b/extra/opencv/PKGBUILD
@@ -5,7 +5,9 @@
 pkgbase=opencv
 pkgname=('opencv' 'opencv-docs' 'opencv-samples')
 _realname=OpenCV
-pkgver=2.4.4
+pkgver=2.4.4.a
+_pkgver=2.4.4a
+__pkgver=2.4.4
 pkgrel=1
 pkgdesc="Open Source Computer Vision Library"
 arch=('i686' 'x86_64' 'mips64el')
@@ -24,10 +26,10 @@ if [ "$CARCH" != "mips64el" ]; then
   depends+=('intel-tbb' 'libcl')
   makedepends+=('opencl-headers')
 fi
-source=("http://downloads.sourceforge.net/opencvlibrary/$_realname-${pkgver}.tar.bz2"
+source=("http://downloads.sourceforge.net/opencvlibrary/$_realname-${_pkgver}.tar.bz2"
         'pkgconfig.patch'
         'fsh.patch')
-md5sums=('bb7272c102a801a9f9ee01db6e7ad8e9'
+md5sums=('876dce80ea2648b7e4d4c5a567b4d37b'
          'cb916260b5ec594fe7a0cc2e54fc569f'
          '35256e3ccace373feba8131d1540a0de')
 
@@ -56,7 +58,7 @@ _cmakeopts+=(
             '-D CMAKE_SKIP_RPATH=ON')
 
 build() {
-  cd "$srcdir/$_realname-$pkgver"
+  cd "$srcdir/$pkgbase-$__pkgver"
 
   # fix pkg-config mess
   # see https://bugs.archlinux.org/task/32430
@@ -76,12 +78,12 @@ build() {
 }
 
 package_opencv() {
-  cd "$srcdir/$_realname-$pkgver"
+  cd "$srcdir/$pkgbase-$__pkgver"
 
   make DESTDIR="$pkgdir" install
 
   # install license file
-  install -Dm644 "$srcdir/$_realname-$pkgver/doc/license.txt" \
+  install -Dm644 "$srcdir/$pkgbase-$__pkgver/doc/license.txt" \
     "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 
   cd "$pkgdir/usr/share"
@@ -106,10 +108,11 @@ package_opencv-docs() {
   cd "$srcdir"
 
   # doc dir now includes opencv subdir (looks like they finally listened)
+  mkdir -p "$pkgdir/usr/share"
   cp -r opencv-doc "$pkgdir/usr/share/doc"
 
   # install license file
-  #install -Dm644 "$srcdir/$_realname-$pkgver/doc/license.txt" \
+  #install -Dm644 "$srcdir/$pkgbase-$__pkgver/doc/license.txt" \
   #  "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 }
 
@@ -126,7 +129,7 @@ package_opencv-samples() {
 
   # Do we really need licenses for these minor splits?
   # install license file
-  #install -Dm644 "$srcdir/$_realname-$pkgver/doc/license.txt" \
+  #install -Dm644 "$srcdir/$pkgbase-$__pkgver/doc/license.txt" \
   #  "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 }