Discussion:
[Buildroot] [PATCH v10 04/28] package/efl/libefl: add webp dependency
Romain Naour
2015-12-15 22:40:16 UTC
Permalink
WebP is a new image format that provides lossless and lossy
compression for images on the web. So enabling webp support
in efl libraries allow to loads images using WebP.

Also, it one of the "highly recommended" dependecies [1]
according to the README but disabling it doesn't need
the --enable-i-really-know-what-i-am-doing... option.
That's why BR2_PACKAGE_LIBEFL_WEBP is not added to
BR2_PACKAGE_LIBEFL_RECOMMENDED_CONFIG.

[1] https://git.enlightenment.org/core/efl.git/tree/README?id=v1.15.2#n486

Signed-off-by: Romain Naour <***@openwide.fr>
Reviewed-by: "Yann E. MORIN" <***@free.fr>
---
v6: select BR2_PACKAGE_WEBP (Yann E.Morin)
v4: rename to libefl
improve commit log
---
package/efl/libefl/Config.in | 6 ++++++
package/efl/libefl/libefl.mk | 9 +++++++--
2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/package/efl/libefl/Config.in b/package/efl/libefl/Config.in
index 41160d4..74e75ec 100644
--- a/package/efl/libefl/Config.in
+++ b/package/efl/libefl/Config.in
@@ -145,4 +145,10 @@ config BR2_PACKAGE_LIBEFL_TIFF
help
This enables the loader code that loads tiff files.

+config BR2_PACKAGE_LIBEFL_WEBP
+ bool "libevas webp image loader"
+ select BR2_PACKAGE_WEBP
+ help
+ This enables the loader code that loads images using WebP.
+
endif # BR2_PACKAGE_LIBEFL
diff --git a/package/efl/libefl/libefl.mk b/package/efl/libefl/libefl.mk
index db150d0..bd20039 100644
--- a/package/efl/libefl/libefl.mk
+++ b/package/efl/libefl/libefl.mk
@@ -32,7 +32,6 @@ LIBEFL_GETTEXTIZE = YES
# --disable-cxx-bindings: disable C++11 bindings.
# --disable-fb: disable frame buffer support.
# --disable-image-loader-jp2k: disable JPEG 2000 support.
-# --disable-image-loader-webp: disable webp support.
# --disable-sdl: disable sdl2 support.
# --disable-systemd: disable systemd support.
# --enable-lua-old: disable Elua and remove luajit dependency.
@@ -44,7 +43,6 @@ LIBEFL_CONF_OPTS = \
--disable-cxx-bindings \
--disable-fb \
--disable-image-loader-jp2k \
- --disable-image-loader-webp \
--disable-sdl \
--disable-systemd \
--enable-lua-old \
@@ -176,6 +174,13 @@ else
LIBEFL_CONF_OPTS += --disable-image-loader-tiff
endif

+ifeq ($(BR2_PACKAGE_LIBEFL_WEBP),y)
+LIBEFL_CONF_OPTS += --enable-image-loader-webp=yes
+LIBEFL_DEPENDENCIES += webp
+else
+LIBEFL_CONF_OPTS += --disable-image-loader-webp
+endif
+
$(eval $(autotools-package))

################################################################################
--
2.4.3
Romain Naour
2015-12-15 22:40:14 UTC
Permalink
Harfbuzz allow to enable complex text shaping and layouting
support in efl libraries.

Also, it one of the "highly recommended" dependecies
according to the README but disabling it doesn't need
the --enable-i-really-know-what-i-am-doing... option.
That's why harfbuzz is not added to
BR2_PACKAGE_LIBEFL_RECOMMENDED_CONFIG.

Signed-off-by: Romain Naour <***@openwide.fr>
Reviewed-by: "Yann E. MORIN" <***@free.fr>
---
v6: use --enable/disable options
v4: rename to libefl
improve commit log.
---
package/efl/libefl/libefl.mk | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/package/efl/libefl/libefl.mk b/package/efl/libefl/libefl.mk
index dad5e40..5059f8c 100644
--- a/package/efl/libefl/libefl.mk
+++ b/package/efl/libefl/libefl.mk
@@ -31,7 +31,6 @@ LIBEFL_GETTEXTIZE = YES
# Configure options:
# --disable-cxx-bindings: disable C++11 bindings.
# --disable-fb: disable frame buffer support.
-# --disable-harfbuzz: disable harfbuzz support.
# --disable-image-loader-jp2k: disable JPEG 2000 support.
# --disable-image-loader-webp: disable webp support.
# --disable-sdl: disable sdl2 support.
@@ -45,7 +44,6 @@ LIBEFL_CONF_OPTS = \
--with-eolian-gen=$(HOST_DIR)/usr/bin/eolian_gen \
--disable-cxx-bindings \
--disable-fb \
- --disable-harfbuzz \
--disable-image-loader-jp2k \
--disable-image-loader-webp \
--disable-sdl \
@@ -109,6 +107,13 @@ else
LIBEFL_CONF_OPTS += --disable-pulseaudio
endif

+ifeq ($(BR2_PACKAGE_HARFBUZZ),y)
+LIBEFL_DEPENDENCIES += harfbuzz
+LIBEFL_CONF_OPTS += --enable-harfbuzz
+else
+LIBEFL_CONF_OPTS += --disable-harfbuzz
+endif
+
ifeq ($(BR2_PACKAGE_TSLIB),y)
LIBEFL_DEPENDENCIES += tslib
LIBEFL_CONF_OPTS += --enable-tslib
--
2.4.3
Romain Naour
2015-12-15 22:40:15 UTC
Permalink
See:
https://www.enlightenment.org/about-wayland

Signed-off-by: Romain Naour <***@openwide.fr>
Reviewed-by: "Yann E. MORIN" <***@free.fr>
---
v6: use --enable/disable options
v4: rename to libefl
---
package/efl/libefl/Config.in | 1 +
package/efl/libefl/libefl.mk | 9 +++++++--
2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/package/efl/libefl/Config.in b/package/efl/libefl/Config.in
index cc39c82..41160d4 100644
--- a/package/efl/libefl/Config.in
+++ b/package/efl/libefl/Config.in
@@ -4,6 +4,7 @@ config BR2_PACKAGE_LIBEFL
select BR2_PACKAGE_FREETYPE
select BR2_PACKAGE_JPEG # Emile needs libjpeg
select BR2_PACKAGE_LIBCURL # Ecore_con_url, runtime dependency
+ select BR2_PACKAGE_LIBXKBCOMMON if BR2_PACKAGE_WAYLAND
select BR2_PACKAGE_UTIL_LINUX
# libblkid is part of required tools, see EFL's README.
select BR2_PACKAGE_UTIL_LINUX_LIBBLKID
diff --git a/package/efl/libefl/libefl.mk b/package/efl/libefl/libefl.mk
index 5059f8c..db150d0 100644
--- a/package/efl/libefl/libefl.mk
+++ b/package/efl/libefl/libefl.mk
@@ -35,7 +35,6 @@ LIBEFL_GETTEXTIZE = YES
# --disable-image-loader-webp: disable webp support.
# --disable-sdl: disable sdl2 support.
# --disable-systemd: disable systemd support.
-# --disable-wayland: disable wayland support.
# --enable-lua-old: disable Elua and remove luajit dependency.
# --with-opengl=none: disable opengl support.
# --with-x11=none: remove dependency on X.org.
@@ -48,7 +47,6 @@ LIBEFL_CONF_OPTS = \
--disable-image-loader-webp \
--disable-sdl \
--disable-systemd \
- --disable-wayland \
--enable-lua-old \
--with-opengl=none \
--with-x11=none
@@ -140,6 +138,13 @@ else
LIBEFL_CONF_OPTS += --with-crypto=none
endif # BR2_PACKAGE_OPENSSL

+ifeq ($(BR2_PACKAGE_WAYLAND),y)
+LIBEFL_DEPENDENCIES += wayland libxkbcommon
+LIBEFL_CONF_OPTS += --enable-wayland
+else
+LIBEFL_CONF_OPTS += --disable-wayland
+endif
+
# Loaders that need external dependencies needs to be --enable-XXX=yes
# otherwise the default is '=static'.
# All other loaders are statically built-in
--
2.4.3
Romain Naour
2015-12-15 22:40:17 UTC
Permalink
Add an config option to enable frame buffer support
in the efl libraries.

From the README [1]:
This requires linux frame-buffer support, headers etc. This supports
basic frame-buffers like /dev/fb as well as input via /dev/input for
keyboards and mice in a basic way.

There is a bug eina_module_load().
From [2]:
When running terminology, a message appears in eina_module_load with:
could not dlopen("/usr/lib/ecore_evas/engines/fb/v-1.15/module.so",
Error relocating /usr/lib/ecore_evas/engines/fb/v-1.15/module.so:
ecore_fb_ts_shutdown: symbol not found): RTLD_NOW
It seems like the EAPI macro has no effect...

A patch from Ross Vandegrift has been posted on enlightenment mailing
list [3], but it's not yet an upstream patch.

[1] https://git.enlightenment.org/core/efl.git/tree/README?id=v1.15.2#n521
[2] http://sourceforge.net/p/enlightenment/mailman/message/34493376
[3] http://sourceforge.net/p/enlightenment/mailman/message/34492801

Signed-off-by: Romain Naour <***@openwide.fr>
Reviewed-by: "Yann E. MORIN" <***@free.fr>
---
v6: squash with the patch adding the fix provided by Vicente Bergas.
v4: rename to libefl
improve commit log
---
...ecore_fb_private.h-define-EAPI-before-use.patch | 64 ++++++++++++++++++++++
package/efl/libefl/Config.in | 5 ++
package/efl/libefl/libefl.mk | 8 ++-
3 files changed, 75 insertions(+), 2 deletions(-)
create mode 100644 package/efl/libefl/0001-ecore_fb_private.h-define-EAPI-before-use.patch

