| 1 |
mgorny 14/05/29 21:15:13 |
| 2 |
|
| 3 |
Modified: emul-linux-x86-medialibs-20140508-r2.ebuild |
| 4 |
ChangeLog |
| 5 |
Log: |
| 6 |
Add USE=pulseaudio to allow breaking pre-built ffmpeg. |
| 7 |
|
| 8 |
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.2 app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-20140508-r2.ebuild |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-20140508-r2.ebuild?rev=1.2&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-20140508-r2.ebuild?rev=1.2&content-type=text/plain |
| 15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-20140508-r2.ebuild?r1=1.1&r2=1.2 |
| 16 |
|
| 17 |
Index: emul-linux-x86-medialibs-20140508-r2.ebuild |
| 18 |
=================================================================== |
| 19 |
RCS file: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-20140508-r2.ebuild,v |
| 20 |
retrieving revision 1.1 |
| 21 |
retrieving revision 1.2 |
| 22 |
diff -u -r1.1 -r1.2 |
| 23 |
--- emul-linux-x86-medialibs-20140508-r2.ebuild 27 May 2014 19:01:02 -0000 1.1 |
| 24 |
+++ emul-linux-x86-medialibs-20140508-r2.ebuild 29 May 2014 21:15:13 -0000 1.2 |
| 25 |
@@ -1,13 +1,13 @@ |
| 26 |
# Copyright 1999-2014 Gentoo Foundation |
| 27 |
# Distributed under the terms of the GNU General Public License v2 |
| 28 |
-# $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 $ |
| 29 |
+# $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 $ |
| 30 |
|
| 31 |
EAPI=5 |
| 32 |
inherit emul-linux-x86 |
| 33 |
|
| 34 |
LICENSE="APL-1.0 GPL-2 BSD BSD-2 public-domain LGPL-2 MPL-1.1 LGPL-2.1 !abi_x86_32? ( MPEG-4 )" |
| 35 |
KEYWORDS="-* ~amd64" |
| 36 |
-IUSE="abi_x86_32" |
| 37 |
+IUSE="abi_x86_32 +pulseaudio" |
| 38 |
|
| 39 |
DEPEND="" |
| 40 |
# required libs |
| 41 |
@@ -26,12 +26,12 @@ |
| 42 |
media-libs/libpng[abi_x86_32(-)] |
| 43 |
media-libs/libvorbis[abi_x86_32(-)] |
| 44 |
media-sound/jack-audio-connection-kit[abi_x86_32(-)] |
| 45 |
- media-sound/pulseaudio[abi_x86_32(-)] |
| 46 |
sci-libs/fftw[abi_x86_32(-)] |
| 47 |
virtual/jpeg:62[abi_x86_32(-)] |
| 48 |
x11-libs/libX11[abi_x86_32(-)] |
| 49 |
x11-libs/libXext[abi_x86_32(-)] |
| 50 |
x11-libs/libXfixes[abi_x86_32(-)] |
| 51 |
+ pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)] ) |
| 52 |
) |
| 53 |
!<=app-emulation/emul-linux-x86-sdl-20081109 |
| 54 |
!<=app-emulation/emul-linux-x86-soundlibs-20110101" |
| 55 |
@@ -77,6 +77,13 @@ |
| 56 |
" |
| 57 |
PDEPEND="!abi_x86_32? ( ~app-emulation/emul-linux-x86-soundlibs-${PV} )" |
| 58 |
|
| 59 |
+pkg_pretend() { |
| 60 |
+ if use abi_x86_32 && ! use pulseaudio; then |
| 61 |
+ ewarn "You have disabled USE=pulseaudio. This is known to break pre-built" |
| 62 |
+ ewarn "libavfilter. If you need it, please turn USE=pulseaudio back on." |
| 63 |
+ fi |
| 64 |
+} |
| 65 |
+ |
| 66 |
src_prepare() { |
| 67 |
# Include all libv4l libs, bug #348277 |
| 68 |
ALLOWED="${S}/usr/lib32/libv4l/" |
| 69 |
|
| 70 |
|
| 71 |
|
| 72 |
1.98 app-emulation/emul-linux-x86-medialibs/ChangeLog |
| 73 |
|
| 74 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/emul-linux-x86-medialibs/ChangeLog?rev=1.98&view=markup |
| 75 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/emul-linux-x86-medialibs/ChangeLog?rev=1.98&content-type=text/plain |
| 76 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/emul-linux-x86-medialibs/ChangeLog?r1=1.97&r2=1.98 |
| 77 |
|
| 78 |
Index: ChangeLog |
| 79 |
=================================================================== |
| 80 |
RCS file: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-medialibs/ChangeLog,v |
| 81 |
retrieving revision 1.97 |
| 82 |
retrieving revision 1.98 |
| 83 |
diff -u -r1.97 -r1.98 |
| 84 |
--- ChangeLog 29 May 2014 16:39:58 -0000 1.97 |
| 85 |
+++ ChangeLog 29 May 2014 21:15:13 -0000 1.98 |
| 86 |
@@ -1,6 +1,10 @@ |
| 87 |
# ChangeLog for app-emulation/emul-linux-x86-medialibs |
| 88 |
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 |
| 89 |
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-medialibs/ChangeLog,v 1.97 2014/05/29 16:39:58 mgorny Exp $ |
| 90 |
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-medialibs/ChangeLog,v 1.98 2014/05/29 21:15:13 mgorny Exp $ |
| 91 |
+ |
| 92 |
+ 29 May 2014; Michał Górny <mgorny@g.o> |
| 93 |
+ emul-linux-x86-medialibs-20140508-r2.ebuild: |
| 94 |
+ Add USE=pulseaudio to allow breaking pre-built ffmpeg. |
| 95 |
|
| 96 |
29 May 2014; Michał Górny <mgorny@g.o> |
| 97 |
-emul-linux-x86-medialibs-20140508-r1.ebuild, |
Archives