[oe-commits] org.oe.dev merge of '9ea31290125f045b9aba7f495e83482e68ce640d'

[mickeyl commit]

merge of '9ea31290125f045b9aba7f495e83482e68ce640d'
     and 'c06fa0c45cd1c86ad35d00394ce13105f5d01c08'

Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: 81ce749b8f57a5a56ca3f31c843da1b227a8a48d
ViewMTN: http://monotone.openembedded.org/revision/info/81ce749b8f57a5a56ca3f31c843da1b227a8a48d
Files:
1
packages/powertop/powertop_1.9.bb
packages/powertop/powertop_1.10.bb
packages/pulseaudio/pulseaudio-esd-wrapper.bb
packages/freesmartphone/python-odeviced/om-gta02/odeviced.conf
packages/freesmartphone/python-odeviced_git.bb
Diffs:

#
# mt diff -r9ea31290125f045b9aba7f495e83482e68ce640d -r81ce749b8f57a5a56ca3f31c843da1b227a8a48d
#
#
#
# rename "packages/powertop/powertop_1.9.bb"
#     to "packages/powertop/powertop_1.10.bb"
# 
# add_file "packages/pulseaudio/pulseaudio-esd-wrapper.bb"
#  content [c0c973abd7c7ed8625a2bd55a37b730dfff842ed]
# 
# patch "packages/powertop/powertop_1.10.bb"
#  from [e371d3eaa74c8f4e6688d7a4ce8fec8ab4a57d50]
#    to [d94eaf37feae41b16440db163dbe4ef700db5eab]
#
============================================================
--- packages/pulseaudio/pulseaudio-esd-wrapper.bb	c0c973abd7c7ed8625a2bd55a37b730dfff842ed
+++ packages/pulseaudio/pulseaudio-esd-wrapper.bb	c0c973abd7c7ed8625a2bd55a37b730dfff842ed
@@ -0,0 +1,40 @@
+DESCRIPTION = "Drop-in Esound replacement"
+LICENSE = "GPLv2"
+
+RCONFLICTS = "esd"
+RREPLACES = "esd"
+
+RDEPENDS = " \
+	pulseaudio-server \
+	pulseaudio-misc \
+	pulseaudio-lib-protocol-esound \
+	pulseaudio-module-esound-compat-spawnfd \
+	pulseaudio-module-esound-compat-spawnpid \
+	pulseaudio-module-esound-protocol-tcp \
+	pulseaudio-module-esound-protocol-unix \
+"
+
+do_install() {
+	install -d ${D}/${bindir}
+	ln -sf ${bindir}/esdcompat ${D}/${bindir}/esd 
+}
+
+
+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-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
+echo "load-module module-esound-protocol-unix" >> /etc/pulse/session
+}
+
============================================================
--- packages/powertop/powertop_1.9.bb	e371d3eaa74c8f4e6688d7a4ce8fec8ab4a57d50
+++ packages/powertop/powertop_1.10.bb	d94eaf37feae41b16440db163dbe4ef700db5eab
@@ -3,7 +3,7 @@ DEPENDS = "ncurses"
 LICENSE = "GPLv2"
 DEPENDS = "ncurses"
 
-SRC_URI = "http://www.linuxpowertop.org/download/powertop-${PV}.tar.gz"
+SRC_URI = "http://www.lesswatts.org/projects/powertop/download/powertop-${PV}.tar.gz"
 
 CFLAGS += "${LDFLAGS}"
 


#
# mt diff -rc06fa0c45cd1c86ad35d00394ce13105f5d01c08 -r81ce749b8f57a5a56ca3f31c843da1b227a8a48d
#
#
#
# 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