From 2a1583a69cf6ab11f425fbe4cfc27f0b212fa448 Mon Sep 17 00:00:00 2001 From: "Rodrigo M. Duarte" Date: Mon, 2 Jun 2025 17:52:18 -0300 Subject: xwayland: 23.2.5.imx -> 24.1.6-imx Signed-off-by: Rodrigo M. Duarte --- conf/machine/include/imx-base.inc | 2 +- recipes-graphics/xwayland/xwayland_23.2.5.imx.bb | 53 ------------------ .../xwayland/xwayland_23.2.5.imx.bbappend | 18 ------- recipes-graphics/xwayland/xwayland_24.1.6.imx.bb | 62 ++++++++++++++++++++++ .../xwayland/xwayland_24.1.6.imx.bbappend | 18 +++++++ 5 files changed, 81 insertions(+), 72 deletions(-) delete mode 100644 recipes-graphics/xwayland/xwayland_23.2.5.imx.bb delete mode 100644 recipes-graphics/xwayland/xwayland_23.2.5.imx.bbappend create mode 100644 recipes-graphics/xwayland/xwayland_24.1.6.imx.bb create mode 100644 recipes-graphics/xwayland/xwayland_24.1.6.imx.bbappend diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc index 07d5a3e20..15d7b2e8d 100644 --- a/conf/machine/include/imx-base.inc +++ b/conf/machine/include/imx-base.inc @@ -594,7 +594,7 @@ PREFERRED_VERSION_weston:imx-mainline-bsp = "" PREFERRED_VERSION_wayland-protocols:imx-nxp-bsp ??= "1.37.imx" -PREFERRED_VERSION_xwayland:imx-nxp-bsp ??= "23.2.5.imx" +PREFERRED_VERSION_xwayland:imx-nxp-bsp ??= "24.1.6.imx" # Use i.MX libdrm Version PREFERRED_VERSION_libdrm:imx-nxp-bsp ??= "2.4.123.imx" diff --git a/recipes-graphics/xwayland/xwayland_23.2.5.imx.bb b/recipes-graphics/xwayland/xwayland_23.2.5.imx.bb deleted file mode 100644 index 0535587bd..000000000 --- a/recipes-graphics/xwayland/xwayland_23.2.5.imx.bb +++ /dev/null @@ -1,53 +0,0 @@ -# This recipe copy helps keep meta-freescale master branch compatible -# with Yocto langdale. -# (From OE-Core rev: 35fdbd0ea81650a0421d50fb53989d96c5956331) - -SUMMARY = "XWayland is an X Server that runs under Wayland." -DESCRIPTION = "XWayland is an X Server running as a Wayland client, \ -and thus is capable of displaying native X11 client applications in a \ -Wayland compositor environment. The goal of XWayland is to facilitate \ -the transition from X Window System to Wayland environments, providing \ -a way to run unported applications in the meantime." -HOMEPAGE = "https://fedoraproject.org/wiki/Changes/XwaylandStandalone" - -DEFAULT_PREFERENCE = "-1" - -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=5df87950af51ac2c5822094553ea1880" - -SRC_URI = "https://www.x.org/archive/individual/xserver/${BP_ORIGINAL}.tar.xz" -BP_ORIGINAL = "${BPN}-23.2.5" -SRC_URI[sha256sum] = "33ec7ff2687a59faaa52b9b09aa8caf118e7ecb6aed8953f526a625ff9f4bd90" -S = "${WORKDIR}/${BP_ORIGINAL}" - -UPSTREAM_CHECK_REGEX = "xwayland-(?P\d+(\.(?!90\d)\d+)+)\.tar" - -inherit meson features_check pkgconfig -REQUIRED_DISTRO_FEATURES = "x11 opengl" - -DEPENDS += "xorgproto xtrans pixman libxkbfile libxfont2 wayland wayland-native wayland-protocols libdrm libepoxy libxcvt" - -OPENGL_PKGCONFIGS = "glx glamor dri3" -PACKAGECONFIG ??= "${XORG_CRYPTO} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', '${OPENGL_PKGCONFIGS}', '', d)} \ -" -PACKAGECONFIG[dri3] = "-Ddri3=true,-Ddri3=false,libxshmfence" -PACKAGECONFIG[glx] = "-Dglx=true,-Dglx=false,virtual/libgl virtual/libx11" -PACKAGECONFIG[glamor] = "-Dglamor=true,-Dglamor=false,libepoxy virtual/libgbm,libegl" -PACKAGECONFIG[unwind] = "-Dlibunwind=true,-Dlibunwind=false,libunwind" -PACKAGECONFIG[xinerama] = "-Dxinerama=true,-Dxinerama=false" - -# Xorg requires a SHA1 implementation, pick one -XORG_CRYPTO ??= "openssl" -PACKAGECONFIG[openssl] = "-Dsha1=libcrypto,,openssl" -PACKAGECONFIG[nettle] = "-Dsha1=libnettle,,nettle" -PACKAGECONFIG[gcrypt] = "-Dsha1=libgcrypt,,libgcrypt" - -do_install:append() { - # remove files not needed and clashing with xserver-xorg - rm -rf ${D}/${libdir}/xorg/ -} - -FILES:${PN} += "${libdir}/xorg/protocol.txt" - -RDEPENDS:${PN} += "xkbcomp" diff --git a/recipes-graphics/xwayland/xwayland_23.2.5.imx.bbappend b/recipes-graphics/xwayland/xwayland_23.2.5.imx.bbappend deleted file mode 100644 index d8f5bdde5..000000000 --- a/recipes-graphics/xwayland/xwayland_23.2.5.imx.bbappend +++ /dev/null @@ -1,18 +0,0 @@ -FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" - -SRC_URI:append:imxgpu = " \ - file://0001-Prefer-to-create-GLES2-context-for-glamor-EGL.patch \ -" - -OPENGL_PKGCONFIGS:remove:imxgpu = "${OPENGL_PKGCONFIGS_REMOVE_IMXGPU}" -OPENGL_PKGCONFIGS_REMOVE_IMXGPU = "" -OPENGL_PKGCONFIGS_REMOVE_IMXGPU:imx-nxp-bsp = "glamor glx" -OPENGL_PKGCONFIGS_REMOVE_IMXGPU:mx8-nxp-bsp = "glx" - -# links with imx-gpu libs which are pre-built for glibc -# gcompat will address it during runtime -LDFLAGS:append:imxgpu:libc-musl = " -Wl,--allow-shlib-undefined" - -RDEPENDS:${PN}:append:imxgpu:libc-musl = " gcompat" - -PACKAGE_ARCH:imxgpu = "${MACHINE_SOCARCH}" diff --git a/recipes-graphics/xwayland/xwayland_24.1.6.imx.bb b/recipes-graphics/xwayland/xwayland_24.1.6.imx.bb new file mode 100644 index 000000000..9d8b49dcd --- /dev/null +++ b/recipes-graphics/xwayland/xwayland_24.1.6.imx.bb @@ -0,0 +1,62 @@ +# This recipe copy helps keep meta-freescale master branch compatible +# with Yocto walnascar. +# (From OE-Core rev: 737e612ca36bbdf415a911644eb7592cf9389846847b47fa46dc705bd754d2d7) + +SUMMARY = "XWayland is an X Server that runs under Wayland." +DESCRIPTION = "XWayland is an X Server running as a Wayland client, \ +and thus is capable of displaying native X11 client applications in a \ +Wayland compositor environment. The goal of XWayland is to facilitate \ +the transition from X Window System to Wayland environments, providing \ +a way to run unported applications in the meantime." +HOMEPAGE = "https://fedoraproject.org/wiki/Changes/XwaylandStandalone" + +DEFAULT_PREFERENCE = "-1" + +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://COPYING;md5=5df87950af51ac2c5822094553ea1880" + +SRC_URI = "https://www.x.org/archive/individual/xserver/${BP_ORIGINAL}.tar.xz" +BP_ORIGINAL = "${BPN}-24.1.6" +SRC_URI[sha256sum] = "737e612ca36bbdf415a911644eb7592cf9389846847b47fa46dc705bd754d2d7" +S = "${WORKDIR}/${BP_ORIGINAL}" + +UPSTREAM_CHECK_REGEX = "xwayland-(?P\d+(\.(?!90\d)\d+)+)\.tar" + +inherit meson features_check pkgconfig +REQUIRED_DISTRO_FEATURES = "x11 opengl" + +DEPENDS += "xorgproto xtrans pixman libxkbfile libxfont2 wayland wayland-native wayland-protocols libdrm libepoxy libxcvt" + +OPENGL_PKGCONFIGS = "glx glamor dri3" +PACKAGECONFIG ??= "${XORG_CRYPTO} ${XWAYLAND_EI} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', '${OPENGL_PKGCONFIGS}', '', d)} \ +" +PACKAGECONFIG[dri3] = "-Ddri3=true,-Ddri3=false,libxshmfence" +PACKAGECONFIG[libdecor] = "-Dlibdecor=true,-Dlibdecor=false,libdecor" +PACKAGECONFIG[glx] = "-Dglx=true,-Dglx=false,virtual/libgl virtual/libx11" +PACKAGECONFIG[glamor] = "-Dglamor=true,-Dglamor=false,libepoxy virtual/libgbm,libegl" +PACKAGECONFIG[unwind] = "-Dlibunwind=true,-Dlibunwind=false,libunwind" +PACKAGECONFIG[xinerama] = "-Dxinerama=true,-Dxinerama=false" + +# Xorg requires a SHA1 implementation, pick one +XORG_CRYPTO ??= "openssl" +PACKAGECONFIG[openssl] = "-Dsha1=libcrypto,,openssl" +PACKAGECONFIG[nettle] = "-Dsha1=libnettle,,nettle" +PACKAGECONFIG[gcrypt] = "-Dsha1=libgcrypt,,libgcrypt" +XWAYLAND_EI ??= "xwayland_ei_false" +PACKAGECONFIG[xwayland_ei_false] = "-Dxwayland_ei=false" +PACKAGECONFIG[xwayland_ei_portal] = "-Dxwayland_ei=portal,,libei" +PACKAGECONFIG[xwayland_ei_socket] = "-Dxwayland_ei=socket,,libei" + +do_install:append() { + # remove files not needed and clashing with xserver-xorg + rm -rf ${D}/${libdir}/xorg/ +} + +FILES:${PN} += "${libdir}/xorg/protocol.txt" + +RDEPENDS:${PN} += "xkbcomp" + +CVE_STATUS_GROUPS = "CVE_STATUS_REDHAT" +CVE_STATUS_REDHAT = "CVE-2025-26594 CVE-2025-26595 CVE-2025-26596 CVE-2025-26597 CVE-2025-26598 CVE-2025-26599 CVE-2025-26600 CVE-2025-26601" +CVE_STATUS_REDHAT[status] = "fixed-version: these are tracked as versionless redhat CVEs in NVD DB, fixed in 24.1.6" diff --git a/recipes-graphics/xwayland/xwayland_24.1.6.imx.bbappend b/recipes-graphics/xwayland/xwayland_24.1.6.imx.bbappend new file mode 100644 index 000000000..d8f5bdde5 --- /dev/null +++ b/recipes-graphics/xwayland/xwayland_24.1.6.imx.bbappend @@ -0,0 +1,18 @@ +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" + +SRC_URI:append:imxgpu = " \ + file://0001-Prefer-to-create-GLES2-context-for-glamor-EGL.patch \ +" + +OPENGL_PKGCONFIGS:remove:imxgpu = "${OPENGL_PKGCONFIGS_REMOVE_IMXGPU}" +OPENGL_PKGCONFIGS_REMOVE_IMXGPU = "" +OPENGL_PKGCONFIGS_REMOVE_IMXGPU:imx-nxp-bsp = "glamor glx" +OPENGL_PKGCONFIGS_REMOVE_IMXGPU:mx8-nxp-bsp = "glx" + +# links with imx-gpu libs which are pre-built for glibc +# gcompat will address it during runtime +LDFLAGS:append:imxgpu:libc-musl = " -Wl,--allow-shlib-undefined" + +RDEPENDS:${PN}:append:imxgpu:libc-musl = " gcompat" + +PACKAGE_ARCH:imxgpu = "${MACHINE_SOCARCH}" -- cgit v1.2.3-54-g00ecf