Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/busybox/PKGBUILD
	community/glpng/PKGBUILD
	community/hercules/PKGBUILD
	community/libnetfilter_acct/PKGBUILD
	community/libvirt/PKGBUILD
	extra/crypto++/PKGBUILD
	extra/hexedit/PKGBUILD
	extra/kdesdk-kate/PKGBUILD
	extra/kdesdk/PKGBUILD
	extra/libmp3splt/PKGBUILD
	extra/ntfs-3g_ntfsprogs/PKGBUILD
	extra/opencv/PKGBUILD
	extra/qemu-kvm/PKGBUILD
	extra/xf86-input-wacom/PKGBUILD
	extra/xfce4-eyes-plugin/PKGBUILD
	extra/xfdesktop/PKGBUILD

1 files changed, 21 insertions, 12 deletions

diff --git a/extra/opencv/PKGBUILD b/extra/opencv/PKGBUILD
index 185059c03..5a9817691 100644
--- a/extra/opencv/PKGBUILD
+++ b/extra/opencv/PKGBUILD
@@ -1,20 +1,21 @@
-# $Id: PKGBUILD 178140 2013-02-16 22:48:58Z ioni $
+# $Id: PKGBUILD 179299 2013-03-04 22:18:11Z schiv $
 # Maintainer: Ray Rashif <schiv@archlinux.org>
 # Contributor: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgbase=opencv
 pkgname=('opencv' 'opencv-docs' 'opencv-samples')
 _realname=OpenCV
-pkgver=2.4.3
-pkgrel=5
+pkgver=2.4.4
+pkgrel=1
 pkgdesc="Open Source Computer Vision Library"
 arch=('i686' 'x86_64' 'mips64el')
 license=('BSD')
 url="http://opencv.org/"
 depends=('jasper' 'gstreamer0.10-base'
          'xine-lib' 'libdc1394' 'openexr' 'gtkglext')
-makedepends=('cmake' 'python2-numpy' 'eigen2'
-             'mesa')
+makedepends=('cmake' 'python2-numpy' 'mesa'
+             'eigen2'
+             'texlive-bin' 'python2-sphinx') # for docs
 optdepends=('opencv-docs'
             'opencv-samples'
             'eigen2'
@@ -26,7 +27,7 @@ fi
 source=("http://downloads.sourceforge.net/opencvlibrary/$_realname-${pkgver}.tar.bz2"
         'pkgconfig.patch'
         'fsh.patch')
-md5sums=('c0a5af4ff9d0d540684c0bf00ef35dbe'
+md5sums=('bb7272c102a801a9f9ee01db6e7ad8e9'
          'cb916260b5ec594fe7a0cc2e54fc569f'
          '35256e3ccace373feba8131d1540a0de')
 
@@ -42,6 +43,7 @@ _cmakeopts+=(
             '-D ENABLE_SSE=OFF'
             '-D ENABLE_SSE2=OFF'
             '-D ENABLE_SSE3=OFF'
+            '-D BUILD_DOCS=ON'
             '-D BUILD_PACKAGE=OFF'
             '-D BUILD_WITH_DEBUG_INFO=OFF'
             '-D BUILD_TESTS=OFF'
@@ -58,12 +60,16 @@ build() {
 
   # fix pkg-config mess
   # see https://bugs.archlinux.org/task/32430
+  # and http://code.opencv.org/issues/1925
   patch -Np1 -i "$srcdir/pkgconfig.patch"
 
-  # fix another upstream mess
+  # fix another upstream mess that they won't fix
   # see http://code.opencv.org/issues/2512
   patch -Np1 -i "$srcdir/fsh.patch"
 
+  # python2 compatibility for generating docs
+  sed -i 's/sphinx-build/sphinx-build2/' cmake/OpenCVDetectPython.cmake
+
   cmake ${_cmakeopts[@]} .
 
   make
@@ -81,11 +87,10 @@ package_opencv() {
   cd "$pkgdir/usr/share"
 
   # separate docs package; also be -R friendly
-  [ -d doc/$pkgname ] && mv doc/$pkgname "$srcdir/opencv-doc" \
-    && rm -r doc
+  [[ -d doc ]] && mv doc "$srcdir/opencv-doc"
 
   # separate samples package
-  [ -d $pkgname/samples ] && mv $pkgname/samples "$srcdir/opencv-samples"
+  [[ -d $pkgname/samples ]] && mv $pkgname/samples "$srcdir/opencv-samples"
 }
 
 package_opencv-docs() {
@@ -94,10 +99,14 @@ package_opencv-docs() {
   unset optdepends
   options=('docs')
 
+  # PDFs are not being generated for some reason as of 2.4.4
+  # even after adding latex and sphinx deps
+  # when previously without them there were a couple of good docs installed
+
   cd "$srcdir"
 
-  mkdir -p "$pkgdir/usr/share/doc"
-  cp -r opencv-doc "$pkgdir/usr/share/doc/opencv"
+  # doc dir now includes opencv subdir (looks like they finally listened)
+  cp -r opencv-doc "$pkgdir/usr/share/doc"
 
   # install license file
   #install -Dm644 "$srcdir/$_realname-$pkgver/doc/license.txt" \