summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2011-10-03 09:52:37 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-10-11 18:08:37 +0100
commit2ee903a73804f16e844c98285962123413bc457b (patch)
treed2a12ae74c2551ba74a15d7cf128543bd5678ea3
parentdc64df6c176c7e56095c4d09a2d00b8a4d976a7c (diff)
downloadpoky-2ee903a73804f16e844c98285962123413bc457b.tar.gz
libx11-trim: move files for libx11-trim from libx11-1.3.4 to libx11-trim-1.3.4
* because there isn't libx11-1.3.4 recipe anymore * remove older versions from libx11-trim directory * notice that DESCRIPTION says xcb is disabled and EXTRA_OECONF has --with-xcb (From OE-Core rev: ccebeb736c785cc6ade075798a1d5c27f106d780) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-graphics/xorg-lib/libx11-diet-1.3/X18NCMSstubs.diff (renamed from meta/recipes-graphics/xorg-lib/libx11/X18NCMSstubs.diff)0
-rw-r--r--meta/recipes-graphics/xorg-lib/libx11-diet-1.3/fix-disable-xlocale.diff (renamed from meta/recipes-graphics/xorg-lib/libx11/fix-disable-xlocale.diff)0
-rw-r--r--meta/recipes-graphics/xorg-lib/libx11-diet-1.3/fix-utf8-wrong-define.patch (renamed from meta/recipes-graphics/xorg-lib/libx11/fix-utf8-wrong-define.patch)0
-rw-r--r--meta/recipes-graphics/xorg-lib/libx11-trim-1.3.4/include_fix.patch (renamed from meta/recipes-graphics/xorg-lib/libx11-1.3.4/include_fix.patch)0
-rw-r--r--meta/recipes-graphics/xorg-lib/libx11-trim-1.3.4/makekeys_crosscompile.patch (renamed from meta/recipes-graphics/xorg-lib/libx11-1.3.4/makekeys_crosscompile.patch)0
-rw-r--r--meta/recipes-graphics/xorg-lib/libx11-trim-1.3.4/nodolt.patch (renamed from meta/recipes-graphics/xorg-lib/libx11-1.3.4/nodolt.patch)0
-rw-r--r--meta/recipes-graphics/xorg-lib/libx11-trim-1.3.4/x11_disable_makekeys.patch (renamed from meta/recipes-graphics/xorg-lib/libx11-1.3.4/x11_disable_makekeys.patch)0
-rw-r--r--meta/recipes-graphics/xorg-lib/libx11-trim/include_fix.patch25
-rw-r--r--meta/recipes-graphics/xorg-lib/libx11-trim/nodolt.patch14
-rw-r--r--meta/recipes-graphics/xorg-lib/libx11-trim/x11_disable_makekeys.patch31
-rw-r--r--meta/recipes-graphics/xorg-lib/libx11-trim_1.3.4.bb8
11 files changed, 4 insertions, 74 deletions
diff --git a/meta/recipes-graphics/xorg-lib/libx11/X18NCMSstubs.diff b/meta/recipes-graphics/xorg-lib/libx11-diet-1.3/X18NCMSstubs.diff
index 91ab180816..91ab180816 100644
--- a/meta/recipes-graphics/xorg-lib/libx11/X18NCMSstubs.diff
+++ b/meta/recipes-graphics/xorg-lib/libx11-diet-1.3/X18NCMSstubs.diff
diff --git a/meta/recipes-graphics/xorg-lib/libx11/fix-disable-xlocale.diff b/meta/recipes-graphics/xorg-lib/libx11-diet-1.3/fix-disable-xlocale.diff
index 7dcdd6af22..7dcdd6af22 100644
--- a/meta/recipes-graphics/xorg-lib/libx11/fix-disable-xlocale.diff
+++ b/meta/recipes-graphics/xorg-lib/libx11-diet-1.3/fix-disable-xlocale.diff
diff --git a/meta/recipes-graphics/xorg-lib/libx11/fix-utf8-wrong-define.patch b/meta/recipes-graphics/xorg-lib/libx11-diet-1.3/fix-utf8-wrong-define.patch
index 26d3349bed..26d3349bed 100644
--- a/meta/recipes-graphics/xorg-lib/libx11/fix-utf8-wrong-define.patch
+++ b/meta/recipes-graphics/xorg-lib/libx11-diet-1.3/fix-utf8-wrong-define.patch
diff --git a/meta/recipes-graphics/xorg-lib/libx11-1.3.4/include_fix.patch b/meta/recipes-graphics/xorg-lib/libx11-trim-1.3.4/include_fix.patch
index eeb4175b4f..eeb4175b4f 100644
--- a/meta/recipes-graphics/xorg-lib/libx11-1.3.4/include_fix.patch
+++ b/meta/recipes-graphics/xorg-lib/libx11-trim-1.3.4/include_fix.patch
diff --git a/meta/recipes-graphics/xorg-lib/libx11-1.3.4/makekeys_crosscompile.patch b/meta/recipes-graphics/xorg-lib/libx11-trim-1.3.4/makekeys_crosscompile.patch
index e5eacf0515..e5eacf0515 100644
--- a/meta/recipes-graphics/xorg-lib/libx11-1.3.4/makekeys_crosscompile.patch
+++ b/meta/recipes-graphics/xorg-lib/libx11-trim-1.3.4/makekeys_crosscompile.patch
diff --git a/meta/recipes-graphics/xorg-lib/libx11-1.3.4/nodolt.patch b/meta/recipes-graphics/xorg-lib/libx11-trim-1.3.4/nodolt.patch
index bf6c7d59c2..bf6c7d59c2 100644
--- a/meta/recipes-graphics/xorg-lib/libx11-1.3.4/nodolt.patch
+++ b/meta/recipes-graphics/xorg-lib/libx11-trim-1.3.4/nodolt.patch
diff --git a/meta/recipes-graphics/xorg-lib/libx11-1.3.4/x11_disable_makekeys.patch b/meta/recipes-graphics/xorg-lib/libx11-trim-1.3.4/x11_disable_makekeys.patch
index 561b57762a..561b57762a 100644
--- a/meta/recipes-graphics/xorg-lib/libx11-1.3.4/x11_disable_makekeys.patch
+++ b/meta/recipes-graphics/xorg-lib/libx11-trim-1.3.4/x11_disable_makekeys.patch
diff --git a/meta/recipes-graphics/xorg-lib/libx11-trim/include_fix.patch b/meta/recipes-graphics/xorg-lib/libx11-trim/include_fix.patch
deleted file mode 100644
index b3bcbabfeb..0000000000
--- a/meta/recipes-graphics/xorg-lib/libx11-trim/include_fix.patch
+++ /dev/null
@@ -1,25 +0,0 @@
1Upstream-Status: Inappropriate [configuration]
2
3---
4 configure.ac | 6 +++---
5 1 file changed, 3 insertions(+), 3 deletions(-)
6
7--- libX11-1.1.5.orig/configure.ac
8+++ libX11-1.1.5/configure.ac
9@@ -218,13 +218,13 @@ AC_SUBST(XDMCP_LIBS)
10 AC_CHECK_FUNC(poll, [AC_DEFINE(USE_POLL, 1, [poll() function is available])], )
11
12 #
13 # Find keysymdef.h
14 #
15-AC_MSG_CHECKING([keysymdef.h])
16-dir=`pkg-config --variable=includedir xproto`
17-KEYSYMDEF="$dir/X11/keysymdef.h"
18+AC_ARG_WITH(keysymdef,
19+ AC_HELP_STRING([--with-keysymdef=DIR/keysymdef.h], [The location of keysymdef.h]),
20+ KEYSYMDEF=$withval, KEYSYMDEF="")
21 if test -f "$KEYSYMDEF"; then
22 AC_MSG_RESULT([$KEYSYMDEF])
23 else
24 AC_MSG_ERROR([Cannot find keysymdef.h])
25 fi
diff --git a/meta/recipes-graphics/xorg-lib/libx11-trim/nodolt.patch b/meta/recipes-graphics/xorg-lib/libx11-trim/nodolt.patch
deleted file mode 100644
index cc05fdca7e..0000000000
--- a/meta/recipes-graphics/xorg-lib/libx11-trim/nodolt.patch
+++ /dev/null
@@ -1,14 +0,0 @@
1Upstream-Status: Inappropriate [configuration]
2
3Index: libX11-1.2.1/configure.ac
4===================================================================
5--- libX11-1.2.1.orig/configure.ac 2009-07-02 14:07:54.000000000 +0100
6+++ libX11-1.2.1/configure.ac 2009-07-02 14:08:01.000000000 +0100
7@@ -20,7 +20,6 @@
8
9 # Checks for programs.
10 AC_PROG_LIBTOOL
11-DOLT
12 AC_PROG_CC
13 XORG_CWARNFLAGS
14
diff --git a/meta/recipes-graphics/xorg-lib/libx11-trim/x11_disable_makekeys.patch b/meta/recipes-graphics/xorg-lib/libx11-trim/x11_disable_makekeys.patch
deleted file mode 100644
index 04458359e4..0000000000
--- a/meta/recipes-graphics/xorg-lib/libx11-trim/x11_disable_makekeys.patch
+++ /dev/null
@@ -1,31 +0,0 @@
1Upstream-Status: Inappropriate [configuration]
2
3---
4 src/util/Makefile.am | 17 -----------------
5 1 file changed, 17 deletions(-)
6
7Index: libX11-1.2.1/src/util/Makefile.am
8===================================================================
9--- libX11-1.2.1.orig/src/util/Makefile.am 2008-10-07 18:18:19.000000000 +0100
10+++ libX11-1.2.1/src/util/Makefile.am 2009-07-02 14:04:38.000000000 +0100
11@@ -1,20 +1,3 @@
12 # $XdotOrg: lib/X11/src/util/Makefile.am,v 1.4 2006-02-19 02:14:12 jamey Exp $
13
14-noinst_PROGRAMS=makekeys
15-
16-makekeys_CFLAGS=$(X11_CFLAGS)
17-
18-CC = @CC_FOR_BUILD@
19-
20 EXTRA_DIST = mkks.sh
21-
22-if LINT
23-# Check source code with tools like lint & sparse
24-
25-ALL_LINT_FLAGS=$(LINT_FLAGS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
26- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS)
27-
28-lint:
29- $(LINT) $(ALL_LINT_FLAGS) makekeys.c
30-
31-endif LINT
diff --git a/meta/recipes-graphics/xorg-lib/libx11-trim_1.3.4.bb b/meta/recipes-graphics/xorg-lib/libx11-trim_1.3.4.bb
index 3c33de98c2..3a8f2c46c8 100644
--- a/meta/recipes-graphics/xorg-lib/libx11-trim_1.3.4.bb
+++ b/meta/recipes-graphics/xorg-lib/libx11-trim_1.3.4.bb
@@ -9,10 +9,10 @@ PR = "r2"
9 9
10DEPENDS += "libxcb xproto xextproto xtrans libxau kbproto inputproto xf86bigfontproto xproto-native" 10DEPENDS += "libxcb xproto xextproto xtrans libxau kbproto inputproto xf86bigfontproto xproto-native"
11 11
12SRC_URI += "file://../libx11-${PV}/x11_disable_makekeys.patch \ 12SRC_URI += "file://x11_disable_makekeys.patch \
13 file://../libx11-${PV}/include_fix.patch \ 13 file://include_fix.patch \
14 file://../libx11-${PV}/nodolt.patch \ 14 file://nodolt.patch \
15 file://../libx11-${PV}/makekeys_crosscompile.patch" 15 file://makekeys_crosscompile.patch"
16 16
17SRC_URI[md5sum] = "f65c9c7ecbfb64c19dbd7927160d63fd" 17SRC_URI[md5sum] = "f65c9c7ecbfb64c19dbd7927160d63fd"
18SRC_URI[sha256sum] = "88d7238ce5f7cd123450567de7a3b56a43556e4ccc45df38b8324147c889a844" 18SRC_URI[sha256sum] = "88d7238ce5f7cd123450567de7a3b56a43556e4ccc45df38b8324147c889a844"