[oe-commits] org.oe.dev merge of 'adeeabec80174cc28a509847c43a6193d386e011'
mickeyl commit
oe at amethyst.openembedded.net
Sat Jul 26 18:27:16 UTC 2008
merge of 'adeeabec80174cc28a509847c43a6193d386e011'
and 'cc5c410b6ecfd58ea2193cb45b120049db7eef5d'
Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: 4a6eea520cb0bded1313d57689af2993701d4e87
ViewMTN: http://monotone.openembedded.org/revision/info/4a6eea520cb0bded1313d57689af2993701d4e87
Files:
1
packages/openmoko-projects/illume
packages/openmoko-projects/illume/configure-keyboard.patch
packages/openmoko-projects/illume_svn.bb
packages/gcc/gcc-cross-kernel.inc
Diffs:
#
# mt diff -radeeabec80174cc28a509847c43a6193d386e011 -r4a6eea520cb0bded1313d57689af2993701d4e87
#
#
#
# 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} = "\
#
# mt diff -rcc5c410b6ecfd58ea2193cb45b120049db7eef5d -r4a6eea520cb0bded1313d57689af2993701d4e87
#
#
#
# patch "packages/gcc/gcc-cross-kernel.inc"
# from [20867aba06eab9b6f8398e481391ea9109b3b80e]
# to [3c5f4ada32dfb18f511b21b25bee2d337693cce0]
#
============================================================
--- packages/gcc/gcc-cross-kernel.inc 20867aba06eab9b6f8398e481391ea9109b3b80e
+++ packages/gcc/gcc-cross-kernel.inc 3c5f4ada32dfb18f511b21b25bee2d337693cce0
@@ -11,6 +11,6 @@ do_stage () {
do_stage () {
cd gcc
- oe_runmake install-common install-headers install-libgcc
+ oe_runmake installdirs install-common install-headers install-libgcc
install -m 0755 xgcc ${CROSS_DIR}/bin/${TARGET_PREFIX}gcc-${PV}
}
More information about the Openembedded-commits
mailing list