[oe-commits] org.oe.dev merge of '23094adbbe1c0cf4e6533536f3d839d77e1e5bbf'

[koen commit]

merge of '23094adbbe1c0cf4e6533536f3d839d77e1e5bbf'
     and 'e52349bdf770c1441b7661f55056b3cf08ffe21e'

Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: 6ff295c2536e27dfcb4ab565a0592a3dc502d6aa
ViewMTN: http://monotone.openembedded.org/revision/info/6ff295c2536e27dfcb4ab565a0592a3dc502d6aa
Files:
1
packages/freesmartphone/python-odeviced/om-gta02/odeviced.conf
packages/freesmartphone/python-odeviced_git.bb
packages/pulseaudio/files/asound.conf.pulseaudio
packages/pulseaudio/pulseaudio-alsa-wrapper.bb
packages/pulseaudio/pulseaudio-esd-wrapper.bb
Diffs:

#
# mt diff -r23094adbbe1c0cf4e6533536f3d839d77e1e5bbf -r6ff295c2536e27dfcb4ab565a0592a3dc502d6aa
#
#
#
# patch "packages/freesmartphone/python-odeviced/om-gta02/odeviced.conf"
#  from [179c3301212831f33f0c97e3e9c466096c39a089]
#    to [658db2f7fe7fe3928fc05e76a952a169b2bc9c64]
# 
# patch "packages/freesmartphone/python-odeviced_git.bb"
#  from [2fca36542c50c1867791e83a4f116efc030620da]
#    to [058d736d2d8da41e108a100d7bcccaa361930c1a]
#
============================================================
--- packages/freesmartphone/python-odeviced/om-gta02/odeviced.conf	179c3301212831f33f0c97e3e9c466096c39a089
+++ packages/freesmartphone/python-odeviced/om-gta02/odeviced.conf	658db2f7fe7fe3928fc05e76a952a169b2bc9c64
@@ -2,3 +2,7 @@ ignoreinput=2,3
 # don't read from accellerometers for now
 ignoreinput=2,3
 
+[input]
+# don't read from accellerometers for now
+ignoreinput=2,3
+
============================================================
--- packages/freesmartphone/python-odeviced_git.bb	2fca36542c50c1867791e83a4f116efc030620da
+++ packages/freesmartphone/python-odeviced_git.bb	058d736d2d8da41e108a100d7bcccaa361930c1a
@@ -5,7 +5,7 @@ PV = "0.7.9+gitr${SRCREV}"
 DEPENDS = "python-cython-native python-pyrex-native"
 LICENSE = "GPLv2"
 PV = "0.7.9+gitr${SRCREV}"
-PR = "r1"
+PR = "r2"
 
 inherit distutils update-rc.d
 


#
# mt diff -re52349bdf770c1441b7661f55056b3cf08ffe21e -r6ff295c2536e27dfcb4ab565a0592a3dc502d6aa
#
#
#
# add_file "packages/pulseaudio/files/asound.conf.pulseaudio"
#  content [d9ce0ae70c1436009981ecb4aa61e90b5cd449ac]
# 
# add_file "packages/pulseaudio/pulseaudio-alsa-wrapper.bb"
#  content [3aecd5acd439510c0a240e80a452390e88c5dc1b]
# 
# patch "packages/pulseaudio/pulseaudio-esd-wrapper.bb"
#  from [c0c973abd7c7ed8625a2bd55a37b730dfff842ed]
#    to [fb6267e7ccabe3982c76ff64e11cbc9641bdbb93]
#
============================================================
--- packages/pulseaudio/files/asound.conf.pulseaudio	d9ce0ae70c1436009981ecb4aa61e90b5cd449ac
+++ packages/pulseaudio/files/asound.conf.pulseaudio	d9ce0ae70c1436009981ecb4aa61e90b5cd449ac
@@ -0,0 +1,7 @@
+pcm.pulse {
+    type pulse
+}
+
+ctl.pulse {
+    type pulse
+}
============================================================
--- packages/pulseaudio/pulseaudio-alsa-wrapper.bb	3aecd5acd439510c0a240e80a452390e88c5dc1b
+++ packages/pulseaudio/pulseaudio-alsa-wrapper.bb	3aecd5acd439510c0a240e80a452390e88c5dc1b
@@ -0,0 +1,37 @@
+DESCRIPTION = "Meta package to make alsa transparently use pulseaudio"
+LICENSE = "GPLv2"
+
+SRC_URI = "file://asound.conf.pulseaudio"
+
+RDEPENDS = "hal \
+	pulseaudio-server \
+	pulseaudio-misc \
+	pulseaudio-module-alsa-sink \
+	pulseaudio-module-alsa-source \
+	pulseaudio-module-hal-detect \
+	libasound-module-ctl-pulse \
+	libasound-module-pcm-pulse \
+"
+
+do_install() {
+	install -d ${D}/${sysconfdir}
+	install -m 0644 ${WORKDIR}/asound.conf.pulseaudio ${D}/${sysconfdir}
+}
+
+PACKAGE_ARCH = "all"
+
+pkg_postinst_${PN} () {
+#!/bin/sh
+if [ "x$D" != "x" ]; then
+        exit 1
+fi
+
+mkdir -p /etc/pulse || true
+# Remove existing entries
+if [ -e /etc/pulse/session ] ; then
+        sed -i -e /load-module\ module-hal-detect/d /etc/pulse/session
+fi
+# Load hal-detect module to avoid alsa->pulse-alsa-pulse->.. loops
+echo "load-module module-hal-detect" >> /etc/pulse/session
+}
+
============================================================
--- packages/pulseaudio/pulseaudio-esd-wrapper.bb	c0c973abd7c7ed8625a2bd55a37b730dfff842ed
+++ packages/pulseaudio/pulseaudio-esd-wrapper.bb	fb6267e7ccabe3982c76ff64e11cbc9641bdbb93
@@ -1,6 +1,8 @@ LICENSE = "GPLv2"
 DESCRIPTION = "Drop-in Esound replacement"
 LICENSE = "GPLv2"
 
+PR = "r1"
+
 RCONFLICTS = "esd"
 RREPLACES = "esd"
 
@@ -31,7 +33,7 @@ if [ -e /etc/pulse/session ] ; then
 mkdir -p /etc/pulse || true
 # Remove existing entries
 if [ -e /etc/pulse/session ] ; then
-        sed -i -e /load-module\ module-esound-protocol-unix/d e /load-module\ module-esound-protocol-tcp/d /etc/pulse/session
+        sed -i -e /load-module\ module-esound-protocol-unix/d -e /load-module\ module-esound-protocol-tcp/d /etc/pulse/session
 fi
 # Load esound modules
 echo "load-module module-esound-protocol-tcp" >> /etc/pulse/session