From dac97d19df2e68fc375a0fc235a7530b0aa199c8 Mon Sep 17 00:00:00 2001 From: Tom Hochstein Date: Wed, 24 Apr 2024 09:20:50 -0700 Subject: [PATCH 01/13] libdrm: Upgrade 2.4.115.imx -> 2.4.116.imx Align with NXP BSP 6.6.3-1.0.0. Signed-off-by: Tom Hochstein --- conf/machine/include/imx-base.inc | 8 ++++---- .../drm/{libdrm_2.4.115.imx.bb => libdrm_2.4.116.imx.bb} | 7 +++---- 2 files changed, 7 insertions(+), 8 deletions(-) rename recipes-graphics/drm/{libdrm_2.4.115.imx.bb => libdrm_2.4.116.imx.bb} (94%) diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc index 78c1e762e..9b6439bc6 100644 --- a/conf/machine/include/imx-base.inc +++ b/conf/machine/include/imx-base.inc @@ -581,10 +581,10 @@ PREFERRED_VERSION_wayland-protocols:mx9-nxp-bsp ??= "1.32.imx" PREFERRED_VERSION_xwayland:imx-nxp-bsp ??= "23.1.1.imx" # Use i.MX libdrm Version -PREFERRED_VERSION_libdrm:mx6-nxp-bsp ??= "2.4.115.imx" -PREFERRED_VERSION_libdrm:mx7-nxp-bsp ??= "2.4.115.imx" -PREFERRED_VERSION_libdrm:mx8-nxp-bsp ??= "2.4.115.imx" -PREFERRED_VERSION_libdrm:mx9-nxp-bsp ??= "2.4.115.imx" +PREFERRED_VERSION_libdrm:mx6-nxp-bsp ??= "2.4.116.imx" +PREFERRED_VERSION_libdrm:mx7-nxp-bsp ??= "2.4.116.imx" +PREFERRED_VERSION_libdrm:mx8-nxp-bsp ??= "2.4.116.imx" +PREFERRED_VERSION_libdrm:mx9-nxp-bsp ??= "2.4.116.imx" PREFERRED_VERSION_spirv-headers:imxvulkan ??= "1.3.239.0.imx" PREFERRED_VERSION_spirv-tools:imxvulkan ??= "1.3.239.0.imx" diff --git a/recipes-graphics/drm/libdrm_2.4.115.imx.bb b/recipes-graphics/drm/libdrm_2.4.116.imx.bb similarity index 94% rename from recipes-graphics/drm/libdrm_2.4.115.imx.bb rename to recipes-graphics/drm/libdrm_2.4.116.imx.bb index ada0b7aed..ff23f35f3 100644 --- a/recipes-graphics/drm/libdrm_2.4.115.imx.bb +++ b/recipes-graphics/drm/libdrm_2.4.116.imx.bb @@ -13,8 +13,8 @@ DEPENDS = "libpthread-stubs" SRC_URI = "${IMX_LIBDRM_SRC};branch=${SRCBRANCH}" IMX_LIBDRM_SRC ?= "git://github.com/nxp-imx/libdrm-imx.git;protocol=https" -SRCBRANCH ?= "libdrm-imx-2.4.115" -SRCREV = "0f889a1f9640f6210132dd565141eb19005245fb" +SRCBRANCH = "libdrm-imx-2.4.116" +SRCREV = "2f1797674f94572ae8c365c8cbffb0263337ed57" S = "${WORKDIR}/git" @@ -45,7 +45,7 @@ PACKAGECONFIG[manpages] = "-Dman-pages=enabled,-Dman-pages=disabled,libxslt-nati ALLOW_EMPTY:${PN}-drivers = "1" PACKAGES =+ "${PN}-tests ${PN}-drivers ${PN}-radeon ${PN}-nouveau ${PN}-omap \ - ${PN}-intel ${PN}-exynos ${PN}-kms ${PN}-freedreno ${PN}-amdgpu \ + ${PN}-intel ${PN}-exynos ${PN}-freedreno ${PN}-amdgpu \ ${PN}-etnaviv" RRECOMMENDS:${PN}-drivers = "${PN}-radeon ${PN}-nouveau ${PN}-omap ${PN}-intel \ @@ -58,7 +58,6 @@ FILES:${PN}-nouveau = "${libdir}/libdrm_nouveau.so.*" FILES:${PN}-omap = "${libdir}/libdrm_omap.so.*" FILES:${PN}-intel = "${libdir}/libdrm_intel.so.*" FILES:${PN}-exynos = "${libdir}/libdrm_exynos.so.*" -FILES:${PN}-kms = "${libdir}/libkms*.so.*" FILES:${PN}-freedreno = "${libdir}/libdrm_freedreno.so.*" FILES:${PN}-amdgpu = "${libdir}/libdrm_amdgpu.so.* ${datadir}/${PN}/amdgpu.ids" FILES:${PN}-etnaviv = "${libdir}/libdrm_etnaviv.so.*" From 364fa4a6416758ae8c47f3165336caae6951fe36 Mon Sep 17 00:00:00 2001 From: Tom Hochstein Date: Wed, 24 Apr 2024 09:20:50 -0700 Subject: [PATCH 02/13] imx-gpu-viv: Upgrade 6.4.11.p2.2 -> 6.4.11.p2.4 Drops OpenGL support. Align with NXP BSP 6.6.3-1.0.0. Signed-off-by: Tom Hochstein --- conf/machine/include/imx-base.inc | 3 ++- .../imx-gpu-viv/imx-gpu-viv-6.inc | 22 ++----------------- .../imx-gpu-viv_6.4.11.p2.2-aarch32.bb | 10 --------- .../imx-gpu-viv_6.4.11.p2.2-aarch64.bb | 10 --------- .../imx-gpu-viv_6.4.11.p2.4-aarch32.bb | 10 +++++++++ .../imx-gpu-viv_6.4.11.p2.4-aarch64.bb | 10 +++++++++ recipes-graphics/mesa/mesa-gl_%.bbappend | 9 +++++++- 7 files changed, 32 insertions(+), 42 deletions(-) delete mode 100644 recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p2.2-aarch32.bb delete mode 100644 recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p2.2-aarch64.bb create mode 100644 recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p2.4-aarch32.bb create mode 100644 recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p2.4-aarch64.bb diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc index 9b6439bc6..9b8c1dc3a 100644 --- a/conf/machine/include/imx-base.inc +++ b/conf/machine/include/imx-base.inc @@ -555,7 +555,8 @@ PREFERRED_PROVIDER_virtual/libgles1 ?= "mesa" PREFERRED_PROVIDER_virtual/libgles2 ?= "mesa" PREFERRED_PROVIDER_virtual/egl:imxgpu ?= "imx-gpu-viv" -PREFERRED_PROVIDER_virtual/libgl:imxgpu3d ?= "imx-gpu-viv" +PREFERRED_PROVIDER_virtual/libgl:imxgpu ?= "mesa-gl" +PREFERRED_PROVIDER_virtual/mesa:imxgpu ?= "mesa-gl" PREFERRED_PROVIDER_virtual/libgles1:imxgpu3d ?= "imx-gpu-viv" PREFERRED_PROVIDER_virtual/libgles2:imxgpu3d ?= "imx-gpu-viv" PREFERRED_PROVIDER_virtual/libgles3:imxgpu3d ?= "imx-gpu-viv" 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 56a9ec4d2..e33df4441 100644 --- a/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc +++ b/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc @@ -1,6 +1,6 @@ # Copyright (C) 2012-2016 Freescale Semiconductor # Copyright (C) 2012-2018 O.S. Systems Software LTDA. -# Copyright 2017-2023 NXP +# Copyright 2017-2024 NXP # Released under the MIT license (see COPYING.MIT for the terms) DESCRIPTION = "GPU driver and apps for i.MX" @@ -20,11 +20,6 @@ DEPENDS += " \ DEPENDS:append:imxdrm = " libdrm wayland" DEPENDS:append:mx8-nxp-bsp = " patchelf-native" -# imx-gpu-viv does not provide everything it needs to for virtual/libgl -# on x11 backend or on Wayland backend with XWayland support. -# We depend on mesa to fill in what is missing. -DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'mesa', '', d)}" - DEPENDS:append:libc-musl = " gcompat" PROVIDES += " \ @@ -40,7 +35,6 @@ EXTRA_PROVIDES = " \ ${PROVIDES_OPENVX} \ " EXTRA_PROVIDES:append:imxgpu3d = " \ - virtual/libgl \ virtual/libgles1 \ virtual/libgles2 \ " @@ -86,7 +80,6 @@ PACKAGECONFIG[valgrind] = "" # Note : If you add a package here, to prevent a naming conflict see the python_anonymous() futher below PACKAGES =+ " \ - libgl-imx libgl-imx-dev \ libgles1-imx libgles1-imx-dev \ libgles2-imx libgles2-imx-dev \ libgles3-imx-dev \ @@ -149,7 +142,7 @@ python __anonymous() { # For the packages that make up the OpenGL interfaces, inject variables so that # they don't get Debian-renamed (which would remove the -imx suffix). - for p in (("libegl", "libegl1"), ("libgl", "libgl1"), + for p in (("libegl", "libegl1"), ("libgles1", "libglesv1-cm1"), ("libgles2", "libglesv2-2"), ("libgles3",), ("libgbm",)): fullp = p[0] + "-imx" @@ -290,8 +283,6 @@ do_install () { # FIXME: MX6SL does not have 3D support; hack it for now if [ "${IS_MX6SL}" = "1" ]; then rm -rf ${D}${libdir}/libCLC* ${D}${includedir}/CL \ - \ - ${D}${libdir}/libGL* ${D}${includedir}/GL* ${D}${libdir}/pkgconfig/gl.pc \ \ ${D}${libdir}/libGLES* ${D}${libdir}/pkgconfig/gles*.pc \ \ @@ -377,15 +368,6 @@ OPENCL_VX_INTRINSIC_EXTENSION_PACKAGES:mx8qm-nxp-bsp = "libclc-imx libopencl-imx OPENCL_VX_INTRINSIC_EXTENSION_PACKAGES:mx8mp-nxp-bsp = "libclc-imx libopencl-imx-dev" INSANE_SKIP:libopenvx-imx += "dev-deps" -FILES:libgl-imx = "${libdir}/libGL${REALSOLIBS} ${libdir}/libGL${SOLIBS}" -FILES:libgl-imx-dev = "${includedir}/GL ${libdir}/pkgconfig/gl.pc" -# libGL is only targeting X11 backend, and in case if Wayland-only is used - -# package QA complains on missing RDEPENDS, which are only available for X11. -# Skip "file-rdeps" QA for this package. -INSANE_SKIP:libgl-imx += "file-rdeps" -# libEGL does dlopen of libGL.so -INSANE_SKIP:libgl-imx += "dev-so" - FILES:libgles1-imx = "${libdir}/libGLESv1*${REALSOLIBS} ${libdir}/libGLESv1*${SOLIBS} ${libdir}/libGLES_*${REALSOLIBS} ${libdir}/libGLES_*${SOLIBS}" FILES:libgles1-imx-dev = "${includedir}/GLES ${libdir}/pkgconfig/glesv1_cm.pc" RPROVIDES:libgles1-imx = "libgles-imx" diff --git a/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p2.2-aarch32.bb b/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p2.2-aarch32.bb deleted file mode 100644 index 07a922467..000000000 --- a/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p2.2-aarch32.bb +++ /dev/null @@ -1,10 +0,0 @@ -require imx-gpu-viv-6.inc - -LIC_FILES_CHKSUM = "file://COPYING;md5=2827219e81f28aba7c6a569f7c437fa7" - -IMX_SRCREV_ABBREV = "fd0148d" - -SRC_URI[md5sum] = "267d3e2d580e264157b7de01df22fb66" -SRC_URI[sha256sum] = "15efe6da5d4bac2a6067c2a898190be8754df6f14128c3db4756cff59c6da049" - -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.2-aarch64.bb b/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p2.2-aarch64.bb deleted file mode 100644 index cea83ddc9..000000000 --- a/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p2.2-aarch64.bb +++ /dev/null @@ -1,10 +0,0 @@ -require imx-gpu-viv-6.inc - -LIC_FILES_CHKSUM = "file://COPYING;md5=2827219e81f28aba7c6a569f7c437fa7" - -IMX_SRCREV_ABBREV = "fd0148d" - -SRC_URI[md5sum] = "b76784e04f24ec9f2bedf2dd377ed5a8" -SRC_URI[sha256sum] = "6e34f3718925ba37c362cd09a3228cc56d03cfad323ebae0932f64449dbaeb2e" - -COMPATIBLE_MACHINE = "(mx8-nxp-bsp)" diff --git a/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p2.4-aarch32.bb b/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p2.4-aarch32.bb new file mode 100644 index 000000000..2b1724664 --- /dev/null +++ b/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p2.4-aarch32.bb @@ -0,0 +1,10 @@ +require imx-gpu-viv-6.inc + +LIC_FILES_CHKSUM = "file://COPYING;md5=44a8052c384584ba09077e85a3d1654f" + +IMX_SRCREV_ABBREV = "b07999b" + +SRC_URI[md5sum] = "eae60321ac971293d3213c88b9198ca0" +SRC_URI[sha256sum] = "ef9be89d3dd3b6448c720e061a8b81bdd26f7a5ff70de1786a5feef2e4836474" + +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.4-aarch64.bb b/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p2.4-aarch64.bb new file mode 100644 index 000000000..b3c397362 --- /dev/null +++ b/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p2.4-aarch64.bb @@ -0,0 +1,10 @@ +require imx-gpu-viv-6.inc + +LIC_FILES_CHKSUM = "file://COPYING;md5=44a8052c384584ba09077e85a3d1654f" + +IMX_SRCREV_ABBREV = "b07999b" + +SRC_URI[md5sum] = "142d9b9ef6f440b8e307569873bdb6b5" +SRC_URI[sha256sum] = "ba86656c357c5d9793058695f320e4cf650d4693e84321870bad392f2a622807" + +COMPATIBLE_MACHINE = "(mx8-nxp-bsp)" diff --git a/recipes-graphics/mesa/mesa-gl_%.bbappend b/recipes-graphics/mesa/mesa-gl_%.bbappend index dafd27f0a..6545571fa 100644 --- a/recipes-graphics/mesa/mesa-gl_%.bbappend +++ b/recipes-graphics/mesa/mesa-gl_%.bbappend @@ -1 +1,8 @@ -COMPATIBLE_MACHINE:imxgpu = "(-)" +DEPENDS:append:imxgpu = " virtual/egl" + +do_install:append:imxgpu() { + # imx-gpu-viv and mali-imx both provide /usr/include/KHR, so drop the mesa-gl one + rm -rf ${D}${includedir}/KHR +} + +COMPATIBLE_MACHINE:imxgpu = "(imxgpu)" From 73d1f62440b593322f0259ef6fea25b505c4c2c5 Mon Sep 17 00:00:00 2001 From: Tom Hochstein Date: Wed, 24 Apr 2024 10:05:25 -0700 Subject: [PATCH 03/13] kernel-module-imx-gpu-viv: Upgrade 6.4.11.p2.2 -> 6.4.11.p2.4 Align with NXP BSP 6.6.3-1.0.0. Signed-off-by: Tom Hochstein --- ...1.p2.2.bb => kernel-module-imx-gpu-viv_6.4.11.p2.4.bb} | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) rename recipes-kernel/kernel-modules/{kernel-module-imx-gpu-viv_6.4.11.p2.2.bb => kernel-module-imx-gpu-viv_6.4.11.p2.4.bb} (84%) diff --git a/recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_6.4.11.p2.2.bb b/recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_6.4.11.p2.4.bb similarity index 84% rename from recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_6.4.11.p2.2.bb rename to recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_6.4.11.p2.4.bb index 7aae0cd76..e48d72585 100644 --- a/recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_6.4.11.p2.2.bb +++ b/recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_6.4.11.p2.4.bb @@ -1,5 +1,5 @@ # Copyright (C) 2015-2016 Freescale Semiconductor -# Copyright (C) 2017-2021 NXP +# Copyright (C) 2017-2024 NXP SUMMARY = "Kernel loadable module for Vivante GPU" DESCRIPTION = "Builds the Vivante GPU kernel driver as a loadable kernel module, \ @@ -10,9 +10,9 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0-only;md5=801f80980d171d SRC_URI = "${KERNEL_SRC};subpath=drivers/mxc/gpu-viv;destsuffix=git/src \ file://Add-makefile.patch" KERNEL_SRC ?= "git://github.com/nxp-imx/linux-imx.git;protocol=https;branch=${SRCBRANCH}" -SRCBRANCH = "lf-6.1.y" -LOCALVERSION = "-6.1.55-2.2.0" -SRCREV = "770c5fe2c1d1529fae21b7043911cd50c6cf087e" +SRCBRANCH = "lf-6.6.y" +LOCALVERSION = "-6.6.3-1.0.0" +SRCREV = "3571388e9660f96b65b5fdcc093cc973ee502949" S = "${WORKDIR}/git" From 21faf768fb4753614f48c06f9af9ebf1402ccd02 Mon Sep 17 00:00:00 2001 From: Tom Hochstein Date: Wed, 24 Apr 2024 11:00:29 -0700 Subject: [PATCH 04/13] imx-gpu-g2d: Upgrade 6.4.11.p2.2 -> 6.4.11.p2.4 Align with NXP BSP 6.6.3-1.0.0. Signed-off-by: Tom Hochstein --- ...d_6.4.11.p2.2.bb => imx-gpu-g2d_6.4.11.p2.4.bb} | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) rename recipes-graphics/imx-g2d/{imx-gpu-g2d_6.4.11.p2.2.bb => imx-gpu-g2d_6.4.11.p2.4.bb} (72%) diff --git a/recipes-graphics/imx-g2d/imx-gpu-g2d_6.4.11.p2.2.bb b/recipes-graphics/imx-g2d/imx-gpu-g2d_6.4.11.p2.4.bb similarity index 72% rename from recipes-graphics/imx-g2d/imx-gpu-g2d_6.4.11.p2.2.bb rename to recipes-graphics/imx-g2d/imx-gpu-g2d_6.4.11.p2.4.bb index b9a7d9387..3ebb8f884 100644 --- a/recipes-graphics/imx-g2d/imx-gpu-g2d_6.4.11.p2.2.bb +++ b/recipes-graphics/imx-g2d/imx-gpu-g2d_6.4.11.p2.4.bb @@ -1,21 +1,21 @@ # Copyright (C) 2016 Freescale Semiconductor -# Copyright 2017-2022 NXP +# Copyright 2017-2024 NXP # Copyright 2018 (C) O.S. Systems Software LTDA. # Released under the MIT license (see COPYING.MIT for the terms) DESCRIPTION = "G2D library using i.MX GPU" LICENSE = "Proprietary" -LIC_FILES_CHKSUM = "file://COPYING;md5=2827219e81f28aba7c6a569f7c437fa7" +LIC_FILES_CHKSUM = "file://COPYING;md5=44a8052c384584ba09077e85a3d1654f" DEPENDS = "libgal-imx" 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 = "fd0148d" -SRC_URI[aarch64.md5sum] = "ebc4cb8fdfa0b8ef9b11d7bb0fd4710f" -SRC_URI[aarch64.sha256sum] = "1cedc606be965b01300613ccea81b4fd589d940306bb1caa30a37c41928616ec" -SRC_URI[arm.md5sum] = "77233957a27ae4da3f01d33b3fbc69d9" -SRC_URI[arm.sha256sum] = "bc168b19096a997251e7137f82ffcff404c61709cf5f227c53a099f631569f76" +IMX_SRCREV_ABBREV = "b07999b" +SRC_URI[aarch64.md5sum] = "fa30ce75803697d5131d707b300258ee" +SRC_URI[aarch64.sha256sum] = "2dff0279ead132ec5fa61dbe9b2b1969135e8ce9fe7487957371327357d70ac7" +SRC_URI[arm.md5sum] = "c81be7c93b60c7d3f3eb5b7bfeda42a4" +SRC_URI[arm.sha256sum] = "e17ac373193622ec0c9aa490ef1b93551d22a2e88ee9f1098ed984e62f02a06c" S = "${WORKDIR}/${IMX_BIN_NAME}" From b1a6da98d63849df18628160d268c6a9b1521702 Mon Sep 17 00:00:00 2001 From: Tom Hochstein Date: Wed, 24 Apr 2024 11:04:55 -0700 Subject: [PATCH 05/13] imx-dpu-g2d: Upgrade 2.1.10 -> 2.1.12 Adds a separate package for i.MX 95 support. Align with NXP BSP 6.6.3-1.0.0. Signed-off-by: Tom Hochstein --- .../imx-g2d/imx-dpu-g2d_2.1.10.bb | 38 ---------------- .../imx-g2d/imx-dpu-g2d_2.1.12.bb | 45 +++++++++++++++++++ 2 files changed, 45 insertions(+), 38 deletions(-) delete mode 100644 recipes-graphics/imx-g2d/imx-dpu-g2d_2.1.10.bb create mode 100644 recipes-graphics/imx-g2d/imx-dpu-g2d_2.1.12.bb diff --git a/recipes-graphics/imx-g2d/imx-dpu-g2d_2.1.10.bb b/recipes-graphics/imx-g2d/imx-dpu-g2d_2.1.10.bb deleted file mode 100644 index 16011bd40..000000000 --- a/recipes-graphics/imx-g2d/imx-dpu-g2d_2.1.10.bb +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright (C) 2016 Freescale Semiconductor -# Copyright 2017-2022 NXP -# Released under the MIT license (see COPYING.MIT for the terms) - -DESCRIPTION = "G2D library using i.MX DPU" -LICENSE = "Proprietary" -LIC_FILES_CHKSUM = "file://COPYING;md5=db4762b09b6bda63da103963e6e081de" - -DEPENDS = "libgal-imx libdrm" -PROVIDES += "virtual/libg2d" - -SRC_URI = "${FSL_MIRROR}/${IMX_BIN_NAME}.bin;fsl-eula=true" -IMX_BIN_NAME = "${BP}-${IMX_SRCREV_ABBREV}" -IMX_SRCREV_ABBREV = "7ed5396" -SRC_URI[md5sum] = "eed4f724973192564474efbda83f67bc" -SRC_URI[sha256sum] = "bca725e442c1438990cf1b41a59194e6efbd080c63d9b683a0d572e27f900e25" - -S = "${WORKDIR}/${IMX_BIN_NAME}" - -inherit fsl-eula-unpack - -do_install () { - install -d ${D}${libdir} - install -d ${D}${includedir} - cp -d ${S}/g2d/usr/lib/*.so* ${D}${libdir} - cp -Pr ${S}/g2d/usr/include/* ${D}${includedir} -} - -INSANE_SKIP:append:libc-musl = " file-rdeps" -RDEPENDS:${PN}:append:libc-musl = " gcompat" - -# The packaged binaries have been stripped of debug info, so disable -# operations accordingly. -INHIBIT_PACKAGE_DEBUG_SPLIT = "1" -INHIBIT_PACKAGE_STRIP = "1" -INHIBIT_SYSROOT_STRIP = "1" - -COMPATIBLE_MACHINE = "(imxdpu)" diff --git a/recipes-graphics/imx-g2d/imx-dpu-g2d_2.1.12.bb b/recipes-graphics/imx-g2d/imx-dpu-g2d_2.1.12.bb new file mode 100644 index 000000000..b10cd997a --- /dev/null +++ b/recipes-graphics/imx-g2d/imx-dpu-g2d_2.1.12.bb @@ -0,0 +1,45 @@ +# Copyright (C) 2016 Freescale Semiconductor +# Copyright 2017-2024 NXP +# Released under the MIT license (see COPYING.MIT for the terms) + +DESCRIPTION = "G2D library using i.MX DPU" +LICENSE = "Proprietary" +LIC_FILES_CHKSUM = "file://COPYING;md5=44a8052c384584ba09077e85a3d1654f" + +DEPENDS = "libdrm ${LIBGAL_IMX}" +LIBGAL_IMX = "libgal-imx" +LIBGAL_IMX:mx95-nxp-bsp = "" + +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 = "ee47ef7" +IMX_SRC_URI_NAME = "v1" +SRC_URI[v1.md5sum] = "4150f09e27178101fdccb792b7cbc526" +SRC_URI[v1.sha256sum] = "bd7849376564f7e2eb55210f156afae00b49451de6de80cfbc5fbda15be6a2b0" + +IMX_SRCREV_ABBREV:mx95-nxp-bsp = "ee47ef7" +IMX_SRC_URI_NAME:mx95-nxp-bsp = "v2" +SRC_URI[v2.md5sum] = "031396e175c432eb6c84aad8e0a6fc7d" +SRC_URI[v2.sha256sum] = "0646d8cc8e53f22fc15a61f0b78cd5f73460520f91949bc1d29c10ecbf77307b" + +S = "${WORKDIR}/${IMX_BIN_NAME}" + +inherit fsl-eula-unpack + +do_install () { + install -d ${D}${libdir} + install -d ${D}${includedir} + cp -d ${S}/g2d/usr/lib/*.so* ${D}${libdir} + cp -Pr ${S}/g2d/usr/include/* ${D}${includedir} +} + +# The packaged binaries have been stripped of debug info, so disable +# operations accordingly. +INHIBIT_PACKAGE_DEBUG_SPLIT = "1" +INHIBIT_PACKAGE_STRIP = "1" +INHIBIT_SYSROOT_STRIP = "1" + +COMPATIBLE_MACHINE = "(imxdpu)" From 2f35f317a58def6724ea1b1908d2a29325fd81f4 Mon Sep 17 00:00:00 2001 From: Tom Hochstein Date: Wed, 24 Apr 2024 11:52:27 -0700 Subject: [PATCH 06/13] imx-pxp-g2d: Update to latest 9f9f41f Align with NXP BSP 6.6.3-1.0.0. Signed-off-by: Tom Hochstein --- recipes-graphics/imx-g2d/imx-pxp-g2d_git.bb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/recipes-graphics/imx-g2d/imx-pxp-g2d_git.bb b/recipes-graphics/imx-g2d/imx-pxp-g2d_git.bb index dedee983e..50c37a2c5 100644 --- a/recipes-graphics/imx-g2d/imx-pxp-g2d_git.bb +++ b/recipes-graphics/imx-g2d/imx-pxp-g2d_git.bb @@ -4,7 +4,7 @@ DESCRIPTION = "G2D library using i.MX PXP" LICENSE = "Proprietary" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=2827219e81f28aba7c6a569f7c437fa7" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=44a8052c384584ba09077e85a3d1654f" PROVIDES += "virtual/libg2d" @@ -12,8 +12,8 @@ PV = "2.1.0+git${SRCPV}" SRC_URI = "${IMX_PXP_G2D_SRC};branch=${SRCBRANCH}" IMX_PXP_G2D_SRC ?= "git://github.com/nxp-imx/imx-g2d-pxp.git;protocol=https" -SRCBRANCH ?= "imx_2.1" -SRCREV = "f3adab05bd0cbb7c38578110d772e8ddf52b4e8e" +SRCBRANCH = "imx_2.1" +SRCREV = "9f9f41fa0e86757f856e1ec7824f56022fe94586" S = "${WORKDIR}/git" From 353ae2dd16fa6b525f9f2987feedf32c1d6bebbb Mon Sep 17 00:00:00 2001 From: Tom Hochstein Date: Wed, 24 Apr 2024 11:54:44 -0700 Subject: [PATCH 07/13] imx-g2d-samples: Update to latest bec2f38 Adds support for i.MX 95. Align with NXP BSP 6.6.3-1.0.0. Signed-off-by: Tom Hochstein --- .../imx-g2d/imx-g2d-samples_git.bb | 22 +++++++++++++------ 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/recipes-graphics/imx-g2d/imx-g2d-samples_git.bb b/recipes-graphics/imx-g2d/imx-g2d-samples_git.bb index 649a16d24..55f88da39 100644 --- a/recipes-graphics/imx-g2d/imx-g2d-samples_git.bb +++ b/recipes-graphics/imx-g2d/imx-g2d-samples_git.bb @@ -9,8 +9,8 @@ PV = "2.1+git${SRCPV}" SRC_URI = "${GPU_G2D_SAMPLES_SRC};branch=${SRCBRANCH}" GPU_G2D_SAMPLES_SRC ?= "git://github.com/nxp-imx/g2d-samples.git;protocol=https" -SRCBRANCH ?= "imx_2.1" -SRCREV = "4391dcda499870418bb38fe395c3cba0664c5bab" +SRCBRANCH = "imx_2.1" +SRCREV = "bec2f3839737b0e83b68b1c976373d9a78e5762f" S = "${WORKDIR}/git" @@ -19,6 +19,7 @@ inherit pkgconfig PACKAGECONFIG ??= "${PACKAGECONFIG_IMPLEMENTATION}" PACKAGECONFIG_IMPLEMENTATION = "" PACKAGECONFIG_IMPLEMENTATION:imxgpu2d:imxdpu = "dpu" +PACKAGECONFIG_IMPLEMENTATION:mx95-nxp-bsp = "dpu95" PACKAGECONFIG_IMPLEMENTATION:imxgpu2d = "gpu-drm" PACKAGECONFIG_IMPLEMENTATION:imxgpu2d:imxfbdev = "gpu-fbdev" PACKAGECONFIG_IMPLEMENTATION:mx93-nxp-bsp = "pxp" @@ -29,28 +30,35 @@ PACKAGECONFIG[dpu] = " \ imx-dpu-g2d wayland-native wayland wayland-protocols, \ , \ , \ - gpu-drm gpu-fbdev pxp" + dpu95 gpu-drm gpu-fbdev pxp" +PACKAGECONFIG[dpu95] = " \ + BUILD_IMPLEMENTATION=dpu95, \ + , \ + imx-dpu-g2d wayland-native wayland wayland-protocols, \ + , \ + , \ + dpu gpu-drm gpu-fbdev pxp" PACKAGECONFIG[gpu-drm] = " \ BUILD_IMPLEMENTATION=gpu-drm, \ , \ imx-gpu-g2d wayland-native wayland wayland-protocols, \ , \ , \ - dpu gpu-fbdev pxp" + dpu dpu95 gpu-fbdev pxp" PACKAGECONFIG[gpu-fbdev] = " \ BUILD_IMPLEMENTATION=gpu-fbdev, \ , \ imx-gpu-g2d, \ , \ , \ - dpu gpu-drm pxp" + dpu dpu95 gpu-drm pxp" PACKAGECONFIG[pxp] = " \ BUILD_IMPLEMENTATION=pxp, \ , \ imx-pxp-g2d wayland-native wayland wayland-protocols, \ , \ , \ - dpu gpu-drm gpu-fbdev" + dpu dpu95 gpu-drm gpu-fbdev" EXTRA_OEMAKE += " \ SDKTARGETSYSROOT=${STAGING_DIR_HOST} \ @@ -65,4 +73,4 @@ FILES:${PN} += "/opt" PACKAGE_ARCH = "${MACHINE_SOCARCH}" -COMPATIBLE_MACHINE = "(imxgpu2d|mx93-nxp-bsp)" +COMPATIBLE_MACHINE = "(imxgpu2d|mx93-nxp-bsp|mx95-nxp-bsp)" From cafd1568d94790cd951e1058fecf645d4daef09d Mon Sep 17 00:00:00 2001 From: Tom Hochstein Date: Wed, 24 Apr 2024 11:59:18 -0700 Subject: [PATCH 08/13] imx-gpu-apitrace: Add support for i.MX 95 Align with NXP BSP 6.6.3-1.0.0. Signed-off-by: Tom Hochstein --- .../imx-gpu-apitrace/imx-gpu-apitrace_10.0.0.bb | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/recipes-graphics/imx-gpu-apitrace/imx-gpu-apitrace_10.0.0.bb b/recipes-graphics/imx-gpu-apitrace/imx-gpu-apitrace_10.0.0.bb index a2f049a8e..7d97f4755 100644 --- a/recipes-graphics/imx-gpu-apitrace/imx-gpu-apitrace_10.0.0.bb +++ b/recipes-graphics/imx-gpu-apitrace/imx-gpu-apitrace_10.0.0.bb @@ -2,7 +2,7 @@ SUMMARY = "Samples for OpenGL ES" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=aeb969185a143c3c25130bc2c3ef9a50" -DEPENDS = "imx-gpu-viv zlib libpng procps" +DEPENDS = "zlib libpng procps" SRC_URI = "git://github.com/nxp-imx/apitrace-imx.git;protocol=https;branch=imx_10.0 \ file://0001-dlsym-workaround-glibc-2.34-build-failure.patch \ @@ -18,11 +18,13 @@ PACKAGECONFIG_BACKEND:mx6-nxp-bsp = " \ bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', \ '', d), d)} \ " -PACKAGECONFIG_BACKEND:mx7-nxp-bsp = "${PACKAGECONFIG_BACKEND:mx6-nxp-bsp}" -PACKAGECONFIG_BACKEND:mx8-nxp-bsp = "waffle" +PACKAGECONFIG_BACKEND:mx7-nxp-bsp = "${PACKAGECONFIG_BACKEND:mx6-nxp-bsp}" +PACKAGECONFIG_BACKEND:mx8-nxp-bsp = "waffle" +PACKAGECONFIG_BACKEND:mx95-nxp-bsp = "waffle" -PACKAGECONFIG_GPU2D = "" -PACKAGECONFIG_GPU2D:imxgpu2d = "vivante" +PACKAGECONFIG_GPU2D = "" +PACKAGECONFIG_GPU2D:imxgpu2d = "vivante" +PACKAGECONFIG_GPU2D:mx95-nxp-bsp = "" PACKAGECONFIG ??= " \ egl \ From cf3f1a6c6e6c4db9775ead7b50b4d6294845ee94 Mon Sep 17 00:00:00 2001 From: Tom Hochstein Date: Wed, 24 Apr 2024 12:16:55 -0700 Subject: [PATCH 09/13] imx-vpu: Drop RPROVIDES of virtual/imxvpu It serves no purpose and generates a warning: ``` WARNING: meta-freescale/recipes-bsp/imx-vpu/imx-vpu_5.4.39.3.bb: QA Issue: RPROVIDES is set to virtual/imxvpu but the substring 'virtual/' holds no meaning in this context. It only works for build time dependencies, not runtime ones. It is suggested to use 'VIRTUAL-RUNTIME_' variables instead. [virtual-slash] ``` Signed-off-by: Tom Hochstein --- recipes-bsp/imx-vpu/imx-vpu_5.4.39.3.bb | 1 - 1 file changed, 1 deletion(-) diff --git a/recipes-bsp/imx-vpu/imx-vpu_5.4.39.3.bb b/recipes-bsp/imx-vpu/imx-vpu_5.4.39.3.bb index 383a0e2a9..553f39930 100644 --- a/recipes-bsp/imx-vpu/imx-vpu_5.4.39.3.bb +++ b/recipes-bsp/imx-vpu/imx-vpu_5.4.39.3.bb @@ -7,7 +7,6 @@ LICENSE = "Proprietary" LIC_FILES_CHKSUM = "file://COPYING;md5=228c72f2a91452b8a03c4cab30f30ef9" PROVIDES = "virtual/imxvpu" -RPROVIDES:${PN} = "virtual/imxvpu" PE = "1" From 771e4ececae9dc0b0a562c7321d94376849898e8 Mon Sep 17 00:00:00 2001 From: Tom Hochstein Date: Wed, 24 Apr 2024 13:08:45 -0700 Subject: [PATCH 10/13] vulkan/spir: Update downgrade 1.3.239.0.imx -> 1.3.261.1.imx Align with NXP BSP 6.6.3-1.0.0. Signed-off-by: Tom Hochstein --- conf/machine/include/imx-base.inc | 12 ++++++------ ...9.0.imx.bb => spirv-headers_1.3.261.1.imx.bb} | 9 +++++---- ...239.0.imx.bb => spirv-tools_1.3.261.1.imx.bb} | 10 +++++++--- ....0.imx.bb => vulkan-headers_1.3.261.1.imx.bb} | 10 +++++++--- ...9.0.imx.bb => vulkan-loader_1.3.261.1.imx.bb} | 8 ++++++-- ...39.0.imx.bb => vulkan-tools_1.3.261.1.imx.bb} | 8 ++++++-- ...=> vulkan-validation-layers_1.3.261.1.imx.bb} | 16 ++++++---------- ...pend => vulkan-loader_1.3.261.1.imx.bbappend} | 2 ++ 8 files changed, 45 insertions(+), 30 deletions(-) rename recipes-downgrade/spir/{spirv-headers_1.3.239.0.imx.bb => spirv-headers_1.3.261.1.imx.bb} (60%) rename recipes-downgrade/spir/{spirv-tools_1.3.239.0.imx.bb => spirv-tools_1.3.261.1.imx.bb} (79%) rename recipes-downgrade/vulkan/{vulkan-headers_1.3.239.0.imx.bb => vulkan-headers_1.3.261.1.imx.bb} (64%) rename recipes-downgrade/vulkan/{vulkan-loader_1.3.239.0.imx.bb => vulkan-loader_1.3.261.1.imx.bb} (82%) rename recipes-downgrade/vulkan/{vulkan-tools_1.3.239.0.imx.bb => vulkan-tools_1.3.261.1.imx.bb} (79%) rename recipes-downgrade/vulkan/{vulkan-validation-layers_1.3.239.0.imx.bb => vulkan-validation-layers_1.3.261.1.imx.bb} (73%) rename recipes-graphics/vulkan/{vulkan-loader_1.3.239.0.imx.bbappend => vulkan-loader_1.3.261.1.imx.bbappend} (69%) diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc index 9b8c1dc3a..4b2468424 100644 --- a/conf/machine/include/imx-base.inc +++ b/conf/machine/include/imx-base.inc @@ -587,12 +587,12 @@ PREFERRED_VERSION_libdrm:mx7-nxp-bsp ??= "2.4.116.imx" PREFERRED_VERSION_libdrm:mx8-nxp-bsp ??= "2.4.116.imx" PREFERRED_VERSION_libdrm:mx9-nxp-bsp ??= "2.4.116.imx" -PREFERRED_VERSION_spirv-headers:imxvulkan ??= "1.3.239.0.imx" -PREFERRED_VERSION_spirv-tools:imxvulkan ??= "1.3.239.0.imx" -PREFERRED_VERSION_vulkan-headers:imxvulkan ??= "1.3.239.0.imx" -PREFERRED_VERSION_vulkan-loader:imxvulkan ??= "1.3.239.0.imx" -PREFERRED_VERSION_vulkan-tools:imxvulkan ??= "1.3.239.0.imx" -PREFERRED_VERSION_vulkan-validation-layers:imxvulkan ??= "1.3.239.0.imx" +PREFERRED_VERSION_spirv-headers:imxvulkan ??= "1.3.261.1.imx" +PREFERRED_VERSION_spirv-tools:imxvulkan ??= "1.3.261.1.imx" +PREFERRED_VERSION_vulkan-headers:imxvulkan ??= "1.3.261.1.imx" +PREFERRED_VERSION_vulkan-loader:imxvulkan ??= "1.3.261.1.imx" +PREFERRED_VERSION_vulkan-tools:imxvulkan ??= "1.3.261.1.imx" +PREFERRED_VERSION_vulkan-validation-layers:imxvulkan ??= "1.3.261.1.imx" # Use i.MX optee Version PREFERRED_VERSION_optee-os:mx8-nxp-bsp ??= "4.0.0.imx" diff --git a/recipes-downgrade/spir/spirv-headers_1.3.239.0.imx.bb b/recipes-downgrade/spir/spirv-headers_1.3.261.1.imx.bb similarity index 60% rename from recipes-downgrade/spir/spirv-headers_1.3.239.0.imx.bb rename to recipes-downgrade/spir/spirv-headers_1.3.261.1.imx.bb index afd59cbcb..945f0879f 100644 --- a/recipes-downgrade/spir/spirv-headers_1.3.239.0.imx.bb +++ b/recipes-downgrade/spir/spirv-headers_1.3.261.1.imx.bb @@ -1,15 +1,16 @@ SUMMARY = "Machine-readable files for the SPIR-V Registry" -DESCRIPTION = "Headers are provided in the include directory, with up-to-date \ -headers in the unified1 subdirectory. Older headers are provided according to \ -their version." SECTION = "graphics" HOMEPAGE = "https://www.khronos.org/registry/spir-v" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=c938b85bceb8fb26c1a807f28a52ae2d" -SRCREV = "d13b52222c39a7e9a401b44646f0ca3a640fbd47" +SRCREV = "124a9665e464ef98b8b718d572d5f329311061eb" SRC_URI = "git://github.com/KhronosGroup/SPIRV-Headers;protocol=https;branch=main" PE = "1" +# These recipes need to be updated in lockstep with each other: +# glslang, vulkan-headers, vulkan-loader, vulkan-tools, spirv-headers, spirv-tools +# The tags versions should always be sdk-x.y.z, as this is what +# upstream considers a release. UPSTREAM_CHECK_GITTAGREGEX = "sdk-(?P\d+(\.\d+)+)" S = "${WORKDIR}/git" diff --git a/recipes-downgrade/spir/spirv-tools_1.3.239.0.imx.bb b/recipes-downgrade/spir/spirv-tools_1.3.261.1.imx.bb similarity index 79% rename from recipes-downgrade/spir/spirv-tools_1.3.239.0.imx.bb rename to recipes-downgrade/spir/spirv-tools_1.3.261.1.imx.bb index 5109bb533..690428829 100644 --- a/recipes-downgrade/spir/spirv-tools_1.3.239.0.imx.bb +++ b/recipes-downgrade/spir/spirv-tools_1.3.261.1.imx.bb @@ -7,13 +7,17 @@ SECTION = "graphics" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" -SRCREV = "63de608daeb7e91fbea6d7477a50debe7cac57ce" +SRCREV = "e553b884c7c9febaa4e52334f683641fb5f196a0" SRC_URI = "git://github.com/KhronosGroup/SPIRV-Tools.git;branch=main;protocol=https" PE = "1" +# These recipes need to be updated in lockstep with each other: +# glslang, vulkan-headers, vulkan-loader, vulkan-tools, spirv-headers, spirv-tools +# The tags versions should always be sdk-x.y.z, as this is what +# upstream considers a release. UPSTREAM_CHECK_GITTAGREGEX = "sdk-(?P\d+(\.\d+)+)" S = "${WORKDIR}/git" -inherit cmake python3native +inherit cmake DEPENDS = "spirv-headers" @@ -28,7 +32,7 @@ do_install:append:class-target() { # Properly set _IMPORT_PREFIX in INTERFACE_LINK_LIBRARIES so that dependent # tools can find the right library sed -i ${D}${libdir}/cmake/SPIRV-Tools/SPIRV-ToolsTarget.cmake \ - -e 's:INTERFACE_LINK_LIBRARIES.*$:INTERFACE_LINK_LIBRARIES "\$\{_IMPORT_PREFIX\}/lib":' + -e 's:INTERFACE_LINK_LIBRARIES.*$:INTERFACE_LINK_LIBRARIES "\$\{_IMPORT_PREFIX\}/${baselib}":' } # all the libraries are unversioned, so don't pack it on PN-dev diff --git a/recipes-downgrade/vulkan/vulkan-headers_1.3.239.0.imx.bb b/recipes-downgrade/vulkan/vulkan-headers_1.3.261.1.imx.bb similarity index 64% rename from recipes-downgrade/vulkan/vulkan-headers_1.3.239.0.imx.bb rename to recipes-downgrade/vulkan/vulkan-headers_1.3.261.1.imx.bb index a6b30fa83..01eb14b9f 100644 --- a/recipes-downgrade/vulkan/vulkan-headers_1.3.239.0.imx.bb +++ b/recipes-downgrade/vulkan/vulkan-headers_1.3.261.1.imx.bb @@ -7,11 +7,11 @@ HOMEPAGE = "https://www.khronos.org/vulkan/" BUGTRACKER = "https://github.com/KhronosGroup/Vulkan-Headers" SECTION = "libs" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57" +LICENSE = "Apache-2.0 & MIT" +LIC_FILES_CHKSUM = "file://LICENSE.md;md5=1bc355d8c4196f774c8b87ed1a8dd625" SRC_URI = "git://github.com/KhronosGroup/Vulkan-Headers.git;branch=main;protocol=https" -SRCREV = "2bb0a23104ceffd9a28d5b7401f2cee7dae35bb8" +SRCREV = "85c2334e92e215cce34e8e0ed8b2dce4700f4a50" S = "${WORKDIR}/git" @@ -20,4 +20,8 @@ inherit cmake FILES:${PN} += "${datadir}/vulkan" RDEPENDS:${PN} += "python3-core" +# These recipes need to be updated in lockstep with each other: +# glslang, vulkan-headers, vulkan-loader, vulkan-tools, spirv-headers, spirv-tools +# The tags versions should always be sdk-x.y.z, as this is what +# upstream considers a release. UPSTREAM_CHECK_GITTAGREGEX = "sdk-(?P\d+(\.\d+)+)" diff --git a/recipes-downgrade/vulkan/vulkan-loader_1.3.239.0.imx.bb b/recipes-downgrade/vulkan/vulkan-loader_1.3.261.1.imx.bb similarity index 82% rename from recipes-downgrade/vulkan/vulkan-loader_1.3.239.0.imx.bb rename to recipes-downgrade/vulkan/vulkan-loader_1.3.261.1.imx.bb index e11f936a0..01cbeafa3 100644 --- a/recipes-downgrade/vulkan/vulkan-loader_1.3.239.0.imx.bb +++ b/recipes-downgrade/vulkan/vulkan-loader_1.3.261.1.imx.bb @@ -9,8 +9,8 @@ SECTION = "libs" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=7dbefed23242760aa3475ee42801c5ac" -SRC_URI = "git://github.com/KhronosGroup/Vulkan-Loader.git;branch=sdk-1.3.239;protocol=https" -SRCREV = "fa421a02686e7f01c8e4af24650fa04374df8338" +SRC_URI = "git://github.com/KhronosGroup/Vulkan-Loader.git;branch=main;protocol=https" +SRCREV = "afdd025ead2b63b2c73d900ab128a2d3b512cdf0" S = "${WORKDIR}/git" @@ -35,4 +35,8 @@ PACKAGECONFIG[wayland] = "-DBUILD_WSI_WAYLAND_SUPPORT=ON, -DBUILD_WSI_WAYLAND_SU RRECOMMENDS:${PN} = "mesa-vulkan-drivers" +# These recipes need to be updated in lockstep with each other: +# glslang, vulkan-headers, vulkan-loader, vulkan-tools, spirv-headers, spirv-tools +# The tags versions should always be sdk-x.y.z, as this is what +# upstream considers a release. UPSTREAM_CHECK_GITTAGREGEX = "sdk-(?P\d+(\.\d+)+)" diff --git a/recipes-downgrade/vulkan/vulkan-tools_1.3.239.0.imx.bb b/recipes-downgrade/vulkan/vulkan-tools_1.3.261.1.imx.bb similarity index 79% rename from recipes-downgrade/vulkan/vulkan-tools_1.3.239.0.imx.bb rename to recipes-downgrade/vulkan/vulkan-tools_1.3.261.1.imx.bb index 934bd53ee..7a7edc9eb 100644 --- a/recipes-downgrade/vulkan/vulkan-tools_1.3.239.0.imx.bb +++ b/recipes-downgrade/vulkan/vulkan-tools_1.3.261.1.imx.bb @@ -6,8 +6,8 @@ SECTION = "libs" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57" -SRC_URI = "git://github.com/KhronosGroup/Vulkan-Tools.git;branch=sdk-1.3.239;protocol=https" -SRCREV = "84c61c463aecdda385de33b0149c7368119c23f6" +SRC_URI = "git://github.com/KhronosGroup/Vulkan-Tools.git;branch=main;protocol=https" +SRCREV = "a7da7027ca9fd0901639f02619c226da9c6036f1" S = "${WORKDIR}/git" @@ -29,4 +29,8 @@ PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'wayland x11', d)}" PACKAGECONFIG[x11] = "-DBUILD_WSI_XLIB_SUPPORT=ON -DBUILD_WSI_XCB_SUPPORT=ON, -DBUILD_WSI_XLIB_SUPPORT=OFF -DBUILD_WSI_XCB_SUPPORT=OFF, libxcb libx11 libxrandr" PACKAGECONFIG[wayland] = "-DBUILD_WSI_WAYLAND_SUPPORT=ON, -DBUILD_WSI_WAYLAND_SUPPORT=OFF, wayland" +# These recipes need to be updated in lockstep with each other: +# glslang, vulkan-headers, vulkan-loader, vulkan-tools, spirv-headers, spirv-tools +# The tags versions should always be sdk-x.y.z, as this is what +# upstream considers a release. UPSTREAM_CHECK_GITTAGREGEX = "sdk-(?P\d+(\.\d+)+)" diff --git a/recipes-downgrade/vulkan/vulkan-validation-layers_1.3.239.0.imx.bb b/recipes-downgrade/vulkan/vulkan-validation-layers_1.3.261.1.imx.bb similarity index 73% rename from recipes-downgrade/vulkan/vulkan-validation-layers_1.3.239.0.imx.bb rename to recipes-downgrade/vulkan/vulkan-validation-layers_1.3.261.1.imx.bb index 5f699c2ba..1e2a0aced 100644 --- a/recipes-downgrade/vulkan/vulkan-validation-layers_1.3.239.0.imx.bb +++ b/recipes-downgrade/vulkan/vulkan-validation-layers_1.3.261.1.imx.bb @@ -5,11 +5,11 @@ HOMEPAGE = "https://www.khronos.org/vulkan/" BUGTRACKER = "https://github.com/KhronosGroup/Vulkan-ValidationLayers" SECTION = "libs" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=8df9e8826734226d08cb412babfa599c" +LICENSE = "Apache-2.0 & MIT" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=cd3c0bc366cd9b6a906e22f0bcb5910f" -SRC_URI = "git://git@github.com/KhronosGroup/Vulkan-ValidationLayers.git;branch=main;protocol=https" -SRCREV = "60e58bc683807fa396b1287deace8b45cfd957a3" +SRC_URI = "git://git@github.com/KhronosGroup/Vulkan-ValidationLayers.git;branch=sdk-1.3.261;protocol=https" +SRCREV = "628cd310bef6d54b4e6b25b5ac2ed013473409d6" S = "${WORKDIR}/git" @@ -18,16 +18,12 @@ REQUIRED_DISTRO_FEATURES = "vulkan" DEPENDS = "vulkan-headers vulkan-loader spirv-headers spirv-tools glslang" # BUILD_TESTS - Not required for OE builds -# BUILD_WERROR - There are too many compiler warnings/errors due to upgrades in version -# of clang. Requiring a number of patches from upstream. Disable compiler -# -Werror to bypass build issues. # USE_ROBIN_HOOD_HASHING - Provides substantial performance improvements on all platforms. # Yocto project doesn't contain a recipe for package so disabled it. EXTRA_OECMAKE = "\ -DBUILD_TESTS=OFF \ - -DBUILD_WERROR=OFF \ -DUSE_ROBIN_HOOD_HASHING=OFF \ - -DGLSLANG_INSTALL_DIR=${STAGING_DATADIR} \ + -DGLSLANG_INSTALL_DIR=${STAGING_LIBDIR} \ -DVULKAN_HEADERS_INSTALL_DIR=${STAGING_EXECPREFIXDIR} \ -DSPIRV_HEADERS_INSTALL_DIR=${STAGING_EXECPREFIXDIR} \ " @@ -35,7 +31,7 @@ EXTRA_OECMAKE = "\ PACKAGECONFIG[x11] = "-DBUILD_WSI_XLIB_SUPPORT=ON -DBUILD_WSI_XCB_SUPPORT=ON, -DBUILD_WSI_XLIB_SUPPORT=OFF -DBUILD_WSI_XCB_SUPPORT=OFF, libxcb libx11 libxrandr" PACKAGECONFIG[wayland] = "-DBUILD_WSI_WAYLAND_SUPPORT=ON, -DBUILD_WSI_WAYLAND_SUPPORT=OFF, wayland" -PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'x11 wayland', d)}" +PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'x11 wayland', d)}" inherit cmake features_check pkgconfig diff --git a/recipes-graphics/vulkan/vulkan-loader_1.3.239.0.imx.bbappend b/recipes-graphics/vulkan/vulkan-loader_1.3.261.1.imx.bbappend similarity index 69% rename from recipes-graphics/vulkan/vulkan-loader_1.3.239.0.imx.bbappend rename to recipes-graphics/vulkan/vulkan-loader_1.3.261.1.imx.bbappend index 05f566a89..c1a9902b7 100644 --- a/recipes-graphics/vulkan/vulkan-loader_1.3.239.0.imx.bbappend +++ b/recipes-graphics/vulkan/vulkan-loader_1.3.261.1.imx.bbappend @@ -5,3 +5,5 @@ INSANE_SKIP:${PN} += "dev-so" # Override default mesa drivers with i.MX GPU drivers RRECOMMENDS:${PN}:imxvulkan = "libvulkan-imx" +# Override default mesa drivers with i.MX GPU drivers +RRECOMMENDS:${PN}:mx95-nxp-bsp = "mali-imx-libvulkan" From 84bb2909ec03f4e8212e23836b8e8e0ec6933991 Mon Sep 17 00:00:00 2001 From: Tom Hochstein Date: Wed, 24 Apr 2024 14:40:22 -0700 Subject: [PATCH 11/13] 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 --- conf/machine/include/imx-base.inc | 4 ++-- ...Revert-protocol-no-found-wayland-scanner-with-Yocto-.patch | 0 .../0001-g2d-renderer.c-Include-sys-stat.h.patch | 0 .../wayland/{weston_10.0.4.imx.bb => weston_10.0.5.imx.bb} | 4 ++-- 4 files changed, 4 insertions(+), 4 deletions(-) rename recipes-graphics/wayland/{weston-10.0.4.imx => weston-10.0.5.imx}/0001-Revert-protocol-no-found-wayland-scanner-with-Yocto-.patch (100%) rename recipes-graphics/wayland/{weston-10.0.4.imx => weston-10.0.5.imx}/0001-g2d-renderer.c-Include-sys-stat.h.patch (100%) rename recipes-graphics/wayland/{weston_10.0.4.imx.bb => weston_10.0.5.imx.bb} (99%) diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc index 4b2468424..adbf5ad17 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" PREFERRED_VERSION_weston:imx-nxp-bsp ??= "11.0.3.imx" # i.MX 6 & 7 stay on weston 10.0 for fbdev -PREFERRED_VERSION_weston:mx6-nxp-bsp ??= "10.0.4.imx" -PREFERRED_VERSION_weston:mx7-nxp-bsp ??= "10.0.4.imx" +PREFERRED_VERSION_weston:mx6-nxp-bsp ??= "10.0.5.imx" +PREFERRED_VERSION_weston:mx7-nxp-bsp ??= "10.0.5.imx" PREFERRED_VERSION_weston:imx-mainline-bsp = "" PREFERRED_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 similarity index 100% rename from recipes-graphics/wayland/weston-10.0.4.imx/0001-Revert-protocol-no-found-wayland-scanner-with-Yocto-.patch rename to 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 similarity index 100% rename from recipes-graphics/wayland/weston-10.0.4.imx/0001-g2d-renderer.c-Include-sys-stat.h.patch rename to 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 similarity index 99% rename from recipes-graphics/wayland/weston_10.0.4.imx.bb rename to recipes-graphics/wayland/weston_10.0.5.imx.bb index e31d22809..99624887f 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} SRC_URI:prepend = "git://github.com/nxp-imx/weston-imx.git;protocol=https;branch=${SRCBRANCH} " 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.4" -SRCREV = "6210a8f1302252273b50cc3c0ff55ec680dda479" +SRCBRANCH = "weston-imx-10.0.5" +SRCREV = "0cc822a1e5a8faea6835a4e9259887d8792b86b4" S = "${WORKDIR}/git" # Disable OpenGL for parts with GPU support for 2D but not 3D From a97b02bb29070ef9f3711ce1b3a081ba1a99c002 Mon Sep 17 00:00:00 2001 From: Tom Hochstein Date: Wed, 24 Apr 2024 14:41:11 -0700 Subject: [PATCH 12/13] weston: Upgrade 11.0.3.imx -> 12.0.3.imx Align with NXP BSP 6.6.3-1.0.0. Signed-off-by: Tom Hochstein --- conf/machine/include/imx-base.inc | 2 +- ...no-found-wayland-scanner-with-Yocto-.patch | 15 +++---- .../wayland/weston/xwayland.weston-start | 4 +- ...ton_11.0.3.imx.bb => weston_12.0.3.imx.bb} | 40 +++++++++++-------- 4 files changed, 32 insertions(+), 29 deletions(-) rename recipes-graphics/wayland/{weston_11.0.3.imx.bb => weston_12.0.3.imx.bb} (84%) diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc index adbf5ad17..3e551ae53 100644 --- a/conf/machine/include/imx-base.inc +++ b/conf/machine/include/imx-base.inc @@ -568,7 +568,7 @@ PREFERRED_PROVIDER_opencl-headers:imxgpu ?= "imx-gpu-viv" PREFERRED_PROVIDER_opencl-icd-loader:imxgpu ?= "imx-gpu-viv" PREFERRED_PROVIDER_virtual/opencl-icd:imxgpu ?= "imx-gpu-viv" -PREFERRED_VERSION_weston:imx-nxp-bsp ??= "11.0.3.imx" +PREFERRED_VERSION_weston:imx-nxp-bsp ??= "12.0.3.imx" # i.MX 6 & 7 stay on weston 10.0 for fbdev PREFERRED_VERSION_weston:mx6-nxp-bsp ??= "10.0.5.imx" PREFERRED_VERSION_weston:mx7-nxp-bsp ??= "10.0.5.imx" diff --git a/recipes-graphics/wayland/weston/0001-Revert-protocol-no-found-wayland-scanner-with-Yocto-.patch b/recipes-graphics/wayland/weston/0001-Revert-protocol-no-found-wayland-scanner-with-Yocto-.patch index 25a4770f8..4d2a333a3 100644 --- a/recipes-graphics/wayland/weston/0001-Revert-protocol-no-found-wayland-scanner-with-Yocto-.patch +++ b/recipes-graphics/wayland/weston/0001-Revert-protocol-no-found-wayland-scanner-with-Yocto-.patch @@ -26,16 +26,13 @@ Signed-off-by: Max Krummenacher protocol/meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/protocol/meson.build b/protocol/meson.build -index e8698530..ba52089b 100644 ---- a/protocol/meson.build -+++ b/protocol/meson.build +Index: git/protocol/meson.build +=================================================================== +--- git.orig/protocol/meson.build ++++ git/protocol/meson.build @@ -1,4 +1,4 @@ -dep_scanner = dependency('wayland-scanner', native: false) +dep_scanner = dependency('wayland-scanner', native: true) - prog_scanner = find_program(dep_scanner.get_pkgconfig_variable('wayland_scanner')) + prog_scanner = find_program(dep_scanner.get_variable(pkgconfig: 'wayland_scanner')) - dep_wp = dependency('wayland-protocols', version: '>= 1.26', --- -2.25.1 - + dep_wp = dependency('wayland-protocols', version: '>= 1.31', diff --git a/recipes-graphics/wayland/weston/xwayland.weston-start b/recipes-graphics/wayland/weston/xwayland.weston-start index 49204f216..342ac8d12 100644 --- a/recipes-graphics/wayland/weston/xwayland.weston-start +++ b/recipes-graphics/wayland/weston/xwayland.weston-start @@ -1,6 +1,6 @@ #!/bin/sh if type Xwayland >/dev/null 2>/dev/null; then - mkdir -m 775 -p /tmp/.X11-unix - chown root:video /tmp/.X11-unix + mkdir -m 775 -p /tmp/.X11-unix + chown root:video /tmp/.X11-unix fi diff --git a/recipes-graphics/wayland/weston_11.0.3.imx.bb b/recipes-graphics/wayland/weston_12.0.3.imx.bb similarity index 84% rename from recipes-graphics/wayland/weston_11.0.3.imx.bb rename to recipes-graphics/wayland/weston_12.0.3.imx.bb index 67eae2686..8114ddbbf 100644 --- a/recipes-graphics/wayland/weston_11.0.3.imx.bb +++ b/recipes-graphics/wayland/weston_12.0.3.imx.bb @@ -3,7 +3,7 @@ # recipe. The second section customizes the recipe for i.MX. ########### OE-core copy ################## -# Upstream hash: 7f1932cb5a408320a5b542e20ba2807718349e8f +# Upstream hash: 92a460b55e7290ec0006365219189761f7226f7c SUMMARY = "Weston, a Wayland compositor" DESCRIPTION = "Weston is the reference implementation of a Wayland compositor" @@ -13,14 +13,14 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d79ee9e66bb0f95d3386a7acae780b70 \ file://libweston/compositor.c;endline=27;md5=eb6d5297798cabe2ddc65e2af519bcf0 \ " -SRC_URI = "https://gitlab.freedesktop.org/wayland/weston/uploads/f5648c818fba5432edc3ea63c4db4813/${BPN}-${PV}.tar.xz \ +SRC_URI = "https://gitlab.freedesktop.org/wayland/weston/-/releases/${PV}/downloads/${BPN}-${PV}.tar.xz \ file://weston.png \ file://weston.desktop \ file://xwayland.weston-start \ file://systemd-notify.weston-start \ " -SRC_URI[sha256sum] = "a413f68c252957fc3191c3650823ec356ae8c124ccc0cb440da5cdc4e2cb9e57" +SRC_URI[sha256sum] = "eb686a7cf00992a23b17f192fca9a887313e92c346ee35d8575196983d656b4a" UPSTREAM_CHECK_URI = "https://wayland.freedesktop.org/releases.html" UPSTREAM_CHECK_REGEX = "weston-(?P\d+\.\d+\.(?!9\d+)\d+)" @@ -44,7 +44,7 @@ PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'kms wayla ${@bb.utils.contains('DISTRO_FEATURES', 'x11 wayland', 'xwayland', '', d)} \ ${@bb.utils.filter('DISTRO_FEATURES', 'systemd x11', d)} \ ${@bb.utils.contains_any('DISTRO_FEATURES', 'wayland x11', '', 'headless', d)} \ - ${@oe.utils.conditional('VIRTUAL-RUNTIME_init_manager', 'sysvinit', 'launcher-libseat', '', d)} \ + launcher-libseat \ image-jpeg \ screenshare \ shell-desktop \ @@ -64,7 +64,7 @@ PACKAGECONFIG[kms] = "-Dbackend-drm=true,-Dbackend-drm=false,drm udev virtual/eg # Weston on Wayland (nested Weston) PACKAGECONFIG[wayland] = "-Dbackend-wayland=true,-Dbackend-wayland=false,virtual/egl virtual/libgles2" # Weston on X11 -PACKAGECONFIG[x11] = "-Dbackend-x11=true,-Dbackend-x11=false,virtual/libx11 libxcb libxcb libxcursor cairo" +PACKAGECONFIG[x11] = "-Dbackend-x11=true,-Dbackend-x11=false,virtual/libx11 libxcb libxcursor" # Headless Weston PACKAGECONFIG[headless] = "-Dbackend-headless=true,-Dbackend-headless=false" # Weston on RDP @@ -77,10 +77,10 @@ PACKAGECONFIG[egl] = "-Drenderer-gl=true,-Drenderer-gl=false,virtual/egl" PACKAGECONFIG[lcms] = "-Dcolor-management-lcms=true,-Dcolor-management-lcms=false,lcms" # Weston with webp support PACKAGECONFIG[webp] = "-Dimage-webp=true,-Dimage-webp=false,libwebp" -# Weston with systemd-login support -PACKAGECONFIG[systemd] = "-Dsystemd=true -Dlauncher-logind=true,-Dsystemd=false -Dlauncher-logind=false,systemd dbus" +# Weston with systemd support +PACKAGECONFIG[systemd] = "-Dsystemd=true,-Dsystemd=false,systemd dbus" # Weston with Xwayland support (requires X11 and Wayland) -PACKAGECONFIG[xwayland] = "-Dxwayland=true,-Dxwayland=false,xwayland" +PACKAGECONFIG[xwayland] = "-Dxwayland=true,-Dxwayland=false,libxcb libxcursor xcb-util-cursor xwayland" # colord CMS support PACKAGECONFIG[colord] = "-Ddeprecated-color-management-colord=true,-Ddeprecated-color-management-colord=false,colord" # Clients support @@ -101,6 +101,13 @@ PACKAGECONFIG[shell-kiosk] = "-Dshell-kiosk=true,-Dshell-kiosk=false" PACKAGECONFIG[image-jpeg] = "-Dimage-jpeg=true,-Dimage-jpeg=false, jpeg" # support libseat based launch PACKAGECONFIG[launcher-libseat] = "-Dlauncher-libseat=true,-Dlauncher-libseat=false,seatd" +# deprecated and superseded by libseat launcher +PACKAGECONFIG[launcher-logind] = "-Ddeprecated-launcher-logind=true,-Ddeprecated-launcher-logind=false," +# screencasting via PipeWire +PACKAGECONFIG[pipewire] = "-Dbackend-pipewire=true,-Dbackend-pipewire=false,pipewire" +# VNC remote screensharing +PACKAGECONFIG[vnc] = "-Dbackend-vnc=true,-Dbackend-vnc=false,neatvnc" + do_install:append() { # Weston doesn't need the .la files to load modules, so wipe them @@ -132,7 +139,7 @@ PACKAGES += "${@bb.utils.contains('PACKAGECONFIG', 'xwayland', '${PN}-xwayland', libweston-${WESTON_MAJOR_VERSION} ${PN}-examples" FILES:${PN}-dev += "${libdir}/${BPN}/libexec_weston.so" -FILES:${PN} = "${bindir}/weston ${bindir}/weston-terminal ${bindir}/weston-info ${bindir}/weston-launch ${bindir}/wcap-decode ${libexecdir} ${libdir}/${BPN}/*.so* ${datadir}" +FILES:${PN} = "${sysconfdir} ${bindir}/weston ${bindir}/weston-terminal ${bindir}/weston-info ${bindir}/weston-launch ${bindir}/wcap-decode ${libexecdir} ${libdir}/${BPN}/*.so* ${datadir}" FILES:libweston-${WESTON_MAJOR_VERSION} = "${libdir}/lib*${SOLIBS} ${libdir}/libweston-${WESTON_MAJOR_VERSION}/*.so" SUMMARY:libweston-${WESTON_MAJOR_VERSION} = "Helper library for implementing 'wayland window managers'." @@ -159,21 +166,20 @@ LIC_FILES_CHKSUM += "file://LICENSE;md5=d79ee9e66bb0f95d3386a7acae780b70" DEFAULT_PREFERENCE = "-1" -SRC_URI:remove = "https://gitlab.freedesktop.org/wayland/weston/uploads/f5648c818fba5432edc3ea63c4db4813/${BPN}-${PV}.tar.xz" +SRC_URI:remove = "https://gitlab.freedesktop.org/wayland/weston/-/releases/${PV}/downloads/${BPN}-${PV}.tar.xz" SRC_URI:prepend = "git://github.com/nxp-imx/weston-imx.git;protocol=https;branch=${SRCBRANCH} " SRC_URI += "file://0001-Revert-protocol-no-found-wayland-scanner-with-Yocto-.patch" -SRCBRANCH = "weston-imx-11.0.3" -SRCREV = "a509c319b7bfc72638c9b9d8f5e4b6259aba0ab7" +SRCBRANCH = "weston-imx-12.0.3" +SRCREV = "b0d890915ee191ceb10e79ea9a830281f5c6258f" S = "${WORKDIR}/git" PACKAGECONFIG_IMX_REMOVALS ?= "wayland x11" PACKAGECONFIG:remove = "${PACKAGECONFIG_IMX_REMOVALS}" -PACKAGECONFIG:append:imxgpu2d = " imxg2d" -PACKAGECONFIG:append:mx93-nxp-bsp = " imxg2d" - -# Override -PACKAGECONFIG[xwayland] = "-Dxwayland=true,-Dxwayland=false,libxcursor xwayland" +PACKAGECONFIG:append = " ${PACKAGECONFIG_G2D}" +PACKAGECONFIG_G2D ??= "" +PACKAGECONFIG_G2D:imxgpu2d ??= "imxg2d" +PACKAGECONFIG_G2D:mx93-nxp-bsp ??= "imxg2d" # Weston with i.MX G2D renderer PACKAGECONFIG[imxg2d] = "-Drenderer-g2d=true,-Drenderer-g2d=false,virtual/libg2d" From 4c34c8027eb7f513d723e29692806c508f6f621d Mon Sep 17 00:00:00 2001 From: Tom Hochstein Date: Wed, 24 Apr 2024 15:29:39 -0700 Subject: [PATCH 13/13] xwayland: Extend support for 9-series with GPU Align with NXP BSP 6.6.3-1.0.0. Signed-off-by: Tom Hochstein --- recipes-graphics/xwayland/xwayland_23.1.1.imx.bbappend | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-graphics/xwayland/xwayland_23.1.1.imx.bbappend b/recipes-graphics/xwayland/xwayland_23.1.1.imx.bbappend index e1708a96d..f71ba16c3 100644 --- a/recipes-graphics/xwayland/xwayland_23.1.1.imx.bbappend +++ b/recipes-graphics/xwayland/xwayland_23.1.1.imx.bbappend @@ -9,7 +9,7 @@ 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: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