Upgraded the alsa-headers, alsa-lib, Portage packages

Upgraded media-libs/alsa-lib to version 1.0.25-r1 on amd64, arm, x86
Upgraded media-sound/alsa-headers to version 1.0.25 on amd64, arm, x86

BUG=chromium-os:29554
TEST=build_packages for stumpy, x86-generic, and daisy.

Change-Id: Ic6b3029d4518f267cc332fe7e94ff38bea516df2
Reviewed-on: https://gerrit.chromium.org/gerrit/20319
Reviewed-by: Mike Frysinger <vapier@chromium.org>
Commit-Ready: Dylan Reid <dgreid@chromium.org>
Tested-by: Dylan Reid <dgreid@chromium.org>
This commit is contained in:
Dylan Reid 2012-04-16 10:54:31 -07:00 committed by Gerrit
parent bed9a50120
commit d82f7e840c
8 changed files with 141 additions and 9 deletions

View File

@ -0,0 +1 @@
DIST alsa-lib-1.0.25.tar.bz2 838403 RMD160 82da10b1ffe50185ec6ceb61c9e08ff2b80c1c3c SHA1 868ec437e033291435b2d3e0978317aae0636212 SHA256 5a1a805cf04106316d549ec650116ce6711a162e107ba8b3c551866680e286e6

View File

