diff options
| author |   Lars Wendler <polynomial-c@gentoo.org> | 2010-04-17 16:46:01 +0000 |
|---|---|---|
| committer | Lars Wendler <polynomial-c@gentoo.org> | 2010-04-17 16:46:01 +0000 |
| commit | 7cb7753d9d8c38c4a5107a6cecbe29cffb76b97e (patch) | |
| tree | 8dff9e0ce6b75f091eb8556d3c692fadef380694 /media-sound/alsa-driver | |
| parent | Add ~arm wrt #300823 (diff) | |
| download | gentoo-2-7cb7753d9d8c38c4a5107a6cecbe29cffb76b97e.tar.gz gentoo-2-7cb7753d9d8c38c4a5107a6cecbe29cffb76b97e.tar.bz2 gentoo-2-7cb7753d9d8c38c4a5107a6cecbe29cffb76b97e.zip | |
Added a check for CONFIG_SOUND_PRIME when oss USE flag is enabled.
With kind permission from beandog.
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'media-sound/alsa-driver')
| -rw-r--r-- | media-sound/alsa-driver/ChangeLog | 9 | ||||
| -rw-r--r-- | media-sound/alsa-driver/alsa-driver-1.0.22.1.ebuild | 7 | ||||
| -rw-r--r-- | media-sound/alsa-driver/alsa-driver-9999.ebuild | 9 |
3 files changed, 21 insertions, 4 deletions
diff --git a/media-sound/alsa-driver/ChangeLog b/media-sound/alsa-driver/ChangeLog index 80df6222c4af..8515cbd09eb9 100644 --- a/media-sound/alsa-driver/ChangeLog +++ b/media-sound/alsa-driver/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for media-sound/alsa-driver # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-driver/ChangeLog,v 1.306 2010/01/07 17:29:20 beandog Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-driver/ChangeLog,v 1.307 2010/04/17 16:46:01 polynomial-c Exp $ + + 17 Apr 2010; Lars Wendler <polynomial-c@gentoo.org> + alsa-driver-1.0.22.1.ebuild, alsa-driver-9999.ebuild: + Having the oss USE flag enabled, compiling alsa-driver against kernel + versions >=2.6.28 results in undefined references when loading the oss + modules. Added a check for CONFIG_SOUND_PRIME being enabled to prevent + this. (With kind permission from beandog) *alsa-driver-1.0.22.1 (07 Jan 2010) diff --git a/media-sound/alsa-driver/alsa-driver-1.0.22.1.ebuild b/media-sound/alsa-driver/alsa-driver-1.0.22.1.ebuild index 0db34595442f..b7a5780f8133 100644 --- a/media-sound/alsa-driver/alsa-driver-1.0.22.1.ebuild +++ b/media-sound/alsa-driver/alsa-driver-1.0.22.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-driver/alsa-driver-1.0.22.1.ebuild,v 1.1 2010/01/07 17:29:20 beandog Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-driver/alsa-driver-1.0.22.1.ebuild,v 1.2 2010/04/17 16:46:01 polynomial-c Exp $ inherit autotools linux-mod flag-o-matic eutils multilib @@ -101,6 +101,11 @@ pkg_setup() { local SOUND_ERROR="Your kernel doesn't have sound support enabled." local SOUND_PRIME_ERROR="Your kernel is configured to use the deprecated OSS drivers. Please disable them and re-emerge alsa-driver." + if use oss && kernel_is -ge 2 6 28 ; then + local CONFIG_CHECK+="SOUND_PRIME" + local SOUND_PRIME_ERROR="You enabled oss USE flag but your kernel's soundcore module lacks support of the proper functions. Please enable CONFIG_SOUND_PRIME and re-emerge alsa-driver." + fi + linux-mod_pkg_setup if [[ ${PROFILE_ARCH} == "sparc64" ]] ; then diff --git a/media-sound/alsa-driver/alsa-driver-9999.ebuild b/media-sound/alsa-driver/alsa-driver-9999.ebuild index 8c27e9715745..fdfbe81c0d3c 100644 --- a/media-sound/alsa-driver/alsa-driver-9999.ebuild +++ b/media-sound/alsa-driver/alsa-driver-9999.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2009 Gentoo Foundation +# Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-driver/alsa-driver-9999.ebuild,v 1.13 2009/08/13 15:11:32 beandog Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-driver/alsa-driver-9999.ebuild,v 1.14 2010/04/17 16:46:01 polynomial-c Exp $ inherit linux-mod flag-o-matic eutils multilib autotools git @@ -90,6 +90,11 @@ pkg_setup() { local SOUND_ERROR="Your kernel doesn't have sound support enabled." local SOUND_PRIME_ERROR="Your kernel is configured to use the deprecated OSS drivers. Please disable them and re-emerge alsa-driver." + if use oss && kernel_is -ge 2 6 28 ; then + local CONFIG_CHECK+="SOUND_PRIME" + local SOUND_PRIME_ERROR="You enabled oss USE flag but your kernel's soundcore module lacks support of the proper functions. Please enable CONFIG_SOUND_PRIME and re-emerge alsa-driver." + fi + linux-mod_pkg_setup if [[ ${PROFILE_ARCH} == "sparc64" ]] ; then |