public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] proj/kde:master commit in: media-libs/opencv/
@ 2011-04-29 19:16 Tomas Chvatal
  0 siblings, 0 replies; 5+ messages in thread
From: Tomas Chvatal @ 2011-04-29 19:16 UTC (permalink / raw
  To: gentoo-commits

commit:     131b9f85568ff453f97e37fa1af91c32a4a31058
Author:     Tomas Chvatal <scarabeus <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 29 19:15:27 2011 +0000
Commit:     Tomas Chvatal <scarabeus <AT> gentoo <DOT> org>
CommitDate: Fri Apr 29 19:15:27 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=131b9f85

[media-libs/opencv] actualy pass the configure phase.

---
 media-libs/opencv/opencv-2.2.0.ebuild |   17 ++++++++++++++---
 1 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/media-libs/opencv/opencv-2.2.0.ebuild b/media-libs/opencv/opencv-2.2.0.ebuild
index 7cc0051..7d6ad6e 100644
--- a/media-libs/opencv/opencv-2.2.0.ebuild
+++ b/media-libs/opencv/opencv-2.2.0.ebuild
@@ -17,9 +17,10 @@ SRC_URI="mirror://sourceforge/${PN}library/${MY_P}.tar.bz2"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
-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"
+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"
 
 RDEPEND="
+	sys-libs/zlib
 	cuda? ( dev-util/nvidia-cuda-toolkit )
 	eigen? ( dev-cpp/eigen:2 )
 	ffmpeg? ( virtual/ffmpeg )
@@ -42,7 +43,6 @@ RDEPEND="
 		x11-libs/qt-gui:4
 		opengl? ( x11-libs/qt-opengl:4 )
 	)
-	threads? ( dev-cpp/tbb )
 	tiff? ( media-libs/tiff )
 	v4l? ( media-libs/libv4l )
 	xine? ( media-libs/xine-lib )
