diff options
| author |   Michał Górny <mgorny@gentoo.org> | 2014-06-12 14:21:28 +0000 |
|---|---|---|
| committer | Michał Górny <mgorny@gentoo.org> | 2014-06-12 14:21:28 +0000 |
| commit | 982aa24cd8f2d6555e3d0362324c4ce370b868b5 (patch) | |
| tree | 0cecaf9e0de4557b09d345fa565796248137ddae /app-emulation | |
| parent | Version bump to 4.5.21.10; fixes bug #509258 and bug #509258, proxied commit ... (diff) | |
| download | historical-982aa24cd8f2d6555e3d0362324c4ce370b868b5.tar.gz historical-982aa24cd8f2d6555e3d0362324c4ce370b868b5.tar.bz2 historical-982aa24cd8f2d6555e3d0362324c4ce370b868b5.zip | |
Replace the dep on virtual/ffmpeg with safer || ( ( libav postproc ) ffmpeg ).
Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xEFB4464E!
Diffstat (limited to 'app-emulation')
3 files changed, 27 insertions, 20 deletions
diff --git a/app-emulation/emul-linux-x86-medialibs/ChangeLog b/app-emulation/emul-linux-x86-medialibs/ChangeLog index 5e6bf329b91c..8f32c1257dd2 100644 --- a/app-emulation/emul-linux-x86-medialibs/ChangeLog +++ b/app-emulation/emul-linux-x86-medialibs/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-emulation/emul-linux-x86-medialibs # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-medialibs/ChangeLog,v 1.103 2014/06/12 07:34:16 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-medialibs/ChangeLog,v 1.104 2014/06/12 14:21:27 mgorny Exp $ + + 12 Jun 2014; Michał Górny <mgorny@gentoo.org> + emul-linux-x86-medialibs-20140508-r6.ebuild: + Replace the dep on virtual/ffmpeg with safer || ( ( libav postproc ) ffmpeg ). 12 Jun 2014; Michał Górny <mgorny@gentoo.org> emul-linux-x86-medialibs-20140508-r6.ebuild: diff --git a/app-emulation/emul-linux-x86-medialibs/Manifest b/app-emulation/emul-linux-x86-medialibs/Manifest index 6aabe1cc1a77..df89cef5a828 100644 --- a/app-emulation/emul-linux-x86-medialibs/Manifest +++ b/app-emulation/emul-linux-x86-medialibs/Manifest @@ -16,25 +16,25 @@ EBUILD emul-linux-x86-medialibs-20140508-r2.ebuild 3485 SHA256 e3c192c0d14831e60 EBUILD emul-linux-x86-medialibs-20140508-r3.ebuild 3577 SHA256 bb0908ddb6e867d237b725ecfe68807c825bed9e330704366e081c446a53b785 SHA512 04a3c4d28b131e114912b4a2c10d022610dbcf1abd237e5bcc8713abb75dad3abb35713f113e8c457b9d7fa19a7c92682c2e6e47cb58be22a5a8a59a93ad0fbb WHIRLPOOL 284273f958bf0b7bebc8688b248c6cfcba06ae234348a7bae2bcb27787b23aa41f519c920ffb9e9fde65e0a512a8e227834cf6e297290b44ec15d5b61cc76b48 EBUILD emul-linux-x86-medialibs-20140508-r4.ebuild 3156 SHA256 0f28a889373d512fe41b9c4125bf9e76a83876f348fc5004d5e18f7ee02a1fdf SHA512 feaa49a2b16eef6e6c21c4d38b47e390308d2f61a1f9f844f8233a2c5eaecd896cd952dcaed23f000e562a7e9a2804625794316462d33684627cbcff9c97ae26 WHIRLPOOL 09fee3579f6ec5536a072fbf8bf02f641eaa96ee51f78aaf824b511e3ebece7f26a1553b68fea7bf20a46cf6806bd65a37247b2de7db14882d134921697d7344 EBUILD emul-linux-x86-medialibs-20140508-r5.ebuild 3207 SHA256 8b48b621b35a36a264ce1a1bbcb29ff5dc409ce6537347d65786b9ca060bb4db SHA512 ba6f5ed22ece33582f61a20c51a0433a2612365872f66ad99b27057d6e8562ff219f13661b8a01c33ecd0be1a8079b5ef496e3e5ecb1fbf11741a8637a066e07 WHIRLPOOL 40ac535a2cb3d003174073157978cd3eb04aba35a19faf64ea198787a3f33cdf071406f2b3cb726074fb40975b9d97b76fda16e02fa2457a983c7c1da812e2eb -EBUILD emul-linux-x86-medialibs-20140508-r6.ebuild 3269 SHA256 e3ac8b0921d56903a323b935b1eeda21ad5bc77b30904e4f8a2974e9990a377e SHA512 545e682fc66a19ab746a0e90b1236816b3842193468718f4ec7e08ac498562fd62cbfe573fc77a2c61eddba5d0699ddd0b597a7753fe09cd63e12c05f5a0a596 WHIRLPOOL 64cb16934d0d4cfea16e385a3330afeaf66bd8342b296ffd25ea9bca1d69bba50405182091abde927dc78b91c6e7721283b47196d00bc9dbd8e7dde23478987d -MISC ChangeLog 20650 SHA256 b33c893afb864e9d3a390624b7e2a8f216e2c735ca298a55cf9d3e495be4b852 SHA512 ff9b649614d1dc3b527bcafb6011ec7c541387a3caf3f70c009df3200e91f7aa5c3de6657890222d7772cbf15d1396bdd1b6b4115387d673d42c680af816ce01 WHIRLPOOL e18293103bdcb31f6646547ead0551b46d18dc4f43010e2198ed1a3690916e9567073c720adfdc3ccfd2d6fda03729b071f9ea6792a1543fda95139623851dc7 +EBUILD emul-linux-x86-medialibs-20140508-r6.ebuild 3290 SHA256 febfe0e77a61f1072f58d717e875fc2d2d54bc6bb876ef88e6b6725e1d34189a SHA512 1f7b87a7c8731c0f1b9747b965abf7871b7d5f2a8bbd308d8823d39aee127be98d685d307e21ba858bf16e06fcfff2d7f4d87d70d10ff8a8070af2fc47dd467d WHIRLPOOL 37dce25bbb291f487513b825201a4b0475328d4925e747df49f8fe930cd3987a13fcfe334933fb718ea86f572d02628a8503db045c22b3e9b3679d16c755f669 +MISC ChangeLog 20829 SHA256 45ebb961708f5f6fa3c209f0be8a420c89af274486eb0673ba39866bfab5c0ba SHA512 66cecffc584eea428de9f19bb39a65d7ec41d100fb66633e9737ccacaf7b03ea714299bc872f6ed9184b36129667e648ecb0b3205568d9d1cfe8cb8671e59518 WHIRLPOOL b95402cb3ce8aab32bafac19907a95d301fcff607d9a3ea299c2301d92c8c28be5731d8e41821ca79ac942b26cbf65201c19259063fef3290c7cfce3fcf9a96f MISC metadata.xml 312 SHA256 9d3f082956c89c24d50eacf1a35e6d3f7e7605a2b290b3ca01123c357595b680 SHA512 21f9fbd2145e18c319f089f1cb2f99cec289daac7e35c944335d979fca8ae595ac2ab81a025c55d56dde80ed7db88fdcd0b644bf2070b6eee7c26bf643fc4e19 WHIRLPOOL 5cfe4fa3453b53f0d056331b905da9584e13a48af3671f248b7ede707b587338b145613a77cf655af74734ae1e9d0dfe50f13d34a2cb069a73c76abc3a753262 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iQJ8BAEBCABmBQJTmVf5XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w +iQJ8BAEBCABmBQJTmbdoXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC -MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOfuEQAKMAp1XSgNnLlaPqWQhGFcog -Mflf2yK+euNNqfT/b3vatf13fGIYMy+3Ck6C2Cvm8of3gCJyUKkNZV8tSwHXcPwT -xYhCvZT9bHj4KnsOHJ6ZCa7r4fepYE4s0Ck8+lSnY7c3DZWPzontWSTvW2w5pJl9 -AEOFM/NHEfWQuQnJruaCyGflJn7iFRWJ/d8exoj1ntZ/SCxnZ4M4uDJNSiQYoBkr -CxHrn67w8tdpt9MWtOcqtVdazNVwKzdWf/F+zJBIM6LmSI6P7oV+8CQCCms2Qec7 -Q3anURuro3rVHXt+mrgIj7XvlpJxn48arKW1WeY3K47muQ/byzE5nYFIuLlambou -wlSa6RndxUvIgTAyCH0q7fnJJhtx6m7SSnq1WdWTJFEDVmNY1shC7btUB2QrSaC1 -uCVAz9JaZgAikKosgAyNMqvizzJYEsWfxXoB/GdTccqEa44VJhnwEkomPsHRlh6R -Lrop7OcfegjHhXwW2wsLjRT+1W01QhRLIrsPTlFOEVnphQ/dE/VCCjgqkLW6ymQ/ -Sq4lDPRBFt9DUmH3bwFm1s9pqqZZBVsnNbgH8m94/2+jjb/Jkv4fYvm2JZ6Kwfe/ -242oSsNYfvXwJr43jO07xF6hs4MDME5vMmTSXzqoi1h2vI8WLXBpn74YAhXQbe8v -QiCW2bvgN3IgdXdDUfx4 -=FyIS +MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZO2iMP/iQQQBbnxVn/PcUKmFegbg6v +C1DP1caG3reEAHXSOBxWpXy/6FekjeTCPcVTdOKl7AEMZedOPJk2D6SbfxEanBkI +airE5zR7kS9MspFnRb4OjPt5DqDQxLd/MyJLjFuXJHnljXow46evtPAzOKoPJ7rQ +eAi30OuN9gwSVtVPVtsnhCiNYz29VoydPM0xZfZe5Ge+yf/puIo+AZuD8k3oWm2J +aqw3laOelHluz8oApTW5oV4sfz16NY/xl4GTImZJdC+toSRVVU8unUDcBEEIvzew +qKQljE/nF3JY8VDpxSJkJCN+p5HerJrjYBLno6hYA68VKAUMNsJeM2S40KFIE/8+ +9z7THt0/mQ48CQVLVj5NLrkgEv6t+rrHuKgFBOmzHS5RqUT7cJjO6rWVK7xG9pc2 +gBKqm/08XMnpwhuH/WH3KyN6eIHjpJRU0wfeJ6ygrW4T1FU2FeXKqoiLyx84IBBv +UJGXbgKqEfNJrQR7ZZ/GHT/S9EnkAvOF9Xm6a5frjE4KfnjK3aAC5zAdXZkarK65 +aGcJjx5+H/jwBFzeFKohm3A60DFn5ZmnuwdtMMbLv0ywQ4pGezlxrTgkq6+lgdXp +sMicwdJ81hGIYKXhRcXzEHF5vJOrCE1eSPZUZv/lMw5Cq11zn7i6DY8PoPXZw68l +AEakbBqiRw4dUF+1E6Rd +=Psfi -----END PGP SIGNATURE----- diff --git a/app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-20140508-r6.ebuild b/app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-20140508-r6.ebuild index 7eabbd33ad8c..bce0b6947a30 100644 --- a/app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-20140508-r6.ebuild +++ b/app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-20140508-r6.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/app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-20140508-r6.ebuild,v 1.2 2014/06/12 07:34:16 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-20140508-r6.ebuild,v 1.3 2014/06/12 14:21:27 mgorny Exp $ EAPI=5 inherit emul-linux-x86 @@ -65,10 +65,13 @@ RDEPEND="${RDEPEND} >=media-gfx/sane-backends-1.0.24-r4[abi_x86_32(-)] >=media-libs/taglib-1.9.1-r1[abi_x86_32(-)] >=media-libs/libofa-0.9.3-r1[abi_x86_32(-)] - >=virtual/ffmpeg-9-r1[abi_x86_32(-)] || ( + ( + >=media-video/libav-9.13-r1[abi_x86_32(-)] + >=media-libs/libpostproc-10.20140517-r1[abi_x86_32(-)] + ) >=media-video/ffmpeg-2.2.3-r1[abi_x86_32(-)] - >=media-libs/libpostproc-10.20140517-r1[abi_x86_32(-)] ) + ) >=media-video/mjpegtools-2.1.0-r2[abi_x86_32(-)] >=media-libs/gstreamer-0.10.36-r1:0.10[abi_x86_32(-)] >=media-libs/gst-plugins-base-0.10.36-r1:0.10[abi_x86_32(-)] |