diff options
| author | Michael Lauer <mickey@vanille-media.de> | 2008-07-26 16:45:03 +0000 |
|---|---|---|
| committer | Michael Lauer <mickey@vanille-media.de> | 2008-07-26 16:45:03 +0000 |
| commit | 7cff782b984312bb9d3226d9e44cb2b9a9401a81 (patch) | |
| tree | 5b96e35ed1bf95d8cbb4b7243d7fa731b549d27c /packages | |
| parent | 5e9d221edf100e3c54630d1214ae85840d75925c (diff) | |
| parent | d40d93ebbb3c5202125d8a1527f1aba1116a34c8 (diff) | |
merge of 'adeeabec80174cc28a509847c43a6193d386e011'
and 'cc5c410b6ecfd58ea2193cb45b120049db7eef5d'
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/openmoko-projects/illume/.mtn2git_empty | 0 | ||||
| -rw-r--r-- | packages/openmoko-projects/illume/configure-keyboard.patch | 39 | ||||
| -rw-r--r-- | packages/openmoko-projects/illume_svn.bb | 9 |
3 files changed, 46 insertions, 2 deletions
diff --git a/packages/openmoko-projects/illume/.mtn2git_empty b/packages/openmoko-projects/illume/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/openmoko-projects/illume/.mtn2git_empty diff --git a/packages/openmoko-projects/illume/configure-keyboard.patch b/packages/openmoko-projects/illume/configure-keyboard.patch new file mode 100644 index 0000000000..589fe53f38 --- /dev/null +++ b/packages/openmoko-projects/illume/configure-keyboard.patch @@ -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), diff --git a/packages/openmoko-projects/illume_svn.bb b/packages/openmoko-projects/illume_svn.bb index af101f1a01..52150a00dc 100644 --- a/packages/openmoko-projects/illume_svn.bb +++ b/packages/openmoko-projects/illume_svn.bb @@ -4,9 +4,12 @@ AUTHOR = "Rasterman" 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} = "\ |