Merge branch 'org.openembedded.dev' of git@git.openembedded.net:openembedded into org.openembedded.dev

author: Sergey Lapin <slapin@ossfans.org> 2010-02-06 23:12:38 +0300
committer: Sergey Lapin <slapin@ossfans.org> 2010-02-06 23:12:38 +0300
commit: 9dbc3d716405d56def0af95748632035864c07b7 (patch)
tree: 8c2865915bcc385c78a32a1c67398e366fea02ae /recipes/alsa
parent: 029e21c8111deafa850ad1724e48da29c321f2f8 (diff)
parent: 01dcb228756ee2348a8f6257b39d196340b69d96 (diff)
6 files changed, 612 insertions, 8 deletions
diff --git a/recipes/alsa/alsa-lib_1.0.20.bb b/recipes/alsa/alsa-lib_1.0.20.bb
index b21a890fd9..6e61b4040b 100644
--- a/recipes/alsa/alsa-lib_1.0.20.bb
+++ b/recipes/alsa/alsa-lib_1.0.20.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Alsa sound library"
 HOMEPAGE = "http://www.alsa-project.org"
 SECTION = "libs/multimedia"
 LICENSE = "LGPL"
-PR = "r2"
+PR = "r3"
 
 # configure.in sets -D__arm__ on the command line for any arm system
 # (not just those with the ARM instruction set), this should be removed,
@@ -18,7 +18,7 @@ SRC_URI = "ftp://ftp.alsa-project.org/pub/lib/alsa-lib-${PV}.tar.bz2 \
 inherit autotools pkgconfig
 
 
-EXTRA_OECONF = "--with-cards=pdaudiocf --with-oss=yes --disable-python"
+EXTRA_OECONF = "--with-cards=pdaudiocf --with-oss=yes --disable-python --enable-shared --enable-static"
 
 
 require alsa-fpu.inc
@@ -29,10 +29,6 @@ require alsa-versym.inc
 EXTRA_OECONF += "${@get_alsa_versym_setting(bb, d)} "
 
 
-do_stage () {
-	autotools_stage_all
-}
-
 PACKAGES =+ "alsa-server libasound alsa-conf-base alsa-conf alsa-doc alsa-dev"
 FILES_${PN}-dbg += "${libdir}/alsa-lib/*/.debu*"
 FILES_libasound = "${libdir}/libasound.so.*"
diff --git a/recipes/alsa/alsa-scenario_0.2.bb b/recipes/alsa/alsa-scenario_0.2.bb
index 3b4cf79f93..ad0ac2059a 100644
--- a/recipes/alsa/alsa-scenario_0.2.bb
+++ b/recipes/alsa/alsa-scenario_0.2.bb
@@ -7,7 +7,7 @@ DEPENDS = "alsa-lib ncurses"
 PR = "r0"
 PE = "1"
 
-SRC_URI = "http://slimlogic.co.uk/pub/downloads/libscenario/scenario-lib-0.2.0.tar.bz2"
+SRC_URI = "http://sources.slimlogic.co.uk/libscenario/scenario-lib-0.2.0.tar.bz2"
 
 S = "${WORKDIR}/scenario-lib-0.2.0"
 
diff --git a/recipes/alsa/alsa-state.bb b/recipes/alsa/alsa-state.bb
index 39bae169af..d77db707df 100644
--- a/recipes/alsa/alsa-state.bb
+++ b/recipes/alsa/alsa-state.bb
@@ -7,7 +7,7 @@
 DESCRIPTION = "Alsa Scenario Files"
 LICENSE = "MIT"
 PV = "0.2.0"
