summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'media-video/ffmpeg')
-rw-r--r--media-video/ffmpeg/ChangeLog5
-rw-r--r--media-video/ffmpeg/Manifest10
-rw-r--r--media-video/ffmpeg/ffmpeg-9999.ebuild4
3 files changed, 11 insertions, 8 deletions
diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog
index 9fa8e12ed995..9b6dec94c9c6 100644
--- a/media-video/ffmpeg/ChangeLog
+++ b/media-video/ffmpeg/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for media-video/ffmpeg
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.857 2015/05/18 13:45:39 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.858 2015/05/19 09:24:10 aballier Exp $
+
+ 19 May 2015; Alexis Ballier <aballier@gentoo.org> ffmpeg-9999.ebuild:
+ bump x265 dep
*ffmpeg-2.6.3 (18 May 2015)
diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index 6a145f7570f0..b15d53ec2df8 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -24,14 +24,14 @@ EBUILD ffmpeg-2.2.15.ebuild 12702 SHA256 957e1d8213a22d08505afe07de6c77c160cffdc
EBUILD ffmpeg-2.6.1.ebuild 14650 SHA256 44a2bd7f2ce63a4d59214691fc8c46f94e5e4714121edc29f56c9a6774fe270b SHA512 aa5b3c43e0d1712f0339cf8b8372ab9fb2cd95ee1b48bd00d0c5b467fea8b9a724338483114d8258471a9a59ceff5c94b9f2b5b61bd19ee37f4cc4e8f892ec6b WHIRLPOOL a3147f3e23fba6a68fcc51802f7124d9f67948aa3e308df382186722a37b6af766a28b69c7bbf9a7956045b9d633573b3704685a4b211c1e1311066ef6107754
EBUILD ffmpeg-2.6.2.ebuild 14650 SHA256 e22edd1a201c23a8a735263d456fa542ef90db969c16b13a8749d0167fb23e12 SHA512 cbab4e69842b6bee5e3bb5211dab98b3274e28afa22b5556dd608d581ac760221b5c85620be556290dc67489df565550498fad037a15d4cbb0ef7332fa3d0b24 WHIRLPOOL 416e3e0c8bea2121ae387c054d4e666415130072a411810d4f256ee6f57ef744f7235c919a322555c0570b933f69b6a740156b5eb9737120cb70daeabd926fec
EBUILD ffmpeg-2.6.3.ebuild 14650 SHA256 579853d57c6a7bf6047ac65450369c6f0b0f752947293d2c697c0eb17cce1bda SHA512 fffa2a1cc1e531cb2b6115312422a3b8936f0b86ef39a518f1da10acb5fae9fae5f766568f6c3fac1de1b4381c100f93b3916294da78bee433a2559e85649731 WHIRLPOOL b3b25e1d39814f8adcff735566bd136884db3bc00bbdc058c590c818dcb99b1ba2e98f89958a069a6743b680f9209c3035a91a0fc7e5262392baf74104c820d3
-EBUILD ffmpeg-9999.ebuild 14651 SHA256 daa6cc812efc8461031450c6bf1a663fb0e82b268b0d4a2dba5b4f938384b328 SHA512 aa01550b1218120f73b7edb426b0c9dff410afaee537326306310667e2ee7b060fbc6cf6d873dc9c77e0b55c3a3f1096f81eb025e573cba07e65df99b1d1a12c WHIRLPOOL b46e549f4a78fb5566fe79b24e3007613f87fc6e65fd72930a60b6388b048f9d968bfee32c3f44751e57e79459db191bc6bccb4a9754d34440f16f74b090b915
-MISC ChangeLog 5392 SHA256 5fd40bf57578efa46d52dfc57ddeff5c17839415fa5ca762bcc60e58a067d264 SHA512 966c1743839c1f9f03ca26704d2fc2b5a67667c8009a7f7c25f17db1290716d4664a037b444f8b0aa103d1727da739b5bf29edea2612518475b79b801d77f5c3 WHIRLPOOL 2899f5cf91d80515227dd6068cbbbeb1370aee363ad25ccfac8a49d0d3f7f7c91e4943d095ece15bd1bc8e6a5ba745c6869743b53e88262a81d8677b5e2e07f9
+EBUILD ffmpeg-9999.ebuild 14651 SHA256 d17bea43115d0e17ac369d32d40336ac345f1738f16ecece98063e4ecd7ea48a SHA512 7b1f0b70eabd3f213bf5c13e4b70fce20102801b3536d931a625cd995fb7296061ac373b79eed89b5e18e4c5851c2f096fdab75d08276427da4255d43153fed2 WHIRLPOOL 48145a3b433ce1299145a0bfe6590788d52402c5d43983e06c556a32bc1e698e6a13d0e72e2f4edd0d659c5ab60fc9139c6e1261be80e208d1923cfd87a5cef0
+MISC ChangeLog 5481 SHA256 b52954bf6db117035290957c2fe8e567d3626b4754bad9542217079cc3c9cede SHA512 711a099d9b073e40fdfeb480efd7f3a6531de87f572312dfd36aa783c0cedba5d012c4fcef6429e096e3c86a0b4891fe02b57e8f85deee62f187358470a5a4cb WHIRLPOOL 63bba782117041ffef77dd741253f5dac0d1477737869cb98df814e34f1c2c759e6a405ec0680941190253d5b3ea5fbc683e069d91b3aff19b5d1cd52c8d839e
MISC ChangeLog-2014 113291 SHA256 4c06c33d7ce130dbe891dac8bbed5394756966a4317815651276b5354aa943ca SHA512 1bd9eb77e715e26a406bf58a543987caf24051dec4f7fd928f6d03af41bf4d952dcdda7c6237cb2ffb9517f04adb9f8fcaac91087fcc758c0836c754050c5ae9 WHIRLPOOL 99024abbc682eee208a9086d0a5450a8855b18a6e20e51e0a19403c0669420e8448b1fd20d5d7558c51c1cc661eb6d3d18623b1dfc42cba9c5fed64f7822b701
MISC metadata.xml 4332 SHA256 b39edc51a5c5d68aefb52639412045287dbd670ab5b43a45b13c2c99d085f9a4 SHA512 0744c75f388ae01989b62cc34c49a665fc19dd8b0639c846a16c84a8db06a9cc571c2952df63857dac15bffca6975a0c872ea59c4f490639655f4eddd1b04ccb WHIRLPOOL ce3593918d35986256ee057520e69ebde51e4201e1d20e66f0367d7bf45e5a1a7301b5c7fa02ec327273702e426a2876a81e381c4af78251e729b2982abb41ad
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2
-iEYEAREIAAYFAlVZ7QQACgkQvFcC4BYPU0r8mwCgrG/HY1MpBmqCcrWQLVb2AQ5C
-mI8An0gYnQJbz6yLBsdnYoUPDIAYpGgQ
-=K0JT
+iEYEAREIAAYFAlVbATsACgkQvFcC4BYPU0qGVQCcDUCECAQUz1V5yeexxsFV8n/B
+pLoAn03kk9A6J1gri0Xr4myA/5OCsfi+
+=wPjp
-----END PGP SIGNATURE-----
diff --git a/media-video/ffmpeg/ffmpeg-9999.ebuild b/media-video/ffmpeg/ffmpeg-9999.ebuild
index ecc9ccc4c0df..af52a78b8caf 100644
--- a/media-video/ffmpeg/ffmpeg-9999.ebuild
+++ b/media-video/ffmpeg/ffmpeg-9999.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/ffmpeg/ffmpeg-9999.ebuild,v 1.188 2015/03/17 08:15:35 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999.ebuild,v 1.189 2015/05/19 09:24:10 aballier Exp $
EAPI="5"
@@ -172,7 +172,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.2:=[${MULTILIB_USEDEP}] )
+ x265? ( >=media-libs/x265-1.6:=[${MULTILIB_USEDEP}] )
xvid? ( >=media-libs/xvid-1.3.2-r1[${MULTILIB_USEDEP}] )
)
fdk? ( >=media-libs/fdk-aac-0.1.3:=[${MULTILIB_USEDEP}] )