[libX11] version bump: 1.1.4 -> 1.2.2

Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>

5 files changed, 6 insertions, 205 deletions

diff --git a/patches/libX11-1.1.4/libX11-1.1.4-autoreconf.diff b/patches/libX11-1.1.4/libX11-1.1.4-autoreconf.diff
deleted file mode 100644
index 5e262132a..000000000
--- a/patches/libX11-1.1.4/libX11-1.1.4-autoreconf.diff
+++ /dev/null
@@ -1,135 +0,0 @@
-diff -ur libX11-1.1.4-orig/src/util/Makefile.in libX11-1.1.4/src/util/Makefile.in
---- libX11-1.1.4-orig/src/util/Makefile.in	2008-03-06 21:48:52.000000000 +0100
-+++ libX11-1.1.4/src/util/Makefile.in	2008-05-18 13:08:18.000000000 +0200
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.10.1 from Makefile.am.
-+# Makefile.in generated by automake 1.10 from Makefile.am.
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -51,9 +51,9 @@
- makekeys_OBJECTS = makekeys-makekeys.$(OBJEXT)
- makekeys_LDADD = $(LDADD)
- makekeys_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
--	--mode=link $(CCLD) $(makekeys_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
--	$(LDFLAGS) -o $@
--DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src -I$(top_builddir)/include/X11
-+	--mode=link $(CCLD) $(makekeys_CFLAGS) $(CFLAGS) \
-+	$(makekeys_LDFLAGS) $(LDFLAGS) -o $@
-+DEFAULT_INCLUDES = -I. -I$(top_builddir)/src -I$(top_builddir)/include/X11@am__isrc@
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-@@ -62,6 +62,9 @@
- 	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- CCLD = $(CC)
-+LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-+	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-+	$(LDFLAGS) -o $@
- SOURCES = makekeys.c
- DIST_SOURCES = makekeys.c
- ETAGS = etags
-@@ -80,11 +83,13 @@
- AWK = @AWK@
- BIGFONT_CFLAGS = @BIGFONT_CFLAGS@
- BIGFONT_LIBS = @BIGFONT_LIBS@
--CC = @CC@
-+CC = $(CC_FOR_BUILD)
- CCDEPMODE = @CCDEPMODE@
--CFLAGS = @CFLAGS@
-+
-+# evil hack
-+CFLAGS = $(CFLAGS_FOR_BUILD) $(X11_CFLAGS) $(BIGREQS_CFLAGS)
- CPP = @CPP@
--CPPFLAGS = @CPPFLAGS@
-+CPPFLAGS = $(CPPFLAGS_FOR_BUILD)
- CXX = @CXX@
- CXXCPP = @CXXCPP@
- CXXDEPMODE = @CXXDEPMODE@
-@@ -94,6 +99,7 @@
- DEPDIR = @DEPDIR@
- DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
- DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
-+DSYMUTIL = @DSYMUTIL@
- ECHO = @ECHO@
- ECHO_C = @ECHO_C@
- ECHO_N = @ECHO_N@
-@@ -113,10 +119,10 @@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- KEYSYMDEF = @KEYSYMDEF@
- LAUNCHD = @LAUNCHD@
--LDFLAGS = @LDFLAGS@
-+LDFLAGS = $(LDFLAGS_FOR_BUILD)
- LIBOBJS = @LIBOBJS@
- LIBS = @LIBS@
--LIBTOOL = @LIBTOOL@
-+LIBTOOL = @LIBTOOL@ --tag=CC
- LIB_MAN_DIR = @LIB_MAN_DIR@
- LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
- LINT = @LINT@
-@@ -130,6 +136,7 @@
- MISC_MAN_DIR = @MISC_MAN_DIR@
- MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
- MKDIR_P = @MKDIR_P@
-+NMEDIT = @NMEDIT@
- OBJEXT = @OBJEXT@
- PACKAGE = @PACKAGE@
- PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-@@ -225,10 +232,9 @@
- target_alias = @target_alias@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
--makekeys_CFLAGS = $(X11_CFLAGS)
--
--#override CC = gcc
--LINK = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+makekeys_CFLAGS = $(CFLAGS_FOR_BUILD)
-+makekeys_CPPLAGS = $(CPPFLAGS_FOR_BUILD)
-+makekeys_LDFLAGS = $(LDFLAGS_FOR_BUILD)
- EXTRA_DIST = mkks.sh
- 
- # Check source code with tools like lint & sparse
-@@ -333,8 +339,8 @@
- 	unique=`for i in $$list; do \
- 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- 	  done | \
--	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
--	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-+	  $(AWK) '    { files[$$0] = 1; } \
-+	       END { for (i in files) print i; }'`; \
- 	mkid -fID $$unique
- tags: TAGS
- 
-@@ -346,8 +352,8 @@
- 	unique=`for i in $$list; do \
- 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- 	  done | \
--	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
--	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-+	  $(AWK) '    { files[$$0] = 1; } \
-+	       END { for (i in files) print i; }'`; \
- 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
- 	  test -n "$$unique" || unique=$$empty_fix; \
- 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -357,12 +363,13 @@
- CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
- 		$(TAGS_FILES) $(LISP)
- 	tags=; \
-+	here=`pwd`; \
- 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
- 	unique=`for i in $$list; do \
- 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- 	  done | \
--	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
--	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-+	  $(AWK) '    { files[$$0] = 1; } \
-+	       END { for (i in files) print i; }'`; \
- 	test -z "$(CTAGS_ARGS)$$tags$$unique" \
- 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- 	     $$tags $$unique
diff --git a/patches/libX11-1.1.4/libX11-1.1.4-fix-cross-compile.diff b/patches/libX11-1.1.4/libX11-1.1.4-fix-cross-compile.diff
deleted file mode 100644
index e6b307f7c..000000000
--- a/patches/libX11-1.1.4/libX11-1.1.4-fix-cross-compile.diff
+++ /dev/null
@@ -1,54 +0,0 @@
-#
-# Submitted-By: Sascha Hauer, 2006-02-23
-# Committed-By: Sascha Hauer
-#
-# Error:
-#
-# makekeys gets crosscompiled but is needed for the host
-#
-# Description:
-#
-# use Benes *_FOR_BUILD hack
-#
-# rediffed for X.org7.1 by Luotao Fu, 2006-06-19
-# State:
-#
-# not reported upstream
-#
-# This patch is broken: it should use CC_FOR_BUILD only if
-# crosscompiling; at the moment it breaks if CC_FOR_BUILD is not set and
-# we build for the host. See nfsutils for an example how to solve it
-# correctly. (MKL, RSC)
-#
-
----
- src/util/Makefile.am |   15 +++++++++++----
- 1 file changed, 11 insertions(+), 4 deletions(-)
-
-Index: libX11-1.1.3/src/util/Makefile.am
-===================================================================
---- libX11-1.1.3.orig/src/util/Makefile.am	2007-05-16 17:34:44.000000000 +0200
-+++ libX11-1.1.3/src/util/Makefile.am	2007-10-17 16:59:32.000000000 +0200
-@@ -1,11 +1,18 @@
- # $XdotOrg: lib/X11/src/util/Makefile.am,v 1.4 2006-02-19 02:14:12 jamey Exp $
- 
--noinst_PROGRAMS=makekeys
-+# evil hack
-+CFLAGS=$(CFLAGS_FOR_BUILD) $(X11_CFLAGS) $(BIGREQS_CFLAGS)
-+CPPFLAGS=$(CPPFLAGS_FOR_BUILD)
-+LDFLAGS=$(LDFLAGS_FOR_BUILD)
-+
-+CC=$(CC_FOR_BUILD)
-+LIBTOOL = @LIBTOOL@ --tag=CC
- 
--makekeys_CFLAGS=$(X11_CFLAGS)
-+noinst_PROGRAMS=makekeys
- 
--#override CC = gcc
--LINK = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+makekeys_CFLAGS=$(CFLAGS_FOR_BUILD)
-+makekeys_CPPLAGS=$(CPPFLAGS_FOR_BUILD)
-+makekeys_LDFLAGS=$(LDFLAGS_FOR_BUILD)
- 
- EXTRA_DIST = mkks.sh
- 
diff --git a/patches/libX11-1.1.4/series b/patches/libX11-1.1.4/series
deleted file mode 100644
index 16240079e..000000000
--- a/patches/libX11-1.1.4/series
+++ /dev/null
@@ -1,2 +0,0 @@
-libX11-1.1.4-fix-cross-compile.diff
-libX11-1.1.4-autoreconf.diff
diff --git a/rules/xorg-lib-X11.in b/rules/xorg-lib-X11.in
index 056aace88..22bf4eeeb 100644
--- a/rules/xorg-lib-X11.in
+++ b/rules/xorg-lib-X11.in
@@ -3,26 +3,18 @@
 menuconfig XORG_LIB_X11
 	tristate
 	prompt "libX11                        "
-# always required:
-# - [xproto >= 7.0.6]
-# - xau (when Xlib only)
-# - xcmiscproto (when Xlib only)
-# - bigreqsproto (when Xlib only)
-# - xdmcp (when Xlib only) + xdmc-aut! check dmcp-lib
-#
 	select XORG_PROTO_X
-	select LIBC_PTHREAD
 	select XORG_PROTO_XEXT
-	select XORG_LIB_XTRANS
-# required on demand
-	select LIBXCB			if XORG_LIB_X11_XCB_LOW_LEVEL
+	select XORG_LIB_XDMCP		if !XORG_LIB_X11_XCB_LOW_LEVEL
 	select XORG_LIB_XAU		if !XORG_LIB_X11_XCB_LOW_LEVEL
 	select XORG_PROTO_XCMISC	if !XORG_LIB_X11_XCB_LOW_LEVEL
 	select XORG_PROTO_BIGREQS	if !XORG_LIB_X11_XCB_LOW_LEVEL
-	select XORG_LIB_XDMCP		if !XORG_LIB_X11_XCB_LOW_LEVEL
-	select XORG_PROTO_INPUT		if XORG_LIB_X11_XKB
+	select LIBXCB			if XORG_LIB_X11_XCB_LOW_LEVEL
+	select XORG_LIB_XTRANS
 	select XORG_PROTO_XF86BIGFONT	if XORG_LIB_X11_XF86BIGFONT
+	select XORG_PROTO_INPUT		if XORG_LIB_X11_XKB
 	select XORG_PROTO_KB		if XORG_LIB_X11_XKB
+	select LIBC_PTHREAD
 	help
 	  This is the main X library
 
diff --git a/rules/xorg-lib-X11.make b/rules/xorg-lib-X11.make
index dad195bfa..4bd7f9ba7 100644
--- a/rules/xorg-lib-X11.make
+++ b/rules/xorg-lib-X11.make
@@ -17,7 +17,7 @@ PACKAGES-$(PTXCONF_XORG_LIB_X11) += xorg-lib-x11
 #
 # Paths and names
 #
-XORG_LIB_X11_VERSION	:= 1.1.4
+XORG_LIB_X11_VERSION	:= 1.2.2
 XORG_LIB_X11		:= libX11-$(XORG_LIB_X11_VERSION)
 XORG_LIB_X11_SUFFIX	:= tar.bz2
 XORG_LIB_X11_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/individual/lib/$(XORG_LIB_X11).$(XORG_LIB_X11_SUFFIX)