diff options
| author | Kévin THIERRY <kevin.thierry@open.eurogiciel.org> | 2014-10-14 13:49:17 +0200 |
|---|---|---|
| committer | Kévin THIERRY <kevin.thierry@open.eurogiciel.org> | 2014-10-16 10:47:45 +0200 |
| commit | 2346bb21c34075f249a5fd727916276293e4c023 (patch) | |
| tree | c9570f161e8b790b9072fc49d327b7c24415c41d /conf/layer.conf | |
| parent | 5657c0b72ca9fd210ed5095472caf6339cb4eadf (diff) | |
| download | meta-tizen-2346bb21c34075f249a5fd727916276293e4c023.tar.gz meta-tizen-2346bb21c34075f249a5fd727916276293e4c023.tar.bz2 meta-tizen-2346bb21c34075f249a5fd727916276293e4c023.zip | |
Update recipes
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 <kevin.thierry@open.eurogiciel.org>
Diffstat (limited to 'conf/layer.conf')
| -rw-r--r-- | conf/layer.conf | 4 |
1 files changed, 3 insertions, 1 deletions
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" |