diff options
-rw-r--r-- | meta/recipes-graphics/wayland/wayland/just-scanner.patch | 36 | ||||
-rw-r--r-- | meta/recipes-graphics/wayland/wayland_1.0.6.bb | 2 |
2 files changed, 38 insertions, 0 deletions
diff --git a/meta/recipes-graphics/wayland/wayland/just-scanner.patch b/meta/recipes-graphics/wayland/wayland/just-scanner.patch new file mode 100644 index 0000000000..234a9c5f79 --- /dev/null +++ b/meta/recipes-graphics/wayland/wayland/just-scanner.patch | |||
@@ -0,0 +1,36 @@ | |||
1 | We only build wayland-native for the scanner, so disable the bits we don't | ||
2 | actually need. This gives us a small speed up but importantly should allow | ||
3 | wayland-native to compile on older hosts such as CentOS 5 which currently fails: | ||
4 | |||
5 | | wayland-1.0.6/src/wayland-server.c:1245: error: 'O_CLOEXEC' undeclared (first use in this function) | ||
6 | | wayland-1.0.6/src/event-loop.c:34:25: error: sys/timerfd.h: No such file or directory | ||
7 | | wayland-1.0.6/src/event-loop.c:199: error: 'CLOCK_MONOTONIC' undeclared (first use in this function) | ||
8 | | wayland-1.0.6/src/event-loop.c:199: error: 'TFD_CLOEXEC' undeclared (first use in this function) | ||
9 | | wayland-1.0.6/src/event-loop.c:268: error: 'SFD_CLOEXEC' undeclared (first use in this function) | ||
10 | |||
11 | Upstream-Status: Inappropriate | ||
12 | Signed-off-by: Ross Burton <ross.burton@intel.com> | ||
13 | |||
14 | diff --git a/Makefile.am b/Makefile.am | ||
15 | index 306d7b3..571fe89 100644 | ||
16 | --- a/Makefile.am | ||
17 | +++ b/Makefile.am | ||
18 | @@ -2,7 +2,7 @@ if BUILD_DOCS | ||
19 | doc_subdir = doc | ||
20 | endif | ||
21 | |||
22 | -SUBDIRS = src protocol $(doc_subdir) tests cursor | ||
23 | +SUBDIRS = src protocol $(doc_subdir) | ||
24 | |||
25 | ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} | ||
26 | |||
27 | diff --git a/src/Makefile.am b/src/Makefile.am | ||
28 | index e1d04ea..702342e 100644 | ||
29 | --- a/src/Makefile.am | ||
30 | +++ b/src/Makefile.am | ||
31 | @@ -1,4 +1,4 @@ | ||
32 | -lib_LTLIBRARIES = libwayland-server.la libwayland-client.la | ||
33 | +#lib_LTLIBRARIES = libwayland-server.la libwayland-client.la | ||
34 | noinst_LTLIBRARIES = libwayland-util.la | ||
35 | |||
36 | include_HEADERS = \ | ||
diff --git a/meta/recipes-graphics/wayland/wayland_1.0.6.bb b/meta/recipes-graphics/wayland/wayland_1.0.6.bb index 1585479f5c..7c18979af7 100644 --- a/meta/recipes-graphics/wayland/wayland_1.0.6.bb +++ b/meta/recipes-graphics/wayland/wayland_1.0.6.bb | |||
@@ -16,6 +16,8 @@ SRC_URI = "http://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz" | |||
16 | SRC_URI[md5sum] = "936a2590aea69fa3c0cf234d54b9137c" | 16 | SRC_URI[md5sum] = "936a2590aea69fa3c0cf234d54b9137c" |
17 | SRC_URI[sha256sum] = "f52a012df699eff434b0f49e56000d6978b5f781048402ca8e0232242970fc49" | 17 | SRC_URI[sha256sum] = "f52a012df699eff434b0f49e56000d6978b5f781048402ca8e0232242970fc49" |
18 | 18 | ||
19 | SRC_URI_append_class-native = " file://just-scanner.patch" | ||
20 | |||
19 | inherit autotools pkgconfig | 21 | inherit autotools pkgconfig |
20 | 22 | ||
21 | # We need wayland-native for the wayland-scanner utility | 23 | # We need wayland-native for the wayland-scanner utility |