From cc06ba7fc557e93921c69a524c00f55790f9e368 Mon Sep 17 00:00:00 2001 From: Valentin Jec Date: Wed, 15 Jan 2025 19:28:06 +0200 Subject: [PATCH 1/6] imx-g2d*: Upgrade Graphics BSP to LF6.6.52_2.2.0 Bump imx-dpu-g2d version 2.2.0 -> 2.2.2 Bump imx-gpu-g2d version 6.4.11.p2.8 -> 6.4.11.p2.10 Signed-off-by: Valentin Jec --- .../{imx-dpu-g2d_2.2.0.bb => imx-dpu-g2d_2.2.2.bb} | 8 ++++---- ...gpu-g2d_6.4.11.p2.8.bb => imx-gpu-g2d_6.4.11.p2.10.bb} | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) rename recipes-graphics/imx-g2d/{imx-dpu-g2d_2.2.0.bb => imx-dpu-g2d_2.2.2.bb} (82%) rename recipes-graphics/imx-g2d/{imx-gpu-g2d_6.4.11.p2.8.bb => imx-gpu-g2d_6.4.11.p2.10.bb} (85%) diff --git a/recipes-graphics/imx-g2d/imx-dpu-g2d_2.2.0.bb b/recipes-graphics/imx-g2d/imx-dpu-g2d_2.2.2.bb similarity index 82% rename from recipes-graphics/imx-g2d/imx-dpu-g2d_2.2.0.bb rename to recipes-graphics/imx-g2d/imx-dpu-g2d_2.2.2.bb index 5e8f5402e..ad3425f98 100644 --- a/recipes-graphics/imx-g2d/imx-dpu-g2d_2.2.0.bb +++ b/recipes-graphics/imx-g2d/imx-dpu-g2d_2.2.2.bb @@ -15,13 +15,13 @@ PROVIDES += "virtual/libg2d" SRC_URI = "${FSL_MIRROR}/${IMX_BIN_NAME}.bin;fsl-eula=true;name=${IMX_SRC_URI_NAME}" IMX_BIN_NAME = "${BPN}-${IMX_SRC_URI_NAME}-${PV}-${IMX_SRCREV_ABBREV}" -IMX_SRCREV_ABBREV = "7943590" +IMX_SRCREV_ABBREV = "e2dce80" IMX_SRC_URI_NAME = "v1" -SRC_URI[v1.sha256sum] = "bf347f53e8f390a0554c0db76707819bb50cf4aaa564a9c86821ae9add26e113" +SRC_URI[v1.sha256sum] = "d43b5d4b8e6015a029c6e8854982aa5d57de25bc0e3ff8209d4aab7679c2d240" -IMX_SRCREV_ABBREV:mx95-nxp-bsp = "7943590" +IMX_SRCREV_ABBREV:mx95-nxp-bsp = "e2dce80" IMX_SRC_URI_NAME:mx95-nxp-bsp = "v2" -SRC_URI[v2.sha256sum] = "c0a87908cd04c208659423746a57eaee6a30b4d680ec871f3495ad4a2acb5076" +SRC_URI[v2.sha256sum] = "d9845356e0c9c959b1d57ebb3ee668ba6aa2b864999263a8c33cb053b83584e6" S = "${WORKDIR}/${IMX_BIN_NAME}" diff --git a/recipes-graphics/imx-g2d/imx-gpu-g2d_6.4.11.p2.8.bb b/recipes-graphics/imx-g2d/imx-gpu-g2d_6.4.11.p2.10.bb similarity index 85% rename from recipes-graphics/imx-g2d/imx-gpu-g2d_6.4.11.p2.8.bb rename to recipes-graphics/imx-g2d/imx-gpu-g2d_6.4.11.p2.10.bb index 7ce542d0a..342c29f04 100644 --- a/recipes-graphics/imx-g2d/imx-gpu-g2d_6.4.11.p2.8.bb +++ b/recipes-graphics/imx-g2d/imx-gpu-g2d_6.4.11.p2.10.bb @@ -11,9 +11,9 @@ PROVIDES = "virtual/libg2d" SRC_URI = "${FSL_MIRROR}/${IMX_BIN_NAME}.bin;name=${TARGET_ARCH};fsl-eula=true" IMX_BIN_NAME = "${BP}-${TARGET_ARCH}-${IMX_SRCREV_ABBREV}" -IMX_SRCREV_ABBREV = "95408a4" -SRC_URI[aarch64.sha256sum] = "48327fe6315aa739d5665004289412ff2e3a4e0084d1664f837276f09d35b032" -SRC_URI[arm.sha256sum] = "f28b2cd7b29302cd654fc845a0695d6fe935e383b56556e36933488dfa014830" +IMX_SRCREV_ABBREV = "accdd64" +SRC_URI[aarch64.sha256sum] = "780479f19142126ed58e12222b80f8f3b882ad3d223ff61b7ea02001f517ff03" +SRC_URI[arm.sha256sum] = "cd4fd05dd6f6880edc3255c85fe08094a07ea4cd3eee947df004dcb8f37bc8fa" S = "${WORKDIR}/${IMX_BIN_NAME}" From 548f3baa225af812a64be6ac6f3f632cdd1f5a09 Mon Sep 17 00:00:00 2001 From: Valentin Jec Date: Wed, 15 Jan 2025 19:31:44 +0200 Subject: [PATCH 2/6] imx-gpu-viv*: Upgrade Graphics BSP to LF6.6.52_2.2.0 Bump imx-gpu-viv version 6.4.11.p2.8 -> 6.4.11.p2.10 Bump LIBVULKAN_API_VERSION 1.3.239 -> 1.3.204 Signed-off-by: Valentin Jec --- recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc | 2 +- ....p2.8-aarch32.bb => imx-gpu-viv_6.4.11.p2.10-aarch32.bb} | 6 +++--- ....p2.8-aarch64.bb => imx-gpu-viv_6.4.11.p2.10-aarch64.bb} | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) rename recipes-graphics/imx-gpu-viv/{imx-gpu-viv_6.4.11.p2.8-aarch32.bb => imx-gpu-viv_6.4.11.p2.10-aarch32.bb} (59%) rename recipes-graphics/imx-gpu-viv/{imx-gpu-viv_6.4.11.p2.8-aarch64.bb => imx-gpu-viv_6.4.11.p2.10-aarch64.bb} (50%) diff --git a/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc b/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc index ee9c391f0..26720fb0d 100644 --- a/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc +++ b/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc @@ -187,7 +187,7 @@ IMX_SOC:mx8mq-nxp-bsp = "mx8mq" IMX_SOC:mx8mn-nxp-bsp = "mx8mn" IMX_SOC:mx8ulp-nxp-bsp = "mx8ulp" -LIBVULKAN_API_VERSION = "1.3.239" +LIBVULKAN_API_VERSION = "1.3.204" do_install () { install -d ${D}${libdir} diff --git a/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p2.8-aarch32.bb b/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p2.10-aarch32.bb similarity index 59% rename from recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p2.8-aarch32.bb rename to recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p2.10-aarch32.bb index 4cdc1d6af..753ab5adb 100644 --- a/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p2.8-aarch32.bb +++ b/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p2.10-aarch32.bb @@ -1,9 +1,9 @@ require imx-gpu-viv-6.inc -LIC_FILES_CHKSUM = "file://COPYING;md5=ca53281cc0caa7e320d4945a896fb837" +LIC_FILES_CHKSUM = "file://COPYING;md5=ca53281cc0caa7e320d4945a896fb837" -IMX_SRCREV_ABBREV = "95408a4" +IMX_SRCREV_ABBREV = "accdd64" -SRC_URI[sha256sum] = "c479c98e83866a7e95e5a6ae29b21ae41f9599326298d9a1debf009cac6e9406" +SRC_URI[sha256sum] = "2242c7cbf1a2b07d40eefe5d1507747e477c54912f179ee0585a5d7965074ce0" COMPATIBLE_MACHINE = "(mx6q-nxp-bsp|mx6dl-nxp-bsp|mx6sx-nxp-bsp|mx6sl-nxp-bsp|mx7ulp-nxp-bsp)" diff --git a/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p2.8-aarch64.bb b/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p2.10-aarch64.bb similarity index 50% rename from recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p2.8-aarch64.bb rename to recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p2.10-aarch64.bb index c5208b554..6a6c6a7c6 100644 --- a/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p2.8-aarch64.bb +++ b/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p2.10-aarch64.bb @@ -1,9 +1,9 @@ require imx-gpu-viv-6.inc -LIC_FILES_CHKSUM = "file://COPYING;md5=ca53281cc0caa7e320d4945a896fb837" +LIC_FILES_CHKSUM = "file://COPYING;md5=ca53281cc0caa7e320d4945a896fb837" -IMX_SRCREV_ABBREV = "95408a4" +IMX_SRCREV_ABBREV = "accdd64" -SRC_URI[sha256sum] = "aadfcf558d07da253a57acfd5aa4ca41d4c8195f04324d0c2f6746f6f18c5a46" +SRC_URI[sha256sum] = "8108fd146de6986486f34860227511a5101b31072b99cd78ae38afba8939fd4e" COMPATIBLE_MACHINE = "(mx8-nxp-bsp)" From 26086c2b4b54caba4a6fdbf17a56f6c52c534bc5 Mon Sep 17 00:00:00 2001 From: Valentin Jec Date: Wed, 15 Jan 2025 19:34:53 +0200 Subject: [PATCH 3/6] xwayland*: Upgrade Graphics BSP to LF6.6.52_2.2.0 Bump xwayland version 23.1.1.imx -> 23.2.5.imx Signed-off-by: Valentin Jec --- conf/machine/include/imx-base.inc | 2 +- .../{xwayland_23.1.1.imx.bb => xwayland_23.2.5.imx.bb} | 4 ++-- ...and_23.1.1.imx.bbappend => xwayland_23.2.5.imx.bbappend} | 6 ++---- 3 files changed, 5 insertions(+), 7 deletions(-) rename recipes-graphics/xwayland/{xwayland_23.1.1.imx.bb => xwayland_23.2.5.imx.bb} (94%) rename recipes-graphics/xwayland/{xwayland_23.1.1.imx.bbappend => xwayland_23.2.5.imx.bbappend} (71%) diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc index 32da2ea50..277fdfe7f 100644 --- a/conf/machine/include/imx-base.inc +++ b/conf/machine/include/imx-base.inc @@ -592,7 +592,7 @@ PREFERRED_VERSION_weston:imx-mainline-bsp = "" PREFERRED_VERSION_wayland-protocols:imx-nxp-bsp ??= "1.32.imx" -PREFERRED_VERSION_xwayland:imx-nxp-bsp ??= "23.1.1.imx" +PREFERRED_VERSION_xwayland:imx-nxp-bsp ??= "23.2.5.imx" # Use i.MX libdrm Version PREFERRED_VERSION_libdrm:imx-nxp-bsp ??= "2.4.116.imx" diff --git a/recipes-graphics/xwayland/xwayland_23.1.1.imx.bb b/recipes-graphics/xwayland/xwayland_23.2.5.imx.bb similarity index 94% rename from recipes-graphics/xwayland/xwayland_23.1.1.imx.bb rename to recipes-graphics/xwayland/xwayland_23.2.5.imx.bb index a9705a233..0535587bd 100644 --- a/recipes-graphics/xwayland/xwayland_23.1.1.imx.bb +++ b/recipes-graphics/xwayland/xwayland_23.2.5.imx.bb @@ -16,8 +16,8 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=5df87950af51ac2c5822094553ea1880" SRC_URI = "https://www.x.org/archive/individual/xserver/${BP_ORIGINAL}.tar.xz" -BP_ORIGINAL = "${BPN}-23.1.1" -SRC_URI[sha256sum] = "fb9461f5cb9fea5e07e91882311b0c88b43e8843b017ebac05eb5af69aa34c15" +BP_ORIGINAL = "${BPN}-23.2.5" +SRC_URI[sha256sum] = "33ec7ff2687a59faaa52b9b09aa8caf118e7ecb6aed8953f526a625ff9f4bd90" S = "${WORKDIR}/${BP_ORIGINAL}" UPSTREAM_CHECK_REGEX = "xwayland-(?P\d+(\.(?!90\d)\d+)+)\.tar" diff --git a/recipes-graphics/xwayland/xwayland_23.1.1.imx.bbappend b/recipes-graphics/xwayland/xwayland_23.2.5.imx.bbappend similarity index 71% rename from recipes-graphics/xwayland/xwayland_23.1.1.imx.bbappend rename to recipes-graphics/xwayland/xwayland_23.2.5.imx.bbappend index f71ba16c3..d8f5bdde5 100644 --- a/recipes-graphics/xwayland/xwayland_23.1.1.imx.bbappend +++ b/recipes-graphics/xwayland/xwayland_23.2.5.imx.bbappend @@ -6,10 +6,8 @@ SRC_URI:append:imxgpu = " \ OPENGL_PKGCONFIGS:remove:imxgpu = "${OPENGL_PKGCONFIGS_REMOVE_IMXGPU}" OPENGL_PKGCONFIGS_REMOVE_IMXGPU = "" -OPENGL_PKGCONFIGS_REMOVE_IMXGPU:mx6-nxp-bsp = "glamor glx" -OPENGL_PKGCONFIGS_REMOVE_IMXGPU:mx7-nxp-bsp = "glamor glx" +OPENGL_PKGCONFIGS_REMOVE_IMXGPU:imx-nxp-bsp = "glamor glx" OPENGL_PKGCONFIGS_REMOVE_IMXGPU:mx8-nxp-bsp = "glx" -OPENGL_PKGCONFIGS_REMOVE_IMXGPU:mx9-nxp-bsp = "glamor glx" # links with imx-gpu libs which are pre-built for glibc # gcompat will address it during runtime @@ -17,4 +15,4 @@ LDFLAGS:append:imxgpu:libc-musl = " -Wl,--allow-shlib-undefined" RDEPENDS:${PN}:append:imxgpu:libc-musl = " gcompat" -PACKAGE_ARCH = "${MACHINE_SOCARCH}" +PACKAGE_ARCH:imxgpu = "${MACHINE_SOCARCH}" From d270be35af35f19b5e5ece6aa4aa5a013054dc93 Mon Sep 17 00:00:00 2001 From: Valentin Jec Date: Wed, 15 Jan 2025 19:36:34 +0200 Subject: [PATCH 4/6] weston: Upgrade Graphics BSP to LF6.6.52_2.2.0 Update checksum to latest Signed-off-by: Valentin Jec --- recipes-graphics/wayland/weston_10.0.5.imx.bb | 2 +- recipes-graphics/wayland/weston_12.0.4.imx.bb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes-graphics/wayland/weston_10.0.5.imx.bb b/recipes-graphics/wayland/weston_10.0.5.imx.bb index df2898f0a..2c74481ac 100644 --- a/recipes-graphics/wayland/weston_10.0.5.imx.bb +++ b/recipes-graphics/wayland/weston_10.0.5.imx.bb @@ -165,7 +165,7 @@ SRC_URI:prepend = "git://github.com/nxp-imx/weston-imx.git;protocol=https;branch SRC_URI += "file://0001-Revert-protocol-no-found-wayland-scanner-with-Yocto-.patch \ file://0001-g2d-renderer.c-Include-sys-stat.h.patch" SRCBRANCH = "weston-imx-10.0.5" -SRCREV = "0cc822a1e5a8faea6835a4e9259887d8792b86b4" +SRCREV = "7129417ae04de57f9596ccf27f74ef967660a64f" S = "${WORKDIR}/git" # Disable OpenGL for parts with GPU support for 2D but not 3D diff --git a/recipes-graphics/wayland/weston_12.0.4.imx.bb b/recipes-graphics/wayland/weston_12.0.4.imx.bb index 8003da07b..c988561eb 100644 --- a/recipes-graphics/wayland/weston_12.0.4.imx.bb +++ b/recipes-graphics/wayland/weston_12.0.4.imx.bb @@ -172,7 +172,7 @@ 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-12.0.4" -SRCREV = "c3c1f9ff7824123dd4808ace3c9476345cb84177" +SRCREV = "de7f8df4b4275e9bb345cacab6962d1a490d9eab" S = "${WORKDIR}/git" PACKAGECONFIG_IMX_REMOVALS ?= "wayland x11" From bd7576c46e9f5ea140f4ea9dc3822cc6b8a96866 Mon Sep 17 00:00:00 2001 From: Valentin Jec Date: Wed, 15 Jan 2025 19:38:27 +0200 Subject: [PATCH 5/6] mali-imx: Upgrade Graphics BSP to LF6.6.52_2.2.0 Bump version r50.0 -> r50.2 Signed-off-by: Valentin Jec --- .../mali/{mali-imx_r50.0.bb => mali-imx_r50.2.bb} | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) rename recipes-graphics/mali/{mali-imx_r50.0.bb => mali-imx_r50.2.bb} (82%) diff --git a/recipes-graphics/mali/mali-imx_r50.0.bb b/recipes-graphics/mali/mali-imx_r50.2.bb similarity index 82% rename from recipes-graphics/mali/mali-imx_r50.0.bb rename to recipes-graphics/mali/mali-imx_r50.2.bb index 3d30f4685..97f6db715 100644 --- a/recipes-graphics/mali/mali-imx_r50.0.bb +++ b/recipes-graphics/mali/mali-imx_r50.2.bb @@ -1,11 +1,11 @@ require mali-imx.inc LICENSE = "Proprietary" -LIC_FILES_CHKSUM = "file://COPYING;md5=ca53281cc0caa7e320d4945a896fb837" +LIC_FILES_CHKSUM = "file://COPYING;md5=ca53281cc0caa7e320d4945a896fb837" SRC_URI = "${FSL_MIRROR}/${BPN}-${PV}-${IMX_SRCREV_ABBREV}.bin;fsl-eula=true" -SRC_URI[sha256sum] = "a787a3285c3e288eedacf1a746de2bc9f5fdc15f35cf8b6147deb436183baf6f" -IMX_SRCREV_ABBREV = "39604c3" +SRC_URI[sha256sum] = "947881cdad085a29dcb52dc4431f803b73c06141b31e06520f9bfe17d324f774" +IMX_SRCREV_ABBREV = "710cfb6" S = "${WORKDIR}/${BPN}-${PV}-${IMX_SRCREV_ABBREV}" From ee0c506d846a6b74ea41e061e2f3465cfe19c589 Mon Sep 17 00:00:00 2001 From: Valentin Jec Date: Wed, 15 Jan 2025 19:40:01 +0200 Subject: [PATCH 6/6] libsdl2: Upgrade Graphics BSP to LF6.6.52_2.2.0 Add libdecor to PACKAGECONFIG for imx platforms Signed-off-by: Valentin Jec --- recipes-graphics/libsdl2/libsdl2_%.bbappend | 2 ++ 1 file changed, 2 insertions(+) diff --git a/recipes-graphics/libsdl2/libsdl2_%.bbappend b/recipes-graphics/libsdl2/libsdl2_%.bbappend index 3b2655ce7..1a63f2f54 100644 --- a/recipes-graphics/libsdl2/libsdl2_%.bbappend +++ b/recipes-graphics/libsdl2/libsdl2_%.bbappend @@ -6,3 +6,5 @@ CFLAGS:append:imxgpu = " -DLINUX \ ${@bb.utils.contains('DISTRO_FEATURES', 'x11', '', '-DEGL_API_FB', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', '-DWL_EGL_PLATFORM', '', d)} \ " +PACKAGECONFIG:append:imx-nxp-bsp = " ${PACKAGECONFIG_LIBDECOR}" +PACKAGECONFIG_LIBDECOR ??= "libdecor" \ No newline at end of file