summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorDexuan Cui <dexuan.cui@intel.com>2010-07-09 13:32:10 +0800
committerRichard Purdie <rpurdie@linux.intel.com>2010-07-13 15:21:43 +0100
commitfb02061ecea0bf6cc6c4a309627a16d759a9c83e (patch)
tree8d7670a5aeb5a7f18f2b7f7ae673246b67bc6ea6 /meta
parent40421c1024497cb8729fbfb494c5852ee0dc6992 (diff)
downloadpoky-fb02061ecea0bf6cc6c4a309627a16d759a9c83e.tar.gz
libx11: upgrade to the latest version 1.3.4
Rebased the 3 patches x11_disable_makekeys.patch, nodolt.patch and include_fix.patch; since the patches are also used by other recipes of lower versions, I created a new directory libx11-1.3.4/ to hold the rebased patches (the original patches are still kept unchanged); Updated LICENSE and LIC_FILES_CHKSUM, and reset PR to "r0"; Removed "patch=1" in SRC_URI as by default a patch is applied; Updated preferred-xorg-versions.inc. Signed-off-by: Dexuan Cui <dexuan.cui@intel.com>
Diffstat (limited to 'meta')
-rw-r--r--meta/conf/distro/include/preferred-xorg-versions.inc6
-rw-r--r--meta/packages/xorg-lib/libx11-1.3.4/include_fix.patch19
-rw-r--r--meta/packages/xorg-lib/libx11-1.3.4/nodolt.patch10
-rw-r--r--meta/packages/xorg-lib/libx11-1.3.4/x11_disable_makekeys.patch31
-rw-r--r--meta/packages/xorg-lib/libx11.inc3
-rw-r--r--meta/packages/xorg-lib/libx11_1.3.4.bb (renamed from meta/packages/xorg-lib/libx11_1.3.bb)11
6 files changed, 72 insertions, 8 deletions
diff --git a/meta/conf/distro/include/preferred-xorg-versions.inc b/meta/conf/distro/include/preferred-xorg-versions.inc
index 1085c6309b..060c8b7ecb 100644
--- a/meta/conf/distro/include/preferred-xorg-versions.inc
+++ b/meta/conf/distro/include/preferred-xorg-versions.inc
@@ -34,10 +34,10 @@ PREFERRED_VERSION_liblbxutil ?= "1.1.0"
34PREFERRED_VERSION_liboldx ?= "1.0.1" 34PREFERRED_VERSION_liboldx ?= "1.0.1"
35PREFERRED_VERSION_libsm ?= "1.1.1" 35PREFERRED_VERSION_libsm ?= "1.1.1"
36PREFERRED_VERSION_libwindowswm ?= "1.0.0" 36PREFERRED_VERSION_libwindowswm ?= "1.0.0"
37PREFERRED_VERSION_libx11 ?= "1.3" 37PREFERRED_VERSION_libx11 ?= "1.3.4"
38PREFERRED_VERSION_libx11-diet ?= "1.3" 38PREFERRED_VERSION_libx11-diet ?= "1.3"
39PREFERRED_VERSION_libx11-native ?= "1.3" 39PREFERRED_VERSION_libx11-native ?= "1.3.4"
40PREFERRED_VERSION_libx11-nativesdk ?= "1.3" 40PREFERRED_VERSION_libx11-nativesdk ?= "1.3.4"
41PREFERRED_VERSION_libx11-trim ?= "1.3" 41PREFERRED_VERSION_libx11-trim ?= "1.3"
42PREFERRED_VERSION_libxau ?= "1.0.5" 42PREFERRED_VERSION_libxau ?= "1.0.5"
43PREFERRED_VERSION_libxau-native ?= "1.0.5" 43PREFERRED_VERSION_libxau-native ?= "1.0.5"
diff --git a/meta/packages/xorg-lib/libx11-1.3.4/include_fix.patch b/meta/packages/xorg-lib/libx11-1.3.4/include_fix.patch
new file mode 100644
index 0000000000..c8aa08595d
--- /dev/null
+++ b/meta/packages/xorg-lib/libx11-1.3.4/include_fix.patch
@@ -0,0 +1,19 @@
1---
2 configure.ac | 6 +++---
3 1 file changed, 3 insertions(+), 3 deletions(-)
4
5--- libX11-1.3.4.orig/configure.ac
6+++ libX11-1.3.4/configure.ac
7@@ -353,9 +353,9 @@
8 #
9 # Find keysymdef.h
10 #
11-AC_MSG_CHECKING([keysymdef.h])
12-dir=`$PKG_CONFIG --variable=includedir xproto`
13-KEYSYMDEF="$dir/X11/keysymdef.h"
14+AC_ARG_WITH(keysymdef,
15+ AC_HELP_STRING([--with-keysymdef=DIR/keysymdef.h], [The location of keysymdef.h]),
16+ KEYSYMDEF=$withval, KEYSYMDEF="")
17 if test -f "$KEYSYMDEF"; then
18 AC_MSG_RESULT([$KEYSYMDEF])
19 else
diff --git a/meta/packages/xorg-lib/libx11-1.3.4/nodolt.patch b/meta/packages/xorg-lib/libx11-1.3.4/nodolt.patch
new file mode 100644
index 0000000000..011c23e8d8
--- /dev/null
+++ b/meta/packages/xorg-lib/libx11-1.3.4/nodolt.patch
@@ -0,0 +1,10 @@
1--- libX11-1.3.4.orig/configure.ac
2+++ libX11-1.3.4/configure.ac
3@@ -32,7 +32,6 @@
4
5 # Checks for programs.
6 AC_PROG_LIBTOOL
7-DOLT
8 AC_PROG_CC
9 PKG_PROG_PKG_CONFIG
10
diff --git a/meta/packages/xorg-lib/libx11-1.3.4/x11_disable_makekeys.patch b/meta/packages/xorg-lib/libx11-1.3.4/x11_disable_makekeys.patch
new file mode 100644
index 0000000000..4036757e54
--- /dev/null
+++ b/meta/packages/xorg-lib/libx11-1.3.4/x11_disable_makekeys.patch
@@ -0,0 +1,31 @@
1---
2 src/util/Makefile.am | 21 -----------------
3 1 file changed, 21 deletions(-)
4
5--- libX11-1.3.4.orig/src/util/Makefile.am
6+++ libX11-1.3.4/src/util/Makefile.am
7@@ -1,24 +1,3 @@
8
9-noinst_PROGRAMS=makekeys
10-
11-makekeys_CFLAGS = \
12- $(X11_CFLAGS) \
13- $(CWARNFLAGS)
14-
15-CC = @CC_FOR_BUILD@
16-CPPFLAGS = @CPPFLAGS_FOR_BUILD@
17-CFLAGS = @CFLAGS_FOR_BUILD@
18-LDFLAGS = @LDFLAGS_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/packages/xorg-lib/libx11.inc b/meta/packages/xorg-lib/libx11.inc
index 3c8d4f9592..f8c17b1a6d 100644
--- a/meta/packages/xorg-lib/libx11.inc
+++ b/meta/packages/xorg-lib/libx11.inc
@@ -1,6 +1,7 @@
1DESCRIPTION = "X11 protocol and utility library"
2
1require xorg-lib-common.inc 3require xorg-lib-common.inc
2 4
3DESCRIPTION = "X11 protocol and utility library"
4PROVIDES = "virtual/libx11" 5PROVIDES = "virtual/libx11"
5 6
6XORG_PN = "libX11" 7XORG_PN = "libX11"
diff --git a/meta/packages/xorg-lib/libx11_1.3.bb b/meta/packages/xorg-lib/libx11_1.3.4.bb
index ff62d90464..aaeb38e2d6 100644
--- a/meta/packages/xorg-lib/libx11_1.3.bb
+++ b/meta/packages/xorg-lib/libx11_1.3.4.bb
@@ -1,11 +1,14 @@
1require libx11.inc 1require libx11.inc
2 2
3LICENSE = "MIT & MIT-style & BSD"
4LIC_FILES_CHKSUM = "file://COPYING;md5=bf75bfe4d05068311b5e6862d4b5f2c5"
5
3PE = "1" 6PE = "1"
4PR = "r2" 7PR = "r0"
5 8
6SRC_URI += "file://x11_disable_makekeys.patch;patch=1 \ 9SRC_URI += "file://x11_disable_makekeys.patch \
7 file://nodolt.patch;patch=1 \ 10 file://nodolt.patch \
8 file://include_fix.patch;patch=1" 11 file://include_fix.patch"
9 12
10DEPENDS += "bigreqsproto xproto xextproto xtrans libxau xcmiscproto \ 13DEPENDS += "bigreqsproto xproto xextproto xtrans libxau xcmiscproto \
11 libxdmcp xf86bigfontproto kbproto inputproto xproto-native gettext" 14 libxdmcp xf86bigfontproto kbproto inputproto xproto-native gettext"