mirror of
git://git.yoctoproject.org/meta-freescale.git
synced 2025-10-22 23:02:20 +02:00
weston: Upgrade 14.0.1.imx -> 14.0.2.imx
Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
This commit is contained in:
parent
6ba1226f11
commit
a3c087a3cb
|
@ -576,7 +576,7 @@ PREFERRED_PROVIDER_virtual/libg2d ?= "imx-gpu-g2d"
|
|||
PREFERRED_PROVIDER_virtual/libg2d:imxdpu ?= "imx-dpu-g2d"
|
||||
PREFERRED_PROVIDER_virtual/libg2d:mx93-nxp-bsp ?= "imx-pxp-g2d"
|
||||
|
||||
PREFERRED_VERSION_weston:imx-nxp-bsp ??= "14.0.1.imx"
|
||||
PREFERRED_VERSION_weston:imx-nxp-bsp ??= "14.0.2.imx"
|
||||
# i.MX 6 & 7 stay on weston 10.0 for fbdev
|
||||
PREFERRED_VERSION_weston:mx6-nxp-bsp ??= "10.0.5.imx"
|
||||
PREFERRED_VERSION_weston:mx7-nxp-bsp ??= "10.0.5.imx"
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
# recipe. The second section customizes the recipe for i.MX.
|
||||
|
||||
########### OE-core copy ##################
|
||||
# Upstream hash: 23271a1f908a223b4eb56d6034cbb1ac23da14fe
|
||||
# Upstream hash: 8996690a79ac42a1dee6d041eeb1c1fe29fdac84
|
||||
|
||||
SUMMARY = "Weston, a Wayland compositor"
|
||||
DESCRIPTION = "Weston is the reference implementation of a Wayland compositor"
|
||||
|
@ -14,14 +14,13 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d79ee9e66bb0f95d3386a7acae780b70 \
|
|||
"
|
||||
|
||||
SRC_URI = "https://gitlab.freedesktop.org/wayland/weston/-/releases/${PV}/downloads/${BPN}-${PV}.tar.xz \
|
||||
file://0001-libweston-tools-Include-libgen.h-for-basename-signat.patch \
|
||||
file://weston.png \
|
||||
file://weston.desktop \
|
||||
file://xwayland.weston-start \
|
||||
file://systemd-notify.weston-start \
|
||||
"
|
||||
|
||||
SRC_URI[sha256sum] = "27f68d96e3b97d98daadef13a202356524924fa381418fa6716b9136ef099093"
|
||||
SRC_URI[sha256sum] = "a8150505b126a59df781fe8c30c8e6f87da7013e179039eb844a5bbbcc7c79b3"
|
||||
|
||||
UPSTREAM_CHECK_URI = "https://gitlab.freedesktop.org/wayland/weston/-/tags"
|
||||
UPSTREAM_CHECK_REGEX = "releases/(?P<pver>\d+\.\d+\.(?!9\d+)\d+)"
|
||||
|
@ -33,13 +32,13 @@ inherit meson pkgconfig useradd
|
|||
require ${THISDIR}/required-distro-features.inc
|
||||
|
||||
DEPENDS = "libxkbcommon gdk-pixbuf pixman cairo glib-2.0"
|
||||
DEPENDS += "wayland wayland-protocols libinput virtual/egl pango wayland-native"
|
||||
DEPENDS += "wayland wayland-protocols libinput virtual/egl pango wayland-native libdisplay-info"
|
||||
|
||||
LDFLAGS += "${@bb.utils.contains('DISTRO_FEATURES', 'lto', '-Wl,-z,undefs', '', d)}"
|
||||
|
||||
WESTON_MAJOR_VERSION = "${@'.'.join(d.getVar('PV').split('.')[0:1])}"
|
||||
|
||||
EXTRA_OEMESON += "-Dpipewire=false"
|
||||
EXTRA_OEMESON += "-Dpipewire=false -Dtests=false"
|
||||
|
||||
PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'kms wayland egl clients', '', d)} \
|
||||
${@bb.utils.contains('DISTRO_FEATURES', 'x11 wayland', 'xwayland', '', d)} \
|
||||
|
@ -80,9 +79,7 @@ PACKAGECONFIG[webp] = "-Dimage-webp=true,-Dimage-webp=false,libwebp"
|
|||
# Weston with systemd support
|
||||
PACKAGECONFIG[systemd] = "-Dsystemd=true,-Dsystemd=false,systemd dbus"
|
||||
# Weston with Xwayland support (requires X11 and Wayland)
|
||||
PACKAGECONFIG[xwayland] = "-Dxwayland=true,-Dxwayland=false,libxcb libxcursor xcb-util-cursor xwayland"
|
||||
# colord CMS support
|
||||
PACKAGECONFIG[colord] = "-Ddeprecated-color-management-colord=true,-Ddeprecated-color-management-colord=false,colord"
|
||||
PACKAGECONFIG[xwayland] = "-Dxwayland=true,-Dxwayland=false,libxcb libxcursor xwayland"
|
||||
# Clients support
|
||||
PACKAGECONFIG[clients] = "-Dsimple-clients=${SIMPLECLIENTS} -Ddemo-clients=true,-Dsimple-clients= -Ddemo-clients=false"
|
||||
# Virtual remote output with GStreamer on DRM backend
|
||||
|
@ -147,7 +144,7 @@ RDEPENDS:${PN}-xwayland += "xwayland"
|
|||
|
||||
RDEPENDS:${PN} += "xkeyboard-config"
|
||||
RRECOMMENDS:${PN} = "weston-init liberation-fonts"
|
||||
RRECOMMENDS:${PN}-dev += "wayland-protocols"
|
||||
RDEPENDS:${PN}-dev += "wayland-protocols-dev"
|
||||
|
||||
USERADD_PACKAGES = "${PN}"
|
||||
GROUPADD_PARAM:${PN} = "--system weston-launch"
|
||||
|
@ -162,26 +159,20 @@ LIC_FILES_CHKSUM += "file://LICENSE;md5=d79ee9e66bb0f95d3386a7acae780b70"
|
|||
|
||||
DEFAULT_PREFERENCE = "-1"
|
||||
|
||||
DEPENDS:append = " libdisplay-info"
|
||||
|
||||
SRC_URI:remove = "https://gitlab.freedesktop.org/wayland/weston/-/releases/${PV}/downloads/${BPN}-${PV}.tar.xz"
|
||||
SRC_URI:prepend = "${WESTON_SRC};branch=${SRCBRANCH} "
|
||||
WESTON_SRC ?= "git://github.com/nxp-imx/weston-imx.git;protocol=https"
|
||||
SRCBRANCH = "weston-imx-14.0.1"
|
||||
SRCREV = "0fd5d3ab75346e525b565039a7b8bf5d9008be78"
|
||||
SRCBRANCH = "weston-imx-14.0.2"
|
||||
SRCREV = "c267ba8e6eed3a824e042a200bcc1b4c370ba88f"
|
||||
|
||||
SRC_URI:remove = "file://0001-libweston-tools-Include-libgen.h-for-basename-signat.patch"
|
||||
|
||||
PACKAGECONFIG_IMX_REMOVALS ?= "wayland x11"
|
||||
PACKAGECONFIG:remove = "${PACKAGECONFIG_IMX_REMOVALS}"
|
||||
PACKAGECONFIG_IMX_REMOVALS ?= "wayland x11"
|
||||
|
||||
PACKAGECONFIG:append = " ${PACKAGECONFIG_G2D}"
|
||||
PACKAGECONFIG_G2D ??= ""
|
||||
PACKAGECONFIG_G2D:imxgpu2d ??= "imxg2d"
|
||||
PACKAGECONFIG_G2D:mx93-nxp-bsp ??= "imxg2d"
|
||||
|
||||
# Remove no longer supported colord
|
||||
PACKAGECONFIG[colord] = ""
|
||||
PACKAGECONFIG_G2D ??= ""
|
||||
PACKAGECONFIG_G2D:imxgpu2d ??= "imxg2d"
|
||||
PACKAGECONFIG_G2D:mx93-nxp-bsp ??= "imxg2d"
|
||||
PACKAGECONFIG_G2D:mx943-nxp-bsp ??= "imxg2d"
|
||||
|
||||
# Weston with i.MX G2D renderer
|
||||
PACKAGECONFIG[imxg2d] = "-Drenderer-g2d=true,-Drenderer-g2d=false,virtual/libg2d"
|
Loading…
Reference in New Issue
Block a user