alsa-lib: upgraded package to upstream
Upgraded media-libs/alsa-lib to version 1.0.27.2 on amd64, arm, x86
BUG=chromium:314974
TEST=Test on Pixel, alex and daisy_spring. On peppy, connect to
6-channel speaker set through HDMI. Execute "speaker-test -D hw:0,3
--channels=6".
Change-Id: Iae1bdd87b6eb35c9c65512c6afbeaf8c48b5e642
Reviewed-on: https://chromium-review.googlesource.com/178401
Reviewed-by: Mike Frysinger <vapier@chromium.org>
Tested-by: Hsinyu Chao <hychao@chromium.org>
Commit-Queue: Hsinyu Chao <hychao@chromium.org>
diff --git a/media-libs/alsa-lib/Manifest b/media-libs/alsa-lib/Manifest
index de0fdb9..483723e 100644
--- a/media-libs/alsa-lib/Manifest
+++ b/media-libs/alsa-lib/Manifest
@@ -1 +1 @@
-DIST alsa-lib-1.0.27.1.tar.bz2 906234 SHA256 690e07a3ef6270d40ed2130638dba3c18395aae8db4a109bcc473643ce29a03b SHA512 546a52c5c23d51e3a49a36565c0bdda98efc3bbe8ba217c72cfb6986b0e1a6104a3040bc223a74966139416ce39709421a3131f3edb29362a3f949b0ae939909 WHIRLPOOL 485a5b260edc208776ca553d13065d242f1266e38b25dab252596fc8d4c9c3482d11fd3e472c7c96c97b396718a715ca12f36c76635bd069ebe09edc6815693f
+DIST alsa-lib-1.0.27.2.tar.bz2 906844 SHA256 690ed393e7efd4fc7e3a2d2cda5449298ca0c895197e5914e350882012430d19 SHA512 3fa9160e001cf21ddc6332c3748f8aa27bd1b514616fd1a9993c34128fe99d07e2dfc5f1a9177e1c17456d1361496f90bf3552f940fd85c6ea5ac9bbc30fe8ce WHIRLPOOL d5df07a99abe4fe7842ef9fe2718148f17db0a182ef0315ec5c32e2ea20ea2a2da007f880dbc2954efc5a2d61dd5e92038a45d8172bee29d8af13532dcdd4afd
diff --git a/media-libs/alsa-lib/alsa-lib-1.0.27.1.ebuild b/media-libs/alsa-lib/alsa-lib-1.0.27.2.ebuild
similarity index 67%
rename from media-libs/alsa-lib/alsa-lib-1.0.27.1.ebuild
rename to media-libs/alsa-lib/alsa-lib-1.0.27.2.ebuild
index d73a92a..cb62c5b 100644
--- a/media-libs/alsa-lib/alsa-lib-1.0.27.1.ebuild
+++ b/media-libs/alsa-lib/alsa-lib-1.0.27.2.ebuild
@@ -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/media-libs/alsa-lib/alsa-lib-1.0.27.1.ebuild,v 1.15 2013/09/01 18:36:03 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/alsa-lib/alsa-lib-1.0.27.2.ebuild,v 1.2 2013/07/30 13:05:57 ssuominen Exp $
EAPI=5
# no support for python3_2 or above yet wrt #471326
PYTHON_COMPAT=( python2_7 )
-inherit autotools eutils multilib python-single-r1
+inherit autotools eutils multilib multilib-minimal python-single-r1
DESCRIPTION="Advanced Linux Sound Architecture Library"
HOMEPAGE="http://www.alsa-project.org/"
@@ -18,7 +18,11 @@
KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 sh sparc x86 ~amd64-linux ~x86-linux"
IUSE="doc debug alisp python"
-RDEPEND="python? ( ${PYTHON_DEPS} )"
+RDEPEND="python? ( ${PYTHON_DEPS} )
+ abi_x86_32? (
+ !<=app-emulation/emul-linux-x86-soundlibs-20130224-r1
+ !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)]
+ )"
DEPEND="${RDEPEND}
doc? ( >=app-doc/doxygen-1.2.6 )"
@@ -28,18 +32,22 @@
src_prepare() {
find . -name Makefile.am -exec sed -i -e '/CFLAGS/s:-g -O2::' {} + || die
- # force use of correct python-config wrt #478802
if [[ ${ABI} == ${DEFAULT_ABI} ]]; then
use python && { sed -i -e "s:python-config:$EPYTHON-config:" configure.in || die; }
fi
- epatch "${FILESDIR}"/${P}-rewind.patch #477282
epatch_user
eautoreconf
}
-src_configure() {
+multilib_src_configure() {
local myconf
- use elibc_uclibc && myconf="--without-versioned"
+ # enable Python only on final ABI
+ if [[ ${ABI} == ${DEFAULT_ABI} ]]; then
+ myconf="$(use_enable python)"
+ else
+ myconf="--disable-python"
+ fi
+ use elibc_uclibc && myconf+=" --without-versioned"
ECONF_SOURCE=${S} \
econf \
@@ -51,25 +59,27 @@
--enable-aload \
$(use_with debug) \
$(use_enable alisp) \
- $(use_enable python) \
${myconf}
}
-src_compile() {
+multilib_src_compile() {
emake
- if use doc; then
+ if [[ ${ABI} == ${DEFAULT_ABI} ]] && use doc; then
emake doc
fgrep -Zrl "${S}" doc/doxygen/html | \
xargs -0 sed -i -e "s:${S}::"
fi
}
-src_install() {
+multilib_src_install() {
emake DESTDIR="${D}" install
- if use doc; then
+ if [[ ${ABI} == ${DEFAULT_ABI} ]] && use doc; then
dohtml -r doc/doxygen/html/.
fi
+}
+
+multilib_src_install_all() {
prune_libtool_files --all
find "${ED}"/usr/$(get_libdir)/alsa-lib -name '*.a' -exec rm -f {} +
dodoc ChangeLog doc/asoundrc.txt NOTES TODO
diff --git a/metadata/md5-cache/media-libs/alsa-lib-1.0.27.1 b/metadata/md5-cache/media-libs/alsa-lib-1.0.27.1
deleted file mode 100644
index e45be6e..0000000
--- a/metadata/md5-cache/media-libs/alsa-lib-1.0.27.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup
-DEPEND=python? ( dev-python/python-exec[python_targets_python2_7?,python_single_target_python2_7(+)?] python_single_target_python2_7? ( dev-lang/python:2.7 ) ) doc? ( >=app-doc/doxygen-1.2.6 ) || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
-DESCRIPTION=Advanced Linux Sound Architecture Library
-EAPI=5
-HOMEPAGE=http://www.alsa-project.org/
-IUSE=doc debug alisp python python_targets_python2_7 python_single_target_python2_7
-KEYWORDS=alpha amd64 arm hppa ia64 mips ppc ppc64 sh sparc x86 ~amd64-linux ~x86-linux
-LICENSE=LGPL-2.1
-RDEPEND=python? ( dev-python/python-exec[python_targets_python2_7?,python_single_target_python2_7(+)?] python_single_target_python2_7? ( dev-lang/python:2.7 ) )
-REQUIRED_USE=|| ( python_targets_python2_7 ) ^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=mirror://alsaproject/lib/alsa-lib-1.0.27.1.tar.bz2
-_eclasses_=autotools 1b0fa473be98091220edff9f51d06153 eutils d40dc948067bd3db1c8ebf7d51897313 libtool 0fd90d183673bf1107465ec45849d1ea multilib ded93e450747134a079e647d888aa80b multiprocessing 1512bdfe7004902b8cd2c466fc3df772 python-single-r1 54b347eb23e8703e001890374d040721 python-utils-r1 003399fd79dd7f27db6df90c2d78b3cb toolchain-funcs 3e30ef439a720915f8f4fd4fe75f704c user 9e552f935106ff0bc92af16da64b4b29
-_md5_=e40f8742d0b15499b47b7490458163c5
diff --git a/metadata/md5-cache/media-libs/alsa-lib-1.0.27.2 b/metadata/md5-cache/media-libs/alsa-lib-1.0.27.2
new file mode 100644
index 0000000..e303db1
--- /dev/null
+++ b/metadata/md5-cache/media-libs/alsa-lib-1.0.27.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=python? ( dev-python/python-exec[python_targets_python2_7?,python_single_target_python2_7(+)?] python_single_target_python2_7? ( dev-lang/python:2.7 ) ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224-r1 !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] ) doc? ( >=app-doc/doxygen-1.2.6 ) || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DESCRIPTION=Advanced Linux Sound Architecture Library
+EAPI=5
+HOMEPAGE=http://www.alsa-project.org/
+IUSE=doc debug alisp python abi_x86_32 abi_x86_64 abi_x86_x32 abi_x86_32 abi_x86_64 abi_mips_n32 abi_mips_n64 abi_mips_o32 python_targets_python2_7 python_single_target_python2_7
+KEYWORDS=alpha amd64 arm hppa ia64 mips ppc ppc64 sh sparc x86 ~amd64-linux ~x86-linux
+LICENSE=LGPL-2.1
+RDEPEND=python? ( dev-python/python-exec[python_targets_python2_7?,python_single_target_python2_7(+)?] python_single_target_python2_7? ( dev-lang/python:2.7 ) ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224-r1 !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] )
+REQUIRED_USE=|| ( python_targets_python2_7 ) ^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=mirror://alsaproject/lib/alsa-lib-1.0.27.2.tar.bz2
+_eclasses_=autotools 1b0fa473be98091220edff9f51d06153 eutils d40dc948067bd3db1c8ebf7d51897313 libtool 0fd90d183673bf1107465ec45849d1ea multibuild c2f33b0eedd7bcfd5bc226baa8da7837 multilib ded93e450747134a079e647d888aa80b multilib-build 812deed50460b095dc41672b2da354eb multilib-minimal 09c985fcba99d0f16fc7161fffa80730 multiprocessing 1512bdfe7004902b8cd2c466fc3df772 python-single-r1 54b347eb23e8703e001890374d040721 python-utils-r1 003399fd79dd7f27db6df90c2d78b3cb toolchain-funcs 3e30ef439a720915f8f4fd4fe75f704c user 9e552f935106ff0bc92af16da64b4b29
+_md5_=ca3fcc781af0aa119c3d870c4aabb128
