wayland: update wayland recipes
Make our wayland sub-folder match NXP's. https://jira.digi.com/browse/DEL-6603 Signed-off-by: Gabriel Valcazar <gabriel.valcazar@digi.com>
This commit is contained in:
Gabriel Valcazar
parent
a74e80ab2d
commit
1764350e53
|
|
@ -1,20 +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 = "https://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \
|
||||
"
|
||||
SRC_URI[md5sum] = "29312149dafcd4a0e739ba94995a574d"
|
||||
SRC_URI[sha256sum] = "0758bc8008d5332f431b2a84fea7de64d971ce270ed208206a098ff2ebc68f38"
|
||||
|
||||
inherit allarch autotools pkgconfig
|
||||
|
||||
PACKAGES = "${PN}"
|
||||
FILES_${PN} += "${datadir}/pkgconfig/wayland-protocols.pc"
|
||||
|
|
@ -1,5 +0,0 @@
|
|||
WAYLAND_PROTOCOLS_SRC ?= "git://source.codeaurora.org/external/imx/wayland-protocols-imx.git;protocol=https"
|
||||
SRCBRANCH = "master"
|
||||
SRC_URI = "${WAYLAND_PROTOCOLS_SRC};branch=${SRCBRANCH} "
|
||||
SRCREV = "d5ded4ddaf68b161fec23d75204d2153232c3a47"
|
||||
S = "${WORKDIR}/git"
|
||||
|
|
@ -12,18 +12,15 @@ Signed-off-by: Haihua Hu <jared.hu@nxp.com>
|
|||
weston.ini.in | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/weston.ini.in b/weston.ini.in
|
||||
index 2d492ab..ae54b79 100644
|
||||
--- a/weston.ini.in
|
||||
+++ b/weston.ini.in
|
||||
@@ -1,6 +1,7 @@
|
||||
[core]
|
||||
Index: git/weston.ini.in
|
||||
===================================================================
|
||||
--- git.orig/weston.ini.in
|
||||
+++ git/weston.ini.in
|
||||
@@ -2,6 +2,7 @@
|
||||
# i.MX: Disable idle timeout
|
||||
idle-time=0
|
||||
#use-g2d=1
|
||||
+gbm-format=argb8888
|
||||
|
||||
[libinput]
|
||||
touchscreen_calibrator=true
|
||||
--
|
||||
2.7.4
|
||||
|
||||
|
|
|
|||
|
|
@ -1,155 +0,0 @@
|
|||
From b9c05520c4ff688c6488d8ca1e1defc592449d49 Mon Sep 17 00:00:00 2001
|
||||
From: Neena Busireddy <neenareddy.busireddy@nxp.com>
|
||||
Date: Wed, 2 May 2018 11:51:45 -0500
|
||||
Subject: [PATCH] weston.ini.in: Modify paths to point to right directories
|
||||
|
||||
Signed-off-by: Neena Busireddy <neenareddy.busireddy@nxp.com>
|
||||
---
|
||||
Makefile.am | 2 ++
|
||||
ivi-shell/weston.ini.in | 56 ++++++++++++++++++++++++-------------------------
|
||||
2 files changed, 30 insertions(+), 28 deletions(-)
|
||||
|
||||
diff --git a/Makefile.am b/Makefile.am
|
||||
index 870e347..427cb5b 100644
|
||||
--- a/Makefile.am
|
||||
+++ b/Makefile.am
|
||||
@@ -27,6 +27,7 @@ ivi-shell/weston.ini : $(srcdir)/ivi-shell/weston.ini.in
|
||||
-e 's|@abs_top_builddir[@]|$(abs_top_builddir)|g' \
|
||||
-e 's|@abs_top_srcdir[@]|$(abs_top_srcdir)|g' \
|
||||
-e 's|@libexecdir[@]|$(libexecdir)|g' \
|
||||
+ -e 's|@datadir[@]|$(datadir)|g' \
|
||||
-e 's|@plugin_prefix[@]||g' \
|
||||
$< > $@
|
||||
|
||||
@@ -43,6 +44,7 @@ AM_CPPFLAGS = \
|
||||
-I$(top_builddir)/protocol \
|
||||
-DLIBWESTON_MODULEDIR='"$(libweston_moduledir)"' \
|
||||
-DLIBEXECDIR='"$(libexecdir)"' \
|
||||
+ -DDATADIR='"$(datadir)"' \
|
||||
-DBINDIR='"$(bindir)"'
|
||||
|
||||
CLEANFILES = weston.ini \
|
||||
diff --git a/ivi-shell/weston.ini.in b/ivi-shell/weston.ini.in
|
||||
index 3f11e1c..d0efd03 100644
|
||||
--- a/ivi-shell/weston.ini.in
|
||||
+++ b/ivi-shell/weston.ini.in
|
||||
@@ -3,7 +3,7 @@ shell=@plugin_prefix@ivi-shell.so
|
||||
modules=@plugin_prefix@hmi-controller.so
|
||||
|
||||
[ivi-shell]
|
||||
-ivi-shell-user-interface=@abs_top_builddir@/weston-ivi-shell-user-interface
|
||||
+ivi-shell-user-interface=@libexecdir@/weston-ivi-shell-user-interface
|
||||
|
||||
#developermode=true
|
||||
|
||||
@@ -19,20 +19,20 @@ application-layer-id=4000
|
||||
|
||||
transition-duration=300
|
||||
|
||||
-background-image=@abs_top_srcdir@/data/background.png
|
||||
+background-image=@datadir@/weston/background.png
|
||||
background-id=1001
|
||||
-panel-image=@abs_top_srcdir@/data/panel.png
|
||||
+panel-image=@datadir@/weston/panel.png
|
||||
panel-id=1002
|
||||
surface-id-offset=10
|
||||
-tiling-image=@abs_top_srcdir@/data/tiling.png
|
||||
+tiling-image=@datadir@/weston/tiling.png
|
||||
tiling-id=1003
|
||||
-sidebyside-image=@abs_top_srcdir@/data/sidebyside.png
|
||||
+sidebyside-image=@datadir@/weston/sidebyside.png
|
||||
sidebyside-id=1004
|
||||
-fullscreen-image=@abs_top_srcdir@/data/fullscreen.png
|
||||
+fullscreen-image=@datadir@/weston/fullscreen.png
|
||||
fullscreen-id=1005
|
||||
-random-image=@abs_top_srcdir@/data/random.png
|
||||
+random-image=@datadir@/weston/random.png
|
||||
random-id=1006
|
||||
-home-image=@abs_top_srcdir@/data/home.png
|
||||
+home-image=@datadir@/weston/home.png
|
||||
home-id=1007
|
||||
workspace-background-color=0x99000000
|
||||
workspace-background-id=2001
|
||||
@@ -43,59 +43,59 @@ path=@libexecdir@/weston-keyboard
|
||||
[ivi-launcher]
|
||||
workspace-id=0
|
||||
icon-id=4001
|
||||
-icon=@abs_top_srcdir@/data/icon_ivi_flower.png
|
||||
-path=@abs_top_builddir@/weston-flower
|
||||
+icon=@datadir@/weston/icon_ivi_flower.png
|
||||
+path=@bindir@/weston-flower
|
||||
|
||||
[ivi-launcher]
|
||||
workspace-id=0
|
||||
icon-id=4002
|
||||
-icon=@abs_top_srcdir@/data/icon_ivi_clickdot.png
|
||||
-path=@abs_top_builddir@/weston-clickdot
|
||||
+icon=@datadir@/weston/icon_ivi_clickdot.png
|
||||
+path=@bindir@/weston-clickdot
|
||||
|
||||
[ivi-launcher]
|
||||
workspace-id=1
|
||||
icon-id=4003
|
||||
-icon=@abs_top_srcdir@/data/icon_ivi_simple-egl.png
|
||||
-path=@abs_top_builddir@/weston-simple-egl
|
||||
+icon=@datadir@/weston/icon_ivi_simple-egl.png
|
||||
+path=@bindir@/weston-simple-egl
|
||||
|
||||
[ivi-launcher]
|
||||
workspace-id=1
|
||||
icon-id=4004
|
||||
-icon=@abs_top_srcdir@/data/icon_ivi_simple-shm.png
|
||||
-path=@abs_top_builddir@/weston-simple-shm
|
||||
+icon=@datadir@/weston/icon_ivi_simple-shm.png
|
||||
+path=@bindir@/weston-simple-shm
|
||||
|
||||
[ivi-launcher]
|
||||
workspace-id=2
|
||||
icon-id=4005
|
||||
-icon=@abs_top_srcdir@/data/icon_ivi_smoke.png
|
||||
-path=@abs_top_builddir@/weston-smoke
|
||||
+icon=@datadir@/weston/icon_ivi_smoke.png
|
||||
+path=@bindir@/weston-smoke
|
||||
|
||||
[ivi-launcher]
|
||||
workspace-id=3
|
||||
icon-id=4006
|
||||
-icon=@abs_top_srcdir@/data/icon_ivi_flower.png
|
||||
-path=@abs_top_builddir@/weston-flower
|
||||
+icon=@datadir@/weston/icon_ivi_flower.png
|
||||
+path=@bindir@/weston-flower
|
||||
|
||||
[ivi-launcher]
|
||||
workspace-id=3
|
||||
icon-id=4007
|
||||
-icon=@abs_top_srcdir@/data/icon_ivi_clickdot.png
|
||||
-path=@abs_top_builddir@/weston-clickdot
|
||||
+icon=@datadir@/weston/icon_ivi_clickdot.png
|
||||
+path=@bindir@/weston-clickdot
|
||||
|
||||
[ivi-launcher]
|
||||
workspace-id=3
|
||||
icon-id=4008
|
||||
-icon=@abs_top_srcdir@/data/icon_ivi_simple-egl.png
|
||||
-path=@abs_top_builddir@/weston-simple-egl
|
||||
+icon=@datadir@/weston/icon_ivi_simple-egl.png
|
||||
+path=@bindir@/weston-simple-egl
|
||||
|
||||
[ivi-launcher]
|
||||
workspace-id=3
|
||||
icon-id=4009
|
||||
-icon=@abs_top_srcdir@/data/icon_ivi_simple-shm.png
|
||||
-path=@abs_top_builddir@/weston-simple-shm
|
||||
+icon=@datadir@/weston/icon_ivi_simple-shm.png
|
||||
+path=@bindir@/weston-simple-shm
|
||||
|
||||
[ivi-launcher]
|
||||
workspace-id=3
|
||||
icon-id=4010
|
||||
-icon=@abs_top_srcdir@/data/icon_ivi_smoke.png
|
||||
-path=@abs_top_builddir@/weston-smoke
|
||||
+icon=@datadir@/weston/icon_ivi_smoke.png
|
||||
+path=@bindir@/weston-smoke
|
||||
--
|
||||
1.9.1
|
||||
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
From 8955e20180954b4778b9284bade05acf323a1690 Mon Sep 17 00:00:00 2001
|
||||
From 46843c8681ddafbea6f491b7af4de6529e93f5bd Mon Sep 17 00:00:00 2001
|
||||
From: Jun Zhu <junzhu@nxp.com>
|
||||
Date: Sun, 30 Sep 2018 15:31:26 +0800
|
||||
Subject: [PATCH] weston-touch-calibrator: Advertise the touchscreen calibrator
|
||||
|
|
@ -9,17 +9,18 @@ Set touchscreen_calibrator to true in the section "libinput" of the configure fi
|
|||
Otherwise, it will report that the new-added interface "weston-touch-calibration" cannot be found.
|
||||
|
||||
Signed-off-by: Jun Zhu <junzhu@nxp.com>
|
||||
|
||||
---
|
||||
weston.ini.in | 3 +++
|
||||
1 file changed, 3 insertions(+)
|
||||
|
||||
diff --git a/weston.ini.in b/weston.ini.in
|
||||
index fec4291..2d492ab 100644
|
||||
index 83dd56e..6e20e11 100644
|
||||
--- a/weston.ini.in
|
||||
+++ b/weston.ini.in
|
||||
@@ -2,6 +2,9 @@
|
||||
# i.MX: Disable idle timeout
|
||||
@@ -3,6 +3,9 @@
|
||||
idle-time=0
|
||||
#use-g2d=1
|
||||
|
||||
+[libinput]
|
||||
+touchscreen_calibrator=true
|
||||
|
|
@ -27,6 +28,3 @@ index fec4291..2d492ab 100644
|
|||
#[output]
|
||||
#name=HDMI-A-1
|
||||
#mode=1920x1080@60
|
||||
--
|
||||
2.7.4
|
||||
|
||||
|
|
|
|||
|
|
@ -1,55 +0,0 @@
|
|||
Multi-plane sub-sampled textures have partial width/height, e.g.
|
||||
YUV420/I420 has a full-size Y plane, followed by a half-width/height U
|
||||
plane, and a half-width/height V plane.
|
||||
|
||||
zwp_linux_dmabuf_v1 allows clients to pass an explicit pitch for each
|
||||
plane, but for wl_shm this must be inferred. gl-renderer was correctly
|
||||
accounting for the width and height when subsampling, but the pitch was
|
||||
being taken as the pitch for the first plane.
|
||||
|
||||
This does not match the requirements for GStreamer's waylandsink, in
|
||||
particular, as well as other clients. Fix the SHM upload path to
|
||||
correctly set the pitch for each plane, according to subsampling.
|
||||
|
||||
Tested with:
|
||||
$ gst-launch-1.0 videotestsrc ! waylandsink
|
||||
|
||||
Upstream-Status: Backport [https://patchwork.freedesktop.org/patch/180767/]
|
||||
|
||||
Signed-off-by: Daniel Stone <daniels@collabora.com>
|
||||
Fixes: fdeefe42418 ("gl-renderer: add support of WL_SHM_FORMAT_YUV420")
|
||||
Reported-by: Fabien Lahoudere <fabien.lahoudere@collabora.co.uk>
|
||||
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=103063
|
||||
|
||||
---
|
||||
libweston/gl-renderer.c | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/libweston/gl-renderer.c b/libweston/gl-renderer.c
|
||||
index 244ce309..40bf0bb6 100644
|
||||
--- a/libweston/gl-renderer.c
|
||||
+++ b/libweston/gl-renderer.c
|
||||
@@ -1445,14 +1445,13 @@ gl_renderer_flush_damage(struct weston_surface *surface)
|
||||
goto done;
|
||||
}
|
||||
|
||||
- glPixelStorei(GL_UNPACK_ROW_LENGTH_EXT, gs->pitch);
|
||||
-
|
||||
if (gs->needs_full_upload) {
|
||||
glPixelStorei(GL_UNPACK_SKIP_PIXELS_EXT, 0);
|
||||
glPixelStorei(GL_UNPACK_SKIP_ROWS_EXT, 0);
|
||||
wl_shm_buffer_begin_access(buffer->shm_buffer);
|
||||
for (j = 0; j < gs->num_textures; j++) {
|
||||
glBindTexture(GL_TEXTURE_2D, gs->textures[j]);
|
||||
+ glPixelStorei(GL_UNPACK_ROW_LENGTH_EXT, gs->pitch / gs->hsub[j]);
|
||||
glTexImage2D(GL_TEXTURE_2D, 0,
|
||||
gs->gl_format[j],
|
||||
gs->pitch / gs->hsub[j],
|
||||
@@ -1477,6 +1476,7 @@ gl_renderer_flush_damage(struct weston_surface *surface)
|
||||
glPixelStorei(GL_UNPACK_SKIP_ROWS_EXT, r.y1);
|
||||
for (j = 0; j < gs->num_textures; j++) {
|
||||
glBindTexture(GL_TEXTURE_2D, gs->textures[j]);
|
||||
+ glPixelStorei(GL_UNPACK_ROW_LENGTH_EXT, gs->pitch / gs->hsub[j]);
|
||||
glTexSubImage2D(GL_TEXTURE_2D, 0,
|
||||
r.x1 / gs->hsub[j],
|
||||
r.y1 / gs->vsub[j],
|
||||
|
|
@ -21,8 +21,7 @@ SRC_URI = "${WESTON_SRC};branch=${SRCBRANCH} \
|
|||
SRC_URI_append_mx8mq = " file://0001-weston.ini-using-argb8888-as-gbm-default-on-mscale-8.patch \
|
||||
file://0002-weston.ini-configure-desktop-shell-size-in-weston-co.patch \
|
||||
"
|
||||
|
||||
SRCREV = "de814e1aa4899375b67140b5e5ae714c67bb27a0"
|
||||
SRCREV = "fb563901657b296c7c7c86d26602a622429e334f"
|
||||
S = "${WORKDIR}/git"
|
||||
|
||||
UPSTREAM_CHECK_URI = "https://wayland.freedesktop.org/releases.html"
|
||||
|
|
|
|||
Loading…
Reference in New Issue