summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.13.0
diff options
context:
space:
mode:
authorLaurentiu Palcu <laurentiu.palcu@intel.com>2012-11-15 13:07:10 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-11-20 15:31:53 +0000
commit69f1b459155fa7d9f43635e391ca8ac4c615b613 (patch)
tree91fba7458acec2c6094f9443e2b3f268db11f408 /meta/recipes-graphics/xorg-xserver/xserver-xorg-1.13.0
parentcb758f9d32aef5e990adc8f0178674e5fdb26565 (diff)
downloadpoky-69f1b459155fa7d9f43635e391ca8ac4c615b613.tar.gz
xserver-xorg: upgrade to 1.13.0
The patch contains several aditional changes: * removed one backported patch (included in the new release); * changed mips64-compiler.patch to apply properly; * licence checksum for COPYING file changed: some copyright years have been changed; * bump PR in xorg-driver-common.inc so that all input/video drivers get rebuilt. That's becaue the ABI changed; The following external modules are now built-in: * DBE * DRI2 * DRI * RECORD The extmod module was completely removed. (From OE-Core rev: 506da0d139dd470475a1d6b2dd3ae62406c36816) Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/xorg-xserver/xserver-xorg-1.13.0')
-rw-r--r--meta/recipes-graphics/xorg-xserver/xserver-xorg-1.13.0/crosscompile.patch22
-rw-r--r--meta/recipes-graphics/xorg-xserver/xserver-xorg-1.13.0/fix_open_max_preprocessor_error.patch15
-rw-r--r--meta/recipes-graphics/xorg-xserver/xserver-xorg-1.13.0/macro_tweak.patch25
-rw-r--r--meta/recipes-graphics/xorg-xserver/xserver-xorg-1.13.0/mips64-compiler.patch29
4 files changed, 91 insertions, 0 deletions
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.13.0/crosscompile.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.13.0/crosscompile.patch
new file mode 100644
index 0000000000..2f98bb8c89
--- /dev/null
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.13.0/crosscompile.patch
@@ -0,0 +1,22 @@
1Upstream-Status: Inappropriate [configuration]
2
3diff --git a/configure.ac b/configure.ac
4index b3b752c..600500b 100644
5--- a/configure.ac
6+++ b/configure.ac
7@@ -523,13 +523,9 @@ dnl Uses --default-font-path if set, otherwise checks for /etc/X11/fontpath.d,
8 dnl otherwise uses standard subdirectories of FONTROOTDIR. When cross
9 dnl compiling, assume default font path uses standard FONTROOTDIR directories.
10 DEFAULT_FONT_PATH="${FONTMISCDIR}/,${FONTTTFDIR}/,${FONTOTFDIR}/,${FONTTYPE1DIR}/,${FONT100DPIDIR}/,${FONT75DPIDIR}/"
11-if test "$cross_compiling" != yes; then
12- AC_CHECK_FILE([${sysconfdir}/X11/fontpath.d],
13- [DEFAULT_FONT_PATH='catalogue:${sysconfdir}/X11/fontpath.d'],
14- [case $host_os in
15+ case $host_os in
16 darwin*) DEFAULT_FONT_PATH="${DEFAULT_FONT_PATH},/Library/Fonts,/System/Library/Fonts" ;;
17- esac])
18-fi
19+ esac
20 AC_ARG_WITH(default-font-path, AS_HELP_STRING([--with-default-font-path=PATH], [Comma separated list of font dirs]),
21 [ FONTPATH="$withval" ],
22 [ FONTPATH="${DEFAULT_FONT_PATH}" ])
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.13.0/fix_open_max_preprocessor_error.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.13.0/fix_open_max_preprocessor_error.patch
new file mode 100644
index 0000000000..2f629724c9
--- /dev/null
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.13.0/fix_open_max_preprocessor_error.patch
@@ -0,0 +1,15 @@
1Upstream-Status: Pending
2
3Index: git/os/osdep.h
4===================================================================
5--- git.orig/os/osdep.h 2008-10-07 18:38:21.000000000 +0100
6+++ git/os/osdep.h 2008-10-07 18:39:36.000000000 +0100
7@@ -92,7 +92,7 @@
8 * like sysconf(_SC_OPEN_MAX) is not supported.
9 */
10
11-#if OPEN_MAX <= 256
12+#if 0
13 #define MAXSOCKS (OPEN_MAX - 1)
14 #else
15 #define MAXSOCKS 256
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.13.0/macro_tweak.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.13.0/macro_tweak.patch
new file mode 100644
index 0000000000..ec0eea6ca2
--- /dev/null
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.13.0/macro_tweak.patch
@@ -0,0 +1,25 @@
1This is the revised version of files/macro_tweak.patch for
2xorg-server 1.8.99.904 and newer.
3
4Upstream-Status: Pending
5
6Signed-off-by: Yu Ke <ke.yu@intel.com>
7
8diff --git a/xorg-server.m4 b/xorg-server.m4
9index bdecf62..040fdb8 100644
10--- a/xorg-server.m4
11+++ b/xorg-server.m4
12@@ -28,10 +28,12 @@ dnl
13 # Checks for the $1 define in xorg-server.h (from the sdk). If it
14 # is defined, then add $1 to $REQUIRED_MODULES.
15
16+m4_pattern_allow(PKG_CONFIG_SYSROOT_DIR)
17+
18 AC_DEFUN([XORG_DRIVER_CHECK_EXT],[
19 AC_REQUIRE([PKG_PROG_PKG_CONFIG])
20 SAVE_CFLAGS="$CFLAGS"
21- CFLAGS="$CFLAGS -I`$PKG_CONFIG --variable=sdkdir xorg-server`"
22+ CFLAGS="$CFLAGS -I$PKG_CONFIG_SYSROOT_DIR`$PKG_CONFIG --variable=sdkdir xorg-server`"
23 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
24 #include "xorg-server.h"
25 #if !defined $1
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.13.0/mips64-compiler.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.13.0/mips64-compiler.patch
new file mode 100644
index 0000000000..168368e6c3
--- /dev/null
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.13.0/mips64-compiler.patch
@@ -0,0 +1,29 @@
1on mips64/n64 pointers are 64bit therefore the pointer conversions to int dont work well
2so we end up with incompatible conversion errors
3
4This patch choses the right values for mips64
5
6Signed-off-by: Khem Raj <raj.khem@gmail.com>
7
8Upstream-Status: Pending
9Index: xorg-server-1.13.0/hw/xfree86/common/compiler.h
10===================================================================
11--- xorg-server-1.13.0-orig/hw/xfree86/common/compiler.h 2012-06-14 23:04:29.000000000 +0300
12+++ xorg-server-1.13.0/hw/xfree86/common/compiler.h 2012-11-08 10:06:50.865831783 +0200
13@@ -101,6 +101,7 @@
14 #if defined(NO_INLINE) || defined(DO_PROTOTYPES)
15 #if !defined(__arm__)
16 #if !defined(__sparc__) && !defined(__sparc) && !defined(__arm32__) && !defined(__nds32__) \
17+ && !defined(__mips64) \
18 && !(defined(__alpha__) && defined(linux)) \
19 && !(defined(__ia64__) && defined(linux)) \
20
21@@ -721,7 +722,7 @@
22 }
23
24 #elif defined(__mips__) || (defined(__arm32__) && !defined(__linux__))
25-#ifdef __arm32__
26+#if defined (__arm32__) || defined (__mips64)
27 #define PORT_SIZE long
28 #else
29 #define PORT_SIZE short