package/efl: bump to 1.18.0

PATCH New Romain Naour 2 participants 19 messages Sep 2, 2016 – Sep 6, 2016

lore

Share & tools

lore

Romain Naour

author

2016-09-02 20:31 UTC #0 lore raw

PATCH 1/9 package/efl: bump to 1.18.0

Elementary, evas-generic-loaders and emotion-generic-loaders are now part of efl 1.18 package [1].

Merge the elementery and evas-generic-loaders package to the efl one.

Rename librsvg option (srvg/libsrvg)

[1] https://phab.enlightenment.org/w/efl_and_elementary_1_18/

Signed-off-by Romain Naour <[email protected]>

---
 package/efl/Config.in | 14 ++++++++++++++
 package/efl/efl.hash  |  4 ++--
 package/efl/efl.mk    | 35 ++++++++++++++++++++++++++++++++++-
 3 files changed, 50 insertions(+), 3 deletions(-)

package/efl/Config.in +14 -0

index 97157f8..1cc681c 100644
@@ -199,6 +199,20 @@ config BR2_PACKAGE_EFL_WEBP
 	help
 	  This enables the loader code that loads images using WebP.
 
+config BR2_PACKAGE_EFL_LIBRAW
+	bool "libraw loader"
+	select BR2_PACKAGE_LIBRAW
+	help
+	  This option enables the Evas generic Libraw loader
+
+config BR2_PACKAGE_EFL_SVG
+	bool "SVG loader"
+	depends on BR2_TOOLCHAIN_HAS_SYNC_4 # librsvg -> pango -> harfbuzz
+	select BR2_PACKAGE_LIBRSVG
+	select BR2_PACKAGE_CAIRO
+	help
+	  This option enables the Evas generic SVG loader
+
 endif # BR2_PACKAGE_EFL
 
 comment "efl needs udev /dev management and a toolchain w/ C++, dynamic library, gcc >= 4.7, threads, wchar"

package/efl/efl.hash +2 -2

index 2ddc005..81727a2 100644
@@ -1,2 +1,2 @@
-# From https://download.enlightenment.org/rel/libs/efl/efl-1.17.2.tar.xz.sha256
-sha256	9aa93ff0ab4bdf95d5cf9606bd7efece611691ca22eb6fc3484fe6e7a92bf8b6	efl-1.17.2.tar.xz
+# From https://download.enlightenment.org/rel/libs/efl/efl-1.18.0.tar.xz.sha256
+sha256	06a0bbf5c28f96731b115b0adfa11374d07beb983ae4612ed25b34f4ab5cbf9e	efl-1.18.0.tar.xz

package/efl/efl.mk +34 -1

index d404e71..83588c1 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-EFL_VERSION = 1.17.2
+EFL_VERSION = 1.18.0
 EFL_SOURCE = efl-$(EFL_VERSION).tar.xz
 EFL_SITE = http://download.enlightenment.org/rel/libs/efl
 EFL_LICENSE = BSD-2c, LGPLv2.1+, GPLv2+

@@ -24,16 +24,26 @@ EFL_DEPENDENCIES = host-pkgconf host-efl host-luajit dbus freetype \
 
 # Configure options:
 # --disable-lua-old: build elua for the target.
+# --disable-poppler: disable poppler image loader.
 # --disable-sdl: disable sdl2 support.
+# --disable-spectre: disable spectre image loader.
 # --disable-xinput22: disable X11 XInput v2.2+ support.
 # --with-opengl=none: disable opengl support.
+# --with-doxygen: disable doxygen documentation
 EFL_CONF_OPTS = \
 	--with-edje-cc=$(HOST_DIR)/usr/bin/edje_cc \
+	--with-eet-eet=$(HOST_DIR)/usr/bin/eet \
+	--with-eldbus_codegen=$(HOST_DIR)/usr/bin/eldbus-codegen \
+	--with-elementary-codegen=$(HOST_DIR)/usr/bin/elementary_codegen \
+	--with-elm-prefs-cc=$(HOST_DIR)/usr/bin/elm_prefs_cc \
 	--with-elua=$(HOST_DIR)/usr/bin/elua \
 	--with-eolian-gen=$(HOST_DIR)/usr/bin/eolian_gen \
 	--disable-lua-old \