diff --git a/package/efl/libefl/0001-ecore_fb_private.h-define-EAPI-before-use.patch b/package/efl/libefl/0001-ecore_fb_private.h-define-EAPI-before-use.patch
new file mode 100644
index 0000000..81d14f9
--- /dev/null
+++ b/package/efl/libefl/0001-ecore_fb_private.h-define-EAPI-before-use.patch
@@ -0,0 +1,64 @@
+From 2fb4fdf641e67e49b87a3524038a694c8dd0ba4e Mon Sep 17 00:00:00 2001
+From: Vicente Bergas <***@gmail.com>
+Date: Fri, 9 Oct 2015 23:35:20 +0200
+Subject: [PATCH] ecore_fb_private.h: define EAPI before use
+
+From [1]:
+When running terminology, a message appears in eina_module_load with:
+could not dlopen("/usr/lib/ecore_evas/engines/fb/v-1.15/module.so",
+Error relocating /usr/lib/ecore_evas/engines/fb/v-1.15/module.so:
+ecore_fb_ts_shutdown: symbol not found): RTLD_NOW
+It seems like the EAPI macro has no effect...
+
+A patch from Ross Vandegrift has been posted on enlightenment mailing
+list [2], but it's not yet an upstream patch.
+
+[1] http://sourceforge.net/p/enlightenment/mailman/message/34493376
+[2] http://sourceforge.net/p/enlightenment/mailman/message/34492801
+
+Signed-off-by: Vicente Bergas <***@gmail.com>
+[Romain:
+ - Add a commit log
+ - Add a link to the enlightenment mailing list
+ - Add Vicente's SoB line]
+Signed-off-by: Romain Naour <***@openwide.fr>
+---
+ src/lib/ecore_fb/ecore_fb_private.h | 17 +++++++++++++++++
+ 1 file changed, 17 insertions(+)
+
+diff --git a/src/lib/ecore_fb/ecore_fb_private.h b/src/lib/ecore_fb/ecore_fb_private.h
+index f7dc0c6..f54c8d2 100644
+--- a/src/lib/ecore_fb/ecore_fb_private.h
++++ b/src/lib/ecore_fb/ecore_fb_private.h
+@@ -33,6 +33,20 @@
+
+ #include <Ecore_Fb.h>
+
++#ifdef EAPI
++# undef EAPI
++#endif
++
++#ifdef __GNUC__
++# if __GNUC__ >= 4
++# define EAPI __attribute__ ((visibility("default")))
++# else
++# define EAPI
++# endif
++#else
++# define EAPI
++#endif
++
+ /* ecore_fb_li.c */
+ struct _Ecore_Fb_Input_Device
+ {
+@@ -92,4 +106,7 @@ void ecore_fb_vt_shutdown(void);
+ #define TS_GET_CAL 0x8014660a
+ #endif
+
++#undef EAPI
++#define EAPI
++
+ #endif
+--
+2.4.3
+
diff --git a/package/efl/libefl/Config.in b/package/efl/libefl/Config.in
index 74e75ec..04ad31e 100644
--- a/package/efl/libefl/Config.in
+++ b/package/efl/libefl/Config.in
@@ -117,6 +117,11 @@ comment "Warning: one of the recommended option for EFL is not enabled"
|| !BR2_PACKAGE_LIBEFL_PULSEAUDIO \
|| !BR2_PACKAGE_LIBEFL_UTIL_LINUX_LIBMOUNT

+comment "libecore video support"
+
+config BR2_PACKAGE_LIBEFL_FB
+ bool "FB support"
+
comment "libevas loaders"

config BR2_PACKAGE_LIBEFL_PNG
diff --git a/package/efl/libefl/libefl.mk b/package/efl/libefl/libefl.mk
index bd20039..cdc28bb 100644
--- a/package/efl/libefl/libefl.mk
+++ b/package/efl/libefl/libefl.mk
@@ -30,7 +30,6 @@ LIBEFL_GETTEXTIZE = YES

# Configure options:
# --disable-cxx-bindings: disable C++11 bindings.
-# --disable-fb: disable frame buffer support.
# --disable-image-loader-jp2k: disable JPEG 2000 support.
# --disable-sdl: disable sdl2 support.
# --disable-systemd: disable systemd support.
@@ -41,7 +40,6 @@ LIBEFL_CONF_OPTS = \
--with-edje-cc=$(HOST_DIR)/usr/bin/edje_cc \
--with-eolian-gen=$(HOST_DIR)/usr/bin/eolian_gen \
--disable-cxx-bindings \
- --disable-fb \
--disable-image-loader-jp2k \
--disable-sdl \
--disable-systemd \
@@ -143,6 +141,12 @@ else
LIBEFL_CONF_OPTS += --disable-wayland
endif

+ifeq ($(BR2_PACKAGE_LIBEFL_FB),y)
+LIBEFL_CONF_OPTS += --enable-fb
+else
+LIBEFL_CONF_OPTS += --disable-fb
+endif
+
# Loaders that need external dependencies needs to be --enable-XXX=yes
# otherwise the default is '=static'.
# All other loaders are statically built-in
--
2.4.3
Romain Naour
2015-12-15 22:40:25 UTC
Permalink
Signed-off-by: Romain Naour <***@openwide.fr>
Reviewed-by: "Yann E. MORIN" <***@free.fr>
---
v6: Even if we are not sure if libefl and libelementary will always
be released in tandem, keep it in sync since there is no reason
to use a different version.
---
package/efl/efl.mk | 2 ++
package/efl/libefl/libefl.mk | 3 +--
package/efl/libelementary/libelementary.mk | 2 +-
3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/package/efl/efl.mk b/package/efl/efl.mk
index 99e4d14..151ac28 100644
--- a/package/efl/efl.mk
+++ b/package/efl/efl.mk
@@ -1,2 +1,4 @@

+EFL_VERSION = 1.15.2
+
include $(sort $(wildcard package/efl/*/*.mk))
diff --git a/package/efl/libefl/libefl.mk b/package/efl/libefl/libefl.mk
index 5e8009e..c60a507 100644
--- a/package/efl/libefl/libefl.mk
+++ b/package/efl/libefl/libefl.mk
@@ -4,8 +4,7 @@
#
################################################################################

-# hardcode the version here since the bump to 1.15 is not complete in Buildroot
-LIBEFL_VERSION = 1.15.2
+LIBEFL_VERSION = $(EFL_VERSION)
LIBEFL_SOURCE = efl-$(LIBEFL_VERSION).tar.xz
LIBEFL_SITE = http://download.enlightenment.org/rel/libs/efl
LIBEFL_LICENSE = BSD-2c, LGPLv2.1+, GPLv2+
diff --git a/package/efl/libelementary/libelementary.mk b/package/efl/libelementary/libelementary.mk
index 4ba8681..c920801 100644
--- a/package/efl/libelementary/libelementary.mk
+++ b/package/efl/libelementary/libelementary.mk
@@ -4,7 +4,7 @@
#
################################################################################

-LIBELEMENTARY_VERSION = 1.15.2
+LIBELEMENTARY_VERSION = $(EFL_VERSION)
LIBELEMENTARY_SOURCE = elementary-$(LIBELEMENTARY_VERSION).tar.xz
LIBELEMENTARY_SITE = http://download.enlightenment.org/rel/libs/elementary
LIBELEMENTARY_LICENSE = LGPLv2.1
--
2.4.3
Romain Naour
2015-12-15 22:40:38 UTC
Permalink
Libeina is now available in efl package.

Signed-off-by: Romain Naour <***@openwide.fr>
Reviewed-by: "Yann E. MORIN" <***@free.fr>
---
v6: Improve lecacy help text (Yann E.Morin)
v5: remove libeina directory
v4: update Config.in to use libefl
v3: update legacy option for 2015.11
update help text
---
Config.in.legacy | 7 +++++++
package/efl/Config.in | 1 -
package/efl/libeina/Config.in | 6 ------
package/efl/libeina/libeina.mk | 18 ------------------
4 files changed, 7 insertions(+), 25 deletions(-)
delete mode 100644 package/efl/libeina/Config.in
delete mode 100644 package/efl/libeina/libeina.mk

diff --git a/Config.in.legacy b/Config.in.legacy
index 1df81ea..e1ea06f 100644
--- a/Config.in.legacy
+++ b/Config.in.legacy
@@ -107,6 +107,13 @@ endif
###############################################################################
comment "Legacy options removed in 2016.02"

+config BR2_PACKAGE_LIBEINA
+ bool "libeina package has been removed"
+ select BR2_LEGACY
+ select BR2_PACKAGE_EFL
+ help
+ With EFL 1.15, libeina is now provided by the libefl package.
+
config BR2_PACKAGE_LIBEET
bool "libeet package has been removed"
select BR2_LEGACY
diff --git a/package/efl/Config.in b/package/efl/Config.in
index a01b971..80658b2 100644
--- a/package/efl/Config.in
+++ b/package/efl/Config.in
@@ -15,7 +15,6 @@ menuconfig BR2_PACKAGE_EFL

if BR2_PACKAGE_EFL

-source "package/efl/libeina/Config.in"
source "package/efl/libefl/Config.in"
source "package/efl/libelementary/Config.in"

diff --git a/package/efl/libeina/Config.in b/package/efl/libeina/Config.in
deleted file mode 100644
index 80600ad..0000000
--- a/package/efl/libeina/Config.in
+++ /dev/null
@@ -1,6 +0,0 @@
-config BR2_PACKAGE_LIBEINA
- bool "libeina"
- help
- Eina is a tiny library to handle data types (list, hash, etc.)
-
- http://trac.enlightenment.org/e/wiki/Eina
diff --git a/package/efl/libeina/libeina.mk b/package/efl/libeina/libeina.mk
deleted file mode 100644
index ae9f1c6..0000000
--- a/package/efl/libeina/libeina.mk
+++ /dev/null
@@ -1,18 +0,0 @@
-################################################################################
-#
-# libeina
-#
-################################################################################
-
-LIBEINA_VERSION = 1.7.10
-LIBEINA_SOURCE = eina-$(LIBEINA_VERSION).tar.bz2
-LIBEINA_SITE = http://download.enlightenment.org/releases
-LIBEINA_LICENSE = LGPLv2.1+
-LIBEINA_LICENSE_FILES = COPYING
-
-LIBEINA_INSTALL_STAGING = YES
-
-LIBEINA_DEPENDENCIES = host-pkgconf
-
-$(eval $(autotools-package))
-$(eval $(host-autotools-package))
--
2.4.3
Romain Naour
2015-12-15 22:40:28 UTC
Permalink
The libecore package will be removed in a followup
patch, so switch to libefl package which contain an
updated version of libecore.

Reported-by: "Yann E. MORIN" <***@free.fr>
Signed-off-by: Romain Naour <***@openwide.fr>
Reviewed-by: "Yann E. MORIN" <***@free.fr>
---
v6: new patch
---
package/dbus-cpp/dbus-cpp.mk | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/dbus-cpp/dbus-cpp.mk b/package/dbus-cpp/dbus-cpp.mk
index 37d12e7..9236ba7 100644
--- a/package/dbus-cpp/dbus-cpp.mk
+++ b/package/dbus-cpp/dbus-cpp.mk
@@ -26,9 +26,9 @@ DBUS_CPP_AUTORECONF = YES
DBUS_CPP_LICENSE = LGPLv2.1+
DBUS_CPP_LICENSE_FILES = COPYING

-ifeq ($(BR2_PACKAGE_LIBECORE),y)
+ifeq ($(BR2_PACKAGE_EFL),y)
DBUS_CPP_CONF_OPTS += --enable-ecore
-DBUS_CPP_DEPENDENCIES += libecore
+DBUS_CPP_DEPENDENCIES += libefl
else
DBUS_CPP_CONF_OPTS += --disable-ecore
endif
--
2.4.3
Romain Naour
2015-12-15 22:40:39 UTC
Permalink
Signed-off-by: Romain Naour <***@openwide.fr>
Reviewed-by: "Yann E. MORIN" <***@free.fr>
---
v6: Add missing vlc dependencies and host-pkgconf (Yann E.Morin)
v5: Use depends on BR2_PACKAGE_EFL instead of select (ThomasP)
update comment on dependencies
v4: update Config.in to use libefl
v3: remove trailing slash (Vicente Bergas)
---
package/Config.in | 1 +
package/libemotion-generic-players/Config.in | 19 +++++++++++++++++++
.../libemotion-generic-players.hash | 2 ++
.../libemotion-generic-players.mk | 17 +++++++++++++++++
4 files changed, 39 insertions(+)
create mode 100644 package/libemotion-generic-players/Config.in
create mode 100644 package/libemotion-generic-players/libemotion-generic-players.hash
create mode 100644 package/libemotion-generic-players/libemotion-generic-players.mk

diff --git a/package/Config.in b/package/Config.in
index 1eea89b..90a01f8 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -829,6 +829,7 @@ menu "Graphics"
source "package/libdri2/Config.in"
source "package/libdrm/Config.in"
source "package/libexif/Config.in"
+ source "package/libemotion-generic-players/Config.in"
source "package/libevas-generic-loaders/Config.in"
source "package/libfm/Config.in"
source "package/libfm-extra/Config.in"
diff --git a/package/libemotion-generic-players/Config.in b/package/libemotion-generic-players/Config.in
new file mode 100644
index 0000000..f6dd45d
--- /dev/null
+++ b/package/libemotion-generic-players/Config.in
@@ -0,0 +1,19 @@
+config BR2_PACKAGE_LIBEMOTION_GENERIC_PLAYERS
+ bool "libemotion generic players"
+ depends on BR2_PACKAGE_EFL
+ depends on (BR2_UCLIBC_VERSION_SNAPSHOT || BR2_UCLIBC_VERSION_NG || BR2_TOOLCHAIN_USES_GLIBC) # vlc
+ depends on BR2_INSTALL_LIBSTDCPP # vlc
+ depends on BR2_USE_WCHAR # vlc
+ depends on BR2_TOOLCHAIN_HAS_THREADS # vlc
+ depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_7 # vlc
+ select BR2_PACKAGE_VLC # needs libvlc
+ help
+ A media object library for Evas and Ecore.
+
+ https://www.enlightenment.org
+ https://docs.enlightenment.org/stable/efl/emotion_main.html
+
+comment "libemotion generic players needs a uclibc snapshot, uclibc-ng or (e)glibc toolchain w/ C++, wchar, threads, headers >= 3.7"
+ depends on !(BR2_UCLIBC_VERSION_SNAPSHOT || BR2_UCLIBC_VERSION_NG || BR2_TOOLCHAIN_USES_GLIBC) \
+ || !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR \
+ || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_7
diff --git a/package/libemotion-generic-players/libemotion-generic-players.hash b/package/libemotion-generic-players/libemotion-generic-players.hash
new file mode 100644
index 0000000..80c8123
--- /dev/null
+++ b/package/libemotion-generic-players/libemotion-generic-players.hash
@@ -0,0 +1,2 @@
+# From https://download.enlightenment.org/rel/libs/emotion_generic_players/emotion_generic_players-1.15.0.tar.xz.sha256
+sha256 9f6d5e9041ac7c014d663dac56d1b39ac42a45abe954d09d0edbf6e759e55f5f emotion_generic_players-1.15.0.tar.xz
diff --git a/package/libemotion-generic-players/libemotion-generic-players.mk b/package/libemotion-generic-players/libemotion-generic-players.mk
new file mode 100644
index 0000000..ef41b2e
--- /dev/null
+++ b/package/libemotion-generic-players/libemotion-generic-players.mk
@@ -0,0 +1,17 @@
+################################################################################
+#
+# libemotion-generic-players
+#
+################################################################################
+
+LIBEMOTION_GENERIC_PLAYERS_VERSION = 1.15.0
+LIBEMOTION_GENERIC_PLAYERS_SOURCE = emotion_generic_players-$(LIBEMOTION_GENERIC_PLAYERS_VERSION).tar.xz
+LIBEMOTION_GENERIC_PLAYERS_SITE = http://download.enlightenment.org/rel/libs/emotion_generic_players
+LIBEMOTION_GENERIC_PLAYERS_LICENSE = BSD-2c
+LIBEMOTION_GENERIC_PLAYERS_LICENSE_FILES = COPYING
+
+LIBEMOTION_GENERIC_PLAYERS_INSTALL_STAGING = YES
+
+LIBEMOTION_GENERIC_PLAYERS_DEPENDENCIES = host-pkgconf libefl vlc
+
+$(eval $(autotools-package))
--
2.4.3
Romain Naour
2015-12-15 22:40:18 UTC
Permalink
Like for webp format, add an option to enable the JPEG 2000
codec support in the efl libraries.

Signed-off-by: Romain Naour <***@openwide.fr>
Reviewed-by: "Yann E. MORIN" <***@free.fr>
---
v6: use --disable option
v4: rename to libefl
improve commit log
---
package/efl/libefl/Config.in | 7 +++++++
package/efl/libefl/libefl.mk | 9 +++++++--
2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/package/efl/libefl/Config.in b/package/efl/libefl/Config.in
index 04ad31e..504cd4b 100644
--- a/package/efl/libefl/Config.in
+++ b/package/efl/libefl/Config.in
@@ -131,6 +131,13 @@ config BR2_PACKAGE_LIBEFL_PNG
This enables the loader code that loads png files using
libpng.

+config BR2_PACKAGE_LIBEFL_JP2K
+ bool "libevas jp2k loader"
+ select BR2_PACKAGE_OPENJPEG
+ help
+ This enables the loader code that loads jp2k files using
+ openjpeg.
+
config BR2_PACKAGE_LIBEFL_JPEG
bool "libevas jpeg loader"
help
diff --git a/package/efl/libefl/libefl.mk b/package/efl/libefl/libefl.mk
index cdc28bb..e1eb313 100644
--- a/package/efl/libefl/libefl.mk
+++ b/package/efl/libefl/libefl.mk
@@ -30,7 +30,6 @@ LIBEFL_GETTEXTIZE = YES

# Configure options:
# --disable-cxx-bindings: disable C++11 bindings.
-# --disable-image-loader-jp2k: disable JPEG 2000 support.
# --disable-sdl: disable sdl2 support.
# --disable-systemd: disable systemd support.
# --enable-lua-old: disable Elua and remove luajit dependency.
@@ -40,7 +39,6 @@ LIBEFL_CONF_OPTS = \
--with-edje-cc=$(HOST_DIR)/usr/bin/edje_cc \
--with-eolian-gen=$(HOST_DIR)/usr/bin/eolian_gen \
--disable-cxx-bindings \
- --disable-image-loader-jp2k \
--disable-sdl \
--disable-systemd \
--enable-lua-old \
@@ -178,6 +176,13 @@ else
LIBEFL_CONF_OPTS += --disable-image-loader-tiff
endif

+ifeq ($(BR2_PACKAGE_LIBEFL_JP2K),y)
+LIBEFL_CONF_OPTS += --enable-image-loader-jp2k=yes
+LIBEFL_DEPENDENCIES += openjpeg
+else
+LIBEFL_CONF_OPTS += --disable-image-loader-jp2k
+endif
+
ifeq ($(BR2_PACKAGE_LIBEFL_WEBP),y)
LIBEFL_CONF_OPTS += --enable-image-loader-webp=yes
LIBEFL_DEPENDENCIES += webp
--
2.4.3
Romain Naour
2015-12-15 22:40:36 UTC
Permalink
Libevas is now available in efl package.

Signed-off-by: Romain Naour <***@openwide.fr>
Reviewed-by: "Yann E. MORIN" <***@free.fr>
---
v6: Improve lecacy help text (Yann E.Morin)
v5: remove libevas directory
v4: update Config.in to use libefl
v3: update legacy option for 2015.11
update help text
---
Config.in.legacy | 7 +
package/efl/Config.in | 1 -
package/efl/libevas/0001-giflib.patch | 98 --------------
package/efl/libevas/Config.in | 211 -----------------------------
package/efl/libevas/libevas.mk | 247 ----------------------------------
5 files changed, 7 insertions(+), 557 deletions(-)
delete mode 100644 package/efl/libevas/0001-giflib.patch
delete mode 100644 package/efl/libevas/Config.in
delete mode 100644 package/efl/libevas/libevas.mk

diff --git a/Config.in.legacy b/Config.in.legacy
index 7a9095c..2ee2f42 100644
--- a/Config.in.legacy
+++ b/Config.in.legacy
@@ -107,6 +107,13 @@ endif
###############################################################################
comment "Legacy options removed in 2016.02"

+config BR2_PACKAGE_LIBEVAS
+ bool "libevas package has been removed"
+ select BR2_LEGACY
+ select BR2_PACKAGE_EFL
+ help
+ With EFL 1.15, libevas is now provided by the libefl package.
+
config BR2_PACKAGE_LIBECORE
bool "libecore package has been removed"
select BR2_LEGACY
diff --git a/package/efl/Config.in b/package/efl/Config.in
index df7c446..48ea706 100644
--- a/package/efl/Config.in
+++ b/package/efl/Config.in
@@ -18,7 +18,6 @@ if BR2_PACKAGE_EFL
source "package/efl/libeina/Config.in"
source "package/efl/libeet/Config.in"
source "package/efl/libefl/Config.in"
-source "package/efl/libevas/Config.in"
source "package/efl/libelementary/Config.in"

endif # BR2_PACKAGE_EFL
diff --git a/package/efl/libevas/0001-giflib.patch b/package/efl/libevas/0001-giflib.patch
deleted file mode 100644
index 9342687..0000000
--- a/package/efl/libevas/0001-giflib.patch
+++ /dev/null
@@ -1,98 +0,0 @@
-Adjust source code to work with giflib 5.1x
-
-From http://giflib.sourceforge.net/gif_lib.html: GIF file openers and
-closers - DGifOpenFileName(), DGifOpenFileHandle(), DGifOpen(),
-DGifClose(), EGifOpenFileName(), EGifOpenFileHandle(), EGifOpen(), and
-EGifClose() - all now take a final integer address argument. If
-non-null, this is used to pass back an error code when the function
-returns NULL.
-
-Downloaded from
-http://commit.cvs.pld.groups.com.ru/332837-packagesevas_fix_building_with_giflib_51_rel_6
-
-Signed-off-by: Bernd Kuhls <***@t-online.de>
-
-diff -uNr evas-1.7.10.org/src/modules/loaders/gif/evas_image_load_gif.c evas-1.7.10/src/modules/loaders/gif/evas_image_load_gif.c
---- evas-1.7.10.org/src/modules/loaders/gif/evas_image_load_gif.c 2013-08-01 17:41:35.000000000 +0200
-+++ evas-1.7.10/src/modules/loaders/gif/evas_image_load_gif.c 2015-01-26 19:44:20.132955194 +0100
-@@ -338,7 +338,7 @@
-
- if (!cmap)
- {
-- DGifCloseFile(gif);
-+ DGifCloseFile(gif, NULL);
- for (i = 0; i < scale_h; i++)
- {
- free(rows[i]);
-@@ -725,7 +725,7 @@
- if ((w < 1) || (h < 1) || (w > IMG_MAX_SIZE) || (h > IMG_MAX_SIZE) ||
- IMG_TOO_BIG(w, h))
- {
-- DGifCloseFile(gif);
-+ DGifCloseFile(gif, NULL);
- if (IMG_TOO_BIG(w, h))
- *error = EVAS_LOAD_ERROR_RESOURCE_ALLOCATION_FAILED;
- else
-@@ -740,7 +740,7 @@
- if (DGifGetRecordType(gif, &rec) == GIF_ERROR)
- {
- /* PrintGifError(); */
-- DGifCloseFile(gif);
-+ DGifCloseFile(gif, NULL);
- *error = EVAS_LOAD_ERROR_UNKNOWN_FORMAT;
- return EINA_FALSE;
- }
-@@ -754,7 +754,7 @@
- if (DGifGetImageDesc(gif) == GIF_ERROR)
- {
- /* PrintGifError(); */
-- DGifCloseFile(gif);
-+ DGifCloseFile(gif, NULL);
- *error = EVAS_LOAD_ERROR_UNKNOWN_FORMAT;
- return EINA_FALSE;
- }
-@@ -762,7 +762,7 @@
- if (DGifGetCode(gif, &img_code, &img) == GIF_ERROR)
- {
- /* PrintGifError(); */
-- DGifCloseFile(gif);
-+ DGifCloseFile(gif, NULL);
- *error = EVAS_LOAD_ERROR_UNKNOWN_FORMAT;
- return EINA_FALSE;
- }
-@@ -818,7 +818,7 @@
- ie->frames = NULL;
- }
-
-- DGifCloseFile(gif);
-+ DGifCloseFile(gif, NULL);
- *error = EVAS_LOAD_ERROR_NONE;
- return EINA_TRUE;
- }
-@@ -885,7 +885,7 @@
- }
-
- ie->frames = eina_list_append(ie->frames, frame);
-- DGifCloseFile(gif);
-+ DGifCloseFile(gif, NULL);
- return EINA_TRUE;
- }
-
-@@ -959,7 +959,7 @@
- *error = EVAS_LOAD_ERROR_UNKNOWN_FORMAT;
- return EINA_FALSE;
- }
-- DGifCloseFile(gif);
-+ DGifCloseFile(gif, NULL);
- *error = EVAS_LOAD_ERROR_NONE;
- return EINA_TRUE;
- }
-@@ -1080,7 +1080,7 @@
- }
- } while (rec != TERMINATE_RECORD_TYPE);
-
-- DGifCloseFile(gif);
-+ DGifCloseFile(gif, NULL);
- return duration;
- }
-
diff --git a/package/efl/libevas/Config.in b/package/efl/libevas/Config.in
deleted file mode 100644
index 6645a14..0000000
--- a/package/efl/libevas/Config.in
+++ /dev/null
@@ -1,211 +0,0 @@
-comment "libevas needs a toolchain w/ threads"
- depends on !BR2_TOOLCHAIN_HAS_THREADS
-
-config BR2_PACKAGE_LIBEVAS
- bool "libevas"
- # libevas should normally build without threads, but due to a
- # build issue when the async preloader is disabled, which is
- # needed when no threads are available, we don't allow evas to
- # be built without threads. This should be revisited when efl
- # is bumped to 1.8.
- depends on BR2_TOOLCHAIN_HAS_THREADS
- select BR2_PACKAGE_FREETYPE
- select BR2_PACKAGE_LIBEINA
- # required to build so far
- select BR2_PACKAGE_LIBEVAS_SCALE_SMOOTH
- help
- Evas is a clean display canvas API for several target
- display systems that can draw anti-aliased text, smooth
- super and sub-sampled scaled images, alpha-blend objects
- much and more.
-
- http://trac.enlightenment.org/e/wiki/Evas
-
-if BR2_PACKAGE_LIBEVAS
-
-comment "libevas rendering options"
-
-config BR2_PACKAGE_LIBEVAS_SCALE_SAMPLE
- bool "libevas sampling scaler"
- help
- This enables the sampling scaler code. This is the fastest
- image scaling code, but also the lowest quality.
-
-config BR2_PACKAGE_LIBEVAS_SCALE_SMOOTH
- bool "libevas smooth scaler"
- help
- This is the nicest looking scaler that is not that much
- slower than tri-linear, but it looks really good.
-
-config BR2_PACKAGE_LIBEVAS_SMALL_DITHERING
- bool "libevas small dithering"
- help
- This uses a 4x4 dither mask instead of 128x128. On desktop
- boxes these days (Pentium, Pentium2, amd etc.) the speed
- difference is not really measurable, but the quality of the
- 128x128 dither mask is quite a lot better.
-
-config BR2_PACKAGE_LIBEVAS_LINE_DITHERING
- bool "libevas line dithering"
-
-config BR2_PACKAGE_LIBEVAS_NO_DITHERING
- bool "libevas no dithering"
-
-
-comment "libevas backends"
-
-config BR2_PACKAGE_LIBEVAS_BUFFER
- bool "libevas buffer backend"
- help
- This enables the software buffer rendering engine. There is
- no hardware assist here.
-
-config BR2_PACKAGE_LIBEVAS_DIRECTFB
- bool "libevas DirectFB backend"
- depends on BR2_PACKAGE_DIRECTFB
- default y
- help
- This is the DirectFB engine that uses the DirectFB library
- (http://www.directfb.org) on Linux to access the framebuffer
- with (or maybe without) acceleration.
-
-config BR2_PACKAGE_LIBEVAS_FB
- bool "libevas frame buffer backend"
- help
- This is the software framebuffer driving engine. this uses
- the linux framebuffer device (/dev/fb<x>) and will currently
- just inherit the current framebuffer settings on the fb
- device and use them to run in.
-
-config BR2_PACKAGE_LIBEVAS_SDL
- bool "libevas SDL backend"
- select BR2_PACKAGE_SDL
- help
- This is the software SDL engine that uses SDL library
- (http://www.libsdl.org). This library should work on many
- operating systems.
-
-config BR2_PACKAGE_LIBEVAS_SDL_GL
- bool "libevas SDL OpenGL backend"
- depends on BR2_PACKAGE_SDL_X11
- depends on BR2_PACKAGE_XSERVER_XORG_SERVER_MODULAR # mesa needs big X
- help
- This is the SDL OpenGL engine that uses SDL library
- and OpenGL to render. This may be hardware accelerated.
-
-comment "SDL OpenGL backend needs modular X.org and X11 support in SDL"
- depends on !(BR2_PACKAGE_SDL_X11 && BR2_PACKAGE_XSERVER_XORG_SERVER_MODULAR)
-
-config BR2_PACKAGE_LIBEVAS_X11
- bool "libevas X11 backend"
- depends on BR2_PACKAGE_XORG7
- select BR2_PACKAGE_XLIB_LIBX11
- select BR2_PACKAGE_XLIB_LIBXEXT
- help
- This enables the software X11 rendering engine that renders
- to X drawable targets using highly optimised software
- routines. There is no hardware assist here.
-
-config BR2_PACKAGE_LIBEVAS_X11_GLX
- bool "libevas X11 GLX backend"
- depends on BR2_PACKAGE_XSERVER_XORG_SERVER_MODULAR # mesa needs big X
- select BR2_PACKAGE_XLIB_LIBX11
- select BR2_PACKAGE_XLIB_LIBXRENDER
- select BR2_PACKAGE_XLIB_LIBXEXT
- select BR2_PACKAGE_XPROTO_GLPROTO
- help
- This enables the OpenGL X11 rendering engine that renders
- using GLX which may be hardware accelerated.
-
-config BR2_PACKAGE_LIBEVAS_XCB
- bool "libevas XCB backend"
- depends on BR2_PACKAGE_XORG7
- select BR2_PACKAGE_LIBXCB
- select BR2_PACKAGE_XCB_UTIL
- select BR2_PACKAGE_XCB_PROTO
- select BR2_PACKAGE_PIXMAN
- help
- This enable the software XCB rendering engine. It allows the
- same features than the software X11 engine.
-
-config BR2_PACKAGE_LIBEVAS_XCB_GLX
- bool "libevas XCB GLX backend"
- depends on BR2_PACKAGE_XSERVER_XORG_SERVER_MODULAR # mesa needs big X
- select BR2_PACKAGE_LIBXCB
- select BR2_PACKAGE_XCB_UTIL
- select BR2_PACKAGE_XCB_PROTO
- select BR2_PACKAGE_XPROTO_GLPROTO
- help
- This enables the OpenGL X11 XCB rendering engine that renders
- using GLX which may be hardware accelerated.
-
-choice
- prompt "libevas OpenGL flavor"
- depends on BR2_PACKAGE_LIBEVAS_SDL_GL || BR2_PACKAGE_LIBEVAS_X11_GLX || BR2_PACKAGE_LIBEVAS_XCB_GLX
- default BR2_PACKAGE_LIBEVAS_GL
-
-config BR2_PACKAGE_LIBEVAS_GL
- bool "generic OpenGL"
- depends on BR2_PACKAGE_HAS_LIBGL
- select BR2_PACKAGE_LIBEET
-
-config BR2_PACKAGE_LIBEVAS_GLES_SGX
- bool "OpenGL-ES SGX"
-
-config BR2_PACKAGE_LIBEVAS_GLES_S3C6410
- bool "OpenGL-ES S3C6410"
-endchoice
-
-
-comment "libevas loaders"
-
-config BR2_PACKAGE_LIBEVAS_PNG
- bool "libevas png loader"
- select BR2_PACKAGE_LIBPNG
- help
- This enables the loader code that loads png files using
- libpng.
-
-config BR2_PACKAGE_LIBEVAS_JPEG
- bool "libevas jpeg loader"
- select BR2_PACKAGE_JPEG
- help
- This enables the loader code that loads jpeg files using
- libjpeg.
-
-config BR2_PACKAGE_LIBEVAS_GIF
- bool "libevas gif loader"
- select BR2_PACKAGE_GIFLIB
- help
- This enables the loader code that loads gif files using
- libungif.
-
-config BR2_PACKAGE_LIBEVAS_PMAPS
- bool "libevas pmaps loader"
- help
- This enables the loader code that loads pmaps files.
-
-config BR2_PACKAGE_LIBEVAS_TIFF
- bool "libevas tiff loader"
- select BR2_PACKAGE_TIFF
- help
- This enables the loader code that loads tiff files.
-
-config BR2_PACKAGE_LIBEVAS_XPM
- bool "libevas xpm loader"
- help
- This enables the loader code that loads xpm files.
-
-config BR2_PACKAGE_LIBEVAS_EET
- bool "libevas eet image loader"
- select BR2_PACKAGE_LIBEET
- help
- This enables the loader code that loads images using libeet.
-
-config BR2_PACKAGE_LIBEVAS_EET_FONT
- bool "libevas eet font loader"
- select BR2_PACKAGE_LIBEET
- help
- This enables the loader code that loads fonts using libeet.
-
-endif # BR2_PACKAGE_LIBEVAS
diff --git a/package/efl/libevas/libevas.mk b/package/efl/libevas/libevas.mk
deleted file mode 100644
index 9adb128..0000000
--- a/package/efl/libevas/libevas.mk
+++ /dev/null
@@ -1,247 +0,0 @@
-################################################################################
-#
-# libevas
-#
-################################################################################
-
-LIBEVAS_VERSION = 1.7.10
-LIBEVAS_SOURCE = evas-$(LIBEVAS_VERSION).tar.bz2
-LIBEVAS_SITE = http://download.enlightenment.org/releases
-LIBEVAS_LICENSE = BSD-2c
-LIBEVAS_LICENSE_FILES = COPYING
-
-LIBEVAS_INSTALL_STAGING = YES
-
-LIBEVAS_DEPENDENCIES = host-pkgconf zlib libeina freetype
-
-HOST_LIBEVAS_DEPENDENCIES = \
- host-pkgconf host-zlib host-libeina \
- host-freetype host-libpng host-libjpeg
-HOST_LIBEVAS_CONF_OPTS += \
- --enable-image-loader-png \
- --enable-image-loader-jpeg \
- --disable-image-loader-gif \
- --disable-image-loader-tiff \
- --disable-image-loader-eet \
- --disable-font-loader-eet \
- --disable-cpu-sse3 \
- --disable-software-sdl \
- --disable-gl-sdl \
- --disable-software-xlib \
- --disable-gl-xlib \
- --enable-software-xcb \
- --disable-gl-xcb
-
-# rendering options
-ifeq ($(BR2_PACKAGE_LIBEVAS_SCALE_SAMPLE),y)
-LIBEVAS_CONF_OPTS += --enable-scale-sample
-else
-LIBEVAS_CONF_OPTS += --disable-scale-sample
-endif
-
-ifeq ($(BR2_PACKAGE_LIBEVAS_SCALE_SMOOTH),y)
-LIBEVAS_CONF_OPTS += --enable-scale-smooth
-else
-LIBEVAS_CONF_OPTS += --disable-scale-smooth
-endif
-
-ifeq ($(BR2_PACKAGE_LIBEVAS_SMALL_DITHERING),y)
-LIBEVAS_CONF_OPTS += --enable-small-dither-mask
-endif
-
-ifeq ($(BR2_PACKAGE_LIBEVAS_LINE_DITHERING),y)
-LIBEVAS_CONF_OPTS += --enable-line-dither-mask
-endif
-
-ifeq ($(BR2_PACKAGE_LIBEVAS_NO_DITHERING),y)
-LIBEVAS_CONF_OPTS += --enable-no-dither-mask
-endif
-
-# backends
-ifeq ($(BR2_PACKAGE_LIBEVAS_BUFFER),y)
-LIBEVAS_CONF_OPTS += --enable-buffer
-endif
-
-ifeq ($(BR2_PACKAGE_LIBEVAS_X11),y)
-LIBEVAS_CONF_OPTS += --enable-software-xlib \
- --with-x=$(STAGING_DIR) \
- --x-includes=$(STAGING_DIR)/usr/include \
- --x-libraries=$(STAGING_DIR)/usr/lib
-LIBEVAS_DEPENDENCIES += xlib_libX11 xlib_libXext
-else
-LIBEVAS_CONF_OPTS += --disable-software-xlib
-endif
-
-ifeq ($(BR2_PACKAGE_LIBEVAS_X11_GLX),y)
-LIBEVAS_CONF_OPTS += --enable-gl-xlib
-LIBEVAS_DEPENDENCIES += \
- xproto_glproto xlib_libX11 xlib_libXrender \
- xlib_libXext libeet
-else
-LIBEVAS_CONF_OPTS += --disable-gl-xlib
-endif
-
-ifeq ($(BR2_PACKAGE_LIBEVAS_XCB),y)
-LIBEVAS_CONF_OPTS += --enable-software-xcb
-LIBEVAS_DEPENDENCIES += libxcb xcb-proto xcb-util pixman
-endif
-
-ifeq ($(BR2_PACKAGE_LIBEVAS_XCB_GLX),y)
-LIBEVAS_CONF_OPTS += --enable-gl-xcb
-LIBEVAS_DEPENDENCIES += libxcb xcb-proto xcb-util xproto_glproto
-endif
-
-ifeq ($(BR2_PACKAGE_LIBEVAS_FB),y)
-LIBEVAS_CONF_OPTS += --enable-fb
-endif
-
-ifeq ($(BR2_PACKAGE_LIBEVAS_DIRECTFB),y)
-LIBEVAS_CONF_OPTS += --enable-directfb
-LIBEVAS_DEPENDENCIES += directfb
-endif
-
-ifeq ($(BR2_PACKAGE_LIBEVAS_SDL),y)
-LIBEVAS_CONF_OPTS += --enable-software-sdl
-LIBEVAS_DEPENDENCIES += sdl
-endif
-
-ifeq ($(BR2_PACKAGE_LIBEVAS_SDL_GL),y)
-LIBEVAS_CONF_OPTS += --enable-gl-sdl
-LIBEVAS_DEPENDENCIES += sdl
-# configure script forgets to check for eet / fill this out
-LIBEVAS_CONF_ENV += \
- GL_EET_CFLAGS='-I$(STAGING_DIR)/usr/include/eet-1' \
- GL_EET_LIBS='-leet'
-endif
-
-# libevas OpenGL flavor
-ifeq ($(BR2_PACKAGE_LIBEVAS_GL),y)
-LIBEVAS_DEPENDENCIES += mesa3d libeet
-endif
-
-ifeq ($(BR2_PACKAGE_LIBEVAS_GLES_SGX),y)
-LIBEVAS_CONF_OPTS += --enable-gl-flavor-gles --enable-gles-variety-sgx
-else
-LIBEVAS_CONF_OPTS += --disable-gles-variety-sgx
-endif
-
-ifeq ($(BR2_PACKAGE_LIBEVAS_GLES_S3C6410),y)
-LIBEVAS_CONF_OPTS += --enable-gl-flavor-gles --enable-gles-variety-s3c6410
-else
-LIBEVAS_CONF_OPTS += --disable-gles-variety-s3c6410
-endif
-
-ifeq ($(BR2_PACKAGE_LIBEVAS_GLES_SGX)$(BR2_PACKAGE_LIBEVAS_GLES_S3C6410),)
-LIBEVAS_CONF_OPTS += --disable-gl-flavor-gles
-endif
-
-# code options
-ifeq ($(BR2_X86_CPU_HAS_MMX),y)
-LIBEVAS_CONF_OPTS += --enable-cpu-mmx
-else
-LIBEVAS_CONF_OPTS += --disable-cpu-mmx
-endif
-
-ifeq ($(BR2_X86_CPU_HAS_SSE),y)
-LIBEVAS_CONF_OPTS += --enable-cpu-sse
-else
-LIBEVAS_CONF_OPTS += --disable-cpu-sse
-endif
-
-ifeq ($(BR2_X86_CPU_HAS_SSE3),y)
-LIBEVAS_CONF_OPTS += --enable-cpu-sse3
-else
-LIBEVAS_CONF_OPTS += --disable-cpu-sse3
-endif
-
-ifeq ($(BR2_POWERPC_CPU_HAS_ALTIVEC),y)
-LIBEVAS_CONF_OPTS += --enable-cpu-altivec
-else
-LIBEVAS_CONF_OPTS += --disable-cpu-altivec
-endif
-
-ifeq ($(BR2_ARM_CPU_HAS_NEON),y)
-LIBEVAS_CONF_OPTS += --enable-cpu-neon
-else
-LIBEVAS_CONF_OPTS += --disable-cpu-neon
-endif
-
-# loaders
-ifeq ($(BR2_PACKAGE_LIBEVAS_PNG),y)
-LIBEVAS_CONF_OPTS += --enable-image-loader-png
-LIBEVAS_DEPENDENCIES += libpng
-else
-LIBEVAS_CONF_OPTS += --disable-image-loader-png
-endif
-
-ifeq ($(BR2_PACKAGE_LIBEVAS_JPEG),y)
-LIBEVAS_CONF_OPTS += --enable-image-loader-jpeg
-LIBEVAS_DEPENDENCIES += jpeg
-else
-LIBEVAS_CONF_OPTS += --disable-image-loader-jpeg
-endif
-
-ifeq ($(BR2_PACKAGE_LIBEVAS_GIF),y)
-LIBEVAS_CONF_OPTS += --enable-image-loader-gif
-LIBEVAS_DEPENDENCIES += giflib
-else
-LIBEVAS_CONF_OPTS += --disable-image-loader-gif
-endif
-
-ifeq ($(BR2_PACKAGE_LIBEVAS_PMAPS),y)
-LIBEVAS_CONF_OPTS += --enable-image-loader-pmaps
-else
-LIBEVAS_CONF_OPTS += --disable-image-loader-pmaps
-endif
-
-ifeq ($(BR2_PACKAGE_LIBEVAS_TIFF),y)
-LIBEVAS_CONF_OPTS += --enable-image-loader-tiff
-LIBEVAS_DEPENDENCIES += tiff
-else
-LIBEVAS_CONF_OPTS += --disable-image-loader-tiff
-endif
-
-ifeq ($(BR2_PACKAGE_LIBEVAS_XPM),y)
-LIBEVAS_CONF_OPTS += --enable-image-loader-xpm
-else
-LIBEVAS_CONF_OPTS += --disable-image-loader-xpm
-endif
-
-ifeq ($(BR2_PACKAGE_LIBEVAS_EET),y)
-LIBEVAS_CONF_OPTS += --enable-image-loader-eet
-LIBEVAS_DEPENDENCIES += libeet
-else
-LIBEVAS_CONF_OPTS += --disable-image-loader-eet
-endif
-
-ifeq ($(BR2_PACKAGE_LIBEVAS_EET_FONT),y)
-LIBEVAS_CONF_OPTS += --enable-font-loader-eet
-LIBEVAS_DEPENDENCIES += libeet
-else
-LIBEVAS_CONF_OPTS += --disable-font-loader-eet
-endif
-
-ifeq ($(BR2_PACKAGE_FONTCONFIG),y)
-LIBEVAS_CONF_OPTS += --enable-fontconfig
-LIBEVAS_DEPENDENCIES += fontconfig
-else
-LIBEVAS_CONF_OPTS += --disable-fontconfig
-endif
-
-ifeq ($(BR2_PACKAGE_LIBFRIBIDI),y)
-LIBEVAS_CONF_OPTS += --enable-fribidi
-LIBEVAS_DEPENDENCIES += libfribidi
-else
-LIBEVAS_CONF_OPTS += --disable-fribidi
-endif
-
-# libevas installs the source code of examples on the target, which
-# are generally not useful.
-define LIBEVAS_REMOVE_EXAMPLES
- rm -rf $(TARGET_DIR)/usr/share/evas/examples/
-endef
-
-LIBEVAS_POST_INSTALL_TARGET_HOOKS += LIBEVAS_REMOVE_EXAMPLES
-
-$(eval $(autotools-package))
-$(eval $(host-autotools-package))
--
2.4.3
Romain Naour
2015-12-15 22:40:33 UTC
Permalink
Libefreet is now available in efl package.

Signed-off-by: Romain Naour <***@openwide.fr>
Reviewed-by: "Yann E. MORIN" <***@free.fr>
---
v6: Improve lecacy help text (Yann E.Morin)
v5: remove libefreet directory
v4: update Config.in to use libefl
v3: update legacy option for 2015.11
update help text
---
Config.in.legacy | 7 +++++++
package/efl/Config.in | 1 -
package/efl/libefreet/Config.in | 10 ----------
package/efl/libefreet/libefreet.mk | 17 -----------------
4 files changed, 7 insertions(+), 28 deletions(-)
delete mode 100644 package/efl/libefreet/Config.in
delete mode 100644 package/efl/libefreet/libefreet.mk

diff --git a/Config.in.legacy b/Config.in.legacy
index 4a99c7b..c6dd9e3 100644
--- a/Config.in.legacy
+++ b/Config.in.legacy
@@ -107,6 +107,13 @@ endif
###############################################################################
comment "Legacy options removed in 2016.02"

+config BR2_PACKAGE_LIBEFREET
+ bool "libefreet package has been removed"
+ select BR2_LEGACY
+ select BR2_PACKAGE_EFL
+ help
+ With EFL 1.15, libefreet is now provided by the libefl package.
+
config BR2_PACKAGE_LIBEIO
bool "libeio package has been removed"
select BR2_LEGACY
diff --git a/package/efl/Config.in b/package/efl/Config.in
index 58e8f65..682164d 100644
--- a/package/efl/Config.in
+++ b/package/efl/Config.in
@@ -19,7 +19,6 @@ source "package/efl/libeina/Config.in"
source "package/efl/libecore/Config.in"
source "package/efl/libeet/Config.in"
source "package/efl/libefl/Config.in"
-source "package/efl/libefreet/Config.in"
source "package/efl/libevas/Config.in"
source "package/efl/libelementary/Config.in"
source "package/efl/libedbus/Config.in"
diff --git a/package/efl/libefreet/Config.in b/package/efl/libefreet/Config.in
deleted file mode 100644
index 8687db4..0000000
--- a/package/efl/libefreet/Config.in
+++ /dev/null
@@ -1,10 +0,0 @@
-config BR2_PACKAGE_LIBEFREET
- bool "libefreet"
- select BR2_PACKAGE_LIBEINA
- select BR2_PACKAGE_LIBEET
- select BR2_PACKAGE_LIBECORE
- help
- Efreet is a library designed to help apps work with several of the
- Freedesktop.org standards regarding Icons, Desktop files and Menus.
-
- http://trac.enlightenment.org/e/wiki/Efreet
diff --git a/package/efl/libefreet/libefreet.mk b/package/efl/libefreet/libefreet.mk
deleted file mode 100644
index 65dbd12..0000000
--- a/package/efl/libefreet/libefreet.mk
+++ /dev/null
@@ -1,17 +0,0 @@
-################################################################################
-#
-# libefreet
-#
-################################################################################
-
-LIBEFREET_VERSION = 1.7.10
-LIBEFREET_SOURCE = efreet-$(LIBEFREET_VERSION).tar.bz2
-LIBEFREET_SITE = http://download.enlightenment.org/releases
-LIBEFREET_LICENSE = BSD-2c
-LIBEFREET_LICENSE_FILES = COPYING
-
-LIBEFREET_INSTALL_STAGING = YES
-
-LIBEFREET_DEPENDENCIES = libeina libeet libecore
-
-$(eval $(autotools-package))
--
2.4.3
Romain Naour
2015-12-15 22:40:30 UTC
Permalink
Libedje is now available in efl package.

Signed-off-by: Romain Naour <***@openwide.fr>
Reviewed-by: "Yann E. MORIN" <***@free.fr>
---
v6: Improve lecacy help text (Yann E.Morin)
v5: remove libedje directory
v4: update Config.in to use libefl
v3: update legacy option for 2015.11
update help text
---
Config.in.legacy | 7 +++++++
package/efl/Config.in | 1 -
package/efl/libedje/Config.in | 28 ----------------------------
package/efl/libedje/libedje.mk | 28 ----------------------------
4 files changed, 7 insertions(+), 57 deletions(-)
delete mode 100644 package/efl/libedje/Config.in
delete mode 100644 package/efl/libedje/libedje.mk

diff --git a/Config.in.legacy b/Config.in.legacy
index 92dc3ac..da7e690 100644
--- a/Config.in.legacy
+++ b/Config.in.legacy
@@ -107,6 +107,13 @@ endif
###############################################################################
comment "Legacy options removed in 2016.02"

+config BR2_PACKAGE_LIBEDJE
+ bool "libedje package has been removed"
+ select BR2_LEGACY
+ select BR2_PACKAGE_EFL
+ help
+ With EFL 1.15, libedje is now provided by the libefl package.
+
config BR2_PACKAGE_LIBETHUMB
bool "libethumb package has been removed"
select BR2_LEGACY
diff --git a/package/efl/Config.in b/package/efl/Config.in
index bc70952..489aa18 100644
--- a/package/efl/Config.in
+++ b/package/efl/Config.in
@@ -23,7 +23,6 @@ source "package/efl/libefreet/Config.in"
source "package/efl/libeio/Config.in"
source "package/efl/libevas/Config.in"
source "package/efl/libembryo/Config.in"
-source "package/efl/libedje/Config.in"
source "package/efl/libelementary/Config.in"
source "package/efl/libedbus/Config.in"

diff --git a/package/efl/libedje/Config.in b/package/efl/libedje/Config.in
deleted file mode 100644
index b163508..0000000
--- a/package/efl/libedje/Config.in
+++ /dev/null
@@ -1,28 +0,0 @@
-comment "libedje needs a toolchain w/ threads"
- depends on !BR2_TOOLCHAIN_HAS_THREADS
-
-config BR2_PACKAGE_LIBEDJE
- bool "libedje"
- select BR2_PACKAGE_LIBEINA
- select BR2_PACKAGE_LIBEET
- select BR2_PACKAGE_LIBECORE
- select BR2_PACKAGE_LIBECORE_EVAS
- select BR2_PACKAGE_LIBEMBRYO
- select BR2_PACKAGE_LIBEVAS
- select BR2_PACKAGE_LUA
- depends on BR2_TOOLCHAIN_HAS_THREADS # libevas
- help
- A graphical layout and animation library for animated
- resizable, compressed and scalable themes.
-
- http://trac.enlightenment.org/e/wiki/Edje
-
-if BR2_PACKAGE_LIBEDJE
-
-config BR2_PACKAGE_LIBEDJE_CC
- bool "build edje_cc"
- help
- Build and install the Edje compiler for the target. Normally this
- is not required.
-
-endif
diff --git a/package/efl/libedje/libedje.mk b/package/efl/libedje/libedje.mk
deleted file mode 100644
index 59189e4..0000000
--- a/package/efl/libedje/libedje.mk
+++ /dev/null
@@ -1,28 +0,0 @@
-################################################################################
-#
-# libedje
-#
-################################################################################
-
-LIBEDJE_VERSION = 1.7.10
-LIBEDJE_SOURCE = edje-$(LIBEDJE_VERSION).tar.bz2
-LIBEDJE_SITE = http://download.enlightenment.org/releases
-LIBEDJE_LICENSE = GPLv2+ (epp binary), BSD-2c (everything else)
-LIBEDJE_LICENSE_FILES = COPYING
-
-LIBEDJE_INSTALL_STAGING = YES
-
-LIBEDJE_DEPENDENCIES = \
- host-pkgconf lua libeina libeet libecore libevas \
- libembryo
-
-ifeq ($(BR2_PACKAGE_LIBEDJE_CC),y)
-LIBEDJE_CONF_OPTS += --enable-edje-cc
-else
-LIBEDJE_CONF_OPTS += --disable-edje-cc
-endif
-
-HOST_LIBEDJE_CONF_OPTS = --enable-edje-cc
-
-$(eval $(autotools-package))
-$(eval $(host-autotools-package))
--
2.4.3
Romain Naour
2015-12-15 22:40:22 UTC
Permalink
Use the newly added libefl package wich provide a new version
of libeina.

Also, update the upstream url and add a hash file.

Signed-off-by: Romain Naour <***@openwide.fr>
Reviewed-by: "Yann E. MORIN" <***@free.fr>
---
v6: add host-pkgconfig dependency (Yann E.Morin)
v5: Use depends on BR2_PACKAGE_EFL instead of select (ThomasP)
v4: rename to libefl
improve commit log
add a dependency on threads
v3: remove trailing slash (Vicente Bergas)
v2: bump to 1.15
remove glibc only dependency
---
package/libevas-generic-loaders/Config.in | 3 +--
package/libevas-generic-loaders/libevas-generic-loaders.hash | 2 ++
package/libevas-generic-loaders/libevas-generic-loaders.mk | 10 ++++++----
3 files changed, 9 insertions(+), 6 deletions(-)
create mode 100644 package/libevas-generic-loaders/libevas-generic-loaders.hash

diff --git a/package/libevas-generic-loaders/Config.in b/package/libevas-generic-loaders/Config.in
index f42f8a6..65ced8a 100644
--- a/package/libevas-generic-loaders/Config.in
+++ b/package/libevas-generic-loaders/Config.in
@@ -1,14 +1,13 @@
config BR2_PACKAGE_LIBEVAS_GENERIC_LOADERS
bool "libevas generic loaders"
depends on BR2_PACKAGE_EFL
- select BR2_PACKAGE_LIBEINA
select BR2_PACKAGE_ZLIB
help
These are additional "generic" loaders for Evas that are
stand-alone executables that evas may run from its generic
loader module.

- http://trac.enlightenment.org/e/wiki/Evas_Generic_Loaders
+ https://www.enlightenment.org/

if BR2_PACKAGE_LIBEVAS_GENERIC_LOADERS

diff --git a/package/libevas-generic-loaders/libevas-generic-loaders.hash b/package/libevas-generic-loaders/libevas-generic-loaders.hash
new file mode 100644
index 0000000..32723ba
--- /dev/null
+++ b/package/libevas-generic-loaders/libevas-generic-loaders.hash
@@ -0,0 +1,2 @@
+# From https://download.enlightenment.org/rel/libs/evas_generic_loaders/evas_generic_loaders-1.15.0.tar.xz.sha256
+sha256 1e539e4d4d4e1590345caeb7fdd84f47ec7cd63bb76b6b7107a87420a401fd7f evas_generic_loaders-1.15.0.tar.xz
diff --git a/package/libevas-generic-loaders/libevas-generic-loaders.mk b/package/libevas-generic-loaders/libevas-generic-loaders.mk
index ac6b1cc..47dfa9a 100644
--- a/package/libevas-generic-loaders/libevas-generic-loaders.mk
+++ b/package/libevas-generic-loaders/libevas-generic-loaders.mk
@@ -4,17 +4,19 @@
#
################################################################################

-LIBEVAS_GENERIC_LOADERS_VERSION = 1.7.10
-LIBEVAS_GENERIC_LOADERS_SOURCE = evas_generic_loaders-$(LIBEVAS_GENERIC_LOADERS_VERSION).tar.bz2
-LIBEVAS_GENERIC_LOADERS_SITE = http://download.enlightenment.org/releases
+LIBEVAS_GENERIC_LOADERS_VERSION = 1.15.0
+LIBEVAS_GENERIC_LOADERS_SOURCE = evas_generic_loaders-$(LIBEVAS_GENERIC_LOADERS_VERSION).tar.xz
+LIBEVAS_GENERIC_LOADERS_SITE = http://download.enlightenment.org/rel/libs/evas_generic_loaders
LIBEVAS_GENERIC_LOADERS_LICENSE = GPLv2
LIBEVAS_GENERIC_LOADERS_LICENSE_FILES = COPYING

LIBEVAS_GENERIC_LOADERS_INSTALL_STAGING = YES

-LIBEVAS_GENERIC_LOADERS_DEPENDENCIES = libeina zlib
+LIBEVAS_GENERIC_LOADERS_DEPENDENCIES = host-pkgconf libefl zlib

# For now, we only support the SVG loader
+# poppler >= 0.32 is not supported by the current version of
+# libevas-generic-loaders.
LIBEVAS_GENERIC_LOADERS_CONF_OPTS += \
--disable-poppler \
--disable-spectre \
--
2.4.3
Romain Naour
2015-12-15 22:40:31 UTC
Permalink
Libembryo is now available in efl package.

Signed-off-by: Romain Naour <***@openwide.fr>
Reviewed-by: "Yann E. MORIN" <***@free.fr>
---
v6: Improve lecacy help text (Yann E.Morin)
v5: remove libembryo directory
v4: update Config.in to use libefl
v3: update legacy option for 2015.11
update help text
---
Config.in.legacy | 7 +++++++
package/efl/Config.in | 1 -
package/efl/libembryo/Config.in | 9 ---------
package/efl/libembryo/libembryo.mk | 18 ------------------
4 files changed, 7 insertions(+), 28 deletions(-)
delete mode 100644 package/efl/libembryo/Config.in
delete mode 100644 package/efl/libembryo/libembryo.mk

diff --git a/Config.in.legacy b/Config.in.legacy
index da7e690..c161687 100644
--- a/Config.in.legacy
+++ b/Config.in.legacy
@@ -107,6 +107,13 @@ endif
###############################################################################
comment "Legacy options removed in 2016.02"

+config BR2_PACKAGE_LIBEMBRYO
+ bool "libembryo package has been removed"
+ select BR2_LEGACY
+ select BR2_PACKAGE_EFL
+ help
+ With EFL 1.15, libembryo is now provided by the libefl package.
+
config BR2_PACKAGE_LIBEDJE
bool "libedje package has been removed"
select BR2_LEGACY
diff --git a/package/efl/Config.in b/package/efl/Config.in
index 489aa18..5947de2 100644
--- a/package/efl/Config.in
+++ b/package/efl/Config.in
@@ -22,7 +22,6 @@ source "package/efl/libefl/Config.in"
source "package/efl/libefreet/Config.in"
source "package/efl/libeio/Config.in"
source "package/efl/libevas/Config.in"
-source "package/efl/libembryo/Config.in"
source "package/efl/libelementary/Config.in"
source "package/efl/libedbus/Config.in"

diff --git a/package/efl/libembryo/Config.in b/package/efl/libembryo/Config.in
deleted file mode 100644
index 63c7064..0000000
--- a/package/efl/libembryo/Config.in
+++ /dev/null
@@ -1,9 +0,0 @@
-config BR2_PACKAGE_LIBEMBRYO
- bool "libembryo"
- select BR2_PACKAGE_LIBEINA
- help
- Embryo is primarily a shared library that gives you an API
- to load and control interpreted programs compiled into an
- abstract machine bytecode that it understands.
-
- http://trac.enlightenment.org/e/wiki/Embryo
diff --git a/package/efl/libembryo/libembryo.mk b/package/efl/libembryo/libembryo.mk
deleted file mode 100644
index fc45e42..0000000
--- a/package/efl/libembryo/libembryo.mk
+++ /dev/null
@@ -1,18 +0,0 @@
-################################################################################
-#
-# libembryo
-#
-################################################################################
-
-LIBEMBRYO_VERSION = 1.7.10
-LIBEMBRYO_SOURCE = embryo-$(LIBEMBRYO_VERSION).tar.bz2
-LIBEMBRYO_SITE = http://download.enlightenment.org/releases
-LIBEMBRYO_LICENSE = BSD-2c, Embryo license
-LIBEMBRYO_LICENSE_FILES = COPYING
-
-LIBEMBRYO_INSTALL_STAGING = YES
-
-LIBEMBRYO_DEPENDENCIES = host-pkgconf libeina
-
-$(eval $(autotools-package))
-$(eval $(host-autotools-package))
--
2.4.3
Romain Naour
2015-12-15 22:40:29 UTC
Permalink
Libethumb is now available in efl package.

Signed-off-by: Romain Naour <***@openwide.fr>
Reviewed-by: "Yann E. MORIN" <***@free.fr>
---
v8: remove the patch added by Peter in a36d751 (Yann E.Morin)
v6: Improve lecacy help text (Yann E.Morin)
v4: remove libethumb from package/efl/
v3: update legacy option for 2015.11
update help text
---
Config.in.legacy | 7 ++++++
package/efl/Config.in | 1 -
.../0001-ethumb-drop-unused-dlfcn.h-include.patch | 28 ----------------------
package/efl/libethumb/Config.in | 15 ------------
package/efl/libethumb/libethumb.mk | 27 ---------------------
5 files changed, 7 insertions(+), 71 deletions(-)
delete mode 100644 package/efl/libethumb/0001-ethumb-drop-unused-dlfcn.h-include.patch
delete mode 100644 package/efl/libethumb/Config.in
delete mode 100644 package/efl/libethumb/libethumb.mk

diff --git a/Config.in.legacy b/Config.in.legacy
index 2bbf2ed..92dc3ac 100644
--- a/Config.in.legacy
+++ b/Config.in.legacy
@@ -107,6 +107,13 @@ endif
###############################################################################
comment "Legacy options removed in 2016.02"

+config BR2_PACKAGE_LIBETHUMB
+ bool "libethumb package has been removed"
+ select BR2_LEGACY
+ select BR2_PACKAGE_EFL
+ help
+ With EFL 1.15, libethumb is now provided by the libefl package.
+
config BR2_PACKAGE_INFOZIP
bool "infozip option has been renamed to zip"
select BR2_LEGACY
diff --git a/package/efl/Config.in b/package/efl/Config.in
index 3a5e708..bc70952 100644
--- a/package/efl/Config.in
+++ b/package/efl/Config.in
@@ -24,7 +24,6 @@ source "package/efl/libeio/Config.in"
source "package/efl/libevas/Config.in"
source "package/efl/libembryo/Config.in"
source "package/efl/libedje/Config.in"
-source "package/efl/libethumb/Config.in"
source "package/efl/libelementary/Config.in"
source "package/efl/libedbus/Config.in"

diff --git a/package/efl/libethumb/0001-ethumb-drop-unused-dlfcn.h-include.patch b/package/efl/libethumb/0001-ethumb-drop-unused-dlfcn.h-include.patch
deleted file mode 100644
index 834b0a8..0000000
--- a/package/efl/libethumb/0001-ethumb-drop-unused-dlfcn.h-include.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From f7eeddc88ce67c248ebb1e6b8a3cb74d61de42b4 Mon Sep 17 00:00:00 2001
-From: Peter Korsgaard <***@korsgaard.com>
-Date: Thu, 26 Nov 2015 22:07:24 +0100
-Subject: [PATCH] ethumb: drop unused dlfcn.h include
-
-ethumb includes dlfcn.h even though it isn't used, breaking builds with
-purely static toolchains.
-
-Signed-off-by: Peter Korsgaard <***@korsgaard.com>
----
- src/lib/ethumb.c | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/src/lib/ethumb.c b/src/lib/ethumb.c
-index d1453a0..48c6a2d 100644
---- a/src/lib/ethumb.c
-+++ b/src/lib/ethumb.c
-@@ -58,7 +58,6 @@ void *alloca (size_t);
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <dirent.h>
--#include <dlfcn.h>
- #include <ctype.h>
-
- #ifdef HAVE_XATTR
---
-2.1.4
-
diff --git a/package/efl/libethumb/Config.in b/package/efl/libethumb/Config.in
deleted file mode 100644
index 3e9cbde..0000000
--- a/package/efl/libethumb/Config.in
+++ /dev/null
@@ -1,15 +0,0 @@
-comment "libethumb needs a toolchain w/ threads"
- depends on !BR2_TOOLCHAIN_HAS_THREADS
-
-config BR2_PACKAGE_LIBETHUMB
- bool "libethumb"
- select BR2_PACKAGE_LIBEINA
- select BR2_PACKAGE_LIBEVAS
- select BR2_PACKAGE_LIBECORE
- select BR2_PACKAGE_LIBECORE_EVAS
- select BR2_PACKAGE_LIBEDJE
- depends on BR2_TOOLCHAIN_HAS_THREADS # libevas
- help
- Ethumb is a library for generating thumbnail images of documents.
-
- http://trac.enlightenment.org/e/wiki/Ethumb
diff --git a/package/efl/libethumb/libethumb.mk b/package/efl/libethumb/libethumb.mk
deleted file mode 100644
index 314ddf9..0000000
--- a/package/efl/libethumb/libethumb.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-################################################################################
-#
-# libethumb
-#
-################################################################################
-
-LIBETHUMB_VERSION = 1.7.10
-LIBETHUMB_SOURCE = ethumb-$(LIBETHUMB_VERSION).tar.bz2
-LIBETHUMB_SITE = http://download.enlightenment.org/releases
-LIBETHUMB_LICENSE = LGPLv2.1+
-LIBETHUMB_LICENSE_FILES = COPYING
-
-LIBETHUMB_INSTALL_STAGING = YES
-
-LIBETHUMB_DEPENDENCIES = libeina libevas libecore libedje host-libedje
-
-LIBETHUMB_CONF_OPTS = --with-edje-cc=$(HOST_DIR)/usr/bin/edje_cc
-
-ifeq ($(BR2_PACKAGE_LIBEXIF),y)
-LIBETHUMB_DEPENDENCIES += libexif
-endif
-
-ifeq ($(BR2_PACKAGE_LIBEDBUS),y)
-LIBETHUMB_DEPENDENCIES += libedbus
-endif
-
-$(eval $(autotools-package))
--
2.4.3
Romain Naour
2015-12-15 22:40:40 UTC
Permalink
In order to avoid duplicate dependencies between efl and
libefl [1] change the BR2_PACKAGE_EFL from a menuconfig
to a simple menu.

This allow to rename the libefl package to efl to keep
backward compatibility with older defconfig files.

Add efl dependency on libelementary package.

Don't add Config.in.legacy entry for libefl since it's
not part of any Buildroot release.

[1] http://lists.busybox.net/pipermail/buildroot/2015-December/147128.html

Signed-off-by: Romain Naour <***@openwide.fr>
Cc: "Yann E. MORIN" <***@free.fr>
---
Config.in.legacy | 20 +--
package/dbus-cpp/dbus-cpp.mk | 2 +-
package/efl/Config.in | 30 +---
...ecore_fb_private.h-define-EAPI-before-use.patch | 0
.../0002-ecore_x-Remove-XPrint-usage.patch | 0
package/efl/{libefl => efl}/Config.in | 91 ++++++-----
package/efl/{libefl/libefl.hash => efl/efl.hash} | 0
package/efl/{libefl/libefl.mk => efl/efl.mk} | 179 ++++++++++-----------
package/efl/libelementary/Config.in | 2 +
package/efl/libelementary/libelementary.mk | 4 +-
package/enlightenment/Config.in | 6 +-
package/enlightenment/enlightenment.mk | 4 +-
package/expedite/expedite.mk | 4 +-
.../libemotion-generic-players.mk | 2 +-
.../libevas-generic-loaders.mk | 2 +-
15 files changed, 170 insertions(+), 176 deletions(-)
rename package/efl/{libefl => efl}/0001-ecore_fb_private.h-define-EAPI-before-use.patch (100%)
rename package/efl/{libefl => efl}/0002-ecore_x-Remove-XPrint-usage.patch (100%)
rename package/efl/{libefl => efl}/Config.in (73%)
rename package/efl/{libefl/libefl.hash => efl/efl.hash} (100%)
rename package/efl/{libefl/libefl.mk => efl/efl.mk} (55%)

diff --git a/Config.in.legacy b/Config.in.legacy
index e1ea06f..4f5bfe5 100644
--- a/Config.in.legacy
+++ b/Config.in.legacy
@@ -112,70 +112,70 @@ config BR2_PACKAGE_LIBEINA
select BR2_LEGACY
select BR2_PACKAGE_EFL
help
- With EFL 1.15, libeina is now provided by the libefl package.
+ With EFL 1.15, libeina is now provided by the efl package.

config BR2_PACKAGE_LIBEET
bool "libeet package has been removed"
select BR2_LEGACY
select BR2_PACKAGE_EFL
help
- With EFL 1.15, libeet is now provided by the libefl package.
+ With EFL 1.15, libeet is now provided by the efl package.

config BR2_PACKAGE_LIBEVAS
bool "libevas package has been removed"
select BR2_LEGACY
select BR2_PACKAGE_EFL
help
- With EFL 1.15, libevas is now provided by the libefl package.
+ With EFL 1.15, libevas is now provided by the efl package.

config BR2_PACKAGE_LIBECORE
bool "libecore package has been removed"
select BR2_LEGACY
select BR2_PACKAGE_EFL
help
- With EFL 1.15, libecore is now provided by the libefl package.
+ With EFL 1.15, libecore is now provided by the efl package.

config BR2_PACKAGE_LIBEDBUS
bool "libedbus package has been removed"
select BR2_LEGACY
select BR2_PACKAGE_EFL
help
- With EFL 1.15, libedbus is now provided by the libefl package.
+ With EFL 1.15, libedbus is now provided by the efl package.

config BR2_PACKAGE_LIBEFREET
bool "libefreet package has been removed"
select BR2_LEGACY
select BR2_PACKAGE_EFL
help
- With EFL 1.15, libefreet is now provided by the libefl package.
+ With EFL 1.15, libefreet is now provided by the efl package.

config BR2_PACKAGE_LIBEIO
bool "libeio package has been removed"
select BR2_LEGACY
select BR2_PACKAGE_EFL
help
- With EFL 1.15, libeio is now provided by the libefl package.
+ With EFL 1.15, libeio is now provided by the efl package.

config BR2_PACKAGE_LIBEMBRYO
bool "libembryo package has been removed"
select BR2_LEGACY
select BR2_PACKAGE_EFL
help
- With EFL 1.15, libembryo is now provided by the libefl package.
+ With EFL 1.15, libembryo is now provided by the efl package.

config BR2_PACKAGE_LIBEDJE
bool "libedje package has been removed"
select BR2_LEGACY
select BR2_PACKAGE_EFL
help
- With EFL 1.15, libedje is now provided by the libefl package.
+ With EFL 1.15, libedje is now provided by the efl package.

config BR2_PACKAGE_LIBETHUMB
bool "libethumb package has been removed"
select BR2_LEGACY
select BR2_PACKAGE_EFL
help
- With EFL 1.15, libethumb is now provided by the libefl package.
+ With EFL 1.15, libethumb is now provided by the efl package.

config BR2_PACKAGE_INFOZIP
bool "infozip option has been renamed to zip"
diff --git a/package/dbus-cpp/dbus-cpp.mk b/package/dbus-cpp/dbus-cpp.mk
index 9236ba7..0b51967 100644
--- a/package/dbus-cpp/dbus-cpp.mk
+++ b/package/dbus-cpp/dbus-cpp.mk
@@ -28,7 +28,7 @@ DBUS_CPP_LICENSE_FILES = COPYING

ifeq ($(BR2_PACKAGE_EFL),y)
DBUS_CPP_CONF_OPTS += --enable-ecore
-DBUS_CPP_DEPENDENCIES += libefl
+DBUS_CPP_DEPENDENCIES += efl
else
DBUS_CPP_CONF_OPTS += --disable-ecore
endif
diff --git a/package/efl/Config.in b/package/efl/Config.in
index 80658b2..d92d877 100644
--- a/package/efl/Config.in
+++ b/package/efl/Config.in
@@ -1,30 +1,6 @@
-menuconfig BR2_PACKAGE_EFL
- bool "Enlightenment Foundation Libraries"
- depends on BR2_INSTALL_LIBSTDCPP
- depends on BR2_PACKAGE_HAS_UDEV # libudev
- depends on BR2_PACKAGE_LUA # lua 5.1 or better
- depends on BR2_TOOLCHAIN_HAS_THREADS # untested without threads
- depends on BR2_USE_MMU
- depends on BR2_USE_WCHAR # use wchar_t
- depends on !BR2_STATIC_LIBS # dlfcn.h
- select BR2_PACKAGE_LIBEFL
- help
- Enlightenment Foundation Libraries
+menu "Enlightenment Foundation Libraries"

- http://enlightenment.org
-
-if BR2_PACKAGE_EFL
-
-source "package/efl/libefl/Config.in"
+source "package/efl/efl/Config.in"
source "package/efl/libelementary/Config.in"

-endif # BR2_PACKAGE_EFL
-
-comment "EFL needs udev /dev management and a toolchain w/ C++, dynamic library, threads, wchar"
- depends on !BR2_PACKAGE_HAS_UDEV || !BR2_INSTALL_LIBSTDCPP \
- || BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR
- depends on BR2_USE_MMU
-
-comment "EFL needs lua"
- depends on !BR2_PACKAGE_LUA
- depends on BR2_USE_MMU
+endmenu
diff --git a/package/efl/libefl/0001-ecore_fb_private.h-define-EAPI-before-use.patch b/package/efl/efl/0001-ecore_fb_private.h-define-EAPI-before-use.patch
similarity index 100%
rename from package/efl/libefl/0001-ecore_fb_private.h-define-EAPI-before-use.patch
rename to package/efl/efl/0001-ecore_fb_private.h-define-EAPI-before-use.patch
diff --git a/package/efl/libefl/0002-ecore_x-Remove-XPrint-usage.patch b/package/efl/efl/0002-ecore_x-Remove-XPrint-usage.patch
similarity index 100%
rename from package/efl/libefl/0002-ecore_x-Remove-XPrint-usage.patch
rename to package/efl/efl/0002-ecore_x-Remove-XPrint-usage.patch
diff --git a/package/efl/libefl/Config.in b/package/efl/efl/Config.in
similarity index 73%
rename from package/efl/libefl/Config.in
rename to package/efl/efl/Config.in
index 7f76b94..80d8c1e 100644
--- a/package/efl/libefl/Config.in
+++ b/package/efl/efl/Config.in
@@ -1,5 +1,12 @@
-config BR2_PACKAGE_LIBEFL
- bool "libefl"
+config BR2_PACKAGE_EFL
+ bool "efl"
+ depends on BR2_INSTALL_LIBSTDCPP
+ depends on BR2_PACKAGE_HAS_UDEV # libudev
+ depends on BR2_PACKAGE_LUA # lua 5.1 or better
+ depends on BR2_TOOLCHAIN_HAS_THREADS # untested without threads
+ depends on BR2_USE_MMU
+ depends on BR2_USE_WCHAR # use wchar_t
+ depends on !BR2_STATIC_LIBS # dlfcn.h
select BR2_PACKAGE_DBUS
select BR2_PACKAGE_FREETYPE
select BR2_PACKAGE_JPEG # Emile needs libjpeg
@@ -13,18 +20,18 @@ config BR2_PACKAGE_LIBEFL

https://enlightenment.org

-if BR2_PACKAGE_LIBEFL
+if BR2_PACKAGE_EFL

-config BR2_PACKAGE_LIBEFL_RECOMMENDED_CONFIG
+config BR2_PACKAGE_EFL_RECOMMENDED_CONFIG
bool "Use recommended and tested configuration"
depends on BR2_ARCH_HAS_ATOMICS # pulseaudio
- select BR2_PACKAGE_LIBEFL_BULLET
- select BR2_PACKAGE_LIBEFL_FONTCONFIG
- select BR2_PACKAGE_LIBEFL_GSTREAMER1
- select BR2_PACKAGE_LIBEFL_LIBFRIBIDI
- select BR2_PACKAGE_LIBEFL_LIBSNDFILE
- select BR2_PACKAGE_LIBEFL_PULSEAUDIO
- select BR2_PACKAGE_LIBEFL_UTIL_LINUX_LIBMOUNT
+ select BR2_PACKAGE_EFL_BULLET
+ select BR2_PACKAGE_EFL_FONTCONFIG
+ select BR2_PACKAGE_EFL_GSTREAMER1
+ select BR2_PACKAGE_EFL_LIBFRIBIDI
+ select BR2_PACKAGE_EFL_LIBSNDFILE
+ select BR2_PACKAGE_EFL_PULSEAUDIO
+ select BR2_PACKAGE_EFL_UTIL_LINUX_LIBMOUNT
default y
help
Enable the basic set of recommended features.
@@ -32,7 +39,7 @@ config BR2_PACKAGE_LIBEFL_RECOMMENDED_CONFIG
Without that, the EFL developpers consider the build to be
potentially broken and won't provide any support for it.

-config BR2_PACKAGE_LIBEFL_BULLET
+config BR2_PACKAGE_EFL_BULLET
bool "Enable bullet support (recommended)"
select BR2_PACKAGE_BULLET
default y
@@ -43,7 +50,7 @@ config BR2_PACKAGE_LIBEFL_BULLET
cause a series of breakages. This is simply not tested so you are
on your own in terms of ensuring everything works if you do this.

-config BR2_PACKAGE_LIBEFL_FONTCONFIG
+config BR2_PACKAGE_EFL_FONTCONFIG
bool "Enable fontconfig support (recommended)"
select BR2_PACKAGE_FONTCONFIG
default y
@@ -55,7 +62,7 @@ config BR2_PACKAGE_LIBEFL_FONTCONFIG
highly reconsider turning fontconfig off. Having it off will
lead to visual problems like missing text in many UI areas etc...

-config BR2_PACKAGE_LIBEFL_GSTREAMER1
+config BR2_PACKAGE_EFL_GSTREAMER1
bool "Enable gstreamer1 support (recommended)"
select BR2_PACKAGE_GSTREAMER1
select BR2_PACKAGE_GST1_PLUGINS_BASE
@@ -65,7 +72,7 @@ config BR2_PACKAGE_LIBEFL_GSTREAMER1
media support options and render some functionality as useless,
leading to visible application bugs.

-config BR2_PACKAGE_LIBEFL_LIBFRIBIDI
+config BR2_PACKAGE_EFL_LIBFRIBIDI
bool "Enable libfribidi support (recommended)"
select BR2_PACKAGE_LIBFRIBIDI
default y
@@ -77,7 +84,7 @@ config BR2_PACKAGE_LIBEFL_LIBFRIBIDI
we don't test with fribidi disabled so you may also trigger code
paths with bugs that are never normally used.

-config BR2_PACKAGE_LIBEFL_LIBSNDFILE
+config BR2_PACKAGE_EFL_LIBSNDFILE
bool "Enable libsndfile support (recommended)"
select BR2_PACKAGE_LIBSNDFILE
default y
@@ -86,7 +93,7 @@ config BR2_PACKAGE_LIBEFL_LIBSNDFILE
create bugs for you due to it creating untested code paths.
Reconsider disabling audio.

-config BR2_PACKAGE_LIBEFL_PULSEAUDIO
+config BR2_PACKAGE_EFL_PULSEAUDIO
bool "Enable pulseaudio support (recommended)"
depends on BR2_ARCH_HAS_ATOMICS # pulseaudio
select BR2_PACKAGE_PULSEAUDIO
@@ -99,7 +106,7 @@ config BR2_PACKAGE_LIBEFL_PULSEAUDIO
NOTE: multisense support is automatically enabled with
pulseaudio.

-config BR2_PACKAGE_LIBEFL_UTIL_LINUX_LIBMOUNT
+config BR2_PACKAGE_EFL_UTIL_LINUX_LIBMOUNT
bool "Enable libmount support (recommended)"
select BR2_PACKAGE_UTIL_LINUX_LIBMOUNT
default y
@@ -109,20 +116,20 @@ config BR2_PACKAGE_LIBEFL_UTIL_LINUX_LIBMOUNT
Enlightenment and its filemanager.

comment "Warning: one of the recommended option for EFL is not enabled"
- depends on !BR2_PACKAGE_LIBEFL_BULLET \
- || !BR2_PACKAGE_LIBEFL_FONTCONFIG \
- || !BR2_PACKAGE_LIBEFL_GSTREAMER1 \
- || !BR2_PACKAGE_LIBEFL_LIBFRIBIDI \
- || !BR2_PACKAGE_LIBEFL_LIBSNDFILE \
- || !BR2_PACKAGE_LIBEFL_PULSEAUDIO \
- || !BR2_PACKAGE_LIBEFL_UTIL_LINUX_LIBMOUNT
+ depends on !BR2_PACKAGE_EFL_BULLET \
+ || !BR2_PACKAGE_EFL_FONTCONFIG \
+ || !BR2_PACKAGE_EFL_GSTREAMER1 \
+ || !BR2_PACKAGE_EFL_LIBFRIBIDI \
+ || !BR2_PACKAGE_EFL_LIBSNDFILE \
+ || !BR2_PACKAGE_EFL_PULSEAUDIO \
+ || !BR2_PACKAGE_EFL_UTIL_LINUX_LIBMOUNT

comment "libecore video support"

-config BR2_PACKAGE_LIBEFL_FB
+config BR2_PACKAGE_EFL_FB
bool "FB support"

-config BR2_PACKAGE_LIBEFL_X_XLIB
+config BR2_PACKAGE_EFL_X_XLIB
bool "X11 support (xlib)"
depends on BR2_PACKAGE_XORG7
select BR2_PACKAGE_XLIB_LIBX11
@@ -141,15 +148,15 @@ config BR2_PACKAGE_LIBEFL_X_XLIB

choice
bool "OpenGL support"
- default BR2_PACKAGE_LIBEFL_OPENGLES if BR2_PACKAGE_HAS_LIBGLES
+ default BR2_PACKAGE_EFL_OPENGLES if BR2_PACKAGE_HAS_LIBGLES
help
libevas can be configured to use HW acceleration only with
OpenGLES.

-config BR2_PACKAGE_LIBEFL_OPENGL_NONE
+config BR2_PACKAGE_EFL_OPENGL_NONE
bool "none"

-config BR2_PACKAGE_LIBEFL_OPENGLES
+config BR2_PACKAGE_EFL_OPENGLES
bool "opengles"
depends on BR2_PACKAGE_HAS_LIBGLES

@@ -160,43 +167,53 @@ endchoice # OpenGL support

comment "libevas loaders"

-config BR2_PACKAGE_LIBEFL_PNG
+config BR2_PACKAGE_EFL_PNG
bool "libevas png loader"
select BR2_PACKAGE_LIBPNG
help
This enables the loader code that loads png files using
libpng.

-config BR2_PACKAGE_LIBEFL_JP2K
+config BR2_PACKAGE_EFL_JP2K
bool "libevas jp2k loader"
select BR2_PACKAGE_OPENJPEG
help
This enables the loader code that loads jp2k files using
openjpeg.

-config BR2_PACKAGE_LIBEFL_JPEG
+config BR2_PACKAGE_EFL_JPEG
bool "libevas jpeg loader"
help
This enables the loader code that loads jpeg files using
libjpeg.

-config BR2_PACKAGE_LIBEFL_GIF
+config BR2_PACKAGE_EFL_GIF
bool "libevas gif loader"
select BR2_PACKAGE_GIFLIB
help
This enables the loader code that loads gif files using
libungif.

-config BR2_PACKAGE_LIBEFL_TIFF
+config BR2_PACKAGE_EFL_TIFF
bool "libevas tiff loader"
select BR2_PACKAGE_TIFF
help
This enables the loader code that loads tiff files.

-config BR2_PACKAGE_LIBEFL_WEBP
+config BR2_PACKAGE_EFL_WEBP
bool "libevas webp image loader"
select BR2_PACKAGE_WEBP
help
This enables the loader code that loads images using WebP.

-endif # BR2_PACKAGE_LIBEFL
+endif # BR2_PACKAGE_EFL
+
+comment "EFL needs udev /dev management and a toolchain w/ C++, dynamic library, threads, wchar"
+ depends on !BR2_PACKAGE_HAS_UDEV || !BR2_INSTALL_LIBSTDCPP \
+ || BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR
+ depends on BR2_USE_MMU
+
+comment "EFL needs lua"
+ depends on !BR2_PACKAGE_LUA
+ depends on BR2_USE_MMU
+
diff --git a/package/efl/libefl/libefl.hash b/package/efl/efl/efl.hash
similarity index 100%
rename from package/efl/libefl/libefl.hash
rename to package/efl/efl/efl.hash
diff --git a/package/efl/libefl/libefl.mk b/package/efl/efl/efl.mk
similarity index 55%
rename from package/efl/libefl/libefl.mk
rename to package/efl/efl/efl.mk
index c60a507..1aa5508 100644
--- a/package/efl/libefl/libefl.mk
+++ b/package/efl/efl/efl.mk
@@ -1,14 +1,13 @@
################################################################################
#
-# libefl
+# efl
#
################################################################################

-LIBEFL_VERSION = $(EFL_VERSION)
-LIBEFL_SOURCE = efl-$(LIBEFL_VERSION).tar.xz
-LIBEFL_SITE = http://download.enlightenment.org/rel/libs/efl
-LIBEFL_LICENSE = BSD-2c, LGPLv2.1+, GPLv2+
-LIBEFL_LICENSE_FILES = \
+EFL_SOURCE = efl-$(EFL_VERSION).tar.xz
+EFL_SITE = http://download.enlightenment.org/rel/libs/efl
+EFL_LICENSE = BSD-2c, LGPLv2.1+, GPLv2+
+EFL_LICENSE_FILES = \
COMPLIANCE \
COPYING \
licenses/COPYING.BSD \
@@ -17,23 +16,23 @@ LIBEFL_LICENSE_FILES = \
licenses/COPYING.LGPL \
licenses/COPYING.SMALL

-LIBEFL_INSTALL_STAGING = YES
+EFL_INSTALL_STAGING = YES

-LIBEFL_DEPENDENCIES = host-pkgconf host-libefl dbus freetype jpeg lua udev \
+EFL_DEPENDENCIES = host-pkgconf host-efl dbus freetype jpeg lua udev \
util-linux zlib

# Regenerate the autotools:
# - to fix an issue in eldbus-codegen: https://phab.enlightenment.org/T2718
# - to remove dependency on libXp: https://phab.enlightenment.org/D3150
-LIBEFL_AUTORECONF = YES
-LIBEFL_GETTEXTIZE = YES
+EFL_AUTORECONF = YES
+EFL_GETTEXTIZE = YES

# Configure options:
# --disable-cxx-bindings: disable C++11 bindings.
# --disable-sdl: disable sdl2 support.
# --disable-systemd: disable systemd support.
# --enable-lua-old: disable Elua and remove luajit dependency.
-LIBEFL_CONF_OPTS = \
+EFL_CONF_OPTS = \
--with-edje-cc=$(HOST_DIR)/usr/bin/edje_cc \
--with-eolian-gen=$(HOST_DIR)/usr/bin/eolian_gen \
--disable-cxx-bindings \
@@ -42,115 +41,115 @@ LIBEFL_CONF_OPTS = \
--enable-lua-old

# Disable untested configuration warning.
-ifeq ($(BR2_PACKAGE_LIBEFL_RECOMMENDED_CONFIG),)
-LIBEFL_CONF_OPTS += --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
+ifeq ($(BR2_PACKAGE_EFL_RECOMMENDED_CONFIG),)
+EFL_CONF_OPTS += --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
endif

ifeq ($(BR2_PACKAGE_UTIL_LINUX_LIBMOUNT),y)
-LIBEFL_DEPENDENCIES += util-linux
-LIBEFL_CONF_OPTS += --enable-libmount
+EFL_DEPENDENCIES += util-linux
+EFL_CONF_OPTS += --enable-libmount
else
-LIBEFL_CONF_OPTS += --disable-libmount
+EFL_CONF_OPTS += --disable-libmount
endif

ifeq ($(BR2_PACKAGE_FONTCONFIG),y)
-LIBEFL_CONF_OPTS += --enable-fontconfig
-LIBEFL_DEPENDENCIES += fontconfig
+EFL_CONF_OPTS += --enable-fontconfig
+EFL_DEPENDENCIES += fontconfig
else
-LIBEFL_CONF_OPTS += --disable-fontconfig
+EFL_CONF_OPTS += --disable-fontconfig
endif

ifeq ($(BR2_PACKAGE_LIBFRIBIDI),y)
-LIBEFL_CONF_OPTS += --enable-fribidi
-LIBEFL_DEPENDENCIES += libfribidi
+EFL_CONF_OPTS += --enable-fribidi
+EFL_DEPENDENCIES += libfribidi
else
-LIBEFL_CONF_OPTS += --disable-fribidi
+EFL_CONF_OPTS += --disable-fribidi
endif

ifeq ($(BR2_PACKAGE_GSTREAMER1)$(BR2_PACKAGE_GST1_PLUGINS_BASE),yy)
-LIBEFL_CONF_OPTS += --enable-gstreamer1
-LIBEFL_DEPENDENCIES += gstreamer1 gst1-plugins-base
+EFL_CONF_OPTS += --enable-gstreamer1
+EFL_DEPENDENCIES += gstreamer1 gst1-plugins-base
else
-LIBEFL_CONF_OPTS += --disable-gstreamer1
+EFL_CONF_OPTS += --disable-gstreamer1
endif

ifeq ($(BR2_PACKAGE_BULLET),y)
-LIBEFL_CONF_OPTS += --enable-physics
-LIBEFL_DEPENDENCIES += bullet
+EFL_CONF_OPTS += --enable-physics
+EFL_DEPENDENCIES += bullet
else
-LIBEFL_CONF_OPTS += --disable-physics
+EFL_CONF_OPTS += --disable-physics
endif

ifeq ($(BR2_PACKAGE_LIBSNDFILE),y)
-LIBEFL_CONF_OPTS += --enable-audio
-LIBEFL_DEPENDENCIES += libsndfile
+EFL_CONF_OPTS += --enable-audio
+EFL_DEPENDENCIES += libsndfile
else
-LIBEFL_CONF_OPTS += --disable-audio
+EFL_CONF_OPTS += --disable-audio
endif

ifeq ($(BR2_PACKAGE_PULSEAUDIO),y)
-LIBEFL_CONF_OPTS += --enable-pulseaudio
-LIBEFL_DEPENDENCIES += pulseaudio
+EFL_CONF_OPTS += --enable-pulseaudio
+EFL_DEPENDENCIES += pulseaudio
else
-LIBEFL_CONF_OPTS += --disable-pulseaudio
+EFL_CONF_OPTS += --disable-pulseaudio
endif

ifeq ($(BR2_PACKAGE_HARFBUZZ),y)
-LIBEFL_DEPENDENCIES += harfbuzz
-LIBEFL_CONF_OPTS += --enable-harfbuzz
+EFL_DEPENDENCIES += harfbuzz
+EFL_CONF_OPTS += --enable-harfbuzz
else
-LIBEFL_CONF_OPTS += --disable-harfbuzz
+EFL_CONF_OPTS += --disable-harfbuzz
endif

ifeq ($(BR2_PACKAGE_TSLIB),y)
-LIBEFL_DEPENDENCIES += tslib
-LIBEFL_CONF_OPTS += --enable-tslib
+EFL_DEPENDENCIES += tslib
+EFL_CONF_OPTS += --enable-tslib
else
-LIBEFL_CONF_OPTS += --disable-tslib
+EFL_CONF_OPTS += --disable-tslib
endif

ifeq ($(BR2_PACKAGE_LIBGLIB2),y)
-LIBEFL_DEPENDENCIES += libglib2
-LIBEFL_CONF_OPTS += --with-glib=yes
+EFL_DEPENDENCIES += libglib2
+EFL_CONF_OPTS += --with-glib=yes
else
-LIBEFL_CONF_OPTS += --with-glib=no
+EFL_CONF_OPTS += --with-glib=no
endif

# Prefer openssl (the default) over gnutls.
ifeq ($(BR2_PACKAGE_OPENSSL),y)
-LIBEFL_DEPENDENCIES += openssl
-LIBEFL_CONF_OPTS += --with-crypto=openssl
+EFL_DEPENDENCIES += openssl
+EFL_CONF_OPTS += --with-crypto=openssl
else ifeq ($(BR2_PACKAGE_GNUTLS)$(BR2_PACKAGE_LIBGCRYPT),yy)
-LIBEFL_DEPENDENCIES += gnutls libgcrypt
-LIBEFL_CONF_OPTS += --with-crypto=gnutls \
+EFL_DEPENDENCIES += gnutls libgcrypt
+EFL_CONF_OPTS += --with-crypto=gnutls \
--with-libgcrypt-prefix=$(STAGING_DIR)/usr
else
-LIBEFL_CONF_OPTS += --with-crypto=none
+EFL_CONF_OPTS += --with-crypto=none
endif # BR2_PACKAGE_OPENSSL

ifeq ($(BR2_PACKAGE_WAYLAND),y)
-LIBEFL_DEPENDENCIES += wayland libxkbcommon
-LIBEFL_CONF_OPTS += --enable-wayland
+EFL_DEPENDENCIES += wayland libxkbcommon
+EFL_CONF_OPTS += --enable-wayland
else
-LIBEFL_CONF_OPTS += --disable-wayland
+EFL_CONF_OPTS += --disable-wayland
endif

-ifeq ($(BR2_PACKAGE_LIBEFL_FB),y)
-LIBEFL_CONF_OPTS += --enable-fb
+ifeq ($(BR2_PACKAGE_EFL_FB),y)
+EFL_CONF_OPTS += --enable-fb
else
-LIBEFL_CONF_OPTS += --disable-fb
+EFL_CONF_OPTS += --disable-fb
endif

-ifeq ($(BR2_PACKAGE_LIBEFL_X_XLIB),y)
+ifeq ($(BR2_PACKAGE_EFL_X_XLIB),y)
# --enable-xinput22 is recommended
-LIBEFL_CONF_OPTS += \
+EFL_CONF_OPTS += \
--with-x11=xlib \
--with-x=$(STAGING_DIR) \
--x-includes=$(STAGING_DIR)/usr/include \
--x-libraries=$(STAGING_DIR)/usr/lib \
--enable-xinput22

-LIBEFL_DEPENDENCIES += \
+EFL_DEPENDENCIES += \
xlib_libX11 \
xlib_libXcomposite \
xlib_libXcursor \
@@ -163,68 +162,68 @@ LIBEFL_DEPENDENCIES += \
xlib_libXScrnSaver \
xlib_libXtst
else
-LIBEFL_CONF_OPTS += --with-x11=none
+EFL_CONF_OPTS += --with-x11=none
endif

-ifeq ($(BR2_PACKAGE_LIBEFL_OPENGLES),y)
-LIBEFL_CONF_OPTS += --with-opengl=es
-LIBEFL_DEPENDENCIES += libgles
+ifeq ($(BR2_PACKAGE_EFL_OPENGLES),y)
+EFL_CONF_OPTS += --with-opengl=es
+EFL_DEPENDENCIES += libgles
endif

-ifeq ($(BR2_PACKAGE_LIBEFL_OPENGL_NONE),y)
-LIBEFL_CONF_OPTS += --with-opengl=none
+ifeq ($(BR2_PACKAGE_EFL_OPENGL_NONE),y)
+EFL_CONF_OPTS += --with-opengl=none
endif

# Loaders that need external dependencies needs to be --enable-XXX=yes
# otherwise the default is '=static'.
# All other loaders are statically built-in
-ifeq ($(BR2_PACKAGE_LIBEFL_PNG),y)
-LIBEFL_CONF_OPTS += --enable-image-loader-png=yes
-LIBEFL_DEPENDENCIES += libpng
+ifeq ($(BR2_PACKAGE_EFL_PNG),y)
+EFL_CONF_OPTS += --enable-image-loader-png=yes
+EFL_DEPENDENCIES += libpng
else
-LIBEFL_CONF_OPTS += --disable-image-loader-png
+EFL_CONF_OPTS += --disable-image-loader-png
endif

-ifeq ($(BR2_PACKAGE_LIBEFL_JPEG),y)
-LIBEFL_CONF_OPTS += --enable-image-loader-jpeg=yes
-# libefl already depends on jpeg.
+ifeq ($(BR2_PACKAGE_EFL_JPEG),y)
+EFL_CONF_OPTS += --enable-image-loader-jpeg=yes
+# efl already depends on jpeg.
else
-LIBEFL_CONF_OPTS += --disable-image-loader-jpeg
+EFL_CONF_OPTS += --disable-image-loader-jpeg
endif

-ifeq ($(BR2_PACKAGE_LIBEFL_GIF),y)
-LIBEFL_CONF_OPTS += --enable-image-loader-gif=yes
-LIBEFL_DEPENDENCIES += giflib
+ifeq ($(BR2_PACKAGE_EFL_GIF),y)
+EFL_CONF_OPTS += --enable-image-loader-gif=yes
+EFL_DEPENDENCIES += giflib
else
-LIBEFL_CONF_OPTS += --disable-image-loader-gif
+EFL_CONF_OPTS += --disable-image-loader-gif
endif

-ifeq ($(BR2_PACKAGE_LIBEFL_TIFF),y)
-LIBEFL_CONF_OPTS += --enable-image-loader-tiff=yes
-LIBEFL_DEPENDENCIES += tiff
+ifeq ($(BR2_PACKAGE_EFL_TIFF),y)
+EFL_CONF_OPTS += --enable-image-loader-tiff=yes
+EFL_DEPENDENCIES += tiff
else
-LIBEFL_CONF_OPTS += --disable-image-loader-tiff
+EFL_CONF_OPTS += --disable-image-loader-tiff
endif

-ifeq ($(BR2_PACKAGE_LIBEFL_JP2K),y)
-LIBEFL_CONF_OPTS += --enable-image-loader-jp2k=yes
-LIBEFL_DEPENDENCIES += openjpeg
+ifeq ($(BR2_PACKAGE_EFL_JP2K),y)
+EFL_CONF_OPTS += --enable-image-loader-jp2k=yes
+EFL_DEPENDENCIES += openjpeg
else
-LIBEFL_CONF_OPTS += --disable-image-loader-jp2k
+EFL_CONF_OPTS += --disable-image-loader-jp2k
endif

-ifeq ($(BR2_PACKAGE_LIBEFL_WEBP),y)
-LIBEFL_CONF_OPTS += --enable-image-loader-webp=yes
-LIBEFL_DEPENDENCIES += webp
+ifeq ($(BR2_PACKAGE_EFL_WEBP),y)
+EFL_CONF_OPTS += --enable-image-loader-webp=yes
+EFL_DEPENDENCIES += webp
else
-LIBEFL_CONF_OPTS += --disable-image-loader-webp
+EFL_CONF_OPTS += --disable-image-loader-webp
endif

$(eval $(autotools-package))

################################################################################
#
-# host-libefl
+# host-efl
#
################################################################################

@@ -237,7 +236,7 @@ $(eval $(autotools-package))
# * host-libglib2: for libecore
# * host-libjpeg, host-libpng: for libevas image loader
# * host-lua: disable luajit dependency
-HOST_LIBEFL_DEPENDENCIES = \
+HOST_EFL_DEPENDENCIES = \
host-pkgconf \
host-dbus \
host-freetype \
@@ -262,7 +261,7 @@ HOST_LIBEFL_DEPENDENCIES = \
# --with-crypto=none: remove dependencies on openssl or gnutls.
# --with-x11=none: remove dependency on X.org.
# Yes I really know what I am doing.
-HOST_LIBEFL_CONF_OPTS += \
+HOST_EFL_CONF_OPTS += \
--disable-audio \
--disable-cxx-bindings \
--disable-fontconfig \
diff --git a/package/efl/libelementary/Config.in b/package/efl/libelementary/Config.in
index 1f8c962..75993a4 100644
--- a/package/efl/libelementary/Config.in
+++ b/package/efl/libelementary/Config.in
@@ -2,6 +2,7 @@ config BR2_PACKAGE_LIBELEMENTARY
bool "libelementary"
depends on BR2_TOOLCHAIN_HAS_THREADS # elm_store.c
depends on !BR2_STATIC_LIBS
+ depends on BR2_PACKAGE_EFL
help
Elementary is a widget toolkit and EFL wrapper and convenience
library to make it easy to build applications and tools with UIs
@@ -10,4 +11,5 @@ config BR2_PACKAGE_LIBELEMENTARY
https://enlightenment.org

comment "libelementary needs a toolchain w/ threads, dynamic library"
+ depends on BR2_PACKAGE_EFL
depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS
diff --git a/package/efl/libelementary/libelementary.mk b/package/efl/libelementary/libelementary.mk
index c920801..b0f6149 100644
--- a/package/efl/libelementary/libelementary.mk
+++ b/package/efl/libelementary/libelementary.mk
@@ -12,7 +12,7 @@ LIBELEMENTARY_LICENSE_FILES = COPYING

LIBELEMENTARY_INSTALL_STAGING = YES

-LIBELEMENTARY_DEPENDENCIES = host-pkgconf host-libefl host-libelementary libefl
+LIBELEMENTARY_DEPENDENCIES = host-pkgconf host-efl host-libelementary efl

LIBELEMENTARY_CONF_OPTS = \
--with-edje-cc=$(HOST_DIR)/usr/bin/edje_cc \
@@ -25,7 +25,7 @@ LIBELEMENTARY_CONF_OPTS = \

# We need a host package in order to provide elm_prefs_cc and
# elementary_codegen.
-HOST_LIBELEMENTARY_DEPENDENCIES = host-pkgconf host-libefl
+HOST_LIBELEMENTARY_DEPENDENCIES = host-pkgconf host-efl
HOST_LIBELEMENTARY_CONF_OPTS = \
--with-edje-cc=$(HOST_DIR)/usr/bin/edje_cc \
--with-eet-eet=$(HOST_DIR)/usr/bin/eet \
diff --git a/package/enlightenment/Config.in b/package/enlightenment/Config.in
index 7f0d583..3bfc444 100644
--- a/package/enlightenment/Config.in
+++ b/package/enlightenment/Config.in
@@ -12,9 +12,9 @@ config BR2_PACKAGE_ENLIGHTENMENT
depends on BR2_PACKAGE_XORG7
# libevas-generic-loaders-svg -> librsvg -> pango -> cairo
depends on BR2_ARCH_HAS_ATOMICS
- select BR2_PACKAGE_LIBEFL_X_XLIB
- select BR2_PACKAGE_LIBEFL_JPEG # needed at runtime by enlightenment_start
- select BR2_PACKAGE_LIBEFL_PNG # needed at runtime by enlightenment_start
+ select BR2_PACKAGE_EFL_X_XLIB
+ select BR2_PACKAGE_EFL_JPEG # needed at runtime by enlightenment_start
+ select BR2_PACKAGE_EFL_PNG # needed at runtime by enlightenment_start
select BR2_PACKAGE_LIBELEMENTARY
select BR2_PACKAGE_LIBEVAS_GENERIC_LOADERS
select BR2_PACKAGE_LIBEVAS_GENERIC_LOADERS_SVG
diff --git a/package/enlightenment/enlightenment.mk b/package/enlightenment/enlightenment.mk
index f2e0bc3..dba81d3 100644
--- a/package/enlightenment/enlightenment.mk
+++ b/package/enlightenment/enlightenment.mk
@@ -12,8 +12,8 @@ ENLIGHTENMENT_LICENSE_FILES = COPYING

ENLIGHTENMENT_DEPENDENCIES = \
host-pkgconf \
- host-libefl \
- libefl \
+ host-efl \
+ efl \
libelementary \
libevas-generic-loaders \
xcb-util-keysyms
diff --git a/package/expedite/expedite.mk b/package/expedite/expedite.mk
index 4a4e2ee..8754dc0 100644
--- a/package/expedite/expedite.mk
+++ b/package/expedite/expedite.mk
@@ -11,12 +11,12 @@ EXPEDITE_SITE_METHOD = git
EXPEDITE_LICENSE = BSD-2c
EXPEDITE_LICENSE_FILES = COPYING

-EXPEDITE_DEPENDENCIES = host-libefl host-pkgconf libefl
+EXPEDITE_DEPENDENCIES = host-efl host-pkgconf efl

# There is no configure script in the git tree.
EXPEDITE_AUTORECONF = YES

-ifeq ($(BR2_PACKAGE_LIBEFL_X_XLIB),y)
+ifeq ($(BR2_PACKAGE_EFL_X_XLIB),y)
EXPEDITE_CONF_OPTS += --with-x=$(STAGING_DIR) \
--x-includes=$(STAGING_DIR)/usr/include \
--x-libraries=$(STAGING_DIR)/usr/lib
diff --git a/package/libemotion-generic-players/libemotion-generic-players.mk b/package/libemotion-generic-players/libemotion-generic-players.mk
index ef41b2e..384cd97 100644
--- a/package/libemotion-generic-players/libemotion-generic-players.mk
+++ b/package/libemotion-generic-players/libemotion-generic-players.mk
@@ -12,6 +12,6 @@ LIBEMOTION_GENERIC_PLAYERS_LICENSE_FILES = COPYING

LIBEMOTION_GENERIC_PLAYERS_INSTALL_STAGING = YES

-LIBEMOTION_GENERIC_PLAYERS_DEPENDENCIES = host-pkgconf libefl vlc
+LIBEMOTION_GENERIC_PLAYERS_DEPENDENCIES = host-pkgconf efl vlc

$(eval $(autotools-package))
diff --git a/package/libevas-generic-loaders/libevas-generic-loaders.mk b/package/libevas-generic-loaders/libevas-generic-loaders.mk
index 2c1c1cd..ff8ea37 100644
--- a/package/libevas-generic-loaders/libevas-generic-loaders.mk
+++ b/package/libevas-generic-loaders/libevas-generic-loaders.mk
@@ -12,7 +12,7 @@ LIBEVAS_GENERIC_LOADERS_LICENSE_FILES = COPYING

LIBEVAS_GENERIC_LOADERS_INSTALL_STAGING = YES

-LIBEVAS_GENERIC_LOADERS_DEPENDENCIES = host-pkgconf libefl zlib
+LIBEVAS_GENERIC_LOADERS_DEPENDENCIES = host-pkgconf efl zlib

# poppler >= 0.32 is not supported by the current version of
# libevas-generic-loaders.
--
2.4.3
Romain Naour
2015-12-15 22:40:27 UTC
Permalink
Since expedite hasn't been released since 1.7.10 release,
use efl-1.15 branch in the git tree.

Use the newly added libefl package wich provide a new version
of efl libraries.

Autoreconf the package since there is no configure script
in the git tree.

Signed-off-by: Romain Naour <***@openwide.fr>
---
v11: remove the hash file added by 74641b
s/BR2_PACKAGE_LIBEFL_X/BR2_PACKAGE_LIBEFL_X_XLIB/
v6: Add host-pkgconfig dependency (Yann E.Morin)
v5: Use depends on BR2_PACKAGE_EFL instead of select (ThomasP)
remove comments on dependencies
v4: update Config.in to use libefl
improve commit log
keep the dependency on threads
Replace the old BR2_PACKAGE_LIBEVAS_X11 by BR2_PACKAGE_LIBEFL_X
v2: bump to 1.15 branch
---
package/expedite/Config.in | 8 ++------
package/expedite/expedite.hash | 2 --
package/expedite/expedite.mk | 14 +++++++++-----
3 files changed, 11 insertions(+), 13 deletions(-)
delete mode 100644 package/expedite/expedite.hash

diff --git a/package/expedite/Config.in b/package/expedite/Config.in
index e60510b..0bcf343 100644
--- a/package/expedite/Config.in
+++ b/package/expedite/Config.in
@@ -2,15 +2,11 @@ config BR2_PACKAGE_EXPEDITE
bool "expedite"
depends on BR2_PACKAGE_EFL
depends on BR2_INSTALL_LIBSTDCPP
- depends on BR2_TOOLCHAIN_HAS_THREADS # libevas
- select BR2_PACKAGE_LIBEET
- select BR2_PACKAGE_LIBEINA
- select BR2_PACKAGE_LIBEVAS
help
Expedite is the official Evas benchmark tool. It can test different
engines, such as X11, XRender, OpenGL (also ES variant), SDL,
DirectFB and so on. Its tests are quite extensive, trying to
reproduce real world usage cases.

-comment "expedite needs a toolchain w/ C++, threads"
- depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS
+comment "expedite needs a toolchain w/ C++"
+ depends on !BR2_INSTALL_LIBSTDCPP
diff --git a/package/expedite/expedite.hash b/package/expedite/expedite.hash
deleted file mode 100644
index cde3689..0000000
--- a/package/expedite/expedite.hash
+++ /dev/null
@@ -1,2 +0,0 @@
-# Locally calculated
-sha256 91d0290ba3635a4440c389647643beaa8e39def2789d685d54a58a723398cc10 expedite-1.7.10.tar.bz2
diff --git a/package/expedite/expedite.mk b/package/expedite/expedite.mk
index 27b4c44..4a4e2ee 100644
--- a/package/expedite/expedite.mk
+++ b/package/expedite/expedite.mk
@@ -4,15 +4,19 @@
#
################################################################################

-EXPEDITE_VERSION = 1.7.10
-EXPEDITE_SOURCE = expedite-$(EXPEDITE_VERSION).tar.bz2
-EXPEDITE_SITE = http://download.enlightenment.org/releases
+# efl-1.15 branch
+EXPEDITE_VERSION = 3ce8b3f1451700f9a2da60c2e717c644220e2449
+EXPEDITE_SITE = http://git.enlightenment.org/tools/expedite.git
+EXPEDITE_SITE_METHOD = git
EXPEDITE_LICENSE = BSD-2c
EXPEDITE_LICENSE_FILES = COPYING

-EXPEDITE_DEPENDENCIES = libevas libeina libeet
+EXPEDITE_DEPENDENCIES = host-libefl host-pkgconf libefl

-ifeq ($(BR2_PACKAGE_LIBEVAS_X11),y)
+# There is no configure script in the git tree.
+EXPEDITE_AUTORECONF = YES
+
+ifeq ($(BR2_PACKAGE_LIBEFL_X_XLIB),y)
EXPEDITE_CONF_OPTS += --with-x=$(STAGING_DIR) \
--x-includes=$(STAGING_DIR)/usr/include \
--x-libraries=$(STAGING_DIR)/usr/lib
--
2.4.3
Romain Naour
2015-12-15 22:40:13 UTC
Permalink
Add the libefl package which contains an updated version of the following
libraries:
libecore, libedje, libeet, libfreet, libeina, libeio, libembryo, libthumb
and libevas. It also contains eldbus, ephysics, and escape, see [1].

The name libefl is transitional in order to bump smoothly all packages
that use efl libraries and remove the old package libecore, libevas...
The package libefl will be renamed to efl in a followup patch at the end
of the series.

For now, the bump to efl 1.15.x is not complete.
This allows to build at least a default configuration without X11 support
or graphics acceleration.
This support will be added by a follow up patches in the series.

Also, add BR2_PACKAGE_LIBEFL_RECOMMENDED_CONFIG config option in order to
select all recommended packages that allows to build libefl without the
extra-long --enable-i-really-know-what-i-am-doing...

Here is some notes about libefl dependencies:
- alsa:
At the end of the configure script, the summary tab will show that
alsa support is allways disabled even if alsa-utils has been build
before efl-core package.
"Ecore_Audio.....: yes (-alsa +pulseaudio +sndfile)"
This is intentional.

- util-linux:
libefl select util-linux libblkid since it's listed as an dependency
in the README [2].

- threads support:
Add a dependency on threads support since clearly efl libraries are
not even built without thread support [3].

- Curl:
Curl is listed as an dependency in the README because it's a runtime
dependency since efl 1.8 [4].

We need to regenerate the configure script to workaround a build issue with
eldbus-codegen:

CCLD bin/eldbus/eldbus-codegen
CXXLD bin/eolian_cxx/eolian_cxx
CCLD lib/ecore_x/ecore_x_vsync
CCLD lib/evas/common/libevas_op_blend_sse3.la
CCLD lib/evas/common/libevas_convert_rgb_32.la
CCLD lib/ecore_ipc/libecore_ipc.la
[...]/i686-ctng-linux-gnu/bin/ld: warning: libefl.so.1, needed by lib/ecore/.libs/libecore.so, not found (try using -rpath or -rpath-link)
lib/ecore/.libs/libecore.so: undefined reference to `efl_control_suspend_set'
lib/ecore/.libs/libecore.so: undefined reference to `efl_control_interface_get'
collect2: error: ld returned 1 exit status
Makefile:19135: recipe for target 'bin/eldbus/eldbus-codegen' failed
make[6]: *** [bin/eldbus/eldbus-codegen] Error 1

A dependency on libefl seems to be missing for eldbus but by
regenerating eldbus-codegen build correctly.

Reported upstream [6].

Also, gettextize is needed since *.po files were generated with
an "old" gettext version (0.18):

Making all in po
*** error: gettext infrastructure mismatch: using a Makefile.in.in from gettext version 0.18 but the autoconf macros are from gettext version 0.19
Makefile:149: recipe for target 'check-macro-version' failed

[1] See https://phab.enlightenment.org/phame/live/3/post/efl_1_8/
[2] https://git.enlightenment.org/core/efl.git/tree/README?id=v1.15.2#n478
[3] https://git.enlightenment.org/core/efl.git/tree/configure.ac#n5032
[4] https://git.enlightenment.org/core/efl.git/tree/README?id=v1.15.2#n453
https://git.enlightenment.org/core/efl.git/commit/?id=2c1c6b9335e38c6e52b06829a95d9b58d780c99e
[5] http://mailman.uclibc-ng.org/pipermail/devel/2015-August/000432.html
[6] https://phab.enlightenment.org/T2718

Signed-off-by: Romain Naour <***@openwide.fr>
Tested-by: Vicente Bergas <***@gmail.com>
Cc: Vicente Bergas <***@gmail.com>
---
An initial runtime test has been done under Qemu with a glibc x86 toolchain.

An additional runtime test has been done with a uClibc-ng 1.0.5 toolchain
patched with [5] in order to add mkstemps() which is used by Eina library.
This patch has been upstreamed in uClubc-ng 1.0.6 release.

Another test has been done with a musl toolchain by Vicente Bergas (Thanks!).
---
v11:
- add Config.in options for each recommended dependencies. (Thomas P)
- fix Lua Config.in comment dependency (Thomas P)
- Avoid duplicate dependencies between BR2_PACKAGE_EFL and BR2_PACKAGE_LIBEFL
(Thomas P)
- Rework commit log to explain that BR2_PACKAGE_EFL menuconfig will become a
real Buildroot package by renaming libefl to efl.
v10:
- fix typo configurations -> configuration
- fix lua/dependencies comments handling in Config.in

v8: move comments about the runtime test to post-commit note (Yann E.Morin)
remove comment about X11 XInput v2.2+ support.
Add the tested-by tag from Vicente Bergas
v6: Changes from Yann E.Morin's review
- squash curl, autotools and libblkid patches
- use depends on Lua
- LIBEFL_RECOMMENDED_CONFIG depends on BR2_ARCH_HAS_ATOMICS
- rework Config.in help text (remove comments in .mk)
- add some option in LIBEFL_CONF_OPTS to disable some features
explicitely.
Split the dependency comment (Arnout)

v4: rename to libefl
EFL needs a toolchain with threads support
v3: fix same typo again
Add a note about multisense support
v2: remove glibc only dependency
update commit log accordingly
fix typo in Config.in (Vicente Bergas)
---
package/efl/Config.in | 20 ++++--
package/efl/libefl/Config.in | 147 ++++++++++++++++++++++++++++++++++++++++++
package/efl/libefl/libefl.mk | 150 +++++++++++++++++++++++++++++++++++++++++++
3 files changed, 313 insertions(+), 4 deletions(-)
create mode 100644 package/efl/libefl/Config.in

diff --git a/package/efl/Config.in b/package/efl/Config.in
index 7ce5a36..3a5e708 100644
--- a/package/efl/Config.in
+++ b/package/efl/Config.in
@@ -1,8 +1,13 @@
menuconfig BR2_PACKAGE_EFL
bool "Enlightenment Foundation Libraries"
- depends on BR2_USE_WCHAR
- # libeina uses madvise(). To revisit when bumping EFL to 1.8
+ depends on BR2_INSTALL_LIBSTDCPP
+ depends on BR2_PACKAGE_HAS_UDEV # libudev
+ depends on BR2_PACKAGE_LUA # lua 5.1 or better
+ depends on BR2_TOOLCHAIN_HAS_THREADS # untested without threads
depends on BR2_USE_MMU
+ depends on BR2_USE_WCHAR # use wchar_t
+ depends on !BR2_STATIC_LIBS # dlfcn.h
+ select BR2_PACKAGE_LIBEFL
help
Enlightenment Foundation Libraries

@@ -13,6 +18,7 @@ if BR2_PACKAGE_EFL
source "package/efl/libeina/Config.in"
source "package/efl/libecore/Config.in"
source "package/efl/libeet/Config.in"
+source "package/efl/libefl/Config.in"
source "package/efl/libefreet/Config.in"
source "package/efl/libeio/Config.in"
source "package/efl/libevas/Config.in"
@@ -24,5 +30,11 @@ source "package/efl/libedbus/Config.in"

endif # BR2_PACKAGE_EFL

-comment "EFL needs a toolchain w/ wchar"
- depends on !BR2_USE_WCHAR
+comment "EFL needs udev /dev management and a toolchain w/ C++, dynamic library, threads, wchar"
+ depends on !BR2_PACKAGE_HAS_UDEV || !BR2_INSTALL_LIBSTDCPP \
+ || BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR
+ depends on BR2_USE_MMU
+
+comment "EFL needs lua"
+ depends on !BR2_PACKAGE_LUA
+ depends on BR2_USE_MMU
diff --git a/package/efl/libefl/Config.in b/package/efl/libefl/Config.in
new file mode 100644
index 0000000..cc39c82
--- /dev/null
+++ b/package/efl/libefl/Config.in
@@ -0,0 +1,147 @@
+config BR2_PACKAGE_LIBEFL
+ bool "libefl"
+ select BR2_PACKAGE_DBUS
+ select BR2_PACKAGE_FREETYPE
+ select BR2_PACKAGE_JPEG # Emile needs libjpeg
+ select BR2_PACKAGE_LIBCURL # Ecore_con_url, runtime dependency
+ select BR2_PACKAGE_UTIL_LINUX
+ # libblkid is part of required tools, see EFL's README.
+ select BR2_PACKAGE_UTIL_LINUX_LIBBLKID
+ help
+ Enlightenment Foundation Libraries
+
+ https://enlightenment.org
+
+if BR2_PACKAGE_LIBEFL
+
+config BR2_PACKAGE_LIBEFL_RECOMMENDED_CONFIG
+ bool "Use recommended and tested configuration"
+ depends on BR2_ARCH_HAS_ATOMICS # pulseaudio
+ select BR2_PACKAGE_LIBEFL_BULLET
+ select BR2_PACKAGE_LIBEFL_FONTCONFIG
+ select BR2_PACKAGE_LIBEFL_GSTREAMER1
+ select BR2_PACKAGE_LIBEFL_LIBFRIBIDI
+ select BR2_PACKAGE_LIBEFL_LIBSNDFILE
+ select BR2_PACKAGE_LIBEFL_PULSEAUDIO
+ select BR2_PACKAGE_LIBEFL_UTIL_LINUX_LIBMOUNT
+ default y
+ help
+ Enable the basic set of recommended features.
+
+ Without that, the EFL developpers consider the build to be
+ potentially broken and won't provide any support for it.
+
+config BR2_PACKAGE_LIBEFL_BULLET
+ bool "Enable bullet support (recommended)"
+ select BR2_PACKAGE_BULLET
+ default y
+ help
+ If you have chosen to disable physics support, this disables lots
+ of core functionality and is effectively never tested. You are
+ going to find features that suddenly don't work and as a result
+ cause a series of breakages. This is simply not tested so you are
+ on your own in terms of ensuring everything works if you do this.
+
+config BR2_PACKAGE_LIBEFL_FONTCONFIG
+ bool "Enable fontconfig support (recommended)"
+ select BR2_PACKAGE_FONTCONFIG
+ default y
+ help
+ If fontconfig is disabled, this is going to make general font
+ searching not work, and only some very direct
+ 'load /path/file.ttf' will work alongside some old-school ttf
+ file path searching. This is very likely not what you want, so
+ highly reconsider turning fontconfig off. Having it off will
+ lead to visual problems like missing text in many UI areas etc...
+
+config BR2_PACKAGE_LIBEFL_GSTREAMER1
+ bool "Enable gstreamer1 support (recommended)"
+ select BR2_PACKAGE_GSTREAMER1
+ select BR2_PACKAGE_GST1_PLUGINS_BASE
+ default y
+ help
+ If Gstreamer 1.x support is disabled, it will heavily limit your
+ media support options and render some functionality as useless,
+ leading to visible application bugs.
+
+config BR2_PACKAGE_LIBEFL_LIBFRIBIDI
+ bool "Enable libfribidi support (recommended)"
+ select BR2_PACKAGE_LIBFRIBIDI
+ default y
+ help
+ Fribidi is used for handling right-to-left text (like Arabic,
+ Hebrew, Farsi, Persian etc.) and is very likely not a feature you
+ want to disable unless you know for absolute certain you will
+ never encounter and have to display such scripts. Also note that
+ we don't test with fribidi disabled so you may also trigger code
+ paths with bugs that are never normally used.
+
+config BR2_PACKAGE_LIBEFL_LIBSNDFILE
+ bool "Enable libsndfile support (recommended)"
+ select BR2_PACKAGE_LIBSNDFILE
+ default y
+ help
+ If you disabled audio support in Ecore, this is not tested and may
+ create bugs for you due to it creating untested code paths.
+ Reconsider disabling audio.
+
+config BR2_PACKAGE_LIBEFL_PULSEAUDIO
+ bool "Enable pulseaudio support (recommended)"
+ depends on BR2_ARCH_HAS_ATOMICS # pulseaudio
+ select BR2_PACKAGE_PULSEAUDIO
+ default y
+ help
+ The only audio output method supported by Ecore right now is via
+ Pulseaudio. You have disabled that and likely have broken a whole
+ bunch of things in the process. Reconsider your configure
+ options.
+ NOTE: multisense support is automatically enabled with
+ pulseaudio.
+
+config BR2_PACKAGE_LIBEFL_UTIL_LINUX_LIBMOUNT
+ bool "Enable libmount support (recommended)"
+ select BR2_PACKAGE_UTIL_LINUX_LIBMOUNT
+ default y
+ help
+ Libmount is used heavily inside Eeze for support of removable
+ devices etc... and disabling this will hurt support for
+ Enlightenment and its filemanager.
+
+comment "Warning: one of the recommended option for EFL is not enabled"
+ depends on !BR2_PACKAGE_LIBEFL_BULLET \
+ || !BR2_PACKAGE_LIBEFL_FONTCONFIG \
+ || !BR2_PACKAGE_LIBEFL_GSTREAMER1 \
+ || !BR2_PACKAGE_LIBEFL_LIBFRIBIDI \
+ || !BR2_PACKAGE_LIBEFL_LIBSNDFILE \
+ || !BR2_PACKAGE_LIBEFL_PULSEAUDIO \
+ || !BR2_PACKAGE_LIBEFL_UTIL_LINUX_LIBMOUNT
+
+comment "libevas loaders"
+
+config BR2_PACKAGE_LIBEFL_PNG
+ bool "libevas png loader"
+ select BR2_PACKAGE_LIBPNG
+ help
+ This enables the loader code that loads png files using
+ libpng.
+
+config BR2_PACKAGE_LIBEFL_JPEG
+ bool "libevas jpeg loader"
+ help
+ This enables the loader code that loads jpeg files using
+ libjpeg.
+
+config BR2_PACKAGE_LIBEFL_GIF
+ bool "libevas gif loader"
+ select BR2_PACKAGE_GIFLIB
+ help
+ This enables the loader code that loads gif files using
+ libungif.
+
+config BR2_PACKAGE_LIBEFL_TIFF
+ bool "libevas tiff loader"
+ select BR2_PACKAGE_TIFF
+ help
+ This enables the loader code that loads tiff files.
+
+endif # BR2_PACKAGE_LIBEFL
diff --git a/package/efl/libefl/libefl.mk b/package/efl/libefl/libefl.mk
index d070131..dad5e40 100644
--- a/package/efl/libefl/libefl.mk
+++ b/package/efl/libefl/libefl.mk
@@ -18,6 +18,156 @@ LIBEFL_LICENSE_FILES = \
licenses/COPYING.LGPL \
licenses/COPYING.SMALL

+LIBEFL_INSTALL_STAGING = YES
+
+LIBEFL_DEPENDENCIES = host-pkgconf host-libefl dbus freetype jpeg lua udev \
+ util-linux zlib
+
+# regenerate the configure script:
+# https://phab.enlightenment.org/T2718
+LIBEFL_AUTORECONF = YES
+LIBEFL_GETTEXTIZE = YES
+
+# Configure options:
+# --disable-cxx-bindings: disable C++11 bindings.
+# --disable-fb: disable frame buffer support.
+# --disable-harfbuzz: disable harfbuzz support.
+# --disable-image-loader-jp2k: disable JPEG 2000 support.
+# --disable-image-loader-webp: disable webp support.
+# --disable-sdl: disable sdl2 support.
+# --disable-systemd: disable systemd support.
+# --disable-wayland: disable wayland support.
+# --enable-lua-old: disable Elua and remove luajit dependency.
+# --with-opengl=none: disable opengl support.
+# --with-x11=none: remove dependency on X.org.
+LIBEFL_CONF_OPTS = \
+ --with-edje-cc=$(HOST_DIR)/usr/bin/edje_cc \
+ --with-eolian-gen=$(HOST_DIR)/usr/bin/eolian_gen \
+ --disable-cxx-bindings \
+ --disable-fb \
+ --disable-harfbuzz \
+ --disable-image-loader-jp2k \
+ --disable-image-loader-webp \
+ --disable-sdl \
+ --disable-systemd \
+ --disable-wayland \
+ --enable-lua-old \
+ --with-opengl=none \
+ --with-x11=none
+
+# Disable untested configuration warning.
+ifeq ($(BR2_PACKAGE_LIBEFL_RECOMMENDED_CONFIG),)
+LIBEFL_CONF_OPTS += --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
+endif
+
+ifeq ($(BR2_PACKAGE_UTIL_LINUX_LIBMOUNT),y)
+LIBEFL_DEPENDENCIES += util-linux
+LIBEFL_CONF_OPTS += --enable-libmount
+else
+LIBEFL_CONF_OPTS += --disable-libmount
+endif
+
+ifeq ($(BR2_PACKAGE_FONTCONFIG),y)
+LIBEFL_CONF_OPTS += --enable-fontconfig
+LIBEFL_DEPENDENCIES += fontconfig
+else
+LIBEFL_CONF_OPTS += --disable-fontconfig
+endif
+
+ifeq ($(BR2_PACKAGE_LIBFRIBIDI),y)
+LIBEFL_CONF_OPTS += --enable-fribidi
+LIBEFL_DEPENDENCIES += libfribidi
+else
+LIBEFL_CONF_OPTS += --disable-fribidi
+endif
+
+ifeq ($(BR2_PACKAGE_GSTREAMER1)$(BR2_PACKAGE_GST1_PLUGINS_BASE),yy)
+LIBEFL_CONF_OPTS += --enable-gstreamer1
+LIBEFL_DEPENDENCIES += gstreamer1 gst1-plugins-base
+else
+LIBEFL_CONF_OPTS += --disable-gstreamer1
+endif
+
+ifeq ($(BR2_PACKAGE_BULLET),y)
+LIBEFL_CONF_OPTS += --enable-physics
+LIBEFL_DEPENDENCIES += bullet
+else
+LIBEFL_CONF_OPTS += --disable-physics
+endif
+
+ifeq ($(BR2_PACKAGE_LIBSNDFILE),y)
+LIBEFL_CONF_OPTS += --enable-audio
+LIBEFL_DEPENDENCIES += libsndfile
+else
+LIBEFL_CONF_OPTS += --disable-audio
+endif
+
+ifeq ($(BR2_PACKAGE_PULSEAUDIO),y)
+LIBEFL_CONF_OPTS += --enable-pulseaudio
+LIBEFL_DEPENDENCIES += pulseaudio
+else
+LIBEFL_CONF_OPTS += --disable-pulseaudio
+endif
+
+ifeq ($(BR2_PACKAGE_TSLIB),y)
+LIBEFL_DEPENDENCIES += tslib
+LIBEFL_CONF_OPTS += --enable-tslib
+else
+LIBEFL_CONF_OPTS += --disable-tslib
+endif
+
+ifeq ($(BR2_PACKAGE_LIBGLIB2),y)
+LIBEFL_DEPENDENCIES += libglib2
+LIBEFL_CONF_OPTS += --with-glib=yes
+else
+LIBEFL_CONF_OPTS += --with-glib=no
+endif
+
+# Prefer openssl (the default) over gnutls.
+ifeq ($(BR2_PACKAGE_OPENSSL),y)
+LIBEFL_DEPENDENCIES += openssl
+LIBEFL_CONF_OPTS += --with-crypto=openssl
+else ifeq ($(BR2_PACKAGE_GNUTLS)$(BR2_PACKAGE_LIBGCRYPT),yy)
+LIBEFL_DEPENDENCIES += gnutls libgcrypt
+LIBEFL_CONF_OPTS += --with-crypto=gnutls \
+ --with-libgcrypt-prefix=$(STAGING_DIR)/usr
+else
+LIBEFL_CONF_OPTS += --with-crypto=none
+endif # BR2_PACKAGE_OPENSSL
+
+# Loaders that need external dependencies needs to be --enable-XXX=yes
+# otherwise the default is '=static'.
+# All other loaders are statically built-in
+ifeq ($(BR2_PACKAGE_LIBEFL_PNG),y)
+LIBEFL_CONF_OPTS += --enable-image-loader-png=yes
+LIBEFL_DEPENDENCIES += libpng
+else
+LIBEFL_CONF_OPTS += --disable-image-loader-png
+endif
+
+ifeq ($(BR2_PACKAGE_LIBEFL_JPEG),y)
+LIBEFL_CONF_OPTS += --enable-image-loader-jpeg=yes
+# libefl already depends on jpeg.
+else
+LIBEFL_CONF_OPTS += --disable-image-loader-jpeg
+endif
+
+ifeq ($(BR2_PACKAGE_LIBEFL_GIF),y)
+LIBEFL_CONF_OPTS += --enable-image-loader-gif=yes
+LIBEFL_DEPENDENCIES += giflib
+else
+LIBEFL_CONF_OPTS += --disable-image-loader-gif
+endif
+
+ifeq ($(BR2_PACKAGE_LIBEFL_TIFF),y)
+LIBEFL_CONF_OPTS += --enable-image-loader-tiff=yes
+LIBEFL_DEPENDENCIES += tiff
+else
+LIBEFL_CONF_OPTS += --disable-image-loader-tiff
+endif
+
+$(eval $(autotools-package))
+
################################################################################
#
# host-libefl
--
2.4.3
Thomas Petazzoni
2015-12-16 20:32:04 UTC
Permalink
Romain,
Post by Romain Naour
Also, add BR2_PACKAGE_LIBEFL_RECOMMENDED_CONFIG config option in order to
select all recommended packages that allows to build libefl without the
extra-long --enable-i-really-know-what-i-am-doing...
I am still not entirely happy with your recommended config mechanism.
What I want to see is the visible option "recommended config"
completely removed. See my proposal in the attached patch 0001.

My attached patch 0002 also rewraps some Config.in help text.

But I have more issues, see below.
Post by Romain Naour
diff --git a/package/efl/Config.in b/package/efl/Config.in
index 7ce5a36..3a5e708 100644
--- a/package/efl/Config.in
+++ b/package/efl/Config.in
@@ -1,8 +1,13 @@
menuconfig BR2_PACKAGE_EFL
bool "Enlightenment Foundation Libraries"
- depends on BR2_USE_WCHAR
- # libeina uses madvise(). To revisit when bumping EFL to 1.8
+ depends on BR2_INSTALL_LIBSTDCPP
+ depends on BR2_PACKAGE_HAS_UDEV # libudev
+ depends on BR2_PACKAGE_LUA # lua 5.1 or better
So we really need Lua itself, and not LuaJIT ? If we need only Lua (and
not LuaJIT), why don't we select it ? If we can use either Lua or
LuaJIT, then we should "depends on BR2_PACKAGE_LUAINTERPRETER.

Also, if I apply just this patch, I get some kconfig warnings:

package/efl/Config.in:1:error: recursive dependency detected!
package/efl/Config.in:1: symbol BR2_PACKAGE_EFL depends on BR2_PACKAGE_LUA
package/lua/Config.in:1: symbol BR2_PACKAGE_LUA is selected by BR2_PACKAGE_LIBEDJE
package/efl/libedje/Config.in:4: symbol BR2_PACKAGE_LIBEDJE is selected by BR2_PACKAGE_LIBETHUMB
package/efl/libethumb/Config.in:4: symbol BR2_PACKAGE_LIBETHUMB depends on BR2_PACKAGE_EFL

But it's true that your series later removes libedje, so maybe I should
just not care about this: it's hard to do the big change you're doing
without having some intermediate steps that are imperfect.

Can you let me know the answer for the Lua/LuaJIT question so that we
can move forward with this ?

Thanks!

Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
Yann E. MORIN
2015-12-16 21:36:48 UTC
Permalink
Thomas, All,
Post by Thomas Petazzoni
Post by Romain Naour
Also, add BR2_PACKAGE_LIBEFL_RECOMMENDED_CONFIG config option in order to
select all recommended packages that allows to build libefl without the
extra-long --enable-i-really-know-what-i-am-doing...
I am still not entirely happy with your recommended config mechanism.
What I want to see is the visible option "recommended config"
completely removed. See my proposal in the attached patch 0001.
My attached patch 0002 also rewraps some Config.in help text.
But I have more issues, see below.
Post by Romain Naour
diff --git a/package/efl/Config.in b/package/efl/Config.in
index 7ce5a36..3a5e708 100644
--- a/package/efl/Config.in
+++ b/package/efl/Config.in
@@ -1,8 +1,13 @@
menuconfig BR2_PACKAGE_EFL
bool "Enlightenment Foundation Libraries"
- depends on BR2_USE_WCHAR
- # libeina uses madvise(). To revisit when bumping EFL to 1.8
+ depends on BR2_INSTALL_LIBSTDCPP
+ depends on BR2_PACKAGE_HAS_UDEV # libudev
+ depends on BR2_PACKAGE_LUA # lua 5.1 or better
So we really need Lua itself, and not LuaJIT ? If we need only Lua (and
not LuaJIT), why don't we select it ?
As Romain and I already explained, that's because Lua is a provider for
the virtual package lua-interpreter, and we can not select a provider.

Regards,
Yann E. MORIN.
Post by Thomas Petazzoni
If we can use either Lua or
LuaJIT, then we should "depends on BR2_PACKAGE_LUAINTERPRETER.
package/efl/Config.in:1:error: recursive dependency detected!
package/efl/Config.in:1: symbol BR2_PACKAGE_EFL depends on BR2_PACKAGE_LUA
package/lua/Config.in:1: symbol BR2_PACKAGE_LUA is selected by BR2_PACKAGE_LIBEDJE
package/efl/libedje/Config.in:4: symbol BR2_PACKAGE_LIBEDJE is selected by BR2_PACKAGE_LIBETHUMB
package/efl/libethumb/Config.in:4: symbol BR2_PACKAGE_LIBETHUMB depends on BR2_PACKAGE_EFL
But it's true that your series later removes libedje, so maybe I should
just not care about this: it's hard to do the big change you're doing
without having some intermediate steps that are imperfect.
Can you let me know the answer for the Lua/LuaJIT question so that we
can move forward with this ?
Thanks!
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
From d4eb62a8eedb36a2b7ef6832439dc15cba813520 Mon Sep 17 00:00:00 2001
Date: Wed, 16 Dec 2015 21:26:37 +0100
Subject: [PATCH 1/2] efl: rework recommended config mechanism
---
package/efl/libefl/Config.in | 36 ++++++++++++------------------------
package/efl/libefl/libefl.mk | 2 +-
2 files changed, 13 insertions(+), 25 deletions(-)
diff --git a/package/efl/libefl/Config.in b/package/efl/libefl/Config.in
index cc39c82..24e0fae 100644
--- a/package/efl/libefl/Config.in
+++ b/package/efl/libefl/Config.in
@@ -14,23 +14,6 @@ config BR2_PACKAGE_LIBEFL
if BR2_PACKAGE_LIBEFL
-config BR2_PACKAGE_LIBEFL_RECOMMENDED_CONFIG
- bool "Use recommended and tested configuration"
- depends on BR2_ARCH_HAS_ATOMICS # pulseaudio
- select BR2_PACKAGE_LIBEFL_BULLET
- select BR2_PACKAGE_LIBEFL_FONTCONFIG
- select BR2_PACKAGE_LIBEFL_GSTREAMER1
- select BR2_PACKAGE_LIBEFL_LIBFRIBIDI
- select BR2_PACKAGE_LIBEFL_LIBSNDFILE
- select BR2_PACKAGE_LIBEFL_PULSEAUDIO
- select BR2_PACKAGE_LIBEFL_UTIL_LINUX_LIBMOUNT
- default y
- help
- Enable the basic set of recommended features.
-
- Without that, the EFL developpers consider the build to be
- potentially broken and won't provide any support for it.
-
config BR2_PACKAGE_LIBEFL_BULLET
bool "Enable bullet support (recommended)"
select BR2_PACKAGE_BULLET
@@ -107,14 +90,19 @@ config BR2_PACKAGE_LIBEFL_UTIL_LINUX_LIBMOUNT
devices etc... and disabling this will hurt support for
Enlightenment and its filemanager.
+config BR2_PACKAGE_LIBEFL_HAS_RECOMMENDED_CONFIG
+ bool
+ default y if BR2_PACKAGE_LIBEFL_BULLET && \
+ BR2_PACKAGE_LIBEFL_FONTCONFIG && \
+ BR2_PACKAGE_LIBEFL_GSTREAMER1 && \
+ BR2_PACKAGE_LIBEFL_LIBFRIBIDI && \
+ BR2_PACKAGE_LIBEFL_LIBSNDFILE && \
+ BR2_PACKAGE_LIBEFL_PULSEAUDIO && \
+ BR2_PACKAGE_LIBEFL_UTIL_LINUX_LIBMOUNT
+
+
comment "Warning: one of the recommended option for EFL is not enabled"
- depends on !BR2_PACKAGE_LIBEFL_BULLET \
- || !BR2_PACKAGE_LIBEFL_FONTCONFIG \
- || !BR2_PACKAGE_LIBEFL_GSTREAMER1 \
- || !BR2_PACKAGE_LIBEFL_LIBFRIBIDI \
- || !BR2_PACKAGE_LIBEFL_LIBSNDFILE \
- || !BR2_PACKAGE_LIBEFL_PULSEAUDIO \
- || !BR2_PACKAGE_LIBEFL_UTIL_LINUX_LIBMOUNT
+ depends on !BR2_PACKAGE_LIBEFL_HAS_RECOMMENDED_CONFIG
comment "libevas loaders"
diff --git a/package/efl/libefl/libefl.mk b/package/efl/libefl/libefl.mk
index dad5e40..615968e 100644
--- a/package/efl/libefl/libefl.mk
+++ b/package/efl/libefl/libefl.mk
@@ -56,7 +56,7 @@ LIBEFL_CONF_OPTS = \
--with-x11=none
# Disable untested configuration warning.
-ifeq ($(BR2_PACKAGE_LIBEFL_RECOMMENDED_CONFIG),)
+ifeq ($(BR2_PACKAGE_LIBEFL_HAS_RECOMMENDED_CONFIG),)
LIBEFL_CONF_OPTS += --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
endif
--
2.6.4
From 68878964e825c678b40194104b68dd9af15b28c7 Mon Sep 17 00:00:00 2001
Date: Wed, 16 Dec 2015 21:27:08 +0100
Subject: [PATCH 2/2] efl: rewrap Config.in help texts
---
package/efl/libefl/Config.in | 56 ++++++++++++++++++++++++--------------------
1 file changed, 30 insertions(+), 26 deletions(-)
diff --git a/package/efl/libefl/Config.in b/package/efl/libefl/Config.in
index 24e0fae..6788bb3 100644
--- a/package/efl/libefl/Config.in
+++ b/package/efl/libefl/Config.in
@@ -19,23 +19,25 @@ config BR2_PACKAGE_LIBEFL_BULLET
select BR2_PACKAGE_BULLET
default y
help
- If you have chosen to disable physics support, this disables lots
- of core functionality and is effectively never tested. You are
- going to find features that suddenly don't work and as a result
- cause a series of breakages. This is simply not tested so you are
- on your own in terms of ensuring everything works if you do this.
+ If you have chosen to disable physics support, this disables
+ lots of core functionality and is effectively never
+ tested. You are going to find features that suddenly don't
+ work and as a result cause a series of breakages. This is
+ simply not tested so you are on your own in terms of
+ ensuring everything works if you do this.
config BR2_PACKAGE_LIBEFL_FONTCONFIG
bool "Enable fontconfig support (recommended)"
select BR2_PACKAGE_FONTCONFIG
default y
help
- If fontconfig is disabled, this is going to make general font
- searching not work, and only some very direct
- 'load /path/file.ttf' will work alongside some old-school ttf
- file path searching. This is very likely not what you want, so
+ If fontconfig is disabled, this is going to make general
+ font searching not work, and only some very direct 'load
+ /path/file.ttf' will work alongside some old-school ttf file
+ path searching. This is very likely not what you want, so
highly reconsider turning fontconfig off. Having it off will
- lead to visual problems like missing text in many UI areas etc...
+ lead to visual problems like missing text in many UI areas
+ etc...
config BR2_PACKAGE_LIBEFL_GSTREAMER1
bool "Enable gstreamer1 support (recommended)"
@@ -43,30 +45,31 @@ config BR2_PACKAGE_LIBEFL_GSTREAMER1
select BR2_PACKAGE_GST1_PLUGINS_BASE
default y
help
- If Gstreamer 1.x support is disabled, it will heavily limit your
- media support options and render some functionality as useless,
- leading to visible application bugs.
+ If Gstreamer 1.x support is disabled, it will heavily limit
+ your media support options and render some functionality as
+ useless, leading to visible application bugs.
config BR2_PACKAGE_LIBEFL_LIBFRIBIDI
bool "Enable libfribidi support (recommended)"
select BR2_PACKAGE_LIBFRIBIDI
default y
help
- Fribidi is used for handling right-to-left text (like Arabic,
- Hebrew, Farsi, Persian etc.) and is very likely not a feature you
- want to disable unless you know for absolute certain you will
- never encounter and have to display such scripts. Also note that
- we don't test with fribidi disabled so you may also trigger code
- paths with bugs that are never normally used.
+ Fribidi is used for handling right-to-left text (like
+ Arabic, Hebrew, Farsi, Persian etc.) and is very likely not
+ a feature you want to disable unless you know for absolute
+ certain you will never encounter and have to display such
+ scripts. Also note that we don't test with fribidi disabled
+ so you may also trigger code paths with bugs that are never
+ normally used.
config BR2_PACKAGE_LIBEFL_LIBSNDFILE
bool "Enable libsndfile support (recommended)"
select BR2_PACKAGE_LIBSNDFILE
default y
help
- If you disabled audio support in Ecore, this is not tested and may
- create bugs for you due to it creating untested code paths.
- Reconsider disabling audio.
+ If you disabled audio support in Ecore, this is not tested
+ and may create bugs for you due to it creating untested code
+ paths. Reconsider disabling audio.
config BR2_PACKAGE_LIBEFL_PULSEAUDIO
bool "Enable pulseaudio support (recommended)"
@@ -74,10 +77,11 @@ config BR2_PACKAGE_LIBEFL_PULSEAUDIO
select BR2_PACKAGE_PULSEAUDIO
default y
help
- The only audio output method supported by Ecore right now is via
- Pulseaudio. You have disabled that and likely have broken a whole
- bunch of things in the process. Reconsider your configure
- options.
+ The only audio output method supported by Ecore right now is
+ via Pulseaudio. You have disabled that and likely have
+ broken a whole bunch of things in the process. Reconsider
+ your configure options.
+
NOTE: multisense support is automatically enabled with
pulseaudio.
--
2.6.4
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
Thomas Petazzoni
2015-12-16 21:45:03 UTC
Permalink
Hello,
Post by Yann E. MORIN
As Romain and I already explained, that's because Lua is a provider for
the virtual package lua-interpreter, and we can not select a provider.
Have you seen the rest of my e-mail ? I'm quoting it, for good measure:

"""
Also, if I apply just this patch, I get some kconfig warnings:

package/efl/Config.in:1:error: recursive dependency detected!
package/efl/Config.in:1: symbol BR2_PACKAGE_EFL depends on BR2_PACKAGE_LUA
package/lua/Config.in:1: symbol BR2_PACKAGE_LUA is selected by BR2_PACKAGE_LIBEDJE
package/efl/libedje/Config.in:4: symbol BR2_PACKAGE_LIBEDJE is selected by BR2_PACKAGE_LIBETHUMB
package/efl/libethumb/Config.in:4: symbol BR2_PACKAGE_LIBETHUMB depends on BR2_PACKAGE_EFL
"""

So there is definitely some packages selecting BR2_PACKAGE_LUA, and it's
actually not the only one:

package/dnsmasq/Config.in: select BR2_PACKAGE_LUA
package/efl/libedje/Config.in: select BR2_PACKAGE_LUA
package/haserl/Config.in: select BR2_PACKAGE_LUA
package/lighttpd/Config.in: select BR2_PACKAGE_LUA

What you cannot do is select BR2_PACKAGE_LUAINTERPRETER to say "select
whichever Lua provider you want". However you can select a particular
Lua interpreter if you need to. And several packages do this.

Best regards,

Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
Romain Naour
2015-12-17 22:09:33 UTC
Permalink
Hi Thomas, Yann, All,
Post by Thomas Petazzoni
Romain,
Post by Romain Naour
Also, add BR2_PACKAGE_LIBEFL_RECOMMENDED_CONFIG config option in order to
select all recommended packages that allows to build libefl without the
extra-long --enable-i-really-know-what-i-am-doing...
I am still not entirely happy with your recommended config mechanism.
What I want to see is the visible option "recommended config"
completely removed. See my proposal in the attached patch 0001.
My attached patch 0002 also rewraps some Config.in help text.
ok, I'll merge these two patches. Thanks.
Post by Thomas Petazzoni
But I have more issues, see below.
Post by Romain Naour
diff --git a/package/efl/Config.in b/package/efl/Config.in
index 7ce5a36..3a5e708 100644
--- a/package/efl/Config.in
+++ b/package/efl/Config.in
@@ -1,8 +1,13 @@
menuconfig BR2_PACKAGE_EFL
bool "Enlightenment Foundation Libraries"
- depends on BR2_USE_WCHAR
- # libeina uses madvise(). To revisit when bumping EFL to 1.8
+ depends on BR2_INSTALL_LIBSTDCPP
+ depends on BR2_PACKAGE_HAS_UDEV # libudev
+ depends on BR2_PACKAGE_LUA # lua 5.1 or better
So we really need Lua itself, and not LuaJIT ? If we need only Lua (and
not LuaJIT), why don't we select it ? If we can use either Lua or
LuaJIT, then we should "depends on BR2_PACKAGE_LUAINTERPRETER.
package/efl/Config.in:1:error: recursive dependency detected!
package/efl/Config.in:1: symbol BR2_PACKAGE_EFL depends on BR2_PACKAGE_LUA
package/lua/Config.in:1: symbol BR2_PACKAGE_LUA is selected by BR2_PACKAGE_LIBEDJE
package/efl/libedje/Config.in:4: symbol BR2_PACKAGE_LIBEDJE is selected by BR2_PACKAGE_LIBETHUMB
package/efl/libethumb/Config.in:4: symbol BR2_PACKAGE_LIBETHUMB depends on BR2_PACKAGE_EFL
But it's true that your series later removes libedje, so maybe I should
just not care about this: it's hard to do the big change you're doing
without having some intermediate steps that are imperfect.
Well, I tried to do a smooth update series has much as possible ;-)
But I didn't want to modify efl packages that are removed at the end of the
series... I didn't test all intermediate test of this series, only when the
entire series is applied.
Post by Thomas Petazzoni
Can you let me know the answer for the Lua/LuaJIT question so that we
can move forward with this ?
I haven't tested all lua interpreter...
Here is the lua interpreter I used for the runtime test:

BR2_PACKAGE_LUA=y
BR2_PACKAGE_PROVIDES_LUAINTERPRETER="lua"
BR2_PACKAGE_LUA_5_1=y

If you want to try with LuaJIT, the --enable-lua-old option must be removed.
IIRC, I had some build issue with it but it was with efl 1.13.2.
So, I wanted to avoid LuaJIT for now and be sure that one of LUA packages is
selected.

I'll check if efl can just depends on BR2_PACKAGE_HAS_LUAINTERPRETER.

Best regards,
Romain
Post by Thomas Petazzoni
Thanks!
Thomas
Thomas Petazzoni
2015-12-17 22:17:16 UTC
Permalink
Romain,
Post by Romain Naour
Post by Thomas Petazzoni
So we really need Lua itself, and not LuaJIT ? If we need only Lua (and
not LuaJIT), why don't we select it ? If we can use either Lua or
LuaJIT, then we should "depends on BR2_PACKAGE_LUAINTERPRETER.
package/efl/Config.in:1:error: recursive dependency detected!
package/efl/Config.in:1: symbol BR2_PACKAGE_EFL depends on BR2_PACKAGE_LUA
package/lua/Config.in:1: symbol BR2_PACKAGE_LUA is selected by BR2_PACKAGE_LIBEDJE
package/efl/libedje/Config.in:4: symbol BR2_PACKAGE_LIBEDJE is selected by BR2_PACKAGE_LIBETHUMB
package/efl/libethumb/Config.in:4: symbol BR2_PACKAGE_LIBETHUMB depends on BR2_PACKAGE_EFL
But it's true that your series later removes libedje, so maybe I should
just not care about this: it's hard to do the big change you're doing
without having some intermediate steps that are imperfect.
Well, I tried to do a smooth update series has much as possible ;-)
But I didn't want to modify efl packages that are removed at the end of the
series... I didn't test all intermediate test of this series, only when the
entire series is applied.
Yes, that's fine with me. The changes are complicated, it's difficult
to do a series that is entirely bisectable.
Post by Romain Naour
Post by Thomas Petazzoni
Can you let me know the answer for the Lua/LuaJIT question so that we
can move forward with this ?
I haven't tested all lua interpreter...
BR2_PACKAGE_LUA=y
BR2_PACKAGE_PROVIDES_LUAINTERPRETER="lua"
BR2_PACKAGE_LUA_5_1=y
If you want to try with LuaJIT, the --enable-lua-old option must be removed.
IIRC, I had some build issue with it but it was with efl 1.13.2.
So, I wanted to avoid LuaJIT for now and be sure that one of LUA packages is
selected.
I'll check if efl can just depends on BR2_PACKAGE_HAS_LUAINTERPRETER.
No, please stick to just Lua for now. I want to merge this series, so
we should stop doing more and more things on it.

