summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2012-09-11 20:18:08 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-09-12 15:13:50 +0100
commit7ca0d775d3625e3b0b5a8a253700b8d1638ce7dc (patch)
tree0dbd4708f20dc13689fe916f65b9f1d9adb0d84e
parentbbe27db677743021f738d3d4868b181f6bcf39c6 (diff)
downloadpoky-7ca0d775d3625e3b0b5a8a253700b8d1638ce7dc.tar.gz
libx11: revise keysymdef patch based on submission upstream
(From OE-Core rev: 6fb59242e476e6b4a19cdb2acbe9509292cdbad9) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-graphics/xorg-lib/libx11/keysymdef_include.patch38
-rw-r--r--meta/recipes-graphics/xorg-lib/libx11_1.5.0.bb2
2 files changed, 32 insertions, 8 deletions
diff --git a/meta/recipes-graphics/xorg-lib/libx11/keysymdef_include.patch b/meta/recipes-graphics/xorg-lib/libx11/keysymdef_include.patch
index d1bdab9778..ba65319186 100644
--- a/meta/recipes-graphics/xorg-lib/libx11/keysymdef_include.patch
+++ b/meta/recipes-graphics/xorg-lib/libx11/keysymdef_include.patch
@@ -1,23 +1,47 @@
1Upstream-Status: Inappropriate [configuration] 1From 547937d82084f2cce7e3f0849b5112a20c467146 Mon Sep 17 00:00:00 2001
2From: Ross Burton <ross.burton@intel.com>
3Date: Tue, 11 Sep 2012 17:39:12 +0100
4Subject: [PATCH] Allow overriding location of keysymdef.h
2 5
3Signed-off-by: Martin Jansa <martin.jansa@gmail.com> 6Currently keysymdef.h is found by using the includedir of xproto. This doesn't
7work when cross-compiling with a sysroot as that ends up being /usr/include/X11,
8not a path into the cross-build environment.
4 9
5diff -uNr libX11-1.3.6.orig//configure.ac libX11-1.3.6/configure.ac 10So, add an option to allow explicitly specifying the location of keysymdef.h,
6--- libX11-1.3.6.orig//configure.ac 2010-09-20 08:04:16.000000000 +0200 11and verify that the specified or found path exists.
7+++ libX11-1.3.6/configure.ac 2010-09-28 16:29:26.000000000 +0200 12
8@@ -355,7 +355,14 @@ 13(original patch by Martin Jansa <martin.jansa@gmail.com>, revised by myself)
14
15Upstream-Status: Submitted [xorg-devel]
16Signed-off-by: Ross Burton <ross.burton@intel.com>
17---
18 configure.ac | 13 ++++++++++++-
19 1 file changed, 12 insertions(+), 1 deletion(-)
20
21diff --git a/configure.ac b/configure.ac
22index 48a0c8a..200db15 100644
23--- a/configure.ac
24+++ b/configure.ac
25@@ -306,7 +306,18 @@ AC_CHECK_FUNC(poll, [AC_DEFINE(USE_POLL, 1, [poll() function is available])], )
9 # Find keysymdef.h 26 # Find keysymdef.h
10 # 27 #
11 AC_MSG_CHECKING([keysym definitions]) 28 AC_MSG_CHECKING([keysym definitions])
12-KEYSYMDEFDIR=`$PKG_CONFIG --variable=includedir xproto`/X11 29-KEYSYMDEFDIR=`$PKG_CONFIG --variable=includedir xproto`/X11
13+AC_ARG_WITH(keysymdefdir, 30+AC_ARG_WITH(keysymdefdir,
14+ AC_HELP_STRING([--with-keysymdefdir=DIR], [The location of keysymdef.h]), 31+ AC_HELP_STRING([--with-keysymdefdir=DIR], [The location of keysymdef.h (defaults to xproto include dir)]),
15+ KEYSYMDEFDIR=$withval, KEYSYMDEFDIR="") 32+ KEYSYMDEFDIR=$withval, KEYSYMDEFDIR="")
16+ 33+
17+if test x$KEYSYMDEFDIR = x; then 34+if test x$KEYSYMDEFDIR = x; then
18+ KEYSYMDEFDIR=`$PKG_CONFIG --variable=includedir xproto`/X11 35+ KEYSYMDEFDIR=`$PKG_CONFIG --variable=includedir xproto`/X11
19+fi 36+fi
20+ 37+
38+if test ! -d $KEYSYMDEFDIR; then
39+ AC_MSG_ERROR([$KEYSYMDEFDIR doesn't exist or isn't a directory])
40+fi
41+
21 FILES="keysymdef.h XF86keysym.h Sunkeysym.h DECkeysym.h HPkeysym.h" 42 FILES="keysymdef.h XF86keysym.h Sunkeysym.h DECkeysym.h HPkeysym.h"
22 for i in $FILES; do 43 for i in $FILES; do
23 if test -f "$KEYSYMDEFDIR/$i"; then 44 if test -f "$KEYSYMDEFDIR/$i"; then
45--
461.7.10.4
47
diff --git a/meta/recipes-graphics/xorg-lib/libx11_1.5.0.bb b/meta/recipes-graphics/xorg-lib/libx11_1.5.0.bb
index 793496cef2..94e205105f 100644
--- a/meta/recipes-graphics/xorg-lib/libx11_1.5.0.bb
+++ b/meta/recipes-graphics/xorg-lib/libx11_1.5.0.bb
@@ -1,7 +1,7 @@
1require libx11.inc 1require libx11.inc
2inherit gettext 2inherit gettext
3 3
4PR = "${INC_PR}.1" 4PR = "${INC_PR}.2"
5 5
6BBCLASSEXTEND = "native nativesdk" 6BBCLASSEXTEND = "native nativesdk"
7 7