diff options
| author |   Ross Burton <ross.burton@intel.com> | 2013-11-07 12:06:04 +0000 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-11-08 17:29:52 +0000 |
| commit | 60973d0584e2533f0debfcd8e80c5e29beb68e37 (patch) | |
| tree | bd431ed82dfa93c89bba176b14bdc593b8e44454 /meta/recipes-graphics/xorg-xserver/xserver-xorg/crosscompile.patch | |
| parent | a0525f3da109848e4b1989247b07fac411b270ce (diff) | |
| download | openembedded-core-contrib-60973d0584e2533f0debfcd8e80c5e29beb68e37.tar.gz | |
xserver-xorg: upgrade to 1.14.4
The xinerama and dixstruct patches are merged in 1.14.4, so drop them.
Also drop explicit PR statement.
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
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, 22 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 @@ +Upstream-Status: Inappropriate [configuration] + +diff --git a/configure.ac b/configure.ac +index b3b752c..600500b 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -523,13 +523,9 @@ dnl Uses --default-font-path if set, otherwise checks for /etc/X11/fontpath.d, + dnl otherwise uses standard subdirectories of FONTROOTDIR. When cross + dnl compiling, assume default font path uses standard FONTROOTDIR directories. + DEFAULT_FONT_PATH="${FONTMISCDIR}/,${FONTTTFDIR}/,${FONTOTFDIR}/,${FONTTYPE1DIR}/,${FONT100DPIDIR}/,${FONT75DPIDIR}/" +-if test "$cross_compiling" != yes; then +- AC_CHECK_FILE([${sysconfdir}/X11/fontpath.d], +- [DEFAULT_FONT_PATH='catalogue:${sysconfdir}/X11/fontpath.d'], +- [case $host_os in ++ case $host_os in + darwin*) DEFAULT_FONT_PATH="${DEFAULT_FONT_PATH},/Library/Fonts,/System/Library/Fonts" ;; +- esac]) +-fi ++ esac + AC_ARG_WITH(default-font-path, AS_HELP_STRING([--with-default-font-path=PATH], [Comma separated list of font dirs]), + [ FONTPATH="$withval" ], + [ FONTPATH="${DEFAULT_FONT_PATH}" ]) |