* [Buildroot] [PATCH v9 01/32] package/expedite: move to package directory
2015-12-12 13:33 [Buildroot] [PATCH v9 00/32] efl bump to 1.15.2 Romain Naour
@ 2015-12-12 13:33 ` Romain Naour
2015-12-12 13:45 ` Thomas Petazzoni
2015-12-12 13:33 ` [Buildroot] [PATCH v9 02/32] package/libevas-generic-loaders: " Romain Naour
` (30 subsequent siblings)
31 siblings, 1 reply; 45+ messages in thread
From: Romain Naour @ 2015-12-12 13:33 UTC (permalink / raw)
To: buildroot
There is no advantage for efl related packages to share the same version
number anymore (except for Efl and Elementary).
Here are the version number used for the 1.15 stable release:
EFL 1.15.2
Elementary 1.15.2
Emotion Generic Players 1.15.0
Evas Generic Loaders 1.15.0
Python-EFL 1.15.0
Also, we usually do not have a sub-directory for a family of related
packages which don't share the same version number, so move expedite
to the package directory. Expedite now appears in the
"Graphic libraries and applications (graphic/text)" in the Kconfig menu.
In a followup patch, expedite will be downloaded directly from the 1.15
branch in the git repository since there is no new tarball release after
1.7.0.
Signed-off-by: Romain Naour <romain.naour@openwide.fr>
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
---
v5: fixes typos (ThomasP)
Use depends on BR2_PACKAGE_EFL instead of select (ThomasP)
v4: improve the commit log (ThomasP)
move expedite to "Graphic applications" under
"Graphic libraries and applications" menu (ThomasP)
fix package comment dependency on BR2_USE_MMU
---
package/Config.in | 1 +
package/efl/Config.in | 1 -
package/{efl => }/expedite/Config.in | 1 +
package/{efl => }/expedite/expedite.mk | 0
4 files changed, 2 insertions(+), 1 deletion(-)
rename package/{efl => }/expedite/Config.in (95%)
rename package/{efl => }/expedite/expedite.mk (100%)
diff --git a/package/Config.in b/package/Config.in
index 0eb6fda..9610423 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -220,6 +220,7 @@ endmenu
menu "Graphic libraries and applications (graphic/text)"
comment "Graphic applications"
+ source "package/expedite/Config.in"
source "package/fswebcam/Config.in"
source "package/glmark2/Config.in"
source "package/gnuplot/Config.in"
diff --git a/package/efl/Config.in b/package/efl/Config.in
index 3d31a26..cb91660 100644
--- a/package/efl/Config.in
+++ b/package/efl/Config.in
@@ -10,7 +10,6 @@ menuconfig BR2_PACKAGE_EFL
if BR2_PACKAGE_EFL
-source "package/efl/expedite/Config.in"
source "package/efl/libeina/Config.in"
source "package/efl/libecore/Config.in"
source "package/efl/libeet/Config.in"
diff --git a/package/efl/expedite/Config.in b/package/expedite/Config.in
similarity index 95%
rename from package/efl/expedite/Config.in
rename to package/expedite/Config.in
index 1e12108..de6a056 100644
--- a/package/efl/expedite/Config.in
+++ b/package/expedite/Config.in
@@ -3,6 +3,7 @@ config BR2_PACKAGE_EXPEDITE
select BR2_PACKAGE_LIBEINA
select BR2_PACKAGE_LIBEVAS
select BR2_PACKAGE_LIBEET
+ depends on BR2_PACKAGE_EFL
depends on BR2_INSTALL_LIBSTDCPP
depends on BR2_TOOLCHAIN_HAS_THREADS # libevas
help
diff --git a/package/efl/expedite/expedite.mk b/package/expedite/expedite.mk
similarity index 100%
rename from package/efl/expedite/expedite.mk
rename to package/expedite/expedite.mk
--
2.4.3
^ permalink raw reply related [flat|nested] 45+ messages in thread* [Buildroot] [PATCH v9 01/32] package/expedite: move to package directory
2015-12-12 13:33 ` [Buildroot] [PATCH v9 01/32] package/expedite: move to package directory Romain Naour
@ 2015-12-12 13:45 ` Thomas Petazzoni
0 siblings, 0 replies; 45+ messages in thread
From: Thomas Petazzoni @ 2015-12-12 13:45 UTC (permalink / raw)
To: buildroot
Dear Romain Naour,
On Sat, 12 Dec 2015 14:33:04 +0100, Romain Naour wrote:
> There is no advantage for efl related packages to share the same version
> number anymore (except for Efl and Elementary).
>
> Here are the version number used for the 1.15 stable release:
> EFL 1.15.2
> Elementary 1.15.2
> Emotion Generic Players 1.15.0
> Evas Generic Loaders 1.15.0
> Python-EFL 1.15.0
>
> Also, we usually do not have a sub-directory for a family of related
> packages which don't share the same version number, so move expedite
> to the package directory. Expedite now appears in the
> "Graphic libraries and applications (graphic/text)" in the Kconfig menu.
>
> In a followup patch, expedite will be downloaded directly from the 1.15
> branch in the git repository since there is no new tarball release after
> 1.7.0.
>
> Signed-off-by: Romain Naour <romain.naour@openwide.fr>
> Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
> ---
> v5: fixes typos (ThomasP)
> Use depends on BR2_PACKAGE_EFL instead of select (ThomasP)
> v4: improve the commit log (ThomasP)
> move expedite to "Graphic applications" under
> "Graphic libraries and applications" menu (ThomasP)
> fix package comment dependency on BR2_USE_MMU
> ---
> package/Config.in | 1 +
> package/efl/Config.in | 1 -
> package/{efl => }/expedite/Config.in | 1 +
> package/{efl => }/expedite/expedite.mk | 0
> 4 files changed, 2 insertions(+), 1 deletion(-)
> rename package/{efl => }/expedite/Config.in (95%)
> rename package/{efl => }/expedite/expedite.mk (100%)
Applied, thanks.
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 45+ messages in thread
* [Buildroot] [PATCH v9 02/32] package/libevas-generic-loaders: move to package directory
2015-12-12 13:33 [Buildroot] [PATCH v9 00/32] efl bump to 1.15.2 Romain Naour
2015-12-12 13:33 ` [Buildroot] [PATCH v9 01/32] package/expedite: move to package directory Romain Naour
@ 2015-12-12 13:33 ` Romain Naour
2015-12-12 13:33 ` [Buildroot] [PATCH v9 03/32] package/libevas-generic-loaders: add missing MMU dependency Romain Naour
` (29 subsequent siblings)
31 siblings, 0 replies; 45+ messages in thread
From: Romain Naour @ 2015-12-12 13:33 UTC (permalink / raw)
To: buildroot
As for expedite package, there is no advantage for efl related
packages to share the same version number anymore
(except for efl and libelementary).
Also, we usually do not have a sub-directory for a family of related
packages which doen't share the same version number, so move
libevas-generic-loaders to package directory.
Libevas-generic-loaders appear now in "Libraries" -> "Graphics" in
the Kconfig menu.
Signed-off-by: Romain Naour <romain.naour@openwide.fr>
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
---
v6: keep the reverse dependency on BR2_USE_WCHAR (Yann E.Morin)
v5: Use depends on BR2_PACKAGE_EFL instead of select (ThomasP)
v4: improve the commit log (ThomasP)
move libevas-generic-loaders to "Libraries" -> "Graphics" (ThomasP)
fix package comment dependency on BR2_USE_MMU
---
package/Config.in | 1 +
package/efl/Config.in | 1 -
package/{efl => }/libevas-generic-loaders/Config.in | 1 +
package/{efl => }/libevas-generic-loaders/libevas-generic-loaders.mk | 0
4 files changed, 2 insertions(+), 1 deletion(-)
rename package/{efl => }/libevas-generic-loaders/Config.in (97%)
rename package/{efl => }/libevas-generic-loaders/libevas-generic-loaders.mk (100%)
diff --git a/package/Config.in b/package/Config.in
index 9610423..00aedad 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -827,6 +827,7 @@ menu "Graphics"
source "package/libdri2/Config.in"
source "package/libdrm/Config.in"
source "package/libexif/Config.in"
+ source "package/libevas-generic-loaders/Config.in"
source "package/libfm/Config.in"
source "package/libfm-extra/Config.in"
source "package/libfreeimage/Config.in"
diff --git a/package/efl/Config.in b/package/efl/Config.in
index cb91660..7ce5a36 100644
--- a/package/efl/Config.in
+++ b/package/efl/Config.in
@@ -16,7 +16,6 @@ source "package/efl/libeet/Config.in"
source "package/efl/libefreet/Config.in"
source "package/efl/libeio/Config.in"
source "package/efl/libevas/Config.in"
-source "package/efl/libevas-generic-loaders/Config.in"
source "package/efl/libembryo/Config.in"
source "package/efl/libedje/Config.in"
source "package/efl/libethumb/Config.in"
diff --git a/package/efl/libevas-generic-loaders/Config.in b/package/libevas-generic-loaders/Config.in
similarity index 97%
rename from package/efl/libevas-generic-loaders/Config.in
rename to package/libevas-generic-loaders/Config.in
index 3f7581f..c69f5e8 100644
--- a/package/efl/libevas-generic-loaders/Config.in
+++ b/package/libevas-generic-loaders/Config.in
@@ -1,5 +1,6 @@
config BR2_PACKAGE_LIBEVAS_GENERIC_LOADERS
bool "libevas generic loaders"
+ depends on BR2_PACKAGE_EFL
select BR2_PACKAGE_LIBEINA
select BR2_PACKAGE_ZLIB
help
diff --git a/package/efl/libevas-generic-loaders/libevas-generic-loaders.mk b/package/libevas-generic-loaders/libevas-generic-loaders.mk
similarity index 100%
rename from package/efl/libevas-generic-loaders/libevas-generic-loaders.mk
rename to package/libevas-generic-loaders/libevas-generic-loaders.mk
--
2.4.3
^ permalink raw reply related [flat|nested] 45+ messages in thread* [Buildroot] [PATCH v9 03/32] package/libevas-generic-loaders: add missing MMU dependency
2015-12-12 13:33 [Buildroot] [PATCH v9 00/32] efl bump to 1.15.2 Romain Naour
2015-12-12 13:33 ` [Buildroot] [PATCH v9 01/32] package/expedite: move to package directory Romain Naour
2015-12-12 13:33 ` [Buildroot] [PATCH v9 02/32] package/libevas-generic-loaders: " Romain Naour
@ 2015-12-12 13:33 ` Romain Naour
2015-12-12 13:46 ` Thomas Petazzoni
2015-12-12 13:33 ` [Buildroot] [PATCH v9 04/32] package/{efl packages}: reorder select/depends Romain Naour
` (28 subsequent siblings)
31 siblings, 1 reply; 45+ messages in thread
From: Romain Naour @ 2015-12-12 13:33 UTC (permalink / raw)
To: buildroot
The MMU dependency from glib2 via librsvg was not propagated
to the SVG loader.
Reported-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Romain Naour <romain.naour@openwide.fr>
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
---
v8: Add a commit log and fix the commit title (Yann)
v6: new patch
---
package/libevas-generic-loaders/Config.in | 2 ++
1 file changed, 2 insertions(+)
diff --git a/package/libevas-generic-loaders/Config.in b/package/libevas-generic-loaders/Config.in
index c69f5e8..72d4adb 100644
--- a/package/libevas-generic-loaders/Config.in
+++ b/package/libevas-generic-loaders/Config.in
@@ -16,6 +16,7 @@ config BR2_PACKAGE_LIBEVAS_GENERIC_LOADERS_SVG
bool "SVG loader"
select BR2_PACKAGE_LIBRSVG
select BR2_PACKAGE_CAIRO
+ depends on BR2_USE_MMU # librsvg -> glib2
depends on BR2_USE_WCHAR # librsvg -> glib2
depends on BR2_TOOLCHAIN_HAS_THREADS # librsvg -> glib2
depends on BR2_INSTALL_LIBSTDCPP # librsvg -> pango
@@ -25,6 +26,7 @@ config BR2_PACKAGE_LIBEVAS_GENERIC_LOADERS_SVG
comment "SVG loader needs a toolchain w/ wchar, threads, C++"
depends on BR2_ARCH_HAS_ATOMICS
+ depends on BR2_USE_MMU
depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP
endif
--
2.4.3
^ permalink raw reply related [flat|nested] 45+ messages in thread* [Buildroot] [PATCH v9 04/32] package/{efl packages}: reorder select/depends
2015-12-12 13:33 [Buildroot] [PATCH v9 00/32] efl bump to 1.15.2 Romain Naour
` (2 preceding siblings ...)
2015-12-12 13:33 ` [Buildroot] [PATCH v9 03/32] package/libevas-generic-loaders: add missing MMU dependency Romain Naour
@ 2015-12-12 13:33 ` Romain Naour
2015-12-12 13:46 ` Thomas Petazzoni
2015-12-12 13:33 ` [Buildroot] [PATCH v9 05/32] package/efl/libefl: new host-package Romain Naour
` (27 subsequent siblings)
31 siblings, 1 reply; 45+ messages in thread
From: Romain Naour @ 2015-12-12 13:33 UTC (permalink / raw)
To: buildroot
As noticed by Yann [1], move the package dependencies
before selected packages/options.
[1] http://lists.busybox.net/pipermail/buildroot/2015-October/142955.html
Signed-off-by: Romain Naour <romain.naour@openwide.fr>
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
---
v6: new patch
---
package/efl/libelementary/Config.in | 4 ++--
package/enlightenment/Config.in | 22 +++++++++++-----------
package/expedite/Config.in | 6 +++---
package/libevas-generic-loaders/Config.in | 4 ++--
4 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/package/efl/libelementary/Config.in b/package/efl/libelementary/Config.in
index 4f62592..fcc7025 100644
--- a/package/efl/libelementary/Config.in
+++ b/package/efl/libelementary/Config.in
@@ -3,12 +3,12 @@ comment "libelementary needs a toolchain w/ threads, dynamic library"
config BR2_PACKAGE_LIBELEMENTARY
bool "libelementary"
+ depends on BR2_TOOLCHAIN_HAS_THREADS # libevas
+ depends on !BR2_STATIC_LIBS
select BR2_PACKAGE_LIBEINA
select BR2_PACKAGE_LIBEVAS
select BR2_PACKAGE_LIBECORE
select BR2_PACKAGE_LIBEDJE
- depends on BR2_TOOLCHAIN_HAS_THREADS # libevas
- depends on !BR2_STATIC_LIBS
help
Elementary is a widget toolkit and EFL wrapper and convenience
library to make it easy to build applications and tools with UIs
diff --git a/package/enlightenment/Config.in b/package/enlightenment/Config.in
index 58f8f39..9dad571 100644
--- a/package/enlightenment/Config.in
+++ b/package/enlightenment/Config.in
@@ -1,5 +1,16 @@
config BR2_PACKAGE_ENLIGHTENMENT
bool "enlightenment"
+ # libevas-generic-loaders-svg -> librsvg -> glib2 / pango
+ depends on BR2_USE_WCHAR
+ depends on BR2_INSTALL_LIBSTDCPP
+ # libedbus -> dbus
+ # libedbus -> glib2, libevas
+ depends on BR2_TOOLCHAIN_HAS_THREADS
+ # libedbus -> dbus, efl libraries
+ depends on BR2_USE_MMU
+ 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
@@ -17,17 +28,6 @@ config BR2_PACKAGE_ENLIGHTENMENT
select BR2_PACKAGE_XCB_UTIL_KEYSYMS
select BR2_PACKAGE_LIBEVAS_GENERIC_LOADERS
select BR2_PACKAGE_LIBEVAS_GENERIC_LOADERS_SVG
- # libevas-generic-loaders-svg -> librsvg -> glib2 / pango
- depends on BR2_USE_WCHAR
- depends on BR2_INSTALL_LIBSTDCPP
- # libedbus -> dbus
- # libedbus -> glib2, libevas
- depends on BR2_TOOLCHAIN_HAS_THREADS
- # libedbus -> dbus, efl libraries
- depends on BR2_USE_MMU
- depends on BR2_PACKAGE_XORG7
- # libevas-generic-loaders-svg -> librsvg -> pango -> cairo
- depends on BR2_ARCH_HAS_ATOMICS
help
Enlightenment, also known simply as E, is a stacking window
manager for the X Window System which can be used alone or
diff --git a/package/expedite/Config.in b/package/expedite/Config.in
index de6a056..e60510b 100644
--- a/package/expedite/Config.in
+++ b/package/expedite/Config.in
@@ -1,11 +1,11 @@
config BR2_PACKAGE_EXPEDITE
bool "expedite"
- select BR2_PACKAGE_LIBEINA
- select BR2_PACKAGE_LIBEVAS
- select BR2_PACKAGE_LIBEET
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,
diff --git a/package/libevas-generic-loaders/Config.in b/package/libevas-generic-loaders/Config.in
index 72d4adb..f42f8a6 100644
--- a/package/libevas-generic-loaders/Config.in
+++ b/package/libevas-generic-loaders/Config.in
@@ -14,13 +14,13 @@ if BR2_PACKAGE_LIBEVAS_GENERIC_LOADERS
config BR2_PACKAGE_LIBEVAS_GENERIC_LOADERS_SVG
bool "SVG loader"
- select BR2_PACKAGE_LIBRSVG
- select BR2_PACKAGE_CAIRO
depends on BR2_USE_MMU # librsvg -> glib2
depends on BR2_USE_WCHAR # librsvg -> glib2
depends on BR2_TOOLCHAIN_HAS_THREADS # librsvg -> glib2
depends on BR2_INSTALL_LIBSTDCPP # librsvg -> pango
depends on BR2_ARCH_HAS_ATOMICS # cairo
+ select BR2_PACKAGE_LIBRSVG
+ select BR2_PACKAGE_CAIRO
help
This option enables the Evas generic SVG loader
--
2.4.3
^ permalink raw reply related [flat|nested] 45+ messages in thread* [Buildroot] [PATCH v9 04/32] package/{efl packages}: reorder select/depends
2015-12-12 13:33 ` [Buildroot] [PATCH v9 04/32] package/{efl packages}: reorder select/depends Romain Naour
@ 2015-12-12 13:46 ` Thomas Petazzoni
0 siblings, 0 replies; 45+ messages in thread
From: Thomas Petazzoni @ 2015-12-12 13:46 UTC (permalink / raw)
To: buildroot
Dear Romain Naour,
On Sat, 12 Dec 2015 14:33:07 +0100, Romain Naour wrote:
> As noticed by Yann [1], move the package dependencies
> before selected packages/options.
>
> [1] http://lists.busybox.net/pipermail/buildroot/2015-October/142955.html
>
> Signed-off-by: Romain Naour <romain.naour@openwide.fr>
> Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
> ---
> v6: new patch
> ---
> package/efl/libelementary/Config.in | 4 ++--
> package/enlightenment/Config.in | 22 +++++++++++-----------
> package/expedite/Config.in | 6 +++---
> package/libevas-generic-loaders/Config.in | 4 ++--
> 4 files changed, 18 insertions(+), 18 deletions(-)
Applied, thanks.
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 45+ messages in thread
* [Buildroot] [PATCH v9 05/32] package/efl/libefl: new host-package
2015-12-12 13:33 [Buildroot] [PATCH v9 00/32] efl bump to 1.15.2 Romain Naour
` (3 preceding siblings ...)
2015-12-12 13:33 ` [Buildroot] [PATCH v9 04/32] package/{efl packages}: reorder select/depends Romain Naour
@ 2015-12-12 13:33 ` Romain Naour
2015-12-12 13:49 ` Thomas Petazzoni
2015-12-12 13:33 ` [Buildroot] [PATCH v9 06/32] package/efl/libefl: new package Romain Naour
` (26 subsequent siblings)
31 siblings, 1 reply; 45+ messages in thread
From: Romain Naour @ 2015-12-12 13:33 UTC (permalink / raw)
To: buildroot
This new host-package provide edje_cc, embryo_cc and eet binaries
that will be used by the upcomming libefl packages which will
contain the new version of efl libraries.
Signed-off-by: Romain Naour <romain.naour@openwide.fr>
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
---
v6: Add more license files (Yann E.Morin)
v4: keep efl as a sub-directory.
rename this new package to libefl since we want to keep a efl
and elementary version in sync.
v3: remove trailing slash (Vicente Bergas)
bump to 1.15.2
---
package/efl/libefl/libefl.hash | 2 ++
package/efl/libefl/libefl.mk | 82 ++++++++++++++++++++++++++++++++++++++++++
2 files changed, 84 insertions(+)
create mode 100644 package/efl/libefl/libefl.hash
create mode 100644 package/efl/libefl/libefl.mk
diff --git a/package/efl/libefl/libefl.hash b/package/efl/libefl/libefl.hash
new file mode 100644
index 0000000..7ac26f4
--- /dev/null
+++ b/package/efl/libefl/libefl.hash
@@ -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/libefl/libefl.mk b/package/efl/libefl/libefl.mk
new file mode 100644
index 0000000..d070131
--- /dev/null
+++ b/package/efl/libefl/libefl.mk
@@ -0,0 +1,82 @@
+################################################################################
+#
+# libefl
+#
+################################################################################
+
+# hardcode the version here since the bump to 1.15 is not complete in Buildroot
+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
+
+################################################################################
+#
+# 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))
--
2.4.3
^ permalink raw reply related [flat|nested] 45+ messages in thread* [Buildroot] [PATCH v9 05/32] package/efl/libefl: new host-package
2015-12-12 13:33 ` [Buildroot] [PATCH v9 05/32] package/efl/libefl: new host-package Romain Naour
@ 2015-12-12 13:49 ` Thomas Petazzoni
0 siblings, 0 replies; 45+ messages in thread
From: Thomas Petazzoni @ 2015-12-12 13:49 UTC (permalink / raw)
To: buildroot
Romain,
On Sat, 12 Dec 2015 14:33:08 +0100, Romain Naour wrote:
> +################################################################################
> +#
> +# host-libefl
> +#
> +################################################################################
I am not a big fan of this, because we don't have this in any other
Buildroot package. It should be removed IMO.
> +# 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.
I think it is good to document the options, but only when there is
actually a reason to do so. For example, in the list above, documenting
--disable-fontconf, --disable-fridibi, --disable-gstreamer1,
--disable-mount, --enable-image-loader-gif=no,
--enable-image-loader-tiff=no, --with-crypto=none and --with-x11=none
is useless, since your explanation does not add any value compared to
the name of the option.
For the other ones, it is less obvious, so it is useful. So I think it
is better to document the ones for which an additional comment is
needed, and for the others, just don't add any comment.
I've applied your patch despite those comments, as they can be
addressed later on.
Thanks,
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 45+ messages in thread
* [Buildroot] [PATCH v9 06/32] package/efl/libefl: new package
2015-12-12 13:33 [Buildroot] [PATCH v9 00/32] efl bump to 1.15.2 Romain Naour
` (4 preceding siblings ...)
2015-12-12 13:33 ` [Buildroot] [PATCH v9 05/32] package/efl/libefl: new host-package Romain Naour
@ 2015-12-12 13:33 ` Romain Naour
2015-12-12 14:15 ` Thomas Petazzoni
2015-12-12 13:33 ` [Buildroot] [PATCH v9 07/32] package/efl/libefl: add harfbuzz dependency Romain Naour
` (25 subsequent siblings)
31 siblings, 1 reply; 45+ messages in thread
From: Romain Naour @ 2015-12-12 13:33 UTC (permalink / raw)
To: buildroot
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].
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 <romain.naour@openwide.fr>
Tested-by: Vicente Bergas <vicencb@gmail.com>
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Vicente Bergas <vicencb@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!).
---
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)
Vicente, can you test this new series and resend your Tested-By tag ? Thanks !
---
package/efl/Config.in | 23 +++++--
package/efl/libefl/Config.in | 114 ++++++++++++++++++++++++++++++++
package/efl/libefl/libefl.mk | 150 +++++++++++++++++++++++++++++++++++++++++++
3 files changed, 282 insertions(+), 5 deletions(-)
create mode 100644 package/efl/libefl/Config.in
diff --git a/package/efl/Config.in b/package/efl/Config.in
index 7ce5a36..1c6f9e5 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_USE_MMU
+ depends on BR2_INSTALL_LIBSTDCPP # libefl
+ depends on BR2_PACKAGE_HAS_UDEV # libefl -> libudev
+ depends on BR2_PACKAGE_LUA # lua 5.1 or better
+ depends on BR2_TOOLCHAIN_HAS_THREADS # libefl
+ depends on BR2_USE_MMU # libefl
+ depends on BR2_USE_WCHAR # libefl
+ depends on !BR2_STATIC_LIBS # libefl
+ 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,12 @@ 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_LUA || !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 || !BR2_PACKAGE_HAS_UDEV || !BR2_INSTALL_LIBSTDCPP \
+ || BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR
+ 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..ac871bf
--- /dev/null
+++ b/package/efl/libefl/Config.in
@@ -0,0 +1,114 @@
+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_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 configurations"
+ depends on BR2_ARCH_HAS_ATOMICS # pulseaudio
+ select BR2_PACKAGE_BULLET
+ select BR2_PACKAGE_FONTCONFIG
+ select BR2_PACKAGE_GSTREAMER1
+ select BR2_PACKAGE_GST1_PLUGINS_BASE
+ select BR2_PACKAGE_LIBFRIBIDI
+ select BR2_PACKAGE_LIBSNDFILE
+ select BR2_PACKAGE_PULSEAUDIO
+ select BR2_PACKAGE_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.
+
+ This turns on the following features:
+
+ - bullet: 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
+
+ - fontconfig: 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...
+
+ - gstreamer 1.x: 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.
+
+ - libfribidi: 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.
+
+ - libsndfile: 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.
+
+ - pulseaudio: 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.
+
+ - util-linux' libmount: Libmount is used heavily inside Eeze for
+ support of removable devices etc... and disabling this will
+ hurt support for Enlightenment and its filemanager.
+
+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
^ permalink raw reply related [flat|nested] 45+ messages in thread* [Buildroot] [PATCH v9 06/32] package/efl/libefl: new package
2015-12-12 13:33 ` [Buildroot] [PATCH v9 06/32] package/efl/libefl: new package Romain Naour
@ 2015-12-12 14:15 ` Thomas Petazzoni
2015-12-12 15:10 ` Yann E. MORIN
2015-12-12 18:38 ` Romain Naour
0 siblings, 2 replies; 45+ messages in thread
From: Thomas Petazzoni @ 2015-12-12 14:15 UTC (permalink / raw)
To: buildroot
Dear Romain Naour,
On Sat, 12 Dec 2015 14:33:09 +0100, Romain Naour wrote:
> diff --git a/package/efl/Config.in b/package/efl/Config.in
> index 7ce5a36..1c6f9e5 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_USE_MMU
> + depends on BR2_INSTALL_LIBSTDCPP # libefl
> + depends on BR2_PACKAGE_HAS_UDEV # libefl -> libudev
> + depends on BR2_PACKAGE_LUA # lua 5.1 or better
> + depends on BR2_TOOLCHAIN_HAS_THREADS # libefl
> + depends on BR2_USE_MMU # libefl
> + depends on BR2_USE_WCHAR # libefl
> + depends on !BR2_STATIC_LIBS # libefl
So we have all these dependencies here in package/efl/Config.in and
then duplicated in package/efl/libefl/Config.in. Is this really needed?
> + 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,12 @@ 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_LUA || !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 || !BR2_PACKAGE_HAS_UDEV || !BR2_INSTALL_LIBSTDCPP \
> + || BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR
> + depends on BR2_USE_MMU
So if I enable Lua but I don't enable udev, I am still seeing the
comment "EFL needs lua".
And ditto: if I don't enable Lua, but I have udev, C++, dynamic
library, threads and wchar, I will still see "EFL needs udev /dev
management and a toolchain w/ C++, dynamic library, threads, wchar".
Seems like the handling of dependencies is not good here. It should be:
> +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
Also, do you have a reason for not selecting Lua ?
> +if BR2_PACKAGE_LIBEFL
> +
> +config BR2_PACKAGE_LIBEFL_RECOMMENDED_CONFIG
> + bool "Use recommended and tested configurations"
configurations -> configuration
> + depends on BR2_ARCH_HAS_ATOMICS # pulseaudio
> + select BR2_PACKAGE_BULLET
> + select BR2_PACKAGE_FONTCONFIG
> + select BR2_PACKAGE_GSTREAMER1
> + select BR2_PACKAGE_GST1_PLUGINS_BASE
> + select BR2_PACKAGE_LIBFRIBIDI
> + select BR2_PACKAGE_LIBSNDFILE
> + select BR2_PACKAGE_PULSEAUDIO
> + select BR2_PACKAGE_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.
> +
> + This turns on the following features:
> +
> + - bullet: 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
> +
> + - fontconfig: 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...
> +
> + - gstreamer 1.x: 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.
> +
> + - libfribidi: 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.
> +
> + - libsndfile: 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.
> +
> + - pulseaudio: 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.
> +
> + - util-linux' libmount: Libmount is used heavily inside Eeze for
> + support of removable devices etc... and disabling this will
> + hurt support for Enlightenment and its filemanager.
I am wondering if it is the right approach. Would it be better to have
sub-options for:
[*] Enable bullet support (recommended)
[*] Enable fontconfig support (recommended)
[*] Enable gstreamer1 support (recommended)
[*] Enable libfridi support (recommended)
[*] Enable libsndfile support (recommended)
[*] Enable pulseaudio support (recommended)
[*] Enable libmount support (recommended)
Those options would be enabled by default, and if one of them is not
enabled, you can do:
comment "Warning: one of the recommended option for EFL is not enabled"
depends on !BR2_PACKAGE_LIBEFL_BULLET || \
!BR2_PACKAGE_LIBEFL_FONTCONFIG || \
...
> +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
How do these options fit with the separate libevas-generic-loaders
package ?
> +# 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
Why do you need both gnutls and libgcrypt for gnutls support ?
Thanks!
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 45+ messages in thread
* [Buildroot] [PATCH v9 06/32] package/efl/libefl: new package
2015-12-12 14:15 ` Thomas Petazzoni
@ 2015-12-12 15:10 ` Yann E. MORIN
2015-12-12 15:55 ` Thomas Petazzoni
2015-12-12 18:38 ` Romain Naour
1 sibling, 1 reply; 45+ messages in thread
From: Yann E. MORIN @ 2015-12-12 15:10 UTC (permalink / raw)
To: buildroot
Thomas, Romain, All,
On 2015-12-12 15:15 +0100, Thomas Petazzoni spake thusly:
> On Sat, 12 Dec 2015 14:33:09 +0100, Romain Naour wrote:
> > diff --git a/package/efl/Config.in b/package/efl/Config.in
> > index 7ce5a36..1c6f9e5 100644
> > --- a/package/efl/Config.in
> > +++ b/package/efl/Config.in
[--SNIP--]
> > +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
>
> Also, do you have a reason for not selecting Lua ?
Because BR2_PACKAGE_LUA is a provider for the virual package
lua-interpreter, and you should not select a provider of a virtual
package:
https://buildroot.org/downloads/manual/manual.html#_infrastructure_for_virtual_packages
If your package really requires a specific provider, then you?ll
have to make your package depends on this provider; you can not
select a provider.
(followed byu an example why this should indeed not be done.)
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. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 45+ messages in thread* [Buildroot] [PATCH v9 06/32] package/efl/libefl: new package
2015-12-12 15:10 ` Yann E. MORIN
@ 2015-12-12 15:55 ` Thomas Petazzoni
0 siblings, 0 replies; 45+ messages in thread
From: Thomas Petazzoni @ 2015-12-12 15:55 UTC (permalink / raw)
To: buildroot
Yann,
On Sat, 12 Dec 2015 16:10:23 +0100, Yann E. MORIN wrote:
> Because BR2_PACKAGE_LUA is a provider for the virual package
> lua-interpreter, and you should not select a provider of a virtual
> package:
>
> https://buildroot.org/downloads/manual/manual.html#_infrastructure_for_virtual_packages
>
> If your package really requires a specific provider, then you?ll
> have to make your package depends on this provider; you can not
> select a provider.
Ah, yes, right, I forgot that Lua was a virtual package. Then indeed,
we don't have any other option here.
Thanks for the explanation,
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 45+ messages in thread
* [Buildroot] [PATCH v9 06/32] package/efl/libefl: new package
2015-12-12 14:15 ` Thomas Petazzoni
2015-12-12 15:10 ` Yann E. MORIN
@ 2015-12-12 18:38 ` Romain Naour
2015-12-12 22:39 ` Romain Naour
2015-12-14 23:08 ` Romain Naour
1 sibling, 2 replies; 45+ messages in thread
From: Romain Naour @ 2015-12-12 18:38 UTC (permalink / raw)
To: buildroot
Hi Thomas, All,
Le 12/12/2015 15:15, Thomas Petazzoni a ?crit :
> Dear Romain Naour,
>
> On Sat, 12 Dec 2015 14:33:09 +0100, Romain Naour wrote:
>
>> diff --git a/package/efl/Config.in b/package/efl/Config.in
>> index 7ce5a36..1c6f9e5 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_USE_MMU
>> + depends on BR2_INSTALL_LIBSTDCPP # libefl
>> + depends on BR2_PACKAGE_HAS_UDEV # libefl -> libudev
>> + depends on BR2_PACKAGE_LUA # lua 5.1 or better
>> + depends on BR2_TOOLCHAIN_HAS_THREADS # libefl
>> + depends on BR2_USE_MMU # libefl
>> + depends on BR2_USE_WCHAR # libefl
>> + depends on !BR2_STATIC_LIBS # libefl
>
> So we have all these dependencies here in package/efl/Config.in and
> then duplicated in package/efl/libefl/Config.in. Is this really needed?
Indeed, it's not really great but since BR2_PACKAGE_EFL select
BR2_PACKAGE_LIBEFL all libefl dependencies must be propagated.
Do you want I remove the dependencies from libefl package ?
I'm not sure the right thing to do here.
>
>> + 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,12 @@ 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_LUA || !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 || !BR2_PACKAGE_HAS_UDEV || !BR2_INSTALL_LIBSTDCPP \
>> + || BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR
>> + depends on BR2_USE_MMU
Humm, it look like the comments dependencies are the same here..
>
> So if I enable Lua but I don't enable udev, I am still seeing the
> comment "EFL needs lua".
>
> And ditto: if I don't enable Lua, but I have udev, C++, dynamic
> library, threads and wchar, I will still see "EFL needs udev /dev
> management and a toolchain w/ C++, dynamic library, threads, wchar".
>
> Seems like the handling of dependencies is not good here. It should be:
>
>> +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
Look better, thanks :)
>
> Also, do you have a reason for not selecting Lua ?
Yann reported in his review that Lua is a virtual package, so we can't select it.
>
>
>> +if BR2_PACKAGE_LIBEFL
>> +
>> +config BR2_PACKAGE_LIBEFL_RECOMMENDED_CONFIG
>> + bool "Use recommended and tested configurations"
>
> configurations -> configuration
>
>> + depends on BR2_ARCH_HAS_ATOMICS # pulseaudio
>> + select BR2_PACKAGE_BULLET
>> + select BR2_PACKAGE_FONTCONFIG
>> + select BR2_PACKAGE_GSTREAMER1
>> + select BR2_PACKAGE_GST1_PLUGINS_BASE
>> + select BR2_PACKAGE_LIBFRIBIDI
>> + select BR2_PACKAGE_LIBSNDFILE
>> + select BR2_PACKAGE_PULSEAUDIO
>> + select BR2_PACKAGE_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.
>> +
>> + This turns on the following features:
>> +
>> + - bullet: 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
>> +
>> + - fontconfig: 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...
>> +
>> + - gstreamer 1.x: 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.
>> +
>> + - libfribidi: 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.
>> +
>> + - libsndfile: 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.
>> +
>> + - pulseaudio: 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.
>> +
>> + - util-linux' libmount: Libmount is used heavily inside Eeze for
>> + support of removable devices etc... and disabling this will
>> + hurt support for Enlightenment and its filemanager.
>
> I am wondering if it is the right approach. Would it be better to have
> sub-options for:
>
> [*] Enable bullet support (recommended)
> [*] Enable fontconfig support (recommended)
> [*] Enable gstreamer1 support (recommended)
> [*] Enable libfridi support (recommended)
> [*] Enable libsndfile support (recommended)
> [*] Enable pulseaudio support (recommended)
> [*] Enable libmount support (recommended)
>
> Those options would be enabled by default, and if one of them is not
> enabled, you can do:
>
> comment "Warning: one of the recommended option for EFL is not enabled"
> depends on !BR2_PACKAGE_LIBEFL_BULLET || \
> !BR2_PACKAGE_LIBEFL_FONTCONFIG || \
> ...
>
Yes, we can try to do that but we need to be sure to add
--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
to LIBEFL_CONF_OPTS if one of them is disabled.
>> +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
>
> How do these options fit with the separate libevas-generic-loaders
> package ?
As far I know libevas-generic-loaders provide additional images loaders that are
not available in libevas:
From libevas-generic-loaders README:
* **XCF** (.xcf .xcf.gz)
* **PDF** (using poppler)
* use -key option to specific what page to get and load options for size
Should we add mupdf ?
* **PS** (using libspectre)
* use -key option to specific what page to get and load options for size
Should we use directly libgs ?
* **RAW** (using libraw)
* **SVG** (using librsvg)
* **MPG/AVI/OGV/MOV/MKV/WMV** etc. (using gstreamer)
* Should we add libxine and vlc ?
* **PPT/PPTX/DOC/DOCX/XLS** etc.
* Required PDF loader, and uses libreoffice binaries as slaves to
export PDFs to load
>
>> +# 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
>
> Why do you need both gnutls and libgcrypt for gnutls support ?
I've keept libgcrypt dependency from the old libecore package. I'm not sure we
still need it.
Best regards,
Romain
>
> Thanks!
>
> Thomas
>
^ permalink raw reply [flat|nested] 45+ messages in thread* [Buildroot] [PATCH v9 06/32] package/efl/libefl: new package
2015-12-12 18:38 ` Romain Naour
@ 2015-12-12 22:39 ` Romain Naour
2015-12-13 10:37 ` Thomas Petazzoni
2015-12-14 23:08 ` Romain Naour
1 sibling, 1 reply; 45+ messages in thread
From: Romain Naour @ 2015-12-12 22:39 UTC (permalink / raw)
To: buildroot
Thomas,
>>
>>> +# 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
>>
>> Why do you need both gnutls and libgcrypt for gnutls support ?
>
> I've keept libgcrypt dependency from the old libecore package. I'm not sure we
> still need it.
libgcrypt is still needed for the gnutls support otherwise:
lib/emile/emile_main.c:8:20: fatal error: gcrypt.h: No such file or directory
#include <gcrypt.h>
Best regards,
Romain
>
> Best regards,
> Romain
>
>>
>> Thanks!
>>
>> Thomas
>>
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
>
^ permalink raw reply [flat|nested] 45+ messages in thread
* [Buildroot] [PATCH v9 06/32] package/efl/libefl: new package
2015-12-12 22:39 ` Romain Naour
@ 2015-12-13 10:37 ` Thomas Petazzoni
0 siblings, 0 replies; 45+ messages in thread
From: Thomas Petazzoni @ 2015-12-13 10:37 UTC (permalink / raw)
To: buildroot
Romain,
On Sat, 12 Dec 2015 23:39:40 +0100, Romain Naour wrote:
> > I've keept libgcrypt dependency from the old libecore package. I'm not sure we
> > still need it.
>
> libgcrypt is still needed for the gnutls support otherwise:
>
> lib/emile/emile_main.c:8:20: fatal error: gcrypt.h: No such file or directory
> #include <gcrypt.h>
OK. A bit weird, but well, if that's how it's done, let's go for it.
Thanks,
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 45+ messages in thread
* [Buildroot] [PATCH v9 06/32] package/efl/libefl: new package
2015-12-12 18:38 ` Romain Naour
2015-12-12 22:39 ` Romain Naour
@ 2015-12-14 23:08 ` Romain Naour
2015-12-14 23:50 ` Yann E. MORIN
1 sibling, 1 reply; 45+ messages in thread
From: Romain Naour @ 2015-12-14 23:08 UTC (permalink / raw)
To: buildroot
Hi Thomas, Yann, All,
Le 12/12/2015 19:38, Romain Naour a ?crit :
> Hi Thomas, All,
>
> Le 12/12/2015 15:15, Thomas Petazzoni a ?crit :
>> Dear Romain Naour,
>>
>> On Sat, 12 Dec 2015 14:33:09 +0100, Romain Naour wrote:
>>
>>> diff --git a/package/efl/Config.in b/package/efl/Config.in
>>> index 7ce5a36..1c6f9e5 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_USE_MMU
>>> + depends on BR2_INSTALL_LIBSTDCPP # libefl
>>> + depends on BR2_PACKAGE_HAS_UDEV # libefl -> libudev
>>> + depends on BR2_PACKAGE_LUA # lua 5.1 or better
>>> + depends on BR2_TOOLCHAIN_HAS_THREADS # libefl
>>> + depends on BR2_USE_MMU # libefl
>>> + depends on BR2_USE_WCHAR # libefl
>>> + depends on !BR2_STATIC_LIBS # libefl
>>
>> So we have all these dependencies here in package/efl/Config.in and
>> then duplicated in package/efl/libefl/Config.in. Is this really needed?
>
> Indeed, it's not really great but since BR2_PACKAGE_EFL select
> BR2_PACKAGE_LIBEFL all libefl dependencies must be propagated.
>
> Do you want I remove the dependencies from libefl package ?
> I'm not sure the right thing to do here.
>
In a previous series I wanted to make BR2_PACKAGE_EFL a real buildroot package.
So what Yann and me suggest is indeed duplicate the dependencies in this patch
and at the end of the series remove them and change the BR2_PACKAGE_EFL from a
menuconfig to a simple menu:
menu "Enlightenment Foundation Libraries"
source "package/efl/libefl/Config.in"
source "package/efl/libelementary/Config.in"
endmenu
By doing this we can even rename the libefl package by efl in order to keep the
previously used Kconfig BR2_PACKAGE_EFL.
We can do that only at the end of the series after the old {libecore,libevas...}
removal.
Thoughts ?
Best regards,
Romain
^ permalink raw reply [flat|nested] 45+ messages in thread* [Buildroot] [PATCH v9 06/32] package/efl/libefl: new package
2015-12-14 23:08 ` Romain Naour
@ 2015-12-14 23:50 ` Yann E. MORIN
0 siblings, 0 replies; 45+ messages in thread
From: Yann E. MORIN @ 2015-12-14 23:50 UTC (permalink / raw)
To: buildroot
Romain, Thomas,
On 2015-12-15 00:08 +0100, Romain Naour spake thusly:
> Le 12/12/2015 19:38, Romain Naour a ?crit :
> > Hi Thomas, All,
> >
> > Le 12/12/2015 15:15, Thomas Petazzoni a ?crit :
> >> Dear Romain Naour,
> >>
> >> On Sat, 12 Dec 2015 14:33:09 +0100, Romain Naour wrote:
> >>
> >>> diff --git a/package/efl/Config.in b/package/efl/Config.in
> >>> index 7ce5a36..1c6f9e5 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_USE_MMU
> >>> + depends on BR2_INSTALL_LIBSTDCPP # libefl
> >>> + depends on BR2_PACKAGE_HAS_UDEV # libefl -> libudev
> >>> + depends on BR2_PACKAGE_LUA # lua 5.1 or better
> >>> + depends on BR2_TOOLCHAIN_HAS_THREADS # libefl
> >>> + depends on BR2_USE_MMU # libefl
> >>> + depends on BR2_USE_WCHAR # libefl
> >>> + depends on !BR2_STATIC_LIBS # libefl
> >>
> >> So we have all these dependencies here in package/efl/Config.in and
> >> then duplicated in package/efl/libefl/Config.in. Is this really needed?
> >
> > Indeed, it's not really great but since BR2_PACKAGE_EFL select
> > BR2_PACKAGE_LIBEFL all libefl dependencies must be propagated.
> >
> > Do you want I remove the dependencies from libefl package ?
> > I'm not sure the right thing to do here.
> >
>
> In a previous series I wanted to make BR2_PACKAGE_EFL a real buildroot package.
>
> So what Yann and me suggest is indeed duplicate the dependencies in this patch
> and at the end of the series remove them and change the BR2_PACKAGE_EFL from a
> menuconfig to a simple menu:
>
> menu "Enlightenment Foundation Libraries"
>
> source "package/efl/libefl/Config.in"
> source "package/efl/libelementary/Config.in"
>
> endmenu
>
> By doing this we can even rename the libefl package by efl in order to keep the
> previously used Kconfig BR2_PACKAGE_EFL.
>
> We can do that only at the end of the series after the old {libecore,libevas...}
> removal.
>
> Thoughts ?
Indeed, I think this is the best solution.
The current patch is transitional, since the old EFL packages are only
removed at the end.
However, if the duplication is still a concern, an option would be to just
have the dependencies on BR2_PACKAGE_EFL, and none on BR2_PACKAGE_LIBEFL,
like so:
package/efl/Config.in:
config BR2_PACKAGE_EFL
bool "EFL blabla"
depends on C++
depends on bla
depends on blabla
select BR2_PACKAGE_LIBEFL
package/efl/libefl/Config.in:
config BR2_PACKAGE_LIBEFL
bool "libefl"
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. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 45+ messages in thread
* [Buildroot] [PATCH v9 07/32] package/efl/libefl: add harfbuzz dependency
2015-12-12 13:33 [Buildroot] [PATCH v9 00/32] efl bump to 1.15.2 Romain Naour
` (5 preceding siblings ...)
2015-12-12 13:33 ` [Buildroot] [PATCH v9 06/32] package/efl/libefl: new package Romain Naour
@ 2015-12-12 13:33 ` Romain Naour
2015-12-12 13:33 ` [Buildroot] [PATCH v9 08/32] package/efl/libefl: add wayland dependency Romain Naour
` (24 subsequent siblings)
31 siblings, 0 replies; 45+ messages in thread
From: Romain Naour @ 2015-12-12 13:33 UTC (permalink / raw)
To: buildroot
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 <romain.naour@openwide.fr>
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@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
^ permalink raw reply related [flat|nested] 45+ messages in thread* [Buildroot] [PATCH v9 08/32] package/efl/libefl: add wayland dependency
2015-12-12 13:33 [Buildroot] [PATCH v9 00/32] efl bump to 1.15.2 Romain Naour
` (6 preceding siblings ...)
2015-12-12 13:33 ` [Buildroot] [PATCH v9 07/32] package/efl/libefl: add harfbuzz dependency Romain Naour
@ 2015-12-12 13:33 ` Romain Naour
2015-12-12 13:33 ` [Buildroot] [PATCH v9 09/32] package/efl/libefl: add webp dependency Romain Naour
` (23 subsequent siblings)
31 siblings, 0 replies; 45+ messages in thread
From: Romain Naour @ 2015-12-12 13:33 UTC (permalink / raw)
To: buildroot
See:
https://www.enlightenment.org/about-wayland
Signed-off-by: Romain Naour <romain.naour@openwide.fr>
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@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 ac871bf..3cf4b4e 100644
--- a/package/efl/libefl/Config.in
+++ b/package/efl/libefl/Config.in
@@ -11,6 +11,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
^ permalink raw reply related [flat|nested] 45+ messages in thread* [Buildroot] [PATCH v9 09/32] package/efl/libefl: add webp dependency
2015-12-12 13:33 [Buildroot] [PATCH v9 00/32] efl bump to 1.15.2 Romain Naour
` (7 preceding siblings ...)
2015-12-12 13:33 ` [Buildroot] [PATCH v9 08/32] package/efl/libefl: add wayland dependency Romain Naour
@ 2015-12-12 13:33 ` Romain Naour
2015-12-12 13:33 ` [Buildroot] [PATCH v9 10/32] package/efl/libefl: add frame buffer config option Romain Naour
` (22 subsequent siblings)
31 siblings, 0 replies; 45+ messages in thread
From: Romain Naour @ 2015-12-12 13:33 UTC (permalink / raw)
To: buildroot
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 <romain.naour@openwide.fr>
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@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 3cf4b4e..0b89411 100644
--- a/package/efl/libefl/Config.in
+++ b/package/efl/libefl/Config.in
@@ -112,4 +112,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
^ permalink raw reply related [flat|nested] 45+ messages in thread* [Buildroot] [PATCH v9 10/32] package/efl/libefl: add frame buffer config option
2015-12-12 13:33 [Buildroot] [PATCH v9 00/32] efl bump to 1.15.2 Romain Naour
` (8 preceding siblings ...)
2015-12-12 13:33 ` [Buildroot] [PATCH v9 09/32] package/efl/libefl: add webp dependency Romain Naour
@ 2015-12-12 13:33 ` Romain Naour
2015-12-12 13:33 ` [Buildroot] [PATCH v9 11/32] package/efl/libefl: add jp2k " Romain Naour
` (21 subsequent siblings)
31 siblings, 0 replies; 45+ messages in thread
From: Romain Naour @ 2015-12-12 13:33 UTC (permalink / raw)
To: buildroot
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 <romain.naour@openwide.fr>
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@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 <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/libefl/Config.in b/package/efl/libefl/Config.in
index 0b89411..4a202a0 100644
--- a/package/efl/libefl/Config.in
+++ b/package/efl/libefl/Config.in
@@ -84,6 +84,11 @@ config BR2_PACKAGE_LIBEFL_RECOMMENDED_CONFIG
support of removable devices etc... and disabling this will
hurt support for Enlightenment and its filemanager.
+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
^ permalink raw reply related [flat|nested] 45+ messages in thread* [Buildroot] [PATCH v9 11/32] package/efl/libefl: add jp2k config option
2015-12-12 13:33 [Buildroot] [PATCH v9 00/32] efl bump to 1.15.2 Romain Naour
` (9 preceding siblings ...)
2015-12-12 13:33 ` [Buildroot] [PATCH v9 10/32] package/efl/libefl: add frame buffer config option Romain Naour
@ 2015-12-12 13:33 ` Romain Naour
2015-12-12 13:33 ` [Buildroot] [PATCH v9 12/32] package/efl/libefl: add X11 support Romain Naour
` (20 subsequent siblings)
31 siblings, 0 replies; 45+ messages in thread
From: Romain Naour @ 2015-12-12 13:33 UTC (permalink / raw)
To: buildroot
Like for webp format, add an option to enable the JPEG 2000
codec support in the efl libraries.
Signed-off-by: Romain Naour <romain.naour@openwide.fr>
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@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 4a202a0..72b7347 100644
--- a/package/efl/libefl/Config.in
+++ b/package/efl/libefl/Config.in
@@ -98,6 +98,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
^ permalink raw reply related [flat|nested] 45+ messages in thread* [Buildroot] [PATCH v9 12/32] package/efl/libefl: add X11 support
2015-12-12 13:33 [Buildroot] [PATCH v9 00/32] efl bump to 1.15.2 Romain Naour
` (10 preceding siblings ...)
2015-12-12 13:33 ` [Buildroot] [PATCH v9 11/32] package/efl/libefl: add jp2k " Romain Naour
@ 2015-12-12 13:33 ` Romain Naour
2015-12-12 13:33 ` [Buildroot] [PATCH v9 13/32] package/efl/libefl: add OpenGLES support Romain Naour
` (19 subsequent siblings)
31 siblings, 0 replies; 45+ messages in thread
From: Romain Naour @ 2015-12-12 13:33 UTC (permalink / raw)
To: buildroot
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 <romain.naour@openwide.fr>
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@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 <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/libefl/Config.in b/package/efl/libefl/Config.in
index 72b7347..560a7b3 100644
--- a/package/efl/libefl/Config.in
+++ b/package/efl/libefl/Config.in
@@ -89,6 +89,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
^ permalink raw reply related [flat|nested] 45+ messages in thread* [Buildroot] [PATCH v9 13/32] package/efl/libefl: add OpenGLES support
2015-12-12 13:33 [Buildroot] [PATCH v9 00/32] efl bump to 1.15.2 Romain Naour
` (11 preceding siblings ...)
2015-12-12 13:33 ` [Buildroot] [PATCH v9 12/32] package/efl/libefl: add X11 support Romain Naour
@ 2015-12-12 13:33 ` Romain Naour
2015-12-12 13:33 ` [Buildroot] [PATCH v9 14/32] package/efl/libefl: enable xinput2.2 Romain Naour
` (18 subsequent siblings)
31 siblings, 0 replies; 45+ messages in thread
From: Romain Naour @ 2015-12-12 13:33 UTC (permalink / raw)
To: buildroot
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 <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 560a7b3..73e14ae 100644
--- a/package/efl/libefl/Config.in
+++ b/package/efl/libefl/Config.in
@@ -105,6 +105,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
^ permalink raw reply related [flat|nested] 45+ messages in thread* [Buildroot] [PATCH v9 14/32] package/efl/libefl: enable xinput2.2
2015-12-12 13:33 [Buildroot] [PATCH v9 00/32] efl bump to 1.15.2 Romain Naour
` (12 preceding siblings ...)
2015-12-12 13:33 ` [Buildroot] [PATCH v9 13/32] package/efl/libefl: add OpenGLES support Romain Naour
@ 2015-12-12 13:33 ` Romain Naour
2015-12-12 13:33 ` [Buildroot] [PATCH v9 15/32] package/libevas-generic-loaders: bump to version 1.15.0 Romain Naour
` (17 subsequent siblings)
31 siblings, 0 replies; 45+ messages in thread
From: Romain Naour @ 2015-12-12 13:33 UTC (permalink / raw)
To: buildroot
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 <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 73e14ae..ecc54f2 100644
--- a/package/efl/libefl/Config.in
+++ b/package/efl/libefl/Config.in
@@ -97,6 +97,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
^ permalink raw reply related [flat|nested] 45+ messages in thread* [Buildroot] [PATCH v9 15/32] package/libevas-generic-loaders: bump to version 1.15.0
2015-12-12 13:33 [Buildroot] [PATCH v9 00/32] efl bump to 1.15.2 Romain Naour
` (13 preceding siblings ...)
2015-12-12 13:33 ` [Buildroot] [PATCH v9 14/32] package/efl/libefl: enable xinput2.2 Romain Naour
@ 2015-12-12 13:33 ` Romain Naour
2015-12-12 13:33 ` [Buildroot] [PATCH v9 16/32] package/libevas-generic-loaders: add libraw dependency Romain Naour
` (16 subsequent siblings)
31 siblings, 0 replies; 45+ messages in thread
From: Romain Naour @ 2015-12-12 13:33 UTC (permalink / raw)
To: buildroot
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 <romain.naour@openwide.fr>
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@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
^ permalink raw reply related [flat|nested] 45+ messages in thread* [Buildroot] [PATCH v9 16/32] package/libevas-generic-loaders: add libraw dependency
2015-12-12 13:33 [Buildroot] [PATCH v9 00/32] efl bump to 1.15.2 Romain Naour
` (14 preceding siblings ...)
2015-12-12 13:33 ` [Buildroot] [PATCH v9 15/32] package/libevas-generic-loaders: bump to version 1.15.0 Romain Naour
@ 2015-12-12 13:33 ` Romain Naour
2015-12-12 13:33 ` [Buildroot] [PATCH v9 17/32] package/efl/libelementary: bump to version 1.15.2 Romain Naour
` (15 subsequent siblings)
31 siblings, 0 replies; 45+ messages in thread
From: Romain Naour @ 2015-12-12 13:33 UTC (permalink / raw)
To: buildroot
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 <romain.naour@openwide.fr>
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@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
^ permalink raw reply related [flat|nested] 45+ messages in thread* [Buildroot] [PATCH v9 17/32] package/efl/libelementary: bump to version 1.15.2
2015-12-12 13:33 [Buildroot] [PATCH v9 00/32] efl bump to 1.15.2 Romain Naour
` (15 preceding siblings ...)
2015-12-12 13:33 ` [Buildroot] [PATCH v9 16/32] package/libevas-generic-loaders: add libraw dependency Romain Naour
@ 2015-12-12 13:33 ` Romain Naour
2015-12-12 13:33 ` [Buildroot] [PATCH v9 18/32] package/efl: libefl and libelementary share the same version number Romain Naour
` (14 subsequent siblings)
31 siblings, 0 replies; 45+ messages in thread
From: Romain Naour @ 2015-12-12 13:33 UTC (permalink / raw)
To: buildroot
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 <romain.naour@openwide.fr>
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@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
^ permalink raw reply related [flat|nested] 45+ messages in thread* [Buildroot] [PATCH v9 18/32] package/efl: libefl and libelementary share the same version number
2015-12-12 13:33 [Buildroot] [PATCH v9 00/32] efl bump to 1.15.2 Romain Naour
` (16 preceding siblings ...)
2015-12-12 13:33 ` [Buildroot] [PATCH v9 17/32] package/efl/libelementary: bump to version 1.15.2 Romain Naour
@ 2015-12-12 13:33 ` Romain Naour
2015-12-12 13:33 ` [Buildroot] [PATCH v9 19/32] package/enlightenment: bump to version 0.19.12 Romain Naour
` (13 subsequent siblings)
31 siblings, 0 replies; 45+ messages in thread
From: Romain Naour @ 2015-12-12 13:33 UTC (permalink / raw)
To: buildroot
Signed-off-by: Romain Naour <romain.naour@openwide.fr>
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@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
^ permalink raw reply related [flat|nested] 45+ messages in thread* [Buildroot] [PATCH v9 19/32] package/enlightenment: bump to version 0.19.12
2015-12-12 13:33 [Buildroot] [PATCH v9 00/32] efl bump to 1.15.2 Romain Naour
` (17 preceding siblings ...)
2015-12-12 13:33 ` [Buildroot] [PATCH v9 18/32] package/efl: libefl and libelementary share the same version number Romain Naour
@ 2015-12-12 13:33 ` Romain Naour
2015-12-12 13:33 ` [Buildroot] [PATCH v9 20/32] package/expedite: bump to efl-1.15 branch Romain Naour
` (12 subsequent siblings)
31 siblings, 0 replies; 45+ messages in thread
From: Romain Naour @ 2015-12-12 13:33 UTC (permalink / raw)
To: buildroot
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 <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
^ permalink raw reply related [flat|nested] 45+ messages in thread* [Buildroot] [PATCH v9 20/32] package/expedite: bump to efl-1.15 branch
2015-12-12 13:33 [Buildroot] [PATCH v9 00/32] efl bump to 1.15.2 Romain Naour
` (18 preceding siblings ...)
2015-12-12 13:33 ` [Buildroot] [PATCH v9 19/32] package/enlightenment: bump to version 0.19.12 Romain Naour
@ 2015-12-12 13:33 ` Romain Naour
2015-12-12 13:33 ` [Buildroot] [PATCH v9 21/32] package/dbus-cpp: switch to libefl Romain Naour
` (11 subsequent siblings)
31 siblings, 0 replies; 45+ messages in thread
From: Romain Naour @ 2015-12-12 13:33 UTC (permalink / raw)
To: buildroot
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 <romain.naour@openwide.fr>
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
---
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.mk | 13 +++++++++----
2 files changed, 11 insertions(+), 10 deletions(-)
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.mk b/package/expedite/expedite.mk
index 9b232f8..6b3bbfe 100644
--- a/package/expedite/expedite.mk
+++ b/package/expedite/expedite.mk
@@ -4,14 +4,19 @@
#
################################################################################
-EXPEDITE_VERSION = 1.7.10
-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),y)
EXPEDITE_CONF_OPTS += --with-x=$(STAGING_DIR) \
--x-includes=$(STAGING_DIR)/usr/include \
--x-libraries=$(STAGING_DIR)/usr/lib
--
2.4.3
^ permalink raw reply related [flat|nested] 45+ messages in thread* [Buildroot] [PATCH v9 21/32] package/dbus-cpp: switch to libefl
2015-12-12 13:33 [Buildroot] [PATCH v9 00/32] efl bump to 1.15.2 Romain Naour
` (19 preceding siblings ...)
2015-12-12 13:33 ` [Buildroot] [PATCH v9 20/32] package/expedite: bump to efl-1.15 branch Romain Naour
@ 2015-12-12 13:33 ` Romain Naour
2015-12-12 13:33 ` [Buildroot] [PATCH v9 22/32] package/efl/libethumb: remove package Romain Naour
` (10 subsequent siblings)
31 siblings, 0 replies; 45+ messages in thread
From: Romain Naour @ 2015-12-12 13:33 UTC (permalink / raw)
To: buildroot
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" <yann.morin.1998@free.fr>
Signed-off-by: Romain Naour <romain.naour@openwide.fr>
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@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
^ permalink raw reply related [flat|nested] 45+ messages in thread* [Buildroot] [PATCH v9 22/32] package/efl/libethumb: remove package
2015-12-12 13:33 [Buildroot] [PATCH v9 00/32] efl bump to 1.15.2 Romain Naour
` (20 preceding siblings ...)
2015-12-12 13:33 ` [Buildroot] [PATCH v9 21/32] package/dbus-cpp: switch to libefl Romain Naour
@ 2015-12-12 13:33 ` Romain Naour
2015-12-12 13:33 ` [Buildroot] [PATCH v9 23/32] package/efl/libedje: " Romain Naour
` (9 subsequent siblings)
31 siblings, 0 replies; 45+ messages in thread
From: Romain Naour @ 2015-12-12 13:33 UTC (permalink / raw)
To: buildroot
Libethumb is now available in efl package.
Signed-off-by: Romain Naour <romain.naour@openwide.fr>
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@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 1c6f9e5..ff8ba83 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 <peter@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 <peter@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
^ permalink raw reply related [flat|nested] 45+ messages in thread* [Buildroot] [PATCH v9 23/32] package/efl/libedje: remove package
2015-12-12 13:33 [Buildroot] [PATCH v9 00/32] efl bump to 1.15.2 Romain Naour
` (21 preceding siblings ...)
2015-12-12 13:33 ` [Buildroot] [PATCH v9 22/32] package/efl/libethumb: remove package Romain Naour
@ 2015-12-12 13:33 ` Romain Naour
2015-12-12 13:33 ` [Buildroot] [PATCH v9 24/32] package/efl/libembryo: " Romain Naour
` (8 subsequent siblings)
31 siblings, 0 replies; 45+ messages in thread
From: Romain Naour @ 2015-12-12 13:33 UTC (permalink / raw)
To: buildroot
Libedje is now available in efl package.
Signed-off-by: Romain Naour <romain.naour@openwide.fr>
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@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 ff8ba83..417534c 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
^ permalink raw reply related [flat|nested] 45+ messages in thread* [Buildroot] [PATCH v9 24/32] package/efl/libembryo: remove package
2015-12-12 13:33 [Buildroot] [PATCH v9 00/32] efl bump to 1.15.2 Romain Naour
` (22 preceding siblings ...)
2015-12-12 13:33 ` [Buildroot] [PATCH v9 23/32] package/efl/libedje: " Romain Naour
@ 2015-12-12 13:33 ` Romain Naour
2015-12-12 13:33 ` [Buildroot] [PATCH v9 25/32] package/efl/libeio: " Romain Naour
` (7 subsequent siblings)
31 siblings, 0 replies; 45+ messages in thread
From: Romain Naour @ 2015-12-12 13:33 UTC (permalink / raw)
To: buildroot
Libembryo is now available in efl package.
Signed-off-by: Romain Naour <romain.naour@openwide.fr>
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@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 417534c..2f6d94d 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
^ permalink raw reply related [flat|nested] 45+ messages in thread* [Buildroot] [PATCH v9 25/32] package/efl/libeio: remove package
2015-12-12 13:33 [Buildroot] [PATCH v9 00/32] efl bump to 1.15.2 Romain Naour
` (23 preceding siblings ...)
2015-12-12 13:33 ` [Buildroot] [PATCH v9 24/32] package/efl/libembryo: " Romain Naour
@ 2015-12-12 13:33 ` Romain Naour
2015-12-12 13:33 ` [Buildroot] [PATCH v9 26/32] package/efl/libefreet: " Romain Naour
` (6 subsequent siblings)
31 siblings, 0 replies; 45+ messages in thread
From: Romain Naour @ 2015-12-12 13:33 UTC (permalink / raw)
To: buildroot
Libeio is now available in efl package.
Signed-off-by: Romain Naour <romain.naour@openwide.fr>
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@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 2f6d94d..509f356 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
^ permalink raw reply related [flat|nested] 45+ messages in thread* [Buildroot] [PATCH v9 26/32] package/efl/libefreet: remove package
2015-12-12 13:33 [Buildroot] [PATCH v9 00/32] efl bump to 1.15.2 Romain Naour
` (24 preceding siblings ...)
2015-12-12 13:33 ` [Buildroot] [PATCH v9 25/32] package/efl/libeio: " Romain Naour
@ 2015-12-12 13:33 ` Romain Naour
2015-12-12 13:33 ` [Buildroot] [PATCH v9 27/32] package/efl/libedbus: " Romain Naour
` (5 subsequent siblings)
31 siblings, 0 replies; 45+ messages in thread
From: Romain Naour @ 2015-12-12 13:33 UTC (permalink / raw)
To: buildroot
Libefreet is now available in efl package.
Signed-off-by: Romain Naour <romain.naour@openwide.fr>
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@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 509f356..a4ad1d9 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
^ permalink raw reply related [flat|nested] 45+ messages in thread* [Buildroot] [PATCH v9 27/32] package/efl/libedbus: remove package
2015-12-12 13:33 [Buildroot] [PATCH v9 00/32] efl bump to 1.15.2 Romain Naour
` (25 preceding siblings ...)
2015-12-12 13:33 ` [Buildroot] [PATCH v9 26/32] package/efl/libefreet: " Romain Naour
@ 2015-12-12 13:33 ` Romain Naour
2015-12-12 13:33 ` [Buildroot] [PATCH v9 28/32] package/efl/libecore: " Romain Naour
` (4 subsequent siblings)
31 siblings, 0 replies; 45+ messages in thread
From: Romain Naour @ 2015-12-12 13:33 UTC (permalink / raw)
To: buildroot
Libedbus is now available in efl package.
Signed-off-by: Romain Naour <romain.naour@openwide.fr>
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@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 a4ad1d9..61e44fe 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
^ permalink raw reply related [flat|nested] 45+ messages in thread* [Buildroot] [PATCH v9 28/32] package/efl/libecore: remove package
2015-12-12 13:33 [Buildroot] [PATCH v9 00/32] efl bump to 1.15.2 Romain Naour
` (26 preceding siblings ...)
2015-12-12 13:33 ` [Buildroot] [PATCH v9 27/32] package/efl/libedbus: " Romain Naour
@ 2015-12-12 13:33 ` Romain Naour
2015-12-12 13:33 ` [Buildroot] [PATCH v9 29/32] package/efl/libevas: " Romain Naour
` (3 subsequent siblings)
31 siblings, 0 replies; 45+ messages in thread
From: Romain Naour @ 2015-12-12 13:33 UTC (permalink / raw)
To: buildroot
Libecore is now available in efl package.
Signed-off-by: Romain Naour <romain.naour@openwide.fr>
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@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 61e44fe..515d51e 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
^ permalink raw reply related [flat|nested] 45+ messages in thread* [Buildroot] [PATCH v9 29/32] package/efl/libevas: remove package
2015-12-12 13:33 [Buildroot] [PATCH v9 00/32] efl bump to 1.15.2 Romain Naour
` (27 preceding siblings ...)
2015-12-12 13:33 ` [Buildroot] [PATCH v9 28/32] package/efl/libecore: " Romain Naour
@ 2015-12-12 13:33 ` Romain Naour
2015-12-12 13:33 ` [Buildroot] [PATCH v9 30/32] package/efl/libeet: " Romain Naour
` (2 subsequent siblings)
31 siblings, 0 replies; 45+ messages in thread
From: Romain Naour @ 2015-12-12 13:33 UTC (permalink / raw)
To: buildroot
Libevas is now available in efl package.
Signed-off-by: Romain Naour <romain.naour@openwide.fr>
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@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 515d51e..92bc64f 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 <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
^ permalink raw reply related [flat|nested] 45+ messages in thread* [Buildroot] [PATCH v9 30/32] package/efl/libeet: remove package
2015-12-12 13:33 [Buildroot] [PATCH v9 00/32] efl bump to 1.15.2 Romain Naour
` (28 preceding siblings ...)
2015-12-12 13:33 ` [Buildroot] [PATCH v9 29/32] package/efl/libevas: " Romain Naour
@ 2015-12-12 13:33 ` Romain Naour
2015-12-12 13:33 ` [Buildroot] [PATCH v9 31/32] package/efl/libeina: " Romain Naour
2015-12-12 13:33 ` [Buildroot] [PATCH v9 32/32] package/libemotion-generic-players: new package Romain Naour
31 siblings, 0 replies; 45+ messages in thread
From: Romain Naour @ 2015-12-12 13:33 UTC (permalink / raw)
To: buildroot
Libeet is now available in efl package.
Signed-off-by: Romain Naour <romain.naour@openwide.fr>
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@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 92bc64f..1dc466e 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
^ permalink raw reply related [flat|nested] 45+ messages in thread* [Buildroot] [PATCH v9 31/32] package/efl/libeina: remove package
2015-12-12 13:33 [Buildroot] [PATCH v9 00/32] efl bump to 1.15.2 Romain Naour
` (29 preceding siblings ...)
2015-12-12 13:33 ` [Buildroot] [PATCH v9 30/32] package/efl/libeet: " Romain Naour
@ 2015-12-12 13:33 ` Romain Naour
2015-12-12 13:33 ` [Buildroot] [PATCH v9 32/32] package/libemotion-generic-players: new package Romain Naour
31 siblings, 0 replies; 45+ messages in thread
From: Romain Naour @ 2015-12-12 13:33 UTC (permalink / raw)
To: buildroot
Libeina is now available in efl package.
Signed-off-by: Romain Naour <romain.naour@openwide.fr>
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@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 1dc466e..4e802ba 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
^ permalink raw reply related [flat|nested] 45+ messages in thread* [Buildroot] [PATCH v9 32/32] package/libemotion-generic-players: new package
2015-12-12 13:33 [Buildroot] [PATCH v9 00/32] efl bump to 1.15.2 Romain Naour
` (30 preceding siblings ...)
2015-12-12 13:33 ` [Buildroot] [PATCH v9 31/32] package/efl/libeina: " Romain Naour
@ 2015-12-12 13:33 ` Romain Naour
31 siblings, 0 replies; 45+ messages in thread
From: Romain Naour @ 2015-12-12 13:33 UTC (permalink / raw)
To: buildroot
Signed-off-by: Romain Naour <romain.naour@openwide.fr>
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@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 00aedad..aa82629 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -827,6 +827,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
^ permalink raw reply related [flat|nested] 45+ messages in thread