From 2346bb21c34075f249a5fd727916276293e4c023 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?K=C3=A9vin=20THIERRY?= Date: Tue, 14 Oct 2014 13:49:17 +0200 Subject: Update recipes MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Also update layer.conf. Note that even though meta-tizen provides a working recipe for libjpeg-turbo, the version used is still the one from Poky since there is an unresolved conflict between the two versions (maybe a recipe expliciely requiring the Poky version). Change-Id: I1b7fda99971d78465fa7a2dbb7aa932f6d5e57de Signed-off-by: Kévin THIERRY --- conf/layer.conf | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'conf/layer.conf') diff --git a/conf/layer.conf b/conf/layer.conf index cf017500..cb825b1b 100644 --- a/conf/layer.conf +++ b/conf/layer.conf @@ -41,19 +41,21 @@ VIRTUAL-RUNTIME_init_manager = "systemd" PREFERRED_PROVIDER_python-dbus = "dbus-python" PREFERRED_PROVIDER_jpeg = "libjpeg-turbo" +PREFERRED_PROVIDER_jpeg-native = "libjpeg-turbo-native" PREFERRED_PROVIDER_libtdb = "tdb" PREFERRED_PROVIDER_make-native = "make-native" PREFERRED_PROVIDER_python-setuptools = "python-setuptools" PREFERRED_PROVIDER_rpmbuild = "rpm-native" PREFERRED_PROVIDER_libpam = "pam" PREFERRED_PROVIDER_pciutils-ids = "pciutils" -PREFERRED_PROVIDER_jpeg-native = "jpeg-native" PREFERRED_VERSION_pulseaudio = "git" PREFERRED_VERSION_libav = "git" PREFERRED_VERSION_linux-yocto ?= "3.14%" PREFERRED_VERSION_weston = "git" PREFERRED_VERSION_pam = "git" +PREFERRED_VERSION_libjpeg-turbo = "8d%" +PREFERRED_VERSION_libjpeg-turbo-native = "8d%" LICENSE_FLAGS_WHITELIST += "commercial" -- cgit v1.2.3