hardknott: weston: sync with meta-imx hardknott-5.10.72-2.2.0 branch
Sync the .bbappend while keeping our ccimx6 patch and remove the 9.0.0.imx recipe, since it's already available in meta-freescale. Signed-off-by: Gabriel Valcazar <gabriel.valcazar@digi.com>
This commit is contained in:
parent
3819ee6672
commit
4a824690cf
|
|
@ -1,43 +0,0 @@
|
||||||
require recipes-graphics/wayland/weston_9.0.0.bb
|
|
||||||
|
|
||||||
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"
|
|
||||||
WESTON_SRC ?= "git://source.codeaurora.org/external/imx/weston-imx.git;protocol=https"
|
|
||||||
SRC_URI_prepend = "${WESTON_SRC};branch=weston-imx-9.0 "
|
|
||||||
SRCREV = "230e9bc3d647e511e0601e3d45034f22495ed3c7"
|
|
||||||
S = "${WORKDIR}/git"
|
|
||||||
|
|
||||||
# Disable OpenGL for parts with GPU support for 2D but not 3D
|
|
||||||
REQUIRED_DISTRO_FEATURES_imxgpu2d = ""
|
|
||||||
REQUIRED_DISTRO_FEATURES_imxgpu3d = "opengl"
|
|
||||||
PACKAGECONFIG_OPENGL = "opengl"
|
|
||||||
PACKAGECONFIG_OPENGL_imxgpu2d = ""
|
|
||||||
PACKAGECONFIG_OPENGL_imxgpu3d = "opengl"
|
|
||||||
|
|
||||||
PACKAGECONFIG_remove = "wayland x11"
|
|
||||||
PACKAGECONFIG_append = " ${@bb.utils.filter('DISTRO_FEATURES', '${PACKAGECONFIG_OPENGL}', d)}"
|
|
||||||
PACKAGECONFIG_remove_imxfbdev = "kms"
|
|
||||||
PACKAGECONFIG_append_imxgpu = " imxgpu"
|
|
||||||
PACKAGECONFIG_append_imxgpu2d = " g2d"
|
|
||||||
#PACKAGECONFIG_append_imxgpu3d = " cairo-glesv2"
|
|
||||||
|
|
||||||
# Weston with Xwayland support (requires X11 and Wayland)
|
|
||||||
PACKAGECONFIG[xwayland] = "-Dxwayland=true,-Dxwayland=false,libxcursor"
|
|
||||||
# Clients support
|
|
||||||
SIMPLE_CLIENTS = "all"
|
|
||||||
SIMPLE_CLIENTS_imxfbdev = "damage,im,egl,shm,touch,dmabuf-v4l"
|
|
||||||
PACKAGECONFIG[clients] = "-Dsimple-clients=${SIMPLE_CLIENTS} -Ddemo-clients=true,-Dsimple-clients= -Ddemo-clients=false"
|
|
||||||
# Weston with cairo glesv2 support
|
|
||||||
#PACKAGECONFIG[cairo-glesv2] = "-Dcairo-glesv2=true,-Dcairo=image"
|
|
||||||
# Weston with i.MX GPU support
|
|
||||||
PACKAGECONFIG[imxgpu] = "-Dimxgpu=true,-Dimxgpu=false"
|
|
||||||
# Weston with i.MX G2D renderer
|
|
||||||
PACKAGECONFIG[g2d] = "-Drenderer-g2d=true,-Drenderer-g2d=false,virtual/libg2d"
|
|
||||||
# Weston with OpenGL support
|
|
||||||
PACKAGECONFIG[opengl] = "-Dopengl=true,-Dopengl=false"
|
|
||||||
|
|
||||||
FILES_${PN} += "${libdir}/${BPN}/lib*${SOLIBS}"
|
|
||||||
FILES_${PN}-dbg += "${libdir}/${BPN}/libexec_weston${SOLIBSDEV}"
|
|
||||||
|
|
||||||
PACKAGE_ARCH = "${MACHINE_SOCARCH}"
|
|
||||||
COMPATIBLE_MACHINE = "(imxfbdev|imxgpu)"
|
|
||||||
|
|
@ -1,3 +1,21 @@
|
||||||
# Copyright (C) 2020 Digi International.
|
# Copyright (C) 2020-2021 Digi International.
|
||||||
|
|
||||||
|
# Digi: include patches/files from this layer
|
||||||
|
FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:"
|
||||||
|
|
||||||
|
WESTON_SRC ?= "git://source.codeaurora.org/external/imx/weston-imx.git;protocol=https"
|
||||||
|
SRC_URI = " \
|
||||||
|
${WESTON_SRC};branch=${SRCBRANCH} \
|
||||||
|
file://weston.png \
|
||||||
|
file://weston.desktop \
|
||||||
|
file://xwayland.weston-start \
|
||||||
|
file://0001-weston-launch-Provide-a-default-version-that-doesn-t.patch \
|
||||||
|
"
|
||||||
|
SRCREV = "26da63a46b926c8301d8c271f6869c893cc35afa"
|
||||||
|
|
||||||
|
EXTRA_OEMESON_remove = "-Dbackend-rdp=false"
|
||||||
|
PACKAGECONFIG_append = " rdp"
|
||||||
|
PACKAGECONFIG[rdp] = "-Dbackend-rdp=true,-Dbackend-rdp=false,freerdp"
|
||||||
|
|
||||||
|
# Digi: fix ccimx6 suspend/resume issue
|
||||||
SRC_URI_append_ccimx6 = " file://0001-libweston-g2d-renderer-try-re-adjusting-fb-if-the-FB.patch"
|
SRC_URI_append_ccimx6 = " file://0001-libweston-g2d-renderer-try-re-adjusting-fb-if-the-FB.patch"
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue