Skip to contentSkip to conversation

efl is now at 1.7.1

PATCH New Evgeni Dobrev 2 participants 2 messages Oct 26, 2012 – Nov 1, 2012

lore
Share & tools
lore

Evgeni Dobrev

author
#0 lore raw

PATCH 1/1 efl is now at 1.7.1

- bumped up revision to 1.7.1
- choose between external and Buildroot built edje_cc and eet when building elemntary
- finer control over building options

---
 package/efl/expedite/expedite.mk           |    2 +-
 package/efl/libecore/libecore.mk           |    2 +-
 package/efl/libedbus/libedbus.mk           |    2 +-
 package/efl/libedje/Config.in              |   60 +++++++++++++++++++++++
 package/efl/libedje/libedje.mk             |   70 ++++++++++++++++++++++++++-
 package/efl/libeet/libeet.mk               |    8 +++-
 package/efl/libefreet/libefreet.mk         |    2 +-
 package/efl/libeina/libeina.mk             |    6 ++-
 package/efl/libelementary/Config.in        |   71 ++++++++++++++++++++++++++++
 package/efl/libelementary/libelementary.mk |   39 +++++++++++++--
 package/efl/libembryo/Config.in            |    7 +++
 package/efl/libembryo/libembryo.mk         |   12 ++++-
 package/efl/libethumb/libethumb.mk         |    4 +-
 package/efl/libevas/libevas.mk             |    4 +-
 14 files changed, 271 insertions(+), 18 deletions(-)
package/efl/expedite/expedite.mk +1 -1
index a841ac9..b58b6ac 100644
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-EXPEDITE_VERSION = 1.1.0
+EXPEDITE_VERSION = 1.7.1
 EXPEDITE_SITE = http://download.enlightenment.org/releases/
 EXPEDITE_DEPENDENCIES = libevas libeina libeet
package/efl/libecore/libecore.mk +1 -1
index df8db0d..87dcfa3 100644
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-LIBECORE_VERSION = 1.1.0
+LIBECORE_VERSION = 1.7.1
 LIBECORE_SOURCE = ecore-$(LIBECORE_VERSION).tar.bz2
 LIBECORE_SITE = http://download.enlightenment.org/releases/
 LIBECORE_INSTALL_STAGING = YES
package/efl/libedbus/libedbus.mk +1 -1
index 04c48a4..43e3536 100644
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-LIBEDBUS_VERSION = 1.1.0
+LIBEDBUS_VERSION = 1.7.1
 LIBEDBUS_SOURCE = e_dbus-$(LIBEDBUS_VERSION).tar.bz2
 LIBEDBUS_SITE = http://download.enlightenment.org/releases/
 LIBEDBUS_INSTALL_STAGING = YES
package/efl/libedje/Config.in +60 -0

63 lines not on this page · raw message

package/efl/libedje/libedje.mk +68 -2

88 lines not on this page · raw message

package/efl/libeet/libeet.mk +7 -1
index 3ca12d3..72cf7f8 100644
@@ -4,12 +4,18 @@
 #
 #############################################################
 
-LIBEET_VERSION = 1.5.0
+LIBEET_VERSION = 1.7.1
 LIBEET_SOURCE = eet-$(LIBEET_VERSION).tar.bz2
 LIBEET_SITE = http://download.enlightenment.org/releases/
 LIBEET_INSTALL_STAGING = YES
 
 LIBEET_DEPENDENCIES = host-pkg-config zlib jpeg libeina
 
+LIBEEET_CONF_OPT += --disable-install-examples 
+
+ifneq ($(BR2_HAVE_DOCUMENTATION),y)
+LIBEET_CONF_OPT += --disable-doc
+endif
+
 $(eval $(autotools-package))
 $(eval $(host-autotools-package))
package/efl/libefreet/libefreet.mk +1 -1
index 2f00bcf..c6762fd 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-LIBEFREET_VERSION = 1.1.0
+LIBEFREET_VERSION = 1.7.1
 LIBEFREET_SOURCE = efreet-$(LIBEFREET_VERSION).tar.bz2
 LIBEFREET_SITE = http://download.enlightenment.org/releases/
 LIBEFREET_INSTALL_STAGING = YES
