Merge oe-devel@oe-devel.bkbits.net:packages

[openembedded.git] / tslib / tslib_cvs.oe

diff --git a/tslib/tslib_cvs.oe b/tslib/tslib_cvs.oe
index e70b081..69cc2ac 100644 (file)
--- a/tslib/tslib_cvs.oe
+++ b/tslib/tslib_cvs.oe
@@ -1,28 +1,24 @@
-PV = "0.1cvs${CVSDATE}"
-PR = "r1"
-
+SECTION = "base"
 DESCRIPTION = "tslib is a touchscreen access library."
+PV = "0.0cvs${CVSDATE}"
+PR = "r8"
+
+SRC_URI = "cvs://cvs:@pubcvs.arm.linux.org.uk/mnt/src/cvsroot;module=tslib \
+          file://ts.conf \
+          file://tslib.sh \
+          file://initialize_djs.patch;patch=1 "
+SRC_URI_append_ramses += " file://devfs.patch;patch=1"
+SRC_URI_append_ramses += " file://event1.patch;patch=1"
+S = "${WORKDIR}/tslib"
 
 CONFFILES_${PN} = "${sysconfdir}/ts.conf"
 
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=apps/tslib \
-           file://collie/ts.conf \
-           file://collie/tslib.sh \
-           file://corgi/ts.conf \
-           file://corgi/tslib.sh \
-           file://h3600/ts.conf \
-           file://h3600/tslib.sh \
-           file://husky/ts.conf \
-           file://husky/tslib.sh \
-           file://poodle/ts.conf \
-           file://poodle/tslib.sh \
-           file://shepherd/ts.conf \
-           file://shepherd/tslib.sh"
-S = "${WORKDIR}/tslib"
-
 inherit autotools
 
+PACKAGES = "libts libts-dev tslib-tests tslib-calibrate"
 EXTRA_OECONF = "--enable-shared"
+EXTRA_OECONF_append_ramses = " --enable-input --disable-ucb1x00 --disable-corgi --disable-collie --disable-h3600 --disable-mk712 --disable-arctic2"
+EXTRA_OECONF_beagle = "--enable-shared --enable-h3600 --disable-input --disable-corgi --disable-collie --disable-mk712 --disable-arctic2 --disable-ucb1x00 "
 
 do_stage () {
        oe_libinstall -so -C src libts-0.0 ${STAGING_LIBDIR}
@@ -32,12 +28,16 @@ do_stage () {
 }
 
 do_install_prepend () {
-       oe_machinstall -m 0644 ${WORKDIR}/ts.conf ${S}/etc/ts.conf
+       install -m 0644 ${WORKDIR}/ts.conf ${S}/etc/ts.conf
 }
 
 do_install_append() {
        install -d ${D}/${sysconfdir}/profile.d/
-       oe_machinstall -m 0755 ${WORKDIR}/tslib.sh ${D}/${sysconfdir}/profile.d/
+       install -m 0755 ${WORKDIR}/tslib.sh ${D}/${sysconfdir}/profile.d/
 }
 
-FILES_${PN} += " ${libdir}/ts/*.so ${datadir}/ts/plugins/*.so"
+FILES_libts  = "${sysconfdir}/ts.conf ${sysconfdir}/profile.d/tslib.sh "
+FILES_libts += "${libdir}/*.so.* ${libdir}/ts/*.so*"
+FILES_libts-dev = "${FILES_tslib-dev}"
+FILES_tslib-calibrate += "${bindir}/ts_calibrate"
+FILES_tslib-tests = "${bindir}/ts_harvest ${bindir}/ts_print ${bindir}/ts_print_raw ${bindir}/ts_test"