diff options
| author | Martin Jansa <Martin.Jansa@gmail.com> | 2011-10-07 17:07:09 +0200 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-10-11 17:04:32 +0100 |
| commit | aaa137f54c246b61a94b62a731de67f09e688a2a (patch) | |
| tree | 8da4c93b3acc9fb899fb16d45787fc3fbd5abe57 /meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.1/crosscompile.patch | |
| parent | 9ccc192d00931288c88503536ba41252fb94e880 (diff) | |
| download | openembedded-core-aaa137f54c246b61a94b62a731de67f09e688a2a.tar.gz openembedded-core-aaa137f54c246b61a94b62a731de67f09e688a2a.tar.bz2 openembedded-core-aaa137f54c246b61a94b62a731de67f09e688a2a.tar.xz openembedded-core-aaa137f54c246b61a94b62a731de67f09e688a2a.zip | |
xserver-xorg: move patches to xserver-xf86-dri-lite-1.11.1 and use same directory from xserver-xf86-lite recipe
* FILESEXTRAPATHS needs to be in xserver-xf86-lite_1.11.1
because in .inc we don't have ${PV} expanded yet
* crosscompile.patch macro_tweak.patch were identical
* fix_open_max_preprocessor_error.patch has only different header
# $ diff xserver-xorg/fix_open_max_preprocessor_error.patch xserver-xorg-dri/fix_open_max_preprocessor_error.patch
1c1
< Upstream-Status: Pending
---
> Upstream-Status: Inappropriate [embedded specific]
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.1/crosscompile.patch')
| -rw-r--r-- | meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.1/crosscompile.patch | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.1/crosscompile.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.1/crosscompile.patch new file mode 100644 index 000000000..2f98bb8c8 --- /dev/null +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.1/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}" ]) |