From c70d183793962f64753c632f258e342b3e04f9d6 Mon Sep 17 00:00:00 2001 From: Alexis Ballier Date: Fri, 9 Dec 2011 13:59:29 +0000 Subject: [PATCH] add missing libXfixes dep for x11grab Package-Manager: portage-2.2.0_alpha79/cvs/Linux x86_64 --- media-video/ffmpeg/ChangeLog | 6 +++++- media-video/ffmpeg/Manifest | 14 +++++++------- media-video/ffmpeg/ffmpeg-0.8.7.ebuild | 4 ++-- media-video/ffmpeg/ffmpeg-9999.ebuild | 4 ++-- 4 files changed, 16 insertions(+), 12 deletions(-) diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog index 73ebfe59c5b8..9d1dee821a18 100644 --- a/media-video/ffmpeg/ChangeLog +++ b/media-video/ffmpeg/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-video/ffmpeg # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.503 2011/12/06 20:30:14 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.504 2011/12/09 13:59:29 aballier Exp $ + + 09 Dec 2011; Alexis Ballier ffmpeg-0.8.7.ebuild, + ffmpeg-9999.ebuild: + add missing libXfixes dep for x11grab 06 Dec 2011; Jeroen Roovers ffmpeg-0.8.7.ebuild: Marked ~hppa (bug #392269). diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest index 6b220f1ee31f..9960d7544508 100644 --- a/media-video/ffmpeg/Manifest +++ b/media-video/ffmpeg/Manifest @@ -7,14 +7,14 @@ DIST ffmpeg-0.7.8.tar.bz2 4530406 RMD160 8f69a6bc5caaba4e3d440c2d5dc96a946454a52 DIST ffmpeg-0.8.7.tar.bz2 4527751 RMD160 5ccc0cfcfaf77b2f7e7cc51190d00bc22db85866 SHA1 e6c391769b1e45afd8e3f41b734c17ba1437f4a9 SHA256 e074656390bfff51c2915d3334306dd7748bab8589a8d04128143c7b8962d0e1 EBUILD ffmpeg-0.7.7.ebuild 8434 RMD160 64ae02f0921dcb59c8850d102fd36be8b83d3ea4 SHA1 a04df51a15709a9b669b8e1ff8e4e7582fce6949 SHA256 2530241330f21149e401ec15fc448acfcbcd5b16b728ae0624dba422b449947f EBUILD ffmpeg-0.7.8.ebuild 8436 RMD160 34282efc2ce033b2015a7916975a14eb493d52e5 SHA1 27a7721fb83ee62e7a0eb36bdbe773cf442c67f1 SHA256 3f34e02690bd4f56e4562d223226375ae19eabfa4ca52a29e2d43f828b972318 -EBUILD ffmpeg-0.8.7.ebuild 7996 RMD160 83bcb8a4f9209cfeb0f4b273349c904bca10f245 SHA1 4e615d15a16a2c4d63a222fa6f1edbddadbe0fe0 SHA256 52b51fdd1d1d0036fbf20dd6fb67c856de063829bc5aff7fb85a4d1e87f7acb1 -EBUILD ffmpeg-9999.ebuild 8830 RMD160 fe45307ae907d84de4293edb9194e67e6261bd2e SHA1 eec0b3d3e0d0a1e9dec536df6436aa46d0ec0383 SHA256 68761e4bab5d7dbb0183d750ee4ba1b4107fa9ef125a0163139eda6e4007f6e0 -MISC ChangeLog 72212 RMD160 d9015b6d92fb013af6dbe344e10655e38713faf0 SHA1 6046724134f2e7d8094dfb8f4d5bf9cfecbe6fb1 SHA256 56c0b80098df4fb9970231eec927551da2bd8ee928b689ef3227f966ee533bad +EBUILD ffmpeg-0.8.7.ebuild 8020 RMD160 7d2e2c1cf5de1f0d7e6af73d4c631705a45c47fb SHA1 02f250e6951e918eb1089a29a65c5dfade548835 SHA256 156ac6a17e91c52d8df28a2a71c77b6ad518da9a727c3416bee1df35777963e4 +EBUILD ffmpeg-9999.ebuild 8849 RMD160 ec36a0557756db9f288c033a5b111d2963f4e6be SHA1 6426dc2629af02273b89bb9b67c1ef3a5099deea SHA256 049921045c1426a1cfe6095c5e214c1f2640fa053d802b10a72f70fb63fffab0 +MISC ChangeLog 72353 RMD160 c2cb7337133209d22622f356d65d1844e1afb047 SHA1 357521a3749607cd8fd7eed606c2926edbaec1b5 SHA256 414e465a3a6007e7d0c626fb88057ccaa88e0d932b7201a608bfa0317a16179e MISC metadata.xml 3136 RMD160 83498fadc792f93d602a65caf742e4cd1c379615 SHA1 61ecdedb07c4d97cf5f3a665e9d301c07657d863 SHA256 6a36d874d9bd519aadc8c406f9f1a07b60dd35c41a41ba8484f602b87f8ed85e -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.17 (GNU/Linux) +Version: GnuPG v2.0.18 (GNU/Linux) -iEYEARECAAYFAk7ee1wACgkQVWmRsqeSphPNdwCfT23Arnuo14MzcGC2eX1efwmL -NVAAn0kfSJD6fSDezi74bQarp145BvXP -=RwUd +iEYEARECAAYFAk7iFEcACgkQvFcC4BYPU0qkogCaAoefpkUSaU5Pyyw9pqpjRKUn +ocgAoLqlULQ4PY0khA6oO5TCFFL0i9U5 +=stva -----END PGP SIGNATURE----- diff --git a/media-video/ffmpeg/ffmpeg-0.8.7.ebuild b/media-video/ffmpeg/ffmpeg-0.8.7.ebuild index 5f9972fa8f49..5c43aa30f122 100644 --- a/media-video/ffmpeg/ffmpeg-0.8.7.ebuild +++ b/media-video/ffmpeg/ffmpeg-0.8.7.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.8.7.ebuild,v 1.4 2011/12/06 20:30:14 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.8.7.ebuild,v 1.5 2011/12/09 13:59:29 aballier Exp $ EAPI="4" @@ -73,7 +73,7 @@ RDEPEND=" vaapi? ( >=x11-libs/libva-0.32 ) vdpau? ( x11-libs/libvdpau ) vpx? ( >=media-libs/libvpx-0.9.6 ) - X? ( x11-libs/libX11 x11-libs/libXext ) + X? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes ) zlib? ( sys-libs/zlib ) !media-video/qt-faststart " diff --git a/media-video/ffmpeg/ffmpeg-9999.ebuild b/media-video/ffmpeg/ffmpeg-9999.ebuild index 05f522258455..e2a0c3a550a4 100644 --- a/media-video/ffmpeg/ffmpeg-9999.ebuild +++ b/media-video/ffmpeg/ffmpeg-9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 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.67 2011/12/06 13:13:02 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999.ebuild,v 1.68 2011/12/09 13:59:29 aballier Exp $ EAPI="4" @@ -81,7 +81,7 @@ RDEPEND=" vaapi? ( >=x11-libs/libva-0.32 ) vdpau? ( x11-libs/libvdpau ) vpx? ( >=media-libs/libvpx-0.9.6 ) - X? ( x11-libs/libX11 x11-libs/libXext ) + X? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes ) zlib? ( sys-libs/zlib ) !media-video/qt-faststart " -- 2.26.2