[Buildroot] [PATCH 1/6] package/efl: bump to 1.20.7

[Buildroot] [PATCH 1/6] package/efl: bump to 1.20.7

[Romain Naour]

See https://www.enlightenment.org/news/efl-1.20.7

Signed-off-by: Romain Naour <romain.naour@gmail.com>
---
 package/efl/efl.hash | 4 ++--
 package/efl/efl.mk   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package/efl/efl.hash b/package/efl/efl.hash
index 5507bda3ef..1391d1f707 100644
--- a/package/efl/efl.hash
+++ b/package/efl/efl.hash
@@ -1,5 +1,5 @@
-# From https://download.enlightenment.org/rel/libs/efl/efl-1.20.6.tar.xz.sha256
-sha256	56c67ea77435753a4f324a0a13488ba58f4ed7eb35a97c1a354fdc79c39a32c1	efl-1.20.6.tar.xz
+# From https://download.enlightenment.org/rel/libs/efl/efl-1.20.7.tar.xz.sha256
+sha256 b0a9b765bcd7b012f1072da1d491fc8671aa089473f746901d93f5807a2c76fe  efl-1.20.7.tar.xz
 sha256 d949e42ca8fd48d275c397c5fc2ac34c9b63ada715dcaf1a670e17bb62964341  COMPLIANCE
 sha256 1f0597d326e2fdb54aa2f0caec6d8bb0afb9941ef32475f017ed02ca214fcf37  COPYING
 sha256 781ee841d15835b393bfe7d4c6497dc1b05217479abd40daceaf7aa102a758e1  licenses/COPYING.BSD
diff --git a/package/efl/efl.mk b/package/efl/efl.mk
index 7085796756..6ef7d53385 100644
--- a/package/efl/efl.mk
+++ b/package/efl/efl.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-EFL_VERSION = 1.20.6
+EFL_VERSION = 1.20.7
 EFL_SOURCE = efl-$(EFL_VERSION).tar.xz
 EFL_SITE = http://download.enlightenment.org/rel/libs/efl
 EFL_LICENSE = BSD-2-Clause, LGPL-2.1+, GPL-2.0+, FTL, MIT
-- 
2.14.3

[Buildroot] [PATCH 2/6] package/enlightenment: fix meson warning

[Romain Naour]

--disable-rpath was added by m4/lib-link.m4 with autotools based
buildsystem. Now we use meson, we don't have such option anymore.

The autotools eet-eet and eldbus_codegen options are named respectively
eet and eldbus-codegen with meson.

Fixes:
WARNING: Unknown command line options: "eet-eet, eldbus_codegen, rpath"

Signed-off-by: Romain Naour <romain.naour@gmail.com>
---
This patch can be backported to 2018.02.x
---
 package/enlightenment/enlightenment.mk | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/package/enlightenment/enlightenment.mk b/package/enlightenment/enlightenment.mk
index 17309619ad..0d87119bb3 100644
--- a/package/enlightenment/enlightenment.mk
+++ b/package/enlightenment/enlightenment.mk
@@ -22,10 +22,9 @@ ENLIGHTENMENT_MESON_OPTS += \
 	--buildtype=$(if $(BR2_ENABLE_DEBUG),debug,release) \
 	--cross-file=$(HOST_DIR)/etc/meson/cross-compilation.conf \
 	-Dedje-cc=$(HOST_DIR)/bin/edje_cc \
-	-Deet-eet=$(HOST_DIR)/bin/eet \
-	-Deldbus_codegen=$(HOST_DIR)/bin/eldbus-codegen \
-	-Dpam=false \
-	-Drpath=false
+	-Deet=$(HOST_DIR)/bin/eet \
+	-Deldbus-codegen=$(HOST_DIR)/bin/eldbus-codegen \
+	-Dpam=false
 
 ifeq ($(BR2_PACKAGE_SYSTEMD),y)
 ENLIGHTENMENT_MESON_OPTS += -Dsystemd=true
-- 
2.14.3

[Buildroot] [PATCH 3/6] package/enlightenment: bump to 0.22.2

[Romain Naour]

See https://www.enlightenment.org/news/e0.22.2_release

Signed-off-by: Romain Naour <romain.naour@gmail.com>
---
 package/enlightenment/enlightenment.hash | 4 ++--
 package/enlightenment/enlightenment.mk   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package/enlightenment/enlightenment.hash b/package/enlightenment/enlightenment.hash
index 10e8facf35..686d0ef3be 100644
--- a/package/enlightenment/enlightenment.hash
+++ b/package/enlightenment/enlightenment.hash
@@ -1,3 +1,3 @@
-# From https://www.enlightenment.org/news/e0.22.1_release
-sha256	207b6b88dafc4932ab007a835510823c5a1dd8c191876ac037628176ca77a7e0	enlightenment-0.22.1.tar.xz
+# From https://www.enlightenment.org/news/e0.22.2_release
+sha256	4d581ef85246f0cba003427bb9b3758e3de137babea1cdd2affd70a2cbe1632c	enlightenment-0.22.2.tar.xz
 sha256	34dbd501ec9d1c8dcc569c01db9cf9a4b7ee5981614cc9f8f613a97463d27350	COPYING
