8 files changed, 57 insertions, 25 deletions

diff --git a/meta/conf/distro/include/preferred-xorg-versions.inc b/meta/conf/distro/include/preferred-xorg-versions.inc
index 136081db2d..66a473b668 100644
--- a/meta/conf/distro/include/preferred-xorg-versions.inc
+++ b/meta/conf/distro/include/preferred-xorg-versions.inc
@@ -129,7 +129,7 @@ PREFERRED_VERSION_xproxymanagementprotocol ?= "1.0.3"
 PREFERRED_VERSION_xrandr ?= "1.3.2"
 PREFERRED_VERSION_xrdb ?= "1.0.5"
 PREFERRED_VERSION_xserver-kdrive ?= "1.7.99.2"
-PREFERRED_VERSION_xserver-xf86-dri-lite ?= "1.7.99.2"
+PREFERRED_VERSION_xserver-xf86-dri-lite ?= "1.8.99.904"
 PREFERRED_VERSION_xset ?= "1.1.0"
 PREFERRED_VERSION_xtrans ?= "1.2.5"
 PREFERRED_VERSION_xtrans-native ?= "1.2.5"
diff --git a/meta/packages/xorg-driver/xf86-input-evdev_2.4.0.bb b/meta/packages/xorg-driver/xf86-input-evdev_2.4.0.bb
index 49bfb30c94..fad47fbc00 100644
--- a/meta/packages/xorg-driver/xf86-input-evdev_2.4.0.bb
+++ b/meta/packages/xorg-driver/xf86-input-evdev_2.4.0.bb
@@ -4,4 +4,4 @@ DESCRIPTION = "X.Org X server -- evdev input driver"
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=ebf4ad82cd33b1432eacb1798a43c092"
 
-PR = "r0"
+PR = "r1"
diff --git a/meta/packages/xorg-driver/xf86-input-keyboard_1.4.0.bb b/meta/packages/xorg-driver/xf86-input-keyboard_1.4.0.bb
index 1153826585..1efb505e27 100644
--- a/meta/packages/xorg-driver/xf86-input-keyboard_1.4.0.bb
+++ b/meta/packages/xorg-driver/xf86-input-keyboard_1.4.0.bb
@@ -4,3 +4,4 @@ DESCRIPTION = "X.Org X server -- keyboard input driver"
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=eae2c98cbb8c60401893ff9313ff3826"
 
+PR = "r1"
diff --git a/meta/packages/xorg-driver/xf86-video-vmware_11.0.1.bb b/meta/packages/xorg-driver/xf86-video-vmware_11.0.1.bb
index dafdbdf481..9628f461a7 100644
--- a/meta/packages/xorg-driver/xf86-video-vmware_11.0.1.bb
+++ b/meta/packages/xorg-driver/xf86-video-vmware_11.0.1.bb
@@ -7,6 +7,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4641deddaa80fe7ca88e944e1fd94a94"
 DEPENDS += "virtual/libx11 libxvmc drm glproto \
             virtual/libgl xineramaproto libpciaccess"
 
-PR = "r0"
+PR = "r1"
 
 COMPATIBLE_HOST = '(i.86.*-linux)'
diff --git a/meta/packages/xorg-xserver/xserver-xf86-common.inc b/meta/packages/xorg-xserver/xserver-xf86-common.inc
index 9fc5bdc4cb..e94df0c768 100644
--- a/meta/packages/xorg-xserver/xserver-xf86-common.inc
+++ b/meta/packages/xorg-xserver/xserver-xf86-common.inc
@@ -30,7 +30,7 @@ FILES_${PN}-dbg += "${libdir}/xorg/modules/.debug \
                     ${libdir}/xorg/modules/*/*/.debug \
                     "
 
-SRC_URI += "file://macro_tweak.patch;patch=1"
+SRC_URI += "file://macro_tweak.patch"
 
 do_install_append () {
         install -d ${D}/${libdir}/X11/fonts/
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}" ])
diff --git a/meta/packages/xorg-xserver/xserver-xf86-dri-lite/macro_tweak.patch b/meta/packages/xorg-xserver/xserver-xf86-dri-lite/macro_tweak.patch
new file mode 100644
index 0000000000..cd408c7bc2
--- /dev/null
+++ b/meta/packages/xorg-xserver/xserver-xf86-dri-lite/macro_tweak.patch
@@ -0,0 +1,28 @@
+This is the revised version of files/macro_tweak.patch for
+xorg-server 1.8.99.904.
+
+the files/macro_tweak.patch can not removed now since it is used by
+xserver-kdrive-1.7.99.2 and xserver-xf86-lite_1.7.99.2. Once they
+are all upgraded to 1.8.99.904, the the files/macro_tweak.patch
+can be safely replace by this patch.
+
+Signed-off-by: Yu Ke <ke.yu@intel.com>
+
+diff --git a/xorg-server.m4 b/xorg-server.m4
+index bdecf62..040fdb8 100644
+--- a/xorg-server.m4
++++ b/xorg-server.m4
+@@ -28,10 +28,12 @@ dnl
+ # Checks for the $1 define in xorg-server.h (from the sdk).  If it
+ # is defined, then add $1 to $REQUIRED_MODULES.
+ 
++m4_pattern_allow(PKG_CONFIG_SYSROOT_DIR)
++
+ AC_DEFUN([XORG_DRIVER_CHECK_EXT],[
+        AC_REQUIRE([PKG_PROG_PKG_CONFIG])
+        SAVE_CFLAGS="$CFLAGS"
+-       CFLAGS="$CFLAGS -I`$PKG_CONFIG --variable=sdkdir xorg-server`"
++       CFLAGS="$CFLAGS -I$PKG_CONFIG_SYSROOT_DIR`$PKG_CONFIG --variable=sdkdir xorg-server`"
+        AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+ #include "xorg-server.h"
+ #if !defined $1
diff --git a/meta/packages/xorg-xserver/xserver-xf86-dri-lite_1.7.99.2.bb b/meta/packages/xorg-xserver/xserver-xf86-dri-lite_1.8.99.904.bb
index cde1712992..0be57a5ce2 100644
--- a/meta/packages/xorg-xserver/xserver-xf86-dri-lite_1.7.99.2.bb
+++ b/meta/packages/xorg-xserver/xserver-xf86-dri-lite_1.8.99.904.bb
@@ -1,18 +1,20 @@
 require xserver-xf86-dri-lite.inc
 
-PE = "1"
-PR = "r3"
+LIC_FILES_CHKSUM = "file://COPYING;md5=3dd2bbe3563837f80ed8926b06c1c353"
 
 PROTO_DEPS += "xf86driproto dri2proto"
 
 DEPENDS += "font-util"
 
-SRC_URI += "file://nodolt.patch;patch=1 \
-            file://crosscompile.patch;patch=1"
+PE = "1"
+PR = "r0"
+
+SRC_URI += "file://nodolt.patch \
+            file://crosscompile.patch"
 #           file://libdri-xinerama-symbol.patch;patch=1 \
 #           file://xserver-boottime.patch;patch=1"
 
 # Misc build failure for master HEAD
-SRC_URI += "file://fix_open_max_preprocessor_error.patch;patch=1"
+SRC_URI += "file://fix_open_max_preprocessor_error.patch"
 
 EXTRA_OECONF += "--enable-dri --enable-dri2"