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

diff --git a/meta/packages/xorg-xserver/xserver-kdrive-common.inc b/meta/packages/xorg-xserver/xserver-kdrive-common.inc
index 625653c614879bb6ab7306c610700b0e9d1c3b9a..e46abe3fe87ec741dc975441fdd8123c9be894e5 100644 (file)
--- 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 62b509a2ef0449687ae13be72de3461ae0699706..372971e2ed61fa3f8d50127c4d6d2f45ba6150a2 100644 (file)
--- 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 bcf225953b8b8344a48667b7edbd03d5b7770b73..bd54518105e1f344640d4ae33e97ed524de43fd5 100644 (file)
--- 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 d3765aa5423a048278c52f7836e88f2e030cf37f..f1be1420dc26dc6e73a077a40e11f1fd3da943cb 100644 (file)
--- 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} \