[oe-commits] Michael 'Mickey' Lauer : libascenario-data: this no longer exists; move to fso-alsa-data
git version control
git at git.openembedded.org
Tue Jun 23 17:32:21 UTC 2009
Module: openembedded.git
Branch: fso/milestone5.5
Commit: 83c3b73767896ef913c7c75317ab7e8032213590
URL: http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=83c3b73767896ef913c7c75317ab7e8032213590
Author: Michael 'Mickey' Lauer <mickey at vanille-media.de>
Date: Tue Jun 23 17:31:26 2009 +0000
libascenario-data: this no longer exists; move to fso-alsa-data
libascenario: remove custom version which is deprecated; fso is using also directly now
---
recipes/alsa/libascenario-data.bb | 22 --------
.../alsa/libascenario-data/om-gta02/default.conf | 51 --------------------
recipes/alsa/libascenario_git.bb | 12 -----
recipes/freesmartphone/fso-alsa-data.bb | 21 ++++++++
.../fso-alsa-data}/default.conf | 0
.../fso-alsa-data/om-gta02/default.conf | 21 ++++++++
.../fso-alsa-data}/om-gta02/default/capturehandset | 0
.../fso-alsa-data}/om-gta02/default/gsmbluetooth | 0
.../fso-alsa-data}/om-gta02/default/gsmhandset | 0
.../fso-alsa-data}/om-gta02/default/gsmheadset | 0
.../fso-alsa-data}/om-gta02/default/gsmspeaker | 0
.../fso-alsa-data}/om-gta02/default/headset | 0
.../fso-alsa-data}/om-gta02/default/stereoout | 0
.../fso-alsa-data}/om-gta02/default/voiphandset | 0
14 files changed, 42 insertions(+), 85 deletions(-)
diff --git a/recipes/alsa/libascenario-data.bb b/recipes/alsa/libascenario-data.bb
deleted file mode 100644
index 5f1d928..0000000
--- a/recipes/alsa/libascenario-data.bb
+++ /dev/null
@@ -1,22 +0,0 @@
-DESCRIPTION = "libascenario data files"
-LICENSE = "MIT"
-PV = "0.1.0"
-PR = "r0"
-
-SRC_URI = "\
- file://default \
- file://default.conf \
-"
-
-do_install() {
- install -d ${D}${sysconfdir}/alsa/scenario/default/
- # master conf
- install -m 0644 ${WORKDIR}/default.conf ${D}${sysconfdir}/alsa/scenario/
- # scenarii
- install -m 0644 ${WORKDIR}/default/* ${D}${sysconfdir}/alsa/scenario/default/
-}
-
-FILES_${PN} = "\
- ${sysconfdir} \
-"
-PACKAGE_ARCH_${PN} = "all"
diff --git a/recipes/alsa/libascenario-data/om-gta02/default.conf b/recipes/alsa/libascenario-data/om-gta02/default.conf
deleted file mode 100644
index 3d779be..0000000
--- a/recipes/alsa/libascenario-data/om-gta02/default.conf
+++ /dev/null
@@ -1,51 +0,0 @@
-#
-# Master configuration file
-#
-
-Section "Scenario"
-
-# scenario unique name (mandatory)
- Identifier = "playback speaker"
-
-# scenario file name (mandatory)
- File = "stereoout"
-
-# scenario audio quality of service (optional) - HIFI, VOICE or SYSTEM
- QoS = HIFI
-
-# alias for master playback volume (optional)
- MasterPlaybackVolume = 8
-
-# alias for master playback switch (optional)
- MasterPlaybackSwitch = 2
-
-# alias for master capture volume (optional)
- MasterCaptureVolume = 3
-
-# alias for master capture switch (optional)
- MasterCaptureSwitch = 4
-EndSection
-
-Section "Scenario"
-
-# scenario unique name (mandatory)
- Identifier = "gsm handset"
-
-# scenario file name (mandatory)
- File = "gsmhandset"
-
-# scenario audio quality of service (optional) - HIFI, VOICE or SYSTEM
- QoS = VOICE
-
-# alias for master playback volume (optional)
- MasterPlaybackVolume = 1
-
-# alias for master playback switch (optional)
- MasterPlaybackSwitch = 2
-
-# alias for master capture volume (optional)
- MasterCaptureVolume = 3
-
-# alias for master capture switch (optional)
- MasterCaptureSwitch = 4
-EndSection
diff --git a/recipes/alsa/libascenario_git.bb b/recipes/alsa/libascenario_git.bb
deleted file mode 100644
index 27d6f44..0000000
--- a/recipes/alsa/libascenario_git.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-DESCRIPTION = "ALSA Scenario Library"
-HOMEPAGE = "http://opensource.wolfsonmicro.com/node/22"
-SECTION = "console/utils"
-LICENSE = "GPL"
-DEPENDS = "alsa-lib ncurses"
-PV = "0.1+gitr${SRCREV}"
-PR = "r0"
-
-SRC_URI = "${FREESMARTPHONE_GIT}/alsa-scenario;branch=mickey;protocol=git"
-S = "${WORKDIR}/git"
-
-inherit autotools autotools_stage lib_package
diff --git a/recipes/freesmartphone/fso-alsa-data.bb b/recipes/freesmartphone/fso-alsa-data.bb
new file mode 100644
index 0000000..e25c0a0
--- /dev/null
+++ b/recipes/freesmartphone/fso-alsa-data.bb
@@ -0,0 +1,21 @@
+DESCRIPTION = "freesmartphone.org Alsa data files"
+LICENSE = "MIT"
+PV = "0.1.0"
+PR = "r0"
+
+SRC_URI = "\
+ file://default \
+ file://default.conf \
+"
+
+do_install() {
+ install -d ${D}${sysconfdir}/freesmartphone/alsa/default/
+ # master conf
+ install -m 0644 ${WORKDIR}/default.conf ${D}${sysconfdir}/freesmartphone/alsa/
+ # scenarii
+ install -m 0644 ${WORKDIR}/default/* ${D}${sysconfdir}/freesmartphone/alsa/default/
+}
+
+FILES_${PN} = "\
+ ${sysconfdir} \
+"
diff --git a/recipes/alsa/libascenario-data/default.conf b/recipes/freesmartphone/fso-alsa-data/default.conf
similarity index 100%
rename from recipes/alsa/libascenario-data/default.conf
rename to recipes/freesmartphone/fso-alsa-data/default.conf
diff --git a/recipes/freesmartphone/fso-alsa-data/om-gta02/default.conf b/recipes/freesmartphone/fso-alsa-data/om-gta02/default.conf
new file mode 100644
index 0000000..b64f70f
--- /dev/null
+++ b/recipes/freesmartphone/fso-alsa-data/om-gta02/default.conf
@@ -0,0 +1,21 @@
+[alsa]
+cardname = default
+default = scenario.stereoout
+
+# GSM
+[scenario.voiphandset]
+
+[scenario.gsmspeaker]
+
+[scenario.gsmheadset]
+
+[scenario.gsmhandset]
+
+[scenario.gsmbluetooth]
+
+[scenario.capturehandset]
+
+# PCM
+[scenario.stereoout]
+
+[scenario.headset]
diff --git a/recipes/alsa/libascenario-data/om-gta02/default/capturehandset b/recipes/freesmartphone/fso-alsa-data/om-gta02/default/capturehandset
similarity index 100%
rename from recipes/alsa/libascenario-data/om-gta02/default/capturehandset
rename to recipes/freesmartphone/fso-alsa-data/om-gta02/default/capturehandset
diff --git a/recipes/alsa/libascenario-data/om-gta02/default/gsmbluetooth b/recipes/freesmartphone/fso-alsa-data/om-gta02/default/gsmbluetooth
similarity index 100%
rename from recipes/alsa/libascenario-data/om-gta02/default/gsmbluetooth
rename to recipes/freesmartphone/fso-alsa-data/om-gta02/default/gsmbluetooth
diff --git a/recipes/alsa/libascenario-data/om-gta02/default/gsmhandset b/recipes/freesmartphone/fso-alsa-data/om-gta02/default/gsmhandset
similarity index 100%
rename from recipes/alsa/libascenario-data/om-gta02/default/gsmhandset
rename to recipes/freesmartphone/fso-alsa-data/om-gta02/default/gsmhandset
diff --git a/recipes/alsa/libascenario-data/om-gta02/default/gsmheadset b/recipes/freesmartphone/fso-alsa-data/om-gta02/default/gsmheadset
similarity index 100%
rename from recipes/alsa/libascenario-data/om-gta02/default/gsmheadset
rename to recipes/freesmartphone/fso-alsa-data/om-gta02/default/gsmheadset
diff --git a/recipes/alsa/libascenario-data/om-gta02/default/gsmspeaker b/recipes/freesmartphone/fso-alsa-data/om-gta02/default/gsmspeaker
similarity index 100%
rename from recipes/alsa/libascenario-data/om-gta02/default/gsmspeaker
rename to recipes/freesmartphone/fso-alsa-data/om-gta02/default/gsmspeaker
diff --git a/recipes/alsa/libascenario-data/om-gta02/default/headset b/recipes/freesmartphone/fso-alsa-data/om-gta02/default/headset
similarity index 100%
rename from recipes/alsa/libascenario-data/om-gta02/default/headset
rename to recipes/freesmartphone/fso-alsa-data/om-gta02/default/headset
diff --git a/recipes/alsa/libascenario-data/om-gta02/default/stereoout b/recipes/freesmartphone/fso-alsa-data/om-gta02/default/stereoout
similarity index 100%
rename from recipes/alsa/libascenario-data/om-gta02/default/stereoout
rename to recipes/freesmartphone/fso-alsa-data/om-gta02/default/stereoout
diff --git a/recipes/alsa/libascenario-data/om-gta02/default/voiphandset b/recipes/freesmartphone/fso-alsa-data/om-gta02/default/voiphandset
similarity index 100%
rename from recipes/alsa/libascenario-data/om-gta02/default/voiphandset
rename to recipes/freesmartphone/fso-alsa-data/om-gta02/default/voiphandset
More information about the Openembedded-commits
mailing list