diff options
author | Jussi Kukkonen <jussi.kukkonen@intel.com> | 2015-05-07 13:39:19 +0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-06-03 16:38:48 +0100 |
commit | f63e9b30eaa8107b8f66e3c118bd4d24185bf662 (patch) | |
tree | a4242770122a182f599be706adc364ea1e119372 /meta/recipes-graphics/xorg-xserver/xserver-xorg/xshmfence-option.patch | |
parent | 0420f7f47818d96964d48fd1309cea5f341432ed (diff) | |
download | poky-f63e9b30eaa8107b8f66e3c118bd4d24185bf662.tar.gz |
xserver-xorg: Upgrade 1.16.3 -> 1.17.1 (OELAYOUT_ABI change)
* Increase OELAYOUT_ABI: this is required because the
xf86-video-modesetting package moves from its own recipe to
xserver-xorg and sanity check cannot handle that currently.
The upgrade will delete old xf86-video-modesetting files from
sysroots.
* Remove upstreamed xserver-xorg patches
* Remove xf86-video-modesetting recipe: the driver is now included in
xserver-xorg recipe, which now produces the xf86-video-modesetting
package. The package version changes from 0.9 to 1.17.1
* Update xserver-xorg license checksum: modesetting license
info (another MIT one) has been added to the file
(From OE-Core rev: 950846d019ffac21909a96d90af8cf7e5bdd5738)
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/xorg-xserver/xserver-xorg/xshmfence-option.patch')
-rw-r--r-- | meta/recipes-graphics/xorg-xserver/xserver-xorg/xshmfence-option.patch | 57 |
1 files changed, 0 insertions, 57 deletions
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg/xshmfence-option.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg/xshmfence-option.patch deleted file mode 100644 index 682ddf7006..0000000000 --- a/meta/recipes-graphics/xorg-xserver/xserver-xorg/xshmfence-option.patch +++ /dev/null | |||
@@ -1,57 +0,0 @@ | |||
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) | ||