From 6b2f2d92cfc29c072de47d5f77e2ae43e82843c1 Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@plugapps.com>
Date: Thu, 3 May 2012 10:40:36 -0400
Subject: [PATCH] extra/opencv: our patch is no longer needed

---
 extra/opencv/PKGBUILD    |  8 ++------
 extra/opencv/alarm.patch | 12 ------------
 2 files changed, 2 insertions(+), 18 deletions(-)
 delete mode 100644 extra/opencv/alarm.patch

diff --git a/extra/opencv/PKGBUILD b/extra/opencv/PKGBUILD
index 82f827673..7f60ddd61 100644
--- a/extra/opencv/PKGBUILD
+++ b/extra/opencv/PKGBUILD
@@ -25,10 +25,8 @@ optdepends=('opencv-docs'
             'eigen2'
             'python2-numpy: Python 2.x interface')
 options=('!libtool')
-source=("http://downloads.sourceforge.net/opencvlibrary/$_realname-${pkgver}.tar.bz2"
-        "alarm.patch")
-md5sums=('1fcda4ed3d0655f033ac30be8bad4882'
-         '941d6076ebdb4af729626ba3730e2f76')
+source=("http://downloads.sourceforge.net/opencvlibrary/$_realname-${pkgver}.tar.bz2")
+md5sums=('1fcda4ed3d0655f033ac30be8bad4882')
 
 _cmakeopts=('-D CMAKE_BUILD_TYPE=Release'
             '-D CMAKE_INSTALL_PREFIX=/usr'
@@ -61,8 +59,6 @@ build() {
   [ $CARCH = x86_64 ] && \
     _cmakeopts=${_cmakeopts[@]/ENABLE_SSE3=OFF/ENABLE_SSE3=ON}
 
-  patch -p1 -i ${srcdir}/alarm.patch
-
   cmake ${_cmakeopts[@]} .
 
   make
diff --git a/extra/opencv/alarm.patch b/extra/opencv/alarm.patch
deleted file mode 100644
index f695a8d30..000000000
--- a/extra/opencv/alarm.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urN a/modules/flann/include/opencv2/flann/dist.h b/modules/flann/include/opencv2/flann/dist.h
---- a/modules/flann/include/opencv2/flann/dist.h	2011-09-12 12:42:27.000000000 -0600
-+++ b/modules/flann/include/opencv2/flann/dist.h	2011-11-05 23:29:38.518023435 -0600
-@@ -60,7 +60,7 @@
- inline double abs<double>(double x) { return fabs(x); }
- 
- template<>
--inline long double abs<long double>(long double x) { return fabsl(x); }
-+inline long double abs<long double>(long double x) { return fabs(x); }
- 
- 
- template<typename T>