Thanks,

Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
Yann E. MORIN
2015-12-17 22:21:51 UTC
Permalink
Romain, Thomas, All,
[--SNIP--]
Post by Romain Naour
Post by Thomas Petazzoni
package/efl/Config.in:1:error: recursive dependency detected!
package/efl/Config.in:1: symbol BR2_PACKAGE_EFL depends on BR2_PACKAGE_LUA
package/lua/Config.in:1: symbol BR2_PACKAGE_LUA is selected by BR2_PACKAGE_LIBEDJE
package/efl/libedje/Config.in:4: symbol BR2_PACKAGE_LIBEDJE is selected by BR2_PACKAGE_LIBETHUMB
package/efl/libethumb/Config.in:4: symbol BR2_PACKAGE_LIBETHUMB depends on BR2_PACKAGE_EFL
But it's true that your series later removes libedje, so maybe I should
just not care about this: it's hard to do the big change you're doing
without having some intermediate steps that are imperfect.
Well, I tried to do a smooth update series has much as possible ;-)
But I didn't want to modify efl packages that are removed at the end of the
series... I didn't test all intermediate test of this series, only when the
entire series is applied.
For what it's worth, I just sent a series actually fixing that very
issue.
Post by Romain Naour
Post by Thomas Petazzoni
Can you let me know the answer for the Lua/LuaJIT question so that we
can move forward with this ?
I haven't tested all lua interpreter...
BR2_PACKAGE_LUA=y
BR2_PACKAGE_PROVIDES_LUAINTERPRETER="lua"
BR2_PACKAGE_LUA_5_1=y
If you want to try with LuaJIT, the --enable-lua-old option must be removed.
IIRC, I had some build issue with it but it was with efl 1.13.2.
So, I wanted to avoid LuaJIT for now and be sure that one of LUA packages is
selected.
I'll check if efl can just depends on BR2_PACKAGE_HAS_LUAINTERPRETER.
I would say: don't.

