diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2017-04-27 11:04:51 +0200 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2017-08-31 10:18:33 +0200 |
commit | ec9e5ed06256ad92c818474cdb490dc0d3a0d0a3 (patch) | |
tree | e16d2a838f4561d5538928a58f805e5f1373225a /meta-efl | |
parent | 6775acb048dabd624c5c8197b683aba45ed91569 (diff) | |
download | meta-openembedded-ec9e5ed06256ad92c818474cdb490dc0d3a0d0a3.tar.gz |
recipes: remove blacklisted recipes
* as PNBLACKLIST message says, these recipes are blacklisted for long
time and nobody showed any interest to fix them
* remove all unused .patch and .inc files as well
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-efl')
104 files changed, 0 insertions, 3837 deletions
diff --git a/meta-efl/conf/distro/include/efl-from-svn-recipes.inc b/meta-efl/conf/distro/include/efl-from-svn-recipes.inc deleted file mode 100644 index 23a8eaeca..000000000 --- a/meta-efl/conf/distro/include/efl-from-svn-recipes.inc +++ /dev/null | |||
@@ -1,43 +0,0 @@ | |||
1 | EFL_PREFERRED_VERSION ?= "1.7.4+svn%" | ||
2 | EFL_PREFERRED_PYTHON_VERSION ?= "1.7.0+svn%" | ||
3 | |||
4 | PREFERRED_VERSION_e-wm ?= "0.17.0+svnr%" | ||
5 | |||
6 | PREFERRED_VERSION_ecore ?= "${EFL_PREFERRED_VERSION}" | ||
7 | PREFERRED_VERSION_ecore-native ?= "${EFL_PREFERRED_VERSION}" | ||
8 | PREFERRED_VERSION_edbus ?= "${EFL_PREFERRED_VERSION}" | ||
9 | PREFERRED_VERSION_edbus-native ?= "${EFL_PREFERRED_VERSION}" | ||
10 | PREFERRED_VERSION_edje ?= "${EFL_PREFERRED_VERSION}" | ||
11 | PREFERRED_VERSION_edje-native ?= "${EFL_PREFERRED_VERSION}" | ||
12 | PREFERRED_VERSION_edje-nativesdk ?= "${EFL_PREFERRED_VERSION}" | ||
13 | PREFERRED_VERSION_eeze ?= "${EFL_PREFERRED_VERSION}" | ||
14 | PREFERRED_VERSION_eeze-native ?= "${EFL_PREFERRED_VERSION}" | ||
15 | PREFERRED_VERSION_efreet ?= "${EFL_PREFERRED_VERSION}" | ||
16 | PREFERRED_VERSION_efreet-native ?= "${EFL_PREFERRED_VERSION}" | ||
17 | PREFERRED_VERSION_eina ?= "${EFL_PREFERRED_VERSION}" | ||
18 | PREFERRED_VERSION_eina-native ?= "${EFL_PREFERRED_VERSION}" | ||
19 | PREFERRED_VERSION_embryo ?= "${EFL_PREFERRED_VERSION}" | ||
20 | PREFERRED_VERSION_embryo-native ?= "${EFL_PREFERRED_VERSION}" | ||
21 | PREFERRED_VERSION_evas ?= "${EFL_PREFERRED_VERSION}" | ||
22 | PREFERRED_VERSION_evas-generic-loaders ?= "${EFL_PREFERRED_VERSION}" | ||
23 | PREFERRED_VERSION_evas-native ?= "${EFL_PREFERRED_VERSION}" | ||
24 | PREFERRED_VERSION_expedite ?= "${EFL_PREFERRED_VERSION}" | ||
25 | PREFERRED_VERSION_expedite-native ?= "${EFL_PREFERRED_VERSION}" | ||
26 | |||
27 | PREFERRED_VERSION_eet ?= "${EFL_PREFERRED_VERSION}" | ||
28 | PREFERRED_VERSION_eet-native ?= "${EFL_PREFERRED_VERSION}" | ||
29 | |||
30 | PREFERRED_VERSION_eio ?= "${EFL_PREFERRED_VERSION}" | ||
31 | PREFERRED_VERSION_eio-native ?= "${EFL_PREFERRED_VERSION}" | ||
32 | PREFERRED_VERSION_emotion ?= "${EFL_PREFERRED_VERSION}" | ||
33 | PREFERRED_VERSION_ethumb ?= "${EFL_PREFERRED_VERSION}" | ||
34 | PREFERRED_VERSION_elementary ?= "${EFL_PREFERRED_VERSION}" | ||
35 | |||
36 | PREFERRED_VERSION_python-elementary ?= "${EFL_PREFERRED_PYTHON_VERSION}" | ||
37 | PREFERRED_VERSION_python-ecore ?= "${EFL_PREFERRED_PYTHON_VERSION}" | ||
38 | PREFERRED_VERSION_python-edbus ?= "${EFL_PREFERRED_PYTHON_VERSION}" | ||
39 | PREFERRED_VERSION_python-edje ?= "${EFL_PREFERRED_PYTHON_VERSION}" | ||
40 | PREFERRED_VERSION_python-emotion ?= "${EFL_PREFERRED_PYTHON_VERSION}" | ||
41 | PREFERRED_VERSION_python-evas ?= "${EFL_PREFERRED_PYTHON_VERSION}" | ||
42 | |||
43 | PREFERRED_VERSION_terminology ?= "0.2.0+svn%" | ||
diff --git a/meta-efl/recipes-devtools/python/python-edbus.inc b/meta-efl/recipes-devtools/python/python-edbus.inc deleted file mode 100644 index cc6008387..000000000 --- a/meta-efl/recipes-devtools/python/python-edbus.inc +++ /dev/null | |||
@@ -1,46 +0,0 @@ | |||
1 | DESCRIPTION = "${PN} bindings" | ||
2 | LICENSE = "LGPLv2.1" | ||
3 | LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24" | ||
4 | AUTHOR = "Gustavo Sverzut Barbieri <barbieri@gmail.com>" | ||
5 | # NOTE: Due to a bug in distutils, even if we don't use pyrex but cython, | ||
6 | # we need to build pyrex otherwise cython doesn't get called to build | ||
7 | # the extension modules. | ||
8 | DEPENDS = "python-cython-native python-pyrex-native python-numeric eina edbus python-dbus" | ||
9 | RDEPENDS_${PN} += "python-lang python-dbus" | ||
10 | |||
11 | inherit e-base autotools pkgconfig distutils-base | ||
12 | |||
13 | SRCNAME = "python-e_dbus" | ||
14 | SRCVER = "${PV}" | ||
15 | |||
16 | SRC_URI = "\ | ||
17 | ${E_MIRROR}/BINDINGS/python/${SRCNAME}-${SRCVER}.tar.bz2 \ | ||
18 | " | ||
19 | S = "${WORKDIR}/${SRCNAME}-${SRCVER}" | ||
20 | |||
21 | |||
22 | do_configure_prepend() { | ||
23 | # prefix CYTHON_.*_INCLUDEDIR with path to STAGING_DIR_HOST also use $PKG_CONFIG instead of pkg-config directly | ||
24 | sed -i "s#=\`\$PKG_CONFIG --variable=includedir \"python-evas#=${STAGING_DIR_HOST}\`\$PKG_CONFIG --variable=includedir \"python-evas#g" ${S}/configure.ac | ||
25 | } | ||
26 | |||
27 | do_install_append() { | ||
28 | if [ -e examples ]; then | ||
29 | for i in `find examples -name "*.edc"`; do | ||
30 | cd ${S}/`dirname $i` | ||
31 | echo "Generating .edj file for $i..." | ||
32 | edje_cc `basename $i` | ||
33 | echo "Removing sources in this directory..." | ||
34 | rm -f *.edc *.png *.ttf *.jpeg | ||
35 | done | ||
36 | cd ${S} | ||
37 | install -d ${D}${datadir}/${PN}/ | ||
38 | cp -R --no-dereference --preserve=mode,links -v examples ${D}${datadir}/${PN}/ | ||
39 | find ${D}${datadir}/${PN}/examples -name ".svn" | xargs rm -rf | ||
40 | fi | ||
41 | } | ||
42 | |||
43 | FILES_${PN}-dbg += "${libdir}/${PYTHON_DIR}/site-packages/*.egg/*/*/.debug" | ||
44 | |||
45 | PACKAGES += "${PN}-examples" | ||
46 | FILES_${PN}-examples = "${datadir}/${PN}/examples" | ||
diff --git a/meta-efl/recipes-devtools/python/python-edbus_1.7.0.bb b/meta-efl/recipes-devtools/python/python-edbus_1.7.0.bb deleted file mode 100644 index bfacf897f..000000000 --- a/meta-efl/recipes-devtools/python/python-edbus_1.7.0.bb +++ /dev/null | |||
@@ -1,8 +0,0 @@ | |||
1 | require ${BPN}.inc | ||
2 | |||
3 | PR = "r1" | ||
4 | |||
5 | SRC_URI[md5sum] = "40b479444bb06147429a276127981890" | ||
6 | SRC_URI[sha256sum] = "78e5ca334ee25185748660b4e612f984f4d3bced018f062278701429868f117b" | ||
7 | |||
8 | PNBLACKLIST[python-edbus] ?= "Fails to build with RSS http://errors.yoctoproject.org/Errors/Details/130600/ - the recipe will be removed on 2017-09-01 unless the issue is fixed" | ||
diff --git a/meta-efl/recipes-devtools/python/python-efl.inc b/meta-efl/recipes-devtools/python/python-efl.inc deleted file mode 100644 index 6837dab9f..000000000 --- a/meta-efl/recipes-devtools/python/python-efl.inc +++ /dev/null | |||
@@ -1,71 +0,0 @@ | |||
1 | DESCRIPTION = "${PN} bindings" | ||
2 | |||
3 | LICENSE = "LGPL-3.0" | ||
4 | LIC_FILES_CHKSUM = "file://COPYING.LESSER;md5=e6a600fd5e1d9cbde2d983680233ad02" | ||
5 | # there is also GPLv3.0 in COPYING;md5=d32239bcb673463ab874e80d47fae504 but no file seems to use that | ||
6 | |||
7 | AUTHOR = "Gustavo Sverzut Barbieri <barbieri@gmail.com>" | ||
8 | # NOTE: Due to a bug in distutils, even if we don't use pyrex but cython, | ||
9 | # we need to build pyrex otherwise cython doesn't get called to build | ||
10 | # the extension modules. | ||
11 | DEPENDS = "python-cython-native python-pyrex-native python-numeric python-dbus lua efl elementary" | ||
12 | RDEPENDS_${PN} += "python-lang" | ||
13 | |||
14 | PROVIDES = "python-ecore python-eldbus python-edje python-elementary python-emotion python-evas" | ||
15 | |||
16 | inherit e-base distutils pkgconfig | ||
17 | |||
18 | SRCVER = "${PV}" | ||
19 | |||
20 | SRC_URI = "\ | ||
21 | ${E_RELEASES}/bindings/python/${SRCNAME}-${SRCVER}.tar.gz \ | ||
22 | " | ||
23 | S = "${WORKDIR}/${SRCNAME}-${SRCVER}" | ||
24 | |||
25 | do_install_append() { | ||
26 | # drop all .pyo, pyc files | ||
27 | find ${D}${libdir}/${PYTHON_DIR}/site-packages -name \*.pyo -o -name \*.pyc | xargs rm -f | ||
28 | } | ||
29 | |||
30 | PACKAGES += "python-ecore python-eldbus python-edje python-elementary python-emotion python-evas python-ethumb ${PN}-examples" | ||
31 | |||
32 | FILES_${PN} = " \ | ||
33 | ${libdir}/${PYTHON_DIR}/site-packages/python_efl*egg-info \ | ||
34 | ${libdir}/${PYTHON_DIR}/site-packages/efl/eo.so \ | ||
35 | ${libdir}/${PYTHON_DIR}/site-packages/efl/utils \ | ||
36 | ${libdir}/${PYTHON_DIR}/site-packages/efl/__init__.py \ | ||
37 | " | ||
38 | FILES_${PN}-dbg += "${libdir}/${PYTHON_DIR}/site-packages/*.egg/*/*/.debug" | ||
39 | FILES_${PN}-dev += "${libdir}/${PYTHON_DIR}/site-packages/*/*.la" | ||
40 | |||
41 | FILES_${PN}-examples = "${datadir}/${PN}/examples" | ||
42 | |||
43 | FILES_python-ecore = " \ | ||
44 | ${libdir}/${PYTHON_DIR}/site-packages/ecore/ \ | ||
45 | ${libdir}/${PYTHON_DIR}/site-packages/efl/ecore*.so \ | ||
46 | ${libdir}/${PYTHON_DIR}/site-packages/efl/ecore \ | ||
47 | " | ||
48 | FILES_python-eldbus = " \ | ||
49 | ${libdir}/${PYTHON_DIR}/site-packages/e_dbus/ \ | ||
50 | ${libdir}/${PYTHON_DIR}/site-packages/efl/dbus_mainloop.so \ | ||
51 | " | ||
52 | FILES_python-edje = " \ | ||
53 | ${libdir}/${PYTHON_DIR}/site-packages/edje/ \ | ||
54 | ${libdir}/${PYTHON_DIR}/site-packages/efl/edje*.so \ | ||
55 | " | ||
56 | FILES_python-elementary = " \ | ||
57 | ${libdir}/${PYTHON_DIR}/site-packages/elementary/ \ | ||
58 | ${libdir}/${PYTHON_DIR}/site-packages/efl/elementary/ \ | ||
59 | " | ||
60 | FILES_python-emotion = " \ | ||
61 | ${libdir}/${PYTHON_DIR}/site-packages/emotion/ \ | ||
62 | ${libdir}/${PYTHON_DIR}/site-packages/efl/emotion.so \ | ||
63 | " | ||
64 | FILES_python-evas = " \ | ||
65 | ${libdir}/${PYTHON_DIR}/site-packages/evas/ \ | ||
66 | ${libdir}/${PYTHON_DIR}/site-packages/efl/evas.so \ | ||
67 | " | ||
68 | FILES_python-ethumb = " \ | ||
69 | ${libdir}/${PYTHON_DIR}/site-packages/ethumb/ \ | ||
70 | ${libdir}/${PYTHON_DIR}/site-packages/efl/ethumb*so \ | ||
71 | " | ||
diff --git a/meta-efl/recipes-devtools/python/python-efl_1.15.0.bb b/meta-efl/recipes-devtools/python/python-efl_1.15.0.bb deleted file mode 100644 index e9a79b252..000000000 --- a/meta-efl/recipes-devtools/python/python-efl_1.15.0.bb +++ /dev/null | |||
@@ -1,6 +0,0 @@ | |||
1 | require ${BPN}.inc | ||
2 | |||
3 | SRC_URI[md5sum] = "f7c5d557336ea9df69bcca09c420711a" | ||
4 | SRC_URI[sha256sum] = "11e607b465cb66dafe05c66e02d61e09335b370fe9fd2a74d88282b3ee597bcc" | ||
5 | |||
6 | PNBLACKLIST[python-efl] ?= "Depends on blacklisted elementary - the recipe will be removed on 2017-09-01 unless the issue is fixed" | ||
diff --git a/meta-efl/recipes-devtools/python/python-efl_git.bb b/meta-efl/recipes-devtools/python/python-efl_git.bb deleted file mode 100644 index 292b9eb87..000000000 --- a/meta-efl/recipes-devtools/python/python-efl_git.bb +++ /dev/null | |||
@@ -1,11 +0,0 @@ | |||
1 | require ${BPN}.inc | ||
2 | |||
3 | SRCREV = "71ed20ebf662a7b72e60913df94ce6933236bf09" | ||
4 | PV = "1.12.0+git${SRCPV}" | ||
5 | DEFAULT_PREFERENCE = "-1" | ||
6 | |||
7 | SRC_URI = "git://git.enlightenment.org/bindings/python/${BPN}.git;branch=python-efl-1.12" | ||
8 | |||
9 | S = "${WORKDIR}/git" | ||
10 | |||
11 | PNBLACKLIST[python-efl] ?= "Depends on blacklisted elementary - the recipe will be removed on 2017-09-01 unless the issue is fixed" | ||
diff --git a/meta-efl/recipes-efl/e17/cpu/configure.patch b/meta-efl/recipes-efl/e17/cpu/configure.patch deleted file mode 100644 index 87c85de9f..000000000 --- a/meta-efl/recipes-efl/e17/cpu/configure.patch +++ /dev/null | |||
@@ -1,13 +0,0 @@ | |||
1 | Index: cpu/configure.ac | ||
2 | =================================================================== | ||
3 | --- cpu.orig/configure.ac 2014-07-17 20:39:48.000000000 +0000 | ||
4 | +++ cpu/configure.ac 2014-07-17 21:39:55.320555868 +0000 | ||
5 | @@ -10,7 +10,7 @@ | ||
6 | AC_CANONICAL_HOST | ||
7 | AC_ISC_POSIX | ||
8 | |||
9 | -AM_INIT_AUTOMAKE(1.6) | ||
10 | +AM_INIT_AUTOMAKE([foreign]) | ||
11 | AM_CONFIG_HEADER(config.h) | ||
12 | m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) | ||
13 | |||
diff --git a/meta-efl/recipes-efl/e17/cpu_svn.bb b/meta-efl/recipes-efl/e17/cpu_svn.bb deleted file mode 100644 index 3ffb9889f..000000000 --- a/meta-efl/recipes-efl/e17/cpu_svn.bb +++ /dev/null | |||
@@ -1,12 +0,0 @@ | |||
1 | LICENSE = "MIT" | ||
2 | LIC_FILES_CHKSUM = "file://COPYING;md5=344895f253c32f38e182dcaf30fe8a35 \ | ||
3 | file://COPYING-PLAIN;md5=c910b645eda0005ccec46f75203dc96e" | ||
4 | |||
5 | PV = "0.0.1+svnr${SRCREV}" | ||
6 | PR = "${INC_PR}.0" | ||
7 | |||
8 | require e-module.inc | ||
9 | |||
10 | SRC_URI += "file://configure.patch" | ||
11 | |||
12 | PNBLACKLIST[cpu] ?= "Depends on blacklisted e-wm - the recipe will be removed on 2017-09-01 unless the issue is fixed" | ||
diff --git a/meta-efl/recipes-efl/e17/diskio_svn.bb b/meta-efl/recipes-efl/e17/diskio_svn.bb deleted file mode 100644 index 4f778d6e1..000000000 --- a/meta-efl/recipes-efl/e17/diskio_svn.bb +++ /dev/null | |||
@@ -1,10 +0,0 @@ | |||
1 | LICENSE = "MIT" | ||
2 | LIC_FILES_CHKSUM = "file://COPYING;md5=344895f253c32f38e182dcaf30fe8a35 \ | ||
3 | file://COPYING-PLAIN;md5=68be76d8126face2fbbecdf1bcbe2b10" | ||
4 | |||
5 | PV = "0.0.1+svnr${SRCPV}" | ||
6 | PR = "${INC_PR}.0" | ||
7 | |||
8 | PNBLACKLIST[diskio] ?= "broken: switch to https://git.enlightenment.org/enlightenment/modules/diskio.git/ and fix 0.0.1+svnr82070-r0.0/E-MODULES-EXTRA/diskio/e-module-diskio.edc:58. invalid state name: 'off'. "default" state must always be first. - the recipe will be removed on 2017-09-01 unless the issue is fixed" | ||
9 | |||
10 | require e-module.inc | ||
diff --git a/meta-efl/recipes-efl/e17/e-module.inc b/meta-efl/recipes-efl/e17/e-module.inc deleted file mode 100644 index 770f794aa..000000000 --- a/meta-efl/recipes-efl/e17/e-module.inc +++ /dev/null | |||
@@ -1,19 +0,0 @@ | |||
1 | DESCRIPTION = "E17 ${PN} module" | ||
2 | SECTION = "x11/multimedia" | ||
3 | DEPENDS = "e-wm" | ||
4 | |||
5 | SRCREV = "${EFL_SRCREV}" | ||
6 | INC_PR = "r0" | ||
7 | |||
8 | SRCNAME = "E-MODULES-EXTRA/${BPN}" | ||
9 | |||
10 | inherit e gettext | ||
11 | SRC_URI = "${E_SVN}/trunk;module=${SRCNAME};protocol=http;scmdata=keep" | ||
12 | S = "${WORKDIR}/${SRCNAME}" | ||
13 | |||
14 | EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc" | ||
15 | |||
16 | FILES_${PN} += "${libdir}/enlightenment/modules/${PN}" | ||
17 | FILES_${PN}-dbg += "${libdir}/enlightenment/modules/${PN}/*/.debug" | ||
18 | FILES_${PN}-staticdev += "${libdir}/enlightenment/modules/${PN}/*/*.a" | ||
19 | |||
diff --git a/meta-efl/recipes-efl/e17/e-tasks/0001-dbus-stuff-Convert-to-eldbus.patch b/meta-efl/recipes-efl/e17/e-tasks/0001-dbus-stuff-Convert-to-eldbus.patch deleted file mode 100644 index f92a772fe..000000000 --- a/meta-efl/recipes-efl/e17/e-tasks/0001-dbus-stuff-Convert-to-eldbus.patch +++ /dev/null | |||
@@ -1,204 +0,0 @@ | |||
1 | From 37223289b3d85ea8876e7ba7c9ff97ec428073ba Mon Sep 17 00:00:00 2001 | ||
2 | From: Martin Jansa <Martin.Jansa@gmail.com> | ||
3 | Date: Sat, 22 Feb 2014 14:36:38 +0100 | ||
4 | Subject: [PATCH] dbus-stuff: Convert to eldbus | ||
5 | |||
6 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | ||
7 | --- | ||
8 | configure.ac | 2 +- | ||
9 | src/Makefile.am | 2 +- | ||
10 | src/dbus-stuff.c | 95 ++++++++++++++++++++++++++++++++------------------------ | ||
11 | src/dbus-stuff.h | 13 ++------ | ||
12 | src/main.c | 2 +- | ||
13 | 5 files changed, 61 insertions(+), 53 deletions(-) | ||
14 | |||
15 | diff --git a/configure.ac b/configure.ac | ||
16 | index b3e4d12..4ace32a 100644 | ||
17 | --- a/configure.ac | ||
18 | +++ b/configure.ac | ||
19 | @@ -15,7 +15,7 @@ AC_HEADER_STDC | ||
20 | |||
21 | AM_PROG_LIBTOOL | ||
22 | |||
23 | -PKG_CHECK_MODULES(TASKS, [elementary eina dbus-1 edbus sqlite3]) | ||
24 | +PKG_CHECK_MODULES(TASKS, [elementary eina dbus-1 eldbus sqlite3]) | ||
25 | |||
26 | AC_OUTPUT([ | ||
27 | Makefile | ||
28 | diff --git a/src/Makefile.am b/src/Makefile.am | ||
29 | index 2143dc9..31d5253 100644 | ||
30 | --- a/src/Makefile.am | ||
31 | +++ b/src/Makefile.am | ||
32 | @@ -8,7 +8,7 @@ AM_CPPFLAGS = \ | ||
33 | $(TASKS_CFLAGS) | ||
34 | |||
35 | AM_CFLAGS =\ | ||
36 | - $(EDBUS_CFLAGS) \ | ||
37 | + $(ELDBUS_CFLAGS) \ | ||
38 | -Wall\ | ||
39 | -g | ||
40 | |||
41 | diff --git a/src/dbus-stuff.c b/src/dbus-stuff.c | ||
42 | index 50809bc..9f02ef3 100644 | ||
43 | --- a/src/dbus-stuff.c | ||
44 | +++ b/src/dbus-stuff.c | ||
45 | @@ -1,8 +1,7 @@ | ||
46 | /*************************************************************************** | ||
47 | * dbus-stuff.c | ||
48 | * | ||
49 | - * Copyright 2009 cchandel | ||
50 | - * <cchandel@yahoo.com> | ||
51 | + * Copyright 2009 cchandel <cchandel@yahoo.com> | ||
52 | ****************************************************************************/ | ||
53 | |||
54 | /* | ||
55 | @@ -21,51 +20,67 @@ | ||
56 | * Foundation, Inc., 51 Franklin Street, Fifth Floor Boston, MA 02110-1301, USA | ||
57 | */ | ||
58 | #include "dbus-stuff.h" | ||
59 | -#include <string.h> | ||
60 | -#include <E_DBus.h> | ||
61 | -#include <Elementary.h> | ||
62 | +#include "Eldbus.h" | ||
63 | |||
64 | -void occupy_cpu(void) | ||
65 | +void on_usage_cb(void *data EINA_UNUSED, const Eldbus_Message *msg, Eldbus_Pending *pending EINA_UNUSED) | ||
66 | +{ | ||
67 | + const char *errname, *errmsg; | ||
68 | + if (eldbus_message_error_get(msg, &errname, &errmsg)) | ||
69 | + fprintf(stderr, "Error: %s %s\n", errname, errmsg); | ||
70 | +} | ||
71 | + | ||
72 | +int ousaged_resource(const char *resource, int used) | ||
73 | { | ||
74 | - e_dbus_init(); | ||
75 | - conn = e_dbus_bus_get(DBUS_BUS_SYSTEM); | ||
76 | - | ||
77 | - DBusMessage *msg; | ||
78 | - msg = dbus_message_new_method_call( | ||
79 | - "org.freesmartphone.ousaged", | ||
80 | - "/org/freesmartphone/Usage", | ||
81 | - "org.freesmartphone.Usage", | ||
82 | - "RequestResource" | ||
83 | - ); | ||
84 | - | ||
85 | - const char *resource = "CPU"; | ||
86 | - dbus_message_append_args (msg, DBUS_TYPE_STRING, &resource, DBUS_TYPE_INVALID); | ||
87 | + eldbus_init(); | ||
88 | + const char *REQUEST = "RequestResource"; | ||
89 | + const char *RELEASE = "ReleaseResource"; | ||
90 | + const int PREQUEST = 1; | ||
91 | |||
92 | - e_dbus_message_send(conn, msg, dbus_reply_cb, -1, NULL); | ||
93 | - dbus_message_unref(msg); | ||
94 | -} | ||
95 | + Eldbus_Connection *conn; | ||
96 | + Eldbus_Object *obj; | ||
97 | + Eldbus_Proxy *usage; | ||
98 | + Eldbus_Pending *pending; | ||
99 | + conn = eldbus_connection_get(ELDBUS_CONNECTION_TYPE_SYSTEM); | ||
100 | + if (!conn) | ||
101 | + { | ||
102 | + fprintf(stderr, "Error: could not get system bus\n"); | ||
103 | + return EXIT_FAILURE; | ||
104 | + } | ||
105 | |||
106 | -void release_cpu(void) | ||
107 | -{ | ||
108 | - DBusMessage *msg; | ||
109 | - msg = dbus_message_new_method_call( | ||
110 | - "org.freesmartphone.ousaged", | ||
111 | - "/org/freesmartphone/Usage", | ||
112 | - "org.freesmartphone.Usage", | ||
113 | - "ReleaseResource" | ||
114 | - ); | ||
115 | - | ||
116 | - const char *resource = "CPU"; | ||
117 | - dbus_message_append_args (msg, DBUS_TYPE_STRING, &resource, DBUS_TYPE_INVALID); | ||
118 | + obj = eldbus_object_get(conn, "org.freesmartphone.ousaged", "/org/freesmartphone/Usage"); | ||
119 | + if (!obj) | ||
120 | + { | ||
121 | + fprintf(stderr, "Error: could not get object\n"); | ||
122 | + return EXIT_FAILURE; | ||
123 | + } | ||
124 | |||
125 | - e_dbus_message_send(conn, msg, dbus_reply_cb, -1, NULL); | ||
126 | - dbus_message_unref(msg); | ||
127 | + usage = eldbus_proxy_get(obj, "org.freesmartphone.Usage"); | ||
128 | + if (!usage) | ||
129 | + { | ||
130 | + fprintf(stderr, "Error: could not get proxy\n"); | ||
131 | + return EXIT_FAILURE; | ||
132 | + } | ||
133 | + | ||
134 | + pending = eldbus_proxy_call(usage, used == PREQUEST ? REQUEST : RELEASE, on_usage_cb, NULL, -1, "ss", resource); | ||
135 | + if (!pending) | ||
136 | + { | ||
137 | + fprintf(stderr, "Error: could not call\n"); | ||
138 | + return EXIT_FAILURE; | ||
139 | + } | ||
140 | + eldbus_proxy_unref(usage); | ||
141 | + eldbus_object_unref(obj); | ||
142 | + eldbus_connection_unref(conn); | ||
143 | + | ||
144 | + eldbus_shutdown(); | ||
145 | + return EXIT_SUCCESS; | ||
146 | } | ||
147 | |||
148 | -void dbus_reply_cb(void *data, DBusMessage *replymsg, DBusError *error) | ||
149 | +int request_cpu(void) | ||
150 | { | ||
151 | - if (dbus_error_is_set(error)) { | ||
152 | - printf("Error: %s - %s\n", error->name, error->message); | ||
153 | - } | ||
154 | + return ousaged_resource("CPU", 1); | ||
155 | } | ||
156 | |||
157 | +int release_cpu(void) | ||
158 | +{ | ||
159 | + return ousaged_resource("CPU" , 0); | ||
160 | +} | ||
161 | diff --git a/src/dbus-stuff.h b/src/dbus-stuff.h | ||
162 | index 83d4778..a3c72cb 100644 | ||
163 | --- a/src/dbus-stuff.h | ||
164 | +++ b/src/dbus-stuff.h | ||
165 | @@ -2,8 +2,7 @@ | ||
166 | * dbus.h | ||
167 | * | ||
168 | * Fri Mar 6 12:32:57 2009 | ||
169 | - * Copyright 2009 nidhin | ||
170 | - * <nidhin@nids-laptop.home> | ||
171 | + * Copyright 2009 nidhin <nidhin@nids-laptop.home> | ||
172 | ****************************************************************************/ | ||
173 | |||
174 | /* | ||
175 | @@ -22,11 +21,5 @@ | ||
176 | * Foundation, Inc., 51 Franklin Street, Fifth Floor Boston, MA 02110-1301, USA | ||
177 | */ | ||
178 | |||
179 | -#include <E_DBus.h> | ||
180 | -#include <Elementary.h> | ||
181 | - | ||
182 | -void occupy_cpu(void); | ||
183 | -void release_cpu(void); | ||
184 | -void dbus_reply_cb(void *data, DBusMessage *replymsg, DBusError *error); | ||
185 | - | ||
186 | -E_DBus_Connection *conn; | ||
187 | +int request_cpu(void); | ||
188 | +int release_cpu(void); | ||
189 | diff --git a/src/main.c b/src/main.c | ||
190 | index 92d21de..4e4bbe2 100644 | ||
191 | --- a/src/main.c | ||
192 | +++ b/src/main.c | ||
193 | @@ -76,7 +76,7 @@ elm_main(int argc, char **argv) | ||
194 | //restore state | ||
195 | restore_state(); | ||
196 | |||
197 | - occupy_cpu(); | ||
198 | + request_cpu(); | ||
199 | |||
200 | elm_run(); | ||
201 | //clean up stuff | ||
202 | -- | ||
203 | 1.8.5.3 | ||
204 | |||
diff --git a/meta-efl/recipes-efl/e17/e-tasks_git.bb b/meta-efl/recipes-efl/e17/e-tasks_git.bb deleted file mode 100644 index 7eab6d0f0..000000000 --- a/meta-efl/recipes-efl/e17/e-tasks_git.bb +++ /dev/null | |||
@@ -1,34 +0,0 @@ | |||
1 | SUMMARY = "e-tasks is a todo program for Openmoko phones" | ||
2 | HOMEPAGE = "http://code.google.com/p/e-tasks/" | ||
3 | AUTHOR = "cchandel" | ||
4 | LICENSE = "GPLv3" | ||
5 | LIC_FILES_CHKSUM = "file://COPYING;md5=8f0e2cd40e05189ec81232da84bd6e1a" | ||
6 | SECTION = "e/apps" | ||
7 | DEPENDS = "elementary eina eldbus sqlite3" | ||
8 | |||
9 | inherit autotools | ||
10 | |||
11 | SRCREV = "890f5ee37d1a5fd1ceb2495950d15151d4cf756b" | ||
12 | PV = "0.0.2+gitr${SRCPV}" | ||
13 | |||
14 | SRC_URI = "git://github.com/shr-project/e-tasks.git" | ||
15 | SRC_URI += "file://0001-dbus-stuff-Convert-to-eldbus.patch" | ||
16 | |||
17 | S = "${WORKDIR}/git" | ||
18 | |||
19 | do_install_append() { | ||
20 | install -d "${D}/${datadir}/pixmaps" | ||
21 | install -m 0644 "${S}/resources/e-tasks.png" "${D}/${datadir}/pixmaps" | ||
22 | install -d "${D}/${datadir}/applications" | ||
23 | install -m 0644 "${S}/resources/e-tasks.desktop" "${D}/${datadir}/applications" | ||
24 | install -d "${D}/${datadir}/e-tasks" | ||
25 | for ico in "${S}/resources/"*.png; do | ||
26 | if [ "$(basename $ico)" != "e-tasks.png" ]; then | ||
27 | install -m 0644 $ico "${D}/${datadir}/e-tasks" | ||
28 | fi | ||
29 | done | ||
30 | } | ||
31 | |||
32 | FILES_${PN} += "/usr/share/e-tasks/* /usr/share/applications/* /usr/share/pixmaps/*" | ||
33 | |||
34 | PNBLACKLIST[e-tasks] ?= "Depends on blacklisted elementary - the recipe will be removed on 2017-09-01 unless the issue is fixed" | ||
diff --git a/meta-efl/recipes-efl/e17/e-wm-theme-b-and-w_svn.bb b/meta-efl/recipes-efl/e17/e-wm-theme-b-and-w_svn.bb deleted file mode 100644 index 9e6e9f24e..000000000 --- a/meta-efl/recipes-efl/e17/e-wm-theme-b-and-w_svn.bb +++ /dev/null | |||
@@ -1,37 +0,0 @@ | |||
1 | DESCRIPTION = "b-and-w theme was default E17 theme before alpha3 and some people still prefers it." | ||
2 | SECTION = "e/utils" | ||
3 | DEPENDS = "edje-native" | ||
4 | RDEPENDS_${PN} = "e-wm" | ||
5 | LICENSE = "MIT & BSD" | ||
6 | # upstream was asked to include license infor in THEME dir | ||
7 | LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" | ||
8 | |||
9 | inherit allarch | ||
10 | |||
11 | SRCREV = "${EFL_SRCREV}" | ||
12 | PV = "0.0+svnr${SRCPV}" | ||
13 | |||
14 | inherit e-base | ||
15 | |||
16 | SRCNAME = "b_and_w" | ||
17 | SRC_URI = "${E_SVN}/trunk/THEMES;module=${SRCNAME};protocol=http" | ||
18 | S = "${WORKDIR}/${SRCNAME}/e" | ||
19 | |||
20 | do_compile() { | ||
21 | # unfortunately hardcoded edje_cc in Makefile | ||
22 | sed -i "s#\tedje_cc#\t${STAGING_BINDIR_NATIVE}/edje_cc#g" Makefile | ||
23 | make | ||
24 | } | ||
25 | |||
26 | do_install() { | ||
27 | install -d ${D}${datadir}/enlightenment/data/themes/ | ||
28 | install -m 0644 ${S}/b_and_w.edj ${D}${datadir}/enlightenment/data/themes/ | ||
29 | } | ||
30 | |||
31 | FILES_${PN} = "${datadir}/enlightenment/data/themes/" | ||
32 | |||
33 | PNBLACKLIST[e-wm-theme-b-and-w] ?= "Runtime depends on blacklisted e-wm - the recipe will be removed on 2017-09-01 unless the issue is fixed" | ||
34 | |||
35 | PNBLACKLIST[e-wm-theme-b-and-w] ?= "Runtime depends on blacklisted e-wm-theme-b-and-w - the recipe will be removed on 2017-09-01 unless the issue is fixed" | ||
36 | |||
37 | PNBLACKLIST[e-wm-theme-b-and-w] ?= "Runtime depends on blacklisted e-wm-theme-b-and-w-dev - the recipe will be removed on 2017-09-01 unless the issue is fixed" | ||
diff --git a/meta-efl/recipes-efl/e17/e-wm-theme-illume-efenniht/LICENSE b/meta-efl/recipes-efl/e17/e-wm-theme-illume-efenniht/LICENSE deleted file mode 100644 index 61bb2f603..000000000 --- a/meta-efl/recipes-efl/e17/e-wm-theme-illume-efenniht/LICENSE +++ /dev/null | |||
@@ -1,25 +0,0 @@ | |||
1 | Copyright notice for Enlightenment: | ||
2 | |||
3 | Copyright (C) 2000-2010 Carsten Haitzler and various contributors (see AUTHORS) | ||
4 | |||
5 | All rights reserved. | ||
6 | |||
7 | Redistribution and use in source and binary forms, with or without | ||
8 | modification, are permitted provided that the following conditions are met: | ||
9 | |||
10 | 1. Redistributions of source code must retain the above copyright | ||
11 | notice, this list of conditions and the following disclaimer. | ||
12 | 2. Redistributions in binary form must reproduce the above copyright | ||
13 | notice, this list of conditions and the following disclaimer in the | ||
14 | documentation and/or other materials provided with the distribution. | ||
15 | |||
16 | THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, | ||
17 | INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND | ||
18 | FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE | ||
19 | COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, | ||
20 | INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT | ||
21 | LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, | ||
22 | OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF | ||
23 | LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING | ||
24 | NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, | ||
25 | EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
diff --git a/meta-efl/recipes-efl/e17/e-wm-theme-illume-efenniht_svn.bb b/meta-efl/recipes-efl/e17/e-wm-theme-illume-efenniht_svn.bb deleted file mode 100644 index 521213475..000000000 --- a/meta-efl/recipes-efl/e17/e-wm-theme-illume-efenniht_svn.bb +++ /dev/null | |||
@@ -1,39 +0,0 @@ | |||
1 | DESCRIPTION = "efenniht illume theme - Efenniht was devised to be clean \ | ||
2 | and neutral. Its name (which means equinox) comes from the chromatic duality \ | ||
3 | that was decided at the very beginning, with a dark theme (black and orange) \ | ||
4 | and a bright one (white and blue) to be developed so that more people feel \ | ||
5 | comfortable using it. Efenniht uses few animations, discrete contrasts between \ | ||
6 | shades of gray and fine lines (colored) that outline the selected elements." | ||
7 | SECTION = "e/utils" | ||
8 | HOMEPAGE = "http://trac.enlightenment.org/e/wiki/Themes#Efenniht" | ||
9 | DEPENDS = "edje-native" | ||
10 | RDEPENDS_${PN} = "e-wm" | ||
11 | RSUGGESTS_${PN} = "elementary-theme-efenniht" | ||
12 | LICENSE = "MIT & BSD" | ||
13 | LIC_FILES_CHKSUM = "file://${WORKDIR}/LICENSE;md5=f523ab5986cc79b52a90d2ac3d5454a2" | ||
14 | |||
15 | SRCREV = "${EFL_SRCREV}" | ||
16 | PV = "0.0+svnr${SRCPV}" | ||
17 | |||
18 | inherit e-base allarch | ||
19 | |||
20 | SRCNAME = "efenniht" | ||
21 | SRC_URI = "${E_SVN}/trunk/THEMES;module=${SRCNAME};protocol=http \ | ||
22 | file://LICENSE \ | ||
23 | " | ||
24 | S = "${WORKDIR}/${SRCNAME}" | ||
25 | |||
26 | do_compile() { | ||
27 | ${STAGING_BINDIR_NATIVE}/edje_cc -id ${S}/images ${S}/efenniht.edc -o ${S}/efenniht.edj | ||
28 | } | ||
29 | |||
30 | do_install() { | ||
31 | install -d ${D}${datadir}/enlightenment/data/themes/ | ||
32 | install -m 0644 ${S}/efenniht.edj ${D}${datadir}/enlightenment/data/themes/ | ||
33 | } | ||
34 | |||
35 | FILES_${PN} = "${datadir}/enlightenment/data/themes/" | ||
36 | |||
37 | PNBLACKLIST[e-wm-theme-illume-efenniht] ?= "Runtime depends on blacklisted e-wm - the recipe will be removed on 2017-09-01 unless the issue is fixed" | ||
38 | |||
39 | PNBLACKLIST[e-wm-theme-illume-efenniht] ?= "Runtime depends on blacklisted e-wm-theme-illume-efenniht - the recipe will be removed on 2017-09-01 unless the issue is fixed" | ||
diff --git a/meta-efl/recipes-efl/e17/e-wm.inc b/meta-efl/recipes-efl/e17/e-wm.inc deleted file mode 100644 index a6e964b55..000000000 --- a/meta-efl/recipes-efl/e17/e-wm.inc +++ /dev/null | |||
@@ -1,200 +0,0 @@ | |||
1 | DESCRIPTION = "The Enlightenment Window Manager Version 17" | ||
2 | DEPENDS = "eet evas eina ecore edje efreet edbus eeze eio elementary libxcb xcb-util-keysyms" | ||
3 | LICENSE = "MIT & BSD" | ||
4 | LIC_FILES_CHKSUM = "file://COPYING;md5=76de290eb3fdda12121830191c152a7d" | ||
5 | SRCNAME = "e" | ||
6 | |||
7 | inherit e update-alternatives gettext pkgconfig | ||
8 | S = "${WORKDIR}/${SRCNAME}" | ||
9 | |||
10 | PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'pam systemd', d)}" | ||
11 | PACKAGECONFIG[pam] = "--enable-pam,--disable-pam,libpam" | ||
12 | PACKAGECONFIG[systemd] = "--enable-systemd,--disable-systemd,systemd" | ||
13 | |||
14 | EXTRA_OECONF = "\ | ||
15 | --with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc \ | ||
16 | --with-eet-eet=${STAGING_BINDIR_NATIVE}/eet \ | ||
17 | --x-includes=${STAGING_INCDIR}/X11 \ | ||
18 | --x-libraries=${STAGING_LIBDIR} \ | ||
19 | --enable-simple-x11 \ | ||
20 | " | ||
21 | |||
22 | do_configure_prepend() { | ||
23 | autopoint || true | ||
24 | sed '/^ *EFL_PKG_CHECK_VAR/ s/systemduserunitdir/systemdsystemunitdir/g' -i ${S}/configure.ac | ||
25 | } | ||
26 | |||
27 | do_install_append() { | ||
28 | # customising - should rather make this simple upstream | ||
29 | install -m 755 ${WORKDIR}/enlightenment_start.oe ${D}/${bindir} | ||
30 | |||
31 | # security reasons, e-wm checks that in runtime | ||
32 | # xinit[418]: ERROR: CONFIGURATION FILE HAS BAD PERMISSIONS | ||
33 | chmod 600 ${D}/${sysconfdir}/enlightenment/sysactions.conf | ||
34 | |||
35 | install -d ${D}/${sysconfdir}/xdg/menus | ||
36 | install -m 644 ${WORKDIR}/applications.menu ${D}/${sysconfdir}/xdg/menus/ | ||
37 | for I in `find ${D}/${libdir}/enlightenment -name "*.a" -print`; do rm -f $I; done | ||
38 | for I in `find ${D}/${libdir}/enlightenment -name "*.la" -print`; do rm -f $I; done | ||
39 | |||
40 | # work around for issue caused in r78978, more infor in: | ||
41 | # http://sourceforge.net/mailarchive/forum.php?thread_name=20121118194904.GA3438%40jama.jama.net&forum_name=enlightenment-devel | ||
42 | mv ${D}/${libdir}/enlightenment/modules/policies ${D}/${libdir}/enlightenment/modules/illume2/ \ | ||
43 | || echo "illume2 policies are in correct place now" | ||
44 | mv ${D}/${libdir}/enlightenment/modules/keyboards ${D}/${libdir}/enlightenment/modules/illume2/ \ | ||
45 | || echo "illume2 keyboards are in correct place now" | ||
46 | } | ||
47 | |||
48 | RDEPENDS_${PN} += "\ | ||
49 | shared-mime-info \ | ||
50 | mime-support \ | ||
51 | setxkbmap \ | ||
52 | edje-utils \ | ||
53 | ${PN}-utils \ | ||
54 | dbus-x11 \ | ||
55 | " | ||
56 | |||
57 | # Uclibc build don't have 'glibc-utils' | ||
58 | RDEPENDS_${PN}_append_libc-glibc = " glibc-utils " | ||
59 | |||
60 | # The systray module used to be external, but is part of e-wm now | ||
61 | RREPLACES_${PN} = "systray" | ||
62 | |||
63 | RREPLACES_${PN}-config-mobile = "${PN}-config-illume2" | ||
64 | RCONFLICTS_${PN}-config-mobile = "${PN}-config-illume2" | ||
65 | RPROVIDES_${PN}-config-mobile = "${PN}-config-illume2" | ||
66 | |||
67 | PACKAGES =+ "\ | ||
68 | ${PN}-config-default \ | ||
69 | ${PN}-config-mobile \ | ||
70 | ${PN}-config-minimalist \ | ||
71 | ${PN}-config-netbook \ | ||
72 | ${PN}-config-scaleable \ | ||
73 | ${PN}-config-standard \ | ||
74 | ${PN}-config-tiling \ | ||
75 | ${PN}-theme-default \ | ||
76 | ${PN}-background-dark-gradient \ | ||
77 | ${PN}-background-light-gradient \ | ||
78 | ${PN}-backgrounds \ | ||
79 | ${PN}-images \ | ||
80 | ${PN}-icons \ | ||
81 | ${PN}-other \ | ||
82 | ${PN}-input-methods \ | ||
83 | ${PN}-sysactions \ | ||
84 | ${PN}-utils \ | ||
85 | ${PN}-menu \ | ||
86 | efm-desktop-icon \ | ||
87 | illume-keyboard-default-alpha \ | ||
88 | illume-keyboard-default-numeric \ | ||
89 | illume-keyboard-default-terminal \ | ||
90 | " | ||
91 | |||
92 | ESYSACTIONS ?= "${PN}-sysactions" | ||
93 | |||
94 | RRECOMMENDS_${PN} = "\ | ||
95 | ${PN}-config-default \ | ||
96 | ${PN}-images \ | ||
97 | ${PN}-icons \ | ||
98 | ${PN}-other \ | ||
99 | ${PN}-input-methods \ | ||
100 | ${ESYSACTIONS} \ | ||
101 | efreet \ | ||
102 | evas-generic-loader-svg \ | ||
103 | " | ||
104 | |||
105 | FILES_${PN} = "\ | ||
106 | ${bindir}/* \ | ||
107 | ${libdir}/enlightenment/utils/* \ | ||
108 | ${libdir}/enlightenment/modules/*/*.* \ | ||
109 | ${libdir}/enlightenment/modules/*/*/* \ | ||
110 | ${libdir}/enlightenment/modules/*/*/.order \ | ||
111 | ${libdir}/enlightenment/modules/keyboards/ignore_built_in_keyboards \ | ||
112 | ${libdir}/enlightenment/*plugins/*/*/* \ | ||
113 | ${libdir}/enlightenment/preload/e_precache.so \ | ||
114 | ${datadir}/enlightenment/data/icons \ | ||
115 | ${datadir}/enlightenment/data/favorites \ | ||
116 | ${datadir}/enlightenment/data/input_methods \ | ||
117 | ${datadir}/enlightenment/data/config/profile.cfg \ | ||
118 | ${datadir}/enlightenment/AUTHORS \ | ||
119 | ${datadir}/enlightenment/COPYING \ | ||
120 | ${datadir}/xsessions/enlightenment.desktop \ | ||
121 | ${sysconfdir}/xdg \ | ||
122 | ${systemd_unitdir} \ | ||
123 | " | ||
124 | |||
125 | FILES_${PN}-config-default = "${datadir}/enlightenment/data/config/default" | ||
126 | FILES_${PN}-config-mobile = "${datadir}/enlightenment/data/config/mobile" | ||
127 | FILES_${PN}-config-minimalist = "${datadir}/enlightenment/data/config/minimalist" | ||
128 | FILES_${PN}-config-netbook = "${datadir}/enlightenment/data/config/netbook" | ||
129 | FILES_${PN}-config-scaleable = "${datadir}/enlightenment/data/config/scaleable" | ||
130 | FILES_${PN}-config-standard = "${datadir}/enlightenment/data/config/standard" | ||
131 | FILES_${PN}-config-tiling = "${datadir}/enlightenment/data/config/tiling" | ||
132 | FILES_${PN}-theme-default = "${datadir}/enlightenment/data/themes/default.edj" | ||
133 | FILES_${PN}-theme-default = "${datadir}/enlightenment/data/themes/default.edj" | ||
134 | FILES_${PN}-background-dark-gradient = "${datadir}/enlightenment/data/backgrounds/Dark_Gradient.edj" | ||
135 | FILES_${PN}-background-light-gradient = "${datadir}/enlightenment/data/backgrounds/Light_Gradient.edj" | ||
136 | FILES_${PN}-backgrounds = "${datadir}/enlightenment/data/backgrounds/*.edj" | ||
137 | FILES_${PN}-images = "${datadir}/enlightenment/data/images ${datadir}/enlightenment/data/flags" | ||
138 | FILES_${PN}-icons = "${datadir}/enlightenment/data/icons" | ||
139 | FILES_${PN}-other = "${datadir}/enlightenment/data/other" | ||
140 | FILES_${PN}-input-methods = "${datadir}/enlightenment/data/input_methods" | ||
141 | FILES_${PN}-sysactions = "${sysconfdir}/enlightenment/sysactions.conf" | ||
142 | FILES_${PN}-utils = "${libdir}/enlightenment/utils/*" | ||
143 | FILES_${PN}-menu = "${sysconfdir}/xdg/menus/applications.menu" | ||
144 | |||
145 | FILES_efm-desktop-icon = "\ | ||
146 | ${datadir}/applications/efm.desktop \ | ||
147 | ${datadir}/applications/enlightenment_filemanager.desktop \ | ||
148 | ${datadir}/icons/e-module-fileman.png \ | ||
149 | " | ||
150 | |||
151 | KEYBOARDS_DIR="${libdir}/enlightenment/modules/illume-keyboard/keyboards" | ||
152 | FILES_illume-keyboard-default-alpha = "\ | ||
153 | ${KEYBOARDS_DIR}/Default.kbd \ | ||
154 | ${KEYBOARDS_DIR}/alpha.png \ | ||
155 | " | ||
156 | FILES_illume-keyboard-default-numeric = "\ | ||
157 | ${KEYBOARDS_DIR}/Numbers.kbd \ | ||
158 | ${KEYBOARDS_DIR}/numeric.png \ | ||
159 | " | ||
160 | FILES_illume-keyboard-default-terminal = "\ | ||
161 | ${KEYBOARDS_DIR}/Terminal.kbd \ | ||
162 | ${KEYBOARDS_DIR}/qwerty.png \ | ||
163 | " | ||
164 | |||
165 | RRECOMMENDS_${PN}-config-default = "${PN}-theme-default" | ||
166 | RRECOMMENDS_${PN}-config-mobile = "\ | ||
167 | illume-keyboard-default-alpha \ | ||
168 | illume-keyboard-default-numeric \ | ||
169 | illume-keyboard-default-terminal \ | ||
170 | " | ||
171 | |||
172 | RRECOMMENDS_${PN}-config-minimalist = "\ | ||
173 | ${PN}-background-light-gradient \ | ||
174 | ${PN}-theme-default \ | ||
175 | " | ||
176 | RRECOMMENDS_${PN}-config-netbook = "\ | ||
177 | ${PN}-background-dark-gradient \ | ||
178 | ${PN}-theme-default \ | ||
179 | " | ||
180 | RRECOMMENDS_${PN}-config-scaleable = "${PN}-theme-default" | ||
181 | RRECOMMENDS_${PN}-config-standard = "${PN}-theme-default" | ||
182 | |||
183 | FILES_${PN}-dbg += "\ | ||
184 | ${libdir}/enlightenment/modules/*/*/.debug/ \ | ||
185 | ${libdir}/enlightenment/modules/policies/.debug/ \ | ||
186 | ${libdir}/enlightenment/preload/.debug/ \ | ||
187 | ${libdir}/enlightenment/utils/.debug/ \ | ||
188 | ${libdir}/enlightenment/*plugins/*/*/.debug \ | ||
189 | " | ||
190 | |||
191 | FILES_${PN}-doc += "\ | ||
192 | ${datadir}/enlightenment/doc \ | ||
193 | " | ||
194 | |||
195 | CONFFILES_${PN}-menu = "${sysconfdir}/xdg/menus/applications.menu" | ||
196 | CONFFILES_${PN}-sysactions = "/etc/enlightenment/sysactions.conf" | ||
197 | |||
198 | ALTERNATIVE_${PN} = "x-window-manager" | ||
199 | ALTERNATIVE_TARGET[x-window-manager] = "${bindir}/enlightenment_start.oe" | ||
200 | ALTERNATIVE_PRIORITY[x-window-manager] = "16" | ||
diff --git a/meta-efl/recipes-efl/e17/e-wm/0001-Fix-incorrect-message-type.patch b/meta-efl/recipes-efl/e17/e-wm/0001-Fix-incorrect-message-type.patch deleted file mode 100644 index e718ef3db..000000000 --- a/meta-efl/recipes-efl/e17/e-wm/0001-Fix-incorrect-message-type.patch +++ /dev/null | |||
@@ -1,28 +0,0 @@ | |||
1 | From 0aef43c9cd1656413cf2eb3dc7c19b355ee7ed52 Mon Sep 17 00:00:00 2001 | ||
2 | From: Carlos Rafael Giani <dv@pseudoterminal.org> | ||
3 | Date: Sun, 1 Jun 2014 14:45:49 +0200 | ||
4 | Subject: [PATCH] Fix incorrect message type | ||
5 | |||
6 | Upstream-Status: Pending | ||
7 | |||
8 | Signed-off-by: Carlos Rafael Giani <dv@pseudoterminal.org> | ||
9 | --- | ||
10 | src/bin/e_desk.c | 2 +- | ||
11 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
12 | |||
13 | diff --git a/src/bin/e_desk.c b/src/bin/e_desk.c | ||
14 | index b156e19..77d7520 100644 | ||
15 | --- a/src/bin/e_desk.c | ||
16 | +++ b/src/bin/e_desk.c | ||
17 | @@ -221,7 +221,7 @@ e_desk_show(E_Desk *desk) | ||
18 | E_Event_Desk_Show *ev; | ||
19 | E_Event_Desk_Before_Show *eev; | ||
20 | E_Event_Desk_After_Show *eeev; | ||
21 | - Edje_Message_Float_Set *msg; | ||
22 | + Edje_Message_Int_Set *msg; | ||
23 | Eina_List *l; | ||
24 | E_Shelf *es; | ||
25 | int was_zone = 0, x, y, dx = 0, dy = 0; | ||
26 | -- | ||
27 | 1.8.3.2 | ||
28 | |||
diff --git a/meta-efl/recipes-efl/e17/e-wm/0001-configure.ac-add-foreign.patch b/meta-efl/recipes-efl/e17/e-wm/0001-configure.ac-add-foreign.patch deleted file mode 100644 index c7a574c90..000000000 --- a/meta-efl/recipes-efl/e17/e-wm/0001-configure.ac-add-foreign.patch +++ /dev/null | |||
@@ -1,29 +0,0 @@ | |||
1 | From 19e59b6e8148388e7a17f10d4390176a50e2917f Mon Sep 17 00:00:00 2001 | ||
2 | From: Martin Jansa <Martin.Jansa@gmail.com> | ||
3 | Date: Mon, 25 Aug 2014 16:06:03 +0200 | ||
4 | Subject: [PATCH] configure.ac: add foreign | ||
5 | |||
6 | * fixes: | ||
7 | | configure.ac:312: error: required file './ABOUT-NLS' not found | ||
8 | |||
9 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | ||
10 | --- | ||
11 | configure.ac | 2 +- | ||
12 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
13 | |||
14 | diff --git a/configure.ac b/configure.ac | ||
15 | index 51ad0ba..cd77739 100644 | ||
16 | --- a/configure.ac | ||
17 | +++ b/configure.ac | ||
18 | @@ -34,7 +34,7 @@ AH_BOTTOM([ | ||
19 | #endif /* EFL_CONFIG_H__ */ | ||
20 | ]) | ||
21 | |||
22 | -AM_INIT_AUTOMAKE([1.11 dist-bzip2 dist-xz -Wno-portability]) | ||
23 | +AM_INIT_AUTOMAKE([1.11 dist-bzip2 dist-xz -Wno-portability foreign]) | ||
24 | AM_SILENT_RULES([yes]) | ||
25 | |||
26 | AC_USE_SYSTEM_EXTENSIONS | ||
27 | -- | ||
28 | 2.3.0 | ||
29 | |||
diff --git a/meta-efl/recipes-efl/e17/e-wm/applications.menu b/meta-efl/recipes-efl/e17/e-wm/applications.menu deleted file mode 100644 index ed9b90662..000000000 --- a/meta-efl/recipes-efl/e17/e-wm/applications.menu +++ /dev/null | |||
@@ -1,105 +0,0 @@ | |||
1 | <?xml version="1.0"?> | ||
2 | <!DOCTYPE Menu PUBLIC "-//freedesktop//DTD Menu 1.0//EN" "http://standards.freedesktop.org/menu-spec/menu-1.0.dtd"> | ||
3 | <Menu> | ||
4 | <Name>Applications</Name> | ||
5 | <!-- <Directory>Applications.directory</Directory> --> | ||
6 | |||
7 | <!-- Read standard .directory and .desktop file locations --> | ||
8 | <DefaultAppDirs>/usr/share/applications</DefaultAppDirs> | ||
9 | <DefaultDirectoryDirs/> | ||
10 | |||
11 | <Menu> | ||
12 | <Name>Office</Name> | ||
13 | <Directory>Office.directory</Directory> | ||
14 | <Include> | ||
15 | <And> | ||
16 | <Category>Office</Category> | ||
17 | </And> | ||
18 | </Include> | ||
19 | </Menu> | ||
20 | |||
21 | <Menu> | ||
22 | <Name>Multimedia</Name> | ||
23 | <Directory>Multimedia.directory</Directory> | ||
24 | <Include> | ||
25 | <And> | ||
26 | <Category>AudioVideo</Category> | ||
27 | </And> | ||
28 | </Include> | ||
29 | </Menu> | ||
30 | |||
31 | <Menu> | ||
32 | <Name>Graphics</Name> | ||
33 | <Directory>Graphics.directory</Directory> | ||
34 | <Include> | ||
35 | <And> | ||
36 | <Category>Graphics</Category> | ||
37 | </And> | ||
38 | </Include> | ||
39 | </Menu> | ||
40 | |||
41 | <Menu> | ||
42 | <Name>Games</Name> | ||
43 | <Directory>Games.directory</Directory> | ||
44 | <Include> | ||
45 | <And> | ||
46 | <Or> | ||
47 | <Category>Game</Category> | ||
48 | <Category>Games</Category> | ||
49 | </Or> | ||
50 | </And> | ||
51 | </Include> | ||
52 | </Menu> | ||
53 | |||
54 | <Menu> | ||
55 | <Name>Internet</Name> | ||
56 | <Directory>Internet.directory</Directory> | ||
57 | <Include> | ||
58 | <And> | ||
59 | <Or> | ||
60 | <Category>Internet</Category> | ||
61 | <Category>Network</Category> | ||
62 | </Or> | ||
63 | </And> | ||
64 | </Include> | ||
65 | </Menu> | ||
66 | |||
67 | <Menu> | ||
68 | <Name>Settings</Name> | ||
69 | <Directory>Settings.directory</Directory> | ||
70 | <Include> | ||
71 | <And> | ||
72 | <Or> | ||
73 | <Category>SystemSettings</Category> | ||
74 | <Category>Settings</Category> | ||
75 | </Or> | ||
76 | <Not> | ||
77 | <Category>System</Category> | ||
78 | </Not> | ||
79 | </And> | ||
80 | </Include> | ||
81 | </Menu> | ||
82 | |||
83 | <Menu> | ||
84 | <Name>Accessories</Name> | ||
85 | <Directory>Accessories.directory</Directory> | ||
86 | <Include> | ||
87 | <And> | ||
88 | <Or> | ||
89 | <Category>Applications</Category> | ||
90 | <Category>Utility</Category> | ||
91 | </Or> | ||
92 | <Not> | ||
93 | <Category>System</Category> | ||
94 | <Category>Office</Category> | ||
95 | <Category>Internet</Category> | ||
96 | <Category>AudioVideo</Category> | ||
97 | <Category>Graphics</Category> | ||
98 | <Category>Games</Category> | ||
99 | </Not> | ||
100 | </And> | ||
101 | </Include> | ||
102 | </Menu> | ||
103 | |||
104 | </Menu> | ||
105 | |||
diff --git a/meta-efl/recipes-efl/e17/e-wm/enlightenment_start.oe b/meta-efl/recipes-efl/e17/e-wm/enlightenment_start.oe deleted file mode 100644 index ff8617275..000000000 --- a/meta-efl/recipes-efl/e17/e-wm/enlightenment_start.oe +++ /dev/null | |||
@@ -1,9 +0,0 @@ | |||
1 | #!/bin/sh | ||
2 | |||
3 | E_PROFILE="" | ||
4 | if [ -r /etc/enlightenment/default_profile ]; then | ||
5 | . /etc/enlightenment/default_profile | ||
6 | fi | ||
7 | |||
8 | renice -2 -p $$ | ||
9 | exec enlightenment_start $E_PROFILE | ||
diff --git a/meta-efl/recipes-efl/e17/e-wm_0.18.8.bb b/meta-efl/recipes-efl/e17/e-wm_0.18.8.bb deleted file mode 100644 index ac18b59bb..000000000 --- a/meta-efl/recipes-efl/e17/e-wm_0.18.8.bb +++ /dev/null | |||
@@ -1,17 +0,0 @@ | |||
1 | require ${BPN}.inc | ||
2 | |||
3 | SRCNAME = "enlightenment" | ||
4 | |||
5 | S = "${WORKDIR}/${SRCNAME}-${PV}" | ||
6 | |||
7 | SRC_URI = "\ | ||
8 | ${E_RELEASES}/apps/${SRCNAME}/${SRCNAME}-${SRCVER}.tar.gz \ | ||
9 | file://enlightenment_start.oe \ | ||
10 | file://applications.menu \ | ||
11 | file://0001-Fix-incorrect-message-type.patch \ | ||
12 | " | ||
13 | |||
14 | SRC_URI[md5sum] = "79c9f524e1d0510061c62c4b038a8ece" | ||
15 | SRC_URI[sha256sum] = "14c9bde4334d2f8b0776c6113d02b923ab159eea1cbf7013489e4f3bf37a51bb" | ||
16 | |||
17 | PNBLACKLIST[e-wm] ?= "Depends on blacklisted elementary - the recipe will be removed on 2017-09-01 unless the issue is fixed" | ||
diff --git a/meta-efl/recipes-efl/e17/e-wm_0.19.10.bb b/meta-efl/recipes-efl/e17/e-wm_0.19.10.bb deleted file mode 100644 index aa6a7b8d7..000000000 --- a/meta-efl/recipes-efl/e17/e-wm_0.19.10.bb +++ /dev/null | |||
@@ -1,21 +0,0 @@ | |||
1 | require ${BPN}.inc | ||
2 | |||
3 | SRCNAME = "enlightenment" | ||
4 | |||
5 | S = "${WORKDIR}/${SRCNAME}-${PV}" | ||
6 | |||
7 | # couple of modules needed for illume2 (mobile) profile were removed in | ||
8 | # http://git.enlightenment.org/core/enlightenment.git/commit/src/modules/Makefile.mk?id=1be76d599ca27f820b58b8186c5f73d9844c67ca | ||
9 | # and replacements aren't included yet, if you want to use e-wm on device with small screen, better stay with 0.18 release | ||
10 | DEFAULT_PREFERENCE = "-1" | ||
11 | |||
12 | SRC_URI = "\ | ||
13 | ${E_RELEASES}/apps/${SRCNAME}/${SRCNAME}-${SRCVER}.tar.gz \ | ||
14 | file://enlightenment_start.oe \ | ||
15 | file://applications.menu \ | ||
16 | " | ||
17 | |||
18 | SRC_URI[md5sum] = "9063617760329445ada8635270a4e627" | ||
19 | SRC_URI[sha256sum] = "484d305bcf403303b18c46a3a498445b93689cd325010ae8d0601551926469d8" | ||
20 | |||
21 | PNBLACKLIST[e-wm] ?= "Depends on blacklisted elementary - the recipe will be removed on 2017-09-01 unless the issue is fixed" | ||
diff --git a/meta-efl/recipes-efl/e17/e-wm_git.bb b/meta-efl/recipes-efl/e17/e-wm_git.bb deleted file mode 100644 index 0f25fd592..000000000 --- a/meta-efl/recipes-efl/e17/e-wm_git.bb +++ /dev/null | |||
@@ -1,16 +0,0 @@ | |||
1 | require ${BPN}.inc | ||
2 | |||
3 | PV = "0.19.4+git${SRCPV}" | ||
4 | DEFAULT_PREFERENCE = "-2" | ||
5 | |||
6 | SRC_URI = " \ | ||
7 | git://git.enlightenment.org/core/enlightenment.git;branch=enlightenment-0.19 \ | ||
8 | file://0001-configure.ac-add-foreign.patch \ | ||
9 | file://enlightenment_start.oe \ | ||
10 | file://applications.menu \ | ||
11 | " | ||
12 | S = "${WORKDIR}/git" | ||
13 | |||
14 | SRCREV = "4545d4a70031e0b2565b8d83d5f756bff1a584d0" | ||
15 | |||
16 | PNBLACKLIST[e-wm] ?= "Depends on blacklisted elementary - the recipe will be removed on 2017-09-01 unless the issue is fixed" | ||
diff --git a/meta-efl/recipes-efl/e17/edje-viewer_svn.bb b/meta-efl/recipes-efl/e17/edje-viewer_svn.bb deleted file mode 100644 index 6d3efda51..000000000 --- a/meta-efl/recipes-efl/e17/edje-viewer_svn.bb +++ /dev/null | |||
@@ -1,18 +0,0 @@ | |||
1 | SUMMARY = "Edje_Viewer is just that" | ||
2 | LICENSE = "MIT" | ||
3 | LIC_FILES_CHKSUM = "file://COPYING;md5=344895f253c32f38e182dcaf30fe8a35 \ | ||
4 | file://COPYING-PLAIN;md5=e01359041001e8bf24c09acca556e792" | ||
5 | |||
6 | DEPENDS = "elementary" | ||
7 | PV = "0.0.0+svnr${SRCPV}" | ||
8 | SRCREV = "${EFL_SRCREV}" | ||
9 | |||
10 | inherit e | ||
11 | |||
12 | SRCNAME = "edje_viewer" | ||
13 | SRC_URI = "${E_SVN}/trunk;module=${SRCNAME};protocol=http;scmdata=keep" | ||
14 | S = "${WORKDIR}/${SRCNAME}" | ||
15 | |||
16 | FILES_${PN} += "${datadir}" | ||
17 | |||
18 | PNBLACKLIST[edje-viewer] ?= "Depends on blacklisted elementary - the recipe will be removed on 2017-09-01 unless the issue is fixed" | ||
diff --git a/meta-efl/recipes-efl/e17/elbow_git.bb b/meta-efl/recipes-efl/e17/elbow_git.bb deleted file mode 100644 index d2a853989..000000000 --- a/meta-efl/recipes-efl/e17/elbow_git.bb +++ /dev/null | |||
@@ -1,26 +0,0 @@ | |||
1 | SUMMARY = "EFL based browser" | ||
2 | LICENSE = "GPLv3" | ||
3 | LIC_FILES_CHKSUM = "file://COPYING;md5=6a6a8e020838b23406c81b19c1d46df6" | ||
4 | DEPENDS = "evas ecore edje eina elementary webkit-efl sqlite3" | ||
5 | |||
6 | PV = "0.0.1+gitr${SRCPV}" | ||
7 | SRCREV = "b41fd0bc9514ff61bb2a50d957efe4155fa3e6a8" | ||
8 | |||
9 | # webkit-efl isn't available for < armv7a | ||
10 | COMPATIBLE_MACHINE = "(-)" | ||
11 | COMPATIBLE_MACHINE_x86 = "(.*)" | ||
12 | COMPATIBLE_MACHINE_x86-64 = "(.*)" | ||
13 | COMPATIBLE_MACHINE_armv7a = "(.*)" | ||
14 | |||
15 | inherit e gettext cmake | ||
16 | |||
17 | EXTRA_OECMAKE = "-DDATA_INSTALL_DIR=${datadir}" | ||
18 | |||
19 | SRC_URI = " \ | ||
20 | git://github.com/bunhere/elbow.git;protocol=https \ | ||
21 | " | ||
22 | S = "${WORKDIR}/git" | ||
23 | |||
24 | FILES_${PN} += "${datadir}/themes" | ||
25 | |||
26 | PNBLACKLIST[elbow] ?= "Depends on blacklisted webkit-efl - the recipe will be removed on 2017-09-01 unless the issue is fixed" | ||
diff --git a/meta-efl/recipes-efl/e17/elfe_git.bb b/meta-efl/recipes-efl/e17/elfe_git.bb deleted file mode 100644 index e9f7f9e89..000000000 --- a/meta-efl/recipes-efl/e17/elfe_git.bb +++ /dev/null | |||
@@ -1,17 +0,0 @@ | |||
1 | LICENSE = "MIT" | ||
2 | LIC_FILES_CHKSUM = "file://COPYING;md5=344895f253c32f38e182dcaf30fe8a35" | ||
3 | PV = "0.0.1+gitr${SRCPV}" | ||
4 | PE = "1" | ||
5 | |||
6 | require e-module.inc | ||
7 | |||
8 | SRC_URI = " \ | ||
9 | git://git.enlightenment.org/enlightenment/modules/${BPN}.git \ | ||
10 | " | ||
11 | S = "${WORKDIR}/git" | ||
12 | |||
13 | SRCREV = "1ec0e7713c3ca901014811ff78277d9e2aaac981" | ||
14 | |||
15 | DEPENDS += "elementary" | ||
16 | |||
17 | PNBLACKLIST[elfe] ?= "Depends on blacklisted elementary - the recipe will be removed on 2017-09-01 unless the issue is fixed" | ||
diff --git a/meta-efl/recipes-efl/e17/elmdentica/configure.patch b/meta-efl/recipes-efl/e17/elmdentica/configure.patch deleted file mode 100644 index 79a981b47..000000000 --- a/meta-efl/recipes-efl/e17/elmdentica/configure.patch +++ /dev/null | |||
@@ -1,13 +0,0 @@ | |||
1 | Index: elmdentica/configure.ac | ||
2 | =================================================================== | ||
3 | --- elmdentica.orig/configure.ac 2014-07-17 21:46:14.712566207 +0000 | ||
4 | +++ elmdentica/configure.ac 2014-07-17 21:51:34.960574935 +0000 | ||
5 | @@ -3,7 +3,7 @@ | ||
6 | AM_CONFIG_HEADER(config.h) | ||
7 | AC_CONFIG_MACRO_DIR([m4]) | ||
8 | |||
9 | -AM_INIT_AUTOMAKE | ||
10 | +AM_INIT_AUTOMAKE([foreign]) | ||
11 | |||
12 | AC_PROG_CC | ||
13 | AC_GNU_SOURCE | ||
diff --git a/meta-efl/recipes-efl/e17/elmdentica_svn.bb b/meta-efl/recipes-efl/e17/elmdentica_svn.bb deleted file mode 100644 index b17121721..000000000 --- a/meta-efl/recipes-efl/e17/elmdentica_svn.bb +++ /dev/null | |||
@@ -1,23 +0,0 @@ | |||
1 | SUMMARY = "A indenti.ca client for E" | ||
2 | DEPENDS = "glib-2.0 gconf curl elementary sqlite3-native azy" | ||
3 | LICENSE = "GPLv3+" | ||
4 | LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" | ||
5 | |||
6 | SECTION = "e/apps" | ||
7 | HOMEPAGE = "http://elmdentica.googlecode.com" | ||
8 | AUTHOR = "seabra" | ||
9 | |||
10 | inherit e gettext | ||
11 | SRC_URI = "${E_SVN}/trunk;module=${SRCNAME};protocol=http;scmdata=keep" | ||
12 | S = "${WORKDIR}/${SRCNAME}" | ||
13 | |||
14 | EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc" | ||
15 | |||
16 | PV = "0.9.9+svnr${SRCPV}" | ||
17 | SRCREV = "${EFL_SRCREV}" | ||
18 | |||
19 | RDEPENDS_${PN} = "${PN}-themes" | ||
20 | |||
21 | SRC_URI += "file://configure.patch" | ||
22 | |||
23 | PNBLACKLIST[elmdentica] ?= "OLD and depends on broken azy - the recipe will be removed on 2017-09-01 unless the issue is fixed" | ||
diff --git a/meta-efl/recipes-efl/e17/emprint_svn.bb b/meta-efl/recipes-efl/e17/emprint_svn.bb deleted file mode 100644 index 115dc7cf5..000000000 --- a/meta-efl/recipes-efl/e17/emprint_svn.bb +++ /dev/null | |||
@@ -1,14 +0,0 @@ | |||
1 | DESCRIPTION = "Emprint is a utility for taking screenshots of the entire screen, a specific window, or a specific region." | ||
2 | LICENSE = "MIT & BSD" | ||
3 | DEPENDS = "imlib2 virtual/libx11 ecore evas edje eina" | ||
4 | PV = "0.0.1+svnr${SRCPV}" | ||
5 | LIC_FILES_CHKSUM = "file://COPYING;md5=344895f253c32f38e182dcaf30fe8a35" | ||
6 | SRCREV = "${EFL_SRCREV}" | ||
7 | |||
8 | inherit e | ||
9 | SRC_URI = "${E_SVN}/trunk;module=${SRCNAME};protocol=http;scmdata=keep" | ||
10 | S = "${WORKDIR}/${SRCNAME}" | ||
11 | |||
12 | FILES_${PN}-dbg += "${libdir}/${PN}/modules/.debug" | ||
13 | |||
14 | PNBLACKLIST[emprint] ?= "if you want to use these modules with E18, then you need to update it to git recipe fetching newer sources from http://git.enlightenment.org/apps/emprint.git/ - the recipe will be removed on 2017-09-01 unless the issue is fixed" | ||
diff --git a/meta-efl/recipes-efl/e17/enjoy/0001-always-use-position-as-percent-and-define-a-1-second.patch b/meta-efl/recipes-efl/e17/enjoy/0001-always-use-position-as-percent-and-define-a-1-second.patch deleted file mode 100644 index 09624503b..000000000 --- a/meta-efl/recipes-efl/e17/enjoy/0001-always-use-position-as-percent-and-define-a-1-second.patch +++ /dev/null | |||
@@ -1,133 +0,0 @@ | |||
1 | From 751505501e0db31cf766ec0ae95a6968b4d1eb93 Mon Sep 17 00:00:00 2001 | ||
2 | From: Alban Browaeys <prahal@yahoo.com> | ||
3 | Date: Wed, 5 Sep 2012 02:58:26 +0000 | ||
4 | Subject: [PATCH] always use position as percent and define a 1 seconds | ||
5 | tolerance. | ||
6 | |||
7 | Fix "reverb" effect: ie loop between setting the slider to match | ||
8 | the position and handling slider to position (seek). | ||
9 | --- | ||
10 | data/themes/default.edc | 8 +++----- | ||
11 | src/bin/win.c | 28 ++++++++++++++++++++++------ | ||
12 | 2 files changed, 25 insertions(+), 11 deletions(-) | ||
13 | |||
14 | diff --git a/data/themes/default.edc b/data/themes/default.edc | ||
15 | index ebf8ba4..7a906b1 100644 | ||
16 | --- a/data/themes/default.edc | ||
17 | +++ b/data/themes/default.edc | ||
18 | @@ -186,7 +186,6 @@ collections { | ||
19 | group { | ||
20 | name: "nowplaying"; | ||
21 | script { | ||
22 | - public cur_length; | ||
23 | public mute; | ||
24 | |||
25 | public get_time_str(Float:time, time_str[6]) | ||
26 | @@ -201,16 +200,15 @@ collections { | ||
27 | new Float:position = getfarg(2); | ||
28 | new Float:length = getfarg(3); | ||
29 | if (length > 0) | ||
30 | - external_param_set_float(PART:"progress.slider", "value", position / length * 100); | ||
31 | + external_param_set_float(PART:"progress.slider", "value", position * 100); | ||
32 | else | ||
33 | external_param_set_float(PART:"progress.slider", "value", 0); | ||
34 | |||
35 | new time_str[6]; | ||
36 | - get_time_str(position, time_str); | ||
37 | + get_time_str(position * length, time_str); | ||
38 | set_text(PART:"ejy.text.current_time", time_str); | ||
39 | get_time_str(length, time_str); | ||
40 | set_text(PART:"ejy.text.total_time", time_str); | ||
41 | - set_float(cur_length, length); | ||
42 | } else if (type == MSG_INT && id == MSG_SHUFFLE) { | ||
43 | external_param_set_bool(PART:"buttons.shuffle", "state", getarg(2)); | ||
44 | } else if (type == MSG_INT && id == MSG_LOOP) { | ||
45 | @@ -689,7 +687,7 @@ collections { | ||
46 | source: "progress.slider"; | ||
47 | signal: "changed"; | ||
48 | script { | ||
49 | - send_message(MSG_FLOAT, MSG_POSITION, (external_param_get_float(PART:"progress.slider", "value") * get_float(cur_length) / 100)); | ||
50 | + send_message(MSG_FLOAT, MSG_POSITION, (external_param_get_float(PART:"progress.slider", "value") / 100)); | ||
51 | } | ||
52 | } | ||
53 | program { | ||
54 | diff --git a/src/bin/win.c b/src/bin/win.c | ||
55 | index 2f65953..428e268 100644 | ||
56 | --- a/src/bin/win.c | ||
57 | +++ b/src/bin/win.c | ||
58 | @@ -194,8 +194,8 @@ _win_play_eval(Win *w) | ||
59 | { | ||
60 | Edje_Message_Float_Set *mf; | ||
61 | |||
62 | - w->play.position = emotion_object_position_get(w->emotion); | ||
63 | w->play.length = emotion_object_play_length_get(w->emotion); | ||
64 | + w->play.position = emotion_object_position_get(w->emotion) / w->play.length; | ||
65 | |||
66 | if ((w->song) && (w->song->length != (int)w->play.length)) | ||
67 | db_song_length_set(w->db, w->song, w->play.length); | ||
68 | @@ -542,8 +542,14 @@ _win_edje_msg(void *data, Evas_Object *o __UNUSED__, Edje_Message_Type type, int | ||
69 | else | ||
70 | { | ||
71 | Edje_Message_Float *m = msg; | ||
72 | + | ||
73 | + if ((((m->val - w->play.position) * w->play.length) < 1.0) | ||
74 | + && (((w->play.position - m->val) * w->play.length) < 1.0)) | ||
75 | + return; | ||
76 | + | ||
77 | w->play.position = m->val; | ||
78 | - emotion_object_position_set(w->emotion, w->play.position); | ||
79 | + emotion_object_position_set(w->emotion, w->play.position | ||
80 | + * w->play.length); | ||
81 | ecore_event_add(ENJOY_EVENT_POSITION_CHANGE, NULL, NULL, NULL); | ||
82 | } | ||
83 | break; | ||
84 | @@ -617,16 +623,21 @@ enjoy_control_seek(uint64_t position) | ||
85 | { | ||
86 | Win *w = &_win; | ||
87 | double seek_to; | ||
88 | + double new_pos = w->play.length / ((double)position / 1e6); | ||
89 | |||
90 | if (!w->db) return; | ||
91 | - seek_to = w->play.position + w->play.length / ((double)position / 1e6); | ||
92 | + | ||
93 | + if ((((new_pos - w->play.position) * w->play.length) < 1.0) | ||
94 | + && (((w->play.position - new_pos) * w->play.length) < 1.0)) return; | ||
95 | + | ||
96 | + seek_to = w->play.position + new_pos; | ||
97 | if (seek_to <= 0.0) | ||
98 | seek_to = 0.0; | ||
99 | else if (seek_to >= 1.0) | ||
100 | seek_to = 1.0; | ||
101 | |||
102 | w->play.position = seek_to; | ||
103 | - emotion_object_position_set(w->emotion, w->play.position); | ||
104 | + emotion_object_position_set(w->emotion, w->play.position * w->play.length); | ||
105 | ecore_event_add(ENJOY_EVENT_POSITION_CHANGE, NULL, NULL, NULL); | ||
106 | } | ||
107 | |||
108 | @@ -692,15 +703,20 @@ EAPI void | ||
109 | enjoy_position_set(int32_t position) | ||
110 | { | ||
111 | Win *w = &_win; | ||
112 | + double new_pos = w->play.length / ((double)position / 1e6); | ||
113 | |||
114 | if (!w->db) return; | ||
115 | - w->play.position = w->play.length / ((double)position / 1e6); | ||
116 | + | ||
117 | + if ((((new_pos - w->play.position) * w->play.length) < 1.0) | ||
118 | + && (((w->play.position - new_pos) * w->play.length) < 1.0)) return; | ||
119 | + | ||
120 | + w->play.position = new_pos; | ||
121 | if (w->play.position < 0.0) | ||
122 | w->play.position = 0.0; | ||
123 | else if (w->play.position > 1.0) | ||
124 | w->play.position = 1.0; | ||
125 | |||
126 | - emotion_object_position_set(w->emotion, w->play.position); | ||
127 | + emotion_object_position_set(w->emotion, w->play.position * w->play.length); | ||
128 | ecore_event_add(ENJOY_EVENT_POSITION_CHANGE, NULL, NULL, NULL); | ||
129 | } | ||
130 | |||
131 | -- | ||
132 | 1.8.5.2 | ||
133 | |||
diff --git a/meta-efl/recipes-efl/e17/enjoy/configure.patch b/meta-efl/recipes-efl/e17/enjoy/configure.patch deleted file mode 100644 index 6e0ed7461..000000000 --- a/meta-efl/recipes-efl/e17/enjoy/configure.patch +++ /dev/null | |||
@@ -1,13 +0,0 @@ | |||
1 | Index: git/configure.ac | ||
2 | =================================================================== | ||
3 | --- git.orig/configure.ac 2014-07-17 21:48:51.284570474 +0000 | ||
4 | +++ git/configure.ac 2014-07-17 21:53:39.104578318 +0000 | ||
5 | @@ -26,7 +26,7 @@ | ||
6 | AC_CANONICAL_HOST | ||
7 | AC_ISC_POSIX | ||
8 | |||
9 | -AM_INIT_AUTOMAKE(1.6 dist-bzip2) | ||
10 | +AM_INIT_AUTOMAKE([dist-bzip2 foreign]) | ||
11 | AC_CONFIG_HEADERS(config.h) | ||
12 | _XTERM_COLORS | ||
13 | m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) | ||
diff --git a/meta-efl/recipes-efl/e17/enjoy_git.bb b/meta-efl/recipes-efl/e17/enjoy_git.bb deleted file mode 100644 index 716d73ed1..000000000 --- a/meta-efl/recipes-efl/e17/enjoy_git.bb +++ /dev/null | |||
@@ -1,50 +0,0 @@ | |||
1 | SUMMARY = "Enjoy music player" | ||
2 | LICENSE = "LGPLv3" | ||
3 | LIC_FILES_CHKSUM = "file://COPYING;md5=6a6a8e020838b23406c81b19c1d46df6" | ||
4 | DEPENDS = "evas ecore edje elementary emotion lightmediascanner eldbus gst-plugins-good" | ||
5 | |||
6 | SRCREV = "aa8fec69e885eec048a849c2b34059ec58404e02" | ||
7 | PV = "0.1.0+gitr${SRCPV}" | ||
8 | |||
9 | #1st needed for all formats | ||
10 | #2nd needed for mp3 playback | ||
11 | #3d needed for ogg playback | ||
12 | #4th needed for flac playback | ||
13 | #5th needed binary to create db | ||
14 | RDEPENDS_${PN} += "\ | ||
15 | gst-plugins-base-typefindfunctions gst-plugins-base-playbin gst-plugins-base-volume gst-plugins-base-decodebin2 gst-plugins-good-autodetect \ | ||
16 | gst-plugins-base-ogg gst-plugins-base-ivorbisdec \ | ||
17 | gst-plugins-good-flac \ | ||
18 | lightmediascanner-test \ | ||
19 | " | ||
20 | |||
21 | inherit e gettext | ||
22 | SRC_URI = " \ | ||
23 | git://git.enlightenment.org/apps/enjoy.git \ | ||
24 | file://0001-always-use-position-as-percent-and-define-a-1-second.patch \ | ||
25 | file://configure.patch \ | ||
26 | " | ||
27 | S = "${WORKDIR}/git" | ||
28 | |||
29 | FILES_${PN} += "${datadir}/icons/" | ||
30 | |||
31 | EXTRA_OECONF = "\ | ||
32 | --with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc \ | ||
33 | " | ||
34 | |||
35 | PACKAGECONFIG[mad] = ",,gst-plugins-ugly,gst-plugins-ugly-mad" | ||
36 | PACKAGECONFIG[id3demux] = ",,,gst-plugins-good-id3demux" | ||
37 | |||
38 | do_configure_prepend() { | ||
39 | autopoint || touch config.rpath | ||
40 | } | ||
41 | |||
42 | pkg_postinst_${PN} () { | ||
43 | echo "enjoy: SCAN and LIBRARY MANAGER are not implemeted yet!" | ||
44 | echo "enjoy: Meanwhile please run:" | ||
45 | echo "enjoy: test-lms -m mono -p id3 -i 5000 -s /path/to/your/music/dir /home/root/.config/enjoy/media.db" | ||
46 | echo "enjoy:" | ||
47 | echo "enjoy: Use test-lms -P to see available formats that can be scanned" | ||
48 | } | ||
49 | |||
50 | PNBLACKLIST[enjoy] ?= "Depends on blacklisted elementary - the recipe will be removed on 2017-09-01 unless the issue is fixed" | ||
diff --git a/meta-efl/recipes-efl/e17/ephoto/configure.patch b/meta-efl/recipes-efl/e17/ephoto/configure.patch deleted file mode 100644 index 59466f8af..000000000 --- a/meta-efl/recipes-efl/e17/ephoto/configure.patch +++ /dev/null | |||
@@ -1,13 +0,0 @@ | |||
1 | Index: ephoto/configure.ac | ||
2 | =================================================================== | ||
3 | --- ephoto.orig/configure.ac 2014-07-17 21:48:51.028570467 +0000 | ||
4 | +++ ephoto/configure.ac 2014-07-17 21:52:56.120577146 +0000 | ||
5 | @@ -27,7 +27,7 @@ | ||
6 | AC_CANONICAL_HOST | ||
7 | AC_ISC_POSIX | ||
8 | |||
9 | -AM_INIT_AUTOMAKE(1.6 dist-bzip2) | ||
10 | +AM_INIT_AUTOMAKE([dist-bzip2 foreign]) | ||
11 | AM_CONFIG_HEADER(src/bin/config.h) | ||
12 | m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) | ||
13 | |||
diff --git a/meta-efl/recipes-efl/e17/ephoto_svn.bb b/meta-efl/recipes-efl/e17/ephoto_svn.bb deleted file mode 100644 index f86ffe16f..000000000 --- a/meta-efl/recipes-efl/e17/ephoto_svn.bb +++ /dev/null | |||
@@ -1,21 +0,0 @@ | |||
1 | LICENSE = "MIT & GPL-3.0" | ||
2 | PV = "0.1.0+svnr${SRCREV}" | ||
3 | PR = "${INC_PR}.0" | ||
4 | |||
5 | LIC_FILES_CHKSUM = "file://COPYING;md5=fdffcddb366d0cc78e0e46c4ea70c8d9 \ | ||
6 | file://COPYING.icons;md5=8f0e2cd40e05189ec81232da84bd6e1a" | ||
7 | |||
8 | require e-module.inc | ||
9 | |||
10 | inherit gettext | ||
11 | |||
12 | DEPENDS += "elementary ethumb ecore eio" | ||
13 | |||
14 | SRCNAME = "${PN}" | ||
15 | |||
16 | # autotools-brokensep | ||
17 | B = "${S}" | ||
18 | |||
19 | SRC_URI += "file://configure.patch" | ||
20 | |||
21 | PNBLACKLIST[ephoto] ?= "Depends on blacklisted elementary - the recipe will be removed on 2017-09-01 unless the issue is fixed" | ||
diff --git a/meta-efl/recipes-efl/e17/exalt-client/configure.patch b/meta-efl/recipes-efl/e17/exalt-client/configure.patch deleted file mode 100644 index d4ff801ce..000000000 --- a/meta-efl/recipes-efl/e17/exalt-client/configure.patch +++ /dev/null | |||
@@ -1,28 +0,0 @@ | |||
1 | Index: exalt-client/configure.ac | ||
2 | =================================================================== | ||
3 | --- exalt-client.orig/configure.ac 2014-07-17 21:46:14.712566207 +0000 | ||
4 | +++ exalt-client/configure.ac 2014-07-17 21:47:56.880568991 +0000 | ||
5 | @@ -10,7 +10,7 @@ | ||
6 | AC_CANONICAL_HOST | ||
7 | AC_ISC_POSIX | ||
8 | |||
9 | -AM_INIT_AUTOMAKE(1.8) | ||
10 | +AM_INIT_AUTOMAKE([foreign]) | ||
11 | AM_CONFIG_HEADER(config.h) | ||
12 | |||
13 | AC_PROG_CC | ||
14 | @@ -29,7 +29,6 @@ | ||
15 | |||
16 | m4_ifdef([AM_GNU_GETTEXT], [ | ||
17 | AM_GNU_GETTEXT([external]) | ||
18 | -po_makefile_in=po/Makefile.in | ||
19 | AM_CONDITIONAL([HAVE_PO], [true]) | ||
20 | ],[ | ||
21 | AM_CONDITIONAL([HAVE_PO], [false]) | ||
22 | @@ -101,6 +100,5 @@ | ||
23 | src/Makefile | ||
24 | module.desktop | ||
25 | e_modules-exalt-client.spec | ||
26 | -$po_makefile_in | ||
27 | ], [ | ||
28 | ]) | ||
diff --git a/meta-efl/recipes-efl/e17/exalt-client_svn.bb b/meta-efl/recipes-efl/e17/exalt-client_svn.bb deleted file mode 100644 index cb78a2e3a..000000000 --- a/meta-efl/recipes-efl/e17/exalt-client_svn.bb +++ /dev/null | |||
@@ -1,26 +0,0 @@ | |||
1 | LICENSE = "LGPL-2.0" | ||
2 | LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24" | ||
3 | |||
4 | PV = "0.0.1+svnr${SRCPV}" | ||
5 | |||
6 | require e-module.inc | ||
7 | |||
8 | DEPENDS += "elementary exalt edje-native" | ||
9 | |||
10 | CFLAGS += " -I${STAGING_INCDIR}/exalt -I${STAGING_INCDIR}/exalt_dbus" | ||
11 | |||
12 | do_configure_prepend() { | ||
13 | sed -i -e /po/d ${S}/configure.ac | ||
14 | sed -i -e s:\ po::g ${S}/Makefile.am | ||
15 | } | ||
16 | |||
17 | FILES_${PN} += "${libdir}/enlightenment/modules/*/*.desktop \ | ||
18 | ${libdir}/enlightenment/modules/*/*.edj \ | ||
19 | ${libdir}/enlightenment/modules/*/*/*.so" | ||
20 | |||
21 | FILES_${PN}-staticdev += "${libdir}/enlightenment/modules/*/*/*.a" | ||
22 | FILES_${PN}-dev += "${libdir}/enlightenment/modules/*/*/*.la" | ||
23 | FILES_${PN}-dbg += "${libdir}/enlightenment/modules/*/*/.debug" | ||
24 | |||
25 | SRC_URI += "file://configure.patch" | ||
26 | PNBLACKLIST[exalt-client] ?= "Depends on blacklisted elementary - the recipe will be removed on 2017-09-01 unless the issue is fixed" | ||
diff --git a/meta-efl/recipes-efl/e17/exalt_svn.bb b/meta-efl/recipes-efl/e17/exalt_svn.bb deleted file mode 100644 index 9e63f1bc2..000000000 --- a/meta-efl/recipes-efl/e17/exalt_svn.bb +++ /dev/null | |||
@@ -1,36 +0,0 @@ | |||
1 | SUMMARY = "Exalt is a network manager for the windows manager Enlightenment DR17" | ||
2 | HOMEPAGE = "http://watchwolf.fr/wiki/doku.php?id=exalt" | ||
3 | |||
4 | LICENSE = "LGPLv2.1" | ||
5 | LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24" | ||
6 | |||
7 | DEPENDS = "elementary vpnc wpa-supplicant ecore eet edbus" | ||
8 | RDEPENDS_${PN} = "vpnc wpa-supplicant" | ||
9 | |||
10 | PV = "0.9+svnr${SRCPV}" | ||
11 | SRCREV = "${EFL_SRCREV}" | ||
12 | |||
13 | inherit e | ||
14 | SRC_URI = "${E_SVN}/trunk;module=${SRCNAME};protocol=http;scmdata=keep" | ||
15 | S = "${WORKDIR}/${SRCNAME}" | ||
16 | |||
17 | EXTRA_OECONF = " \ | ||
18 | --with-wpa_supplicant=${sbindir}/wpa_supplicant \ | ||
19 | --with-vpnc=${sbindir}/vpnc \ | ||
20 | --with-vpnc-disconnect=${sbindir}/vpnc-disconnect \ | ||
21 | " | ||
22 | |||
23 | do_install_append() { | ||
24 | # install dbus config file | ||
25 | install -d ${D}${sysconfdir}/dbus-1/system.d/ | ||
26 | install -m 0644 ${S}/data/daemon/dbus/exalt.conf ${D}${sysconfdir}/dbus-1/system.d/exalt.conf | ||
27 | |||
28 | # install dbus service file | ||
29 | install -d ${D}${datadir}/dbus-1/system-services/ | ||
30 | install -m 0644 ${B}/org.e.Exalt.service ${D}${datadir}/dbus-1/system-services/ | ||
31 | } | ||
32 | |||
33 | FILES_${PN} += "${datadir}/dbus-1" | ||
34 | |||
35 | |||
36 | PNBLACKLIST[exalt] ?= "Depends on blacklisted elementary - the recipe will be removed on 2017-09-01 unless the issue is fixed" | ||
diff --git a/meta-efl/recipes-efl/e17/exquisite-theme-illume.bb b/meta-efl/recipes-efl/e17/exquisite-theme-illume.bb deleted file mode 100644 index c9063bc44..000000000 --- a/meta-efl/recipes-efl/e17/exquisite-theme-illume.bb +++ /dev/null | |||
@@ -1,41 +0,0 @@ | |||
1 | DDESCRIPTION = "A theme for exquisite" | ||
2 | LICENSE = "MIT & BSD" | ||
3 | LIC_FILES_CHKSUM = "file://${WORKDIR}/LICENSE;md5=f523ab5986cc79b52a90d2ac3d5454a2" | ||
4 | SECTION = "x11" | ||
5 | DEPENDS = "edje-native" | ||
6 | PV = "1.0+svnr${SRCPV}" | ||
7 | SRCREV = "${EFL_SRCREV}" | ||
8 | |||
9 | inherit e-base update-alternatives allarch | ||
10 | |||
11 | ALTERNATIVE_NAME = "exquisite-config" | ||
12 | ALTERNATIVE_LINK = "${sysconfdir}/exquisite/config" | ||
13 | ALTERNATIVE_PATH = "${sysconfdir}/exquisite/config-illume" | ||
14 | ALTERNATIVE_PRIORITY = "10" | ||
15 | |||
16 | SRCNAME = "b_and_w" | ||
17 | |||
18 | SRC_URI = "${E_SVN}/trunk/THEMES;module=${SRCNAME};protocol=http \ | ||
19 | file://LICENSE \ | ||
20 | " | ||
21 | S = "${WORKDIR}/${SRCNAME}" | ||
22 | |||
23 | do_compile() { | ||
24 | ${STAGING_BINDIR_NATIVE}/edje_cc exquisite.edc illume.edj | ||
25 | } | ||
26 | |||
27 | do_install() { | ||
28 | install -d ${D}${sysconfdir}/exquisite | ||
29 | install -d ${D}${datadir}/exquisite/data/themes | ||
30 | install -m 0644 ${S}/illume.edj ${D}${datadir}/exquisite/data/themes/ | ||
31 | echo 'THEME="-t illume"' > ${D}${sysconfdir}/exquisite/config-illume | ||
32 | } | ||
33 | |||
34 | CONFFILES_${PN} = "${sysconfdir}/exquisite/config-illume" | ||
35 | FILES_${PN} = "${sysconfdir}/exquisite ${datadir}/exquisite/data/themes" | ||
36 | |||
37 | PNBLACKLIST[exquisite-theme-illume] ?= "Depends on blacklisted edje-native - the recipe will be removed on 2017-09-01 unless the issue is fixed" | ||
38 | |||
39 | PNBLACKLIST[exquisite-theme-illume] ?= "Runtime depends on blacklisted exquisite-theme-illume - the recipe will be removed on 2017-09-01 unless the issue is fixed" | ||
40 | |||
41 | PNBLACKLIST[exquisite-theme-illume] ?= "Runtime depends on blacklisted exquisite-theme-illume-dev - the recipe will be removed on 2017-09-01 unless the issue is fixed" | ||
diff --git a/meta-efl/recipes-efl/e17/exquisite-theme-illume/LICENSE b/meta-efl/recipes-efl/e17/exquisite-theme-illume/LICENSE deleted file mode 100644 index 61bb2f603..000000000 --- a/meta-efl/recipes-efl/e17/exquisite-theme-illume/LICENSE +++ /dev/null | |||
@@ -1,25 +0,0 @@ | |||
1 | Copyright notice for Enlightenment: | ||
2 | |||
3 | Copyright (C) 2000-2010 Carsten Haitzler and various contributors (see AUTHORS) | ||
4 | |||
5 | All rights reserved. | ||
6 | |||
7 | Redistribution and use in source and binary forms, with or without | ||
8 | modification, are permitted provided that the following conditions are met: | ||
9 | |||
10 | 1. Redistributions of source code must retain the above copyright | ||
11 | notice, this list of conditions and the following disclaimer. | ||
12 | 2. Redistributions in binary form must reproduce the above copyright | ||
13 | notice, this list of conditions and the following disclaimer in the | ||
14 | documentation and/or other materials provided with the distribution. | ||
15 | |||
16 | THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, | ||
17 | INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND | ||
18 | FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE | ||
19 | COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, | ||
20 | INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT | ||
21 | LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, | ||
22 | OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF | ||
23 | LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING | ||
24 | NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, | ||
25 | EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
diff --git a/meta-efl/recipes-efl/e17/exquisite/exquisite-init b/meta-efl/recipes-efl/e17/exquisite/exquisite-init deleted file mode 100644 index 2de6774ff..000000000 --- a/meta-efl/recipes-efl/e17/exquisite/exquisite-init +++ /dev/null | |||
@@ -1,40 +0,0 @@ | |||
1 | #!/bin/sh | ||
2 | |||
3 | for x in $(cat /proc/cmdline); do | ||
4 | case $x in | ||
5 | splash=false) | ||
6 | echo "Splash Disabled" | ||
7 | exit 0; | ||
8 | ;; | ||
9 | esac | ||
10 | done | ||
11 | |||
12 | . /etc/init.d/functions | ||
13 | |||
14 | ### Default config here - gets overriden later | ||
15 | THEME="-t default" | ||
16 | FPS="-fps 30" | ||
17 | ### Override config - if there is a config file - load it. | ||
18 | if test -f /etc/exquisite/config; then | ||
19 | . /etc/exquisite/config | ||
20 | fi | ||
21 | |||
22 | args='' | ||
23 | case `machine_id` in | ||
24 | "hp_ipaq_h3100"|"hp_ipaq_h3800") | ||
25 | args='-rot 90' ;; | ||
26 | "hp_ipaq_3600"|"hp_ipaq_3700"|"hp_ipaq_h3900"|"htc_universal"|*collie|*poodle|*akita|*spitz|*borzoi) | ||
27 | args='-rot 270' ;; | ||
28 | esac | ||
29 | args=$args" $FPS $THEME" | ||
30 | |||
31 | export EXDIR=/mnt/.splash | ||
32 | export EXQUISITE_IPC=$EXDIR/exquisite | ||
33 | mount tmpfs -t tmpfs $EXDIR -o,size=40k | ||
34 | exquisite -fb -fs $args & | ||
35 | |||
36 | exquisite-write -wait 120 | ||
37 | exquisite-write "PULSATE" | ||
38 | setterm -blank 0 | ||
39 | setterm -powersave off | ||
40 | setterm -powerdown 0 | ||
diff --git a/meta-efl/recipes-efl/e17/exquisite/splashfuncs b/meta-efl/recipes-efl/e17/exquisite/splashfuncs deleted file mode 100644 index ada2a96dd..000000000 --- a/meta-efl/recipes-efl/e17/exquisite/splashfuncs +++ /dev/null | |||
@@ -1,29 +0,0 @@ | |||
1 | status() { | ||
2 | if type splash-write >/dev/null 2>&1; then | ||
3 | (TMPDIR="/mnt/.splash" EXQUISITE_IPC="$TMPDIR/exquisite" splash-write "$1" || true) & | ||
4 | fi | ||
5 | } | ||
6 | |||
7 | status_position() { | ||
8 | status "PROGRESS $1" | ||
9 | } | ||
10 | |||
11 | status_title() { | ||
12 | status "TITLE $1" | ||
13 | } | ||
14 | |||
15 | status_text() { | ||
16 | if test -n "$1"; then | ||
17 | status "MSG $1" | ||
18 | else | ||
19 | status "CLEAR" | ||
20 | fi | ||
21 | } | ||
22 | |||
23 | status_pulse() { | ||
24 | status "PULSATE" | ||
25 | } | ||
26 | |||
27 | status_tick() { | ||
28 | status "TICK" | ||
29 | } | ||
diff --git a/meta-efl/recipes-efl/e17/exquisite_svn.bb b/meta-efl/recipes-efl/e17/exquisite_svn.bb deleted file mode 100644 index 826cd444e..000000000 --- a/meta-efl/recipes-efl/e17/exquisite_svn.bb +++ /dev/null | |||
@@ -1,43 +0,0 @@ | |||
1 | SUMMARY = "A psplash replacement for display" | ||
2 | LICENSE = "MIT & BSD" | ||
3 | LIC_FILES_CHKSUM = "file://COPYING;md5=14defa372a91118e755133bc8e6aff83" | ||
4 | DEPENDS = "eet evas ecore embryo edje" | ||
5 | PV = "0.0.1+svnr${SRCPV}" | ||
6 | SRCREV = "${EFL_SRCREV}" | ||
7 | RRECOMMENDS_${PN} = "exquisite-themes" | ||
8 | RCONFLICTS_${PN} = "psplash virtual-psplash" | ||
9 | |||
10 | SRCNAME = "exquisite" | ||
11 | |||
12 | inherit e | ||
13 | SRC_URI = "${E_SVN}/trunk;module=${SRCNAME};protocol=http;scmdata=keep" | ||
14 | S = "${WORKDIR}/${SRCNAME}" | ||
15 | |||
16 | EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc" | ||
17 | |||
18 | SRC_URI += "file://exquisite-init" | ||
19 | SRC_URI += "file://splashfuncs" | ||
20 | |||
21 | inherit update-rc.d | ||
22 | |||
23 | do_install_prepend() { | ||
24 | install -d ${D}/mnt/.splash/ | ||
25 | install -d ${D}${sysconfdir}/init.d | ||
26 | install -m 0755 ${WORKDIR}/exquisite-init ${D}${sysconfdir}/init.d/exquisite | ||
27 | install -d ${D}${sysconfdir}/default | ||
28 | install -m 0755 ${WORKDIR}/splashfuncs ${D}${sysconfdir}/default/splashfuncs | ||
29 | install -d ${D}${bindir} | ||
30 | ln -s exquisite-write ${D}${bindir}/splash-write | ||
31 | } | ||
32 | |||
33 | |||
34 | do_install_append() { | ||
35 | rm -rf ${D}${datadir}/exquisite/data/fonts/* | ||
36 | } | ||
37 | |||
38 | INITSCRIPT_NAME = "exquisite" | ||
39 | INITSCRIPT_PARAMS = "start 01 S . stop 20 0 1 6 ." | ||
40 | |||
41 | FILES_${PN} += "/mnt/.splash/" | ||
42 | |||
43 | PNBLACKLIST[exquisite] ?= "Fails to build with RSS http://errors.yoctoproject.org/Errors/Details/130619/ - the recipe will be removed on 2017-09-01 unless the issue is fixed" | ||
diff --git a/meta-efl/recipes-efl/e17/flame/configure.patch b/meta-efl/recipes-efl/e17/flame/configure.patch deleted file mode 100644 index 87c85de9f..000000000 --- a/meta-efl/recipes-efl/e17/flame/configure.patch +++ /dev/null | |||
@@ -1,13 +0,0 @@ | |||
1 | Index: cpu/configure.ac | ||
2 | =================================================================== | ||
3 | --- cpu.orig/configure.ac 2014-07-17 20:39:48.000000000 +0000 | ||
4 | +++ cpu/configure.ac 2014-07-17 21:39:55.320555868 +0000 | ||
5 | @@ -10,7 +10,7 @@ | ||
6 | AC_CANONICAL_HOST | ||
7 | AC_ISC_POSIX | ||
8 | |||
9 | -AM_INIT_AUTOMAKE(1.6) | ||
10 | +AM_INIT_AUTOMAKE([foreign]) | ||
11 | AM_CONFIG_HEADER(config.h) | ||
12 | m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) | ||
13 | |||
diff --git a/meta-efl/recipes-efl/e17/flame_svn.bb b/meta-efl/recipes-efl/e17/flame_svn.bb deleted file mode 100644 index 6583d2724..000000000 --- a/meta-efl/recipes-efl/e17/flame_svn.bb +++ /dev/null | |||
@@ -1,17 +0,0 @@ | |||
1 | LICENSE = "MIT" | ||
2 | LIC_FILES_CHKSUM = "file://COPYING;md5=344895f253c32f38e182dcaf30fe8a35 \ | ||
3 | file://COPYING-PLAIN;md5=c910b645eda0005ccec46f75203dc96e" | ||
4 | |||
5 | PV = "0.0.3+svnr${SRCPV}" | ||
6 | PR = "${INC_PR}.0" | ||
7 | |||
8 | require e-module.inc | ||
9 | |||
10 | do_configure_prepend() { | ||
11 | sed -i -e /po/d ${S}/configure.ac | ||
12 | sed -i -e s:\ po::g ${S}/Makefile.am | ||
13 | } | ||
14 | |||
15 | SRC_URI += "file://configure.patch" | ||
16 | |||
17 | PNBLACKLIST[flame] ?= "Depends on blacklisted e-wm - the recipe will be removed on 2017-09-01 unless the issue is fixed" | ||
diff --git a/meta-efl/recipes-efl/e17/forecasts/configure.patch b/meta-efl/recipes-efl/e17/forecasts/configure.patch deleted file mode 100644 index 87c85de9f..000000000 --- a/meta-efl/recipes-efl/e17/forecasts/configure.patch +++ /dev/null | |||
@@ -1,13 +0,0 @@ | |||
1 | Index: cpu/configure.ac | ||
2 | =================================================================== | ||
3 | --- cpu.orig/configure.ac 2014-07-17 20:39:48.000000000 +0000 | ||
4 | +++ cpu/configure.ac 2014-07-17 21:39:55.320555868 +0000 | ||
5 | @@ -10,7 +10,7 @@ | ||
6 | AC_CANONICAL_HOST | ||
7 | AC_ISC_POSIX | ||
8 | |||
9 | -AM_INIT_AUTOMAKE(1.6) | ||
10 | +AM_INIT_AUTOMAKE([foreign]) | ||
11 | AM_CONFIG_HEADER(config.h) | ||
12 | m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) | ||
13 | |||
diff --git a/meta-efl/recipes-efl/e17/forecasts_svn.bb b/meta-efl/recipes-efl/e17/forecasts_svn.bb deleted file mode 100644 index 495f314fc..000000000 --- a/meta-efl/recipes-efl/e17/forecasts_svn.bb +++ /dev/null | |||
@@ -1,12 +0,0 @@ | |||
1 | LICENSE = "MIT" | ||
2 | LIC_FILES_CHKSUM = "file://COPYING;md5=344895f253c32f38e182dcaf30fe8a35 \ | ||
3 | file://COPYING-PLAIN;md5=51328cfb73bfec3eed7cfd3dbed73988" | ||
4 | |||
5 | PV = "0.2.0+svnr${SRCREV}" | ||
6 | PR = "${INC_PR}.0" | ||
7 | |||
8 | require e-module.inc | ||
9 | |||
10 | SRC_URI += "file://configure.patch" | ||
11 | |||
12 | PNBLACKLIST[forecasts] ?= "Depends on blacklisted e-wm - the recipe will be removed on 2017-09-01 unless the issue is fixed" | ||
diff --git a/meta-efl/recipes-efl/e17/illume-keyboards-shr/0001-Makefile-update-KEYBOARDS_DIR-for-new-illume2.patch b/meta-efl/recipes-efl/e17/illume-keyboards-shr/0001-Makefile-update-KEYBOARDS_DIR-for-new-illume2.patch deleted file mode 100644 index b18a69b0b..000000000 --- a/meta-efl/recipes-efl/e17/illume-keyboards-shr/0001-Makefile-update-KEYBOARDS_DIR-for-new-illume2.patch +++ /dev/null | |||
@@ -1,23 +0,0 @@ | |||
1 | From 9316e3973c44b981e73b953b2861060c6902de47 Mon Sep 17 00:00:00 2001 | ||
2 | From: Martin Jansa <Martin.Jansa@gmail.com> | ||
3 | Date: Mon, 23 Aug 2010 12:54:05 +0200 | ||
4 | Subject: [PATCH] Makefile: update KEYBOARDS_DIR for new illume2 | ||
5 | |||
6 | --- | ||
7 | Makefile | 2 +- | ||
8 | 1 files changed, 1 insertions(+), 1 deletions(-) | ||
9 | |||
10 | diff --git a/Makefile b/Makefile | ||
11 | index 46e9420..3d8757c 100644 | ||
12 | --- a/Makefile | ||
13 | +++ b/Makefile | ||
14 | @@ -1,5 +1,5 @@ | ||
15 | |||
16 | -INSTBASE = /usr/lib/enlightenment/modules/illume/keyboards | ||
17 | +INSTBASE = /usr/lib/enlightenment/modules/illume-keyboard/keyboards | ||
18 | |||
19 | FILES-arabic = Arabic.kbd Arabic.png | ||
20 | FILES-persian = Persian.kbd Persian.png | ||
21 | -- | ||
22 | 1.7.2 | ||
23 | |||
diff --git a/meta-efl/recipes-efl/e17/illume-keyboards-shr/LICENSE b/meta-efl/recipes-efl/e17/illume-keyboards-shr/LICENSE deleted file mode 100644 index 61bb2f603..000000000 --- a/meta-efl/recipes-efl/e17/illume-keyboards-shr/LICENSE +++ /dev/null | |||
@@ -1,25 +0,0 @@ | |||
1 | Copyright notice for Enlightenment: | ||
2 | |||
3 | Copyright (C) 2000-2010 Carsten Haitzler and various contributors (see AUTHORS) | ||
4 | |||
5 | All rights reserved. | ||
6 | |||
7 | Redistribution and use in source and binary forms, with or without | ||
8 | modification, are permitted provided that the following conditions are met: | ||
9 | |||
10 | 1. Redistributions of source code must retain the above copyright | ||
11 | notice, this list of conditions and the following disclaimer. | ||
12 | 2. Redistributions in binary form must reproduce the above copyright | ||
13 | notice, this list of conditions and the following disclaimer in the | ||
14 | documentation and/or other materials provided with the distribution. | ||
15 | |||
16 | THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, | ||
17 | INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND | ||
18 | FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE | ||
19 | COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, | ||
20 | INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT | ||
21 | LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, | ||
22 | OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF | ||
23 | LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING | ||
24 | NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, | ||
25 | EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
diff --git a/meta-efl/recipes-efl/e17/news_svn.bb b/meta-efl/recipes-efl/e17/news_svn.bb deleted file mode 100644 index 4349e0445..000000000 --- a/meta-efl/recipes-efl/e17/news_svn.bb +++ /dev/null | |||
@@ -1,14 +0,0 @@ | |||
1 | LICENSE = "GPL-2.0" | ||
2 | LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" | ||
3 | |||
4 | PV = "0.1.0+svnr${SRCPV}" | ||
5 | PR = "${INC_PR}.0" | ||
6 | |||
7 | require e-module.inc | ||
8 | |||
9 | do_configure_prepend() { | ||
10 | sed -i -e /po/d configure.ac | ||
11 | sed -i -e s:\ po::g Makefile.am | ||
12 | } | ||
13 | |||
14 | PNBLACKLIST[news] ?= "if you want to use these modules with E18, then you need to update it to git recipe fetching newer sources from http://git.enlightenment.org/enlightenment/modules/news.git/ - the recipe will be removed on 2017-09-01 unless the issue is fixed" | ||
diff --git a/meta-efl/recipes-efl/e17/places/configure.patch b/meta-efl/recipes-efl/e17/places/configure.patch deleted file mode 100644 index f8f48345c..000000000 --- a/meta-efl/recipes-efl/e17/places/configure.patch +++ /dev/null | |||
@@ -1,13 +0,0 @@ | |||
1 | Index: places/configure.ac | ||
2 | =================================================================== | ||
3 | --- places.orig/configure.ac 2014-07-17 21:51:01.276574017 +0000 | ||
4 | +++ places/configure.ac 2014-07-17 21:52:07.096575810 +0000 | ||
5 | @@ -10,7 +10,7 @@ | ||
6 | AC_CANONICAL_HOST | ||
7 | AC_ISC_POSIX | ||
8 | |||
9 | -AM_INIT_AUTOMAKE(1.8) | ||
10 | +AM_INIT_AUTOMAKE([foreign]) | ||
11 | m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) | ||
12 | AM_CONFIG_HEADER(config.h) | ||
13 | |||
diff --git a/meta-efl/recipes-efl/e17/places_svn.bb b/meta-efl/recipes-efl/e17/places_svn.bb deleted file mode 100644 index b184f84c3..000000000 --- a/meta-efl/recipes-efl/e17/places_svn.bb +++ /dev/null | |||
@@ -1,18 +0,0 @@ | |||
1 | LICENSE = "BSD" | ||
2 | LIC_FILES_CHKSUM = "file://COPYING;md5=344895f253c32f38e182dcaf30fe8a35" | ||
3 | |||
4 | PV = "0.1.0+svnr${SRCPV}" | ||
5 | PR = "${INC_PR}.0" | ||
6 | |||
7 | require e-module.inc | ||
8 | |||
9 | do_configure_prepend() { | ||
10 | autopoint || touch config.rpath | ||
11 | } | ||
12 | |||
13 | # Calls /usr/bin/eject for media | ||
14 | RRECOMMENDS_${PN} += "eject" | ||
15 | |||
16 | SRC_URI += "file://configure.patch" | ||
17 | |||
18 | PNBLACKLIST[places] ?= "Depends on blacklisted e-wm - the recipe will be removed on 2017-09-01 unless the issue is fixed" | ||
diff --git a/meta-efl/recipes-efl/e17/rage_svn.bb b/meta-efl/recipes-efl/e17/rage_svn.bb deleted file mode 100644 index 0a90fe3cd..000000000 --- a/meta-efl/recipes-efl/e17/rage_svn.bb +++ /dev/null | |||
@@ -1,15 +0,0 @@ | |||
1 | SUMMARY = "Rage is a media center application based on EFL" | ||
2 | AUTHOR = "Carsten 'The Rasterman' Haitzler" | ||
3 | HOMEPAGE = "http://www.rasterman.com" | ||
4 | LICENSE = "MIT & BSD" | ||
5 | LIC_FILES_CHKSUM = "file://COPYING;md5=344895f253c32f38e182dcaf30fe8a35" | ||
6 | DEPENDS = "emotion evas ecore edje" | ||
7 | SECTION = "x11/multimedia" | ||
8 | PV = "0.3.0.042+svnr${SRCPV}" | ||
9 | SRCREV = "${EFL_SRCREV}" | ||
10 | |||
11 | inherit e | ||
12 | SRC_URI = "${E_SVN}/trunk;module=${SRCNAME};protocol=http;scmdata=keep" | ||
13 | S = "${WORKDIR}/${SRCNAME}" | ||
14 | |||
15 | PNBLACKLIST[rage] ?= "if you want to use these modules with E18, then you need to update it to git recipe fetching newer sources from http://git.enlightenment.org/apps/rage.git/ - the recipe will be removed on 2017-09-01 unless the issue is fixed" | ||
diff --git a/meta-efl/recipes-efl/e17/rain/configure.patch b/meta-efl/recipes-efl/e17/rain/configure.patch deleted file mode 100644 index 87c85de9f..000000000 --- a/meta-efl/recipes-efl/e17/rain/configure.patch +++ /dev/null | |||
@@ -1,13 +0,0 @@ | |||
1 | Index: cpu/configure.ac | ||
2 | =================================================================== | ||
3 | --- cpu.orig/configure.ac 2014-07-17 20:39:48.000000000 +0000 | ||
4 | +++ cpu/configure.ac 2014-07-17 21:39:55.320555868 +0000 | ||
5 | @@ -10,7 +10,7 @@ | ||
6 | AC_CANONICAL_HOST | ||
7 | AC_ISC_POSIX | ||
8 | |||
9 | -AM_INIT_AUTOMAKE(1.6) | ||
10 | +AM_INIT_AUTOMAKE([foreign]) | ||
11 | AM_CONFIG_HEADER(config.h) | ||
12 | m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) | ||
13 | |||
diff --git a/meta-efl/recipes-efl/e17/rain_svn.bb b/meta-efl/recipes-efl/e17/rain_svn.bb deleted file mode 100644 index 14aa2ed38..000000000 --- a/meta-efl/recipes-efl/e17/rain_svn.bb +++ /dev/null | |||
@@ -1,18 +0,0 @@ | |||
1 | LICENSE = "MIT" | ||
2 | |||
3 | LIC_FILES_CHKSUM = "file://COPYING;md5=344895f253c32f38e182dcaf30fe8a35 \ | ||
4 | file://COPYING-PLAIN;md5=c910b645eda0005ccec46f75203dc96e" | ||
5 | |||
6 | PV = "0.0.3+svnr${SRCPV}" | ||
7 | PR = "${INC_PR}.0" | ||
8 | |||
9 | require e-module.inc | ||
10 | |||
11 | do_configure_prepend() { | ||
12 | sed -i -e /po/d ${S}/configure.ac | ||
13 | sed -i -e s:\ po::g ${S}/Makefile.am | ||
14 | } | ||
15 | |||
16 | SRC_URI += "file://configure.patch" | ||
17 | |||
18 | PNBLACKLIST[rain] ?= "Depends on blacklisted e-wm - the recipe will be removed on 2017-09-01 unless the issue is fixed" | ||
diff --git a/meta-efl/recipes-efl/e17/screenshot/screenshot-fix-mkinstalldirs.patch b/meta-efl/recipes-efl/e17/screenshot/screenshot-fix-mkinstalldirs.patch deleted file mode 100644 index 14f1141f1..000000000 --- a/meta-efl/recipes-efl/e17/screenshot/screenshot-fix-mkinstalldirs.patch +++ /dev/null | |||
@@ -1,23 +0,0 @@ | |||
1 | From: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> | ||
2 | Subject: fix screenshot po/ building | ||
3 | Upstream-Status: Pending | ||
4 | |||
5 | Somehow configure doesn't substitute @MKINSTALLDIRS@ by default anymore, | ||
6 | however this substitution is required for po/Makefile | ||
7 | |||
8 | Fix that by calling AM_MKINSTALLDIRS from configure.ac | ||
9 | |||
10 | Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> | ||
11 | |||
12 | Index: E-MODULES-EXTRA/screenshot/configure.ac | ||
13 | =================================================================== | ||
14 | --- E-MODULES-EXTRA.orig/screenshot/configure.ac 2011-08-17 15:49:22.000000000 +0400 | ||
15 | +++ E-MODULES-EXTRA/screenshot/configure.ac 2011-08-17 15:49:34.000000000 +0400 | ||
16 | @@ -24,6 +24,7 @@ | ||
17 | define([AC_LIBTOOL_LANG_F77_CONFIG], [:])dnl | ||
18 | AC_PROG_LIBTOOL | ||
19 | |||
20 | +AM_MKINSTALLDIRS | ||
21 | m4_ifdef([AM_GNU_GETTEXT_VERSION], [ | ||
22 | AM_GNU_GETTEXT_VERSION([0.14]) | ||
23 | ]) | ||
diff --git a/meta-efl/recipes-efl/e17/screenshot_svn.bb b/meta-efl/recipes-efl/e17/screenshot_svn.bb deleted file mode 100644 index 233f7777f..000000000 --- a/meta-efl/recipes-efl/e17/screenshot_svn.bb +++ /dev/null | |||
@@ -1,16 +0,0 @@ | |||
1 | LICENSE = "MIT" | ||
2 | PV = "0.3.0+svnr${SRCREV}" | ||
3 | PR = "${INC_PR}.0" | ||
4 | LIC_FILES_CHKSUM = "file://COPYING;md5=344895f253c32f38e182dcaf30fe8a35" | ||
5 | SRC_URI += "file://screenshot-fix-mkinstalldirs.patch" | ||
6 | |||
7 | require e-module.inc | ||
8 | |||
9 | DEPENDS += "emprint" | ||
10 | RDEPENDS_${PN} += "emprint" | ||
11 | |||
12 | do_configure_prepend() { | ||
13 | sed -i -e 's:AC_MSG_ERROR(emprint not found):echo foo:g' ${S}/configure.ac | ||
14 | } | ||
15 | |||
16 | PNBLACKLIST[screenshot] ?= "depends on blacklisted emprint - the recipe will be removed on 2017-09-01 unless the issue is fixed" | ||
diff --git a/meta-efl/recipes-efl/e17/terminology.inc b/meta-efl/recipes-efl/e17/terminology.inc deleted file mode 100644 index 24f789f59..000000000 --- a/meta-efl/recipes-efl/e17/terminology.inc +++ /dev/null | |||
@@ -1,22 +0,0 @@ | |||
1 | DESCRIPTION = "Enlightenment Terminal Emulator" | ||
2 | LICENSE = "MIT & BSD-2-Clause" | ||
3 | LIC_FILES_CHKSUM = "file://COPYING;md5=4efac6b05b3256ba7da66301ac1ee6c6" | ||
4 | DEPENDS = "evas ecore edje elementary eina eet emotion" | ||
5 | |||
6 | inherit e gettext | ||
7 | |||
8 | # Because latest release we have is 0.1.0 which sorts lower then 0.1.0+svnr${SRCPV} already in feeds | ||
9 | PE = "2" | ||
10 | |||
11 | EXTRA_OECONF = "\ | ||
12 | --with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc \ | ||
13 | " | ||
14 | |||
15 | FILES_${PN} += "\ | ||
16 | ${datadir}/icons/terminology.png \ | ||
17 | " | ||
18 | |||
19 | # doesn't start without own theme | ||
20 | # ERR<770>:terminology utils.c:26 theme_apply() Could not load any theme for group=terminology/background: No Error | ||
21 | # CRI<770>:terminology main.c:448 elm_main() Couldn't find terminology theme! Forgot 'make install'? | ||
22 | RDEPENDS_${PN} += "${PN}-themes" | ||
diff --git a/meta-efl/recipes-efl/e17/terminology_0.9.1.bb b/meta-efl/recipes-efl/e17/terminology_0.9.1.bb deleted file mode 100644 index 77dd223fd..000000000 --- a/meta-efl/recipes-efl/e17/terminology_0.9.1.bb +++ /dev/null | |||
@@ -1,10 +0,0 @@ | |||
1 | require ${BPN}.inc | ||
2 | |||
3 | SRC_URI = "\ | ||
4 | ${E_RELEASES}/apps/${SRCNAME}/${SRCNAME}-${SRCVER}.tar.gz \ | ||
5 | " | ||
6 | |||
7 | SRC_URI[md5sum] = "c7ce2e8ebc5f311d3d3f59ecfdf18f61" | ||
8 | SRC_URI[sha256sum] = "7fb864a14202490e9181c5f254a7e772019216a3aa75c3952d0f12cd32113896" | ||
9 | |||
10 | PNBLACKLIST[terminology] ?= "Depends on blacklisted elementary - the recipe will be removed on 2017-09-01 unless the issue is fixed" | ||
diff --git a/meta-efl/recipes-efl/e17/uptime/configure.patch b/meta-efl/recipes-efl/e17/uptime/configure.patch deleted file mode 100644 index 87c85de9f..000000000 --- a/meta-efl/recipes-efl/e17/uptime/configure.patch +++ /dev/null | |||
@@ -1,13 +0,0 @@ | |||
1 | Index: cpu/configure.ac | ||
2 | =================================================================== | ||
3 | --- cpu.orig/configure.ac 2014-07-17 20:39:48.000000000 +0000 | ||
4 | +++ cpu/configure.ac 2014-07-17 21:39:55.320555868 +0000 | ||
5 | @@ -10,7 +10,7 @@ | ||
6 | AC_CANONICAL_HOST | ||
7 | AC_ISC_POSIX | ||
8 | |||
9 | -AM_INIT_AUTOMAKE(1.6) | ||
10 | +AM_INIT_AUTOMAKE([foreign]) | ||
11 | AM_CONFIG_HEADER(config.h) | ||
12 | m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) | ||
13 | |||
diff --git a/meta-efl/recipes-efl/e17/uptime_svn.bb b/meta-efl/recipes-efl/e17/uptime_svn.bb deleted file mode 100644 index 60d48a2ca..000000000 --- a/meta-efl/recipes-efl/e17/uptime_svn.bb +++ /dev/null | |||
@@ -1,12 +0,0 @@ | |||
1 | LICENSE = "MIT" | ||
2 | LIC_FILES_CHKSUM = "file://COPYING;md5=344895f253c32f38e182dcaf30fe8a35 \ | ||
3 | file://COPYING-PLAIN;md5=c910b645eda0005ccec46f75203dc96e" | ||
4 | |||
5 | PV = "0.0.2+svnr${SRCREV}" | ||
6 | PR = "${INC_PR}.0" | ||
7 | |||
8 | require e-module.inc | ||
9 | |||
10 | SRC_URI += "file://configure.patch" | ||
11 | |||
12 | PNBLACKLIST[uptime] ?= "Depends on blacklisted e-wm - the recipe will be removed on 2017-09-01 unless the issue is fixed" | ||
diff --git a/meta-efl/recipes-efl/efl/azy_svn.bb b/meta-efl/recipes-efl/efl/azy_svn.bb deleted file mode 100644 index d3bc200f5..000000000 --- a/meta-efl/recipes-efl/efl/azy_svn.bb +++ /dev/null | |||
@@ -1,37 +0,0 @@ | |||
1 | DESCRIPTION = "Azy is a library meant for implementing rpc clients and servers in a simple manner." | ||
2 | DEPENDS = "pkgconfig zlib openssl eina gnutls ecore libxml2 re2c-native mysql5 azy-native glib-2.0" | ||
3 | DEPENDS_class-native = "pkgconfig-native zlib-native openssl-native eina-native gnutls-native ecore-native libxml2-native re2c-native mysql5-native glib-2.0-native" | ||
4 | LICENSE = "LGPLv2.1+" | ||
5 | LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" | ||
6 | |||
7 | PV = "1.0.0+svnr${SRCPV}" | ||
8 | PR = "r2" | ||
9 | |||
10 | SRCREV = "${EFL_SRCREV}" | ||
11 | |||
12 | # to provide native lemon binary | ||
13 | BBCLASSEXTEND = "native" | ||
14 | |||
15 | EXTRA_OECONF += " --disable-mysql-tests" | ||
16 | |||
17 | do_configure_prepend_class-target() { | ||
18 | sed -i "s#\./lemon#${STAGING_BINDIR_NATIVE}/azy_lemon#g" ${S}/src/bin/Makefile.am | ||
19 | sed -i "s#\$(top_builddir)/src/bin/azy_parser -H -p -o#${STAGING_BINDIR_NATIVE}/azy_parser -H -p -o#g" ${S}/src/tests/Makefile.am | ||
20 | sed -i "s#\$(top_builddir)/src/bin/azy_parser -eHn -m#${STAGING_BINDIR_NATIVE}/azy_parser -eHn -m#g" ${S}/src/tests/identi.ca/Makefile.am | ||
21 | } | ||
22 | |||
23 | do_install_append_class-native() { | ||
24 | install -d ${D}/${bindir} | ||
25 | install -m 0755 ${B}/src/bin/lemon ${D}/${bindir}/azy_lemon | ||
26 | } | ||
27 | |||
28 | inherit efl | ||
29 | |||
30 | SRC_URI = "${E_SVN}/trunk/PROTO;module=${SRCNAME};protocol=http;scmdata=keep" | ||
31 | S = "${WORKDIR}/${SRCNAME}" | ||
32 | |||
33 | # azy/2_1.0.0+svnr82070-r2/azy/src/lib/extras/pugixml.cpp:33: | ||
34 | # sysroots/qemuarm/usr/include/c++/5.2.0/bits/basic_string.h:4780:5: error: reference to 'basic_string' is ambiguous | ||
35 | # basic_string<_CharT, _Traits, _Alloc> | ||
36 | # ^ | ||
37 | PNBLACKLIST[azy] ?= "OLD and doesn't build with gcc-5 - the recipe will be removed on 2017-09-01 unless the issue is fixed" | ||
diff --git a/meta-efl/recipes-efl/efl/ecore/fix-ecore-fb-initialization.patch b/meta-efl/recipes-efl/efl/ecore/fix-ecore-fb-initialization.patch deleted file mode 100644 index 55773a3b9..000000000 --- a/meta-efl/recipes-efl/efl/ecore/fix-ecore-fb-initialization.patch +++ /dev/null | |||
@@ -1,41 +0,0 @@ | |||
1 | From 657571197c9d369e12ae31b6777a1929fe3680ef Mon Sep 17 00:00:00 2001 | ||
2 | From: Martin Jansa <Martin.Jansa@gmail.com> | ||
3 | Date: Sat, 29 Oct 2011 00:16:55 +0200 | ||
4 | Subject: [PATCH] ecore-fb: fix ts init | ||
5 | |||
6 | Upstream-Status: Pending | ||
7 | |||
8 | The whole ecore-fb init logic is somewhat flawed; with this patch we | ||
9 | get at least a working touchscreen w/ tslib again. | ||
10 | |||
11 | Signed-off-by: Michael 'Mickey' Lauer <mlauer@vanille-media.de> | ||
12 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | ||
13 | --- | ||
14 | ecore/src/lib/ecore_fb/ecore_fb.c | 4 ++++ | ||
15 | 1 files changed, 4 insertions(+), 0 deletions(-) | ||
16 | |||
17 | diff --git a/src/lib/ecore_fb/ecore_fb.c b/src/lib/ecore_fb/ecore_fb.c | ||
18 | index 5b2b84b..a1904b3 100644 | ||
19 | --- a/src/lib/ecore_fb/ecore_fb.c | ||
20 | +++ b/src/lib/ecore_fb/ecore_fb.c | ||
21 | @@ -46,6 +46,9 @@ ecore_fb_init(const char *name __UNUSED__) | ||
22 | if (!ecore_fb_vt_init()) | ||
23 | return --_ecore_fb_init_count; | ||
24 | |||
25 | + if (!ecore_fb_ts_init()) | ||
26 | + return --_ecore_fb_init_count; | ||
27 | + | ||
28 | if (!oldhand) | ||
29 | { | ||
30 | oldhand = signal(SIGINT, nosigint); | ||
31 | @@ -77,6 +80,7 @@ ecore_fb_shutdown(void) | ||
32 | oldhand = NULL; | ||
33 | } | ||
34 | |||
35 | + ecore_fb_ts_shutdown(); | ||
36 | ecore_fb_vt_shutdown(); | ||
37 | |||
38 | return _ecore_fb_init_count; | ||
39 | -- | ||
40 | 1.7.8.6 | ||
41 | |||
diff --git a/meta-efl/recipes-efl/efl/edbus.inc b/meta-efl/recipes-efl/efl/edbus.inc deleted file mode 100644 index 03d0ee58d..000000000 --- a/meta-efl/recipes-efl/efl/edbus.inc +++ /dev/null | |||
@@ -1,29 +0,0 @@ | |||
1 | DESCRIPTION = "DBus and HAL convenience wrappers for EFL" | ||
2 | DEPENDS = "dbus ecore eina" | ||
3 | LICENSE = "MIT & BSD" | ||
4 | LIC_FILES_CHKSUM = "file://COPYING;md5=550b8cea13dacc4bf00508a8cce1074c" | ||
5 | |||
6 | inherit efl | ||
7 | |||
8 | # -dev and -dbg packages wants ${PN} which is empty here | ||
9 | ALLOW_EMPTY_${PN} = "1" | ||
10 | |||
11 | BBCLASSEXTEND = "native" | ||
12 | INC_PR = "r0" | ||
13 | |||
14 | SRCNAME = "e_dbus" | ||
15 | |||
16 | # it needs to be disabled, because creates circular dependency on elementary | ||
17 | EXTRA_OECONF += "--disable-edbus-performance-test" | ||
18 | |||
19 | PACKAGES =+ "${PN}-enotify ${PN}-edbus ${PN}-enm ${PN}-ehal ${PN}-econnman ${PN}-eofono ${PN}-eukit ${PN}-ebluez" | ||
20 | FILES_${PN}-enotify = "${libdir}/libenotify.so.* ${bindir}/e-notify-send" | ||
21 | FILES_${PN}-edbus = "${libdir}/libedbus.so.*" | ||
22 | FILES_${PN}-enm = "${libdir}/libenm.so.*" | ||
23 | FILES_${PN}-ehal = "${libdir}/libehal.so.*" | ||
24 | FILES_${PN}-econnman = "${libdir}/libeconnman.so.* ${libdir}/libeconnman0_7x.so.*" | ||
25 | FILES_${PN}-eofono = "${libdir}/libeofono.so.*" | ||
26 | FILES_${PN}-eukit = "${libdir}/libeukit.so.*" | ||
27 | FILES_${PN}-ebluez = "${libdir}/libebluez.so.*" | ||
28 | FILES_${PN} += "${datadir}/e_dbus/logo.png" | ||
29 | |||
diff --git a/meta-efl/recipes-efl/efl/edbus_1.7.9.bb b/meta-efl/recipes-efl/efl/edbus_1.7.9.bb deleted file mode 100644 index a8033ac59..000000000 --- a/meta-efl/recipes-efl/efl/edbus_1.7.9.bb +++ /dev/null | |||
@@ -1,16 +0,0 @@ | |||
1 | require ${BPN}.inc | ||
2 | |||
3 | SRC_URI = "\ | ||
4 | ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \ | ||
5 | " | ||
6 | |||
7 | SRC_URI[md5sum] = "8f72da14e5664aad8c45eeeca0e3ff5f" | ||
8 | SRC_URI[sha256sum] = "c328c4cf1424629cb67c83689ccc1f95967abcb4c03dffd437e93b799ff151c1" | ||
9 | |||
10 | PNBLACKLIST[edbus] ?= "Depends on blacklisted ecore - the recipe will be removed on 2017-09-01 unless the issue is fixed" | ||
11 | |||
12 | PNBLACKLIST[edbus] ?= "Depends on blacklisted eina - the recipe will be removed on 2017-09-01 unless the issue is fixed" | ||
13 | |||
14 | PNBLACKLIST[edbus] ?= "Runtime depends on blacklisted edbus - the recipe will be removed on 2017-09-01 unless the issue is fixed" | ||
15 | |||
16 | PNBLACKLIST[edbus] ?= "Runtime depends on blacklisted edbus-dev - the recipe will be removed on 2017-09-01 unless the issue is fixed" | ||
diff --git a/meta-efl/recipes-efl/efl/edje-fpu.inc b/meta-efl/recipes-efl/efl/edje-fpu.inc deleted file mode 100644 index 32a6daf7d..000000000 --- a/meta-efl/recipes-efl/efl/edje-fpu.inc +++ /dev/null | |||
@@ -1,6 +0,0 @@ | |||
1 | |||
2 | def get_edje_fpu_setting(bb, d): | ||
3 | if d.getVar('TARGET_FPU') in [ 'soft' ]: | ||
4 | return "--enable-fixed-point" | ||
5 | return "" | ||
6 | |||
diff --git a/meta-efl/recipes-efl/efl/efl.inc b/meta-efl/recipes-efl/efl/efl.inc deleted file mode 100644 index 4cd21bfd0..000000000 --- a/meta-efl/recipes-efl/efl/efl.inc +++ /dev/null | |||
@@ -1,290 +0,0 @@ | |||
1 | SUMMARY = "EFL" | ||
2 | LICENSE = "MIT & BSD & LGPL-2.1" | ||
3 | LIC_FILES_CHKSUM = "file://COPYING;md5=ca7873210523dcfd32694b94286dca60" | ||
4 | |||
5 | DEPENDS_class-native = "freetype-native libxext-native libpng-native jpeg-native tiff-native libfribidi-native glib-2.0-native dbus-native openssl-native" | ||
6 | DEPENDS = "virtual/libiconv tslib curl glib-2.0 gnutls pkgconfig zlib jpeg openssl libsndfile1 dbus libexif librsvg freetype libpng tiff libxext virtual/libx11 libxdamage libxrender fontconfig libfribidi giflib udev libxcursor libxcomposite libxinerama libxrandr libxtst libxscrnsaver efl-native util-linux libunwind" | ||
7 | |||
8 | inherit efl gettext pkgconfig | ||
9 | |||
10 | BBCLASSEXTEND = "native" | ||
11 | |||
12 | PROVIDES += "ecore edje eet eeze efreet eina eio embryo emotion ethumb evas eldbus" | ||
13 | |||
14 | # we don't have bullet for physics | ||
15 | # You have chosen to disable physics support. This disables lots of | ||
16 | # core functionality and is effectively never tested. You are going | ||
17 | # to find features that suddenly don't work and as a result cause | ||
18 | # a series of breakages. This is simply not tested so you are on | ||
19 | # your own in terms of ensuring everything works if you do this | ||
20 | EXTRA_OECONF = " \ | ||
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-aba \ | ||
23 | " | ||
24 | EXTRA_OECONF_append_class-target = " \ | ||
25 | --with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc \ | ||
26 | --with-eolian-gen=${STAGING_BINDIR_NATIVE}/eolian_gen \ | ||
27 | --with-eolian-cxx=${STAGING_BINDIR_NATIVE}/eolian_cxx \ | ||
28 | --with-elua=${STAGING_BINDIR_NATIVE}/elua \ | ||
29 | " | ||
30 | EXTRA_OECONF_append_class-native = " \ | ||
31 | --disable-fontconfig \ | ||
32 | --disable-audio \ | ||
33 | --disable-physics \ | ||
34 | --disable-multisense \ | ||
35 | --disable-cserve \ | ||
36 | --disable-libeeze \ | ||
37 | --with-x11=none \ | ||
38 | --disable-image-loader-bmp \ | ||
39 | --disable-image-loader-eet \ | ||
40 | --disable-image-loader-generic \ | ||
41 | --disable-image-loader-gif \ | ||
42 | --disable-image-loader-ico \ | ||
43 | --disable-image-loader-jp2k \ | ||
44 | --disable-image-loader-pmaps \ | ||
45 | --disable-image-loader-psd \ | ||
46 | --disable-image-loader-tga \ | ||
47 | --disable-image-loader-wbmp \ | ||
48 | --disable-image-loader-webp \ | ||
49 | --disable-image-loader-xpm \ | ||
50 | --disable-image-loader-tgv \ | ||
51 | --disable-image-loader-dds \ | ||
52 | " | ||
53 | |||
54 | PACKAGECONFIG ?= "egl opengl-es gstreamer1 pulseaudio luajit ${@bb.utils.filter('DISTRO_FEATURES', 'wayland', d)}" | ||
55 | PACKAGECONFIG_class-native = "luajit" | ||
56 | |||
57 | PACKAGECONFIG[wayland] = "--enable-wayland --enable-wayland-ivi-shell,--disable-wayland --disable-wayland-ivi-shell,wayland" | ||
58 | PACKAGECONFIG[egl] = "--enable-egl,--disable-egl,virtual/egl" | ||
59 | # sort of tri-state | ||
60 | PACKAGECONFIG[opengl-full] = "--with-opengl=full,,virtual/libgl" | ||
61 | PACKAGECONFIG[opengl-es] = "--with-opengl=es,,virtual/libgles2" | ||
62 | PACKAGECONFIG[opengl-none] = "--with-opengl=none,," | ||
63 | # be aware when enabling this for efl-native, we don't provide gcc-native so you need to make | ||
64 | # sure that all your builders have g++ which supports -std=gnu++11 | ||
65 | PACKAGECONFIG[c++11] = "--enable-cxx-bindings,--disable-cxx-bindings" | ||
66 | PACKAGECONFIG[gstreamer] = "--enable-gstreamer,--disable-gstreamer,gstreamer" | ||
67 | PACKAGECONFIG[gstreamer1] = "--enable-gstreamer1,--disable-gstreamer1,gstreamer1.0 gstreamer1.0-plugins-base" | ||
68 | PACKAGECONFIG[pulseaudio] = "--enable-pulseaudio,--disable-pulseaudio,pulseaudio" | ||
69 | PACKAGECONFIG[systemd] = "--enable-systemd,--disable-systemd,systemd" | ||
70 | PACKAGECONFIG[luajit] = "--disable-lua-old,--enable-lua-old,luajit" | ||
71 | PACKAGECONFIG[lua-old] = "--enable-lua-old,--disable-lua-old,lua" | ||
72 | PACKAGECONFIG[avahi] = "--enable-avahi,--disable-avahi,avahi" | ||
73 | # currently we don't provide doxygen-native | ||
74 | PACKAGECONFIG[doc] = "--enable-doc,--disable-doc,doxygen-native" | ||
75 | |||
76 | do_install_append() { | ||
77 | # don't ship precompiled lua files | ||
78 | rm -f ${datadir}/elua/*/*.luac | ||
79 | } | ||
80 | |||
81 | PACKAGES =+ "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" | ||
82 | |||
83 | # upgrade path from 1.7 | ||
84 | DEBIAN_NOAUTONAME_ecore-audio = "1" | ||
85 | DEBIAN_NOAUTONAME_ecore-input-evas = "1" | ||
86 | DEBIAN_NOAUTONAME_ecore-input = "1" | ||
87 | DEBIAN_NOAUTONAME_ecore-imf-evas = "1" | ||
88 | DEBIAN_NOAUTONAME_ecore-imf = "1" | ||
89 | DEBIAN_NOAUTONAME_ecore-file = "1" | ||
90 | DEBIAN_NOAUTONAME_ecore-con = "1" | ||
91 | DEBIAN_NOAUTONAME_ecore-ipc = "1" | ||
92 | DEBIAN_NOAUTONAME_ecore-x = "1" | ||
93 | DEBIAN_NOAUTONAME_ecore-evas = "1" | ||
94 | DEBIAN_NOAUTONAME_embryo = "1" | ||
95 | |||
96 | ALLOW_EMPTY_ecore = "1" | ||
97 | RDEPENDS_ecore = "ecore-audio ecore-input-evas ecore-input ecore-imf-evas ecore-imf ecore-file ecore-con ecore-ipc ecore-x ecore-evas" | ||
98 | |||
99 | python populate_packages_prepend () { | ||
100 | for plugin_type in "engines loaders savers".split(): | ||
101 | bb.note( "splitting packages for evas %s..." % plugin_type ) | ||
102 | basedir = d.expand( '${libdir}/evas/modules/%s' % plugin_type) | ||
103 | |||
104 | do_split_packages(d, basedir, '^(.*)', | ||
105 | output_pattern = 'evas-' + plugin_type[:-1] + "-%s", | ||
106 | description = 'Evas module %s', | ||
107 | allow_dirs=True, recursive=False, extra_depends="" ) | ||
108 | |||
109 | plugin_type = "cserve2" | ||
110 | bb.note( "splitting packages for evas %s..." % plugin_type ) | ||
111 | basedir = d.expand( '${libdir}/evas/%s/loaders' % plugin_type) | ||
112 | |||
113 | do_split_packages(d, basedir, '^(.*)', | ||
114 | output_pattern = 'evas-' + plugin_type + "-%s", | ||
115 | description = 'Evas csever2 loader module %s', | ||
116 | allow_dirs=True, recursive=False, extra_depends="" ) | ||
117 | } | ||
118 | |||
119 | PACKAGES += "evas-loader-png evas-engine-software-generic evas-engine-fb" | ||
120 | PACKAGES_DYNAMIC += "^evas-engine-.* ^evas-loader-.* ^evas-saver-.* ^evas-cserve2-.*" | ||
121 | |||
122 | # PACKAGES_DYNAMIC + do_split_packages isn't used for all libe libs, | ||
123 | # because PACKAGES_DYNAMIC would be catching too many patterns | ||
124 | # (or need to list all possible prefixes) and not all original packages | ||
125 | # were splitted like that, so it would need RCONFLICTS/RPROVIDES/RREPLACES | ||
126 | # combos at least in few places for upgrade path. | ||
127 | |||
128 | FILES_efreet-trash = " \ | ||
129 | ${libdir}/libefreet_trash${SOLIBS} \ | ||
130 | " | ||
131 | FILES_efreet-mime = " \ | ||
132 | ${libdir}/libefreet_mime${SOLIBS} \ | ||
133 | " | ||
134 | FILES_libeet = " \ | ||
135 | ${libdir}/libeet${SOLIBS} \ | ||
136 | " | ||
137 | FILES_libefreet = " \ | ||
138 | ${libdir}/libefreet${SOLIBS} \ | ||
139 | " | ||
140 | FILES_ecore-audio = "\ | ||
141 | ${libdir}/libecore_audio${SOLIBS} \ | ||
142 | " | ||
143 | FILES_ecore-input-evas = "\ | ||
144 | ${libdir}/libecore_input_evas${SOLIBS} \ | ||
145 | " | ||
146 | FILES_ecore-input = "\ | ||
147 | ${libdir}/libecore_input${SOLIBS} \ | ||
148 | " | ||
149 | FILES_ecore-imf-evas = "\ | ||
150 | ${libdir}/libecore_imf_evas${SOLIBS} \ | ||
151 | ${libdir}/ecore-imf/modules/*/*/module.so \ | ||
152 | " | ||
153 | FILES_ecore-imf = "\ | ||
154 | ${libdir}/libecore_imf${SOLIBS} \ | ||
155 | " | ||
156 | |||
157 | FILES_ecore-file = "\ | ||
158 | ${libdir}/libecore_file${SOLIBS} \ | ||
159 | " | ||
160 | FILES_ecore-con = "\ | ||
161 | ${libdir}/libecore_con${SOLIBS} \ | ||
162 | " | ||
163 | FILES_ecore-ipc = "\ | ||
164 | ${libdir}/libecore_ipc${SOLIBS} \ | ||
165 | " | ||
166 | FILES_ecore-x = "\ | ||
167 | ${libdir}/libecore_x${SOLIBS} \ | ||
168 | ${libdir}/ecore_x/bin/v-*/ecore_x_vsync \ | ||
169 | " | ||
170 | FILES_ecore-evas = "\ | ||
171 | ${libdir}/libecore_evas${SOLIBS} \ | ||
172 | ${libdir}/ecore-evas/engines/*/*/module.so \ | ||
173 | " | ||
174 | FILES_eio = "\ | ||
175 | ${libdir}/libeio${SOLIBS} \ | ||
176 | " | ||
177 | FILES_eina = "\ | ||
178 | ${libdir}/libeina${SOLIBS} \ | ||
179 | ${bindir}/eina-bench-cmp \ | ||
180 | " | ||
181 | FILES_edje-utils = "\ | ||
182 | ${bindir}/edje_* \ | ||
183 | ${datadir}/edje/include/edje.inc \ | ||
184 | " | ||
185 | FILES_eldbus = "\ | ||
186 | ${libdir}/libeldbus${SOLIBS} \ | ||
187 | " | ||
188 | FILES_eo = "\ | ||
189 | ${libdir}/libeo${SOLIBS} \ | ||
190 | " | ||
191 | FILES_libemotion = "\ | ||
192 | ${libdir}/libemotion${SOLIBS} \ | ||
193 | " | ||
194 | FILES_efreet = " \ | ||
195 | ${datadir}/dbus-1/services/*Efreet* \ | ||
196 | ${libdir}/efreet/*/efreet*create \ | ||
197 | ${bindir}/efreetd \ | ||
198 | ${datadir}/efreet \ | ||
199 | " | ||
200 | FILES_eet = " \ | ||
201 | ${bindir}/eet \ | ||
202 | ${bindir}/eetpack \ | ||
203 | ${bindir}/vieet \ | ||
204 | ${bindir}/diffeet \ | ||
205 | ${libdir}/libeet${SOLIBS} \ | ||
206 | " | ||
207 | FILES_emotion = " \ | ||
208 | ${datadir}/emotion \ | ||
209 | ${libdir}/emotion/modules/gstreamer1/*/module.so \ | ||
210 | " | ||
211 | FILES_embryo-tests = " \ | ||
212 | ${datadir}/embryo/ \ | ||
213 | " | ||
214 | FILES_embryo-utils = " \ | ||
215 | ${binddir}/embryo_* \ | ||
216 | " | ||
217 | FILES_embryo = " \ | ||
218 | ${libdir}/libembryo${SOLIBS} \ | ||
219 | " | ||
220 | FILES_ethumb = " \ | ||
221 | ${datadir}/dbus-1/services/*Ethumb* \ | ||
222 | ${libdir}/libethumb${SOLIBS} \ | ||
223 | ${libdir}/libethumb_client${SOLIBS} \ | ||
224 | ${bindir}/ethumbd \ | ||
225 | ${bindir}/ethumbd_client \ | ||
226 | ${bindir}/ethumb \ | ||
227 | ${libdir}/ethumb/*/*/*/module.so \ | ||
228 | ${libdir}/ethumb/*/*/*/*.edj \ | ||
229 | ${libdir}/ethumb_client/utils/*/ethumbd_slave \ | ||
230 | ${datadir}/ethumb* \ | ||
231 | " | ||
232 | FILES_ecore = " \ | ||
233 | ${libdir}/libecore${SOLIBS} \ | ||
234 | ${libdir}/ecore*/*/*/*/module.so \ | ||
235 | ${datadir}/ecore* \ | ||
236 | " | ||
237 | FILES_evas = " \ | ||
238 | ${libdir}/libevas${SOLIBS} \ | ||
239 | ${libdir}/evas*/*/*/*/*/module.so \ | ||
240 | ${libdir}/evas*/*/*/*/*/*.edj \ | ||
241 | ${libdir}/evas/cserve2/bin/*/evas_cserve2* \ | ||
242 | ${datadir}/evas* \ | ||
243 | ${bindir}/evas_cserve2_* \ | ||
244 | " | ||
245 | |||
246 | FILES_eeze = " \ | ||
247 | ${libdir}/libeeze${SOLIBS} \ | ||
248 | ${libdir}/eeze*/*/*/*/*/module.so \ | ||
249 | ${datadir}/eeze \ | ||
250 | ${bindir}/eeze_* \ | ||
251 | " | ||
252 | FILES_edje = " \ | ||
253 | ${libdir}/libedje${SOLIBS} \ | ||
254 | ${libdir}/edje*/*/*/*/module.so \ | ||
255 | ${libdir}/edje/utils/*/epp \ | ||
256 | ${datadir}/edje \ | ||
257 | ${datadir}/mime \ | ||
258 | " | ||
259 | FILES_elua = " \ | ||
260 | ${bindir}/elua \ | ||
261 | ${datadir}/elua \ | ||
262 | " | ||
263 | FILES_${PN}-dbg += " \ | ||
264 | ${libdir}/efreet/*/.debug \ | ||
265 | ${libdir}/ecore*/*/*/*/.debug \ | ||
266 | ${libdir}/ecore*/*/*/.debug \ | ||
267 | ${libdir}/evas*/*/*/*/*/.debug \ | ||
268 | ${libdir}/evas/cserve2/bin/*/.debug \ | ||
269 | ${libdir}/eeze*/*/*/*/*/.debug \ | ||
270 | ${libdir}/edje*/*/*/*/.debug \ | ||
271 | ${libdir}/edje/utils/*/.debug \ | ||
272 | ${libdir}/ethumb/*/*/*/.debug \ | ||
273 | ${libdir}/ethumb_client/utils/*/.debug \ | ||
274 | ${libdir}/emotion/modules/gstreamer1/*/.debug \ | ||
275 | " | ||
276 | FILES_${PN}-dev += " \ | ||
277 | ${libdir}/cmake \ | ||
278 | ${libdir}/ecore*/*/*/*/module.la \ | ||
279 | ${libdir}/evas*/*/*/*/*/module.la \ | ||
280 | ${libdir}/ethumb*/*/*/*/module.la \ | ||
281 | ${libdir}/eeze*/*/*/*/*/module.la \ | ||
282 | ${libdir}/edje*/*/*/*/module.la \ | ||
283 | ${libdir}/emotion/modules/gstreamer1/*/module.la \ | ||
284 | ${datadir}/gdb/auto-load \ | ||
285 | ${datadir}/eo/gdb \ | ||
286 | ${bindir}/eldbus-codegen \ | ||
287 | " | ||
288 | |||
289 | PNBLACKLIST[efl] ?= "Depends on broken efl-native - the recipe will be removed on 2017-09-01 unless the issue is fixed" | ||
290 | PNBLACKLIST[efl-native] ?= "Broken: fails to build with http://errors.yoctoproject.org/Errors/Details/138240/ - the recipe will be removed on 2017-09-01 unless the issue is fixed" | ||
diff --git a/meta-efl/recipes-efl/efl/efl/0001-configure.ac-Don-t-check-for-Xprint-extension.patch b/meta-efl/recipes-efl/efl/efl/0001-configure.ac-Don-t-check-for-Xprint-extension.patch deleted file mode 100644 index fa85f817e..000000000 --- a/meta-efl/recipes-efl/efl/efl/0001-configure.ac-Don-t-check-for-Xprint-extension.patch +++ /dev/null | |||
@@ -1,27 +0,0 @@ | |||
1 | From 27aedcdcdafbf079dc022bab72ec309cf7db3172 Mon Sep 17 00:00:00 2001 | ||
2 | From: Martin Jansa <Martin.Jansa@gmail.com> | ||
3 | Date: Fri, 10 Jan 2014 17:07:13 +0100 | ||
4 | Subject: [PATCH 1/3] configure.ac: Don't check for Xprint extension | ||
5 | |||
6 | * it's long gone | ||
7 | |||
8 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | ||
9 | --- | ||
10 | configure.ac | 1 - | ||
11 | 1 file changed, 1 deletion(-) | ||
12 | |||
13 | diff --git a/configure.ac b/configure.ac | ||
14 | index c108b1b..f019bfc 100644 | ||
15 | --- a/configure.ac | ||
16 | +++ b/configure.ac | ||
17 | @@ -3474,7 +3474,6 @@ if test "x${want_x11_xlib}" = "xyes" ; then | ||
18 | ECORE_CHECK_X_EXTENSION([Xdpms], [dpms.h], [Xext], [DPMSQueryExtension]) | ||
19 | ECORE_CHECK_X_EXTENSION([Xfixes], [Xfixes.h], [Xfixes], [XFixesExpandRegion]) | ||
20 | ECORE_CHECK_X_EXTENSION([Xinerama], [Xinerama.h], [Xinerama], [XineramaQueryScreens]) | ||
21 | - ECORE_CHECK_X_EXTENSION([Xprint], [Print.h], [Xp], [XpQueryScreens]) | ||
22 | ECORE_CHECK_X_EXTENSION([Xrandr], [Xrandr.h], [Xrandr], [XRRGetScreenResourcesCurrent]) | ||
23 | ECORE_CHECK_X_EXTENSION([Xrender], [Xrender.h], [Xrender], [XRenderFindVisualFormat]) | ||
24 | ECORE_CHECK_X_EXTENSION([Xtest], [XTest.h], [Xtst], [XTestFakeKeyEvent]) | ||
25 | -- | ||
26 | 2.3.0 | ||
27 | |||
diff --git a/meta-efl/recipes-efl/efl/efl/0001-evas_3d-Add-Eet.h-includes.patch b/meta-efl/recipes-efl/efl/efl/0001-evas_3d-Add-Eet.h-includes.patch deleted file mode 100644 index d0f26c7dd..000000000 --- a/meta-efl/recipes-efl/efl/efl/0001-evas_3d-Add-Eet.h-includes.patch +++ /dev/null | |||
@@ -1,51 +0,0 @@ | |||
1 | From 2e50fd2dfc68b77e7acddc79550f22987778a897 Mon Sep 17 00:00:00 2001 | ||
2 | From: Martin Jansa <Martin.Jansa@gmail.com> | ||
3 | Date: Tue, 2 Dec 2014 12:21:10 +0100 | ||
4 | Subject: [PATCH] evas_3d: Add Eet.h includes | ||
5 | |||
6 | * with some very restrictive options like we use in efl-native, the build is complaining | ||
7 | about missing symbols from Eet.h, add include where needed | ||
8 | |||
9 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | ||
10 | --- | ||
11 | src/lib/evas/canvas/evas_canvas3d_eet.c | 1 + | ||
12 | src/modules/evas/model_loaders/eet/evas_model_load_eet.c | 1 + | ||
13 | src/modules/evas/model_savers/eet/evas_model_save_eet.c | 1 + | ||
14 | 3 files changed, 3 insertions(+) | ||
15 | |||
16 | diff --git a/src/lib/evas/canvas/evas_canvas3d_eet.c b/src/lib/evas/canvas/evas_canvas3d_eet.c | ||
17 | index 281f69d..a604076 100644 | ||
18 | --- a/src/lib/evas/canvas/evas_canvas3d_eet.c | ||
19 | +++ b/src/lib/evas/canvas/evas_canvas3d_eet.c | ||
20 | @@ -1,3 +1,4 @@ | ||
21 | +#include <Eet.h> | ||
22 | #include <stdio.h> | ||
23 | #include "evas_common_private.h" | ||
24 | #include "evas_private.h" | ||
25 | diff --git a/src/modules/evas/model_loaders/eet/evas_model_load_eet.c b/src/modules/evas/model_loaders/eet/evas_model_load_eet.c | ||
26 | index 803846d..7ebaf8e 100644 | ||
27 | --- a/src/modules/evas/model_loaders/eet/evas_model_load_eet.c | ||
28 | +++ b/src/modules/evas/model_loaders/eet/evas_model_load_eet.c | ||
29 | @@ -3,6 +3,7 @@ | ||
30 | #endif | ||
31 | |||
32 | #include <Eo.h> | ||
33 | +#include <Eet.h> | ||
34 | #include <stdio.h> | ||
35 | #include "evas_common_private.h" | ||
36 | #include "evas_private.h" | ||
37 | diff --git a/src/modules/evas/model_savers/eet/evas_model_save_eet.c b/src/modules/evas/model_savers/eet/evas_model_save_eet.c | ||
38 | index 71e094a..4d56977 100644 | ||
39 | --- a/src/modules/evas/model_savers/eet/evas_model_save_eet.c | ||
40 | +++ b/src/modules/evas/model_savers/eet/evas_model_save_eet.c | ||
41 | @@ -2,6 +2,7 @@ | ||
42 | #include "config.h" | ||
43 | #endif | ||
44 | |||
45 | +#include <Eet.h> | ||
46 | #include <stdio.h> | ||
47 | #include "evas_common_private.h" | ||
48 | #include "evas_private.h" | ||
49 | -- | ||
50 | 2.5.0 | ||
51 | |||
diff --git a/meta-efl/recipes-efl/efl/efl_1.15.1.bb b/meta-efl/recipes-efl/efl/efl_1.15.1.bb deleted file mode 100644 index 9f18531de..000000000 --- a/meta-efl/recipes-efl/efl/efl_1.15.1.bb +++ /dev/null | |||
@@ -1,29 +0,0 @@ | |||
1 | require ${BPN}.inc | ||
2 | |||
3 | SRC_URI = "\ | ||
4 | ${E_RELEASES}/libs/${SRCNAME}/${SRCNAME}-${SRCVER}.tar.gz \ | ||
5 | file://0001-configure.ac-Don-t-check-for-Xprint-extension.patch \ | ||
6 | file://0001-evas_3d-Add-Eet.h-includes.patch \ | ||
7 | " | ||
8 | |||
9 | SRC_URI[md5sum] = "dc91bcab73275f678e1748a2dea8d88a" | ||
10 | SRC_URI[sha256sum] = "2a6d0ab28020b4741be20b32ad0ffeb8f97f766c5c32175bacc2f2d0dc52f98c" | ||
11 | |||
12 | # Temporary disable until error like the one following are fixed | ||
13 | # efl-native/2_1.8.4-r0/efl-1.8.4/src/lib/eet/.libs/libeet.so: file not recognized: File truncated | ||
14 | # collect2: error: ld returned 1 exit status | ||
15 | # x86_64-linux-libtool: install: error: relink `modules/evas/savers/tiff/module.la' with the above command before installing it | ||
16 | # Makefile:11031: recipe for target 'install-savertiffpkgLTLIBRARIES' failed | ||
17 | PARALLEL_MAKE_class-native = "" | ||
18 | |||
19 | #EFL_RUN_IN_TREE=1 ../src/bin/eolian/eolian_gen --eo --legacy -I/OE/build/shr-core/tmp-eglibc/work/x86_64-linux/efl-native/2_1.10.0-r0/efl-1.10.0/src/lib/eo -I/OE/build/shr-core/tmp-eglibc/work/x86_64-linux/efl-native/2_1.10.0-r0/efl-1.10.0/src/lib/evas/canvas -I/OE/build/shr-core/tmp-eglibc/work/x86_64-linux/efl-native/2_1.10.0-r0/efl-1.10.0/src/lib/edje -I/OE/build/shr-core/tmp-eglibc/work/x86_64-linux/efl-native/2_1.10.0-r0/efl-1.10.0/src/lib/ecore_audio --gc -o lib/evas/canvas/evas_line.eo.c /OE/build/shr-core/tmp-eglibc/work/x86_64-linux/efl-native/2_1.10.0-r0/efl-1.10.0/src/lib/evas/canvas/evas_line.eo | ||
20 | #ERR<32439>:eolian_gen /OE/build/shr-core/tmp-eglibc/work/x86_64-linux/efl-native/2_1.10.0-r0/efl-1.10.0/src/bin/eolian/main.c:103 _generate_c_file() Couldnt open file lib/evas/canvas/evas_line.eo.c for writing | ||
21 | #Makefile:30738: recipe for target 'lib/evas/canvas/evas_line.eo.c' failed | ||
22 | #make[2]: *** [lib/evas/canvas/evas_line.eo.c] Error 1 | ||
23 | #Makefile:2163: recipe for target 'all-recursive' failed | ||
24 | # autotools-brokensep | ||
25 | B = "${S}" | ||
26 | |||
27 | #ld: error: modules/evas/image_loaders/png/bin_evas_evas_cserve2_slave-evas_image_load_png.o: requires unsupported dynamic reloc R_ARM_MOVW_ABS_NC; recompile with -fPIC | ||
28 | #ld: error: modules/evas/image_loaders/png/bin_evas_evas_cserve2_slave-evas_image_load_png.o: requires unsupported dynamic reloc R_ARM_MOVW_ABS_NC; recompile with -fPIC | ||
29 | CFLAGS += "-fPIC" | ||
diff --git a/meta-efl/recipes-efl/efl/elementary-theme-efenniht/LICENSE b/meta-efl/recipes-efl/efl/elementary-theme-efenniht/LICENSE deleted file mode 100644 index 61bb2f603..000000000 --- a/meta-efl/recipes-efl/efl/elementary-theme-efenniht/LICENSE +++ /dev/null | |||
@@ -1,25 +0,0 @@ | |||
1 | Copyright notice for Enlightenment: | ||
2 | |||
3 | Copyright (C) 2000-2010 Carsten Haitzler and various contributors (see AUTHORS) | ||
4 | |||
5 | All rights reserved. | ||
6 | |||
7 | Redistribution and use in source and binary forms, with or without | ||
8 | modification, are permitted provided that the following conditions are met: | ||
9 | |||
10 | 1. Redistributions of source code must retain the above copyright | ||
11 | notice, this list of conditions and the following disclaimer. | ||
12 | 2. Redistributions in binary form must reproduce the above copyright | ||
13 | notice, this list of conditions and the following disclaimer in the | ||
14 | documentation and/or other materials provided with the distribution. | ||
15 | |||
16 | THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, | ||
17 | INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND | ||
18 | FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE | ||
19 | COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, | ||
20 | INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT | ||
21 | LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, | ||
22 | OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF | ||
23 | LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING | ||
24 | NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, | ||
25 | EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
diff --git a/meta-efl/recipes-efl/efl/elementary-theme-efenniht_svn.bb b/meta-efl/recipes-efl/efl/elementary-theme-efenniht_svn.bb deleted file mode 100644 index 783d12304..000000000 --- a/meta-efl/recipes-efl/efl/elementary-theme-efenniht_svn.bb +++ /dev/null | |||
@@ -1,44 +0,0 @@ | |||
1 | DESCRIPTION = "efenniht elementary theme - Efenniht was devised to be clean \ | ||
2 | and neutral. Its name (which means equinox) comes from the chromatic duality \ | ||
3 | that was decided at the very beginning, with a dark theme (black and orange) \ | ||
4 | and a bright one (white and blue) to be developed so that more people feel \ | ||
5 | comfortable using it. Efenniht uses few animations, discrete contrasts between \ | ||
6 | shades of gray and fine lines (colored) that outline the selected elements." | ||
7 | SECTION = "e/utils" | ||
8 | HOMEPAGE = "http://trac.enlightenment.org/e/wiki/Themes#Efenniht" | ||
9 | DEPENDS = "edje-native" | ||
10 | RSUGGESTS_${PN} = "e-wm-theme-illume-efenniht" | ||
11 | LICENSE = "MIT & BSD" | ||
12 | LIC_FILES_CHKSUM = "file://${WORKDIR}/LICENSE;md5=f523ab5986cc79b52a90d2ac3d5454a2" | ||
13 | |||
14 | SRCREV_THM_REV ?= "${EFL_SRCREV}" | ||
15 | SRCREV_ELM_REV ?= "${EFL_SRCREV}" | ||
16 | |||
17 | SRCREV_FORMAT = "THM_REV" | ||
18 | PV = "0.0+svnr${SRCPV}" | ||
19 | PR = "r1" | ||
20 | |||
21 | inherit e-base allarch | ||
22 | |||
23 | SRCNAME = "efenniht" | ||
24 | SRC_URI = "${E_SVN}/trunk/THEMES;module=${SRCNAME};protocol=http;name=THM_REV" | ||
25 | SRC_URI += "${E_SVN}/trunk/elementary/data;module=themes;protocol=http;name=ELM_REV" | ||
26 | SRC_URI += "file://LICENSE" | ||
27 | S = "${WORKDIR}/${SRCNAME}" | ||
28 | |||
29 | do_compile() { | ||
30 | ${STAGING_BINDIR_NATIVE}/edje_cc -id ${S}/images -id ${WORKDIR}/themes/images ${S}/elm-efenniht.edc -o ${S}/elm-efenniht.edj | ||
31 | } | ||
32 | |||
33 | do_install() { | ||
34 | install -d ${D}${datadir}/elementary/themes/ | ||
35 | install -m 0644 ${S}/elm-efenniht.edj ${D}${datadir}/elementary/themes/ | ||
36 | } | ||
37 | |||
38 | FILES_${PN} = "${datadir}/elementary/themes/" | ||
39 | |||
40 | PNBLACKLIST[elementary-theme-efenniht] ?= "Depends on blacklisted edje-native - the recipe will be removed on 2017-09-01 unless the issue is fixed" | ||
41 | |||
42 | PNBLACKLIST[elementary-theme-efenniht] ?= "Runtime depends on blacklisted elementary-theme-efenniht - the recipe will be removed on 2017-09-01 unless the issue is fixed" | ||
43 | |||
44 | PNBLACKLIST[elementary-theme-efenniht] ?= "Runtime depends on blacklisted elementary-theme-efenniht-dev - the recipe will be removed on 2017-09-01 unless the issue is fixed" | ||
diff --git a/meta-efl/recipes-efl/efl/elementary.inc b/meta-efl/recipes-efl/efl/elementary.inc deleted file mode 100644 index cec67aa72..000000000 --- a/meta-efl/recipes-efl/efl/elementary.inc +++ /dev/null | |||
@@ -1,89 +0,0 @@ | |||
1 | DESCRIPTION = "EFL based widget set for mobile devices" | ||
2 | LICENSE = "LGPLv2.1" | ||
3 | LIC_FILES_CHKSUM = "file://COPYING;md5=a173054a93896e933df53e3382d472c2" | ||
4 | DEPENDS = "eet-native edje-native elementary-native efreet evas ecore edje eet eldbus ethumb eio" | ||
5 | DEPENDS_class-native = "efl-native" | ||
6 | |||
7 | inherit efl gettext | ||
8 | |||
9 | EXTRA_OECONF_append_class-target = "\ | ||
10 | --with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc \ | ||
11 | --with-eet-eet=${STAGING_BINDIR_NATIVE}/eet \ | ||
12 | --with-elementary-codegen=${STAGING_BINDIR_NATIVE}/elementary_codegen \ | ||
13 | --with-elm-prefs-cc=${STAGING_BINDIR_NATIVE}/elm_prefs_cc \ | ||
14 | --with-eolian-gen=${STAGING_BINDIR_NATIVE}/eolian_gen \ | ||
15 | --with-eolian-cxx=${STAGING_BINDIR_NATIVE}/eolian_cxx \ | ||
16 | " | ||
17 | |||
18 | BBCLASSEXTEND = "native" | ||
19 | |||
20 | PACKAGECONFIG[eweather] = "--enable-eweather,--disable-eweather,libeweather" | ||
21 | PACKAGECONFIG[ewebkit] = "--with-elementary-web-backend=ewebkit,--with-elementary-web-backend=none,webkit-efl" | ||
22 | # be aware when enabling this for efl-native, we don't provide gcc-native so you need to make | ||
23 | # sure that all your builders have g++ which supports -std=gnu++11 | ||
24 | PACKAGECONFIG[c++11] = "--enable-cxx-bindings,--disable-cxx-bindings" | ||
25 | |||
26 | do_configure_prepend() { | ||
27 | # prefix returned eolian paths with STAGING_DIR_HOST | ||
28 | sed -i 's%^\(DEPS_EOLIAN_FLAGS=`.*\)`$%\1 | sed "s#-I\\${prefix}#-I\\${STAGING_DIR_HOST}\\${prefix}#g"`%g' ${S}/configure.ac | ||
29 | } | ||
30 | |||
31 | do_compile_append_class-target() { | ||
32 | sed -i -e s:${STAGING_DIR_TARGET}::g \ | ||
33 | -e s:/${TARGET_SYS}::g \ | ||
34 | elementary.pc | ||
35 | } | ||
36 | |||
37 | PACKAGES += "${PN}-configs ${PN}-accessibility" | ||
38 | |||
39 | RDEPENDS_${PN}_class-native = "" | ||
40 | |||
41 | RDEPENDS_${PN} = "\ | ||
42 | ${PN}-themes \ | ||
43 | ${PN}-configs \ | ||
44 | " | ||
45 | RSUGGESTS_${PN} = "${PN}-tests ${PN}-accessibility" | ||
46 | |||
47 | FILES_${PN} += "\ | ||
48 | ${libdir}/edje/modules/elm \ | ||
49 | ${libdir}/elementary/modules/datetime_input_ctxpopup/*/module.so \ | ||
50 | ${libdir}/elementary/modules/prefs/*/module.so \ | ||
51 | ${libdir}/elementary/modules/prefs/*/*.edj \ | ||
52 | " | ||
53 | |||
54 | FILES_${PN}-dev += "\ | ||
55 | ${bindir}/elm_prefs_cc \ | ||
56 | ${libdir}/elementary/modules/*/*/module.la \ | ||
57 | ${libdir}/cmake \ | ||
58 | " | ||
59 | |||
60 | FILES_${PN}-themes = "\ | ||
61 | ${datadir}/elementary/themes \ | ||
62 | " | ||
63 | |||
64 | FILES_${PN}-configs = "\ | ||
65 | ${datadir}/elementary/config \ | ||
66 | " | ||
67 | |||
68 | FILES_${PN}-dbg += "\ | ||
69 | ${libdir}/elementary/modules/*/*/.debug \ | ||
70 | ${libdir}/edje/modules/elm/*/.debug \ | ||
71 | " | ||
72 | |||
73 | FILES_${PN}-tests = "\ | ||
74 | ${bindir}/elementary* \ | ||
75 | ${datadir}/elementary/images \ | ||
76 | ${datadir}/elementary/objects \ | ||
77 | ${datadir}/elementary/examples \ | ||
78 | ${datadir}/applications/* \ | ||
79 | ${datadir}/icons/* \ | ||
80 | ${libdir}/elementary/modules/test_entry/* \ | ||
81 | ${libdir}/elementary/modules/test_map/* \ | ||
82 | " | ||
83 | |||
84 | FILES_${PN}-accessibility = "\ | ||
85 | ${libdir}/elementary/modules/access_output/* \ | ||
86 | " | ||
87 | |||
88 | # Some upgrade path tweaking, as in evas | ||
89 | AUTO_LIBNAME_PKGS = "" | ||
diff --git a/meta-efl/recipes-efl/efl/elementary/0001-Makefile-Use-elementary_codegen-defined-in-configure.patch b/meta-efl/recipes-efl/efl/elementary/0001-Makefile-Use-elementary_codegen-defined-in-configure.patch deleted file mode 100644 index 9524c70d7..000000000 --- a/meta-efl/recipes-efl/efl/elementary/0001-Makefile-Use-elementary_codegen-defined-in-configure.patch +++ /dev/null | |||
@@ -1,29 +0,0 @@ | |||
1 | From 75d104d105aa03dd9d446fa7d84fa95e0f566cf9 Mon Sep 17 00:00:00 2001 | ||
2 | From: Martin Jansa <Martin.Jansa@gmail.com> | ||
3 | Date: Sat, 11 Jan 2014 12:55:59 +0100 | ||
4 | Subject: [PATCH] Makefile: Use elementary_codegen defined in configure | ||
5 | |||
6 | * using binaries from top_buildir doesn't work when cross-compiling elementary | ||
7 | where we need to pass native binaries in configure params | ||
8 | |||
9 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | ||
10 | --- | ||
11 | src/examples/Makefile.am | 2 +- | ||
12 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
13 | |||
14 | diff --git a/src/examples/Makefile.am b/src/examples/Makefile.am | ||
15 | index fc35c75..1e10b0b 100644 | ||
16 | --- a/src/examples/Makefile.am | ||
17 | +++ b/src/examples/Makefile.am | ||
18 | @@ -29,7 +29,7 @@ LDADD = \ | ||
19 | @ELEMENTARY_X_LIBS@ \ | ||
20 | $(top_builddir)/src/lib/libelementary.la | ||
21 | |||
22 | -ELEMENTARY_CODEGEN = $(top_builddir)/src/bin/@ELEMENTARY_CODEGEN_PRG@ | ||
23 | +ELEMENTARY_CODEGEN = @elementary_codegen@ | ||
24 | ELEMENTARY_CODEGEN_FLAGS = --prefix=codegen_example | ||
25 | |||
26 | SRCS = \ | ||
27 | -- | ||
28 | 1.9.0 | ||
29 | |||
diff --git a/meta-efl/recipes-efl/efl/elementary_1.15.1.bb b/meta-efl/recipes-efl/efl/elementary_1.15.1.bb deleted file mode 100644 index 40dd8ad27..000000000 --- a/meta-efl/recipes-efl/efl/elementary_1.15.1.bb +++ /dev/null | |||
@@ -1,18 +0,0 @@ | |||
1 | require ${BPN}.inc | ||
2 | |||
3 | SRC_URI = "\ | ||
4 | ${E_RELEASES}/libs/${SRCNAME}/${SRCNAME}-${SRCVER}.tar.gz \ | ||
5 | " | ||
6 | |||
7 | # only for target, because configure doesn't default to sane default when | ||
8 | # these paths aren't passed in -native build | ||
9 | SRC_URI_append_class-target = " file://0001-Makefile-Use-elementary_codegen-defined-in-configure.patch" | ||
10 | |||
11 | SRC_URI[md5sum] = "bde4d85fa10ee8a7c0aeb74e69d7cd06" | ||
12 | SRC_URI[sha256sum] = "ae5540c2103fcdc69fd7469277ce25a8a00a0f701fc2c20771dc0108401e53a0" | ||
13 | |||
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 | ||
16 | B = "${S}" | ||
17 | |||
18 | PNBLACKLIST[elementary] ?= "Fails to build with RSS http://errors.yoctoproject.org/Errors/Details/130584/ - the recipe will be removed on 2017-09-01 unless the issue is fixed" | ||
diff --git a/meta-efl/recipes-efl/efl/emotion-generic-players.inc b/meta-efl/recipes-efl/efl/emotion-generic-players.inc deleted file mode 100644 index 4ab89ae32..000000000 --- a/meta-efl/recipes-efl/efl/emotion-generic-players.inc +++ /dev/null | |||
@@ -1,14 +0,0 @@ | |||
1 | DESCRIPTION = "Emotion generic players" | ||
2 | LICENSE = "GPLv2" | ||
3 | LIC_FILES_CHKSUM = "file://COPYING;md5=a0f11eedf8706bf6d4d6639fb67eb8ae" | ||
4 | |||
5 | DEPENDS = "emotion" | ||
6 | |||
7 | inherit efl | ||
8 | |||
9 | SRCNAME = "emotion_generic_players" | ||
10 | |||
11 | # creates empty packages until you get vlc-2 and enable it here | ||
12 | PACKAGECONFIG ?= "" | ||
13 | # needs eina and ecore from efl and vlc-2 (currently we have 1.11) | ||
14 | PACKAGECONFIG[vlc] = "--with-vlc,--without-vlc,vlc efl" | ||
diff --git a/meta-efl/recipes-efl/efl/emotion-generic-players_1.15.0.bb b/meta-efl/recipes-efl/efl/emotion-generic-players_1.15.0.bb deleted file mode 100644 index ffdd26982..000000000 --- a/meta-efl/recipes-efl/efl/emotion-generic-players_1.15.0.bb +++ /dev/null | |||
@@ -1,14 +0,0 @@ | |||
1 | require ${BPN}.inc | ||
2 | |||
3 | SRC_URI = "\ | ||
4 | ${E_RELEASES}/libs/${SRCNAME}/${SRCNAME}-${SRCVER}.tar.gz \ | ||
5 | " | ||
6 | |||
7 | SRC_URI[md5sum] = "68627c1aabf5b7fe084299adcc0b73c1" | ||
8 | SRC_URI[sha256sum] = "10bad633480a691585b0ba470c573b14da0a010008d9d59d0792cea8c621d423" | ||
9 | |||
10 | PNBLACKLIST[emotion-generic-players] ?= "Depends on blacklisted emotion - the recipe will be removed on 2017-09-01 unless the issue is fixed" | ||
11 | |||
12 | PNBLACKLIST[emotion-generic-players] ?= "Runtime depends on blacklisted emotion-generic-players - the recipe will be removed on 2017-09-01 unless the issue is fixed" | ||
13 | |||
14 | PNBLACKLIST[emotion-generic-players] ?= "Runtime depends on blacklisted emotion-generic-players-dev - the recipe will be removed on 2017-09-01 unless the issue is fixed" | ||
diff --git a/meta-efl/recipes-efl/efl/engrave_svn.bb b/meta-efl/recipes-efl/efl/engrave_svn.bb deleted file mode 100644 index f950938c9..000000000 --- a/meta-efl/recipes-efl/efl/engrave_svn.bb +++ /dev/null | |||
@@ -1,15 +0,0 @@ | |||
1 | SUMMARY = "Engrave is an Edje Editing Library" | ||
2 | LICENSE = "MIT" | ||
3 | LIC_FILES_CHKSUM = "file://COPYING;md5=edf2d968b9eb026bfa82cccbd0e6f9f5" | ||
4 | # also requires yacc and lex on host | ||
5 | DEPENDS = "evas ecore flex" | ||
6 | PV = "0.0.0+svnr${SRCPV}" | ||
7 | SRCREV = "${EFL_SRCREV}" | ||
8 | |||
9 | inherit efl autotools-brokensep | ||
10 | SRC_URI = "${E_SVN}/OLD;module=${SRCNAME};protocol=http;scmdata=keep" | ||
11 | S = "${WORKDIR}/${SRCNAME}" | ||
12 | |||
13 | # engrave.l:5:35: fatal error: libengrave_la-engrave.h: No such file or directory | ||
14 | # http://errors.yoctoproject.org/Errors/Details/56597/ | ||
15 | PNBLACKLIST[engrave] ?= "BROKEN: fails to build with latest oe-core - the recipe will be removed on 2017-09-01 unless the issue is fixed" | ||
diff --git a/meta-efl/recipes-efl/efl/entrance/0001-pam-use-common-auth-instead-of-system-auth.patch b/meta-efl/recipes-efl/efl/entrance/0001-pam-use-common-auth-instead-of-system-auth.patch deleted file mode 100644 index a82d1ed3c..000000000 --- a/meta-efl/recipes-efl/efl/entrance/0001-pam-use-common-auth-instead-of-system-auth.patch +++ /dev/null | |||
@@ -1,26 +0,0 @@ | |||
1 | From 14396c52a2556b1ab778a310a318ec19c2829735 Mon Sep 17 00:00:00 2001 | ||
2 | From: Martin Jansa <Martin.Jansa@gmail.com> | ||
3 | Date: Thu, 24 Nov 2011 13:25:33 +0100 | ||
4 | Subject: [PATCH] pam: use common-auth instead of system-auth | ||
5 | |||
6 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | ||
7 | --- | ||
8 | PROTO/entrance/data/entrance | 8 ++++---- | ||
9 | 1 files changed, 4 insertions(+), 4 deletions(-) | ||
10 | |||
11 | diff --git a/data/entrance b/data/entrance | ||
12 | index 872c83d..2b98c3a 100644 | ||
13 | --- a/data/entrance | ||
14 | +++ b/data/entrance | ||
15 | @@ -1,4 +1,4 @@ | ||
16 | -auth include system-auth | ||
17 | -account include system-auth | ||
18 | -password include system-auth | ||
19 | -session include system-auth | ||
20 | +auth include common-auth | ||
21 | +account include common-account | ||
22 | +password include common-password | ||
23 | +session include common-session | ||
24 | -- | ||
25 | 1.7.8.6 | ||
26 | |||
diff --git a/meta-efl/recipes-efl/efl/entrance/entrance.service b/meta-efl/recipes-efl/efl/entrance/entrance.service deleted file mode 100644 index 482868695..000000000 --- a/meta-efl/recipes-efl/efl/entrance/entrance.service +++ /dev/null | |||
@@ -1,8 +0,0 @@ | |||
1 | [Unit] | ||
2 | Description=Login manager for Enlightenment | ||
3 | |||
4 | [Service] | ||
5 | ExecStart=/usr/sbin/entrance | ||
6 | |||
7 | [Install] | ||
8 | Alias=display-manager.service | ||
diff --git a/meta-efl/recipes-efl/efl/entrance_svn.bb b/meta-efl/recipes-efl/efl/entrance_svn.bb deleted file mode 100644 index b1e580dbe..000000000 --- a/meta-efl/recipes-efl/efl/entrance_svn.bb +++ /dev/null | |||
@@ -1,43 +0,0 @@ | |||
1 | SUMMARY = "Login manager for Enlightenment" | ||
2 | DEPENDS = "efreet eina eet ecore elementary" | ||
3 | LICENSE = "GPLv3+" | ||
4 | LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" | ||
5 | SECTION = "e/apps" | ||
6 | |||
7 | inherit e gettext systemd | ||
8 | SRC_URI = "${E_SVN}/trunk/PROTO;module=${SRCNAME};protocol=http;scmdata=keep \ | ||
9 | file://0001-pam-use-common-auth-instead-of-system-auth.patch \ | ||
10 | file://entrance.service \ | ||
11 | " | ||
12 | S = "${WORKDIR}/${SRCNAME}" | ||
13 | |||
14 | PNBLACKLIST[entrance] ?= "broken: switch to https://git.enlightenment.org/misc/entrance.git and fix 0.0.4+svnr82070-r7/entrance/data/themes/old/default.edc:678. invalid state name: 'defaault'. "default" state must always be first. - the recipe will be removed on 2017-09-01 unless the issue is fixed" | ||
15 | |||
16 | PACKAGECONFIG ??= "" | ||
17 | PACKAGECONFIG[consolekit] = "--enable-consolekit,--disable-consolekit,consolekit" | ||
18 | |||
19 | EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '', '--disable-pam', d)}" | ||
20 | |||
21 | PR = "r7" | ||
22 | PV = "0.0.4+svnr${SRCPV}" | ||
23 | SRCREV = "${EFL_SRCREV}" | ||
24 | |||
25 | RDEPENDS_${PN} += "${PN}-themes sessreg xauth" | ||
26 | CONFFILES_${PN} += "${sysconfdir}/entrance.conf" | ||
27 | |||
28 | RCONFLICTS_${PN} += "xserver-nodm-init" | ||
29 | RREPLACES_${PN} += "xserver-nodm-init" | ||
30 | |||
31 | RCONFLICTS_${PN} += "xserver-nodm-init-systemd" | ||
32 | RREPLACES_${PN} += "xserver-nodm-init-systemd" | ||
33 | |||
34 | RPROVIDES_${PN} += "${PN}-systemd" | ||
35 | RREPLACES_${PN} += "${PN}-systemd" | ||
36 | RCONFLICTS_${PN} += "${PN}-systemd" | ||
37 | |||
38 | SYSTEMD_SERVICE_${PN} = "entrance.service" | ||
39 | |||
40 | do_install_append() { | ||
41 | install -d ${D}${systemd_unitdir}/system | ||
42 | install -m 0644 ${WORKDIR}/entrance.service ${D}${systemd_unitdir}/system | ||
43 | } | ||
diff --git a/meta-efl/recipes-efl/efl/epdf/0001-remove-antialias-functions-poppler-has-dropped-them-.patch b/meta-efl/recipes-efl/efl/epdf/0001-remove-antialias-functions-poppler-has-dropped-them-.patch deleted file mode 100644 index 728ffa6e3..000000000 --- a/meta-efl/recipes-efl/efl/epdf/0001-remove-antialias-functions-poppler-has-dropped-them-.patch +++ /dev/null | |||
@@ -1,132 +0,0 @@ | |||
1 | From 6691ac5fcbac0e766d4410ae649a13957ae85289 Mon Sep 17 00:00:00 2001 | ||
2 | From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> | ||
3 | Date: Thu, 22 Oct 2015 16:27:52 +0200 | ||
4 | Subject: [PATCH 1/2] remove antialias functions - poppler has dropped them in | ||
5 | the API | ||
6 | MIME-Version: 1.0 | ||
7 | Content-Type: text/plain; charset=UTF-8 | ||
8 | Content-Transfer-Encoding: 8bit | ||
9 | |||
10 | The functions removed were not used. | ||
11 | |||
12 | Upstream-Status: pending | ||
13 | |||
14 | Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> | ||
15 | --- | ||
16 | src/lib/epdf_main.h | 45 ----------------------------------- | ||
17 | src/lib/mupdf/epdf_mupdf_main.c | 18 -------------- | ||
18 | src/lib/poppler/epdf_poppler_main.cpp | 21 ---------------- | ||
19 | 3 files changed, 84 deletions(-) | ||
20 | |||
21 | diff --git a/src/lib/epdf_main.h b/src/lib/epdf_main.h | ||
22 | index 54a57ca..0a79bad 100644 | ||
23 | --- a/src/lib/epdf_main.h | ||
24 | +++ b/src/lib/epdf_main.h | ||
25 | @@ -29,49 +29,4 @@ EAPI int epdf_shutdown(); | ||
26 | */ | ||
27 | EAPI const char *epdf_backend_version_get (void); | ||
28 | |||
29 | -/** | ||
30 | - * @brief Return the state of fonts antialiasing in Poppler | ||
31 | - * | ||
32 | - * @return EINA_TRUE if fonts antialiasing enabled, EINA_FALSE otherwise. | ||
33 | - * | ||
34 | - * Return EINA_TRUE if the state of fonts antialiasing is enabled in | ||
35 | - * Poppler, EINA_FALSE otherwise. | ||
36 | - * | ||
37 | - * @ingroup Epdf_Main | ||
38 | - */ | ||
39 | -EAPI Eina_Bool epdf_fonts_antialias_get (void); | ||
40 | - | ||
41 | -/** | ||
42 | - * @brief Sets fonts antialiasing mode in Poppler | ||
43 | - * | ||
44 | - * @param on EINA_TRUE to enable fonts antialiasing, EINA_FALSE to disable | ||
45 | - * | ||
46 | - * Set @p on to EINA_TRUE to enable fonts antialiasing in Poppler, | ||
47 | - * EINA_FALSE to disable it. | ||
48 | - */ | ||
49 | -EAPI void epdf_fonts_antialias_set (Eina_Bool on); | ||
50 | - | ||
51 | -/** | ||
52 | - * @brief Return the state of lines antialiasing in Poppler | ||
53 | - * | ||
54 | - * @return EINA_TRUE if lines antialiasing enabled, EINA_FALSE otherwise. | ||
55 | - * | ||
56 | - * Return EINA_TRUE if the state of lines antialiasing is enabled in | ||
57 | - * Poppler, EINA_FALSE otherwise. | ||
58 | - * | ||
59 | - * @ingroup Epdf_Main | ||
60 | - */ | ||
61 | -EAPI Eina_Bool epdf_lines_antialias_get (void); | ||
62 | - | ||
63 | -/** | ||
64 | - * @brief Sets lines antialiasing mode in Poppler | ||
65 | - * | ||
66 | - * @param on EINA_TRUE to enable lines antialiasing, EINA_FALSE to disable | ||
67 | - * | ||
68 | - * Set @p on to EINA_TRUE to enable lines antialiasing in Poppler, | ||
69 | - * EINA_FALSE to disable it. | ||
70 | - */ | ||
71 | -EAPI void epdf_lines_antialias_set (Eina_Bool on); | ||
72 | - | ||
73 | - | ||
74 | #endif /* __EPDF_MAIN_H__ */ | ||
75 | diff --git a/src/lib/mupdf/epdf_mupdf_main.c b/src/lib/mupdf/epdf_mupdf_main.c | ||
76 | index 17bb830..27c6de2 100644 | ||
77 | --- a/src/lib/mupdf/epdf_mupdf_main.c | ||
78 | +++ b/src/lib/mupdf/epdf_mupdf_main.c | ||
79 | @@ -37,21 +37,3 @@ epdf_backend_version_get (void) | ||
80 | { | ||
81 | return "0.5"; | ||
82 | } | ||
83 | - | ||
84 | -Eina_Bool epdf_fonts_antialias_get(void) | ||
85 | -{ | ||
86 | - return EINA_TRUE; | ||
87 | -} | ||
88 | - | ||
89 | -void epdf_fonts_antialias_set(Eina_Bool on) | ||
90 | -{ | ||
91 | -} | ||
92 | - | ||
93 | -Eina_Bool epdf_lines_antialias_get(void) | ||
94 | -{ | ||
95 | - return EINA_TRUE; | ||
96 | -} | ||
97 | - | ||
98 | -void epdf_lines_antialias_set(Eina_Bool on) | ||
99 | -{ | ||
100 | -} | ||
101 | diff --git a/src/lib/poppler/epdf_poppler_main.cpp b/src/lib/poppler/epdf_poppler_main.cpp | ||
102 | index 9841987..9efdbe8 100644 | ||
103 | --- a/src/lib/poppler/epdf_poppler_main.cpp | ||
104 | +++ b/src/lib/poppler/epdf_poppler_main.cpp | ||
105 | @@ -46,24 +46,3 @@ epdf_backend_version_get (void) | ||
106 | { | ||
107 | return POPPLER_VERSION; | ||
108 | } | ||
109 | - | ||
110 | -Eina_Bool epdf_fonts_antialias_get (void) | ||
111 | -{ | ||
112 | - return globalParams->getAntialias(); | ||
113 | -} | ||
114 | - | ||
115 | -void epdf_fonts_antialias_set (Eina_Bool on) | ||
116 | -{ | ||
117 | - /* Nice API */ | ||
118 | - globalParams->setAntialias((char*)(on ? "yes" : "no")); | ||
119 | -} | ||
120 | - | ||
121 | -Eina_Bool epdf_lines_antialias_get (void) | ||
122 | -{ | ||
123 | - return globalParams->getVectorAntialias(); | ||
124 | -} | ||
125 | - | ||
126 | -void epdf_lines_antialias_set (Eina_Bool on) | ||
127 | -{ | ||
128 | - globalParams->setVectorAntialias((char*)(on ? "yes" : "no")); | ||
129 | -} | ||
130 | -- | ||
131 | 2.1.0 | ||
132 | |||
diff --git a/meta-efl/recipes-efl/efl/epdf/0002-epdf_poppler_postscript.cpp-fix-build-for-poppler-AP.patch b/meta-efl/recipes-efl/efl/epdf/0002-epdf_poppler_postscript.cpp-fix-build-for-poppler-AP.patch deleted file mode 100644 index c9adaa731..000000000 --- a/meta-efl/recipes-efl/efl/epdf/0002-epdf_poppler_postscript.cpp-fix-build-for-poppler-AP.patch +++ /dev/null | |||
@@ -1,45 +0,0 @@ | |||
1 | From a84c16fdc606f22b993f870b1cea56dd060a35e6 Mon Sep 17 00:00:00 2001 | ||
2 | From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> | ||
3 | Date: Thu, 22 Oct 2015 16:55:30 +0200 | ||
4 | Subject: [PATCH 2/2] epdf_poppler_postscript.cpp: fix build for poppler API | ||
5 | change | ||
6 | MIME-Version: 1.0 | ||
7 | Content-Type: text/plain; charset=UTF-8 | ||
8 | Content-Transfer-Encoding: 8bit | ||
9 | |||
10 | Poppler API was changed in [1]. The patch not only shows the change but also | ||
11 | inspires how to fix. | ||
12 | |||
13 | [1] http://cgit.freedesktop.org/poppler/poppler/commit/?id=9caf7525409d699c16896653528486451123b485 | ||
14 | |||
15 | Upstream-Status: Pending | ||
16 | |||
17 | Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> | ||
18 | --- | ||
19 | src/lib/poppler/epdf_poppler_postscript.cpp | 7 +++++-- | ||
20 | 1 file changed, 5 insertions(+), 2 deletions(-) | ||
21 | |||
22 | diff --git a/src/lib/poppler/epdf_poppler_postscript.cpp b/src/lib/poppler/epdf_poppler_postscript.cpp | ||
23 | index 0c2836b..656193b 100644 | ||
24 | --- a/src/lib/poppler/epdf_poppler_postscript.cpp | ||
25 | +++ b/src/lib/poppler/epdf_poppler_postscript.cpp | ||
26 | @@ -82,11 +82,14 @@ epdf_postscript_print (const Epdf_Postscript *postscript) | ||
27 | |||
28 | // FIXME: fix postscript title | ||
29 | #ifdef HAVE_POPPLER_0_20 | ||
30 | + std::vector<int> pages; | ||
31 | + for (int i = postscript->first_page; i <= postscript->last_page; ++i) { | ||
32 | + pages.push_back(i); | ||
33 | + } | ||
34 | PSOutputDev ps_dev(postscript->filename, | ||
35 | postscript->pdfdoc, | ||
36 | (char *)"PS title", | ||
37 | - postscript->first_page, | ||
38 | - postscript->last_page, | ||
39 | + pages, | ||
40 | psModePS, | ||
41 | (int)postscript->width, | ||
42 | (int)postscript->height, | ||
43 | -- | ||
44 | 2.1.0 | ||
45 | |||
diff --git a/meta-efl/recipes-efl/efl/epdf_svn.bb b/meta-efl/recipes-efl/efl/epdf_svn.bb deleted file mode 100644 index d664bad78..000000000 --- a/meta-efl/recipes-efl/efl/epdf_svn.bb +++ /dev/null | |||
@@ -1,35 +0,0 @@ | |||
1 | SUMMARY = "Epdf is the glue between EFL and libpoppler" | ||
2 | |||
3 | DEPENDS = "poppler evas ecore" | ||
4 | PV = "0.1.0+svnr${SRCPV}" | ||
5 | SRCREV = "${EFL_SRCREV}" | ||
6 | |||
7 | inherit efl | ||
8 | |||
9 | LICENSE = "GPLv2 & LGPLv3" | ||
10 | LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \ | ||
11 | file://COPYING.LESSER;md5=6a6a8e020838b23406c81b19c1d46df6 \ | ||
12 | " | ||
13 | |||
14 | SRC_URI = " \ | ||
15 | ${E_SVN}/trunk/PROTO;module=${SRCNAME};protocol=http;scmdata=keep \ | ||
16 | file://0001-remove-antialias-functions-poppler-has-dropped-them-.patch \ | ||
17 | file://0002-epdf_poppler_postscript.cpp-fix-build-for-poppler-AP.patch \ | ||
18 | " | ||
19 | S = "${WORKDIR}/${SRCNAME}" | ||
20 | |||
21 | EXTRA_OECONF = "\ | ||
22 | --enable-poppler \ | ||
23 | --disable-mupdf \ | ||
24 | " | ||
25 | |||
26 | # Some upgrade path tweaking, as in evas | ||
27 | AUTO_LIBNAME_PKGS = "" | ||
28 | |||
29 | PNBLACKLIST[epdf] ?= "Depends on blacklisted ecore - the recipe will be removed on 2017-09-01 unless the issue is fixed" | ||
30 | |||
31 | PNBLACKLIST[epdf] ?= "Depends on blacklisted evas - the recipe will be removed on 2017-09-01 unless the issue is fixed" | ||
32 | |||
33 | PNBLACKLIST[epdf] ?= "Runtime depends on blacklisted epdf-dev - the recipe will be removed on 2017-09-01 unless the issue is fixed" | ||
34 | |||
35 | PNBLACKLIST[epdf] ?= "Runtime depends on blacklisted epdf - the recipe will be removed on 2017-09-01 unless the issue is fixed" | ||
diff --git a/meta-efl/recipes-efl/efl/evas-generic-loaders.inc b/meta-efl/recipes-efl/efl/evas-generic-loaders.inc deleted file mode 100644 index d277c1167..000000000 --- a/meta-efl/recipes-efl/efl/evas-generic-loaders.inc +++ /dev/null | |||
@@ -1,73 +0,0 @@ | |||
1 | DESCRIPTION = "Evas generic loaders" | ||
2 | LICENSE = "GPLv2" | ||
3 | LIC_FILES_CHKSUM = "file://COPYING;md5=a87563ed30add2b0e3460272d3138a00" | ||
4 | DEPENDS = "eina librsvg cairo" | ||
5 | |||
6 | inherit efl | ||
7 | |||
8 | SRCNAME = "evas_generic_loaders" | ||
9 | |||
10 | EXTRA_OECONF = " \ | ||
11 | --enable-svg \ | ||
12 | --disable-gstreamer \ | ||
13 | --disable-libraw \ | ||
14 | --disable-spectre \ | ||
15 | " | ||
16 | |||
17 | PACKAGECONFIG ??= "" | ||
18 | PACKAGECONFIG[poppler] = "--enable-poppler,--disable-poppler,poppler" | ||
19 | |||
20 | PACKAGESPLITFUNCS_prepend = "split_evas_loader_packages " | ||
21 | |||
22 | python split_evas_loader_packages () { | ||
23 | bb.note( "splitting packages for evas generic loaders" ) | ||
24 | basedir = d.expand( '${libdir}/evas/utils') | ||
25 | |||
26 | do_split_packages(d, basedir, 'evas_image_loader\.(.*)$', | ||
27 | output_pattern = "evas-generic-loader-%s", | ||
28 | description = 'Evas generic loaders - module %s', | ||
29 | allow_dirs=True, recursive=False, extra_depends="" ) | ||
30 | |||
31 | do_split_packages(d, basedir, 'evas_generic_pdf_loader\.(.*)$', | ||
32 | output_pattern = "evas-generic-pdf-loader-%s", | ||
33 | description = 'Evas generic pdf loaders - module %s', | ||
34 | allow_dirs=True, recursive=False, extra_depends="" ) | ||
35 | } | ||
36 | |||
37 | # add symlinks for different format (it doesn't make much sense to package them in separate packages) | ||
38 | FILES_evas-generic-loader-xcf += " \ | ||
39 | ${libdir}/evas/utils/evas_image_loader.xcf.gz \ | ||
40 | " | ||
41 | FILES_evas-generic-loader-svg += " \ | ||
42 | ${libdir}/evas/utils/evas_image_loader.svg.gz \ | ||
43 | ${libdir}/evas/utils/evas_image_loader.svgz \ | ||
44 | " | ||
45 | FILES_evas-generic-loader-pdf += " \ | ||
46 | ${libdir}/evas/utils/evas_image_loader.doc \ | ||
47 | ${libdir}/evas/utils/evas_image_loader.docx \ | ||
48 | ${libdir}/evas/utils/evas_image_loader.odp \ | ||
49 | ${libdir}/evas/utils/evas_image_loader.ods \ | ||
50 | ${libdir}/evas/utils/evas_image_loader.odt \ | ||
51 | ${libdir}/evas/utils/evas_image_loader.ppt \ | ||
52 | ${libdir}/evas/utils/evas_image_loader.pptx \ | ||
53 | ${libdir}/evas/utils/evas_image_loader.rtf \ | ||
54 | ${libdir}/evas/utils/evas_image_loader.xls \ | ||
55 | ${libdir}/evas/utils/evas_image_loader.xlsx \ | ||
56 | " | ||
57 | FILES_evas-generic-pdf-loader-libreoffice += " \ | ||
58 | ${libdir}/evas/utils/evas_generic_pdf_loader.doc \ | ||
59 | ${libdir}/evas/utils/evas_generic_pdf_loader.docx \ | ||
60 | ${libdir}/evas/utils/evas_generic_pdf_loader.odp \ | ||
61 | ${libdir}/evas/utils/evas_generic_pdf_loader.ods \ | ||
62 | ${libdir}/evas/utils/evas_generic_pdf_loader.odt \ | ||
63 | ${libdir}/evas/utils/evas_generic_pdf_loader.ppt \ | ||
64 | ${libdir}/evas/utils/evas_generic_pdf_loader.pptx \ | ||
65 | ${libdir}/evas/utils/evas_generic_pdf_loader.rtf \ | ||
66 | ${libdir}/evas/utils/evas_generic_pdf_loader.xls \ | ||
67 | ${libdir}/evas/utils/evas_generic_pdf_loader.xlsx \ | ||
68 | " | ||
69 | |||
70 | FILES_${PN}-dbg += "${libdir}/evas/utils/.debug" | ||
71 | |||
72 | PACKAGES += "evas-generic-loader-svg" | ||
73 | PACKAGES_DYNAMIC += "^evas-generic-loader-.* ^evas-generic-pdf-loader-.*" | ||
diff --git a/meta-efl/recipes-efl/efl/evas-generic-loaders_1.15.0.bb b/meta-efl/recipes-efl/efl/evas-generic-loaders_1.15.0.bb deleted file mode 100644 index ecdbcee1f..000000000 --- a/meta-efl/recipes-efl/efl/evas-generic-loaders_1.15.0.bb +++ /dev/null | |||
@@ -1,14 +0,0 @@ | |||
1 | require ${BPN}.inc | ||
2 | |||
3 | SRC_URI = "\ | ||
4 | ${E_RELEASES}/libs/${SRCNAME}/${SRCNAME}-${SRCVER}.tar.gz \ | ||
5 | " | ||
6 | |||
7 | SRC_URI[md5sum] = "3ca8443b8cbf177845595c5e02fbc49c" | ||
8 | SRC_URI[sha256sum] = "caa22c9ba1ae9629c16a3fe809ea927f60b8f0d80cdb7f145159b997b9ae2bcd" | ||
9 | |||
10 | PNBLACKLIST[evas-generic-loaders] ?= "Depends on blacklisted eina - the recipe will be removed on 2017-09-01 unless the issue is fixed" | ||
11 | |||
12 | PNBLACKLIST[evas-generic-loaders] ?= "Runtime depends on blacklisted evas-generic-loaders - the recipe will be removed on 2017-09-01 unless the issue is fixed" | ||
13 | |||
14 | PNBLACKLIST[evas-generic-loaders] ?= "Runtime depends on blacklisted evas-generic-loaders-dev - the recipe will be removed on 2017-09-01 unless the issue is fixed" | ||
diff --git a/meta-efl/recipes-efl/efl/expedite.inc b/meta-efl/recipes-efl/efl/expedite.inc deleted file mode 100644 index 60e85974c..000000000 --- a/meta-efl/recipes-efl/efl/expedite.inc +++ /dev/null | |||
@@ -1,25 +0,0 @@ | |||
1 | DESCRIPTION = "Expedite is a comprehensive benchmarking suite for Evas" | ||
2 | DEPENDS = "eet evas libsdl" | ||
3 | LICENSE = "MIT & BSD" | ||
4 | LIC_FILES_CHKSUM = "file://COPYING;md5=d70bc65d46237e4ef386beebe7d0fe5b" | ||
5 | |||
6 | INC_PR = "r0" | ||
7 | |||
8 | inherit e | ||
9 | |||
10 | EXTRA_OECONF = "\ | ||
11 | --x-includes=${STAGING_INCDIR}/X11 \ | ||
12 | --x-libraries=${STAGING_LIBDIR} \ | ||
13 | --enable-simple-x11 \ | ||
14 | \ | ||
15 | --enable-software-x11 \ | ||
16 | --enable-xrender-x11 \ | ||
17 | --enable-software-16-x11 \ | ||
18 | --enable-opengl-x11 \ | ||
19 | --enable-fb \ | ||
20 | --disable-software-ddraw \ | ||
21 | --disable-direct3d \ | ||
22 | " | ||
23 | |||
24 | FILES_${PN} += "${datadir}" | ||
25 | RDEPENDS_${PN} = "expedite-themes evas-engine-fb evas-engine-software-generic evas-engine-software-x11 evas-engine-gl-x11 evas-loader-png" | ||
diff --git a/meta-efl/recipes-efl/efl/expedite_1.7.9.bb b/meta-efl/recipes-efl/efl/expedite_1.7.9.bb deleted file mode 100644 index 832cd00a5..000000000 --- a/meta-efl/recipes-efl/efl/expedite_1.7.9.bb +++ /dev/null | |||
@@ -1,28 +0,0 @@ | |||
1 | require ${BPN}.inc | ||
2 | |||
3 | SRC_URI = "\ | ||
4 | ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \ | ||
5 | " | ||
6 | |||
7 | SRC_URI[md5sum] = "954fe8e40fec6a561190ff0fb75b6bdd" | ||
8 | SRC_URI[sha256sum] = "a05be096c911e0d66d4bdc497ebb935a04ad23696de9084aed9959b5172a593e" | ||
9 | |||
10 | PNBLACKLIST[expedite] ?= "Depends on blacklisted eet - the recipe will be removed on 2017-09-01 unless the issue is fixed" | ||
11 | |||
12 | PNBLACKLIST[expedite] ?= "Depends on blacklisted evas - the recipe will be removed on 2017-09-01 unless the issue is fixed" | ||
13 | |||
14 | PNBLACKLIST[expedite] ?= "Runtime depends on blacklisted evas-loader-png - the recipe will be removed on 2017-09-01 unless the issue is fixed" | ||
15 | |||
16 | PNBLACKLIST[expedite] ?= "Runtime depends on blacklisted expedite - the recipe will be removed on 2017-09-01 unless the issue is fixed" | ||
17 | |||
18 | PNBLACKLIST[expedite] ?= "Runtime depends on blacklisted expedite-themes - the recipe will be removed on 2017-09-01 unless the issue is fixed" | ||
19 | |||
20 | PNBLACKLIST[expedite] ?= "Runtime depends on blacklisted evas-engine-gl-x11 - the recipe will be removed on 2017-09-01 unless the issue is fixed" | ||
21 | |||
22 | PNBLACKLIST[expedite] ?= "Runtime depends on blacklisted evas-engine-software-generic - the recipe will be removed on 2017-09-01 unless the issue is fixed" | ||
23 | |||
24 | PNBLACKLIST[expedite] ?= "Runtime depends on blacklisted expedite-dev - the recipe will be removed on 2017-09-01 unless the issue is fixed" | ||
25 | |||
26 | PNBLACKLIST[expedite] ?= "Runtime depends on blacklisted evas-engine-software-x11 - the recipe will be removed on 2017-09-01 unless the issue is fixed" | ||
27 | |||
28 | PNBLACKLIST[expedite] ?= "Runtime depends on blacklisted evas-engine-fb - the recipe will be removed on 2017-09-01 unless the issue is fixed" | ||
diff --git a/meta-efl/recipes-efl/efl/expedite_git.bb b/meta-efl/recipes-efl/efl/expedite_git.bb deleted file mode 100644 index 65c2d4a49..000000000 --- a/meta-efl/recipes-efl/efl/expedite_git.bb +++ /dev/null | |||
@@ -1,31 +0,0 @@ | |||
1 | require ${BPN}.inc | ||
2 | |||
3 | SRCREV = "a5e6af917af52877b378090811cf836c16d0bfbb" | ||
4 | PV = "1.7.99+gitr${SRCPV}" | ||
5 | |||
6 | DEFAULT_PREFERENCE = "-1" | ||
7 | |||
8 | SRC_URI = "\ | ||
9 | git://git.enlightenment.org/tools/${BPN}.git \ | ||
10 | " | ||
11 | S = "${WORKDIR}/${SRCNAME}" | ||
12 | |||
13 | PNBLACKLIST[expedite] ?= "Depends on blacklisted eet - the recipe will be removed on 2017-09-01 unless the issue is fixed" | ||
14 | |||
15 | PNBLACKLIST[expedite] ?= "Depends on blacklisted evas - the recipe will be removed on 2017-09-01 unless the issue is fixed" | ||
16 | |||
17 | PNBLACKLIST[expedite] ?= "Runtime depends on blacklisted evas-loader-png - the recipe will be removed on 2017-09-01 unless the issue is fixed" | ||
18 | |||
19 | PNBLACKLIST[expedite] ?= "Runtime depends on blacklisted expedite - the recipe will be removed on 2017-09-01 unless the issue is fixed" | ||
20 | |||
21 | PNBLACKLIST[expedite] ?= "Runtime depends on blacklisted evas-engine-software-generic - the recipe will be removed on 2017-09-01 unless the issue is fixed" | ||
22 | |||
23 | PNBLACKLIST[expedite] ?= "Runtime depends on blacklisted evas-engine-fb - the recipe will be removed on 2017-09-01 unless the issue is fixed" | ||
24 | |||
25 | PNBLACKLIST[expedite] ?= "Runtime depends on blacklisted evas-engine-software-x11 - the recipe will be removed on 2017-09-01 unless the issue is fixed" | ||
26 | |||
27 | PNBLACKLIST[expedite] ?= "Runtime depends on blacklisted evas-engine-gl-x11 - the recipe will be removed on 2017-09-01 unless the issue is fixed" | ||
28 | |||
29 | PNBLACKLIST[expedite] ?= "Runtime depends on blacklisted expedite-dev - the recipe will be removed on 2017-09-01 unless the issue is fixed" | ||
30 | |||
31 | PNBLACKLIST[expedite] ?= "Runtime depends on blacklisted expedite-themes - the recipe will be removed on 2017-09-01 unless the issue is fixed" | ||
diff --git a/meta-efl/recipes-efl/efl/libeflvala/disable.eina.test.patch b/meta-efl/recipes-efl/efl/libeflvala/disable.eina.test.patch deleted file mode 100644 index 84be133f6..000000000 --- a/meta-efl/recipes-efl/efl/libeflvala/disable.eina.test.patch +++ /dev/null | |||
@@ -1,44 +0,0 @@ | |||
1 | It causes testeina.c build to fail linking to internal eina_.*_{init,shutdown} symbols | ||
2 | as reported in: | ||
3 | http://lists.alioth.debian.org/pipermail/pkg-fso-maint/2010-May/003056.html | ||
4 | |||
5 | Upstream-Status: Pending | ||
6 | |||
7 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | ||
8 | |||
9 | diff -uNr vala/tests/testeina.vala ../../../arm920tt-oe-linux-gnueabi/libeflvala/1_2011.01.13.1+svnr82070-r2/vala/tests/testeina.vala | ||
10 | --- vala/tests/testeina.vala 2014-01-13 16:16:53.984999035 +0100 | ||
11 | +++ ../../../arm920tt-oe-linux-gnueabi/libeflvala/1_2011.01.13.1+svnr82070-r2/vala/tests/testeina.vala 2010-02-26 09:02:06.000000000 +0100 | ||
12 | @@ -153,22 +153,22 @@ | ||
13 | |||
14 | void test_eina_benchmark() | ||
15 | { | ||
16 | - assert( Eina.Module.init() ); | ||
17 | - assert( Eina.List.init() ); | ||
18 | - assert( Eina.Array.init() ); | ||
19 | - assert( Eina.Benchmark.init() ); | ||
20 | - assert( Eina.Mempool.init() ); | ||
21 | +// assert( Eina.Module.init() ); | ||
22 | +// assert( Eina.List.init() ); | ||
23 | +// assert( Eina.Array.init() ); | ||
24 | +// assert( Eina.Benchmark.init() ); | ||
25 | +// assert( Eina.Mempool.init() ); | ||
26 | var b = new Eina.Benchmark( "test", "test"); | ||
27 | assert( b.register( "bogus", spec_one, 0, 100, 5 ) ); | ||
28 | unowned Eina.Array<string> result = b.run(); | ||
29 | assert( result.count_get() == 2 ); | ||
30 | result = null; | ||
31 | b = null; | ||
32 | - assert( Eina.Mempool.shutdown() ); | ||
33 | - assert( Eina.Benchmark.shutdown() ); | ||
34 | - assert( Eina.Array.shutdown() ); | ||
35 | - assert( Eina.List.shutdown() ); | ||
36 | - assert( Eina.Module.shutdown() ); | ||
37 | +// assert( Eina.Mempool.shutdown() ); | ||
38 | +// assert( Eina.Benchmark.shutdown() ); | ||
39 | +// assert( Eina.Array.shutdown() ); | ||
40 | +// assert( Eina.List.shutdown() ); | ||
41 | +// assert( Eina.Module.shutdown() ); | ||
42 | } | ||
43 | |||
44 | //=========================================================================== | ||
diff --git a/meta-efl/recipes-efl/efl/libeflvala_svn.bb b/meta-efl/recipes-efl/efl/libeflvala_svn.bb deleted file mode 100644 index eaf4893f7..000000000 --- a/meta-efl/recipes-efl/efl/libeflvala_svn.bb +++ /dev/null | |||
@@ -1,23 +0,0 @@ | |||
1 | SUMMARY = "Vala meets the Enlightenment Foundation Libraries" | ||
2 | AUTHOR = "Michael 'Mickey' Lauer <mlauer@vanille-media.de>" | ||
3 | LICENSE = "GPLv2" | ||
4 | LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" | ||
5 | SECTION = "devel" | ||
6 | DEPENDS = "vala-native glib-2.0 dbus dbus-glib eina eet evas ecore edje elementary tiff" | ||
7 | PV = "2011.01.13.1+svnr${SRCPV}" | ||
8 | PE = "1" | ||
9 | PR = "r2" | ||
10 | SRCREV = "${EFL_SRCREV}" | ||
11 | SRCNAME = "vala" | ||
12 | |||
13 | inherit e-base autotools-brokensep pkgconfig vala | ||
14 | |||
15 | SRC_URI = "${E_SVN}/trunk/BINDINGS;module=${SRCNAME};protocol=http \ | ||
16 | file://disable.eina.test.patch \ | ||
17 | " | ||
18 | S = "${WORKDIR}/${SRCNAME}" | ||
19 | |||
20 | PACKAGES =+ "${PN}-examples" | ||
21 | FILES_${PN}-examples = "${datadir}/libeflvala ${bindir}/*" | ||
22 | |||
23 | PNBLACKLIST[libeflvala] ?= "Depends on blacklisted elementary - the recipe will be removed on 2017-09-01 unless the issue is fixed" | ||
diff --git a/meta-efl/recipes-efl/efl/libeweather_svn.bb b/meta-efl/recipes-efl/efl/libeweather_svn.bb deleted file mode 100644 index 53988b0d1..000000000 --- a/meta-efl/recipes-efl/efl/libeweather_svn.bb +++ /dev/null | |||
@@ -1,48 +0,0 @@ | |||
1 | SUMMARY = "EFL-based weather widget library" | ||
2 | LICENSE = "LGPL-2.1" | ||
3 | LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24 \ | ||
4 | file://COPYING-PLAIN;md5=c910b645eda0005ccec46f75203dc96e" | ||
5 | |||
6 | DEPENDS = "ecore edje" | ||
7 | PV = "0.0.0+svnr${SRCPV}" | ||
8 | SRCREV = "${EFL_SRCREV}" | ||
9 | |||
10 | inherit efl | ||
11 | SRC_URI = "${E_SVN}/trunk/PROTO;module=${SRCNAME};protocol=http;scmdata=keep" | ||
12 | S = "${WORKDIR}/${SRCNAME}" | ||
13 | |||
14 | EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc" | ||
15 | |||
16 | RSUGGESTS_${PN} = "elementary-tests" | ||
17 | |||
18 | do_compile_append() { | ||
19 | sed -i -e s:${STAGING_DIR_TARGET}::g \ | ||
20 | -e s:/${TARGET_SYS}::g \ | ||
21 | eweather.pc | ||
22 | } | ||
23 | |||
24 | PACKAGES += "${PN}-plugins" | ||
25 | |||
26 | FILES_${PN}-themes = "\ | ||
27 | ${datadir} \ | ||
28 | " | ||
29 | |||
30 | FILES_${PN}-plugins = "\ | ||
31 | ${libdir}/eweather/plugins/*.so \ | ||
32 | " | ||
33 | |||
34 | FILES_${PN}-dbg += "\ | ||
35 | ${libdir}/eweather/plugins/.debug \ | ||
36 | " | ||
37 | |||
38 | FILES_${PN}-dev += "\ | ||
39 | ${libdir}/eweather/plugins/*.a \ | ||
40 | ${libdir}/eweather/plugins/*.la \ | ||
41 | " | ||
42 | |||
43 | RRECOMMENDS_${PN} = "\ | ||
44 | ${PN}-themes \ | ||
45 | ${PN}-plugins \ | ||
46 | " | ||
47 | |||
48 | PNBLACKLIST[libeweather] ?= "Fails to build with RSS http://errors.yoctoproject.org/Errors/Details/130649/ - the recipe will be removed on 2017-09-01 unless the issue is fixed" | ||
diff --git a/meta-efl/recipes-efl/packagegroups/packagegroup-efl-sdk.bb b/meta-efl/recipes-efl/packagegroups/packagegroup-efl-sdk.bb deleted file mode 100644 index ee4e2c414..000000000 --- a/meta-efl/recipes-efl/packagegroups/packagegroup-efl-sdk.bb +++ /dev/null | |||
@@ -1,19 +0,0 @@ | |||
1 | SUMMARY = "Efl Software Development Kit" | ||
2 | LICENSE = "MIT" | ||
3 | LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=4d92cd373abda3937c2bc47fbc49d690 \ | ||
4 | file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" | ||
5 | |||
6 | ALLOW_EMPTY_${PN} = "1" | ||
7 | |||
8 | PR = "r1" | ||
9 | |||
10 | require packagegroup-efl-sdk.inc | ||
11 | |||
12 | PACKAGES = "${PN}" | ||
13 | |||
14 | RDEPENDS_${PN} = "\ | ||
15 | packagegroup-core-sdk \ | ||
16 | ${SDK-EFL} \ | ||
17 | ${SDK-EXTRAS}" | ||
18 | |||
19 | PNBLACKLIST[packagegroup-efl-sdk] ?= "Runtime depends on blacklisted elementary-dev - the recipe will be removed on 2017-09-01 unless the issue is fixed" | ||
diff --git a/meta-efl/recipes-efl/packagegroups/packagegroup-efl-sdk.inc b/meta-efl/recipes-efl/packagegroups/packagegroup-efl-sdk.inc deleted file mode 100644 index f2b0456d4..000000000 --- a/meta-efl/recipes-efl/packagegroups/packagegroup-efl-sdk.inc +++ /dev/null | |||
@@ -1,12 +0,0 @@ | |||
1 | SDK-EFL = " \ | ||
2 | efl-dev \ | ||
3 | elementary-dev \ | ||
4 | edbus-dev \ | ||
5 | luajit-dev \ | ||
6 | " | ||
7 | |||
8 | SDK-EXTRAS ?= "" | ||
9 | SDK-EXTRAS_qemux86 ?= " valgrind lttng-ust-dev" | ||
10 | SDK-EXTRAS_qemux86-64 ?= " lttng-ust-dev" | ||
11 | SDK-EXTRAS_qemuppc ?= " lttng-ust-dev" | ||
12 | SDK-EXTRAS_qemuarm ?= " lttng-ust-dev" | ||
diff --git a/meta-efl/recipes-efl/packagegroups/packagegroup-efl-standalone-sdk-target.bb b/meta-efl/recipes-efl/packagegroups/packagegroup-efl-standalone-sdk-target.bb deleted file mode 100644 index 2d9dde649..000000000 --- a/meta-efl/recipes-efl/packagegroups/packagegroup-efl-standalone-sdk-target.bb +++ /dev/null | |||
@@ -1,19 +0,0 @@ | |||
1 | SUMMARY = "Efl Software Development Kit" | ||
2 | LICENSE = "MIT" | ||
3 | LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=4d92cd373abda3937c2bc47fbc49d690 \ | ||
4 | file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" | ||
5 | |||
6 | ALLOW_EMPTY_${PN} = "1" | ||
7 | |||
8 | PR = "r1" | ||
9 | |||
10 | require packagegroup-efl-sdk.inc | ||
11 | |||
12 | PACKAGES = "${PN} ${PN}-dbg" | ||
13 | |||
14 | RDEPENDS_${PN} = "\ | ||
15 | packagegroup-core-standalone-sdk-target \ | ||
16 | ${SDK-EFL} \ | ||
17 | ${SDK-EXTRAS}" | ||
18 | |||
19 | PNBLACKLIST[packagegroup-efl-standalone-sdk-target] ?= "Runtime depends on blacklisted elementary-dev - the recipe will be removed on 2017-09-01 unless the issue is fixed" | ||
diff --git a/meta-efl/recipes-efl/packagegroups/packagegroup-x11-illume.bb b/meta-efl/recipes-efl/packagegroups/packagegroup-x11-illume.bb deleted file mode 100644 index 95ebcabf3..000000000 --- a/meta-efl/recipes-efl/packagegroups/packagegroup-x11-illume.bb +++ /dev/null | |||
@@ -1,30 +0,0 @@ | |||
1 | DESCRIPTION = "The Illume Windowing Environment -- install this task to get the Enlightenment Window Manager + the Illume environment." | ||
2 | SECTION = "x11/wm" | ||
3 | LICENSE = "MIT" | ||
4 | LIC_FILES_CHKSUM = "file://${TOPDIR}/meta-openembedded/meta-efl/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" | ||
5 | PV = "1.0" | ||
6 | PR = "r5" | ||
7 | |||
8 | inherit packagegroup allarch | ||
9 | |||
10 | # Default theme and config | ||
11 | ETHEME ?= "e-wm-theme-default" | ||
12 | ECONFIG ?= "e-wm-config-mobile" | ||
13 | |||
14 | RRECOMMENDS_${PN} = "\ | ||
15 | ${ETHEME} \ | ||
16 | " | ||
17 | |||
18 | RDEPENDS_${PN} = "\ | ||
19 | packagegroup-core-x11-xserver \ | ||
20 | packagegroup-core-x11-utils \ | ||
21 | \ | ||
22 | e-wm \ | ||
23 | ${ECONFIG} \ | ||
24 | " | ||
25 | |||
26 | PNBLACKLIST[packagegroup-x11-illume] ?= "Runtime depends on blacklisted e-wm - the recipe will be removed on 2017-09-01 unless the issue is fixed" | ||
27 | |||
28 | PNBLACKLIST[packagegroup-x11-illume] ?= "Runtime depends on blacklisted e-wm-config-mobile - the recipe will be removed on 2017-09-01 unless the issue is fixed" | ||
29 | |||
30 | PNBLACKLIST[packagegroup-x11-illume] ?= "Runtime depends on blacklisted e-wm-theme-default - the recipe will be removed on 2017-09-01 unless the issue is fixed" | ||
diff --git a/meta-efl/recipes-efl/webkit/webkit-efl.inc b/meta-efl/recipes-efl/webkit/webkit-efl.inc deleted file mode 100644 index f49f2ee02..000000000 --- a/meta-efl/recipes-efl/webkit/webkit-efl.inc +++ /dev/null | |||
@@ -1,69 +0,0 @@ | |||
1 | DESCRIPTION = "Webkit browser engine, EFL edition" | ||
2 | LICENSE = "GPLv2+ & LGPL-2.1" | ||
3 | LIC_FILES_CHKSUM = " \ | ||
4 | file://Source/JavaScriptCore/COPYING.LIB;md5=d0c6d6397a5d84286dda758da57bd691 \ | ||
5 | file://Source/WebCore/LICENSE-APPLE;md5=4646f90082c40bcf298c285f8bab0b12 \ | ||
6 | file://Source/WebCore/LICENSE-LGPL-2.1;md5=a778a33ef338abbaf8b8a7c36b6eec80 \ | ||
7 | file://Source/WebCore/LICENSE-LGPL-2;md5=36357ffde2b64ae177b2494445b79d21 \ | ||
8 | " | ||
9 | |||
10 | # you need harfbuzz with icu enabled, you can add this to your config: | ||
11 | # PACKAGECONFIG_append_pn-harfbuzz = " icu" | ||
12 | DEPENDS = "icu libxslt sqlite3 gperf-native bison-native flex-native jpeg \ | ||
13 | libpng libxt fontconfig cairo freetype glib-2.0 libsoup-2.4 \ | ||
14 | libxml2 pango eina ecore evas edje eldbus harfbuzz enchant \ | ||
15 | ruby-native elementary" | ||
16 | |||
17 | PE = "1" | ||
18 | |||
19 | SRCVER ?= "${PV}" | ||
20 | SRC_URI = "\ | ||
21 | ${E_RELEASES}/libs/webkit-efl/ewebkit-${SRCVER}.tar.xz \ | ||
22 | " | ||
23 | S = "${WORKDIR}/ewebkit" | ||
24 | |||
25 | inherit cmake lib_package pkgconfig perlnative pythonnative | ||
26 | |||
27 | ARM_INSTRUCTION_SET = "arm" | ||
28 | |||
29 | EXTRA_OECMAKE = " \ | ||
30 | -DPORT=Efl \ | ||
31 | -DSHARED_CORE=On \ | ||
32 | -DENABLE_DRAG_SUPPORT=On \ | ||
33 | -DENABLE_WEB_AUDIO=Off \ | ||
34 | -DENABLE_VIDEO=Off \ | ||
35 | -DENABLE_VIDEO_TRACK=Off \ | ||
36 | -DENABLE_ACCESSIBILITY=Off \ | ||
37 | -DENABLE_BATTERY_STATUS=Off \ | ||
38 | " | ||
39 | # generated ASM code isn't compatible with armv[45] | ||
40 | # it was removed from macro assembler in upstream commit 121885 | ||
41 | # https://bugs.webkit.org/show_bug.cgi?id=90198 | ||
42 | EXTRA_OECMAKE_append_armv4 = " -DENABLE_LLINT=Off -DENABLE_JIT=Off -DENABLE_DFG_JIT=Off -DENABLE_FTL_JIT=Off" | ||
43 | EXTRA_OECMAKE_append_armv5 = " -DENABLE_LLINT=Off -DENABLE_JIT=Off -DENABLE_DFG_JIT=Off -DENABLE_FTL_JIT=Off" | ||
44 | |||
45 | # hack it in OptionsEfl.cmake because that overrules -DENABLE_LLINT=Off | ||
46 | do_configure_prepend_armv4() { | ||
47 | sed -i 's/WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_LLINT ON)/WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_LLINT OFF)/g' ${S}/Source/cmake/OptionsEfl.cmake | ||
48 | } | ||
49 | do_configure_prepend_armv5() { | ||
50 | sed -i 's/WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_LLINT ON)/WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_LLINT OFF)/g' ${S}/Source/cmake/OptionsEfl.cmake | ||
51 | } | ||
52 | |||
53 | # and disabled LLINT currently isn't supported, so restrict to armv7a and x86* | ||
54 | COMPATIBLE_MACHINE = "(-)" | ||
55 | COMPATIBLE_MACHINE_x86 = "(.*)" | ||
56 | COMPATIBLE_MACHINE_x86-64 = "(.*)" | ||
57 | COMPATIBLE_MACHINE_armv7a = "(.*)" | ||
58 | |||
59 | LEAD_SONAME = "libewebkit.so" | ||
60 | PACKAGES =+ "${PN}launcher-dbg ${PN}launcher ${PN}-inspector" | ||
61 | |||
62 | FILES_${PN} += "${datadir}/ewebkit2-1/themes/default.edj" | ||
63 | FILES_${PN}-dev += "${libdir}/cmake" | ||
64 | FILES_${PN}launcher = "${bindir}/EWebLauncher" | ||
65 | FILES_${PN}launcher-dbg = "${bindir}/.debug/EWebLauncher" | ||
66 | FILES_${PN}-inspector += "${datadir}/ewebkit2-1/inspector" | ||
67 | |||
68 | # http://errors.yoctoproject.org/Errors/Details/40659/ | ||
69 | PNBLACKLIST[webkit-efl] ?= "Old and unmaintaned fork with many security issues - the recipe will be removed on 2017-09-01 unless the issue is fixed" | ||
diff --git a/meta-efl/recipes-efl/webkit/webkit-efl/0001-OptionsCommon.cmake-don-t-mix-CXX_FLAGS-into-C_FLAGS.patch b/meta-efl/recipes-efl/webkit/webkit-efl/0001-OptionsCommon.cmake-don-t-mix-CXX_FLAGS-into-C_FLAGS.patch deleted file mode 100644 index 19b7bb88d..000000000 --- a/meta-efl/recipes-efl/webkit/webkit-efl/0001-OptionsCommon.cmake-don-t-mix-CXX_FLAGS-into-C_FLAGS.patch +++ /dev/null | |||
@@ -1,46 +0,0 @@ | |||
1 | From e6caaf6e80b9c80dc2b860b471a8f05e825f6dfa Mon Sep 17 00:00:00 2001 | ||
2 | From: Martin Jansa <Martin.Jansa@gmail.com> | ||
3 | Date: Thu, 14 Aug 2014 01:00:21 +0200 | ||
4 | Subject: [PATCH 1/3] OptionsCommon.cmake: don't mix CXX_FLAGS into C_FLAGS | ||
5 | |||
6 | * it was added in https://bugs.webkit.org/show_bug.cgi?id=130261 | ||
7 | * causes build failures in udis86 which explicitly asks for gcc but then | ||
8 | gets g++ flags from CMAKE_CXX_FLAGS. | ||
9 | |||
10 | cc1: error: command line option '-fvisibility-inlines-hidden' is valid | ||
11 | for C++/ObjC++ but not for C [-Werror] | ||
12 | cc1: error: command line option '-fpermissive' is valid for C++/ObjC++ | ||
13 | but not for C [-Werror] | ||
14 | cc1: all warnings being treated as errors | ||
15 | Source/JavaScriptCore/CMakeFiles/JavaScriptCore.dir/build.make:11182: | ||
16 | recipe for target | ||
17 | 'Source/JavaScriptCore/CMakeFiles/JavaScriptCore.dir/disassembler/udis86/udis86.c.o' | ||
18 | failed | ||
19 | make[2]: *** | ||
20 | [Source/JavaScriptCore/CMakeFiles/JavaScriptCore.dir/disassembler/udis86/udis86.c.o] | ||
21 | Error 1 | ||
22 | make[2]: *** Waiting for unfinished jobs.... | ||
23 | make[2]: Leaving directory | ||
24 | '/OE/build/oe-core/tmp-eglibc/work/core2-64-oe-linux/webkit-efl/1_1.10.0+1.11.0-beta1-r0/build' | ||
25 | |||
26 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | ||
27 | --- | ||
28 | Source/cmake/OptionsCommon.cmake | 2 +- | ||
29 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
30 | |||
31 | diff --git a/Source/cmake/OptionsCommon.cmake b/Source/cmake/OptionsCommon.cmake | ||
32 | index e304a99..045c614 100644 | ||
33 | --- a/Source/cmake/OptionsCommon.cmake | ||
34 | +++ b/Source/cmake/OptionsCommon.cmake | ||
35 | @@ -25,7 +25,7 @@ endif () | ||
36 | set_property(GLOBAL PROPERTY USE_FOLDERS ON) | ||
37 | |||
38 | if (CMAKE_COMPILER_IS_GNUCXX OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") | ||
39 | - set(CMAKE_C_FLAGS "${CMAKE_CXX_FLAGS} -fno-exceptions -fno-strict-aliasing") | ||
40 | + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fno-exceptions -fno-strict-aliasing") | ||
41 | set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -fno-exceptions -fno-strict-aliasing -fno-rtti") | ||
42 | endif () | ||
43 | |||
44 | -- | ||
45 | 2.1.3 | ||
46 | |||
diff --git a/meta-efl/recipes-efl/webkit/webkit-efl/0002-WebKitHelpers.cmake-Add-Wno-error-deprecated-declara.patch b/meta-efl/recipes-efl/webkit/webkit-efl/0002-WebKitHelpers.cmake-Add-Wno-error-deprecated-declara.patch deleted file mode 100644 index 627a9e82b..000000000 --- a/meta-efl/recipes-efl/webkit/webkit-efl/0002-WebKitHelpers.cmake-Add-Wno-error-deprecated-declara.patch +++ /dev/null | |||
@@ -1,45 +0,0 @@ | |||
1 | From de93951f89e851b6689718022eebb4b8b1d14c06 Mon Sep 17 00:00:00 2001 | ||
2 | From: Martin Jansa <Martin.Jansa@gmail.com> | ||
3 | Date: Mon, 13 Jan 2014 17:21:25 +0100 | ||
4 | Subject: [PATCH 2/3] WebKitHelpers.cmake: Add | ||
5 | -Wno-error=deprecated-declarations -Wno-error=cast-align | ||
6 | -Wno-error=type-limits | ||
7 | |||
8 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | ||
9 | --- | ||
10 | Source/cmake/WebKitHelpers.cmake | 10 ++++++++++ | ||
11 | 1 file changed, 10 insertions(+) | ||
12 | |||
13 | diff --git a/Source/cmake/WebKitHelpers.cmake b/Source/cmake/WebKitHelpers.cmake | ||
14 | index 227b9ee..ae52ef6 100644 | ||
15 | --- a/Source/cmake/WebKitHelpers.cmake | ||
16 | +++ b/Source/cmake/WebKitHelpers.cmake | ||
17 | @@ -40,6 +40,25 @@ macro(WEBKIT_SET_EXTRA_COMPILER_FLAGS _target) | ||
18 | # FIXME: When we use -fno-tree-dce to support the jsCStack branch merge, build error occurs due to the uninitialization. Temporarily we set | ||
19 | # uninitialized as build warning in order to support the jsCStack merge. https://bugs.webkit.org/show_bug.cgi?id=127777. | ||
20 | set(OLD_COMPILE_FLAGS "-Werror -Wno-error=unused-parameter -Wno-error=uninitialized -Wno-error=literal-suffix ${OLD_COMPILE_FLAGS}") | ||
21 | + # libsoup-2.4/libsoup/soup-proxy-uri-resolver.h:13:84: error: 'GType soup_proxy_uri_resolver_get_type()' is deprecated (declared at /OE/build/oe-core/tmp-eglibc/sysroots/qemux86-64/usr/include/libsoup-2.4/libsoup/soup-proxy-uri-resolver.h:48) [-Werror=deprecated-declarations] | ||
22 | + set(OLD_COMPILE_FLAGS "-Wno-error=deprecated-declarations ${OLD_COMPILE_FLAGS}") | ||
23 | + # webkit-efl/1_1.10.0+1.11.0-beta1-r0/ewebkit/Source/WTF/wtf/text/StringImpl.h:742:87: error: cast from 'uint8_t* {aka unsigned char*}' to 'WTF::StringImpl**' increases required alignment of target type [-Werror=cast-align] | ||
24 | + set(OLD_COMPILE_FLAGS "-Wno-error=cast-align ${OLD_COMPILE_FLAGS}") | ||
25 | + # webkit-efl/1_1.10.0+1.11.0-beta1-r0/ewebkit/Source/WebKit2/Shared/linux/WebMemorySamplerLinux.cpp:70:16: error: comparison is always false due to limited range of data type [-Werror=type-limits] | ||
26 | + set(OLD_COMPILE_FLAGS "-Wno-error=type-limits ${OLD_COMPILE_FLAGS}") | ||
27 | + # webkit-efl/1_1.11.0-r0/ewebkit/Source/WebKit2/UIProcess/API/efl/EwkView.cpp:832:5: error: missing initializer for member '_Evas_GL_Config::gles_version' [-Werror=missing-field-initializers] | ||
28 | + # this one is new with efl-1.12 | ||
29 | + set(OLD_COMPILE_FLAGS "-Wno-error=missing-field-initializers ${OLD_COMPILE_FLAGS}") | ||
30 | + # webkit-efl/1_1.11.0-r0/ewebkit/Source/WTF/wtf/dtoa/bignum.cc:105:10: error: assuming signed overflow does not occur when assuming that (X + c) < X is always false [-Werror=strict-overflow] | ||
31 | + # this one is new with gcc-5.2 | ||
32 | + set(OLD_COMPILE_FLAGS "-Wno-error=strict-overflow ${OLD_COMPILE_FLAGS}") | ||
33 | + # webkit-efl/1_1.11.0-r0/ewebkit/Source/WTF/wtf/SaturatedArithmetic.h:46:26: error: suggest parentheses around operand of '!' or change '&' to '&&' or '!' to '~' [-Werror=parentheses] | ||
34 | + # this one is new with gcc-5.2 | ||
35 | + set(OLD_COMPILE_FLAGS "-Wno-error=parentheses ${OLD_COMPILE_FLAGS}") | ||
36 | + # webkit-efl/1_1.11.0-r0/ewebkit/Source/WebCore/loader/cache/CachedScript.cpp:103:108: error: logical not is only applied to the left hand side of comparison [-Werror=logical-not-parentheses] | ||
37 | + # this one is new with gcc-5.2 | ||
38 | + set(OLD_COMPILE_FLAGS "-Wno-error=logical-not-parentheses ${OLD_COMPILE_FLAGS}") | ||
39 | + | ||
40 | endif () | ||
41 | |||
42 | set_target_properties(${_target} PROPERTIES | ||
43 | -- | ||
44 | 2.1.3 | ||
45 | |||
diff --git a/meta-efl/recipes-efl/webkit/webkit-efl/0003-FEBlendNEON.h-fix-missing-semicolon.patch b/meta-efl/recipes-efl/webkit/webkit-efl/0003-FEBlendNEON.h-fix-missing-semicolon.patch deleted file mode 100644 index e718ee1c1..000000000 --- a/meta-efl/recipes-efl/webkit/webkit-efl/0003-FEBlendNEON.h-fix-missing-semicolon.patch +++ /dev/null | |||
@@ -1,35 +0,0 @@ | |||
1 | From a076d76b8e8862bd641cd991190e82cfd478cc66 Mon Sep 17 00:00:00 2001 | ||
2 | From: Martin Jansa <Martin.Jansa@gmail.com> | ||
3 | Date: Wed, 20 Aug 2014 00:52:03 +0200 | ||
4 | Subject: [PATCH 3/3] FEBlendNEON.h: fix missing semicolon | ||
5 | |||
6 | * Otherwise fails with: | ||
7 | In file included from ewebkit/Source/WebCore/platform/graphics/filters/FEBlend.cpp:29:0: | ||
8 | ewebkit/Source/WebCore/platform/graphics/cpu/arm/filters/FEBlendNEON.h: In member function 'virtual void WebCore::FEBlend::platformApplySoftware()': | ||
9 | ewebkit/Source/WebCore/platform/graphics/cpu/arm/filters/FEBlendNEON.h:130:5: error: expected primary-expression before '}' token | ||
10 | } | ||
11 | ^ | ||
12 | ewebkit/Source/WebCore/platform/graphics/cpu/arm/filters/FEBlendNEON.h:130:5: error: return-statement with a value, in function returning 'void' [-fpermissive] | ||
13 | ewebkit/Source/WebCore/platform/graphics/cpu/arm/filters/FEBlendNEON.h:130:5: error: expected ';' before '}' token | ||
14 | |||
15 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | ||
16 | --- | ||
17 | Source/WebCore/platform/graphics/cpu/arm/filters/FEBlendNEON.h | 2 +- | ||
18 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
19 | |||
20 | diff --git a/Source/WebCore/platform/graphics/cpu/arm/filters/FEBlendNEON.h b/Source/WebCore/platform/graphics/cpu/arm/filters/FEBlendNEON.h | ||
21 | index 1c50765..f4b6f46 100644 | ||
22 | --- a/Source/WebCore/platform/graphics/cpu/arm/filters/FEBlendNEON.h | ||
23 | +++ b/Source/WebCore/platform/graphics/cpu/arm/filters/FEBlendNEON.h | ||
24 | @@ -126,7 +126,7 @@ void FEBlend::platformApplySoftware() | ||
25 | |||
26 | if (pixelArrayLength >= 8) { | ||
27 | platformApplyNEON(srcPixelArrayA->data(), srcPixelArrayB->data(), dstPixelArray->data(), pixelArrayLength); | ||
28 | - return | ||
29 | + return; | ||
30 | } | ||
31 | // If there is just one pixel we expand it to two. | ||
32 | ASSERT(pixelArrayLength > 0); | ||
33 | -- | ||
34 | 2.1.3 | ||
35 | |||
diff --git a/meta-efl/recipes-efl/webkit/webkit-efl/0004-Fix-the-build-with-EFL-1.12-https-bugs.webkit.org-sh.patch b/meta-efl/recipes-efl/webkit/webkit-efl/0004-Fix-the-build-with-EFL-1.12-https-bugs.webkit.org-sh.patch deleted file mode 100644 index bfa3052b1..000000000 --- a/meta-efl/recipes-efl/webkit/webkit-efl/0004-Fix-the-build-with-EFL-1.12-https-bugs.webkit.org-sh.patch +++ /dev/null | |||
@@ -1,146 +0,0 @@ | |||
1 | From baebc004111289ef658c78a42f8332f3dceef41e Mon Sep 17 00:00:00 2001 | ||
2 | From: "ryuan.choi@navercorp.com" <ryuan.choi@navercorp.com> | ||
3 | Date: Thu, 13 Nov 2014 07:07:16 +0000 | ||
4 | Subject: [PATCH 4/4] Fix the build with EFL 1.12 | ||
5 | https://bugs.webkit.org/show_bug.cgi?id=138245 | ||
6 | |||
7 | Reviewed by Gyuyoung Kim. | ||
8 | |||
9 | Source/WebKit2: | ||
10 | |||
11 | * UIProcess/API/efl/EwkView.cpp: | ||
12 | First, modified to use Evas_GL raw pointer instead of UniquePtrEfl because | ||
13 | Evas_GL.h can't be included in UniquePtrEfl.h | ||
14 | It should be moved into EvasGLContext because WebKit/EFL use only one Evas_GL. | ||
15 | Second, provided the version of GLES in Evas_GL_Config not to break build with | ||
16 | EFL 1.12 | ||
17 | (EwkView::EwkView): | ||
18 | (EwkView::~EwkView): | ||
19 | (EwkView::displayTimerFired): | ||
20 | (EwkView::createGLSurface): | ||
21 | * UIProcess/API/efl/EwkView.h: | ||
22 | |||
23 | Source/WTF: | ||
24 | |||
25 | * wtf/efl/UniquePtrEfl.h: | ||
26 | Removed Evas_GL.h from UniquePtrEfl.h, which is commonly included, because | ||
27 | it should not be included with official GL headers. | ||
28 | |||
29 | git-svn-id: http://svn.webkit.org/repository/webkit/trunk@176066 268f45cc-cd09-0410-ab3c-d52691b4dbfc | ||
30 | --- | ||
31 | Source/WTF/wtf/efl/UniquePtrEfl.h | 2 -- | ||
32 | Source/WebKit2/UIProcess/API/efl/EwkView.cpp | 24 ++++++++++++++++-------- | ||
33 | Source/WebKit2/UIProcess/API/efl/EwkView.h | 3 ++- | ||
34 | 3 files changed, 18 insertions(+), 11 deletions(-) | ||
35 | |||
36 | diff --git a/Source/WTF/wtf/efl/UniquePtrEfl.h b/Source/WTF/wtf/efl/UniquePtrEfl.h | ||
37 | index ba0110a..038d3fb 100644 | ||
38 | --- a/Source/WTF/wtf/efl/UniquePtrEfl.h | ||
39 | +++ b/Source/WTF/wtf/efl/UniquePtrEfl.h | ||
40 | @@ -33,7 +33,6 @@ | ||
41 | #include <Ecore_IMF.h> | ||
42 | #include <Eina.h> | ||
43 | #include <Evas.h> | ||
44 | -#include <Evas_GL.h> | ||
45 | |||
46 | namespace WTF { | ||
47 | |||
48 | @@ -51,7 +50,6 @@ using EflUniquePtr = std::unique_ptr<T, EflPtrDeleter<T>>; | ||
49 | macro(Eina_Hash, eina_hash_free) \ | ||
50 | macro(Eina_Module, eina_module_free) \ | ||
51 | macro(Evas_Object, evas_object_del) \ | ||
52 | - macro(Evas_GL, evas_gl_free) | ||
53 | |||
54 | #define WTF_DEFINE_EFLPTR_DELETER(typeName, deleterFunc) \ | ||
55 | template<> struct EflPtrDeleter<typeName> \ | ||
56 | diff --git a/Source/WebKit2/UIProcess/API/efl/EwkView.cpp b/Source/WebKit2/UIProcess/API/efl/EwkView.cpp | ||
57 | index 50d34ed..6ff3394 100755 | ||
58 | --- a/Source/WebKit2/UIProcess/API/efl/EwkView.cpp | ||
59 | +++ b/Source/WebKit2/UIProcess/API/efl/EwkView.cpp | ||
60 | @@ -299,9 +299,11 @@ EwkView::EwkView(WKViewRef view, Evas_Object* evasObject) | ||
61 | |||
62 | // FIXME: Remove when possible. | ||
63 | static_cast<WebViewEfl*>(webView())->setEwkView(this); | ||
64 | - m_evasGL = EflUniquePtr<Evas_GL>(evas_gl_new(evas_object_evas_get(m_evasObject))); | ||
65 | + | ||
66 | + // FIXME: Consider it to move into EvasGLContext. | ||
67 | + m_evasGL = evas_gl_new(evas_object_evas_get(m_evasObject)); | ||
68 | if (m_evasGL) | ||
69 | - m_evasGLContext = EvasGLContext::create(m_evasGL.get()); | ||
70 | + m_evasGLContext = EvasGLContext::create(m_evasGL); | ||
71 | |||
72 | if (!m_evasGLContext) { | ||
73 | WARN("Failed to create Evas_GL, falling back to software mode."); | ||
74 | @@ -333,6 +335,9 @@ EwkView::~EwkView() | ||
75 | { | ||
76 | ASSERT(wkPageToEvasObjectMap().get(wkPage()) == m_evasObject); | ||
77 | wkPageToEvasObjectMap().remove(wkPage()); | ||
78 | + | ||
79 | + if (m_evasGL) | ||
80 | + evas_gl_free(m_evasGL); | ||
81 | } | ||
82 | |||
83 | EwkView* EwkView::create(WKViewRef webView, Evas* canvas, Evas_Smart* smart) | ||
84 | @@ -587,7 +592,7 @@ void EwkView::displayTimerFired(Timer<EwkView>*) | ||
85 | return; | ||
86 | } | ||
87 | |||
88 | - evas_gl_make_current(m_evasGL.get(), m_evasGLSurface->surface(), m_evasGLContext->context()); | ||
89 | + evas_gl_make_current(m_evasGL, m_evasGLSurface->surface(), m_evasGLContext->context()); | ||
90 | |||
91 | WKViewPaintToCurrentGLContext(wkView()); | ||
92 | |||
93 | @@ -828,21 +833,24 @@ bool EwkView::createGLSurface() | ||
94 | EVAS_GL_DEPTH_BIT_8, | ||
95 | EVAS_GL_STENCIL_NONE, | ||
96 | EVAS_GL_OPTIONS_NONE, | ||
97 | - EVAS_GL_MULTISAMPLE_NONE | ||
98 | + EVAS_GL_MULTISAMPLE_NONE, | ||
99 | +#if defined(EVAS_GL_API_VERSION) && EVAS_GL_API_VERSION >= 2 | ||
100 | + EVAS_GL_GLES_2_X | ||
101 | +#endif | ||
102 | }; | ||
103 | |||
104 | // Recreate to current size: Replaces if non-null, and frees existing surface after (OwnPtr). | ||
105 | - m_evasGLSurface = EvasGLSurface::create(m_evasGL.get(), &evasGLConfig, deviceSize()); | ||
106 | + m_evasGLSurface = EvasGLSurface::create(m_evasGL, &evasGLConfig, deviceSize()); | ||
107 | if (!m_evasGLSurface) | ||
108 | return false; | ||
109 | |||
110 | Evas_Native_Surface nativeSurface; | ||
111 | - evas_gl_native_surface_get(m_evasGL.get(), m_evasGLSurface->surface(), &nativeSurface); | ||
112 | + evas_gl_native_surface_get(m_evasGL, m_evasGLSurface->surface(), &nativeSurface); | ||
113 | evas_object_image_native_surface_set(smartData()->image, &nativeSurface); | ||
114 | |||
115 | - evas_gl_make_current(m_evasGL.get(), m_evasGLSurface->surface(), m_evasGLContext->context()); | ||
116 | + evas_gl_make_current(m_evasGL, m_evasGLSurface->surface(), m_evasGLContext->context()); | ||
117 | |||
118 | - Evas_GL_API* gl = evas_gl_api_get(m_evasGL.get()); | ||
119 | + Evas_GL_API* gl = evas_gl_api_get(m_evasGL); | ||
120 | |||
121 | WKPoint boundsEnd = WKViewUserViewportToScene(wkView(), WKPointMake(deviceSize().width(), deviceSize().height())); | ||
122 | gl->glViewport(0, 0, boundsEnd.x, boundsEnd.y); | ||
123 | diff --git a/Source/WebKit2/UIProcess/API/efl/EwkView.h b/Source/WebKit2/UIProcess/API/efl/EwkView.h | ||
124 | index 1c482cf..68dab87 100644 | ||
125 | --- a/Source/WebKit2/UIProcess/API/efl/EwkView.h | ||
126 | +++ b/Source/WebKit2/UIProcess/API/efl/EwkView.h | ||
127 | @@ -39,6 +39,7 @@ | ||
128 | #endif | ||
129 | |||
130 | typedef struct _cairo_surface cairo_surface_t; | ||
131 | +typedef struct _Evas_GL Evas_GL; | ||
132 | |||
133 | namespace WebKit { | ||
134 | class ContextMenuClientEfl; | ||
135 | @@ -241,7 +242,7 @@ private: | ||
136 | Evas_Object* m_evasObject; | ||
137 | RefPtr<EwkContext> m_context; | ||
138 | RefPtr<EwkPageGroup> m_pageGroup; | ||
139 | - EflUniquePtr<Evas_GL> m_evasGL; | ||
140 | + Evas_GL* m_evasGL; | ||
141 | std::unique_ptr<WebCore::EvasGLContext> m_evasGLContext; | ||
142 | std::unique_ptr<WebCore::EvasGLSurface> m_evasGLSurface; | ||
143 | bool m_pendingSurfaceResize; | ||
144 | -- | ||
145 | 2.1.3 | ||
146 | |||
diff --git a/meta-efl/recipes-efl/webkit/webkit-efl/0005-Fix-the-build-with-cmake-3.patch b/meta-efl/recipes-efl/webkit/webkit-efl/0005-Fix-the-build-with-cmake-3.patch deleted file mode 100644 index 7e8e295c7..000000000 --- a/meta-efl/recipes-efl/webkit/webkit-efl/0005-Fix-the-build-with-cmake-3.patch +++ /dev/null | |||
@@ -1,104 +0,0 @@ | |||
1 | From a00a7097b85567ae6eb7a00b3ce7ef021841203c Mon Sep 17 00:00:00 2001 | ||
2 | From: Martin Jansa <Martin.Jansa@gmail.com> | ||
3 | Date: Thu, 24 Sep 2015 18:03:52 +0200 | ||
4 | Subject: [PATCH 5/5] Fix the build with cmake 3 | ||
5 | |||
6 | * the same issue as in GTK port: | ||
7 | https://bugs.webkit.org/show_bug.cgi?id=141796 | ||
8 | http://trac.webkit.org/changeset/180502 | ||
9 | |||
10 | * otherwise linking fails with couple undefined symbols | ||
11 | | CMakeFiles/WebKit2.dir/PluginProcess/unix/PluginProcessMainUnix.cpp.o: In function `WebKit::webkitXError(_XDisplay*, XErrorEvent*)': | ||
12 | | ewebkit/Source/WebKit2/PluginProcess/unix/PluginProcessMainUnix.cpp:63: undefined reference to `XGetErrorText' | ||
13 | | CMakeFiles/WebKit2.dir/PluginProcess/unix/PluginProcessMainUnix.cpp.o: In function `WebKit::PluginProcessMain::parseCommandLine(int, char**)': | ||
14 | | ewebkit/Source/WebKit2/PluginProcess/unix/PluginProcessMainUnix.cpp:102: undefined reference to `XSetErrorHandler' | ||
15 | | ewebkit/Source/WebKit2/PluginProcess/unix/PluginProcessMainUnix.cpp:102: undefined reference to `XSetErrorHandler' | ||
16 | | CMakeFiles/WebKit2.dir/WebProcess/efl/WebProcessMainEfl.cpp.o: In function `WebKit::WebProcessMain::platformInitialize()': | ||
17 | | ewebkit/Source/WebKit2/WebProcess/efl/WebProcessMainEfl.cpp:67: undefined reference to `XSetExtensionErrorHandler' | ||
18 | | ewebkit/Source/WebKit2/WebProcess/efl/WebProcessMainEfl.cpp:67: undefined reference to `XSetExtensionErrorHandler' | ||
19 | | CMakeFiles/WebKit2.dir/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp.o: In function `WebKit::NetscapePlugin::platformPostInitializeWindowed(bool, unsigned long)': | ||
20 | | ewebkit/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp:170: undefined reference to `XFlush' | ||
21 | | CMakeFiles/WebKit2.dir/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp.o: In function `WebKit::NetscapePlugin::platformPostInitializeWindowless()': | ||
22 | | ewebkit/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp:195: undefined reference to `XGetVisualInfo' | ||
23 | | ewebkit/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp:199: undefined reference to `XFree' | ||
24 | | ewebkit/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp:202: undefined reference to `XCreateColormap' | ||
25 | | CMakeFiles/WebKit2.dir/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp.o: In function `WebKit::NetscapePlugin::platformDestroy()': | ||
26 | | ewebkit/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp:251: undefined reference to `XFreeColormap' | ||
27 | | ewebkit/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp:255: undefined reference to `XFreePixmap' | ||
28 | | CMakeFiles/WebKit2.dir/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp.o: In function `WebKit::NetscapePlugin::platformGeometryDidChange()': | ||
29 | | ewebkit/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp:293: undefined reference to `XCreatePixmap' | ||
30 | | ewebkit/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp:286: undefined reference to `XFreePixmap' | ||
31 | | ewebkit/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp:295: undefined reference to `XSync' | ||
32 | | CMakeFiles/WebKit2.dir/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp.o: In function `WebKit::NetscapePlugin::platformPaint(WebCore::GraphicsContext*, WebCore::IntRect const&, bool)': | ||
33 | | ewebkit/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp:343: undefined reference to `XSync' | ||
34 | | collect2: error: ld returned 1 exit status | ||
35 | | Source/WebKit2/CMakeFiles/WebKit2.dir/build.make:16145: recipe for target 'lib/libewebkit2.so.1.11.0' failed | ||
36 | | make[2]: *** [lib/libewebkit2.so.1.11.0] Error 1 | ||
37 | |||
38 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | ||
39 | --- | ||
40 | Source/WebCore/PlatformEfl.cmake | 1 + | ||
41 | Source/WebKit2/PlatformEfl.cmake | 3 +++ | ||
42 | Source/cmake/OptionsEfl.cmake | 1 + | ||
43 | Tools/WebKitTestRunner/PlatformEfl.cmake | 1 + | ||
44 | 4 files changed, 6 insertions(+) | ||
45 | |||
46 | diff --git a/Source/WebCore/PlatformEfl.cmake b/Source/WebCore/PlatformEfl.cmake | ||
47 | index 41ffc15..63b7861 100644 | ||
48 | --- a/Source/WebCore/PlatformEfl.cmake | ||
49 | +++ b/Source/WebCore/PlatformEfl.cmake | ||
50 | @@ -404,6 +404,7 @@ if (WTF_USE_3D_GRAPHICS) | ||
51 | ) | ||
52 | endif () | ||
53 | |||
54 | + find_package(X11 REQUIRED) | ||
55 | list(APPEND WebCore_LIBRARIES | ||
56 | ${X11_X11_LIB} | ||
57 | ) | ||
58 | diff --git a/Source/WebKit2/PlatformEfl.cmake b/Source/WebKit2/PlatformEfl.cmake | ||
59 | index 8c66d1b..d96f0bd 100644 | ||
60 | --- a/Source/WebKit2/PlatformEfl.cmake | ||
61 | +++ b/Source/WebKit2/PlatformEfl.cmake | ||
62 | @@ -331,12 +331,15 @@ if (ENABLE_SECCOMP_FILTERS) | ||
63 | endif () | ||
64 | |||
65 | if (ENABLE_ECORE_X) | ||
66 | + find_package(X11 REQUIRED) | ||
67 | list(APPEND WebProcess_LIBRARIES | ||
68 | ${ECORE_X_LIBRARIES} | ||
69 | ${X11_Xext_LIB} | ||
70 | ) | ||
71 | list(APPEND WebKit2_LIBRARIES | ||
72 | ${ECORE_X_LIBRARIES} | ||
73 | + ${X11_X11_LIB} | ||
74 | + ${X11_Xext_LIB} | ||
75 | ) | ||
76 | endif () | ||
77 | |||
78 | diff --git a/Source/cmake/OptionsEfl.cmake b/Source/cmake/OptionsEfl.cmake | ||
79 | index 8585f19..1aa9002 100644 | ||
80 | --- a/Source/cmake/OptionsEfl.cmake | ||
81 | +++ b/Source/cmake/OptionsEfl.cmake | ||
82 | @@ -181,6 +181,7 @@ endif () | ||
83 | |||
84 | if (WTF_OS_UNIX) | ||
85 | set(ENABLE_X11_TARGET ON) | ||
86 | + find_package(X11 REQUIRED) | ||
87 | add_definitions(-DXP_UNIX) | ||
88 | endif (WTF_OS_UNIX) | ||
89 | |||
90 | diff --git a/Tools/WebKitTestRunner/PlatformEfl.cmake b/Tools/WebKitTestRunner/PlatformEfl.cmake | ||
91 | index 1873279..a905f2a 100644 | ||
92 | --- a/Tools/WebKitTestRunner/PlatformEfl.cmake | ||
93 | +++ b/Tools/WebKitTestRunner/PlatformEfl.cmake | ||
94 | @@ -53,6 +53,7 @@ list(APPEND WebKitTestRunnerInjectedBundle_LIBRARIES | ||
95 | ) | ||
96 | |||
97 | if (ENABLE_ECORE_X) | ||
98 | + find_package(X11 REQUIRED) | ||
99 | list(APPEND WebKitTestRunner_INCLUDE_DIRECTORIES | ||
100 | ${ECORE_X_INCLUDE_DIRS} | ||
101 | ) | ||
102 | -- | ||
103 | 2.6.0 | ||
104 | |||
diff --git a/meta-efl/recipes-efl/webkit/webkit-efl/0006-OptionsEfl.cmake-Fix-build-with-newer-CMake-3.4.patch b/meta-efl/recipes-efl/webkit/webkit-efl/0006-OptionsEfl.cmake-Fix-build-with-newer-CMake-3.4.patch deleted file mode 100644 index 05626349b..000000000 --- a/meta-efl/recipes-efl/webkit/webkit-efl/0006-OptionsEfl.cmake-Fix-build-with-newer-CMake-3.4.patch +++ /dev/null | |||
@@ -1,30 +0,0 @@ | |||
1 | From 993882f81fe991b8baf1099392703337cc13fac0 Mon Sep 17 00:00:00 2001 | ||
2 | From: Martin Jansa <Martin.Jansa@gmail.com> | ||
3 | Date: Wed, 27 Jan 2016 18:40:23 +0100 | ||
4 | Subject: [PATCH] OptionsEfl.cmake: Fix build with newer CMake 3.4 | ||
5 | |||
6 | * otherwise it fails with: | ||
7 | | CMake Error at Source/cmake/OptionsEfl.cmake:251 (CHECK_INCLUDE_FILES): | ||
8 | | Unknown CMake command "CHECK_INCLUDE_FILES". | ||
9 | * https://bugs.webkit.org/show_bug.cgi?id=150117 | ||
10 | |||
11 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | ||
12 | --- | ||
13 | Source/cmake/OptionsEfl.cmake | 1 + | ||
14 | 1 file changed, 1 insertion(+) | ||
15 | |||
16 | diff --git a/Source/cmake/OptionsEfl.cmake b/Source/cmake/OptionsEfl.cmake | ||
17 | index 1aa9002..05216d0 100644 | ||
18 | --- a/Source/cmake/OptionsEfl.cmake | ||
19 | +++ b/Source/cmake/OptionsEfl.cmake | ||
20 | @@ -253,6 +253,7 @@ if (ENABLE_WEBGL OR WTF_USE_TILED_BACKING_STORE) | ||
21 | set(WTF_USE_EGL 1) | ||
22 | add_definitions(-DWTF_USE_EGL=1) | ||
23 | else () | ||
24 | + include(CheckIncludeFiles) | ||
25 | CHECK_INCLUDE_FILES("GL/glx.h" OPENGLX_FOUND) | ||
26 | add_definitions(-DWTF_USE_GLX=1) | ||
27 | endif () | ||
28 | -- | ||
29 | 2.7.0 | ||
30 | |||
diff --git a/meta-efl/recipes-efl/webkit/webkit-efl_1.11.0.bb b/meta-efl/recipes-efl/webkit/webkit-efl_1.11.0.bb deleted file mode 100644 index 96ad83029..000000000 --- a/meta-efl/recipes-efl/webkit/webkit-efl_1.11.0.bb +++ /dev/null | |||
@@ -1,12 +0,0 @@ | |||
1 | require ${BPN}.inc | ||
2 | |||
3 | SRC_URI += "\ | ||
4 | file://0001-OptionsCommon.cmake-don-t-mix-CXX_FLAGS-into-C_FLAGS.patch \ | ||
5 | file://0002-WebKitHelpers.cmake-Add-Wno-error-deprecated-declara.patch \ | ||
6 | file://0003-FEBlendNEON.h-fix-missing-semicolon.patch \ | ||
7 | file://0004-Fix-the-build-with-EFL-1.12-https-bugs.webkit.org-sh.patch \ | ||
8 | file://0005-Fix-the-build-with-cmake-3.patch \ | ||
9 | file://0006-OptionsEfl.cmake-Fix-build-with-newer-CMake-3.4.patch \ | ||
10 | " | ||
11 | SRC_URI[md5sum] = "90fa970ebf8646319d292c2bb5bff5db" | ||
12 | SRC_URI[sha256sum] = "d8d21e27f4a21cd77c41914548c184ddb98693ba23851aa66c8e51c0be4b90b7" | ||
diff --git a/meta-efl/recipes-navigation/mcnavi/mcnavi_0.3.4.bb b/meta-efl/recipes-navigation/mcnavi/mcnavi_0.3.4.bb deleted file mode 100644 index 040e006ab..000000000 --- a/meta-efl/recipes-navigation/mcnavi/mcnavi_0.3.4.bb +++ /dev/null | |||
@@ -1,19 +0,0 @@ | |||
1 | SUMMARY = "Free GPS navigation for car and outdoor with OpenStreetMap maps" | ||
2 | HOMEPAGE = "http://www.gps-routes.info/index.php?name=Content&pa=showpage&pid=1" | ||
3 | LICENSE = "GPLv3" | ||
4 | LIC_FILES_CHKSUM = "file://COPYING;md5=8f0e2cd40e05189ec81232da84bd6e1a" | ||
5 | DEPENDS = "ecore evas imlib2 gpsd edje edje-native mysql5 intltool-native" | ||
6 | |||
7 | SRC_URI = "http://www.gps-routes.info/debian/pool/main/m/mcnavi/mcnavi_${PV}.tar.gz" | ||
8 | SRC_URI[md5sum] = "6860cde5c02a9f93c829da4b10e5a226" | ||
9 | SRC_URI[sha256sum] = "ee7f65155e91386175875fc4f72f4bc94e4e9cdb8258112632da94520ef2c349" | ||
10 | |||
11 | S = "${WORKDIR}/${PN}" | ||
12 | |||
13 | inherit autotools | ||
14 | |||
15 | PNBLACKLIST[mcnavi] ?= "BROKEN: latest version 0.3.4 is 3 years old and now broken with more strict ejde_cc from efl-1.13 - the recipe will be removed on 2017-09-01 unless the issue is fixed" | ||
16 | # | edje_cc: Error. parse error 0.3.4-r0/mcnavi/data/themes/Default/main.edc:126. invalid state name: 'none'. "default" state must always be first. | ||
17 | # | edje_cc: Error. parse error 0.3.4-r0/mcnavi/data/themes/Default/itinerary.edc:84. invalid state name: 'none'. "default" state must always be first. | ||
18 | # | edje_cc: Error. parse error 0.3.4-r0/mcnavi/data/themes/Default/text.edc:1129. invalid state name: 'none'. "default" state must always be first. | ||
19 | # | edje_cc: Error. parse error 0.3.4-r0/mcnavi/data/themes/Default/fileopen.edc:78. invalid state name: 'off'. "default" state must always be first. | ||