package/efl/libeina/libeina.mk +5 -1
index 2391379..8aaada9 100644
@@ -4,12 +4,16 @@
 #
 #############################################################
 
-LIBEINA_VERSION = 1.1.0
+LIBEINA_VERSION = 1.7.1
 LIBEINA_SOURCE = eina-$(LIBEINA_VERSION).tar.bz2
 LIBEINA_SITE = http://download.enlightenment.org/releases/
 LIBEINA_INSTALL_STAGING = YES
 
 LIBEINA_DEPENDENCIES = host-pkg-config
 
+ifneq ($(BR2_HAVE_DOCUMENTATION),y)
+LIBEINA_CONF_OPT += --disable-doc
+endif
+
 $(eval $(autotools-package))
 $(eval $(host-autotools-package))
package/efl/libelementary/Config.in +71 -0

74 lines not on this page · raw message

package/efl/libelementary/libelementary.mk +33 -6
index 83c9005..18319d1 100644
@@ -4,15 +4,42 @@
 #
 ################################################################################
 
-LIBELEMENTARY_VERSION = 0.8.0.65643
+LIBELEMENTARY_VERSION = 1.7.1
 LIBELEMENTARY_SOURCE = elementary-$(LIBELEMENTARY_VERSION).tar.bz2
-LIBELEMENTARY_SITE = http://download.enlightenment.org/snapshots/2011-11-28
+LIBELEMENTARY_SITE = http://download.enlightenment.org/releases/
 LIBELEMENTARY_INSTALL_STAGING = YES
 
-LIBELEMENTARY_DEPENDENCIES = libeina libevas libecore libedje host-libedje \
-				host-libeet
+LIBELEMENTARY_DEPENDENCIES = libeina libevas libecore libedje 
 
-LIBELEMENTARY_CONF_OPT = --with-edje-cc=$(HOST_DIR)/usr/bin/edje_cc \
-			 --with-eet-eet=$(HOST_DIR)/usr/bin/eet
+ifneq ($(BR2_PACKAGE_LIBELEMENTARY_TEST),y)
+LIBELEMENTARY_CONF_OPT += --disable-elementary-test
+endif
+
+ifneq ($(BR2_PACKAGE_LIBELEMENTARY_CONFIG),y)
+LIBELEMENTARY_CONF_OPT += --disable-elementary-config
+endif
+
+ifneq ($(BR2_PACKAGE_LIBELEMENTARY_QUICK_LAUNCH),y)
+LIBELEMENTARY_CONF_OPT += --disable-quick-launch
+endif
+
+ifeq ($(BR2_PACKAGE_LIBELEMENTARY_EDJE_CC_PREINSTALLED),y)
+LIBELEMENTARY_CONF_OPT += --with-edje-cc=$(BR2_PACKAGE_LIBELEMENTARY_EDJE_CC_PATH)
+else
+LIBELEMENTARY_DEPENDENCIES += host-libedje
+LIBELEMENTARY_CONF_OPT += --with-edje-cc=$(HOST_DIR)/usr/bin/edje_cc
+endif
+
+ifeq ($(BR2_PACKAGE_LIBELEMENTARY_EET_PREINSTALLED),y)
+LIBELEMENTARY_CONF_OPT += --with-eet-eet=$(BR2_PACKAGE_LIBELEMENTARY_EET_PATH)
+else
+LIBELEMENTARY_DEPENDENCIES += host-libeet
+LIBELEMENTARY_CONF_OPT += --with-eet-eet=$(HOST_DIR)/usr/bin/eet
+endif
+
+
+ifneq ($(BR2_HAVE_DOCUMENTATION),y)
+LIBELEMENTARY_CONF_OPT += --disable-doc
+endif
 
 $(eval $(autotools-package))
package/efl/libembryo/Config.in +7 -0
index 63c7064..ee6313d 100644
@@ -7,3 +7,10 @@ config BR2_PACKAGE_LIBEMBRYO
 	  abstract machine bytecode that it understands.
 
 	  http://trac.enlightenment.org/e/wiki/Embryo
