From: "Michal Gorny (mgorny)" <mgorny@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] gentoo-x86 commit in app-emulation/emul-linux-x86-soundlibs: emul-linux-x86-soundlibs-20131008-r2.ebuild metadata.xml ChangeLog
Date: Sun, 1 Dec 2013 09:30:10 +0000 (UTC) [thread overview]
Message-ID: <20131201093010.78EEA2004B@flycatcher.gentoo.org> (raw)
mgorny 13/12/01 09:30:10
Modified: emul-linux-x86-soundlibs-20131008-r2.ebuild
metadata.xml ChangeLog
Log:
Add USE=pulseaudio to disable PulseAudio support on multilib variant.
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!)
Revision Changes Path
1.3 app-emulation/emul-linux-x86-soundlibs/emul-linux-x86-soundlibs-20131008-r2.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/emul-linux-x86-soundlibs/emul-linux-x86-soundlibs-20131008-r2.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/emul-linux-x86-soundlibs/emul-linux-x86-soundlibs-20131008-r2.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/emul-linux-x86-soundlibs/emul-linux-x86-soundlibs-20131008-r2.ebuild?r1=1.2&r2=1.3
Index: emul-linux-x86-soundlibs-20131008-r2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-soundlibs/emul-linux-x86-soundlibs-20131008-r2.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- emul-linux-x86-soundlibs-20131008-r2.ebuild 30 Nov 2013 21:41:55 -0000 1.2
+++ emul-linux-x86-soundlibs-20131008-r2.ebuild 1 Dec 2013 09:30:10 -0000 1.3
@@ -1,13 +1,13 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-soundlibs/emul-linux-x86-soundlibs-20131008-r2.ebuild,v 1.2 2013/11/30 21:41:55 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-soundlibs/emul-linux-x86-soundlibs-20131008-r2.ebuild,v 1.3 2013/12/01 09:30:10 mgorny Exp $
EAPI=5
inherit emul-linux-x86
LICENSE="BSD FDL-1.2 GPL-2 LGPL-2.1 LGPL-2 MIT gsm public-domain"
KEYWORDS="-* amd64"
-IUSE="abi_x86_32 alsa"
+IUSE="abi_x86_32 alsa +pulseaudio"
RDEPEND="~app-emulation/emul-linux-x86-baselibs-${PV}[abi_x86_32=]
~app-emulation/emul-linux-x86-medialibs-${PV}[abi_x86_32=]
@@ -38,9 +38,17 @@
>=media-libs/portaudio-19_pre20111121-r1[abi_x86_32(-)]
>=media-sound/mpg123-1.15.4-r1[abi_x86_32(-)]
>=media-libs/libao-1.1.0-r1[abi_x86_32(-)]
- >=media-sound/pulseaudio-4.0-r1[abi_x86_32(-)]
+ pulseaudio? ( >=media-sound/pulseaudio-4.0-r1[abi_x86_32(-)] )
)"
+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 in emul-linux-x86-medialibs. If you need that, please"
+ ewarn "turn USE=pulseaudio back on."
+ fi
+}
+
src_prepare() {
_ALLOWED="${S}/etc/env.d"
use alsa && _ALLOWED="${_ALLOWED}|${S}/usr/bin/aoss"
1.9 app-emulation/emul-linux-x86-soundlibs/metadata.xml
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/emul-linux-x86-soundlibs/metadata.xml?rev=1.9&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/emul-linux-x86-soundlibs/metadata.xml?rev=1.9&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/emul-linux-x86-soundlibs/metadata.xml?r1=1.8&r2=1.9
Index: metadata.xml
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-soundlibs/metadata.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- metadata.xml 22 Aug 2013 16:01:10 -0000 1.8
+++ metadata.xml 1 Dec 2013 09:30:10 -0000 1.9
@@ -5,5 +5,8 @@
<email>multilib@gentoo.org</email>
<name>Gentoo multilib project</name>
</maintainer>
- <use><flag name="development">Install pkgconfig files</flag></use>
+ <use>
+ <flag name="development">Install pkgconfig files</flag>
+ <flag name="pulseaudio">Pull in pulseaudio if using USE=abi_x86_32</flag>
+ </use>
</pkgmetadata>
1.112 app-emulation/emul-linux-x86-soundlibs/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/emul-linux-x86-soundlibs/ChangeLog?rev=1.112&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/emul-linux-x86-soundlibs/ChangeLog?rev=1.112&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/emul-linux-x86-soundlibs/ChangeLog?r1=1.111&r2=1.112
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-soundlibs/ChangeLog,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -r1.111 -r1.112
--- ChangeLog 30 Nov 2013 21:41:55 -0000 1.111
+++ ChangeLog 1 Dec 2013 09:30:10 -0000 1.112
@@ -1,6 +1,10 @@
# ChangeLog for app-emulation/emul-linux-x86-soundlibs
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-soundlibs/ChangeLog,v 1.111 2013/11/30 21:41:55 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-soundlibs/ChangeLog,v 1.112 2013/12/01 09:30:10 mgorny Exp $
+
+ 01 Dec 2013; Michał Górny <mgorny@gentoo.org>
+ emul-linux-x86-soundlibs-20131008-r2.ebuild, metadata.xml:
+ Add USE=pulseaudio to disable PulseAudio support on multilib variant.
30 Nov 2013; Michał Górny <mgorny@gentoo.org>
emul-linux-x86-soundlibs-20131008-r2.ebuild:
reply other threads:[~2013-12-01 9:30 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20131201093010.78EEA2004B@flycatcher.gentoo.org \
--to=mgorny@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox