diff options
author | Michael Lauer <mickey@vanille-media.de> | 2007-07-04 10:35:39 +0000 |
---|---|---|
committer | Michael Lauer <mickey@vanille-media.de> | 2007-07-04 10:35:39 +0000 |
commit | dbcb36d8e4e156f4ec64444077b776bcd69f2259 (patch) | |
tree | 62be86157fc983199ded32890b9d86098305f5b4 | |
parent | c135979b41af99c0ab5c76e26a9652d5e8ed6858 (diff) |
openmoko-base: merge w/ openmoko svn overlay
-rw-r--r-- | packages/openmoko-base/openmoko-icon-theme-standard_svn.bb | 12 | ||||
-rw-r--r-- | packages/openmoko-base/openmoko-libs_svn.bb | 16 | ||||
-rw-r--r-- | packages/openmoko-base/openmoko-session/.mtn2git_empty (renamed from packages/openmoko-base/files/.mtn2git_empty) | 0 | ||||
-rw-r--r-- | packages/openmoko-base/openmoko-session/session (renamed from packages/openmoko-base/files/session) | 13 | ||||
-rw-r--r-- | packages/openmoko-base/openmoko-session_svn.bb | 13 | ||||
-rw-r--r-- | packages/openmoko-base/openmoko-sound-system/.mtn2git_empty | 0 | ||||
-rwxr-xr-x | packages/openmoko-base/openmoko-sound-system/pulseaudio | 46 | ||||
-rw-r--r-- | packages/openmoko-base/openmoko-sound-system/session | 26 | ||||
-rw-r--r-- | packages/openmoko-base/openmoko-sound-system_0.1.0.bb | 31 | ||||
-rw-r--r-- | packages/openmoko-base/openmoko-sound-theme-standard_svn.bb | 23 |
10 files changed, 162 insertions, 18 deletions
diff --git a/packages/openmoko-base/openmoko-icon-theme-standard_svn.bb b/packages/openmoko-base/openmoko-icon-theme-standard_svn.bb index 8be6211d68..a7f62b31c0 100644 --- a/packages/openmoko-base/openmoko-icon-theme-standard_svn.bb +++ b/packages/openmoko-base/openmoko-icon-theme-standard_svn.bb @@ -1,11 +1,19 @@ 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" diff --git a/packages/openmoko-base/openmoko-libs_svn.bb b/packages/openmoko-base/openmoko-libs_svn.bb index caa70363a2..a7b5387a99 100644 --- a/packages/openmoko-base/openmoko-libs_svn.bb +++ b/packages/openmoko-base/openmoko-libs_svn.bb @@ -2,8 +2,8 @@ DESCRIPTION = "openmoko-libs is a set of libraries implementing a Gtk+ based app 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" diff --git a/packages/openmoko-base/files/.mtn2git_empty b/packages/openmoko-base/openmoko-session/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/openmoko-base/files/.mtn2git_empty +++ b/packages/openmoko-base/openmoko-session/.mtn2git_empty diff --git a/packages/openmoko-base/files/session b/packages/openmoko-base/openmoko-session/session index 91b38a0bea..c7a773efcb 100644 --- a/packages/openmoko-base/files/session +++ b/packages/openmoko-base/openmoko-session/session @@ -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 $@ diff --git a/packages/openmoko-base/openmoko-session_svn.bb b/packages/openmoko-base/openmoko-session_svn.bb index 18781493f6..7acc8fae1c 100644 --- a/packages/openmoko-base/openmoko-session_svn.bb +++ b/packages/openmoko-base/openmoko-session_svn.bb @@ -1,8 +1,8 @@ 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 @@ if [ "x$D" != "x" ]; then 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" + diff --git a/packages/openmoko-base/openmoko-sound-system/.mtn2git_empty b/packages/openmoko-base/openmoko-sound-system/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/openmoko-base/openmoko-sound-system/.mtn2git_empty diff --git a/packages/openmoko-base/openmoko-sound-system/pulseaudio b/packages/openmoko-base/openmoko-sound-system/pulseaudio new file mode 100755 index 0000000000..76daacd3ae --- /dev/null +++ b/packages/openmoko-base/openmoko-sound-system/pulseaudio @@ -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 diff --git a/packages/openmoko-base/openmoko-sound-system/session b/packages/openmoko-base/openmoko-sound-system/session new file mode 100644 index 0000000000..91267b672a --- /dev/null +++ b/packages/openmoko-base/openmoko-sound-system/session @@ -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 diff --git a/packages/openmoko-base/openmoko-sound-system_0.1.0.bb b/packages/openmoko-base/openmoko-sound-system_0.1.0.bb new file mode 100644 index 0000000000..671ff37f45 --- /dev/null +++ b/packages/openmoko-base/openmoko-sound-system_0.1.0.bb @@ -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" diff --git a/packages/openmoko-base/openmoko-sound-theme-standard_svn.bb b/packages/openmoko-base/openmoko-sound-theme-standard_svn.bb new file mode 100644 index 0000000000..39b1e8d143 --- /dev/null +++ b/packages/openmoko-base/openmoko-sound-theme-standard_svn.bb @@ -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}" + |