+
+config BR2_PACKAGE_LIBEMBRYO_CC
+	bool "build embryo_cc"
+	depends on BR2_PACKAGE_LIBEMBRYO
+	help
+	  Build and install the embryo compiler for the target. Normally this
+	  is not required.
package/efl/libembryo/libembryo.mk +11 -1
index db1696d..6b92b24 100644
@@ -4,12 +4,22 @@
 #
 #############################################################
 
-LIBEMBRYO_VERSION = 1.1.0
+LIBEMBRYO_VERSION = 1.7.1
 LIBEMBRYO_SOURCE = embryo-$(LIBEMBRYO_VERSION).tar.bz2
 LIBEMBRYO_SITE = http://download.enlightenment.org/releases/
 LIBEMBRYO_INSTALL_STAGING = YES
 
 LIBEMBRYO_DEPENDENCIES = host-pkg-config libeina
 
+ifeq ($(BR2_PACKAGE_LIBEMBRYO_CC),y)
+LIBEMBRYO_CONF_OPT += --enable-embryo-cc
+else
+LIBEMBRYO_CONF_OPT += --disable-embryo-cc
+endif
+
+ifneq ($(BR2_HAVE_DOCUMENTATION),y)
+LIBEMBRYO_CONF_OPT += --disable-doc
+endif
+
 $(eval $(autotools-package))
 $(eval $(host-autotools-package))
package/efl/libethumb/libethumb.mk +2 -2
index 92e4c83..9b7ee1d 100644
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-LIBETHUMB_VERSION = 0.1.1.65643
+LIBETHUMB_VERSION = 1.7.1
 LIBETHUMB_SOURCE = ethumb-$(LIBETHUMB_VERSION).tar.bz2
-LIBETHUMB_SITE = http://download.enlightenment.org/snapshots/2011-11-28
+LIBETHUMB_SITE = http://download.enlightenment.org/releases/
 LIBETHUMB_INSTALL_STAGING = YES
 
 LIBETHUMB_DEPENDENCIES = libeina libevas libecore libedje host-libedje
package/efl/libevas/libevas.mk +3 -1
index 3baf23b..3b2263e 100644
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-LIBEVAS_VERSION = 1.1.0
+LIBEVAS_VERSION = 1.7.1
 LIBEVAS_SOURCE = evas-$(LIBEVAS_VERSION).tar.bz2
 LIBEVAS_SITE = http://download.enlightenment.org/releases/
 LIBEVAS_INSTALL_STAGING = YES

@@ -28,6 +28,8 @@ HOST_LIBEVAS_CONF_OPT += \
 	--enable-software-xcb \
 	--disable-gl-xcb
 
+LIBEVAS_CONF_OPT += --disable-build-examples 
+
 # rendering options
 ifeq ($(BR2_PACKAGE_LIBEVAS_SCALE_SAMPLE),y)
 LIBEVAS_CONF_OPT += --enable-scale-sample
Signature · 1 line
1.7.2.5
#1 lore raw

PATCH 1/1 efl is now at 1.7.1

Quoted 3 lines · Evgeni Dobrev

- bumped up revision to 1.7.1
- choose between external and Buildroot built edje_cc and eet when building elemntary
- finer control over building options

This should be split up into separate patches. We'd usually have one version-bump
patch per package, but I guess in this case bumping all of them together is acceptable. However, the feature-adding patches should definitely be done separately (one per package).

[snip]

package/efl/libedje/Config.in config BR2_PACKAGE_LIBEDJE_CC · line 69

Quoted 5 lines
package/efl/libedje/Config.in +5 -0
+config BR2_PACKAGE_LIBEDJE_PROGRAM_CACHE
+	bool "edje program cache"
+	depends on BR2_PACKAGE_LIBEDJE
+	help
+	  Enable EDJE_PROGRAM_CACHE support.

Can you give a more detailed explanation?

[snip]

package/efl/libelementary/Config.in config BR2_PACKAGE_LIBELEMENTARY · line 15

Quoted 11 lines
package/efl/libelementary/Config.in +3 -0
index 59af80e..13d03dc 100644
@@ -10,3 +10,74 @@ config BR2_PACKAGE_LIBELEMENTARY
  	  with less code.
 
  	  http://trac.enlightenment.org/e/wiki/Elementary