If you manage to make it work with the 'full' Lua, just keep it as is.
Checking for luajit can be done is a followup series.

But please, no more feature changes in that series. Let's get it
appplied asap now. Let's just fix the obvious, new features can be added
*later*.

Thanks!

Regards,
Yann E. MORIN.
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
Romain Naour
2015-12-15 22:40:19 UTC
Permalink
Add an option to enable X11 support in libecore without graphic
acceleration. libecore can use xlib or xcb support but the latter
in not recommended by efl developpers [1]. Thereby the xcb support
has been dropped with the bump to efl 1.15.

Also, set x-includes and x-libraries configure option for cross-compiling.
Previous efl versions had cross-compilation issue (poisoned paths)
if these options are not passed to configure script.

In order to remove the dependency on libXp wich is no longer bundled in
recent X11 release [2], backport an upstream patch [3] to remove xprint
usage.

[1] https://git.enlightenment.org/core/efl.git/tree/configure.ac#n5002
[2] http://www.x.org/wiki/Releases/ModuleVersions
[3] https://git.enlightenment.org/core/efl.git/commit/?h=efl-1.15&id=434572355c7e929b84210b2f795634d38f13c913

Signed-off-by: Romain Naour <***@openwide.fr>
Reviewed-by: "Yann E. MORIN" <***@free.fr>
---
v8: fix codin style (Yann)
add --disable-xinput22
v6: drop xcb support
Improve the comment about autotools (Yann E.Morin)
fix typo (enable-lua-old)
v4: rename libefl
improve commit log
v3: fix typo
remove xlib_libXp dependency (xprint), since libXp package has been
removed from this series.
---
.../libefl/0002-ecore_x-Remove-XPrint-usage.patch | 153 +++++++++++++++++++++
package/efl/libefl/Config.in | 16 +++
package/efl/libefl/libefl.mk | 33 ++++-
3 files changed, 197 insertions(+), 5 deletions(-)
create mode 100644 package/efl/libefl/0002-ecore_x-Remove-XPrint-usage.patch

