summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--conf/distro/angstrom-2008.1.conf2
-rw-r--r--conf/distro/include/sane-srcrevs.inc7
-rw-r--r--conf/machine/fic-gta01.conf2
-rw-r--r--conf/machine/fic-gta02.conf2
-rw-r--r--files/device_table-ezx.txt1
-rw-r--r--packages/ezx/ezxd/ezxd.init4
-rw-r--r--packages/gsm/files/default6
-rw-r--r--packages/gsm/libgsmd_svn.bb7
-rwxr-xr-xpackages/linux/linux-ezx-2.6.21/a1200/defconfig3
-rwxr-xr-xpackages/linux/linux-ezx-2.6.21/a780/defconfig3
-rwxr-xr-xpackages/linux/linux-ezx-2.6.21/e680/defconfig3
-rwxr-xr-xpackages/linux/linux-ezx-2.6.21/rokre2/defconfig3
-rwxr-xr-xpackages/linux/linux-ezx-2.6.21/rokre6/defconfig3
-rw-r--r--packages/linux/linux-ezx_2.6.21.bb2
-rw-r--r--packages/openmoko2/openmoko-icon-theme-standard2-qvga_svn.bb54
-rw-r--r--packages/openmoko2/openmoko-session2.bb4
-rwxr-xr-xpackages/openmoko2/openmoko-session2/etc/matchbox/session2
-rw-r--r--packages/openmoko2/openmoko-sound-system2/.mtn2git_empty0
-rwxr-xr-xpackages/openmoko2/openmoko-sound-system2/pulseaudio46
-rw-r--r--packages/openmoko2/openmoko-sound-system2/session28
-rw-r--r--packages/openmoko2/openmoko-sound-system2_0.1.0.bb31
-rw-r--r--packages/pango/pango-1.18.1/.mtn2git_empty0
-rw-r--r--packages/pango/pango-1.18.1/no-tests.patch10
-rw-r--r--packages/pango/pango_1.18.1.bb1
-rw-r--r--packages/tasks/task-openmoko-feed.bb4
-rw-r--r--packages/tasks/task-openmoko.bb46
26 files changed, 227 insertions, 47 deletions
diff --git a/conf/distro/angstrom-2008.1.conf b/conf/distro/angstrom-2008.1.conf
index a5a99d3a2c..bc9e42fc57 100644
--- a/conf/distro/angstrom-2008.1.conf
+++ b/conf/distro/angstrom-2008.1.conf
@@ -39,6 +39,6 @@ PREFERRED_VERSION_glibc-initial = "2.6.1"
#Prefer a newer GTK+ and friends
PREFERRED_VERSION_gtk+ = "2.12.0"
-
+PREFERRED_VERSION_glib-2.0 = "2.14.0"
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index 1ad75d108b..6553591a04 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -11,7 +11,7 @@ SRCREV_pn-dfu-util-native ?= "2866"
SRCREV_pn-eglibc ?= "3468"
SRCREV_pn-eglibc-initial ?= "3468"
SRCREV_pn-eglibc-intermediate ?= "3468"
-SRCREV_pn-ezxd ?= "2052"
+SRCREV_pn-ezxd ?= "2058"
SRCREV_pn-elf2flt="1786"
SRCREV_pn-fbgrab-viewer-native ?= "1943"
SRCREV_pn-fstests ?= "204"
@@ -45,13 +45,14 @@ SRCREV_pn-openmoko-contacts2 ?= "335"
SRCREV_pn-openmoko-dates ?= "467"
SRCREV_pn-openmoko-dates2 ?= "563"
SRCREV_pn-openmoko-dialer ?= "2811"
-SRCREV_pn-openmoko-dialer2 ?= "2946"
+SRCREV_pn-openmoko-dialer2 ?= "2976"
SRCREV_pn-openmoko-feedreader2 ?= "2944"
SRCREV_pn-openmoko-finger-demo ?= "1671"
SRCREV_pn-openmoko-firststart2 ?= "2873"
SRCREV_pn-openmoko-footer ?= "2354"
SRCREV_pn-openmoko-icon-theme-standard ?= "2232"
SRCREV_pn-openmoko-icon-theme-standard2 ?= "2967"
+SRCREV_pn-openmoko-icon-theme-standard2-qvga ?= "2967"
SRCREV_pn-openmoko-keyboard ?= "1631"
SRCREV_pn-openmoko-libs ?= "2367"
SRCREV_pn-openmoko-mediaplayer2 ?= "2952"
@@ -67,7 +68,7 @@ SRCREV_pn-openmoko-panel-mainmenu ?= "2567"
SRCREV_pn-openmoko-panel-usb ?= "2893"
SRCREV_pn-openmoko-session ?= "152"
SRCREV_pn-openmoko-simplemediaplayer ?= "1688"
-SRCREV_pn-openmoko-sound-theme-standard2 ?= "2974"
+SRCREV_pn-openmoko-sound-theme-standard2 ?= "2976"
SRCREV_pn-openmoko-stylus-demo ?= "2324"
SRCREV_pn-openmoko-stylus-demo-simple ?= "1818"
SRCREV_pn-openmoko-taskmanager ?= "1663"
diff --git a/conf/machine/fic-gta01.conf b/conf/machine/fic-gta01.conf
index 97e5a0cf37..ffd3584da6 100644
--- a/conf/machine/fic-gta01.conf
+++ b/conf/machine/fic-gta01.conf
@@ -10,7 +10,7 @@ PACKAGE_EXTRA_ARCHS = "armv4t"
PREFERRED_PROVIDER_virtual/kernel = "linux-openmoko"
UBOOT_ENTRYPOINT = "30008000"
-MACHINE_FEATURES = "kernel26 apm alsa bluetooth usbgadget usbhost phone"
+MACHINE_FEATURES = "kernel26 apm alsa bluetooth gps usbgadget usbhost phone"
MACHINE_DISPLAY_WIDTH_PIXELS = "480"
MACHINE_DISPLAY_HEIGHT_PIXELS = "640"
MACHINE_DISPLAY_ORIENTATION = "0"
diff --git a/conf/machine/fic-gta02.conf b/conf/machine/fic-gta02.conf
index 2febe9f897..99eb9f0832 100644
--- a/conf/machine/fic-gta02.conf
+++ b/conf/machine/fic-gta02.conf
@@ -10,7 +10,7 @@ PACKAGE_EXTRA_ARCHS = "armv4t"
PREFERRED_PROVIDER_virtual/kernel = "linux-openmoko"
UBOOT_ENTRYPOINT = "30008000"
-MACHINE_FEATURES = "kernel26 apm alsa bluetooth usbgadget usbhost phone wifi"
+MACHINE_FEATURES = "kernel26 apm alsa bluetooth gps usbgadget usbhost phone wifi"
MACHINE_DISPLAY_WIDTH_PIXELS = "480"
MACHINE_DISPLAY_HEIGHT_PIXELS = "640"
MACHINE_DISPLAY_ORIENTATION = "0"
diff --git a/files/device_table-ezx.txt b/files/device_table-ezx.txt
index 5e54ff928b..ad382052e0 100644
--- a/files/device_table-ezx.txt
+++ b/files/device_table-ezx.txt
@@ -1 +1,2 @@
/dev/mux c 660 0 5 250 0 0 1 8
+/dev/input/uinput c 660 0 0 10 223 - - -
diff --git a/packages/ezx/ezxd/ezxd.init b/packages/ezx/ezxd/ezxd.init
index dccd293af1..3e33064166 100644
--- a/packages/ezx/ezxd/ezxd.init
+++ b/packages/ezx/ezxd/ezxd.init
@@ -49,8 +49,8 @@ start_it_up()
shut_it_down()
{
- if [ -d $EVENTDIR ]; then
- run-parts --reverse --arg=stop $EVENTDIR
+ if [ -d "$EVENTDIR" ]; then
+ run-parts --arg=stop $EVENTDIR
fi
echo -n "Stopping $DESC: "
start-stop-daemon --stop --quiet --pidfile $PIDFILE
diff --git a/packages/gsm/files/default b/packages/gsm/files/default
index 14c8fc8589..0d3eb74c7d 100644
--- a/packages/gsm/files/default
+++ b/packages/gsm/files/default
@@ -9,7 +9,7 @@ case `cpuinfo_id` in
GSM_RES="/sys/bus/platform/devices/gta01-pm-gsm.0/reset"
GSM_DEV="/dev/ttySAC0"
;;
- "HTC Apache"|"HTC Blueangel")
+ "HTC Apache"|"HTC Blueangel"|"HTC Universal")
GSMD_OPTS="-s 115200 -F"
GSM_DEV="/dev/ttyS0"
;;
@@ -21,10 +21,6 @@ case `cpuinfo_id` in
GSMD_OPTS="-s 115200 -F"
GSM_DEV="/dev/ttyS1"
;;
- "HTC Universal")
- GSMD_OPTS="-s 115200 -F -w 1"
- GSM_DEV="/dev/ttyS0"
- ;;
"Palm Treo 650")
GSMD_OPTS="-s 460800 -F -w 1"
GSM_DEV="/dev/ttyS0"
diff --git a/packages/gsm/libgsmd_svn.bb b/packages/gsm/libgsmd_svn.bb
index 50debc0e11..a3b8f8a21a 100644
--- a/packages/gsm/libgsmd_svn.bb
+++ b/packages/gsm/libgsmd_svn.bb
@@ -4,7 +4,7 @@ LICENSE = "GPL LGPL"
SECTION = "libs/gsm"
PROVIDES += "gsmd"
PV = "0.1+svnr${SRCREV}"
-PR = "r26"
+PR = "r27"
SRC_URI = "svn://svn.openmoko.org/trunk/src/target;module=gsm;proto=http \
file://gsmd \
@@ -12,6 +12,9 @@ SRC_URI = "svn://svn.openmoko.org/trunk/src/target;module=gsm;proto=http \
S = "${WORKDIR}/gsm"
inherit autotools pkgconfig update-rc.d
+# handle update-rc.d RDEPENDS manually, we don't need it on
+# anything but gsmd
+RDEPENDS_append = ""
INITSCRIPT_NAME = "gsmd"
INITSCRIPT_PARAMS = "defaults 35"
@@ -44,7 +47,7 @@ RDEPENDS_gsmd-plugins = "gsmd-plugin-machine-generic \
gsmd-plugin-vendor-tihtc \
"
-RDEPENDS_gsmd = "initscripts"
+RDEPENDS_gsmd = "update-rc.d initscripts"
RRECOMMENDS_gsmd = "gsmd-plugins"
FILES_${PN}-dbg += "${libdir}/gsmd/.debug/*"
diff --git a/packages/linux/linux-ezx-2.6.21/a1200/defconfig b/packages/linux/linux-ezx-2.6.21/a1200/defconfig
index 3cf42ac8b1..b40f2f6eba 100755
--- a/packages/linux/linux-ezx-2.6.21/a1200/defconfig
+++ b/packages/linux/linux-ezx-2.6.21/a1200/defconfig
@@ -795,7 +795,8 @@ CONFIG_INPUT_TOUCHSCREEN=y
# CONFIG_TOUCHSCREEN_TOUCHWIN is not set
# CONFIG_TOUCHSCREEN_UCB1400 is not set
CONFIG_TOUCHSCREEN_PCAP=y
-# CONFIG_INPUT_MISC is not set
+CONFIG_INPUT_MISC=y
+CONFIG_INPUT_UINPUT=y
#
# Hardware I/O ports
diff --git a/packages/linux/linux-ezx-2.6.21/a780/defconfig b/packages/linux/linux-ezx-2.6.21/a780/defconfig
index 9ea8e88266..613fe3de5b 100755
--- a/packages/linux/linux-ezx-2.6.21/a780/defconfig
+++ b/packages/linux/linux-ezx-2.6.21/a780/defconfig
@@ -792,7 +792,8 @@ CONFIG_INPUT_TOUCHSCREEN=y
# CONFIG_TOUCHSCREEN_TOUCHWIN is not set
# CONFIG_TOUCHSCREEN_UCB1400 is not set
CONFIG_TOUCHSCREEN_PCAP=y
-# CONFIG_INPUT_MISC is not set
+CONFIG_INPUT_MISC=y
+CONFIG_INPUT_UINPUT=y
#
# Hardware I/O ports
diff --git a/packages/linux/linux-ezx-2.6.21/e680/defconfig b/packages/linux/linux-ezx-2.6.21/e680/defconfig
index 770df7f34c..94947cceb3 100755
--- a/packages/linux/linux-ezx-2.6.21/e680/defconfig
+++ b/packages/linux/linux-ezx-2.6.21/e680/defconfig
@@ -792,7 +792,8 @@ CONFIG_INPUT_TOUCHSCREEN=y
# CONFIG_TOUCHSCREEN_TOUCHWIN is not set
# CONFIG_TOUCHSCREEN_UCB1400 is not set
CONFIG_TOUCHSCREEN_PCAP=y
-# CONFIG_INPUT_MISC is not set
+CONFIG_INPUT_MISC=y
+CONFIG_INPUT_UINPUT=y
#
# Hardware I/O ports
diff --git a/packages/linux/linux-ezx-2.6.21/rokre2/defconfig b/packages/linux/linux-ezx-2.6.21/rokre2/defconfig
index d4a6e25c00..8d0f391c08 100755
--- a/packages/linux/linux-ezx-2.6.21/rokre2/defconfig
+++ b/packages/linux/linux-ezx-2.6.21/rokre2/defconfig
@@ -792,7 +792,8 @@ CONFIG_INPUT_TOUCHSCREEN=y
# CONFIG_TOUCHSCREEN_TOUCHWIN is not set
# CONFIG_TOUCHSCREEN_UCB1400 is not set
CONFIG_TOUCHSCREEN_PCAP=y
-# CONFIG_INPUT_MISC is not set
+CONFIG_INPUT_MISC=y
+CONFIG_INPUT_UINPUT=y
#
# Hardware I/O ports
diff --git a/packages/linux/linux-ezx-2.6.21/rokre6/defconfig b/packages/linux/linux-ezx-2.6.21/rokre6/defconfig
index 7a203fa0a7..6351d3a45b 100755
--- a/packages/linux/linux-ezx-2.6.21/rokre6/defconfig
+++ b/packages/linux/linux-ezx-2.6.21/rokre6/defconfig
@@ -795,7 +795,8 @@ CONFIG_INPUT_TOUCHSCREEN=y
# CONFIG_TOUCHSCREEN_TOUCHWIN is not set
# CONFIG_TOUCHSCREEN_UCB1400 is not set
CONFIG_TOUCHSCREEN_PCAP=y
-# CONFIG_INPUT_MISC is not set
+CONFIG_INPUT_MISC=y
+CONFIG_INPUT_UINPUT=y
#
# Hardware I/O ports
diff --git a/packages/linux/linux-ezx_2.6.21.bb b/packages/linux/linux-ezx_2.6.21.bb
index deaa99d5ad..2e9569f43c 100644
--- a/packages/linux/linux-ezx_2.6.21.bb
+++ b/packages/linux/linux-ezx_2.6.21.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "2.6 Linux Development Kernel for the Motorola GSM phones A780 and
AUTHOR = "The OpenEZX Team <openezx-devel@lists.openezx.org>"
HOMEPAGE = "http://www.openezx.org"
EZX = "ezxdev"
-PR = "${EZX}-r16"
+PR = "${EZX}-r17"
require linux.inc
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..235ca6ad97 100644
--- a/packages/openmoko2/openmoko-session2.bb
+++ b/packages/openmoko2/openmoko-session2.bb
@@ -1,10 +1,10 @@
-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 = "r32"
SRC_URI = "file://etc"
S = ${WORKDIR}
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..46397afa9b
--- /dev/null
+++ b/packages/openmoko2/openmoko-sound-system2_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 = "r0"
+
+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/pango/pango-1.18.1/.mtn2git_empty b/packages/pango/pango-1.18.1/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/pango/pango-1.18.1/.mtn2git_empty
diff --git a/packages/pango/pango-1.18.1/no-tests.patch b/packages/pango/pango-1.18.1/no-tests.patch
new file mode 100644
index 0000000000..dafcb20c3b
--- /dev/null
+++ b/packages/pango/pango-1.18.1/no-tests.patch
@@ -0,0 +1,10 @@
+--- /tmp/Makefile.am 2007-03-01 13:29:37.000000000 +0100
++++ pango-1.16.0/Makefile.am 2007-03-01 13:29:52.545251000 +0100
+@@ -1,6 +1,6 @@
+ ## Process this file with automake to create Makefile.in.
+
+-SUBDIRS= pango modules pango-view examples docs tools tests
++SUBDIRS= pango modules pango-view examples docs tools
+
+ EXTRA_DIST = \
+ autogen.sh \
diff --git a/packages/pango/pango_1.18.1.bb b/packages/pango/pango_1.18.1.bb
new file mode 100644
index 0000000000..8e3e8e7d3a
--- /dev/null
+++ b/packages/pango/pango_1.18.1.bb
@@ -0,0 +1 @@
+require pango.inc
diff --git a/packages/tasks/task-openmoko-feed.bb b/packages/tasks/task-openmoko-feed.bb
index bc4a4ff967..f11f322e39 100644
--- a/packages/tasks/task-openmoko-feed.bb
+++ b/packages/tasks/task-openmoko-feed.bb
@@ -24,9 +24,13 @@ RDEPENDS_task-openmoko-feed = "\
openssh openssh-scp openssh-ssh openssh-sshd openssh-sftp openssh-misc \
python python-pygtk python-pyserial \
ruby \
+ libsdl-x11 libsdl-mixer libsdl-net libsdl-ttf \
synergy \
tzdata \
+ timezones \
tor \
vnc \
+ wxwidgets \
+ x11vnc \
"
diff --git a/packages/tasks/task-openmoko.bb b/packages/tasks/task-openmoko.bb
index 2583416617..3b48b674c7 100644
--- a/packages/tasks/task-openmoko.bb
+++ b/packages/tasks/task-openmoko.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "OpenMoko: Tasks for the OpenMoko Linux Distribution"
SECTION = "openmoko/base"
LICENSE = "MIT"
PROVIDES = "task-openmoko-everything"
-PR = "r62"
+PR = "r65"
inherit task
@@ -52,63 +52,65 @@ RDEPENDS_task-openmoko-ui = "\
pango-module-basic-x \
pango-module-basic-fc \
gtk+ \
- libgtkstylus \
- libgtkinput \
matchbox-common \
matchbox-wm \
xserver-kdrive-fbdev \
xserver-kdrive-common \
xserver-nodm-init \
-# x11-c-locale \
ttf-bitstream-vera \
xauth \
xhost \
xset \
xrandr \
+ \
settings-daemon \
+ notification-daemon \
+ neod \
+ libnotify \
\
openmoko-session2 \
- openmoko-sound-system \
+ openmoko-sound-system2 \
openmoko-sound-theme-standard2 \
- neod \
+ \
gpe-scap \
"
-# handle theming. FIXME: properly use machine database in a smart way,
+# Handle theming. FIXME: properly use machine database in a smart way,
# taking into account not only size but also PPI! Ultimately this might
# need recomputing some theme files and images on-the-fly :/ SVG and logical
# theme description anyone? Or simply Edje to the rescue! :D
-THEMES = "openmoko-icon-theme-standard2 openmoko-theme-standard2"
-THEMES_a780 = "openmoko-icon-theme-standard2 openmoko-theme-standard2-qvga"
-THEMES_e680 = "openmoko-icon-theme-standard2 openmoko-theme-standard2-qvga"
-THEMES_a1200 = "openmoko-icon-theme-standard2 openmoko-theme-standard2-qvga"
-THEMES_rokre2 = "openmoko-icon-theme-standard2 openmoko-theme-standard2-qvga"
-THEMES_rokre6 = "openmoko-icon-theme-standard2 openmoko-theme-standard2-qvga"
-THEMES_magician = "openmoko-icon-theme-standard2 openmoko-theme-standard2-qvga"
+THEMES = "openmoko-icon-theme-standard2 openmoko-theme-standard2"
+THEMES_a780 = "openmoko-icon-theme-standard2-qvga openmoko-theme-standard2-qvga"
+THEMES_e680 = "openmoko-icon-theme-standard2-qvga openmoko-theme-standard2-qvga"
+THEMES_a1200 = "openmoko-icon-theme-standard2-qvga openmoko-theme-standard2-qvga"
+THEMES_rokre2 = "openmoko-icon-theme-standard2-qvga openmoko-theme-standard2-qvga"
+THEMES_rokre6 = "openmoko-icon-theme-standard2-qvga openmoko-theme-standard2-qvga"
+THEMES_magician = "openmoko-icon-theme-standard2-qvga openmoko-theme-standard2-qvga"
RDEPENDS_task-openmoko-ui += "${THEMES}"
+PACKAGE_ARCH_task-openmoko-ui = "${MACHINE_ARCH}"
#
# task-openmoko-base
#
-DESCRIPTION_task-openmoko-base = "OpenMoko: Main-Menu Launcher, Top Panel, and Footer"
+DESCRIPTION_task-openmoko-base = "OpenMoko: Top Panel, Application Launcher, Application Manager"
RDEPENDS_task-openmoko-base = "\
matchbox-panel-2 \
matchbox-panel-2-applets \
- matchbox-applet-inputmanager \
-# openmoko-appmanager \
matchbox-keyboard-inputmethod \
matchbox-keyboard-im \
matchbox-keyboard-applet \
matchbox-stroke \
openmoko-terminal2 \
- openmoko-keyboard \
-# openmoko-panel-mainmenu \
+# openmoko-keyboard \
openmoko-panel-battery \
openmoko-panel-bt \
openmoko-panel-clock \
openmoko-panel-usb \
- openmoko-panel-gps \
+ ${@base_contains('MACHINE_FEATURES', 'gps', 'openmoko-panel-gps', '',d)} \
+ \
+ openmoko-today2 \
+# openmoko-appmanager \
"
#
@@ -126,7 +128,7 @@ RDEPENDS_task-openmoko-phone = "\
#
# task-openmoko-pim
#
-DESCRIPTION_task-openmoko-pim = "OpenMoko: PIM Applications"
+DESCRIPTION_task-openmoko-pim = "OpenMoko: Personal Information Management Suite"
RDEPENDS_task-openmoko-pim = "\
eds-dbus \
openmoko-calculator2 \
@@ -134,7 +136,7 @@ RDEPENDS_task-openmoko-pim = "\
openmoko-dates2 \
openmoko-feedreader2 \
openmoko-tasks2 \
- openmoko-today2 \
+ openmoko-mediaplayer2 \
# openmoko-messages \
"