mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-06-01 13:09:50 +00:00
Code Issues Projects Releases Wiki Activity

weston: upgrade to 1.4.0

Browse Source 
(*) added fbdev backend in case the user will
    want to use weston even if drm fails.
(*) removed tablet-shell flag because in 1.4
    tablet-shell has been removed from src.
(*) tested on qemux86 and genericx86 with
    core-image-weston and core-image-sato.

(From OE-Core rev: 270ed9322dbd40b61e31ee9ab27cf7af5d433c1c)

Signed-off-by: Valentin Popa <valentin.popa@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Valentin Popa
2014-02-13 15:45:20 +02:00
committed by Richard Purdie
parent a204c1e1be
commit c8cf900e4e
2 changed files with 36 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/recipes-graphics/wayland/weston/0001-remove-dependence-on-wayland-scanner-flags.patch
+30
View File
@@ -0,0 +1,30 @@
From a0335393ddde2228c84eda1081b5d7b175f78a94 Mon Sep 17 00:00:00 2001
From: Valentin Popa <valentin.popa@intel.com>
Date: Fri, 7 Feb 2014 16:59:58 +0200
Subject: [PATCH] remove dependence on wayland-scanner flags
weston doesn't make use of wayland-scanner flags,
it only uses the -native- wayland-scanner for protocol.
Upstream-Status: Pending
Signed-off-by: Valentin Popa <valentin.popa@intel.com>
---
configure.ac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac
index cce1850..8775eb9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -482,7 +482,7 @@ if test x$wayland_scanner = x; then
AC_MSG_ERROR([wayland-scanner is needed to compile weston])
fi
-PKG_CHECK_MODULES(WAYLAND_SCANNER, wayland-scanner)
+#PKG_CHECK_MODULES(WAYLAND_SCANNER, wayland-scanner)
AC_PATH_PROG(XMLLINT, xmllint)
AC_ARG_WITH([dtddir],
AS_HELP_STRING([--with-dtddir],
--
1.8.3.2
meta/recipes-graphics/wayland/weston_1.3.1.bb → meta/recipes-graphics/wayland/weston_1.4.0.bb
+6 -6
View File
@@ -7,9 +7,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=275efac2559a224527bd4fd593d38466 \
SRC_URI = "http://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \ SRC_URI = "http://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \
file://weston.png \ file://weston.png \
file://weston.desktop" file://weston.desktop \
SRC_URI[md5sum] = "ffe7c3bc0e7eb39a305cbbea8c7766f3" file://0001-remove-dependence-on-wayland-scanner-flags.patch"
SRC_URI[sha256sum] = "f7141334b141ae1a6435bd03bfdb01b7fb628f39259164f201e7e71c8d815bc7" SRC_URI[md5sum] = "4438d2b1f3c9ba9a4a2b10d89fac6fd0"
SRC_URI[sha256sum] = "74a2319d98e9cdb1acf24659699719aa89ac268cf549759271e326edc5f9ed64"
inherit autotools pkgconfig useradd inherit autotools pkgconfig useradd
@@ -18,18 +19,17 @@ DEPENDS = "libxkbcommon gdk-pixbuf pixman cairo glib-2.0 jpeg"
DEPENDS += "wayland virtual/egl pango" DEPENDS += "wayland virtual/egl pango"
EXTRA_OECONF = "--enable-setuid-install \ EXTRA_OECONF = "--enable-setuid-install \
--disable-tablet-shell \
--disable-xwayland \ --disable-xwayland \
--enable-simple-clients \ --enable-simple-clients \
--enable-clients \ --enable-clients \
--enable-demo-clients \ --enable-demo-clients-install \
--disable-simple-egl-clients \ --disable-simple-egl-clients \
--disable-libunwind \ --disable-libunwind \
--disable-rpi-compositor \ --disable-rpi-compositor \
--disable-rdp-compositor" --disable-rdp-compositor"
PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'wayland', 'kms wayland', '', d)} \ PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'wayland', 'kms fbdev wayland', '', d)} \
${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \ ${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \
${@base_contains('DISTRO_FEATURES', 'pam', 'launch', '', d)} \ ${@base_contains('DISTRO_FEATURES', 'pam', 'launch', '', d)} \
" "