diff --git a/package/efl/libefl/0002-ecore_x-Remove-XPrint-usage.patch b/package/efl/libefl/0002-ecore_x-Remove-XPrint-usage.patch
new file mode 100644
index 0000000..4687e4c
--- /dev/null
+++ b/package/efl/libefl/0002-ecore_x-Remove-XPrint-usage.patch
@@ -0,0 +1,153 @@
+From 434572355c7e929b84210b2f795634d38f13c913 Mon Sep 17 00:00:00 2001
+From: Derek Foreman <***@osg.samsung.com>
+Date: Tue, 6 Oct 2015 13:13:01 -0400
+Subject: [PATCH] ecore_x: Remove XPrint usage
+
+Summary:
+Xprint has been deprecated since 2008.
+
+It's recently (August 2015) been removed from debian.
+
+Reviewers: zmike, devilhorns
+
+Subscribers: cedric
+
+Differential Revision: https://phab.enlightenment.org/D3150
+---
+ configure.ac | 1 -
+ src/lib/ecore_x/xlib/ecore_x.c | 78 ----------------------------------
+ src/lib/ecore_x/xlib/ecore_x_private.h | 3 --
+ 3 files changed, 82 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 9c17946..c34191c 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -3624,7 +3624,6 @@ if test "x${want_x11_xlib}" = "xyes" ; then
+ ECORE_CHECK_X_EXTENSION([Xdpms], [dpms.h], [Xext], [DPMSQueryExtension])
+ ECORE_CHECK_X_EXTENSION([Xfixes], [Xfixes.h], [Xfixes], [XFixesExpandRegion])
+ ECORE_CHECK_X_EXTENSION([Xinerama], [Xinerama.h], [Xinerama], [XineramaQueryScreens])
+- ECORE_CHECK_X_EXTENSION([Xprint], [Print.h], [Xp], [XpQueryScreens])
+ ECORE_CHECK_X_EXTENSION([Xrandr], [Xrandr.h], [Xrandr], [XRRGetScreenResourcesCurrent])
+ ECORE_CHECK_X_EXTENSION([Xrender], [Xrender.h], [Xrender], [XRenderFindVisualFormat])
+ ECORE_CHECK_X_EXTENSION([Xtest], [XTest.h], [Xtst], [XTestFakeKeyEvent])
+diff --git a/src/lib/ecore_x/xlib/ecore_x.c b/src/lib/ecore_x/xlib/ecore_x.c
+index 096f64d..8e2057e 100644
+--- a/src/lib/ecore_x/xlib/ecore_x.c
++++ b/src/lib/ecore_x/xlib/ecore_x.c
+@@ -1219,9 +1219,6 @@ ecore_x_window_root_list(int *num_ret)
+ {
+ int num, i;
+ Ecore_X_Window *roots;
+-#ifdef ECORE_XPRINT
+- int xp_base, xp_err_base;
+-#endif /* ifdef ECORE_XPRINT */
+
+ if (!num_ret)
+ return NULL;
+@@ -1229,80 +1226,6 @@ ecore_x_window_root_list(int *num_ret)
+ *num_ret = 0;
+
+ LOGFN(__FILE__, __LINE__, __FUNCTION__);
+-#ifdef ECORE_XPRINT
+- num = ScreenCount(_ecore_x_disp);
+- if (XpQueryExtension(_ecore_x_disp, &xp_base, &xp_err_base))
+- {
+- Screen **ps = NULL;
+- int psnum = 0;
+-
+- ps = XpQueryScreens(_ecore_x_disp, &psnum);
+- if (ps)
+- {
+- int overlap, j;
+-
+- overlap = 0;
+- for (i = 0; i < num; i++)
+- {
+- for (j = 0; j < psnum; j++)
+- {
+- if (ScreenOfDisplay(_ecore_x_disp, i) == ps[j])
+- overlap++;
+- }
+- }
+- roots = malloc(MAX((num - overlap) * sizeof(Ecore_X_Window), 1));
+- if (roots)
+- {
+- int k;
+-
+- k = 0;
+- for (i = 0; i < num; i++)
+- {
+- int is_print;
+-
+- is_print = 0;
+- for (j = 0; j < psnum; j++)
+- {
+- if (ScreenOfDisplay(_ecore_x_disp, i) == ps[j])
+- {
+- is_print = 1;
+- break;
+- }
+- }
+- if (!is_print)
+- {
+- roots[k] = RootWindow(_ecore_x_disp, i);
+- k++;
+- }
+- }
+- *num_ret = k;
+- }
+-
+- XFree(ps);
+- }
+- else
+- {
+- roots = malloc(num * sizeof(Ecore_X_Window));
+- if (!roots)
+- return NULL;
+-
+- *num_ret = num;
+- for (i = 0; i < num; i++)
+- roots[i] = RootWindow(_ecore_x_disp, i);
+- }
+- }
+- else
+- {
+- roots = malloc(num * sizeof(Ecore_X_Window));
+- if (!roots)
+- return NULL;
+-
+- *num_ret = num;
+- for (i = 0; i < num; i++)
+- roots[i] = RootWindow(_ecore_x_disp, i);
+- }
+-
+-#else /* ifdef ECORE_XPRINT */
+ num = ScreenCount(_ecore_x_disp);
+ roots = malloc(num * sizeof(Ecore_X_Window));
+ if (!roots)
+@@ -1311,7 +1234,6 @@ ecore_x_window_root_list(int *num_ret)
+ *num_ret = num;
+ for (i = 0; i < num; i++)
+ roots[i] = RootWindow(_ecore_x_disp, i);
+-#endif /* ifdef ECORE_XPRINT */
+ return roots;
+ }
+
+diff --git a/src/lib/ecore_x/xlib/ecore_x_private.h b/src/lib/ecore_x/xlib/ecore_x_private.h
+index 97b3858..07c09fb 100644
+--- a/src/lib/ecore_x/xlib/ecore_x_private.h
++++ b/src/lib/ecore_x/xlib/ecore_x_private.h
+@@ -19,9 +19,6 @@
+ #ifdef ECORE_XCURSOR
+ #include <X11/Xcursor/Xcursor.h>
+ #endif /* ifdef ECORE_XCURSOR */
+-#ifdef ECORE_XPRINT
+-#include <X11/extensions/Print.h>
+-#endif /* ifdef ECORE_XPRINT */
+ #ifdef ECORE_XINERAMA
+ #include <X11/extensions/Xinerama.h>
+ #endif /* ifdef ECORE_XINERAMA */
+--
+2.4.3
+
diff --git a/package/efl/libefl/Config.in b/package/efl/libefl/Config.in
index 504cd4b..bf15de7 100644
--- a/package/efl/libefl/Config.in
+++ b/package/efl/libefl/Config.in
@@ -122,6 +122,22 @@ comment "libecore video support"
config BR2_PACKAGE_LIBEFL_FB
bool "FB support"

