diff options
| author |   Michał Górny <mgorny@gentoo.org> | 2014-05-29 21:15:15 +0000 |
|---|---|---|
| committer | Michał Górny <mgorny@gentoo.org> | 2014-05-29 21:15:15 +0000 |
| commit | 723b86500b49303a560ead541cc0794786145862 (patch) | |
| tree | 4b0a5d36aef83af49697d2fd72adc423ed40f5c0 /app-emulation/emul-linux-x86-medialibs | |
| parent | rm obsolete patch (diff) | |
| download | historical-723b86500b49303a560ead541cc0794786145862.tar.gz historical-723b86500b49303a560ead541cc0794786145862.tar.bz2 historical-723b86500b49303a560ead541cc0794786145862.zip | |
Add USE=pulseaudio to allow breaking pre-built ffmpeg.
Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xEFB4464E!
Diffstat (limited to 'app-emulation/emul-linux-x86-medialibs')
3 files changed, 31 insertions, 20 deletions
diff --git a/app-emulation/emul-linux-x86-medialibs/ChangeLog b/app-emulation/emul-linux-x86-medialibs/ChangeLog index 26609ef39f10..588c6a81eb7f 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.97 2014/05/29 16:39:58 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-medialibs/ChangeLog,v 1.98 2014/05/29 21:15:13 mgorny Exp $ + + 29 May 2014; Michał Górny <mgorny@gentoo.org> + emul-linux-x86-medialibs-20140508-r2.ebuild: + Add USE=pulseaudio to allow breaking pre-built ffmpeg. 29 May 2014; Michał Górny <mgorny@gentoo.org> -emul-linux-x86-medialibs-20140508-r1.ebuild, diff --git a/app-emulation/emul-linux-x86-medialibs/Manifest b/app-emulation/emul-linux-x86-medialibs/Manifest index 9f4c72166dc1..e392dbb82ada 100644 --- a/app-emulation/emul-linux-x86-medialibs/Manifest +++ b/app-emulation/emul-linux-x86-medialibs/Manifest @@ -8,25 +8,25 @@ DIST emul-linux-x86-medialibs-20140406.tar.xz 11406932 SHA256 b2f4634137492cc678 DIST emul-linux-x86-medialibs-20140508.tar.xz 11322988 SHA256 bb7057b107997ba72d49f93f4284a238121394d3fbb807cc8e48a7191cda8039 SHA512 81e538284a6d821d72d7fef552e24162398109d91306b9a25f4ece0d55064acd6bd3c1b3e83cd22c34a7c55ab2fac149dde60223102627c725d8995f040534f8 WHIRLPOOL 1231d3ae390835f847064a86676cb2c6ae38a6d4961050b1cf2324e8be2ac487f1f33e98111caf3610067d612c7b9076d8965e1dd298dede5955baa505582a39 EBUILD emul-linux-x86-medialibs-20131008-r1.ebuild 2498 SHA256 2efb848dd180527bfd14896d6b6ae83f03770cfd2def10fe0cf768a3bcda4ffc SHA512 cb88f5eb655874c5d718bc3c381020ec8e68750d672ebbb109d882e5e828b52667198e1a4bd3a5b2342bbdec9fe4a7d6ff49dc4a0f7ca6a5bf6fa385dd7d3aab WHIRLPOOL 0ffde1f95f538930bfa8a0cb5054be995646365e9d4b42fc026a4b254160efa700ef084e4704ddaab75a778590f72cd7f882d26af4a39d27bd0ca26d6125623c EBUILD emul-linux-x86-medialibs-20140406.ebuild 2492 SHA256 27cbf38e7c2ba2ac7c138d48c0479d137f14764663e70a412f51d0ff0b3e072d SHA512 3ae52af2f3e4aa5d95d484439248d2b6634ddf5ffd9d182c371efa1a1f18993119346aea0b4c164e35b43f854bad1ec9f2d92ba056c442b028ee5a519c735ba0 WHIRLPOOL 3a5dc305ec547a8ce560de7c57a8104a53679eed1fd48ed431d55a5fa1ea57bab2e7096110c2c1dc5dd43ec185089e0e42b181dd1769b00189b18ebb429cbfd3 -EBUILD emul-linux-x86-medialibs-20140508-r2.ebuild 3237 SHA256 e4c8d265f0b9f253b562780b65cfa05556b038cd64394649b2b69d7fe8dc3af0 SHA512 e9b67e167a562120c8d75d594d6ea5756a84f629c20d910aec8b8f9c8141645dac0a28b3684ee2a6fdf4eb535677a8b3ce6c3a38f1cc7b528ecfc3ece707c608 WHIRLPOOL cad859f0d555aa72f1f355979ea40981beea153160cf5683cb4b79ee6e600f8ff9dc6402ef9ced1e98d118a3411ef5b6d7fe0d6ca6754a1b71824c78b41f6dad -MISC ChangeLog 19437 SHA256 7a86566654a6f47e3988483f363a451ff767bbdd8b32bdb74dc1d58ea96c0615 SHA512 43de418c1df47dfd3420b3f978255b385907abc3f389d85ddb1f58f393960d4ec02847d8957fb35dab43313ca24091cc52e34f3079970cfdf48482da4b42066c WHIRLPOOL d0929d372dfca8780b85c39891504b8f9d15878a49b975e46cbecb2318d793ba74d01dbaca064eeaa807208fff5723c797c55f029eb90b9484f0b2057bc4e873 +EBUILD emul-linux-x86-medialibs-20140508-r2.ebuild 3485 SHA256 e3c192c0d14831e60146afaf9e7808708990b063e784e11d2660dd53c04eb230 SHA512 90ac940bbb015929e772e0a73b97a1040f964911732c1fa04029f11d19f628f190b75f579036d1e2dc5b530325813816ead51a2871ea5d1a56fdc60ecbc8e26b WHIRLPOOL db2b51d01a28d935c02da6f4f10ca5bd5dc6d5b20150d5452b1fa543e17ee372c477198c86528d48e4dad1b7ee63e181c3c0b20cc36fabd853b15852f60a3a88 +MISC ChangeLog 19592 SHA256 9e0c7585210841439e00788eb8226bf25be51a1edca3bb34c2e42ece69c42c0f SHA512 423d559845845357b65d10511c935d7a78009d672d7812cbab6ea243a5528527d3cf61ea67782301b6b675ba4d1e9d01253da85b1380e3b2fbe75b83a2db46a6 WHIRLPOOL c4d418a0d96338cae9658c8126452accced8adeaa73a8f9cb331b2a7972e7f0758d5ddbe87b06d64ca4e9843a7206f4ec434a9e9b0a815cdd427ad6e52d4ec04 MISC metadata.xml 312 SHA256 9d3f082956c89c24d50eacf1a35e6d3f7e7605a2b290b3ca01123c357595b680 SHA512 21f9fbd2145e18c319f089f1cb2f99cec289daac7e35c944335d979fca8ae595ac2ab81a025c55d56dde80ed7db88fdcd0b644bf2070b6eee7c26bf643fc4e19 WHIRLPOOL 5cfe4fa3453b53f0d056331b905da9584e13a48af3671f248b7ede707b587338b145613a77cf655af74734ae1e9d0dfe50f13d34a2cb069a73c76abc3a753262 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) -iQJ8BAEBCABmBQJTh2LgXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w +iQJ8BAEBCABmBQJTh6NlXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC -MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOKNMP/2do1/ac1im06YSf7fREceTM -ESeO7WNlPXSyJi/1c3B6v9wmdFAq4WYc06ZVF3hHjz+1Kj8FiWW9rNv9X4ctHG08 -2Z/eL5B6yxJrYxfi+mSxCD3+XddxV6fZKtgWef3LFYFwpLvj+EWkInrIa0QQZCdj -cdCV0NcR6G4QzTdx9tulNDsdnjYUOTTg/GeJ8G5ivCqUAe4QPkw6dp3d6ohMWU/h -f5zmhD7vR1K6fKkZYoM0jnnreJMNi2CRu/VXWHSNdsiec9hUNv95eXAzMlh/RPYS -NuisUgzeoTi7hr4fT9TJ89iS6nbqSAtwRMzJUYFZabauMsHfw/0WcgAzjS1IPiPI -McD9s70IJPm8wCaAx90HP+ng97BsnkvS7I3wTuPVqNnWkPHivIcqBSZAsPyym4Pb -0xxP4nEHBq23owExJscYf6EyAvbVXDBb9kf575y4YO5IS2j5TGlw/UaCRF6JB0jt -bTeaswRvJ1R1stbTEcK7VuwmR85Qhg+IYxM7exENHYlt4wWk7GrorwBkVO8Izho4 -QAk+WTLg8cnSuBfvUH7H3sCzKXyJenSiWDDqGxEC9WIdWamApHqLkVWeIK6SF/mN -9UmKAatMFSHS6aACEUwYSqDhaPt8je88XPEnabeZJY2RT9SbqvLXybiT9JRPd49c -UrhovhZTIji5nfGBSm4C -=I77L +MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOjXAQAOH0XYpey2KJs2ViJ76IwYQ/ +CulqGU6LHNCdPET/73zg0WX78VjU1RB/c0qSyDuEYBhMHVgzfhS7BL4BsncHWJsH +WfsUFLGpmtSxFdfjoLSNc5Y2rRBP/GWLKNPedKfDSqxyuZUEwix51NRuDtzFGvLT +WgjKH1A1cMWJReJ59+1JS8V2hcs6T2Ch+Q7d4tyYxW9RFaTBWmCIgAqiWiaX6bbK +nMfRR8pC0nFRIXE0q+//R9jlj+jKPRFmhwWliEL1DLKXfuZTpjcgDre2auvN2BES +8s68aGqOcCMIc1kl3bKUQXevOOiI5QU0wTccK7hqtXAnXTKDjVbOR853w2MgdaVT +ofQmMlt7k5IFA/Qf8Q6f2fZ84iFYdItEeXN0eRuUpRUc8pETbkcmv6bJy/lkO3Xz +/De69XV3trW2E2aKhPQ845MkhJHQc608Quak3jju0sP3xsoQDlKFr+pz98dgei9Y +YTDNCqnRccPLhDQM0ar/EqlVkNU2/jPxAV3eyAbNTjZxM9E58djdgZYpMRWoePQb +N6giQfqqAuPdWeWMZsBg8gGXFf0tAT5KuIEg60xz9aibgqQifK10U2JSF5vl97CK +z7pQSjr8nafKorAX7F/ba54aKXX/KbXLoP0GQ3o59chCYqquOFyubbX5xrgASuRn +p/rfsRfEq7X/CVUZWaqn +=gxqI -----END PGP SIGNATURE----- diff --git a/app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-20140508-r2.ebuild b/app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-20140508-r2.ebuild index cd2092b82a88..1e52bd75d0f8 100644 --- a/app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-20140508-r2.ebuild +++ b/app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-20140508-r2.ebuild @@ -1,13 +1,13 @@ # 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-r2.ebuild,v 1.1 2014/05/27 19:01:02 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-20140508-r2.ebuild,v 1.2 2014/05/29 21:15:13 mgorny Exp $ EAPI=5 inherit emul-linux-x86 LICENSE="APL-1.0 GPL-2 BSD BSD-2 public-domain LGPL-2 MPL-1.1 LGPL-2.1 !abi_x86_32? ( MPEG-4 )" KEYWORDS="-* ~amd64" -IUSE="abi_x86_32" +IUSE="abi_x86_32 +pulseaudio" DEPEND="" # required libs @@ -26,12 +26,12 @@ RDEPEND=" media-libs/libpng[abi_x86_32(-)] media-libs/libvorbis[abi_x86_32(-)] media-sound/jack-audio-connection-kit[abi_x86_32(-)] - media-sound/pulseaudio[abi_x86_32(-)] sci-libs/fftw[abi_x86_32(-)] virtual/jpeg:62[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] x11-libs/libXfixes[abi_x86_32(-)] + pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)] ) ) !<=app-emulation/emul-linux-x86-sdl-20081109 !<=app-emulation/emul-linux-x86-soundlibs-20110101" @@ -77,6 +77,13 @@ RDEPEND="${RDEPEND} " PDEPEND="!abi_x86_32? ( ~app-emulation/emul-linux-x86-soundlibs-${PV} )" +pkg_pretend() { + if use abi_x86_32 && ! use pulseaudio; then + ewarn "You have disabled USE=pulseaudio. This is known to break pre-built" + ewarn "libavfilter. If you need it, please turn USE=pulseaudio back on." + fi +} + src_prepare() { # Include all libv4l libs, bug #348277 ALLOWED="${S}/usr/lib32/libv4l/" |