summaryrefslogtreecommitdiffstats
path: root/meta-efl/recipes-efl/efl
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2014-08-13 14:00:32 +0200
committerMartin Jansa <Martin.Jansa@gmail.com>2014-08-23 13:36:20 +0200
commita8d31694852bc0d0d4069b4fb9f4fde6625e47f7 (patch)
tree0673bd226f21ad53f0e3c6d38697d0ee15fed312 /meta-efl/recipes-efl/efl
parentfaf83c51dd4e79419e5dd1abfba96c26a09ac982 (diff)
downloadmeta-openembedded-a8d31694852bc0d0d4069b4fb9f4fde6625e47f7.tar.gz
efl: upgrade to 1.11.0
* announcement: https://phab.enlightenment.org/phame/post/view/74/ https://phab.enlightenment.org/phame/post/view/77/ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-efl/recipes-efl/efl')
-rw-r--r--meta-efl/recipes-efl/efl/efl.inc15
-rw-r--r--meta-efl/recipes-efl/efl/efl_1.11.0.bb (renamed from meta-efl/recipes-efl/efl/efl_1.10.2.bb)4
-rw-r--r--meta-efl/recipes-efl/efl/elementary.inc3
-rw-r--r--meta-efl/recipes-efl/efl/elementary_1.11.0.bb (renamed from meta-efl/recipes-efl/efl/elementary_1.10.2.bb)4
-rw-r--r--meta-efl/recipes-efl/efl/emotion-generic-players_1.10.0.bb8
-rw-r--r--meta-efl/recipes-efl/efl/emotion-generic-players_1.11.0.bb8
-rw-r--r--meta-efl/recipes-efl/efl/evas-generic-loaders_1.10.0.bb8
-rw-r--r--meta-efl/recipes-efl/efl/evas-generic-loaders_1.11.0.bb8
8 files changed, 35 insertions, 23 deletions
diff --git a/meta-efl/recipes-efl/efl/efl.inc b/meta-efl/recipes-efl/efl/efl.inc
index 648c5b6fb..c82780b99 100644
--- a/meta-efl/recipes-efl/efl/efl.inc
+++ b/meta-efl/recipes-efl/efl/efl.inc
@@ -19,7 +19,7 @@ PROVIDES += "ecore edje eet eeze efreet eina eio embryo emotion ethumb evas eldb
19# your own in terms of ensuring everything works if you do this 19# your own in terms of ensuring everything works if you do this
20EXTRA_OECONF = " \ 20EXTRA_OECONF = " \
21 --disable-physics \ 21 --disable-physics \
22 --enable-i-really-know-what-i-am-doing-and-that-this-will-probably-break-things-and-i-will-fix-them-myself-and-send-patches-aaa \ 22 --enable-i-really-know-what-i-am-doing-and-that-this-will-probably-break-things-and-i-will-fix-them-myself-and-send-patches-aba \
23" 23"
24EXTRA_OECONF_append_class-target = " \ 24EXTRA_OECONF_append_class-target = " \
25 --with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc \ 25 --with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc \
@@ -53,20 +53,23 @@ PACKAGECONFIG[opengl-es] = "--with-opengl=es,,virtual/libgles2"
53PACKAGECONFIG[opengl-none] = "--with-opengl=none,," 53PACKAGECONFIG[opengl-none] = "--with-opengl=none,,"
54# be aware when enabling this for efl-native, we don't provide gcc-native so you need to make 54# be aware when enabling this for efl-native, we don't provide gcc-native so you need to make
55# sure that all your builders have g++ which supports -std=gnu++11 55# sure that all your builders have g++ which supports -std=gnu++11
56PACKAGECONFIG[c++11] = "--enable-c++11,--disable-c++11" 56PACKAGECONFIG[c++11] = "--enable-cxx-bindings,--disable-cxx-bindings"
57PACKAGECONFIG[gstreamer] = "--enable-gstreamer,--disable-gstreamer,gstreamer" 57PACKAGECONFIG[gstreamer] = "--enable-gstreamer,--disable-gstreamer,gstreamer"
58PACKAGECONFIG[gstreamer1] = "--enable-gstreamer1,--disable-gstreamer1,gstreamer1.0 gstreamer1.0-plugins-base" 58PACKAGECONFIG[gstreamer1] = "--enable-gstreamer1,--disable-gstreamer1,gstreamer1.0 gstreamer1.0-plugins-base"
59PACKAGECONFIG[pulseaudio] = "--enable-pulseaudio,--disable-pulseaudio,pulseaudio" 59PACKAGECONFIG[pulseaudio] = "--enable-pulseaudio,--disable-pulseaudio,pulseaudio"
60PACKAGECONFIG[systemd] = "--enable-systemd,--disable-systemd,systemd" 60PACKAGECONFIG[systemd] = "--enable-systemd,--disable-systemd,systemd"
61PACKAGECONFIG[luajit] = "--disable-lua-old,--enable-lua-old,luajit" 61PACKAGECONFIG[luajit] = "--disable-lua-old,--enable-lua-old,luajit"
62PACKAGECONFIG[lua-old] = "--enable-lua-old,--disable-lua-old,lua" 62PACKAGECONFIG[lua-old] = "--enable-lua-old,--disable-lua-old,lua"
63PACKAGECONFIG[avahi] = "--enable-avahi,--disable-avahi,avahi"
64# currently we don't provide doxygen-native
65PACKAGECONFIG[doc] = "--enable-doc,--disable-doc,doxygen-native"
63 66
64# new efl doesn't have option to disable eeze build and we don't want to provide udev-native just to build eeze-native we don't need 67# new efl doesn't have option to disable eeze build and we don't want to provide udev-native just to build eeze-native we don't need
65do_configure_prepend_class-native() { 68do_configure_prepend_class-native() {
66 sed -i 's/EFL_LIB_START_OPTIONAL(\[Eeze\], \[test "${have_linux}" = "yes"\])/EFL_LIB_START_OPTIONAL([Eeze], [test "${no-we-really-dont-want-native-eeze}" = "yes"])/g' ${S}/configure.ac 69 sed -i 's/EFL_LIB_START_OPTIONAL(\[Eeze\], \[test "${have_linux}" = "yes"\])/EFL_LIB_START_OPTIONAL([Eeze], [test "${no-we-really-dont-want-native-eeze}" = "yes"])/g' ${S}/configure.ac
67} 70}
68 71
69PACKAGES =+ "edje-utils embryo-utils embryo-tests efreet-trash efreet-mime libeet libefreet ecore-audio ecore-input-evas ecore-input ecore-imf-evas ecore-imf ecore-file ecore-con ecore-ipc ecore-x ecore-evas libemotion eo ecore edje eet eeze efreet eina eio embryo emotion ethumb evas eldbus" 72PACKAGES =+ "edje-utils embryo-utils embryo-tests efreet-trash efreet-mime libeet libefreet ecore-audio ecore-input-evas ecore-input ecore-imf-evas ecore-imf ecore-file ecore-con ecore-ipc ecore-x ecore-evas libemotion eo ecore edje eet eeze efreet eina eio embryo emotion ethumb evas eldbus elua"
70 73
71# upgrade path from 1.7 74# upgrade path from 1.7
72DEBIAN_NOAUTONAME_ecore-audio = "1" 75DEBIAN_NOAUTONAME_ecore-audio = "1"
@@ -153,6 +156,7 @@ FILES_ecore-ipc = "\
153" 156"
154FILES_ecore-x = "\ 157FILES_ecore-x = "\
155 ${libdir}/libecore_x${SOLIBS} \ 158 ${libdir}/libecore_x${SOLIBS} \
159 ${libdir}/ecore_x/bin/v-*/ecore_x_vsync \
156" 160"
157FILES_ecore-evas = "\ 161FILES_ecore-evas = "\
158 ${libdir}/libecore_evas${SOLIBS} \ 162 ${libdir}/libecore_evas${SOLIBS} \
@@ -241,9 +245,14 @@ FILES_edje = " \
241 ${datadir}/edje \ 245 ${datadir}/edje \
242 ${datadir}/mime \ 246 ${datadir}/mime \
243" 247"
248FILES_elua = " \
249 ${bindir}/elua \
250 ${datadir}/elua \
251"
244FILES_${PN}-dbg += " \ 252FILES_${PN}-dbg += " \
245 ${libdir}/efreet/*/.debug \ 253 ${libdir}/efreet/*/.debug \
246 ${libdir}/ecore*/*/*/*/.debug \ 254 ${libdir}/ecore*/*/*/*/.debug \
255 ${libdir}/ecore*/*/*/.debug \
247 ${libdir}/evas*/*/*/*/*/.debug \ 256 ${libdir}/evas*/*/*/*/*/.debug \
248 ${libdir}/evas/cserve2/bin/*/.debug \ 257 ${libdir}/evas/cserve2/bin/*/.debug \
249 ${libdir}/eeze*/*/*/*/*/.debug \ 258 ${libdir}/eeze*/*/*/*/*/.debug \
diff --git a/meta-efl/recipes-efl/efl/efl_1.10.2.bb b/meta-efl/recipes-efl/efl/efl_1.11.0.bb
index 76a9ba7cf..45ee389e7 100644
--- a/meta-efl/recipes-efl/efl/efl_1.10.2.bb
+++ b/meta-efl/recipes-efl/efl/efl_1.11.0.bb
@@ -4,8 +4,8 @@ SRC_URI = "\
4 ${E_RELEASES}/libs/${SRCNAME}/${SRCNAME}-${SRCVER}.tar.gz \ 4 ${E_RELEASES}/libs/${SRCNAME}/${SRCNAME}-${SRCVER}.tar.gz \
5" 5"
6 6
7SRC_URI[md5sum] = "c74888bfdc774e69eac26978557a89bb" 7SRC_URI[md5sum] = "83a1e983d7e9d3efcbba9a7a29cad54d"
8SRC_URI[sha256sum] = "44acf012f0dd3b0c01bb2c5e53231076d7ed463166f581d22ef441b127e8c85f" 8SRC_URI[sha256sum] = "0a8ab66e012820cad7dd78de371f8dcbbd79cb316302e1e6c354181de35d727f"
9 9
10# Temporary disable until error like the one following are fixed 10# Temporary disable until error like the one following are fixed
11# efl-native/2_1.8.4-r0/efl-1.8.4/src/lib/eet/.libs/libeet.so: file not recognized: File truncated 11# efl-native/2_1.8.4-r0/efl-1.8.4/src/lib/eet/.libs/libeet.so: file not recognized: File truncated
diff --git a/meta-efl/recipes-efl/efl/elementary.inc b/meta-efl/recipes-efl/efl/elementary.inc
index c22070f91..c5e75b96c 100644
--- a/meta-efl/recipes-efl/efl/elementary.inc
+++ b/meta-efl/recipes-efl/efl/elementary.inc
@@ -18,6 +18,9 @@ BBCLASSEXTEND = "native"
18 18
19PACKAGECONFIG[eweather] = "--enable-eweather,--disable-eweather,libeweather" 19PACKAGECONFIG[eweather] = "--enable-eweather,--disable-eweather,libeweather"
20PACKAGECONFIG[ewebkit] = "--with-elementary-web-backend=ewebkit,--with-elementary-web-backend=none,webkit-efl" 20PACKAGECONFIG[ewebkit] = "--with-elementary-web-backend=ewebkit,--with-elementary-web-backend=none,webkit-efl"
21# be aware when enabling this for efl-native, we don't provide gcc-native so you need to make
22# sure that all your builders have g++ which supports -std=gnu++11
23PACKAGECONFIG[c++11] = "--enable-cxx-bindings,--disable-cxx-bindings"
21 24
22do_configure_prepend() { 25do_configure_prepend() {
23 # prefix returned eolian paths with STAGING_DIR_HOST also use $PKG_CONFIG instead of pkg-config directly 26 # prefix returned eolian paths with STAGING_DIR_HOST also use $PKG_CONFIG instead of pkg-config directly
diff --git a/meta-efl/recipes-efl/efl/elementary_1.10.2.bb b/meta-efl/recipes-efl/efl/elementary_1.11.0.bb
index eb182bbfe..d188c2376 100644
--- a/meta-efl/recipes-efl/efl/elementary_1.10.2.bb
+++ b/meta-efl/recipes-efl/efl/elementary_1.11.0.bb
@@ -8,8 +8,8 @@ SRC_URI = "\
8# these paths aren't passed in -native build 8# these paths aren't passed in -native build
9SRC_URI_append_class-target = " file://0001-Makefile-Use-elementary_codegen-defined-in-configure.patch" 9SRC_URI_append_class-target = " file://0001-Makefile-Use-elementary_codegen-defined-in-configure.patch"
10 10
11SRC_URI[md5sum] = "2ccc130e137319accd81ccf3d321905b" 11SRC_URI[md5sum] = "cfcf3b0620cbb6e86021286631274d9a"
12SRC_URI[sha256sum] = "48fcfbd66b90df8b21203307d66364fb1d773b3e979476116b2ad1a5eab67378" 12SRC_URI[sha256sum] = "47ee79f7fc4e355557e6809e2001468bc8e40939562e3a96f689969ab67c17b4"
13 13
14# autotools-brokensep - configure updates Elementary.h correctly in ${B}, but then build is using Elementary.h from ${S} 14# autotools-brokensep - configure updates Elementary.h correctly in ${B}, but then build is using Elementary.h from ${S}
15# which includes #define ELM_EMAP (instead of #undef ELM_EMAP) and building fails 15# which includes #define ELM_EMAP (instead of #undef ELM_EMAP) and building fails
diff --git a/meta-efl/recipes-efl/efl/emotion-generic-players_1.10.0.bb b/meta-efl/recipes-efl/efl/emotion-generic-players_1.10.0.bb
deleted file mode 100644
index 5d5ed4b8c..000000000
--- a/meta-efl/recipes-efl/efl/emotion-generic-players_1.10.0.bb
+++ /dev/null
@@ -1,8 +0,0 @@
1require ${BPN}.inc
2
3SRC_URI = "\
4 ${E_RELEASES}/libs/${SRCNAME}/${SRCNAME}-${SRCVER}.tar.gz \
5"
6
7SRC_URI[md5sum] = "f73b1f73b38a323e37bd138b103191a5"
8SRC_URI[sha256sum] = "ccfb1c8c346ba1a84484b82ce1ce871fd2c6660421ca7fa5d911661bd3cc94db"
diff --git a/meta-efl/recipes-efl/efl/emotion-generic-players_1.11.0.bb b/meta-efl/recipes-efl/efl/emotion-generic-players_1.11.0.bb
new file mode 100644
index 000000000..4cb74f5e2
--- /dev/null
+++ b/meta-efl/recipes-efl/efl/emotion-generic-players_1.11.0.bb
@@ -0,0 +1,8 @@
1require ${BPN}.inc
2
3SRC_URI = "\
4 ${E_RELEASES}/libs/${SRCNAME}/${SRCNAME}-${SRCVER}.tar.gz \
5"
6
7SRC_URI[md5sum] = "432febd580ed1a4d7d7b42984ee4c693"
8SRC_URI[sha256sum] = "5d2e7923a6e4e909df2f9fc3bf7508086ea04b0146e62015dbc93a8bf58bca74"
diff --git a/meta-efl/recipes-efl/efl/evas-generic-loaders_1.10.0.bb b/meta-efl/recipes-efl/efl/evas-generic-loaders_1.10.0.bb
deleted file mode 100644
index 732c2968a..000000000
--- a/meta-efl/recipes-efl/efl/evas-generic-loaders_1.10.0.bb
+++ /dev/null
@@ -1,8 +0,0 @@
1require ${BPN}.inc
2
3SRC_URI = "\
4 ${E_RELEASES}/libs/${SRCNAME}/${SRCNAME}-${SRCVER}.tar.gz \
5"
6
7SRC_URI[md5sum] = "ef5ac6a7960528bb12e997f3e304f151"
8SRC_URI[sha256sum] = "f5294c1a86dd4d7d4983ec4217c0d0d1a9cfa3fc2060d4af7eec5fa4ce23a463"
diff --git a/meta-efl/recipes-efl/efl/evas-generic-loaders_1.11.0.bb b/meta-efl/recipes-efl/efl/evas-generic-loaders_1.11.0.bb
new file mode 100644
index 000000000..0b98b1155
--- /dev/null
+++ b/meta-efl/recipes-efl/efl/evas-generic-loaders_1.11.0.bb
@@ -0,0 +1,8 @@
1require ${BPN}.inc
2
3SRC_URI = "\
4 ${E_RELEASES}/libs/${SRCNAME}/${SRCNAME}-${SRCVER}.tar.gz \
5"
6
7SRC_URI[md5sum] = "b99fd8dc1e79efacd4e212374a4f0668"
8SRC_URI[sha256sum] = "4cf55717d75214d22e6c9955bd5b2e74656cc454f011496bac74ae3df6c924e2"