diff options
Diffstat (limited to 'meta/recipes-graphics/xorg-xserver/xserver-xorg')
7 files changed, 245 insertions, 0 deletions
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg/crosscompile.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg/crosscompile.patch new file mode 100644 index 0000000000..2f98bb8c89 --- /dev/null +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg/crosscompile.patch | |||
@@ -0,0 +1,22 @@ | |||
1 | Upstream-Status: Inappropriate [configuration] | ||
2 | |||
3 | diff --git a/configure.ac b/configure.ac | ||
4 | index 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/fix_open_max_preprocessor_error.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg/fix_open_max_preprocessor_error.patch new file mode 100644 index 0000000000..2f629724c9 --- /dev/null +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg/fix_open_max_preprocessor_error.patch | |||
@@ -0,0 +1,15 @@ | |||
1 | Upstream-Status: Pending | ||
2 | |||
3 | Index: 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/macro_tweak.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg/macro_tweak.patch new file mode 100644 index 0000000000..ec0eea6ca2 --- /dev/null +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg/macro_tweak.patch | |||
@@ -0,0 +1,25 @@ | |||
1 | This is the revised version of files/macro_tweak.patch for | ||
2 | xorg-server 1.8.99.904 and newer. | ||
3 | |||
4 | Upstream-Status: Pending | ||
5 | |||
6 | Signed-off-by: Yu Ke <ke.yu@intel.com> | ||
7 | |||
8 | diff --git a/xorg-server.m4 b/xorg-server.m4 | ||
9 | index 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/mips64-compiler.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg/mips64-compiler.patch new file mode 100644 index 0000000000..168368e6c3 --- /dev/null +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg/mips64-compiler.patch | |||
@@ -0,0 +1,29 @@ | |||
1 | on mips64/n64 pointers are 64bit therefore the pointer conversions to int dont work well | ||
2 | so we end up with incompatible conversion errors | ||
3 | |||
4 | This patch choses the right values for mips64 | ||
5 | |||
6 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
7 | |||
8 | Upstream-Status: Pending | ||
9 | Index: 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 | ||
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg/present-module.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg/present-module.patch new file mode 100644 index 0000000000..13f3caf768 --- /dev/null +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg/present-module.patch | |||
@@ -0,0 +1,66 @@ | |||
1 | [ YOCTO #6583 ] | ||
2 | |||
3 | Upstream-Status: Backport | ||
4 | Signed-off-by: Ross Burton <ross.burton@intel.com> | ||
5 | |||
6 | From 746be5a03ebbda4ab411ca3efb2ed95f99e9ea46 Mon Sep 17 00:00:00 2001 | ||
7 | From: Chris Wilson <chris@chris-wilson.co.uk> | ||
8 | Date: Wed, 28 May 2014 08:13:59 +0100 | ||
9 | Subject: xfree86: Report DRI3 as a built-in module | ||
10 | |||
11 | This is so that drivers can do a runtime check that DRI3 is available, | ||
12 | similar to existing runtime checks performed by the drivers for DRI and | ||
13 | DRI2. | ||
14 | |||
15 | v2: Only add DRI3 to the list if the module was actually built into the | ||
16 | server (Mark Kettenis). | ||
17 | |||
18 | Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> | ||
19 | Cc: Mark Kettenis <mark.kettenis@xs4all.nl> | ||
20 | Signed-off-by: Keith Packard <keithp@keithp.com> | ||
21 | |||
22 | diff --git a/hw/xfree86/loader/loadmod.c b/hw/xfree86/loader/loadmod.c | ||
23 | index 092bf57..f92ad8d 100644 | ||
24 | --- a/hw/xfree86/loader/loadmod.c | ||
25 | +++ b/hw/xfree86/loader/loadmod.c | ||
26 | @@ -838,6 +838,9 @@ static const char *compiled_in_modules[] = { | ||
27 | "extmod", | ||
28 | "dri", | ||
29 | "dri2", | ||
30 | +#if DRI3 | ||
31 | + "dri3", | ||
32 | +#endif | ||
33 | NULL | ||
34 | }; | ||
35 | |||
36 | -- | ||
37 | cgit v0.10.2 | ||
38 | |||
39 | |||
40 | From 7ca458493aa2f0aa091c989ea0768611e0730bf5 Mon Sep 17 00:00:00 2001 | ||
41 | From: Chris Wilson <chris@chris-wilson.co.uk> | ||
42 | Date: Wed, 28 May 2014 08:14:00 +0100 | ||
43 | Subject: xfree86: Report Present as a built-in module | ||
44 | |||
45 | This is so that drivers can do a runtime check that Present is available, | ||
46 | similar to existing runtime checks performed by the drivers for DRI. | ||
47 | |||
48 | Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> | ||
49 | Signed-off-by: Keith Packard <keithp@keithp.com> | ||
50 | |||
51 | diff --git a/hw/xfree86/loader/loadmod.c b/hw/xfree86/loader/loadmod.c | ||
52 | index f92ad8d..e1f649a 100644 | ||
53 | --- a/hw/xfree86/loader/loadmod.c | ||
54 | +++ b/hw/xfree86/loader/loadmod.c | ||
55 | @@ -841,6 +841,9 @@ static const char *compiled_in_modules[] = { | ||
56 | #if DRI3 | ||
57 | "dri3", | ||
58 | #endif | ||
59 | +#if PRESENT | ||
60 | + "present", | ||
61 | +#endif | ||
62 | NULL | ||
63 | }; | ||
64 | |||
65 | -- | ||
66 | cgit v0.10.2 | ||
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg/xorg-CVE-2013-6424.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg/xorg-CVE-2013-6424.patch new file mode 100644 index 0000000000..7c6153022f --- /dev/null +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg/xorg-CVE-2013-6424.patch | |||
@@ -0,0 +1,31 @@ | |||
1 | This patch comes from: | ||
2 | http://lists.x.org/archives/xorg-devel/2013-October/037996.html | ||
3 | |||
4 | Upstream-Status: Backport | ||
5 | |||
6 | Signed-off-by: Baogen shang <baogen.shang@windriver.com> | ||
7 | diff -Naur xorg-server-1.14.0-orig/exa/exa_render.c xorg-server-1.14.0/exa/exa_render.c | ||
8 | --- xorg-server-1.14.0-orig/exa/exa_render.c 2014-02-27 14:32:38.000000000 +0800 | ||
9 | +++ xorg-server-1.14.0/exa/exa_render.c 2014-02-27 15:46:59.000000000 +0800 | ||
10 | @@ -1141,7 +1141,8 @@ | ||
11 | |||
12 | exaPrepareAccess(pPicture->pDrawable, EXA_PREPARE_DEST); | ||
13 | for (; ntrap; ntrap--, traps++) | ||
14 | - (*ps->RasterizeTrapezoid) (pPicture, traps, -bounds.x1, -bounds.y1); | ||
15 | + if (xTrapezoidValid(traps)) | ||
16 | + (*ps->RasterizeTrapezoid) (pPicture, traps, -bounds.x1, -bounds.y1); | ||
17 | exaFinishAccess(pPicture->pDrawable, EXA_PREPARE_DEST); | ||
18 | |||
19 | xRel = bounds.x1 + xSrc - xDst; | ||
20 | diff -Naur xorg-server-1.14.0-orig/render/picture.h xorg-server-1.14.0/render/picture.h | ||
21 | --- xorg-server-1.14.0-orig/render/picture.h 2014-02-27 14:32:26.000000000 +0800 | ||
22 | +++ xorg-server-1.14.0/render/picture.h 2014-02-27 15:48:13.000000000 +0800 | ||
23 | @@ -211,7 +211,7 @@ | ||
24 | /* whether 't' is a well defined not obviously empty trapezoid */ | ||
25 | #define xTrapezoidValid(t) ((t)->left.p1.y != (t)->left.p2.y && \ | ||
26 | (t)->right.p1.y != (t)->right.p2.y && \ | ||
27 | - (int) ((t)->bottom - (t)->top) > 0) | ||
28 | + ((t)->bottom > (t)->top)) | ||
29 | |||
30 | /* | ||
31 | * Standard NTSC luminance conversions: | ||
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg/xshmfence-option.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg/xshmfence-option.patch new file mode 100644 index 0000000000..682ddf7006 --- /dev/null +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg/xshmfence-option.patch | |||
@@ -0,0 +1,57 @@ | |||
1 | Upstream-Status: Submitted | ||
2 | Signed-off-by: Ross Burton <ross.burton@intel.com> | ||
3 | |||
4 | commit ca29a9f3e689f3840426897f58aaa3974932ae78 | ||
5 | Author: Ross Burton <ross.burton@intel.com> | ||
6 | Date: Mon Jul 7 12:53:35 2014 +0100 | ||
7 | |||
8 | configure.ac: add option for xshmfence | ||
9 | |||
10 | xshmfence is usable outside of DRI3, and is currently autodetected which isn't | ||
11 | good for distributions where deterministic builds are aspired to. | ||
12 | |||
13 | Signed-off-by: Ross Burton <ross.burton@intel.com> | ||
14 | |||
15 | diff --git a/configure.ac b/configure.ac | ||
16 | index c214638..a1ca9ec 100644 | ||
17 | --- a/configure.ac | ||
18 | +++ b/configure.ac | ||
19 | @@ -648,6 +648,7 @@ AC_ARG_ENABLE(kdrive-kbd, AS_HELP_STRING([--enable-kdrive-kbd], [Build kbd d | ||
20 | AC_ARG_ENABLE(kdrive-mouse, AS_HELP_STRING([--enable-kdrive-mouse], [Build mouse driver for kdrive (default: auto)]), [KDRIVE_MOUSE=$enableval], [KDRIVE_MOUSE=auto]) | ||
21 | AC_ARG_ENABLE(kdrive-evdev, AS_HELP_STRING([--enable-kdrive-evdev], [Build evdev driver for kdrive (default: auto)]), [KDRIVE_EVDEV=$enableval], [KDRIVE_EVDEV=auto]) | ||
22 | AC_ARG_ENABLE(libunwind, AS_HELP_STRING([--enable-libunwind], [Use libunwind for backtracing (default: auto)]), [LIBUNWIND="$enableval"], [LIBUNWIND="auto"]) | ||
23 | +AC_ARG_ENABLE(xshmfence, AS_HELP_STRING([--disable-xshmfence], [Disable xshmfence (default: auto)]), [WANT_XSHMFENCE="$enableval"], [WANT_XSHMFENCE="auto"]) | ||
24 | |||
25 | |||
26 | dnl chown/chmod to be setuid root as part of build | ||
27 | @@ -1235,18 +1236,21 @@ esac | ||
28 | |||
29 | AM_CONDITIONAL(BUSFAULT, test x"$BUSFAULT" = xyes) | ||
30 | |||
31 | -PKG_CHECK_MODULES([XSHMFENCE], $XSHMFENCE, | ||
32 | - [HAVE_XSHMFENCE=yes], [HAVE_XSHMFENCE=no]) | ||
33 | |||
34 | -AM_CONDITIONAL(XSHMFENCE, test "x$HAVE_XSHMFENCE" = xyes) | ||
35 | +PKG_CHECK_MODULES([XSHMFENCE], $XSHMFENCE, [HAVE_XSHMFENCE=yes], [HAVE_XSHMFENCE=no]) | ||
36 | +if test "x$WANT_XSHMFENCE" = "xauto"; then | ||
37 | + WANT_XSHMFENCE="$HAVE_XSHMFENCE" | ||
38 | +fi | ||
39 | |||
40 | -case x"$HAVE_XSHMFENCE" in | ||
41 | - xyes) | ||
42 | - AC_DEFINE(HAVE_XSHMFENCE, 1, [Have X Shared Memory Fence library]) | ||
43 | - REQUIRED_LIBS="$REQUIRED_LIBS xshmfence" | ||
44 | - ;; | ||
45 | -esac | ||
46 | +if test "x$WANT_XSHMFENCE" = "xyes"; then | ||
47 | + if test "x$HAVE_XSHMFENCE" != "xyes"; then | ||
48 | + AC_MSG_ERROR([xshmfence requested but not installed.]) | ||
49 | + fi | ||
50 | + AC_DEFINE(HAVE_XSHMFENCE, 1, [Have xshmfence support]) | ||
51 | + REQUIRED_LIBS="$REQUIRED_LIBS xshmfence" | ||
52 | +fi | ||
53 | |||
54 | +AM_CONDITIONAL(XSHMFENCE, [test "x$WANT_XSHMFENCE" = xyes]) | ||
55 | |||
56 | case "$DRI3,$HAVE_XSHMFENCE" in | ||
57 | yes,yes | auto,yes) | ||