diff options
author | Aníbal Limón <anibal.limon@linux.intel.com> | 2014-12-04 14:58:26 -0600 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-12-11 11:34:55 +0000 |
commit | acfb2982e851edb4505094f31bbba4bfbc88ca1e (patch) | |
tree | fa08ab82b6b180e1d29480b6bf530b59ef223653 /meta/recipes-graphics/xorg-xserver/xserver-xorg/crosscompile.patch | |
parent | 993989f033a31f3ac72891d9627c0d2c46e893be (diff) | |
download | poky-acfb2982e851edb4505094f31bbba4bfbc88ca1e.tar.gz |
xorg-xserver: Upgrade to 1.16.2.
Add PACKAGECONFIG systemd, xserver-xorg now depends in dbus because
adds support for systemd-logind, dbus is used by xserver-xorg to
communicate with systemd.
Add conditional enablement of systemd-logind if DISTRO_FEATURES contains
systemd.
Remove crosscompile, mips64-compile and present-module because are already
in upstream.
(From OE-Core rev: 4c33baa4a95aee26c6bf6fd0c7ec827ff63a9e62)
Signed-off-by: Aníbal Limón <anibal.limon@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/xorg-xserver/xserver-xorg/crosscompile.patch')
-rw-r--r-- | meta/recipes-graphics/xorg-xserver/xserver-xorg/crosscompile.patch | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg/crosscompile.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg/crosscompile.patch deleted file mode 100644 index 2f98bb8c89..0000000000 --- a/meta/recipes-graphics/xorg-xserver/xserver-xorg/crosscompile.patch +++ /dev/null | |||
@@ -1,22 +0,0 @@ | |||
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}" ]) | ||