diff options
22 files changed, 206 insertions, 124 deletions
diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc index 309db148..6136713d 100644 --- a/conf/machine/include/imx-base.inc +++ b/conf/machine/include/imx-base.inc | |||
@@ -371,14 +371,14 @@ PREFERRED_PROVIDER_opencl-icd-loader:imxgpu ?= "imx-gpu-viv" | |||
371 | PREFERRED_VERSION_weston:imx ?= "9.0.0.imx" | 371 | PREFERRED_VERSION_weston:imx ?= "9.0.0.imx" |
372 | PREFERRED_VERSION_weston:use-mainline-bsp = "" | 372 | PREFERRED_VERSION_weston:use-mainline-bsp = "" |
373 | 373 | ||
374 | PREFERRED_VERSION_wayland-protocols:mx6 ?= "1.20.imx" | 374 | PREFERRED_VERSION_wayland-protocols:mx6 ?= "1.22.imx" |
375 | PREFERRED_VERSION_wayland-protocols:mx7 ?= "1.20.imx" | 375 | PREFERRED_VERSION_wayland-protocols:mx7 ?= "1.22.imx" |
376 | PREFERRED_VERSION_wayland-protocols:mx8 ?= "1.20.imx" | 376 | PREFERRED_VERSION_wayland-protocols:mx8 ?= "1.22.imx" |
377 | 377 | ||
378 | # Use i.MX libdrm Version | 378 | # Use i.MX libdrm Version |
379 | PREFERRED_VERSION_libdrm:mx6 ?= "2.4.102.imx" | 379 | PREFERRED_VERSION_libdrm:mx6 ?= "2.4.107.imx" |
380 | PREFERRED_VERSION_libdrm:mx7 ?= "2.4.102.imx" | 380 | PREFERRED_VERSION_libdrm:mx7 ?= "2.4.107.imx" |
381 | PREFERRED_VERSION_libdrm:mx8 ?= "2.4.102.imx" | 381 | PREFERRED_VERSION_libdrm:mx8 ?= "2.4.107.imx" |
382 | 382 | ||
383 | # Use i.MX optee Version | 383 | # Use i.MX optee Version |
384 | PREFERRED_VERSION_optee-os:mx8 ?= "3.10.0.imx" | 384 | PREFERRED_VERSION_optee-os:mx8 ?= "3.10.0.imx" |
diff --git a/recipes-graphics/drm/libdrm_2.4.102.imx.bb b/recipes-graphics/drm/libdrm_2.4.107.imx.bb index bffef407..cf5dadd4 100644 --- a/recipes-graphics/drm/libdrm_2.4.102.imx.bb +++ b/recipes-graphics/drm/libdrm_2.4.107.imx.bb | |||
@@ -11,10 +11,10 @@ PROVIDES = "drm" | |||
11 | DEPENDS = "libpthread-stubs" | 11 | DEPENDS = "libpthread-stubs" |
12 | 12 | ||
13 | IMX_LIBDRM_SRC ?= "git://source.codeaurora.org/external/imx/libdrm-imx.git;protocol=https;nobranch=1" | 13 | IMX_LIBDRM_SRC ?= "git://source.codeaurora.org/external/imx/libdrm-imx.git;protocol=https;nobranch=1" |
14 | IMX_LIBDRM_BRANCH ?= "libdrm-imx-2.4.102" | 14 | IMX_LIBDRM_BRANCH ?= "libdrm-imx-2.4.107" |
15 | SRC_URI = "${IMX_LIBDRM_SRC};branch=${IMX_LIBDRM_BRANCH} \ | 15 | SRC_URI = "${IMX_LIBDRM_SRC};branch=${IMX_LIBDRM_BRANCH} \ |
16 | file://0001-meson-add-libdrm-vivante-to-the-meson-meta-data.patch " | 16 | file://0001-meson-add-libdrm-vivante-to-the-meson-meta-data.patch " |
17 | SRCREV = "40ea53973b99b7df07f472318918a8c2b310e4a7" | 17 | SRCREV = "a7316e7d67b7708f40ffe469858dae07f14fe21a" |
18 | S = "${WORKDIR}/git" | 18 | S = "${WORKDIR}/git" |
19 | 19 | ||
20 | DEFAULT_PREFERENCE = "-1" | 20 | DEFAULT_PREFERENCE = "-1" |
@@ -40,7 +40,7 @@ PACKAGECONFIG[valgrind] = "-Dvalgrind=true,-Dvalgrind=false,valgrind" | |||
40 | 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" |
41 | PACKAGECONFIG[cairo-tests] = "-Dcairo-tests=true,-Dcairo-tests=false" | 41 | PACKAGECONFIG[cairo-tests] = "-Dcairo-tests=true,-Dcairo-tests=false" |
42 | PACKAGECONFIG[udev] = "-Dudev=true,-Dudev=false,udev" | 42 | PACKAGECONFIG[udev] = "-Dudev=true,-Dudev=false,udev" |
43 | PACKAGECONFIG[manpages] = "-Dman-pages=true,-Dman-pages=false,libxslt-native xmlto-native" | 43 | PACKAGECONFIG[manpages] = "-Dman-pages=true,-Dman-pages=false,libxslt-native xmlto-native python3-docutils-native" |
44 | 44 | ||
45 | ALLOW_EMPTY:${PN}-drivers = "1" | 45 | ALLOW_EMPTY:${PN}-drivers = "1" |
46 | PACKAGES =+ "${PN}-tests ${PN}-drivers ${PN}-radeon ${PN}-nouveau ${PN}-omap \ | 46 | PACKAGES =+ "${PN}-tests ${PN}-drivers ${PN}-radeon ${PN}-nouveau ${PN}-omap \ |
diff --git a/recipes-graphics/imx-dpu-g2d/imx-dpu-g2d_1.9.4.bb b/recipes-graphics/imx-g2d/imx-dpu-g2d_1.9.4.bb index c340505e..c340505e 100644 --- a/recipes-graphics/imx-dpu-g2d/imx-dpu-g2d_1.9.4.bb +++ b/recipes-graphics/imx-g2d/imx-dpu-g2d_1.9.4.bb | |||
diff --git a/recipes-graphics/imx-g2d/imx-g2d-samples_1.0.0.bb b/recipes-graphics/imx-g2d/imx-g2d-samples_1.0.0.bb new file mode 100644 index 00000000..b3f1051a --- /dev/null +++ b/recipes-graphics/imx-g2d/imx-g2d-samples_1.0.0.bb | |||
@@ -0,0 +1,22 @@ | |||
1 | SUMMARY = "i.MX G2D Samples" | ||
2 | DESCRIPTION = "Set of sample applications for i.MX G2D" | ||
3 | LICENSE = "BSD-3-Clause" | ||
4 | LIC_FILES_CHKSUM = "file://COPYING;md5=0858ec9c7a80c4a2cf16e4f825a2cc91" | ||
5 | |||
6 | # This package is currently only for GPU-based G2D. Support for DPU-based G2d is coming. | ||
7 | DEPENDS = "imx-gpu-g2d" | ||
8 | |||
9 | GPU_G2D_SAMPLES_SRC ?= "git://github.com/nxpmicro/g2d-samples.git;protocol=https" | ||
10 | SRCBRANCH ?= "imx_1.0" | ||
11 | SRC_URI = "${GPU_G2D_SAMPLES_SRC};branch=${SRCBRANCH}" | ||
12 | SRCREV = "daf64d010666ef2458566573c074e238993f228c" | ||
13 | |||
14 | S = "${WORKDIR}/git" | ||
15 | |||
16 | do_configure[noexec] = "1" | ||
17 | |||
18 | do_install() { | ||
19 | oe_runmake install DESTDIR=${D} PREFIX=${exec_prefix} | ||
20 | } | ||
21 | |||
22 | FILES:${PN} += "/opt" | ||
diff --git a/recipes-graphics/imx-g2d/imx-gpu-g2d_6.4.3.p2.4.bb b/recipes-graphics/imx-g2d/imx-gpu-g2d_6.4.3.p2.4.bb new file mode 100644 index 00000000..8eaa0bb3 --- /dev/null +++ b/recipes-graphics/imx-g2d/imx-gpu-g2d_6.4.3.p2.4.bb | |||
@@ -0,0 +1,31 @@ | |||
1 | # Copyright (C) 2016 Freescale Semiconductor | ||
2 | # Copyright 2017-2021 NXP | ||
3 | # Copyright 2018 (C) O.S. Systems Software LTDA. | ||
4 | # Released under the MIT license (see COPYING.MIT for the terms) | ||
5 | |||
6 | DESCRIPTION = "G2D library using i.MX GPU" | ||
7 | LICENSE = "Proprietary" | ||
8 | LIC_FILES_CHKSUM = "file://COPYING;md5=03bcadc8dc0a788f66ca9e2b89f56c6f" | ||
9 | |||
10 | DEPENDS = "libgal-imx" | ||
11 | PROVIDES = "virtual/libg2d" | ||
12 | |||
13 | FSLBIN_NAME = "${PN}-${PV}-${TARGET_ARCH}" | ||
14 | |||
15 | SRC_URI = "${FSL_MIRROR}/${FSLBIN_NAME}.bin;name=${TARGET_ARCH};fsl-eula=true" | ||
16 | SRC_URI[aarch64.md5sum] = "9d64a9c4a870419607d9e47e832eb997" | ||
17 | SRC_URI[aarch64.sha256sum] = "6065f545568e6cdc138f2d6e7cdcb525e477ce1d775c0ceabe2beb2eacf4eb5b" | ||
18 | SRC_URI[arm.md5sum] = "4d6cb47f09f268533cc6a9a90cc87555" | ||
19 | SRC_URI[arm.sha256sum] = "b298a38a16400e655ea46ab25b6261e602687e9970dd755594db343064a9ae53" | ||
20 | |||
21 | S = "${WORKDIR}/${FSLBIN_NAME}" | ||
22 | |||
23 | inherit fsl-eula-unpack | ||
24 | |||
25 | do_install () { | ||
26 | cp -r -d --no-preserve=ownership ${S}/g2d/* ${D} | ||
27 | } | ||
28 | |||
29 | INSANE_SKIP:${PN} = "ldflags" | ||
30 | |||
31 | COMPATIBLE_MACHINE = "(imxgpu2d)" | ||
diff --git a/recipes-graphics/imx-gpu-apitrace/imx-gpu-apitrace/0001-dlsym-workaround-glibc-2.34-build-failure.patch b/recipes-graphics/imx-gpu-apitrace/imx-gpu-apitrace/0001-dlsym-workaround-glibc-2.34-build-failure.patch index 9f3410d7..2ed5587f 100644 --- a/recipes-graphics/imx-gpu-apitrace/imx-gpu-apitrace/0001-dlsym-workaround-glibc-2.34-build-failure.patch +++ b/recipes-graphics/imx-gpu-apitrace/imx-gpu-apitrace/0001-dlsym-workaround-glibc-2.34-build-failure.patch | |||
@@ -15,19 +15,16 @@ Signed-off-by: Andrey Zhizhikin <andrey.z@gmail.com> | |||
15 | wrappers/dlsym.cpp | 2 +- | 15 | wrappers/dlsym.cpp | 2 +- |
16 | 1 file changed, 1 insertion(+), 1 deletion(-) | 16 | 1 file changed, 1 insertion(+), 1 deletion(-) |
17 | 17 | ||
18 | diff --git a/wrappers/dlsym.cpp b/wrappers/dlsym.cpp | 18 | Index: git/wrappers/dlsym.cpp |
19 | index cdf5cfdb..4061afc4 100644 | 19 | =================================================================== |
20 | --- a/wrappers/dlsym.cpp | 20 | --- git.orig/wrappers/dlsym.cpp |
21 | +++ b/wrappers/dlsym.cpp | 21 | +++ git/wrappers/dlsym.cpp |
22 | @@ -34,7 +34,7 @@ | 22 | @@ -34,7 +34,7 @@ |
23 | #include "os.hpp" | 23 | #include "os.hpp" |
24 | 24 | ||
25 | 25 | ||
26 | -#ifdef __GLIBC__ | 26 | -#if defined(__GLIBC__) && !defined(__UCLIBC__) |
27 | +#if defined(__GLIBC__) && !(__GLIBC__ == 2 && __GLIBC_MINOR__ >= 34) | 27 | +#if defined(__GLIBC__) && !defined(__UCLIBC__) && !(__GLIBC__ == 2 && __GLIBC_MINOR__ >= 34) |
28 | 28 | ||
29 | 29 | ||
30 | #include <dlfcn.h> | 30 | #include <dlfcn.h> |
31 | -- | ||
32 | 2.17.1 | ||
33 | |||
diff --git a/recipes-graphics/imx-gpu-apitrace/imx-gpu-apitrace_9.0.0.bb b/recipes-graphics/imx-gpu-apitrace/imx-gpu-apitrace_10.0.0.bb index dfa8dde7..c272d1b7 100644 --- a/recipes-graphics/imx-gpu-apitrace/imx-gpu-apitrace_9.0.0.bb +++ b/recipes-graphics/imx-gpu-apitrace/imx-gpu-apitrace_10.0.0.bb | |||
@@ -4,10 +4,10 @@ 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 = "imx-gpu-viv zlib libpng procps" |
6 | 6 | ||
7 | SRC_URI = "git://source.codeaurora.org/external/imx/apitrace-imx.git;protocol=https;branch=imx_9.0 \ | 7 | SRC_URI = "git://source.codeaurora.org/external/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 = "c50e6a954e44998f2e3793a8de863e961f8008c6" | 10 | SRCREV = "90a59407f1cddd31b4dac67e5a2500100eb091bc" |
11 | 11 | ||
12 | S = "${WORKDIR}/git" | 12 | S = "${WORKDIR}/git" |
13 | 13 | ||
diff --git a/recipes-graphics/imx-gpu-g2d/imx-gpu-g2d_6.4.3.p2.2.bb b/recipes-graphics/imx-gpu-g2d/imx-gpu-g2d_6.4.3.p2.2.bb deleted file mode 100644 index cc12c451..00000000 --- a/recipes-graphics/imx-gpu-g2d/imx-gpu-g2d_6.4.3.p2.2.bb +++ /dev/null | |||
@@ -1,39 +0,0 @@ | |||
1 | # Copyright (C) 2016 Freescale Semiconductor | ||
2 | # Copyright 2017-2021 NXP | ||
3 | # Copyright 2018 (C) O.S. Systems Software LTDA. | ||
4 | # Released under the MIT license (see COPYING.MIT for the terms) | ||
5 | |||
6 | DESCRIPTION = "GPU G2D library and apps for i.MX with 2D GPU and no DPU" | ||
7 | LICENSE = "Proprietary" | ||
8 | LIC_FILES_CHKSUM = "file://COPYING;md5=e565271ec9a80ce47abbddc4bffe56fa" | ||
9 | |||
10 | DEPENDS += "libgal-imx" | ||
11 | PROVIDES += "virtual/libg2d" | ||
12 | |||
13 | FSLBIN_NAME = "${PN}-${PV}-${TARGET_ARCH}" | ||
14 | |||
15 | SRC_URI = "${FSL_MIRROR}/${FSLBIN_NAME}.bin;name=${TARGET_ARCH};fsl-eula=true" | ||
16 | SRC_URI[aarch64.md5sum] = "64559ad7909bdfe70c66e942e922b49a" | ||
17 | SRC_URI[aarch64.sha256sum] = "40a5ccb7b49eecff4a8003fa74104d4cf659a6519039d3fa9d2f7548813db879" | ||
18 | SRC_URI[arm.md5sum] = "3c50524afe5a19044ea8c0ce2bd9575e" | ||
19 | SRC_URI[arm.sha256sum] = "9c81dfba32f2c86c92d811650e509bdf148b0181f9b3ce9a752e1210f2c78a73" | ||
20 | |||
21 | S = "${WORKDIR}/${FSLBIN_NAME}" | ||
22 | |||
23 | inherit fsl-eula-unpack | ||
24 | |||
25 | do_install () { | ||
26 | install -d ${D}${libdir} | ||
27 | install -d ${D}${includedir} | ||
28 | cp ${S}/g2d/usr/lib/*.so* ${D}${libdir} | ||
29 | cp -Pr ${S}/g2d/usr/include/* ${D}${includedir} | ||
30 | cp -r ${S}/gpu-demos/opt ${D} | ||
31 | } | ||
32 | |||
33 | FILES:${PN} = "${libdir}/libg2d* /opt" | ||
34 | FILES:${PN}-dev = "${includedir}" | ||
35 | INSANE_SKIP:${PN} = "ldflags" | ||
36 | |||
37 | RDEPENDS:${PN} = "libgal-imx" | ||
38 | |||
39 | COMPATIBLE_MACHINE = "(imxgpu2d)" | ||
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 14912e1b..1b3a0169 100644 --- a/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc +++ b/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc | |||
@@ -6,7 +6,7 @@ | |||
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=e565271ec9a80ce47abbddc4bffe56fa" | 9 | LIC_FILES_CHKSUM = "file://COPYING;md5=03bcadc8dc0a788f66ca9e2b89f56c6f" |
10 | 10 | ||
11 | DEPENDS += " \ | 11 | DEPENDS += " \ |
12 | ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland', \ | 12 | ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland', \ |
@@ -56,6 +56,11 @@ PE = "1" | |||
56 | 56 | ||
57 | inherit fsl-eula-unpack features_check | 57 | inherit fsl-eula-unpack features_check |
58 | 58 | ||
59 | # For i.MX 6 & 7, support Wayland and Framebuffer | ||
60 | CONFLICT_DISTRO_FEATURES:mx6 = \ | ||
61 | "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', '', 'x11', d)}" | ||
62 | CONFLICT_DISTRO_FEATURES:mx7 = "${CONFLICT_DISTRO_FEATURES:mx6}" | ||
63 | # For i.MX 8, support Wayland only | ||
59 | REQUIRED_DISTRO_FEATURES:mx8 = "wayland" | 64 | REQUIRED_DISTRO_FEATURES:mx8 = "wayland" |
60 | 65 | ||
61 | SRC_URI = "${FSL_MIRROR}/${BPN}-${PV}.bin;fsl-eula=true" | 66 | SRC_URI = "${FSL_MIRROR}/${BPN}-${PV}.bin;fsl-eula=true" |
@@ -79,7 +84,6 @@ PACKAGES =+ "libclc-imx libclc-imx-dev \ | |||
79 | libvdk-imx libvdk-imx-dev \ | 84 | libvdk-imx libvdk-imx-dev \ |
80 | libegl-imx libegl-imx-dev \ | 85 | libegl-imx libegl-imx-dev \ |
81 | libgal-imx libgal-imx-dev \ | 86 | libgal-imx libgal-imx-dev \ |
82 | libvivante-dri-imx \ | ||
83 | libvsc-imx \ | 87 | libvsc-imx \ |
84 | ${IMX_PACKAGES_GBM} \ | 88 | ${IMX_PACKAGES_GBM} \ |
85 | imx-gpu-viv-tools \ | 89 | imx-gpu-viv-tools \ |
@@ -94,8 +98,7 @@ python __anonymous () { | |||
94 | raise bb.parse.SkipPackage('The kernel of machine needs to have Vivante kernel driver support for this recipe to be used.') | 98 | raise bb.parse.SkipPackage('The kernel of machine needs to have Vivante kernel driver support for this recipe to be used.') |
95 | } | 99 | } |
96 | 100 | ||
97 | USE_X11 = "${@bb.utils.contains("DISTRO_FEATURES", "x11", "yes", "no", d)}" | 101 | BACKEND = "${@bb.utils.contains("DISTRO_FEATURES", "wayland", "wayland", "fb", d)}" |
98 | USE_WL = "${@bb.utils.contains("DISTRO_FEATURES", "wayland", "yes", "no", d)}" | ||
99 | 102 | ||
100 | # The packaged binaries have been stripped of debug info, so disable | 103 | # The packaged binaries have been stripped of debug info, so disable |
101 | # operations accordingly. | 104 | # operations accordingly. |
@@ -180,44 +183,16 @@ do_install () { | |||
180 | install -m 0644 ${S}/gpu-core/usr/lib/pkgconfig/gbm.pc ${D}${libdir}/pkgconfig/gbm.pc | 183 | install -m 0644 ${S}/gpu-core/usr/lib/pkgconfig/gbm.pc ${D}${libdir}/pkgconfig/gbm.pc |
181 | fi | 184 | fi |
182 | 185 | ||
183 | # The preference order, based in DISTRO_FEATURES, is Wayland (with or without X11), X11 and fb | 186 | if [ "${BACKEND}" = "wayland" ]; then |
184 | if [ "${USE_WL}" = "yes" ]; then | ||
185 | |||
186 | backend=wayland | ||
187 | |||
188 | install -m 0644 ${S}/gpu-core/usr/lib/pkgconfig/egl_wayland.pc ${D}${libdir}/pkgconfig/egl.pc | 187 | install -m 0644 ${S}/gpu-core/usr/lib/pkgconfig/egl_wayland.pc ${D}${libdir}/pkgconfig/egl.pc |
189 | install -m 0644 ${S}/gpu-core/usr/lib/pkgconfig/glesv1_cm.pc ${D}${libdir}/pkgconfig/glesv1_cm.pc | 188 | install -m 0644 ${S}/gpu-core/usr/lib/pkgconfig/glesv1_cm.pc ${D}${libdir}/pkgconfig/glesv1_cm.pc |
190 | install -m 0644 ${S}/gpu-core/usr/lib/pkgconfig/glesv2.pc ${D}${libdir}/pkgconfig/glesv2.pc | 189 | install -m 0644 ${S}/gpu-core/usr/lib/pkgconfig/glesv2.pc ${D}${libdir}/pkgconfig/glesv2.pc |
191 | install -m 0644 ${S}/gpu-core/usr/lib/pkgconfig/vg.pc ${D}${libdir}/pkgconfig/vg.pc | 190 | install -m 0644 ${S}/gpu-core/usr/lib/pkgconfig/vg.pc ${D}${libdir}/pkgconfig/vg.pc |
192 | |||
193 | if [ "${USE_X11}" = "yes" ]; then | ||
194 | |||
195 | cp -r ${S}/gpu-core/usr/lib/dri ${D}${libdir} | ||
196 | |||
197 | fi | ||
198 | |||
199 | elif [ "${USE_X11}" = "yes" ]; then | ||
200 | |||
201 | cp -r ${S}/gpu-core/usr/lib/dri ${D}${libdir} | ||
202 | |||
203 | backend=x11 | ||
204 | |||
205 | install -m 0644 ${S}/gpu-core/usr/lib/pkgconfig/gl_x11.pc ${D}${libdir}/pkgconfig/gl.pc | ||
206 | install -m 0644 ${S}/gpu-core/usr/lib/pkgconfig/egl_x11.pc ${D}${libdir}/pkgconfig/egl.pc | ||
207 | install -m 0644 ${S}/gpu-core/usr/lib/pkgconfig/glesv1_cm_x11.pc ${D}${libdir}/pkgconfig/glesv1_cm.pc | ||
208 | install -m 0644 ${S}/gpu-core/usr/lib/pkgconfig/glesv2_x11.pc ${D}${libdir}/pkgconfig/glesv2.pc | ||
209 | install -m 0644 ${S}/gpu-core/usr/lib/pkgconfig/vg_x11.pc ${D}${libdir}/pkgconfig/vg.pc | ||
210 | |||
211 | else | 191 | else |
212 | install -m 0644 ${S}/gpu-core/usr/lib/pkgconfig/glesv1_cm.pc ${D}${libdir}/pkgconfig/glesv1_cm.pc | 192 | install -m 0644 ${S}/gpu-core/usr/lib/pkgconfig/glesv1_cm.pc ${D}${libdir}/pkgconfig/glesv1_cm.pc |
213 | install -m 0644 ${S}/gpu-core/usr/lib/pkgconfig/glesv2.pc ${D}${libdir}/pkgconfig/glesv2.pc | 193 | install -m 0644 ${S}/gpu-core/usr/lib/pkgconfig/glesv2.pc ${D}${libdir}/pkgconfig/glesv2.pc |
214 | install -m 0644 ${S}/gpu-core/usr/lib/pkgconfig/vg.pc ${D}${libdir}/pkgconfig/vg.pc | 194 | install -m 0644 ${S}/gpu-core/usr/lib/pkgconfig/vg.pc ${D}${libdir}/pkgconfig/vg.pc |
215 | |||
216 | # Regular framebuffer | ||
217 | install -m 0644 ${S}/gpu-core/usr/lib/pkgconfig/egl_linuxfb.pc ${D}${libdir}/pkgconfig/egl.pc | 195 | install -m 0644 ${S}/gpu-core/usr/lib/pkgconfig/egl_linuxfb.pc ${D}${libdir}/pkgconfig/egl.pc |
218 | |||
219 | backend=fb | ||
220 | |||
221 | fi | 196 | fi |
222 | 197 | ||
223 | # Install Vendor ICDs for OpenCL's installable client driver loader (ICDs Loader) | 198 | # Install Vendor ICDs for OpenCL's installable client driver loader (ICDs Loader) |
@@ -225,8 +200,8 @@ do_install () { | |||
225 | install -m 0644 ${S}/gpu-core/etc/Vivante.icd ${D}${sysconfdir}/OpenCL/vendors/Vivante.icd | 200 | install -m 0644 ${S}/gpu-core/etc/Vivante.icd ${D}${sysconfdir}/OpenCL/vendors/Vivante.icd |
226 | 201 | ||
227 | # Handle backend specific drivers | 202 | # Handle backend specific drivers |
228 | cp -r ${S}/gpu-core/usr/lib/${backend}/* ${D}${libdir} | 203 | cp -r ${S}/gpu-core/usr/lib/${BACKEND}/* ${D}${libdir} |
229 | if [ "${USE_WL}" = "yes" ]; then | 204 | if [ "${BACKEND}" = "wayland" ] && [ "${IS_MX8}" != "1" ]; then |
230 | # Special case for libVDK on Wayland backend, deliver fb library as well. | 205 | # Special case for libVDK on Wayland backend, deliver fb library as well. |
231 | cp ${S}/gpu-core/usr/lib/fb/libVDK.so.1.2.0 ${D}${libdir}/libVDK-fb.so.1.2.0 | 206 | cp ${S}/gpu-core/usr/lib/fb/libVDK.so.1.2.0 ${D}${libdir}/libVDK-fb.so.1.2.0 |
232 | fi | 207 | fi |
@@ -346,9 +321,6 @@ FILES:libopenvg-imx-dev = "${includedir}/VG ${libdir}/libOpenVG*${SOLIBSDEV} ${l | |||
346 | FILES:libvdk-imx = "${libdir}/libVDK*${REALSOLIBS}" | 321 | FILES:libvdk-imx = "${libdir}/libVDK*${REALSOLIBS}" |
347 | FILES:libvdk-imx-dev = "${includedir}/*vdk*.h ${libdir}/libVDK${SOLIBSDEV}" | 322 | FILES:libvdk-imx-dev = "${includedir}/*vdk*.h ${libdir}/libVDK${SOLIBSDEV}" |
348 | 323 | ||
349 | FILES:libvivante-dri-imx = "${libdir}/dri/vivante_dri.so" | ||
350 | RDEPENDS:libvivante-dri-imx = "libdrm" | ||
351 | |||
352 | FILES:imx-gpu-viv-tools = "${bindir}/gmem_info" | 324 | FILES:imx-gpu-viv-tools = "${bindir}/gmem_info" |
353 | 325 | ||
354 | FILES:imx-gpu-viv-demos = "/opt" | 326 | FILES:imx-gpu-viv-demos = "/opt" |
diff --git a/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.3.p2.2-aarch64.bb b/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.3.p2.2-aarch64.bb deleted file mode 100644 index 3a86f97c..00000000 --- a/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.3.p2.2-aarch64.bb +++ /dev/null | |||
@@ -1,6 +0,0 @@ | |||
1 | require imx-gpu-viv-6.inc | ||
2 | |||
3 | SRC_URI[md5sum] = "612a9bfc0663da7aeee0c4d277acffb7" | ||
4 | SRC_URI[sha256sum] = "ea9ecb151d2dcdaeff1184e5de097bb35d53d8747a743a96d4cfd4a8a3814752" | ||
5 | |||
6 | COMPATIBLE_MACHINE = "(mx8)" | ||
diff --git a/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.3.p2.2-aarch32.bb b/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.3.p2.4-aarch32.bb index 77b75593..a2f23731 100644 --- a/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.3.p2.2-aarch32.bb +++ b/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.3.p2.4-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] = "200ee64d8b922bc2f8718e5d0af01539" | 7 | SRC_URI[md5sum] = "d577c4e34df73855ebf1c3b3be206f40" |
8 | SRC_URI[sha256sum] = "b53e6e2f9b47678bb2f8ad107fea5bd70d111b085e03d246fbaafd1f6cc2dc3a" | 8 | SRC_URI[sha256sum] = "a0266612e8c9ca64b417047274941c867de1058db6709170d0bb5c8b8a38eab1" |
9 | 9 | ||
10 | COMPATIBLE_MACHINE = "(mx6q|mx6dl|mx6sx|mx6sl|mx7ulp)" | 10 | COMPATIBLE_MACHINE = "(mx6q|mx6dl|mx6sx|mx6sl|mx7ulp)" |
diff --git a/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.3.p2.4-aarch64.bb b/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.3.p2.4-aarch64.bb new file mode 100644 index 00000000..b69bd041 --- /dev/null +++ b/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.3.p2.4-aarch64.bb | |||
@@ -0,0 +1,6 @@ | |||
1 | require imx-gpu-viv-6.inc | ||
2 | |||
3 | SRC_URI[md5sum] = "d53371c1a9a504ff15f747e725164dcb" | ||
4 | SRC_URI[sha256sum] = "6106133afed40327b65d3eec0c197d214ff8f28f8ce3cad94653be4bffb9f9d4" | ||
5 | |||
6 | COMPATIBLE_MACHINE = "(mx8)" | ||
diff --git a/recipes-graphics/wayland/wayland-protocols_1.20.imx.bb b/recipes-graphics/wayland/wayland-protocols_1.22.imx.bb index 0d1f4726..8cc2f137 100644 --- a/recipes-graphics/wayland/wayland-protocols_1.20.imx.bb +++ b/recipes-graphics/wayland/wayland-protocols_1.22.imx.bb | |||
@@ -9,8 +9,8 @@ LICENSE = "MIT" | |||
9 | LIC_FILES_CHKSUM = "file://COPYING;md5=c7b12b6702da38ca028ace54aae3d484 \ | 9 | LIC_FILES_CHKSUM = "file://COPYING;md5=c7b12b6702da38ca028ace54aae3d484 \ |
10 | file://stable/presentation-time/presentation-time.xml;endline=26;md5=4646cd7d9edc9fa55db941f2d3a7dc53" | 10 | file://stable/presentation-time/presentation-time.xml;endline=26;md5=4646cd7d9edc9fa55db941f2d3a7dc53" |
11 | 11 | ||
12 | SRC_URI = "git://source.codeaurora.org/external/imx/wayland-protocols-imx.git;protocol=https;branch=wayland-protocols-imx-1.20" | 12 | SRC_URI = "git://source.codeaurora.org/external/imx/wayland-protocols-imx.git;protocol=https;branch=wayland-protocols-imx-1.22" |
13 | SRCREV = "9cacf108d0ee5863c7a656da5d2271bc2396e43d" | 13 | SRCREV = "0f71ffe59cf4c3f050ff79ea18f96345fcf0061e" |
14 | S = "${WORKDIR}/git" | 14 | S = "${WORKDIR}/git" |
15 | 15 | ||
16 | inherit autotools pkgconfig | 16 | inherit autotools pkgconfig |
diff --git a/recipes-graphics/wayland/weston-init/imx/weston.ini b/recipes-graphics/wayland/weston-init/imx/weston.ini index 916e621a..3e8be42f 100644 --- a/recipes-graphics/wayland/weston-init/imx/weston.ini +++ b/recipes-graphics/wayland/weston-init/imx/weston.ini | |||
@@ -5,6 +5,7 @@ idle-time=0 | |||
5 | #xwayland=true | 5 | #xwayland=true |
6 | #repaint-window=16 | 6 | #repaint-window=16 |
7 | #enable-overlay-view=1 | 7 | #enable-overlay-view=1 |
8 | modules=screen-share.so | ||
8 | 9 | ||
9 | #[shell] | 10 | #[shell] |
10 | #size=1920x1080 | 11 | #size=1920x1080 |
@@ -27,4 +28,4 @@ touchscreen_calibrator=true | |||
27 | #transform=rotate-90 | 28 | #transform=rotate-90 |
28 | 29 | ||
29 | [screen-share] | 30 | [screen-share] |
30 | command=@bindir@/weston --backend=rdp-backend.so --shell=fullscreen-shell.so --no-clients-resize | 31 | command=@bindir@/weston --backend=rdp-backend.so --shell=fullscreen-shell.so --no-clients-resize --rdp-tls-cert=/etc/freerdp/keys/server.crt --rdp-tls-key=/etc/freerdp/keys/server.key |
diff --git a/recipes-graphics/wayland/weston/0001-libweston-backend-drm-Re-order-gbm-destruction-at-DR.patch b/recipes-graphics/wayland/weston/0001-libweston-backend-drm-Re-order-gbm-destruction-at-DR.patch new file mode 100644 index 00000000..db640055 --- /dev/null +++ b/recipes-graphics/wayland/weston/0001-libweston-backend-drm-Re-order-gbm-destruction-at-DR.patch | |||
@@ -0,0 +1,52 @@ | |||
1 | From 4be82f75a47bd456452ab713d7d57a75d844f42a Mon Sep 17 00:00:00 2001 | ||
2 | From: Marius Vlad <marius.vlad@collabora.com> | ||
3 | Date: Thu, 1 Apr 2021 00:12:00 +0300 | ||
4 | Subject: [PATCH] libweston/backend-drm: Re-order gbm destruction at | ||
5 | DRM-backend tear down | ||
6 | |||
7 | Tearing down the drm-backend when there are no input devices, would call | ||
8 | for the gbm device destruction before compositor shutdown. The latter | ||
9 | would call into the renderer detroy function and assume that the | ||
10 | EGLDisplay, which was created using the before-mentioned gbm device, is | ||
11 | still available. This patch re-orders the gbm destruction after the | ||
12 | compositor shutdown when no one would make use of it. | ||
13 | |||
14 | Fixes: #314 | ||
15 | |||
16 | Signed-off-by: Marius Vlad <marius.vlad@collabora.com> | ||
17 | Suggested-by: Daniel Stone <daniel.stone@collabora.com> | ||
18 | |||
19 | Upstream-Status: Backport [https://gitlab.freedesktop.org/wayland/weston/-/commit/d171c7b3ba346c4d0bd6494f45ebf0be3c3cc5fb] | ||
20 | --- | ||
21 | libweston/backend-drm/drm.c | 8 ++++---- | ||
22 | 1 file changed, 4 insertions(+), 4 deletions(-) | ||
23 | |||
24 | diff --git a/libweston/backend-drm/drm.c b/libweston/backend-drm/drm.c | ||
25 | index 9d3b5dcc..67834d3e 100644 | ||
26 | --- a/libweston/backend-drm/drm.c | ||
27 | +++ b/libweston/backend-drm/drm.c | ||
28 | @@ -3402,10 +3402,6 @@ err_drm_source: | ||
29 | wl_event_source_remove(b->drm_source); | ||
30 | err_udev_input: | ||
31 | udev_input_destroy(&b->input); | ||
32 | -#ifdef BUILD_DRM_GBM | ||
33 | - if (b->gbm) | ||
34 | - gbm_device_destroy(b->gbm); | ||
35 | -#endif | ||
36 | destroy_sprites(b); | ||
37 | err_udev_dev: | ||
38 | udev_device_unref(drm_device); | ||
39 | @@ -3415,6 +3411,10 @@ err_launcher: | ||
40 | weston_launcher_destroy(compositor->launcher); | ||
41 | err_compositor: | ||
42 | weston_compositor_shutdown(compositor); | ||
43 | +#ifdef BUILD_DRM_GBM | ||
44 | + if (b->gbm) | ||
45 | + gbm_device_destroy(b->gbm); | ||
46 | +#endif | ||
47 | free(b); | ||
48 | return NULL; | ||
49 | } | ||
50 | -- | ||
51 | 2.17.1 | ||
52 | |||
diff --git a/recipes-graphics/wayland/weston/0001-meson.build-fix-incorrect-header.patch b/recipes-graphics/wayland/weston/0001-meson.build-fix-incorrect-header.patch new file mode 100644 index 00000000..06e0f7ba --- /dev/null +++ b/recipes-graphics/wayland/weston/0001-meson.build-fix-incorrect-header.patch | |||
@@ -0,0 +1,32 @@ | |||
1 | From a2ba4714a6872e547621d29d9ddcb0f374b88cf6 Mon Sep 17 00:00:00 2001 | ||
2 | From: Chen Qi <Qi.Chen@windriver.com> | ||
3 | Date: Tue, 20 Apr 2021 20:42:18 -0700 | ||
4 | Subject: [PATCH] meson.build: fix incorrect header | ||
5 | |||
6 | The wayland.c actually include 'xdg-shell-client-protocol.h' instead of | ||
7 | the server one, so fix it. Otherwise, it's possible to get build failure | ||
8 | due to race condition. | ||
9 | |||
10 | Upstream-Status: Pending | ||
11 | |||
12 | Signed-off-by: Chen Qi <Qi.Chen@windriver.com> | ||
13 | --- | ||
14 | libweston/backend-wayland/meson.build | 2 +- | ||
15 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
16 | |||
17 | diff --git a/libweston/backend-wayland/meson.build b/libweston/backend-wayland/meson.build | ||
18 | index 7e82513..29270b5 100644 | ||
19 | --- a/libweston/backend-wayland/meson.build | ||
20 | +++ b/libweston/backend-wayland/meson.build | ||
21 | @@ -10,7 +10,7 @@ srcs_wlwl = [ | ||
22 | fullscreen_shell_unstable_v1_protocol_c, | ||
23 | presentation_time_protocol_c, | ||
24 | presentation_time_server_protocol_h, | ||
25 | - xdg_shell_server_protocol_h, | ||
26 | + xdg_shell_client_protocol_h, | ||
27 | xdg_shell_protocol_c, | ||
28 | ] | ||
29 | |||
30 | -- | ||
31 | 2.30.2 | ||
32 | |||
diff --git a/recipes-graphics/wayland/weston/0001-weston-launch-Provide-a-default-version-that-doesn-t.patch b/recipes-graphics/wayland/weston/0001-weston-launch-Provide-a-default-version-that-doesn-t.patch index 3279a728..f6ebfd8f 100644 --- a/recipes-graphics/wayland/weston/0001-weston-launch-Provide-a-default-version-that-doesn-t.patch +++ b/recipes-graphics/wayland/weston/0001-weston-launch-Provide-a-default-version-that-doesn-t.patch | |||
@@ -11,7 +11,7 @@ Since starting weston as root is a valid use case by itself, if | |||
11 | PAM is not available, provide a default version of weston-launch | 11 | PAM is not available, provide a default version of weston-launch |
12 | without non-root-user support. | 12 | without non-root-user support. |
13 | 13 | ||
14 | Upstream-Status: Pending | 14 | Upstream-Status: Denied [https://gitlab.freedesktop.org/wayland/weston/-/merge_requests/725] |
15 | 15 | ||
16 | Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com> | 16 | Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com> |
17 | Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> | 17 | Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> |
diff --git a/recipes-graphics/wayland/weston/systemd-notify.weston-start b/recipes-graphics/wayland/weston/systemd-notify.weston-start new file mode 100644 index 00000000..a97e7b38 --- /dev/null +++ b/recipes-graphics/wayland/weston/systemd-notify.weston-start | |||
@@ -0,0 +1,9 @@ | |||
1 | #!/bin/sh | ||
2 | |||
3 | # SPDX-FileCopyrightText: Huawei Inc. | ||
4 | # SPDX-License-Identifier: Apache-2.0 | ||
5 | |||
6 | |||
7 | if [[ -x "/usr/lib/weston/systemd-notify.so" ]]; then | ||
8 | add_weston_module "systemd-notify.so" | ||
9 | fi | ||
diff --git a/recipes-graphics/wayland/weston/xwayland.weston-start b/recipes-graphics/wayland/weston/xwayland.weston-start index b483c97c..db384b1a 100644 --- a/recipes-graphics/wayland/weston/xwayland.weston-start +++ b/recipes-graphics/wayland/weston/xwayland.weston-start | |||
@@ -2,6 +2,4 @@ | |||
2 | 2 | ||
3 | if type Xwayland >/dev/null 2>/dev/null; then | 3 | if type Xwayland >/dev/null 2>/dev/null; then |
4 | mkdir -p /tmp/.X11-unix | 4 | mkdir -p /tmp/.X11-unix |
5 | |||
6 | add_weston_argument "--modules=xwayland.so" | ||
7 | fi | 5 | fi |
diff --git a/recipes-graphics/wayland/weston_9.0.0.imx.bb b/recipes-graphics/wayland/weston_9.0.0.imx.bb index 76296c8e..0ab2c6b2 100644 --- a/recipes-graphics/wayland/weston_9.0.0.imx.bb +++ b/recipes-graphics/wayland/weston_9.0.0.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: 0a882490fe75915c7a119f3498df6750be25f8e0 | 6 | # Upstream hash: c8aa0222ce2be647911114aaebcbb0d55d7caf87 |
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" |
@@ -16,8 +16,11 @@ SRC_URI = "https://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \ | |||
16 | file://weston.png \ | 16 | file://weston.png \ |
17 | file://weston.desktop \ | 17 | file://weston.desktop \ |
18 | file://xwayland.weston-start \ | 18 | file://xwayland.weston-start \ |
19 | file://systemd-notify.weston-start \ | ||
19 | file://0001-weston-launch-Provide-a-default-version-that-doesn-t.patch \ | 20 | file://0001-weston-launch-Provide-a-default-version-that-doesn-t.patch \ |
20 | file://0001-tests-include-fcntl.h-for-open-O_RDWR-O_CLOEXEC-and-.patch \ | 21 | file://0001-tests-include-fcntl.h-for-open-O_RDWR-O_CLOEXEC-and-.patch \ |
22 | file://0001-meson.build-fix-incorrect-header.patch \ | ||
23 | file://0001-libweston-backend-drm-Re-order-gbm-destruction-at-DR.patch \ | ||
21 | " | 24 | " |
22 | 25 | ||
23 | SRC_URI:append:libc-musl = " file://dont-use-plane-add-prop.patch " | 26 | SRC_URI:append:libc-musl = " file://dont-use-plane-add-prop.patch " |
@@ -38,7 +41,7 @@ LDFLAGS += "${@bb.utils.contains('DISTRO_FEATURES', 'lto', '-Wl,-z,undefs', '', | |||
38 | 41 | ||
39 | WESTON_MAJOR_VERSION = "${@'.'.join(d.getVar('PV').split('.')[0:1])}" | 42 | WESTON_MAJOR_VERSION = "${@'.'.join(d.getVar('PV').split('.')[0:1])}" |
40 | 43 | ||
41 | EXTRA_OEMESON += "-Dbackend-default=auto -Dbackend-rdp=false -Dpipewire=false" | 44 | EXTRA_OEMESON += "-Dbackend-default=auto -Dpipewire=false" |
42 | 45 | ||
43 | PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'kms fbdev wayland egl clients', '', d)} \ | 46 | PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'kms fbdev wayland egl clients', '', d)} \ |
44 | ${@bb.utils.contains('DISTRO_FEATURES', 'x11 wayland', 'xwayland', '', d)} \ | 47 | ${@bb.utils.contains('DISTRO_FEATURES', 'x11 wayland', 'xwayland', '', d)} \ |
@@ -64,6 +67,8 @@ PACKAGECONFIG[x11] = "-Dbackend-x11=true,-Dbackend-x11=false,virtual/libx11 libx | |||
64 | PACKAGECONFIG[headless] = "-Dbackend-headless=true,-Dbackend-headless=false" | 67 | PACKAGECONFIG[headless] = "-Dbackend-headless=true,-Dbackend-headless=false" |
65 | # Weston on framebuffer | 68 | # Weston on framebuffer |
66 | PACKAGECONFIG[fbdev] = "-Dbackend-fbdev=true,-Dbackend-fbdev=false,udev mtdev" | 69 | PACKAGECONFIG[fbdev] = "-Dbackend-fbdev=true,-Dbackend-fbdev=false,udev mtdev" |
70 | # Weston on RDP | ||
71 | PACKAGECONFIG[rdp] = "-Dbackend-rdp=true,-Dbackend-rdp=false,freerdp" | ||
67 | # weston-launch | 72 | # weston-launch |
68 | PACKAGECONFIG[launch] = "-Dweston-launch=true,-Dweston-launch=false,drm" | 73 | PACKAGECONFIG[launch] = "-Dweston-launch=true,-Dweston-launch=false,drm" |
69 | # VA-API desktop recorder | 74 | # VA-API desktop recorder |
@@ -83,7 +88,7 @@ PACKAGECONFIG[colord] = "-Dcolor-management-colord=true,-Dcolor-management-color | |||
83 | # Clients support | 88 | # Clients support |
84 | PACKAGECONFIG[clients] = "-Dsimple-clients=all -Ddemo-clients=true,-Dsimple-clients= -Ddemo-clients=false" | 89 | PACKAGECONFIG[clients] = "-Dsimple-clients=all -Ddemo-clients=true,-Dsimple-clients= -Ddemo-clients=false" |
85 | # Virtual remote output with GStreamer on DRM backend | 90 | # Virtual remote output with GStreamer on DRM backend |
86 | PACKAGECONFIG[remoting] = "-Dremoting=true,-Dremoting=false,gstreamer1.0" | 91 | PACKAGECONFIG[remoting] = "-Dremoting=true,-Dremoting=false,gstreamer1.0 gstreamer1.0-plugins-base" |
87 | # Weston with PAM support | 92 | # Weston with PAM support |
88 | PACKAGECONFIG[pam] = "-Dpam=true,-Dpam=false,libpam" | 93 | PACKAGECONFIG[pam] = "-Dpam=true,-Dpam=false,libpam" |
89 | # Weston with screen-share support | 94 | # Weston with screen-share support |
@@ -114,6 +119,10 @@ do_install:append() { | |||
114 | install -Dm 644 ${WORKDIR}/xwayland.weston-start ${D}${datadir}/weston-start/xwayland | 119 | install -Dm 644 ${WORKDIR}/xwayland.weston-start ${D}${datadir}/weston-start/xwayland |
115 | fi | 120 | fi |
116 | 121 | ||
122 | if [ "${@bb.utils.contains('PACKAGECONFIG', 'systemd', 'yes', 'no', d)}" = "yes" ]; then | ||
123 | install -Dm 644 ${WORKDIR}/systemd-notify.weston-start ${D}${datadir}/weston-start/systemd-notify | ||
124 | fi | ||
125 | |||
117 | if [ "${@bb.utils.contains('PACKAGECONFIG', 'launch', 'yes', 'no', d)}" = "yes" ]; then | 126 | if [ "${@bb.utils.contains('PACKAGECONFIG', 'launch', 'yes', 'no', d)}" = "yes" ]; then |
118 | chmod u+s ${D}${bindir}/weston-launch | 127 | chmod u+s ${D}${bindir}/weston-launch |
119 | fi | 128 | fi |
@@ -149,13 +158,11 @@ SUMMARY = "Weston, a Wayland compositor, i.MX fork" | |||
149 | DEFAULT_PREFERENCE = "-1" | 158 | DEFAULT_PREFERENCE = "-1" |
150 | 159 | ||
151 | SRCBRANCH = "weston-imx-9.0" | 160 | SRCBRANCH = "weston-imx-9.0" |
152 | SRC_URI = "git://source.codeaurora.org/external/imx/weston-imx.git;protocol=https;branch=${SRCBRANCH} \ | 161 | SRC_URI:remove = "https://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \ |
153 | file://weston.png \ | 162 | file://0001-tests-include-fcntl.h-for-open-O_RDWR-O_CLOEXEC-and-.patch \ |
154 | file://weston.desktop \ | ||
155 | file://xwayland.weston-start \ | ||
156 | file://0001-weston-launch-Provide-a-default-version-that-doesn-t.patch \ | ||
157 | " | 163 | " |
158 | SRCREV = "230e9bc3d647e511e0601e3d45034f22495ed3c7" | 164 | SRC_URI:prepend = "git://source.codeaurora.org/external/imx/weston-imx.git;protocol=https;branch=${SRCBRANCH} " |
165 | SRCREV = "26da63a46b926c8301d8c271f6869c893cc35afa" | ||
159 | S = "${WORKDIR}/git" | 166 | S = "${WORKDIR}/git" |
160 | 167 | ||
161 | # Disable OpenGL for parts with GPU support for 2D but not 3D | 168 | # Disable OpenGL for parts with GPU support for 2D but not 3D |
diff --git a/recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_6.4.3.p2.2.bb b/recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_6.4.3.p2.4.bb index 996e8262..a3433b7c 100644 --- a/recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_6.4.3.p2.2.bb +++ b/recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_6.4.3.p2.4.bb | |||
@@ -8,13 +8,13 @@ LICENSE = "GPLv2" | |||
8 | LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0-only;md5=801f80980d171dd6425610833a22dbe6" | 8 | LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0-only;md5=801f80980d171dd6425610833a22dbe6" |
9 | 9 | ||
10 | SRCBRANCH = "lf-5.10.y" | 10 | SRCBRANCH = "lf-5.10.y" |
11 | LOCALVERSION = "-5.10.52-2.1.0" | 11 | LOCALVERSION = "-5.10.72-2.2.0" |
12 | KERNEL_SRC ?= "git://source.codeaurora.org/external/imx/linux-imx.git;protocol=https;branch=master" | 12 | KERNEL_SRC ?= "git://source.codeaurora.org/external/imx/linux-imx.git;protocol=https;branch=master" |
13 | SRC_URI = " \ | 13 | SRC_URI = " \ |
14 | ${KERNEL_SRC};branch=${SRCBRANCH};subpath=drivers/mxc/gpu-viv;destsuffix=git/src \ | 14 | ${KERNEL_SRC};branch=${SRCBRANCH};subpath=drivers/mxc/gpu-viv;destsuffix=git/src \ |
15 | file://Add-makefile.patch \ | 15 | file://Add-makefile.patch \ |
16 | " | 16 | " |
17 | SRCREV = "d46e3cd94bdd2c13b6511e008ad9719b0727637d" | 17 | SRCREV = "8e035d8196aacc7c1926d3d278df99255baa3c6d" |
18 | 18 | ||
19 | S = "${WORKDIR}/git" | 19 | S = "${WORKDIR}/git" |
20 | 20 | ||
diff --git a/recipes-kernel/kernel-modules/kernel-module-isp-vvcam_4.2.2.15.0.bb b/recipes-kernel/kernel-modules/kernel-module-isp-vvcam_4.2.2.16.0.bb index df97f8b9..e9a09ad7 100644 --- a/recipes-kernel/kernel-modules/kernel-module-isp-vvcam_4.2.2.15.0.bb +++ b/recipes-kernel/kernel-modules/kernel-module-isp-vvcam_4.2.2.16.0.bb | |||
@@ -4,13 +4,13 @@ DESCRIPTION = "Kernel loadable module for ISP" | |||
4 | LICENSE = "GPLv2" | 4 | LICENSE = "GPLv2" |
5 | LIC_FILES_CHKSUM = "file://${WORKDIR}/git/vvcam/LICENSE;md5=64381a6ea83b48c39fe524c85f65fb44" | 5 | LIC_FILES_CHKSUM = "file://${WORKDIR}/git/vvcam/LICENSE;md5=64381a6ea83b48c39fe524c85f65fb44" |
6 | 6 | ||
7 | SRCBRANCH = "lf-5.10.52_2.1.0" | 7 | SRCBRANCH = "lf-5.10.y_2.2.0" |
8 | ISP_KERNEL_SRC ?= "git://source.codeaurora.org/external/imx/isp-vvcam.git;protocol=https;branch=master" | 8 | ISP_KERNEL_SRC ?= "git://source.codeaurora.org/external/imx/isp-vvcam.git;protocol=https;branch=master" |
9 | 9 | ||
10 | SRC_URI = " \ | 10 | SRC_URI = " \ |
11 | ${ISP_KERNEL_SRC};branch=${SRCBRANCH} \ | 11 | ${ISP_KERNEL_SRC};branch=${SRCBRANCH} \ |
12 | " | 12 | " |
13 | SRCREV = "39bfc64f09f8da3c41df3bdada5becb88bf5bb5f" | 13 | SRCREV = "b2321c0c513322aca8187ebf0328b74fe45a0f01" |
14 | 14 | ||
15 | S = "${WORKDIR}/git/vvcam/v4l2" | 15 | S = "${WORKDIR}/git/vvcam/v4l2" |
16 | 16 | ||