package/efl: rename libefl to efl
authorRomain Naour <romain.naour@openwide.fr>
Sat, 19 Dec 2015 16:39:16 +0000 (17:39 +0100)
committerThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Sun, 20 Dec 2015 13:42:22 +0000 (14:42 +0100)
This allow to keep backward compatibility with older
defconfig files that used BR2_PACKAGE_EFL.

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

Signed-off-by: Romain Naour <romain.naour@openwide.fr>
Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Cc: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
18 files changed:
Config.in.legacy
package/Config.in
package/dbus-cpp/dbus-cpp.mk
package/efl/0001-ecore_fb_private.h-define-EAPI-before-use.patch [new file with mode: 0644]
package/efl/0002-ecore_x-Remove-XPrint-usage.patch [new file with mode: 0644]
package/efl/Config.in [new file with mode: 0644]
package/efl/efl.hash [new file with mode: 0644]
package/efl/efl.mk [new file with mode: 0644]
package/elementary/elementary.mk
package/enlightenment/Config.in
package/enlightenment/enlightenment.mk
package/expedite/expedite.mk
package/libefl/0001-ecore_fb_private.h-define-EAPI-before-use.patch [deleted file]
package/libefl/0002-ecore_x-Remove-XPrint-usage.patch [deleted file]
package/libefl/Config.in [deleted file]
package/libefl/libefl.hash [deleted file]
package/libefl/libefl.mk [deleted file]
package/libevas-generic-loaders/libevas-generic-loaders.mk

index f4c462a33cc942cc0c3fd395c03f7ab55b585f75..a21ea827aba5ce7eeb8a57d11a34987838d25763 100644 (file)
@@ -174,70 +174,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"
index 53e89887284f487c6d7aa735c02a003446a8d8e1..40969fa61716beeae1fecd1fa0bf1f87eca768d7 100644 (file)
@@ -242,6 +242,7 @@ comment "Graphic libraries"
        source "package/cegui06/Config.in"
        source "package/directfb/Config.in"
        source "package/directfb-examples/Config.in"
+       source "package/efl/Config.in"
        source "package/elementary/Config.in"
        source "package/fbdump/Config.in"
        source "package/fbgrab/Config.in"
@@ -253,7 +254,6 @@ endif
        source "package/fbv/Config.in"
        source "package/freerdp/Config.in"
        source "package/imagemagick/Config.in"
-       source "package/libefl/Config.in"
        source "package/linux-fusion/Config.in"
        source "package/lite/Config.in"
        source "package/mesa3d/Config.in"
