From f79c0a1b387e882f65c813d430c1ba1fe22e21ad Mon Sep 17 00:00:00 2001 From: Dominik Kapusta Date: Sat, 21 Nov 2009 12:49:21 +0000 Subject: Updated init_default patch (bug #281538). Thanks to Michał Guminiak (michal.guminiak@gmail.com) for reporting. Package-Manager: portage-2.2_rc50/cvs/Linux x86_64 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- media-sound/alsa-utils/ChangeLog | 9 ++- media-sound/alsa-utils/Manifest | 16 +++- media-sound/alsa-utils/alsa-utils-1.0.21-r1.ebuild | 93 ++++++++++++++++++++++ media-sound/alsa-utils/alsa-utils-1.0.21.ebuild | 93 ---------------------- .../files/alsa-utils-1.0.21-init_default.patch | 38 ++++++++- 5 files changed, 151 insertions(+), 98 deletions(-) create mode 100644 media-sound/alsa-utils/alsa-utils-1.0.21-r1.ebuild delete mode 100644 media-sound/alsa-utils/alsa-utils-1.0.21.ebuild (limited to 'media-sound/alsa-utils') diff --git a/media-sound/alsa-utils/ChangeLog b/media-sound/alsa-utils/ChangeLog index 6d33085bdcc5..d408c0a6c15b 100644 --- a/media-sound/alsa-utils/ChangeLog +++ b/media-sound/alsa-utils/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for media-sound/alsa-utils # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/ChangeLog,v 1.283 2009/10/13 17:51:35 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/ChangeLog,v 1.284 2009/11/21 12:49:21 ayoy Exp $ + +*alsa-utils-1.0.21-r1 (21 Nov 2009) + + 21 Nov 2009; Dominik Kapusta -alsa-utils-1.0.21.ebuild, + +alsa-utils-1.0.21-r1.ebuild, files/alsa-utils-1.0.21-init_default.patch: + Updated init_default patch (bug #281538). Thanks to Michał Guminiak + (michal.guminiak@gmail.com) for reporting. 13 Oct 2009; Raúl Porcel alsa-utils-1.0.20-r5.ebuild: diff --git a/media-sound/alsa-utils/Manifest b/media-sound/alsa-utils/Manifest index fae29e0fb6a8..8372fd673ade 100644 --- a/media-sound/alsa-utils/Manifest +++ b/media-sound/alsa-utils/Manifest @@ -1,3 +1,6 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + AUX alsa-modules.conf-rc 1028 RMD160 8e115310eb0e13e08b21304c98a78e721be0029a SHA1 7a2b5fed91fa640894efaf2f557eb2b04aff1a40 SHA256 6060c101ca0793ea80e2b6b5bb8d6b118325092788ff26f07c280dd1ff546570 AUX alsa-utils-1.0.11_rc2-nls.patch 1212 RMD160 a83b1c634b5dd589cc0b119329453576f5995691 SHA1 4074ab6478a890052ff627f296a9310be9c839bb SHA256 ce3630efbed0cd3b3fea3a4e012e9d24f8a1f01a44d759fb5ad7bc9f6a96b7b2 AUX alsa-utils-1.0.11_rc5-alsaconf-redirect.patch 1283 RMD160 9bd58de0ab10c6ea8a7b310759b5b99c80681bf4 SHA1 cf3cd67c492e5c69e78e34c6a8fdfebdd84639df SHA256 8a28d91e9b6092c5f71a45bf40a9dc710fa1f305ee0738d16070eedfcb480511 @@ -5,7 +8,7 @@ AUX alsa-utils-1.0.14-alsaconf-modules-update.patch 1337 RMD160 9910bf0845f27960 AUX alsa-utils-1.0.17-seq.patch 1633 RMD160 8363501d3b7a52d95105cf43cb2b9cccf380f112 SHA1 29a69aa7bd8cc08a1d369ff0e16700d5c613a86e SHA256 a9c2df9b16c9907c4388513739db939ffe31a49b61e3c5d93b4b8c1bf3038e78 AUX alsa-utils-1.0.20-init_default.patch 811 RMD160 851dcc7c4b17ae703adc5e1eb82c1ee839d3a3e1 SHA1 8171fc924abdb2a1179d56d2100b5474ddcfd35d SHA256 f10e23e5f8cdb29039cabef9a97804db81841bee245bc632ee9940516640cf1d AUX alsa-utils-1.0.20-modprobe.d.patch 501 RMD160 4b2aa8676fc23b029a66e8a699be5f811c7c932c SHA1 4598144173d13e02be8727e17098c4b0c8fa8bc6 SHA256 f7d3a49f26995118d22c2c06383da59a649030a938dd25911ac074f5bb7a1c3d -AUX alsa-utils-1.0.21-init_default.patch 811 RMD160 46846a644677bdda54cef7252a48e927c9d9a5ea SHA1 df35ff13fd89c280d0f44866515c2127992da12a SHA256 3f16ebe7b29ade4a7c6a7fdd26d2ff1e5a82636cb8284a405e5434e727584eb8 +AUX alsa-utils-1.0.21-init_default.patch 3023 RMD160 b9cd2707fac2958b86c98c84b3aa99f014cc9317 SHA1 e337319d9c0ee61327b5a01993da76c016cd3be7 SHA256 36545d8e6c80a65bcf07f2d80ccbb3f05b7670e7c2705133c124dbced29c7e9b AUX alsa-utils-1.0.21-modprobe.d.patch 501 RMD160 072188940d24966698fd9b488a13eead2d8d114d SHA1 c1097f57094559512b974f705918a07d4e232d11 SHA256 a39df3d44dadfd0469e4d0dca836b1db38e06b8cbbf68ca33e368188f1b45c96 AUX alsasound-1.0.19-r1.initd 6868 RMD160 9e7e9ac4a2c2e98def8c1e5498bb6631fd269a9d SHA1 c5a716afde0da422d7d3a3160f5a21024f7ea660 SHA256 b9d53242b7aae9b6517677b65ff4d9412fb347769adc8f9efb7d902b28731130 AUX alsasound-1.0.19.confd 1012 RMD160 42d0abf97bb01236bcfb7f1cf758696844550a84 SHA1 d0b1ae65379cb8f54a9dc1b9bed9229c5cd9c187 SHA256 3740d675d0c403530a71813472332decbfe9620545e4c248511cacd89b85f35b @@ -20,6 +23,13 @@ DIST alsa-utils-1.0.21.tar.bz2 1074700 RMD160 48f7221de6d665f38b4e3cb84c3bd971c2 EBUILD alsa-utils-1.0.17.ebuild 2370 RMD160 bc00bdcbcb81cd9f09e62bfffc10f557a953bd32 SHA1 a77ec0421c845d32f85e5d1434c450e2f6bc3d88 SHA256 705e05b8aa3bff1fab0389c505d3a6f2f8377167f65b65f6935d3ab2a53a32ba EBUILD alsa-utils-1.0.19-r2.ebuild 2644 RMD160 72373a4a4b98a16ddbcd796c0dde96c9091a05cb SHA1 ddbfc63ba4ff40eb83209e283da1acb01b5722c8 SHA256 fa2ef7d7646155d2d5283f1b826136b61a94585b8ebe3240e4bad0f018c446ed EBUILD alsa-utils-1.0.20-r5.ebuild 2776 RMD160 42eb94cec24c47722d674261e6c2c3325b97e6fb SHA1 c87c64d77daf8d9ec06492780a8a6cfeed583151 SHA256 f3974908123c3cb93be8677c9ec1132a4a9309530f43c474feb747f72aef7e73 -EBUILD alsa-utils-1.0.21.ebuild 2735 RMD160 0a2021c6f37a4b32217a7f0de3a74a534af7db66 SHA1 5e59fa0a0e64e22c911ec89b3d33fc62fc567f57 SHA256 82b404b29ee37308338e78c2f280c5b2d1a767faede2d0fbb6d6a8e9c81616d2 -MISC ChangeLog 43262 RMD160 00ff472eb3bc4d75a679fb86f75f570e8365bf1c SHA1 8b21306dfdbd96d4891b53b5e8a840f6ad3aff4a SHA256 f26668923d4879c3e41f42881718d69bc7a0046577a1317b1b344879c8e7d01b +EBUILD alsa-utils-1.0.21-r1.ebuild 2734 RMD160 6a0fdd148c6ee2285aa0a9bfec987f9654e91298 SHA1 d0eb5dc2af74541aac6234480fed01b3443a7510 SHA256 50bc84393c65d667b9fe4f9151e5e0b960a4504369f98591a7fc20ee0299f8e3 +MISC ChangeLog 43565 RMD160 b18a423d8aac05de3ea1f60760979cf6d7ef4a9f SHA1 4c1053d8c10d4cd1660c3774f2e9639a6649c8c2 SHA256 7aa263598404f5e6cf3b8ee7f787be3c285f3a7d43ed2a3c2cc39d6fe4747c5c MISC metadata.xml 230 RMD160 fa99b07bbc82d3dde53c4bb732ec862ee8fc6bb5 SHA1 1337d895713f767f43778dce0b300da5bf852d80 SHA256 1f81ba2d193a0ca53dcedb87b01a28851a9d7b14d77db3b2c2647330f4ba6f00 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.13 (GNU/Linux) + +iEYEARECAAYFAksH4dsACgkQ+CZEqwt+F6bGJgCeId3SbU8kGDWUDG5rhs9cZLM9 +hNwAnA9YfLFVJ72zLw5lmNUqADpj5b6X +=64y7 +-----END PGP SIGNATURE----- diff --git a/media-sound/alsa-utils/alsa-utils-1.0.21-r1.ebuild b/media-sound/alsa-utils/alsa-utils-1.0.21-r1.ebuild new file mode 100644 index 000000000000..d687e4db3387 --- /dev/null +++ b/media-sound/alsa-utils/alsa-utils-1.0.21-r1.ebuild @@ -0,0 +1,93 @@ +# Copyright 1999-2009 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.21-r1.ebuild,v 1.1 2009/11/21 12:49:21 ayoy Exp $ + +EAPI=2 +inherit eutils + +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="doc nls minimal" + +DEPEND=">=sys-libs/ncurses-5.1 + dev-util/dialog + >=media-libs/alsa-lib-${PV} + doc? ( app-text/xmlto )" +RDEPEND=">=sys-libs/ncurses-5.1 + dev-util/dialog + >=media-libs/alsa-lib-${PV} + virtual/modutils + !minimal? ( sys-apps/pciutils )" + +S=${WORKDIR}/${MY_P} + +pkg_setup() { + if [[ -e "${ROOT}etc/modules.d/alsa" ]]; then + eerror "Obsolete config /etc/modules.d/alsa found." + die "Move /etc/modules.d/alsa to /etc/modprobe.d/alsa.conf." + fi + + if [[ -e "${ROOT}etc/modprobe.d/alsa" ]]; then + eerror "Obsolete config /etc/modprobe.d/alsa found." + die "Move /etc/modprobe.d/alsa to /etc/modprobe.d/alsa.conf." + fi +} + +src_prepare() { + epatch "${FILESDIR}"/${P}-modprobe.d.patch \ + "${FILESDIR}"/${P}-init_default.patch +} + +src_configure() { + local myconf="" + use doc || myconf="--disable-xmlto" + + econf ${myconf} \ + $(use_enable nls) +} + +src_install() { + local ALSA_UTILS_DOCS="ChangeLog README TODO + seq/aconnect/README.aconnect + seq/aseqnet/README.aseqnet" + + emake DESTDIR="${D}" install || die "emake install failed" + + dodoc ${ALSA_UTILS_DOCS} || die + + newinitd "${FILESDIR}/alsasound.initd-r4" alsasound + newconfd "${FILESDIR}/alsasound.confd-r3" alsasound + insinto /etc/modprobe.d + newins "${FILESDIR}/alsa-modules.conf-rc" alsa.conf + + keepdir /var/lib/alsa +} + +pkg_postinst() { + echo + elog "To take advantage of the init script, and automate the process of" + elog "saving 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 + elog "The script will load ALSA modules, if you choose to use a modular" + elog "configuration. The Gentoo ALSA developers recommend you to build" + elog "your audio drivers into the kernel unless the device is hotpluggable" + elog "or you need to supply specific options (such as model= to HD Audio)." + echo + ewarn "Automated unloading of ALSA modules is deprecated and unsupported." + ewarn "Should you choose to use it, bug reports will not be accepted." + echo + if use minimal; then + ewarn "The minimal use flag disables the dependency on pciutils that" + ewarn "is needed by alsaconf at runtime." + fi +} diff --git a/media-sound/alsa-utils/alsa-utils-1.0.21.ebuild b/media-sound/alsa-utils/alsa-utils-1.0.21.ebuild deleted file mode 100644 index f8b45a429d3d..000000000000 --- a/media-sound/alsa-utils/alsa-utils-1.0.21.ebuild +++ /dev/null @@ -1,93 +0,0 @@ -# Copyright 1999-2009 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.21.ebuild,v 1.1 2009/08/31 15:45:43 chainsaw Exp $ - -EAPI=2 -inherit eutils - -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="doc nls minimal" - -DEPEND=">=sys-libs/ncurses-5.1 - dev-util/dialog - >=media-libs/alsa-lib-${PV} - doc? ( app-text/xmlto )" -RDEPEND=">=sys-libs/ncurses-5.1 - dev-util/dialog - >=media-libs/alsa-lib-${PV} - virtual/modutils - !minimal? ( sys-apps/pciutils )" - -S=${WORKDIR}/${MY_P} - -pkg_setup() { - if [[ -e "${ROOT}etc/modules.d/alsa" ]]; then - eerror "Obsolete config /etc/modules.d/alsa found." - die "Move /etc/modules.d/alsa to /etc/modprobe.d/alsa.conf." - fi - - if [[ -e "${ROOT}etc/modprobe.d/alsa" ]]; then - eerror "Obsolete config /etc/modprobe.d/alsa found." - die "Move /etc/modprobe.d/alsa to /etc/modprobe.d/alsa.conf." - fi -} - -src_prepare() { - epatch "${FILESDIR}"/${P}-modprobe.d.patch \ - "${FILESDIR}"/${P}-init_default.patch -} - -src_configure() { - local myconf="" - use doc || myconf="--disable-xmlto" - - econf ${myconf} \ - $(use_enable nls) -} - -src_install() { - local ALSA_UTILS_DOCS="ChangeLog README TODO - seq/aconnect/README.aconnect - seq/aseqnet/README.aseqnet" - - emake DESTDIR="${D}" install || die "emake install failed" - - dodoc ${ALSA_UTILS_DOCS} || die - - newinitd "${FILESDIR}/alsasound.initd-r4" alsasound - newconfd "${FILESDIR}/alsasound.confd-r3" alsasound - insinto /etc/modprobe.d - newins "${FILESDIR}/alsa-modules.conf-rc" alsa.conf - - keepdir /var/lib/alsa -} - -pkg_postinst() { - echo - elog "To take advantage of the init script, and automate the process of" - elog "saving 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 - elog "The script will load ALSA modules, if you choose to use a modular" - elog "configuration. The Gentoo ALSA developers recommend you to build" - elog "your audio drivers into the kernel unless the device is hotpluggable" - elog "or you need to supply specific options (such as model= to HD Audio)." - echo - ewarn "Automated unloading of ALSA modules is deprecated and unsupported." - ewarn "Should you choose to use it, bug reports will not be accepted." - echo - if use minimal; then - ewarn "The minimal use flag disables the dependency on pciutils that" - ewarn "is needed by alsaconf at runtime." - fi -} diff --git a/media-sound/alsa-utils/files/alsa-utils-1.0.21-init_default.patch b/media-sound/alsa-utils/files/alsa-utils-1.0.21-init_default.patch index 4127f184116d..f6564b95906a 100644 --- a/media-sound/alsa-utils/files/alsa-utils-1.0.21-init_default.patch +++ b/media-sound/alsa-utils/files/alsa-utils-1.0.21-init_default.patch @@ -1,8 +1,17 @@ diff -ur alsa-utils-1.0.21.orig/alsactl/init/default alsa-utils-1.0.21/alsactl/init/default --- alsa-utils-1.0.21.orig/alsactl/init/default 2009-05-06 10:07:24.000000000 +0300 +++ alsa-utils-1.0.21/alsactl/init/default 2009-08-17 22:29:46.000000000 +0300 +@@ -39,7 +39,7 @@ + CTL{name}="Front Playback Volume",PROGRAM!="__ctl_search",GOTO="front0_end" + # if master volume control is present, turn front volume to max + ENV{has_pmaster_vol}=="true",CTL{values}="0dB",RESULT=="0",GOTO="front0_end" +-ENV{has_pmaster_vol}=="true",CTL{values)="100%",GOTO="front0_end" ++ENV{has_pmaster_vol}=="true",CTL{values}="100%",GOTO="front0_end" + CTL{values}="$env{pvolume}",RESULT!="0",CTL{values}="$env{ppercent}" + LABEL="front0_end" + CTL{name}="Front Playback Switch",PROGRAM=="__ctl_search", \ @@ -49,7 +49,7 @@ - CTL{name}="Headphone Playback Volume",PROGRAM=="__ctl_search",GOTO="headphone0_end" + CTL{name}="Headphone Playback Volume",PROGRAM!="__ctl_search",GOTO="headphone0_end" # if master volume control is present, turn headphone volume to max ENV{has_pmaster_vol}=="true",CTL{values}="0dB",RESULT=="0",GOTO="headphone0_end" -ENV{has_pmaster_vol}=="true",CTL{values)="100%",GOTO="headphone0_end" @@ -10,3 +19,30 @@ diff -ur alsa-utils-1.0.21.orig/alsactl/init/default alsa-utils-1.0.21/alsactl/i CTL{values}="$env{pvolume}",RESULT!="0",CTL{values}="$env{ppercent}" LABEL="headphone0_end" CTL{name}="Headphone Playback Switch",PROGRAM=="__ctl_search", \ +@@ -72,7 +72,7 @@ + CTL{name}="PCM Volume",PROGRAM!="__ctl_search", GOTO="pcm0_end" + # if master volume control is present, turn PCM volume to max + ENV{has_pmaster_vol}=="true",CTL{values}="0dB",RESULT=="0",GOTO="pcm0_end" +-ENV{has_pmaster_vol}=="true",CTL{values)="100%",GOTO="pcm0_end" ++ENV{has_pmaster_vol}=="true",CTL{values}="100%",GOTO="pcm0_end" + # exception - some HDA codecs have shifted dB range + CTL{dBmin}=="-34.50dB",CTL{dBmax}=="12.00dB",CTL{values}="0dB",GOTO="pcm0_end" + CTL{dBmin}=="-30.00dB",CTL{dBmax}=="0dB",CTL{values}="0dB",GOTO="pcm0_end" +@@ -86,7 +86,7 @@ + CTL{name}="PCM Volume",PROGRAM!="__ctl_search",GOTO="pcm1_end" + # if master volume control is present, turn PCM volume to max + ENV{has_pmaster_vol}=="true",CTL{values}="0dB",RESULT=="0",GOTO="pcm1_end" +-ENV{has_pmaster_vol}=="true",CTL{values)="100%",GOTO="pcm1_end" ++ENV{has_pmaster_vol}=="true",CTL{values}="100%",GOTO="pcm1_end" + # exception - some HDA codecs have shifted dB range + CTL{dBmin}=="-34.50dB",CTL{dBmax}=="12.00dB",CTL{values}="0dB",GOTO="pcm1_end" + CTL{dBmin}=="-30.00dB",CTL{dBmax}=="0dB",CTL{values}="0dB",GOTO="pcm1_end" +@@ -125,7 +125,7 @@ + CTL{name}="CD Playback Volume",PROGRAM!="__ctl_search", GOTO="cd0_end" + # if master volume control is present, turn CD volume to max + ENV{has_pmaster_vol}=="true",CTL{values}="0dB",RESULT=="0",GOTO="cd0_end" +-ENV{has_pmaster_vol}=="true",CTL{values)="100%",GOTO="cd0_end" ++ENV{has_pmaster_vol}=="true",CTL{values}="100%",GOTO="cd0_end" + # exception - some HDA codecs have shifted dB range + CTL{dBmin}=="-34.50dB",CTL{dBmax}=="12.00dB",CTL{values}="0dB",GOTO="cd0_end" + CTL{dBmin}=="-30.00dB",CTL{dBmax}=="0dB",CTL{values}="0dB",GOTO="cd0_end" -- cgit v1.2.3-65-gdbad