Send commitlog mailing list submissions to
[email protected]
To subscribe or unsubscribe via the World Wide Web, visit
http://lists.openmoko.org/mailman/listinfo/commitlog
or, via email, send a message with subject or body 'help' to
[EMAIL PROTECTED]
You can reach the person managing the list at
[EMAIL PROTECTED]
When replying, please edit your Subject line so it is more specific
than "Re: Contents of commitlog digest..."
Today's Topics:
1. r2206 - trunk/oe/packages/pulseaudio ([EMAIL PROTECTED])
2. r2207 - in trunk/oe/packages/openmoko-base: .
openmoko-sound-system ([EMAIL PROTECTED])
3. r2208 - in trunk/oe/packages/openmoko-base: .
openmoko-session ([EMAIL PROTECTED])
4. r2209 -
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/src
([EMAIL PROTECTED])
5. r2210 -
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/src
([EMAIL PROTECTED])
6. r2211 -
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/src
([EMAIL PROTECTED])
7. r2212 -
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/src
([EMAIL PROTECTED])
8. r2213 -
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/src
([EMAIL PROTECTED])
9. r2214 - in trunk/oe/packages: . python ([EMAIL PROTECTED])
10. r2215 - in trunk/oe/packages/python: . python-dbus
([EMAIL PROTECTED])
--- Begin Message ---
Author: mickey
Date: 2007-06-10 12:38:21 +0200 (Sun, 10 Jun 2007)
New Revision: 2206
Modified:
trunk/oe/packages/pulseaudio/pulseaudio_0.9.6.bb
Log:
oe/pulseaudio: add/remove user in libpulse. fix TARGET_FPU assignment
Modified: trunk/oe/packages/pulseaudio/pulseaudio_0.9.6.bb
===================================================================
--- trunk/oe/packages/pulseaudio/pulseaudio_0.9.6.bb 2007-06-09 17:42:22 UTC
(rev 2205)
+++ trunk/oe/packages/pulseaudio/pulseaudio_0.9.6.bb 2007-06-10 10:38:21 UTC
(rev 2206)
@@ -6,7 +6,7 @@
DEPENDS = "libatomic-ops liboil avahi libsamplerate0 libsndfile1 libtool"
# optional
DEPENDS += "alsa-lib"
-PR = "r1"
+PR = "r2"
SRC_URI =
"http://0pointer.de/lennart/projects/pulseaudio/pulseaudio-${PV}.tar.gz \
file://gcc4-compile-fix.patch;patch=1 \
@@ -25,7 +25,7 @@
PARALLEL_MAKE = ""
-export TARGET_FPU="${TARGET_FPU}"
+export TARGET_FPU := "${TARGET_FPU}"
do_stage() {
autotools_stage_all
@@ -70,7 +70,9 @@
${sysconfdir}/pulse/daemon.conf \
${sysconfdir}/pulse/client.conf \
"
-pkg_postinst_${PN}-bin() {
+# libpulse is correct, rather than pulseaudio-server, because
+# libpulse can spawn a server as well
+pkg_postinst_libpulse() {
if test "x$D" != "x"; then
exit 1
else
@@ -82,7 +84,7 @@
fi
}
-pkg_postrm${PN}-bin() {
+pkg_postrm_libpulse() {
if test "x$D" != "x"; then
exit 1
else
--- End Message ---
--- Begin Message ---
Author: mickey
Date: 2007-06-10 12:43:56 +0200 (Sun, 10 Jun 2007)
New Revision: 2207
Modified:
trunk/oe/packages/openmoko-base/openmoko-sound-system/pulseaudio
trunk/oe/packages/openmoko-base/openmoko-sound-system/session
trunk/oe/packages/openmoko-base/openmoko-sound-system_0.1.0.bb
Log:
oe/openmoko-sound-system: correct some paths to make pulseaudio startup as
daemon
Modified: trunk/oe/packages/openmoko-base/openmoko-sound-system/pulseaudio
===================================================================
--- trunk/oe/packages/openmoko-base/openmoko-sound-system/pulseaudio
2007-06-10 10:38:21 UTC (rev 2206)
+++ trunk/oe/packages/openmoko-base/openmoko-sound-system/pulseaudio
2007-06-10 10:43:56 UTC (rev 2207)
@@ -6,9 +6,6 @@
# description: Pulseaudio manages the sound input/output
# processname: pulseaudio
-# If you must specify special options, uncomment and modify the next line
-OPTS="-s 115200 -F"
-
# Source function library.
#. /etc/rc.d/init.d/functions
@@ -17,14 +14,16 @@
start() {
echo -n "Starting the audio server..."
- pulseaudio --system -nDF /etc/share/pulseaudio/session
- echo "success"
+ # FIXME once alsa/shm permissions have been fixed, supply --system
+ pulseaudio -D -nF /etc/pulse/session
+ echo $prog
}
stop() {
# Stop daemons.
echo -n "Shutting down $prog: "
killall pulseaudio
+ echo "done"
}
# See how we were called.
Modified: trunk/oe/packages/openmoko-base/openmoko-sound-system/session
===================================================================
--- trunk/oe/packages/openmoko-base/openmoko-sound-system/session
2007-06-10 10:38:21 UTC (rev 2206)
+++ trunk/oe/packages/openmoko-base/openmoko-sound-system/session
2007-06-10 10:43:56 UTC (rev 2207)
@@ -1,4 +1,4 @@
-#!/usr/bin/pulseaudio -nDF
+#!/usr/bin/pulseaudio -nF
# Create autoload entries for the device drivers
add-autoload-sink output module-alsa-sink sink_name=output
@@ -18,9 +18,9 @@
.nofail
# Load an audio to the sample cache for usage with module-x11-bell
-load-sample-lazy /usr/share/openmoko/sounds/notify_doorbell.wav x11-bell
+load-sample-lazy x11-bell /usr/share/openmoko/sounds/notify_doorbell.wav
load-module module-x11-bell sample=x11-bell
# Load samples
-load-sample startup /usr/share/openmoko/sounds/openmoko_startup.wav
+load-sample startup /usr/share/openmoko/sounds/startup_openmoko.wav
load-sample touchscreen /usr/share/openmoko/sounds/touchscreen_click.wav
Modified: trunk/oe/packages/openmoko-base/openmoko-sound-system_0.1.0.bb
===================================================================
--- trunk/oe/packages/openmoko-base/openmoko-sound-system_0.1.0.bb
2007-06-10 10:38:21 UTC (rev 2206)
+++ trunk/oe/packages/openmoko-base/openmoko-sound-system_0.1.0.bb
2007-06-10 10:43:56 UTC (rev 2207)
@@ -10,7 +10,7 @@
pulseaudio-module-native-protocol-unix \
pulseaudio-module-cli-protocol-unix \
"
-PR = "r3"
+PR = "r4"
inherit openmoko-base update-rc.d
--- End Message ---
--- Begin Message ---
Author: mickey
Date: 2007-06-10 12:53:46 +0200 (Sun, 10 Jun 2007)
New Revision: 2208
Modified:
trunk/oe/packages/openmoko-base/openmoko-session/session
trunk/oe/packages/openmoko-base/openmoko-session_svn.bb
Log:
oe/openmoko-session: remove playing startup sound from session file
Modified: trunk/oe/packages/openmoko-base/openmoko-session/session
===================================================================
--- trunk/oe/packages/openmoko-base/openmoko-session/session 2007-06-10
10:43:56 UTC (rev 2207)
+++ trunk/oe/packages/openmoko-base/openmoko-session/session 2007-06-10
10:53:46 UTC (rev 2208)
@@ -9,8 +9,8 @@
# start old-style panel plugin to get a keyboard
mbinputmgr &
-# set default alsa configuration and play welcome sound
-( sleep 8; alsactl restore 0 -f /etc/alsa/stereoout.state; madplay
/usr/share/openmoko/sounds/startup_openmoko.mp3 ) &
+# set default alsa configuration
+alsactl restore 0 -f /etc/alsa/stereoout.state
# start UI and dialer
openmoko-footer &
Modified: trunk/oe/packages/openmoko-base/openmoko-session_svn.bb
===================================================================
--- trunk/oe/packages/openmoko-base/openmoko-session_svn.bb 2007-06-10
10:43:56 UTC (rev 2207)
+++ trunk/oe/packages/openmoko-base/openmoko-session_svn.bb 2007-06-10
10:53:46 UTC (rev 2208)
@@ -2,7 +2,7 @@
SECTION = "openmoko/base"
RDEPENDS = "matchbox-panel-2 matchbox-wm gconf"
PV = "0.1+svn${SRCDATE}"
-PR = "r3"
+PR = "r4"
inherit openmoko-base
--- End Message ---
--- Begin Message ---
Author: mickey
Date: 2007-06-10 13:14:14 +0200 (Sun, 10 Jun 2007)
New Revision: 2209
Modified:
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/src/buttonactions.c
Log:
openmoko-panel-mainmenu: set display backlight
Modified:
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/src/buttonactions.c
===================================================================
---
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/src/buttonactions.c
2007-06-10 10:53:46 UTC (rev 2208)
+++
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/src/buttonactions.c
2007-06-10 11:14:14 UTC (rev 2209)
@@ -41,8 +41,11 @@
#include <linux/input.h>
#undef DEBUG_THIS_FILE
-#define DEBUG_THIS_FILE
+//#define DEBUG_THIS_FILE
+//FIXME load this from sysfs
+static const int MAX_BRIGHTNESS = 5000;
+
//FIXME find out through sysfs
#ifndef DEBUG_THIS_FILE
#define AUX_BUTTON_EVENT_PATH "/dev/input/event1"
@@ -410,6 +413,16 @@
void panel_mainmenu_set_display( int brightness )
{
g_debug( "mainmenu set display %d", brightness );
+ int fd = g_open( "/sys/class/backlight/gta01-bl/brightness" );
+ if ( fd != -1 )
+ g_debug( "can't open backlight device: %s", strerror( errno ) );
+ else
+ {
+ char buf[10];
+ int numbytes = g_sprintf( buf, "%d\0", MAX_BRIGHTNESS * 100 /
brightness );
+ write( fd, buf, numbytes );
+ close( fd );
+ }
}
gboolean panel_mainmenu_powersave_timeout1( guint timeout )
--- End Message ---
--- Begin Message ---
Author: mickey
Date: 2007-06-10 13:21:54 +0200 (Sun, 10 Jun 2007)
New Revision: 2210
Modified:
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/src/buttonactions.c
Log:
openmoko-panel-mainmenu: add some more debug
Modified:
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/src/buttonactions.c
===================================================================
---
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/src/buttonactions.c
2007-06-10 11:14:14 UTC (rev 2209)
+++
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/src/buttonactions.c
2007-06-10 11:21:54 UTC (rev 2210)
@@ -414,7 +414,7 @@
{
g_debug( "mainmenu set display %d", brightness );
int fd = g_open( "/sys/class/backlight/gta01-bl/brightness" );
- if ( fd != -1 )
+ if ( fd == -1 )
g_debug( "can't open backlight device: %s", strerror( errno ) );
else
{
@@ -459,6 +459,7 @@
void panel_mainmenu_sound_state_cb( pa_context* pac, void* userdata )
{
+ g_debug( "mainmenu sound state callback. state = %d",
pa_context_get_state( pac ) );
if ( pa_context_get_state( pac ) == PA_CONTEXT_READY )
{
panel_mainmenu_sound_play( "startup" );
@@ -467,6 +468,7 @@
void panel_mainmenu_sound_init()
{
+ g_debug( "panel mainmenu sound init" );
pa_threaded_mainloop* mainloop = pa_threaded_mainloop_new();
if ( !mainloop )
@@ -487,6 +489,8 @@
pa_context_set_state_callback( pac, panel_mainmenu_sound_state_cb, NULL );
pa_context_connect( pac, NULL, 0, NULL );
pa_threaded_mainloop_start( mainloop );
+
+ g_debug( "sound init ok. threaded mainloop started" );
}
void panel_mainmenu_sound_play( const gchar* samplename )
--- End Message ---
--- Begin Message ---
Author: mickey
Date: 2007-06-10 18:34:02 +0200 (Sun, 10 Jun 2007)
New Revision: 2211
Modified:
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/src/buttonactions.c
Log:
openmoko-panel-mainmenu: use proper g_open flags, fix samplename
Modified:
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/src/buttonactions.c
===================================================================
---
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/src/buttonactions.c
2007-06-10 11:21:54 UTC (rev 2210)
+++
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/src/buttonactions.c
2007-06-10 16:34:02 UTC (rev 2211)
@@ -413,7 +413,7 @@
void panel_mainmenu_set_display( int brightness )
{
g_debug( "mainmenu set display %d", brightness );
- int fd = g_open( "/sys/class/backlight/gta01-bl/brightness" );
+ int fd = g_open( "/sys/class/backlight/gta01-bl/brightness", O_WRONLY, 0 );
if ( fd == -1 )
g_debug( "can't open backlight device: %s", strerror( errno ) );
else
@@ -496,7 +496,7 @@
void panel_mainmenu_sound_play( const gchar* samplename )
{
pa_context_play_sample( pac,
- "startup", // Name of my sample
+ samplename, // Name of my sample
NULL, // Use default sink
PA_VOLUME_NORM, // Full volume
NULL, // Don't need a callback
--- End Message ---
--- Begin Message ---
Author: mickey
Date: 2007-06-10 18:58:38 +0200 (Sun, 10 Jun 2007)
New Revision: 2212
Modified:
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/src/buttonactions.c
Log:
openmoko-panel-mainmenu: fix thinko in brightness calculation and set sleep
timeout to 5m
Modified:
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/src/buttonactions.c
===================================================================
---
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/src/buttonactions.c
2007-06-10 16:34:02 UTC (rev 2211)
+++
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/src/buttonactions.c
2007-06-10 16:58:38 UTC (rev 2212)
@@ -407,7 +407,7 @@
//TODO load this from preferences
powersave_timer1 = g_timeout_add( 10 * 1000, (GSourceFunc)
panel_mainmenu_powersave_timeout1, (gpointer)1 );
powersave_timer2 = g_timeout_add( 20 * 1000, (GSourceFunc)
panel_mainmenu_powersave_timeout2, (gpointer)1 );
- powersave_timer3 = g_timeout_add( 40 * 1000, (GSourceFunc)
panel_mainmenu_powersave_timeout3, (gpointer)1 );
+ powersave_timer3 = g_timeout_add( 60 * 5 * 1000, (GSourceFunc)
panel_mainmenu_powersave_timeout3, (gpointer)1 );
}
void panel_mainmenu_set_display( int brightness )
@@ -419,7 +419,7 @@
else
{
char buf[10];
- int numbytes = g_sprintf( buf, "%d\0", MAX_BRIGHTNESS * 100 /
brightness );
+ int numbytes = g_sprintf( buf, "%d\0", MAX_BRIGHTNESS / 100 *
(brightness+1 ) );
write( fd, buf, numbytes );
close( fd );
}
--- End Message ---
--- Begin Message ---
Author: mickey
Date: 2007-06-11 05:20:28 +0200 (Mon, 11 Jun 2007)
New Revision: 2213
Modified:
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/src/buttonactions.c
Log:
openmoko-panel-mainmenu: remove (some) debug output
Modified:
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/src/buttonactions.c
===================================================================
---
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/src/buttonactions.c
2007-06-10 16:58:38 UTC (rev 2212)
+++
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/src/buttonactions.c
2007-06-11 03:20:28 UTC (rev 2213)
@@ -369,8 +369,6 @@
struct input_event event;
int size = read( g_io_channel_unix_get_fd( source ), &event, sizeof(
struct input_event ) );
- g_debug( "read %d bytes from touchscreen_fd %d", size,
g_io_channel_unix_get_fd( source ) );
- g_debug( "input event = ( %0x, %0x, %0x )", event.type, event.code,
event.value );
if ( event.type == 1 && event.code == TOUCHSCREEN_BUTTON_KEYCODE )
{
@@ -429,9 +427,8 @@
{
g_debug( "mainmenu powersave timeout 1" );
//FIXME talk to neod
- //FIXME dim display
power_state = DISPLAY_DIM;
- panel_mainmenu_set_display( 50 );
+ panel_mainmenu_set_display( 25 );
return FALSE;
}
@@ -439,7 +436,6 @@
{
g_debug( "mainmenu powersave timeout 2" );
//FIXME talk to neod
- //FIXME turn off display
panel_mainmenu_set_display( 0 );
power_state = DISPLAY_OFF;
return FALSE;
--- End Message ---
--- Begin Message ---
Author: mickey
Date: 2007-06-11 07:58:07 +0200 (Mon, 11 Jun 2007)
New Revision: 2214
Added:
trunk/oe/packages/python/
trunk/oe/packages/python/allow-older-autotools.patch
trunk/oe/packages/python/python-dbus_0.81.1.bb
Log:
oe/python-dbus: add 0.81.1 as per Marcel Hotmanns request
NOTE: ~lart python extensions switching from distutils to autotools
Added: trunk/oe/packages/python/allow-older-autotools.patch
===================================================================
--- trunk/oe/packages/python/allow-older-autotools.patch 2007-06-11
03:20:28 UTC (rev 2213)
+++ trunk/oe/packages/python/allow-older-autotools.patch 2007-06-11
05:58:07 UTC (rev 2214)
@@ -0,0 +1,23 @@
+Index: dbus-python-0.81.1/configure.ac
+===================================================================
+--- dbus-python-0.81.1.orig/configure.ac 2007-06-04 13:17:10.000000000
+0000
++++ dbus-python-0.81.1/configure.ac 2007-06-11 06:57:20.000000000 +0000
+@@ -1,5 +1,5 @@
+ -*- mode: m4 -*-
+-AC_PREREQ(2.59c)
++AC_PREREQ(2.59)
+
+ dnl If not 1, append datestamp to the version number
+ m4_define(dbus_python_released, 1)
+Index: dbus-python-0.81.1/Makefile.am
+===================================================================
+--- dbus-python-0.81.1.orig/Makefile.am 2007-05-09 09:44:40.000000000
+0000
++++ dbus-python-0.81.1/Makefile.am 2007-06-11 06:59:23.000000000 +0000
+@@ -38,6 +38,7 @@
+
+ TXT_RSTDOCS = doc/tutorial.txt doc/API_CHANGES.txt doc/HACKING.txt
+ RSTDOCS = README NEWS TODO
++docdir=foo
+ dist_doc_DATA = $(TXT_RSTDOCS) $(RSTDOCS)
+
+ maintainer-update-website: _maintainer-update-apidocs \
Added: trunk/oe/packages/python/python-dbus_0.81.1.bb
===================================================================
--- trunk/oe/packages/python/python-dbus_0.81.1.bb 2007-06-11 03:20:28 UTC
(rev 2213)
+++ trunk/oe/packages/python/python-dbus_0.81.1.bb 2007-06-11 05:58:07 UTC
(rev 2214)
@@ -0,0 +1,13 @@
+DESCRIPTION = "Python bindings for DBus, a socket-based message bus system for
interprocess communication"
+SECTION = "devel/python"
+HOMEPAGE = "http://www.freedesktop.org/Software/dbus";
+LICENSE = "GPL"
+DEPENDS = "expat glib-2.0 virtual/libintl python-pyrex-native python"
+RDEPENDS = "dbus"
+PR = "ml0"
+
+SRC_URI =
"http://dbus.freedesktop.org/releases/dbus-python/dbus-python-${PV}.tar.gz \
+ file://allow-older-autotools.patch;patch=1"
+S = "${WORKDIR}/dbus-python-${PV}"
+
+inherit distutils-base autotools
--- End Message ---
--- Begin Message ---
Author: mickey
Date: 2007-06-11 10:22:37 +0200 (Mon, 11 Jun 2007)
New Revision: 2215
Added:
trunk/oe/packages/python/python-dbus/
trunk/oe/packages/python/python-dbus/allow-older-autotools.patch
Removed:
trunk/oe/packages/python/allow-older-autotools.patch
Modified:
trunk/oe/packages/python/python-dbus_0.81.1.bb
Log:
oe/python-dbus: add some RDEPENDS
Deleted: trunk/oe/packages/python/allow-older-autotools.patch
===================================================================
--- trunk/oe/packages/python/allow-older-autotools.patch 2007-06-11
05:58:07 UTC (rev 2214)
+++ trunk/oe/packages/python/allow-older-autotools.patch 2007-06-11
08:22:37 UTC (rev 2215)
@@ -1,23 +0,0 @@
-Index: dbus-python-0.81.1/configure.ac
-===================================================================
---- dbus-python-0.81.1.orig/configure.ac 2007-06-04 13:17:10.000000000
+0000
-+++ dbus-python-0.81.1/configure.ac 2007-06-11 06:57:20.000000000 +0000
-@@ -1,5 +1,5 @@
- -*- mode: m4 -*-
--AC_PREREQ(2.59c)
-+AC_PREREQ(2.59)
-
- dnl If not 1, append datestamp to the version number
- m4_define(dbus_python_released, 1)
-Index: dbus-python-0.81.1/Makefile.am
-===================================================================
---- dbus-python-0.81.1.orig/Makefile.am 2007-05-09 09:44:40.000000000
+0000
-+++ dbus-python-0.81.1/Makefile.am 2007-06-11 06:59:23.000000000 +0000
-@@ -38,6 +38,7 @@
-
- TXT_RSTDOCS = doc/tutorial.txt doc/API_CHANGES.txt doc/HACKING.txt
- RSTDOCS = README NEWS TODO
-+docdir=foo
- dist_doc_DATA = $(TXT_RSTDOCS) $(RSTDOCS)
-
- maintainer-update-website: _maintainer-update-apidocs \
Copied: trunk/oe/packages/python/python-dbus/allow-older-autotools.patch (from
rev 2214, trunk/oe/packages/python/allow-older-autotools.patch)
Modified: trunk/oe/packages/python/python-dbus_0.81.1.bb
===================================================================
--- trunk/oe/packages/python/python-dbus_0.81.1.bb 2007-06-11 05:58:07 UTC
(rev 2214)
+++ trunk/oe/packages/python/python-dbus_0.81.1.bb 2007-06-11 08:22:37 UTC
(rev 2215)
@@ -3,7 +3,7 @@
HOMEPAGE = "http://www.freedesktop.org/Software/dbus";
LICENSE = "GPL"
DEPENDS = "expat glib-2.0 virtual/libintl python-pyrex-native python"
-RDEPENDS = "dbus"
+RDEPENDS = "dbus python-threading python-io python-stringold python-logging"
PR = "ml0"
SRC_URI =
"http://dbus.freedesktop.org/releases/dbus-python/dbus-python-${PV}.tar.gz \
--- End Message ---
_______________________________________________
commitlog mailing list
[email protected]
http://lists.openmoko.org/mailman/listinfo/commitlog
