hasufell 15/02/15 19:56:41 Modified: ChangeLog ffdiaporama-2.1.ebuild Log: fix build with ffmpeg-2.4 (patch by Olivier Laurantin), move to libav USE flag (Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key BDEED020)
Revision Changes Path 1.23 media-video/ffdiaporama/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffdiaporama/ChangeLog?rev=1.23&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffdiaporama/ChangeLog?rev=1.23&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffdiaporama/ChangeLog?r1=1.22&r2=1.23 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/media-video/ffdiaporama/ChangeLog,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- ChangeLog 13 Jun 2014 03:04:07 -0000 1.22 +++ ChangeLog 15 Feb 2015 19:56:41 -0000 1.23 @@ -1,6 +1,11 @@ # ChangeLog for media-video/ffdiaporama -# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/ffdiaporama/ChangeLog,v 1.22 2014/06/13 03:04:07 patrick Exp $ +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/media-video/ffdiaporama/ChangeLog,v 1.23 2015/02/15 19:56:41 hasufell Exp $ + + 15 Feb 2015; Julian Ospald <hasuf...@gentoo.org> ffdiaporama-2.1.ebuild, + +files/ffdiaporama-2.1-ffmpeg-2.4.patch: + fix build with ffmpeg-2.4 (patch by Olivier Laurantin), move to libav USE + flag 13 Jun 2014; Patrick Lauer <patr...@gentoo.org> ffdiaporama-2.1.ebuild: Fix header 1.4 media-video/ffdiaporama/ffdiaporama-2.1.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffdiaporama/ffdiaporama-2.1.ebuild?rev=1.4&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffdiaporama/ffdiaporama-2.1.ebuild?rev=1.4&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffdiaporama/ffdiaporama-2.1.ebuild?r1=1.3&r2=1.4 Index: ffdiaporama-2.1.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/media-video/ffdiaporama/ffdiaporama-2.1.ebuild,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- ffdiaporama-2.1.ebuild 13 Jun 2014 03:04:07 -0000 1.3 +++ ffdiaporama-2.1.ebuild 15 Feb 2015 19:56:41 -0000 1.4 @@ -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-video/ffdiaporama/ffdiaporama-2.1.ebuild,v 1.3 2014/06/13 03:04:07 patrick Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/ffdiaporama/ffdiaporama-2.1.ebuild,v 1.4 2015/02/15 19:56:41 hasufell Exp $ EAPI=5 @@ -23,7 +23,7 @@ texturemate? ( CC-BY-3.0 )" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="openclipart texturemate" +IUSE="libav openclipart texturemate" RDEPEND=" dev-qt/qtcore:4 @@ -34,11 +34,12 @@ media-gfx/exiv2 media-libs/libsdl[sound] media-libs/taglib - !<media-video/ffmpeg-1.2:0 - virtual/ffmpeg[encode]" + !libav? ( >media-video/ffmpeg-1.2:0=[encode] ) + libav? ( >=media-video/libav-9:0=[encode] )" DEPEND="${RDEPEND}" DOCS=( authors.txt ) +PATCHES=( "${FILESDIR}"/${P}-ffmpeg-2.4.patch ) S="${WORKDIR}/ffDiaporama"
