From 7d60b95520974eab77ec16cecf3706a68ac9cc25 Mon Sep 17 00:00:00 2001 From: Ronan Le Martret Date: Thu, 26 Jun 2014 14:53:37 +0200 Subject: [PATCH] meta-tizen: Remove libx11 Change-Id: I70165b9dc587a7ee349b7e8bb53bcaf7117bfdf3 (From meta-tizen rev: b53f5c89da897f4027a4f37a8cba684c86cc03dd) Signed-off-by: Patrick Ohly --- meta-tizen/conf/layer.conf | 10 ++++++++-- meta-tizen/recipes-efl/efl/efl_1.9.3.bbappend | 6 +++--- .../recipes-image/images/tizen-common-core-image-crosswalk.bb | 1 + 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/meta-tizen/conf/layer.conf b/meta-tizen/conf/layer.conf index 4af3329..ad4f8ed 100644 --- a/meta-tizen/conf/layer.conf +++ b/meta-tizen/conf/layer.conf @@ -36,11 +36,17 @@ PREFERRED_VERSION_linux-yocto ?= "3.14%" DISTRO_FEATURES_append = " systemd" VIRTUAL-RUNTIME_init_manager = "systemd" +DISTRO_FEATURES_append = " wayland" + DISTRO_FEATURES_append = " pam " + DISTRO_FEATURES_append = " ld-is-gold " -PREFERRED_PROVIDER_jpeg = "libjpeg-turbo" +DISTRO_FEATURES_remove = " x11" + +PREFERRED_PROVIDER_jpeg = "libjpeg-turbo" LICENSE_FLAGS_WHITELIST += "commercial" +PREFERRED_VERSION_libav = "9.13" + -PREFERRED_VERSION_libav = "9.13" \ No newline at end of file diff --git a/meta-tizen/recipes-efl/efl/efl_1.9.3.bbappend b/meta-tizen/recipes-efl/efl/efl_1.9.3.bbappend index 00d5ee4..53af637 100644 --- a/meta-tizen/recipes-efl/efl/efl_1.9.3.bbappend +++ b/meta-tizen/recipes-efl/efl/efl_1.9.3.bbappend @@ -2,8 +2,8 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/efl" -DEPENDS_class-native = "sensor mesa freetype-native libxext-native libpng-native jpeg-native tiff-native libfribidi-native glib-2.0-native dbus-native " -DEPENDS = " sensor mesa virtual/libiconv tslib curl glib-2.0 gnutls pkgconfig zlib jpeg openssl libsndfile1 dbus libexif librsvg libcheck freetype libpng tiff libxext virtual/libx11 libxrender fontconfig libfribidi giflib udev libxcursor libxcomposite libxinerama libxrandr libxtst libxscrnsaver efl-native" +DEPENDS_class-native = "sensor mesa freetype-native libpng-native jpeg-native tiff-native libfribidi-native glib-2.0-native dbus-native " +DEPENDS = " sensor mesa virtual/libiconv tslib curl glib-2.0 gnutls pkgconfig zlib jpeg openssl libsndfile1 dbus libexif librsvg libcheck freetype libpng tiff fontconfig libfribidi giflib udev efl-native" inherit efl gettext pkgconfig @@ -48,7 +48,7 @@ EXTRA_OECONF_append_class-target = " \ --enable-systemd \ --enable-lua-old \ --enable-i-really-know-what-i-am-doing-and-that-this-will-probably-break-things-and-i-will-fix-them-myself-and-send-patches-aaa \ - --with-tests=none \ + --with-tests=none \ --with-bin-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc \ " EXTRA_OECONF_append_class-native = " \ diff --git a/meta-tizen/recipes-image/images/tizen-common-core-image-crosswalk.bb b/meta-tizen/recipes-image/images/tizen-common-core-image-crosswalk.bb index 5370004..079f88e 100644 --- a/meta-tizen/recipes-image/images/tizen-common-core-image-crosswalk.bb +++ b/meta-tizen/recipes-image/images/tizen-common-core-image-crosswalk.bb @@ -8,3 +8,4 @@ DESCRIPTION = "A weston image with Tizen common ." IMAGE_INSTALL += "crosswalk" IMAGE_INSTALL += "tizen-extensions-crosswalk" +IMAGE_INSTALL += "tzdata" -- 2.7.4