summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexis Ballier <aballier@gentoo.org>2012-04-05 11:59:54 +0000
committerAlexis Ballier <aballier@gentoo.org>2012-04-05 11:59:54 +0000
commitf876ca52ed10ff6ad85d46addfb633be5d50bbc7 (patch)
tree2101eeab0a675e2456a6b609b97437626d9201e1 /media-video
parentbump a new snapshot (diff)
downloadhistorical-f876ca52ed10ff6ad85d46addfb633be5d50bbc7.tar.gz
historical-f876ca52ed10ff6ad85d46addfb633be5d50bbc7.tar.bz2
historical-f876ca52ed10ff6ad85d46addfb633be5d50bbc7.zip
bump gnutls dep for bug #405083
Package-Manager: portage-2.2.0_alpha99/cvs/Linux x86_64
Diffstat (limited to 'media-video')
-rw-r--r--media-video/ffmpeg/ChangeLog6
-rw-r--r--media-video/ffmpeg/ffmpeg-0.10.2.ebuild4
-rw-r--r--media-video/ffmpeg/ffmpeg-9999.ebuild4
-rw-r--r--media-video/mplayer/Manifest12
4 files changed, 15 insertions, 11 deletions
diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog
index f76cbff3c80a..24c2d471c118 100644
--- a/media-video/ffmpeg/ChangeLog
+++ b/media-video/ffmpeg/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for media-video/ffmpeg
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.535 2012/03/31 09:43:39 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.536 2012/04/05 11:59:54 aballier Exp $
+
+ 05 Apr 2012; Alexis Ballier <aballier@gentoo.org> ffmpeg-0.10.2.ebuild,
+ ffmpeg-9999.ebuild:
+ bump gnutls dep for bug #405083
31 Mar 2012; Agostino Sarubbo <ago@gentoo.org> ffmpeg-0.10.ebuild:
reverted to ~amd64
diff --git a/media-video/ffmpeg/ffmpeg-0.10.2.ebuild b/media-video/ffmpeg/ffmpeg-0.10.2.ebuild
index 8368ef945a3c..6de0c50b5b14 100644
--- a/media-video/ffmpeg/ffmpeg-0.10.2.ebuild
+++ b/media-video/ffmpeg/ffmpeg-0.10.2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.10.2.ebuild,v 1.2 2012/03/22 11:33:27 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.10.2.ebuild,v 1.3 2012/04/05 11:59:54 aballier Exp $
EAPI="4"
@@ -70,7 +70,7 @@ RDEPEND="
xvid? ( >=media-libs/xvid-1.1.0 )
)
frei0r? ( media-plugins/frei0r-plugins )
- gnutls? ( net-libs/gnutls )
+ gnutls? ( >=net-libs/gnutls-2.12.16 )
gsm? ( >=media-sound/gsm-1.0.12-r1 )
ieee1394? ( media-libs/libdc1394 sys-libs/libraw1394 )
jack? ( media-sound/jack-audio-connection-kit )
diff --git a/media-video/ffmpeg/ffmpeg-9999.ebuild b/media-video/ffmpeg/ffmpeg-9999.ebuild
index fd254fedf289..21c29ed3a2bc 100644
--- a/media-video/ffmpeg/ffmpeg-9999.ebuild
+++ b/media-video/ffmpeg/ffmpeg-9999.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 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.83 2012/03/22 11:33:27 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999.ebuild,v 1.84 2012/04/05 11:59:54 aballier Exp $
EAPI="4"
@@ -71,7 +71,7 @@ RDEPEND="
xvid? ( >=media-libs/xvid-1.1.0 )
)
frei0r? ( media-plugins/frei0r-plugins )
- gnutls? ( net-libs/gnutls )
+ gnutls? ( >=net-libs/gnutls-2.12.16 )
gsm? ( >=media-sound/gsm-1.0.12-r1 )
ieee1394? ( media-libs/libdc1394 sys-libs/libraw1394 )
jack? ( media-sound/jack-audio-connection-kit )
diff --git a/media-video/mplayer/Manifest b/media-video/mplayer/Manifest
index eb75999b87cb..3b63ae486608 100644
--- a/media-video/mplayer/Manifest
+++ b/media-video/mplayer/Manifest
@@ -15,15 +15,15 @@ DIST mplayer-1.0_rc4_p20120213.tar.xz 5451168 RMD160 ebfa2e7f4ab5bc180eea0b2206e
DIST mplayer-1.0_rc4_p20120405.tar.xz 5449560 RMD160 e1286c02bda77d7e771cc36d043e1af993a99b6b SHA1 111d3e5e1a89bd9b9143e050bd0ee19e18f8f0ea SHA256 8da4ad1daa5c9b70884f775406c071c508b1bf5227084c895d840d08a115cc86
EBUILD mplayer-1.0_rc4_p20110322-r1.ebuild 20370 RMD160 1d9b49b345d159a823d81a109cab7c4cdd58f1e0 SHA1 8522919334631657b69e2c3076378a22c2d69b8e SHA256 6f547a9a6ce0db16556394113b57fe0d38fdf67edddd97cac12d92a7b4a83361
EBUILD mplayer-1.0_rc4_p20120213.ebuild 17743 RMD160 f527f3a275e27c86be6eb51e3aaf72b738b6eda6 SHA1 df6fef3e88997f56d8469092e93f1af22d715aeb SHA256 48aa9eae67245925f5a203420010b218494833d54ebff33728becc1c3f64b197
-EBUILD mplayer-1.0_rc4_p20120405.ebuild 17770 RMD160 25e77084db3951824958835e9279864424232fde SHA1 5a9660eb6b6ea425e3f4f7ee07192e4f0d1eb179 SHA256 0d9bc27e12b8a86a6633ed2820f6d2859fce22aed2e764dfdac3cf2e8da6219c
-EBUILD mplayer-9999.ebuild 17728 RMD160 762738f3ccb38a1f47d247d30ce0f724c603f2ab SHA1 ffc87e17e0ea5e3f071c44b731cefd2a9d45012e SHA256 287b1691be0daa7847fb57d5d9ad85d489c74fe36c01b9908a5e4b3bb86a16f2
-MISC ChangeLog 40906 RMD160 ebf67c059d851dd9a0865adc9743efb493b3ca78 SHA1 8d00456cab5b2274303380e8f2e9df6d3aea3d29 SHA256 128d5b3590ce28529cd67465d98f629f052d63c0fe9b941e6ffa2c6efe1f6663
+EBUILD mplayer-1.0_rc4_p20120405.ebuild 17772 RMD160 d585f29f35d26c6fc3de2dbd26cf8eb432b167d7 SHA1 b531155d923ce6d9be897d6465732c42fce126e3 SHA256 9c8b83645678d011f3278285d6c637acf660c256901831961a6f25ca7faa6562
+EBUILD mplayer-9999.ebuild 17729 RMD160 c78964d3948e5c1432635a30d2e1b073a08672ef SHA1 edc5adca027900249c621f4a299adc4732655be1 SHA256 bb5c7fd9b50d3f36da76f8743a786c999e559ae6c27d9d638a0ffdaed84f9e02
+MISC ChangeLog 41081 RMD160 6b19805d9f2dab0df9571705bb0d1128a1f9a56b SHA1 25a5725cad1b6bbba9072bebcdfaa46e5211efab SHA256 a4bd565a71dd11ee26a42165d9761a8267593401b10cbc56ee9a0b0d7ba1ceb5
MISC ChangeLog-2008 107064 RMD160 146604862227a837d1f463a96af6fe94d17421bf SHA1 5a18c910edcf540877f3b803fc85a9b74b503dd2 SHA256 d9949e0e21fd6fd00f1417201455ee399240ef1010dcf56611ac0fc1f6f9505b
MISC metadata.xml 3738 RMD160 774f4bbf001584d46c477c241c0bddf72340283b SHA1 ba7e1be9dbdcd38403059b9d29f8a710d3d68663 SHA256 78acd6956eee0def16d1953c52ce6f5bbb101a4a66caa0d3c7846f85ac7915e4
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.19 (GNU/Linux)
-iEYEARECAAYFAk99iKIACgkQvFcC4BYPU0qJIQCgve+pBxFknnl/cIMEF/JdyQsp
-2VEAoLCA9i5uYcllkxDyzhjqchvgDkjo
-=FvO2
+iEYEARECAAYFAk99ifUACgkQvFcC4BYPU0pTrgCgvV4bUlmBVR83gr9kMc1Sp4TU
+/GMAoII/s712aeKtbk5vp6xa8UafGa49
+=FUE2
-----END PGP SIGNATURE-----