11 files changed, 222 insertions, 12 deletions
diff --git a/packages/openmoko2/libmokoui2_svn.bb b/packages/openmoko2/libmokoui2_svn.bb
index 86372ae274..50c3928670 100644
--- a/packages/openmoko2/libmokoui2_svn.bb
+++ b/packages/openmoko2/libmokoui2_svn.bb
@@ -1,14 +1,15 @@
 SECTION = "openmoko/libs"
 DEPENDS = "gtk+"
 PV = "0.1.0+svn${SVNREV}"
-PR = "r1"
+PR = "r2"
 
 inherit openmoko2
 
+do_configure_prepend() {
+        touch gtk-doc.make
+}
+
 do_stage() {
         autotools_stage_all
 }
 
-
-
-
diff --git a/packages/openmoko2/moko-gtk-engine_svn.bb b/packages/openmoko2/moko-gtk-engine_svn.bb
new file mode 100644
index 0000000000..38bc691c8e
--- /dev/null
+++ b/packages/openmoko2/moko-gtk-engine_svn.bb
@@ -0,0 +1,14 @@
+DESCRIPTION = "Moko GTK+ theme engine"
+SECTION = "openmoko/libs"
+PV = "0.1.0+svn${SVNREV}"
+PR = "r0"
+
+inherit openmoko2
+
+PACKAGES += "moko-gtk-theme"
+FILES_${PN} = "${libdir}/gtk-2.0/*/engines/*.so "
+FILES_${PN}-dev = "${libdir}/gtk-2.0/*/engines/*"
+FILES_${PN}-dbg = "${libdir}/gtk-2.0/*/engines/.debug"
+FILES_moko-gtk-theme = "${datadir}/themes"
+RDEPENDS_${PN} = "moko-gtk-theme"
+
diff --git a/packages/openmoko2/openmoko-browser2_svn.bb b/packages/openmoko2/openmoko-browser2_svn.bb
new file mode 100644
index 0000000000..edfeca7702
--- /dev/null
+++ b/packages/openmoko2/openmoko-browser2_svn.bb
@@ -0,0 +1,7 @@
+DESCRIPTION = "The OpenMoko Webbrowser"
+SECTION = "openmoko/apps"
+DEPENDS += "intltool libmokoui2 check webkit-gtk"
+PV = "0.0.1+svn${SVNREV}"
+PR = "r0"
+
+inherit openmoko2
diff --git a/packages/openmoko2/openmoko-icon-theme-standard2-qvga_svn.bb b/packages/openmoko2/openmoko-icon-theme-standard2-qvga_svn.bb
new file mode 100644
index 0000000000..723042da94
--- /dev/null
+++ b/packages/openmoko2/openmoko-icon-theme-standard2-qvga_svn.bb
@@ -0,0 +1,54 @@
+DESCRIPTION = "Standard Gtk+ icon theme for the OpenMoko distribution, QVGA edition"
+SECTION = "openmoko/base"
+PV = "0.1.0+svn${SVNREV}"
+PR = "r0"
+
+inherit openmoko2
+
+SRC_URI = "svn://svn.openmoko.org/trunk/src/target/OM-2007.2/artwork/;module=icons;proto=http"
+S = "${WORKDIR}/icons"
+
+pkg_postinst_${PN} () {
+    if [ "x$D" != "x" ]; then
+        exit 1
+    fi
+    gtk-update-icon-cache -q /usr/share/icons/openmoko-standard
+}
+
+do_configure_prepend () {
+	cd ${S}
+	#
+	# don't include 36x36 and 128x128 icons, 32x32 and 48x48 stock icons
+	#
+	sed -i -e "/\(36\|128\)/d" -e "/\(32\|48\)\/stock/d" configure.ac
+	cd openmoko-standard
+	sed -i -e "s/\(36x36\|128x128\) //g" Makefile.am
+	sed -i "/^SUBDIRS=/s/ stock//" {32x32,48x48}/Makefile.am 
+	#
+	# rescale stock icons to 22x22
+	#
+	for png in $(ls */stock/*.png | sed "s,.*/,," | sort | uniq); do
+		svg=scalable/stock/$(basename $png .png).svg
+		out=22x22/stock/$png
+		if [ -f $svg ]; then
+			#
+			# if there are vector graphics, rerender
+			#
+			rsvg -w 22 -h 22 $svg $out
+		else
+			#
+			# otherwise rescale biggest existing bitmap
+			#
+			png=$(echo */stock/$png | sed "s/.* //")
+			convert -scale 22x22 $png $out
+		fi
+	done
+	#
+	# register the rescaled icons with automake
+	#
+	cd 22x22/stock
+	sed -i "/^icons_DATA/s/=.*/= $(echo *.png)/" Makefile.am
+	cd ${S}
+}
+
+PACKAGE_ARCH = "all"
diff --git a/packages/openmoko2/openmoko-session2.bb b/packages/openmoko2/openmoko-session2.bb
index de2d7cdff6..b1f9dae38d 100644
--- a/packages/openmoko2/openmoko-session2.bb
+++ b/packages/openmoko2/openmoko-session2.bb
@@ -1,19 +1,20 @@
-DESCRIPTION = "Custom MB session files for OpenMoko"
+DESCRIPTION = "Custom Matchbox session files for OpenMoko"
 LICENSE = "GPL"
 SECTION = "x11"
 RDEPENDS = "matchbox-common matchbox-applet-startup-monitor matchbox-panel-2"
 RDEPENDS += "openmoko-common2 openmoko-today2 openmoko-dialer2"
 RCONFLICTS = "openmoko-session"
-PR = "r31"
+PR = "r33"
 
 SRC_URI = "file://etc"
 S = ${WORKDIR}
 
 do_install() {
-	cp -R ${S}/etc ${D}/etc
-	rm -fR ${D}/etc/.svn
-	rm -fR ${D}/etc/matchbox/.svn
-	chmod -R 755 ${D}/etc
+        install -d ${D}${sysconfdir}
+	cp -R ${S}/etc/* ${D}${sysconfdir}
+	rm -fR ${D}${sysconfdir}/.svn
+	rm -fR ${D}${sysconfdir}/matchbox/.svn
+	chmod -R 755 ${D}${sysconfdir}/
 }
 
 pkg_postinst_openmoko-session2 () {
@@ -31,3 +32,6 @@ gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --dire
 }
 
 PACKAGE_ARCH = "all"
+
+CONFFILES_${PN} = "${sysconfdir}/matchbox/session"
+
diff --git a/packages/openmoko2/openmoko-session2/etc/matchbox/session b/packages/openmoko2/openmoko-session2/etc/matchbox/session
index 4f2f8ae110..558f55ee87 100755
--- a/packages/openmoko2/openmoko-session2/etc/matchbox/session
+++ b/packages/openmoko2/openmoko-session2/etc/matchbox/session
@@ -1,8 +1,6 @@
 #!/bin/sh
 SHOWCURSOR="no"
 
-export GTK_MODULES="libgtkstylus.so" 
-
 openmoko-today &
 openmoko-dialer &
 
diff --git a/packages/openmoko2/openmoko-sound-system2/.mtn2git_empty b/packages/openmoko2/openmoko-sound-system2/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/openmoko2/openmoko-sound-system2/.mtn2git_empty
diff --git a/packages/openmoko2/openmoko-sound-system2/pulseaudio b/packages/openmoko2/openmoko-sound-system2/pulseaudio
new file mode 100755
index 0000000000..76daacd3ae
--- /dev/null
+++ b/packages/openmoko2/openmoko-sound-system2/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/openmoko2/openmoko-sound-system2/session b/packages/openmoko2/openmoko-sound-system2/session
new file mode 100644
index 0000000000..dfef83d934
--- /dev/null
+++ b/packages/openmoko2/openmoko-sound-system2/session
@@ -0,0 +1,28 @@
+#!/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
+load-sample ringtone /usr/share/openmoko/sounds/ringtone_classy.wav
+
diff --git a/packages/openmoko2/openmoko-sound-system2_0.1.0.bb b/packages/openmoko2/openmoko-sound-system2_0.1.0.bb
new file mode 100644
index 0000000000..35bfe66318
--- /dev/null
+++ b/packages/openmoko2/openmoko-sound-system2_0.1.0.bb
@@ -0,0 +1,33 @@
+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 \
+"
+RREPLACES = "openmoko-sound-system"
+RPROVIDES = "openmoko-sound-system"
+PR = "r1"
+
+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/openmoko2/openmoko-sound-theme-standard2_svn.bb b/packages/openmoko2/openmoko-sound-theme-standard2_svn.bb
new file mode 100644
index 0000000000..0693b9bb8a
--- /dev/null
+++ b/packages/openmoko2/openmoko-sound-theme-standard2_svn.bb
@@ -0,0 +1,25 @@
+DESCRIPTION = "Standard sound theme for the OpenMoko distribution"
+SECTION = "openmoko/base"
+RREPLACES = "openmoko-sound-theme-standard"
+RPROVIDES = "openmoko-sound-theme-standard"
+PV = "0.1+svnr${SRCREV}"
+PR = "r1"
+
+inherit openmoko2 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 ringtone_classy.wav notify_doorbell.wav startup_openmoko.wav; do
+                cp -f ${S}/$i ${D}${datadir}/openmoko/sounds/
+        done
+}
+
+FILES_${PN} = "${datadir}"
+