Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 572836 | Differences between
and this patch

Collapse All | Expand All

(-)/usr/portage/media-libs/opencv/metadata.xml (+3 lines)
Line 0 Link Here
1
diff -Naur a/opencv_contrib-3.1.0/modules/text/CMakeLists.txt b/opencv_contrib-3.1.0/modules/text/CMakeLists.txt
2
--- a/opencv_contrib-3.1.0/modules/text/CMakeLists.txt	2016-06-22 22:30:13.427798189 +0930
Lines 26-31 Link Here
26
		<flag name="gdal">Enable support for sci-libs/gdal library</flag>
26
		<flag name="gdal">Enable support for sci-libs/gdal library</flag>
27
		<flag name="ipp">Enable Intel Integrated Primitive support</flag>
27
		<flag name="ipp">Enable Intel Integrated Primitive support</flag>
28
		<flag name="opencl">Add support for OpenCL</flag>
28
		<flag name="opencl">Add support for OpenCL</flag>
29
		<flag name="tesseract">Add support for OCR using <pkg>app-text/tesseract</pkg></flag>
29
		<flag name="testprograms">Build and install programs for testing OpenCV (performance)</flag>
30
		<flag name="testprograms">Build and install programs for testing OpenCV (performance)</flag>
30
		<flag name="vtk">Build new 3D visualization module viz based on sci-libs/vtk</flag>
31
		<flag name="vtk">Build new 3D visualization module viz based on sci-libs/vtk</flag>
31
		<flag name="webp">Enable support for webp image format</flag>
32
		<flag name="webp">Enable support for webp image format</flag>
(-)/usr/portage/media-libs/opencv/opencv-3.1.0-r4.ebuild (-6 / +12 lines)
Lines 22-28 Link Here
22
KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux"
22
KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux"
23
IUSE="contrib cuda +eigen examples ffmpeg gdal gphoto2 gstreamer gtk \
23
IUSE="contrib cuda +eigen examples ffmpeg gdal gphoto2 gstreamer gtk \
24
	ieee1394 ipp jpeg jpeg2k libav opencl openexr opengl openmp pch png \
24
	ieee1394 ipp jpeg jpeg2k libav opencl openexr opengl openmp pch png \
25
	+python qt4 qt5 testprograms threads tiff vaapi v4l vtk webp xine"
25
	+python qt4 qt5 tesseract testprograms threads tiff vaapi v4l vtk webp xine"
26
26
27
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
27
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
28
	?? ( qt4 qt5 )"
28
	?? ( qt4 qt5 )"
Lines 76-81 Link Here
76
		dev-qt/qtconcurrent:5
76
		dev-qt/qtconcurrent:5
77
		opengl? ( dev-qt/qtopengl:5 )
77
		opengl? ( dev-qt/qtopengl:5 )
78
	)
78
	)
79
	tesseract? (
80
		app-text/tesseract
81
		!opencl? ( !cuda? ( app-text/tesseract[-opencl] ) )
82
	)
79
	threads? ( dev-cpp/tbb )
83
	threads? ( dev-cpp/tbb )
80
	tiff? ( media-libs/tiff:0 )
84
	tiff? ( media-libs/tiff:0 )
81
	v4l? ( >=media-libs/libv4l-0.8.3 )
85
	v4l? ( >=media-libs/libv4l-0.8.3 )
Lines 105-110 Link Here
105
src_prepare() {
109
src_prepare() {
106
	default
110
	default
107
111
112
	cd "${WORKDIR}/${PN}_contrib-${PV}"
113
	epatch "${FILESDIR}"/${PN}_contrib-${PV}-tesseract-opencl.patch
114
	cd "${S}"
115
108
	# remove bundled stuff
116
	# remove bundled stuff
109
	rm -rf 3rdparty || die "Removing 3rd party components failed"
117
	rm -rf 3rdparty || die "Removing 3rd party components failed"
110
	sed -i \
118
	sed -i \
Lines 178-183 Link Here
178
		-DWITH_VA_INTEL=$(usex vaapi ON OFF)
186
		-DWITH_VA_INTEL=$(usex vaapi ON OFF)
179
		-DWITH_GDAL=$(usex gdal ON OFF)
187
		-DWITH_GDAL=$(usex gdal ON OFF)
180
		-DWITH_GPHOTO2=$(usex gphoto2 ON OFF)
188
		-DWITH_GPHOTO2=$(usex gphoto2 ON OFF)
189
		-DWITH_TESSERACT=$(usex tesseract ON OFF)
181
	# ===================================================
190
	# ===================================================
182
	# OpenCV build components
191
	# OpenCV build components
183
	# ===================================================
192
	# ===================================================
Lines 211-221 Link Here
211
		if [[ "$(gcc-version)" > "4.8" ]]; then
220
		if [[ "$(gcc-version)" > "4.8" ]]; then
212
			# bug 577410 
221
			# bug 577410 
213
			# #error -- unsupported GNU version! gcc 4.9 and up are not supported!
222
			# #error -- unsupported GNU version! gcc 4.9 and up are not supported!
214
			ewarn "CUDA and >=sys-devel/gcc-4.9 do not play well together. Disabling CUDA support."
223
			ewarn "CUDA and >=sys-devel/gcc-4.9 do not play well together. Remove the cuda USE flag from opencv."
215
			mycmakeargs+=( -DWITH_CUDA=OFF )
224
			die
216
			mycmakeargs+=( -DWITH_CUBLAS=OFF )
217
			mycmakeargs+=( -DWITH_CUFFT=OFF )
218
219
		else
225
		else
220
			mycmakeargs+=( -DWITH_CUDA=ON )
226
			mycmakeargs+=( -DWITH_CUDA=ON )
221
			mycmakeargs+=( -DWITH_CUBLAS=ON )
227
			mycmakeargs+=( -DWITH_CUBLAS=ON )

Return to bug 572836