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

Conflicts:
	community/mcelog/PKGBUILD
	extra/calligra/PKGBUILD
	extra/libmpdclient/PKGBUILD
	extra/mpc/PKGBUILD
	extra/opencv/PKGBUILD
	extra/qt5/PKGBUILD

1 files changed, 29 insertions, 54 deletions

diff --git a/extra/opencv/PKGBUILD b/extra/opencv/PKGBUILD
index d80149274..5f888dd46 100644
--- a/extra/opencv/PKGBUILD
+++ b/extra/opencv/PKGBUILD
@@ -1,13 +1,11 @@
-# $Id: PKGBUILD 179299 2013-03-04 22:18:11Z schiv $
+# $Id: PKGBUILD 182637 2013-04-11 18:36:34Z schiv $
 # Maintainer: Ray Rashif <schiv@archlinux.org>
 # Contributor: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgbase=opencv
-pkgname=('opencv' 'opencv-docs' 'opencv-samples')
+pkgname=('opencv' 'opencv-samples')
 _realname=OpenCV
-pkgver=2.4.4.a
-_pkgver=2.4.4a
-__pkgver=2.4.4
+pkgver=2.4.5
 pkgrel=1
 pkgdesc="Open Source Computer Vision Library"
 arch=('i686' 'x86_64' 'mips64el')
@@ -16,20 +14,18 @@ url="http://opencv.org/"
 depends=('jasper' 'gstreamer0.10-base'
          'xine-lib' 'libdc1394' 'openexr' 'gtkglext')
 makedepends=('cmake' 'python2-numpy' 'mesa'
-             'eigen2'
-             'texlive-bin' 'python2-sphinx') # for docs
-optdepends=('opencv-docs'
-            'opencv-samples'
+             'eigen2')
+optdepends=('opencv-samples'
             'eigen2'
             'python2-numpy: Python 2.x interface')
 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/$pkgname-$pkgver.tar.gz"
         'pkgconfig.patch'
         'fsh.patch')
-md5sums=('876dce80ea2648b7e4d4c5a567b4d37b'
+md5sums=('8eac87462c7bec8b89021b723207c623'
          'cb916260b5ec594fe7a0cc2e54fc569f'
          '35256e3ccace373feba8131d1540a0de')
 
@@ -42,10 +38,6 @@ fi
 _cmakeopts+=(
             '-D WITH_OPENGL=ON'
             '-D WITH_XINE=ON'
-            '-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'
@@ -57,8 +49,17 @@ _cmakeopts+=(
             '-D CMAKE_INSTALL_PREFIX=/usr'
             '-D CMAKE_SKIP_RPATH=ON')
 
-build() {
-  cd "$srcdir/$pkgbase-$__pkgver"
+# SSE only available from Pentium 3 onwards (i686 is way older)
+[[ "$CARCH" = 'i686' ]] && \
+  _cmakeopts+=('-D ENABLE_SSE=OFF'
+               '-D ENABLE_SSE2=OFF'
+               '-D ENABLE_SSE3=OFF')
+
+# all x64 CPUs support SSE2 but not SSE3
+[[ "$CARCH" = 'x86_64' ]] && _cmakeopts+=('-D ENABLE_SSE3=OFF')
+
+prepare() {
+  cd "$srcdir/$pkgname-$pkgver"
 
   # fix pkg-config mess
   # see https://bugs.archlinux.org/task/32430
@@ -69,8 +70,13 @@ build() {
   # 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
+  # no longer including docs, see https://bugs.archlinux.org/task/34185
+  # python2 compatibility for generating (html) docs
+  #sed -i 's/sphinx-build/sphinx-build2/' cmake/OpenCVDetectPython.cmake
+}
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
 
   cmake ${_cmakeopts[@]} .
 
@@ -78,59 +84,28 @@ build() {
 }
 
 package_opencv() {
-  cd "$srcdir/$pkgbase-$__pkgver"
+  cd "$srcdir/$pkgname-$pkgver"
 
   make DESTDIR="$pkgdir" install
 
   # install license file
-  install -Dm644 "$srcdir/$pkgbase-$__pkgver/doc/license.txt" \
+  install -Dm644 "$srcdir/$pkgname-$pkgver/doc/license.txt" \
     "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 
   cd "$pkgdir/usr/share"
 
-  # separate docs package; also be -R friendly
-  [[ -d doc ]] && mv doc "$srcdir/opencv-doc"
-
-  # separate samples package
+  # separate samples package; also be -R friendly
   [[ -d $pkgname/samples ]] && mv $pkgname/samples "$srcdir/opencv-samples"
 }
 
-package_opencv-docs() {
-  pkgdesc+=" (documentation)"
-  unset depends
-  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"
-
-  # 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/$pkgbase-$__pkgver/doc/license.txt" \
-  #  "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-}
-
 package_opencv-samples() {
   pkgdesc+=" (samples)"
   depends=('bash')
   unset optdepends
   unset options
 
-  cd "$srcdir"
-
   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/$pkgbase-$__pkgver/doc/license.txt" \
-  #  "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+  cp -r "$srcdir/opencv-samples" "$pkgdir/usr/share/opencv/samples"
 }
 
 # vim:set ts=2 sw=2 et: