summaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-graphics/xorg-lib
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2011-04-18 10:34:58 +0200
committerMartin Jansa <Martin.Jansa@gmail.com>2011-04-18 12:28:54 +0200
commitcaa015b5995e708756c83ef93797e3eb1f83a18e (patch)
tree8170b1aaf9eba18784dddf28260812a538acb0ef /meta-oe/recipes-graphics/xorg-lib
parentbfb960a7fcf3471ade94001e813377ff19f50ae4 (diff)
downloadmeta-openembedded-caa015b5995e708756c83ef93797e3eb1f83a18e.tar.gz
libx11: drop older version 1.4.1
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-oe/recipes-graphics/xorg-lib')
-rw-r--r--meta-oe/recipes-graphics/xorg-lib/libx11-1.4.1/keysymdef_include.patch19
-rw-r--r--meta-oe/recipes-graphics/xorg-lib/libx11-1.4.1/x11_disable_makekeys.patch29
-rw-r--r--meta-oe/recipes-graphics/xorg-lib/libx11_1.4.1.bb12
3 files changed, 0 insertions, 60 deletions
diff --git a/meta-oe/recipes-graphics/xorg-lib/libx11-1.4.1/keysymdef_include.patch b/meta-oe/recipes-graphics/xorg-lib/libx11-1.4.1/keysymdef_include.patch
deleted file mode 100644
index 1a30e345f..000000000
--- a/meta-oe/recipes-graphics/xorg-lib/libx11-1.4.1/keysymdef_include.patch
+++ /dev/null
@@ -1,19 +0,0 @@
1diff -uNr libX11-1.3.6.orig//configure.ac libX11-1.3.6/configure.ac
2--- libX11-1.3.6.orig//configure.ac 2010-09-20 08:04:16.000000000 +0200
3+++ libX11-1.3.6/configure.ac 2010-09-28 16:29:26.000000000 +0200
4@@ -355,7 +355,14 @@
5 # Find keysymdef.h
6 #
7 AC_MSG_CHECKING([keysym definitions])
8-KEYSYMDEFDIR=`$PKG_CONFIG --variable=includedir xproto`/X11
9+AC_ARG_WITH(keysymdefdir,
10+ AC_HELP_STRING([--with-keysymdefdir=DIR], [The location of keysymdef.h]),
11+ KEYSYMDEFDIR=$withval, KEYSYMDEFDIR="")
12+
13+if test x$KEYSYMDEFDIR = x; then
14+ KEYSYMDEFDIR=`$PKG_CONFIG --variable=includedir xproto`/X11
15+fi
16+
17 FILES="keysymdef.h XF86keysym.h Sunkeysym.h DECkeysym.h HPkeysym.h"
18 for i in $FILES; do
19 if test -f "$KEYSYMDEFDIR/$i"; then
diff --git a/meta-oe/recipes-graphics/xorg-lib/libx11-1.4.1/x11_disable_makekeys.patch b/meta-oe/recipes-graphics/xorg-lib/libx11-1.4.1/x11_disable_makekeys.patch
deleted file mode 100644
index 976331397..000000000
--- a/meta-oe/recipes-graphics/xorg-lib/libx11-1.4.1/x11_disable_makekeys.patch
+++ /dev/null
@@ -1,29 +0,0 @@
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-oe/recipes-graphics/xorg-lib/libx11_1.4.1.bb b/meta-oe/recipes-graphics/xorg-lib/libx11_1.4.1.bb
deleted file mode 100644
index a4423305e..000000000
--- a/meta-oe/recipes-graphics/xorg-lib/libx11_1.4.1.bb
+++ /dev/null
@@ -1,12 +0,0 @@
1require libx11.inc
2
3LICENSE = "MIT & MIT-style & BSD"
4LIC_FILES_CHKSUM = "file://COPYING;md5=172255dee66bb0151435b2d5d709fcf7"
5
6#--without-xcb is not an option anymore
7#http://cgit.freedesktop.org/xorg/lib/libX11/commit/?id=15e5eaf62897b3179d1fbe457cb19f886f0449f8
8DEPENDS_virtclass-native = "libxcb-native ${COMMON_DEPENDS}"
9PR = "${INC_PR}.0"
10
11SRC_URI[md5sum] = "4603bdbce1bd73cbc140de402fe6ed24"
12SRC_URI[sha256sum] = "70f4e0f798645a0f269f362bfdbd4c7934dae3a2dd9ecbad28d6ede414f63ce2"