+config BR2_PACKAGE_LIBEFL_X_XLIB
+ bool "X11 support (xlib)"
+ depends on BR2_PACKAGE_XORG7
+ select BR2_PACKAGE_XLIB_LIBX11
+ select BR2_PACKAGE_XLIB_LIBXEXT
+ select BR2_PACKAGE_XLIB_LIBXCOMPOSITE
+ select BR2_PACKAGE_XLIB_LIBXCURSOR
+ select BR2_PACKAGE_XLIB_LIBXDAMAGE
+ select BR2_PACKAGE_XLIB_LIBXINERAMA
+ select BR2_PACKAGE_XLIB_LIBXP
+ select BR2_PACKAGE_XLIB_LIBXRANDR
+ select BR2_PACKAGE_XLIB_LIBXRENDER
+ select BR2_PACKAGE_XLIB_LIBXSCRNSAVER
+ select BR2_PACKAGE_XLIB_LIBXTST
+ select BR2_PACKAGE_XPROTO_GLPROTO
+
comment "libevas loaders"

config BR2_PACKAGE_LIBEFL_PNG
diff --git a/package/efl/libefl/libefl.mk b/package/efl/libefl/libefl.mk
index e1eb313..3d58e24 100644
--- a/package/efl/libefl/libefl.mk
+++ b/package/efl/libefl/libefl.mk
@@ -23,8 +23,9 @@ LIBEFL_INSTALL_STAGING = YES
LIBEFL_DEPENDENCIES = host-pkgconf host-libefl dbus freetype jpeg lua udev \
util-linux zlib

