From c24ce903757193dd686ce2f6614ee548d919646a Mon Sep 17 00:00:00 2001
From: Richard Purdie <richard@openedhand.com>
Date: Tue, 21 Nov 2006 09:58:11 +0000
Subject: tslib: Sync major cleanup I made in OE.dev

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@898 311d38ba-8fff-0310-9ca6-ca027cbcb966
---
 meta/packages/tslib/tslib_1.0.bb | 83 ++++++++++++++++++++++------------------
 1 file changed, 45 insertions(+), 38 deletions(-)

(limited to 'meta/packages/tslib/tslib_1.0.bb')

diff --git a/meta/packages/tslib/tslib_1.0.bb b/meta/packages/tslib/tslib_1.0.bb
index f63a8ddc7..5e5f61cb3 100644
--- a/meta/packages/tslib/tslib_1.0.bb
+++ b/meta/packages/tslib/tslib_1.0.bb
@@ -1,35 +1,31 @@
+DESCRIPTION = "tslib is a plugin-based flexible touchscreen access library."
+HOMEPAGE = "http://cvs.arm.linux.org.uk/"
+AUTHOR = "Russell King w/ plugins by Chris Larson et. al."
 SECTION = "base"
-DESCRIPTION = "tslib is a touchscreen access library."
-PR = "r3"
-SRCDATE_tslib = "now"
+LICENSE = "LGPL"
 
-SRC_URI_OVERRIDES_PACKAGE_ARCH = "0"
-PACKAGE_ARCH_tslib-conf = "${MACHINE_ARCH}"
-PACKAGE_ARCH_mnci = "${MACHINE_ARCH}"
+PR = "r3"
 
-SRC_URI = "svn://svn.berlios.de/svnroot/repos/tslib/tags/tslib;module=${PV};proto=http \
-           file://ts.conf file://ts-2.6.conf \
-           file://ts.conf-h3600-2.4 file://ts.conf-simpad-2.4 \
-           file://ts.conf-corgi-2.4 file://ts.conf-collie-2.4 \
-	   file://tslib.sh"
+SRC_URI = "http://download.berlios.de/tslib/tslib-1.0.tar.bz2 \
+           file://ts.conf \
+           file://ts.conf-h3600-2.4 \
+           file://ts.conf-simpad-2.4 \
+           file://ts.conf-corgi-2.4 \
+           file://ts.conf-collie-2.4 \
+           file://tslib.sh"
 SRC_URI_append_mnci += " file://devfs.patch;patch=1"
 SRC_URI_append_mnci += " file://event1.patch;patch=1"
-S = "${WORKDIR}/${PV}"
-LICENSE = "LGPL"
-CONFFILES_${PN} = "${sysconfdir}/ts.conf"
 
 inherit autotools pkgconfig
 
-PACKAGES = "tslib-conf libts libts-dev tslib-tests tslib-calibrate"
 EXTRA_OECONF        = "--enable-shared"
 EXTRA_OECONF_mnci   = "--enable-shared --disable-h3600 --enable-input --disable-corgi --disable-collie --disable-mk712 --disable-arctic2 --disable-ucb1x00 "
-EXTRA_OECONF_beagle = "--enable-shared --enable-h3600 --disable-input --disable-corgi --disable-collie --disable-mk712 --disable-arctic2 --disable-ucb1x00 "
 
