--- /dev/null
+--- /tmp/configure.ac 2008-10-29 18:53:23.000000000 +0100
++++ xorg-server-1.4.2/configure.ac 2008-10-29 18:53:40.000000000 +0100
+@@ -865,7 +865,7 @@
+ FONTPATH="built-ins"
+ fi
+
+-if test "x$XCALIBRATE" = xyes && test "$KDRIVE" = yes; then
++if test "x$XCALIBRATE" = xyes ; then
+ AC_DEFINE(XCALIBRATE, 1, [Build XCalibrate extension])
+ REQUIRED_MODULES="$REQUIRED_MODULES xcalibrateproto"
+ else
DESCRIPTION = "the X.Org X server"
DEPENDS += "pixman"
PE = "1"
-PR = "r7"
+PR = "r8"
SRC_URI += "file://drmfix.patch;patch=1 \
file://pkgconfig_fix.patch;patch=1 \
- file://sysroot_fix.patch;patch=1"
+ file://sysroot_fix.patch;patch=1 \
+ file://xcalibrate-xorg.diff \
+"
MESA_VER = "7.0.2"
-EXTRA_OECONF += " ac_cv_file__usr_share_sgml_X11_defs_ent=no "
-
export LDFLAGS += " -ldl "