From: Roy Marples Date: Thu, 15 Mar 2007 11:33:25 +0000 (+0000) Subject: Fix init script to work with snd-card-x alias, #171009. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=a355299513105af29d2f0ec69e35a1ddfdf5cf01;p=gentoo.git Fix init script to work with snd-card-x alias, #171009. Package-Manager: portage-2.1.2.2 --- diff --git a/media-sound/alsa-utils/ChangeLog b/media-sound/alsa-utils/ChangeLog index 45903ed4ef19..69f231013f2c 100644 --- a/media-sound/alsa-utils/ChangeLog +++ b/media-sound/alsa-utils/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for media-sound/alsa-utils # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/ChangeLog,v 1.198 2007/03/14 13:55:13 uberlord Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/ChangeLog,v 1.199 2007/03/15 11:33:25 uberlord Exp $ + +*alsa-utils-1.0.14_rc2-r3 (15 Mar 2007) + + 15 Mar 2007; Roy Marples files/alsasound.initd, + +alsa-utils-1.0.14_rc2-r3.ebuild: + Fix init script to work with snd-card-x alias, #171009. 14 Mar 2007; Roy Marples files/alsasound.initd: Typo, #170586 thanks to Patrice Beaud. diff --git a/media-sound/alsa-utils/Manifest b/media-sound/alsa-utils/Manifest index 7f0dc47e8d20..d52e33337227 100644 --- a/media-sound/alsa-utils/Manifest +++ b/media-sound/alsa-utils/Manifest @@ -26,10 +26,10 @@ AUX alsasound.confd 515 RMD160 16ab3f3d931436947172da8efa656d6af1635049 SHA1 6d5 MD5 f4f492c382b243ebf558809a372fd6b7 files/alsasound.confd 515 RMD160 16ab3f3d931436947172da8efa656d6af1635049 files/alsasound.confd 515 SHA256 01f2c85c61cd9b40124945f31ece9ecabc3aefe3c57c53dd3c1eda994e2c2827 files/alsasound.confd 515 -AUX alsasound.initd 6306 RMD160 31e3c347f0c1bdcc3c014d76ebb1e8564b4ac28f SHA1 66d21083f5b12f28f23cb51a7783b85d00edace2 SHA256 b717dd0cbf3f1cc4461729f4285a02eca995a0033bda0bc5f19a90cbb25d456b -MD5 95eda53eeb772419090b698b9daca920 files/alsasound.initd 6306 -RMD160 31e3c347f0c1bdcc3c014d76ebb1e8564b4ac28f files/alsasound.initd 6306 -SHA256 b717dd0cbf3f1cc4461729f4285a02eca995a0033bda0bc5f19a90cbb25d456b files/alsasound.initd 6306 +AUX alsasound.initd 6307 RMD160 26b864db6784bfeb839fb834f3c02d751ff7437b SHA1 67110d5751413cb449cb1b59654ecff58ecaeba0 SHA256 efb2b0564adae0453ea97430321dc05b73e88ae7e014a390bc417beae62268d6 +MD5 6721b6281e809273195d3295727c2708 files/alsasound.initd 6307 +RMD160 26b864db6784bfeb839fb834f3c02d751ff7437b files/alsasound.initd 6307 +SHA256 efb2b0564adae0453ea97430321dc05b73e88ae7e014a390bc417beae62268d6 files/alsasound.initd 6307 DIST alsa-utils-1.0.11.tar.bz2 990018 RMD160 17da9d3743a70352ae448569fbeb2f2aab3e78b0 SHA1 abc890763afb5c4e9d5a3b4a1649a0145368d389 SHA256 4b33229437ddab4196b8fd0bdfaf074314185a5afd3e24bbe28025022b42d01b DIST alsa-utils-1.0.12.tar.bz2 979797 RMD160 26ff9d4fed31bdecbfeb65b09ef52c05aecba733 SHA1 ea43e407ae50ec50a00679d79c86909f895f632c SHA256 a2fb425ee6b824f2442d38ce14ce630ae8332b1f4a6eeb45bee1c0cafac725a8 DIST alsa-utils-1.0.13.tar.bz2 980874 RMD160 2a3cd882543232f81e211d216c9e8112da3f8977 SHA1 05b460a0e7ae6519ea37240476f026b59dbc710d SHA256 d7fe8a7995bc74331c89fbc1937a0682d239339d6659a402cd7b8e4b96c050f0 @@ -59,14 +59,18 @@ EBUILD alsa-utils-1.0.14_rc2-r2.ebuild 2262 RMD160 9af437a34ecd98401cb123a914c74 MD5 69bd13f88bcb92a2d494cdc205ec1307 alsa-utils-1.0.14_rc2-r2.ebuild 2262 RMD160 9af437a34ecd98401cb123a914c745c0ef83bb50 alsa-utils-1.0.14_rc2-r2.ebuild 2262 SHA256 faf54c74838c0b3df94e7c35873f4338a51cccea53970620fc0ea22c2f876342 alsa-utils-1.0.14_rc2-r2.ebuild 2262 +EBUILD alsa-utils-1.0.14_rc2-r3.ebuild 2262 RMD160 660f2deafa53e4efbcc9f7ac3260fb16cef93d33 SHA1 3b5d0b7cb996a0ab07f95a4c43ef65972e50081d SHA256 21f0ccd2850daa9efb4487dd445bfb1a862dc3a6a5d320deccd088de75606e86 +MD5 572dbfc6e08eb338c075b38ff25eaa2a alsa-utils-1.0.14_rc2-r3.ebuild 2262 +RMD160 660f2deafa53e4efbcc9f7ac3260fb16cef93d33 alsa-utils-1.0.14_rc2-r3.ebuild 2262 +SHA256 21f0ccd2850daa9efb4487dd445bfb1a862dc3a6a5d320deccd088de75606e86 alsa-utils-1.0.14_rc2-r3.ebuild 2262 EBUILD alsa-utils-1.0.14_rc2.ebuild 3025 RMD160 0fdafd51671c8b60e0fed78adac5d197677ddca3 SHA1 5e90bd71552166f5e12db46324ac988386923789 SHA256 3b36bd45c61657c96f82f168f299ce6c754abbb16a213dfa94325209896bd2ef MD5 5ccd9fda3711bbbc3c718c5b1a0b3830 alsa-utils-1.0.14_rc2.ebuild 3025 RMD160 0fdafd51671c8b60e0fed78adac5d197677ddca3 alsa-utils-1.0.14_rc2.ebuild 3025 SHA256 3b36bd45c61657c96f82f168f299ce6c754abbb16a213dfa94325209896bd2ef alsa-utils-1.0.14_rc2.ebuild 3025 -MISC ChangeLog 29753 RMD160 41c6ccc9f50e44d9e1df54f326fcb4a4e9149163 SHA1 5c1c131c8f2f0cfc0baed57b293cd612a7541cde SHA256 c3c7934b1d4bcf235d7183d46585f8b4cf7fc2c457f0803e98df9c319a364c58 -MD5 39a208a6f669a40de1dd2b94dd6db7af ChangeLog 29753 -RMD160 41c6ccc9f50e44d9e1df54f326fcb4a4e9149163 ChangeLog 29753 -SHA256 c3c7934b1d4bcf235d7183d46585f8b4cf7fc2c457f0803e98df9c319a364c58 ChangeLog 29753 +MISC ChangeLog 29961 RMD160 0760ad731d5ea5a371a005f30da8722432acc7bd SHA1 eaf7e2ffbfec08733c4a92d82d521fe2bc829a8c SHA256 1f0762787d87134034924ca96598f924f33a16ef922fcf486d0452663957ea63 +MD5 49e2a83fc8cf6d045795906ad9c75181 ChangeLog 29961 +RMD160 0760ad731d5ea5a371a005f30da8722432acc7bd ChangeLog 29961 +SHA256 1f0762787d87134034924ca96598f924f33a16ef922fcf486d0452663957ea63 ChangeLog 29961 MISC metadata.xml 220 RMD160 e49f8bb330d1798cd2c8ee5335cef1784f0d7ccb SHA1 1b895fe6cae4b8eab08ba1a6a1212baf4b4b4105 SHA256 8570ef11cd59b0d8edb71e78eecaec423616836b10eacb86bee0de941f0ae054 MD5 7c52acc7d4fe40bac97d3198a43dcbd6 metadata.xml 220 RMD160 e49f8bb330d1798cd2c8ee5335cef1784f0d7ccb metadata.xml 220 @@ -92,3 +96,6 @@ SHA256 262613d1f667889dbf9295f128b935e0d7de80b17279b01972d952071279f785 files/di MD5 353bea327d899275d0d9c7addde48a99 files/digest-alsa-utils-1.0.14_rc2-r2 265 RMD160 fb49ddc8d34d96b51008565f020638b4dc742958 files/digest-alsa-utils-1.0.14_rc2-r2 265 SHA256 262613d1f667889dbf9295f128b935e0d7de80b17279b01972d952071279f785 files/digest-alsa-utils-1.0.14_rc2-r2 265 +MD5 353bea327d899275d0d9c7addde48a99 files/digest-alsa-utils-1.0.14_rc2-r3 265 +RMD160 fb49ddc8d34d96b51008565f020638b4dc742958 files/digest-alsa-utils-1.0.14_rc2-r3 265 +SHA256 262613d1f667889dbf9295f128b935e0d7de80b17279b01972d952071279f785 files/digest-alsa-utils-1.0.14_rc2-r3 265 diff --git a/media-sound/alsa-utils/alsa-utils-1.0.14_rc2-r3.ebuild b/media-sound/alsa-utils/alsa-utils-1.0.14_rc2-r3.ebuild new file mode 100644 index 000000000000..579937ae5340 --- /dev/null +++ b/media-sound/alsa-utils/alsa-utils-1.0.14_rc2-r3.ebuild @@ -0,0 +1,86 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/alsa-utils-1.0.14_rc2-r3.ebuild,v 1.1 2007/03/15 11:33:25 uberlord Exp $ + +WANT_AUTOMAKE="latest" +WANT_AUTOCONF="latest" + +inherit eutils autotools + +MY_P="${P/_rc/rc}" + +DESCRIPTION="Advanced Linux Sound Architecture Utils (alsactl, alsamixer, etc.)" +HOMEPAGE="http://www.alsa-project.org/" +SRC_URI="mirror://alsaproject/utils/${MY_P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0.9" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86" +IUSE="nls midi" + +DEPEND=">=sys-libs/ncurses-5.1 + dev-util/dialog + >=media-libs/alsa-lib-1.0.14_rc1" +RDEPEND="${DEPEND} + virtual/modutils + sys-apps/pciutils" + +S="${WORKDIR}/${MY_P}" + +pkg_setup() { + if use midi && ! built_with_use --missing true media-libs/alsa-lib midi; then + eerror "" + eerror "To be able to build alsa-utils with midi support you need" + eerror "to have built media-libs/alsa-lib with midi USE flag." + die "Missing midi USE flag on media-libs/alsa-lib" + fi +} + +src_unpack() { + unpack ${A} + cd "${S}" + + epatch "${FILESDIR}/${PN}-1.0.11_rc2-nls.patch" + epatch "${FILESDIR}/${PN}-1.0.11_rc5-alsaconf-redirect.patch" + epatch "${FILESDIR}/${P}-seq.patch" + + AT_M4DIR="m4" eautoreconf +} + +src_compile() { + econf \ + $(use_enable nls) \ + $(use_enable midi sequencer) \ + || die "configure failed" + + emake || die "make failed" +} + +src_install() { + local ALSA_UTILS_DOCS="ChangeLog README TODO + seq/aconnect/README.aconnect + seq/aseqnet/README.aseqnet" + + emake DESTDIR="${D}" install || die "Installation Failed" + + dodoc ${ALSA_UTILS_DOCS} + newdoc alsamixer/README README.alsamixer + + newinitd "${FILESDIR}/alsasound.initd" alsasound + newconfd "${FILESDIR}/alsasound.confd" alsasound + insinto /etc/modules.d + newins "${FILESDIR}/alsa-modules.conf-rc" alsa + + keepdir /var/lib/alsa +} + +pkg_postinst() { + echo + elog "To take advantage of the init script, and automate the process of" + elog "loading and unloading the ALSA sound drivers as well as" + elog "storing and restoring sound-card mixer levels you should" + elog "add alsasound to the boot runlevel. You can do this as" + elog "root like so:" + elog " # rc-update add alsasound boot" + echo +} diff --git a/media-sound/alsa-utils/files/alsasound.initd b/media-sound/alsa-utils/files/alsasound.initd index 6192164d4abd..5e6dbfb15e9f 100644 --- a/media-sound/alsa-utils/files/alsasound.initd +++ b/media-sound/alsa-utils/files/alsasound.initd @@ -1,5 +1,5 @@ #!/sbin/runscript -# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/files/alsasound.initd,v 1.2 2007/03/14 13:55:13 uberlord Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/files/alsasound.initd,v 1.3 2007/03/15 11:33:25 uberlord Exp $ # Copyright 2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 @@ -15,7 +15,7 @@ depend() { load_modules() { # List of drivers for each card. - local DRIVERS="$(modprobe -c | sed -n -e 's/^alias \(snd-card-[[:digit:]]+\) .*/\1/p')" + local DRIVERS="$(modprobe -c | sed -n -e 's/^alias \(snd-card-[[:digit:]]\+\) .*/\1/p')" # Fall back on the automated aliases if we don't have ALSA configured properly... if [ -z "${DRIVERS}" ] && \ diff --git a/media-sound/alsa-utils/files/digest-alsa-utils-1.0.14_rc2-r3 b/media-sound/alsa-utils/files/digest-alsa-utils-1.0.14_rc2-r3 new file mode 100644 index 000000000000..8db4c3f3529e --- /dev/null +++ b/media-sound/alsa-utils/files/digest-alsa-utils-1.0.14_rc2-r3 @@ -0,0 +1,3 @@ +MD5 7e9f132b34b7773d2a29b0ff14719a49 alsa-utils-1.0.14rc2.tar.bz2 981123 +RMD160 9975bc5c71df585ad1818647a1abb2be68910403 alsa-utils-1.0.14rc2.tar.bz2 981123 +SHA256 306bd7c4436c1c56a0a499317e23b5b58aea3718df17c138ab0df56fd9bf3e0c alsa-utils-1.0.14rc2.tar.bz2 981123