diff options
| author | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2014-12-08 02:06:27 +0100 |
|---|---|---|
| committer | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2014-12-08 02:20:43 +0100 |
| commit | 42a45352ddd64ac94a1ef1334cb28447cc3cbdd8 (patch) | |
| tree | 9582c261492c0240050ec5a4a9b44128c6507a43 /recipes-graphics/xorg-xserver/xserver-xorg/crosscompile.patch | |
| parent | 0ea8f1bca5e83e0146f36db113821624c7b8e6cb (diff) | |
xserver-xorg: upgrade to 1.14.7
This is an upgrade from the former 1.14.4 recipe as found here:
http://cgit.openembedded.org/openembedded-core/tree/meta/
recipes-graphics/xorg-xserver?id=
b8feee3cf21f70ba4ec3b822d2f596d4fc02a292
Diffstat (limited to 'recipes-graphics/xorg-xserver/xserver-xorg/crosscompile.patch')
| -rw-r--r-- | recipes-graphics/xorg-xserver/xserver-xorg/crosscompile.patch | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/recipes-graphics/xorg-xserver/xserver-xorg/crosscompile.patch b/recipes-graphics/xorg-xserver/xserver-xorg/crosscompile.patch new file mode 100644 index 0000000..2f98bb8 --- /dev/null +++ b/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}" ]) |