+	--disable-poppler \
 	--disable-sdl \
+	--disable-spectre \
 	--disable-xinput22 \
+	--with-doxygen=no \
 	--with-opengl=none
 
 # Disable untested configuration warning.

@@ -217,6 +227,20 @@ else
 EFL_CONF_OPTS += --disable-image-loader-webp
 endif
 
+ifeq ($(BR2_PACKAGE_EFL_LIBRAW),y)
+EFL_DEPENDENCIES += libraw
+EFL_CONF_OPTS += --enable-libraw
+else
+EFL_CONF_OPTS += --disable-libraw
+endif
+
+ifeq ($(BR2_PACKAGE_EFL_SVG),y)
+EFL_DEPENDENCIES += librsvg cairo
+EFL_CONF_OPTS += --enable-librsvg
+else
+EFL_CONF_OPTS += --disable-librsvg
+endif
+
 $(eval $(autotools-package))
 
 ################################################################################

@@ -254,9 +278,12 @@ HOST_EFL_DEPENDENCIES = \
 # --disable-libmount: remove dependency on host-util-linux libmount.
 # --disable-lua-old: build elua for the host.
 # --disable-physics: remove Bullet dependency.
+# --disable-poppler: disable poppler image loader.
+# --disable-spectre: disable spectre image loader.
 # --enable-image-loader-gif=no: disable Gif dependency.
 # --enable-image-loader-tiff=no: disable Tiff dependency.
 # --with-crypto=none: remove dependencies on openssl or gnutls.
+# --with-doxygen: disable doxygen documentation
 # --with-x11=none: remove dependency on X.org.
 #   Yes I really know what I am doing.
 HOST_EFL_CONF_OPTS += \

@@ -266,14 +293,20 @@ HOST_EFL_CONF_OPTS += \
 	--disable-gstreamer1 \
 	--disable-libeeze \
 	--disable-libmount \
+	--disable-libraw \
+	--disable-librsvg \
 	--disable-lua-old \
 	--disable-multisense \
 	--disable-physics \
+	--disable-poppler \
+	--disable-spectre \
+	--disable-xcf \
 	--enable-image-loader-gif=no \
 	--enable-image-loader-jpeg=yes \
 	--enable-image-loader-png=yes \
 	--enable-image-loader-tiff=no \
 	--with-crypto=none \
+	--with-doxygen=no \
 	--with-glib=yes \
 	--with-opengl=none \
 	--with-x11=none \

Signature · 1 line

2.5.5

Romain Naour

author

2016-09-02 20:31 UTC #1 lore raw

PATCH 2/9 package/enlightenment: remove elementary dependency

elementary is now provided by efl package, so remove elementary package dependency.

Signed-off-by Romain Naour <[email protected]>

---
 package/enlightenment/Config.in        | 1 -
 package/enlightenment/enlightenment.mk | 1 -
 2 files changed, 2 deletions(-)

package/enlightenment/Config.in +0 -1

index 05ee6fc..5509e63 100644
@@ -15,7 +15,6 @@ config BR2_PACKAGE_ENLIGHTENMENT
 	select BR2_PACKAGE_EFL_X_XLIB
 	select BR2_PACKAGE_EFL_JPEG # needed at runtime by enlightenment_start
 	select BR2_PACKAGE_EFL_PNG # needed at runtime by enlightenment_start
-	select BR2_PACKAGE_ELEMENTARY
 	select BR2_PACKAGE_LIBEVAS_GENERIC_LOADERS
 	select BR2_PACKAGE_LIBEVAS_GENERIC_LOADERS_SVG
 	select BR2_PACKAGE_XCB_UTIL_KEYSYMS

package/enlightenment/enlightenment.mk +0 -1

index 2440cec..b172383 100644
@@ -14,7 +14,6 @@ ENLIGHTENMENT_DEPENDENCIES = \
 	host-pkgconf \
 	host-efl \
 	efl \
-	elementary \
 	libevas-generic-loaders \
 	xcb-util-keysyms

Signature · 1 line

2.5.5

Thomas Petazzoni

Applied

