[oe-commits] org.oe.dev illume svn enable keyboard

[mickeyl commit]

illume svn enable keyboard

Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: cc5c410b6ecfd58ea2193cb45b120049db7eef5d
ViewMTN: http://monotone.openembedded.org/revision/info/cc5c410b6ecfd58ea2193cb45b120049db7eef5d
Files:
1
packages/openmoko-projects/illume
packages/openmoko-projects/illume/configure-keyboard.patch
packages/openmoko-projects/illume_svn.bb
Diffs:

#
# mt diff -rd11de5b2fccb6699a3ba660836048f87dc676a4c -rcc5c410b6ecfd58ea2193cb45b120049db7eef5d
#
#
#
# add_dir "packages/openmoko-projects/illume"
# 
# add_file "packages/openmoko-projects/illume/configure-keyboard.patch"
#  content [7d8bf7ac9d5970f6624d67804676e55a5f781bd0]
# 
# patch "packages/openmoko-projects/illume_svn.bb"
#  from [39270f48f788723273ee3a1246361321db6608d4]
#    to [7ee2770bdff03d604f1482288b0b7c00f05481ce]
#
============================================================
--- packages/openmoko-projects/illume/configure-keyboard.patch	7d8bf7ac9d5970f6624d67804676e55a5f781bd0
+++ packages/openmoko-projects/illume/configure-keyboard.patch	7d8bf7ac9d5970f6624d67804676e55a5f781bd0
@@ -0,0 +1,39 @@
+Index: configure.in
+===================================================================
+--- configure.in	(Revision 170)
++++ configure.in	(Arbeitskopie)
+@@ -95,6 +95,21 @@
+ AC_SUBST(e_libs)
+ AC_SUBST(e_modules)
+ 
++want_illume_virtual_keyboard=no
++AC_ARG_ENABLE(illume-keyboard,
++    AC_HELP_STRING(
++        [--enable-illume-keyboard],
++        [Enable the illume virtual keyboard.]
++    ),
++    [want_illume_virtual_keyboard=$enableval]
++    )
++AC_MSG_CHECKING(whether the illume virtual keyboard is to be built in)
++AC_MSG_RESULT($want_illume_virtual_keyboard)
++
++if test "x$want_illume_virtual_keyboard" = "xyes"; then
++    AC_DEFINE(BUILD_ILLUME_VIRTUAL_KEYBOARD, 1, [Build the virtual keyboard in])
++fi
++
+ AC_OUTPUT([
+ Makefile
+ src/Makefile
+Index: src/e_mod_win.c
+===================================================================
+--- src/e_mod_win.c	(Revision 170)
++++ src/e_mod_win.c	(Arbeitskopie)
+@@ -102,7 +102,7 @@
+ 		    e_module_dir_get(m),
+ 		    e_module_dir_get(m));
+    // FIXME: run kbd app or use internal
+-#if 0
++#ifdef BUILD_ILLUME_VIRTUAL_KEYBOARD
+    //enable for now to test internal kbd
+    vkbd_int = e_kbd_int_new(e_module_dir_get(m),
+ 			    e_module_dir_get(m),
============================================================
--- packages/openmoko-projects/illume_svn.bb	39270f48f788723273ee3a1246361321db6608d4
+++ packages/openmoko-projects/illume_svn.bb	7ee2770bdff03d604f1482288b0b7c00f05481ce
@@ -4,9 +4,12 @@ PV = "0.0+svnr${SRCREV}"
 LICENSE = "MIT/BSD"
 DEPENDS = "e-wm eet evas ecore edje embryo efreet edbus edje-native embryo-native"
 PV = "0.0+svnr${SRCREV}"
-PR = "r8"
+PR = "r10"
 
-SRC_URI = "svn://svn.projects.openmoko.org/svnroot/;module=${PN};proto=http"
+SRC_URI = "\
+  svn://svn.projects.openmoko.org/svnroot/;module=${PN};proto=http \
+  file://configure-keyboard.patch;patch=1;pnum=0 \
+"
 S = "${WORKDIR}/${PN}"
 
 inherit autotools pkgconfig
@@ -16,6 +19,8 @@ EXTRA_OECONF = "\
   --x-libraries=${STAGING_LIBDIR} \
   --enable-simple-x11 \
   --with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc \
+\
+  --enable-illume-keyboard \
 "
 
 RRECOMMENDS_${PN} = "\