summaryrefslogtreecommitdiff
path: root/packages/tslib
diff options
context:
space:
mode:
authorKoen Kooi <koen@openembedded.org>2006-07-04 17:42:49 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2006-07-04 17:42:49 +0000
commit3fbcf379bbd88204d7dd396415bbb65346feeaab (patch)
tree9a74ccf298a095cc74eb6bcc2cb878f98c5b548d /packages/tslib
parent7fd16b8fe80ee1707595b3a6026e9026a0717502 (diff)
parent86d9211f52171f3367ce974b997e16864e20118d (diff)
merge of 8f7f4f1a6f08da91c5fe2312650063893394888b
and f69ed55f40216d16d8f1cb7559d13b46385991b2
Diffstat (limited to 'packages/tslib')
-rw-r--r--packages/tslib/tslib-maemo_0.0.1-15.bb18
-rw-r--r--packages/tslib/tslib_20060703.bb (renamed from packages/tslib/tslib_cvs.bb)7
2 files changed, 12 insertions, 13 deletions
diff --git a/packages/tslib/tslib-maemo_0.0.1-15.bb b/packages/tslib/tslib-maemo_0.0.1-15.bb
index f744833d57..e303b40841 100644
--- a/packages/tslib/tslib-maemo_0.0.1-15.bb
+++ b/packages/tslib/tslib-maemo_0.0.1-15.bb
@@ -1,25 +1,18 @@
-DEFAULT_PREFERENCE = "-1"
-SECTION = "base"
DESCRIPTION = "tslib is a touchscreen access library (maemo patched version)."
-PR = "r2"
+SECTION = "GPL"
+LICENSE = "LGPL"
PROVIDES = "tslib"
+PR = "r3"
DEFAULT_PREFERENCE = "-1"
-SRC_URI_OVERRIDES_PACKAGE_ARCH = "0"
-PACKAGE_ARCH_tslib-conf = "${MACHINE_ARCH}"
-
SRC_URI = "http://repository.maemo.org/pool/maemo/ossw/source/t/tslib/tslib_${PV}.tar.gz \
file://ts.conf \
file://tslib.sh"
-
S = "${WORKDIR}/tslib"
-LICENSE = "LGPL"
-CONFFILES_${PN} = "${sysconfdir}/ts.conf"
inherit autotools
-PACKAGES = "tslib-maemo-conf libts-maemo libts-maemo-dev tslib-maemo-tests tslib-maemo-calibrate"
EXTRA_OECONF = "--enable-shared"
do_stage () {
@@ -36,6 +29,11 @@ do_install_append() {
install -m 0755 ${WORKDIR}/tslib.sh ${D}${sysconfdir}/profile.d/
}
+SRC_URI_OVERRIDES_PACKAGE_ARCH = "0"
+PACKAGE_ARCH_tslib-conf = "${MACHINE_ARCH}"
+CONFFILES_${PN} = "${sysconfdir}/ts.conf"
+PACKAGES = "tslib-maemo-conf libts-maemo libts-maemo-dev tslib-maemo-tests tslib-maemo-calibrate"
+
RDEPENDS_libts-maemo = "tslib-maemo-conf"
RPROVIDES_tslib-maemo-conf = "tslib-conf"
diff --git a/packages/tslib/tslib_cvs.bb b/packages/tslib/tslib_20060703.bb
index bd3478191e..f4ff493b57 100644
--- a/packages/tslib/tslib_cvs.bb
+++ b/packages/tslib/tslib_20060703.bb
@@ -4,10 +4,11 @@ AUTHOR = "Russell King w/ plugins by Chris Larson et. al."
SECTION = "base"
LICENSE = "LGPL"
-PV = "0.0+cvs${SRCDATE}"
-PR = "r39"
+RV := "${PV}"
+PV = "0.1+cvs-${RV}"
+PR = "r0"
-SRC_URI = "cvs://cvs:@pubcvs.arm.linux.org.uk/mnt/src/cvsroot;module=tslib \
+SRC_URI = "cvs://cvs:@pubcvs.arm.linux.org.uk/mnt/src/cvsroot;module=tslib;date=${RV} \
file://usec_fix.patch;patch=1 \
file://ts.conf \
file://ts-2.6.conf \