From a08d438956aa4aea02544035828e3e03b501f3f1 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Wed, 11 Jun 2008 15:30:32 +0000 Subject: alsa-plugins 1.0.14 update to 1.0.15 --- packages/alsa/alsa-plugins_1.0.14.bb | 20 -------------------- packages/alsa/alsa-plugins_1.0.15.bb | 20 ++++++++++++++++++++ 2 files changed, 20 insertions(+), 20 deletions(-) delete mode 100644 packages/alsa/alsa-plugins_1.0.14.bb create mode 100644 packages/alsa/alsa-plugins_1.0.15.bb (limited to 'packages/alsa') diff --git a/packages/alsa/alsa-plugins_1.0.14.bb b/packages/alsa/alsa-plugins_1.0.14.bb deleted file mode 100644 index b17a3265e8..0000000000 --- a/packages/alsa/alsa-plugins_1.0.14.bb +++ /dev/null @@ -1,20 +0,0 @@ -DESCRIPTION = "ALSA Plugins" -HOMEPAGE = "http://www.alsa-project.org" -SECTION = "multimedia/alsa/plugins" -LICENSE = "GPL" -DEPENDS = "alsa-lib pulseaudio" -PR = "r0" - -SRC_URI = "ftp://ftp.alsa-project.org/pub/plugins/alsa-plugins-${PV}.tar.bz2" - -inherit autotools - -PACKAGES_DYNAMIC = "libasound-module*" - -python populate_packages_prepend() { - plugindir = bb.data.expand('${libdir}/alsa-lib/', d) - do_split_packages(d, plugindir, '^libasound_module_(.*)\.so$', 'libasound-module-%s', 'Alsa plugin for %s', extra_depends='' ) -} - -FILES_${PN}-dev += "${libdir}/alsa-lib/libasound*.a ${libdir}/alsa-lib/libasound*.la" -FILES_${PN}-dbg += "${libdir}/alsa-lib/.debug" diff --git a/packages/alsa/alsa-plugins_1.0.15.bb b/packages/alsa/alsa-plugins_1.0.15.bb new file mode 100644 index 0000000000..b17a3265e8 --- /dev/null +++ b/packages/alsa/alsa-plugins_1.0.15.bb @@ -0,0 +1,20 @@ +DESCRIPTION = "ALSA Plugins" +HOMEPAGE = "http://www.alsa-project.org" +SECTION = "multimedia/alsa/plugins" +LICENSE = "GPL" +DEPENDS = "alsa-lib pulseaudio" +PR = "r0" + +SRC_URI = "ftp://ftp.alsa-project.org/pub/plugins/alsa-plugins-${PV}.tar.bz2" + +inherit autotools + +PACKAGES_DYNAMIC = "libasound-module*" + +python populate_packages_prepend() { + plugindir = bb.data.expand('${libdir}/alsa-lib/', d) + do_split_packages(d, plugindir, '^libasound_module_(.*)\.so$', 'libasound-module-%s', 'Alsa plugin for %s', extra_depends='' ) +} + +FILES_${PN}-dev += "${libdir}/alsa-lib/libasound*.a ${libdir}/alsa-lib/libasound*.la" +FILES_${PN}-dbg += "${libdir}/alsa-lib/.debug" -- cgit v1.2.3 From 4ef1e4c6f9fd31ca96541afb09ae4f6d63f3957c Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Wed, 11 Jun 2008 15:31:56 +0000 Subject: alsa-state: fix standard alsa dmix configuration, it now works out-of-the-box --- packages/alsa/alsa-state.bb | 17 ++++++++++------- packages/alsa/alsa-state/asound.conf | 12 ++++++++++++ packages/alsa/alsa-state/asoundrc | 12 ------------ 3 files changed, 22 insertions(+), 19 deletions(-) create mode 100644 packages/alsa/alsa-state/asound.conf delete mode 100644 packages/alsa/alsa-state/asoundrc (limited to 'packages/alsa') diff --git a/packages/alsa/alsa-state.bb b/packages/alsa/alsa-state.bb index b9eb1431b4..83a9ca6ccd 100644 --- a/packages/alsa/alsa-state.bb +++ b/packages/alsa/alsa-state.bb @@ -10,13 +10,13 @@ RRECOMMENDS_alsa-state = "alsa-states" RRECOMMENDS_${PN}_om-gta01 = "openmoko-alsa-scenarios" RRECOMMENDS_${PN}_om-gta02 = "openmoko-alsa-scenarios" PV = "0.1.0" -PR = "r17" +PR = "r18" -SRC_URI = " \ - file://asoundrc \ +SRC_URI = "\ + file://asound.conf \ file://asound.state \ - file://alsa-state " - + file://alsa-state \ +" inherit update-rc.d @@ -32,8 +32,12 @@ do_install() { } PACKAGES += "alsa-states" -FILES_${PN} = "${sysconfdir}/init.d ${sysconfdir}/asoundrc" + +FILES_${PN} = "${sysconfdir}/init.d ${sysconfdir}/asound.conf" +CONFFILES_${PN} = "${sysconfdir}/asound.conf" + FILES_alsa-states = "${sysconfdir}/*.state" + PACKAGE_ARCH_${PN} = "all" PACKAGE_ARCH_alsa-states = "${MACHINE_ARCH}" @@ -46,4 +50,3 @@ pkg_postinst_${PN}() { fi fi } - diff --git a/packages/alsa/alsa-state/asound.conf b/packages/alsa/alsa-state/asound.conf new file mode 100644 index 0000000000..6be024201c --- /dev/null +++ b/packages/alsa/alsa-state/asound.conf @@ -0,0 +1,12 @@ +# default dmix configuration + +pcm.!default { + type plug + slave.pcm "dmix" +} + +ctl.mixer0 { + type hw + card 0 +} + diff --git a/packages/alsa/alsa-state/asoundrc b/packages/alsa/alsa-state/asoundrc deleted file mode 100644 index bc038e3e73..0000000000 --- a/packages/alsa/alsa-state/asoundrc +++ /dev/null @@ -1,12 +0,0 @@ -# -# simple dmix configuration -# -pcm.dsp0 { - type plug - slave.pcm "dmix" -} - -ctl.mixer0 { - type hw - card 0 -} -- cgit v1.2.3 From 530971b6de0c825c418cfb194dc5b8cd9b2c5d87 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Wed, 11 Jun 2008 15:43:57 +0000 Subject: alsa-state: install correct file --- packages/alsa/alsa-state.bb | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'packages/alsa') diff --git a/packages/alsa/alsa-state.bb b/packages/alsa/alsa-state.bb index 83a9ca6ccd..58c724f79c 100644 --- a/packages/alsa/alsa-state.bb +++ b/packages/alsa/alsa-state.bb @@ -6,9 +6,6 @@ DESCRIPTION = "Default ALSA configuration" LICENSE = "GPL" -RRECOMMENDS_alsa-state = "alsa-states" -RRECOMMENDS_${PN}_om-gta01 = "openmoko-alsa-scenarios" -RRECOMMENDS_${PN}_om-gta02 = "openmoko-alsa-scenarios" PV = "0.1.0" PR = "r18" @@ -27,12 +24,16 @@ do_install() { install -d ${D}${sysconfdir}/init.d install -m 0755 ${WORKDIR}/alsa-state ${D}${sysconfdir}/init.d - install -m 0644 ${WORKDIR}/asoundrc ${D}${sysconfdir} + install -m 0644 ${WORKDIR}/asound.conf ${D}${sysconfdir} install -m 0644 ${WORKDIR}/*.state ${D}${sysconfdir} } PACKAGES += "alsa-states" +RRECOMMENDS_alsa-state = "alsa-states" +RRECOMMENDS_${PN}_om-gta01 = "openmoko-alsa-scenarios" +RRECOMMENDS_${PN}_om-gta02 = "openmoko-alsa-scenarios" + FILES_${PN} = "${sysconfdir}/init.d ${sysconfdir}/asound.conf" CONFFILES_${PN} = "${sysconfdir}/asound.conf" -- cgit v1.2.3