2016-09-06 19:51 UTC #2 lore raw

PATCH 2/9 package/enlightenment: remove elementary dependency

Hello,

Quoted 8 lines · Romain Naour

elementary is now provided by efl package, so remove elementary package dependency.
Signed-off-by Romain Naour <[email protected]>
---
 package/enlightenment/Config.in        | 1 -
 package/enlightenment/enlightenment.mk | 1 -
 2 files changed, 2 deletions(-)

Applied to master, thanks.

Thomas

Signature · 3 lines

Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

Romain Naour

author

2016-09-02 20:31 UTC #3 lore raw

PATCH 3/9 package/enlightenment: remove libevas-generic-loaders dependency

In reply to Romain Naour

libevas-generic-loaders is now provided by efl package, so remove libevas-generic-loaders package dependency.

Signed-off-by Romain Naour <[email protected]>

---
 package/enlightenment/Config.in        | 3 +--
 package/enlightenment/enlightenment.mk | 1 -
 2 files changed, 1 insertion(+), 3 deletions(-)

package/enlightenment/Config.in +1 -2

index 5509e63..b5d889b 100644
@@ -15,8 +15,7 @@ config BR2_PACKAGE_ENLIGHTENMENT
 	select BR2_PACKAGE_EFL_X_XLIB
 	select BR2_PACKAGE_EFL_JPEG # needed at runtime by enlightenment_start
 	select BR2_PACKAGE_EFL_PNG # needed at runtime by enlightenment_start
-	select BR2_PACKAGE_LIBEVAS_GENERIC_LOADERS
-	select BR2_PACKAGE_LIBEVAS_GENERIC_LOADERS_SVG
+	select BR2_PACKAGE_EFL_SVG
 	select BR2_PACKAGE_XCB_UTIL_KEYSYMS
 	help
 	  Enlightenment, also known simply as E, is a stacking window

package/enlightenment/enlightenment.mk +0 -1

index b172383..34c4f21 100644
@@ -14,7 +14,6 @@ ENLIGHTENMENT_DEPENDENCIES = \
 	host-pkgconf \
 	host-efl \
 	efl \
-	libevas-generic-loaders \
 	xcb-util-keysyms
 
 ENLIGHTENMENT_CONF_OPTS = \

Signature · 1 line

2.5.5

Thomas Petazzoni

Applied

2016-09-06 19:51 UTC #4 lore raw

PATCH 3/9 package/enlightenment: remove libevas-generic-loaders dependency

Hello,

Quoted 8 lines · Romain Naour

libevas-generic-loaders is now provided by efl package, so remove libevas-generic-loaders package dependency.
Signed-off-by Romain Naour <[email protected]>
---
 package/enlightenment/Config.in        | 3 +--
 package/enlightenment/enlightenment.mk | 1 -
 2 files changed, 1 insertion(+), 3 deletions(-)

Applied to master, thanks.

Thomas

Signature · 3 lines

Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

Romain Naour

author

2016-09-02 20:31 UTC #5 lore raw

PATCH 4/9 package/terminology: remove elementary dependency

In reply to Romain Naour

elementary is now provided by efl package, so remove elementary package dependency.

Signed-off-by Romain Naour <[email protected]>

---
 package/terminology/Config.in      | 1 -
 package/terminology/terminology.mk | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

package/terminology/Config.in +0 -1

index c574af7..f367ce5 100644
@@ -1,7 +1,6 @@
 config BR2_PACKAGE_TERMINOLOGY
 	bool "terminology"
 	depends on BR2_PACKAGE_EFL
-	select BR2_PACKAGE_ELEMENTARY
 	help
 	  Terminology is an EFL terminal emulator with some extra
 	  bells and whistles.

package/terminology/terminology.mk +1 -1

index d6c41d7..86b51c5 100644
@@ -10,7 +10,7 @@ TERMINOLOGY_SITE = https://download.enlightenment.org/rel/apps/terminology
 TERMINOLOGY_LICENSE = BSD-2c
 TERMINOLOGY_LICENSE_FILES = COPYING
 
