Gentoo Archives: gentoo-commits

From: Amy Winston <amynka@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/
Date: Sat, 31 Oct 2015 08:27:42
Message-Id: 1446279966.875fab34771b06d73495896ee560a7834a760c31.amynka@gentoo
1 commit: 875fab34771b06d73495896ee560a7834a760c31
2 Author: Amy Winston <amynka <AT> gentoo <DOT> org>
3 AuthorDate: Sat Oct 31 08:26:06 2015 +0000
4 Commit: Amy Winston <amynka <AT> gentoo <DOT> org>
5 CommitDate: Sat Oct 31 08:26:06 2015 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=875fab34
7
8 media-libs/opencv: contrib updated, broken example removed bug #558104.
9
10 Package-Manager: portage-2.2.20.1
11
12 media-libs/opencv/opencv-3.0.0.ebuild | 5 ++++-
13 1 file changed, 4 insertions(+), 1 deletion(-)
14
15 diff --git a/media-libs/opencv/opencv-3.0.0.ebuild b/media-libs/opencv/opencv-3.0.0.ebuild
16 index e2d2c75..a101fc4 100644
17 --- a/media-libs/opencv/opencv-3.0.0.ebuild
18 +++ b/media-libs/opencv/opencv-3.0.0.ebuild
19 @@ -13,7 +13,7 @@ HOMEPAGE="http://opencv.org"
20 SRC_URI="
21 mirror://sourceforge/opencvlibrary/opencv-unix/${PV}/${P}.zip
22 https://github.com/Itseez/${PN}/archive/${PV}.zip -> ${P}.zip
23 - contrib? ( https://github.com/Itseez/opencv_contrib/archive/172fdb315280325a617fbb9db5ec5631acd8180e.zip -> ${PN}_contrib.zip )" # commit from 6.8.2015
24 + contrib? ( https://github.com/Itseez/opencv_contrib/archive/2d1fc7a6cdccd04435795f68126151a51071a539.zip -> ${PN}_contrib.zip )" # commit from 26.10.2015
25
26 LICENSE="BSD"
27 SLOT="0/3.0"
28 @@ -103,6 +103,9 @@ src_prepare() {
29 -e '/add_subdirectory(.*3rdparty.*)/ d' \
30 CMakeLists.txt cmake/*cmake || die
31
32 + #removing broken sample bug #558104
33 + rm ../opencv_contrib-master/modules/ximgproc/samples/disparity_filtering.cpp
34 +
35 java-pkg-opt-2_src_prepare
36 }