From: Koen Kooi <koen@openembedded.org>
Date: Wed, 29 Oct 2008 18:03:15 +0000 (+0100)
Subject: xserver xorg 1.4.2: try harder to get xcalibrate enabled
X-Git-Tag: Release-2010-05/1~5562
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f36893c64eb7873f5865ecf485a4fadac8f0bbe9;p=openembedded.git

xserver xorg 1.4.2: try harder to get xcalibrate enabled
---

diff --git a/packages/xorg-xserver/files/xcalibrate-xorg.diff b/packages/xorg-xserver/files/xcalibrate-xorg.diff
new file mode 100644
index 0000000000..65121efc3b
--- /dev/null
+++ b/packages/xorg-xserver/files/xcalibrate-xorg.diff
@@ -0,0 +1,11 @@
+--- /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
diff --git a/packages/xorg-xserver/xserver-xorg_1.4.2.bb b/packages/xorg-xserver/xserver-xorg_1.4.2.bb
index 3f53002a34..1abac8443f 100644
--- a/packages/xorg-xserver/xserver-xorg_1.4.2.bb
+++ b/packages/xorg-xserver/xserver-xorg_1.4.2.bb
@@ -3,14 +3,14 @@ require xorg-xserver-common.inc
 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 "