summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMing Liu <ming.liu@toradex.com>2019-07-26 22:19:39 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-07-27 22:45:30 +0100
commiteea967a3fb6cb494530eae84c6203be55886695d (patch)
tree3dbb44d63955c45a410e939c10ecdd57df4671a7
parentec79f620e06356f1ccc77e759b2af90edd7d6953 (diff)
downloadpoky-eea967a3fb6cb494530eae84c6203be55886695d.tar.gz
libx11-compose-data: add recipe
So far libx11 compose data is being required by some non-X11 recipes, like weston -> libxkbcommon -> libx11-locale. But the libx11-locale could not build without x11 distro feature enabled. This is not reasonable. To fix it, we introduce this new recipe, it uses the same source with libx11 but dropped X11 dependencies, this makes it to be able to build without x11 distro feature. It would be skipped if x11 distro feature is enabled, in which case the libx11-locale would provide the libx11 compose data. (From OE-Core rev: d8a5b22757ccc76007cda55ee45922a313639258) Signed-off-by: Ming Liu <ming.liu@toradex.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-graphics/xorg-lib/libx11-compose-data/0001-Drop-x11-dependencies.patch86
-rw-r--r--meta/recipes-graphics/xorg-lib/libx11-compose-data_1.6.7.bb35
2 files changed, 121 insertions, 0 deletions
diff --git a/meta/recipes-graphics/xorg-lib/libx11-compose-data/0001-Drop-x11-dependencies.patch b/meta/recipes-graphics/xorg-lib/libx11-compose-data/0001-Drop-x11-dependencies.patch
new file mode 100644
index 0000000000..fbd968483d
--- /dev/null
+++ b/meta/recipes-graphics/xorg-lib/libx11-compose-data/0001-Drop-x11-dependencies.patch
@@ -0,0 +1,86 @@
1From a60f5058136aeadceebfccadf606d8210f8d3ca6 Mon Sep 17 00:00:00 2001
2From: Ming Liu <ming.liu@toradex.com>
3Date: Sun, 5 May 2019 11:55:14 +0200
4Subject: [PATCH] Drop x11 dependencies
5
6Upstream-Status: Inappropriate [OE-Specific]
7
8Signed-off-by: Ming Liu <ming.liu@toradex.com>
9---
10 configure.ac | 44 --------------------------------------------
11 1 file changed, 44 deletions(-)
12
13diff --git a/configure.ac b/configure.ac
14index 3090845..d14063f 100644
15--- a/configure.ac
16+++ b/configure.ac
17@@ -66,27 +66,8 @@ fi
18 AC_SUBST(LDFLAGS_FOR_BUILD)
19
20 # Checks for pkg-config packages
21-
22-# Always required
23-X11_REQUIRES='xproto >= 7.0.17 xextproto xtrans xcb >= 1.11.1'
24-X11_EXTRA_DEPS="xcb >= 1.11.1"
25-
26 PKG_PROG_PKG_CONFIG()
27
28-AC_SUBST(X11_EXTRA_DEPS)
29-
30-# Issue an error if xtrans.m4 was not found and XTRANS_CONNECTION_FLAGS macro
31-# was not expanded, since libX11 with no transport types is rather useless.
32-#
33-# If you're seeing an error here, be sure you installed the lib/xtrans module
34-# first and if it's not in the default location, that you set the ACLOCAL
35-# environment variable to find it, such as:
36-# ACLOCAL="aclocal -I ${PREFIX}/share/aclocal"
37-m4_pattern_forbid([^XTRANS_CONNECTION_FLAGS$])
38-
39-# Transport selection macro from xtrans.m4
40-XTRANS_CONNECTION_FLAGS
41-
42 # Check for dlopen
43 AC_MSG_CHECKING([if run-time linking is supported])
44 AC_SEARCH_LIBS(dlopen,[dl svld])
45@@ -226,30 +207,6 @@ AC_SUBST(XTHREAD_CFLAGS)
46
47 AC_CHECK_FUNC(poll, [AC_DEFINE(USE_POLL, 1, [poll() function is available])], )
48
49-#
50-# Find keysymdef.h
51-#
52-AC_MSG_CHECKING([keysym definitions])
53-AC_ARG_WITH([keysymdefdir],
54- [AC_HELP_STRING([--with-keysymdefdir=DIR], [The location of keysymdef.h (defaults to xproto include dir)])],
55- [KEYSYMDEFDIR=$withval],
56- [KEYSYMDEFDIR=`$PKG_CONFIG --variable=includedir xproto`/X11])
57-
58-if test ! -d "$KEYSYMDEFDIR"; then
59- AC_MSG_ERROR([$KEYSYMDEFDIR doesn't exist or isn't a directory])
60-fi
61-
62-FILES="keysymdef.h XF86keysym.h Sunkeysym.h DECkeysym.h HPkeysym.h"
63-for i in $FILES; do
64- if test -f "$KEYSYMDEFDIR/$i"; then
65- KEYSYMDEFS="$KEYSYMDEFS $KEYSYMDEFDIR/$i"
66- elif test "x$i" = "xkeysymdef.h"; then
67- AC_MSG_ERROR([Cannot find keysymdef.h])
68- fi
69-done
70-AC_MSG_RESULT([$KEYSYMDEFS])
71-AC_SUBST(KEYSYMDEFS)
72-
73 AC_ARG_ENABLE(xcms,
74 AS_HELP_STRING([--disable-xcms],
75 [Disable Xlib support for CMS *EXPERIMENTAL*]),
76@@ -329,7 +286,6 @@ X11_LIBDIR="${libdir}/X11"
77 AX_DEFINE_DIR(X11_LIBDIR, X11_LIBDIR, [Location of libX11 library data])
78 AC_SUBST(X11_LIBDIR)
79
80-PKG_CHECK_MODULES(X11, [$X11_REQUIRES])
81 X11_CFLAGS="$X11_CFLAGS $XTHREAD_CFLAGS"
82
83 #
84--
852.7.4
86
diff --git a/meta/recipes-graphics/xorg-lib/libx11-compose-data_1.6.7.bb b/meta/recipes-graphics/xorg-lib/libx11-compose-data_1.6.7.bb
new file mode 100644
index 0000000000..9dace701a5
--- /dev/null
+++ b/meta/recipes-graphics/xorg-lib/libx11-compose-data_1.6.7.bb
@@ -0,0 +1,35 @@
1SUMMARY = "Xlib: Compose data files for libx11"
2DESCRIPTION = "This package provides the compose data files for libx11."
3
4python () {
5 if bb.utils.contains('DISTRO_FEATURES', 'x11', True, False, d):
6 raise bb.parse.SkipRecipe("libx11-compose-data is incompatible with x11 distro feature, use libx11 instead.")
7}
8
9require xorg-lib-common.inc
10
11LICENSE = "MIT & MIT-style & BSD"
12LIC_FILES_CHKSUM = "file://COPYING;md5=172255dee66bb0151435b2d5d709fcf7"
13
14SRC_URI[md5sum] = "034fdd6cc5393974d88aec6f5bc96162"
15SRC_URI[sha256sum] = "910e9e30efba4ad3672ca277741c2728aebffa7bc526f04dcfa74df2e52a1348"
16
17SRC_URI += "file://0001-Drop-x11-dependencies.patch"
18
19XORG_PN = "libX11"
20
21EXTRA_OECONF += "--disable-xkb"
22
23PACKAGES = "${PN}"
24
25FILES_${PN} = "${datadir}/X11/locale ${libdir}/X11/locale"
26
27do_compile() {
28 oe_runmake -C nls
29}
30
31do_install() {
32 oe_runmake DESTDIR=${D} -C nls install
33}
34
35REQUIRED_DISTRO_FEATURES = ""