mirror of
https://github.com/archlinuxarm/PKGBUILDs.git
synced 2024-11-28 22:57:37 +00:00
extra/opencv: our patch is no longer needed
This commit is contained in:
parent
fecf6750ea
commit
6b2f2d92cf
2 changed files with 2 additions and 18 deletions
|
@ -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
|
||||
|
|
|
@ -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>
|
Loading…
Reference in a new issue