diff options
| author | Yu Ke <ke.yu@intel.com> | 2010-07-07 17:28:12 +0800 |
|---|---|---|
| committer | Saul Wold <Saul.Wold@intel.com> | 2010-07-08 21:19:45 -0700 |
| commit | f7a98901d91a0f4b3b865419861c3f8fda79f301 (patch) | |
| tree | a4b79f834f153b74a685f882849e9ecd7d882173 /meta/packages/xorg-xserver/xserver-xf86-dri-lite/crosscompile.patch | |
| parent | 3e9592e9da5eca850accf842557ef29aef788ee4 (diff) | |
| download | openembedded-core-f7a98901d91a0f4b3b865419861c3f8fda79f301.tar.gz openembedded-core-f7a98901d91a0f4b3b865419861c3f8fda79f301.tar.bz2 openembedded-core-f7a98901d91a0f4b3b865419861c3f8fda79f301.zip | |
xserver-xf86-dri-lite: upgrade to 1.8.99.904 (1.9 RC4)
Also update the releated x driver PR value, since they
need recompile to match the new xserver ABI
Signed-off-by: Yu Ke <ke.yu@intel.com>
Diffstat (limited to 'meta/packages/xorg-xserver/xserver-xf86-dri-lite/crosscompile.patch')
| -rw-r--r-- | meta/packages/xorg-xserver/xserver-xf86-dri-lite/crosscompile.patch | 33 |
1 files changed, 17 insertions, 16 deletions
diff --git a/meta/packages/xorg-xserver/xserver-xf86-dri-lite/crosscompile.patch b/meta/packages/xorg-xserver/xserver-xf86-dri-lite/crosscompile.patch index 2341e40bca..8b82de2223 100644 --- a/meta/packages/xorg-xserver/xserver-xf86-dri-lite/crosscompile.patch +++ b/meta/packages/xorg-xserver/xserver-xf86-dri-lite/crosscompile.patch @@ -1,19 +1,20 @@ -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 -- ]) +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}" ]) |