[oe-commits] org.oe.dev openmoko-base: merge w/ openmoko svn overlay
mickeyl commit
openembedded-commits at lists.openembedded.org
Fri Jul 6 12:54:10 UTC 2007
openmoko-base: merge w/ openmoko svn overlay
Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: fc1bdba1e93b141eca3748c63ab565ab12ec6a93
ViewMTN: http://monotone.openembedded.org/revision.psp?id=fc1bdba1e93b141eca3748c63ab565ab12ec6a93
Files:
1
packages/openmoko-base/files
packages/openmoko-base/openmoko-session
packages/openmoko-base/openmoko-sound-system
packages/openmoko-base/openmoko-sound-system/pulseaudio
packages/openmoko-base/openmoko-sound-system/session
packages/openmoko-base/openmoko-sound-system_0.1.0.bb
packages/openmoko-base/openmoko-sound-theme-standard_svn.bb
packages/openmoko-base/openmoko-icon-theme-standard_svn.bb
packages/openmoko-base/openmoko-libs_svn.bb
packages/openmoko-base/openmoko-session/session
packages/openmoko-base/openmoko-session_svn.bb
mtn:execute
true
Diffs:
#
# mt diff -r0e150443d291bc62c30745eee41a34a08f3eb3db -rfc1bdba1e93b141eca3748c63ab565ab12ec6a93
#
#
#
# rename "packages/openmoko-base/files"
# to "packages/openmoko-base/openmoko-session"
#
# add_dir "packages/openmoko-base/openmoko-sound-system"
#
# add_file "packages/openmoko-base/openmoko-sound-system/pulseaudio"
# content [d433451e55cb5437d6d11869506ebab909fc386b]
#
# add_file "packages/openmoko-base/openmoko-sound-system/session"
# content [2d729d476a1b9fa1ab08c40c8f8d00ff7e126359]
#
# add_file "packages/openmoko-base/openmoko-sound-system_0.1.0.bb"
# content [b17f4014d9d87df4e995907d56b14ff983834d1d]
#
# add_file "packages/openmoko-base/openmoko-sound-theme-standard_svn.bb"
# content [6e57e9b6ea74759e04f0c76d6855305a93ded158]
#
# patch "packages/openmoko-base/openmoko-icon-theme-standard_svn.bb"
# from [1bb8567e5884cb5cfff6a978969c2bdda39a17b0]
# to [80697dbfe450a8f2d4047ec78dde405e797d5a57]
#
# patch "packages/openmoko-base/openmoko-libs_svn.bb"
# from [dd7eb1f538df699f20256d8f379700b3a72f2cef]
# to [adf0ca211a78e2352a7a4ba89dc18d49eb8f2ee7]
#
# patch "packages/openmoko-base/openmoko-session/session"
# from [63f0b0b66b735a4c931d806d858d877a7b0b0ba0]
# to [63b586046c1425b8e3e086e9c21de425e61b893c]
#
# patch "packages/openmoko-base/openmoko-session_svn.bb"
# from [48ddee5be6a27435d476a746622d29fc73e5c6a9]
# to [718fa6627900d5dca4f892c41ae12c3e48cc8ff2]
#
# set "packages/openmoko-base/openmoko-sound-system/pulseaudio"
# attr "mtn:execute"
# value "true"
#
============================================================
--- packages/openmoko-base/openmoko-sound-system/pulseaudio d433451e55cb5437d6d11869506ebab909fc386b
+++ packages/openmoko-base/openmoko-sound-system/pulseaudio d433451e55cb5437d6d11869506ebab909fc386b
@@ -0,0 +1,46 @@
+#!/bin/sh
+#
+# pulseaudio This shell script starts and stops pulseaudio.
+#
+# chkconfig: 345 90 40
+# description: Pulseaudio manages the sound input/output
+# processname: pulseaudio
+
+# Source function library.
+#. /etc/rc.d/init.d/functions
+
+RETVAL=0
+prog="pulseaudio"
+
+start() {
+ echo -n "Starting the audio server..."
+ # FIXME once alsa/shm permissions have been fixed, supply --system
+ pulseaudio --resample-method=trivial -D -nF /etc/pulse/session
+ echo $prog
+}
+
+stop() {
+ # Stop daemons.
+ echo -n "Shutting down $prog: "
+ killall pulseaudio
+ echo "done"
+}
+
+# See how we were called.
+case "$1" in
+ start)
+ start
+ ;;
+ stop)
+ stop
+ ;;
+ restart|reload)
+ stop
+ start
+ ;;
+ *)
+ echo "Usage: $0 {start|stop|restart}"
+ exit 1
+esac
+
+exit $RETVAL
============================================================
--- packages/openmoko-base/openmoko-sound-system/session 2d729d476a1b9fa1ab08c40c8f8d00ff7e126359
+++ packages/openmoko-base/openmoko-sound-system/session 2d729d476a1b9fa1ab08c40c8f8d00ff7e126359
@@ -0,0 +1,26 @@
+#!/usr/bin/pulseaudio -nF
+
+# Create autoload entries for the device drivers
+add-autoload-sink output module-alsa-sink fragment_size=2048 sink_name=output
+add-autoload-source input module-alsa-source source_name=input
+
+# Load several protocols
+load-module module-esound-protocol-unix
+load-module module-simple-protocol-tcp
+load-module module-native-protocol-unix
+load-module module-cli-protocol-unix
+
+# Make some devices default
+set-default-sink output
+set-default-source input
+
+# Don't fail if the audio files referred to below don't exist
+.nofail
+
+# Load an audio to the sample cache for usage with module-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/startup_openmoko.wav
+load-sample touchscreen /usr/share/openmoko/sounds/touchscreen_click.wav
============================================================
--- packages/openmoko-base/openmoko-sound-system_0.1.0.bb b17f4014d9d87df4e995907d56b14ff983834d1d
+++ packages/openmoko-base/openmoko-sound-system_0.1.0.bb b17f4014d9d87df4e995907d56b14ff983834d1d
@@ -0,0 +1,31 @@
+DESCRIPTION = "OpenMoko Sound System"
+SECTION = "openmoko/base"
+RDEPENDS = "\
+ pulseaudio-server \
+ pulseaudio-module-alsa-sink \
+ pulseaudio-module-alsa-source \
+ pulseaudio-module-cli \
+ pulseaudio-module-esound-protocol-unix \
+ pulseaudio-module-simple-protocol-tcp \
+ pulseaudio-module-native-protocol-unix \
+ pulseaudio-module-cli-protocol-unix \
+"
+PR = "r5"
+
+inherit openmoko-base update-rc.d
+
+INITSCRIPT_NAME = "pulseaudio"
+INITSCRIPT_PARAMS = "defaults 35"
+
+SRC_URI = "file://pulseaudio \
+ file://session"
+S = "${WORKDIR}"
+
+do_install() {
+ install -d ${D}/${sysconfdir}/init.d
+ install -m 0755 ${WORKDIR}/pulseaudio ${D}/${sysconfdir}/init.d/
+ install -d ${D}/${sysconfdir}/pulse
+ install -m 0755 ${WORKDIR}/session ${D}/${sysconfdir}/pulse/session
+}
+
+PACKAGE_ARCH = "all"
============================================================
--- packages/openmoko-base/openmoko-sound-theme-standard_svn.bb 6e57e9b6ea74759e04f0c76d6855305a93ded158
+++ packages/openmoko-base/openmoko-sound-theme-standard_svn.bb 6e57e9b6ea74759e04f0c76d6855305a93ded158
@@ -0,0 +1,23 @@
+DESCRIPTION = "Standard sound theme for the OpenMoko distribution"
+SECTION = "openmoko/base"
+PV = "0.1+svn${SRCDATE}"
+PR = "r0"
+
+inherit openmoko-base autotools
+
+SRC_URI = "${OPENMOKO_MIRROR}/src/target/${OPENMOKO_RELEASE}/artwork;module=sounds;proto=http"
+S = "${WORKDIR}/sounds"
+
+do_install() {
+ find ${WORKDIR} -name ".svn" | xargs rm -rf
+ install -d ${D}${datadir}/openmoko/sounds
+ for i in *.mp3; do
+ cp -fpPR ${S}/$i ${D}${datadir}/openmoko/sounds/
+ done
+ for i in touchscreen_click.wav notify_doorbell.wav startup_openmoko.wav; do
+ cp -f ${S}/$i ${D}${datadir}/openmoko/sounds/
+ done
+}
+
+FILES_${PN} = "${datadir}"
+
============================================================
--- packages/openmoko-base/openmoko-icon-theme-standard_svn.bb 1bb8567e5884cb5cfff6a978969c2bdda39a17b0
+++ packages/openmoko-base/openmoko-icon-theme-standard_svn.bb 80697dbfe450a8f2d4047ec78dde405e797d5a57
@@ -1,11 +1,19 @@ SECTION = "openmoko/base"
DESCRIPTION = "Standard Gtk+ icon theme for the OpenMoko distribution"
SECTION = "openmoko/base"
-PV = "0.0+svn${SRCDATE}"
-PR = "r0"
+PV = "0.1+svn${SRCDATE}"
+PR = "r1"
inherit openmoko-base autotools
SRC_URI = "${OPENMOKO_MIRROR}/src/target/${OPENMOKO_RELEASE}/artwork;module=icons;proto=http"
S = "${WORKDIR}/icons"
+pkg_postinst_openmoko-icon-theme-standard () {
+#!/bin/sh -e
+if [ "x$D" != "x" ]; then
+ exit 1
+fi
+gtk-update-icon-cache ${datadir}/icons/openmoko-standard/
+}
+
PACKAGE_ARCH = "all"
============================================================
--- packages/openmoko-base/openmoko-libs_svn.bb dd7eb1f538df699f20256d8f379700b3a72f2cef
+++ packages/openmoko-base/openmoko-libs_svn.bb adf0ca211a78e2352a7a4ba89dc18d49eb8f2ee7
@@ -1,9 +1,9 @@ DEPENDS += "gtk+ eds-dbus libgsmd libxos
DESCRIPTION = "openmoko-libs is a set of libraries implementing a Gtk+ based application framework for mobile communication applications"
SECTION = "openmoko/libs"
LICENSE = "LGPL"
DEPENDS += "gtk+ eds-dbus libgsmd libxosd"
-PV = "0.0.1+svn${SRCDATE}"
-PR = "r5"
+PV = "0.4+svn${SRCDATE}"
+PR = "r0"
inherit openmoko
@@ -11,12 +11,12 @@ do_stage() {
autotools_stage_all
}
-PACKAGES =+ " \
- libmokojournal libmokojournal-dev libmokojournal-dbg \
- libmokogsmd libmokogsmd-dev libmokogsmd-dbg \
- libmokocore libmokocore-dev libmokocore-dbg \
- libmokoui libmokoui-dev libmokoui-dbg \
- "
+PACKAGES =+ "\
+ libmokojournal libmokojournal-dev libmokojournal-dbg \
+ libmokogsmd libmokogsmd-dev libmokogsmd-dbg \
+ libmokocore libmokocore-dev libmokocore-dbg \
+ libmokoui libmokoui-dev libmokoui-dbg \
+"
FILES_libmokojournal = "${libdir}/libmokojournal.so.*"
FILES_libmokojournal-dev = "${libdir}/libmokojournal.so ${libdir}/libmokojournal.*a ${includedir}/${PN}/libmokojournal"
============================================================
--- packages/openmoko-base/openmoko-session/session 63f0b0b66b735a4c931d806d858d877a7b0b0ba0
+++ packages/openmoko-base/openmoko-session/session 63b586046c1425b8e3e086e9c21de425e61b893c
@@ -1,17 +1,24 @@
#!/bin/sh
+export GTK_MODULES="libgtkstylus.so libgtkinput.so"
SHOWCURSOR="no"
matchbox-panel-2 \
- --start-applets=openmoko-panel-mainmenu,systray \
+ --start-applets=openmoko-panel-mainmenu,systray,startup \
--end-applets=openmoko-panel-battery,openmoko-panel-gsm,openmoko-panel-gps,openmoko-panel-usb,openmoko-panel-bt,openmoko-panel-clock &
-#start some old-style panel plugins to get a keyboard and battery status
+# start old-style panel plugin to get a keyboard
mbinputmgr &
-mb-applet-startup-monitor &
+# set default alsa configuration
+alsactl restore 0 -f /etc/alsa/stereoout.state
+
+# start UI and dialer
openmoko-footer &
openmoko-today --desktop &
openmoko-dialer &
+
+sleep 1
+
exec matchbox-window-manager -use_titlebar no -use_cursor $SHOWCURSOR $@
============================================================
--- packages/openmoko-base/openmoko-session_svn.bb 48ddee5be6a27435d476a746622d29fc73e5c6a9
+++ packages/openmoko-base/openmoko-session_svn.bb 718fa6627900d5dca4f892c41ae12c3e48cc8ff2
@@ -1,8 +1,8 @@ SECTION = "openmoko/base"
DESCRIPTION = "Matchbox session files for OpenMoko"
SECTION = "openmoko/base"
-RDEPENDS = "matchbox-panel-2 matchbox-wm openmoko-today gconf matchbox-applet-startup-monitor gtk-theme-clearlooks"
-PV = "0.0+svn${SRCDATE}"
-PR = "r11"
+RDEPENDS = "matchbox-panel-2 matchbox-wm openmoko-today gconf"
+PV = "0.1+svn${SRCDATE}"
+PR = "r0"
inherit openmoko-base
@@ -15,7 +15,7 @@ do_install() {
rm -fR ${D}/${sysconfdir}/.svn
rm -fR ${D}/${sysconfdir}/matchbox/.svn
chmod -R 755 ${D}/${sysconfdir}
- # DEMO only!
+ # DEMO only. Need to handle this differently in actual production images
install -m 0755 ${WORKDIR}/session ${D}/${sysconfdir}/matchbox/session
}
@@ -25,5 +25,8 @@ fi
exit 1
fi
-gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct --type string --set /desktop/openmoko/interface/theme Clearlooks
+gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct --type string --set /desktop/openmoko/interface/theme openmoko-standard
}
+
+PACKAGE_ARCH = "all"
+
More information about the Openembedded-commits
mailing list