diff options
| author |   Luca Barbato <lu_zero@gentoo.org> | 2011-11-14 04:53:45 +0000 |
|---|---|---|
| committer | Luca Barbato <lu_zero@gentoo.org> | 2011-11-14 04:53:45 +0000 |
| commit | 13ccadf5546b441801ea611ff4f028bbc11f9986 (patch) | |
| tree | 02f1924773a7a97c396b1c7537501e4564afecaf | |
| parent | Fix CFLAGS (bug 240225) (diff) | |
| download | gentoo-2-13ccadf5546b441801ea611ff4f028bbc11f9986.tar.gz gentoo-2-13ccadf5546b441801ea611ff4f028bbc11f9986.tar.bz2 gentoo-2-13ccadf5546b441801ea611ff4f028bbc11f9986.zip | |
Fix libavutil usage
(Portage version: 2.1.10.34/cvs/Linux x86_64)
| -rw-r--r-- | media-libs/opencv/ChangeLog | 6 | ||||
| -rw-r--r-- | media-libs/opencv/files/opencv-2.3.1a-libav-0.7.patch | 10 | ||||
| -rw-r--r-- | media-libs/opencv/opencv-2.3.1a.ebuild | 7 |
3 files changed, 18 insertions, 5 deletions
diff --git a/media-libs/opencv/ChangeLog b/media-libs/opencv/ChangeLog index 3c0422d3e985..e6a693d4b23d 100644 --- a/media-libs/opencv/ChangeLog +++ b/media-libs/opencv/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-libs/opencv # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/ChangeLog,v 1.58 2011/11/13 14:36:29 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/ChangeLog,v 1.59 2011/11/14 04:53:45 lu_zero Exp $ + + 14 Nov 2011; Luca Barbato <lu_zero@gentoo.org> opencv-2.3.1a.ebuild, + +files/opencv-2.3.1a-libav-0.7.patch: + Fix libavutil usage 13 Nov 2011; Andreas K. Huettel <dilfridge@gentoo.org> opencv-2.3.1a.ebuild: Does not work with libav-0.8_pre, bug 384021 diff --git a/media-libs/opencv/files/opencv-2.3.1a-libav-0.7.patch b/media-libs/opencv/files/opencv-2.3.1a-libav-0.7.patch new file mode 100644 index 000000000000..59090703d149 --- /dev/null +++ b/media-libs/opencv/files/opencv-2.3.1a-libav-0.7.patch @@ -0,0 +1,10 @@ +--- OpenCV-2.3.1.orig/modules/highgui/src/cap_ffmpeg_impl.hpp 2011-11-14 05:33:37.000000000 +0100 ++++ OpenCV-2.3.1/modules/highgui/src/cap_ffmpeg_impl.hpp 2011-11-14 05:33:18.000000000 +0100 +@@ -104,6 +104,7 @@ + #endif + #if defined(HAVE_LIBAVCODEC_AVCODEC_H) + #include <libavcodec/avcodec.h> ++ #include <libavutil/mathematics.h> + #endif + #if defined(HAVE_LIBSWSCALE_SWSCALE_H) + #include <libswscale/swscale.h> diff --git a/media-libs/opencv/opencv-2.3.1a.ebuild b/media-libs/opencv/opencv-2.3.1a.ebuild index 53026a71283d..b30e15ab4ed0 100644 --- a/media-libs/opencv/opencv-2.3.1a.ebuild +++ b/media-libs/opencv/opencv-2.3.1a.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/opencv-2.3.1a.ebuild,v 1.2 2011/11/13 14:36:29 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/opencv-2.3.1a.ebuild,v 1.3 2011/11/14 04:53:45 lu_zero Exp $ EAPI=3 @@ -24,9 +24,7 @@ RDEPEND=" sys-libs/zlib cuda? ( >=dev-util/nvidia-cuda-toolkit-4 ) eigen? ( dev-cpp/eigen:2 ) - ffmpeg? ( - || ( media-video/ffmpeg <=media-video/libav-0.7.9999 ) - ) + ffmpeg? ( virtual/ffmpeg ) gstreamer? ( media-libs/gstreamer media-libs/gst-plugins-base @@ -63,6 +61,7 @@ PATCHES=( "${FILESDIR}/${P}-convert_sets_to_options.patch" "${FILESDIR}/${P}-libsuffix.patch" "${FILESDIR}/${P}-nocaps.patch" + "${FILESDIR}/${P}-libav-0.7.patch" ) CMAKE_BUILD_TYPE="Release" |