summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKai Kang <kai.kang@windriver.com>2013-08-21 16:09:45 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-08-22 18:30:05 +0100
commit0bc5f7c8f6e43d0c9b3cedebc911ab63dec236c1 (patch)
treeb8f0ac2ef76527abe28071021b992e436be45779
parentf0a690dd9daf8098306a9776975b537e28e07dfa (diff)
downloadpoky-0bc5f7c8f6e43d0c9b3cedebc911ab63dec236c1.tar.gz
libx11-diet: upgrade to 1.6.1
Deleted keysymdef_include patch as it's been merged upstream (From OE-Core rev: 02c78a1cc849c931f802693e654a72dac71ffb85) Signed-off-by: Kai Kang <kai.kang@windriver.com> [sgw - Removed PR and tweaked commit message] Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-graphics/xorg-lib/libx11-diet_1.6.1.bb (renamed from meta/recipes-graphics/xorg-lib/libx11-diet_1.5.0.bb)7
-rw-r--r--meta/recipes-graphics/xorg-lib/libx11/keysymdef_include.patch42
2 files changed, 2 insertions, 47 deletions
diff --git a/meta/recipes-graphics/xorg-lib/libx11-diet_1.5.0.bb b/meta/recipes-graphics/xorg-lib/libx11-diet_1.6.1.bb
index 0b50f094a3..3c3b8e7dce 100644
--- a/meta/recipes-graphics/xorg-lib/libx11-diet_1.5.0.bb
+++ b/meta/recipes-graphics/xorg-lib/libx11-diet_1.6.1.bb
@@ -3,10 +3,7 @@ require libx11.inc
3DESCRIPTION += " Support for XCMS and XLOCALE is disabled in \ 3DESCRIPTION += " Support for XCMS and XLOCALE is disabled in \
4this version." 4this version."
5 5
6PR = "${INC_PR}.4"
7
8SRC_URI += "file://X18NCMSstubs.diff \ 6SRC_URI += "file://X18NCMSstubs.diff \
9 file://keysymdef_include.patch \
10 file://fix-disable-xlocale.diff \ 7 file://fix-disable-xlocale.diff \
11 file://fix-utf8-wrong-define.patch \ 8 file://fix-utf8-wrong-define.patch \
12 " 9 "
@@ -14,8 +11,8 @@ SRC_URI += "file://X18NCMSstubs.diff \
14RPROVIDES_${PN}-dev = "libx11-dev" 11RPROVIDES_${PN}-dev = "libx11-dev"
15RPROVIDES_${PN}-locale = "libx11-locale" 12RPROVIDES_${PN}-locale = "libx11-locale"
16 13
17SRC_URI[md5sum] = "78b4b3bab4acbdf0abcfca30a8c70cc6" 14SRC_URI[md5sum] = "bc5fc459ec25a50c5a7e27035b89e579"
18SRC_URI[sha256sum] = "c382efd7e92bfc3cef39a4b7f1ecf2744ba4414a705e3bc1e697f75502bd4d86" 15SRC_URI[sha256sum] = "10a54fc16b58b4f5a5eed4d080c357a82fd2f42d09af625c1f5df50650701892"
19 16
20EXTRA_OECONF += "--disable-xlocale" 17EXTRA_OECONF += "--disable-xlocale"
21 18
diff --git a/meta/recipes-graphics/xorg-lib/libx11/keysymdef_include.patch b/meta/recipes-graphics/xorg-lib/libx11/keysymdef_include.patch
deleted file mode 100644
index 8c50bb7262..0000000000
--- a/meta/recipes-graphics/xorg-lib/libx11/keysymdef_include.patch
+++ /dev/null
@@ -1,42 +0,0 @@
1From d45b3fc19fbe95c41afc4e51d768df6d42332010 Mon Sep 17 00:00:00 2001
2From: Ross Burton <ross.burton@intel.com>
3Date: Wed, 12 Sep 2012 13:39:40 +0000
4Subject: Allow overriding location of keysymdef.h
5
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.
9
10So, add an option to allow explicitly specifying the location of keysymdef.h,
11and verify that the specified or found path exists.
12
13(original patch by Martin Jansa <martin.jansa@gmail.com>, revised by myself)
14
15Upstream-Status: Backport
16Signed-off-by: Ross Burton <ross.burton@intel.com>
17Reviewed-by: Dan Nicholson <dbn.lists@gmail.com>
18Reviewed-by: Daniel Stone <daniel@fooishbar.org>
19---
20diff --git a/configure.ac b/configure.ac
21index 48a0c8a..a45f9d9 100644
22--- a/configure.ac
23+++ b/configure.ac
24@@ -306,7 +306,15 @@ AC_CHECK_FUNC(poll, [AC_DEFINE(USE_POLL, 1, [poll() function is available])], )
25 # Find keysymdef.h
26 #
27 AC_MSG_CHECKING([keysym definitions])
28-KEYSYMDEFDIR=`$PKG_CONFIG --variable=includedir xproto`/X11
29+AC_ARG_WITH([keysymdefdir],
30+ [AC_HELP_STRING([--with-keysymdefdir=DIR], [The location of keysymdef.h (defaults to xproto include dir)])],
31+ [KEYSYMDEFDIR=$withval],
32+ [KEYSYMDEFDIR=`$PKG_CONFIG --variable=includedir xproto`/X11])
33+
34+if test ! -d "$KEYSYMDEFDIR"; then
35+ AC_MSG_ERROR([$KEYSYMDEFDIR doesn't exist or isn't a directory])
36+fi
37+
38 FILES="keysymdef.h XF86keysym.h Sunkeysym.h DECkeysym.h HPkeysym.h"
39 for i in $FILES; do
40 if test -f "$KEYSYMDEFDIR/$i"; then
41--
42cgit v0.9.0.2-2-gbebe