merge of 'af851f4509aae0ba4c539361ee5e09b515f331f8'

     and 'b43a21b343fe9c1dc9cb8c83379234f15bc53f72'

19 files changed, 115 insertions, 118 deletions

diff --git a/packages/e17/e-wm_cvs.bb b/packages/e17/e-wm_cvs.bb
index 87161526e0..b3a4201bcf 100644
--- a/packages/e17/e-wm_cvs.bb
+++ b/packages/e17/e-wm_cvs.bb
@@ -1,8 +1,8 @@
 DESCRIPTION = "The Enlightenment Window Mananger Version 17"
-DEPENDS = "eet evas ecore edje efreet"
+DEPENDS = "eet evas ecore edje efreet edbus"
 LICENSE = "MIT BSD"
 PV = "0.16.999.042+cvs${SRCDATE}"
-PR = "r8"
+PR = "r9"
 
 inherit e update-alternatives
 
diff --git a/packages/efl1/edbus_cvs.bb b/packages/efl1/edbus_cvs.bb
index e59ba0be1a..8574d9f29e 100644
--- a/packages/efl1/edbus_cvs.bb
+++ b/packages/efl1/edbus_cvs.bb
@@ -1,8 +1,8 @@
 DESCRIPTION = "DBus and HAL convenience wrappers for EFL"
-DEPENDS = "dbus ecore efreet ewl"
+DEPENDS = "dbus ecore"
 LICENSE = "MIT BSD"
 PV = "0.5.0.043+cvs${SRCDATE}"
-PR = "r0"
+PR = "r1"
 
 inherit efl
 
diff --git a/packages/gnash/gnash_0.8.3.bb b/packages/gnash/gnash_0.8.3.bb
new file mode 100644
index 0000000000..383f970755
--- /dev/null
+++ b/packages/gnash/gnash_0.8.3.bb
@@ -0,0 +1,6 @@
+require gnash.inc
+
+do_configure() {
+	gnu-configize
+	oe_runconf
+}
diff --git a/packages/hal/hal_0.5.9.1.bb b/packages/hal/hal_0.5.9.1.bb
index 3d2ba155b5..8bd193c40a 100644
--- a/packages/hal/hal_0.5.9.1.bb
+++ b/packages/hal/hal_0.5.9.1.bb
@@ -7,7 +7,7 @@ DEPENDS = "virtual/kernel dbus-glib udev intltool-native expat libusb-compat"
 RDEPENDS_${PN} += "udev hal-info"
 RRECOMMENDS_${PN} += "udev-utils"
 
-PR = "r7"
+PR = "r8"
 
 SRC_URI = "http://freedesktop.org/~david/dist/hal-${PV}.tar.gz \
            file://configure_fix.patch;patch=1 \
@@ -52,11 +52,11 @@ pkg_postinst_hal () {
 		exit 1
 	fi
 
-	/etc/init.d/populate-volatile.sh update
-
 	grep haldaemon /etc/group || addgroup haldaemon
 	grep haldaemon /etc/passwd || adduser --disabled-password --system --home /var/run/hald --no-create-home haldaemon --ingroup haldaemon -g HAL
 
+	/etc/init.d/populate-volatile.sh update
+
 	DBUSPID=`pidof dbus-daemon`
 
 	if [ "x$DBUSPID" != "x" ]; then
diff --git a/packages/hal/hal_0.5.9.bb b/packages/hal/hal_0.5.9.bb
index b878638ff2..8dabddf23c 100644
--- a/packages/hal/hal_0.5.9.bb
+++ b/packages/hal/hal_0.5.9.bb
@@ -5,7 +5,7 @@ RDEPENDS += "udev hal-info"
 #RDEPENDS_hal-device-manager = "python hal python-pygnome"
 RRECOMMENDS = "udev-utils"
 
-PR = "r7"
+PR = "r8"
 
 SRC_URI += "file://99_hal \
             file://20hal \
@@ -53,11 +53,11 @@ pkg_postinst_hal () {
 		exit 1
 	fi
 
-	/etc/init.d/populate-volatile.sh update
-
 	grep haldaemon /etc/group || addgroup haldaemon
 	grep haldaemon /etc/passwd || adduser --disabled-password --system --home /var/run/hald --no-create-home haldaemon --ingroup haldaemon -g HAL
 
