Added a check for CONFIG_SOUND_PRIME when oss USE flag is enabled.

With kind permission from beandog.
Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

diff --git a/media-sound/alsa-driver/ChangeLog b/media-sound/alsa-driver/ChangeLog
index 80df6222c4af37966081d6a4a94c84268076d272..8515cbd09eb98a4c4e53b70d92dd64ae616066f1 100644 (file)
--- 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/Manifest b/media-sound/alsa-driver/Manifest
index 7d17edae9dcce650d667386fb6dad4edcb74fe82..445f86e360b17e89d25d4ecca8c7fc85a44ff9b2 100644 (file)
--- a/media-sound/alsa-driver/Manifest
+++ b/media-sound/alsa-driver/Manifest
@@ -1,5 +1,5 @@
 DIST alsa-driver-1.0.22.1.tar.bz2 3218678 RMD160 ad139cf0b4769f0a27afd0aa4d91cb808d43a589 SHA1 603f0caff5307c68be4d941c841d892e376e4ae9 SHA256 2c69f4fa72f55e85f32db696f3a6497642ebfe1204ca8f30d328f177176c6782
-EBUILD alsa-driver-1.0.22.1.ebuild 7048 RMD160 97ce819581f538538b1c519f84a2f9781512d046 SHA1 964ac7240345d656e88a606b79f9fb7d6a798a15 SHA256 cc1e4edd3a807c4379ea4514b918ec23fe846e6e8ca0c926f0c6fc3fddfbf3b7
-EBUILD alsa-driver-9999.ebuild 6800 RMD160 88ed11624bd5cdc8ed533c01c2a65b01ee356c7f SHA1 ceb52d29b266f4bc4db9b210321b2ccdee3f9fcb SHA256 407deecff4a3d4c57e248e37be827dc794193866fa81714c4f5170565212d65e
-MISC ChangeLog 52176 RMD160 c905ec53f5ba9d8b5bcf2d3cf5bca474d904d6ab SHA1 9b5e16372e21f99395efd7cf4a80b1d1ddca5ec8 SHA256 3bff40698c92858d55ecab78ea5e472cb7f8f6723fc508d27d22148afb03f9a2
+EBUILD alsa-driver-1.0.22.1.ebuild 7324 RMD160 b8be882eac6bd719de2057d47033d56c1b5be063 SHA1 10d857fd9a56dbb278653fa5f5aa3872a81c568f SHA256 3969466258d9c25fbf67bf6a8d35de2beb45fde1b574e0452655257e360117eb
+EBUILD alsa-driver-9999.ebuild 7076 RMD160 4361e1c76eee86919d67e67ce2ad06f788422690 SHA1 2d5156fd3f443711f78785e169ce232aeace879f SHA256 c73cde9bfb169a1d10381fd3adc3a5c2fe2aad08e1fdb4b76b86d5010b646bff
+MISC ChangeLog 52556 RMD160 09d5dcb0f492d984708c2e0104f52a9881652072 SHA1 ccbe089e395c763fdbfba831d328349db3f2143e SHA256 c56f663155dfa075194776c58c49d059577e80a912322d4fed6900f12ef291e8
 MISC metadata.xml 231 RMD160 24abe9408b4c6e5156b661d0889c57f7b341bd6f SHA1 bac14117a40aabff9dfd27f2a8ff55d9071c8265 SHA256 34105d33263c918eca8ca9f6dc9aeec9008cb2349196d130d77f66610abcf701

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 0db34595442f243071c34331637aedc353e87faf..b7a5780f81330394bdc4a5566e67f746f4fe73bf 100644 (file)
--- 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 8c27e971574547000f85e3e4f2224f041e930379..fdfbe81c0d3cec3576127054639640031d82a4d8 100644 (file)
--- 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