mgorny 15/02/27 22:24:32 Modified: opencv-2.4.9.ebuild ChangeLog Log: Use USE=libav to control ffmpeg/libav linking. Patch provided by Nikoli in https://github.com/gentoo/gentoo-portage-rsync-mirror/pull/62. (Portage version: 2.2.17/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!)
Revision Changes Path 1.9 media-libs/opencv/opencv-2.4.9.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/opencv/opencv-2.4.9.ebuild?rev=1.9&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/opencv/opencv-2.4.9.ebuild?rev=1.9&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/opencv/opencv-2.4.9.ebuild?r1=1.8&r2=1.9 Index: opencv-2.4.9.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/media-libs/opencv/opencv-2.4.9.ebuild,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- opencv-2.4.9.ebuild 25 Nov 2014 08:43:41 -0000 1.8 +++ opencv-2.4.9.ebuild 27 Feb 2015 22:24:32 -0000 1.9 @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/opencv-2.4.9.ebuild,v 1.8 2014/11/25 08:43:41 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/opencv-2.4.9.ebuild,v 1.9 2015/02/27 22:24:32 mgorny Exp $ EAPI=5 PYTHON_COMPAT=( python2_{6,7} ) @@ -15,7 +15,7 @@ LICENSE="BSD" SLOT="0/2.4" KEYWORDS="amd64 ~arm ppc x86 ~amd64-linux" -IUSE="cuda doc +eigen examples ffmpeg gstreamer gtk ieee1394 ipp jpeg jpeg2k opencl openexr opengl openmp pch png +python qt4 testprograms threads tiff v4l vtk xine" +IUSE="cuda doc +eigen examples ffmpeg gstreamer gtk ieee1394 ipp jpeg jpeg2k libav opencl openexr opengl openmp pch png +python qt4 testprograms threads tiff v4l vtk xine" REQUIRED_USE=" python? ( ${PYTHON_REQUIRED_USE} ) " @@ -30,7 +30,10 @@ app-arch/bzip2 sys-libs/zlib cuda? ( >=dev-util/nvidia-cuda-toolkit-5.5 ) - ffmpeg? ( virtual/ffmpeg ) + ffmpeg? ( + libav? ( media-video/libav:0= ) + !libav? ( media-video/ffmpeg:0= ) + ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 1.118 media-libs/opencv/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/opencv/ChangeLog?rev=1.118&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/opencv/ChangeLog?rev=1.118&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/opencv/ChangeLog?r1=1.117&r2=1.118 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/media-libs/opencv/ChangeLog,v retrieving revision 1.117 retrieving revision 1.118 diff -u -r1.117 -r1.118 --- ChangeLog 26 Dec 2014 18:18:22 -0000 1.117 +++ ChangeLog 27 Feb 2015 22:24:32 -0000 1.118 @@ -1,6 +1,10 @@ # ChangeLog for media-libs/opencv -# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/ChangeLog,v 1.117 2014/12/26 18:18:22 kensington Exp $ +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/ChangeLog,v 1.118 2015/02/27 22:24:32 mgorny Exp $ + + 27 Feb 2015; Michał Górny <[email protected]> opencv-2.4.9.ebuild: + Use USE=libav to control ffmpeg/libav linking. Patch provided by Nikoli in + https://github.com/gentoo/gentoo-portage-rsync-mirror/pull/62. 26 Dec 2014; Michael Palimaka <[email protected]> -files/opencv-2.4.5-javamagic.patch, -opencv-2.4.5.ebuild,