+	/etc/init.d/populate-volatile.sh update
+
 	DBUSPID=`pidof dbus-daemon`
 
 	if [ "x$DBUSPID" != "x" ]; then
diff --git a/packages/hal/hal_git.bb b/packages/hal/hal_git.bb
index 659ab8eb6c..49ecfde9ea 100644
--- a/packages/hal/hal_git.bb
+++ b/packages/hal/hal_git.bb
@@ -14,7 +14,7 @@ SRC_URI = "git://anongit.freedesktop.org/hal/;protocol=git \
         file://99_hal"
 
 PV = "0.5.9.1+git${SRCDATE}"
-PR = "r5"
+PR = "r6"
 
 S = "${WORKDIR}/git"
 
@@ -53,11 +53,11 @@ pkg_postinst_hal () {
 		exit 1
 	fi
 
-	/etc/init.d/populate-volatile.sh update
-
 	grep haldaemon /etc/group || addgroup haldaemon
 	grep haldaemon /etc/passwd || adduser --disabled-password --system --home /var/run/hald --no-create-home haldaemon --ingroup haldaemon -g HAL
 
+	/etc/init.d/populate-volatile.sh update
+
 	DBUSPID=`pidof dbus-daemon`
 
 	if [ "x$DBUSPID" != "x" ]; then
diff --git a/packages/libsidplay/libsidplay_1.36.59.bb b/packages/libsidplay/libsidplay_1.36.59.bb
index fc9a01279c..9ca4ee13c4 100644
--- a/packages/libsidplay/libsidplay_1.36.59.bb
+++ b/packages/libsidplay/libsidplay_1.36.59.bb
@@ -3,7 +3,11 @@ SECTION = "libs"
 PRIORITY = "optional"
 LICENSE = "GPL"
 
-SRC_URI = "http://www.geocities.com/SiliconValley/Lakes/5147/sidplay/packages/libsidplay-${PV}.tgz"
+PR = "r1"
+
+SRC_URI = "http://www.geocities.com/SiliconValley/Lakes/5147/sidplay/packages/libsidplay-${PV}.tgz \
+           http://ftp.debian.org/debian/pool/main/libs/libsidplay/libsidplay_1.36.59-5.diff.gz;patch=1 \
+"
 
 inherit autotools
 
diff --git a/packages/linux/linux-omap2-git/beagleboard/defconfig b/packages/linux/linux-omap2-git/beagleboard/defconfig
index 3ef03cf5d5..7fc46c9113 100644
--- a/packages/linux/linux-omap2-git/beagleboard/defconfig
+++ b/packages/linux/linux-omap2-git/beagleboard/defconfig
@@ -4,7 +4,7 @@
 # Tue Jun 24 20:16:52 2008
 #
 CONFIG_ARM=y
-CONFIG_SYS_SUPPORTS_APM_EMULATION=y
+CONFIG_SYS_SUPPORTS_APM_EMULATION=n
 CONFIG_GENERIC_GPIO=y
 CONFIG_GENERIC_TIME=y
 CONFIG_GENERIC_CLOCKEVENTS=y
@@ -346,7 +346,7 @@ CONFIG_PM=y
 CONFIG_PM_SLEEP=y
 CONFIG_SUSPEND=y
 CONFIG_SUSPEND_FREEZER=y
-CONFIG_APM_EMULATION=y
+CONFIG_APM_EMULATION=n
 CONFIG_ARCH_SUSPEND_POSSIBLE=y
 
 #
diff --git a/packages/linux/linux-omap2_git.bb b/packages/linux/linux-omap2_git.bb
index 4ccf527bae..7042cab3db 100644
--- a/packages/linux/linux-omap2_git.bb
+++ b/packages/linux/linux-omap2_git.bb
@@ -5,7 +5,7 @@ FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/linux-omap2-git/${MA
 SRCREV = "050684c18f2ea0b08fdd5233a0cd3c7f96e00a0e"
 
 PV = "2.6.25+2.6.26-rc8+${PR}+git${SRCREV}"
-PR = "r32"
+PR = "r34"
 
 
 SRC_URI = "git://source.mvista.com/git/linux-omap-2.6.git;protocol=git \
diff --git a/packages/openmoko-projects/illume-theme_svn.bb b/packages/openmoko-projects/illume-theme_svn.bb
index b360d3b14a..3ea672117f 100644
--- a/packages/openmoko-projects/illume-theme_svn.bb
+++ b/packages/openmoko-projects/illume-theme_svn.bb
@@ -4,27 +4,22 @@ LICENSE = "MIT/BSD"
 
 PACKAGE_ARCH="all"
 PV = "0.0+svnr${SRCREV}"
-PR = "r4"
+PR = "r5"
 
 SRC_URI = "svn://svn.projects.openmoko.org/svnroot/;module=illume;proto=https"
 S = "${WORKDIR}/illume"
 
-python do_unpack_append() {
-	bb.note("Unpacking to %s" % os.getcwd())
-	os.system("cd illume; tar -xz --no-same-owner -f misc-data/untar-me-from-root.tar.gz")
-}
-
 CONFFILES_${PN} = "${sysconfdir}/enlightenment/default_profile"
 FILES_${PN} = "${sysconfdir}/enlightenment ${datadir}/enlightenment"
 
 do_install() {
     install -d ${D}${sysconfdir}/enlightenment
     install -d ${D}${datadir}/enlightenment/data/themes/
-    install -d ${D}${datadir}/enlightenment/data/config/
+    install -d ${D}${datadir}/enlightenment/data/init/
 
     # Make illume the default profile
     echo 'E_PROFILE="-profile illume"' > ${D}${sysconfdir}/enlightenment/default_profile
 
     install -m 0644 ${S}/misc-data/illume.edj ${D}${datadir}/enlightenment/data/themes/
-    cp -pPR ${S}/.e/e/config/default ${D}${datadir}/enlightenment/data/config/illume
+    install -m 0644 ${S}/misc-data/illume_init.edj ${D}${datadir}/enlightenment/data/init/
 }
diff --git a/packages/openmoko-projects/illume/keyboard.patch b/packages/openmoko-projects/illume/keyboard.patch
deleted file mode 100644
index 320e798a3e..0000000000
--- a/packages/openmoko-projects/illume/keyboard.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-Index: configure.in
-===================================================================
---- configure.in	(Revision 17)
-+++ configure.in	(Arbeitskopie)
-@@ -28,6 +28,9 @@
- AC_SUBST(LOCALEDIR, "${localedir}")
- AC_DEFINE_UNQUOTED(LOCALEDIR, "${localedir}", "Module Locale Directory")
- 
-+keyboarddir="${datarootdir}/${PACKAGE}/keyboard"
-+AC_SUBST(keyboarddir)
-+
- #
- # Check EFL Libs
- #
-Index: src/e_kbd.c
-===================================================================
---- src/e_kbd.c	(Revision 17)
-+++ src/e_kbd.c	(Arbeitskopie)
-@@ -57,6 +57,7 @@
- 
- static int _e_kbd_config_parse(E_Kbd *kbd, const char *config);
- static Evas_Object *_theme_obj_new(Evas *e, const char *custom_dir, const char *group);
-+static char* _e_kbd_get_default_path(void);
- 
- /* state */
- 
-@@ -470,7 +471,7 @@
-    edje_object_part_swallow(kbd->base_obj, "e.swallow.content", o);
-    evas_object_show(o);
-    kbd->layout_obj = o;
--   _e_kbd_config_parse(kbd, "/home/raster/work/illume/default.kbd");
-+   _e_kbd_config_parse(kbd, _e_kbd_get_default_path());
-    _e_kbd_layout_build(kbd);
-    
-    edje_object_size_min_calc(kbd->base_obj, &mw, &mh);
-@@ -744,3 +745,26 @@
-      }
-    return o;
- }
-+
-+/*
-+ * Return the to be used keyboard file
-+ */
-+static char *
-+_e_kbd_get_default_path()
-+{
-+   static char *buf = 0;
-+
-+   if (getenv("ILLUME_KEYBOARD_DIR"))
-+     {
-+        if (!buf)
-+           {
-+              buf = (char*)malloc(sizeof(char)*PATH_MAX);
-+           }
-+
-+        snprintf(buf, PATH_MAX, "%s/default.kbd", getenv("ILLUME_KEYBOARD_DIR"));
-+        return buf;
-+     }
-+
-+
-+    return KEYBOARDDIR"/default.kbd";
-+}
-Index: src/Makefile.am
-===================================================================
---- src/Makefile.am	(Revision 17)
-+++ src/Makefile.am	(Arbeitskopie)
-@@ -1,6 +1,8 @@
- ACLOCAL_AMFLAGS = -I m4
- MAINTAINERCLEANFILES = Makefile.in
- 
-+AM_CPPFLAGS = -DKEYBOARDDIR=\"$(keyboarddir)\"
-+
- INCLUDES = -I. \
- 	 -I$(top_srcdir) \
- 	 @e_cflags@
-Index: Makefile.am
-===================================================================
---- Makefile.am	(Revision 17)
-+++ Makefile.am	(Arbeitskopie)
-@@ -14,6 +14,9 @@
- files_DATA = module.desktop \
- 	     e-module-illume.edj \
- 	     illume.edj
-+
-+keybddir = $(keyboarddir)
-+keybd_DATA = default.kbd
- 	     
- EXTRA_DIST = $(files_DATA) \
- 	     illume.edc \
diff --git a/packages/openmoko-projects/illume_svn.bb b/packages/openmoko-projects/illume_svn.bb
index 5136240568..f3fb611e09 100644
--- a/packages/openmoko-projects/illume_svn.bb
+++ b/packages/openmoko-projects/illume_svn.bb
@@ -4,10 +4,9 @@ LICENSE = "MIT/BSD"
 DEPENDS = "e-wm eet evas ecore edje embryo efreet edbus edje-native embryo-native"
 RRECOMMENDS = "wamerican"
 PV = "0.0+svnr${SRCREV}"
