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

[Ray Rashif]

    Date: Saturday, February 12, 2011 @ 10:04:53
  Author: schiv
Revision: 109758

upgpkg: opencv 2.2.0-3
Fix bug in highgui lib; FS#22841

Added:
  opencv/trunk/ptrcvcapture.patch
Modified:
  opencv/trunk/PKGBUILD

--------------------+
 PKGBUILD           |   46 ++++++++++++++++++++++++++++------------------
 ptrcvcapture.patch |   17 +++++++++++++++++
 2 files changed, 45 insertions(+), 18 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-02-12 14:11:51 UTC (rev 109757)
+++ PKGBUILD	2011-02-12 15:04:53 UTC (rev 109758)
@@ -3,53 +3,63 @@
 # Contributor: Tobias Powalowski <tpowa at archlinux.org>
 
 pkgname=opencv
-_pybin=python2
-_pydir=python2.7
+_realname=OpenCV
 pkgver=2.2.0
-pkgrel=2
-pkgdesc="Intel(R) Open Source Computer Vision Library"
+pkgrel=3
+pkgdesc="Open Source Computer Vision Library"
 arch=('i686' 'x86_64')
 license=('BSD')
 url="http://opencv.willowgarage.com"
-depends=('jasper' 'python2-numpy' 'gstreamer0.10-base'
-          'gtk2' 'xine-lib' 'libdc1394' 'v4l-utils')
-makedepends=('pkg-config' 'cmake')
+depends=('jasper' 'gstreamer0.10-base' 'openexr'
+         'gtk2' 'xine-lib' 'libdc1394' 'v4l-utils')
+makedepends=('pkg-config' 'cmake' 'doxygen'
+             'python2-numpy' 'eigen')
+optdepends=('eigen'
+            'python2-numpy')
 options=('!libtool')
-source=(http://downloads.sourceforge.net/opencvlibrary/OpenCV-$pkgver.tar.bz2)
-md5sums=('122c9ac793a46854ef2819fedbbd6b1b')
+source=(http://downloads.sourceforge.net/opencvlibrary/$_realname-$pkgver.tar.bz2
+        ptrcvcapture.patch)
+md5sums=('122c9ac793a46854ef2819fedbbd6b1b'
+         '461a8b1b0f2264521e13d9ae051d13be')
 
 build() {
-  cd "$srcdir/OpenCV-$pkgver"
+  cd "$srcdir/$_realname-$pkgver"
 
+  # Please do not remove any patches from trunk #
+
   # libpng 1.4 compatibility
-  #patch -Np1 -i ../libpng-1.4.patch
+  #patch -Np1 -i "$srcdir/libpng-1.4.patch"
 
   # fix v4l issue
-  #patch -Np0 -i ../v4l-mmap.patch
+  #patch -Np0 -i "$srcdir/v4l-mmap.patch"
 
   # fix ffmpeg-related C++ issue
   # see http://code.google.com/p/ffmpegsource/source/detail?r=311
   #export CXXFLAGS="$CXXFLAGS -D__STDC_CONSTANT_MACROS"
 
+  # fix linking against highgui
+  # see https://bugs.archlinux.org/task/22841
+  patch -Np0 -i "$srcdir/ptrcvcapture.patch"
+
   cmake . -DCMAKE_BUILD_TYPE=Release \
           -DCMAKE_INSTALL_PREFIX=/usr \
           -DCMAKE_SKIP_RPATH=ON \
           -DWITH_XINE=ON \
           -DWITH_UNICAP=OFF \
-          -DPYTHON_EXECUTABLE=/usr/bin/$_pybin \
-          -DPYTHON_INCLUDE_DIR=/usr/include/$_pydir \
-          -DPYTHON_LIBRARY=/usr/lib/lib$_pydir.so
-
+          -DBUILD_EXAMPLES=ON \
+          -DBUILD_TESTS=OFF \
+          -DINSTALL_C_EXAMPLES=ON \
+          -DINSTALL_PYTHON_EXAMPLES=ON
   make
 }
 
 package() {
-  cd "$srcdir/OpenCV-$pkgver"
+  cd "$srcdir/$_realname-$pkgver"
 
   make DESTDIR="$pkgdir/" install
 
   # install license file
-  install -Dm644 "$srcdir/OpenCV-$pkgver/doc/license.txt" \
+  install -Dm644 "$srcdir/$_realname-$pkgver/doc/license.txt" \
     "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 }
 

Added: ptrcvcapture.patch
===================================================================
--- ptrcvcapture.patch	                        (rev 0)
+++ ptrcvcapture.patch	2011-02-12 15:04:53 UTC (rev 109758)
@@ -0,0 +1,17 @@
+Index: modules/highgui/src/cap.cpp
+===================================================================
+--- modules/highgui/src/cap.cpp	(revision 4283)
++++ modules/highgui/src/cap.cpp	(working copy)
+@@ -52,10 +52,10 @@
+ namespace cv
+ {
+ 
+-template<> inline void Ptr<CvCapture>::delete_obj()
++template<> void Ptr<CvCapture>::delete_obj()
+ { cvReleaseCapture(&obj); }
+ 
+-template<> inline void Ptr<CvVideoWriter>::delete_obj()
++template<> void Ptr<CvVideoWriter>::delete_obj()
+ { cvReleaseVideoWriter(&obj); }
+ 
+ }