From 4d08e08ba8d30020298a91d98364dddd923d2f1a Mon Sep 17 00:00:00 2001 From: Dan McGregor Date: Mon, 24 Nov 2014 08:35:22 -0600 Subject: efl: fix systemd check and better PACKAGECONFIG Make the check for systemd only fire if systemd support is enabled in the distro, and make pulseaudio a PACKAGECONFIG variable. Signed-off-by: Dan McGregor --- meta-efl/recipes-efl/efl/efl.inc | 7 +++- .../efl/efl/fix-configure-systemd.patch | 47 ++++++++++++++++++++++ meta-efl/recipes-efl/efl/efl_1.15.1.bb | 2 + 3 files changed, 55 insertions(+), 1 deletion(-) create mode 100644 meta-efl/recipes-efl/efl/efl/fix-configure-systemd.patch diff --git a/meta-efl/recipes-efl/efl/efl.inc b/meta-efl/recipes-efl/efl/efl.inc index 3cbd04b361..4b55bda0e0 100644 --- a/meta-efl/recipes-efl/efl/efl.inc +++ b/meta-efl/recipes-efl/efl/efl.inc @@ -20,6 +20,7 @@ PROVIDES += "ecore edje eet eeze efreet eina eio embryo emotion ethumb evas eldb EXTRA_OECONF = " \ --disable-physics \ --enable-i-really-know-what-i-am-doing-and-that-this-will-probably-break-things-and-i-will-fix-them-myself-and-send-patches-aba \ + ${@base_contains('TUNE_FEATURES', 'neon', '--enable-neon', '--disable-neon', d)} \ " EXTRA_OECONF_append_class-target = " \ --with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc \ @@ -51,7 +52,9 @@ EXTRA_OECONF_append_class-native = " \ --disable-image-loader-dds \ " -PACKAGECONFIG ?= "wayland egl opengl-es gstreamer1 pulseaudio luajit" +PACKAGECONFIG ?= "wayland egl opengl-es gstreamer1 luajit \ + ${@base_contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)} \ + ${@base_contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)}" PACKAGECONFIG_class-native = "luajit" PACKAGECONFIG[wayland] = "--enable-wayland --enable-wayland-ivi-shell,--disable-wayland --disable-wayland-ivi-shell,wayland" @@ -193,6 +196,7 @@ FILES_libemotion = "\ " FILES_efreet = " \ ${datadir}/dbus-1/services/*Efreet* \ + ${libdir}/systemd/user/efreet.service \ ${libdir}/efreet/*/efreet*create \ ${bindir}/efreetd \ ${datadir}/efreet \ @@ -219,6 +223,7 @@ FILES_embryo = " \ " FILES_ethumb = " \ ${datadir}/dbus-1/services/*Ethumb* \ + ${libdir}/systemd/user/ethumb.service \ ${libdir}/libethumb${SOLIBS} \ ${libdir}/libethumb_client${SOLIBS} \ ${bindir}/ethumbd \ diff --git a/meta-efl/recipes-efl/efl/efl/fix-configure-systemd.patch b/meta-efl/recipes-efl/efl/efl/fix-configure-systemd.patch new file mode 100644 index 0000000000..9ff671b893 --- /dev/null +++ b/meta-efl/recipes-efl/efl/efl/fix-configure-systemd.patch @@ -0,0 +1,47 @@ +--- efl-1.11.0/configure.ac.orig 2014-08-28 08:53:24.215245108 -0600 ++++ efl-1.11.0/configure.ac 2014-08-28 08:59:04.341710384 -0600 +@@ -650,7 +650,7 @@ + + + if test "x${have_systemd_pkg}" = "xauto" -o "x${have_systemd_pkg}" = "xyes"; then +- PKG_CHECK_MODULES([SYSTEMD], [libsystemd-daemon >= 192 libsystemd-journal >= 192], ++ PKG_CHECK_MODULES([SYSTEMD], [libsystemd >= 208], + [have_systemd_pkg="yes"], + [have_systemd_pkg="no"]) + fi +@@ -864,7 +864,7 @@ + [test "x${want_cow_magic}" = "xyes" ], + [1], [Turn on Eina_Magic in Eina_Cow]) + +-EFL_OPTIONAL_DEPEND_PKG([EINA], [${want_systemd}], [SYSTEMD], [libsystemd-journal]) ++EFL_OPTIONAL_DEPEND_PKG([EINA], [${want_systemd}], [SYSTEMD], [libsystemd]) + + EFL_EVAL_PKGS([EINA]) + +@@ -2180,7 +2180,7 @@ + want_g_main_loop="no" + fi + +-EFL_OPTIONAL_DEPEND_PKG([ECORE], [${want_systemd}], [SYSTEMD], [libsystemd-daemon]) ++EFL_OPTIONAL_DEPEND_PKG([ECORE], [${want_systemd}], [SYSTEMD], [libsystemd]) + + EFL_ADD_FEATURE([ECORE], [systemd-daemon], [${want_systemd}]) + EFL_ADD_FEATURE([ECORE], [glib]) +@@ -2413,7 +2413,7 @@ + ecore_con_resolver="fork" + fi + +-EFL_OPTIONAL_DEPEND_PKG([ECORE_CON], [${want_systemd}], [SYSTEMD], [libsystemd-daemon]) ++EFL_OPTIONAL_DEPEND_PKG([ECORE_CON], [${want_systemd}], [SYSTEMD], [libsystemd]) + + EFL_ADD_FEATURE([ECORE_CON], [cares]) + EFL_ADD_FEATURE([ECORE_CON], [local-sockets], [${want_ecore_con_local_sockets}]) +@@ -2813,7 +2813,7 @@ + EFL_INTERNAL_DEPEND_PKG([ECORE_DRM], [eo]) + EFL_INTERNAL_DEPEND_PKG([ECORE_DRM], [eina]) + +-EFL_DEPEND_PKG([ECORE_DRM], [DRM], [libudev >= 148 libdrm >= 2.4 xkbcommon >= 0.3.0 libsystemd-login >= 192 dbus-1]) ++EFL_DEPEND_PKG([ECORE_DRM], [DRM], [libudev >= 148 libdrm >= 2.4 xkbcommon >= 0.3.0 libsystemd >= 208 dbus-1]) + + EFL_EVAL_PKGS([ECORE_DRM]) + diff --git a/meta-efl/recipes-efl/efl/efl_1.15.1.bb b/meta-efl/recipes-efl/efl/efl_1.15.1.bb index aaebf90407..5e74a1247d 100644 --- a/meta-efl/recipes-efl/efl/efl_1.15.1.bb +++ b/meta-efl/recipes-efl/efl/efl_1.15.1.bb @@ -4,6 +4,8 @@ SRC_URI = "\ ${E_RELEASES}/libs/${SRCNAME}/${SRCNAME}-${SRCVER}.tar.gz \ file://0001-configure.ac-Don-t-check-for-Xprint-extension.patch \ file://0001-evas_3d-Add-Eet.h-includes.patch \ + file://0002-evas_3d-Add-Eet.h-includes.patch \ + file://fix-configure-systemd.patch \ " SRC_URI[md5sum] = "dc91bcab73275f678e1748a2dea8d88a" -- cgit 1.2.3-korg