-# regenerate the configure script:
-# https://phab.enlightenment.org/T2718
+# Regenerate the autotools:
+# - to fix an issue in eldbus-codegen: https://phab.enlightenment.org/T2718
+# - to remove dependency on libXp: https://phab.enlightenment.org/D3150
LIBEFL_AUTORECONF = YES
LIBEFL_GETTEXTIZE = YES

@@ -32,18 +33,18 @@ LIBEFL_GETTEXTIZE = YES
# --disable-cxx-bindings: disable C++11 bindings.
# --disable-sdl: disable sdl2 support.
# --disable-systemd: disable systemd support.
+# --disable-xinput22: disable X11 XInput v2.2+ support.
# --enable-lua-old: disable Elua and remove luajit dependency.
# --with-opengl=none: disable opengl support.
-# --with-x11=none: remove dependency on X.org.
LIBEFL_CONF_OPTS = \
--with-edje-cc=$(HOST_DIR)/usr/bin/edje_cc \
--with-eolian-gen=$(HOST_DIR)/usr/bin/eolian_gen \
--disable-cxx-bindings \
--disable-sdl \
--disable-systemd \
+ --disable-xinput22 \
--enable-lua-old \
- --with-opengl=none \
- --with-x11=none
+ --with-opengl=none

# Disable untested configuration warning.
ifeq ($(BR2_PACKAGE_LIBEFL_RECOMMENDED_CONFIG),)
@@ -145,6 +146,28 @@ else
LIBEFL_CONF_OPTS += --disable-fb
endif

+ifeq ($(BR2_PACKAGE_LIBEFL_X_XLIB),y)
+LIBEFL_CONF_OPTS += \
+ --with-x11=xlib \
+ --with-x=$(STAGING_DIR) \
+ --x-includes=$(STAGING_DIR)/usr/include \
+ --x-libraries=$(STAGING_DIR)/usr/lib
+
+LIBEFL_DEPENDENCIES += \
+ xlib_libX11 \
+ xlib_libXcomposite \
+ xlib_libXcursor \
+ xlib_libXdamage \
+ xlib_libXext \
+ xlib_libXinerama \
+ xlib_libXrandr \
+ xlib_libXrender \
+ xlib_libXScrnSaver \
+ xlib_libXtst
+else
+LIBEFL_CONF_OPTS += --with-x11=none
+endif
+
# Loaders that need external dependencies needs to be --enable-XXX=yes
# otherwise the default is '=static'.
# All other loaders are statically built-in
--
2.4.3
Romain Naour
2015-12-15 22:40:23 UTC
Permalink
libraw it's one of the "highly recommended" dependecies
according to the README [1].

[1] https://git.enlightenment.org/core/evas_generic_loaders.git/tree/README?id=v1.15.0#n31

Signed-off-by: Romain Naour <***@openwide.fr>
Reviewed-by: "Yann E. MORIN" <***@free.fr>
---
v6: select BR2_PACKAGE_LIBRAW and propagate its dependency on
C++. (Yann E.Morin)
v4: improve commit log
---
package/libevas-generic-loaders/Config.in | 10 ++++++++++
package/libevas-generic-loaders/libevas-generic-loaders.mk | 9 +++++++--
2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/package/libevas-generic-loaders/Config.in b/package/libevas-generic-loaders/Config.in
index 65ced8a..1d5b717 100644
--- a/package/libevas-generic-loaders/Config.in
+++ b/package/libevas-generic-loaders/Config.in
@@ -11,6 +11,16 @@ config BR2_PACKAGE_LIBEVAS_GENERIC_LOADERS

if BR2_PACKAGE_LIBEVAS_GENERIC_LOADERS

+config BR2_PACKAGE_LIBEVAS_GENERIC_LOADERS_LIBRAW
+ bool "libraw loader"
+ depends on BR2_INSTALL_LIBSTDCPP # libraw
+ select BR2_PACKAGE_LIBRAW
+ help
+ This option enables the Evas generic Libraw loader
+
+comment "libraw loader needs a toolchain w/ C++"
+ depends on !BR2_INSTALL_LIBSTDCPP
+
config BR2_PACKAGE_LIBEVAS_GENERIC_LOADERS_SVG
bool "SVG loader"
depends on BR2_USE_MMU # librsvg -> glib2
diff --git a/package/libevas-generic-loaders/libevas-generic-loaders.mk b/package/libevas-generic-loaders/libevas-generic-loaders.mk
index 47dfa9a..2c1c1cd 100644
--- a/package/libevas-generic-loaders/libevas-generic-loaders.mk
+++ b/package/libevas-generic-loaders/libevas-generic-loaders.mk
@@ -14,15 +14,20 @@ LIBEVAS_GENERIC_LOADERS_INSTALL_STAGING = YES

LIBEVAS_GENERIC_LOADERS_DEPENDENCIES = host-pkgconf libefl zlib

-# For now, we only support the SVG loader
# poppler >= 0.32 is not supported by the current version of
# libevas-generic-loaders.
LIBEVAS_GENERIC_LOADERS_CONF_OPTS += \
--disable-poppler \
--disable-spectre \
- --disable-libraw \
--disable-gstreamer

+ifeq ($(BR2_PACKAGE_LIBEVAS_GENERIC_LOADERS_LIBRAW),y)
+LIBEVAS_GENERIC_LOADERS_DEPENDENCIES += libraw
+LIBEVAS_GENERIC_LOADERS_CONF_OPTS += --enable-libraw
+else
+LIBEVAS_GENERIC_LOADERS_CONF_OPTS += --disable-libraw
+endif
+
ifeq ($(BR2_PACKAGE_LIBEVAS_GENERIC_LOADERS_SVG),y)
LIBEVAS_GENERIC_LOADERS_DEPENDENCIES += librsvg cairo
LIBEVAS_GENERIC_LOADERS_CONF_OPTS += --enable-svg
--
2.4.3
Romain Naour
2015-12-15 22:40:24 UTC
Permalink
Use the newly added libefl package wich provide a new version
of libeina, libevas, libecore and libedje.

Update the upstream url and add a hash file.

We need to add a host package to provide elm_prefs_cc the
host machine to cross-compile correctly libelementary
for the target. Otherwise, elm_prefs_cc for the
target is used on the host machine.

Since eet, eolian_gen and eldbus_codegen are installed in
HOST_DIR by host-efl package, help configure script to find
them.

Explicitly disable doxygen and elementary-test.

Signed-off-by: Romain Naour <***@openwide.fr>
Reviewed-by: "Yann E. MORIN" <***@free.fr>
---
v6: squash with the patch adding host-libelementary (Yann E.Morin)
v5: move the hash file to package/efl/libelementary
v4: keep libelementary in package/efl/
v3: bump to 1.15.2
remove trailing slash (Vicente Bergas)
v2: bump to 1.15.1
remove glibc only dependency
---
package/efl/libelementary/Config.in | 14 ++++-------
package/efl/libelementary/libelementary.hash | 2 ++
package/efl/libelementary/libelementary.mk | 35 ++++++++++++++++------------
3 files changed, 27 insertions(+), 24 deletions(-)
create mode 100644 package/efl/libelementary/libelementary.hash

diff --git a/package/efl/libelementary/Config.in b/package/efl/libelementary/Config.in
index fcc7025..1f8c962 100644
--- a/package/efl/libelementary/Config.in
+++ b/package/efl/libelementary/Config.in
@@ -1,17 +1,13 @@
-comment "libelementary needs a toolchain w/ threads, dynamic library"
- depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS
-
config BR2_PACKAGE_LIBELEMENTARY
bool "libelementary"
- depends on BR2_TOOLCHAIN_HAS_THREADS # libevas
+ depends on BR2_TOOLCHAIN_HAS_THREADS # elm_store.c
depends on !BR2_STATIC_LIBS
- select BR2_PACKAGE_LIBEINA
- select BR2_PACKAGE_LIBEVAS
- select BR2_PACKAGE_LIBECORE
- select BR2_PACKAGE_LIBEDJE
help
Elementary is a widget toolkit and EFL wrapper and convenience
library to make it easy to build applications and tools with UIs
with less code.

- http://trac.enlightenment.org/e/wiki/Elementary
+ https://enlightenment.org
+
+comment "libelementary needs a toolchain w/ threads, dynamic library"
+ depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS
diff --git a/package/efl/libelementary/libelementary.hash b/package/efl/libelementary/libelementary.hash
new file mode 100644
index 0000000..2cd36d8
--- /dev/null
+++ b/package/efl/libelementary/libelementary.hash
@@ -0,0 +1,2 @@
+# From https://download.enlightenment.org/rel/libs/elementary/elementary-1.15.2.tar.xz.sha256
+sha256 523c3073210b611817d0f56aa8348962ec757282f9f7dfde93825afa164a0f3f elementary-1.15.2.tar.xz
diff --git a/package/efl/libelementary/libelementary.mk b/package/efl/libelementary/libelementary.mk
index 8bd69fe..4ba8681 100644
--- a/package/efl/libelementary/libelementary.mk
+++ b/package/efl/libelementary/libelementary.mk
@@ -4,29 +4,34 @@
#
################################################################################

-LIBELEMENTARY_VERSION = 1.7.10
-LIBELEMENTARY_SOURCE = elementary-$(LIBELEMENTARY_VERSION).tar.bz2
-LIBELEMENTARY_SITE = http://download.enlightenment.org/releases
+LIBELEMENTARY_VERSION = 1.15.2
+LIBELEMENTARY_SOURCE = elementary-$(LIBELEMENTARY_VERSION).tar.xz
+LIBELEMENTARY_SITE = http://download.enlightenment.org/rel/libs/elementary
LIBELEMENTARY_LICENSE = LGPLv2.1
LIBELEMENTARY_LICENSE_FILES = COPYING

LIBELEMENTARY_INSTALL_STAGING = YES

-LIBELEMENTARY_DEPENDENCIES = \
- libeina libevas libecore libedje host-libedje \
- host-libeet
+LIBELEMENTARY_DEPENDENCIES = host-pkgconf host-libefl host-libelementary libefl

LIBELEMENTARY_CONF_OPTS = \
--with-edje-cc=$(HOST_DIR)/usr/bin/edje_cc \
- --with-eet-eet=$(HOST_DIR)/usr/bin/eet
+ --with-eet-eet=$(HOST_DIR)/usr/bin/eet \
+ --with-eolian-gen=$(HOST_DIR)/usr/bin/eolian_gen \
+ --with-eldbus_codegen=$(HOST_DIR)/usr/bin/eldbus-codegen \
+ --with-elm-prefs-cc=$(HOST_DIR)/usr/bin/elm_prefs_cc \
+ --with-doxygen=no \
+ --disable-elementary-test

-# libethumb_client is only built when ethumbd is built.
-# ethumbd is only built if edbus is built.
-ifeq ($(BR2_PACKAGE_LIBETHUMB)$(BR2_PACKAGE_LIBEDBUS),yy)
-LIBELEMENTARY_DEPENDENCIES += libethumb
-LIBELEMENTARY_CONF_OPTS += --enable-ethumb
-else
-LIBELEMENTARY_CONF_OPTS += --disable-ethumb
-endif
+# We need a host package in order to provide elm_prefs_cc and
+# elementary_codegen.
+HOST_LIBELEMENTARY_DEPENDENCIES = host-pkgconf host-libefl
+HOST_LIBELEMENTARY_CONF_OPTS = \
+ --with-edje-cc=$(HOST_DIR)/usr/bin/edje_cc \
+ --with-eet-eet=$(HOST_DIR)/usr/bin/eet \
+ --with-eolian-gen=$(HOST_DIR)/usr/bin/eolian_gen \
+ --with-doxygen=no \
+ --disable-elementary-test

$(eval $(autotools-package))
+$(eval $(host-autotools-package))
--
2.4.3
Romain Naour
2015-12-15 22:40:32 UTC
Permalink
Libeio is now available in efl package.

Signed-off-by: Romain Naour <***@openwide.fr>
Reviewed-by: "Yann E. MORIN" <***@free.fr>
---
v6: Improve lecacy help text (Yann E.Morin)
v5: remove libeio directory
v4: update Config.in to use libefl
v3: update legacy option for 2015.11
update help text
---
Config.in.legacy | 7 +++++++
package/efl/Config.in | 1 -
package/efl/libeio/Config.in | 22 ----------------------
package/efl/libeio/libeio.mk | 16 ----------------
4 files changed, 7 insertions(+), 39 deletions(-)
delete mode 100644 package/efl/libeio/Config.in
delete mode 100644 package/efl/libeio/libeio.mk

diff --git a/Config.in.legacy b/Config.in.legacy
index c161687..4a99c7b 100644
--- a/Config.in.legacy
+++ b/Config.in.legacy
@@ -107,6 +107,13 @@ endif
###############################################################################
comment "Legacy options removed in 2016.02"

+config BR2_PACKAGE_LIBEIO
+ bool "libeio package has been removed"
+ select BR2_LEGACY
+ select BR2_PACKAGE_EFL
+ help
+ With EFL 1.15, libeio is now provided by the libefl package.
+
config BR2_PACKAGE_LIBEMBRYO
bool "libembryo package has been removed"
select BR2_LEGACY
diff --git a/package/efl/Config.in b/package/efl/Config.in
index 5947de2..58e8f65 100644
--- a/package/efl/Config.in
+++ b/package/efl/Config.in
@@ -20,7 +20,6 @@ source "package/efl/libecore/Config.in"
source "package/efl/libeet/Config.in"
source "package/efl/libefl/Config.in"
source "package/efl/libefreet/Config.in"
-source "package/efl/libeio/Config.in"
source "package/efl/libevas/Config.in"
source "package/efl/libelementary/Config.in"
source "package/efl/libedbus/Config.in"
diff --git a/package/efl/libeio/Config.in b/package/efl/libeio/Config.in
deleted file mode 100644
index 5b1e395..0000000
--- a/package/efl/libeio/Config.in
+++ /dev/null
@@ -1,22 +0,0 @@
-config BR2_PACKAGE_LIBEIO
- bool "libeio"
- select BR2_PACKAGE_LIBEET
- select BR2_PACKAGE_LIBEINA
- select BR2_PACKAGE_LIBECORE
- depends on BR2_TOOLCHAIN_HAS_THREADS
- help
- Eio integrates with EFL (Ecore, Eina) to provide efficient
- filesystem Input/Output (I/O). It use the best techniques to
- achieve such purpose, like using at-variants, splice,
- properly handling errors and doing it in an asynchronous
- fashion by means of worker threads. It is also ported to
- Windows, so multi-platform.
-
- Whenever you need to list a directory, copy, move or delete
- files, Eio will do that task better than you'd achieve with
- naive implementations, and it is easy to use.
-
- http://trac.enlightenment.org/e/wiki/Eio
-
-comment "libeio needs a toolchain w/ threads"
- depends on !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/efl/libeio/libeio.mk b/package/efl/libeio/libeio.mk
deleted file mode 100644
index e687c32..0000000
--- a/package/efl/libeio/libeio.mk
+++ /dev/null
@@ -1,16 +0,0 @@
-################################################################################
-#
-# libeio
-#
-################################################################################
-
-LIBEIO_VERSION = 1.7.10
-LIBEIO_SOURCE = eio-$(LIBEIO_VERSION).tar.bz2
-LIBEIO_SITE = http://download.enlightenment.org/releases
-LIBEIO_LICENSE = LGPLv2.1
-LIBEIO_LICENSE_FILES = COPYING
-
-LIBEIO_INSTALL_STAGING = YES
-LIBEIO_DEPENDENCIES = libeina libeet libecore
-
-$(eval $(autotools-package))
--
2.4.3
Romain Naour
2015-12-15 22:40:20 UTC
Permalink
Allow to enable graphic acceleration using OpenGLES
with efl libraries.

The full opengl option (--with-opengl=full) is still disabled
for now since it's mainly used with Tizen on GPU Intel and ARM Mali.

With the upcomming Wayland support in EFL 1.16 and Enlightenment 0.20,
only OpenGLES support is recommanded.

Signed-off-by: Romain Naour <***@openwide.fr>
---
v9: remove OpenGL full support
v6: Rename OpenGL options (Yann E.Morin)
Only full OpenGL support depends on X11.
v4: rename libefl
improve commit log
---
package/efl/libefl/Config.in | 19 +++++++++++++++++++
package/efl/libefl/libefl.mk | 13 ++++++++++---
2 files changed, 29 insertions(+), 3 deletions(-)

diff --git a/package/efl/libefl/Config.in b/package/efl/libefl/Config.in
index bf15de7..333456e 100644
--- a/package/efl/libefl/Config.in
+++ b/package/efl/libefl/Config.in
@@ -138,6 +138,25 @@ config BR2_PACKAGE_LIBEFL_X_XLIB
select BR2_PACKAGE_XLIB_LIBXTST
select BR2_PACKAGE_XPROTO_GLPROTO

+choice
+ bool "OpenGL support"
+ default BR2_PACKAGE_LIBEFL_OPENGLES if BR2_PACKAGE_HAS_LIBGLES
+ help
+ libevas can be configured to use HW acceleration only with
+ OpenGLES.
+
+config BR2_PACKAGE_LIBEFL_OPENGL_NONE
+ bool "none"
+
+config BR2_PACKAGE_LIBEFL_OPENGLES
+ bool "opengles"
+ depends on BR2_PACKAGE_HAS_LIBGLES
+
+comment "opengles support needs an opengles provider"
+ depends on !BR2_PACKAGE_HAS_LIBGLES
+
+endchoice # OpenGL support
+
comment "libevas loaders"

config BR2_PACKAGE_LIBEFL_PNG
diff --git a/package/efl/libefl/libefl.mk b/package/efl/libefl/libefl.mk
index 3d58e24..0eb17c2 100644
--- a/package/efl/libefl/libefl.mk
+++ b/package/efl/libefl/libefl.mk
@@ -35,7 +35,6 @@ LIBEFL_GETTEXTIZE = YES
# --disable-systemd: disable systemd support.
# --disable-xinput22: disable X11 XInput v2.2+ support.
# --enable-lua-old: disable Elua and remove luajit dependency.
-# --with-opengl=none: disable opengl support.
LIBEFL_CONF_OPTS = \
--with-edje-cc=$(HOST_DIR)/usr/bin/edje_cc \
--with-eolian-gen=$(HOST_DIR)/usr/bin/eolian_gen \
@@ -43,8 +42,7 @@ LIBEFL_CONF_OPTS = \
--disable-sdl \
--disable-systemd \
--disable-xinput22 \
- --enable-lua-old \
- --with-opengl=none
+ --enable-lua-old

# Disable untested configuration warning.
ifeq ($(BR2_PACKAGE_LIBEFL_RECOMMENDED_CONFIG),)
@@ -168,6 +166,15 @@ else
LIBEFL_CONF_OPTS += --with-x11=none
endif

+ifeq ($(BR2_PACKAGE_LIBEFL_OPENGLES),y)
+LIBEFL_CONF_OPTS += --with-opengl=es
+LIBEFL_DEPENDENCIES += libgles
+endif
+
+ifeq ($(BR2_PACKAGE_LIBEFL_OPENGL_NONE),y)
+LIBEFL_CONF_OPTS += --with-opengl=none
+endif
+
# Loaders that need external dependencies needs to be --enable-XXX=yes
# otherwise the default is '=static'.
# All other loaders are statically built-in
--
2.4.3
Romain Naour
2015-12-15 22:40:34 UTC
Permalink
Libedbus is now available in efl package.

Signed-off-by: Romain Naour <***@openwide.fr>
Reviewed-by: "Yann E. MORIN" <***@free.fr>
---
v6: Improve lecacy help text (Yann E.Morin)
v5: remove libedbus directory
v3: update legacy option for 2015.11
update help text
---
Config.in.legacy | 7 +++++++
package/efl/Config.in | 1 -
package/efl/libedbus/Config.in | 44 ----------------------------------------
package/efl/libedbus/libedbus.mk | 37 ---------------------------------
4 files changed, 7 insertions(+), 82 deletions(-)
delete mode 100644 package/efl/libedbus/Config.in
delete mode 100644 package/efl/libedbus/libedbus.mk

diff --git a/Config.in.legacy b/Config.in.legacy
index c6dd9e3..f44a1af 100644
--- a/Config.in.legacy
+++ b/Config.in.legacy
@@ -107,6 +107,13 @@ endif
###############################################################################
comment "Legacy options removed in 2016.02"

+config BR2_PACKAGE_LIBEDBUS
+ bool "libedbus package has been removed"
+ select BR2_LEGACY
+ select BR2_PACKAGE_EFL
+ help
+ With EFL 1.15, libedbus is now provided by the libefl package.
+
config BR2_PACKAGE_LIBEFREET
bool "libefreet package has been removed"
select BR2_LEGACY
diff --git a/package/efl/Config.in b/package/efl/Config.in
index 682164d..98ca114 100644
--- a/package/efl/Config.in
+++ b/package/efl/Config.in
@@ -21,7 +21,6 @@ source "package/efl/libeet/Config.in"
source "package/efl/libefl/Config.in"
source "package/efl/libevas/Config.in"
source "package/efl/libelementary/Config.in"
-source "package/efl/libedbus/Config.in"

endif # BR2_PACKAGE_EFL

diff --git a/package/efl/libedbus/Config.in b/package/efl/libedbus/Config.in
deleted file mode 100644
index 7e862d3..0000000
--- a/package/efl/libedbus/Config.in
+++ /dev/null
@@ -1,44 +0,0 @@
-config BR2_PACKAGE_LIBEDBUS
- bool "libedbus"
- select BR2_PACKAGE_LIBEINA
- select BR2_PACKAGE_LIBECORE
- select BR2_PACKAGE_DBUS
- depends on BR2_TOOLCHAIN_HAS_THREADS # dbus
- depends on BR2_USE_MMU # dbus
- help
- E_Dbus is a set of wrappers around D-Bus APIs so they can be
- easily used by EFL applications, automatically providing
- Ecore/main loop integration, as well as Eina data types.
-
- http://trac.enlightenment.org/e/wiki/E_Dbus
-
-if BR2_PACKAGE_LIBEDBUS
-
-config BR2_PACKAGE_LIBEDBUS_BLUEZ
- bool "bluez support"
- depends on !BR2_STATIC_LIBS # bluez_utils
- depends on BR2_USE_WCHAR # bluez_utils -> glib2
- depends on BR2_TOOLCHAIN_HAS_THREADS # bluez_utils -> glib2
- select BR2_PACKAGE_BLUEZ_UTILS
- help
- Bluetooth support.
-
-comment "bluez support needs a toolchain w/ wchar, threads, dynamic library"
- depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS
-
-config BR2_PACKAGE_LIBEDBUS_CONNMAN
- bool "connman support"
- depends on BR2_PACKAGE_CONNMAN
- help
- Connection manager support.
-
-config BR2_PACKAGE_LIBEDBUS_NOTIFY
- bool "notify support"
- help
- Notify support.
-
-endif
-
-comment "libedbus needs a toolchain w/ threads"
- depends on BR2_USE_MMU
- depends on !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/efl/libedbus/libedbus.mk b/package/efl/libedbus/libedbus.mk
deleted file mode 100644
index 634ceaf..0000000
--- a/package/efl/libedbus/libedbus.mk
+++ /dev/null
@@ -1,37 +0,0 @@
-################################################################################
-#
-# libedbus
-#
-################################################################################
-
-LIBEDBUS_VERSION = 1.7.10
-LIBEDBUS_SOURCE = e_dbus-$(LIBEDBUS_VERSION).tar.bz2
-LIBEDBUS_SITE = http://download.enlightenment.org/releases
-LIBEDBUS_LICENSE = BSD-2c
-LIBEDBUS_LICENSE_FILES = COPYING
-
-LIBEDBUS_INSTALL_STAGING = YES
-
-LIBEDBUS_DEPENDENCIES = host-pkgconf dbus libeina libecore
-
-ifeq ($(BR2_PACKAGE_LIBEDBUS_BLUEZ),y)
-LIBEDBUS_CONF_OPTS += --enable-ebluez
-LIBEDBUS_DEPENDENCIES += bluez_utils
-else
-LIBEDBUS_CONF_OPTS += --disable-ebluez
-endif
-
-ifeq ($(BR2_PACKAGE_LIBEDBUS_CONNMAN),y)
-LIBEDBUS_CONF_OPTS += --enable-econnman0_7x
-LIBEDBUS_DEPENDENCIES += connman
-else
-LIBEDBUS_CONF_OPTS += --disable-econnman0_7x
-endif
-
-ifeq ($(BR2_PACKAGE_LIBEDBUS_NOTIFY),y)
-LIBEDBUS_CONF_OPTS += --enable-enotify --disable-edbus-notify-test
-else
-LIBEDBUS_CONF_OPTS += --disable-enotify
-endif
-
-$(eval $(autotools-package))
--
2.4.3
Romain Naour
2015-12-15 22:40:35 UTC
Permalink
Libecore is now available in efl package.

Signed-off-by: Romain Naour <***@openwide.fr>
Reviewed-by: "Yann E. MORIN" <***@free.fr>
---
v6: Improve lecacy help text (Yann E.Morin)
v5: remove libecore directory
v4: update Config.in to use libefl
v3: update legacy option for 2015.11
update help text
---
Config.in.legacy | 7 +++
package/efl/Config.in | 1 -
package/efl/libecore/Config.in | 46 ----------------
package/efl/libecore/libecore.mk | 114 ---------------------------------------
4 files changed, 7 insertions(+), 161 deletions(-)
delete mode 100644 package/efl/libecore/Config.in
delete mode 100644 package/efl/libecore/libecore.mk

diff --git a/Config.in.legacy b/Config.in.legacy
index f44a1af..7a9095c 100644
--- a/Config.in.legacy
+++ b/Config.in.legacy
@@ -107,6 +107,13 @@ endif
###############################################################################
comment "Legacy options removed in 2016.02"

+config BR2_PACKAGE_LIBECORE
+ bool "libecore package has been removed"
+ select BR2_LEGACY
+ select BR2_PACKAGE_EFL
+ help
+ With EFL 1.15, libecore is now provided by the libefl package.
+
config BR2_PACKAGE_LIBEDBUS
bool "libedbus package has been removed"
select BR2_LEGACY
diff --git a/package/efl/Config.in b/package/efl/Config.in
index 98ca114..df7c446 100644
--- a/package/efl/Config.in
+++ b/package/efl/Config.in
@@ -16,7 +16,6 @@ menuconfig BR2_PACKAGE_EFL
if BR2_PACKAGE_EFL

