| 1 |
mgorny 15/02/27 22:24:32 |
| 2 |
|
| 3 |
Modified: opencv-2.4.9.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
Use USE=libav to control ffmpeg/libav linking. Patch provided by Nikoli in https://github.com/gentoo/gentoo-portage-rsync-mirror/pull/62. |
| 6 |
|
| 7 |
(Portage version: 2.2.17/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.9 media-libs/opencv/opencv-2.4.9.ebuild |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/opencv/opencv-2.4.9.ebuild?rev=1.9&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/opencv/opencv-2.4.9.ebuild?rev=1.9&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/opencv/opencv-2.4.9.ebuild?r1=1.8&r2=1.9 |
| 15 |
|
| 16 |
Index: opencv-2.4.9.ebuild |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/media-libs/opencv/opencv-2.4.9.ebuild,v |
| 19 |
retrieving revision 1.8 |
| 20 |
retrieving revision 1.9 |
| 21 |
diff -u -r1.8 -r1.9 |
| 22 |
--- opencv-2.4.9.ebuild 25 Nov 2014 08:43:41 -0000 1.8 |
| 23 |
+++ opencv-2.4.9.ebuild 27 Feb 2015 22:24:32 -0000 1.9 |
| 24 |
@@ -1,6 +1,6 @@ |
| 25 |
-# Copyright 1999-2014 Gentoo Foundation |
| 26 |
+# Copyright 1999-2015 Gentoo Foundation |
| 27 |
# Distributed under the terms of the GNU General Public License v2 |
| 28 |
-# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/opencv-2.4.9.ebuild,v 1.8 2014/11/25 08:43:41 ago Exp $ |
| 29 |
+# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/opencv-2.4.9.ebuild,v 1.9 2015/02/27 22:24:32 mgorny Exp $ |
| 30 |
|
| 31 |
EAPI=5 |
| 32 |
PYTHON_COMPAT=( python2_{6,7} ) |
| 33 |
@@ -15,7 +15,7 @@ |
| 34 |
LICENSE="BSD" |
| 35 |
SLOT="0/2.4" |
| 36 |
KEYWORDS="amd64 ~arm ppc x86 ~amd64-linux" |
| 37 |
-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" |
| 38 |
+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" |
| 39 |
REQUIRED_USE=" |
| 40 |
python? ( ${PYTHON_REQUIRED_USE} ) |
| 41 |
" |
| 42 |
@@ -30,7 +30,10 @@ |
| 43 |
app-arch/bzip2 |
| 44 |
sys-libs/zlib |
| 45 |
cuda? ( >=dev-util/nvidia-cuda-toolkit-5.5 ) |
| 46 |
- ffmpeg? ( virtual/ffmpeg ) |
| 47 |
+ ffmpeg? ( |
| 48 |
+ libav? ( media-video/libav:0= ) |
| 49 |
+ !libav? ( media-video/ffmpeg:0= ) |
| 50 |
+ ) |
| 51 |
gstreamer? ( |
| 52 |
media-libs/gstreamer:0.10 |
| 53 |
media-libs/gst-plugins-base:0.10 |
| 54 |
|
| 55 |
|
| 56 |
|
| 57 |
1.118 media-libs/opencv/ChangeLog |
| 58 |
|
| 59 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/opencv/ChangeLog?rev=1.118&view=markup |
| 60 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/opencv/ChangeLog?rev=1.118&content-type=text/plain |
| 61 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/opencv/ChangeLog?r1=1.117&r2=1.118 |
| 62 |
|
| 63 |
Index: ChangeLog |
| 64 |
=================================================================== |
| 65 |
RCS file: /var/cvsroot/gentoo-x86/media-libs/opencv/ChangeLog,v |
| 66 |
retrieving revision 1.117 |
| 67 |
retrieving revision 1.118 |
| 68 |
diff -u -r1.117 -r1.118 |
| 69 |
--- ChangeLog 26 Dec 2014 18:18:22 -0000 1.117 |
| 70 |
+++ ChangeLog 27 Feb 2015 22:24:32 -0000 1.118 |
| 71 |
@@ -1,6 +1,10 @@ |
| 72 |
# ChangeLog for media-libs/opencv |
| 73 |
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 |
| 74 |
-# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/ChangeLog,v 1.117 2014/12/26 18:18:22 kensington Exp $ |
| 75 |
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 |
| 76 |
+# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/ChangeLog,v 1.118 2015/02/27 22:24:32 mgorny Exp $ |
| 77 |
+ |
| 78 |
+ 27 Feb 2015; Michał Górny <mgorny@g.o> opencv-2.4.9.ebuild: |
| 79 |
+ Use USE=libav to control ffmpeg/libav linking. Patch provided by Nikoli in |
| 80 |
+ https://github.com/gentoo/gentoo-portage-rsync-mirror/pull/62. |
| 81 |
|
| 82 |
26 Dec 2014; Michael Palimaka <kensington@g.o> |
| 83 |
-files/opencv-2.4.5-javamagic.patch, -opencv-2.4.5.ebuild, |
Archives