summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics/wayland/weston
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-graphics/wayland/weston')
-rw-r--r--meta/recipes-graphics/wayland/weston/0001-configure.ac-Fix-wayland-protocols-path.patch34
-rw-r--r--meta/recipes-graphics/wayland/weston/explicit-enable-disable-systemd.patch70
-rw-r--r--meta/recipes-graphics/wayland/weston/libsystemd.patch53
-rw-r--r--meta/recipes-graphics/wayland/weston/make-lcms-explicitly-configurable.patch43
4 files changed, 34 insertions, 166 deletions
diff --git a/meta/recipes-graphics/wayland/weston/0001-configure.ac-Fix-wayland-protocols-path.patch b/meta/recipes-graphics/wayland/weston/0001-configure.ac-Fix-wayland-protocols-path.patch
new file mode 100644
index 0000000000..7e00038fce
--- /dev/null
+++ b/meta/recipes-graphics/wayland/weston/0001-configure.ac-Fix-wayland-protocols-path.patch
@@ -0,0 +1,34 @@
1From 1cfc1434a5d385a74de593ec7601674dba39e2fe Mon Sep 17 00:00:00 2001
2From: Jussi Kukkonen <jussi.kukkonen@intel.com>
3Date: Wed, 11 May 2016 16:16:30 +0300
4Subject: [PATCH] configure.ac: Fix wayland-protocols path
5
6The wayland-protocols directory is used during build: Fix the path
7to point to sysroot specified in recipe.
8
9Normally PKG_CONFIG_SYSROOT_DIR could be used in configure.ac but that
10breaks multilib weston as it would point to multilib sysroot when the
11(allarch) wayland-protocols is actually in the machine sysroot.
12
13Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
14Upstream-Status: Inappropriate [embedded specific]
15---
16 configure.ac | 2 +-
17 1 file changed, 1 insertion(+), 1 deletion(-)
18
19diff --git a/configure.ac b/configure.ac
20index bc7c329..15a05d3 100644
21--- a/configure.ac
22+++ b/configure.ac
23@@ -184,7 +184,7 @@ PKG_CHECK_MODULES(LIBINPUT_BACKEND, [libinput >= 0.8.0])
24 PKG_CHECK_MODULES(COMPOSITOR, [$COMPOSITOR_MODULES])
25
26 PKG_CHECK_MODULES(WAYLAND_PROTOCOLS, [wayland-protocols >= 1.0],
27- [ac_wayland_protocols_pkgdatadir=`$PKG_CONFIG --variable=pkgdatadir wayland-protocols`])
28+ [ac_wayland_protocols_pkgdatadir=${WAYLAND_PROTOCOLS_SYSROOT_DIR}`$PKG_CONFIG --variable=pkgdatadir wayland-protocols`])
29 AC_SUBST(WAYLAND_PROTOCOLS_DATADIR, $ac_wayland_protocols_pkgdatadir)
30
31 AC_ARG_ENABLE(wayland-compositor, [ --enable-wayland-compositor],,
32--
332.1.4
34
diff --git a/meta/recipes-graphics/wayland/weston/explicit-enable-disable-systemd.patch b/meta/recipes-graphics/wayland/weston/explicit-enable-disable-systemd.patch
deleted file mode 100644
index a40eaf186e..0000000000
--- a/meta/recipes-graphics/wayland/weston/explicit-enable-disable-systemd.patch
+++ /dev/null
@@ -1,70 +0,0 @@
1From 8e1efcd40b3bad81c83744e2e120d70c2b567ef2 Mon Sep 17 00:00:00 2001
2From: Frederico Cadete <frederico@cadete.eu>
3Date: Mon, 28 Sep 2015 00:30:10 +0200
4Subject: configure.ac: add explicit enable/disable for systemd-login support
5
6Otherwise, auto-enable depending on whether the system has the necessary
7libraries.
8
9[Updated help text as per pq suggestion -- bwh]
10
11Reviewed-by: Bryce Harrington <bryce@osg.samsung.com>
12Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
13Tested-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
14
15Upstream-Status: Backport
16Backported from Weston git:
17http://cgit.freedesktop.org/wayland/weston/commit/?id=8e1efc
18
19Signed-off-by: Joshua Lock <joshua.lock@collabora.co.uk>
20
21diff --git a/configure.ac b/configure.ac
22index a9cd429..67e80d0 100644
23--- a/configure.ac
24+++ b/configure.ac
25@@ -380,18 +380,30 @@ AC_ARG_ENABLE(resize-optimization,
26 AS_IF([test "x$enable_resize_optimization" = "xyes"],
27 [AC_DEFINE([USE_RESIZE_POOL], [1], [Use resize memory pool as a performance optimization])])
28
29-PKG_CHECK_MODULES(SYSTEMD_LOGIN,
30- [libsystemd >= 209],
31- [have_systemd_login_209=yes;have_systemd_login=yes],
32- [have_systemd_login_209=no;have_systemd_login=no])
33-
34-# Older versions of systemd package systemd-login separately. Fall back on that
35-AS_IF([test x$have_systemd_login != xyes],[
36- PKG_CHECK_MODULES(SYSTEMD_LOGIN,
37- [libsystemd-login >= 198],
38- [have_systemd_login=yes],
39- [have_systemd_login=no])
40- ])
41+AC_ARG_ENABLE(systemd-login,
42+ AS_HELP_STRING([--enable-systemd-login],
43+ [Enable logind support]),,
44+ enable_systemd_login=auto)
45+if test x$enable_systemd_login != xno; then
46+ PKG_CHECK_MODULES(SYSTEMD_LOGIN,
47+ [libsystemd >= 209],
48+ [have_systemd_login_209=yes;have_systemd_login=yes],
49+ [have_systemd_login_209=no;have_systemd_login=no])
50+
51+ # Older versions of systemd package systemd-login separately. Fall back on that
52+ AS_IF([test x$have_systemd_login != xyes],[
53+ PKG_CHECK_MODULES(SYSTEMD_LOGIN,
54+ [libsystemd-login >= 198],
55+ [have_systemd_login=yes],
56+ [have_systemd_login=no])
57+ ])
58+else
59+ have_systemd_login=no
60+fi
61+
62+if test "x$have_systemd_login" = "xno" -a "x$enable_systemd_login" = "xyes"; then
63+ AC_MSG_ERROR([systemd-login support explicitly enabled, but can't find libsystemd>=209 or libsystemd-login])
64+fi
65
66 AS_IF([test "x$have_systemd_login" = "xyes"],
67 [AC_DEFINE([HAVE_SYSTEMD_LOGIN], [1], [Have systemd-login])])
68--
69cgit v0.10.2
70
diff --git a/meta/recipes-graphics/wayland/weston/libsystemd.patch b/meta/recipes-graphics/wayland/weston/libsystemd.patch
deleted file mode 100644
index 2d28d5689a..0000000000
--- a/meta/recipes-graphics/wayland/weston/libsystemd.patch
+++ /dev/null
@@ -1,53 +0,0 @@
1From 5eb025a867b42f8bc7bc73279eac8de58e51a13e Mon Sep 17 00:00:00 2001
2From: Frederico Cadete <frederico@cadete.eu>
3Date: Mon, 28 Sep 2015 00:30:09 +0200
4Subject: configure.ac: add support for new versions of systemd
5
6Starting from systemd version 209, a single libsystemd.pc is provided.
7For previous versions, fall back on libsystemd-login.pc.
8
9Signed-off-by: Frederico Cadete <frederico@cadete.eu>
10Reviewed-by: Bryce Harrington <bryce@osg.samsung.com>
11Reviewed-by: Derek Foreman <derekf@osg.samsung.com>
12
13Upstream-Status: Backport
14Backported from Weston git:
15http://cgit.freedesktop.org/wayland/weston/commit/?id=5eb025
16
17Signed-off-by: Joshua Lock <joshua.lock@collabora.co.uk>
18
19diff --git a/configure.ac b/configure.ac
20index 045291c..a9cd429 100644
21--- a/configure.ac
22+++ b/configure.ac
23@@ -380,14 +380,23 @@ AC_ARG_ENABLE(resize-optimization,
24 AS_IF([test "x$enable_resize_optimization" = "xyes"],
25 [AC_DEFINE([USE_RESIZE_POOL], [1], [Use resize memory pool as a performance optimization])])
26
27-PKG_CHECK_MODULES(SYSTEMD_LOGIN, [libsystemd-login >= 198],
28- [have_systemd_login=yes], [have_systemd_login=no])
29+PKG_CHECK_MODULES(SYSTEMD_LOGIN,
30+ [libsystemd >= 209],
31+ [have_systemd_login_209=yes;have_systemd_login=yes],
32+ [have_systemd_login_209=no;have_systemd_login=no])
33+
34+# Older versions of systemd package systemd-login separately. Fall back on that
35+AS_IF([test x$have_systemd_login != xyes],[
36+ PKG_CHECK_MODULES(SYSTEMD_LOGIN,
37+ [libsystemd-login >= 198],
38+ [have_systemd_login=yes],
39+ [have_systemd_login=no])
40+ ])
41+
42 AS_IF([test "x$have_systemd_login" = "xyes"],
43 [AC_DEFINE([HAVE_SYSTEMD_LOGIN], [1], [Have systemd-login])])
44 AM_CONDITIONAL(HAVE_SYSTEMD_LOGIN, test "x$have_systemd_login" = "xyes")
45
46-PKG_CHECK_MODULES(SYSTEMD_LOGIN_209, [libsystemd-login >= 209],
47- [have_systemd_login_209=yes], [have_systemd_login_209=no])
48 AS_IF([test "x$have_systemd_login_209" = "xyes"],
49 [AC_DEFINE([HAVE_SYSTEMD_LOGIN_209], [1], [Have systemd-login >= 209])])
50
51--
52cgit v0.10.2
53
diff --git a/meta/recipes-graphics/wayland/weston/make-lcms-explicitly-configurable.patch b/meta/recipes-graphics/wayland/weston/make-lcms-explicitly-configurable.patch
deleted file mode 100644
index 35e6d6ff58..0000000000
--- a/meta/recipes-graphics/wayland/weston/make-lcms-explicitly-configurable.patch
+++ /dev/null
@@ -1,43 +0,0 @@
1weston-1.5.0/configure.ac: make lcms explicitly configurable
2
3The lcms package is outside of openembedded-core, so make it
4explicitly configurable. Make it deterministic, so that if lcms
5dependencies are missing, autoconf throws a fatal error. Follow
6upstream style to make it more likely to be merged.
7
8Upstream-Status: Pending
9
10Index: weston-1.5.0/configure.ac
11===================================================================
12--- weston-1.5.0.orig/configure.ac
13+++ weston-1.5.0/configure.ac
14@@ -491,12 +491,24 @@ AC_ARG_ENABLE(demo-clients-install,
15 enable_demo_clients_install=no)
16 AM_CONDITIONAL(INSTALL_DEMO_CLIENTS, [test "x$enable_demo_clients_install" = "xyes"])
17
18-PKG_CHECK_MODULES(LCMS, lcms2,
19- [have_lcms=yes], [have_lcms=no])
20-if test "x$have_lcms" = xyes; then
21- AC_DEFINE(HAVE_LCMS, 1, [Have lcms support])
22+AC_ARG_ENABLE(lcms,
23+ AS_HELP_STRING([--disable-lcms],
24+ [Disable lcms support]),,
25+ enable_lcms=auto)
26+AM_CONDITIONAL(HAVE_LCMS, [test "x$enable_lcms" = xyes])
27+if test "x$enable_lcms" != "xno"; then
28+ PKG_CHECK_MODULES(LCMS,
29+ lcms2,
30+ [have_lcms=yes],
31+ [have_lcms=no])
32+ if test "x$have_lcms" = "xno" -a "x$enable_lcms" = "xyes"; then
33+ AC_MSG_ERROR([lcms support explicitly requested, but lcms couldn't be found])
34+ fi
35+ if test "x$have_lcms" = "xyes"; then
36+ enable_lcms=yes
37+ AC_DEFINE(HAVE_LCMS, 1, [Have lcms support])
38+ fi
39 fi
40-AM_CONDITIONAL(HAVE_LCMS, [test "x$have_lcms" = xyes])
41
42 AC_PATH_PROG([wayland_scanner], [wayland-scanner])
43 if test x$wayland_scanner = x; then
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-17 06:44:47 +0000