diff mbox

[PACH,v2,24/38] package/libelementary: bump to version 1.15.1

Message ID 1441747212-27421-25-git-send-email-romain.naour@openwide.fr
State Superseded
Headers show

Commit Message

Romain Naour Sept. 8, 2015, 9:19 p.m. UTC
Update url and add a hash file.

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>
---
v2: bump to 1.15.1
    remove glibc only dependency
---
 package/libelementary/Config.in          | 19 +++++++++----------
 package/libelementary/libelementary.hash |  2 ++
 package/libelementary/libelementary.mk   | 25 +++++++++----------------
 3 files changed, 20 insertions(+), 26 deletions(-)
 create mode 100644 package/libelementary/libelementary.hash
diff mbox

Patch

diff --git a/package/libelementary/Config.in b/package/libelementary/Config.in
index 320d160..bde9dac 100644
--- a/package/libelementary/Config.in
+++ b/package/libelementary/Config.in
@@ -1,19 +1,18 @@ 
-comment "libelementary needs a toolchain w/ threads, dynamic library, wchar"
-	depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS || !BR2_USE_WCHAR
-
 config BR2_PACKAGE_LIBELEMENTARY
 	bool "libelementary"
-	select BR2_PACKAGE_LIBEINA
-	select BR2_PACKAGE_LIBEVAS
-	select BR2_PACKAGE_LIBECORE
-	select BR2_PACKAGE_LIBEDJE
-	depends on BR2_TOOLCHAIN_HAS_THREADS # libevas
+	select BR2_PACKAGE_EFL
+	depends on BR2_INSTALL_LIBSTDCPP # efl
+	depends on BR2_PACKAGE_HAS_UDEV # efl -> libudev
 	depends on BR2_USE_MMU # efl
+	depends on !BR2_STATIC_LIBS # efl
 	depends on BR2_USE_WCHAR # efl
-	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.
 
-	  http://trac.enlightenment.org/e/wiki/Elementary
+	  https://enlightenment.org
+
+comment "libelementary needs udev /dev management and a toolchain w/ C++, dynamic library, wchar"
+	depends on !BR2_PACKAGE_HAS_UDEV || !BR2_INSTALL_LIBSTDCPP || BR2_STATIC_LIBS || !BR2_USE_WCHAR
+	depends on BR2_USE_MMU
diff --git a/package/libelementary/libelementary.hash b/package/libelementary/libelementary.hash
new file mode 100644
index 0000000..226a15a
--- /dev/null
+++ b/package/libelementary/libelementary.hash
@@ -0,0 +1,2 @@ 
+# From https://download.enlightenment.org/rel/libs/elementary/elementary-1.15.1.tar.xz.sha256
+sha256	ab22a40a5108f7f988a34b0a791d202d2c6c538ea8508919c264bdbdce11ab04	elementary-1.15.1.tar.xz
diff --git a/package/libelementary/libelementary.mk b/package/libelementary/libelementary.mk
index 8bd69fe..fb16d6a 100644
--- a/package/libelementary/libelementary.mk
+++ b/package/libelementary/libelementary.mk
@@ -4,29 +4,22 @@ 
 #
 ################################################################################
 
-LIBELEMENTARY_VERSION = 1.7.10
-LIBELEMENTARY_SOURCE = elementary-$(LIBELEMENTARY_VERSION).tar.bz2
-LIBELEMENTARY_SITE = http://download.enlightenment.org/releases
+LIBELEMENTARY_VERSION = 1.15.1
+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-efl efl
 
 LIBELEMENTARY_CONF_OPTS = \
 	--with-edje-cc=$(HOST_DIR)/usr/bin/edje_cc \
-	--with-eet-eet=$(HOST_DIR)/usr/bin/eet
-
-# 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
+	--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-doxygen=no \
+	--disable-elementary-test
 
 $(eval $(autotools-package))