summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics/wayland
diff options
context:
space:
mode:
authorValentin Popa <valentin.popa@intel.com>2014-02-13 15:45:19 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-02-17 15:28:59 +0000
commite7d41d3a273adfefc5ca8a3b5562d3cd763739f1 (patch)
tree3a4fa73060f370700864c1ee8d0c6a4aacd53f1d /meta/recipes-graphics/wayland
parentc8cf900e4e1b51515d9a08dd32740f52c467fe7f (diff)
downloadpoky-e7d41d3a273adfefc5ca8a3b5562d3cd763739f1.tar.gz
wayland: upgrade to 1.4.0
(*) tested on qemux86 and genericx86 with core-image-weston and core-image-sato (From OE-Core rev: 46100431a726010645824a84850fd7bef8cc923b) 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>
Diffstat (limited to 'meta/recipes-graphics/wayland')
-rw-r--r--meta/recipes-graphics/wayland/wayland/just-scanner.patch21
-rw-r--r--meta/recipes-graphics/wayland/wayland_1.4.0.bb (renamed from meta/recipes-graphics/wayland/wayland_1.3.0.bb)6
2 files changed, 20 insertions, 7 deletions
diff --git a/meta/recipes-graphics/wayland/wayland/just-scanner.patch b/meta/recipes-graphics/wayland/wayland/just-scanner.patch
index 234a9c5f79..ae9935e089 100644
--- a/meta/recipes-graphics/wayland/wayland/just-scanner.patch
+++ b/meta/recipes-graphics/wayland/wayland/just-scanner.patch
@@ -1,3 +1,8 @@
1From f674544d4f6f5f763e449207da77a561b22eff97 Mon Sep 17 00:00:00 2001
2From: Valentin Popa <valentin.popa@intel.com>
3Date: Fri, 7 Feb 2014 16:36:47 +0200
4Subject: [PATCH] just scanner
5
1We only build wayland-native for the scanner, so disable the bits we don't 6We only build wayland-native for the scanner, so disable the bits we don't
2actually need. This gives us a small speed up but importantly should allow 7actually need. This gives us a small speed up but importantly should allow
3wayland-native to compile on older hosts such as CentOS 5 which currently fails: 8wayland-native to compile on older hosts such as CentOS 5 which currently fails:
@@ -10,22 +15,27 @@ wayland-native to compile on older hosts such as CentOS 5 which currently fails:
10 15
11Upstream-Status: Inappropriate 16Upstream-Status: Inappropriate
12Signed-off-by: Ross Burton <ross.burton@intel.com> 17Signed-off-by: Ross Burton <ross.burton@intel.com>
18Signed-off-by: Valentin Popa <valentin.popa@intel.com>
19---
20 Makefile.am | 2 +-
21 src/Makefile.am | 2 +-
22 2 files changed, 2 insertions(+), 2 deletions(-)
13 23
14diff --git a/Makefile.am b/Makefile.am 24diff --git a/Makefile.am b/Makefile.am
15index 306d7b3..571fe89 100644 25index 99607b0..ecce1f1 100644
16--- a/Makefile.am 26--- a/Makefile.am
17+++ b/Makefile.am 27+++ b/Makefile.am
18@@ -2,7 +2,7 @@ if BUILD_DOCS 28@@ -2,7 +2,7 @@ if BUILD_DOCS
19 doc_subdir = doc 29 doc_subdir = doc
20 endif 30 endif
21 31
22-SUBDIRS = src protocol $(doc_subdir) tests cursor 32-SUBDIRS = protocol src $(doc_subdir) tests cursor
23+SUBDIRS = src protocol $(doc_subdir) 33+SUBDIRS = protocol src $(doc_subdir)
24 34
25 ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} 35 ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
26 36
27diff --git a/src/Makefile.am b/src/Makefile.am 37diff --git a/src/Makefile.am b/src/Makefile.am
28index e1d04ea..702342e 100644 38index 15f44a5..b938d17 100644
29--- a/src/Makefile.am 39--- a/src/Makefile.am
30+++ b/src/Makefile.am 40+++ b/src/Makefile.am
31@@ -1,4 +1,4 @@ 41@@ -1,4 +1,4 @@
@@ -34,3 +44,6 @@ index e1d04ea..702342e 100644
34 noinst_LTLIBRARIES = libwayland-util.la 44 noinst_LTLIBRARIES = libwayland-util.la
35 45
36 include_HEADERS = \ 46 include_HEADERS = \
47--
481.8.3.2
49
diff --git a/meta/recipes-graphics/wayland/wayland_1.3.0.bb b/meta/recipes-graphics/wayland/wayland_1.4.0.bb
index aa04f8d1c5..0f08cacfea 100644
--- a/meta/recipes-graphics/wayland/wayland_1.3.0.bb
+++ b/meta/recipes-graphics/wayland/wayland_1.4.0.bb
@@ -11,10 +11,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=1d4476a7d98dd5691c53d4d43a510c72 \
11 file://src/wayland-server.c;endline=21;md5=079ae21dbf98ada52ec23744851b0a5c" 11 file://src/wayland-server.c;endline=21;md5=079ae21dbf98ada52ec23744851b0a5c"
12 12
13SRC_URI = "http://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz" 13SRC_URI = "http://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz"
14SRC_URI[md5sum] = "d16d27081e0871de82d08840c2f133fc" 14SRC_URI[md5sum] = "332cf9191837be12638a29265ed7cf46"
15SRC_URI[sha256sum] = "2e817685f68a26acd19964d69ddbc4549ba5412114ad95e1a9f5934cce470d6e" 15SRC_URI[sha256sum] = "18f33b9f15b4c8b662fb1968e7636e7926b419dfc48de8a164b3a3d7095c5a58"
16 16
17SRC_URI_append_class-native = " file://just-scanner.patch" 17SRC_URI_append_class-native = " file://just-scanner.patch"
18EXTRA_OECONF_class-native = "--disable-documentation --enable-scanner"
18 19
19inherit autotools pkgconfig 20inherit autotools pkgconfig
20 21
@@ -24,7 +25,6 @@ BBCLASSEXTEND = "native"
24DEPENDS_class-native = "expat-native libffi-native" 25DEPENDS_class-native = "expat-native libffi-native"
25DEPENDS = "expat libffi wayland-native" 26DEPENDS = "expat libffi wayland-native"
26 27
27EXTRA_OECONF_class-native = "--disable-documentation"
28EXTRA_OECONF = "--disable-documentation --disable-scanner" 28EXTRA_OECONF = "--disable-documentation --disable-scanner"
29 29
30# Wayland installs a M4 macro for other projects to use, which uses the target 30# Wayland installs a M4 macro for other projects to use, which uses the target