-TERMINOLOGY_DEPENDENCIES = efl elementary host-pkgconf
+TERMINOLOGY_DEPENDENCIES = efl host-pkgconf
 TERMINOLOGY_CONF_OPTS = --with-edje-cc=$(HOST_DIR)/usr/bin/edje_cc
 
 $(eval $(autotools-package))

Signature · 1 line

2.5.5

Thomas Petazzoni

Applied

2016-09-06 19:51 UTC #6 lore raw

PATCH 4/9 package/terminology: remove elementary dependency

Hello,

Quoted 8 lines · Romain Naour

elementary is now provided by efl package, so remove elementary package dependency.
Signed-off-by Romain Naour <[email protected]>
---
 package/terminology/Config.in      | 1 -
 package/terminology/terminology.mk | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

Applied to master, thanks.

Thomas

Signature · 3 lines

Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

Romain Naour

author

2016-09-02 20:31 UTC #7 lore raw

PATCH 5/9 package/elementary: remove package

In reply to Romain Naour

elementary package is now used anymore, remove it. Add a legacy entry.

Signed-off-by Romain Naour <[email protected]>

---
 Config.in.legacy                                   |  7 ++++
 package/Config.in                                  |  1 -
 ...emove-.eo.h-files-from-includesub_HEADERS.patch | 45 --------------------
 package/elementary/Config.in                       | 15 -------
 package/elementary/elementary.hash                 |  2 -
 package/elementary/elementary.mk                   | 48 ----------------------
 6 files changed, 7 insertions(+), 111 deletions(-)
 delete mode 100644 package/elementary/0001-lib-remove-.eo.h-files-from-includesub_HEADERS.patch
 delete mode 100644 package/elementary/Config.in
 delete mode 100644 package/elementary/elementary.hash
 delete mode 100644 package/elementary/elementary.mk

Config.in.legacy +7 -0

index 59e3f84..03ac4f8 100644
@@ -157,6 +157,13 @@ config BR2_LINUX_KERNEL_CUSTOM_LOCAL
 ###############################################################################
 comment "Legacy options removed in 2016.08"
 
+config BR2_PACKAGE_ELEMENTARY
+	bool "elementary package removed"
+	select BR2_LEGACY
+	select BR2_PACKAGE_EFL
+	help
+	  With EFL 1.18, elementary is now provided by the efl package.
+
 config BR2_PACKAGE_SYSTEMD_COMPAT
 	bool "systemd compatibility libraries have been removed"
 	select BR2_LEGACY

package/Config.in +0 -1

index 6da9d7b..a577ad2 100644
@@ -245,7 +245,6 @@ comment "Graphic libraries"
 	source "package/directfb/Config.in"
 	source "package/directfb-examples/Config.in"
 	source "package/efl/Config.in"
-	source "package/elementary/Config.in"
 	source "package/fbdump/Config.in"
 	source "package/fbgrab/Config.in"
 	source "package/fbset/Config.in"

package/elementary/0001-lib-remove-.eo.h-files-from-includesub_HEADERS.patch deleted +0 ~~-45~~

45 lines not on this page · raw message

package/elementary/Config.in deleted +0 ~~-15~~

deleted file mode 100644
index f356784..0000000
@@ -1,15 +0,0 @@
-config BR2_PACKAGE_ELEMENTARY
-	bool "elementary"
-	depends on BR2_PACKAGE_EFL
-	depends on BR2_TOOLCHAIN_HAS_THREADS # elm_store.c
-	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
-	  with less code.
-
-	  https://enlightenment.org
-
-comment "elementary needs a toolchain w/ threads, dynamic library"
-	depends on BR2_PACKAGE_EFL
-	depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS

package/elementary/elementary.hash deleted +0 -2

deleted file mode 100644
index f173752..0000000
@@ -1,2 +0,0 @@
-# From https://download.enlightenment.org/rel/libs/elementary/elementary-1.17.1.tar.xz.sha256
-sha256	85e116a453a8ac23da878670534c6292832756d2f3a33603278486f309963d91	elementary-1.17.1.tar.xz

package/elementary/elementary.mk deleted +0 ~~-48~~

48 lines not on this page · raw message

Signature · 1 line

2.5.5

Thomas Petazzoni

Applied

2016-09-06 19:52 UTC #8 lore raw

