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

Collapse All | Expand All

(-)/usr/portage/media-libs/opencv/opencv-3.4.1-r5.ebuild (-11 / +12 lines)
Lines 22-28 Link Here
22
	)"
22
	)"
23
23
24
LICENSE="BSD"
24
LICENSE="BSD"
25
SLOT="0/3.4.1" # subslot = libopencv* soname version
25
SLOT="0/4.0.1" # subslot = libopencv* soname version
26
KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86 ~amd64-linux"
26
KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86 ~amd64-linux"
27
IUSE="contrib contrib_cvv contrib_dnn contrib_hdf contrib_sfm contrib_xfeatures2d cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_popcnt cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_fma3 cuda debug dnn_samples +eigen examples ffmpeg gdal gflags glog gphoto2 gstreamer gtk ieee1394 jpeg jpeg2k lapack libav opencl openexr opengl openmp pch png +python qt5 tesseract testprograms threads tiff vaapi v4l vtk webp xine"
27
IUSE="contrib contrib_cvv contrib_dnn contrib_hdf contrib_sfm contrib_xfeatures2d cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_popcnt cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_fma3 cuda debug dnn_samples +eigen examples ffmpeg gdal gflags glog gphoto2 gstreamer gtk ieee1394 jpeg jpeg2k lapack libav opencl openexr opengl openmp pch png +python qt5 tesseract testprograms threads tiff vaapi v4l vtk webp xine"
28
# OpenGL needs gtk or Qt installed to activate, otherwise build system
28
# OpenGL needs gtk or Qt installed to activate, otherwise build system
Lines 225-240 Link Here
225
	/usr/include/opencv2/cudev/warp/warp.hpp
225
	/usr/include/opencv2/cudev/warp/warp.hpp
226
)
226
)
227
227
228
PATCHES=(
228
#PATCHES=(
229
	"${FILESDIR}/${PN}-3.0.0-gles.patch"
229
#	"${FILESDIR}/${PN}-3.0.0-gles.patch"
230
	"${FILESDIR}/${PN}-3.4.0-disable-download.patch"
230
#	"${FILESDIR}/${PN}-3.4.0-disable-download.patch"
231
	"${FILESDIR}/${P}-compilation-C-mode.patch" # https://bugs.gentoo.org/656530
231
#	"${FILESDIR}/${P}-compilation-C-mode.patch" # https://bugs.gentoo.org/656530
232
	"${FILESDIR}/${P}-python-lib-suffix-hack.patch"
232
#	"${FILESDIR}/${P}-python-lib-suffix-hack.patch"
233
	"${FILESDIR}/${P}-cuda-add-relaxed-constexpr.patch"
233
#	"${FILESDIR}/${P}-cuda-add-relaxed-constexpr.patch"
234
	"${FILESDIR}/${P}-remove-git-autodetect.patch"
234
#	"${FILESDIR}/${P}-remove-git-autodetect.patch"
235
	"${FILESDIR}/${P}-fix-build-with-va.patch" # bug https://bugs.gentoo.org/656576
235
#	"${FILESDIR}/${P}-fix-build-with-va.patch" # bug https://bugs.gentoo.org/656576
236
	"${FILESDIR}/${P}-popcnt.patch" # https://bugs.gentoo.org/633900
236
#	"${FILESDIR}/${P}-popcnt.patch" # https://bugs.gentoo.org/633900
237
)
237
#)
238
238
239
pkg_pretend() {
239
pkg_pretend() {
240
	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
240
	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
Lines 336-341 Link Here
336
		-DWITH_GPHOTO2=$(usex gphoto2)
336
		-DWITH_GPHOTO2=$(usex gphoto2)
337
		-DWITH_LAPACK=$(multilib_native_usex lapack)
337
		-DWITH_LAPACK=$(multilib_native_usex lapack)
338
		-DWITH_ITT=OFF # 3dparty libs itt_notify
338
		-DWITH_ITT=OFF # 3dparty libs itt_notify
339
		-DWITH_QUIRC=OFF
339
	# ===================================================
340
	# ===================================================
340
	# CUDA build components: nvidia-cuda-toolkit takes care of GCC version
341
	# CUDA build components: nvidia-cuda-toolkit takes care of GCC version
341
	# ===================================================
342
	# ===================================================

Return to bug 663730