summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2012-09-13 11:10:32 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-09-14 09:50:27 +0100
commitf73e829585171f6a3e65f98a4138f8fdc26e1d13 (patch)
tree5c448def24689dd149c3ce904e98f786db836445 /meta
parent1cc4bb4a66b7a72ba84bc3021658ca44caaf3609 (diff)
downloadpoky-f73e829585171f6a3e65f98a4138f8fdc26e1d13.tar.gz
libx11: update patch to a backport from upstream git
(From OE-Core rev: 0d8db0a1fe236be24bd5dc003a79ee1b6cdd5c05) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-graphics/xorg-lib/libx11/keysymdef_include.patch35
1 files changed, 15 insertions, 20 deletions
diff --git a/meta/recipes-graphics/xorg-lib/libx11/keysymdef_include.patch b/meta/recipes-graphics/xorg-lib/libx11/keysymdef_include.patch
index ba65319186..8c50bb7262 100644
--- a/meta/recipes-graphics/xorg-lib/libx11/keysymdef_include.patch
+++ b/meta/recipes-graphics/xorg-lib/libx11/keysymdef_include.patch
@@ -1,7 +1,7 @@
1From 547937d82084f2cce7e3f0849b5112a20c467146 Mon Sep 17 00:00:00 2001 1From d45b3fc19fbe95c41afc4e51d768df6d42332010 Mon Sep 17 00:00:00 2001
2From: Ross Burton <ross.burton@intel.com> 2From: Ross Burton <ross.burton@intel.com>
3Date: Tue, 11 Sep 2012 17:39:12 +0100 3Date: Wed, 12 Sep 2012 13:39:40 +0000
4Subject: [PATCH] Allow overriding location of keysymdef.h 4Subject: Allow overriding location of keysymdef.h
5 5
6Currently keysymdef.h is found by using the includedir of xproto. This doesn't 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, 7work when cross-compiling with a sysroot as that ends up being /usr/include/X11,
@@ -12,36 +12,31 @@ and verify that the specified or found path exists.
12 12
13(original patch by Martin Jansa <martin.jansa@gmail.com>, revised by myself) 13(original patch by Martin Jansa <martin.jansa@gmail.com>, revised by myself)
14 14
15Upstream-Status: Submitted [xorg-devel] 15Upstream-Status: Backport
16Signed-off-by: Ross Burton <ross.burton@intel.com> 16Signed-off-by: Ross Burton <ross.burton@intel.com>
17Reviewed-by: Dan Nicholson <dbn.lists@gmail.com>
18Reviewed-by: Daniel Stone <daniel@fooishbar.org>
17--- 19---
18 configure.ac | 13 ++++++++++++-
19 1 file changed, 12 insertions(+), 1 deletion(-)
20
21diff --git a/configure.ac b/configure.ac 20diff --git a/configure.ac b/configure.ac
22index 48a0c8a..200db15 100644 21index 48a0c8a..a45f9d9 100644
23--- a/configure.ac 22--- a/configure.ac
24+++ b/configure.ac 23+++ b/configure.ac
25@@ -306,7 +306,18 @@ AC_CHECK_FUNC(poll, [AC_DEFINE(USE_POLL, 1, [poll() function is available])], ) 24@@ -306,7 +306,15 @@ AC_CHECK_FUNC(poll, [AC_DEFINE(USE_POLL, 1, [poll() function is available])], )
26 # Find keysymdef.h 25 # Find keysymdef.h
27 # 26 #
28 AC_MSG_CHECKING([keysym definitions]) 27 AC_MSG_CHECKING([keysym definitions])
29-KEYSYMDEFDIR=`$PKG_CONFIG --variable=includedir xproto`/X11 28-KEYSYMDEFDIR=`$PKG_CONFIG --variable=includedir xproto`/X11
30+AC_ARG_WITH(keysymdefdir, 29+AC_ARG_WITH([keysymdefdir],
31+ AC_HELP_STRING([--with-keysymdefdir=DIR], [The location of keysymdef.h (defaults to xproto include dir)]), 30+ [AC_HELP_STRING([--with-keysymdefdir=DIR], [The location of keysymdef.h (defaults to xproto include dir)])],
32+ KEYSYMDEFDIR=$withval, KEYSYMDEFDIR="") 31+ [KEYSYMDEFDIR=$withval],
33+ 32+ [KEYSYMDEFDIR=`$PKG_CONFIG --variable=includedir xproto`/X11])
34+if test x$KEYSYMDEFDIR = x; then
35+ KEYSYMDEFDIR=`$PKG_CONFIG --variable=includedir xproto`/X11
36+fi
37+ 33+
38+if test ! -d $KEYSYMDEFDIR; then 34+if test ! -d "$KEYSYMDEFDIR"; then
39+ AC_MSG_ERROR([$KEYSYMDEFDIR doesn't exist or isn't a directory]) 35+ AC_MSG_ERROR([$KEYSYMDEFDIR doesn't exist or isn't a directory])
40+fi 36+fi
41+ 37+
42 FILES="keysymdef.h XF86keysym.h Sunkeysym.h DECkeysym.h HPkeysym.h" 38 FILES="keysymdef.h XF86keysym.h Sunkeysym.h DECkeysym.h HPkeysym.h"
43 for i in $FILES; do 39 for i in $FILES; do
44 if test -f "$KEYSYMDEFDIR/$i"; then 40 if test -f "$KEYSYMDEFDIR/$i"; then
45-- 41--
461.7.10.4 42cgit v0.9.0.2-2-gbebe
47