PATCH 5/9 package/elementary: remove package

Hello,

Quoted 1 line · Romain Naour

elementary package is now used anymore, remove it.

now -> not

Config.in.legacy config BR2_LINUX_KERNEL_CUSTOM_LOCAL · line 166

Quoted 11 lines

Config.in.legacy +7 -0

@@ -157,6 +157,13 @@ config BR2_LINUX_KERNEL_CUSTOM_LOCAL
 ###############################################################################
 comment "Legacy options removed in 2016.08"
 
+config BR2_PACKAGE_ELEMENTARY
+	bool "elementary package removed"
+	select BR2_LEGACY
+	select BR2_PACKAGE_EFL
+	help
+	  With EFL 1.18, elementary is now provided by the efl package.
+

I've moved this so that it is under the options removed in 2016.11.

Applied to master with those two issues fixed. Thanks!

Thomas

Signature · 3 lines

Thomas Petazzoni, CTO, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com

Romain Naour

author

2016-09-02 20:31 UTC #9 lore raw

PATCH 6/9 package/libevas-generic-loaders: remove package

In reply to Romain Naour

libevas-generic-loaders package is now used anymore, remove it. Add a legacy entry.

Signed-off-by Romain Naour <[email protected]>

---
 Config.in.legacy                                   |  8 +++++
 package/Config.in                                  |  1 -
 package/libevas-generic-loaders/Config.in          | 41 ----------------------
 .../libevas-generic-loaders.hash                   |  2 --
 .../libevas-generic-loaders.mk                     | 38 --------------------
 5 files changed, 8 insertions(+), 82 deletions(-)
 delete mode 100644 package/libevas-generic-loaders/Config.in
 delete mode 100644 package/libevas-generic-loaders/libevas-generic-loaders.hash
 delete mode 100644 package/libevas-generic-loaders/libevas-generic-loaders.mk

Config.in.legacy +8 -0

index 03ac4f8..d9555f9 100644
@@ -157,6 +157,14 @@ config BR2_LINUX_KERNEL_CUSTOM_LOCAL
 ###############################################################################
 comment "Legacy options removed in 2016.08"
 
+config BR2_PACKAGE_LIBEVAS_GENERIC_LOADERS
+	bool "libevas-generic-loaders package removed"
+	select BR2_LEGACY
+	select BR2_PACKAGE_EFL
+	help
+	  With EFL 1.18, libevas-generic-loaders is now provided by the efl
+	  package.
+
 config BR2_PACKAGE_ELEMENTARY
 	bool "elementary package removed"
 	select BR2_LEGACY

package/Config.in +0 -1

index a577ad2..4a8186d 100644
@@ -958,7 +958,6 @@ menu "Graphics"
 	source "package/libdri2/Config.in"
 	source "package/libdrm/Config.in"
 	source "package/libepoxy/Config.in"
-	source "package/libevas-generic-loaders/Config.in"
 	source "package/libexif/Config.in"
 	source "package/libfm/Config.in"
 	source "package/libfm-extra/Config.in"

package/libevas-generic-loaders/Config.in deleted +0 ~~-41~~

41 lines not on this page · raw message

package/libevas-generic-loaders/libevas-generic-loaders.hash deleted +0 -2

deleted file mode 100644
index ee2ae9b..0000000
@@ -1,2 +0,0 @@
-# From https://download.enlightenment.org/rel/libs/evas_generic_loaders/evas_generic_loaders-1.17.0.tar.xz.sha256
-sha256	c2f5193a9326532d3ab3ff76f547b9d17b33ae7221ce4d6e0aefb905ba0dd87a	evas_generic_loaders-1.17.0.tar.xz

package/libevas-generic-loaders/libevas-generic-loaders.mk deleted +0 ~~-38~~

deleted file mode 100644
index abc436b..0000000
@@ -1,38 +0,0 @@
-################################################################################
-#
-# libevas-generic-loaders
-#
-################################################################################
-
-LIBEVAS_GENERIC_LOADERS_VERSION = 1.17.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 = host-pkgconf efl zlib
-
-# poppler >= 0.32 is not supported by the current version of
-# libevas-generic-loaders.
-LIBEVAS_GENERIC_LOADERS_CONF_OPTS += \
-	--disable-poppler \
-	--disable-spectre \
-	--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
-else
-LIBEVAS_GENERIC_LOADERS_CONF_OPTS += --disable-svg
-endif
-
-$(eval $(autotools-package))

