diff options
author | Daniel Willmann <daniel@totalueberwachung.de> | 2009-06-18 00:24:01 +0200 |
---|---|---|
committer | Daniel Willmann <daniel@totalueberwachung.de> | 2009-06-18 00:24:01 +0200 |
commit | 5d8462117aeb1723846f5aab81115270d55df87d (patch) | |
tree | 566e58afc40fa42d38c51b38e5254c522b378afb /recipes/efl1 | |
parent | a5cb19c83b3c14645dec98ef40e54337315776d9 (diff) | |
parent | 489a25bc0376e8ef0c6548378934f32a0fb6af10 (diff) | |
download | openembedded-5d8462117aeb1723846f5aab81115270d55df87d.tar.gz |
Merge commit 'origin/fso/milestone5.5' into shr/import
Conflicts:
conf/checksums.ini
conf/distro/include/fso-autorev.inc
conf/distro/include/sane-srcrevs.inc
recipes/dbus/dbus_1.2.14.bb
recipes/efl1/ecore.inc
recipes/fbreader/fbreader_0.8.2a.bb
recipes/freesmartphone/libfso-glib_git.bb
recipes/freesmartphone/libfsotransport_git.bb
recipes/intone/intone_svn.bb
recipes/libgee/libgee_git.bb
recipes/mokomaze/mokomaze_0.5.1.bb
recipes/netbase/netbase_4.21.bb
recipes/openmoko2/libmokoui2_svn.bb
recipes/python/python-native-2.6.1/05-enable-ctypes-cross-build.patch
recipes/python/python.inc
recipes/speech-dispatcher/speech-dispatcher_0.6.6.bb
recipes/vala/files/static-dbus-methods.patch
recipes/vala/vala.inc
recipes/xserver-kdrive-common/xserver-nodm-init.bb
Diffstat (limited to 'recipes/efl1')
-rw-r--r-- | recipes/efl1/ecore.inc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/recipes/efl1/ecore.inc b/recipes/efl1/ecore.inc index c75282be5d..9d4cd0ce2a 100644 --- a/recipes/efl1/ecore.inc +++ b/recipes/efl1/ecore.inc @@ -4,10 +4,12 @@ DEPENDS = "curl eet evas tslib libxtst libxcomposite libxinerama libxscrnsaver l # optional # DEPENDS += "directfb libsdl-x11 openssl virtual/libiconv" PV = "0.9.9.050+svnr${SRCREV}" -PR = "r4" +PR = "r5" inherit efl +SRC_URI += "file://ecore-add-includes.patch;patch=1" + FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/ecore" PACKAGES += "\ |