Gentoo Archives: gentoo-commits

From: Tomas Chvatal <scarabeus@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/kde:master commit in: media-libs/opencv/files/, media-libs/opencv/
Date: Fri, 29 Apr 2011 19:39:16
Message-Id: c9d131843e69f93b4bbaae90f1f17e3eb29bfe5a.scarabeus@gentoo
1 commit: c9d131843e69f93b4bbaae90f1f17e3eb29bfe5a
2 Author: Tomas Chvatal <scarabeus <AT> gentoo <DOT> org>
3 AuthorDate: Fri Apr 29 19:38:22 2011 +0000
4 Commit: Tomas Chvatal <scarabeus <AT> gentoo <DOT> org>
5 CommitDate: Fri Apr 29 19:38:22 2011 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=c9d13184
7
8 [media-libs/opencv] Add initial patch to fix bundled libraries calls (will for sure need more work)
9
10 ---
11 .../opencv/files/2.2.0-use_system_libs.patch | 12 ++++++++++++
12 media-libs/opencv/opencv-2.2.0.ebuild | 1 +
13 2 files changed, 13 insertions(+), 0 deletions(-)
14
15 diff --git a/media-libs/opencv/files/2.2.0-use_system_libs.patch b/media-libs/opencv/files/2.2.0-use_system_libs.patch
16 new file mode 100644
17 index 0000000..c85bd6e
18 --- /dev/null
19 +++ b/media-libs/opencv/files/2.2.0-use_system_libs.patch
20 @@ -0,0 +1,12 @@
21 +diff -urN OpenCV-2.2.0.old/modules/core/src/lapack.cpp OpenCV-2.2.0/modules/core/src/lapack.cpp
22 +--- OpenCV-2.2.0.old/modules/core/src/lapack.cpp 2010-12-05 04:35:24.000000000 +0100
23 ++++ OpenCV-2.2.0/modules/core/src/lapack.cpp 2011-04-29 21:34:50.000000000 +0200
24 +@@ -48,7 +48,7 @@
25 + typedef __CLPK_integer integer;
26 + typedef __CLPK_real real;
27 + #else
28 +- #include "clapack.h"
29 ++ #include <clapack/clapack.h>
30 + #endif
31 +
32 + #undef abs
33
34 diff --git a/media-libs/opencv/opencv-2.2.0.ebuild b/media-libs/opencv/opencv-2.2.0.ebuild
35 index 249cc73..3af965d 100644
36 --- a/media-libs/opencv/opencv-2.2.0.ebuild
37 +++ b/media-libs/opencv/opencv-2.2.0.ebuild
38 @@ -60,6 +60,7 @@ PATCHES=(
39 "${FILESDIR}/${PV}-gcc46.patch"
40 "${FILESDIR}/${PV}-ptrcvcapture.patch"
41 "${FILESDIR}/${PV}-v4l_2.6.38.patch"
42 + "${FILESDIR}/${PV}-use_system_libs.patch"
43 )
44
45 S=${WORKDIR}/${MY_P}