From efee00a832671355064c66b94c7884bc15ef5b0a Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Tue, 15 Dec 2015 23:40:24 +0100 Subject: [PATCH] package/efl/libelementary: bump to version 1.15.2 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. [Thomas: add explicit select BR2_PACKAGE_LIBEFL.] Signed-off-by: Romain Naour Reviewed-by: "Yann E. MORIN" Signed-off-by: Thomas Petazzoni --- package/efl/libelementary/Config.in | 15 ++++----- package/efl/libelementary/libelementary.hash | 2 ++ package/efl/libelementary/libelementary.mk | 35 +++++++++++--------- 3 files changed, 28 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 fcc702532e..ce597de6c7 100644 --- a/package/efl/libelementary/Config.in +++ b/package/efl/libelementary/Config.in @@ -1,17 +1,14 @@ -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 + select BR2_PACKAGE_LIBEFL + 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 0000000000..2cd36d8db8 --- /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 8bd69fea0a..4ba8681dd7 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.30.2