From 4d8be061f0b9ea7663916a6cb3acae42e2829517 Mon Sep 17 00:00:00 2001 From: Javier Viguera Date: Mon, 8 Jan 2024 16:39:01 +0100 Subject: [PATCH] ccimx93: update graphics package for NXP release lf-6.1.55-2.2.0 Backport of graphics package for ccimx93 from NXP's Mickledore-based lf-6.1.55-2.2.0 release. Mainly copies and appends of graphics recipes from the new release, and restricted to ccimx93 by changing the COMPATIBLE_MACHINE, so it does not affect other platforms. Signed-off-by: Javier Viguera --- meta-digi-arm/conf/machine/include/ccimx93.inc | 2 +- .../imx-g2d/imx-g2d-samples_git.bbappend | 4 +++- .../imx-g2d/imx-pxp-g2d_git.bbappend | 6 +++--- .../recipes-kernel/linux/linux-imx-headers_6.1.bb | 6 +++--- ...tocol-no-found-wayland-scanner-with-Yocto-.patch | 0 .../systemd-notify.weston-start | 0 .../weston.desktop | 0 .../weston.png | Bin .../xwayland.weston-start | 0 .../wayland/weston_10.0.1.imx.bbappend | 7 ------- .../{weston_11.0.2.imx.bb => weston_11.0.3.imx.bb} | 4 ++-- 11 files changed, 12 insertions(+), 17 deletions(-) rename meta-digi-dey/dynamic-layers/freescale-layer/recipes-graphics/wayland/{weston-11.0.2.imx => weston-11.0.3.imx}/0001-Revert-protocol-no-found-wayland-scanner-with-Yocto-.patch (100%) rename meta-digi-dey/dynamic-layers/freescale-layer/recipes-graphics/wayland/{weston-11.0.2.imx => weston-11.0.3.imx}/systemd-notify.weston-start (100%) rename meta-digi-dey/dynamic-layers/freescale-layer/recipes-graphics/wayland/{weston-11.0.2.imx => weston-11.0.3.imx}/weston.desktop (100%) rename meta-digi-dey/dynamic-layers/freescale-layer/recipes-graphics/wayland/{weston-11.0.2.imx => weston-11.0.3.imx}/weston.png (100%) rename meta-digi-dey/dynamic-layers/freescale-layer/recipes-graphics/wayland/{weston-11.0.2.imx => weston-11.0.3.imx}/xwayland.weston-start (100%) delete mode 100644 meta-digi-dey/dynamic-layers/freescale-layer/recipes-graphics/wayland/weston_10.0.1.imx.bbappend rename meta-digi-dey/dynamic-layers/freescale-layer/recipes-graphics/wayland/{weston_11.0.2.imx.bb => weston_11.0.3.imx.bb} (98%) diff --git a/meta-digi-arm/conf/machine/include/ccimx93.inc b/meta-digi-arm/conf/machine/include/ccimx93.inc index 3ebd5fbc9..124559061 100644 --- a/meta-digi-arm/conf/machine/include/ccimx93.inc +++ b/meta-digi-arm/conf/machine/include/ccimx93.inc @@ -88,5 +88,5 @@ PREFERRED_VERSION_nativesdk-wayland:ccimx93 ?= "1.22.0.imx" PREFERRED_VERSION_wayland:ccimx93 ?= "1.22.0.imx" PREFERRED_VERSION_wayland-native:ccimx93 ?= "1.22.0.imx" PREFERRED_VERSION_wayland-protocols:ccimx93 ?= "1.32.imx" -PREFERRED_VERSION_weston:ccimx93 ?= "11.0.2.imx" +PREFERRED_VERSION_weston:ccimx93 ?= "11.0.3.imx" PREFERRED_VERSION_xwayland:ccimx93 ?= "23.1.1.imx" diff --git a/meta-digi-arm/dynamic-layers/freescale-layer/recipes-graphics/imx-g2d/imx-g2d-samples_git.bbappend b/meta-digi-arm/dynamic-layers/freescale-layer/recipes-graphics/imx-g2d/imx-g2d-samples_git.bbappend index 980a6a4cf..9d9ee37f4 100644 --- a/meta-digi-arm/dynamic-layers/freescale-layer/recipes-graphics/imx-g2d/imx-g2d-samples_git.bbappend +++ b/meta-digi-arm/dynamic-layers/freescale-layer/recipes-graphics/imx-g2d/imx-g2d-samples_git.bbappend @@ -1,4 +1,6 @@ -# Copyright (c) 2023, Digi International Inc. +# Copyright 2023, 2024 Digi International Inc. + +SRCREV:mx93-nxp-bsp = "4391dcda499870418bb38fe395c3cba0664c5bab" PACKAGECONFIG_IMPLEMENTATION:mx93-nxp-bsp = "pxp" diff --git a/meta-digi-arm/dynamic-layers/freescale-layer/recipes-graphics/imx-g2d/imx-pxp-g2d_git.bbappend b/meta-digi-arm/dynamic-layers/freescale-layer/recipes-graphics/imx-g2d/imx-pxp-g2d_git.bbappend index 415c0e026..55a5c18fb 100644 --- a/meta-digi-arm/dynamic-layers/freescale-layer/recipes-graphics/imx-g2d/imx-pxp-g2d_git.bbappend +++ b/meta-digi-arm/dynamic-layers/freescale-layer/recipes-graphics/imx-g2d/imx-pxp-g2d_git.bbappend @@ -1,5 +1,5 @@ -# Copyright 2023 Digi International Inc. +# Copyright 2023, 2024 Digi International Inc. -LIC_FILES_CHKSUM:ccimx93 = "file://LICENSE.txt;md5=db4762b09b6bda63da103963e6e081de" +LIC_FILES_CHKSUM:ccimx93 = "file://LICENSE.txt;md5=2827219e81f28aba7c6a569f7c437fa7" -SRCREV:ccimx93 = "8d8b48c7c3d95b6c54093a09873ae796a0f09e8a" +SRCREV:ccimx93 = "f3adab05bd0cbb7c38578110d772e8ddf52b4e8e" diff --git a/meta-digi-arm/dynamic-layers/freescale-layer/recipes-kernel/linux/linux-imx-headers_6.1.bb b/meta-digi-arm/dynamic-layers/freescale-layer/recipes-kernel/linux/linux-imx-headers_6.1.bb index bec64d9b7..7da3e1d78 100644 --- a/meta-digi-arm/dynamic-layers/freescale-layer/recipes-kernel/linux/linux-imx-headers_6.1.bb +++ b/meta-digi-arm/dynamic-layers/freescale-layer/recipes-kernel/linux/linux-imx-headers_6.1.bb @@ -1,4 +1,4 @@ -# Copyright 2023 Digi International Inc. +# Copyright 2023, 2024 Digi International Inc. # # Reuse meta-freescale's linux-imx-headers_5.15.bb @@ -6,8 +6,8 @@ require recipes-kernel/linux/linux-imx-headers_5.15.bb SRCBRANCH = "lf-6.1.y" -LOCALVERSION = "-6.1.36-2.1.0" -SRCREV = "04b05c5527e9af8d81254638c307df07dc9a5dd3" +LOCALVERSION = "-lts-${SRCBRANCH}" +SRCREV = "770c5fe2c1d1529fae21b7043911cd50c6cf087e" IMX_UAPI_HEADERS:remove = "isl29023.h" diff --git a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-graphics/wayland/weston-11.0.2.imx/0001-Revert-protocol-no-found-wayland-scanner-with-Yocto-.patch b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-graphics/wayland/weston-11.0.3.imx/0001-Revert-protocol-no-found-wayland-scanner-with-Yocto-.patch similarity index 100% rename from meta-digi-dey/dynamic-layers/freescale-layer/recipes-graphics/wayland/weston-11.0.2.imx/0001-Revert-protocol-no-found-wayland-scanner-with-Yocto-.patch rename to meta-digi-dey/dynamic-layers/freescale-layer/recipes-graphics/wayland/weston-11.0.3.imx/0001-Revert-protocol-no-found-wayland-scanner-with-Yocto-.patch diff --git a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-graphics/wayland/weston-11.0.2.imx/systemd-notify.weston-start b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-graphics/wayland/weston-11.0.3.imx/systemd-notify.weston-start similarity index 100% rename from meta-digi-dey/dynamic-layers/freescale-layer/recipes-graphics/wayland/weston-11.0.2.imx/systemd-notify.weston-start rename to meta-digi-dey/dynamic-layers/freescale-layer/recipes-graphics/wayland/weston-11.0.3.imx/systemd-notify.weston-start diff --git a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-graphics/wayland/weston-11.0.2.imx/weston.desktop b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-graphics/wayland/weston-11.0.3.imx/weston.desktop similarity index 100% rename from meta-digi-dey/dynamic-layers/freescale-layer/recipes-graphics/wayland/weston-11.0.2.imx/weston.desktop rename to meta-digi-dey/dynamic-layers/freescale-layer/recipes-graphics/wayland/weston-11.0.3.imx/weston.desktop diff --git a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-graphics/wayland/weston-11.0.2.imx/weston.png b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-graphics/wayland/weston-11.0.3.imx/weston.png similarity index 100% rename from meta-digi-dey/dynamic-layers/freescale-layer/recipes-graphics/wayland/weston-11.0.2.imx/weston.png rename to meta-digi-dey/dynamic-layers/freescale-layer/recipes-graphics/wayland/weston-11.0.3.imx/weston.png diff --git a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-graphics/wayland/weston-11.0.2.imx/xwayland.weston-start b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-graphics/wayland/weston-11.0.3.imx/xwayland.weston-start similarity index 100% rename from meta-digi-dey/dynamic-layers/freescale-layer/recipes-graphics/wayland/weston-11.0.2.imx/xwayland.weston-start rename to meta-digi-dey/dynamic-layers/freescale-layer/recipes-graphics/wayland/weston-11.0.3.imx/xwayland.weston-start diff --git a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-graphics/wayland/weston_10.0.1.imx.bbappend b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-graphics/wayland/weston_10.0.1.imx.bbappend deleted file mode 100644 index 8774d4608..000000000 --- a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-graphics/wayland/weston_10.0.1.imx.bbappend +++ /dev/null @@ -1,7 +0,0 @@ -# Copyright (C) 2023 Digi International - -SRCREV = "b3ccf36b718d16f5fb38ccfc2cccaf45c79854d8" - -PACKAGECONFIG:append:mx93-nxp-bsp = " imxgpu imxg2d" - -COMPATIBLE_MACHINE = "(imx-nxp-bsp)" diff --git a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-graphics/wayland/weston_11.0.2.imx.bb b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-graphics/wayland/weston_11.0.3.imx.bb similarity index 98% rename from meta-digi-dey/dynamic-layers/freescale-layer/recipes-graphics/wayland/weston_11.0.2.imx.bb rename to meta-digi-dey/dynamic-layers/freescale-layer/recipes-graphics/wayland/weston_11.0.3.imx.bb index 93e125563..812675c8f 100644 --- a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-graphics/wayland/weston_11.0.2.imx.bb +++ b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-graphics/wayland/weston_11.0.3.imx.bb @@ -163,8 +163,8 @@ SRC_URI:remove = "https://gitlab.freedesktop.org/wayland/weston/uploads/f5648c81 SRC_URI:prepend = "${WESTON_SRC};branch=${SRCBRANCH} " WESTON_SRC ?= "git://github.com/nxp-imx/weston-imx.git;protocol=https" SRC_URI += "file://0001-Revert-protocol-no-found-wayland-scanner-with-Yocto-.patch" -SRCBRANCH = "weston-imx-11.0.2" -SRCREV = "a3c5e63aa94f8d27b72780e333370be78c9a7653" +SRCBRANCH = "weston-imx-11.0.3" +SRCREV = "a509c319b7bfc72638c9b9d8f5e4b6259aba0ab7" S = "${WORKDIR}/git" PACKAGECONFIG_IMX_REMOVALS ?= "wayland x11"