Thu May 5 19:03:27 UTC 2011

5 files changed, 0 insertions, 149 deletions

diff --git a/testing/opencv/PKGBUILD b/testing/opencv/PKGBUILD
deleted file mode 100644
index b909207c7..000000000
--- a/testing/opencv/PKGBUILD
+++ /dev/null
@@ -1,75 +0,0 @@
-# $Id: PKGBUILD 120048 2011-04-18 20:44:58Z schiv $
-# Maintainer: Ray Rashif <schiv@archlinux.org>
-# Contributor: Tobias Powalowski <tpowa@archlinux.org>
-
-pkgname=opencv
-_realname=OpenCV
-pkgver=2.2.0
-pkgrel=5
-pkgdesc="Open Source Computer Vision Library"
-arch=('i686' 'x86_64')
-license=('BSD')
-url="http://opencv.willowgarage.com"
-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/$_realname-$pkgver.tar.bz2
-        ptrcvcapture.patch
-        gcc46.patch
-        v4l_2.6.38.patch)
-md5sums=('122c9ac793a46854ef2819fedbbd6b1b'
-         '461a8b1b0f2264521e13d9ae051d13be'
-         'b5fb8d6786578ae7bf272615279e8865'
-         '82c8a8a76275acd4a73a4f8e948c3f78')
-
-build() {
-  cd "$srcdir/$_realname-$pkgver"
-
-  # Please do not remove any patches from trunk #
-
-  # fix v4l issue
-  #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"
-
-  # gcc 4.6 compatibility
-  # see https://bugs.archlinux.org/task/23741
-  patch -Np3 -i "$srcdir/gcc46.patch"
-
-  # distro kernel no longer has v4l1
-  # see https://bugs.archlinux.org/task/23826
-  patch -Np1 -i "$srcdir/v4l_2.6.38.patch"
-
-  cmake . -DCMAKE_BUILD_TYPE=Release \
-          -DCMAKE_INSTALL_PREFIX=/usr \
-          -DCMAKE_SKIP_RPATH=ON \
-          -DWITH_XINE=ON \
-          -DWITH_UNICAP=OFF \
-          -DBUILD_EXAMPLES=ON \
-          -DBUILD_TESTS=OFF \
-          -DINSTALL_C_EXAMPLES=ON \
-          -DINSTALL_PYTHON_EXAMPLES=ON
-  make
-}
-
-package() {
-  cd "$srcdir/$_realname-$pkgver"
-
-  make DESTDIR="$pkgdir/" install
-
-  # install license file
-  install -Dm644 "$srcdir/$_realname-$pkgver/doc/license.txt" \
-    "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/testing/opencv/gcc46.patch b/testing/opencv/gcc46.patch
deleted file mode 100644
index a69499b4f..000000000
--- a/testing/opencv/gcc46.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-Index: /trunk/opencv/modules/core/include/opencv2/core/core.hpp
-===================================================================
---- /trunk/opencv/modules/core/include/opencv2/core/core.hpp	(revision 4804)
-+++ /trunk/opencv/modules/core/include/opencv2/core/core.hpp	(revision 4861)
-@@ -56,4 +56,5 @@
- #include <algorithm>
- #include <cmath>
-+#include <cstddef>
- #include <complex>
- #include <map>
diff --git a/testing/opencv/ptrcvcapture.patch b/testing/opencv/ptrcvcapture.patch
deleted file mode 100644
index c1316f0ea..000000000
--- a/testing/opencv/ptrcvcapture.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-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); }
- 
- }
diff --git a/testing/opencv/v4l-mmap.patch b/testing/opencv/v4l-mmap.patch
deleted file mode 100644
index b7bbc9b74..000000000
--- a/testing/opencv/v4l-mmap.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-http://code.ros.org/trac/opencv/ticket/141
-http://bugs.gentoo.org/313649
-
---- src/highgui/cvcap_libv4l.cpp
-+++ src/highgui/cvcap_libv4l.cpp
-@@ -782,7 +782,7 @@
- 
-        capture->buffers[n_buffers].length = buf.length;
-        capture->buffers[n_buffers].start =
--         mmap (NULL /* start anywhere */,
-+         v4l2_mmap (NULL /* start anywhere */,
-                buf.length,
-                PROT_READ | PROT_WRITE /* required */,
-                MAP_SHARED /* recommended */,
diff --git a/testing/opencv/v4l_2.6.38.patch b/testing/opencv/v4l_2.6.38.patch
deleted file mode 100644
index dd23cd133..000000000
--- a/testing/opencv/v4l_2.6.38.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -up OpenCV-2.2.0/modules/highgui/src/cap_v4l.cpp.nov4l1 OpenCV-2.2.0/modules/highgui/src/cap_v4l.cpp
---- OpenCV-2.2.0/modules/highgui/src/cap_v4l.cpp.nov4l1	2010-12-05 11:35:25.000000000 +0800
-+++ OpenCV-2.2.0/modules/highgui/src/cap_v4l.cpp	2011-04-18 10:40:01.984950054 +0800
-@@ -214,7 +214,7 @@
- #include <sys/types.h>
- #include <sys/mman.h>
- 
--#include <linux/videodev.h>
-+#include <libv4l1-videodev.h>
- 
- #include <string.h>
- #include <stdlib.h>
-diff -up OpenCV-2.2.0/modules/highgui/src/cap_v4l.cpp.nov4l1 OpenCV-2.2.0/modules/highgui/src/cap_libv4l.cpp.cpp
---- OpenCV-2.2.0/modules/highgui/src/cap_libv4l.cpp.nov4l1	2010-12-05 11:35:25.000000000 +0800
-+++ OpenCV-2.2.0/modules/highgui/src/cap_libv4l.cpp	2011-04-18 10:39:07.568578185 +0800
-@@ -224,7 +224,7 @@
- #include "highgui.h"
- #include "precomp.hpp"
- 
--#if !defined WIN32 && defined HAVE_CAMV4L && defined HAVE_CAMV4L2
-+#if !defined WIN32 && defined HAVE_CAMV4L2
- 
- #define CLEAR(x) memset (&(x), 0, sizeof (x))
- 
-@@ -241,7 +241,7 @@
- #include <sys/stat.h>
- #include <sys/ioctl.h>
- 
--#include <linux/videodev.h>
-+#include <libv4l1-videodev.h>
- #include <linux/videodev2.h>
- 
- #include <libv4l1.h>