[oe-commits] Michael 'Mickey' Lauer : fsodeviced: disable support for libcanberra, which seldomly builds these days.

[git version control]

Module: openembedded.git
Branch: testing-next
Commit: 1b3a22200a3ea913d1766144d35b60cf70cf64dc
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=1b3a22200a3ea913d1766144d35b60cf70cf64dc

Author: Michael 'Mickey' Lauer <mickey at vanille-media.de>
Date:   Tue Dec 28 01:16:56 2010 +0100

fsodeviced: disable support for libcanberra, which seldomly builds these days.

---

 recipes/freesmartphone/fsodeviced_git.bb |   13 +++++++------
 1 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/recipes/freesmartphone/fsodeviced_git.bb b/recipes/freesmartphone/fsodeviced_git.bb
index 33f58d3..240794b 100644
--- a/recipes/freesmartphone/fsodeviced_git.bb
+++ b/recipes/freesmartphone/fsodeviced_git.bb
@@ -1,19 +1,16 @@
 require cornucopia.inc
 inherit fso-plugin
 
-DEPENDS += "alsa-lib libcanberra libfsoresource android-rpc i2c-tools"
-RDEPENDS_${PN} += "libcanberra-alsa"
-# Included in fsodeviced itself now
-# RRECOMMENDS_${PN} += "fso-alsa-data"
+DEPENDS += "alsa-lib libfsoresource android-rpc i2c-tools"
 RPROVIDES_${PN} = "openmoko-alsa-scenarios virtual/alsa-scenarios"
 SRCREV = "${FSO_CORNUCOPIA_SRCREV}"
 PV = "0.9.4+gitr${SRCPV}"
 PE = "2"
-PR = "${INC_PR}.18"
+PR = "${INC_PR}.19"
 
 EXTRA_OECONF = "\
   --enable-kernel26-rfkill \
-  --enable-player-canberra \
+  --disable-player-canberra \
   --enable-htcdream-powercontrol \
 "
 
@@ -24,6 +21,10 @@ INITSCRIPT_PARAMS = "defaults 27"
 
 SRC_URI += "file://fsodeviced"
 
+do_configure_prepend() {
+	install ${STAGING_INCDIR}/linux/i2c-dev-user.h ${STAGING_INCDIR}/linux/i2c-dev.h
+}
+
 CONFFILES_${PN} = "${sysconfdir}/freesmartphone/conf/openmoko_gta/fsodeviced.conf \
                    ${sysconfdir}/freesmartphone/conf/palm_pre/fsodeviced.conf \
                    ${sysconfdir}/freesmartphone/conf/htc_qualcomm_dream/fsodeviced.conf \