summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics/xorg-xserver
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-graphics/xorg-xserver')
-rw-r--r--meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2/gcc-47-warning.patch33
-rw-r--r--meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.4/crosscompile.patch (renamed from meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2/crosscompile.patch)0
-rw-r--r--meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.4/fix_open_max_preprocessor_error.patch (renamed from meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2/fix_open_max_preprocessor_error.patch)0
-rw-r--r--meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.4/macro_tweak.patch (renamed from meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2/macro_tweak.patch)0
-rw-r--r--meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.4/mips64-compiler.patch (renamed from meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2/mips64-compiler.patch)0
-rw-r--r--meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.4/pkgconfig-deps.patch70
-rw-r--r--meta/recipes-graphics/xorg-xserver/xserver-xorg_1.11.2.bb13
-rw-r--r--meta/recipes-graphics/xorg-xserver/xserver-xorg_1.11.4.bb13
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 @@
1This patch fixes errors on powerpc like below
2
3| lnx_video.c: In function 'unmapVidMem':
4| lnx_video.c:472:24: error: cast from pointer to integer of different size [-Werror=pointer-to-int-cast]
5
6Its in 1.12 branch
7
8http://cgit.freedesktop.org/xorg/xserver/commit/?h=server-1.12-branch&id=eb3377ffb8a7baa26c9831e56ed782d48b28fa71
9
10Upstream-Status: Backport
11
12Signed-off-by: Khem Raj <raj.khem@gmail.com>
13
14Index: xorg-server-1.11.2/hw/xfree86/os-support/linux/lnx_video.c
15===================================================================
16--- xorg-server-1.11.2.orig/hw/xfree86/os-support/linux/lnx_video.c 2012-05-01 06:32:34.186489019 -0700
17+++ xorg-server-1.11.2/hw/xfree86/os-support/linux/lnx_video.c 2012-05-01 06:49:14.926537452 -0700
18@@ -469,11 +469,11 @@
19 static void
20 unmapVidMem(int ScreenNum, pointer Base, unsigned long Size)
21 {
22- memType alignOff = (memType)Base
23- - ((memType)Base & ~(getpagesize() - 1));
24+ uintptr_t alignOff = (uintptr_t)Base
25+ - ((uintptr_t)Base & ~(getpagesize() - 1));
26
27- DebugF("alignment offset: %lx\n",alignOff);
28- munmap((caddr_t)((memType)Base - alignOff), (Size + alignOff));
29+ DebugF("alignment offset: %lx\n",(unsigned long)alignOff);
30+ munmap((void*)((uintptr_t)Base - alignOff), (Size + alignOff));
31 }
32
33
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 @@
1Upstream-Status: Backport
2Signed-off-by: Ross Burton <ross.burton@intel.com>
3
4commit 41d903918a5721e53ed694880eab44170f9717cc
5Author: Jeremy Huddleston <jeremyhu@apple.com>
6Date: Wed Sep 14 13:45:18 2011 -0500
7
8 xorg-server.pc.in: Remove libpciaccess and pixman-1 from Requires
9
10 Every module building against xorg-server does not *Require* pixman nor
11 libpciaccess. If such modules need pixman or pciaccess, they should be
12 depending on them directly rather than inheriting a dependency from
13 xorg-server. To do this, they should use PKG_CHECK_MODULES in configure.ac
14 to check for pixman-1 or pciaccess and include the apporpriate _LIBS variable
15 to the appropriate _LDFLAGS variable in Makefile.am
16
17 This also moves pixman-1 to Requires.private, so CPPFLAGS is set right to
18 to satisfy include dependencies but avoid linking needlessly.
19
20 Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
21 Reviewed-by: Gaetan Nadon <memsize@videotron.ca>
22
23diff --git a/configure.ac b/configure.ac
24index 50beb01..4bfa82c 100644
25--- a/configure.ac
26+++ b/configure.ac
27@@ -780,11 +780,6 @@ VIDMODEPROTO="xf86vidmodeproto >= 2.2.99.1"
28 WINDOWSWMPROTO="windowswmproto"
29 APPLEWMPROTO="applewmproto >= 1.4"
30
31-dnl Core modules for most extensions, et al.
32-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"
33-# Make SDK_REQUIRED_MODULES available for inclusion in xorg-server.pc
34-AC_SUBST(SDK_REQUIRED_MODULES)
35-
36 dnl List of libraries that require a specific version
37 LIBAPPLEWM="applewm >= 1.4"
38 LIBDMX="dmx >= 1.0.99.1"
39@@ -806,6 +801,11 @@ dnl specific modules against it
40 PKG_CHECK_MODULES(PIXMAN, $LIBPIXMAN)
41 REQUIRED_LIBS="$REQUIRED_LIBS $LIBPIXMAN $LIBXFONT xau"
42
43+dnl Core modules for most extensions, et al.
44+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"
45+# Make SDK_REQUIRED_MODULES available for inclusion in xorg-server.pc
46+AC_SUBST(SDK_REQUIRED_MODULES)
47+
48 REQUIRED_MODULES="[fixesproto >= 5.0] [damageproto >= 1.1] [xcmiscproto >= 1.2.0] [xtrans >= 1.2.2] [bigreqsproto >= 1.1.0] $SDK_REQUIRED_MODULES"
49
50 if test "x$CONFIG_UDEV" = xyes &&
51@@ -1583,6 +1583,7 @@ if test "x$XORG" = xyes; then
52 if test "x$PCI" = xyes; then
53
54 PKG_CHECK_MODULES([PCIACCESS], $LIBPCIACCESS)
55+ SDK_REQUIRED_MODULES="$SDK_REQUIRED_MODULES $LIBPCIACCESS"
56 SAVE_LIBS=$LIBS
57 SAVE_CFLAGS=$CFLAGS
58 CFLAGS=$PCIACCESS_CFLAGS
59diff --git a/xorg-server.pc.in b/xorg-server.pc.in
60index fb238b5..a98eca8 100644
61--- a/xorg-server.pc.in
62+++ b/xorg-server.pc.in
63@@ -15,7 +15,6 @@ abi_extension=@abi_extension@
64 Name: xorg-server
65 Description: Modular X.Org X Server
66 Version: @PACKAGE_VERSION@
67-Requires: pixman-1 pciaccess
68 Requires.private: @SDK_REQUIRED_MODULES@
69 Cflags: -I${sdkdir} @symbol_visibility@
70 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 @@
1require xserver-xorg.inc
2
3# Misc build failure for master HEAD
4SRC_URI += "file://crosscompile.patch \
5 file://fix_open_max_preprocessor_error.patch \
6 file://gcc-47-warning.patch \
7 file://mips64-compiler.patch \
8 "
9
10SRC_URI[md5sum] = "8796fff441e5435ee36a72579008af24"
11SRC_URI[sha256sum] = "fa415decf02027ca278b06254ccfbcceba2a83c2741405257ebf749da4a73cf2"
12
13PR = "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 @@
1require xserver-xorg.inc
2
3# Misc build failure for master HEAD
4SRC_URI += "file://crosscompile.patch \
5 file://fix_open_max_preprocessor_error.patch \
6 file://mips64-compiler.patch \
7 file://pkgconfig-deps.patch \
8 "
9
10SRC_URI[md5sum] = "256325e9b17dff479d92bed97f6b0adb"
11SRC_URI[sha256sum] = "3e2935bc400612df58d5b5e6840829e2c63af02c2e7d2893092500358a4366fc"
12
13PR = "r0"