From 891324509c8b276e579605b4026fbf2fbec82bc9 Mon Sep 17 00:00:00 2001 From: Kazumasa Mitsunari Date: Wed, 31 Jan 2018 16:30:59 +0900 Subject: [PATCH 1/1] Upgrade wayland-ivi-extension Upgrade wayland-ivi-extension version to 2.0.% from 1.13. Currently, version is 2.0.2 This change is for only master branch. [PatchSet2] Apply the patch for type conversion for dra7xx board. The patch for wayland-ivi-extension 1.13 is already applied but for 2.0.2 is not applied yet. Bug-AGL: SPEC-1244 Change-Id: I200c19837b8f7b646296a868c14423e55e98bf86 Signed-off-by: Kazumasa Mitsunari --- .../recipes-graphics/wayland/wayland-ivi-extension_2.0.2.bbappend | 5 +++++ meta-agl-distro/conf/distro/poky-agl.conf | 2 +- .../recipes-graphics/wayland/wayland-ivi-extension_2.0.2.bb | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) create mode 100644 meta-agl-bsp/meta-ti/recipes-graphics/wayland/wayland-ivi-extension_2.0.2.bbappend diff --git a/meta-agl-bsp/meta-ti/recipes-graphics/wayland/wayland-ivi-extension_2.0.2.bbappend b/meta-agl-bsp/meta-ti/recipes-graphics/wayland/wayland-ivi-extension_2.0.2.bbappend new file mode 100644 index 000000000..e9a57d324 --- /dev/null +++ b/meta-agl-bsp/meta-ti/recipes-graphics/wayland/wayland-ivi-extension_2.0.2.bbappend @@ -0,0 +1,5 @@ +FILESEXTRAPATHS_append := ":${THISDIR}/${PN}" + +SRC_URI_append = "\ + file://force-type-conversion.patch \ + " diff --git a/meta-agl-distro/conf/distro/poky-agl.conf b/meta-agl-distro/conf/distro/poky-agl.conf index d79111742..235cc8434 100644 --- a/meta-agl-distro/conf/distro/poky-agl.conf +++ b/meta-agl-distro/conf/distro/poky-agl.conf @@ -66,7 +66,7 @@ DISTRO_FEATURES_APPEND = " " DISTRO_FEATURES_remove = "x11" DISTRO_FEATURES_BACKFILL_CONSIDERED = "sysvinit" -PREFERRED_VERSION_wayland-ivi-extension ?= "1.1%" +PREFERRED_VERSION_wayland-ivi-extension ?= "2.0.%" # Prefer GStreamer 1.10.x by default PREFERRED_VERSION_gstreamer1.0 ?= "1.10.%" diff --git a/meta-ivi-common/recipes-graphics/wayland/wayland-ivi-extension_2.0.2.bb b/meta-ivi-common/recipes-graphics/wayland/wayland-ivi-extension_2.0.2.bb index d4e280455..ea74e384c 100644 --- a/meta-ivi-common/recipes-graphics/wayland/wayland-ivi-extension_2.0.2.bb +++ b/meta-ivi-common/recipes-graphics/wayland/wayland-ivi-extension_2.0.2.bb @@ -6,7 +6,7 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=1f1a56bb2dadf5f2be8eb342acf4ed79" SRCREV = "ff067a640451de46836200624ece7ac777977c30" -SRC_URI = "git://github.com/GENIVI/${BPN}.git;protocol=http \ +SRC_URI = "git://github.com/GENIVI/${BPN}.git;branch=2.0;protocol=http \ " SRC_URI_append_wandboard = " file://wandboard_fix_build.patch" -- 2.16.6