-PR = "r10"
+PR = "r11"
 
 SRC_URI = "\
   file://asound.conf \
diff --git a/recipes/alsa/alsa-state/at91sam9g45ek/asound.conf b/recipes/alsa/alsa-state/at91sam9g45ek/asound.conf
new file mode 100644
index 0000000000..fa98593515
--- /dev/null
+++ b/recipes/alsa/alsa-state/at91sam9g45ek/asound.conf
@@ -0,0 +1,2 @@
+pcm.!default {  type hw  card 0  }
+ctl.!default {  type hw  card 0  }
diff --git a/recipes/alsa/alsa-state/at91sam9g45ek/asound.state b/recipes/alsa/alsa-state/at91sam9g45ek/asound.state
new file mode 100644
index 0000000000..ee646a1341
--- /dev/null
+++ b/recipes/alsa/alsa-state/at91sam9g45ek/asound.state
@@ -0,0 +1,283 @@
+state.AC97 {
+	control.1 {
+		comment.access 'read write'
+		comment.type BOOLEAN
+		comment.count 2
+		iface MIXER
+		name 'Master Playback Switch'
+		value.0 true
+		value.1 true
+	}
+	control.2 {
+		comment.access 'read write'
+		comment.type INTEGER
+		comment.count 2
+		comment.range '0 - 31'
+		comment.dbmin -4650
+		comment.dbmax 0
+		iface MIXER
+		name 'Master Playback Volume'
+		value.0 22
+		value.1 22
+	}
+	control.3 {
+		comment.access 'read write'
+		comment.type BOOLEAN
+		comment.count 2
+		iface MIXER
+		name 'Headphone Playback Switch'
+		value.0 true
+		value.1 true
+	}
+	control.4 {
+		comment.access 'read write'
+		comment.type INTEGER
+		comment.count 2
+		comment.range '0 - 31'
+		comment.dbmin -4650
+		comment.dbmax 0
+		iface MIXER
+		name 'Headphone Playback Volume'
+		value.0 22
+		value.1 22
+	}
+	control.5 {
+		comment.access 'read write'
+		comment.type BOOLEAN
+		comment.count 1
+		iface MIXER
+		name 'Master Mono Playback Switch'
+		value false
+	}
+	control.6 {
+		comment.access 'read write'
+		comment.type INTEGER
+		comment.count 1
+		comment.range '0 - 31'
+		comment.dbmin -4650
+		comment.dbmax 0
+		iface MIXER
+		name 'Master Mono Playback Volume'
+		value 0
+	}
+	control.7 {
+		comment.access 'read write'
+		comment.type BOOLEAN
+		comment.count 1
+		iface MIXER
+		name 'Phone Playback Switch'
+		value false
+	}
+	control.8 {
+		comment.access 'read write'
+		comment.type INTEGER
+		comment.count 1
+		comment.range '0 - 31'
+		comment.dbmin -3450
+		comment.dbmax 1200
+		iface MIXER
+		name 'Phone Playback Volume'
+		value 0
+	}
+	control.9 {
+		comment.access 'read write'
+		comment.type BOOLEAN
+		comment.count 1
+		iface MIXER
+		name 'Mic Playback Switch'
+		value false
+	}
+	control.10 {
+		comment.access 'read write'
+		comment.type INTEGER
+		comment.count 1
+		comment.range '0 - 31'
+		comment.dbmin -3450
+		comment.dbmax 1200
+		iface MIXER
+		name 'Mic Playback Volume'
+		value 0
+	}
+	control.11 {
+		comment.access 'read write'
+		comment.type BOOLEAN
+		comment.count 1
+		iface MIXER
+		name 'Mic Boost (+20dB)'
+		value false
+	}
+	control.12 {
+		comment.access 'read write'
+		comment.type BOOLEAN
+		comment.count 2
+		iface MIXER
+		name 'Line Playback Switch'
+		value.0 false
+		value.1 false
+	}
+	control.13 {
+		comment.access 'read write'
+		comment.type INTEGER
+		comment.count 2
+		comment.range '0 - 31'
+		comment.dbmin -3450
+		comment.dbmax 1200
+		iface MIXER
+		name 'Line Playback Volume'
+		value.0 0
+		value.1 0
+	}
+	control.14 {
+		comment.access 'read write'
+		comment.type BOOLEAN
+		comment.count 2
+		iface MIXER
+		name 'CD Playback Switch'
+		value.0 false
+		value.1 false
+	}
+	control.15 {
+		comment.access 'read write'
+		comment.type INTEGER
+		comment.count 2
+		comment.range '0 - 31'
+		comment.dbmin -3450
+		comment.dbmax 1200
+		iface MIXER
+		name 'CD Playback Volume'
+		value.0 0
+		value.1 0
+	}
+	control.16 {
+		comment.access 'read write'
+		comment.type BOOLEAN
+		comment.count 2
+		iface MIXER
+		name 'Aux Playback Switch'
+		value.0 false
+		value.1 false
+	}
+	control.17 {
+		comment.access 'read write'
+		comment.type INTEGER
+		comment.count 2
+		comment.range '0 - 31'
+		comment.dbmin -3450
+		comment.dbmax 1200
+		iface MIXER
+		name 'Aux Playback Volume'
+		value.0 0
+		value.1 0
+	}
+	control.18 {
+		comment.access 'read write'
+		comment.type BOOLEAN
+		comment.count 2
+		iface MIXER
+		name 'PCM Playback Switch'
+		value.0 true
+		value.1 true
+	}
+	control.19 {
+		comment.access 'read write'
+		comment.type INTEGER
+		comment.count 2
+		comment.range '0 - 31'
+		comment.dbmin -3450
+		comment.dbmax 1200
+		iface MIXER
+		name 'PCM Playback Volume'
+		value.0 22
+		value.1 22
+	}
+	control.20 {
+		comment.access 'read write'
+		comment.type ENUMERATED
+		comment.count 2
+		comment.item.0 Mic
+		comment.item.1 CD
+		comment.item.2 Video
+		comment.item.3 Aux
+		comment.item.4 Line
+		comment.item.5 Mix
+		comment.item.6 'Mix Mono'
+		comment.item.7 Phone
+		iface MIXER
+		name 'Capture Source'
+		value.0 Mic
+		value.1 Mic
+	}
+	control.21 {
+		comment.access 'read write'
+		comment.type BOOLEAN
+		comment.count 2
+		iface MIXER
+		name 'Capture Switch'
+		value.0 true
+		value.1 true
+	}
+	control.22 {
+		comment.access 'read write'
+		comment.type INTEGER
+		comment.count 2
+		comment.range '0 - 15'
+		comment.dbmin 0
+		comment.dbmax 2250
+		iface MIXER
+		name 'Capture Volume'
+		value.0 11
+		value.1 11
+	}
+	control.23 {
+		comment.access 'read write'
+		comment.type ENUMERATED
+		comment.count 1
+		comment.item.0 Mix
+		comment.item.1 Mic
+		iface MIXER
+		name 'Mono Output Select'
+		value Mix
+	}
+	control.24 {
+		comment.access 'read write'
+		comment.type ENUMERATED
+		comment.count 1
+		comment.item.0 Mic1
+		comment.item.1 Mic2
+		iface MIXER
+		name 'Mic Select'
+		value Mic1
+	}
+	control.25 {
+		comment.access 'read write'
+		comment.type BOOLEAN
+		comment.count 1
+		iface MIXER
+		name 'Stereo Mic'
+		value false
+	}
+	control.26 {
+		comment.access 'read write'
+		comment.type BOOLEAN
+		comment.count 1
+		iface MIXER
+		name 'Headphone Jack Sense'
+		value false
+	}
+	control.27 {
+		comment.access 'read write'
+		comment.type BOOLEAN
+		comment.count 1
+		iface MIXER
+		name 'Line Jack Sense'
+		value false
+	}
+	control.28 {
+		comment.access 'read write'
+		comment.type BOOLEAN
+		comment.count 1
+		iface MIXER
+		name 'External Amplifier'
+		value true
+	}
+}
diff --git a/recipes/alsa/alsa-state/omap3-touchbook/asound.state b/recipes/alsa/alsa-state/omap3-touchbook/asound.state
new file mode 100644
index 0000000000..d0e048db51
--- /dev/null
+++ b/recipes/alsa/alsa-state/omap3-touchbook/asound.state
@@ -0,0 +1,323 @@
+state.omap3beagle {
+	control.1 {
+		comment.access 'read write'
+		comment.type INTEGER
+		comment.count 2
+		comment.range '0 - 63'
+		comment.dbmin -6300
+		comment.dbmax 0
+		iface MIXER
+		name 'DAC1 Digital Fine Playback Volume'
+		value.0 0
+		value.1 0
+	}
+	control.2 {
+		comment.access 'read write'
+		comment.type INTEGER
+		comment.count 2
+		comment.range '0 - 63'
+		comment.dbmin -6300
+		comment.dbmax 0
+		iface MIXER
+		name 'DAC2 Digital Fine Playback Volume'
+		value.0 63
+		value.1 63
+	}
+	control.3 {
+		comment.access 'read write'
+		comment.type INTEGER
+		comment.count 2
+		comment.range '0 - 2'
+		comment.dbmin 0
+		comment.dbmax 1200
+		iface MIXER
+		name 'DAC1 Digital Coarse Playback Volume'
+		value.0 0
+		value.1 0
+	}
+	control.4 {
+		comment.access 'read write'
+		comment.type INTEGER
+		comment.count 2
+		comment.range '0 - 2'
+		comment.dbmin 0
+		comment.dbmax 1200
+		iface MIXER
+		name 'DAC2 Digital Coarse Playback Volume'
+		value.0 2
+		value.1 2
+	}
+	control.5 {
+		comment.access 'read write'
+		comment.type INTEGER
+		comment.count 2
+		comment.range '0 - 18'
+		comment.dbmin -2400
+		comment.dbmax 1200
+		iface MIXER
+		name 'DAC1 Analog Playback Volume'
+		value.0 0
+		value.1 0
+	}
+	control.6 {
+		comment.access 'read write'
+		comment.type INTEGER
+		comment.count 2
+		comment.range '0 - 18'
+		comment.dbmin -2400
+		comment.dbmax 1200
+		iface MIXER
+		name 'DAC2 Analog Playback Volume'
+		value.0 12
+		value.1 12
+	}
+	control.7 {
+		comment.access 'read write'
+		comment.type BOOLEAN
+		comment.count 2
+		iface MIXER
+		name 'DAC1 Analog Playback Switch'
+		value.0 false
+		value.1 false
+	}
+	control.8 {
+		comment.access 'read write'
+		comment.type BOOLEAN
+		comment.count 2
+		iface MIXER
+		name 'DAC2 Analog Playback Switch'
+		value.0 true
+		value.1 true
+	}
+	control.9 {
+		comment.access 'read write'
+		comment.type INTEGER
+		comment.count 2
+		comment.range '0 - 3'
+		comment.dbmin -1200
+		comment.dbmax 600
+		iface MIXER
+		name 'PreDriv Playback Volume'
+		value.0 0
+		value.1 0
+	}
+	control.10 {
+		comment.access 'read write'
+		comment.type INTEGER
+		comment.count 2
+		comment.range '0 - 3'
+		comment.dbmin -1200
+		comment.dbmax 600
+		iface MIXER
+		name 'Headset Playback Volume'
+		value.0 2
+		value.1 2
+	}
+	control.11 {
+		comment.access 'read write'
+		comment.type INTEGER
+		comment.count 2
+		comment.range '0 - 3'
+		comment.dbmin -1200
+		comment.dbmax 600
+		iface MIXER
+		name 'Carkit Playback Volume'
+		value.0 0
+		value.1 0
+	}
+	control.12 {
+		comment.access 'read write'
+		comment.type INTEGER
+		comment.count 1
+		comment.range '0 - 3'
+		comment.dbmin -1200
+		comment.dbmax 600
+		iface MIXER
+		name 'Earpiece Playback Volume'
+		value 0
+	}
+	control.13 {
+		comment.access 'read write'
+		comment.type INTEGER
+		comment.count 2
+		comment.range '0 - 31'
+		comment.dbmin 0
+		comment.dbmax 3100
+		iface MIXER
+		name 'TX1 Digital Capture Volume'
+		value.0 12
+		value.1 12
+	}
+	control.14 {
+		comment.access 'read write'
+		comment.type INTEGER
+		comment.count 2
+		comment.range '0 - 31'
+		comment.dbmin 0
+		comment.dbmax 3100
+		iface MIXER
+		name 'TX2 Digital Capture Volume'
+		value.0 0
+		value.1 0
+	}
+	control.15 {
+		comment.access 'read write'
+		comment.type INTEGER
+		comment.count 2
+		comment.range '0 - 5'
+		comment.dbmin 0
+		comment.dbmax 3000
+		iface MIXER
+		name 'Analog Capture Volume'
+		value.0 0
+		value.1 0
+	}
+	control.16 {
+		comment.access 'read write'
+		comment.type ENUMERATED
+		comment.count 1
+		comment.item.0 Off
+		comment.item.1 'Sub mic'
+		comment.item.2 AUXR
+		iface MIXER
+		name 'Analog Right Capture Route'
+		value AUXR
+	}
+	control.17 {
+		comment.access 'read write'
+		comment.type ENUMERATED
+		comment.count 1
+		comment.item.0 Off
+		comment.item.1 'Main mic'
+		comment.item.2 'Headset mic'
+		comment.item.3 AUXL
+		comment.item.4 'Carkit mic'
+		iface MIXER
+		name 'Analog Left Capture Route'
+		value AUXL
+	}
+	control.18 {
+		comment.access 'read write'
+		comment.type ENUMERATED
+		comment.count 1
+		comment.item.0 Analog
+		comment.item.1 Digimic1
+		iface MIXER
+		name 'TX2 Capture Route'
+		value Analog
+	}
+	control.19 {
+		comment.access 'read write'
+		comment.type ENUMERATED
+		comment.count 1
+		comment.item.0 Analog
+		comment.item.1 Digimic0
+		iface MIXER
+		name 'TX1 Capture Route'
+		value Analog
+	}
+	control.20 {
+		comment.access 'read write'
+		comment.type ENUMERATED
+		comment.count 1
+		comment.item.0 Voice
+		comment.item.1 DACR1
+		comment.item.2 DACR2
+		comment.item.3 DACL2
+		iface MIXER
+		name 'HandsfreeR Mux'
+		value DACR2
+	}
+	control.21 {
+		comment.access 'read write'
+		comment.type ENUMERATED
+		comment.count 1
+		comment.item.0 Voice
+		comment.item.1 DACL1
+		comment.item.2 DACL2
+		comment.item.3 DACR2
+		iface MIXER
+		name 'HandsfreeL Mux'
+		value DACL2
+	}
+	control.22 {
+		comment.access 'read write'
+		comment.type ENUMERATED
+		comment.count 1
+		comment.item.0 Off
+		comment.item.1 DACR1
+		comment.item.2 DACR2
+		iface MIXER
+		name 'CarkitR Mux'
+		value Off
+	}
+	control.23 {
+		comment.access 'read write'
+		comment.type ENUMERATED
+		comment.count 1
+		comment.item.0 Off
+		comment.item.1 DACL1
+		comment.item.2 DACL2
+		iface MIXER
+		name 'CarkitL Mux'
+		value Off
+	}
+	control.24 {
+		comment.access 'read write'
+		comment.type ENUMERATED
+		comment.count 1
+		comment.item.0 Off
+		comment.item.1 DACR1
+		comment.item.2 DACR2
+		iface MIXER
+		name 'HeadsetR Mux'
+		value DACR2
+	}
+	control.25 {
+		comment.access 'read write'
+		comment.type ENUMERATED
+		comment.count 1
+		comment.item.0 Off
+		comment.item.1 DACL1
+		comment.item.2 DACL2
+		iface MIXER
+		name 'HeadsetL Mux'
+		value DACL2
+	}
+	control.26 {
+		comment.access 'read write'
+		comment.type ENUMERATED
+		comment.count 1
+		comment.item.0 Off
+		comment.item.1 DACR1
+		comment.item.2 DACR2
+		comment.item.3 DACL2
+		iface MIXER
+		name 'PredriveR Mux'
+		value Off
+	}
+	control.27 {
+		comment.access 'read write'
+		comment.type ENUMERATED
+		comment.count 1
+		comment.item.0 Off
+		comment.item.1 DACL1
+		comment.item.2 DACL2
+		comment.item.3 DACR2
+		iface MIXER
+		name 'PredriveL Mux'
+		value Off
+	}
+	control.28 {
+		comment.access 'read write'
+		comment.type ENUMERATED
+		comment.count 1
+		comment.item.0 Off
+		comment.item.1 DACL1
+		comment.item.2 DACL2
+		comment.item.3 DACR1
+		iface MIXER
+		name 'Earpiece Mux'
+		value Off
+	}
+}
author	Sergey Lapin <slapin@ossfans.org>	2010-02-06 23:12:38 +0300
committer	Sergey Lapin <slapin@ossfans.org>	2010-02-06 23:12:38 +0300
commit	9dbc3d716405d56def0af95748632035864c07b7 (patch)
tree	8c2865915bcc385c78a32a1c67398e366fea02ae /recipes/alsa
parent	029e21c8111deafa850ad1724e48da29c321f2f8 (diff)
parent	01dcb228756ee2348a8f6257b39d196340b69d96 (diff)