diff options
| author |   Alexis Ballier <aballier@gentoo.org> | 2015-07-14 17:04:01 +0000 |
|---|---|---|
| committer | Alexis Ballier <aballier@gentoo.org> | 2015-07-14 17:04:01 +0000 |
| commit | fa67659e07459079a94c2695dd4f32840e3864a1 (patch) | |
| tree | 0e9da736d77e808ba0067d813e3746582b6873d5 /media-video | |
| parent | Stable on alpha, bug 551846 (diff) | |
| download | gentoo-2-fa67659e07459079a94c2695dd4f32840e3864a1.tar.gz gentoo-2-fa67659e07459079a94c2695dd4f32840e3864a1.tar.bz2 gentoo-2-fa67659e07459079a94c2695dd4f32840e3864a1.zip | |
do not build findobject plugin which was automagic on opencv and now fails to build, bug #554516
(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 160F534A)
Diffstat (limited to 'media-video')
| -rw-r--r-- | media-video/cinelerra/ChangeLog | 7 | ||||
| -rw-r--r-- | media-video/cinelerra/cinelerra-20140710.ebuild | 5 | ||||
| -rw-r--r-- | media-video/cinelerra/files/cinelerra-nofindobject.patch | 16 |
3 files changed, 25 insertions, 3 deletions
diff --git a/media-video/cinelerra/ChangeLog b/media-video/cinelerra/ChangeLog index e674e09d64ce..03aa8f6e758d 100644 --- a/media-video/cinelerra/ChangeLog +++ b/media-video/cinelerra/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for media-video/cinelerra # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/cinelerra/ChangeLog,v 1.71 2015/02/08 16:21:49 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/cinelerra/ChangeLog,v 1.72 2015/07/14 17:04:01 aballier Exp $ + + 14 Jul 2015; Alexis Ballier <aballier@gentoo.org> cinelerra-20140710.ebuild, + +files/cinelerra-nofindobject.patch: + do not build findobject plugin which was automagic on opencv and now fails to + build, bug #554516 08 Feb 2015; Alexis Ballier <aballier@gentoo.org> cinelerra-20140710.ebuild, +files/cinelerra-pngtoh.patch: diff --git a/media-video/cinelerra/cinelerra-20140710.ebuild b/media-video/cinelerra/cinelerra-20140710.ebuild index bb46c737a19b..ff5834c67bc2 100644 --- a/media-video/cinelerra/cinelerra-20140710.ebuild +++ b/media-video/cinelerra/cinelerra-20140710.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/cinelerra/cinelerra-20140710.ebuild,v 1.3 2015/02/08 16:21:49 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/cinelerra/cinelerra-20140710.ebuild,v 1.4 2015/07/14 17:04:01 aballier Exp $ EAPI=5 inherit autotools eutils multilib flag-o-matic @@ -61,7 +61,8 @@ src_prepare() { "${FILESDIR}"/${P}-underlinking.patch \ "${FILESDIR}"/${P}-ffmpeg-0.11.patch \ "${FILESDIR}"/${PN}-libav9.patch \ - "${FILESDIR}"/${PN}-pngtoh.patch + "${FILESDIR}"/${PN}-pngtoh.patch \ + "${FILESDIR}"/${PN}-nofindobject.patch if has_version '>=media-video/ffmpeg-2' ; then epatch "${FILESDIR}"/${PN}-ffmpeg2.patch diff --git a/media-video/cinelerra/files/cinelerra-nofindobject.patch b/media-video/cinelerra/files/cinelerra-nofindobject.patch new file mode 100644 index 000000000000..99acf2b643c7 --- /dev/null +++ b/media-video/cinelerra/files/cinelerra-nofindobject.patch @@ -0,0 +1,16 @@ +Depends on features removed in opencv3. +https://bugs.gentoo.org/show_bug.cgi?id=554516 + +Index: cinelerra-20140710/configure.ac +=================================================================== +--- cinelerra-20140710.orig/configure.ac ++++ cinelerra-20140710/configure.ac +@@ -317,7 +317,7 @@ fi + AC_DEFINE_UNQUOTED(HAVE_OPENCV_SURF, $HAVE_OPENCV_SURF, + [define if SURF support is compiled into opencv]) + if test "x$opencv" = "xyes" && test "x$opencvh" = "xyes" ; then +- enable_findobject=ok ++ enable_findobject=no + fi + AM_CONDITIONAL(ENABLE_FINDOBJECT,test "x$enable_findobject" = "xok") + ############## END OF MISC LIBRARIES |