summaryrefslogtreecommitdiff
path: root/recipes
diff options
context:
space:
mode:
Diffstat (limited to 'recipes')
-rw-r--r--recipes/xorg-xserver/files/ac_check_file.cross.patch30
-rw-r--r--recipes/xorg-xserver/xserver-xorg_git.bb3
2 files changed, 1 insertions, 32 deletions
diff --git a/recipes/xorg-xserver/files/ac_check_file.cross.patch b/recipes/xorg-xserver/files/ac_check_file.cross.patch
deleted file mode 100644
index 5d3b18fe91..0000000000
--- a/recipes/xorg-xserver/files/ac_check_file.cross.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-AC_CHECK_FILE is not available for crosscompiling
-error: cannot check for file existence when cross compiling
-
-http://cgit.freedesktop.org/xorg/xserver/commit/?id=56658fc06cb773ed20ef1b23a3fe918c0d3b36bb
-===================================================================
---- a/configure.ac.orig 2010-02-10 15:41:33.000000000 +0100
-+++ b/configure.ac 2010-02-10 15:41:51.000000000 +0100
-@@ -505,14 +505,14 @@
-
- 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
-- ])
-+dnl AC_CHECK_FILE([${sysconfdir}/X11/fontpath.d],
-+dnl [DEFAULT_FONT_PATH='catalogue:${sysconfdir}/X11/fontpath.d'],
-+dnl [
-+dnl DEFAULT_FONT_PATH="${FONTMISCDIR}/,${FONTTTFDIR}/,${FONTOTFDIR}/,${FONTTYPE1DIR}/,${FONT100DPIDIR}/,${FONT75DPIDIR}/"
-+dnl case $host_os in
-+dnl darwin*) DEFAULT_FONT_PATH="${DEFAULT_FONT_PATH},/Library/Fonts,/System/Library/Fonts" ;;
-+dnl esac
-+dnl ])
- 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}" ])
diff --git a/recipes/xorg-xserver/xserver-xorg_git.bb b/recipes/xorg-xserver/xserver-xorg_git.bb
index 8c3f4a417b..f417ac201a 100644
--- a/recipes/xorg-xserver/xserver-xorg_git.bb
+++ b/recipes/xorg-xserver/xserver-xorg_git.bb
@@ -9,9 +9,8 @@ PE = "2"
DEFAULT_PREFERENCE = "-1"
-SRCREV = "db687f718f760ba254ab51994769db101dc9ca3a"
+SRCREV = "84905007702da2c05a4f7446b3fc5ff52be49655"
SRC_URI = "git://anongit.freedesktop.org/xorg/xserver;protocol=git;branch=master \
- file://ac_check_file.cross.patch;patch=1 \
file://dolt-fix-1.7.0.patch;patch=1 \
file://randr-support-1.7.0.patch;patch=1 \
"