alsa: Upgrade alsa packages to latest version
This patch updates alsa packages (alsa-lib, alsa-utils and
alsa-plugins) to their latest release versions.
This commit also moves the alsa packages back to portage-stable.
BUG=chrome-os-partner:43618
TEST=./build_packages --board=reef installs latest versions of
alsa-lib (1.1.3) ,alsa-utils (1.1.3) and alsa-plugins (1.1.1).
CQ-DEPEND=CL:431877
Change-Id: I3adccb529a7ea105a2d9237edd78df33259c7953
Signed-off-by: Vedang Patel <vedang.patel@intel.com>
Reviewed-on: https://chromium-review.googlesource.com/407636
Tested-by: Wayne Boyer <wayne.boyer@intel.com>
Reviewed-by: Dylan Reid <dgreid@chromium.org>
Reviewed-by: Hsinyu Chao <hychao@chromium.org>
diff --git a/media-libs/alsa-lib/Manifest b/media-libs/alsa-lib/Manifest
index 055ed2c..5e6c87c 100644
--- a/media-libs/alsa-lib/Manifest
+++ b/media-libs/alsa-lib/Manifest
@@ -1 +1 @@
-DIST alsa-lib-1.1.0.tar.bz2 929874 SHA256 dfde65d11e82b68f82e562ab6228c1fb7c78854345d3c57e2c68a9dd3dae1f15 SHA512 2939d0b621c1c619b0a492b05f2e84f354d588c9cc982d93dbcf01c582319258dd5f803ff5c10be52343cd8827d690f671ab5b20ad586a0ee371f0949c9e98f4 WHIRLPOOL b82bdf72ed5cd23517270a1e81407670d2af2794fa14decf9513643f270281affe978eef9bc61cd76eea529751461ab016fc0e187b36e2527bec02674e5ee8a8
+DIST alsa-lib-1.1.3.tar.bz2 962001 SHA256 71282502184c592c1a008e256c22ed0ba5728ca65e05273ceb480c70f515969c SHA512 f5dbe2375a8c66af14378314a5238284d4ed63dfc86a750c0c6e8f6cdb6b1ea2d8ef26f870b5d152dc0b77d9b40821cab523f6734902b91583beb08e28c66850 WHIRLPOOL f33871789a7cc06a9db83fd659abdfeb7940d61a24ad7c71866f843d8c0c29eaf0e0770a2034dee2526c96835935b88c2fe882184c86528c98e7d4901f94b27d
diff --git a/media-libs/alsa-lib/alsa-lib-1.1.0.ebuild b/media-libs/alsa-lib/alsa-lib-1.1.3.ebuild
similarity index 89%
rename from media-libs/alsa-lib/alsa-lib-1.1.0.ebuild
rename to media-libs/alsa-lib/alsa-lib-1.1.3.ebuild
index 3fdebf0..82fdf47 100644
--- a/media-libs/alsa-lib/alsa-lib-1.1.0.ebuild
+++ b/media-libs/alsa-lib/alsa-lib-1.1.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -36,7 +36,9 @@
find . -name Makefile.am -exec sed -i -e '/CFLAGS/s:-g -O2::' {} + || die
# https://bugs.gentoo.org/509886
use elibc_uclibc && { sed -i -e 's:oldapi queue_timer:queue_timer:' test/Makefile.am || die; }
- epatch_user
+ # https://bugs.gentoo.org/545950
+ sed -i -e '5s:^$:\nAM_CPPFLAGS = -I$(top_srcdir)/include:' test/lsb/Makefile.am || die
+ default
eautoreconf
}
@@ -76,12 +78,14 @@
multilib_src_install() {
emake DESTDIR="${D}" install
if multilib_is_native_abi && use doc; then
- dohtml -r doc/doxygen/html/.
+ docinto html
+ dodoc -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 {} +
+ docinto ""
dodoc ChangeLog doc/asoundrc.txt NOTES TODO
}
diff --git a/media-plugins/alsa-plugins/Manifest b/media-plugins/alsa-plugins/Manifest
index b9289cb..32f4941 100644
--- a/media-plugins/alsa-plugins/Manifest
+++ b/media-plugins/alsa-plugins/Manifest
@@ -1 +1,2 @@
DIST alsa-plugins-1.1.0.tar.bz2 366296 SHA256 3b83c329953bef99f5fe25ae04ec4a455fe6514939f3b45a5321966652b2c9ee SHA512 5ed31ce1b6d11232d464d3cdef6015403840edbf2154266a479c2fde12ef4506e1f20c0f405ccee9cc39aec80be3bc41b10798a4475494ba56c6b4d69637fdc9 WHIRLPOOL 32c8460ed27a6a554f983e476e09847940e152cbc7b8cf0909243d312091560b1b25360249e3edeae50a46c5990f216cfd17915ec539812a5c473406705c2e73
+DIST alsa-plugins-1.1.1.tar.bz2 366193 SHA256 8ea4d1e082c36528a896a2581e5eb62d4dc2683238e353050d0d624e65f901f1 SHA512 9dd277cb5cce144ce4e5e0010cebcba0f8634c783e7bcd80ce6d04b198d6de5150a2764df3087a39a468b5fb7c4578de2e252095568e811dedaa5e7ffdbeb7c9 WHIRLPOOL 20f36afcb01dfe47172b6470fea929ffb267e0b7a78ac4ca8c2031b33faa6fe15bd0608d9963e053366ac6bf3b2f540d776537c8547418a0d2b80b5c0366a76f
diff --git a/media-plugins/alsa-plugins/alsa-plugins-1.1.0.ebuild b/media-plugins/alsa-plugins/alsa-plugins-1.1.1.ebuild
similarity index 86%
rename from media-plugins/alsa-plugins/alsa-plugins-1.1.0.ebuild
rename to media-plugins/alsa-plugins/alsa-plugins-1.1.1.ebuild
index 10d78e5..301c9bd 100644
--- a/media-plugins/alsa-plugins/alsa-plugins-1.1.0.ebuild
+++ b/media-plugins/alsa-plugins/alsa-plugins-1.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -24,20 +24,17 @@
libsamplerate? ( >=media-libs/libsamplerate-0.1.8-r1:=[${MULTILIB_USEDEP}] )
pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
speex? ( >=media-libs/speex-1.2_rc1-r1:=[${MULTILIB_USEDEP}] )
- abi_x86_32? (
- !<app-emulation/emul-linux-x86-soundlibs-20140406-r1
- !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32]
- )
"
DEPEND="${RDEPEND}
virtual/pkgconfig"
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-1.0.23-automagic.patch
- epatch "${FILESDIR}"/${PN}-1.0.28-libav10.patch
- has_version '>=media-video/ffmpeg-2.8' && epatch "${FILESDIR}"/${PN}-1.0.29-ffmpeg29.patch
+PATCHES=(
+ "${FILESDIR}/${PN}-1.0.23-automagic.patch"
+ "${FILESDIR}/${PN}-1.0.28-libav10.patch"
+)
- epatch_user
+src_prepare() {
+ default
# For some reasons the polyp/pulse plugin does fail with alsaplayer with a
# failed assert. As the code works just fine with asserts disabled, for now
diff --git a/media-sound/alsa-utils/Manifest b/media-sound/alsa-utils/Manifest
index 2c7456f..ba0d7d3 100644
--- a/media-sound/alsa-utils/Manifest
+++ b/media-sound/alsa-utils/Manifest
@@ -1 +1 @@
-DIST alsa-utils-1.1.0.tar.bz2 1181085 SHA256 3b1c3135b76e14532d3dd23fb15759ddd7daf9ffbc183f7a9a0a3a86374748f1 SHA512 c61f056959feba015bb4a6f49980c4beb6a0c34be09e7196864583897ea86373b593a8807999a07df9c87a3a0c714075b9aae516752e83a946d0d60bc8f90f98 WHIRLPOOL 50d8e1506fb9f969b3dfcd618933efbeda6f938c3350eccf99526fb8329afd1ea4381ff1a548590f0f9bae12bdb63c1e8ab068641743d52b3ba609eae2d337e5
+DIST alsa-utils-1.1.3.tar.bz2 1201424 SHA256 127217a54eea0f9a49700a2f239a2d4f5384aa094d68df04a8eb80132eb6167c SHA512 a0a00578e7f7ed8441628757048412813a0345f0a3f2e085cda7a881ae3c6e22f7cf1e5119f8200e2e4340e42152b91aa5bdc20646b8422adc74ba00e4c59363 WHIRLPOOL 10f1f8f5b7a659dc7ba79c934076eafbbd72f4892b571660a6224fc1061b4e893e2f5a937187a4eb50f2e982c07e097c965a88052451218adcde2e5cd3bfb6f9
diff --git a/media-sound/alsa-utils/alsa-utils-1.1.0.ebuild b/media-sound/alsa-utils/alsa-utils-1.1.3.ebuild
similarity index 86%
rename from media-sound/alsa-utils/alsa-utils-1.1.0.ebuild
rename to media-sound/alsa-utils/alsa-utils-1.1.3.ebuild
index 5ac6bce..55e00b8 100644
--- a/media-sound/alsa-utils/alsa-utils-1.1.0.ebuild
+++ b/media-sound/alsa-utils/alsa-utils-1.1.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -16,18 +16,14 @@
CDEPEND=">=media-libs/alsa-lib-${PV}
libsamplerate? ( media-libs/libsamplerate )
- ncurses? ( >=sys-libs/ncurses-5.7-r7:5= )
- bat? ( sci-libs/fftw )"
+ ncurses? ( >=sys-libs/ncurses-5.7-r7:0= )
+ bat? ( sci-libs/fftw:= )"
DEPEND="${CDEPEND}
virtual/pkgconfig
doc? ( app-text/xmlto )"
RDEPEND="${CDEPEND}
selinux? ( sec-policy/selinux-alsa )"
-src_prepare() {
- epatch_user
-}
-
src_configure() {
local myconf
use doc || myconf='--disable-xmlto'
@@ -40,8 +36,9 @@
$(use_enable nls) \
$(use_enable ncurses alsamixer) \
--disable-alsaconf \
- "$(systemd_with_unitdir)" \
- --with-udev-rules-dir="$(get_udevdir)"/rules.d \
+ --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \
+ --with-udev-rules-dir="${EPREFIX}/$(get_udevdir)"/rules.d \
+ --with-asound-state-dir="${EPREFIX}"/var/lib/alsa \
${myconf}
}
