diff mbox

[v7,20/33] package/enlightenment: bump to version 0.19.12

Message ID 1449523775-6582-21-git-send-email-romain.naour@openwide.fr
State Superseded
Headers show

Commit Message

Romain Naour Dec. 7, 2015, 9:29 p.m. UTC 
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

Comments

Yann E. MORIN Dec. 8, 2015, 11:06 a.m. UTC | #1 
Romain, All,

On 2015-12-07 22:29 +0100, Romain Naour spake thusly:
> 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)
[--SNIP--]
> 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

What if libefl has systemd support but enlightenment hasn't?

Regards,
Yann E. MORIN.
Romain Naour Dec. 9, 2015, 10:34 p.m. UTC | #2 
Hi Yann,

Le 08/12/2015 12:06, Yann E. MORIN a écrit :
> Romain, All,
> 
> On 2015-12-07 22:29 +0100, Romain Naour spake thusly:
>> 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)
> [--SNIP--]
>> 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
> 
> What if libefl has systemd support but enlightenment hasn't?

You're right, systemd should be enabled in this case...
But I haven't fully tested enlightenment with systemd.
Maybe we can drop the systemd support for libefl for now ?

Best regards,
Romain

> 
> Regards,
> Yann E. MORIN.
>
Yann E. MORIN Dec. 9, 2015, 10:39 p.m. UTC | #3 
Romain, All,

On 2015-12-09 23:34 +0100, Romain Naour spake thusly:
> Le 08/12/2015 12:06, Yann E. MORIN a écrit :
> > On 2015-12-07 22:29 +0100, Romain Naour spake thusly:
> >> 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)
> > [--SNIP--]
> >> 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
[--SNIP--]
> >>  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
> > 
> > What if libefl has systemd support but enlightenment hasn't?
> 
> You're right, systemd should be enabled in this case...
> But I haven't fully tested enlightenment with systemd.
> Maybe we can drop the systemd support for libefl for now ?

If you have not tested it, then don't add it, indeed.

Regards,
Yann E. MORIN.
diff mbox

Patch

diff --git a/package/enlightenment/Config.in b/package/enlightenment/Config.in
index 9dad571..1a39ac4 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
+	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)