diff --git a/package/enlightenment/enlightenment.mk b/package/enlightenment/enlightenment.mk
index 0d87119bb3..6ee983db76 100644
--- a/package/enlightenment/enlightenment.mk
+++ b/package/enlightenment/enlightenment.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-ENLIGHTENMENT_VERSION = 0.22.1
+ENLIGHTENMENT_VERSION = 0.22.2
 ENLIGHTENMENT_SOURCE = enlightenment-$(ENLIGHTENMENT_VERSION).tar.xz
 ENLIGHTENMENT_SITE = http://download.enlightenment.org/rel/apps/enlightenment
 ENLIGHTENMENT_LICENSE = BSD-2-Clause
-- 
2.14.3

[Buildroot] [PATCH 4/6] package/x11r7/xkeyboard-config: install to staging

[Romain Naour]

enlightenment doesn't detect xkeyboard-config since it's missing
from staging.

Fixes:
Dependency xkeyboard-config found: NO

Signed-off-by: Romain Naour <romain.naour@gmail.com>
Cc: Bernd Kuhls <bernd.kuhls@t-online.de>
---
 package/x11r7/xkeyboard-config/xkeyboard-config.mk | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/package/x11r7/xkeyboard-config/xkeyboard-config.mk b/package/x11r7/xkeyboard-config/xkeyboard-config.mk
index d9998aa489..9a8838dde1 100644
--- a/package/x11r7/xkeyboard-config/xkeyboard-config.mk
+++ b/package/x11r7/xkeyboard-config/xkeyboard-config.mk
@@ -10,6 +10,9 @@ XKEYBOARD_CONFIG_SITE = http://www.x.org/releases/individual/data/xkeyboard-conf
 XKEYBOARD_CONFIG_LICENSE = MIT
 XKEYBOARD_CONFIG_LICENSE_FILES = COPYING
 
+# xkeyboard-config.pc
+XKEYBOARD_CONFIG_INSTALL_STAGING = YES
+
 XKEYBOARD_CONFIG_CONF_OPTS = --disable-runtime-deps
 XKEYBOARD_CONFIG_DEPENDENCIES = host-gettext host-intltool host-xapp_xkbcomp
 
-- 
2.14.3

[Buildroot] [PATCH 5/6] package/enlightenment: add xkeyboard-config optional dependency

[Romain Naour]

The meson build systemd is checking for xkeyboard-config optional
dependency but there is no option to handle it.

Signed-off-by: Romain Naour <romain.naour@gmail.com>
---
 package/enlightenment/enlightenment.mk | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/package/enlightenment/enlightenment.mk b/package/enlightenment/enlightenment.mk
index 6ee983db76..ae68888aac 100644
--- a/package/enlightenment/enlightenment.mk
+++ b/package/enlightenment/enlightenment.mk
@@ -41,6 +41,10 @@ else
 ENLIGHTENMENT_MESON_OPTS += -Dmixer=false
 endif
 
+ifeq ($(BR2_PACKAGE_XKEYBOARD_CONFIG),y)
+ENLIGHTENMENT_DEPENDENCIES += xkeyboard-config
+endif
+
 define ENLIGHTENMENT_CONFIGURE_CMDS
 	rm -rf $(@D)/build
 	mkdir -p $(@D)/build
-- 
2.14.3

[Buildroot] [PATCH 6/6] package/enlightenment: install to staging

[Romain Naour]

enlightenment provide enlightenment.pc and some shared libraries.

Signed-off-by: Romain Naour <romain.naour@gmail.com>
---
 package/enlightenment/enlightenment.mk | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/package/enlightenment/enlightenment.mk b/package/enlightenment/enlightenment.mk
index ae68888aac..ba6b54143e 100644
--- a/package/enlightenment/enlightenment.mk
+++ b/package/enlightenment/enlightenment.mk
@@ -26,6 +26,9 @@ ENLIGHTENMENT_MESON_OPTS += \
 	-Deldbus-codegen=$(HOST_DIR)/bin/eldbus-codegen \
 	-Dpam=false
 
+# enlightenment.pc and /usr/lib/enlightenment/modules/*.so
+ENLIGHTENMENT_INSTALL_STAGING = YES
+
 ifeq ($(BR2_PACKAGE_SYSTEMD),y)
 ENLIGHTENMENT_MESON_OPTS += -Dsystemd=true
 ENLIGHTENMENT_DEPENDENCIES += systemd
-- 
2.14.3

[Buildroot] [PATCH 1/6] package/efl: bump to 1.20.7

