summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2011-09-07 23:27:26 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-10-11 18:08:36 +0100
commitd2aea41ec27d731773bc3f7eb156b596358438f4 (patch)
tree52601a8d869f7668225ba8ba4fca995bf2565d5f /meta
parentaf0a9577604de374035c06c344771a874a2b7496 (diff)
downloadpoky-d2aea41ec27d731773bc3f7eb156b596358438f4.tar.gz
libx11: add new version 1.4.4
(From OE-Core rev: c3ae134362382fd0db6ee34613b0c258076ef9b6) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-graphics/xorg-lib/libx11-1.4.4/keysymdef_include.patch23
-rw-r--r--meta/recipes-graphics/xorg-lib/libx11-1.4.4/x11_disable_makekeys.patch29
-rw-r--r--meta/recipes-graphics/xorg-lib/libx11_1.4.4.bb18
3 files changed, 70 insertions, 0 deletions
diff --git a/meta/recipes-graphics/xorg-lib/libx11-1.4.4/keysymdef_include.patch b/meta/recipes-graphics/xorg-lib/libx11-1.4.4/keysymdef_include.patch
new file mode 100644
index 0000000000..d1bdab9778
--- /dev/null
+++ b/meta/recipes-graphics/xorg-lib/libx11-1.4.4/keysymdef_include.patch
@@ -0,0 +1,23 @@
1Upstream-Status: Inappropriate [configuration]
2
3Signed-off-by: Martin Jansa <martin.jansa@gmail.com>
4
5diff -uNr libX11-1.3.6.orig//configure.ac libX11-1.3.6/configure.ac
6--- libX11-1.3.6.orig//configure.ac 2010-09-20 08:04:16.000000000 +0200
7+++ libX11-1.3.6/configure.ac 2010-09-28 16:29:26.000000000 +0200
8@@ -355,7 +355,14 @@
9 # Find keysymdef.h
10 #
11 AC_MSG_CHECKING([keysym definitions])
12-KEYSYMDEFDIR=`$PKG_CONFIG --variable=includedir xproto`/X11
13+AC_ARG_WITH(keysymdefdir,
14+ AC_HELP_STRING([--with-keysymdefdir=DIR], [The location of keysymdef.h]),
15+ KEYSYMDEFDIR=$withval, KEYSYMDEFDIR="")
16+
17+if test x$KEYSYMDEFDIR = x; then
18+ KEYSYMDEFDIR=`$PKG_CONFIG --variable=includedir xproto`/X11
19+fi
20+
21 FILES="keysymdef.h XF86keysym.h Sunkeysym.h DECkeysym.h HPkeysym.h"
22 for i in $FILES; do
23 if test -f "$KEYSYMDEFDIR/$i"; then
diff --git a/meta/recipes-graphics/xorg-lib/libx11-1.4.4/x11_disable_makekeys.patch b/meta/recipes-graphics/xorg-lib/libx11-1.4.4/x11_disable_makekeys.patch
new file mode 100644
index 0000000000..9763313975
--- /dev/null
+++ b/meta/recipes-graphics/xorg-lib/libx11-1.4.4/x11_disable_makekeys.patch
@@ -0,0 +1,29 @@
1Index: libX11-1.3.4/src/util/Makefile.am
2===================================================================
3--- libX11-1.3.4.orig/src/util/Makefile.am
4+++ libX11-1.3.4/src/util/Makefile.am
5@@ -1,24 +1 @@
6-
7-noinst_PROGRAMS=makekeys
8-
9-makekeys_CFLAGS = \
10- $(X11_CFLAGS) \
11- $(CWARNFLAGS)
12-
13-CC = @CC_FOR_BUILD@
14-CPPFLAGS = @CPPFLAGS_FOR_BUILD@
15-CFLAGS = @CFLAGS_FOR_BUILD@
16-LDFLAGS = @LDFLAGS_FOR_BUILD@
17-
18 EXTRA_DIST = mkks.sh
19-
20-if LINT
21-# Check source code with tools like lint & sparse
22-
23-ALL_LINT_FLAGS=$(LINT_FLAGS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
24- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS)
25-
26-lint:
27- $(LINT) $(ALL_LINT_FLAGS) makekeys.c
28-
29-endif LINT
diff --git a/meta/recipes-graphics/xorg-lib/libx11_1.4.4.bb b/meta/recipes-graphics/xorg-lib/libx11_1.4.4.bb
new file mode 100644
index 0000000000..823b3dcbea
--- /dev/null
+++ b/meta/recipes-graphics/xorg-lib/libx11_1.4.4.bb
@@ -0,0 +1,18 @@
1require libx11.inc
2inherit gettext
3
4BBCLASSEXTEND = "native nativesdk"
5
6EXTRA_OECONF += "--with-keysymdefdir=${STAGING_INCDIR}/X11"
7
8DEPENDS += "util-macros xtrans libxdmcp libxau \
9 bigreqsproto xproto xextproto xcmiscproto \
10 xf86bigfontproto kbproto inputproto libxcb \
11 xproto-native"
12
13SRC_URI += " file://keysymdef_include.patch \
14 file://x11_disable_makekeys.patch \
15 "
16
17SRC_URI[md5sum] = "ed7c382cbf8c13425b6a66bcac0ca5d9"
18SRC_URI[sha256sum] = "7fe62180f08ef5f0a0062fb444591e349cae2ab5af6ad834599f5c654e6c840d"