[arch-commits] Commit in opencv/trunk (PKGBUILD)

[Ray Rashif]

    Date: Saturday, March 9, 2013 @ 22:06:32
  Author: schiv
Revision: 179823

opencv: scrap doc split

Modified:
  opencv/trunk/PKGBUILD

----------+
 PKGBUILD |   46 ++++++++--------------------------------------
 1 file changed, 8 insertions(+), 38 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-03-09 21:04:13 UTC (rev 179822)
+++ PKGBUILD	2013-03-09 21:06:32 UTC (rev 179823)
@@ -3,10 +3,10 @@
 # Contributor: Tobias Powalowski <tpowa at archlinux.org>
 
 pkgbase=opencv
-pkgname=('opencv' 'opencv-docs' 'opencv-samples')
+pkgname=('opencv' 'opencv-samples')
 _realname=OpenCV
 pkgver=2.4.4
-pkgrel=1
+pkgrel=2
 pkgdesc="Open Source Computer Vision Library"
 arch=('i686' 'x86_64')
 license=('BSD')
@@ -14,10 +14,8 @@
 depends=('jasper' 'gstreamer0.10-base' 'intel-tbb' 'libcl'
          'xine-lib' 'libdc1394' 'openexr' 'gtkglext')
 makedepends=('cmake' 'python2-numpy' 'mesa'
-             'opencl-headers' 'eigen2'
-             'texlive-bin' 'python2-sphinx') # for docs
-optdepends=('opencv-docs'
-            'opencv-samples'
+             'opencl-headers' 'eigen2')
+optdepends=('opencv-samples'
             'eigen2'
             'python2-numpy: Python 2.x interface')
 source=("http://downloads.sourceforge.net/opencvlibrary/$_realname-${pkgver}.tar.bz2"
@@ -34,7 +32,6 @@
             '-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,8 +55,9 @@
   # 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
 
   cmake ${_cmakeopts[@]} .
 
@@ -77,33 +75,10 @@
 
   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)
-  cp -r opencv-doc "$pkgdir/usr/share/doc"
-
-  # install license file
-  #install -Dm644 "$srcdir/$_realname-$pkgver/doc/license.txt" \
-  #  "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-}
-
 package_opencv-samples() {
   pkgdesc+=" (samples)"
   depends=('bash')
@@ -114,11 +89,6 @@
 
   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"
 }
 
 # vim:set ts=2 sw=2 et: