summaryrefslogtreecommitdiffstats
path: root/meta/packages/xorg-lib
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2009-07-02 14:28:29 +0100
committerRichard Purdie <rpurdie@linux.intel.com>2009-07-02 14:28:29 +0100
commit5377e4fa3a003b7dcfce1b153ee9c1b9ddc2537f (patch)
tree6ce4ecebd391e72a0302100ba1933c3be9438879 /meta/packages/xorg-lib
parent136fecf7af7f98edc2302f0896442cba82342b72 (diff)
downloadpoky-5377e4fa3a003b7dcfce1b153ee9c1b9ddc2537f.tar.gz
libx11 1.1.5 -> 1.2.1
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'meta/packages/xorg-lib')
-rw-r--r--meta/packages/xorg-lib/libx11-diet_1.2.1.bb (renamed from meta/packages/xorg-lib/libx11-diet_1.1.5.bb)0
-rw-r--r--meta/packages/xorg-lib/libx11-native_1.2.1.bb (renamed from meta/packages/xorg-lib/libx11-native_1.1.5.bb)0
-rw-r--r--meta/packages/xorg-lib/libx11-sdk_1.2.1.bb (renamed from meta/packages/xorg-lib/libx11-sdk_1.1.5.bb)0
-rw-r--r--meta/packages/xorg-lib/libx11-trim_1.2.1.bb (renamed from meta/packages/xorg-lib/libx11-trim_1.1.5.bb)5
-rw-r--r--meta/packages/xorg-lib/libx11/nodolt.patch12
-rw-r--r--meta/packages/xorg-lib/libx11/x11_disable_makekeys.patch13
-rw-r--r--meta/packages/xorg-lib/libx11_1.2.1.bb (renamed from meta/packages/xorg-lib/libx11_1.1.5.bb)3
-rw-r--r--meta/packages/xorg-lib/libxi_git.bb2
8 files changed, 24 insertions, 11 deletions
diff --git a/meta/packages/xorg-lib/libx11-diet_1.1.5.bb b/meta/packages/xorg-lib/libx11-diet_1.2.1.bb
index a76aba16e4..a76aba16e4 100644
--- a/meta/packages/xorg-lib/libx11-diet_1.1.5.bb
+++ b/meta/packages/xorg-lib/libx11-diet_1.2.1.bb
diff --git a/meta/packages/xorg-lib/libx11-native_1.1.5.bb b/meta/packages/xorg-lib/libx11-native_1.2.1.bb
index 30f0ff826e..30f0ff826e 100644
--- a/meta/packages/xorg-lib/libx11-native_1.1.5.bb
+++ b/meta/packages/xorg-lib/libx11-native_1.2.1.bb
diff --git a/meta/packages/xorg-lib/libx11-sdk_1.1.5.bb b/meta/packages/xorg-lib/libx11-sdk_1.2.1.bb
index 920f7b7704..920f7b7704 100644
--- a/meta/packages/xorg-lib/libx11-sdk_1.1.5.bb
+++ b/meta/packages/xorg-lib/libx11-sdk_1.2.1.bb
diff --git a/meta/packages/xorg-lib/libx11-trim_1.1.5.bb b/meta/packages/xorg-lib/libx11-trim_1.2.1.bb
index bd605bee30..08c8b163ab 100644
--- a/meta/packages/xorg-lib/libx11-trim_1.1.5.bb
+++ b/meta/packages/xorg-lib/libx11-trim_1.2.1.bb
@@ -1,10 +1,11 @@
1require libx11.inc 1require libx11.inc
2 2
3PR = "r5" 3PR = "r6"
4 4
5DEPENDS += "libxcb xproto xextproto xtrans libxau kbproto inputproto xf86bigfontproto xproto-native" 5DEPENDS += "libxcb xproto xextproto xtrans libxau kbproto inputproto xf86bigfontproto xproto-native"
6 6
7SRC_URI += "file://x11_disable_makekeys.patch;patch=1 \ 7SRC_URI += "file://x11_disable_makekeys.patch;patch=1 \
8 file://include_fix.patch;patch=1" 8 file://include_fix.patch;patch=1 \
9 file://nodolt.patch;patch=1"
9 10
10EXTRA_OECONF += "--disable-xcms --with-xcb" 11EXTRA_OECONF += "--disable-xcms --with-xcb"
diff --git a/meta/packages/xorg-lib/libx11/nodolt.patch b/meta/packages/xorg-lib/libx11/nodolt.patch
new file mode 100644
index 0000000000..ecf9625cad
--- /dev/null
+++ b/meta/packages/xorg-lib/libx11/nodolt.patch
@@ -0,0 +1,12 @@
1Index: libX11-1.2.1/configure.ac
2===================================================================
3--- libX11-1.2.1.orig/configure.ac 2009-07-02 14:07:54.000000000 +0100
4+++ libX11-1.2.1/configure.ac 2009-07-02 14:08:01.000000000 +0100
5@@ -20,7 +20,6 @@
6
7 # Checks for programs.
8 AC_PROG_LIBTOOL
9-DOLT
10 AC_PROG_CC
11 XORG_CWARNFLAGS
12
diff --git a/meta/packages/xorg-lib/libx11/x11_disable_makekeys.patch b/meta/packages/xorg-lib/libx11/x11_disable_makekeys.patch
index 2a8a55cdf5..670578257c 100644
--- a/meta/packages/xorg-lib/libx11/x11_disable_makekeys.patch
+++ b/meta/packages/xorg-lib/libx11/x11_disable_makekeys.patch
@@ -2,22 +2,21 @@
2 src/util/Makefile.am | 17 ----------------- 2 src/util/Makefile.am | 17 -----------------
3 1 file changed, 17 deletions(-) 3 1 file changed, 17 deletions(-)
4 4
5Index: libX11-1.1.2/src/util/Makefile.am 5Index: libX11-1.2.1/src/util/Makefile.am
6=================================================================== 6===================================================================
7--- libX11-1.1.2.orig/src/util/Makefile.am 2007-08-22 14:17:42.000000000 +0100 7--- libX11-1.2.1.orig/src/util/Makefile.am 2008-10-07 18:18:19.000000000 +0100
8+++ libX11-1.1.2/src/util/Makefile.am 2007-08-22 14:18:04.000000000 +0100 8+++ libX11-1.2.1/src/util/Makefile.am 2009-07-02 14:04:38.000000000 +0100
9@@ -1,21 +1,4 @@ 9@@ -1,20 +1,3 @@
10 # $XdotOrg: lib/X11/src/util/Makefile.am,v 1.4 2006-02-19 02:14:12 jamey Exp $ 10 # $XdotOrg: lib/X11/src/util/Makefile.am,v 1.4 2006-02-19 02:14:12 jamey Exp $
11 11
12-noinst_PROGRAMS=makekeys 12-noinst_PROGRAMS=makekeys
13- 13-
14-makekeys_CFLAGS=$(X11_CFLAGS) 14-makekeys_CFLAGS=$(X11_CFLAGS)
15- 15-
16-#override CC = gcc 16-CC = @CC_FOR_BUILD@
17-LINK = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
18- 17-
19 EXTRA_DIST = mkks.sh 18 EXTRA_DIST = mkks.sh
20 19-
21-if LINT 20-if LINT
22-# Check source code with tools like lint & sparse 21-# Check source code with tools like lint & sparse
23- 22-
diff --git a/meta/packages/xorg-lib/libx11_1.1.5.bb b/meta/packages/xorg-lib/libx11_1.2.1.bb
index 81d3f91fa6..9c858fc1a5 100644
--- a/meta/packages/xorg-lib/libx11_1.1.5.bb
+++ b/meta/packages/xorg-lib/libx11_1.2.1.bb
@@ -1,9 +1,10 @@
1require libx11.inc 1require libx11.inc
2 2
3PE = "1" 3PE = "1"
4PR = "r0" 4PR = "r1"
5 5
6SRC_URI += "file://x11_disable_makekeys.patch;patch=1 \ 6SRC_URI += "file://x11_disable_makekeys.patch;patch=1 \
7 file://nodolt.patch;patch=1 \
7 file://include_fix.patch;patch=1" 8 file://include_fix.patch;patch=1"
8 9
9DEPENDS += "bigreqsproto xproto xextproto xtrans libxau xcmiscproto \ 10DEPENDS += "bigreqsproto xproto xextproto xtrans libxau xcmiscproto \
diff --git a/meta/packages/xorg-lib/libxi_git.bb b/meta/packages/xorg-lib/libxi_git.bb
index efa3d93f9e..13e51f4378 100644
--- a/meta/packages/xorg-lib/libxi_git.bb
+++ b/meta/packages/xorg-lib/libxi_git.bb
@@ -3,7 +3,7 @@ require xorg-lib-common.inc
3DESCRIPTION = "X11 Input extension library" 3DESCRIPTION = "X11 Input extension library"
4DEPENDS += "libxext inputproto" 4DEPENDS += "libxext inputproto"
5PE = "1" 5PE = "1"
6PV = "1.9.99.5+gitr${SRCREV}" 6PV = "1.9.99.5+gitr${SRCPV}"
7 7
8XORG_PN = "libXi" 8XORG_PN = "libXi"
9 9