diff options
author | Otavio Salvador <otavio@ossystems.com.br> | 2023-05-17 10:31:54 -0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-05-17 10:31:54 -0300 |
commit | 011aa5617d287aa83fff549494a63c4baad0c171 (patch) | |
tree | f2d8eee52d65f2ae99efe3bd909dded037338845 | |
parent | 4b1a51b1e953b57494e1a95bc0ccfe5cd8b5e1a6 (diff) | |
parent | 448ce7db7176bd51eff3ce377cb0cb39eb49f0fb (diff) | |
download | meta-freescale-011aa5617d287aa83fff549494a63c4baad0c171.tar.gz |
Merge pull request #1535 from thochstein/graphics
Graphics
12 files changed, 100 insertions, 80 deletions
diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc index b8190abf..d8022c01 100644 --- a/conf/machine/include/imx-base.inc +++ b/conf/machine/include/imx-base.inc | |||
@@ -523,10 +523,10 @@ PREFERRED_VERSION_wayland-protocols:mx8-nxp-bsp ??= "1.31.imx" | |||
523 | PREFERRED_VERSION_wayland-protocols:mx9-nxp-bsp ??= "1.31.imx" | 523 | PREFERRED_VERSION_wayland-protocols:mx9-nxp-bsp ??= "1.31.imx" |
524 | 524 | ||
525 | # Use i.MX libdrm Version | 525 | # Use i.MX libdrm Version |
526 | PREFERRED_VERSION_libdrm:mx6-nxp-bsp ??= "2.4.109.imx" | 526 | PREFERRED_VERSION_libdrm:mx6-nxp-bsp ??= "2.4.114.imx" |
527 | PREFERRED_VERSION_libdrm:mx7-nxp-bsp ??= "2.4.109.imx" | 527 | PREFERRED_VERSION_libdrm:mx7-nxp-bsp ??= "2.4.114.imx" |
528 | PREFERRED_VERSION_libdrm:mx8-nxp-bsp ??= "2.4.109.imx" | 528 | PREFERRED_VERSION_libdrm:mx8-nxp-bsp ??= "2.4.114.imx" |
529 | PREFERRED_VERSION_libdrm:mx9-nxp-bsp ??= "2.4.109.imx" | 529 | PREFERRED_VERSION_libdrm:mx9-nxp-bsp ??= "2.4.114.imx" |
530 | 530 | ||
531 | PREFERRED_VERSION_vulkan-headers:imxvulkan ??= "1.2.182.0" | 531 | PREFERRED_VERSION_vulkan-headers:imxvulkan ??= "1.2.182.0" |
532 | PREFERRED_VERSION_vulkan-loader:imxvulkan ??= "1.2.182.0" | 532 | PREFERRED_VERSION_vulkan-loader:imxvulkan ??= "1.2.182.0" |
diff --git a/recipes-graphics/drm/libdrm_2.4.109.imx.bb b/recipes-graphics/drm/libdrm_2.4.114.imx.bb index 5edc0611..42893cbf 100644 --- a/recipes-graphics/drm/libdrm_2.4.109.imx.bb +++ b/recipes-graphics/drm/libdrm_2.4.114.imx.bb | |||
@@ -6,14 +6,16 @@ accelerated OpenGL drivers." | |||
6 | HOMEPAGE = "http://dri.freedesktop.org" | 6 | HOMEPAGE = "http://dri.freedesktop.org" |
7 | SECTION = "x11/base" | 7 | SECTION = "x11/base" |
8 | LICENSE = "MIT" | 8 | LICENSE = "MIT" |
9 | LIC_FILES_CHKSUM = "file://xf86drm.c;beginline=9;endline=32;md5=c8a3b961af7667c530816761e949dc71" | 9 | LIC_FILES_CHKSUM = "file://LICENSE;md5=9eb1f4831351ab42d762c40b3ebb7add \ |
10 | file://xf86drm.c;beginline=9;endline=32;md5=c8a3b961af7667c530816761e949dc71" | ||
10 | PROVIDES = "drm" | 11 | PROVIDES = "drm" |
11 | DEPENDS = "libpthread-stubs" | 12 | DEPENDS = "libpthread-stubs" |
12 | 13 | ||
13 | SRC_URI = "${IMX_LIBDRM_SRC};branch=${SRCBRANCH}" | 14 | SRC_URI = "${IMX_LIBDRM_SRC};branch=${SRCBRANCH}" |
14 | IMX_LIBDRM_SRC ?= "git://github.com/nxp-imx/libdrm-imx.git;protocol=https;nobranch=1" | 15 | IMX_LIBDRM_SRC ?= "git://github.com/nxp-imx/libdrm-imx.git;protocol=https;nobranch=1" |
15 | SRCBRANCH ?= "libdrm-imx-2.4.109" | 16 | SRCBRANCH ?= "libdrm-imx-2.4.114" |
16 | SRCREV = "063bd699054866852ae182d2b31d4d3e7eae4f03" | 17 | SRCREV = "68531f3f411d65f71e4616f51e3ab841a7bac0aa" |
18 | |||
17 | S = "${WORKDIR}/git" | 19 | S = "${WORKDIR}/git" |
18 | 20 | ||
19 | DEFAULT_PREFERENCE = "-1" | 21 | DEFAULT_PREFERENCE = "-1" |
@@ -21,25 +23,25 @@ COMPATIBLE_MACHINE = "(imx-nxp-bsp)" | |||
21 | 23 | ||
22 | inherit meson pkgconfig manpages | 24 | inherit meson pkgconfig manpages |
23 | 25 | ||
24 | PACKAGECONFIG ??= "libkms intel radeon amdgpu nouveau vmwgfx omap freedreno vc4 etnaviv install-test-programs" | 26 | PACKAGECONFIG ??= "intel radeon amdgpu nouveau vmwgfx omap freedreno vc4 etnaviv tests install-test-programs" |
25 | PACKAGECONFIG[libkms] = "-Dlibkms=true,-Dlibkms=false" | 27 | PACKAGECONFIG[intel] = "-Dintel=enabled,-Dintel=disabled,libpciaccess" |
26 | PACKAGECONFIG[intel] = "-Dintel=true,-Dintel=false,libpciaccess" | 28 | PACKAGECONFIG[radeon] = "-Dradeon=enabled,-Dradeon=disabled" |
27 | PACKAGECONFIG[radeon] = "-Dradeon=true,-Dradeon=false" | 29 | PACKAGECONFIG[amdgpu] = "-Damdgpu=enabled,-Damdgpu=disabled" |
28 | PACKAGECONFIG[amdgpu] = "-Damdgpu=true,-Damdgpu=false" | 30 | PACKAGECONFIG[nouveau] = "-Dnouveau=enabled,-Dnouveau=disabled" |
29 | PACKAGECONFIG[nouveau] = "-Dnouveau=true,-Dnouveau=false" | 31 | PACKAGECONFIG[vmwgfx] = "-Dvmwgfx=enabled,-Dvmwgfx=disabled" |
30 | PACKAGECONFIG[vmwgfx] = "-Dvmwgfx=true,-Dvmwgfx=false" | 32 | PACKAGECONFIG[omap] = "-Domap=enabled,-Domap=disabled" |
31 | PACKAGECONFIG[omap] = "-Domap=true,-Domap=false" | 33 | PACKAGECONFIG[exynos] = "-Dexynos=enabled,-Dexynos=disabled" |
32 | PACKAGECONFIG[exynos] = "-Dexynos=true,-Dexynos=false" | 34 | PACKAGECONFIG[freedreno] = "-Dfreedreno=enabled,-Dfreedreno=disabled" |
33 | PACKAGECONFIG[freedreno] = "-Dfreedreno=true,-Dfreedreno=false" | 35 | PACKAGECONFIG[tegra] = "-Dtegra=enabled,-Dtegra=disabled" |
34 | PACKAGECONFIG[tegra] = "-Dtegra=true,-Dtegra=false" | 36 | PACKAGECONFIG[vc4] = "-Dvc4=enabled,-Dvc4=disabled" |
35 | PACKAGECONFIG[vc4] = "-Dvc4=true,-Dvc4=false" | 37 | PACKAGECONFIG[etnaviv] = "-Detnaviv=enabled,-Detnaviv=disabled" |
36 | PACKAGECONFIG[etnaviv] = "-Detnaviv=true,-Detnaviv=false" | ||
37 | PACKAGECONFIG[freedreno-kgsl] = "-Dfreedreno-kgsl=true,-Dfreedreno-kgsl=false" | 38 | PACKAGECONFIG[freedreno-kgsl] = "-Dfreedreno-kgsl=true,-Dfreedreno-kgsl=false" |
38 | PACKAGECONFIG[valgrind] = "-Dvalgrind=true,-Dvalgrind=false,valgrind" | 39 | PACKAGECONFIG[valgrind] = "-Dvalgrind=enabled,-Dvalgrind=disabled,valgrind" |
39 | PACKAGECONFIG[install-test-programs] = "-Dinstall-test-programs=true,-Dinstall-test-programs=false" | 40 | PACKAGECONFIG[install-test-programs] = "-Dinstall-test-programs=true,-Dinstall-test-programs=false" |
40 | PACKAGECONFIG[cairo-tests] = "-Dcairo-tests=true,-Dcairo-tests=false" | 41 | PACKAGECONFIG[cairo-tests] = "-Dcairo-tests=enabled,-Dcairo-tests=disabled" |
42 | PACKAGECONFIG[tests] = "-Dtests=true,-Dtests=false" | ||
41 | PACKAGECONFIG[udev] = "-Dudev=true,-Dudev=false,udev" | 43 | PACKAGECONFIG[udev] = "-Dudev=true,-Dudev=false,udev" |
42 | PACKAGECONFIG[manpages] = "-Dman-pages=true,-Dman-pages=false,libxslt-native xmlto-native python3-docutils-native" | 44 | PACKAGECONFIG[manpages] = "-Dman-pages=enabled,-Dman-pages=disabled,libxslt-native xmlto-native python3-docutils-native" |
43 | 45 | ||
44 | ALLOW_EMPTY:${PN}-drivers = "1" | 46 | ALLOW_EMPTY:${PN}-drivers = "1" |
45 | PACKAGES =+ "${PN}-tests ${PN}-drivers ${PN}-radeon ${PN}-nouveau ${PN}-omap \ | 47 | PACKAGES =+ "${PN}-tests ${PN}-drivers ${PN}-radeon ${PN}-nouveau ${PN}-omap \ |
diff --git a/recipes-graphics/imx-g2d/imx-dpu-g2d_2.1.4.bb b/recipes-graphics/imx-g2d/imx-dpu-g2d_2.1.6.bb index 667bc26b..8d26e7a5 100644 --- a/recipes-graphics/imx-g2d/imx-dpu-g2d_2.1.4.bb +++ b/recipes-graphics/imx-g2d/imx-dpu-g2d_2.1.6.bb | |||
@@ -4,26 +4,27 @@ | |||
4 | 4 | ||
5 | DESCRIPTION = "G2D library using i.MX DPU" | 5 | DESCRIPTION = "G2D library using i.MX DPU" |
6 | LICENSE = "Proprietary" | 6 | LICENSE = "Proprietary" |
7 | LIC_FILES_CHKSUM = "file://COPYING;md5=5a0bf11f745e68024f37b4724a5364fe" | 7 | LIC_FILES_CHKSUM = "file://COPYING;md5=ea25d099982d035af85d193c88a1b479" |
8 | 8 | ||
9 | DEPENDS = "libgal-imx libdrm" | 9 | DEPENDS = "libgal-imx libdrm" |
10 | PROVIDES += "virtual/libg2d" | 10 | PROVIDES += "virtual/libg2d" |
11 | 11 | ||
12 | SRC_URI = "${FSL_MIRROR}/${BPN}-${PV}.bin;fsl-eula=true" | 12 | SRC_URI = "${FSL_MIRROR}/${BPN}-${PV}.bin;fsl-eula=true" |
13 | SRC_URI[md5sum] = "488d9f63b2d02c687a0bc8c3debfb51c" | 13 | SRC_URI[md5sum] = "ab5972089fe8746dc5fa5388e432a154" |
14 | SRC_URI[sha256sum] = "62050bc5dd35e942c97e7a8ab22b0b98d02e27a38935b585e622cdc5221ef2a3" | 14 | SRC_URI[sha256sum] = "771d71b5766f148bfb349cbc069a1808ad43f881d17cb11ec2ca27a959a9ad34" |
15 | 15 | ||
16 | inherit fsl-eula-unpack | 16 | inherit fsl-eula-unpack |
17 | 17 | ||
18 | do_install () { | 18 | do_install () { |
19 | install -d ${D}${libdir} | 19 | install -d ${D}${libdir} |
20 | install -d ${D}${includedir} | 20 | install -d ${D}${includedir} |
21 | cp -r ${S}/g2d/usr/lib/*.so* ${D}${libdir} | 21 | cp -d ${S}/g2d/usr/lib/*.so* ${D}${libdir} |
22 | cp -Pr ${S}/g2d/usr/include/* ${D}${includedir} | 22 | cp -Pr ${S}/g2d/usr/include/* ${D}${includedir} |
23 | } | 23 | } |
24 | 24 | ||
25 | INSANE_SKIP:${PN} += "ldflags" | 25 | INSANE_SKIP:${PN} += "ldflags" |
26 | INSANE_SKIP:append:libc-musl = " file-rdeps" | 26 | INSANE_SKIP:append:libc-musl = " file-rdeps" |
27 | RDEPENDS:${PN}:append:libc-musl = " gcompat" | ||
27 | 28 | ||
28 | # The packaged binaries have been stripped of debug info, so disable | 29 | # The packaged binaries have been stripped of debug info, so disable |
29 | # operations accordingly. | 30 | # operations accordingly. |
@@ -32,5 +33,3 @@ INHIBIT_PACKAGE_STRIP = "1" | |||
32 | INHIBIT_SYSROOT_STRIP = "1" | 33 | INHIBIT_SYSROOT_STRIP = "1" |
33 | 34 | ||
34 | COMPATIBLE_MACHINE = "(imxdpu)" | 35 | COMPATIBLE_MACHINE = "(imxdpu)" |
35 | |||
36 | RDEPENDS:${PN}:append:libc-musl = " gcompat" | ||
diff --git a/recipes-graphics/imx-g2d/imx-g2d-samples_git.bb b/recipes-graphics/imx-g2d/imx-g2d-samples_git.bb index c02a4f50..c5f2158e 100644 --- a/recipes-graphics/imx-g2d/imx-g2d-samples_git.bb +++ b/recipes-graphics/imx-g2d/imx-g2d-samples_git.bb | |||
@@ -1,16 +1,16 @@ | |||
1 | SUMMARY = "i.MX G2D Samples" | 1 | SUMMARY = "i.MX G2D Samples" |
2 | DESCRIPTION = "Set of sample applications for i.MX G2D" | 2 | DESCRIPTION = "Set of sample applications for i.MX G2D" |
3 | LICENSE = "BSD-3-Clause" | 3 | LICENSE = "BSD-3-Clause" |
4 | LIC_FILES_CHKSUM = "file://COPYING;md5=0858ec9c7a80c4a2cf16e4f825a2cc91" | 4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=0858ec9c7a80c4a2cf16e4f825a2cc91" |
5 | 5 | ||
6 | DEPENDS = "virtual/libg2d cairo" | 6 | DEPENDS = "cairo" |
7 | 7 | ||
8 | PV = "2.1+git${SRCPV}" | 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 = "3efd75a90e3c606c9b7bed6791bcd4085ae69b9b" | 13 | SRCREV = "a5f620fcf0e986a19e4acdfa48c95eaf79a5c570" |
14 | 14 | ||
15 | S = "${WORKDIR}/git" | 15 | S = "${WORKDIR}/git" |
16 | 16 | ||
@@ -21,28 +21,36 @@ PACKAGECONFIG_IMPLEMENTATION = "" | |||
21 | PACKAGECONFIG_IMPLEMENTATION:imxgpu2d:imxdpu = "dpu" | 21 | PACKAGECONFIG_IMPLEMENTATION:imxgpu2d:imxdpu = "dpu" |
22 | PACKAGECONFIG_IMPLEMENTATION:imxgpu2d = "gpu-drm" | 22 | PACKAGECONFIG_IMPLEMENTATION:imxgpu2d = "gpu-drm" |
23 | PACKAGECONFIG_IMPLEMENTATION:imxgpu2d:imxfbdev = "gpu-fbdev" | 23 | PACKAGECONFIG_IMPLEMENTATION:imxgpu2d:imxfbdev = "gpu-fbdev" |
24 | PACKAGECONFIG_IMPLEMENTATION:mx93-nxp-bsp = "pxp" | ||
24 | 25 | ||
25 | PACKAGECONFIG[dpu] = " \ | 26 | PACKAGECONFIG[dpu] = " \ |
26 | BUILD_IMPLEMENTATION=dpu, \ | 27 | BUILD_IMPLEMENTATION=dpu, \ |
27 | , \ | 28 | , \ |
28 | imx-dpu-g2d wayland-native wayland-protocols, \ | 29 | imx-dpu-g2d wayland-native wayland wayland-protocols, \ |
29 | , \ | 30 | , \ |
30 | , \ | 31 | , \ |
31 | gpu-drm gpu-fbdev" | 32 | gpu-drm gpu-fbdev pxp" |
32 | PACKAGECONFIG[gpu-drm] = " \ | 33 | PACKAGECONFIG[gpu-drm] = " \ |
33 | BUILD_IMPLEMENTATION=gpu-drm, \ | 34 | BUILD_IMPLEMENTATION=gpu-drm, \ |
34 | , \ | 35 | , \ |
35 | imx-gpu-g2d wayland-native wayland-protocols, \ | 36 | imx-gpu-g2d wayland-native wayland wayland-protocols, \ |
36 | , \ | 37 | , \ |
37 | , \ | 38 | , \ |
38 | dpu gpu-fbdev" | 39 | dpu gpu-fbdev pxp" |
39 | PACKAGECONFIG[gpu-fbdev] = " \ | 40 | PACKAGECONFIG[gpu-fbdev] = " \ |
40 | BUILD_IMPLEMENTATION=gpu-fbdev, \ | 41 | BUILD_IMPLEMENTATION=gpu-fbdev, \ |
41 | , \ | 42 | , \ |
42 | imx-gpu-g2d, \ | 43 | imx-gpu-g2d, \ |
43 | , \ | 44 | , \ |
44 | , \ | 45 | , \ |
45 | dpu gpu-drm" | 46 | dpu gpu-drm pxp" |
47 | PACKAGECONFIG[pxp] = " \ | ||
48 | BUILD_IMPLEMENTATION=pxp, \ | ||
49 | , \ | ||
50 | imx-pxp-g2d wayland-native wayland wayland-protocols, \ | ||
51 | , \ | ||
52 | , \ | ||
53 | dpu gpu-drm gpu-fbdev" | ||
46 | 54 | ||
47 | EXTRA_OEMAKE += " \ | 55 | EXTRA_OEMAKE += " \ |
48 | SDKTARGETSYSROOT=${STAGING_DIR_HOST} \ | 56 | SDKTARGETSYSROOT=${STAGING_DIR_HOST} \ |
@@ -57,4 +65,4 @@ FILES:${PN} += "/opt" | |||
57 | 65 | ||
58 | PACKAGE_ARCH = "${MACHINE_SOCARCH}" | 66 | PACKAGE_ARCH = "${MACHINE_SOCARCH}" |
59 | 67 | ||
60 | COMPATIBLE_MACHINE = "(imxgpu2d)" | 68 | COMPATIBLE_MACHINE = "(imxgpu2d|mx93-nxp-bsp)" |
diff --git a/recipes-graphics/imx-g2d/imx-gpu-g2d_6.4.3.p4.6.bb b/recipes-graphics/imx-g2d/imx-gpu-g2d_6.4.11.p1.0.bb index d513c720..1d4e3cc5 100644 --- a/recipes-graphics/imx-g2d/imx-gpu-g2d_6.4.3.p4.6.bb +++ b/recipes-graphics/imx-g2d/imx-gpu-g2d_6.4.11.p1.0.bb | |||
@@ -5,17 +5,16 @@ | |||
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=5a0bf11f745e68024f37b4724a5364fe" | 8 | LIC_FILES_CHKSUM = "file://COPYING;md5=ea25d099982d035af85d193c88a1b479" |
9 | DEPENDS = "libgal-imx" | 9 | DEPENDS = "libgal-imx" |
10 | PROVIDES = "virtual/libg2d" | 10 | PROVIDES = "virtual/libg2d" |
11 | 11 | ||
12 | FSLBIN_NAME = "${PN}-${PV}-${TARGET_ARCH}" | ||
13 | |||
14 | SRC_URI = "${FSL_MIRROR}/${FSLBIN_NAME}.bin;name=${TARGET_ARCH};fsl-eula=true" | 12 | SRC_URI = "${FSL_MIRROR}/${FSLBIN_NAME}.bin;name=${TARGET_ARCH};fsl-eula=true" |
15 | SRC_URI[aarch64.md5sum] = "41e6c3a6f8d4151d30c1f34341465b30" | 13 | FSLBIN_NAME = "${PN}-${PV}-${TARGET_ARCH}" |
16 | SRC_URI[aarch64.sha256sum] = "70e007f66459ee6a392f4a21f4d4a753ff22a75b728cc7d952251b00ba3ab51e" | 14 | SRC_URI[aarch64.md5sum] = "7aafa5910ef3e3be1c449b4bddd97b56" |
17 | SRC_URI[arm.md5sum] = "4c751218aa4db1f545bcec17ee963cc0" | 15 | SRC_URI[aarch64.sha256sum] = "9bf8ebbfc85245d75ab7d133c3e135a4c5f23a0430c75883af9700e9cb82c151" |
18 | SRC_URI[arm.sha256sum] = "288f78419d825e71563c38a39a738f040e098b581b76e6f8b8fc5895e7d9d7c4" | 16 | SRC_URI[arm.md5sum] = "e0da61541b0b95083a3c95cc0bba4f63" |
17 | SRC_URI[arm.sha256sum] = "65427c12b43c7bb3838ec2bc91a5853c310652b920a65b2b52bacad8e761a8e4" | ||
19 | 18 | ||
20 | S = "${WORKDIR}/${FSLBIN_NAME}" | 19 | S = "${WORKDIR}/${FSLBIN_NAME}" |
21 | 20 | ||
@@ -40,7 +39,5 @@ INHIBIT_PACKAGE_DEBUG_SPLIT = "1" | |||
40 | INHIBIT_PACKAGE_STRIP = "1" | 39 | INHIBIT_PACKAGE_STRIP = "1" |
41 | INHIBIT_SYSROOT_STRIP = "1" | 40 | INHIBIT_SYSROOT_STRIP = "1" |
42 | 41 | ||
43 | INSANE_SKIP:${PN} = "ldflags" | ||
44 | |||
45 | PACKAGE_ARCH = "${MACHINE_SOCARCH}" | 42 | PACKAGE_ARCH = "${MACHINE_SOCARCH}" |
46 | COMPATIBLE_MACHINE = "(imxgpu2d)" | 43 | COMPATIBLE_MACHINE = "(imxgpu2d)" |
diff --git a/recipes-graphics/imx-g2d/imx-pxp-g2d_git.bb b/recipes-graphics/imx-g2d/imx-pxp-g2d_git.bb index fbf56e0c..0f444cfa 100644 --- a/recipes-graphics/imx-g2d/imx-pxp-g2d_git.bb +++ b/recipes-graphics/imx-g2d/imx-pxp-g2d_git.bb | |||
@@ -1,10 +1,10 @@ | |||
1 | # Copyright (C) 2016 Freescale Semiconductor | 1 | # Copyright (C) 2016 Freescale Semiconductor |
2 | # Copyright 2017-2022 NXP | 2 | # Copyright 2017-2023 NXP |
3 | # Released under the MIT license (see COPYING.MIT for the terms) | 3 | # Released under the MIT license (see COPYING.MIT for the terms) |
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://EULA.txt;md5=d3c315c6eaa43e07d8c130dc3a04a011" | 7 | LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=ea25d099982d035af85d193c88a1b479" |
8 | 8 | ||
9 | PROVIDES += "virtual/libg2d" | 9 | PROVIDES += "virtual/libg2d" |
10 | 10 | ||
@@ -13,7 +13,7 @@ PV = "2.1.0+git${SRCPV}" | |||
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 = "178970dc7cdba69b94c2219b5bade46d67adb640" | 16 | SRCREV = "8887f6bbf533affef7e22a65179a08a25f1547f1" |
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 f325ff94..a2f049a8 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 | |||
@@ -7,7 +7,7 @@ DEPENDS = "imx-gpu-viv zlib libpng procps" | |||
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 \ |
9 | " | 9 | " |
10 | SRCREV = "90a59407f1cddd31b4dac67e5a2500100eb091bc" | 10 | SRCREV = "522cb2981289b7ba20d6dd4b4bf75097e079815b" |
11 | 11 | ||
12 | S = "${WORKDIR}/git" | 12 | S = "${WORKDIR}/git" |
13 | 13 | ||
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 169606c2..0c6e3c81 100644 --- a/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc +++ b/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc | |||
@@ -1,12 +1,12 @@ | |||
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-2021 NXP | 3 | # Copyright 2017-2023 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" |
7 | SECTION = "libs" | 7 | SECTION = "libs" |
8 | LICENSE = "Proprietary" | 8 | LICENSE = "Proprietary" |
9 | LIC_FILES_CHKSUM = "file://COPYING;md5=5a0bf11f745e68024f37b4724a5364fe" | 9 | LIC_FILES_CHKSUM = "file://COPYING;md5=ea25d099982d035af85d193c88a1b479" |
10 | 10 | ||
11 | DEPENDS += " \ | 11 | DEPENDS += " \ |
12 | ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland', \ | 12 | ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland', \ |
@@ -30,15 +30,12 @@ DEPENDS:append:libc-musl = " gcompat" | |||
30 | PROVIDES += " \ | 30 | PROVIDES += " \ |
31 | imx-gpu-viv \ | 31 | imx-gpu-viv \ |
32 | libgal-imx \ | 32 | libgal-imx \ |
33 | opencl-headers \ | ||
34 | opencl-clhpp \ | ||
35 | opencl-icd-loader \ | ||
36 | virtual/egl \ | 33 | virtual/egl \ |
37 | virtual/libopenvg \ | 34 | virtual/libopenvg \ |
38 | virtual/opencl-icd \ | ||
39 | ${EXTRA_PROVIDES} \ | 35 | ${EXTRA_PROVIDES} \ |
40 | " | 36 | " |
41 | EXTRA_PROVIDES = " \ | 37 | EXTRA_PROVIDES = " \ |
38 | ${PROVIDES_OPENCL} \ | ||
42 | ${PROVIDES_OPENGLES3} \ | 39 | ${PROVIDES_OPENGLES3} \ |
43 | ${PROVIDES_OPENVX} \ | 40 | ${PROVIDES_OPENVX} \ |
44 | " | 41 | " |
@@ -51,6 +48,15 @@ EXTRA_PROVIDES:append:mx8-nxp-bsp = " \ | |||
51 | virtual/libgbm \ | 48 | virtual/libgbm \ |
52 | " | 49 | " |
53 | 50 | ||
51 | PROVIDES_OPENCL = " \ | ||
52 | opencl-headers \ | ||
53 | opencl-clhpp \ | ||
54 | opencl-icd-loader \ | ||
55 | virtual/opencl-icd \ | ||
56 | " | ||
57 | PROVIDES_OPENCL:mx7-nxp-bsp = "" | ||
58 | PROVIDES_OPENCL:mx8mm-nxp-bsp = "" | ||
59 | |||
54 | PROVIDES_OPENGLES3 = "" | 60 | PROVIDES_OPENGLES3 = "" |
55 | PROVIDES_OPENGLES3:mx8-nxp-bsp = "virtual/libgles3" | 61 | PROVIDES_OPENGLES3:mx8-nxp-bsp = "virtual/libgles3" |
56 | PROVIDES_OPENGLES3:mx8mm-nxp-bsp = "" | 62 | PROVIDES_OPENGLES3:mx8mm-nxp-bsp = "" |
@@ -95,13 +101,15 @@ PACKAGES =+ " \ | |||
95 | ${PACKAGES_VULKAN} \ | 101 | ${PACKAGES_VULKAN} \ |
96 | ${PACKAGES_OPENVX} \ | 102 | ${PACKAGES_OPENVX} \ |
97 | libnn-imx \ | 103 | libnn-imx \ |
104 | libspirv-imx \ | ||
98 | " | 105 | " |
99 | 106 | ||
100 | PACKAGES_GBM = "" | 107 | PACKAGES_GBM = "" |
101 | PACKAGES_GBM:mx8-nxp-bsp = "libgbm-imx libgbm-imx-dev" | 108 | PACKAGES_GBM:mx8-nxp-bsp = "libgbm-imx libgbm-imx-dev" |
102 | 109 | ||
103 | PACKAGES_OPENCL = "libopencl-imx libopencl-imx-dev libclc-imx libclc-imx-dev" | 110 | PACKAGES_OPENCL = "libclc-imx libclc-imx-dev libopencl-imx libopencl-imx-dev" |
104 | PACKAGES_OPENCL:mx7-nxp-bsp = "" | 111 | PACKAGES_OPENCL:mx7-nxp-bsp = "" |
112 | PACKAGES_OPENCL:mx8mm-nxp-bsp = "" | ||
105 | 113 | ||
106 | PACKAGES_OPENVX = \ | 114 | PACKAGES_OPENVX = \ |
107 | "${@bb.utils.contains("PROVIDES_OPENVX", "virtual/libopenvx", \ | 115 | "${@bb.utils.contains("PROVIDES_OPENVX", "virtual/libopenvx", \ |
@@ -109,6 +117,7 @@ PACKAGES_OPENVX = \ | |||
109 | 117 | ||
110 | PACKAGES_VULKAN = "" | 118 | PACKAGES_VULKAN = "" |
111 | PACKAGES_VULKAN:imxvulkan = "libvulkan-imx libvulkan-imx-dev" | 119 | PACKAGES_VULKAN:imxvulkan = "libvulkan-imx libvulkan-imx-dev" |
120 | PACKAGES_VULKAN:mx8mm-nxp-bsp = "libvulkan-imx libvulkan-imx-dev" | ||
112 | 121 | ||
113 | python __anonymous () { | 122 | python __anonymous () { |
114 | has_vivante_kernel_driver_support = (d.getVar('MACHINE_HAS_VIVANTE_KERNEL_DRIVER_SUPPORT') or '0') | 123 | has_vivante_kernel_driver_support = (d.getVar('MACHINE_HAS_VIVANTE_KERNEL_DRIVER_SUPPORT') or '0') |
@@ -209,6 +218,9 @@ do_install () { | |||
209 | # Install backend-specific drivers | 218 | # Install backend-specific drivers |
210 | if [ "${BACKEND}" = "wayland" ]; then | 219 | if [ "${BACKEND}" = "wayland" ]; then |
211 | # Wayland backend | 220 | # Wayland backend |
221 | if ! ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'true', 'false', d)}; then | ||
222 | install -m 0644 ${S}/gpu-core/usr/lib/pkgconfig/gl.pc ${D}${libdir}/pkgconfig/gl.pc | ||
223 | fi | ||
212 | install -m 0644 ${S}/gpu-core/usr/lib/pkgconfig/egl_wayland.pc ${D}${libdir}/pkgconfig/egl.pc | 224 | install -m 0644 ${S}/gpu-core/usr/lib/pkgconfig/egl_wayland.pc ${D}${libdir}/pkgconfig/egl.pc |
213 | cp -r ${S}/gpu-core/usr/lib/wayland/* ${D}${libdir} | 225 | cp -r ${S}/gpu-core/usr/lib/wayland/* ${D}${libdir} |
214 | elif [ "${IS_MX8}" != "1" ]; then | 226 | elif [ "${IS_MX8}" != "1" ]; then |
@@ -316,7 +328,6 @@ do_install:append:libc-musl() { | |||
316 | ALLOW_EMPTY:${PN} = "1" | 328 | ALLOW_EMPTY:${PN} = "1" |
317 | 329 | ||
318 | FILES:libclc-imx = "${libdir}/libCLC${SOLIBS} ${includedir}/CL/cl_viv_vx_ext.h" | 330 | FILES:libclc-imx = "${libdir}/libCLC${SOLIBS} ${includedir}/CL/cl_viv_vx_ext.h" |
319 | FILES:libclc-imx-dev = "${includedir}/CL ${libdir}/libCLC${SOLIBSDEV}" | ||
320 | 331 | ||
321 | # libEGL.so is used by some demo apps from Freescale | 332 | # libEGL.so is used by some demo apps from Freescale |
322 | INSANE_SKIP:libegl-imx += "dev-so" | 333 | INSANE_SKIP:libegl-imx += "dev-so" |
@@ -324,7 +335,7 @@ FILES:libegl-imx = "${libdir}/libEGL${REALSOLIBS} ${libdir}/libEGL${SOLIBSDEV} " | |||
324 | FILES:libegl-imx-dev = "${includedir}/EGL ${includedir}/KHR ${libdir}/pkgconfig/egl.pc" | 335 | FILES:libegl-imx-dev = "${includedir}/EGL ${includedir}/KHR ${libdir}/pkgconfig/egl.pc" |
325 | 336 | ||
326 | FILES:libgal-imx = "${libdir}/libGAL${SOLIBS} ${libdir}/libGAL_egl${SOLIBS}" | 337 | FILES:libgal-imx = "${libdir}/libGAL${SOLIBS} ${libdir}/libGAL_egl${SOLIBS}" |
327 | FILES:libgal-imx-dev = "${libdir}/libGAL${SOLIBSDEV} ${includedir}/HAL" | 338 | FILES:libgal-imx-dev = "${includedir}/HAL" |
328 | RDEPENDS:libgal-imx += "${@bb.utils.contains('PACKAGECONFIG', 'valgrind', 'valgrind', '', d)}" | 339 | RDEPENDS:libgal-imx += "${@bb.utils.contains('PACKAGECONFIG', 'valgrind', 'valgrind', '', d)}" |
329 | RPROVIDES:libgal-imx += "libgal-imx" | 340 | RPROVIDES:libgal-imx += "libgal-imx" |
330 | RRECOMMENDS:libgal-imx += "kernel-module-imx-gpu-viv" | 341 | RRECOMMENDS:libgal-imx += "kernel-module-imx-gpu-viv" |
@@ -339,10 +350,13 @@ INSANE_SKIP:libgbm-imx += "dev-so" | |||
339 | 350 | ||
340 | FILES:libvulkan-imx = "\ | 351 | FILES:libvulkan-imx = "\ |
341 | ${libdir}/libvulkan_VSI${REALSOLIBS} \ | 352 | ${libdir}/libvulkan_VSI${REALSOLIBS} \ |
342 | ${libdir}/libSPIRV_viv${SOLIBS} \ | ||
343 | ${sysconfdir}/vulkan" | 353 | ${sysconfdir}/vulkan" |
344 | FILES:libvulkan-imx-dev = "${includedir}/vulkan ${libdir}/libvulkan_VSI${SOLIBSDEV}" | 354 | FILES:libvulkan-imx-dev = "${includedir}/vulkan ${libdir}/libvulkan_VSI${SOLIBSDEV}" |
345 | 355 | ||
356 | FILES:libspirv-imx = " \ | ||
357 | ${libdir}/libSPIRV_viv${SOLIBS} \ | ||
358 | " | ||
359 | |||
346 | FILES:libopenvx-imx = " \ | 360 | FILES:libopenvx-imx = " \ |
347 | ${libdir}/libOpenVX${REALSOLIBS} \ | 361 | ${libdir}/libOpenVX${REALSOLIBS} \ |
348 | ${libdir}/libOpenVXC${SOLIBS} \ | 362 | ${libdir}/libOpenVXC${SOLIBS} \ |
@@ -357,20 +371,20 @@ RDEPENDS:libopenvx-imx = "libnn-imx" | |||
357 | # package QA complains on missing RDEPENDS, which are only available for X11. | 371 | # package QA complains on missing RDEPENDS, which are only available for X11. |
358 | # Skip "file-rdeps" QA for this package. | 372 | # Skip "file-rdeps" QA for this package. |
359 | FILES:libgl-imx = "${libdir}/libGL${REALSOLIBS}" | 373 | FILES:libgl-imx = "${libdir}/libGL${REALSOLIBS}" |
360 | FILES:libgl-imx-dev = "${libdir}/libGL${SOLIBSDEV} ${includedir}/GL" | 374 | FILES:libgl-imx-dev = "${libdir}/libGL${SOLIBSDEV} ${includedir}/GL ${libdir}/pkgconfig/gl.pc" |
361 | INSANE_SKIP:libgl-imx += "file-rdeps" | 375 | INSANE_SKIP:libgl-imx += "file-rdeps" |
362 | 376 | ||
363 | # libEGL needs to open libGLESv1.so | 377 | # libEGL needs to open libGLESv1.so |
364 | INSANE_SKIP:libgles1-imx += "dev-so" | 378 | INSANE_SKIP:libgles1-imx += "dev-so" |
365 | FILES:libgles1-imx = "${libdir}/libGLESv1*${REALSOLIBS} ${libdir}/libGLESv1*${SOLIBS} ${libdir}/libGLES_*${REALSOLIBS} ${libdir}/libGLES_*${SOLIBS}" | 379 | FILES:libgles1-imx = "${libdir}/libGLESv1*${REALSOLIBS} ${libdir}/libGLESv1*${SOLIBS} ${libdir}/libGLES_*${REALSOLIBS} ${libdir}/libGLES_*${SOLIBS}" |
366 | FILES:libgles1-imx-dev = "${includedir}/GLES ${libdir}/libGLESv1*${SOLIBS} ${libdir}/libGLES_*${SOLIBSDEV} ${libdir}/pkgconfig/glesv1_cm.pc" | 380 | FILES:libgles1-imx-dev = "${includedir}/GLES ${libdir}/libGLESv1*${SOLIBS} ${libdir}/pkgconfig/glesv1_cm.pc" |
367 | RPROVIDES:libgles1-imx = "libgles-imx" | 381 | RPROVIDES:libgles1-imx = "libgles-imx" |
368 | RPROVIDES:libgles1-imx-dev = "libgles-imx-dev" | 382 | RPROVIDES:libgles1-imx-dev = "libgles-imx-dev" |
369 | 383 | ||
370 | # libEGL needs to open libGLESv2.so | 384 | # libEGL needs to open libGLESv2.so |
371 | INSANE_SKIP:libgles2-imx += "dev-so" | 385 | INSANE_SKIP:libgles2-imx += "dev-so" |
372 | FILES:libgles2-imx = "${libdir}/libGLESv2${REALSOLIBS} ${libdir}/libGLESv2${SOLIBS}" | 386 | FILES:libgles2-imx = "${libdir}/libGLESv2${REALSOLIBS} ${libdir}/libGLESv2${SOLIBS}" |
373 | FILES:libgles2-imx-dev = "${includedir}/GLES2 ${libdir}/libGLESv2${SOLIBSDEV} ${libdir}/pkgconfig/glesv2.pc" | 387 | FILES:libgles2-imx-dev = "${includedir}/GLES2 ${libdir}/pkgconfig/glesv2.pc" |
374 | RDEPENDS:libgles2-imx = "libglslc-imx" | 388 | RDEPENDS:libgles2-imx = "libglslc-imx" |
375 | 389 | ||
376 | FILES:libgles3-imx-dev = "${includedir}/GLES3" | 390 | FILES:libgles3-imx-dev = "${includedir}/GLES3" |
@@ -379,7 +393,6 @@ FILES:libgles3-imx-dev = "${includedir}/GLES3" | |||
379 | RDEPENDS:libgles2-imx-dev += "libgles3-imx-dev" | 393 | RDEPENDS:libgles2-imx-dev += "libgles3-imx-dev" |
380 | 394 | ||
381 | FILES:libglslc-imx = "${libdir}/libGLSLC${SOLIBS}" | 395 | FILES:libglslc-imx = "${libdir}/libGLSLC${SOLIBS}" |
382 | FILES:libglslc-imx-dev = "${includedir}/CL ${libdir}/libGLSLC${SOLIBSDEV}" | ||
383 | 396 | ||
384 | FILES:libopencl-imx = "${libdir}/libOpenCL${REALSOLIBS} \ | 397 | FILES:libopencl-imx = "${libdir}/libOpenCL${REALSOLIBS} \ |
385 | ${libdir}/libVivanteOpenCL${SOLIBS} \ | 398 | ${libdir}/libVivanteOpenCL${SOLIBS} \ |
diff --git a/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.3.p4.6-aarch32.bb b/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p1.0-aarch32.bb index 7a8d0634..846fa31d 100644 --- a/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.3.p4.6-aarch32.bb +++ b/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p1.0-aarch32.bb | |||
@@ -4,7 +4,7 @@ | |||
4 | 4 | ||
5 | require imx-gpu-viv-6.inc | 5 | require imx-gpu-viv-6.inc |
6 | 6 | ||
7 | SRC_URI[md5sum] = "92d8a1440b680917a4001ebe65811584" | 7 | SRC_URI[md5sum] = "9a1796264d9a07205e3ec7bc184599c8" |
8 | SRC_URI[sha256sum] = "fdb9e4250d2baf9a76ba60eab376c2317f9c53b621fe2c886a02f6355c0e01c6" | 8 | SRC_URI[sha256sum] = "6e2f3fb43d16c30fd0b23027f5205818e9d4c74d4903f1c63f265ccf8269f01d" |
9 | 9 | ||
10 | COMPATIBLE_MACHINE = "(mx6q-nxp-bsp|mx6dl-nxp-bsp|mx6sx-nxp-bsp|mx6sl-nxp-bsp|mx7ulp-nxp-bsp)" | 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.3.p4.6-aarch64.bb b/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p1.0-aarch64.bb index 2779ff3c..c1cde9f3 100644 --- a/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.3.p4.6-aarch64.bb +++ b/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p1.0-aarch64.bb | |||
@@ -1,10 +1,9 @@ | |||
1 | require imx-gpu-viv-6.inc | 1 | require imx-gpu-viv-6.inc |
2 | 2 | ||
3 | SRC_URI[md5sum] = "b33fde69f544674340ea617e9faf404e" | 3 | SRC_URI[md5sum] = "f7b41c4f8bfa25959796d240ca0bb285" |
4 | SRC_URI[sha256sum] = "60a63b66ef28cadc62bc1305a3ab5a2018c910e171b0cd72f4876317282dcfcc" | 4 | SRC_URI[sha256sum] = "4a5f2235500dc4bdfaaeaffa0e4c13cdd28436cc0d859e5be222bce990fda461" |
5 | 5 | ||
6 | INSANE_SKIP:append:libc-musl = " file-rdeps" | 6 | INSANE_SKIP:append:libc-musl = " file-rdeps" |
7 | RDEPENDS:${PN}:append:libc-musl = " gcompat" | ||
7 | 8 | ||
8 | COMPATIBLE_MACHINE = "(mx8-nxp-bsp)" | 9 | COMPATIBLE_MACHINE = "(mx8-nxp-bsp)" |
9 | |||
10 | RDEPENDS:${PN}:append:libc-musl = " gcompat" | ||
diff --git a/recipes-graphics/waffle/waffle/0001-meson-Add-missing-wayland-dependency-on-EGL.patch b/recipes-graphics/waffle/waffle/0001-meson-Add-missing-wayland-dependency-on-EGL.patch index 5f587d84..6f4be031 100644 --- a/recipes-graphics/waffle/waffle/0001-meson-Add-missing-wayland-dependency-on-EGL.patch +++ b/recipes-graphics/waffle/waffle/0001-meson-Add-missing-wayland-dependency-on-EGL.patch | |||
@@ -14,9 +14,11 @@ Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com> | |||
14 | meson.build | 6 ++++-- | 14 | meson.build | 6 ++++-- |
15 | 1 file changed, 4 insertions(+), 2 deletions(-) | 15 | 1 file changed, 4 insertions(+), 2 deletions(-) |
16 | 16 | ||
17 | --- a/meson.build | 17 | Index: git/meson.build |
18 | +++ b/meson.build | 18 | =================================================================== |
19 | @@ -63,6 +63,7 @@ dep_gl = _dep_null | 19 | --- git.orig/meson.build |
20 | +++ git/meson.build | ||
21 | @@ -65,6 +65,7 @@ dep_gl = _dep_null | ||
20 | dep_egl = _dep_null | 22 | dep_egl = _dep_null |
21 | dep_wayland_client = _dep_null | 23 | dep_wayland_client = _dep_null |
22 | dep_wayland_egl = _dep_null | 24 | dep_wayland_egl = _dep_null |
@@ -24,7 +26,7 @@ Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com> | |||
24 | dep_wayland_scanner = _dep_null | 26 | dep_wayland_scanner = _dep_null |
25 | dep_wayland_proto = _dep_null | 27 | dep_wayland_proto = _dep_null |
26 | dep_x11_xcb = _dep_null | 28 | dep_x11_xcb = _dep_null |
27 | @@ -104,7 +105,8 @@ else | 29 | @@ -106,7 +107,8 @@ else |
28 | dep_wayland_client = dependency( | 30 | dep_wayland_client = dependency( |
29 | 'wayland-client', version : '>= 1.10', required : get_option('wayland'), | 31 | 'wayland-client', version : '>= 1.10', required : get_option('wayland'), |
30 | ) | 32 | ) |
@@ -34,8 +36,8 @@ Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com> | |||
34 | 'wayland-egl', version : '>= 9.1', required : get_option('wayland'), | 36 | 'wayland-egl', version : '>= 9.1', required : get_option('wayland'), |
35 | ) | 37 | ) |
36 | dep_wayland_scanner = dependency( | 38 | dep_wayland_scanner = dependency( |
37 | @@ -120,7 +122,7 @@ else | 39 | @@ -124,7 +126,7 @@ else |
38 | wayland_xdg_shell_xml = join_paths(dep_wayland_proto.get_pkgconfig_variable('pkgdatadir'), | 40 | wayland_xdg_shell_xml = join_paths(dep_wayland_proto.get_variable(pkgconfig: 'pkgdatadir'), |
39 | 'stable/xdg-shell/xdg-shell.xml') | 41 | 'stable/xdg-shell/xdg-shell.xml') |
40 | endif | 42 | endif |
41 | - build_wayland = dep_egl.found() and dep_wayland_client.found() and dep_wayland_egl.found() and dep_wayland_scanner.found() and dep_wayland_proto.found() | 43 | - build_wayland = dep_egl.found() and dep_wayland_client.found() and dep_wayland_egl.found() and dep_wayland_scanner.found() and dep_wayland_proto.found() |
diff --git a/recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_6.4.3.p4.6.bb b/recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_6.4.11.p1.0.bb index abb7b323..f4c6129c 100644 --- a/recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_6.4.3.p4.6.bb +++ b/recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_6.4.11.p1.0.bb | |||
@@ -10,9 +10,9 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0-only;md5=801f80980d171d | |||
10 | SRC_URI = "${KERNEL_SRC};subpath=drivers/mxc/gpu-viv;destsuffix=git/src \ | 10 | SRC_URI = "${KERNEL_SRC};subpath=drivers/mxc/gpu-viv;destsuffix=git/src \ |
11 | file://Add-makefile.patch" | 11 | file://Add-makefile.patch" |
12 | KERNEL_SRC ?= "git://github.com/nxp-imx/linux-imx.git;protocol=https;branch=${SRCBRANCH}" | 12 | KERNEL_SRC ?= "git://github.com/nxp-imx/linux-imx.git;protocol=https;branch=${SRCBRANCH}" |
13 | SRCBRANCH = "lf-5.15.y" | 13 | SRCBRANCH = "lf-6.1.y" |
14 | LOCALVERSION = "-5.15.71-2.2.0" | 14 | LOCALVERSION = "-6.1.1-1.0.0" |
15 | SRCREV = "b257903e33d78d7658ea2a5697fd11044a7b1770" | 15 | SRCREV = "1df0ce9060c9e16449a9b0f97d4caef3a5414b7a" |
16 | 16 | ||
17 | S = "${WORKDIR}/git" | 17 | S = "${WORKDIR}/git" |
18 | 18 | ||