Signature · 1 line

2.5.5

Thomas Petazzoni

2016-09-06 19:53 UTC #10 lore raw

PATCH 6/9 package/libevas-generic-loaders: remove package

Hello,

Quoted 1 line · Romain Naour

libevas-generic-loaders package is now used anymore, remove it.

now -> not

Quoted 6 lines

Config.in.legacy +0 -0

index 03ac4f8..d9555f9 100644
@@ -157,6 +157,14 @@ config BR2_LINUX_KERNEL_CUSTOM_LOCAL
 ###############################################################################

Config.in.legacy config BR2_LINUX_KERNEL_CUSTOM_LOCAL · line 167

Quoted 10 lines

Config.in.legacy +8 -0

 comment "Legacy options removed in 2016.08"
 
+config BR2_PACKAGE_LIBEVAS_GENERIC_LOADERS
+	bool "libevas-generic-loaders package removed"
+	select BR2_LEGACY
+	select BR2_PACKAGE_EFL
+	help
+	  With EFL 1.18, libevas-generic-loaders is now provided by the efl
+	  package.
+

Same as previous: I've moved this under the "options removed in 2016.11".

Applied with those issues fixed. Thanks!

Thomas

Signature · 3 lines

Thomas Petazzoni, CTO, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com

Romain Naour

author

2016-09-02 20:31 UTC #11 lore raw

PATCH 7/9 package/expedite: bump to lastest commit

In reply to Romain Naour

expedite from 1.15 branch doesn't build anymore with efl 1.18 due to API changes. Since there is no new release or 1.18 scpecific branch, use the latest commit.

Add a hash file.

Signed-off-by Romain Naour <[email protected]>

---
 package/expedite/expedite.hash | 2 ++
 package/expedite/expedite.mk   | 3 +--
 2 files changed, 3 insertions(+), 2 deletions(-)
 create mode 100644 package/expedite/expedite.hash

package/expedite/expedite.hash new file +2 -0

new file mode 100644
index 0000000..0438dcf
@@ -0,0 +1,2 @@
+# locally computed
+sha256 a8690a714c16d6b67e7fd6d70973e9805c3569a9131900b1feaf183220496831  dl/expedite-ffa005ea3de26b4219f32c285cb1665bb1366163.tar.gz

package/expedite/expedite.mk +1 -2

index 8754dc0..0b2901d 100644
@@ -4,8 +4,7 @@
 #
 ################################################################################
 
-# efl-1.15 branch
-EXPEDITE_VERSION = 3ce8b3f1451700f9a2da60c2e717c644220e2449
+EXPEDITE_VERSION = ffa005ea3de26b4219f32c285cb1665bb1366163
 EXPEDITE_SITE = http://git.enlightenment.org/tools/expedite.git
 EXPEDITE_SITE_METHOD = git
 EXPEDITE_LICENSE = BSD-2c

Signature · 1 line

2.5.5

Romain Naour

author

2016-09-03 11:07 UTC #12 lore raw

PATCH 7/9 package/expedite: bump to lastest commit

Hi all,

Le 02/09/2016 ? 22:31, Romain Naour a ?crit :

Quoted 19 lines

expedite from 1.15 branch doesn't build anymore with efl 1.18 due to API changes. Since there is no new release or 1.18 scpecific branch, use the latest commit.
Add a hash file.
Signed-off-by Romain Naour <[email protected]>
---
 package/expedite/expedite.hash | 2 ++
 package/expedite/expedite.mk   | 3 +--
 2 files changed, 3 insertions(+), 2 deletions(-)
 create mode 100644 package/expedite/expedite.hash
package/expedite/expedite.hash new file +0 -0
new file mode 100644
index 0000000..0438dcf

package/expedite/expedite.hash line 2

Quoted 2 lines

package/expedite/expedite.hash new file +2 -0

