xserver-kdrive: fix build after tslib version fix

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2153 311d38ba-8fff-0310-9ca6-ca027cbcb966

4 files changed, 13 insertions, 1 deletions

diff --git a/meta/packages/xorg-xserver/xserver-kdrive-common.inc b/meta/packages/xorg-xserver/xserver-kdrive-common.inc
index 625653c614..e46abe3fe8 100644
--- a/meta/packages/xorg-xserver/xserver-kdrive-common.inc
+++ b/meta/packages/xorg-xserver/xserver-kdrive-common.inc
@@ -123,3 +123,7 @@ EXTRA_OECONF = "--enable-composite --enable-kdrive \
                 --with-default-font-path=built-ins \
                 --enable-tslib --enable-xcalibrate \
                 ac_cv_file__usr_share_X11_sgml_defs_ent=no"
+
+do_configure_prepend() {
+    sed -i -e 's/tslib-0.0/tslib-1.0/' ${S}/configure.ac
+}
diff --git a/meta/packages/xorg-xserver/xserver-kdrive-xomap_1.1.99.3.bb b/meta/packages/xorg-xserver/xserver-kdrive-xomap_1.1.99.3.bb
index 62b509a2ef..372971e2ed 100644
--- a/meta/packages/xorg-xserver/xserver-kdrive-xomap_1.1.99.3.bb
+++ b/meta/packages/xorg-xserver/xserver-kdrive-xomap_1.1.99.3.bb
@@ -45,3 +45,7 @@ EXTRA_OECONF = "--enable-composite --enable-kdrive --enable-builtin-fonts \
                 --with-default-font-path=built-ins \
                 ac_cv_file__usr_share_X11_sgml_defs_ent=no \
                 --enable-xomap"
+
+do_configure_prepend() {
+    sed -i -e 's/tslib-0.0/tslib-1.0/' ${S}/configure.ac
+}
diff --git a/meta/packages/xorg-xserver/xserver-kdrive_1.1.0.bb b/meta/packages/xorg-xserver/xserver-kdrive_1.1.0.bb
index bcf225953b..bd54518105 100644
--- a/meta/packages/xorg-xserver/xserver-kdrive_1.1.0.bb
+++ b/meta/packages/xorg-xserver/xserver-kdrive_1.1.0.bb
@@ -54,3 +54,7 @@ EXTRA_OECONF = "--enable-composite --enable-kdrive \
                 --disable-xevie --disable-xprint --disable-xtrap \
                 --with-default-font-path=built-ins \
                 ac_cv_file__usr_share_X11_sgml_defs_ent=no"
+
+do_configure_prepend() {
+    sed -i -e 's/tslib-0.0/tslib-1.0/' ${S}/configure.ac
+}
diff --git a/meta/packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb b/meta/packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb
index d3765aa542..f1be1420dc 100644
--- a/meta/packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb
+++ b/meta/packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb
@@ -3,7 +3,7 @@ require xserver-kdrive-common.inc
 DEPENDS += "libxkbfile libxcalibrate"
 
 PE = "1"
-PR = "r14"
+PR = "r15"
 
 SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \
         ${KDRIVE_COMMON_PATCHES} \