merge of '66551f8550ad2253c8034a5f044ff55b9feb2b58'

     and '750215559f3cd57e976011193cc7b72d50be5aba'

6 files changed, 28 insertions, 3 deletions

diff --git a/classes/gtk-binver.bbclass b/classes/gtk-binver.bbclass
new file mode 100644
index 0000000000..d59145e641
--- /dev/null
+++ b/classes/gtk-binver.bbclass
@@ -0,0 +1,9 @@
+def gtkbinver_find(d):
+    import bb
+    try:
+        for line in file( "%s/pkgconfig/gtk+-2.0.pc" % bb.data.getVar('STAGING_DATADIR', d, 1) ).readlines():
+            if line.startswith( "gtk_binary_version" ):
+                # bb.note( "gtk_binary_version = '%s'" % line.split("=")[1].strip() )
+                return line.split("=")[1].strip()
+    except OSError:
+        return "0.0.0"
diff --git a/conf/machine/hx4700.conf b/conf/machine/hx4700.conf
index fad812759b..e12927772d 100644
--- a/conf/machine/hx4700.conf
+++ b/conf/machine/hx4700.conf
@@ -37,6 +37,7 @@ SERIAL_CONSOLE = "115200 ttyS0"
 
 
 GUI_MACHINE_CLASS = "bigscreen"
+XSERVER = "xserver-kdrive-w100"
 
 # Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm.
 require conf/machine/include/tune-xscale.conf
diff --git a/packages/gtk-engines/gtk-engines_2.7.4.bb b/packages/gtk-engines/gtk-engines_2.7.4.bb
index 29c20e1e65..7ad1acc0ca 100644
--- a/packages/gtk-engines/gtk-engines_2.7.4.bb
+++ b/packages/gtk-engines/gtk-engines_2.7.4.bb
@@ -14,14 +14,16 @@ RDEPENDS_gtk-theme-clearlooks = "gtk-engine-clearlooks"
 
 SRC_URI = "${GNOME_MIRROR}/${PN}/2.7/${P}.tar.bz2"
 
-inherit autotools pkgconfig
+inherit autotools pkgconfig gtk-binver
 
 PACKAGES_DYNAMIC = "gtk-engine-* gtk-theme-*"
 
 python populate_packages_prepend() {
 	import os.path
 
-	engines_root = os.path.join(bb.data.getVar('libdir', d, 1), "gtk-2.0/2.4.0/engines")
+	engines_ver = ['gtk-2.0/', gtkbinver_find(d), '/engines']
+
+	engines_root = os.path.join(bb.data.getVar('libdir', d, 1), ''.join(engines_ver))
 	themes_root = os.path.join(bb.data.getVar('datadir', d, 1), "themes")
 
 	do_split_packages(d, engines_root, '^lib(.*)\.so$', 'gtk-engine-%s', 'GTK %s theme engine', extra_depends='')
diff --git a/packages/linux/linux-omap1.inc b/packages/linux/linux-omap1.inc
index 27e470a6a0..f924cbec2f 100644
--- a/packages/linux/linux-omap1.inc
+++ b/packages/linux/linux-omap1.inc
@@ -20,7 +20,7 @@ do_deploy() {
                 install -d ${DEPLOY_DIR_IMAGE}
                 arm-linux-objcopy -O binary -R .note -R .comment -S ${KERNEL_OUTPUT} ${DEPLOY_DIR_IMAGE}/linux.bin
                 gzip -f -9 ${DEPLOY_DIR_IMAGE}/linux.bin
-                mkimage -A arm -O linux -T kernel -C gzip -a 0x10c08000 -e 0x10c08000 -n "OE" -d ${DEPLOY_DIR_IMAGE}/linux.bin.gz ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${MACHINE}-${DATETIME}.bin
+                mkimage -A arm -O linux -T kernel -C gzip -a 0x10008000 -e 0x10008000 -n "OE" -d ${DEPLOY_DIR_IMAGE}/linux.bin.gz ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${MACHINE}-${DATETIME}.bin
                 rm ${DEPLOY_DIR_IMAGE}/linux.bin.gz
         fi
 }
diff --git a/packages/xoo/.mtn2git_empty b/packages/xoo/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/xoo/.mtn2git_empty
diff --git a/packages/xoo/xoo_svn.bb b/packages/xoo/xoo_svn.bb
new file mode 100644
index 0000000000..dedab26b21
--- /dev/null
+++ b/packages/xoo/xoo_svn.bb
@@ -0,0 +1,13 @@
+DESCRIPTION = "Xoo is a GTK2 based graphical wrapper around a windowed X Server. \
+It is intended for embedded developers that want to simulate a target device \
+(with an accurate display size, working hardware buttons, etc) on a desktop machine."
+HOMEPAGE = "http://projects.o-hand.com/xoo"
+LICENSE = "GPL"
+DEPENDS = "virtual/libx11 libxtst"
+PV = "0.7+svn${SRCDATE}"
+PR = "r0"
+
+SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=Xoo;proto=http"
+S = "${WORKDIR}/Xoo"
+
+inherit autotools