@@ -0,0 +1,2 @@
+# locally computed
+sha256 a8690a714c16d6b67e7fd6d70973e9805c3569a9131900b1feaf183220496831  dl/expedite-ffa005ea3de26b4219f32c285cb1665bb1366163.tar.gz

^^^

Sorry, copy-past error :-/

Best regards,
Romain

Quoted 15 lines

package/expedite/expedite.mk +1 -2

index 8754dc0..0b2901d 100644
@@ -4,8 +4,7 @@
 #
 ################################################################################
 
-# efl-1.15 branch
-EXPEDITE_VERSION = 3ce8b3f1451700f9a2da60c2e717c644220e2449
+EXPEDITE_VERSION = ffa005ea3de26b4219f32c285cb1665bb1366163
 EXPEDITE_SITE = http://git.enlightenment.org/tools/expedite.git
 EXPEDITE_SITE_METHOD = git
 EXPEDITE_LICENSE = BSD-2c

Thomas Petazzoni

Applied

2016-09-06 19:53 UTC #13 lore raw

PATCH 7/9 package/expedite: bump to lastest commit

In reply to Romain Naour

Hello,

Quoted 4 lines · Romain Naour

expedite from 1.15 branch doesn't build anymore with efl 1.18 due to API changes. Since there is no new release or 1.18 scpecific branch, use the latest commit.

Quoted 8 lines

Add a hash file.

Signed-off-by Romain Naour <[email protected]>

---
 package/expedite/expedite.hash | 2 ++
 package/expedite/expedite.mk   | 3 +--
 2 files changed, 3 insertions(+), 2 deletions(-)
 create mode 100644 package/expedite/expedite.hash

Applied to master, after fixing the hash file as you pointed out.

Thanks,

Thomas

Signature · 3 lines

Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

Romain Naour

author

2016-09-02 20:31 UTC #14 lore raw

PATCH 8/9 package/enlightenment: bump to v0.21.2

In reply to Romain Naour

Remove upstream patch.

Signed-off-by Romain Naour <[email protected]>

---
 ...uid.h-only-when-Wayland-support-is-enable.patch | 39 ----------------------
 package/enlightenment/enlightenment.hash           |  4 +--
 package/enlightenment/enlightenment.mk             |  2 +-
 3 files changed, 3 insertions(+), 42 deletions(-)
 delete mode 100644 package/enlightenment/0001-E-include-uuid.h-only-when-Wayland-support-is-enable.patch

package/enlightenment/0001-E-include-uuid.h-only-when-Wayland-support-is-enable.patch deleted +0 ~~-39~~

deleted file mode 100644
index 3f33fa3..0000000
@@ -1,39 +0,0 @@
-From 368c4c7cc5722b2edfe98fb3a8999f8f01bc9b56 Mon Sep 17 00:00:00 2001
-From: Romain Naour <[email protected]>
-Date: Fri, 5 Aug 2016 21:14:46 +0200
-Subject: [PATCH] E: include uuid.h only when Wayland support is enabled.
-
-libuuid is checked only when Wayland support is enabled and
-uuid_t uuid is guarded by HAVE_WAYLAND.
-
-So move include uuid.h below a HAVE_WAYLAND.
-
-Signed-off-by: Romain Naour <[email protected]>
----
- src/bin/e_pixmap.c | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/src/bin/e_pixmap.c b/src/bin/e_pixmap.c
-index 2bd94a7..0b01473 100644
---- a/src/bin/e_pixmap.c
-+++ b/src/bin/e_pixmap.c
-@@ -2,6 +2,7 @@
- 
- #ifdef HAVE_WAYLAND
- # include "e_comp_wl.h"
-+# include <uuid.h>
- # ifndef EGL_TEXTURE_FORMAT
- #  define EGL_TEXTURE_FORMAT		0x3080
- # endif
-@@ -13,8 +14,6 @@
- # include "e_comp_x.h"
- #endif
- 
--#include <uuid.h>
--
- static Eina_Hash *pixmaps[2] = {NULL};
- static Eina_Hash *aliases[2] = {NULL};
- 
--- 
-2.5.5
-

package/enlightenment/enlightenment.hash +2 -2

