diff options
author | Samuli Suominen <ssuominen@gentoo.org> | 2014-07-27 13:10:10 +0000 |
---|---|---|
committer | Samuli Suominen <ssuominen@gentoo.org> | 2014-07-27 13:10:10 +0000 |
commit | 3131d88c88026f2c27d915f7bca515eaced873f4 (patch) | |
tree | deff103fa76aaaba8c6720aafda216845f41a338 /media-video | |
parent | Version bump; update SLOT to 0/25 based on new SONAME (diff) | |
download | gentoo-2-3131d88c88026f2c27d915f7bca515eaced873f4.tar.gz gentoo-2-3131d88c88026f2c27d915f7bca515eaced873f4.tar.bz2 gentoo-2-3131d88c88026f2c27d915f7bca515eaced873f4.zip |
Update media-libs/x265 dependency from 1.0 to 1.2 wrt #518320 by "darkbasic"
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)
Diffstat (limited to 'media-video')
-rw-r--r-- | media-video/ffmpeg/ChangeLog | 6 | ||||
-rw-r--r-- | media-video/ffmpeg/ffmpeg-2.3.ebuild | 4 | ||||
-rw-r--r-- | media-video/ffmpeg/ffmpeg-9999.ebuild | 4 |
3 files changed, 9 insertions, 5 deletions
diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog index f6f9fa97eedc..903719968e28 100644 --- a/media-video/ffmpeg/ChangeLog +++ b/media-video/ffmpeg/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-video/ffmpeg # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.771 2014/07/27 09:36:19 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.772 2014/07/27 13:10:10 ssuominen Exp $ + + 27 Jul 2014; Samuli Suominen <ssuominen@gentoo.org> ffmpeg-2.3.ebuild, + ffmpeg-9999.ebuild: + Update media-libs/x265 dependency from 1.0 to 1.2 wrt #518320 by "darkbasic" *ffmpeg-2.3 (27 Jul 2014) diff --git a/media-video/ffmpeg/ffmpeg-2.3.ebuild b/media-video/ffmpeg/ffmpeg-2.3.ebuild index 7294aaf4fb67..ed3185c560bf 100644 --- a/media-video/ffmpeg/ffmpeg-2.3.ebuild +++ b/media-video/ffmpeg/ffmpeg-2.3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-2.3.ebuild,v 1.1 2014/07/27 09:36:19 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-2.3.ebuild,v 1.2 2014/07/27 13:10:10 ssuominen Exp $ EAPI="5" @@ -100,7 +100,7 @@ RDEPEND=" wavpack? ( >=media-sound/wavpack-4.60.1-r1[${MULTILIB_USEDEP}] ) webp? ( >=media-libs/libwebp-0.3.0[${MULTILIB_USEDEP}] ) x264? ( >=media-libs/x264-0.0.20130506:=[${MULTILIB_USEDEP}] ) - x265? ( >=media-libs/x265-1.0:=[${MULTILIB_USEDEP}] ) + x265? ( >=media-libs/x265-1.2:=[${MULTILIB_USEDEP}] ) xvid? ( >=media-libs/xvid-1.3.2-r1[${MULTILIB_USEDEP}] ) ) fdk? ( >=media-libs/fdk-aac-0.1.3[${MULTILIB_USEDEP}] ) diff --git a/media-video/ffmpeg/ffmpeg-9999.ebuild b/media-video/ffmpeg/ffmpeg-9999.ebuild index cb1c7a76674a..37b1045c4ca5 100644 --- a/media-video/ffmpeg/ffmpeg-9999.ebuild +++ b/media-video/ffmpeg/ffmpeg-9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999.ebuild,v 1.167 2014/07/27 09:23:21 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999.ebuild,v 1.168 2014/07/27 13:10:10 ssuominen Exp $ EAPI="5" @@ -100,7 +100,7 @@ RDEPEND=" wavpack? ( >=media-sound/wavpack-4.60.1-r1[${MULTILIB_USEDEP}] ) webp? ( >=media-libs/libwebp-0.3.0[${MULTILIB_USEDEP}] ) x264? ( >=media-libs/x264-0.0.20130506:=[${MULTILIB_USEDEP}] ) - x265? ( >=media-libs/x265-1.0:=[${MULTILIB_USEDEP}] ) + x265? ( >=media-libs/x265-1.2:=[${MULTILIB_USEDEP}] ) xvid? ( >=media-libs/xvid-1.3.2-r1[${MULTILIB_USEDEP}] ) ) fdk? ( >=media-libs/fdk-aac-0.1.3[${MULTILIB_USEDEP}] ) |