From 21f8d46cd7c044364e5a0e38231f3dbe5f3f74e8 Mon Sep 17 00:00:00 2001
From: Marcin Juszkiewicz <hrw@openedhand.com>
Date: Wed, 11 Jul 2007 08:35:03 +0000
Subject: 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
---
 meta/packages/xorg-xserver/xserver-kdrive-common.inc        | 4 ++++
 meta/packages/xorg-xserver/xserver-kdrive-xomap_1.1.99.3.bb | 4 ++++
 meta/packages/xorg-xserver/xserver-kdrive_1.1.0.bb          | 4 ++++
 meta/packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb        | 2 +-
 4 files changed, 13 insertions(+), 1 deletion(-)

(limited to 'meta')

diff --git a/meta/packages/xorg-xserver/xserver-kdrive-common.inc b/meta/packages/xorg-xserver/xserver-kdrive-common.inc
index 625653c61..e46abe3fe 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 62b509a2e..372971e2e 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 bcf225953..bd5451810 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 d3765aa54..f1be1420d 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} \
-- 
cgit v1.2.3