From ac691c49c69c5b93847d5930cfb9ce8c39474833 Mon Sep 17 00:00:00 2001 From: Taylor Hutt Date: Thu, 6 Oct 2011 14:06:39 -0700 Subject: [PATCH] chromium-os:21259: Upgrade alsa-plugins ebuild to 1.0.24 Details This change updates 'alsa-plugins-1.0.22.ebuild' to 'alsa-plugins-1.0.24.ebuild'. Testing Followed instructions: http://www.chromium.org/chromium-os/gentoo-package-upgrade-process Executed the following, all successfully: C="I2a77e14b" cbuildbot --gerrit-patches "${C}" arm-generic-bin cbuildbot --gerrit-patches "${C}" arm-tegra2-bin cbuildbot --gerrit-patches "${C}" x86-generic-pre-flight-queue cbuildbot --gerrit-patches "${C}" x86-mario-pre-flight-queue o x86-mario Built and installed new image Played youtube video, w/ sound Played wav file using aplay Used gtalk o tegra2_kaen Built and installed new image Played youtube video, w/ sound Played wav file using aplay Used gtalk o Validated alsa-plugins-1.0.22 is currently used In a source tree without my change: equery-tegra2_asymptote list -op alsa-plugins * Searching for alsaplugins ... [-P-] [ ] media-plugins/alsa-plugins-1.0.20:0 [IP-] [ ] media-plugins/alsa-plugins-1.0.21:0 [-P-] [ ~] media-plugins/alsa-plugins-1.0.22:0 [--O] [ ~] media-plugins/alsa-plugins-1.0.24:0 In same source tree after cherry picking gerrit change 8911: [-P-] [ ] media-plugins/alsa-plugins-1.0.20:0 [-P-] [ ] media-plugins/alsa-plugins-1.0.21:0 [-P-] [ ~] media-plugins/alsa-plugins-1.0.22:0 [I-O] [ ] media-plugins/alsa-plugins-1.0.24:0 In source tree which originated this change set: equery-tegra2_kaen list -op alsa-plugins * Searching for alsaplugins ... [-P-] [ ] media-plugins/alsa-plugins-1.0.20:0 [-P-] [ ] media-plugins/alsa-plugins-1.0.21:0 [-P-] [ ~] media-plugins/alsa-plugins-1.0.22:0 [I-O] [ ] media-plugins/alsa-plugins-1.0.24:0 BUG=chromium-os:21259 TEST=See above Change-Id: I2a77e14b484ecaead4f5b70914609f5d0c3324f4 Signed-off-by: Taylor Hutt Reviewed-on: http://gerrit.chromium.org/gerrit/8911 Reviewed-by: Matt Tennant Reviewed-by: David James --- .../alsa-plugins/alsa-plugins-1.0.24.ebuild | 4 +-- .../files/alsa-plugins-1.0.21-automagic.patch | 12 +++++++++ .../alsa-plugins/files/pulse-alsa.conf | 27 +++++++++++++++++++ .../alsa-plugins/files/pulse.conf | 18 +++++++++++++ 4 files changed, 59 insertions(+), 2 deletions(-) create mode 100644 sdk_container/src/third_party/portage-stable/media-plugins/alsa-plugins/files/alsa-plugins-1.0.21-automagic.patch create mode 100644 sdk_container/src/third_party/portage-stable/media-plugins/alsa-plugins/files/pulse-alsa.conf create mode 100644 sdk_container/src/third_party/portage-stable/media-plugins/alsa-plugins/files/pulse.conf diff --git a/sdk_container/src/third_party/portage-stable/media-plugins/alsa-plugins/alsa-plugins-1.0.24.ebuild b/sdk_container/src/third_party/portage-stable/media-plugins/alsa-plugins/alsa-plugins-1.0.24.ebuild index 9e17ac3f01..2fb62daa69 100644 --- a/sdk_container/src/third_party/portage-stable/media-plugins/alsa-plugins/alsa-plugins-1.0.24.ebuild +++ b/sdk_container/src/third_party/portage-stable/media-plugins/alsa-plugins/alsa-plugins-1.0.24.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-plugins/alsa-plugins/alsa-plugins-1.0.24.ebuild,v 1.2 2011/04/10 20:21:10 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-plugins/alsa-plugins/alsa-plugins-1.0.24.ebuild,v 1.6 2011/10/04 04:52:47 maekke Exp $ EAPI=3 @@ -14,7 +14,7 @@ SRC_URI="mirror://alsaproject/plugins/${MY_P}.tar.bz2" LICENSE="GPL-2 LGPL-2.1" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86" +KEYWORDS="~alpha amd64 arm hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc x86" IUSE="debug ffmpeg jack libsamplerate pulseaudio speex" RDEPEND=">=media-libs/alsa-lib-${PV}[alsa_pcm_plugins_ioplug] diff --git a/sdk_container/src/third_party/portage-stable/media-plugins/alsa-plugins/files/alsa-plugins-1.0.21-automagic.patch b/sdk_container/src/third_party/portage-stable/media-plugins/alsa-plugins/files/alsa-plugins-1.0.21-automagic.patch new file mode 100644 index 0000000000..f7d9e7dc43 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/media-plugins/alsa-plugins/files/alsa-plugins-1.0.21-automagic.patch @@ -0,0 +1,12 @@ +diff -ur alsa-plugins-1.0.21.orig/Makefile.am alsa-plugins-1.0.21/Makefile.am +--- alsa-plugins-1.0.21.orig/Makefile.am 2009-05-06 10:07:28.000000000 +0300 ++++ alsa-plugins-1.0.21/Makefile.am 2009-08-01 18:23:26.000000000 +0300 +@@ -17,7 +17,7 @@ + if HAVE_PPH + SUBDIRS += pph + endif +-if HAVE_SPEEXDSP ++if USE_LIBSPEEX + SUBDIRS += speex + endif + diff --git a/sdk_container/src/third_party/portage-stable/media-plugins/alsa-plugins/files/pulse-alsa.conf b/sdk_container/src/third_party/portage-stable/media-plugins/alsa-plugins/files/pulse-alsa.conf new file mode 100644 index 0000000000..9964f29467 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/media-plugins/alsa-plugins/files/pulse-alsa.conf @@ -0,0 +1,27 @@ +# This file is referred to by /usr/share/alsa/pulse.conf to set pulseaudio as +# the default output plugin for applications using alsa when PulseAudio is +# running. + +pcm.!default { + type pulse +} + +ctl.!default { + type pulse +} + +pcm.pulse { + type pulse + hint { + show { + @func refer + name defaults.namehint.basic + } + description "Playback/recording through the PulseAudio sound server" + } +} + +ctl.pulse { + type pulse +} + diff --git a/sdk_container/src/third_party/portage-stable/media-plugins/alsa-plugins/files/pulse.conf b/sdk_container/src/third_party/portage-stable/media-plugins/alsa-plugins/files/pulse.conf new file mode 100644 index 0000000000..bc409fe6db --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/media-plugins/alsa-plugins/files/pulse.conf @@ -0,0 +1,18 @@ +# PulseAudio alsa plugin configuration file to set the pulseaudio plugin as +# default output for applications using alsa when pulseaudio is running. +hook_func.pulse_load_if_running { + lib "/usr/lib/alsa-lib/libasound_module_conf_pulse.so" + func "conf_pulse_hook_load_if_running" +} + +@hooks [ + { + func pulse_load_if_running + files [ + "/usr/share/alsa/pulse-alsa.conf" + "/etc/asound.conf" + "~/.asoundrc" + ] + errors false + } +]