index 9236ba78b378d557b6b514a61b15d6719ca6216e..0b519670610db481f6b66dc536180a73cf6c3bf7 100644 (file)
@@ -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/0001-ecore_fb_private.h-define-EAPI-before-use.patch b/package/efl/0001-ecore_fb_private.h-define-EAPI-before-use.patch
new file mode 100644 (file)
index 0000000..81d14f9
--- /dev/null
@@ -0,0 +1,64 @@
+From 2fb4fdf641e67e49b87a3524038a694c8dd0ba4e Mon Sep 17 00:00:00 2001
+From: Vicente Bergas <vicencb@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 <vicencb@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 <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/0002-ecore_x-Remove-XPrint-usage.patch b/package/efl/0002-ecore_x-Remove-XPrint-usage.patch
new file mode 100644 (file)
index 0000000..4687e4c
--- /dev/null
@@ -0,0 +1,153 @@
+From 434572355c7e929b84210b2f795634d38f13c913 Mon Sep 17 00:00:00 2001
+From: Derek Foreman <derekf@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/Config.in b/package/efl/Config.in
new file mode 100644 (file)
index 0000000..fd3498e
--- /dev/null
@@ -0,0 +1,190 @@
+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
+       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
+       help
+         Enlightenment Foundation Libraries
+
+         https://enlightenment.org
+
+if BR2_PACKAGE_EFL
+
+config BR2_PACKAGE_EFL_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_EFL_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_EFL_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_EFL_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_EFL_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_EFL_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_EFL_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.
+
+config BR2_PACKAGE_EFL_HAS_RECOMMENDED_CONFIG
+       bool
+       default y if 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 "Warning: one of the recommended option for EFL is not enabled"
+       depends on !BR2_PACKAGE_EFL_HAS_RECOMMENDED_CONFIG
+
+comment "libecore video support"
+
+config BR2_PACKAGE_EFL_FB
+       bool "FB support"
+
+config BR2_PACKAGE_EFL_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_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_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_EFL_JPEG
+       bool "libevas jpeg loader"
+       help
+         This enables the loader code that loads jpeg files using
+         libjpeg.
+
+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_EFL_TIFF
+       bool "libevas tiff loader"
+       select BR2_PACKAGE_TIFF
+       help
+         This enables the loader code that loads tiff files.
+
+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_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/efl.hash b/package/efl/efl.hash
new file mode 100644 (file)
index 0000000..7ac26f4
--- /dev/null
@@ -0,0 +1,2 @@
+# From https://download.enlightenment.org/rel/libs/efl/efl-1.15.2.tar.xz.sha256
+sha256 dd738f19f454621a7fa1fdb4c008457c170989f5f0c535edfed7b6773ae6c2a4        efl-1.15.2.tar.xz
diff --git a/package/efl/efl.mk b/package/efl/efl.mk
new file mode 100644 (file)
index 0000000..014e010
--- /dev/null
@@ -0,0 +1,278 @@
+################################################################################
+#
+# efl
+#
+################################################################################
+
+EFL_VERSION = 1.15.2
+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 \
+       licenses/COPYING.FTL \
+       licenses/COPYING.GPL \
+       licenses/COPYING.LGPL \
+       licenses/COPYING.SMALL
+
+EFL_INSTALL_STAGING = YES
+
+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
+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.
+# --disable-xinput22: disable X11 XInput v2.2+ support.
+# --enable-lua-old: disable Elua and remove luajit dependency.
+# --with-opengl=none: disable opengl support.
+EFL_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
+
+# Disable untested configuration warning.
+ifeq ($(BR2_PACKAGE_EFL_HAS_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)
+EFL_DEPENDENCIES += util-linux
+EFL_CONF_OPTS += --enable-libmount
+else
+EFL_CONF_OPTS += --disable-libmount
+endif
+
+ifeq ($(BR2_PACKAGE_FONTCONFIG),y)
+EFL_CONF_OPTS += --enable-fontconfig
+EFL_DEPENDENCIES += fontconfig
+else
+EFL_CONF_OPTS += --disable-fontconfig
+endif
+
+ifeq ($(BR2_PACKAGE_LIBFRIBIDI),y)
+EFL_CONF_OPTS += --enable-fribidi
+EFL_DEPENDENCIES += libfribidi
+else
+EFL_CONF_OPTS += --disable-fribidi
+endif
+
+ifeq ($(BR2_PACKAGE_GSTREAMER1)$(BR2_PACKAGE_GST1_PLUGINS_BASE),yy)
+EFL_CONF_OPTS += --enable-gstreamer1
+EFL_DEPENDENCIES += gstreamer1 gst1-plugins-base
+else
+EFL_CONF_OPTS += --disable-gstreamer1
+endif
+
+ifeq ($(BR2_PACKAGE_BULLET),y)
+EFL_CONF_OPTS += --enable-physics
+EFL_DEPENDENCIES += bullet
+else
+EFL_CONF_OPTS += --disable-physics
+endif
+
+ifeq ($(BR2_PACKAGE_LIBSNDFILE),y)
+EFL_CONF_OPTS += --enable-audio
+EFL_DEPENDENCIES += libsndfile
+else
+EFL_CONF_OPTS += --disable-audio
+endif
+
+ifeq ($(BR2_PACKAGE_PULSEAUDIO),y)
+EFL_CONF_OPTS += --enable-pulseaudio
+EFL_DEPENDENCIES += pulseaudio
+else
+EFL_CONF_OPTS += --disable-pulseaudio
+endif
+
+ifeq ($(BR2_PACKAGE_HARFBUZZ),y)
+EFL_DEPENDENCIES += harfbuzz
+EFL_CONF_OPTS += --enable-harfbuzz
+else
+EFL_CONF_OPTS += --disable-harfbuzz
+endif
+
+ifeq ($(BR2_PACKAGE_TSLIB),y)
+EFL_DEPENDENCIES += tslib
+EFL_CONF_OPTS += --enable-tslib
+else
+EFL_CONF_OPTS += --disable-tslib
+endif
+
+ifeq ($(BR2_PACKAGE_LIBGLIB2),y)
+EFL_DEPENDENCIES += libglib2
+EFL_CONF_OPTS += --with-glib=yes
+else
+EFL_CONF_OPTS += --with-glib=no
+endif
+
+# Prefer openssl (the default) over gnutls.
+ifeq ($(BR2_PACKAGE_OPENSSL),y)
+EFL_DEPENDENCIES += openssl
+EFL_CONF_OPTS += --with-crypto=openssl
+else ifeq ($(BR2_PACKAGE_GNUTLS)$(BR2_PACKAGE_LIBGCRYPT),yy)
+EFL_DEPENDENCIES += gnutls libgcrypt
+EFL_CONF_OPTS += --with-crypto=gnutls \
+       --with-libgcrypt-prefix=$(STAGING_DIR)/usr
+else
+EFL_CONF_OPTS += --with-crypto=none
+endif # BR2_PACKAGE_OPENSSL
+
+ifeq ($(BR2_PACKAGE_WAYLAND),y)
+EFL_DEPENDENCIES += wayland libxkbcommon
+EFL_CONF_OPTS += --enable-wayland
+else
+EFL_CONF_OPTS += --disable-wayland
+endif
+
+ifeq ($(BR2_PACKAGE_EFL_FB),y)
+EFL_CONF_OPTS += --enable-fb
+else
+EFL_CONF_OPTS += --disable-fb
+endif
+
+ifeq ($(BR2_PACKAGE_EFL_X_XLIB),y)
+EFL_CONF_OPTS += \
+       --with-x11=xlib \
+       --with-x=$(STAGING_DIR) \
+       --x-includes=$(STAGING_DIR)/usr/include \
+       --x-libraries=$(STAGING_DIR)/usr/lib
+
+EFL_DEPENDENCIES += \
+       xlib_libX11 \
+       xlib_libXcomposite \
+       xlib_libXcursor \
+       xlib_libXdamage \
+       xlib_libXext \
+       xlib_libXinerama \
+       xlib_libXrandr \
+       xlib_libXrender \
+       xlib_libXScrnSaver \
+       xlib_libXtst
+else
+EFL_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
+ifeq ($(BR2_PACKAGE_EFL_PNG),y)
+EFL_CONF_OPTS += --enable-image-loader-png=yes
+EFL_DEPENDENCIES += libpng
+else
+EFL_CONF_OPTS += --disable-image-loader-png
+endif
+
+ifeq ($(BR2_PACKAGE_EFL_JPEG),y)
+EFL_CONF_OPTS += --enable-image-loader-jpeg=yes
+# efl already depends on jpeg.
+else
+EFL_CONF_OPTS += --disable-image-loader-jpeg
+endif
+
+ifeq ($(BR2_PACKAGE_EFL_GIF),y)
+EFL_CONF_OPTS += --enable-image-loader-gif=yes
+EFL_DEPENDENCIES += giflib
+else
+EFL_CONF_OPTS += --disable-image-loader-gif
+endif
+
+ifeq ($(BR2_PACKAGE_EFL_TIFF),y)
+EFL_CONF_OPTS += --enable-image-loader-tiff=yes
+EFL_DEPENDENCIES += tiff
+else
+EFL_CONF_OPTS += --disable-image-loader-tiff
+endif
+
+ifeq ($(BR2_PACKAGE_EFL_JP2K),y)
+EFL_CONF_OPTS += --enable-image-loader-jp2k=yes
+EFL_DEPENDENCIES += openjpeg
+else
+EFL_CONF_OPTS += --disable-image-loader-jp2k
+endif
+
+ifeq ($(BR2_PACKAGE_EFL_WEBP),y)
+EFL_CONF_OPTS += --enable-image-loader-webp=yes
+EFL_DEPENDENCIES += webp
+else
+EFL_CONF_OPTS += --disable-image-loader-webp
+endif
+
+$(eval $(autotools-package))
+
+################################################################################
+#
+# host-efl
+#
+################################################################################
+
+# We want to build only some host tools used later in the build.
+# Actually we want: edje_cc, embryo_cc and eet.
+
+# Host dependencies:
+# * host-dbus: for Eldbus
+# * host-freetype: for libevas
+# * host-libglib2: for libecore
+# * host-libjpeg, host-libpng: for libevas image loader
+# * host-lua: disable luajit dependency
+HOST_EFL_DEPENDENCIES = \
+       host-pkgconf \
+       host-dbus \
+       host-freetype \
+       host-libglib2 \
+       host-libjpeg \
+       host-libpng \
+       host-lua \
+       host-zlib
+
+# Configure options:
+# --disable-audio, --disable-multisense remove libsndfile dependency.
+# --disable-cxx-bindings: disable C++11 bindings.
+# --disable-fontconfig: remove dependency on fontconfig.
+# --disable-fribidi: remove dependency on libfribidi.
+# --disable-gstreamer1: remove dependency on gtreamer 1.0.
+# --disable-libeeze: remove libudev dependency.
+# --disable-libmount: remove dependency on host-util-linux libmount.
+# --disable-physics: remove Bullet dependency.
+# --enable-image-loader-gif=no: disable Gif dependency.
+# --enable-image-loader-tiff=no: disable Tiff dependency.
+# --enable-lua-old: disable Elua and remove luajit dependency.
+# --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_EFL_CONF_OPTS += \
+       --disable-audio \
+       --disable-cxx-bindings \
+       --disable-fontconfig \
+       --disable-fribidi \
+       --disable-gstreamer1 \
+       --disable-libeeze \
+       --disable-libmount \
+       --disable-multisense \
+       --disable-physics \
+       --enable-image-loader-gif=no \
+       --enable-image-loader-jpeg=yes \
+       --enable-image-loader-png=yes \
+       --enable-image-loader-tiff=no \
+       --enable-lua-old \
+       --with-crypto=none \
+       --with-glib=yes \
+       --with-opengl=none \
+       --with-x11=none \
+       --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
+
+$(eval $(host-autotools-package))
index 4320064aaf509cdf1993080d8ffdec2674e573e7..57da1e04f2cbf7ba0ec9cd86ad245eebf9bc6bb9 100644 (file)
@@ -12,7 +12,7 @@ ELEMENTARY_LICENSE_FILES = COPYING
 
 ELEMENTARY_INSTALL_STAGING = YES
 
-ELEMENTARY_DEPENDENCIES = host-pkgconf host-libefl host-elementary libefl
+ELEMENTARY_DEPENDENCIES = host-pkgconf host-efl host-elementary efl
 
 ELEMENTARY_CONF_OPTS = \
        --with-edje-cc=$(HOST_DIR)/usr/bin/edje_cc \
@@ -25,7 +25,7 @@ ELEMENTARY_CONF_OPTS = \
 
 # We need a host package in order to provide elm_prefs_cc and
 # elementary_codegen.
-HOST_ELEMENTARY_DEPENDENCIES = host-pkgconf host-libefl
+HOST_ELEMENTARY_DEPENDENCIES = host-pkgconf host-efl
 HOST_ELEMENTARY_CONF_OPTS = \
        --with-edje-cc=$(HOST_DIR)/usr/bin/edje_cc \
        --with-eet-eet=$(HOST_DIR)/usr/bin/eet \
index 451fa0bc280ea9dc533e17e6e0226568758d98dd..fc1f469aa84b41dacd1124ef019d33b7d9770870 100644 (file)
@@ -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_ELEMENTARY
        select BR2_PACKAGE_LIBEVAS_GENERIC_LOADERS
        select BR2_PACKAGE_LIBEVAS_GENERIC_LOADERS_SVG
index 546b5aa4c5c5fc28622492d5fe338191f9eca31f..5cf48118cfa420da6dd7e55f0d15ab88bf5422d3 100644 (file)
@@ -12,8 +12,8 @@ ENLIGHTENMENT_LICENSE_FILES = COPYING
 
 ENLIGHTENMENT_DEPENDENCIES = \
        host-pkgconf \
-       host-libefl \
-       libefl \
+       host-efl \
+       efl \
        elementary \
        libevas-generic-loaders \
        xcb-util-keysyms
index 4a4e2ee821702b74a790bfb7e1ed1201384950d9..8754dc0da762e6ba7f5d88c6b365af7effe69295 100644 (file)
@@ -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/libefl/0001-ecore_fb_private.h-define-EAPI-before-use.patch b/package/libefl/0001-ecore_fb_private.h-define-EAPI-before-use.patch
deleted file mode 100644 (file)
index 81d14f9..0000000
+++ /dev/null
@@ -1,64 +0,0 @@
-From 2fb4fdf641e67e49b87a3524038a694c8dd0ba4e Mon Sep 17 00:00:00 2001
-From: Vicente Bergas <vicencb@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 <vicencb@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 <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/libefl/0002-ecore_x-Remove-XPrint-usage.patch b/package/libefl/0002-ecore_x-Remove-XPrint-usage.patch
deleted file mode 100644 (file)
index 4687e4c..0000000
+++ /dev/null
@@ -1,153 +0,0 @@
-From 434572355c7e929b84210b2f795634d38f13c913 Mon Sep 17 00:00:00 2001
-From: Derek Foreman <derekf@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/libefl/Config.in b/package/libefl/Config.in
deleted file mode 100644 (file)
index 08c29fc..0000000
+++ /dev/null
@@ -1,190 +0,0 @@
-config BR2_PACKAGE_LIBEFL
-       bool "libefl"
-       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
-       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
-       help
-         Enlightenment Foundation Libraries
-
-         https://enlightenment.org
-
-if BR2_PACKAGE_LIBEFL
-
-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.
-
-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_HAS_RECOMMENDED_CONFIG
-
-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
-       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
-       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
-         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.
-
-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
-
-comment "LIBEFL 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 "LIBEFL needs lua"
-       depends on !BR2_PACKAGE_LUA
-       depends on BR2_USE_MMU
diff --git a/package/libefl/libefl.hash b/package/libefl/libefl.hash
deleted file mode 100644 (file)
index 7ac26f4..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-# From https://download.enlightenment.org/rel/libs/efl/efl-1.15.2.tar.xz.sha256
-sha256 dd738f19f454621a7fa1fdb4c008457c170989f5f0c535edfed7b6773ae6c2a4        efl-1.15.2.tar.xz
diff --git a/package/libefl/libefl.mk b/package/libefl/libefl.mk
deleted file mode 100644 (file)
index f08a4fb..0000000
+++ /dev/null
@@ -1,278 +0,0 @@
-################################################################################
-#
-# libefl
-#
-################################################################################
-
-LIBEFL_VERSION = 1.15.2
-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 = \
-       COMPLIANCE \
-       COPYING \
-       licenses/COPYING.BSD \
-       licenses/COPYING.FTL \
-       licenses/COPYING.GPL \
-       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 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
-
-# Configure options:
-# --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.
-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
-
-# Disable untested configuration warning.
-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
-
-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_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
-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
-
-ifeq ($(BR2_PACKAGE_WAYLAND),y)
-LIBEFL_DEPENDENCIES += wayland libxkbcommon
-LIBEFL_CONF_OPTS += --enable-wayland
-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
-
-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
-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
-
-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
-else
-LIBEFL_CONF_OPTS += --disable-image-loader-webp
-endif
-
-$(eval $(autotools-package))
-
-################################################################################
-#
-# host-libefl
-#
-################################################################################
-
-# We want to build only some host tools used later in the build.
-# Actually we want: edje_cc, embryo_cc and eet.
-
-# Host dependencies:
-# * host-dbus: for Eldbus
-# * host-freetype: for libevas
-# * host-libglib2: for libecore
-# * host-libjpeg, host-libpng: for libevas image loader
-# * host-lua: disable luajit dependency
-HOST_LIBEFL_DEPENDENCIES = \
-       host-pkgconf \
-       host-dbus \
-       host-freetype \
-       host-libglib2 \
-       host-libjpeg \
-       host-libpng \
-       host-lua \
-       host-zlib
-
-# Configure options:
-# --disable-audio, --disable-multisense remove libsndfile dependency.
-# --disable-cxx-bindings: disable C++11 bindings.
-# --disable-fontconfig: remove dependency on fontconfig.
-# --disable-fribidi: remove dependency on libfribidi.
-# --disable-gstreamer1: remove dependency on gtreamer 1.0.
-# --disable-libeeze: remove libudev dependency.
-# --disable-libmount: remove dependency on host-util-linux libmount.
-# --disable-physics: remove Bullet dependency.
-# --enable-image-loader-gif=no: disable Gif dependency.
-# --enable-image-loader-tiff=no: disable Tiff dependency.
-# --enable-lua-old: disable Elua and remove luajit dependency.
-# --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 += \
-       --disable-audio \
-       --disable-cxx-bindings \
-       --disable-fontconfig \
-       --disable-fribidi \
-       --disable-gstreamer1 \
-       --disable-libeeze \
-       --disable-libmount \
-       --disable-multisense \
-       --disable-physics \
-       --enable-image-loader-gif=no \
-       --enable-image-loader-jpeg=yes \
-       --enable-image-loader-png=yes \
-       --enable-image-loader-tiff=no \
-       --enable-lua-old \
-       --with-crypto=none \
-       --with-glib=yes \
-       --with-opengl=none \
-       --with-x11=none \
-       --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
-
-$(eval $(host-autotools-package))
index 2c1c1cddf21a501299bbe65227ad7a7c28382bff..ff8ea372adaea511bc3863dbbb1e6a6ce07d504d 100644 (file)
@@ -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.