xserver-xorg: upgrade to 1.11.4

gcc-47-warning.patch was integrated, so drop.

Add pkgconfig-deps.patch, a backport of a commit to fix bad exposed library
dependencies (which resulted in the keyboard driver depending on pixman).

Signed-off-by: Ross Burton <ross.burton@intel.com>

8 files changed, 83 insertions, 46 deletions

diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2/gcc-47-warning.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2/gcc-47-warning.patch
deleted file mode 100644
index ed4eaac391..0000000000
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2/gcc-47-warning.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-This patch fixes errors on powerpc like below
-
-| lnx_video.c: In function 'unmapVidMem':
-| lnx_video.c:472:24: error: cast from pointer to integer of different size [-Werror=pointer-to-int-cast]
-
-Its in 1.12 branch 
-
-http://cgit.freedesktop.org/xorg/xserver/commit/?h=server-1.12-branch&id=eb3377ffb8a7baa26c9831e56ed782d48b28fa71
-
-Upstream-Status: Backport
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-
-Index: xorg-server-1.11.2/hw/xfree86/os-support/linux/lnx_video.c
-===================================================================
---- xorg-server-1.11.2.orig/hw/xfree86/os-support/linux/lnx_video.c	2012-05-01 06:32:34.186489019 -0700
-+++ xorg-server-1.11.2/hw/xfree86/os-support/linux/lnx_video.c	2012-05-01 06:49:14.926537452 -0700
-@@ -469,11 +469,11 @@
- static void
- unmapVidMem(int ScreenNum, pointer Base, unsigned long Size)
- {
--    memType alignOff = (memType)Base 
--	- ((memType)Base & ~(getpagesize() - 1));
-+    uintptr_t alignOff = (uintptr_t)Base 
-+	- ((uintptr_t)Base & ~(getpagesize() - 1));
- 
--    DebugF("alignment offset: %lx\n",alignOff);
--    munmap((caddr_t)((memType)Base - alignOff), (Size + alignOff));
-+    DebugF("alignment offset: %lx\n",(unsigned long)alignOff);
-+    munmap((void*)((uintptr_t)Base - alignOff), (Size + alignOff));
- }
- 
- 
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2/crosscompile.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.4/crosscompile.patch
index 2f98bb8c89..2f98bb8c89 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2/crosscompile.patch
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.4/crosscompile.patch
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2/fix_open_max_preprocessor_error.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.4/fix_open_max_preprocessor_error.patch
index 2f629724c9..2f629724c9 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2/fix_open_max_preprocessor_error.patch
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.4/fix_open_max_preprocessor_error.patch
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2/macro_tweak.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.4/macro_tweak.patch
index ec0eea6ca2..ec0eea6ca2 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2/macro_tweak.patch
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.4/macro_tweak.patch
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2/mips64-compiler.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.4/mips64-compiler.patch
index e6bc95b449..e6bc95b449 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2/mips64-compiler.patch
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.4/mips64-compiler.patch
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.4/pkgconfig-deps.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.4/pkgconfig-deps.patch
new file mode 100644
index 0000000000..fee8d76ccf
--- /dev/null
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.4/pkgconfig-deps.patch
@@ -0,0 +1,70 @@
+Upstream-Status: Backport
+Signed-off-by: Ross Burton <ross.burton@intel.com>
+
+commit 41d903918a5721e53ed694880eab44170f9717cc
+Author: Jeremy Huddleston <jeremyhu@apple.com>
+Date:   Wed Sep 14 13:45:18 2011 -0500
+
+    xorg-server.pc.in: Remove libpciaccess and pixman-1 from Requires
+    
+    Every module building against xorg-server does not *Require* pixman nor
+    libpciaccess.  If such modules need pixman or pciaccess, they should be
+    depending on them directly rather than inheriting a dependency from
+    xorg-server.  To do this, they should use PKG_CHECK_MODULES in configure.ac
+    to check for pixman-1 or pciaccess and include the apporpriate _LIBS variable
+    to the appropriate _LDFLAGS variable in Makefile.am
+    
+    This also moves pixman-1 to Requires.private, so CPPFLAGS is set right to
+    to satisfy include dependencies but avoid linking needlessly.
+    
+    Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
+    Reviewed-by: Gaetan Nadon <memsize@videotron.ca>
+
+diff --git a/configure.ac b/configure.ac
+index 50beb01..4bfa82c 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -780,11 +780,6 @@ VIDMODEPROTO="xf86vidmodeproto >= 2.2.99.1"
+ WINDOWSWMPROTO="windowswmproto"
+ APPLEWMPROTO="applewmproto >= 1.4"
+ 
+-dnl Core modules for most extensions, et al.
+-SDK_REQUIRED_MODULES="[xproto >= 7.0.22] [randrproto >= 1.2.99.3] [renderproto >= 0.11] [xextproto >= 7.1.99] [inputproto >= 1.9.99.902] [kbproto >= 1.0.3] fontsproto"
+-# Make SDK_REQUIRED_MODULES available for inclusion in xorg-server.pc
+-AC_SUBST(SDK_REQUIRED_MODULES)
+-
+ dnl List of libraries that require a specific version
+ LIBAPPLEWM="applewm >= 1.4"
+ LIBDMX="dmx >= 1.0.99.1"
+@@ -806,6 +801,11 @@ dnl specific modules against it
+ PKG_CHECK_MODULES(PIXMAN, $LIBPIXMAN)
+ REQUIRED_LIBS="$REQUIRED_LIBS $LIBPIXMAN $LIBXFONT xau"
+ 
++dnl Core modules for most extensions, et al.
++SDK_REQUIRED_MODULES="[xproto >= 7.0.22] [randrproto >= 1.2.99.3] [renderproto >= 0.11] [xextproto >= 7.1.99] [inputproto >= 1.99.99.902] [kbproto >= 1.0.3] fontsproto $LIBPIXMAN"
++# Make SDK_REQUIRED_MODULES available for inclusion in xorg-server.pc
++AC_SUBST(SDK_REQUIRED_MODULES)
++
+ REQUIRED_MODULES="[fixesproto >= 5.0] [damageproto >= 1.1] [xcmiscproto >= 1.2.0] [xtrans >= 1.2.2] [bigreqsproto >= 1.1.0] $SDK_REQUIRED_MODULES"
+ 
+ if test "x$CONFIG_UDEV" = xyes &&
+@@ -1583,6 +1583,7 @@ if test "x$XORG" = xyes; then
+ 	if test "x$PCI" = xyes; then
+ 
+ 	PKG_CHECK_MODULES([PCIACCESS], $LIBPCIACCESS)
++	SDK_REQUIRED_MODULES="$SDK_REQUIRED_MODULES $LIBPCIACCESS"
+	SAVE_LIBS=$LIBS
+	SAVE_CFLAGS=$CFLAGS
+	CFLAGS=$PCIACCESS_CFLAGS
+diff --git a/xorg-server.pc.in b/xorg-server.pc.in
+index fb238b5..a98eca8 100644
+--- a/xorg-server.pc.in
++++ b/xorg-server.pc.in
+@@ -15,7 +15,6 @@ abi_extension=@abi_extension@
+ Name: xorg-server
+ Description: Modular X.Org X Server
+ Version: @PACKAGE_VERSION@
+-Requires: pixman-1 pciaccess
+ Requires.private: @SDK_REQUIRED_MODULES@
+ Cflags: -I${sdkdir} @symbol_visibility@
+ Libs: -L${libdir}
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.11.2.bb b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.11.2.bb
deleted file mode 100644
index a219f814ac..0000000000
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.11.2.bb
+++ /dev/null
@@ -1,13 +0,0 @@
-require xserver-xorg.inc
-
-# Misc build failure for master HEAD
-SRC_URI += "file://crosscompile.patch \
-            file://fix_open_max_preprocessor_error.patch \
-            file://gcc-47-warning.patch \
-	    file://mips64-compiler.patch \
-           "
-
-SRC_URI[md5sum] = "8796fff441e5435ee36a72579008af24"
-SRC_URI[sha256sum] = "fa415decf02027ca278b06254ccfbcceba2a83c2741405257ebf749da4a73cf2"
-
-PR = "r10"
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.11.4.bb b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.11.4.bb
new file mode 100644
index 0000000000..23ae4d4cac
--- /dev/null
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.11.4.bb
@@ -0,0 +1,13 @@
+require xserver-xorg.inc
+
+# Misc build failure for master HEAD
+SRC_URI += "file://crosscompile.patch \
+            file://fix_open_max_preprocessor_error.patch \
+            file://mips64-compiler.patch \
+            file://pkgconfig-deps.patch \
+           "
+
+SRC_URI[md5sum] = "256325e9b17dff479d92bed97f6b0adb"
+SRC_URI[sha256sum] = "3e2935bc400612df58d5b5e6840829e2c63af02c2e7d2893092500358a4366fc"
+
+PR = "r0"