summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMikle Kolyada <zlogene@gentoo.org>2015-04-11 12:09:52 +0000
committerMikle Kolyada <zlogene@gentoo.org>2015-04-11 12:09:52 +0000
commitda40a5ce6121ce43c6ad6d6c34cb00658a006a17 (patch)
tree5dfea466916d23289f0f8a65fd391c51d6e8f78c /media-video/ffmpeg
parentStable mask x265 dependency for ffmpeg (bug #538798) (diff)
downloadhistorical-da40a5ce6121ce43c6ad6d6c34cb00658a006a17.tar.gz
historical-da40a5ce6121ce43c6ad6d6c34cb00658a006a17.tar.bz2
historical-da40a5ce6121ce43c6ad6d6c34cb00658a006a17.zip
amd64 stable wrt bug #538798
Package-Manager: portage-2.2.14/cvs/Linux x86_64 Manifest-Sign-Key: 0xC42EB5D6
Diffstat (limited to 'media-video/ffmpeg')
-rw-r--r--media-video/ffmpeg/ChangeLog5
-rw-r--r--media-video/ffmpeg/Manifest12
-rw-r--r--media-video/ffmpeg/ffmpeg-2.2.14.ebuild4
3 files changed, 13 insertions, 8 deletions
diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog
index 5f45ed3eba49..7fd19c3b4ab1 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.850 2015/04/02 16:24:04 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.851 2015/04/11 12:09:46 zlogene Exp $
+
+ 11 Apr 2015; Mikle Kolyada <zlogene@gentoo.org> ffmpeg-2.2.14.ebuild:
+ amd64 stable wrt bug #538798
02 Apr 2015; Jeroen Roovers <jer@gentoo.org> ffmpeg-2.2.14.ebuild:
Stable for HPPA (bug #538798).
diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index ecaa18d554f9..6e17fbb1d0cb 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -16,16 +16,18 @@ EBUILD ffmpeg-0.10.16.ebuild 10077 SHA256 78a2ca42d92c398de9d68c8e9198eecf00a6a2
EBUILD ffmpeg-1.0.10.ebuild 9713 SHA256 6d6ae75be2af88b036b9dff32a15ea2ccea74f02404f22c187de5c1cf0bfb400 SHA512 253a4bfba29398cd1fba6ac6e0f8b6fc5416fd9d86116a4f17af36ee7a50aa5767fa917ecf6f300ad01bef8b8bc58e37582cfedfe94820abd093c26a7f405127 WHIRLPOOL aa180cd1b8ee1d5ff373b02cb942c252daaf05fd4f5ad41155014c6752766ac7f3ad98381435b7999596f06249b64f41ad2955bb1856ece1c6cf88fb96c185f7
EBUILD ffmpeg-1.2.12.ebuild 11006 SHA256 13469cba576174cfb78737018e18444f9b5ffb5ff963a6a84a67856aeda995d2 SHA512 4680ce2f34e946fffd588133eacbf341e08fd6954b249a50488a7b262d66ef87fa4e830ada253a9db731557fbcbc65b6f08b974a2b50b41c459918aa4b2a8e21 WHIRLPOOL 7142e4fe36428f6561b42da91471cd5f11c9978b0c27d59746371d746961280c1739b2840cbf9577f3808d8f6d8a80f4d42c29ca197c506b613624a34a6be318
EBUILD ffmpeg-1.2.6-r1.ebuild 11049 SHA256 88d7665d4e89c851182da15a4b4345ff2b037fd26dad1b2e8b18795cc2a5dd02 SHA512 81aa531007bc9d981b32337a25db8b76770a415347b42885e88e6c330c089f2de84cc671783542a8d1c2b4cf59f3a4bf4520a7a0b2ed9c96528a5ea36fc80aeb WHIRLPOOL 830702c5a1f586a7cf655a0e804d4b60375a8bd41048a7dd0b05657459c66f5e2711fc1e6c712e16cdf073a4a5026a74776014e17d61fdf4ded7c22d98b5f0e3
-EBUILD ffmpeg-2.2.14.ebuild 12696 SHA256 910402d107073e977bdca60f61edd5e9c713f2944d8d29ef42479105b97a7cf1 SHA512 0fb0295ee6ecce783f5ef6deb80483a6d266c5945d03bbc1de43fff78e50d8913939b51a19ea0e06a7db4aa98bf3283422cea5fc9e6d59b3f9fba3814d57408b WHIRLPOOL 5182fc7ff607521d27eb395db08b2ce7168a6e3d35b037ef510558b51341ec3b7809b291ba04fc22e5a493de928ad610450f5f1442b8898706d41b49fc708de9
+EBUILD ffmpeg-2.2.14.ebuild 12699 SHA256 3ace5438ddc21fb4b7dfa1d571648915349a7573ff333fc285b297dc0efcb6c2 SHA512 22d9cf2b0fc8bb78050d8cafca2c83c3ec0b5126de285c3f61fdefc2eb3ed9d00847d0329fb0ead7b5ac71fd9dc4b3d2c476ff189eac2256e27d574a1f2f4d49 WHIRLPOOL 03dfba2468b141ddf4105a804222d93ca88ee3e4a339a66d6eb44729773c35c329f56c3fc4c3088a3f7b1c55abfad863ad3c3a37d4adc28f93cee05831c35908
EBUILD ffmpeg-2.6.1.ebuild 14650 SHA256 44a2bd7f2ce63a4d59214691fc8c46f94e5e4714121edc29f56c9a6774fe270b SHA512 aa5b3c43e0d1712f0339cf8b8372ab9fb2cd95ee1b48bd00d0c5b467fea8b9a724338483114d8258471a9a59ceff5c94b9f2b5b61bd19ee37f4cc4e8f892ec6b WHIRLPOOL a3147f3e23fba6a68fcc51802f7124d9f67948aa3e308df382186722a37b6af766a28b69c7bbf9a7956045b9d633573b3704685a4b211c1e1311066ef6107754
EBUILD ffmpeg-9999.ebuild 14651 SHA256 daa6cc812efc8461031450c6bf1a663fb0e82b268b0d4a2dba5b4f938384b328 SHA512 aa01550b1218120f73b7edb426b0c9dff410afaee537326306310667e2ee7b060fbc6cf6d873dc9c77e0b55c3a3f1096f81eb025e573cba07e65df99b1d1a12c WHIRLPOOL b46e549f4a78fb5566fe79b24e3007613f87fc6e65fd72930a60b6388b048f9d968bfee32c3f44751e57e79459db191bc6bccb4a9754d34440f16f74b090b915
-MISC ChangeLog 4627 SHA256 7cbbf263267c26c5666012b10693b15c505aa47232ae208f6cb40615ae4cbf3e SHA512 8f9bebf8769a822f240ddc08c3b3374ba0b925d914d975a4f84a8a29671bff6344fbe13ece6aaa4cde4f6ffcf8f849617633e5e6ff8c2048f6292449b48fe3fe WHIRLPOOL 0d597fd24a8ccc4463e7e5c2e7d2bbd1f9feec6ff4fd3e41dcb83d4cc1892c4ae483003dfd3db1baa9c0124ce59f42a01eb0d923e22ec609d0d025f0fbd39795
+MISC ChangeLog 4735 SHA256 bfe551657f2c1079235831928a2e89f691f5ec58bed91de2039f87a3c43edf1a SHA512 8d8926c8396bc07d1e4edb6a66e7e6d99dff457361a23ac486e55aac94fe6426d58ad263588c81e4a8d36453e421ee67212fa620c18ed74a5f420b29fa50810c WHIRLPOOL 651a589df1be72a3114662e5bcbc27f88a248846d6ef82e0fa2072dbb97c62a90dc0fbf011e28127aa1e961a443f5c670eb000c03191571b5d286fab61fbdeda
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
-iEYEAREIAAYFAlUdbScACgkQVWmRsqeSphNJ8ACfdRUMe5myvmS9tAwRXXs2ATtk
-o08Amwcya3+hbD9ScGqaexTVtYHcMILW
-=rW89
+iJwEAQEIAAYFAlUpDpoACgkQG9wOWsQutdbybQP/XDuIcX7zXYS/RiRG4AlK+oig
+poUsiGWOcxPxT4umDJCe4EKzP/i5BxujXYdFkfvznxDkY/pyI6gNBGUR2NPKe7Ux
+FNDz1y4hVl2eUZKtKy+Tz98DcGSmOtF59xtTGqwA4mHn+ZpoMDhVQUGbvtOA1o46
+avmnP45szdnDF/wD2mg=
+=y5VE
-----END PGP SIGNATURE-----
diff --git a/media-video/ffmpeg/ffmpeg-2.2.14.ebuild b/media-video/ffmpeg/ffmpeg-2.2.14.ebuild
index f43a16e1b7b9..410a2bc477ae 100644
--- a/media-video/ffmpeg/ffmpeg-2.2.14.ebuild
+++ b/media-video/ffmpeg/ffmpeg-2.2.14.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-2.2.14.ebuild,v 1.2 2015/04/02 16:24:04 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-2.2.14.ebuild,v 1.3 2015/04/11 12:09:46 zlogene Exp $
EAPI="5"
@@ -37,7 +37,7 @@ FFMPEG_REVISION="${PV#*_p}"
LICENSE="GPL-2 amr? ( GPL-3 ) encode? ( aac? ( GPL-3 ) )"
SLOT="0/${FFMPEG_SUBSLOT}"
if [ "${PV#9999}" = "${PV}" ] ; then
- KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+ KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
fi
IUSE="
aac aacplus alsa amr amrenc bluray +bzip2 cdio celt