From: Amy Winston <amynka@gentoo.org>
Date: Sat, 31 Oct 2015 08:26:06 +0000 (+0100)
Subject: media-libs/opencv: contrib updated, broken example removed bug #558104.
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=875fab34771b06d73495896ee560a7834a760c31;p=gentoo.git

media-libs/opencv: contrib updated, broken example removed bug #558104.

Package-Manager: portage-2.2.20.1
---

diff --git a/media-libs/opencv/opencv-3.0.0.ebuild b/media-libs/opencv/opencv-3.0.0.ebuild
index e2d2c7527eaf..a101fc4a06b3 100644
--- a/media-libs/opencv/opencv-3.0.0.ebuild
+++ b/media-libs/opencv/opencv-3.0.0.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="http://opencv.org"
 SRC_URI="
 	mirror://sourceforge/opencvlibrary/opencv-unix/${PV}/${P}.zip
 	https://github.com/Itseez/${PN}/archive/${PV}.zip -> ${P}.zip
-	contrib? ( https://github.com/Itseez/opencv_contrib/archive/172fdb315280325a617fbb9db5ec5631acd8180e.zip -> ${PN}_contrib.zip )" # commit from 6.8.2015
+	contrib? ( https://github.com/Itseez/opencv_contrib/archive/2d1fc7a6cdccd04435795f68126151a51071a539.zip -> ${PN}_contrib.zip )" # commit from 26.10.2015
 
 LICENSE="BSD"
 SLOT="0/3.0"
@@ -103,6 +103,9 @@ src_prepare() {
 		-e '/add_subdirectory(.*3rdparty.*)/ d' \
 		CMakeLists.txt cmake/*cmake || die
 
+	#removing broken sample bug #558104
+	rm ../opencv_contrib-master/modules/ximgproc/samples/disparity_filtering.cpp
+
 	java-pkg-opt-2_src_prepare
 }