diff options
| author | Marcin Juszkiewicz <hrw@openembedded.org> | 2007-01-04 11:22:16 +0000 |
|---|---|---|
| committer | Marcin Juszkiewicz <hrw@openembedded.org> | 2007-01-04 11:22:16 +0000 |
| commit | 4b7e6a49215b00d0cfa9a0fde3808f032a9599e5 (patch) | |
| tree | f2e294728789ab01a7a89fa06b6c67c5464ceab0 /packages/efl | |
| parent | 4601ad28765bf7ef207974f9ad7fc209d3745088 (diff) | |
| parent | 8f19556367701b3a3fa50802903d0d67997407b7 (diff) | |
merge of '274cb1a3f97188420857e4b0650a1ace718148a6'
and '8091ca9b08503f4700e05ee8973cec755727ed4a'
Diffstat (limited to 'packages/efl')
| -rw-r--r-- | packages/efl/ecore.inc | 1 | ||||
| -rw-r--r-- | packages/efl/ecore/ecore_kernel_input_header.patch | 23 | ||||
| -rw-r--r-- | packages/efl/edje-native_0.5.0.036.bb | 5 | ||||
| -rw-r--r-- | packages/efl/evas.inc | 2 |
4 files changed, 25 insertions, 6 deletions
diff --git a/packages/efl/ecore.inc b/packages/efl/ecore.inc index cea3114dc7..e0e65b69c0 100644 --- a/packages/efl/ecore.inc +++ b/packages/efl/ecore.inc @@ -12,6 +12,7 @@ inherit efl SRC_URI = "http://enlightenment.freedesktop.org/files/ecore-${PV}.tar.gz \ file://configure.patch;patch=1 \ file://fix-tslib-configure.patch;patch=1 \ + file://ecore_kernel_input_header.patch;patch=1 \ ${E_CVS};module=e17/libs/ecore/m4;date=20060101" S = "${WORKDIR}/ecore-${PV}" diff --git a/packages/efl/ecore/ecore_kernel_input_header.patch b/packages/efl/ecore/ecore_kernel_input_header.patch new file mode 100644 index 0000000000..99f57ddcff --- /dev/null +++ b/packages/efl/ecore/ecore_kernel_input_header.patch @@ -0,0 +1,23 @@ +Index: ecore-0.9.9.036/src/lib/ecore_fb/ecore_fb_li.c +=================================================================== +--- ecore-0.9.9.036.orig/src/lib/ecore_fb/ecore_fb_li.c 2006-09-05 01:36:43.000000000 +0100 ++++ ecore-0.9.9.036/src/lib/ecore_fb/ecore_fb_li.c 2006-12-02 21:55:54.000000000 +0000 +@@ -1,6 +1,18 @@ + #include "Ecore_Fb.h" + #include "ecore_fb_private.h" + ++struct input_absinfo { ++ __s32 value; ++ __s32 minimum; ++ __s32 maximum; ++ __s32 fuzz; ++ __s32 flat; ++}; ++ ++ ++#define EV_SYN 0x00 ++#define EV_PWR 0x16 ++#define EV_FF_STATUS 0x17 + + /* Copyright (C) Brad Hards (1999-2002). + * this macro is used to tell if "bit" is set in "array" diff --git a/packages/efl/edje-native_0.5.0.036.bb b/packages/efl/edje-native_0.5.0.036.bb index 9909811448..c66639d25e 100644 --- a/packages/efl/edje-native_0.5.0.036.bb +++ b/packages/efl/edje-native_0.5.0.036.bb @@ -6,11 +6,6 @@ inherit native DEPENDS = "evas-native ecore-native eet-native embryo-native" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/edje" -EXTRA_OECONF = "--with-evas-config=${STAGING_BINDIR}/evas-config-native \ - --with-ecore-config=${STAGING_BINDIR}/ecore-config-native \ - --with-eet-config=${STAGING_BINDIR}/eet-config-native \ - --with-embryo-config=${STAGING_BINDIR}/embryo-config-native" - do_configure_prepend() { sed -i 's:EMBRYO_PREFIX"/bin:"${STAGING_BINDIR}:' ${S}/src/bin/edje_cc_out.c sed -i 's:cpp -I:/usr/bin/cpp -I:' ${S}/src/bin/edje_cc_parse.c diff --git a/packages/efl/evas.inc b/packages/efl/evas.inc index 4577535aaa..f065d944f8 100644 --- a/packages/efl/evas.inc +++ b/packages/efl/evas.inc @@ -9,7 +9,7 @@ PROVIDES += "virtual/evas" inherit efl -export FREETYPE_CONFIG = "${STAGING_BINDIR}/freetype-config${@binconfig_suffix(d)}" +export FREETYPE_CONFIG = "${STAGING_BINDIR_CROSS}/freetype-config" SRC_URI = "http://enlightenment.freedesktop.org/files/evas-${PV}.tar.gz \ file://fix-configure.patch;patch=1 \ |