@ -0,0 +1,82 @@
# Copyright 1999-2012 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.25-r1.ebuild,v 1.7 2012/04/01 15:11:43 armin76 Exp $
EAPI=4
PYTHON_DEPEND="python? 2"
inherit autotools base python multilib
MY_P=${P/_rc/rc}
S=${WORKDIR}/${MY_P}
DESCRIPTION="Advanced Linux Sound Architecture Library"
HOMEPAGE="http://www.alsa-project.org/"
SRC_URI="mirror://alsaproject/lib/${MY_P}.tar.bz2"
LICENSE="LGPL-2.1"
SLOT="0"
KEYWORDS="alpha amd64 arm hppa ia64 ~mips ~ppc ppc64 sh sparc x86 ~amd64-linux ~x86-linux"
IUSE="doc debug alisp python"
DEPEND=">=media-sound/alsa-headers-1.0.25
doc? ( >=app-doc/doxygen-1.2.6 )"
RDEPEND=""
PATCHES=( "${FILESDIR}/${PV}-extraneous-cflags.diff" )
pkg_setup() {
if use python; then
python_set_active_version 2
fi
}
src_prepare() {
eautoreconf
epunt_cxx
}
src_configure() {
local myconf
use elibc_uclibc && myconf="--without-versioned"
econf \
--enable-shared \
--disable-resmgr \
--enable-rawmidi \
--enable-seq \
--enable-aload \
$(use_with debug) \
$(use_enable alisp) \
$(use_enable python) \
--disable-dependency-tracking \
${myconf}
}
src_compile() {
emake || die
if use doc; then
emake doc || die "failed to generate docs"
fgrep -Zrl "${S}" "${S}/doc/doxygen/html" | \
xargs -0 sed -i -e "s:${S}::"
fi
}
src_install() {
emake DESTDIR="${D}" install || die
find "${ED}" -name '*.la' -exec rm -f {} +
find "${ED}"/usr/$(get_libdir)/alsa-lib -name '*.a' -exec rm -f {} +
dodoc ChangeLog TODO || die
use doc && dohtml -r doc/doxygen/html/*
}
pkg_postinst() {
elog "Please try in-kernel ALSA drivers instead of the alsa-driver ebuild."
elog "If alsa-driver works for you where a *recent* kernel does not, we want "
elog "to know about this. Our e-mail address is alsa-bugs@gentoo.org"
elog "However, if you notice no sound output or instability, please try to "
elog "upgrade your kernel to a newer version first."
}

View File

@ -0,0 +1,23 @@
diff -uNr alsa-lib-1.0.25.ORIG/modules/mixer/simple/Makefile.am alsa-lib-1.0.25/modules/mixer/simple/Makefile.am
--- alsa-lib-1.0.25.ORIG/modules/mixer/simple/Makefile.am 2012-01-26 10:46:50.870738448 +0000
+++ alsa-lib-1.0.25/modules/mixer/simple/Makefile.am 2012-01-26 11:12:16.972695934 +0000
@@ -1,7 +1,7 @@
alsaplugindir = @ALSA_PLUGIN_DIR@
pkglibdir = $(alsaplugindir)/smixer
-AM_CFLAGS = -g -O2 -W -Wall
+AM_CFLAGS = -W -Wall
INCLUDES=-I$(top_srcdir)/include
diff -uNr alsa-lib-1.0.25.ORIG/src/pcm/scopes/Makefile.am alsa-lib-1.0.25/src/pcm/scopes/Makefile.am
--- alsa-lib-1.0.25.ORIG/src/pcm/scopes/Makefile.am 2012-01-26 10:46:50.875738335 +0000
+++ alsa-lib-1.0.25/src/pcm/scopes/Makefile.am 2012-01-26 11:12:29.172695655 +0000
@@ -1,6 +1,6 @@
pkglibdir = $(libdir)/@PACKAGE@/scopes
-AM_CFLAGS = -g -O2 -W -Wall
+AM_CFLAGS = -W -Wall
pkglib_LTLIBRARIES = scope-level.la

View File

@ -1 +1 @@
DIST alsa-driver-1.0.24.tar.bz2 3609960 RMD160 727c6b78c4f595f20b74649f391db75bb927c66a SHA1 df82fc3d5e2a9248f0214a87ad31a9825bcab9bc SHA256 fe8aa69b209879dd6df820237a28cddcf1bed5417710e53336ec7281b5f48d2b
DIST alsa-driver-1.0.25.tar.bz2 3861484 RMD160 ad8b8093bf1de78cb0dcbb1b6a82ebb18d7aad6d SHA1 ebda37d18379466ca9d843e7a80d10bb706a6b04 SHA256 d80e219fd410b5bc62f9332e5964acd575cc8a0bcda80fa41d5eebeabde0ebc3

View File

@ -1,8 +1,8 @@
# Copyright 1999-2011 Gentoo Foundation
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-headers/alsa-headers-1.0.24.ebuild,v 1.1 2011/02/05 23:55:34 chainsaw Exp $
# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-headers/alsa-headers-1.0.25.ebuild,v 1.7 2012/04/01 15:10:10 armin76 Exp $
EAPI="3"
EAPI="4"
inherit base
@ -16,7 +16,7 @@ SRC_URI="mirror://alsaproject/driver/${MY_P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
KEYWORDS="alpha amd64 arm hppa ia64 ~mips ~ppc ppc64 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
IUSE=""
DEPEND=""

View File

@ -0,0 +1,13 @@
DEFINED_PHASES=compile configure install postinst prepare setup unpack
DEPEND=>=media-sound/alsa-headers-1.0.25 doc? ( >=app-doc/doxygen-1.2.6 ) || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool >=app-admin/eselect-python-20091230 python? ( =dev-lang/python-2* )
DESCRIPTION=Advanced Linux Sound Architecture Library
EAPI=4
HOMEPAGE=http://www.alsa-project.org/
IUSE=doc debug alisp python
KEYWORDS=alpha amd64 arm hppa ia64 ~mips ~ppc ppc64 sh sparc x86 ~amd64-linux ~x86-linux
LICENSE=LGPL-2.1
RDEPEND=>=app-admin/eselect-python-20091230 python? ( =dev-lang/python-2* )
SLOT=0
SRC_URI=mirror://alsaproject/lib/alsa-lib-1.0.25.tar.bz2
_eclasses_=autotools 63332a15502113ca711ccccb3889a109 base fc89786f3f7e7bcf03334359bd5b639b eutils 33ef77a15337022e05342d2c772a7a5a libtool 0fd90d183673bf1107465ec45849d1ea multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c python 6bbd984910e27780e5d0ea543d83ef84 toolchain-funcs 6526ac6fc9aedf391efb91fcd75ace68 user 9e552f935106ff0bc92af16da64b4b29
_md5_=753dcf4703d81c2aa2db6f404398835d

View File

@ -1,11 +1,11 @@
DEFINED_PHASES=compile configure install prepare setup unpack
DESCRIPTION=Header files for Advanced Linux Sound Architecture kernel modules
EAPI=3
EAPI=4
HOMEPAGE=http://www.alsa-project.org/
KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
KEYWORDS=alpha amd64 arm hppa ia64 ~mips ~ppc ppc64 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
LICENSE=GPL-2
RESTRICT=binchecks strip
SLOT=0
SRC_URI=mirror://alsaproject/driver/alsa-driver-1.0.24.tar.bz2
SRC_URI=mirror://alsaproject/driver/alsa-driver-1.0.25.tar.bz2
_eclasses_=base fc89786f3f7e7bcf03334359bd5b639b eutils 33ef77a15337022e05342d2c772a7a5a multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 6526ac6fc9aedf391efb91fcd75ace68 user 9e552f935106ff0bc92af16da64b4b29
_md5_=110666a0cd08edff6f8822df0f08595c
_md5_=b3f4fa8815b82fdfedda8a385d4bd32d

View File

@ -0,0 +1,13 @@
DEFINED_PHASES=compile configure install postinst prepare unpack
DEPEND=>=sys-libs/ncurses-5.1 dev-util/dialog >=media-libs/alsa-lib-1.0.25 media-libs/libsamplerate doc? ( app-text/xmlto )
DESCRIPTION=Advanced Linux Sound Architecture Utils (alsactl, alsamixer, etc.)
EAPI=4
HOMEPAGE=http://www.alsa-project.org/
IUSE=doc nls minimal
KEYWORDS=alpha amd64 arm hppa ia64 ~mips ~ppc ppc64 sh sparc x86
LICENSE=GPL-2
RDEPEND=>=sys-libs/ncurses-5.1 dev-util/dialog >=media-libs/alsa-lib-1.0.25 media-libs/libsamplerate !minimal? ( sys-apps/pciutils )
SLOT=0.9
SRC_URI=mirror://alsaproject/utils/alsa-utils-1.0.25.tar.bz2 mirror://alsaproject/driver/alsa-driver-1.0.25.tar.bz2
_eclasses_=base fc89786f3f7e7bcf03334359bd5b639b eutils 33ef77a15337022e05342d2c772a7a5a multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c systemd b5da52630b2559da43198bfb56ccacba toolchain-funcs 6526ac6fc9aedf391efb91fcd75ace68 user 9e552f935106ff0bc92af16da64b4b29
_md5_=a9aa392e347f04d3cb1bce0d98546d00