source "package/efl/libeina/Config.in"
-source "package/efl/libecore/Config.in"
source "package/efl/libeet/Config.in"
source "package/efl/libefl/Config.in"
source "package/efl/libevas/Config.in"
diff --git a/package/efl/libecore/Config.in b/package/efl/libecore/Config.in
deleted file mode 100644
index a9408dc..0000000
--- a/package/efl/libecore/Config.in
+++ /dev/null
@@ -1,46 +0,0 @@
-config BR2_PACKAGE_LIBECORE
- bool "libecore"
- select BR2_PACKAGE_LIBEINA
- help
- Ecore is the event/X abstraction layer that makes doing
- selections, Xdnd, general X stuff, event loops, timeouts and
- idle handlers fast, optimized, and convenient.
-
- http://trac.enlightenment.org/e/wiki/Ecore
-
-if BR2_PACKAGE_LIBECORE
-
-config BR2_PACKAGE_LIBECORE_DIRECTFB
- bool "libecore DirectFB support"
- depends on BR2_PACKAGE_DIRECTFB
- default y
-
-config BR2_PACKAGE_LIBECORE_FB
- bool "libecore framebuffer support"
-
-config BR2_PACKAGE_LIBECORE_SDL
- bool "libecore SDL support"
- select BR2_PACKAGE_SDL
-
-config BR2_PACKAGE_LIBECORE_X
- bool "libecore X support"
- depends on BR2_PACKAGE_XORG7
- select BR2_PACKAGE_XLIB_LIBX11
- select BR2_PACKAGE_XLIB_LIBXEXT
-
-config BR2_PACKAGE_LIBECORE_X_XCB
- bool "libecore XCB support"
- depends on BR2_PACKAGE_XORG7
- select BR2_PACKAGE_LIBXCB
- select BR2_PACKAGE_XLIB_LIBX11
- select BR2_PACKAGE_XCB_UTIL
-
-config BR2_PACKAGE_LIBECORE_EVAS
- bool "libecore Evas support"
- select BR2_PACKAGE_LIBEVAS
- depends on BR2_TOOLCHAIN_HAS_THREADS
-
-comment "evas support needs a toolchain w/ threads"
- depends on !BR2_TOOLCHAIN_HAS_THREADS
-
-endif # BR2_PACKAGE_LIBECORE
diff --git a/package/efl/libecore/libecore.mk b/package/efl/libecore/libecore.mk
deleted file mode 100644
index 28a8bae..0000000
--- a/package/efl/libecore/libecore.mk
+++ /dev/null
@@ -1,114 +0,0 @@
-################################################################################
-#
-# libecore
-#
-################################################################################
-
-LIBECORE_VERSION = 1.7.10
-LIBECORE_SOURCE = ecore-$(LIBECORE_VERSION).tar.bz2
-LIBECORE_SITE = http://download.enlightenment.org/releases
-LIBECORE_LICENSE = BSD-2c
-LIBECORE_LICENSE_FILES = COPYING
-
-LIBECORE_INSTALL_STAGING = YES
-
-LIBECORE_DEPENDENCIES = host-pkgconf libeina
-
-HOST_LIBECORE_DEPENDENCIES = host-pkgconf host-libeina host-libevas
-HOST_LIBECORE_CONF_OPTS += \
- --enable-ecore-evas \
- --disable-simple-x11 \
- --disable-ecore-directfb \
- --disable-ecore-x \
- --disable-ecore-x-xcb \
- --disable-ecore-imf-xim
-
-# default options
-LIBECORE_CONF_OPTS = --disable-simple-x11
-
-ifeq ($(BR2_PACKAGE_TSLIB),y)
-LIBECORE_DEPENDENCIES += tslib
-endif
-
-ifeq ($(BR2_PACKAGE_LIBGLIB2),y)
-LIBECORE_DEPENDENCIES += libglib2
-endif
-
-ifeq ($(BR2_PACKAGE_OPENSSL),y)
-LIBECORE_DEPENDENCIES += openssl
-LIBECORE_CONF_OPTS += --enable-openssl
-else
-LIBECORE_CONF_OPTS += --disable-openssl
-endif
-
-ifeq ($(BR2_PACKAGE_GNUTLS)$(BR2_PACKAGE_LIBGCRYPT),yy)
-LIBECORE_DEPENDENCIES += gnutls libgcrypt
-LIBECORE_CONF_OPTS += --enable-gnutls --with-libgcrypt-prefix=$(STAGING_DIR)/usr
-else
-LIBECORE_CONF_OPTS += --disable-gnutls
-endif
-
-ifeq ($(BR2_PACKAGE_LIBCURL),y)
-LIBECORE_DEPENDENCIES += libcurl
-endif
-
-# libecore
-ifeq ($(BR2_PACKAGE_LIBECORE_DIRECTFB),y)
-LIBECORE_CONF_OPTS += --enable-ecore-directfb
-LIBECORE_DEPENDENCIES += directfb
-else
-LIBECORE_CONF_OPTS += --disable-ecore-directfb
-endif
-
-ifeq ($(BR2_PACKAGE_LIBECORE_FB),y)
-LIBECORE_CONF_OPTS += --enable-ecore-fb
-else
-LIBECORE_CONF_OPTS += --disable-ecore-fb
-endif
-
-ifeq ($(BR2_PACKAGE_LIBECORE_SDL),y)
-LIBECORE_CONF_OPTS += --enable-ecore-sdl
-LIBECORE_DEPENDENCIES += sdl
-else
-LIBECORE_CONF_OPTS += --disable-ecore-sdl
-endif
-
-ifeq ($(BR2_PACKAGE_LIBECORE_X),y)
-LIBECORE_CONF_OPTS += --enable-ecore-x \
- --with-x=$(STAGING_DIR) \
- --x-includes=$(STAGING_DIR)/usr/include \
- --x-libraries=$(STAGING_DIR)/usr/lib
-LIBECORE_DEPENDENCIES += xlib_libXext xlib_libX11
-else
-LIBECORE_CONF_OPTS += --disable-ecore-x --disable-ecore-imf-xim
-endif
-
-ifeq ($(BR2_PACKAGE_LIBECORE_X_XCB),y)
-LIBECORE_CONF_OPTS += --enable-ecore-x-xcb
-LIBECORE_DEPENDENCIES += libxcb xlib_libX11 xcb-util pixman
-
-# src/util/makekeys is executed at build time to generate
-# ecore_xcb_keysym_table.h, so it should get compiled for the host.
-# The ecore makefile unfortunately doesn't know about cross
-# compilation so this doesn't work. Long term, we should probably
-# teach it about CC_FOR_BUILD, but for now simply build makekeys by
-# hand in advance
-define LIBECORE_BUILD_MAKEKEYS_FOR_HOST
- $(HOST_CONFIGURE_OPTS) $(MAKE1) -C $(@D)/src/util makekeys.o makekeys
-endef
-
-LIBECORE_PRE_CONFIGURE_HOOKS += LIBECORE_BUILD_MAKEKEYS_FOR_HOST
-else
-LIBECORE_CONF_OPTS += --disable-ecore-x-xcb
-endif
-
-# libecore-evas
-ifeq ($(BR2_PACKAGE_LIBECORE_EVAS),y)
-LIBECORE_CONF_OPTS += --enable-ecore-evas
-LIBECORE_DEPENDENCIES += libevas
-else
-LIBECORE_CONF_OPTS += --disable-ecore-evas
-endif
-
-$(eval $(autotools-package))
-$(eval $(host-autotools-package))
--
2.4.3
Romain Naour
2015-12-15 22:40:26 UTC
Permalink
Use the newly added libefl package wich provide a new version
of efl libraries.
This new version needs libelementary dependency.

Update upstream url, add hash file and use xz archive.

Select png and jpeg image loader since enlightenment_start
fail at runtime if png and jpeg image loader are not
available in elf libraries.

Signed-off-by: Romain Naour <***@openwide.fr>
---
v6: disable systemd and linux-pam explicitely since it's auto
detected. (A patch adding their support can be added latter)
v5: Use depends on BR2_PACKAGE_EFL instead of select (ThomasP)
remove comment on dependencies
v4: update Config.in to use libefl
improve commit log
keep the dependency on threads
v3: bymp to 0.19.12
remove trailing slash (Vicente Bergas)
v2: bump to 0.19.9
remove glibc only dependency
---
package/enlightenment/Config.in | 23 +++++++----------------
package/enlightenment/enlightenment.hash | 2 ++
package/enlightenment/enlightenment.mk | 26 +++++++++++---------------
3 files changed, 20 insertions(+), 31 deletions(-)
create mode 100644 package/enlightenment/enlightenment.hash

diff --git a/package/enlightenment/Config.in b/package/enlightenment/Config.in
index 9dad571..7f0d583 100644
--- a/package/enlightenment/Config.in
+++ b/package/enlightenment/Config.in
@@ -8,26 +8,17 @@ config BR2_PACKAGE_ENLIGHTENMENT
depends on BR2_TOOLCHAIN_HAS_THREADS
# libedbus -> dbus, efl libraries
depends on BR2_USE_MMU
+ depends on BR2_PACKAGE_EFL
depends on BR2_PACKAGE_XORG7
# libevas-generic-loaders-svg -> librsvg -> pango -> cairo
depends on BR2_ARCH_HAS_ATOMICS
- select BR2_PACKAGE_EFL
- select BR2_PACKAGE_LIBECORE
- select BR2_PACKAGE_LIBECORE_X
- select BR2_PACKAGE_LIBEINA
- select BR2_PACKAGE_LIBEET
- select BR2_PACKAGE_LIBEVAS
- select BR2_PACKAGE_LIBEVAS_JPEG
- select BR2_PACKAGE_LIBEVAS_PNG
- select BR2_PACKAGE_LIBEVAS_EET
- select BR2_PACKAGE_LIBECORE_EVAS
- select BR2_PACKAGE_LIBEDJE
- select BR2_PACKAGE_LIBEFREET
- select BR2_PACKAGE_LIBEDBUS
- select BR2_PACKAGE_LIBEIO
- select BR2_PACKAGE_XCB_UTIL_KEYSYMS
+ select BR2_PACKAGE_LIBEFL_X_XLIB
+ select BR2_PACKAGE_LIBEFL_JPEG # needed at runtime by enlightenment_start
+ select BR2_PACKAGE_LIBEFL_PNG # needed at runtime by enlightenment_start
+ select BR2_PACKAGE_LIBELEMENTARY
select BR2_PACKAGE_LIBEVAS_GENERIC_LOADERS
select BR2_PACKAGE_LIBEVAS_GENERIC_LOADERS_SVG
+ select BR2_PACKAGE_XCB_UTIL_KEYSYMS
help
Enlightenment, also known simply as E, is a stacking window
manager for the X Window System which can be used alone or
@@ -38,6 +29,6 @@ config BR2_PACKAGE_ENLIGHTENMENT
http://www.enlightenment.org/

comment "enlightenment needs a toolchain w/ wchar, C++, threads"
- depends on BR2_PACKAGE_XORG7 && BR2_USE_MMU
+ depends on BR2_PACKAGE_EFL && BR2_PACKAGE_XORG7 && BR2_USE_MMU
depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP
depends on BR2_ARCH_HAS_ATOMICS
diff --git a/package/enlightenment/enlightenment.hash b/package/enlightenment/enlightenment.hash
new file mode 100644
index 0000000..c9b1284
--- /dev/null
+++ b/package/enlightenment/enlightenment.hash
@@ -0,0 +1,2 @@
+# From https://phab.enlightenment.org/phame/live/3/post/e19_12_release/
+sha256 55f23c337e3092e735ae37ada8f6701adab5ddd13f37ef38c63eec8a536f0b25 enlightenment-0.19.12.tar.xz
diff --git a/package/enlightenment/enlightenment.mk b/package/enlightenment/enlightenment.mk
index ddebe06..f2e0bc3 100644
--- a/package/enlightenment/enlightenment.mk
+++ b/package/enlightenment/enlightenment.mk
@@ -4,30 +4,26 @@
#
################################################################################

-ENLIGHTENMENT_VERSION = 0.17.6
-ENLIGHTENMENT_SITE = http://download.enlightenment.org/releases
+ENLIGHTENMENT_VERSION = 0.19.12
+ENLIGHTENMENT_SOURCE = enlightenment-$(ENLIGHTENMENT_VERSION).tar.xz
+ENLIGHTENMENT_SITE = http://download.enlightenment.org/rel/apps/enlightenment
ENLIGHTENMENT_LICENSE = BSD-2c
ENLIGHTENMENT_LICENSE_FILES = COPYING

-ENLIGHTENMENT_DEPENDENCIES = \
- host-pkgconf \
- libecore \
- libeet \
- libeina \
- libevas \
+ENLIGHTENMENT_DEPENDENCIES = \
+ host-pkgconf \
+ host-libefl \
+ libefl \
+ libelementary \
libevas-generic-loaders \
- libedje \
- libefreet \
- libedbus \
- libeio \
- host-libedje \
- host-libeet \
xcb-util-keysyms

ENLIGHTENMENT_CONF_OPTS = \
--with-edje-cc=$(HOST_DIR)/usr/bin/edje_cc \
--with-eet-eet=$(HOST_DIR)/usr/bin/eet \
- --disable-rpath
+ --disable-pam \
+ --disable-rpath \
+ --disable-systemd

# uClibc has an old incomplete sys/ptrace.h for powerpc & sparc
ifeq ($(BR2_TOOLCHAIN_USES_UCLIBC)$(BR2_powerpc)$(BR2_sparc),yy)
--
2.4.3
Romain Naour
2015-12-15 22:40:37 UTC
Permalink
Libeet is now available in efl package.

Signed-off-by: Romain Naour <***@openwide.fr>
Reviewed-by: "Yann E. MORIN" <***@free.fr>
---
v6: Improve lecacy help text (Yann E.Morin)
v5: remove libeet directory
v4: update Config.in to use libefl
v3: update legacy option for 2015.11
update help text
---
Config.in.legacy | 7 +++++++
package/efl/Config.in | 1 -
package/efl/libeet/Config.in | 11 -----------
package/efl/libeet/libeet.mk | 27 ---------------------------
4 files changed, 7 insertions(+), 39 deletions(-)
delete mode 100644 package/efl/libeet/Config.in
delete mode 100644 package/efl/libeet/libeet.mk

diff --git a/Config.in.legacy b/Config.in.legacy
index 2ee2f42..1df81ea 100644
--- a/Config.in.legacy
+++ b/Config.in.legacy
@@ -107,6 +107,13 @@ endif
###############################################################################
comment "Legacy options removed in 2016.02"

+config BR2_PACKAGE_LIBEET
+ bool "libeet package has been removed"
+ select BR2_LEGACY
+ select BR2_PACKAGE_EFL
+ help
+ With EFL 1.15, libeet is now provided by the libefl package.
+
config BR2_PACKAGE_LIBEVAS
bool "libevas package has been removed"
select BR2_LEGACY
diff --git a/package/efl/Config.in b/package/efl/Config.in
index 48ea706..a01b971 100644
--- a/package/efl/Config.in
+++ b/package/efl/Config.in
@@ -16,7 +16,6 @@ menuconfig BR2_PACKAGE_EFL
if BR2_PACKAGE_EFL

source "package/efl/libeina/Config.in"
-source "package/efl/libeet/Config.in"
source "package/efl/libefl/Config.in"
source "package/efl/libelementary/Config.in"

diff --git a/package/efl/libeet/Config.in b/package/efl/libeet/Config.in
deleted file mode 100644
index 48631a0..0000000
--- a/package/efl/libeet/Config.in
+++ /dev/null
@@ -1,11 +0,0 @@
-config BR2_PACKAGE_LIBEET
- bool "libeet"
- select BR2_PACKAGE_ZLIB
- select BR2_PACKAGE_JPEG
- select BR2_PACKAGE_LIBEINA
- help
- Eet is a tiny library designed to write an arbitary set of
- chunks of data to a file and optionally compress each chunk
- (very much like a zip file).
-
- http://trac.enlightenment.org/e/wiki/Eet
diff --git a/package/efl/libeet/libeet.mk b/package/efl/libeet/libeet.mk
deleted file mode 100644
index fc3d7f9..0000000
--- a/package/efl/libeet/libeet.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-################################################################################
-#
-# libeet
-#
-################################################################################
-
-LIBEET_VERSION = 1.7.10
-LIBEET_SOURCE = eet-$(LIBEET_VERSION).tar.bz2
-LIBEET_SITE = http://download.enlightenment.org/releases
-LIBEET_LICENSE = BSD-2c
-LIBEET_LICENSE_FILES = COPYING
-
-LIBEET_INSTALL_STAGING = YES
-
-LIBEET_DEPENDENCIES = host-pkgconf zlib jpeg libeina
-HOST_LIBEET_DEPENDENCIES = host-pkgconf host-zlib host-libjpeg host-libeina
-
-ifeq ($(BR2_PACKAGE_GNUTLS)$(BR2_PACKAGE_LIBGCRYPT),yy)
-LIBEET_DEPENDENCIES += gnutls libgcrypt
-LIBEET_CONF_ENV += LIBGCRYPT_CONFIG=$(STAGING_DIR)/usr/bin/libgcrypt-config
-LIBEET_CONF_OPTS += --enable-gnutls
-else
-LIBEET_CONF_OPTS += --disable-gnutls
-endif
-
-$(eval $(autotools-package))
-$(eval $(host-autotools-package))
--
2.4.3
Romain Naour
2015-12-15 22:40:21 UTC
Permalink
X11 XInput v2.2+ support is one of the recommended
feature for the efl libraries:
https://git.enlightenment.org/core/efl.git/tree/README?h=efl-1.15#n490

Signed-off-by: Romain Naour <***@openwide.fr>
---
v8: Remove --disable-xinput22 added by the patch adding X11 support
(Yann E.Morin)
v6: add missing dependency on xlib_libXi (Yann E.Morin)
v4: rename to libefl
improve commit log
v3: new patch
---
package/efl/libefl/Config.in | 1 +
package/efl/libefl/libefl.mk | 7 ++++---
2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/package/efl/libefl/Config.in b/package/efl/libefl/Config.in
index 333456e..7f76b94 100644
--- a/package/efl/libefl/Config.in
+++ b/package/efl/libefl/Config.in
@@ -130,6 +130,7 @@ config BR2_PACKAGE_LIBEFL_X_XLIB
select BR2_PACKAGE_XLIB_LIBXCOMPOSITE
select BR2_PACKAGE_XLIB_LIBXCURSOR
select BR2_PACKAGE_XLIB_LIBXDAMAGE
+ select BR2_PACKAGE_XLIB_LIBXI
select BR2_PACKAGE_XLIB_LIBXINERAMA
select BR2_PACKAGE_XLIB_LIBXP
select BR2_PACKAGE_XLIB_LIBXRANDR
diff --git a/package/efl/libefl/libefl.mk b/package/efl/libefl/libefl.mk
index 0eb17c2..5e8009e 100644
--- a/package/efl/libefl/libefl.mk
+++ b/package/efl/libefl/libefl.mk
@@ -33,7 +33,6 @@ LIBEFL_GETTEXTIZE = YES
# --disable-cxx-bindings: disable C++11 bindings.
# --disable-sdl: disable sdl2 support.
# --disable-systemd: disable systemd support.
-# --disable-xinput22: disable X11 XInput v2.2+ support.
# --enable-lua-old: disable Elua and remove luajit dependency.
LIBEFL_CONF_OPTS = \
--with-edje-cc=$(HOST_DIR)/usr/bin/edje_cc \
@@ -41,7 +40,6 @@ LIBEFL_CONF_OPTS = \
--disable-cxx-bindings \
--disable-sdl \
--disable-systemd \
- --disable-xinput22 \
--enable-lua-old

# Disable untested configuration warning.
@@ -145,11 +143,13 @@ LIBEFL_CONF_OPTS += --disable-fb
endif

ifeq ($(BR2_PACKAGE_LIBEFL_X_XLIB),y)
+# --enable-xinput22 is recommended
LIBEFL_CONF_OPTS += \
--with-x11=xlib \
--with-x=$(STAGING_DIR) \
--x-includes=$(STAGING_DIR)/usr/include \
- --x-libraries=$(STAGING_DIR)/usr/lib
+ --x-libraries=$(STAGING_DIR)/usr/lib \
+ --enable-xinput22

LIBEFL_DEPENDENCIES += \
xlib_libX11 \
@@ -157,6 +157,7 @@ LIBEFL_DEPENDENCIES += \
xlib_libXcursor \
xlib_libXdamage \
xlib_libXext \
+ xlib_libXi \
xlib_libXinerama \
xlib_libXrandr \
xlib_libXrender \
--
2.4.3
Thomas Petazzoni
2015-12-17 23:11:44 UTC
Permalink
Dear Romain Naour,
package/efl/libefl: new package
package/efl/libefl: add harfbuzz dependency
package/efl/libefl: add wayland dependency
package/efl/libefl: add webp dependency
package/efl/libefl: add frame buffer config option
package/efl/libefl: add jp2k config option
package/efl/libefl: add X11 support
All those ones applied. On the "libefl: new package" patch I've applied
my two patches that I showed you on the mailing list.
package/efl/libefl: add OpenGLES support
This one I wasn't sure about the "choice"; we had some discussion about
it with Yann on IRC.
package/efl/libefl: enable xinput2.2
This one I thought should have been part of the X11 support patch, but
now that I have applied the X11 support patch, I think I'll apply this
one separately.
package/libevas-generic-loaders: bump to version 1.15.0
package/libevas-generic-loaders: add libraw dependency
package/efl/libelementary: bump to version 1.15.2
package/efl: libefl and libelementary share the same version number
package/enlightenment: bump to version 0.19.12
package/expedite: bump to efl-1.15 branch
package/dbus-cpp: switch to libefl
package/efl/libethumb: remove package
package/efl/libedje: remove package
package/efl/libembryo: remove package
package/efl/libeio: remove package
package/efl/libefreet: remove package
package/efl/libedbus: remove package
package/efl/libecore: remove package
package/efl/libevas: remove package
package/efl/libeet: remove package
package/efl/libeina: remove package
All applied.
package/libemotion-generic-players: new package
I want to do some more review on this one.
package/efl: rename libefl to efl
I don't understand the logic of this one, and why we're moving from a
'menuconfig' to a 'menu'.

So there are four patches left to be applied out of 28.

Thanks a lot for working on this, definitely great to have an
up-to-date EFL stack.

To be honest, with the version number now being shared with just libefl
and libelementary, I am not sure it is really worth the effort to have
a package/efl/ directory with those two packages. What about making
them normal top-level packages ?

Thanks!

Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
Romain Naour
2015-12-19 14:30:27 UTC
Permalink
Hello Thomas, All,
Post by Thomas Petazzoni
Dear Romain Naour,
package/efl/libefl: new package
package/efl/libefl: add harfbuzz dependency
package/efl/libefl: add wayland dependency
package/efl/libefl: add webp dependency
package/efl/libefl: add frame buffer config option
package/efl/libefl: add jp2k config option
package/efl/libefl: add X11 support
All those ones applied. On the "libefl: new package" patch I've applied
my two patches that I showed you on the mailing list.
package/efl/libefl: add OpenGLES support
This one I wasn't sure about the "choice"; we had some discussion about
it with Yann on IRC.
It's not clear to me when we can really use the full OpenGL support.
I thought that the full OpenGL support was only needed by some specific hardware...
Post by Thomas Petazzoni
package/efl/libefl: enable xinput2.2
This one I thought should have been part of the X11 support patch, but
now that I have applied the X11 support patch, I think I'll apply this
one separately.
ok.
Post by Thomas Petazzoni
package/libevas-generic-loaders: bump to version 1.15.0
package/libevas-generic-loaders: add libraw dependency
package/efl/libelementary: bump to version 1.15.2
package/efl: libefl and libelementary share the same version number
package/enlightenment: bump to version 0.19.12
package/expedite: bump to efl-1.15 branch
package/dbus-cpp: switch to libefl
package/efl/libethumb: remove package
package/efl/libedje: remove package
package/efl/libembryo: remove package
package/efl/libeio: remove package
package/efl/libefreet: remove package
package/efl/libedbus: remove package
package/efl/libecore: remove package
package/efl/libevas: remove package
package/efl/libeet: remove package
package/efl/libeina: remove package
All applied.
package/libemotion-generic-players: new package
I want to do some more review on this one.
Ok.
Post by Thomas Petazzoni
package/efl: rename libefl to efl
I don't understand the logic of this one, and why we're moving from a
'menuconfig' to a 'menu'.
So there are four patches left to be applied out of 28.
Thanks a lot for working on this, definitely great to have an
up-to-date EFL stack.
Yes, special thank to Vicente who did a runtime test and Yann complete review of
this series.
Post by Thomas Petazzoni
To be honest, with the version number now being shared with just libefl
and libelementary, I am not sure it is really worth the effort to have
a package/efl/ directory with those two packages. What about making
them normal top-level packages ?
This is what I wanted to do initially (in v3):
- move all old efl package outside of package/efl/ [1]
- add a new package efl [2]

[1] http://patchwork.ozlabs.org/patch/528603/
[2] http://patchwork.ozlabs.org/patch/528573/

But someone asked me to keep in sync libelementary and efl, so I introduced the
libefl package in the followup series.

Now, we can move libelementary and libefl to package/ directory.
And even rename libefl to efl because all packages that use efl libraries
depends on BR2_PACKAGE_EFL.

Thoughts ?

Romain
Post by Thomas Petazzoni
Thanks!
Thomas
Thomas Petazzoni
2015-12-19 14:47:13 UTC
Permalink
Dear Romain Naour,
Post by Romain Naour
Post by Thomas Petazzoni
To be honest, with the version number now being shared with just libefl
and libelementary, I am not sure it is really worth the effort to have
a package/efl/ directory with those two packages. What about making
them normal top-level packages ?
- move all old efl package outside of package/efl/ [1]
- add a new package efl [2]
[1] http://patchwork.ozlabs.org/patch/528603/
[2] http://patchwork.ozlabs.org/patch/528573/
But someone asked me to keep in sync libelementary and efl, so I introduced the
libefl package in the followup series.
Now, we can move libelementary and libefl to package/ directory.
And even rename libefl to efl because all packages that use efl libraries
depends on BR2_PACKAGE_EFL.
Thoughts ?
As said on IRC, I think it's better to have just package/efl/ and
package/elementary/.

Having a subdirectory for just two components that currently share
their version, but for which there is no clear statement from upstream
that they will always been doing in-sync releases, is not a good idea
IMO. Let's have two separate normal packages.

Thanks,

Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
Yann E. MORIN
2015-12-19 15:57:40 UTC
Permalink
Romain, All,
[--SNIP--]
Post by Romain Naour
Post by Thomas Petazzoni
package/efl/libefl: add OpenGLES support
This one I wasn't sure about the "choice"; we had some discussion about
it with Yann on IRC.
It's not clear to me when we can really use the full OpenGL support.
I thought that the full OpenGL support was only needed by some specific hardware...
You don't care about the hardware in this case. If there is a full
OpenGL provider *and* Xorg is enabled, then you can do full OpenGL.
It is the responsibility of the libgl provider to provide hardware
access (e.g. mesa3d, nvidia-driver, rpi-userland...)

So, in case my previous comments were not clear, here we go:

- full OpenGL currently requires Xorg and a libgl provider.

Or, put in other words:

- if you have Xorg and you have a libgl provider, then you can do full
OpenGL.

So, for EFL, I would add an new entry to the choice:

config BR2_PACKAGE_EFL_GL
bool "opengl"
depends on BR2_PACKAGE_HAS_LIBGL
depends on BR2_PACKAGE_LIBEFL_X_XLIB

comment "opengl support needs X11 support and a libgl provider"
depends on !BR2_PACKAGE_HAS_LIBGL || !BR2_PACKAGE_LIBEFL_X_XLIB


Alternatively, you can go with a select, like:

config BR2_PACKAGE_EFL_GL
bool "opengl"
depends on BR2_PACKAGE_HAS_LIBGL
depends on BR2_PACKAGE_XORG7 # X_XLIB
select BR2_PACKAGE_LIBEFL_X_XLIB

comment "opengl support needs Xorg and a libgl provider"
depends on !BR2_PACKAGE_HAS_LIBGL || !BR2_PACKAGE_XORG7


I think I'd prefer the first solution, but either is OK for me.

But now, if you are not interested in full OpenGL, or you can't test it,
or really don't care, just leave it aside. Interested parties can submit
that support later.

Regards,
Yann E. MORIN.
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
Loading...