-PR = "r3"
+PR = "r6"
 
-SRC_URI = "svn://svn.projects.openmoko.org/svnroot/;module=${PN};proto=https \
-           file://keyboard.patch;patch=1;pnum=0;minrev=17;maxrev=20"
+SRC_URI = "svn://svn.projects.openmoko.org/svnroot/;module=${PN};proto=https"
 
 S = "${WORKDIR}/${PN}"
 
@@ -21,5 +20,6 @@ EXTRA_OECONF = "--x-includes=${STAGING_INCDIR}/X11 \
 FILES_${PN} = "${libdir}/enlightenment/modules/*/*.edj \
                ${libdir}/enlightenment/modules/*/*.desktop \
                ${libdir}/enlightenment/modules/*/*/* \
+               ${datadir}/enlightenment/data/config/*/* \
                ${datadir}/${PN} "
 FILES_${PN}-dbg += "${libdir}/enlightenment/modules/*/*/.debug/"
diff --git a/packages/python/python-psyco_1.5.bb b/packages/python/python-psyco_1.6.bb
index 5c47e6971d..5c47e6971d 100644
--- a/packages/python/python-psyco_1.5.bb
+++ b/packages/python/python-psyco_1.6.bb
diff --git a/packages/sqlite/sqlite3.inc b/packages/sqlite/sqlite3.inc
index 68cc3e1c33..93a536e8b6 100644
--- a/packages/sqlite/sqlite3.inc
+++ b/packages/sqlite/sqlite3.inc
@@ -28,6 +28,7 @@ do_compile_prepend() {
 
 do_stage() {
 	oe_libinstall -so libsqlite3 ${STAGING_LIBDIR}
+	install -m 0644 sqlite3.h ${STAGING_INCDIR}
 }
 
 #do_install() {
diff --git a/packages/sqlite/sqlite3_3.5.6.bb b/packages/sqlite/sqlite3_3.5.6.bb
index 53fd96c705..5075dd35b7 100644
--- a/packages/sqlite/sqlite3_3.5.6.bb
+++ b/packages/sqlite/sqlite3_3.5.6.bb
@@ -1 +1,3 @@
 require sqlite3.inc
+
+PR = "r1"
diff --git a/packages/swfdec/swfdec/arm/.mtn2git_empty b/packages/swfdec/swfdec/arm/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/swfdec/swfdec/arm/.mtn2git_empty
diff --git a/packages/swfdec/swfdec/arm/jsautocfg.h b/packages/swfdec/swfdec/arm/jsautocfg.h
new file mode 100644
index 0000000000..7e8171fc23
--- /dev/null
+++ b/packages/swfdec/swfdec/arm/jsautocfg.h
@@ -0,0 +1,52 @@
+#ifndef js_cpucfg___
+#define js_cpucfg___
+
+/* AUTOMATICALLY GENERATED - DO NOT EDIT */
+
+#define IS_LITTLE_ENDIAN 1
+#undef  IS_BIG_ENDIAN
+
+#define JS_BYTES_PER_BYTE   1L
+#define JS_BYTES_PER_SHORT  2L
+#define JS_BYTES_PER_INT    4L
+#define JS_BYTES_PER_INT64  8L
+#define JS_BYTES_PER_LONG   4L
+#define JS_BYTES_PER_FLOAT  4L
+#define JS_BYTES_PER_DOUBLE 8L
+#define JS_BYTES_PER_WORD   4L
+#define JS_BYTES_PER_DWORD  8L
+
+#define JS_BITS_PER_BYTE    8L
+#define JS_BITS_PER_SHORT   16L
+#define JS_BITS_PER_INT     32L
+#define JS_BITS_PER_INT64   64L
+#define JS_BITS_PER_LONG    32L
+#define JS_BITS_PER_FLOAT   32L
+#define JS_BITS_PER_DOUBLE  64L
+#define JS_BITS_PER_WORD    32L
+
+#define JS_BITS_PER_BYTE_LOG2   3L
+#define JS_BITS_PER_SHORT_LOG2  4L
+#define JS_BITS_PER_INT_LOG2    5L
+#define JS_BITS_PER_INT64_LOG2  6L
+#define JS_BITS_PER_LONG_LOG2   5L
+#define JS_BITS_PER_FLOAT_LOG2  5L
+#define JS_BITS_PER_DOUBLE_LOG2 6L
+#define JS_BITS_PER_WORD_LOG2   5L
+
+#define JS_ALIGN_OF_SHORT   2L
+#define JS_ALIGN_OF_INT     4L
+#define JS_ALIGN_OF_LONG    4L
+#define JS_ALIGN_OF_INT64   8L
+#define JS_ALIGN_OF_FLOAT   4L
+#define JS_ALIGN_OF_DOUBLE  8L
+#define JS_ALIGN_OF_POINTER 4L
+#define JS_ALIGN_OF_WORD    4L
+
+#define JS_BYTES_PER_WORD_LOG2   2L
+#define JS_BYTES_PER_DWORD_LOG2  3L
+#define JS_WORDS_PER_DWORD_LOG2  1L
+
+#define JS_STACK_GROWTH_DIRECTION (-1)
+
+#endif /* js_cpucfg___ */
diff --git a/packages/swfdec/swfdec_0.4.0.bb b/packages/swfdec/swfdec_0.4.0.bb
index 778302c140..b4c56afacf 100644
--- a/packages/swfdec/swfdec_0.4.0.bb
+++ b/packages/swfdec/swfdec_0.4.0.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "Swfdec is a decoder/renderer for Macromedia Flash animations."
-LICENSE = ""LGPL
+LICENSE = "LGPL"
 
 DEPENDS = "pango cairo liboil zlib libmad gtk+ alsa-lib"
 
diff --git a/packages/swfdec/swfdec_0.7.2.bb b/packages/swfdec/swfdec_0.7.2.bb
new file mode 100644
index 0000000000..05d4977eae
--- /dev/null
+++ b/packages/swfdec/swfdec_0.7.2.bb
@@ -0,0 +1,26 @@
+DESCRIPTION = "Swfdec is a decoder/renderer for Macromedia Flash animations."
+LICENSE = "LGPL"
+
+DEPENDS = "gstreamer libsoup-2.4 pango cairo liboil zlib libmad gtk+ alsa-lib"
+
+SRC_URI = "http://swfdec.freedesktop.org/download/swfdec/0.7/${P}.tar.gz \
+"
+
+inherit autotools pkgconfig 
+
+do_install_append() {
+	install -d ${D}/${bindir}
+	install -m 0755 ${S}/player/.libs/swfplay ${D}/${bindir}
+}
+
+do_stage() {
+	autotools_stage_all
+}
+
+PACKAGES =+ "libswfdecgtk libswfdec"
+
+FILES_${PN} += "${datadir}/icons"
+FILES_libswfdec = "${libdir}/libswfdec-0.7.so.*"
+FILES_libswfdecgtk = "${libdir}/libswfdec-gtk-0.7.so*"
+
+