@@ -72,6 +72,9 @@ src_prepare() {
 
 	# remove bundled stuff
 	rm -rf 3rdparty
+	sed -i \
+		-e '/add_subdirectory(3rdparty)/ d' \
+		CMakeLists.txt || die
 }
 
 src_configure() {
@@ -97,7 +100,6 @@ src_configure() {
 		$(cmake-utils_use_with png)
 		$(cmake-utils_use_with qt4 QT)
 		$(cmake-utils_use_with opengl QT_OPENGL)
-		$(cmake-utils_use_with threads TBB)
 		$(cmake-utils_use_with tiff)
 		$(cmake-utils_use_with v4l V4L)
 		$(cmake-utils_use_with xine)
@@ -126,6 +128,7 @@ src_configure() {
 		"-DENABLE_SSE42=OFF"
 		"-DWITH_PVAPI=OFF"
 		"-DWITH_UNICAP=OFF"
+		"-DWITH_TBB=OFF"
 	)
 
 	# things we want to be hardly enabled not worth useflag
@@ -137,3 +140,11 @@ src_configure() {
 
 	cmake-utils_src_configure
 }
+
+pkg_postinst() {
+	use python && python_mod_optimize opencv
+}
+
+pkg_postrm() {
+	use python && python_mod_cleanup opencv
+}



^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] proj/kde:master commit in: media-libs/opencv/
@ 2011-04-29 19:32 Tomas Chvatal
  0 siblings, 0 replies; 5+ messages in thread
From: Tomas Chvatal @ 2011-04-29 19:32 UTC (permalink / raw
  To: gentoo-commits

commit:     6e040b79f2e23a6b5a8b1e5bc7fd0141f32f10b2
Author:     Tomas Chvatal <scarabeus <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 29 19:31:36 2011 +0000
Commit:     Tomas Chvatal <scarabeus <AT> gentoo <DOT> org>
CommitDate: Fri Apr 29 19:31:36 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=6e040b79

[media-libs/opencv] add missing dep on clapack

---
 media-libs/opencv/opencv-2.2.0.ebuild |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/media-libs/opencv/opencv-2.2.0.ebuild b/media-libs/opencv/opencv-2.2.0.ebuild
index 35691dd..249cc73 100644
--- a/media-libs/opencv/opencv-2.2.0.ebuild
+++ b/media-libs/opencv/opencv-2.2.0.ebuild
@@ -21,6 +21,7 @@ IUSE="cuda doc eigen examples ffmpeg gstreamer gtk ieee1394 ipp jpeg jpeg2k open
 
 RDEPEND="
 	sys-libs/zlib
+	sci-libs/clapack
 	cuda? ( dev-util/nvidia-cuda-toolkit )
 	eigen? ( dev-cpp/eigen:2 )
 	ffmpeg? ( virtual/ffmpeg )



^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] proj/kde:master commit in: media-libs/opencv/
@ 2011-04-30 17:12 Andreas K. Huettel
  0 siblings, 0 replies; 5+ messages in thread
From: Andreas K. Huettel @ 2011-04-30 17:12 UTC (permalink / raw
  To: gentoo-commits

commit:     514075fba110106144b8caf5786a3fd66b0e1675
Author:     Andreas K. Huettel (dilfridge) <mail <AT> akhuettel <DOT> de>
AuthorDate: Sat Apr 30 17:15:02 2011 +0000
Commit:     Andreas K. Huettel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Apr 30 17:15:02 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=514075fb

[media-libs/opencv] Fix use of precompiled headers, bug 365399

(Portage version: 2.1.9.46/git/Linux x86_64, RepoMan options: --force, signed Manifest commit with key B6C5F7DE)

---
 media-libs/opencv/opencv-2.2.0.ebuild |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/media-libs/opencv/opencv-2.2.0.ebuild b/media-libs/opencv/opencv-2.2.0.ebuild
index f2890d4..d21fd2b 100644
--- a/media-libs/opencv/opencv-2.2.0.ebuild
+++ b/media-libs/opencv/opencv-2.2.0.ebuild
@@ -71,6 +71,8 @@ PATCHES=(
 	"${FILESDIR}/${PV}-v4l_2.6.38.patch"
 )
 
+CMAKE_BUILD_TYPE="Release"
+
 S=${WORKDIR}/${MY_P}
 
 pkg_setup() {



^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] proj/kde:master commit in: media-libs/opencv/
@ 2011-04-30 18:43 Andreas K. Huettel
  0 siblings, 0 replies; 5+ messages in thread
From: Andreas K. Huettel @ 2011-04-30 18:43 UTC (permalink / raw
  To: gentoo-commits

commit:     23561644695c6e92e7ca1d6a83ec7fde4d170846
Author:     Andreas K. Huettel (dilfridge) <mail <AT> akhuettel <DOT> de>
AuthorDate: Sat Apr 30 18:45:42 2011 +0000
Commit:     Andreas K. Huettel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Apr 30 18:45:42 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=23561644

[media-libs/opencv] Fix libv4l dependency

(Portage version: 2.1.9.46/git/Linux x86_64, RepoMan options: --force, signed Manifest commit with key B6C5F7DE)

---
 media-libs/opencv/opencv-2.2.0.ebuild |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/media-libs/opencv/opencv-2.2.0.ebuild b/media-libs/opencv/opencv-2.2.0.ebuild
index d21fd2b..af07b1d 100644
--- a/media-libs/opencv/opencv-2.2.0.ebuild
+++ b/media-libs/opencv/opencv-2.2.0.ebuild
@@ -49,7 +49,7 @@ RDEPEND="
 		opengl? ( x11-libs/qt-opengl:4 )
 	)
 	tiff? ( media-libs/tiff )
-	v4l? ( media-libs/libv4l )
+	v4l? ( >=media-libs/libv4l-0.8.3 )
 	xine? ( media-libs/xine-lib )
 "
 DEPEND="${RDEPEND}



^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] proj/kde:master commit in: media-libs/opencv/
@ 2011-04-30 19:15 Andreas K. Huettel
  0 siblings, 0 replies; 5+ messages in thread
From: Andreas K. Huettel @ 2011-04-30 19:15 UTC (permalink / raw
  To: gentoo-commits

commit:     ab0455b33b70c999e8960603250cb07ecc9bebf1
Author:     Andreas K. Huettel (dilfridge) <mail <AT> akhuettel <DOT> de>
AuthorDate: Sat Apr 30 19:09:30 2011 +0000
Commit:     Andreas K. Huettel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Apr 30 19:09:30 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=ab0455b3

[] Restrict tests

(Portage version: 2.1.9.46/git/Linux x86_64, RepoMan options: --force, signed Manifest commit with key B6C5F7DE)

---
 media-libs/opencv/opencv-2.2.0.ebuild |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/media-libs/opencv/opencv-2.2.0.ebuild b/media-libs/opencv/opencv-2.2.0.ebuild
index af07b1d..55e6300 100644
--- a/media-libs/opencv/opencv-2.2.0.ebuild
+++ b/media-libs/opencv/opencv-2.2.0.ebuild
@@ -19,6 +19,9 @@ SLOT="0"
 KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
 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"
 
+# all tests fail, needs further investigation, bug 296681 - dilfridge
+RESTRICT=test
+
 RDEPEND="
 	app-arch/bzip2
 	dev-libs/libf2c



^ permalink raw reply related	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2011-04-30 19:25 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-04-30 18:43 [gentoo-commits] proj/kde:master commit in: media-libs/opencv/ Andreas K. Huettel
  -- strict thread matches above, loose matches on Subject: below --
2011-04-30 19:15 Andreas K. Huettel
2011-04-30 17:12 Andreas K. Huettel
2011-04-29 19:32 Tomas Chvatal
2011-04-29 19:16 Tomas Chvatal

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox