From 315d018f17478b93a0151611edc7a8ccb0eac73f Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 10 Apr 2023 10:01:43 -0700 Subject: xwayland: Drop upstreamed patch to make use of GL_EXT_texture_format_BGRA8888 OE-core is soon upgrading to xwayland 23.x and this patch is already part of this release [1] Be aware that this would be post mickledore release, so this patch is not backportable to mickledore, its only for upcoming master and beyond. [1] https://gitlab.freedesktop.org/xorg/xserver/-/commit/24cd5f34f8edcc6621ed9c0f2b1a3df08de7488d Signed-off-by: Khem Raj --- ...or-Fix-fbo-pixmap-format-with-GL_BGRA_EXT.patch | 39 ---------------------- recipes-graphics/xwayland/xwayland_%.bbappend | 1 - 2 files changed, 40 deletions(-) delete mode 100644 recipes-graphics/xwayland/xwayland/0002-glamor-Fix-fbo-pixmap-format-with-GL_BGRA_EXT.patch diff --git a/recipes-graphics/xwayland/xwayland/0002-glamor-Fix-fbo-pixmap-format-with-GL_BGRA_EXT.patch b/recipes-graphics/xwayland/xwayland/0002-glamor-Fix-fbo-pixmap-format-with-GL_BGRA_EXT.patch deleted file mode 100644 index 1c6cf2ec..00000000 --- a/recipes-graphics/xwayland/xwayland/0002-glamor-Fix-fbo-pixmap-format-with-GL_BGRA_EXT.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 4508e54dae9d2884b2d6ccca13450b25d509cc9a Mon Sep 17 00:00:00 2001 -From: Xianzhong -Date: Thu, 5 Aug 2021 16:57:43 +0800 -Subject: [PATCH 3/3] glamor: Fix fbo pixmap format with GL_BGRA_EXT - -Red and Blue channels are swizzled in GLES path, -Fix color inverse problem with ximagesink command: -gst-launch-1.0 videotestsrc pattern=6 num-buffers=1 ! video/x-raw,format=BGRx ! videoconvert ! ximagesink display=:0 -v - -This fix requires GL_EXT_texture_format_BGRA8888 extension, not applicable for upstream. - -Upstream-Status: Inappropriate [embedded specific] -Signed-off-by: Xianzhong ---- - glamor/glamor.c | 7 +++++++ - 1 file changed, 7 insertions(+) - -Index: xwayland-21.1.4/glamor/glamor.c -=================================================================== ---- xwayland-21.1.4.orig/glamor/glamor.c -+++ xwayland-21.1.4/glamor/glamor.c -@@ -586,10 +586,17 @@ glamor_setup_formats(ScreenPtr screen) - - if (glamor_priv->is_gles) { - assert(X_BYTE_ORDER == X_LITTLE_ENDIAN); -+#if GL_EXT_texture_format_BGRA8888 -+ glamor_add_format(screen, 24, PICT_x8r8g8b8, -+ GL_BGRA_EXT, GL_BGRA_EXT, GL_UNSIGNED_BYTE, TRUE); -+ glamor_add_format(screen, 32, PICT_a8r8g8b8, -+ GL_BGRA_EXT, GL_BGRA_EXT, GL_UNSIGNED_BYTE, TRUE); -+#else - glamor_add_format(screen, 24, PICT_x8b8g8r8, - GL_RGBA8, GL_RGBA, GL_UNSIGNED_BYTE, TRUE); - glamor_add_format(screen, 32, PICT_a8b8g8r8, - GL_RGBA8, GL_RGBA, GL_UNSIGNED_BYTE, TRUE); -+#endif - } else { - glamor_add_format(screen, 24, PICT_x8r8g8b8, - GL_RGBA, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, TRUE); diff --git a/recipes-graphics/xwayland/xwayland_%.bbappend b/recipes-graphics/xwayland/xwayland_%.bbappend index f2141f4f..8515a538 100644 --- a/recipes-graphics/xwayland/xwayland_%.bbappend +++ b/recipes-graphics/xwayland/xwayland_%.bbappend @@ -2,7 +2,6 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" SRC_URI:append:imxgpu = " \ file://0001-Prefer-to-create-GLES2-context-for-glamor-EGL.patch \ - file://0002-glamor-Fix-fbo-pixmap-format-with-GL_BGRA_EXT.patch \ " OPENGL_PKGCONFIGS:remove:imxgpu = "${OPENGL_PKGCONFIGS_REMOVE_IMXGPU}" -- cgit v1.2.3-54-g00ecf From cbc85581a682d4a864bd2711b760f933a6516fa0 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 10 Apr 2023 11:29:28 -0700 Subject: wayland-protocols: Upgrade to 1.31 on imx fork Fixes https://github.com/Freescale/meta-freescale/issues/1490 Signed-off-by: Khem Raj --- conf/machine/include/imx-base.inc | 8 +++---- .../wayland/wayland-protocols_1.25.imx.bb | 28 ---------------------- .../wayland/wayland-protocols_1.31.imx.bb | 28 ++++++++++++++++++++++ 3 files changed, 32 insertions(+), 32 deletions(-) delete mode 100644 recipes-graphics/wayland/wayland-protocols_1.25.imx.bb create mode 100644 recipes-graphics/wayland/wayland-protocols_1.31.imx.bb diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc index 10c3601a..b8190abf 100644 --- a/conf/machine/include/imx-base.inc +++ b/conf/machine/include/imx-base.inc @@ -517,10 +517,10 @@ PREFERRED_PROVIDER_virtual/opencl-icd:imxgpu ?= "imx-gpu-viv" PREFERRED_VERSION_weston:imx-nxp-bsp ??= "10.0.1.imx" PREFERRED_VERSION_weston:imx-mainline-bsp = "" -PREFERRED_VERSION_wayland-protocols:mx6-nxp-bsp ??= "1.25.imx" -PREFERRED_VERSION_wayland-protocols:mx7-nxp-bsp ??= "1.25.imx" -PREFERRED_VERSION_wayland-protocols:mx8-nxp-bsp ??= "1.25.imx" -PREFERRED_VERSION_wayland-protocols:mx9-nxp-bsp ??= "1.25.imx" +PREFERRED_VERSION_wayland-protocols:mx6-nxp-bsp ??= "1.31.imx" +PREFERRED_VERSION_wayland-protocols:mx7-nxp-bsp ??= "1.31.imx" +PREFERRED_VERSION_wayland-protocols:mx8-nxp-bsp ??= "1.31.imx" +PREFERRED_VERSION_wayland-protocols:mx9-nxp-bsp ??= "1.31.imx" # Use i.MX libdrm Version PREFERRED_VERSION_libdrm:mx6-nxp-bsp ??= "2.4.109.imx" diff --git a/recipes-graphics/wayland/wayland-protocols_1.25.imx.bb b/recipes-graphics/wayland/wayland-protocols_1.25.imx.bb deleted file mode 100644 index b31267c1..00000000 --- a/recipes-graphics/wayland/wayland-protocols_1.25.imx.bb +++ /dev/null @@ -1,28 +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://github.com/nxp-imx/wayland-protocols-imx.git;protocol=https;branch=wayland-protocols-imx-1.25" -SRCREV = "a104fb66d1b899dc04077422c2204638675ee4a6" -S = "${WORKDIR}/git" - -UPSTREAM_CHECK_URI = "https://wayland.freedesktop.org/releases.html" - -# NOTE: For i.MX drop allarch since the recipe is SOCARCH -#inherit meson pkgconfig allarch -inherit meson pkgconfig - -EXTRA_OEMESON += "-Dtests=false" - -PACKAGES = "${PN}" -FILES:${PN} += "${datadir}/pkgconfig/wayland-protocols.pc" - -PACKAGE_ARCH = "${MACHINE_SOCARCH}" -COMPATIBLE_MACHINE = "(mx6-nxp-bsp|mx7-nxp-bsp|mx8-nxp-bsp|mx9-nxp-bsp)" diff --git a/recipes-graphics/wayland/wayland-protocols_1.31.imx.bb b/recipes-graphics/wayland/wayland-protocols_1.31.imx.bb new file mode 100644 index 00000000..294ff920 --- /dev/null +++ b/recipes-graphics/wayland/wayland-protocols_1.31.imx.bb @@ -0,0 +1,28 @@ +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://LICENSE;md5=c7b12b6702da38ca028ace54aae3d484 \ + file://stable/presentation-time/presentation-time.xml;endline=26;md5=4646cd7d9edc9fa55db941f2d3a7dc53" + +SRC_URI = "git://github.com/nxp-imx/wayland-protocols-imx.git;protocol=https;branch=wayland-protocols-imx-1.31" +SRCREV = "99a2a439fc6b5d25d41bfec9c9b459408a45bf92" +S = "${WORKDIR}/git" + +UPSTREAM_CHECK_URI = "https://wayland.freedesktop.org/releases.html" + +# NOTE: For i.MX drop allarch since the recipe is SOCARCH +#inherit meson pkgconfig allarch +inherit meson pkgconfig + +EXTRA_OEMESON += "-Dtests=false" + +PACKAGES = "${PN}" +FILES:${PN} += "${datadir}/pkgconfig/wayland-protocols.pc" + +PACKAGE_ARCH = "${MACHINE_SOCARCH}" +COMPATIBLE_MACHINE = "(mx6-nxp-bsp|mx7-nxp-bsp|mx8-nxp-bsp|mx9-nxp-bsp)" -- cgit v1.2.3-54-g00ecf