From 88859e50626d707f9429ee135605c8d29ea2d6ee Mon Sep 17 00:00:00 2001 From: Tom Hochstein Date: Tue, 25 Jan 2022 12:44:06 -0600 Subject: libdrm: Upgrade to 2.4.107.imx Signed-off-by: Tom Hochstein --- conf/machine/include/imx-base.inc | 6 +-- recipes-graphics/drm/libdrm_2.4.102.imx.bb | 73 ------------------------------ recipes-graphics/drm/libdrm_2.4.107.imx.bb | 73 ++++++++++++++++++++++++++++++ 3 files changed, 76 insertions(+), 76 deletions(-) delete mode 100644 recipes-graphics/drm/libdrm_2.4.102.imx.bb create mode 100644 recipes-graphics/drm/libdrm_2.4.107.imx.bb diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc index 51c62034d..ded072748 100644 --- a/conf/machine/include/imx-base.inc +++ b/conf/machine/include/imx-base.inc @@ -373,9 +373,9 @@ PREFERRED_VERSION_wayland-protocols:mx7 ?= "1.20.imx" PREFERRED_VERSION_wayland-protocols:mx8 ?= "1.20.imx" # Use i.MX libdrm Version -PREFERRED_VERSION_libdrm:mx6 ?= "2.4.102.imx" -PREFERRED_VERSION_libdrm:mx7 ?= "2.4.102.imx" -PREFERRED_VERSION_libdrm:mx8 ?= "2.4.102.imx" +PREFERRED_VERSION_libdrm:mx6 ?= "2.4.107.imx" +PREFERRED_VERSION_libdrm:mx7 ?= "2.4.107.imx" +PREFERRED_VERSION_libdrm:mx8 ?= "2.4.107.imx" # Use i.MX optee Version 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.102.imx.bb deleted file mode 100644 index bffef4079..000000000 --- a/recipes-graphics/drm/libdrm_2.4.102.imx.bb +++ /dev/null @@ -1,73 +0,0 @@ -SUMMARY = "Userspace interface to the kernel DRM services" -DESCRIPTION = "The runtime library for accessing the kernel DRM services. DRM \ -stands for \"Direct Rendering Manager\", which is the kernel portion of the \ -\"Direct Rendering Infrastructure\" (DRI). DRI is required for many hardware \ -accelerated OpenGL drivers." -HOMEPAGE = "http://dri.freedesktop.org" -SECTION = "x11/base" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://xf86drm.c;beginline=9;endline=32;md5=c8a3b961af7667c530816761e949dc71" -PROVIDES = "drm" -DEPENDS = "libpthread-stubs" - -IMX_LIBDRM_SRC ?= "git://source.codeaurora.org/external/imx/libdrm-imx.git;protocol=https;nobranch=1" -IMX_LIBDRM_BRANCH ?= "libdrm-imx-2.4.102" -SRC_URI = "${IMX_LIBDRM_SRC};branch=${IMX_LIBDRM_BRANCH} \ - file://0001-meson-add-libdrm-vivante-to-the-meson-meta-data.patch " -SRCREV = "40ea53973b99b7df07f472318918a8c2b310e4a7" -S = "${WORKDIR}/git" - -DEFAULT_PREFERENCE = "-1" -COMPATIBLE_MACHINE = "(mx6|mx7|mx8)" - -inherit meson pkgconfig manpages - -PACKAGECONFIG ??= "libkms intel radeon amdgpu nouveau vmwgfx omap freedreno vc4 etnaviv install-test-programs" -PACKAGECONFIG[libkms] = "-Dlibkms=true,-Dlibkms=false" -PACKAGECONFIG[intel] = "-Dintel=true,-Dintel=false,libpciaccess" -PACKAGECONFIG[radeon] = "-Dradeon=true,-Dradeon=false" -PACKAGECONFIG[amdgpu] = "-Damdgpu=true,-Damdgpu=false" -PACKAGECONFIG[nouveau] = "-Dnouveau=true,-Dnouveau=false" -PACKAGECONFIG[vmwgfx] = "-Dvmwgfx=true,-Dvmwgfx=false" -PACKAGECONFIG[omap] = "-Domap=true,-Domap=false" -PACKAGECONFIG[exynos] = "-Dexynos=true,-Dexynos=false" -PACKAGECONFIG[freedreno] = "-Dfreedreno=true,-Dfreedreno=false" -PACKAGECONFIG[tegra] = "-Dtegra=true,-Dtegra=false" -PACKAGECONFIG[vc4] = "-Dvc4=true,-Dvc4=false" -PACKAGECONFIG[etnaviv] = "-Detnaviv=true,-Detnaviv=false" -PACKAGECONFIG[freedreno-kgsl] = "-Dfreedreno-kgsl=true,-Dfreedreno-kgsl=false" -PACKAGECONFIG[valgrind] = "-Dvalgrind=true,-Dvalgrind=false,valgrind" -PACKAGECONFIG[install-test-programs] = "-Dinstall-test-programs=true,-Dinstall-test-programs=false" -PACKAGECONFIG[cairo-tests] = "-Dcairo-tests=true,-Dcairo-tests=false" -PACKAGECONFIG[udev] = "-Dudev=true,-Dudev=false,udev" -PACKAGECONFIG[manpages] = "-Dman-pages=true,-Dman-pages=false,libxslt-native xmlto-native" - -ALLOW_EMPTY:${PN}-drivers = "1" -PACKAGES =+ "${PN}-tests ${PN}-drivers ${PN}-radeon ${PN}-nouveau ${PN}-omap \ - ${PN}-intel ${PN}-exynos ${PN}-kms ${PN}-freedreno ${PN}-amdgpu \ - ${PN}-etnaviv" - -RRECOMMENDS:${PN}-drivers = "${PN}-radeon ${PN}-nouveau ${PN}-omap ${PN}-intel \ - ${PN}-exynos ${PN}-freedreno ${PN}-amdgpu \ - ${PN}-etnaviv" - -FILES:${PN}-tests = "${bindir}/*" -FILES:${PN}-radeon = "${libdir}/libdrm_radeon.so.*" -FILES:${PN}-nouveau = "${libdir}/libdrm_nouveau.so.*" -FILES:${PN}-omap = "${libdir}/libdrm_omap.so.*" -FILES:${PN}-intel = "${libdir}/libdrm_intel.so.*" -FILES:${PN}-exynos = "${libdir}/libdrm_exynos.so.*" -FILES:${PN}-kms = "${libdir}/libkms*.so.*" -FILES:${PN}-freedreno = "${libdir}/libdrm_freedreno.so.*" -FILES:${PN}-amdgpu = "${libdir}/libdrm_amdgpu.so.* ${datadir}/${PN}/amdgpu.ids" -FILES:${PN}-etnaviv = "${libdir}/libdrm_etnaviv.so.*" - -BBCLASSEXTEND = "native nativesdk" - -PACKAGES:prepend:imxgpu = "${PN}-vivante " -RRECOMMENDS:${PN}-drivers:append:imxgpu = " ${PN}-vivante" -FILES:${PN}-vivante = "${libdir}/libdrm_vivante.so.*" -PACKAGECONFIG:append:imxgpu = " vivante" -PACKAGECONFIG[vivante] = "-Dvivante=true,-Dvivante=false" - -PACKAGE_ARCH = "${MACHINE_SOCARCH}" diff --git a/recipes-graphics/drm/libdrm_2.4.107.imx.bb b/recipes-graphics/drm/libdrm_2.4.107.imx.bb new file mode 100644 index 000000000..cf5dadd40 --- /dev/null +++ b/recipes-graphics/drm/libdrm_2.4.107.imx.bb @@ -0,0 +1,73 @@ +SUMMARY = "Userspace interface to the kernel DRM services" +DESCRIPTION = "The runtime library for accessing the kernel DRM services. DRM \ +stands for \"Direct Rendering Manager\", which is the kernel portion of the \ +\"Direct Rendering Infrastructure\" (DRI). DRI is required for many hardware \ +accelerated OpenGL drivers." +HOMEPAGE = "http://dri.freedesktop.org" +SECTION = "x11/base" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://xf86drm.c;beginline=9;endline=32;md5=c8a3b961af7667c530816761e949dc71" +PROVIDES = "drm" +DEPENDS = "libpthread-stubs" + +IMX_LIBDRM_SRC ?= "git://source.codeaurora.org/external/imx/libdrm-imx.git;protocol=https;nobranch=1" +IMX_LIBDRM_BRANCH ?= "libdrm-imx-2.4.107" +SRC_URI = "${IMX_LIBDRM_SRC};branch=${IMX_LIBDRM_BRANCH} \ + file://0001-meson-add-libdrm-vivante-to-the-meson-meta-data.patch " +SRCREV = "a7316e7d67b7708f40ffe469858dae07f14fe21a" +S = "${WORKDIR}/git" + +DEFAULT_PREFERENCE = "-1" +COMPATIBLE_MACHINE = "(mx6|mx7|mx8)" + +inherit meson pkgconfig manpages + +PACKAGECONFIG ??= "libkms intel radeon amdgpu nouveau vmwgfx omap freedreno vc4 etnaviv install-test-programs" +PACKAGECONFIG[libkms] = "-Dlibkms=true,-Dlibkms=false" +PACKAGECONFIG[intel] = "-Dintel=true,-Dintel=false,libpciaccess" +PACKAGECONFIG[radeon] = "-Dradeon=true,-Dradeon=false" +PACKAGECONFIG[amdgpu] = "-Damdgpu=true,-Damdgpu=false" +PACKAGECONFIG[nouveau] = "-Dnouveau=true,-Dnouveau=false" +PACKAGECONFIG[vmwgfx] = "-Dvmwgfx=true,-Dvmwgfx=false" +PACKAGECONFIG[omap] = "-Domap=true,-Domap=false" +PACKAGECONFIG[exynos] = "-Dexynos=true,-Dexynos=false" +PACKAGECONFIG[freedreno] = "-Dfreedreno=true,-Dfreedreno=false" +PACKAGECONFIG[tegra] = "-Dtegra=true,-Dtegra=false" +PACKAGECONFIG[vc4] = "-Dvc4=true,-Dvc4=false" +PACKAGECONFIG[etnaviv] = "-Detnaviv=true,-Detnaviv=false" +PACKAGECONFIG[freedreno-kgsl] = "-Dfreedreno-kgsl=true,-Dfreedreno-kgsl=false" +PACKAGECONFIG[valgrind] = "-Dvalgrind=true,-Dvalgrind=false,valgrind" +PACKAGECONFIG[install-test-programs] = "-Dinstall-test-programs=true,-Dinstall-test-programs=false" +PACKAGECONFIG[cairo-tests] = "-Dcairo-tests=true,-Dcairo-tests=false" +PACKAGECONFIG[udev] = "-Dudev=true,-Dudev=false,udev" +PACKAGECONFIG[manpages] = "-Dman-pages=true,-Dman-pages=false,libxslt-native xmlto-native python3-docutils-native" + +ALLOW_EMPTY:${PN}-drivers = "1" +PACKAGES =+ "${PN}-tests ${PN}-drivers ${PN}-radeon ${PN}-nouveau ${PN}-omap \ + ${PN}-intel ${PN}-exynos ${PN}-kms ${PN}-freedreno ${PN}-amdgpu \ + ${PN}-etnaviv" + +RRECOMMENDS:${PN}-drivers = "${PN}-radeon ${PN}-nouveau ${PN}-omap ${PN}-intel \ + ${PN}-exynos ${PN}-freedreno ${PN}-amdgpu \ + ${PN}-etnaviv" + +FILES:${PN}-tests = "${bindir}/*" +FILES:${PN}-radeon = "${libdir}/libdrm_radeon.so.*" +FILES:${PN}-nouveau = "${libdir}/libdrm_nouveau.so.*" +FILES:${PN}-omap = "${libdir}/libdrm_omap.so.*" +FILES:${PN}-intel = "${libdir}/libdrm_intel.so.*" +FILES:${PN}-exynos = "${libdir}/libdrm_exynos.so.*" +FILES:${PN}-kms = "${libdir}/libkms*.so.*" +FILES:${PN}-freedreno = "${libdir}/libdrm_freedreno.so.*" +FILES:${PN}-amdgpu = "${libdir}/libdrm_amdgpu.so.* ${datadir}/${PN}/amdgpu.ids" +FILES:${PN}-etnaviv = "${libdir}/libdrm_etnaviv.so.*" + +BBCLASSEXTEND = "native nativesdk" + +PACKAGES:prepend:imxgpu = "${PN}-vivante " +RRECOMMENDS:${PN}-drivers:append:imxgpu = " ${PN}-vivante" +FILES:${PN}-vivante = "${libdir}/libdrm_vivante.so.*" +PACKAGECONFIG:append:imxgpu = " vivante" +PACKAGECONFIG[vivante] = "-Dvivante=true,-Dvivante=false" + +PACKAGE_ARCH = "${MACHINE_SOCARCH}" -- cgit v1.2.3-54-g00ecf From 747c96f5b82d12b135739f93a74e6ee6e9ed8f5b Mon Sep 17 00:00:00 2001 From: Tom Hochstein Date: Wed, 26 Jan 2022 14:48:42 -0600 Subject: imx-gpu-viv: Upgrade to 6.4.3.p2.4 - x11 is no longer supported - dri is no longer supported - remove vestiges of 64-bit framebuffer on Wayland, which is no longer supported Signed-off-by: Tom Hochstein --- recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc | 48 +++++----------------- .../imx-gpu-viv/imx-gpu-viv_6.4.3.p2.2-aarch32.bb | 10 ----- .../imx-gpu-viv/imx-gpu-viv_6.4.3.p2.2-aarch64.bb | 6 --- .../imx-gpu-viv/imx-gpu-viv_6.4.3.p2.4-aarch32.bb | 10 +++++ .../imx-gpu-viv/imx-gpu-viv_6.4.3.p2.4-aarch64.bb | 6 +++ 5 files changed, 26 insertions(+), 54 deletions(-) delete mode 100644 recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.3.p2.2-aarch32.bb delete mode 100644 recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.3.p2.2-aarch64.bb create mode 100644 recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.3.p2.4-aarch32.bb create mode 100644 recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.3.p2.4-aarch64.bb 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 14912e1b9..1b3a01694 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 @@ DESCRIPTION = "GPU driver and apps for i.MX" SECTION = "libs" LICENSE = "Proprietary" -LIC_FILES_CHKSUM = "file://COPYING;md5=e565271ec9a80ce47abbddc4bffe56fa" +LIC_FILES_CHKSUM = "file://COPYING;md5=03bcadc8dc0a788f66ca9e2b89f56c6f" DEPENDS += " \ ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland', \ @@ -56,6 +56,11 @@ PE = "1" inherit fsl-eula-unpack features_check +# For i.MX 6 & 7, support Wayland and Framebuffer +CONFLICT_DISTRO_FEATURES:mx6 = \ + "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', '', 'x11', d)}" +CONFLICT_DISTRO_FEATURES:mx7 = "${CONFLICT_DISTRO_FEATURES:mx6}" +# For i.MX 8, support Wayland only REQUIRED_DISTRO_FEATURES:mx8 = "wayland" SRC_URI = "${FSL_MIRROR}/${BPN}-${PV}.bin;fsl-eula=true" @@ -79,7 +84,6 @@ PACKAGES =+ "libclc-imx libclc-imx-dev \ libvdk-imx libvdk-imx-dev \ libegl-imx libegl-imx-dev \ libgal-imx libgal-imx-dev \ - libvivante-dri-imx \ libvsc-imx \ ${IMX_PACKAGES_GBM} \ imx-gpu-viv-tools \ @@ -94,8 +98,7 @@ python __anonymous () { raise bb.parse.SkipPackage('The kernel of machine needs to have Vivante kernel driver support for this recipe to be used.') } -USE_X11 = "${@bb.utils.contains("DISTRO_FEATURES", "x11", "yes", "no", d)}" -USE_WL = "${@bb.utils.contains("DISTRO_FEATURES", "wayland", "yes", "no", d)}" +BACKEND = "${@bb.utils.contains("DISTRO_FEATURES", "wayland", "wayland", "fb", d)}" # The packaged binaries have been stripped of debug info, so disable # operations accordingly. @@ -180,44 +183,16 @@ do_install () { install -m 0644 ${S}/gpu-core/usr/lib/pkgconfig/gbm.pc ${D}${libdir}/pkgconfig/gbm.pc fi - # The preference order, based in DISTRO_FEATURES, is Wayland (with or without X11), X11 and fb - if [ "${USE_WL}" = "yes" ]; then - - backend=wayland - + if [ "${BACKEND}" = "wayland" ]; then install -m 0644 ${S}/gpu-core/usr/lib/pkgconfig/egl_wayland.pc ${D}${libdir}/pkgconfig/egl.pc install -m 0644 ${S}/gpu-core/usr/lib/pkgconfig/glesv1_cm.pc ${D}${libdir}/pkgconfig/glesv1_cm.pc install -m 0644 ${S}/gpu-core/usr/lib/pkgconfig/glesv2.pc ${D}${libdir}/pkgconfig/glesv2.pc install -m 0644 ${S}/gpu-core/usr/lib/pkgconfig/vg.pc ${D}${libdir}/pkgconfig/vg.pc - - if [ "${USE_X11}" = "yes" ]; then - - cp -r ${S}/gpu-core/usr/lib/dri ${D}${libdir} - - fi - - elif [ "${USE_X11}" = "yes" ]; then - - cp -r ${S}/gpu-core/usr/lib/dri ${D}${libdir} - - backend=x11 - - install -m 0644 ${S}/gpu-core/usr/lib/pkgconfig/gl_x11.pc ${D}${libdir}/pkgconfig/gl.pc - install -m 0644 ${S}/gpu-core/usr/lib/pkgconfig/egl_x11.pc ${D}${libdir}/pkgconfig/egl.pc - install -m 0644 ${S}/gpu-core/usr/lib/pkgconfig/glesv1_cm_x11.pc ${D}${libdir}/pkgconfig/glesv1_cm.pc - install -m 0644 ${S}/gpu-core/usr/lib/pkgconfig/glesv2_x11.pc ${D}${libdir}/pkgconfig/glesv2.pc - install -m 0644 ${S}/gpu-core/usr/lib/pkgconfig/vg_x11.pc ${D}${libdir}/pkgconfig/vg.pc - else install -m 0644 ${S}/gpu-core/usr/lib/pkgconfig/glesv1_cm.pc ${D}${libdir}/pkgconfig/glesv1_cm.pc install -m 0644 ${S}/gpu-core/usr/lib/pkgconfig/glesv2.pc ${D}${libdir}/pkgconfig/glesv2.pc install -m 0644 ${S}/gpu-core/usr/lib/pkgconfig/vg.pc ${D}${libdir}/pkgconfig/vg.pc - - # Regular framebuffer install -m 0644 ${S}/gpu-core/usr/lib/pkgconfig/egl_linuxfb.pc ${D}${libdir}/pkgconfig/egl.pc - - backend=fb - fi # Install Vendor ICDs for OpenCL's installable client driver loader (ICDs Loader) @@ -225,8 +200,8 @@ do_install () { install -m 0644 ${S}/gpu-core/etc/Vivante.icd ${D}${sysconfdir}/OpenCL/vendors/Vivante.icd # Handle backend specific drivers - cp -r ${S}/gpu-core/usr/lib/${backend}/* ${D}${libdir} - if [ "${USE_WL}" = "yes" ]; then + cp -r ${S}/gpu-core/usr/lib/${BACKEND}/* ${D}${libdir} + if [ "${BACKEND}" = "wayland" ] && [ "${IS_MX8}" != "1" ]; then # Special case for libVDK on Wayland backend, deliver fb library as well. cp ${S}/gpu-core/usr/lib/fb/libVDK.so.1.2.0 ${D}${libdir}/libVDK-fb.so.1.2.0 fi @@ -346,9 +321,6 @@ FILES:libopenvg-imx-dev = "${includedir}/VG ${libdir}/libOpenVG*${SOLIBSDEV} ${l FILES:libvdk-imx = "${libdir}/libVDK*${REALSOLIBS}" FILES:libvdk-imx-dev = "${includedir}/*vdk*.h ${libdir}/libVDK${SOLIBSDEV}" -FILES:libvivante-dri-imx = "${libdir}/dri/vivante_dri.so" -RDEPENDS:libvivante-dri-imx = "libdrm" - FILES:imx-gpu-viv-tools = "${bindir}/gmem_info" FILES:imx-gpu-viv-demos = "/opt" 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.2-aarch32.bb deleted file mode 100644 index 77b755933..000000000 --- a/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.3.p2.2-aarch32.bb +++ /dev/null @@ -1,10 +0,0 @@ -# Copyright (C) 2013-2016 Freescale Semiconductor -# Copyright 2017-2020 NXP -# Released under the MIT license (see COPYING.MIT for the terms) - -require imx-gpu-viv-6.inc - -SRC_URI[md5sum] = "200ee64d8b922bc2f8718e5d0af01539" -SRC_URI[sha256sum] = "b53e6e2f9b47678bb2f8ad107fea5bd70d111b085e03d246fbaafd1f6cc2dc3a" - -COMPATIBLE_MACHINE = "(mx6q|mx6dl|mx6sx|mx6sl|mx7ulp)" 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 3a86f97ce..000000000 --- a/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.3.p2.2-aarch64.bb +++ /dev/null @@ -1,6 +0,0 @@ -require imx-gpu-viv-6.inc - -SRC_URI[md5sum] = "612a9bfc0663da7aeee0c4d277acffb7" -SRC_URI[sha256sum] = "ea9ecb151d2dcdaeff1184e5de097bb35d53d8747a743a96d4cfd4a8a3814752" - -COMPATIBLE_MACHINE = "(mx8)" diff --git a/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.3.p2.4-aarch32.bb b/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.3.p2.4-aarch32.bb new file mode 100644 index 000000000..a2f23731a --- /dev/null +++ b/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.3.p2.4-aarch32.bb @@ -0,0 +1,10 @@ +# Copyright (C) 2013-2016 Freescale Semiconductor +# Copyright 2017-2020 NXP +# Released under the MIT license (see COPYING.MIT for the terms) + +require imx-gpu-viv-6.inc + +SRC_URI[md5sum] = "d577c4e34df73855ebf1c3b3be206f40" +SRC_URI[sha256sum] = "a0266612e8c9ca64b417047274941c867de1058db6709170d0bb5c8b8a38eab1" + +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 000000000..b69bd0410 --- /dev/null +++ b/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.3.p2.4-aarch64.bb @@ -0,0 +1,6 @@ +require imx-gpu-viv-6.inc + +SRC_URI[md5sum] = "d53371c1a9a504ff15f747e725164dcb" +SRC_URI[sha256sum] = "6106133afed40327b65d3eec0c197d214ff8f28f8ce3cad94653be4bffb9f9d4" + +COMPATIBLE_MACHINE = "(mx8)" -- cgit v1.2.3-54-g00ecf From ef8b5c64ee623539836f1e28ebcdfe74e13485a7 Mon Sep 17 00:00:00 2001 From: Tom Hochstein Date: Wed, 26 Jan 2022 15:48:52 -0600 Subject: kernel-module-imx-gpu-viv: Upgrade to 6.4.3.p2.4 Signed-off-by: Tom Hochstein --- .../kernel-module-imx-gpu-viv_6.4.3.p2.2.bb | 26 ---------------------- .../kernel-module-imx-gpu-viv_6.4.3.p2.4.bb | 26 ++++++++++++++++++++++ 2 files changed, 26 insertions(+), 26 deletions(-) delete mode 100644 recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_6.4.3.p2.2.bb create mode 100644 recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_6.4.3.p2.4.bb 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.2.bb deleted file mode 100644 index 996e8262f..000000000 --- a/recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_6.4.3.p2.2.bb +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright (C) 2015-2016 Freescale Semiconductor -# Copyright (C) 2017-2021 NXP - -SUMMARY = "Kernel loadable module for Vivante GPU" -DESCRIPTION = "Builds the Vivante GPU kernel driver as a loadable kernel module, \ -allowing flexibility to use a newer graphics release with an older kernel." -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0-only;md5=801f80980d171dd6425610833a22dbe6" - -SRCBRANCH = "lf-5.10.y" -LOCALVERSION = "-5.10.52-2.1.0" -KERNEL_SRC ?= "git://source.codeaurora.org/external/imx/linux-imx.git;protocol=https;branch=master" -SRC_URI = " \ - ${KERNEL_SRC};branch=${SRCBRANCH};subpath=drivers/mxc/gpu-viv;destsuffix=git/src \ - file://Add-makefile.patch \ -" -SRCREV = "d46e3cd94bdd2c13b6511e008ad9719b0727637d" - -S = "${WORKDIR}/git" - -inherit module - -EXTRA_OEMAKE += "CONFIG_MXC_GPU_VIV=m" - -KERNEL_MODULE_AUTOLOAD = "galcore" -COMPATIBLE_MACHINE = "(imx)" diff --git a/recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_6.4.3.p2.4.bb b/recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_6.4.3.p2.4.bb new file mode 100644 index 000000000..a3433b7c3 --- /dev/null +++ b/recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_6.4.3.p2.4.bb @@ -0,0 +1,26 @@ +# Copyright (C) 2015-2016 Freescale Semiconductor +# Copyright (C) 2017-2021 NXP + +SUMMARY = "Kernel loadable module for Vivante GPU" +DESCRIPTION = "Builds the Vivante GPU kernel driver as a loadable kernel module, \ +allowing flexibility to use a newer graphics release with an older kernel." +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0-only;md5=801f80980d171dd6425610833a22dbe6" + +SRCBRANCH = "lf-5.10.y" +LOCALVERSION = "-5.10.72-2.2.0" +KERNEL_SRC ?= "git://source.codeaurora.org/external/imx/linux-imx.git;protocol=https;branch=master" +SRC_URI = " \ + ${KERNEL_SRC};branch=${SRCBRANCH};subpath=drivers/mxc/gpu-viv;destsuffix=git/src \ + file://Add-makefile.patch \ +" +SRCREV = "8e035d8196aacc7c1926d3d278df99255baa3c6d" + +S = "${WORKDIR}/git" + +inherit module + +EXTRA_OEMAKE += "CONFIG_MXC_GPU_VIV=m" + +KERNEL_MODULE_AUTOLOAD = "galcore" +COMPATIBLE_MACHINE = "(imx)" -- cgit v1.2.3-54-g00ecf From d41698c912fe992d1cf43c15599f451cbaf6c1b7 Mon Sep 17 00:00:00 2001 From: Tom Hochstein Date: Wed, 26 Jan 2022 15:57:03 -0600 Subject: kernel-module-isp-vvcam: Upgrade to 4.2.2.16.0 b2321c0 compand compress curve update 724df72 BSLRM865-189:Image quality with HDR mode is worse than Linear mode 16ffd85 BSLRM865-200: sensor_driver: Sensor api change because 5.15 kernel change 1bedecf Update Release P16 20211003 from Verisilicon 841f438 Update Release P15 from Verisilicon Signed-off-by: Tom Hochstein --- .../kernel-module-isp-vvcam_4.2.2.15.0.bb | 19 ------------------- .../kernel-module-isp-vvcam_4.2.2.16.0.bb | 19 +++++++++++++++++++ 2 files changed, 19 insertions(+), 19 deletions(-) delete mode 100644 recipes-kernel/kernel-modules/kernel-module-isp-vvcam_4.2.2.15.0.bb create mode 100644 recipes-kernel/kernel-modules/kernel-module-isp-vvcam_4.2.2.16.0.bb 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.15.0.bb deleted file mode 100644 index df97f8b9e..000000000 --- a/recipes-kernel/kernel-modules/kernel-module-isp-vvcam_4.2.2.15.0.bb +++ /dev/null @@ -1,19 +0,0 @@ -# Copyright 2020-2021 NXP - -DESCRIPTION = "Kernel loadable module for ISP" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://${WORKDIR}/git/vvcam/LICENSE;md5=64381a6ea83b48c39fe524c85f65fb44" - -SRCBRANCH = "lf-5.10.52_2.1.0" -ISP_KERNEL_SRC ?= "git://source.codeaurora.org/external/imx/isp-vvcam.git;protocol=https;branch=master" - -SRC_URI = " \ - ${ISP_KERNEL_SRC};branch=${SRCBRANCH} \ -" -SRCREV = "39bfc64f09f8da3c41df3bdada5becb88bf5bb5f" - -S = "${WORKDIR}/git/vvcam/v4l2" - -inherit module - -COMPATIBLE_MACHINE = "(mx8mp)" diff --git a/recipes-kernel/kernel-modules/kernel-module-isp-vvcam_4.2.2.16.0.bb b/recipes-kernel/kernel-modules/kernel-module-isp-vvcam_4.2.2.16.0.bb new file mode 100644 index 000000000..e9a09ad77 --- /dev/null +++ b/recipes-kernel/kernel-modules/kernel-module-isp-vvcam_4.2.2.16.0.bb @@ -0,0 +1,19 @@ +# Copyright 2020-2021 NXP + +DESCRIPTION = "Kernel loadable module for ISP" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://${WORKDIR}/git/vvcam/LICENSE;md5=64381a6ea83b48c39fe524c85f65fb44" + +SRCBRANCH = "lf-5.10.y_2.2.0" +ISP_KERNEL_SRC ?= "git://source.codeaurora.org/external/imx/isp-vvcam.git;protocol=https;branch=master" + +SRC_URI = " \ + ${ISP_KERNEL_SRC};branch=${SRCBRANCH} \ +" +SRCREV = "b2321c0c513322aca8187ebf0328b74fe45a0f01" + +S = "${WORKDIR}/git/vvcam/v4l2" + +inherit module + +COMPATIBLE_MACHINE = "(mx8mp)" -- cgit v1.2.3-54-g00ecf From 98b159c0a64cf4a0402a86285fb96bbab10a94cd Mon Sep 17 00:00:00 2001 From: Tom Hochstein Date: Wed, 26 Jan 2022 16:29:32 -0600 Subject: imx-g2d: Consolidate G2D recipes in single folder Signed-off-by: Tom Hochstein --- recipes-graphics/imx-dpu-g2d/imx-dpu-g2d_1.9.4.bb | 35 ------------------- recipes-graphics/imx-g2d/imx-dpu-g2d_1.9.4.bb | 35 +++++++++++++++++++ recipes-graphics/imx-g2d/imx-gpu-g2d_6.4.3.p2.2.bb | 39 ++++++++++++++++++++++ .../imx-gpu-g2d/imx-gpu-g2d_6.4.3.p2.2.bb | 39 ---------------------- 4 files changed, 74 insertions(+), 74 deletions(-) delete mode 100644 recipes-graphics/imx-dpu-g2d/imx-dpu-g2d_1.9.4.bb create mode 100644 recipes-graphics/imx-g2d/imx-dpu-g2d_1.9.4.bb create mode 100644 recipes-graphics/imx-g2d/imx-gpu-g2d_6.4.3.p2.2.bb delete mode 100644 recipes-graphics/imx-gpu-g2d/imx-gpu-g2d_6.4.3.p2.2.bb diff --git a/recipes-graphics/imx-dpu-g2d/imx-dpu-g2d_1.9.4.bb b/recipes-graphics/imx-dpu-g2d/imx-dpu-g2d_1.9.4.bb deleted file mode 100644 index c340505e0..000000000 --- a/recipes-graphics/imx-dpu-g2d/imx-dpu-g2d_1.9.4.bb +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright (C) 2016 Freescale Semiconductor -# Copyright 2017-2021 NXP -# Released under the MIT license (see COPYING.MIT for the terms) - -DESCRIPTION = "GPU G2D library and apps for i.MX with 2D GPU and DPU" -LICENSE = "Proprietary" -LIC_FILES_CHKSUM = "file://COPYING;md5=e565271ec9a80ce47abbddc4bffe56fa" -PROVIDES += "virtual/libg2d" - -SRC_URI = "${FSL_MIRROR}/${BPN}-${PV}.bin;fsl-eula=true" -SRC_URI[md5sum] = "0b7fc529b3af3ecc3087a99cca0c627d" -SRC_URI[sha256sum] = "42d470373fd72b2e2aa8d8a226e133c61b0a88e4e5bddbfec9509f7d2764f206" - -inherit fsl-eula-unpack - -do_install () { - install -d ${D}${libdir} - install -d ${D}${includedir} - cp -r ${S}/g2d/usr/lib/*.so* ${D}${libdir} - cp -Pr ${S}/g2d/usr/include/* ${D}${includedir} - cp -r ${S}/gpu-demos/opt ${D} -} - -FILES:${PN} = "${libdir}/libg2d* /opt" -FILES:${PN}-dev = "${libdir}/libg2d${SOLIBSDEV} ${includedir}" -INSANE_SKIP:${PN} += "ldflags" - -RDEPENDS:${PN} = "libgal-imx libdrm libopencl-imx" - -# This is required to provide support for VPU Amphion HEVC tile format -# From NXP [MGS-5547] (commit e175d6b4f78deab24d319b852998bef55cdecc99): -# VPU Amphion HEVC tile support was added using OpenCL, so add a dependency on libopencl-imx. -RDEPENDS:${PN} += "libopencl-imx" - -COMPATIBLE_MACHINE = "(imxdpu)" diff --git a/recipes-graphics/imx-g2d/imx-dpu-g2d_1.9.4.bb b/recipes-graphics/imx-g2d/imx-dpu-g2d_1.9.4.bb new file mode 100644 index 000000000..c340505e0 --- /dev/null +++ b/recipes-graphics/imx-g2d/imx-dpu-g2d_1.9.4.bb @@ -0,0 +1,35 @@ +# Copyright (C) 2016 Freescale Semiconductor +# Copyright 2017-2021 NXP +# Released under the MIT license (see COPYING.MIT for the terms) + +DESCRIPTION = "GPU G2D library and apps for i.MX with 2D GPU and DPU" +LICENSE = "Proprietary" +LIC_FILES_CHKSUM = "file://COPYING;md5=e565271ec9a80ce47abbddc4bffe56fa" +PROVIDES += "virtual/libg2d" + +SRC_URI = "${FSL_MIRROR}/${BPN}-${PV}.bin;fsl-eula=true" +SRC_URI[md5sum] = "0b7fc529b3af3ecc3087a99cca0c627d" +SRC_URI[sha256sum] = "42d470373fd72b2e2aa8d8a226e133c61b0a88e4e5bddbfec9509f7d2764f206" + +inherit fsl-eula-unpack + +do_install () { + install -d ${D}${libdir} + install -d ${D}${includedir} + cp -r ${S}/g2d/usr/lib/*.so* ${D}${libdir} + cp -Pr ${S}/g2d/usr/include/* ${D}${includedir} + cp -r ${S}/gpu-demos/opt ${D} +} + +FILES:${PN} = "${libdir}/libg2d* /opt" +FILES:${PN}-dev = "${libdir}/libg2d${SOLIBSDEV} ${includedir}" +INSANE_SKIP:${PN} += "ldflags" + +RDEPENDS:${PN} = "libgal-imx libdrm libopencl-imx" + +# This is required to provide support for VPU Amphion HEVC tile format +# From NXP [MGS-5547] (commit e175d6b4f78deab24d319b852998bef55cdecc99): +# VPU Amphion HEVC tile support was added using OpenCL, so add a dependency on libopencl-imx. +RDEPENDS:${PN} += "libopencl-imx" + +COMPATIBLE_MACHINE = "(imxdpu)" diff --git a/recipes-graphics/imx-g2d/imx-gpu-g2d_6.4.3.p2.2.bb b/recipes-graphics/imx-g2d/imx-gpu-g2d_6.4.3.p2.2.bb new file mode 100644 index 000000000..cc12c451c --- /dev/null +++ b/recipes-graphics/imx-g2d/imx-gpu-g2d_6.4.3.p2.2.bb @@ -0,0 +1,39 @@ +# Copyright (C) 2016 Freescale Semiconductor +# Copyright 2017-2021 NXP +# Copyright 2018 (C) O.S. Systems Software LTDA. +# Released under the MIT license (see COPYING.MIT for the terms) + +DESCRIPTION = "GPU G2D library and apps for i.MX with 2D GPU and no DPU" +LICENSE = "Proprietary" +LIC_FILES_CHKSUM = "file://COPYING;md5=e565271ec9a80ce47abbddc4bffe56fa" + +DEPENDS += "libgal-imx" +PROVIDES += "virtual/libg2d" + +FSLBIN_NAME = "${PN}-${PV}-${TARGET_ARCH}" + +SRC_URI = "${FSL_MIRROR}/${FSLBIN_NAME}.bin;name=${TARGET_ARCH};fsl-eula=true" +SRC_URI[aarch64.md5sum] = "64559ad7909bdfe70c66e942e922b49a" +SRC_URI[aarch64.sha256sum] = "40a5ccb7b49eecff4a8003fa74104d4cf659a6519039d3fa9d2f7548813db879" +SRC_URI[arm.md5sum] = "3c50524afe5a19044ea8c0ce2bd9575e" +SRC_URI[arm.sha256sum] = "9c81dfba32f2c86c92d811650e509bdf148b0181f9b3ce9a752e1210f2c78a73" + +S = "${WORKDIR}/${FSLBIN_NAME}" + +inherit fsl-eula-unpack + +do_install () { + install -d ${D}${libdir} + install -d ${D}${includedir} + cp ${S}/g2d/usr/lib/*.so* ${D}${libdir} + cp -Pr ${S}/g2d/usr/include/* ${D}${includedir} + cp -r ${S}/gpu-demos/opt ${D} +} + +FILES:${PN} = "${libdir}/libg2d* /opt" +FILES:${PN}-dev = "${includedir}" +INSANE_SKIP:${PN} = "ldflags" + +RDEPENDS:${PN} = "libgal-imx" + +COMPATIBLE_MACHINE = "(imxgpu2d)" 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 cc12c451c..000000000 --- a/recipes-graphics/imx-gpu-g2d/imx-gpu-g2d_6.4.3.p2.2.bb +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright (C) 2016 Freescale Semiconductor -# Copyright 2017-2021 NXP -# Copyright 2018 (C) O.S. Systems Software LTDA. -# Released under the MIT license (see COPYING.MIT for the terms) - -DESCRIPTION = "GPU G2D library and apps for i.MX with 2D GPU and no DPU" -LICENSE = "Proprietary" -LIC_FILES_CHKSUM = "file://COPYING;md5=e565271ec9a80ce47abbddc4bffe56fa" - -DEPENDS += "libgal-imx" -PROVIDES += "virtual/libg2d" - -FSLBIN_NAME = "${PN}-${PV}-${TARGET_ARCH}" - -SRC_URI = "${FSL_MIRROR}/${FSLBIN_NAME}.bin;name=${TARGET_ARCH};fsl-eula=true" -SRC_URI[aarch64.md5sum] = "64559ad7909bdfe70c66e942e922b49a" -SRC_URI[aarch64.sha256sum] = "40a5ccb7b49eecff4a8003fa74104d4cf659a6519039d3fa9d2f7548813db879" -SRC_URI[arm.md5sum] = "3c50524afe5a19044ea8c0ce2bd9575e" -SRC_URI[arm.sha256sum] = "9c81dfba32f2c86c92d811650e509bdf148b0181f9b3ce9a752e1210f2c78a73" - -S = "${WORKDIR}/${FSLBIN_NAME}" - -inherit fsl-eula-unpack - -do_install () { - install -d ${D}${libdir} - install -d ${D}${includedir} - cp ${S}/g2d/usr/lib/*.so* ${D}${libdir} - cp -Pr ${S}/g2d/usr/include/* ${D}${includedir} - cp -r ${S}/gpu-demos/opt ${D} -} - -FILES:${PN} = "${libdir}/libg2d* /opt" -FILES:${PN}-dev = "${includedir}" -INSANE_SKIP:${PN} = "ldflags" - -RDEPENDS:${PN} = "libgal-imx" - -COMPATIBLE_MACHINE = "(imxgpu2d)" -- cgit v1.2.3-54-g00ecf From bf4876581987b7e6e260b2e29a678005b34ba67d Mon Sep 17 00:00:00 2001 From: Tom Hochstein Date: Wed, 26 Jan 2022 17:35:43 -0600 Subject: imx-gpu-g2d: Upgrade to 6.4.3.p2.4 This version has the sample apps removed, available now in the new recipe imx-g2d-samples. Signed-off-by: Tom Hochstein --- recipes-graphics/imx-g2d/imx-gpu-g2d_6.4.3.p2.2.bb | 39 ---------------------- recipes-graphics/imx-g2d/imx-gpu-g2d_6.4.3.p2.4.bb | 31 +++++++++++++++++ 2 files changed, 31 insertions(+), 39 deletions(-) delete mode 100644 recipes-graphics/imx-g2d/imx-gpu-g2d_6.4.3.p2.2.bb create mode 100644 recipes-graphics/imx-g2d/imx-gpu-g2d_6.4.3.p2.4.bb diff --git a/recipes-graphics/imx-g2d/imx-gpu-g2d_6.4.3.p2.2.bb b/recipes-graphics/imx-g2d/imx-gpu-g2d_6.4.3.p2.2.bb deleted file mode 100644 index cc12c451c..000000000 --- a/recipes-graphics/imx-g2d/imx-gpu-g2d_6.4.3.p2.2.bb +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright (C) 2016 Freescale Semiconductor -# Copyright 2017-2021 NXP -# Copyright 2018 (C) O.S. Systems Software LTDA. -# Released under the MIT license (see COPYING.MIT for the terms) - -DESCRIPTION = "GPU G2D library and apps for i.MX with 2D GPU and no DPU" -LICENSE = "Proprietary" -LIC_FILES_CHKSUM = "file://COPYING;md5=e565271ec9a80ce47abbddc4bffe56fa" - -DEPENDS += "libgal-imx" -PROVIDES += "virtual/libg2d" - -FSLBIN_NAME = "${PN}-${PV}-${TARGET_ARCH}" - -SRC_URI = "${FSL_MIRROR}/${FSLBIN_NAME}.bin;name=${TARGET_ARCH};fsl-eula=true" -SRC_URI[aarch64.md5sum] = "64559ad7909bdfe70c66e942e922b49a" -SRC_URI[aarch64.sha256sum] = "40a5ccb7b49eecff4a8003fa74104d4cf659a6519039d3fa9d2f7548813db879" -SRC_URI[arm.md5sum] = "3c50524afe5a19044ea8c0ce2bd9575e" -SRC_URI[arm.sha256sum] = "9c81dfba32f2c86c92d811650e509bdf148b0181f9b3ce9a752e1210f2c78a73" - -S = "${WORKDIR}/${FSLBIN_NAME}" - -inherit fsl-eula-unpack - -do_install () { - install -d ${D}${libdir} - install -d ${D}${includedir} - cp ${S}/g2d/usr/lib/*.so* ${D}${libdir} - cp -Pr ${S}/g2d/usr/include/* ${D}${includedir} - cp -r ${S}/gpu-demos/opt ${D} -} - -FILES:${PN} = "${libdir}/libg2d* /opt" -FILES:${PN}-dev = "${includedir}" -INSANE_SKIP:${PN} = "ldflags" - -RDEPENDS:${PN} = "libgal-imx" - -COMPATIBLE_MACHINE = "(imxgpu2d)" 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 000000000..8eaa0bb32 --- /dev/null +++ b/recipes-graphics/imx-g2d/imx-gpu-g2d_6.4.3.p2.4.bb @@ -0,0 +1,31 @@ +# Copyright (C) 2016 Freescale Semiconductor +# Copyright 2017-2021 NXP +# Copyright 2018 (C) O.S. Systems Software LTDA. +# Released under the MIT license (see COPYING.MIT for the terms) + +DESCRIPTION = "G2D library using i.MX GPU" +LICENSE = "Proprietary" +LIC_FILES_CHKSUM = "file://COPYING;md5=03bcadc8dc0a788f66ca9e2b89f56c6f" + +DEPENDS = "libgal-imx" +PROVIDES = "virtual/libg2d" + +FSLBIN_NAME = "${PN}-${PV}-${TARGET_ARCH}" + +SRC_URI = "${FSL_MIRROR}/${FSLBIN_NAME}.bin;name=${TARGET_ARCH};fsl-eula=true" +SRC_URI[aarch64.md5sum] = "9d64a9c4a870419607d9e47e832eb997" +SRC_URI[aarch64.sha256sum] = "6065f545568e6cdc138f2d6e7cdcb525e477ce1d775c0ceabe2beb2eacf4eb5b" +SRC_URI[arm.md5sum] = "4d6cb47f09f268533cc6a9a90cc87555" +SRC_URI[arm.sha256sum] = "b298a38a16400e655ea46ab25b6261e602687e9970dd755594db343064a9ae53" + +S = "${WORKDIR}/${FSLBIN_NAME}" + +inherit fsl-eula-unpack + +do_install () { + cp -r -d --no-preserve=ownership ${S}/g2d/* ${D} +} + +INSANE_SKIP:${PN} = "ldflags" + +COMPATIBLE_MACHINE = "(imxgpu2d)" -- cgit v1.2.3-54-g00ecf From e55e641ab78ef33043f17942dd582652bb695034 Mon Sep 17 00:00:00 2001 From: Tom Hochstein Date: Wed, 26 Jan 2022 17:39:29 -0600 Subject: imx-g2d-samples: New recipe for G2D sample apps The G2D sample apps are now available as source. Note that the package is currently limited to GPU-based G2D and is not compatible with DPU-based G2D. A future release will add DPU support. Signed-off-by: Tom Hochstein --- recipes-graphics/imx-g2d/imx-g2d-samples_1.0.0.bb | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 recipes-graphics/imx-g2d/imx-g2d-samples_1.0.0.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 000000000..b3f1051aa --- /dev/null +++ b/recipes-graphics/imx-g2d/imx-g2d-samples_1.0.0.bb @@ -0,0 +1,22 @@ +SUMMARY = "i.MX G2D Samples" +DESCRIPTION = "Set of sample applications for i.MX G2D" +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://COPYING;md5=0858ec9c7a80c4a2cf16e4f825a2cc91" + +# This package is currently only for GPU-based G2D. Support for DPU-based G2d is coming. +DEPENDS = "imx-gpu-g2d" + +GPU_G2D_SAMPLES_SRC ?= "git://github.com/nxpmicro/g2d-samples.git;protocol=https" +SRCBRANCH ?= "imx_1.0" +SRC_URI = "${GPU_G2D_SAMPLES_SRC};branch=${SRCBRANCH}" +SRCREV = "daf64d010666ef2458566573c074e238993f228c" + +S = "${WORKDIR}/git" + +do_configure[noexec] = "1" + +do_install() { + oe_runmake install DESTDIR=${D} PREFIX=${exec_prefix} +} + +FILES:${PN} += "/opt" -- cgit v1.2.3-54-g00ecf From 4cf61024ed4990a47262f21ff86f3d3c51baa6a5 Mon Sep 17 00:00:00 2001 From: Tom Hochstein Date: Thu, 27 Jan 2022 12:14:29 -0600 Subject: imx-gpu-apitrace: Upgrade to 10.0.0 Signed-off-by: Tom Hochstein --- ...dlsym-workaround-glibc-2.34-build-failure.patch | 15 +++---- .../imx-gpu-apitrace/imx-gpu-apitrace_10.0.0.bb | 48 ++++++++++++++++++++++ .../imx-gpu-apitrace/imx-gpu-apitrace_9.0.0.bb | 48 ---------------------- 3 files changed, 54 insertions(+), 57 deletions(-) create mode 100644 recipes-graphics/imx-gpu-apitrace/imx-gpu-apitrace_10.0.0.bb delete mode 100644 recipes-graphics/imx-gpu-apitrace/imx-gpu-apitrace_9.0.0.bb 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 9f3410d7d..2ed5587f7 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 wrappers/dlsym.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/wrappers/dlsym.cpp b/wrappers/dlsym.cpp -index cdf5cfdb..4061afc4 100644 ---- a/wrappers/dlsym.cpp -+++ b/wrappers/dlsym.cpp +Index: git/wrappers/dlsym.cpp +=================================================================== +--- git.orig/wrappers/dlsym.cpp ++++ git/wrappers/dlsym.cpp @@ -34,7 +34,7 @@ #include "os.hpp" --#ifdef __GLIBC__ -+#if defined(__GLIBC__) && !(__GLIBC__ == 2 && __GLIBC_MINOR__ >= 34) +-#if defined(__GLIBC__) && !defined(__UCLIBC__) ++#if defined(__GLIBC__) && !defined(__UCLIBC__) && !(__GLIBC__ == 2 && __GLIBC_MINOR__ >= 34) #include --- -2.17.1 - 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 new file mode 100644 index 000000000..c272d1b70 --- /dev/null +++ b/recipes-graphics/imx-gpu-apitrace/imx-gpu-apitrace_10.0.0.bb @@ -0,0 +1,48 @@ +# Copyright 2018 (C) O.S. Systems Software LTDA. +SUMMARY = "Samples for OpenGL ES" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=aeb969185a143c3c25130bc2c3ef9a50" +DEPENDS = "imx-gpu-viv zlib libpng procps" + +SRC_URI = "git://source.codeaurora.org/external/imx/apitrace-imx.git;protocol=https;branch=imx_10.0 \ + file://0001-dlsym-workaround-glibc-2.34-build-failure.patch \ +" +SRCREV = "90a59407f1cddd31b4dac67e5a2500100eb091bc" + +S = "${WORKDIR}/git" + +inherit cmake pkgconfig perlnative python3native + +PACKAGECONFIG_BACKEND:mx6 = " \ + ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'waffle', \ + bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', \ + '', d), d)} \ +" +PACKAGECONFIG_BACKEND:mx7 = "${PACKAGECONFIG_BACKEND:mx6}" +PACKAGECONFIG_BACKEND:mx8 = "waffle" + +PACKAGECONFIG_GPU2D = "" +PACKAGECONFIG_GPU2D:imxgpu2d = "vivante" + +PACKAGECONFIG ??= " \ + egl \ + ${PACKAGECONFIG_BACKEND} \ + ${PACKAGECONFIG_GPU2D} \ +" + +PACKAGECONFIG[egl] = "-DENABLE_EGL=ON,-DENABLE_EGL=OFF,virtual/egl" +PACKAGECONFIG[gui] = "-DENABLE_GUI=ON,-DENABLE_GUI=OFF" +PACKAGECONFIG[multiarch] = "-DENABLE_MULTIARCH=ON,-DENABLE_MULTIARCH=OFF" +PACKAGECONFIG[waffle] = "-DENABLE_WAFFLE=ON,-DENABLE_WAFFLE=OFF,waffle" +PACKAGECONFIG[x11] = "-DENABLE_X11=ON,-DENABLE_X11=OFF" +PACKAGECONFIG[vivante] = "-DENABLE_VIVANTE=ON,-DENABLE_VIVANTE=OFF,virtual/libg2d" + +SOLIBS = ".so" +FILES_SOLIBSDEV = "" +FILES:${PN} += " \ + ${libdir}/apitrace/scripts/* \ + ${libdir}/apitrace/wrappers/* \ +" + +PACKAGE_ARCH = "${MACHINE_SOCARCH}" +COMPATIBLE_MACHINE = "(imxgpu)" diff --git a/recipes-graphics/imx-gpu-apitrace/imx-gpu-apitrace_9.0.0.bb b/recipes-graphics/imx-gpu-apitrace/imx-gpu-apitrace_9.0.0.bb deleted file mode 100644 index dfa8dde70..000000000 --- a/recipes-graphics/imx-gpu-apitrace/imx-gpu-apitrace_9.0.0.bb +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 2018 (C) O.S. Systems Software LTDA. -SUMMARY = "Samples for OpenGL ES" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=aeb969185a143c3c25130bc2c3ef9a50" -DEPENDS = "imx-gpu-viv zlib libpng procps" - -SRC_URI = "git://source.codeaurora.org/external/imx/apitrace-imx.git;protocol=https;branch=imx_9.0 \ - file://0001-dlsym-workaround-glibc-2.34-build-failure.patch \ -" -SRCREV = "c50e6a954e44998f2e3793a8de863e961f8008c6" - -S = "${WORKDIR}/git" - -inherit cmake pkgconfig perlnative python3native - -PACKAGECONFIG_BACKEND:mx6 = " \ - ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'waffle', \ - bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', \ - '', d), d)} \ -" -PACKAGECONFIG_BACKEND:mx7 = "${PACKAGECONFIG_BACKEND:mx6}" -PACKAGECONFIG_BACKEND:mx8 = "waffle" - -PACKAGECONFIG_GPU2D = "" -PACKAGECONFIG_GPU2D:imxgpu2d = "vivante" - -PACKAGECONFIG ??= " \ - egl \ - ${PACKAGECONFIG_BACKEND} \ - ${PACKAGECONFIG_GPU2D} \ -" - -PACKAGECONFIG[egl] = "-DENABLE_EGL=ON,-DENABLE_EGL=OFF,virtual/egl" -PACKAGECONFIG[gui] = "-DENABLE_GUI=ON,-DENABLE_GUI=OFF" -PACKAGECONFIG[multiarch] = "-DENABLE_MULTIARCH=ON,-DENABLE_MULTIARCH=OFF" -PACKAGECONFIG[waffle] = "-DENABLE_WAFFLE=ON,-DENABLE_WAFFLE=OFF,waffle" -PACKAGECONFIG[x11] = "-DENABLE_X11=ON,-DENABLE_X11=OFF" -PACKAGECONFIG[vivante] = "-DENABLE_VIVANTE=ON,-DENABLE_VIVANTE=OFF,virtual/libg2d" - -SOLIBS = ".so" -FILES_SOLIBSDEV = "" -FILES:${PN} += " \ - ${libdir}/apitrace/scripts/* \ - ${libdir}/apitrace/wrappers/* \ -" - -PACKAGE_ARCH = "${MACHINE_SOCARCH}" -COMPATIBLE_MACHINE = "(imxgpu)" -- cgit v1.2.3-54-g00ecf From d4bfe77653d77d5be5dc131afa6a9ed0dd8d7d31 Mon Sep 17 00:00:00 2001 From: Tom Hochstein Date: Thu, 27 Jan 2022 13:11:25 -0600 Subject: wayland-protocols: Upgrade to 1.22.imx Signed-off-by: Tom Hochstein --- conf/machine/include/imx-base.inc | 6 +++--- .../wayland/wayland-protocols_1.20.imx.bb | 22 ---------------------- .../wayland/wayland-protocols_1.22.imx.bb | 22 ++++++++++++++++++++++ 3 files changed, 25 insertions(+), 25 deletions(-) delete mode 100644 recipes-graphics/wayland/wayland-protocols_1.20.imx.bb create mode 100644 recipes-graphics/wayland/wayland-protocols_1.22.imx.bb diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc index ded072748..ead9170c3 100644 --- a/conf/machine/include/imx-base.inc +++ b/conf/machine/include/imx-base.inc @@ -368,9 +368,9 @@ PREFERRED_PROVIDER_opencl-icd-loader:imxgpu ?= "imx-gpu-viv" PREFERRED_VERSION_weston:imx ?= "9.0.0.imx" PREFERRED_VERSION_weston:use-mainline-bsp = "" -PREFERRED_VERSION_wayland-protocols:mx6 ?= "1.20.imx" -PREFERRED_VERSION_wayland-protocols:mx7 ?= "1.20.imx" -PREFERRED_VERSION_wayland-protocols:mx8 ?= "1.20.imx" +PREFERRED_VERSION_wayland-protocols:mx6 ?= "1.22.imx" +PREFERRED_VERSION_wayland-protocols:mx7 ?= "1.22.imx" +PREFERRED_VERSION_wayland-protocols:mx8 ?= "1.22.imx" # Use i.MX libdrm Version PREFERRED_VERSION_libdrm:mx6 ?= "2.4.107.imx" diff --git a/recipes-graphics/wayland/wayland-protocols_1.20.imx.bb b/recipes-graphics/wayland/wayland-protocols_1.20.imx.bb deleted file mode 100644 index 0d1f47261..000000000 --- a/recipes-graphics/wayland/wayland-protocols_1.20.imx.bb +++ /dev/null @@ -1,22 +0,0 @@ -SUMMARY = "Collection of additional Wayland protocols" -DESCRIPTION = "Wayland protocols that add functionality not \ -available in the Wayland core protocol. Such protocols either add \ -completely new functionality, or extend the functionality of some other \ -protocol either in Wayland core, or some other protocol in \ -wayland-protocols." -HOMEPAGE = "http://wayland.freedesktop.org" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=c7b12b6702da38ca028ace54aae3d484 \ - file://stable/presentation-time/presentation-time.xml;endline=26;md5=4646cd7d9edc9fa55db941f2d3a7dc53" - -SRC_URI = "git://source.codeaurora.org/external/imx/wayland-protocols-imx.git;protocol=https;branch=wayland-protocols-imx-1.20" -SRCREV = "9cacf108d0ee5863c7a656da5d2271bc2396e43d" -S = "${WORKDIR}/git" - -inherit autotools pkgconfig - -PACKAGES = "${PN}" -FILES:${PN} += "${datadir}/pkgconfig/wayland-protocols.pc" - -PACKAGE_ARCH = "${MACHINE_SOCARCH}" -COMPATIBLE_MACHINE = "(imxfbdev|imxgpu)" diff --git a/recipes-graphics/wayland/wayland-protocols_1.22.imx.bb b/recipes-graphics/wayland/wayland-protocols_1.22.imx.bb new file mode 100644 index 000000000..8cc2f1377 --- /dev/null +++ b/recipes-graphics/wayland/wayland-protocols_1.22.imx.bb @@ -0,0 +1,22 @@ +SUMMARY = "Collection of additional Wayland protocols" +DESCRIPTION = "Wayland protocols that add functionality not \ +available in the Wayland core protocol. Such protocols either add \ +completely new functionality, or extend the functionality of some other \ +protocol either in Wayland core, or some other protocol in \ +wayland-protocols." +HOMEPAGE = "http://wayland.freedesktop.org" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://COPYING;md5=c7b12b6702da38ca028ace54aae3d484 \ + file://stable/presentation-time/presentation-time.xml;endline=26;md5=4646cd7d9edc9fa55db941f2d3a7dc53" + +SRC_URI = "git://source.codeaurora.org/external/imx/wayland-protocols-imx.git;protocol=https;branch=wayland-protocols-imx-1.22" +SRCREV = "0f71ffe59cf4c3f050ff79ea18f96345fcf0061e" +S = "${WORKDIR}/git" + +inherit autotools pkgconfig + +PACKAGES = "${PN}" +FILES:${PN} += "${datadir}/pkgconfig/wayland-protocols.pc" + +PACKAGE_ARCH = "${MACHINE_SOCARCH}" +COMPATIBLE_MACHINE = "(imxfbdev|imxgpu)" -- cgit v1.2.3-54-g00ecf From 9bfbf2b84e1bedb8a2d3aab67493ac2877c86491 Mon Sep 17 00:00:00 2001 From: Tom Hochstein Date: Thu, 27 Jan 2022 17:28:45 -0600 Subject: weston: Rework SRC_URI Rework the i.MX SRC_URI override so it's clear what is changed and what is inherited. Signed-off-by: Tom Hochstein --- recipes-graphics/wayland/weston_9.0.0.imx.bb | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/recipes-graphics/wayland/weston_9.0.0.imx.bb b/recipes-graphics/wayland/weston_9.0.0.imx.bb index 76296c8ed..2d66dff47 100644 --- a/recipes-graphics/wayland/weston_9.0.0.imx.bb +++ b/recipes-graphics/wayland/weston_9.0.0.imx.bb @@ -149,12 +149,10 @@ SUMMARY = "Weston, a Wayland compositor, i.MX fork" DEFAULT_PREFERENCE = "-1" SRCBRANCH = "weston-imx-9.0" -SRC_URI = "git://source.codeaurora.org/external/imx/weston-imx.git;protocol=https;branch=${SRCBRANCH} \ - file://weston.png \ - file://weston.desktop \ - file://xwayland.weston-start \ - file://0001-weston-launch-Provide-a-default-version-that-doesn-t.patch \ +SRC_URI:remove = "https://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \ + file://0001-tests-include-fcntl.h-for-open-O_RDWR-O_CLOEXEC-and-.patch \ " +SRC_URI:prepend = "git://source.codeaurora.org/external/imx/weston-imx.git;protocol=https;branch=${SRCBRANCH} " SRCREV = "230e9bc3d647e511e0601e3d45034f22495ed3c7" S = "${WORKDIR}/git" -- cgit v1.2.3-54-g00ecf From 20d809ad97104d228672ce15be5ce0abf489bbbe Mon Sep 17 00:00:00 2001 From: Tom Hochstein Date: Thu, 27 Jan 2022 17:59:12 -0600 Subject: weston: Update base portion of recipe Update the base portion of the i.MX fork recipe to the latest OE-core recipe c8aa0222ce2be647911114aaebcbb0d55d7caf87. Signed-off-by: Tom Hochstein --- ...ackend-drm-Re-order-gbm-destruction-at-DR.patch | 50 ++++++++++++++++++++++ .../0001-meson.build-fix-incorrect-header.patch | 32 ++++++++++++++ ...ch-Provide-a-default-version-that-doesn-t.patch | 2 +- .../wayland/weston/systemd-notify.weston-start | 9 ++++ .../wayland/weston/xwayland.weston-start | 2 - recipes-graphics/wayland/weston_9.0.0.imx.bb | 15 +++++-- 6 files changed, 104 insertions(+), 6 deletions(-) create mode 100644 recipes-graphics/wayland/weston/0001-libweston-backend-drm-Re-order-gbm-destruction-at-DR.patch create mode 100644 recipes-graphics/wayland/weston/0001-meson.build-fix-incorrect-header.patch create mode 100644 recipes-graphics/wayland/weston/systemd-notify.weston-start 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 000000000..f8f758949 --- /dev/null +++ b/recipes-graphics/wayland/weston/0001-libweston-backend-drm-Re-order-gbm-destruction-at-DR.patch @@ -0,0 +1,50 @@ +From c8bfa1f8d576cdc6d515dbbac36c48c6166be0d5 Mon Sep 17 00:00:00 2001 +From: Marius Vlad +Date: Thu, 1 Apr 2021 00:12:00 +0300 +Subject: [PATCH] libweston/backend-drm: Re-order gbm destruction at DRM-backend tear down + +Tearing down the drm-backend when there are no input devices, would call +for the gbm device destruction before compositor shutdown. The latter +would call into the renderer detroy function and assume that the +EGLDisplay, which was created using the before-mentioned gbm device, is +still available. This patch re-orders the gbm destruction after the +compositor shutdown when no one would make use of it. + +Fixes: #314 + +Signed-off-by: Marius Vlad +Suggested-by: Daniel Stone + +Upstream-Status: Backport [https://gitlab.freedesktop.org/wayland/weston/-/commit/d171c7b3ba346c4d0bd6494f45ebf0be3c3cc5fb] +--- + libweston/backend-drm/drm.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/libweston/backend-drm/drm.c b/libweston/backend-drm/drm.c +index 2780f3b..fbcfeca 100644 +--- a/libweston/backend-drm/drm.c ++++ b/libweston/backend-drm/drm.c +@@ -3025,10 +3025,6 @@ err_drm_source: + err_udev_input: + udev_input_destroy(&b->input); + err_sprite: +-#ifdef BUILD_DRM_GBM +- if (b->gbm) +- gbm_device_destroy(b->gbm); +-#endif + destroy_sprites(b); + err_udev_dev: + udev_device_unref(drm_device); +@@ -3038,6 +3034,10 @@ err_launcher: + weston_launcher_destroy(compositor->launcher); + err_compositor: + weston_compositor_shutdown(compositor); ++#ifdef BUILD_DRM_GBM ++ if (b->gbm) ++ gbm_device_destroy(b->gbm); ++#endif + free(b); + return NULL; + } +-- +2.33.0 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 000000000..06e0f7bae --- /dev/null +++ b/recipes-graphics/wayland/weston/0001-meson.build-fix-incorrect-header.patch @@ -0,0 +1,32 @@ +From a2ba4714a6872e547621d29d9ddcb0f374b88cf6 Mon Sep 17 00:00:00 2001 +From: Chen Qi +Date: Tue, 20 Apr 2021 20:42:18 -0700 +Subject: [PATCH] meson.build: fix incorrect header + +The wayland.c actually include 'xdg-shell-client-protocol.h' instead of +the server one, so fix it. Otherwise, it's possible to get build failure +due to race condition. + +Upstream-Status: Pending + +Signed-off-by: Chen Qi +--- + libweston/backend-wayland/meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/libweston/backend-wayland/meson.build b/libweston/backend-wayland/meson.build +index 7e82513..29270b5 100644 +--- a/libweston/backend-wayland/meson.build ++++ b/libweston/backend-wayland/meson.build +@@ -10,7 +10,7 @@ srcs_wlwl = [ + fullscreen_shell_unstable_v1_protocol_c, + presentation_time_protocol_c, + presentation_time_server_protocol_h, +- xdg_shell_server_protocol_h, ++ xdg_shell_client_protocol_h, + xdg_shell_protocol_c, + ] + +-- +2.30.2 + 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 3279a728c..f6ebfd8f6 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 PAM is not available, provide a default version of weston-launch without non-root-user support. -Upstream-Status: Pending +Upstream-Status: Denied [https://gitlab.freedesktop.org/wayland/weston/-/merge_requests/725] Signed-off-by: Tom Hochstein Signed-off-by: Jussi Kukkonen 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 000000000..a97e7b38d --- /dev/null +++ b/recipes-graphics/wayland/weston/systemd-notify.weston-start @@ -0,0 +1,9 @@ +#!/bin/sh + +# SPDX-FileCopyrightText: Huawei Inc. +# SPDX-License-Identifier: Apache-2.0 + + +if [[ -x "/usr/lib/weston/systemd-notify.so" ]]; then + add_weston_module "systemd-notify.so" +fi diff --git a/recipes-graphics/wayland/weston/xwayland.weston-start b/recipes-graphics/wayland/weston/xwayland.weston-start index b483c97cf..db384b1a5 100644 --- a/recipes-graphics/wayland/weston/xwayland.weston-start +++ b/recipes-graphics/wayland/weston/xwayland.weston-start @@ -2,6 +2,4 @@ if type Xwayland >/dev/null 2>/dev/null; then mkdir -p /tmp/.X11-unix - - add_weston_argument "--modules=xwayland.so" fi diff --git a/recipes-graphics/wayland/weston_9.0.0.imx.bb b/recipes-graphics/wayland/weston_9.0.0.imx.bb index 2d66dff47..4b4679e3d 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 @@ # recipe. The second section customizes the recipe for i.MX. ########### OE-core copy ################## -# Upstream hash: 0a882490fe75915c7a119f3498df6750be25f8e0 +# Upstream hash: c8aa0222ce2be647911114aaebcbb0d55d7caf87 SUMMARY = "Weston, a Wayland compositor" 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 \ file://weston.png \ file://weston.desktop \ file://xwayland.weston-start \ + file://systemd-notify.weston-start \ file://0001-weston-launch-Provide-a-default-version-that-doesn-t.patch \ file://0001-tests-include-fcntl.h-for-open-O_RDWR-O_CLOEXEC-and-.patch \ + file://0001-meson.build-fix-incorrect-header.patch \ + file://0001-libweston-backend-drm-Re-order-gbm-destruction-at-DR.patch \ " 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', '', WESTON_MAJOR_VERSION = "${@'.'.join(d.getVar('PV').split('.')[0:1])}" -EXTRA_OEMESON += "-Dbackend-default=auto -Dbackend-rdp=false -Dpipewire=false" +EXTRA_OEMESON += "-Dbackend-default=auto -Dpipewire=false" PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'kms fbdev wayland egl clients', '', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'x11 wayland', 'xwayland', '', d)} \ @@ -64,6 +67,8 @@ PACKAGECONFIG[x11] = "-Dbackend-x11=true,-Dbackend-x11=false,virtual/libx11 libx PACKAGECONFIG[headless] = "-Dbackend-headless=true,-Dbackend-headless=false" # Weston on framebuffer PACKAGECONFIG[fbdev] = "-Dbackend-fbdev=true,-Dbackend-fbdev=false,udev mtdev" +# Weston on RDP +PACKAGECONFIG[rdp] = "-Dbackend-rdp=true,-Dbackend-rdp=false,freerdp" # weston-launch PACKAGECONFIG[launch] = "-Dweston-launch=true,-Dweston-launch=false,drm" # VA-API desktop recorder @@ -83,7 +88,7 @@ PACKAGECONFIG[colord] = "-Dcolor-management-colord=true,-Dcolor-management-color # Clients support PACKAGECONFIG[clients] = "-Dsimple-clients=all -Ddemo-clients=true,-Dsimple-clients= -Ddemo-clients=false" # Virtual remote output with GStreamer on DRM backend -PACKAGECONFIG[remoting] = "-Dremoting=true,-Dremoting=false,gstreamer1.0" +PACKAGECONFIG[remoting] = "-Dremoting=true,-Dremoting=false,gstreamer1.0 gstreamer1.0-plugins-base" # Weston with PAM support PACKAGECONFIG[pam] = "-Dpam=true,-Dpam=false,libpam" # Weston with screen-share support @@ -114,6 +119,10 @@ do_install:append() { install -Dm 644 ${WORKDIR}/xwayland.weston-start ${D}${datadir}/weston-start/xwayland fi + if [ "${@bb.utils.contains('PACKAGECONFIG', 'systemd', 'yes', 'no', d)}" = "yes" ]; then + install -Dm 644 ${WORKDIR}/systemd-notify.weston-start ${D}${datadir}/weston-start/systemd-notify + fi + if [ "${@bb.utils.contains('PACKAGECONFIG', 'launch', 'yes', 'no', d)}" = "yes" ]; then chmod u+s ${D}${bindir}/weston-launch fi -- cgit v1.2.3-54-g00ecf From bf81d436d8050a7b8fd04b622ed3b6036b91259a Mon Sep 17 00:00:00 2001 From: Tom Hochstein Date: Thu, 27 Jan 2022 18:22:53 -0600 Subject: weston: Upgrade to L5.10.72-2.2.0 release Fixes: ``` 26da63a4 screen-share: weston screen-share poor performance with g2d-renderer f8ce046f g2d-renderer: weston screenshare fail to work on rdp-backend with g2d-renderer 74ae3012 drm-backend: rename NV12_10LE40 to NV15 78e17706 backend-fbdev: MIPI display recovery slowly after suspend resume e73c641e LF-4317 launcher-logind: weston sometimes failed to start when booting up from eMMC d5ad97f2 g2d-renderer: use dmabuf.attributes.stride for video stride 23166110 LF-3992 state-propose: fix chromium cannot show on 8mq platform ``` Signed-off-by: Tom Hochstein --- recipes-graphics/wayland/weston_9.0.0.imx.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-graphics/wayland/weston_9.0.0.imx.bb b/recipes-graphics/wayland/weston_9.0.0.imx.bb index 4b4679e3d..0ab2c6b2d 100644 --- a/recipes-graphics/wayland/weston_9.0.0.imx.bb +++ b/recipes-graphics/wayland/weston_9.0.0.imx.bb @@ -162,7 +162,7 @@ SRC_URI:remove = "https://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \ file://0001-tests-include-fcntl.h-for-open-O_RDWR-O_CLOEXEC-and-.patch \ " SRC_URI:prepend = "git://source.codeaurora.org/external/imx/weston-imx.git;protocol=https;branch=${SRCBRANCH} " -SRCREV = "230e9bc3d647e511e0601e3d45034f22495ed3c7" +SRCREV = "26da63a46b926c8301d8c271f6869c893cc35afa" S = "${WORKDIR}/git" # Disable OpenGL for parts with GPU support for 2D but not 3D -- cgit v1.2.3-54-g00ecf From eb58cacc94dbcd7c670da9c320fbaf500e66c5af Mon Sep 17 00:00:00 2001 From: Tom Hochstein Date: Fri, 28 Jan 2022 11:25:21 -0600 Subject: weston: Adjust base patch for fork Signed-off-by: Tom Hochstein --- ...on-backend-drm-Re-order-gbm-destruction-at-DR.patch | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) 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 index f8f758949..db6400550 100644 --- 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 @@ -1,7 +1,8 @@ -From c8bfa1f8d576cdc6d515dbbac36c48c6166be0d5 Mon Sep 17 00:00:00 2001 +From 4be82f75a47bd456452ab713d7d57a75d844f42a Mon Sep 17 00:00:00 2001 From: Marius Vlad Date: Thu, 1 Apr 2021 00:12:00 +0300 -Subject: [PATCH] libweston/backend-drm: Re-order gbm destruction at DRM-backend tear down +Subject: [PATCH] libweston/backend-drm: Re-order gbm destruction at + DRM-backend tear down Tearing down the drm-backend when there are no input devices, would call for the gbm device destruction before compositor shutdown. The latter @@ -21,13 +22,13 @@ Upstream-Status: Backport [https://gitlab.freedesktop.org/wayland/weston/-/commi 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libweston/backend-drm/drm.c b/libweston/backend-drm/drm.c -index 2780f3b..fbcfeca 100644 +index 9d3b5dcc..67834d3e 100644 --- a/libweston/backend-drm/drm.c +++ b/libweston/backend-drm/drm.c -@@ -3025,10 +3025,6 @@ err_drm_source: +@@ -3402,10 +3402,6 @@ err_drm_source: + wl_event_source_remove(b->drm_source); err_udev_input: udev_input_destroy(&b->input); - err_sprite: -#ifdef BUILD_DRM_GBM - if (b->gbm) - gbm_device_destroy(b->gbm); @@ -35,7 +36,7 @@ index 2780f3b..fbcfeca 100644 destroy_sprites(b); err_udev_dev: udev_device_unref(drm_device); -@@ -3038,6 +3034,10 @@ err_launcher: +@@ -3415,6 +3411,10 @@ err_launcher: weston_launcher_destroy(compositor->launcher); err_compositor: weston_compositor_shutdown(compositor); @@ -46,5 +47,6 @@ index 2780f3b..fbcfeca 100644 free(b); return NULL; } --- -2.33.0 +-- +2.17.1 + -- cgit v1.2.3-54-g00ecf From 679337c55cdf061099fefde9842815a8e9c407a0 Mon Sep 17 00:00:00 2001 From: Tom Hochstein Date: Sat, 29 Jan 2022 15:28:05 -0600 Subject: weston-init: Enable screen sharing Signed-off-by: Tom Hochstein --- recipes-graphics/wayland/weston-init/imx/weston.ini | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/recipes-graphics/wayland/weston-init/imx/weston.ini b/recipes-graphics/wayland/weston-init/imx/weston.ini index 916e621ab..3e8be42f3 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 #xwayland=true #repaint-window=16 #enable-overlay-view=1 +modules=screen-share.so #[shell] #size=1920x1080 @@ -27,4 +28,4 @@ touchscreen_calibrator=true #transform=rotate-90 [screen-share] -command=@bindir@/weston --backend=rdp-backend.so --shell=fullscreen-shell.so --no-clients-resize +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 -- cgit v1.2.3-54-g00ecf