[Peter Korsgaard]

>>>>> "Romain" == Romain Naour <romain.naour@gmail.com> writes:

 > See https://www.enlightenment.org/news/efl-1.20.7
 > Signed-off-by: Romain Naour <romain.naour@gmail.com>

Committed, thanks.

-- 
Bye, Peter Korsgaard

[Buildroot] [PATCH 1/6] package/efl: bump to 1.20.7

[Peter Korsgaard]

>>>>> "Romain" == Romain Naour <romain.naour@gmail.com> writes:

 > See https://www.enlightenment.org/news/efl-1.20.7
 > Signed-off-by: Romain Naour <romain.naour@gmail.com>

Sorry, forgot to ask - Would this be a candidate for 2018.02.x as well?

-- 
Bye, Peter Korsgaard

[Buildroot] [PATCH 2/6] package/enlightenment: fix meson warning

[Peter Korsgaard]

>>>>> "Romain" == Romain Naour <romain.naour@gmail.com> writes:

 > --disable-rpath was added by m4/lib-link.m4 with autotools based
 > buildsystem. Now we use meson, we don't have such option anymore.

 > The autotools eet-eet and eldbus_codegen options are named respectively
 > eet and eldbus-codegen with meson.

 > Fixes:
 > WARNING: Unknown command line options: "eet-eet, eldbus_codegen, rpath"

 > Signed-off-by: Romain Naour <romain.naour@gmail.com>

Committed, thanks.

 > ---
 > This patch can be backported to 2018.02.x

Thanks. I'll do a backport run in a few days.

-- 
Bye, Peter Korsgaard

[Buildroot] [PATCH 3/6] package/enlightenment: bump to 0.22.2

[Peter Korsgaard]

>>>>> "Romain" == Romain Naour <romain.naour@gmail.com> writes:

 > See https://www.enlightenment.org/news/e0.22.2_release
 > Signed-off-by: Romain Naour <romain.naour@gmail.com>

Committed, thanks.

This also seems like purely bugfixes. Would this also be a candidate for
2018.02.x?

-- 
Bye, Peter Korsgaard

[Buildroot] [PATCH 4/6] package/x11r7/xkeyboard-config: install to staging

[Peter Korsgaard]

>>>>> "Romain" == Romain Naour <romain.naour@gmail.com> writes:

 > enlightenment doesn't detect xkeyboard-config since it's missing
 > from staging.

 > Fixes:
 > Dependency xkeyboard-config found: NO

 > Signed-off-by: Romain Naour <romain.naour@gmail.com>
 > Cc: Bernd Kuhls <bernd.kuhls@t-online.de>

Committed, thanks.

-- 
Bye, Peter Korsgaard

[Buildroot] [PATCH 5/6] package/enlightenment: add xkeyboard-config optional dependency

[Peter Korsgaard]

>>>>> "Romain" == Romain Naour <romain.naour@gmail.com> writes:

 > The meson build systemd is checking for xkeyboard-config optional
 > dependency but there is no option to handle it.

 > Signed-off-by: Romain Naour <romain.naour@gmail.com>

Committed, thanks.

-- 
Bye, Peter Korsgaard

[Buildroot] [PATCH 6/6] package/enlightenment: install to staging

[Peter Korsgaard]

>>>>> "Romain" == Romain Naour <romain.naour@gmail.com> writes:

 > enlightenment provide enlightenment.pc and some shared libraries.

Committed, thanks.

Do we have any packages today needing these?

-- 
Bye, Peter Korsgaard

[Buildroot] [PATCH 1/6] package/efl: bump to 1.20.7

[Romain Naour]

Hi Peter,

Le 17/03/2018 ? 09:38, Peter Korsgaard a ?crit?:
>>>>>> "Romain" == Romain Naour <romain.naour@gmail.com> writes:
> 
>  > See https://www.enlightenment.org/news/efl-1.20.7
>  > Signed-off-by: Romain Naour <romain.naour@gmail.com>
> 
> Sorry, forgot to ask - Would this be a candidate for 2018.02.x as well?
> 

Yes probably, this is a bugfix release. Same for enlightenment.
In the past, such version bump was merged in next during stabilization period
(see b0dc300b73124b42ea3465973e20b962f064a870 "bump to 1.20.6" in next).

Best regards,
Romain

[Buildroot] [PATCH 6/6] package/enlightenment: install to staging

[Romain Naour]

Le 17/03/2018 ? 09:56, Peter Korsgaard a ?crit?:
>>>>>> "Romain" == Romain Naour <romain.naour@gmail.com> writes:
> 
>  > enlightenment provide enlightenment.pc and some shared libraries.
> 
> Committed, thanks.
> 
> Do we have any packages today needing these?
> 

I don't think so. But It can be used for custom enlightenment extensions, from a
Buildroot sdk.

Best regards,
Romain