libx11 1.1.5 -> 1.2.1

Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>

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 @@
 require libx11.inc
 
-PR = "r5"
+PR = "r6"
 
 DEPENDS += "libxcb xproto xextproto xtrans libxau kbproto inputproto xf86bigfontproto xproto-native"
 
 SRC_URI += "file://x11_disable_makekeys.patch;patch=1 \
-            file://include_fix.patch;patch=1"
+            file://include_fix.patch;patch=1 \
+            file://nodolt.patch;patch=1"
 
 EXTRA_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 @@
+Index: libX11-1.2.1/configure.ac
+===================================================================
+--- libX11-1.2.1.orig/configure.ac      2009-07-02 14:07:54.000000000 +0100
++++ libX11-1.2.1/configure.ac   2009-07-02 14:08:01.000000000 +0100
+@@ -20,7 +20,6 @@
+ 
+ # Checks for programs.
+ AC_PROG_LIBTOOL
+-DOLT
+ AC_PROG_CC
+ XORG_CWARNFLAGS
+ 
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 @@
  src/util/Makefile.am |   17 -----------------
  1 file changed, 17 deletions(-)
 
-Index: libX11-1.1.2/src/util/Makefile.am
+Index: libX11-1.2.1/src/util/Makefile.am
 ===================================================================
---- libX11-1.1.2.orig/src/util/Makefile.am      2007-08-22 14:17:42.000000000 +0100
-+++ libX11-1.1.2/src/util/Makefile.am   2007-08-22 14:18:04.000000000 +0100
-@@ -1,21 +1,4 @@
+--- libX11-1.2.1.orig/src/util/Makefile.am      2008-10-07 18:18:19.000000000 +0100
++++ libX11-1.2.1/src/util/Makefile.am   2009-07-02 14:04:38.000000000 +0100
+@@ -1,20 +1,3 @@
  # $XdotOrg: lib/X11/src/util/Makefile.am,v 1.4 2006-02-19 02:14:12 jamey Exp $
  
 -noinst_PROGRAMS=makekeys
 -
 -makekeys_CFLAGS=$(X11_CFLAGS)
 -
--#override CC = gcc
--LINK = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-CC = @CC_FOR_BUILD@
 -
  EXTRA_DIST = mkks.sh
- 
+-
 -if LINT
 -# Check source code with tools like lint & sparse
 -
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 @@
 require libx11.inc
 
 PE = "1"
-PR = "r0"
+PR = "r1"
 
 SRC_URI += "file://x11_disable_makekeys.patch;patch=1 \
+            file://nodolt.patch;patch=1 \
             file://include_fix.patch;patch=1"
 
 DEPENDS += "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
 DESCRIPTION = "X11 Input extension library"
 DEPENDS += "libxext inputproto"
 PE = "1"
-PV = "1.9.99.5+gitr${SRCREV}"
+PV = "1.9.99.5+gitr${SRCPV}"
 
 XORG_PN = "libXi"