+
+choice
+	prompt "edje_cc type"

It's conceivable that several packages use edje_cc, so it makes more
sense to have this config option as part of libedje itself. Then you'll also need to define a variable $(host-libedje) which is empty if an external edje_cc is used, and which is host-libedje if the buildroot-built one is used, so dependent packages can add $(host-libedje) to their dependencies.

package/efl/libelementary/Config.in config BR2_PACKAGE_LIBELEMENTARY · line 17

Quoted 2 lines
package/efl/libelementary/Config.in +2 -0
+	default BR2_PACKAGE_LIBELEMENTARY_EDJE_CC_BUILDROOT
+	depends on BR2_PACKAGE_LIBELEMENTARY

Wrap everything in a single
if BR2_PACKAGE_LIBELEMENTARY

choice
...

choice
...

endif # BR2_PACKAGE_LIBELEMENTARY

package/efl/libelementary/Config.in config BR2_PACKAGE_LIBELEMENTARY · line 21

Quoted 4 lines
package/efl/libelementary/Config.in +4 -0
+
+config BR2_PACKAGE_LIBELEMENTARY_EDJE_CC_BUILDROOT
+	bool "Buildroot built"
+	select BR2_PACKAGE_LIBEDJE_CC

Why do you need edje_cc on the target in order to build it on
the host?

Quoted 4 lines
package/efl/libelementary/Config.in +4 -0
+	help
+	  Select this option if you want Buildroot to build edje_cc on your host.
+
+config BR2_PACKAGE_LIBELEMENTARY_EDJE_CC_PREINSTALLED

package/efl/libelementary/Config.in config BR2_PACKAGE_LIBELEMENTARY · line 35

Quoted 10 lines
package/efl/libelementary/Config.in +10 -0
+	bool "Pre-installed"
+	help
+	  Select this option if you want to use a pre-installed edje_cc
+	  Specify the path to edje_cc in BR2_PACKAGE_LIBELEMENTARY_EDJE_CC_PATH
+
+endchoice
+
+config BR2_PACKAGE_LIBELEMENTARY_EDJE_CC_PATH
+	string "edje_cc path"
+	default "/path/to/edje_cc"

I guess one typical use case is when edje_cc is already installed on
the host, so this should default to "edje_cc".

Quoted 8 lines
package/efl/libelementary/Config.in +8 -0
+	depends on BR2_PACKAGE_LIBELEMENTARY_EDJE_CC_PREINSTALLED
+	help
+	  Path to an externally provided edje_cc
+
+choice
+	prompt "eet type"
+	default BR2_PACKAGE_LIBELEMENTARY_EET_BUILDROOT
+	depends on BR2_PACKAGE_LIBELEMENTARY

package/efl/libelementary/Config.in config BR2_PACKAGE_LIBELEMENTARY · line 53

Quoted 10 lines
package/efl/libelementary/Config.in +10 -0
+
+config BR2_PACKAGE_LIBELEMENTARY_EET_BUILDROOT
+	bool "Buildroot built"
+	help
+	  Select this option if you want Buildroot to build eet on your host.
+
+config BR2_PACKAGE_LIBELEMENTARY_EET_PREINSTALLED
+	bool "Pre-installed"
+	help
+	  Select this option if you want to use a pre-installed eer.

eer -> eet.

package/efl/libelementary/Config.in config BR2_PACKAGE_LIBELEMENTARY · line 60

Quoted 7 lines
package/efl/libelementary/Config.in +7 -0
+	  Specify the path to eet in BR2_PACKAGE_LIBELEMENTARY_EET_PATH
+
+endchoice
+
+config BR2_PACKAGE_LIBELEMENTARY_EET_PATH
+	string "eet path"
+	default "/path/to/eet"

default "eet"

