xorg xserver: enable xcalibrate to get touchscreens working a bit better

6 files changed, 9 insertions, 6 deletions

diff --git a/packages/xorg-xserver/xorg-xserver-common.inc b/packages/xorg-xserver/xorg-xserver-common.inc
index 2c16eeacc9..190de2c49a 100644
--- a/packages/xorg-xserver/xorg-xserver-common.inc
+++ b/packages/xorg-xserver/xorg-xserver-common.inc
@@ -11,7 +11,7 @@ scrnsaverproto bigreqsproto resourceproto fontsproto inputproto \
 xf86dgaproto videoproto compositeproto trapproto recordproto dmxproto \
 resourceproto xineramaproto xtrans evieext libxkbfile libxfont libxau \
 libfontenc libxdmcp libxxf86vm libxaw libxmu libxt libxpm libxext libx11 \
-libxkbui libxxf86misc libxi libdmx libxtst libxres mesa"
+libxkbui libxxf86misc libxi libdmx libxtst libxres mesa libxcalibrate"
 
 RECOMMENDS_${PN} = "hal"
 
@@ -23,6 +23,9 @@ S = "${WORKDIR}/${XORG_PN}-${PV}"
 
 inherit autotools pkgconfig
 
+EXTRA_OECONF += " --enable-xcalibrate \
+                  ac_cv_file__usr_share_sgml_X11_defs_ent=no"
+
 PACKAGES =+ "xserver-security-policy"
 FILES_xserver-security-policy += "${libdir}/xserver/SecurityPolicy"
 RRECOMMENDS_${PN} += "xserver-security-policy xkeyboard-config xorg-minimal-fonts rgb"
diff --git a/packages/xorg-xserver/xserver-xorg_1.2.0.bb b/packages/xorg-xserver/xserver-xorg_1.2.0.bb
index e4a0a22db0..218e6dc026 100644
--- a/packages/xorg-xserver/xserver-xorg_1.2.0.bb
+++ b/packages/xorg-xserver/xserver-xorg_1.2.0.bb
@@ -2,7 +2,7 @@ MESA_VER = "6.5.2"
 
 require xorg-xserver-common.inc
 PE = "1"
-PR = "r2"
+PR = "r3"
 
 EXTRA_OECONF += " ac_cv_file__usr_share_sgml_X11_defs_ent=no "
 
diff --git a/packages/xorg-xserver/xserver-xorg_1.3.0.0.bb b/packages/xorg-xserver/xserver-xorg_1.3.0.0.bb
index d6633f1f88..d28fec16e1 100644
--- a/packages/xorg-xserver/xserver-xorg_1.3.0.0.bb
+++ b/packages/xorg-xserver/xserver-xorg_1.3.0.0.bb
@@ -2,7 +2,7 @@ MESA_VER = "6.5.2"
 
 require xorg-xserver-common.inc
 PE = "1"
-PR = "r6"
+PR = "r7"
 
 SRC_URI += "file://drmfix.patch;patch=1 \
             file://glyphstr.patch;patch=1"
diff --git a/packages/xorg-xserver/xserver-xorg_1.4.2.bb b/packages/xorg-xserver/xserver-xorg_1.4.2.bb
index b6685d43a1..3f53002a34 100644
--- a/packages/xorg-xserver/xserver-xorg_1.4.2.bb
+++ b/packages/xorg-xserver/xserver-xorg_1.4.2.bb
@@ -3,7 +3,7 @@ require xorg-xserver-common.inc
 DESCRIPTION = "the X.Org X server"
 DEPENDS += "pixman"
 PE = "1"
-PR = "r6"
+PR = "r7"
 
 SRC_URI += "file://drmfix.patch;patch=1 \
             file://pkgconfig_fix.patch;patch=1 \
diff --git a/packages/xorg-xserver/xserver-xorg_1.4.bb b/packages/xorg-xserver/xserver-xorg_1.4.bb
index b6685d43a1..3f53002a34 100644
--- a/packages/xorg-xserver/xserver-xorg_1.4.bb
+++ b/packages/xorg-xserver/xserver-xorg_1.4.bb
@@ -3,7 +3,7 @@ require xorg-xserver-common.inc
 DESCRIPTION = "the X.Org X server"
 DEPENDS += "pixman"
 PE = "1"
-PR = "r6"
+PR = "r7"
 
 SRC_URI += "file://drmfix.patch;patch=1 \
             file://pkgconfig_fix.patch;patch=1 \
diff --git a/packages/xorg-xserver/xserver-xorg_cvs.bb b/packages/xorg-xserver/xserver-xorg_cvs.bb
index abbfb3fcab..c1574a621b 100644
--- a/packages/xorg-xserver/xserver-xorg_cvs.bb
+++ b/packages/xorg-xserver/xserver-xorg_cvs.bb
@@ -1,7 +1,7 @@
 SECTION = "x11/base"
 LICENSE = "Xorg"
 PROVIDES = "virtual/xserver"
-PR = "r5"
+PR = "r7"
 PV = "6.8.1+cvs${SRCDATE}"
 
 DEPENDS = "fontconfig freetype libxi libxmu flex-2.5.4-native"