1 |
commit: 131b9f85568ff453f97e37fa1af91c32a4a31058 |
2 |
Author: Tomas Chvatal <scarabeus <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Apr 29 19:15:27 2011 +0000 |
4 |
Commit: Tomas Chvatal <scarabeus <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Apr 29 19:15:27 2011 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=131b9f85 |
7 |
|
8 |
[media-libs/opencv] actualy pass the configure phase. |
9 |
|
10 |
--- |
11 |
media-libs/opencv/opencv-2.2.0.ebuild | 17 ++++++++++++++--- |
12 |
1 files changed, 14 insertions(+), 3 deletions(-) |
13 |
|
14 |
diff --git a/media-libs/opencv/opencv-2.2.0.ebuild b/media-libs/opencv/opencv-2.2.0.ebuild |
15 |
index 7cc0051..7d6ad6e 100644 |
16 |
--- a/media-libs/opencv/opencv-2.2.0.ebuild |
17 |
+++ b/media-libs/opencv/opencv-2.2.0.ebuild |
18 |
@@ -17,9 +17,10 @@ SRC_URI="mirror://sourceforge/${PN}library/${MY_P}.tar.bz2" |
19 |
LICENSE="BSD" |
20 |
SLOT="0" |
21 |
KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86" |
22 |
-IUSE="cuda doc eigen examples ffmpeg gstreamer gtk ieee1394 ipp jpeg jpeg2k openexr opengl png python qt4 sse sse2 sse3 ssse3 test threads tiff v4l xine" |
23 |
+IUSE="cuda doc eigen examples ffmpeg gstreamer gtk ieee1394 ipp jpeg jpeg2k openexr opengl png python qt4 sse sse2 sse3 ssse3 test tiff v4l xine" |
24 |
|
25 |
RDEPEND=" |
26 |
+ sys-libs/zlib |
27 |
cuda? ( dev-util/nvidia-cuda-toolkit ) |
28 |
eigen? ( dev-cpp/eigen:2 ) |
29 |
ffmpeg? ( virtual/ffmpeg ) |
30 |
@@ -42,7 +43,6 @@ RDEPEND=" |
31 |
x11-libs/qt-gui:4 |
32 |
opengl? ( x11-libs/qt-opengl:4 ) |
33 |
) |
34 |
- threads? ( dev-cpp/tbb ) |
35 |
tiff? ( media-libs/tiff ) |
36 |
v4l? ( media-libs/libv4l ) |
37 |
xine? ( media-libs/xine-lib ) |
38 |
@@ -72,6 +72,9 @@ src_prepare() { |
39 |
|
40 |
# remove bundled stuff |
41 |
rm -rf 3rdparty |
42 |
+ sed -i \ |
43 |
+ -e '/add_subdirectory(3rdparty)/ d' \ |
44 |
+ CMakeLists.txt || die |
45 |
} |
46 |
|
47 |
src_configure() { |
48 |
@@ -97,7 +100,6 @@ src_configure() { |
49 |
$(cmake-utils_use_with png) |
50 |
$(cmake-utils_use_with qt4 QT) |
51 |
$(cmake-utils_use_with opengl QT_OPENGL) |
52 |
- $(cmake-utils_use_with threads TBB) |
53 |
$(cmake-utils_use_with tiff) |
54 |
$(cmake-utils_use_with v4l V4L) |
55 |
$(cmake-utils_use_with xine) |
56 |
@@ -126,6 +128,7 @@ src_configure() { |
57 |
"-DENABLE_SSE42=OFF" |
58 |
"-DWITH_PVAPI=OFF" |
59 |
"-DWITH_UNICAP=OFF" |
60 |
+ "-DWITH_TBB=OFF" |
61 |
) |
62 |
|
63 |
# things we want to be hardly enabled not worth useflag |
64 |
@@ -137,3 +140,11 @@ src_configure() { |
65 |
|
66 |
cmake-utils_src_configure |
67 |
} |
68 |
+ |
69 |
+pkg_postinst() { |
70 |
+ use python && python_mod_optimize opencv |
71 |
+} |
72 |
+ |
73 |
+pkg_postrm() { |
74 |
+ use python && python_mod_cleanup opencv |
75 |
+} |