diff options
author | Otavio Salvador <otavio@ossystems.com.br> | 2024-04-25 08:37:29 -0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-04-25 08:37:29 -0300 |
commit | df4a0ae5111e6300aaaa88c3a0db61910fac1d69 (patch) | |
tree | 206b4d48679511fc8773e68b885be45af0a18503 /recipes-graphics | |
parent | 19ffbd1a6bf1caadbc23b09415985d73c1827828 (diff) | |
parent | 4c34c8027eb7f513d723e29692806c508f6f621d (diff) | |
download | meta-freescale-df4a0ae5111e6300aaaa88c3a0db61910fac1d69.tar.gz |
Merge pull request #1803 from nxp-upstream/gpu-viv
Upgrade graphics to LF6.6.3-1.0.0
Diffstat (limited to 'recipes-graphics')
21 files changed, 146 insertions, 136 deletions
diff --git a/recipes-graphics/drm/libdrm_2.4.115.imx.bb b/recipes-graphics/drm/libdrm_2.4.116.imx.bb index ada0b7ae..ff23f35f 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" | |||
13 | 13 | ||
14 | SRC_URI = "${IMX_LIBDRM_SRC};branch=${SRCBRANCH}" | 14 | SRC_URI = "${IMX_LIBDRM_SRC};branch=${SRCBRANCH}" |
15 | IMX_LIBDRM_SRC ?= "git://github.com/nxp-imx/libdrm-imx.git;protocol=https" | 15 | IMX_LIBDRM_SRC ?= "git://github.com/nxp-imx/libdrm-imx.git;protocol=https" |
16 | SRCBRANCH ?= "libdrm-imx-2.4.115" | 16 | SRCBRANCH = "libdrm-imx-2.4.116" |
17 | SRCREV = "0f889a1f9640f6210132dd565141eb19005245fb" | 17 | SRCREV = "2f1797674f94572ae8c365c8cbffb0263337ed57" |
18 | 18 | ||
19 | S = "${WORKDIR}/git" | 19 | S = "${WORKDIR}/git" |
20 | 20 | ||
@@ -45,7 +45,7 @@ PACKAGECONFIG[manpages] = "-Dman-pages=enabled,-Dman-pages=disabled,libxslt-nati | |||
45 | 45 | ||
46 | ALLOW_EMPTY:${PN}-drivers = "1" | 46 | ALLOW_EMPTY:${PN}-drivers = "1" |
47 | PACKAGES =+ "${PN}-tests ${PN}-drivers ${PN}-radeon ${PN}-nouveau ${PN}-omap \ | 47 | PACKAGES =+ "${PN}-tests ${PN}-drivers ${PN}-radeon ${PN}-nouveau ${PN}-omap \ |
48 | ${PN}-intel ${PN}-exynos ${PN}-kms ${PN}-freedreno ${PN}-amdgpu \ | 48 | ${PN}-intel ${PN}-exynos ${PN}-freedreno ${PN}-amdgpu \ |
49 | ${PN}-etnaviv" | 49 | ${PN}-etnaviv" |
50 | 50 | ||
51 | RRECOMMENDS:${PN}-drivers = "${PN}-radeon ${PN}-nouveau ${PN}-omap ${PN}-intel \ | 51 | RRECOMMENDS:${PN}-drivers = "${PN}-radeon ${PN}-nouveau ${PN}-omap ${PN}-intel \ |
@@ -58,7 +58,6 @@ FILES:${PN}-nouveau = "${libdir}/libdrm_nouveau.so.*" | |||
58 | FILES:${PN}-omap = "${libdir}/libdrm_omap.so.*" | 58 | FILES:${PN}-omap = "${libdir}/libdrm_omap.so.*" |
59 | FILES:${PN}-intel = "${libdir}/libdrm_intel.so.*" | 59 | FILES:${PN}-intel = "${libdir}/libdrm_intel.so.*" |
60 | FILES:${PN}-exynos = "${libdir}/libdrm_exynos.so.*" | 60 | FILES:${PN}-exynos = "${libdir}/libdrm_exynos.so.*" |
61 | FILES:${PN}-kms = "${libdir}/libkms*.so.*" | ||
62 | FILES:${PN}-freedreno = "${libdir}/libdrm_freedreno.so.*" | 61 | FILES:${PN}-freedreno = "${libdir}/libdrm_freedreno.so.*" |
63 | FILES:${PN}-amdgpu = "${libdir}/libdrm_amdgpu.so.* ${datadir}/${PN}/amdgpu.ids" | 62 | FILES:${PN}-amdgpu = "${libdir}/libdrm_amdgpu.so.* ${datadir}/${PN}/amdgpu.ids" |
64 | FILES:${PN}-etnaviv = "${libdir}/libdrm_etnaviv.so.*" | 63 | FILES:${PN}-etnaviv = "${libdir}/libdrm_etnaviv.so.*" |
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 16011bd4..00000000 --- a/recipes-graphics/imx-g2d/imx-dpu-g2d_2.1.10.bb +++ /dev/null | |||
@@ -1,38 +0,0 @@ | |||
1 | # Copyright (C) 2016 Freescale Semiconductor | ||
2 | # Copyright 2017-2022 NXP | ||
3 | # Released under the MIT license (see COPYING.MIT for the terms) | ||
4 | |||
5 | DESCRIPTION = "G2D library using i.MX DPU" | ||
6 | LICENSE = "Proprietary" | ||
7 | LIC_FILES_CHKSUM = "file://COPYING;md5=db4762b09b6bda63da103963e6e081de" | ||
8 | |||
9 | DEPENDS = "libgal-imx libdrm" | ||
10 | PROVIDES += "virtual/libg2d" | ||
11 | |||
12 | SRC_URI = "${FSL_MIRROR}/${IMX_BIN_NAME}.bin;fsl-eula=true" | ||
13 | IMX_BIN_NAME = "${BP}-${IMX_SRCREV_ABBREV}" | ||
14 | IMX_SRCREV_ABBREV = "7ed5396" | ||
15 | SRC_URI[md5sum] = "eed4f724973192564474efbda83f67bc" | ||
16 | SRC_URI[sha256sum] = "bca725e442c1438990cf1b41a59194e6efbd080c63d9b683a0d572e27f900e25" | ||
17 | |||
18 | S = "${WORKDIR}/${IMX_BIN_NAME}" | ||
19 | |||
20 | inherit fsl-eula-unpack | ||
21 | |||
22 | do_install () { | ||
23 | install -d ${D}${libdir} | ||
24 | install -d ${D}${includedir} | ||
25 | cp -d ${S}/g2d/usr/lib/*.so* ${D}${libdir} | ||
26 | cp -Pr ${S}/g2d/usr/include/* ${D}${includedir} | ||
27 | } | ||
28 | |||
29 | INSANE_SKIP:append:libc-musl = " file-rdeps" | ||
30 | RDEPENDS:${PN}:append:libc-musl = " gcompat" | ||
31 | |||
32 | # The packaged binaries have been stripped of debug info, so disable | ||
33 | # operations accordingly. | ||
34 | INHIBIT_PACKAGE_DEBUG_SPLIT = "1" | ||
35 | INHIBIT_PACKAGE_STRIP = "1" | ||
36 | INHIBIT_SYSROOT_STRIP = "1" | ||
37 | |||
38 | 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 00000000..b10cd997 --- /dev/null +++ b/recipes-graphics/imx-g2d/imx-dpu-g2d_2.1.12.bb | |||
@@ -0,0 +1,45 @@ | |||
1 | # Copyright (C) 2016 Freescale Semiconductor | ||
2 | # Copyright 2017-2024 NXP | ||
3 | # Released under the MIT license (see COPYING.MIT for the terms) | ||
4 | |||
5 | DESCRIPTION = "G2D library using i.MX DPU" | ||
6 | LICENSE = "Proprietary" | ||
7 | LIC_FILES_CHKSUM = "file://COPYING;md5=44a8052c384584ba09077e85a3d1654f" | ||
8 | |||
9 | DEPENDS = "libdrm ${LIBGAL_IMX}" | ||
10 | LIBGAL_IMX = "libgal-imx" | ||
11 | LIBGAL_IMX:mx95-nxp-bsp = "" | ||
12 | |||
13 | PROVIDES += "virtual/libg2d" | ||
14 | |||
15 | SRC_URI = "${FSL_MIRROR}/${IMX_BIN_NAME}.bin;fsl-eula=true;name=${IMX_SRC_URI_NAME}" | ||
16 | IMX_BIN_NAME = "${BPN}-${IMX_SRC_URI_NAME}-${PV}-${IMX_SRCREV_ABBREV}" | ||
17 | |||
18 | IMX_SRCREV_ABBREV = "ee47ef7" | ||
19 | IMX_SRC_URI_NAME = "v1" | ||
20 | SRC_URI[v1.md5sum] = "4150f09e27178101fdccb792b7cbc526" | ||
21 | SRC_URI[v1.sha256sum] = "bd7849376564f7e2eb55210f156afae00b49451de6de80cfbc5fbda15be6a2b0" | ||
22 | |||
23 | IMX_SRCREV_ABBREV:mx95-nxp-bsp = "ee47ef7" | ||
24 | IMX_SRC_URI_NAME:mx95-nxp-bsp = "v2" | ||
25 | SRC_URI[v2.md5sum] = "031396e175c432eb6c84aad8e0a6fc7d" | ||
26 | SRC_URI[v2.sha256sum] = "0646d8cc8e53f22fc15a61f0b78cd5f73460520f91949bc1d29c10ecbf77307b" | ||
27 | |||
28 | S = "${WORKDIR}/${IMX_BIN_NAME}" | ||
29 | |||
30 | inherit fsl-eula-unpack | ||
31 | |||
32 | do_install () { | ||
33 | install -d ${D}${libdir} | ||
34 | install -d ${D}${includedir} | ||
35 | cp -d ${S}/g2d/usr/lib/*.so* ${D}${libdir} | ||
36 | cp -Pr ${S}/g2d/usr/include/* ${D}${includedir} | ||
37 | } | ||
38 | |||
39 | # The packaged binaries have been stripped of debug info, so disable | ||
40 | # operations accordingly. | ||
41 | INHIBIT_PACKAGE_DEBUG_SPLIT = "1" | ||
42 | INHIBIT_PACKAGE_STRIP = "1" | ||
43 | INHIBIT_SYSROOT_STRIP = "1" | ||
44 | |||
45 | COMPATIBLE_MACHINE = "(imxdpu)" | ||
diff --git a/recipes-graphics/imx-g2d/imx-g2d-samples_git.bb b/recipes-graphics/imx-g2d/imx-g2d-samples_git.bb index 649a16d2..55f88da3 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}" | |||
9 | 9 | ||
10 | SRC_URI = "${GPU_G2D_SAMPLES_SRC};branch=${SRCBRANCH}" | 10 | SRC_URI = "${GPU_G2D_SAMPLES_SRC};branch=${SRCBRANCH}" |
11 | GPU_G2D_SAMPLES_SRC ?= "git://github.com/nxp-imx/g2d-samples.git;protocol=https" | 11 | GPU_G2D_SAMPLES_SRC ?= "git://github.com/nxp-imx/g2d-samples.git;protocol=https" |
12 | SRCBRANCH ?= "imx_2.1" | 12 | SRCBRANCH = "imx_2.1" |
13 | SRCREV = "4391dcda499870418bb38fe395c3cba0664c5bab" | 13 | SRCREV = "bec2f3839737b0e83b68b1c976373d9a78e5762f" |
14 | 14 | ||
15 | S = "${WORKDIR}/git" | 15 | S = "${WORKDIR}/git" |
16 | 16 | ||
@@ -19,6 +19,7 @@ inherit pkgconfig | |||
19 | PACKAGECONFIG ??= "${PACKAGECONFIG_IMPLEMENTATION}" | 19 | PACKAGECONFIG ??= "${PACKAGECONFIG_IMPLEMENTATION}" |
20 | PACKAGECONFIG_IMPLEMENTATION = "" | 20 | PACKAGECONFIG_IMPLEMENTATION = "" |
21 | PACKAGECONFIG_IMPLEMENTATION:imxgpu2d:imxdpu = "dpu" | 21 | PACKAGECONFIG_IMPLEMENTATION:imxgpu2d:imxdpu = "dpu" |
22 | PACKAGECONFIG_IMPLEMENTATION:mx95-nxp-bsp = "dpu95" | ||
22 | PACKAGECONFIG_IMPLEMENTATION:imxgpu2d = "gpu-drm" | 23 | PACKAGECONFIG_IMPLEMENTATION:imxgpu2d = "gpu-drm" |
23 | PACKAGECONFIG_IMPLEMENTATION:imxgpu2d:imxfbdev = "gpu-fbdev" | 24 | PACKAGECONFIG_IMPLEMENTATION:imxgpu2d:imxfbdev = "gpu-fbdev" |
24 | PACKAGECONFIG_IMPLEMENTATION:mx93-nxp-bsp = "pxp" | 25 | PACKAGECONFIG_IMPLEMENTATION:mx93-nxp-bsp = "pxp" |
@@ -29,28 +30,35 @@ PACKAGECONFIG[dpu] = " \ | |||
29 | imx-dpu-g2d wayland-native wayland wayland-protocols, \ | 30 | imx-dpu-g2d wayland-native wayland wayland-protocols, \ |
30 | , \ | 31 | , \ |
31 | , \ | 32 | , \ |
32 | gpu-drm gpu-fbdev pxp" | 33 | dpu95 gpu-drm gpu-fbdev pxp" |
34 | PACKAGECONFIG[dpu95] = " \ | ||
35 | BUILD_IMPLEMENTATION=dpu95, \ | ||
36 | , \ | ||
37 | imx-dpu-g2d wayland-native wayland wayland-protocols, \ | ||
38 | , \ | ||
39 | , \ | ||
40 | dpu gpu-drm gpu-fbdev pxp" | ||
33 | PACKAGECONFIG[gpu-drm] = " \ | 41 | PACKAGECONFIG[gpu-drm] = " \ |
34 | BUILD_IMPLEMENTATION=gpu-drm, \ | 42 | BUILD_IMPLEMENTATION=gpu-drm, \ |
35 | , \ | 43 | , \ |
36 | imx-gpu-g2d wayland-native wayland wayland-protocols, \ | 44 | imx-gpu-g2d wayland-native wayland wayland-protocols, \ |
37 | , \ | 45 | , \ |
38 | , \ | 46 | , \ |
39 | dpu gpu-fbdev pxp" | 47 | dpu dpu95 gpu-fbdev pxp" |
40 | PACKAGECONFIG[gpu-fbdev] = " \ | 48 | PACKAGECONFIG[gpu-fbdev] = " \ |
41 | BUILD_IMPLEMENTATION=gpu-fbdev, \ | 49 | BUILD_IMPLEMENTATION=gpu-fbdev, \ |
42 | , \ | 50 | , \ |
43 | imx-gpu-g2d, \ | 51 | imx-gpu-g2d, \ |
44 | , \ | 52 | , \ |
45 | , \ | 53 | , \ |
46 | dpu gpu-drm pxp" | 54 | dpu dpu95 gpu-drm pxp" |
47 | PACKAGECONFIG[pxp] = " \ | 55 | PACKAGECONFIG[pxp] = " \ |
48 | BUILD_IMPLEMENTATION=pxp, \ | 56 | BUILD_IMPLEMENTATION=pxp, \ |
49 | , \ | 57 | , \ |
50 | imx-pxp-g2d wayland-native wayland wayland-protocols, \ | 58 | imx-pxp-g2d wayland-native wayland wayland-protocols, \ |
51 | , \ | 59 | , \ |
52 | , \ | 60 | , \ |
53 | dpu gpu-drm gpu-fbdev" | 61 | dpu dpu95 gpu-drm gpu-fbdev" |
54 | 62 | ||
55 | EXTRA_OEMAKE += " \ | 63 | EXTRA_OEMAKE += " \ |
56 | SDKTARGETSYSROOT=${STAGING_DIR_HOST} \ | 64 | SDKTARGETSYSROOT=${STAGING_DIR_HOST} \ |
@@ -65,4 +73,4 @@ FILES:${PN} += "/opt" | |||
65 | 73 | ||
66 | PACKAGE_ARCH = "${MACHINE_SOCARCH}" | 74 | PACKAGE_ARCH = "${MACHINE_SOCARCH}" |
67 | 75 | ||
68 | COMPATIBLE_MACHINE = "(imxgpu2d|mx93-nxp-bsp)" | 76 | COMPATIBLE_MACHINE = "(imxgpu2d|mx93-nxp-bsp|mx95-nxp-bsp)" |
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 index b9a7d938..3ebb8f88 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 @@ | |||
1 | # Copyright (C) 2016 Freescale Semiconductor | 1 | # Copyright (C) 2016 Freescale Semiconductor |
2 | # Copyright 2017-2022 NXP | 2 | # Copyright 2017-2024 NXP |
3 | # Copyright 2018 (C) O.S. Systems Software LTDA. | 3 | # Copyright 2018 (C) O.S. Systems Software LTDA. |
4 | # Released under the MIT license (see COPYING.MIT for the terms) | 4 | # Released under the MIT license (see COPYING.MIT for the terms) |
5 | 5 | ||
6 | DESCRIPTION = "G2D library using i.MX GPU" | 6 | DESCRIPTION = "G2D library using i.MX GPU" |
7 | LICENSE = "Proprietary" | 7 | LICENSE = "Proprietary" |
8 | LIC_FILES_CHKSUM = "file://COPYING;md5=2827219e81f28aba7c6a569f7c437fa7" | 8 | LIC_FILES_CHKSUM = "file://COPYING;md5=44a8052c384584ba09077e85a3d1654f" |
9 | DEPENDS = "libgal-imx" | 9 | DEPENDS = "libgal-imx" |
10 | PROVIDES = "virtual/libg2d" | 10 | PROVIDES = "virtual/libg2d" |
11 | 11 | ||
12 | SRC_URI = "${FSL_MIRROR}/${IMX_BIN_NAME}.bin;name=${TARGET_ARCH};fsl-eula=true" | 12 | SRC_URI = "${FSL_MIRROR}/${IMX_BIN_NAME}.bin;name=${TARGET_ARCH};fsl-eula=true" |
13 | IMX_BIN_NAME = "${BP}-${TARGET_ARCH}-${IMX_SRCREV_ABBREV}" | 13 | IMX_BIN_NAME = "${BP}-${TARGET_ARCH}-${IMX_SRCREV_ABBREV}" |
14 | IMX_SRCREV_ABBREV = "fd0148d" | 14 | IMX_SRCREV_ABBREV = "b07999b" |
15 | SRC_URI[aarch64.md5sum] = "ebc4cb8fdfa0b8ef9b11d7bb0fd4710f" | 15 | SRC_URI[aarch64.md5sum] = "fa30ce75803697d5131d707b300258ee" |
16 | SRC_URI[aarch64.sha256sum] = "1cedc606be965b01300613ccea81b4fd589d940306bb1caa30a37c41928616ec" | 16 | SRC_URI[aarch64.sha256sum] = "2dff0279ead132ec5fa61dbe9b2b1969135e8ce9fe7487957371327357d70ac7" |
17 | SRC_URI[arm.md5sum] = "77233957a27ae4da3f01d33b3fbc69d9" | 17 | SRC_URI[arm.md5sum] = "c81be7c93b60c7d3f3eb5b7bfeda42a4" |
18 | SRC_URI[arm.sha256sum] = "bc168b19096a997251e7137f82ffcff404c61709cf5f227c53a099f631569f76" | 18 | SRC_URI[arm.sha256sum] = "e17ac373193622ec0c9aa490ef1b93551d22a2e88ee9f1098ed984e62f02a06c" |
19 | 19 | ||
20 | S = "${WORKDIR}/${IMX_BIN_NAME}" | 20 | S = "${WORKDIR}/${IMX_BIN_NAME}" |
21 | 21 | ||
diff --git a/recipes-graphics/imx-g2d/imx-pxp-g2d_git.bb b/recipes-graphics/imx-g2d/imx-pxp-g2d_git.bb index dedee983..50c37a2c 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 @@ | |||
4 | 4 | ||
5 | DESCRIPTION = "G2D library using i.MX PXP" | 5 | DESCRIPTION = "G2D library using i.MX PXP" |
6 | LICENSE = "Proprietary" | 6 | LICENSE = "Proprietary" |
7 | LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=2827219e81f28aba7c6a569f7c437fa7" | 7 | LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=44a8052c384584ba09077e85a3d1654f" |
8 | 8 | ||
9 | PROVIDES += "virtual/libg2d" | 9 | PROVIDES += "virtual/libg2d" |
10 | 10 | ||
@@ -12,8 +12,8 @@ PV = "2.1.0+git${SRCPV}" | |||
12 | 12 | ||
13 | SRC_URI = "${IMX_PXP_G2D_SRC};branch=${SRCBRANCH}" | 13 | SRC_URI = "${IMX_PXP_G2D_SRC};branch=${SRCBRANCH}" |
14 | IMX_PXP_G2D_SRC ?= "git://github.com/nxp-imx/imx-g2d-pxp.git;protocol=https" | 14 | IMX_PXP_G2D_SRC ?= "git://github.com/nxp-imx/imx-g2d-pxp.git;protocol=https" |
15 | SRCBRANCH ?= "imx_2.1" | 15 | SRCBRANCH = "imx_2.1" |
16 | SRCREV = "f3adab05bd0cbb7c38578110d772e8ddf52b4e8e" | 16 | SRCREV = "9f9f41fa0e86757f856e1ec7824f56022fe94586" |
17 | 17 | ||
18 | S = "${WORKDIR}/git" | 18 | S = "${WORKDIR}/git" |
19 | 19 | ||
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 a2f049a8..7d97f475 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 @@ | |||
2 | SUMMARY = "Samples for OpenGL ES" | 2 | SUMMARY = "Samples for OpenGL ES" |
3 | LICENSE = "MIT" | 3 | LICENSE = "MIT" |
4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=aeb969185a143c3c25130bc2c3ef9a50" | 4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=aeb969185a143c3c25130bc2c3ef9a50" |
5 | DEPENDS = "imx-gpu-viv zlib libpng procps" | 5 | DEPENDS = "zlib libpng procps" |
6 | 6 | ||
7 | SRC_URI = "git://github.com/nxp-imx/apitrace-imx.git;protocol=https;branch=imx_10.0 \ | 7 | SRC_URI = "git://github.com/nxp-imx/apitrace-imx.git;protocol=https;branch=imx_10.0 \ |
8 | file://0001-dlsym-workaround-glibc-2.34-build-failure.patch \ | 8 | file://0001-dlsym-workaround-glibc-2.34-build-failure.patch \ |
@@ -18,11 +18,13 @@ PACKAGECONFIG_BACKEND:mx6-nxp-bsp = " \ | |||
18 | bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', \ | 18 | bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', \ |
19 | '', d), d)} \ | 19 | '', d), d)} \ |
20 | " | 20 | " |
21 | PACKAGECONFIG_BACKEND:mx7-nxp-bsp = "${PACKAGECONFIG_BACKEND:mx6-nxp-bsp}" | 21 | PACKAGECONFIG_BACKEND:mx7-nxp-bsp = "${PACKAGECONFIG_BACKEND:mx6-nxp-bsp}" |
22 | PACKAGECONFIG_BACKEND:mx8-nxp-bsp = "waffle" | 22 | PACKAGECONFIG_BACKEND:mx8-nxp-bsp = "waffle" |
23 | PACKAGECONFIG_BACKEND:mx95-nxp-bsp = "waffle" | ||
23 | 24 | ||
24 | PACKAGECONFIG_GPU2D = "" | 25 | PACKAGECONFIG_GPU2D = "" |
25 | PACKAGECONFIG_GPU2D:imxgpu2d = "vivante" | 26 | PACKAGECONFIG_GPU2D:imxgpu2d = "vivante" |
27 | PACKAGECONFIG_GPU2D:mx95-nxp-bsp = "" | ||
26 | 28 | ||
27 | PACKAGECONFIG ??= " \ | 29 | PACKAGECONFIG ??= " \ |
28 | egl \ | 30 | egl \ |
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 56a9ec4d..e33df444 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 @@ | |||
1 | # Copyright (C) 2012-2016 Freescale Semiconductor | 1 | # Copyright (C) 2012-2016 Freescale Semiconductor |
2 | # Copyright (C) 2012-2018 O.S. Systems Software LTDA. | 2 | # Copyright (C) 2012-2018 O.S. Systems Software LTDA. |
3 | # Copyright 2017-2023 NXP | 3 | # Copyright 2017-2024 NXP |
4 | # Released under the MIT license (see COPYING.MIT for the terms) | 4 | # Released under the MIT license (see COPYING.MIT for the terms) |
5 | 5 | ||
6 | DESCRIPTION = "GPU driver and apps for i.MX" | 6 | DESCRIPTION = "GPU driver and apps for i.MX" |
@@ -20,11 +20,6 @@ DEPENDS += " \ | |||
20 | DEPENDS:append:imxdrm = " libdrm wayland" | 20 | DEPENDS:append:imxdrm = " libdrm wayland" |
21 | DEPENDS:append:mx8-nxp-bsp = " patchelf-native" | 21 | DEPENDS:append:mx8-nxp-bsp = " patchelf-native" |
22 | 22 | ||
23 | # imx-gpu-viv does not provide everything it needs to for virtual/libgl | ||
24 | # on x11 backend or on Wayland backend with XWayland support. | ||
25 | # We depend on mesa to fill in what is missing. | ||
26 | DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'mesa', '', d)}" | ||
27 | |||
28 | DEPENDS:append:libc-musl = " gcompat" | 23 | DEPENDS:append:libc-musl = " gcompat" |
29 | 24 | ||
30 | PROVIDES += " \ | 25 | PROVIDES += " \ |
@@ -40,7 +35,6 @@ EXTRA_PROVIDES = " \ | |||
40 | ${PROVIDES_OPENVX} \ | 35 | ${PROVIDES_OPENVX} \ |
41 | " | 36 | " |
42 | EXTRA_PROVIDES:append:imxgpu3d = " \ | 37 | EXTRA_PROVIDES:append:imxgpu3d = " \ |
43 | virtual/libgl \ | ||
44 | virtual/libgles1 \ | 38 | virtual/libgles1 \ |
45 | virtual/libgles2 \ | 39 | virtual/libgles2 \ |
46 | " | 40 | " |
@@ -86,7 +80,6 @@ PACKAGECONFIG[valgrind] = "" | |||
86 | 80 | ||
87 | # Note : If you add a package here, to prevent a naming conflict see the python_anonymous() futher below | 81 | # Note : If you add a package here, to prevent a naming conflict see the python_anonymous() futher below |
88 | PACKAGES =+ " \ | 82 | PACKAGES =+ " \ |
89 | libgl-imx libgl-imx-dev \ | ||
90 | libgles1-imx libgles1-imx-dev \ | 83 | libgles1-imx libgles1-imx-dev \ |
91 | libgles2-imx libgles2-imx-dev \ | 84 | libgles2-imx libgles2-imx-dev \ |
92 | libgles3-imx-dev \ | 85 | libgles3-imx-dev \ |
@@ -149,7 +142,7 @@ python __anonymous() { | |||
149 | 142 | ||
150 | # For the packages that make up the OpenGL interfaces, inject variables so that | 143 | # For the packages that make up the OpenGL interfaces, inject variables so that |
151 | # they don't get Debian-renamed (which would remove the -imx suffix). | 144 | # they don't get Debian-renamed (which would remove the -imx suffix). |
152 | for p in (("libegl", "libegl1"), ("libgl", "libgl1"), | 145 | for p in (("libegl", "libegl1"), |
153 | ("libgles1", "libglesv1-cm1"), ("libgles2", "libglesv2-2"), | 146 | ("libgles1", "libglesv1-cm1"), ("libgles2", "libglesv2-2"), |
154 | ("libgles3",), ("libgbm",)): | 147 | ("libgles3",), ("libgbm",)): |
155 | fullp = p[0] + "-imx" | 148 | fullp = p[0] + "-imx" |
@@ -291,8 +284,6 @@ do_install () { | |||
291 | if [ "${IS_MX6SL}" = "1" ]; then | 284 | if [ "${IS_MX6SL}" = "1" ]; then |
292 | rm -rf ${D}${libdir}/libCLC* ${D}${includedir}/CL \ | 285 | rm -rf ${D}${libdir}/libCLC* ${D}${includedir}/CL \ |
293 | \ | 286 | \ |
294 | ${D}${libdir}/libGL* ${D}${includedir}/GL* ${D}${libdir}/pkgconfig/gl.pc \ | ||
295 | \ | ||
296 | ${D}${libdir}/libGLES* ${D}${libdir}/pkgconfig/gles*.pc \ | 287 | ${D}${libdir}/libGLES* ${D}${libdir}/pkgconfig/gles*.pc \ |
297 | \ | 288 | \ |
298 | ${D}${libdir}/libOpenCL* ${D}${includedir}/CL \ | 289 | ${D}${libdir}/libOpenCL* ${D}${includedir}/CL \ |
@@ -377,15 +368,6 @@ OPENCL_VX_INTRINSIC_EXTENSION_PACKAGES:mx8qm-nxp-bsp = "libclc-imx libopencl-imx | |||
377 | OPENCL_VX_INTRINSIC_EXTENSION_PACKAGES:mx8mp-nxp-bsp = "libclc-imx libopencl-imx-dev" | 368 | OPENCL_VX_INTRINSIC_EXTENSION_PACKAGES:mx8mp-nxp-bsp = "libclc-imx libopencl-imx-dev" |
378 | INSANE_SKIP:libopenvx-imx += "dev-deps" | 369 | INSANE_SKIP:libopenvx-imx += "dev-deps" |
379 | 370 | ||
380 | FILES:libgl-imx = "${libdir}/libGL${REALSOLIBS} ${libdir}/libGL${SOLIBS}" | ||
381 | FILES:libgl-imx-dev = "${includedir}/GL ${libdir}/pkgconfig/gl.pc" | ||
382 | # libGL is only targeting X11 backend, and in case if Wayland-only is used - | ||
383 | # package QA complains on missing RDEPENDS, which are only available for X11. | ||
384 | # Skip "file-rdeps" QA for this package. | ||
385 | INSANE_SKIP:libgl-imx += "file-rdeps" | ||
386 | # libEGL does dlopen of libGL.so | ||
387 | INSANE_SKIP:libgl-imx += "dev-so" | ||
388 | |||
389 | FILES:libgles1-imx = "${libdir}/libGLESv1*${REALSOLIBS} ${libdir}/libGLESv1*${SOLIBS} ${libdir}/libGLES_*${REALSOLIBS} ${libdir}/libGLES_*${SOLIBS}" | 371 | FILES:libgles1-imx = "${libdir}/libGLESv1*${REALSOLIBS} ${libdir}/libGLESv1*${SOLIBS} ${libdir}/libGLES_*${REALSOLIBS} ${libdir}/libGLES_*${SOLIBS}" |
390 | FILES:libgles1-imx-dev = "${includedir}/GLES ${libdir}/pkgconfig/glesv1_cm.pc" | 372 | FILES:libgles1-imx-dev = "${includedir}/GLES ${libdir}/pkgconfig/glesv1_cm.pc" |
391 | RPROVIDES:libgles1-imx = "libgles-imx" | 373 | 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 07a92246..00000000 --- a/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p2.2-aarch32.bb +++ /dev/null | |||
@@ -1,10 +0,0 @@ | |||
1 | require imx-gpu-viv-6.inc | ||
2 | |||
3 | LIC_FILES_CHKSUM = "file://COPYING;md5=2827219e81f28aba7c6a569f7c437fa7" | ||
4 | |||
5 | IMX_SRCREV_ABBREV = "fd0148d" | ||
6 | |||
7 | SRC_URI[md5sum] = "267d3e2d580e264157b7de01df22fb66" | ||
8 | SRC_URI[sha256sum] = "15efe6da5d4bac2a6067c2a898190be8754df6f14128c3db4756cff59c6da049" | ||
9 | |||
10 | 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 cea83ddc..00000000 --- a/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p2.2-aarch64.bb +++ /dev/null | |||
@@ -1,10 +0,0 @@ | |||
1 | require imx-gpu-viv-6.inc | ||
2 | |||
3 | LIC_FILES_CHKSUM = "file://COPYING;md5=2827219e81f28aba7c6a569f7c437fa7" | ||
4 | |||
5 | IMX_SRCREV_ABBREV = "fd0148d" | ||
6 | |||
7 | SRC_URI[md5sum] = "b76784e04f24ec9f2bedf2dd377ed5a8" | ||
8 | SRC_URI[sha256sum] = "6e34f3718925ba37c362cd09a3228cc56d03cfad323ebae0932f64449dbaeb2e" | ||
9 | |||
10 | 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 00000000..2b172466 --- /dev/null +++ b/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p2.4-aarch32.bb | |||
@@ -0,0 +1,10 @@ | |||
1 | require imx-gpu-viv-6.inc | ||
2 | |||
3 | LIC_FILES_CHKSUM = "file://COPYING;md5=44a8052c384584ba09077e85a3d1654f" | ||
4 | |||
5 | IMX_SRCREV_ABBREV = "b07999b" | ||
6 | |||
7 | SRC_URI[md5sum] = "eae60321ac971293d3213c88b9198ca0" | ||
8 | SRC_URI[sha256sum] = "ef9be89d3dd3b6448c720e061a8b81bdd26f7a5ff70de1786a5feef2e4836474" | ||
9 | |||
10 | 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 00000000..b3c39736 --- /dev/null +++ b/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p2.4-aarch64.bb | |||
@@ -0,0 +1,10 @@ | |||
1 | require imx-gpu-viv-6.inc | ||
2 | |||
3 | LIC_FILES_CHKSUM = "file://COPYING;md5=44a8052c384584ba09077e85a3d1654f" | ||
4 | |||
5 | IMX_SRCREV_ABBREV = "b07999b" | ||
6 | |||
7 | SRC_URI[md5sum] = "142d9b9ef6f440b8e307569873bdb6b5" | ||
8 | SRC_URI[sha256sum] = "ba86656c357c5d9793058695f320e4cf650d4693e84321870bad392f2a622807" | ||
9 | |||
10 | COMPATIBLE_MACHINE = "(mx8-nxp-bsp)" | ||
diff --git a/recipes-graphics/mesa/mesa-gl_%.bbappend b/recipes-graphics/mesa/mesa-gl_%.bbappend index dafd27f0..6545571f 100644 --- a/recipes-graphics/mesa/mesa-gl_%.bbappend +++ b/recipes-graphics/mesa/mesa-gl_%.bbappend | |||
@@ -1 +1,8 @@ | |||
1 | COMPATIBLE_MACHINE:imxgpu = "(-)" | 1 | DEPENDS:append:imxgpu = " virtual/egl" |
2 | |||
3 | do_install:append:imxgpu() { | ||
4 | # imx-gpu-viv and mali-imx both provide /usr/include/KHR, so drop the mesa-gl one | ||
5 | rm -rf ${D}${includedir}/KHR | ||
6 | } | ||
7 | |||
8 | COMPATIBLE_MACHINE:imxgpu = "(imxgpu)" | ||
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 index 05f566a8..c1a9902b 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" | |||
5 | 5 | ||
6 | # Override default mesa drivers with i.MX GPU drivers | 6 | # Override default mesa drivers with i.MX GPU drivers |
7 | RRECOMMENDS:${PN}:imxvulkan = "libvulkan-imx" | 7 | RRECOMMENDS:${PN}:imxvulkan = "libvulkan-imx" |
8 | # Override default mesa drivers with i.MX GPU drivers | ||
9 | RRECOMMENDS:${PN}:mx95-nxp-bsp = "mali-imx-libvulkan" | ||
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/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 25a4770f..4d2a333a 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 <max.krummenacher@toradex.com> | |||
26 | protocol/meson.build | 2 +- | 26 | protocol/meson.build | 2 +- |
27 | 1 file changed, 1 insertion(+), 1 deletion(-) | 27 | 1 file changed, 1 insertion(+), 1 deletion(-) |
28 | 28 | ||
29 | diff --git a/protocol/meson.build b/protocol/meson.build | 29 | Index: git/protocol/meson.build |
30 | index e8698530..ba52089b 100644 | 30 | =================================================================== |
31 | --- a/protocol/meson.build | 31 | --- git.orig/protocol/meson.build |
32 | +++ b/protocol/meson.build | 32 | +++ git/protocol/meson.build |
33 | @@ -1,4 +1,4 @@ | 33 | @@ -1,4 +1,4 @@ |
34 | -dep_scanner = dependency('wayland-scanner', native: false) | 34 | -dep_scanner = dependency('wayland-scanner', native: false) |
35 | +dep_scanner = dependency('wayland-scanner', native: true) | 35 | +dep_scanner = dependency('wayland-scanner', native: true) |
36 | prog_scanner = find_program(dep_scanner.get_pkgconfig_variable('wayland_scanner')) | 36 | prog_scanner = find_program(dep_scanner.get_variable(pkgconfig: 'wayland_scanner')) |
37 | 37 | ||
38 | dep_wp = dependency('wayland-protocols', version: '>= 1.26', | 38 | dep_wp = dependency('wayland-protocols', version: '>= 1.31', |
39 | -- | ||
40 | 2.25.1 | ||
41 | |||
diff --git a/recipes-graphics/wayland/weston/xwayland.weston-start b/recipes-graphics/wayland/weston/xwayland.weston-start index 49204f21..342ac8d1 100644 --- a/recipes-graphics/wayland/weston/xwayland.weston-start +++ b/recipes-graphics/wayland/weston/xwayland.weston-start | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/bin/sh | 1 | #!/bin/sh |
2 | 2 | ||
3 | if type Xwayland >/dev/null 2>/dev/null; then | 3 | if type Xwayland >/dev/null 2>/dev/null; then |
4 | mkdir -m 775 -p /tmp/.X11-unix | 4 | mkdir -m 775 -p /tmp/.X11-unix |
5 | chown root:video /tmp/.X11-unix | 5 | chown root:video /tmp/.X11-unix |
6 | fi | 6 | fi |
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} | |||
164 | SRC_URI:prepend = "git://github.com/nxp-imx/weston-imx.git;protocol=https;branch=${SRCBRANCH} " | 164 | SRC_URI:prepend = "git://github.com/nxp-imx/weston-imx.git;protocol=https;branch=${SRCBRANCH} " |
165 | SRC_URI += "file://0001-Revert-protocol-no-found-wayland-scanner-with-Yocto-.patch \ | 165 | SRC_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" |
167 | SRCBRANCH = "weston-imx-10.0.4" | 167 | SRCBRANCH = "weston-imx-10.0.5" |
168 | SRCREV = "6210a8f1302252273b50cc3c0ff55ec680dda479" | 168 | SRCREV = "0cc822a1e5a8faea6835a4e9259887d8792b86b4" |
169 | S = "${WORKDIR}/git" | 169 | S = "${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 |
diff --git a/recipes-graphics/wayland/weston_11.0.3.imx.bb b/recipes-graphics/wayland/weston_12.0.3.imx.bb index 67eae268..8114ddbb 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 @@ | |||
3 | # recipe. The second section customizes the recipe for i.MX. | 3 | # recipe. The second section customizes the recipe for i.MX. |
4 | 4 | ||
5 | ########### OE-core copy ################## | 5 | ########### OE-core copy ################## |
6 | # Upstream hash: 7f1932cb5a408320a5b542e20ba2807718349e8f | 6 | # Upstream hash: 92a460b55e7290ec0006365219189761f7226f7c |
7 | 7 | ||
8 | SUMMARY = "Weston, a Wayland compositor" | 8 | SUMMARY = "Weston, a Wayland compositor" |
9 | DESCRIPTION = "Weston is the reference implementation of a Wayland compositor" | 9 | DESCRIPTION = "Weston is the reference implementation of a Wayland compositor" |
@@ -13,14 +13,14 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d79ee9e66bb0f95d3386a7acae780b70 \ | |||
13 | file://libweston/compositor.c;endline=27;md5=eb6d5297798cabe2ddc65e2af519bcf0 \ | 13 | file://libweston/compositor.c;endline=27;md5=eb6d5297798cabe2ddc65e2af519bcf0 \ |
14 | " | 14 | " |
15 | 15 | ||
16 | SRC_URI = "https://gitlab.freedesktop.org/wayland/weston/uploads/f5648c818fba5432edc3ea63c4db4813/${BPN}-${PV}.tar.xz \ | 16 | SRC_URI = "https://gitlab.freedesktop.org/wayland/weston/-/releases/${PV}/downloads/${BPN}-${PV}.tar.xz \ |
17 | file://weston.png \ | 17 | file://weston.png \ |
18 | file://weston.desktop \ | 18 | file://weston.desktop \ |
19 | file://xwayland.weston-start \ | 19 | file://xwayland.weston-start \ |
20 | file://systemd-notify.weston-start \ | 20 | file://systemd-notify.weston-start \ |
21 | " | 21 | " |
22 | 22 | ||
23 | SRC_URI[sha256sum] = "a413f68c252957fc3191c3650823ec356ae8c124ccc0cb440da5cdc4e2cb9e57" | 23 | SRC_URI[sha256sum] = "eb686a7cf00992a23b17f192fca9a887313e92c346ee35d8575196983d656b4a" |
24 | 24 | ||
25 | UPSTREAM_CHECK_URI = "https://wayland.freedesktop.org/releases.html" | 25 | UPSTREAM_CHECK_URI = "https://wayland.freedesktop.org/releases.html" |
26 | UPSTREAM_CHECK_REGEX = "weston-(?P<pver>\d+\.\d+\.(?!9\d+)\d+)" | 26 | UPSTREAM_CHECK_REGEX = "weston-(?P<pver>\d+\.\d+\.(?!9\d+)\d+)" |
@@ -44,7 +44,7 @@ PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'kms wayla | |||
44 | ${@bb.utils.contains('DISTRO_FEATURES', 'x11 wayland', 'xwayland', '', d)} \ | 44 | ${@bb.utils.contains('DISTRO_FEATURES', 'x11 wayland', 'xwayland', '', d)} \ |
45 | ${@bb.utils.filter('DISTRO_FEATURES', 'systemd x11', d)} \ | 45 | ${@bb.utils.filter('DISTRO_FEATURES', 'systemd x11', d)} \ |
46 | ${@bb.utils.contains_any('DISTRO_FEATURES', 'wayland x11', '', 'headless', d)} \ | 46 | ${@bb.utils.contains_any('DISTRO_FEATURES', 'wayland x11', '', 'headless', d)} \ |
47 | ${@oe.utils.conditional('VIRTUAL-RUNTIME_init_manager', 'sysvinit', 'launcher-libseat', '', d)} \ | 47 | launcher-libseat \ |
48 | image-jpeg \ | 48 | image-jpeg \ |
49 | screenshare \ | 49 | screenshare \ |
50 | shell-desktop \ | 50 | shell-desktop \ |
@@ -64,7 +64,7 @@ PACKAGECONFIG[kms] = "-Dbackend-drm=true,-Dbackend-drm=false,drm udev virtual/eg | |||
64 | # Weston on Wayland (nested Weston) | 64 | # Weston on Wayland (nested Weston) |
65 | PACKAGECONFIG[wayland] = "-Dbackend-wayland=true,-Dbackend-wayland=false,virtual/egl virtual/libgles2" | 65 | PACKAGECONFIG[wayland] = "-Dbackend-wayland=true,-Dbackend-wayland=false,virtual/egl virtual/libgles2" |
66 | # Weston on X11 | 66 | # Weston on X11 |
67 | PACKAGECONFIG[x11] = "-Dbackend-x11=true,-Dbackend-x11=false,virtual/libx11 libxcb libxcb libxcursor cairo" | 67 | PACKAGECONFIG[x11] = "-Dbackend-x11=true,-Dbackend-x11=false,virtual/libx11 libxcb libxcursor" |
68 | # Headless Weston | 68 | # Headless Weston |
69 | PACKAGECONFIG[headless] = "-Dbackend-headless=true,-Dbackend-headless=false" | 69 | PACKAGECONFIG[headless] = "-Dbackend-headless=true,-Dbackend-headless=false" |
70 | # Weston on RDP | 70 | # Weston on RDP |
@@ -77,10 +77,10 @@ PACKAGECONFIG[egl] = "-Drenderer-gl=true,-Drenderer-gl=false,virtual/egl" | |||
77 | PACKAGECONFIG[lcms] = "-Dcolor-management-lcms=true,-Dcolor-management-lcms=false,lcms" | 77 | PACKAGECONFIG[lcms] = "-Dcolor-management-lcms=true,-Dcolor-management-lcms=false,lcms" |
78 | # Weston with webp support | 78 | # Weston with webp support |
79 | PACKAGECONFIG[webp] = "-Dimage-webp=true,-Dimage-webp=false,libwebp" | 79 | PACKAGECONFIG[webp] = "-Dimage-webp=true,-Dimage-webp=false,libwebp" |
80 | # Weston with systemd-login support | 80 | # Weston with systemd support |
81 | PACKAGECONFIG[systemd] = "-Dsystemd=true -Dlauncher-logind=true,-Dsystemd=false -Dlauncher-logind=false,systemd dbus" | 81 | PACKAGECONFIG[systemd] = "-Dsystemd=true,-Dsystemd=false,systemd dbus" |
82 | # Weston with Xwayland support (requires X11 and Wayland) | 82 | # Weston with Xwayland support (requires X11 and Wayland) |
83 | PACKAGECONFIG[xwayland] = "-Dxwayland=true,-Dxwayland=false,xwayland" | 83 | PACKAGECONFIG[xwayland] = "-Dxwayland=true,-Dxwayland=false,libxcb libxcursor xcb-util-cursor xwayland" |
84 | # colord CMS support | 84 | # colord CMS support |
85 | PACKAGECONFIG[colord] = "-Ddeprecated-color-management-colord=true,-Ddeprecated-color-management-colord=false,colord" | 85 | PACKAGECONFIG[colord] = "-Ddeprecated-color-management-colord=true,-Ddeprecated-color-management-colord=false,colord" |
86 | # Clients support | 86 | # Clients support |
@@ -101,6 +101,13 @@ PACKAGECONFIG[shell-kiosk] = "-Dshell-kiosk=true,-Dshell-kiosk=false" | |||
101 | PACKAGECONFIG[image-jpeg] = "-Dimage-jpeg=true,-Dimage-jpeg=false, jpeg" | 101 | PACKAGECONFIG[image-jpeg] = "-Dimage-jpeg=true,-Dimage-jpeg=false, jpeg" |
102 | # support libseat based launch | 102 | # support libseat based launch |
103 | PACKAGECONFIG[launcher-libseat] = "-Dlauncher-libseat=true,-Dlauncher-libseat=false,seatd" | 103 | PACKAGECONFIG[launcher-libseat] = "-Dlauncher-libseat=true,-Dlauncher-libseat=false,seatd" |
104 | # deprecated and superseded by libseat launcher | ||
105 | PACKAGECONFIG[launcher-logind] = "-Ddeprecated-launcher-logind=true,-Ddeprecated-launcher-logind=false," | ||
106 | # screencasting via PipeWire | ||
107 | PACKAGECONFIG[pipewire] = "-Dbackend-pipewire=true,-Dbackend-pipewire=false,pipewire" | ||
108 | # VNC remote screensharing | ||
109 | PACKAGECONFIG[vnc] = "-Dbackend-vnc=true,-Dbackend-vnc=false,neatvnc" | ||
110 | |||
104 | 111 | ||
105 | do_install:append() { | 112 | do_install:append() { |
106 | # Weston doesn't need the .la files to load modules, so wipe them | 113 | # 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', | |||
132 | libweston-${WESTON_MAJOR_VERSION} ${PN}-examples" | 139 | libweston-${WESTON_MAJOR_VERSION} ${PN}-examples" |
133 | 140 | ||
134 | FILES:${PN}-dev += "${libdir}/${BPN}/libexec_weston.so" | 141 | FILES:${PN}-dev += "${libdir}/${BPN}/libexec_weston.so" |
135 | FILES:${PN} = "${bindir}/weston ${bindir}/weston-terminal ${bindir}/weston-info ${bindir}/weston-launch ${bindir}/wcap-decode ${libexecdir} ${libdir}/${BPN}/*.so* ${datadir}" | 142 | FILES:${PN} = "${sysconfdir} ${bindir}/weston ${bindir}/weston-terminal ${bindir}/weston-info ${bindir}/weston-launch ${bindir}/wcap-decode ${libexecdir} ${libdir}/${BPN}/*.so* ${datadir}" |
136 | 143 | ||
137 | FILES:libweston-${WESTON_MAJOR_VERSION} = "${libdir}/lib*${SOLIBS} ${libdir}/libweston-${WESTON_MAJOR_VERSION}/*.so" | 144 | FILES:libweston-${WESTON_MAJOR_VERSION} = "${libdir}/lib*${SOLIBS} ${libdir}/libweston-${WESTON_MAJOR_VERSION}/*.so" |
138 | SUMMARY:libweston-${WESTON_MAJOR_VERSION} = "Helper library for implementing 'wayland window managers'." | 145 | SUMMARY:libweston-${WESTON_MAJOR_VERSION} = "Helper library for implementing 'wayland window managers'." |
@@ -159,21 +166,20 @@ LIC_FILES_CHKSUM += "file://LICENSE;md5=d79ee9e66bb0f95d3386a7acae780b70" | |||
159 | 166 | ||
160 | DEFAULT_PREFERENCE = "-1" | 167 | DEFAULT_PREFERENCE = "-1" |
161 | 168 | ||
162 | SRC_URI:remove = "https://gitlab.freedesktop.org/wayland/weston/uploads/f5648c818fba5432edc3ea63c4db4813/${BPN}-${PV}.tar.xz" | 169 | SRC_URI:remove = "https://gitlab.freedesktop.org/wayland/weston/-/releases/${PV}/downloads/${BPN}-${PV}.tar.xz" |
163 | SRC_URI:prepend = "git://github.com/nxp-imx/weston-imx.git;protocol=https;branch=${SRCBRANCH} " | 170 | SRC_URI:prepend = "git://github.com/nxp-imx/weston-imx.git;protocol=https;branch=${SRCBRANCH} " |
164 | SRC_URI += "file://0001-Revert-protocol-no-found-wayland-scanner-with-Yocto-.patch" | 171 | SRC_URI += "file://0001-Revert-protocol-no-found-wayland-scanner-with-Yocto-.patch" |
165 | SRCBRANCH = "weston-imx-11.0.3" | 172 | SRCBRANCH = "weston-imx-12.0.3" |
166 | SRCREV = "a509c319b7bfc72638c9b9d8f5e4b6259aba0ab7" | 173 | SRCREV = "b0d890915ee191ceb10e79ea9a830281f5c6258f" |
167 | S = "${WORKDIR}/git" | 174 | S = "${WORKDIR}/git" |
168 | 175 | ||
169 | PACKAGECONFIG_IMX_REMOVALS ?= "wayland x11" | 176 | PACKAGECONFIG_IMX_REMOVALS ?= "wayland x11" |
170 | PACKAGECONFIG:remove = "${PACKAGECONFIG_IMX_REMOVALS}" | 177 | PACKAGECONFIG:remove = "${PACKAGECONFIG_IMX_REMOVALS}" |
171 | 178 | ||
172 | PACKAGECONFIG:append:imxgpu2d = " imxg2d" | 179 | PACKAGECONFIG:append = " ${PACKAGECONFIG_G2D}" |
173 | PACKAGECONFIG:append:mx93-nxp-bsp = " imxg2d" | 180 | PACKAGECONFIG_G2D ??= "" |
174 | 181 | PACKAGECONFIG_G2D:imxgpu2d ??= "imxg2d" | |
175 | # Override | 182 | PACKAGECONFIG_G2D:mx93-nxp-bsp ??= "imxg2d" |
176 | PACKAGECONFIG[xwayland] = "-Dxwayland=true,-Dxwayland=false,libxcursor xwayland" | ||
177 | 183 | ||
178 | # Weston with i.MX G2D renderer | 184 | # Weston with i.MX G2D renderer |
179 | PACKAGECONFIG[imxg2d] = "-Drenderer-g2d=true,-Drenderer-g2d=false,virtual/libg2d" | 185 | PACKAGECONFIG[imxg2d] = "-Drenderer-g2d=true,-Drenderer-g2d=false,virtual/libg2d" |
diff --git a/recipes-graphics/xwayland/xwayland_23.1.1.imx.bbappend b/recipes-graphics/xwayland/xwayland_23.1.1.imx.bbappend index e1708a96..f71ba16c 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 = "" | |||
9 | OPENGL_PKGCONFIGS_REMOVE_IMXGPU:mx6-nxp-bsp = "glamor glx" | 9 | OPENGL_PKGCONFIGS_REMOVE_IMXGPU:mx6-nxp-bsp = "glamor glx" |
10 | OPENGL_PKGCONFIGS_REMOVE_IMXGPU:mx7-nxp-bsp = "glamor glx" | 10 | OPENGL_PKGCONFIGS_REMOVE_IMXGPU:mx7-nxp-bsp = "glamor glx" |
11 | OPENGL_PKGCONFIGS_REMOVE_IMXGPU:mx8-nxp-bsp = "glx" | 11 | OPENGL_PKGCONFIGS_REMOVE_IMXGPU:mx8-nxp-bsp = "glx" |
12 | 12 | OPENGL_PKGCONFIGS_REMOVE_IMXGPU:mx9-nxp-bsp = "glamor glx" | |
13 | 13 | ||
14 | # links with imx-gpu libs which are pre-built for glibc | 14 | # links with imx-gpu libs which are pre-built for glibc |
15 | # gcompat will address it during runtime | 15 | # gcompat will address it during runtime |