-do_stage () {
-autotools_stage_all
+do_stage() {
+	autotools_stage_all
 }
 
-do_install_prepend () {
+do_install_prepend() {
 	install -m 0644 ${WORKDIR}/ts.conf ${S}/etc/ts.conf
 }
 
@@ -37,44 +33,55 @@ do_install_append() {
 	install -d ${D}${sysconfdir}/profile.d/
 	install -m 0755 ${WORKDIR}/tslib.sh ${D}${sysconfdir}/profile.d/
 	case ${MACHINE} in
-	h3600 | h3900 | h1940 | h6300 | h2200 | ipaq-pxa270 | blueangel)
+	a780 | e680 | h3600 | h3900 | h5xxx | h1940 | h6300 | h2200 | ipaq-pxa270 | hx4700 | hx2000 | blueangel | h4000)
 		install -d ${D}${datadir}/tslib
-		for f in ts-2.6.conf ts.conf-h3600-2.4; do
-			install -m 0644 ${WORKDIR}/$f ${D}${datadir}/tslib/
-		done
-		rm -f ${D}${sysconfdir}/ts.conf
+		install -m 0644 ${WORKDIR}/ts.conf-h3600-2.4 ${D}${datadir}/tslib/
 		;;
 	c7x0 | spitz | akita | tosa )
 		install -d ${D}${datadir}/tslib
-		for f in ts-2.6.conf ts.conf-corgi-2.4; do
-			install -m 0644 ${WORKDIR}/$f ${D}${datadir}/tslib/
-		done
-		rm -f ${D}${sysconfdir}/ts.conf
+		install -m 0644 ${WORKDIR}/ts.conf-corgi-2.4 ${D}${datadir}/tslib/
 		;;
 	collie | poodle )
 		install -d ${D}${datadir}/tslib
-		for f in ts-2.6.conf ts.conf-collie-2.4; do
-			install -m 0644 ${WORKDIR}/$f ${D}${datadir}/tslib/
-		done
-		rm -f ${D}${sysconfdir}/ts.conf
+		install -m 0644 ${WORKDIR}/ts.conf-collie-2.4 ${D}${datadir}/tslib/
 		;;
 
 	simpad )
 		install -d ${D}${datadir}/tslib
-		for f in ts-2.6.conf ts.conf-simpad-2.4; do
-			install -m 0644 ${WORKDIR}/$f ${D}${datadir}/tslib/
-		done
-		rm -f ${D}${sysconfdir}/ts.conf
+		install -m 0644 ${WORKDIR}/ts.conf-simpad-2.4 ${D}${datadir}/tslib/
 		;;
 	*)
 		;;
 	esac
 }
 
-RDEPENDS_libts = "tslib-conf"
+SRC_URI_OVERRIDES_PACKAGE_ARCH = "0"
+
+# People should consider using udev's /dev/input/touchscreen0 symlink 
+# instead of detect-stylus
+RDEPENDS_tslib-conf_h1940 = "detect-stylus"
+RDEPENDS_tslib-conf_h3600 = "detect-stylus"
+RDEPENDS_tslib-conf_h3900 = "detect-stylus"
+RDEPENDS_tslib-conf_h6300 = "detect-stylus"
+RDEPENDS_tslib-conf_blueangel = "detect-stylus"
+RDEPENDS_tslib-conf_htcuniversal = "detect-stylus"
+RDEPENDS_tslib-conf_h4000 = "detect-stylus"
+RPROVIDES_tslib-conf = "libts-0.0-conf"
+
+PACKAGE_ARCH_tslib-conf = "${MACHINE_ARCH}"
+PACKAGE_ARCH_mnci = "${MACHINE_ARCH}"
+
+PACKAGES =+ "tslib-conf libts-dev tslib-tests tslib-calibrate"
+DEBIAN_NOAUTONAME_tslib-conf = "1"
+DEBIAN_NOAUTONAME_tslib-tests = "1"
+DEBIAN_NOAUTONAME_tslib-calibrate = "1"
+
+RDEPENDS_${PN} = "tslib-conf"
+
 
+FILES_${PN}-dbg += "${libdir}/ts/.debug*"
 FILES_tslib-conf = "${sysconfdir}/ts.conf ${sysconfdir}/profile.d/tslib.sh ${datadir}/tslib"
-FILES_libts = "${libdir}/*.so.* ${libdir}/ts/*.so*"
+FILES_${PN} = "${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"
-- 
cgit v1.2.3