diff options
| author | Yu Ke <ke.yu@intel.com> | 2011-05-09 16:12:51 +0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-05-11 16:43:22 +0100 |
| commit | 57d50baa7dc318471d5915c405ccba8032a02249 (patch) | |
| tree | 1b3ab1da8f286de410e51df8443537aee66e30c8 /meta/recipes-graphics/xorg-xserver/xserver-xf86-lite/crosscompile.patch | |
| parent | 495c109534b32be107c55864c0818df9387284cf (diff) | |
| download | ast2050-yocto-poky-57d50baa7dc318471d5915c405ccba8032a02249.zip ast2050-yocto-poky-57d50baa7dc318471d5915c405ccba8032a02249.tar.gz | |
xserver-xf86-lite: upgrade to from 1.7 RC2 to 1.10.1
- remove the following patches, since they are already in upstream
xserver-xf86-lite/libdri-xinerama-symbol.patch,
xserver-xf86-lite/drmfix.patch
xserver-xf86-lite/nodolt.patch
xserver-xf86-lite/revert_make_sys_c_use_unaligned_access_functions.patch
- rebase the patch for 1.10.1
xserver-xf86-lite/crosscompile.patch
(From OE-Core rev: 057613870f54d1f9a25317e350219d967fcd25ef)
Signed-off-by: Yu Ke <ke.yu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/xorg-xserver/xserver-xf86-lite/crosscompile.patch')
| -rw-r--r-- | meta/recipes-graphics/xorg-xserver/xserver-xf86-lite/crosscompile.patch | 35 |
1 files changed, 19 insertions, 16 deletions
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-lite/crosscompile.patch b/meta/recipes-graphics/xorg-xserver/xserver-xf86-lite/crosscompile.patch index 2341e40..2f98bb8 100644 --- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-lite/crosscompile.patch +++ b/meta/recipes-graphics/xorg-xserver/xserver-xf86-lite/crosscompile.patch @@ -1,19 +1,22 @@ -Index: xorg-server-1.7.99.2/configure.ac -=================================================================== ---- xorg-server-1.7.99.2.orig/configure.ac 2010-01-29 16:38:49.000000000 +0000 -+++ xorg-server-1.7.99.2/configure.ac 2010-01-29 16:42:39.000000000 +0000 -@@ -503,14 +503,10 @@ - - dnl Uses --default-font-path if set, otherwise checks for /etc/X11/fontpath.d, - dnl otherwise uses standard subdirectories of FONTROOTDIR --AC_CHECK_FILE([${sysconfdir}/X11/fontpath.d], -- [DEFAULT_FONT_PATH='catalogue:${sysconfdir}/X11/fontpath.d'], -- [ - DEFAULT_FONT_PATH="${FONTMISCDIR}/,${FONTTTFDIR}/,${FONTOTFDIR}/,${FONTTYPE1DIR}/,${FONT100DPIDIR}/,${FONT75DPIDIR}/" - case $host_os in - darwin*) DEFAULT_FONT_PATH="${DEFAULT_FONT_PATH},/Library/Fonts,/System/Library/Fonts" ;; - esac -- ]) +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}" ]) |