Quoted 48 lines
package/efl/libelementary/Config.in +23 -0
+	depends on BR2_PACKAGE_LIBELEMENTARY_EET_PREINSTALLED
+	help
+	  Path to an externally provided eet
+
+config BR2_PACKAGE_LIBELEMENTARY_TEST
+	bool "build elementary_test"
+	depends on BR2_PACKAGE_LIBELEMENTARY
+	help
+	  Build and install elementary_test for the target. Normally this
+	  is not required.
+
+config BR2_PACKAGE_LIBELEMENTARY_CONFIG
+	bool "build elementary_config"
+	depends on BR2_PACKAGE_LIBELEMENTARY
+	help
+	  Build and install elementary_config for the target. Normally this
+	  is not required.
+
+config BR2_PACKAGE_LIBELEMENTARY_QUICK_LAUNCH
+	bool "enable quick-launch support"
+	depends on BR2_PACKAGE_LIBELEMENTARY
+	help
+	  Enable quick-launch support.
package/efl/libelementary/libelementary.mk +7 -6
index 83c9005..18319d1 100644
@@ -4,15 +4,42 @@
  #
  ################################################################################
 
-LIBELEMENTARY_VERSION = 0.8.0.65643
+LIBELEMENTARY_VERSION = 1.7.1
  LIBELEMENTARY_SOURCE = elementary-$(LIBELEMENTARY_VERSION).tar.bz2
-LIBELEMENTARY_SITE = http://download.enlightenment.org/snapshots/2011-11-28
+LIBELEMENTARY_SITE = http://download.enlightenment.org/releases/
  LIBELEMENTARY_INSTALL_STAGING = YES
 
-LIBELEMENTARY_DEPENDENCIES = libeina libevas libecore libedje host-libedje \
-				host-libeet
+LIBELEMENTARY_DEPENDENCIES = libeina libevas libecore libedje
 
-LIBELEMENTARY_CONF_OPT = --with-edje-cc=$(HOST_DIR)/usr/bin/edje_cc \
-			 --with-eet-eet=$(HOST_DIR)/usr/bin/eet
+ifneq ($(BR2_PACKAGE_LIBELEMENTARY_TEST),y)
+LIBELEMENTARY_CONF_OPT += --disable-elementary-test
+endif
+

package/efl/libelementary/libelementary.mk line 27

Quoted 10 lines
package/efl/libelementary/libelementary.mk +10 -0
+ifneq ($(BR2_PACKAGE_LIBELEMENTARY_CONFIG),y)
+LIBELEMENTARY_CONF_OPT += --disable-elementary-config
+endif
+
+ifneq ($(BR2_PACKAGE_LIBELEMENTARY_QUICK_LAUNCH),y)
+LIBELEMENTARY_CONF_OPT += --disable-quick-launch
+endif
+
+ifeq ($(BR2_PACKAGE_LIBELEMENTARY_EDJE_CC_PREINSTALLED),y)
+LIBELEMENTARY_CONF_OPT += --with-edje-cc=$(BR2_PACKAGE_LIBELEMENTARY_EDJE_CC_PATH)

If configure doesn't support searching path for what you specify here,
you can use --with-edje-cc=which $(BR2_PACKAGE_LIBELEMENTARY_EDJE_CC_PATH)

Quoted 8 lines
package/efl/libelementary/libelementary.mk +8 -0
+else
+LIBELEMENTARY_DEPENDENCIES += host-libedje
+LIBELEMENTARY_CONF_OPT += --with-edje-cc=$(HOST_DIR)/usr/bin/edje_cc
+endif
+
+ifeq ($(BR2_PACKAGE_LIBELEMENTARY_EET_PREINSTALLED),y)
+LIBELEMENTARY_CONF_OPT += --with-eet-eet=$(BR2_PACKAGE_LIBELEMENTARY_EET_PATH)
+else

package/efl/libelementary/libelementary.mk line 45

Quoted 10 lines
package/efl/libelementary/libelementary.mk +8 -0
+LIBELEMENTARY_DEPENDENCIES += host-libeet
+LIBELEMENTARY_CONF_OPT += --with-eet-eet=$(HOST_DIR)/usr/bin/eet
+endif
+
+
+ifneq ($(BR2_HAVE_DOCUMENTATION),y)
+LIBELEMENTARY_CONF_OPT += --disable-doc
+endif
 
  $(eval $(autotools-package))

[snip]

Regards,
Arnout

Signature · 6 lines
Arnout Vandecappelle                               arnout at mind be
Senior Embedded Software Architect                 +32-16-286540
Essensium/Mind                                     http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium                BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint:  7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F