summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom Hochstein <tom.hochstein@nxp.com>2024-04-24 14:40:22 -0700
committerTom Hochstein <tom.hochstein@nxp.com>2024-04-24 16:17:06 -0700
commit84bb2909ec03f4e8212e23836b8e8e0ec6933991 (patch)
tree7d1c1c4ef56a6ab53dd5fb2a518595db10af586d
parent771e4ececae9dc0b0a562c7321d94376849898e8 (diff)
downloadmeta-freescale-84bb2909ec03f4e8212e23836b8e8e0ec6933991.tar.gz
weston: Upgrade 10.0.4.imx -> 10.0.5.imx
Align with NXP BSP 6.6.3-1.0.0. Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
-rw-r--r--conf/machine/include/imx-base.inc4
-rw-r--r--recipes-graphics/wayland/weston-10.0.5.imx/0001-Revert-protocol-no-found-wayland-scanner-with-Yocto-.patch (renamed from recipes-graphics/wayland/weston-10.0.4.imx/0001-Revert-protocol-no-found-wayland-scanner-with-Yocto-.patch)0
-rw-r--r--recipes-graphics/wayland/weston-10.0.5.imx/0001-g2d-renderer.c-Include-sys-stat.h.patch (renamed from recipes-graphics/wayland/weston-10.0.4.imx/0001-g2d-renderer.c-Include-sys-stat.h.patch)0
-rw-r--r--recipes-graphics/wayland/weston_10.0.5.imx.bb (renamed from recipes-graphics/wayland/weston_10.0.4.imx.bb)4
4 files changed, 4 insertions, 4 deletions
diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc
index 4b246842..adbf5ad1 100644
--- a/conf/machine/include/imx-base.inc
+++ b/conf/machine/include/imx-base.inc
@@ -570,8 +570,8 @@ PREFERRED_PROVIDER_virtual/opencl-icd:imxgpu ?= "imx-gpu-viv"
570 570
571PREFERRED_VERSION_weston:imx-nxp-bsp ??= "11.0.3.imx" 571PREFERRED_VERSION_weston:imx-nxp-bsp ??= "11.0.3.imx"
572# i.MX 6 & 7 stay on weston 10.0 for fbdev 572# i.MX 6 & 7 stay on weston 10.0 for fbdev
573PREFERRED_VERSION_weston:mx6-nxp-bsp ??= "10.0.4.imx" 573PREFERRED_VERSION_weston:mx6-nxp-bsp ??= "10.0.5.imx"
574PREFERRED_VERSION_weston:mx7-nxp-bsp ??= "10.0.4.imx" 574PREFERRED_VERSION_weston:mx7-nxp-bsp ??= "10.0.5.imx"
575PREFERRED_VERSION_weston:imx-mainline-bsp = "" 575PREFERRED_VERSION_weston:imx-mainline-bsp = ""
576 576
577PREFERRED_VERSION_wayland-protocols:mx6-nxp-bsp ??= "1.32.imx" 577PREFERRED_VERSION_wayland-protocols:mx6-nxp-bsp ??= "1.32.imx"
diff --git a/recipes-graphics/wayland/weston-10.0.4.imx/0001-Revert-protocol-no-found-wayland-scanner-with-Yocto-.patch b/recipes-graphics/wayland/weston-10.0.5.imx/0001-Revert-protocol-no-found-wayland-scanner-with-Yocto-.patch
index 59f2a4b6..59f2a4b6 100644
--- a/recipes-graphics/wayland/weston-10.0.4.imx/0001-Revert-protocol-no-found-wayland-scanner-with-Yocto-.patch
+++ b/recipes-graphics/wayland/weston-10.0.5.imx/0001-Revert-protocol-no-found-wayland-scanner-with-Yocto-.patch
diff --git a/recipes-graphics/wayland/weston-10.0.4.imx/0001-g2d-renderer.c-Include-sys-stat.h.patch b/recipes-graphics/wayland/weston-10.0.5.imx/0001-g2d-renderer.c-Include-sys-stat.h.patch
index b9cb31fb..b9cb31fb 100644
--- a/recipes-graphics/wayland/weston-10.0.4.imx/0001-g2d-renderer.c-Include-sys-stat.h.patch
+++ b/recipes-graphics/wayland/weston-10.0.5.imx/0001-g2d-renderer.c-Include-sys-stat.h.patch
diff --git a/recipes-graphics/wayland/weston_10.0.4.imx.bb b/recipes-graphics/wayland/weston_10.0.5.imx.bb
index e31d2280..99624887 100644
--- a/recipes-graphics/wayland/weston_10.0.4.imx.bb
+++ b/recipes-graphics/wayland/weston_10.0.5.imx.bb
@@ -164,8 +164,8 @@ SRC_URI:remove = "https://gitlab.freedesktop.org/wayland/weston/-/releases/${PV}
164SRC_URI:prepend = "git://github.com/nxp-imx/weston-imx.git;protocol=https;branch=${SRCBRANCH} " 164SRC_URI:prepend = "git://github.com/nxp-imx/weston-imx.git;protocol=https;branch=${SRCBRANCH} "
165SRC_URI += "file://0001-Revert-protocol-no-found-wayland-scanner-with-Yocto-.patch \ 165SRC_URI += "file://0001-Revert-protocol-no-found-wayland-scanner-with-Yocto-.patch \
166 file://0001-g2d-renderer.c-Include-sys-stat.h.patch" 166 file://0001-g2d-renderer.c-Include-sys-stat.h.patch"
167SRCBRANCH = "weston-imx-10.0.4" 167SRCBRANCH = "weston-imx-10.0.5"
168SRCREV = "6210a8f1302252273b50cc3c0ff55ec680dda479" 168SRCREV = "0cc822a1e5a8faea6835a4e9259887d8792b86b4"
169S = "${WORKDIR}/git" 169S = "${WORKDIR}/git"
170 170
171# Disable OpenGL for parts with GPU support for 2D but not 3D 171# Disable OpenGL for parts with GPU support for 2D but not 3D