diff options
Diffstat (limited to 'recipes-graphics/wayland')
-rw-r--r-- | recipes-graphics/wayland/weston/dont-use-plane-add-prop.patch | 23 | ||||
-rw-r--r-- | recipes-graphics/wayland/weston_10.0.3.imx.bb (renamed from recipes-graphics/wayland/weston_10.0.1.imx.bb) | 28 |
2 files changed, 12 insertions, 39 deletions
diff --git a/recipes-graphics/wayland/weston/dont-use-plane-add-prop.patch b/recipes-graphics/wayland/weston/dont-use-plane-add-prop.patch deleted file mode 100644 index a4444e5d..00000000 --- a/recipes-graphics/wayland/weston/dont-use-plane-add-prop.patch +++ /dev/null | |||
@@ -1,23 +0,0 @@ | |||
1 | Fix atomic modesetting with musl | ||
2 | |||
3 | atomic modesetting seems to fail with drm weston backend and this patch fixes | ||
4 | it, below errors are seen before weston exits | ||
5 | |||
6 | atomic: couldn't commit new state: Invalid argument | ||
7 | |||
8 | Upstream-Status: Submitted [https://gitlab.freedesktop.org/wayland/weston/-/issues/158] | ||
9 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
10 | |||
11 | --- a/libweston/backend-drm/kms.c | ||
12 | +++ b/libweston/backend-drm/kms.c | ||
13 | @@ -1168,8 +1168,8 @@ drm_pending_state_apply_atomic(struct dr | ||
14 | wl_list_for_each(plane, &b->plane_list, link) { | ||
15 | drm_debug(b, "\t\t[atomic] starting with plane %lu disabled\n", | ||
16 | (unsigned long) plane->plane_id); | ||
17 | - plane_add_prop(req, plane, WDRM_PLANE_CRTC_ID, 0); | ||
18 | - plane_add_prop(req, plane, WDRM_PLANE_FB_ID, 0); | ||
19 | + //plane_add_prop(req, plane, WDRM_PLANE_CRTC_ID, 0); | ||
20 | + //plane_add_prop(req, plane, WDRM_PLANE_FB_ID, 0); | ||
21 | } | ||
22 | |||
23 | flags |= DRM_MODE_ATOMIC_ALLOW_MODESET; | ||
diff --git a/recipes-graphics/wayland/weston_10.0.1.imx.bb b/recipes-graphics/wayland/weston_10.0.3.imx.bb index 470a7b0b..f3e913fc 100644 --- a/recipes-graphics/wayland/weston_10.0.1.imx.bb +++ b/recipes-graphics/wayland/weston_10.0.3.imx.bb | |||
@@ -3,28 +3,27 @@ | |||
3 | # recipe. The second section customizes the recipe for i.MX. | 3 | # recipe. The second section customizes the recipe for i.MX. |
4 | 4 | ||
5 | ########### OE-core copy ################## | 5 | ########### OE-core copy ################## |
6 | # Upstream hash: 400aae43d08f0b9f787ac0d21cb3c97058d76748 | 6 | # Upstream hash: 4b42fd87da290ddea098605aea3a5cce1fb432a7 |
7 | 7 | ||
8 | SUMMARY = "Weston, a Wayland compositor" | 8 | SUMMARY = "Weston, a Wayland compositor" |
9 | DESCRIPTION = "Weston is the reference implementation of a Wayland compositor" | 9 | DESCRIPTION = "Weston is the reference implementation of a Wayland compositor" |
10 | HOMEPAGE = "http://wayland.freedesktop.org" | 10 | HOMEPAGE = "http://wayland.freedesktop.org" |
11 | LICENSE = "MIT" | 11 | LICENSE = "MIT" |
12 | LIC_FILES_CHKSUM = "file://COPYING;md5=d79ee9e66bb0f95d3386a7acae780b70 \ | 12 | LIC_FILES_CHKSUM = "file://LICENSE;md5=d79ee9e66bb0f95d3386a7acae780b70 \ |
13 | file://libweston/compositor.c;endline=27;md5=eb6d5297798cabe2ddc65e2af519bcf0 \ | 13 | file://libweston/compositor.c;endline=27;md5=eb6d5297798cabe2ddc65e2af519bcf0 \ |
14 | " | 14 | " |
15 | 15 | ||
16 | SRC_URI = "https://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \ | 16 | SRC_URI = "https://gitlab.freedesktop.org/wayland/weston/-/releases/${PV}/downloads/${BPN}-${PV}.tar.xz \ |
17 | file://weston.png \ | 17 | file://weston.png \ |
18 | file://weston.desktop \ | 18 | file://weston.desktop \ |
19 | file://xwayland.weston-start \ | 19 | file://xwayland.weston-start \ |
20 | file://systemd-notify.weston-start \ | 20 | file://systemd-notify.weston-start \ |
21 | " | 21 | " |
22 | 22 | ||
23 | SRC_URI:append:libc-musl = " file://dont-use-plane-add-prop.patch " | 23 | SRC_URI[sha256sum] = "89646ca0d9f8d413c2767e5c3828eaa3fa149c2a105b3729a6894fa7cf1549e7" |
24 | |||
25 | SRC_URI[sha256sum] = "5c23964112b90238bed39e5dd1e41cd71a79398813cdc3bbb15a9fdc94e547ae" | ||
26 | 24 | ||
27 | UPSTREAM_CHECK_URI = "https://wayland.freedesktop.org/releases.html" | 25 | UPSTREAM_CHECK_URI = "https://wayland.freedesktop.org/releases.html" |
26 | UPSTREAM_CHECK_REGEX = "weston-(?P<pver>\d+\.\d+\.(?!9\d+)\d+)" | ||
28 | 27 | ||
29 | inherit meson pkgconfig useradd | 28 | inherit meson pkgconfig useradd |
30 | 29 | ||
@@ -34,7 +33,6 @@ require ${THISDIR}/required-distro-features.inc | |||
34 | 33 | ||
35 | DEPENDS = "libxkbcommon gdk-pixbuf pixman cairo glib-2.0" | 34 | DEPENDS = "libxkbcommon gdk-pixbuf pixman cairo glib-2.0" |
36 | DEPENDS += "wayland wayland-protocols libinput virtual/egl pango wayland-native" | 35 | DEPENDS += "wayland wayland-protocols libinput virtual/egl pango wayland-native" |
37 | DEPENDS:append:imxfbdev = " libdrm" | ||
38 | 36 | ||
39 | LDFLAGS += "${@bb.utils.contains('DISTRO_FEATURES', 'lto', '-Wl,-z,undefs', '', d)}" | 37 | LDFLAGS += "${@bb.utils.contains('DISTRO_FEATURES', 'lto', '-Wl,-z,undefs', '', d)}" |
40 | 38 | ||
@@ -159,15 +157,12 @@ SUMMARY = "Weston, a Wayland compositor, i.MX fork" | |||
159 | 157 | ||
160 | DEFAULT_PREFERENCE = "-1" | 158 | DEFAULT_PREFERENCE = "-1" |
161 | 159 | ||
162 | SRC_URI:remove = "https://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz" | 160 | SRC_URI:remove = "https://gitlab.freedesktop.org/wayland/weston/-/releases/${PV}/downloads/${BPN}-${PV}.tar.xz" |
163 | SRC_URI:prepend = "git://github.com/nxp-imx/weston-imx.git;protocol=https;branch=${SRCBRANCH} " | 161 | SRC_URI:prepend = "git://github.com/nxp-imx/weston-imx.git;protocol=https;branch=${SRCBRANCH} " |
164 | SRC_URI += "file://0001-Revert-protocol-no-found-wayland-scanner-with-Yocto-.patch \ | 162 | SRC_URI += "file://0001-Revert-protocol-no-found-wayland-scanner-with-Yocto-.patch \ |
165 | file://0001-g2d-renderer.c-Include-sys-stat.h.patch \ | 163 | file://0001-g2d-renderer.c-Include-sys-stat.h.patch" |
166 | file://0001-tests-Add-dependency-on-screenshooter-client-protoco.patch \ | 164 | SRCBRANCH = "weston-imx-10.0.3" |
167 | " | 165 | SRCREV = "c41675dc616886828219eba9b9ce22ec17533090" |
168 | SRCBRANCH = "weston-imx-10.0.1" | ||
169 | SRCREV = "3f8f336b5d2cf7ea7aa4e047d669d093fc46dfe6" | ||
170 | |||
171 | S = "${WORKDIR}/git" | 166 | S = "${WORKDIR}/git" |
172 | 167 | ||
173 | # Disable OpenGL for parts with GPU support for 2D but not 3D | 168 | # Disable OpenGL for parts with GPU support for 2D but not 3D |
@@ -178,7 +173,8 @@ PACKAGECONFIG_OPENGL = "opengl" | |||
178 | PACKAGECONFIG_OPENGL:imxgpu2d = "" | 173 | PACKAGECONFIG_OPENGL:imxgpu2d = "" |
179 | PACKAGECONFIG_OPENGL:imxgpu3d = "opengl" | 174 | PACKAGECONFIG_OPENGL:imxgpu3d = "opengl" |
180 | 175 | ||
181 | PACKAGECONFIG:remove = "wayland x11" | 176 | PACKAGECONFIG_IMX_REMOVALS ?= "wayland x11" |
177 | PACKAGECONFIG:remove = "${PACKAGECONFIG_IMX_REMOVALS}" | ||
182 | PACKAGECONFIG:append = " ${@bb.utils.filter('DISTRO_FEATURES', '${PACKAGECONFIG_OPENGL}', d)}" | 178 | PACKAGECONFIG:append = " ${@bb.utils.filter('DISTRO_FEATURES', '${PACKAGECONFIG_OPENGL}', d)}" |
183 | 179 | ||
184 | PACKAGECONFIG:remove:imxfbdev = "kms" | 180 | PACKAGECONFIG:remove:imxfbdev = "kms" |
@@ -197,7 +193,7 @@ PACKAGECONFIG[imxg2d] = "-Drenderer-g2d=true,-Drenderer-g2d=false,virtual/libg2d | |||
197 | # Weston with OpenGL support | 193 | # Weston with OpenGL support |
198 | PACKAGECONFIG[opengl] = "-Dopengl=true,-Dopengl=false" | 194 | PACKAGECONFIG[opengl] = "-Dopengl=true,-Dopengl=false" |
199 | 195 | ||
200 | PACKAGECONFIG[fbdev] = "-Dbackend-fbdev=true,-Dbackend-fbdev=false,udev mtdev" | 196 | PACKAGECONFIG[fbdev] = "-Dbackend-fbdev=true,-Dbackend-fbdev=false,udev mtdev libdrm" |
201 | EXTRA_OEMESON:append:imxfbdev = " -Dbackend-default=fbdev" | 197 | EXTRA_OEMESON:append:imxfbdev = " -Dbackend-default=fbdev" |
202 | 198 | ||
203 | EXTRA_OEMESON += "-Ddeprecated-wl-shell=true" | 199 | EXTRA_OEMESON += "-Ddeprecated-wl-shell=true" |