mgorny 14/05/29 21:15:13
Modified: emul-linux-x86-medialibs-20140508-r2.ebuild
ChangeLog
Log:
Add USE=pulseaudio to allow breaking pre-built ffmpeg.
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key
EFB4464E!)
Revision Changes Path
1.2
app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-20140508-r2.ebuild
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
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
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
Index: emul-linux-x86-medialibs-20140508-r2.ebuild
===================================================================
RCS file:
/var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-20140508-r2.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- emul-linux-x86-medialibs-20140508-r2.ebuild 27 May 2014 19:01:02 -0000
1.1
+++ emul-linux-x86-medialibs-20140508-r2.ebuild 29 May 2014 21:15:13 -0000
1.2
@@ -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 @@
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 @@
"
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/"
1.98 app-emulation/emul-linux-x86-medialibs/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/emul-linux-x86-medialibs/ChangeLog?rev=1.98&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/emul-linux-x86-medialibs/ChangeLog?rev=1.98&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/emul-linux-x86-medialibs/ChangeLog?r1=1.97&r2=1.98
Index: ChangeLog
===================================================================
RCS file:
/var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-medialibs/ChangeLog,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -r1.97 -r1.98
--- ChangeLog 29 May 2014 16:39:58 -0000 1.97
+++ ChangeLog 29 May 2014 21:15:13 -0000 1.98
@@ -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 <mgo...@gentoo.org>
+ emul-linux-x86-medialibs-20140508-r2.ebuild:
+ Add USE=pulseaudio to allow breaking pre-built ffmpeg.
29 May 2014; Michał Górny <mgo...@gentoo.org>
-emul-linux-x86-medialibs-20140508-r1.ebuild,