index ecfe537..8abbd96 100644
@@ -1,2 +1,2 @@
-# From https://www.enlightenment.org/news/e-0.20.10-release
-sha256	59fd447d120d91d18958a31a5827f97842cc472f2e22f132b2c7d4d208944baf 	enlightenment-0.20.10.tar.xz
+# From https://www.enlightenment.org/news/e-0.21.2-release
+sha256	a877645dc70aee71141013888863b69a1029f575f685e285b570db7c736f253a 	enlightenment-0.21.2.tar.xz

package/enlightenment/enlightenment.mk +1 -1

index 34c4f21..a86fb86 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-ENLIGHTENMENT_VERSION = 0.20.10
+ENLIGHTENMENT_VERSION = 0.21.2
 ENLIGHTENMENT_SOURCE = enlightenment-$(ENLIGHTENMENT_VERSION).tar.xz
 ENLIGHTENMENT_SITE = http://download.enlightenment.org/rel/apps/enlightenment
 ENLIGHTENMENT_LICENSE = BSD-2c

Signature · 1 line

2.5.5

Thomas Petazzoni

Applied

2016-09-06 19:53 UTC #15 lore raw

PATCH 8/9 package/enlightenment: bump to v0.21.2

Hello,

Quoted 9 lines · Romain Naour

Remove upstream patch.

Signed-off-by Romain Naour <[email protected]>

---
 ...uid.h-only-when-Wayland-support-is-enable.patch | 39 ----------------------
 package/enlightenment/enlightenment.hash           |  4 +--
 package/enlightenment/enlightenment.mk             |  2 +-
 3 files changed, 3 insertions(+), 42 deletions(-)
 delete mode 100644 package/enlightenment/0001-E-include-uuid.h-only-when-Wayland-support-is-enable.patch

Applied to master, thanks.

Thomas

Signature · 3 lines

Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

Romain Naour

author

2016-09-02 20:31 UTC #16 lore raw

PATCH 9/9 package/enlightenment: set eldbus-codegen path

In reply to Romain Naour

Otherwise the one from the host may be used.

Signed-off-by Romain Naour <[email protected]>

---
 package/enlightenment/enlightenment.mk | 1 +
 1 file changed, 1 insertion(+)

package/enlightenment/enlightenment.mk +1 -0

index a86fb86..d77421f 100644
@@ -19,6 +19,7 @@ ENLIGHTENMENT_DEPENDENCIES = \
 ENLIGHTENMENT_CONF_OPTS = \
 	--with-edje-cc=$(HOST_DIR)/usr/bin/edje_cc \
 	--with-eet-eet=$(HOST_DIR)/usr/bin/eet \
+	--with-eldbus_codegen=$(HOST_DIR)/usr/bin/eldbus-codegen \
 	--disable-pam \
 	--disable-rpath

Signature · 1 line

2.5.5

Thomas Petazzoni

Applied

2016-09-06 19:53 UTC #17 lore raw

PATCH 9/9 package/enlightenment: set eldbus-codegen path

Hello,

Quoted 6 lines · Romain Naour

Otherwise the one from the host may be used.
Signed-off-by Romain Naour <[email protected]>
---
 package/enlightenment/enlightenment.mk | 1 +
 1 file changed, 1 insertion(+)

Applied to master, thanks.

Thomas

Signature · 3 lines

Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

Thomas Petazzoni

Applied

2016-09-06 19:51 UTC #18 lore raw

PATCH 1/9 package/efl: bump to 1.18.0

In reply to Romain Naour

Hello,

Quoted 7 lines · Romain Naour

Elementary, evas-generic-loaders and emotion-generic-loaders are now part of efl 1.18 package [1].
Merge the elementery and evas-generic-loaders package to the efl one.
Rename librsvg option (srvg/libsrvg)

Quoted 8 lines

[1] https://phab.enlightenment.org/w/efl_and_elementary_1_18/
Signed-off-by Romain Naour <[email protected]>
---
 package/efl/Config.in | 14 ++++++++++++++
 package/efl/efl.hash  |  4 ++--
 package/efl/efl.mk    | 35 ++++++++++++++++++++++++++++++++++-
 3 files changed, 50 insertions(+), 3 deletions(-)

Applied to master, thanks.

Thomas

Signature · 3 lines

Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com