sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

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
This commit is contained in:
Richard Purdie 2006-11-21 09:58:11 +00:00
parent c0d040f1e7
commit c24ce90375
34 changed files with 165 additions and 151 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
meta/packages/tslib/tslib/a780/tslib.sh Normal file
View File

@ -0,0 +1,6 @@
#!/bin/sh
TSLIB_TSDEVICE=/dev/input/event1
TSLIB_CONFFILE=/etc/ts.conf
export TSLIB_TSDEVICE TSLIB_CONFFILE

11
meta/packages/tslib/tslib/akita/tslib.sh
View File

@ -1,16 +1,13 @@
#!/bin/sh
TSLIB_TSDEVICE=/dev/input/touchscreen0
TSLIB_CONFFILE=/etc/ts.conf
case `uname -r` in
2.4*)
TSLIB_TSDEVICE=/dev/ts
TSLIB_TSEVENTTYPE=CORGI
TSLIB_CONFFILE=/usr/share/tslib/ts.conf-corgi-2.4
;;
*)
TSLIB_TSDEVICE=/dev/input/touchscreen0
TSLIB_TSEVENTTYPE=INPUT
TSLIB_CONFFILE=/usr/share/tslib/ts-2.6.conf
;;
esac
export TSLIB_TSDEVICE TSLIB_TSEVENTTYPE TSLIB_CONFFILE
export TSLIB_TSDEVICE TSLIB_CONFFILE

11
meta/packages/tslib/tslib/c7x0/tslib.sh
View File

@ -1,16 +1,13 @@
#!/bin/sh
TSLIB_TSDEVICE=/dev/input/touchscreen0
TSLIB_CONFFILE=/etc/ts.conf
case `uname -r` in
2.4*)
TSLIB_TSDEVICE=/dev/ts
TSLIB_TSEVENTTYPE=CORGI
TSLIB_CONFFILE=/usr/share/tslib/ts.conf-corgi-2.4
;;
*)
TSLIB_TSDEVICE=/dev/input/touchscreen0
TSLIB_TSEVENTTYPE=INPUT
TSLIB_CONFFILE=/usr/share/tslib/ts-2.6.conf
;;
esac
export TSLIB_TSDEVICE TSLIB_TSEVENTTYPE TSLIB_CONFFILE
export TSLIB_TSDEVICE TSLIB_CONFFILE

11
meta/packages/tslib/tslib/collie/tslib.sh
View File

@ -1,16 +1,13 @@
#!/bin/sh
TSLIB_TSDEVICE=/dev/input/touchscreen0
TSLIB_CONFFILE=/etc/ts.conf
case `uname -r` in
2.4*)
TSLIB_TSDEVICE=/dev/ts
TSLIB_TSEVENTTYPE=COLLIE
TSLIB_CONFFILE=/usr/share/tslib/ts.conf-collie-2.4
;;
*)
TSLIB_TSDEVICE=/dev/input/touchscreen0
TSLIB_TSEVENTTYPE=INPUT
TSLIB_CONFFILE=/usr/share/tslib/ts-2.6.conf
;;
esac
export TSLIB_TSDEVICE TSLIB_TSEVENTTYPE TSLIB_CONFFILE
export TSLIB_TSDEVICE TSLIB_CONFFILE

6
meta/packages/tslib/tslib/e680/tslib.sh Normal file
View File

@ -0,0 +1,6 @@
#!/bin/sh
TSLIB_TSDEVICE=/dev/input/event1
TSLIB_CONFFILE=/etc/ts.conf
export TSLIB_TSDEVICE TSLIB_CONFFILE

2
meta/packages/tslib/tslib/h1940/tslib.sh
View File

@ -1,7 +1,7 @@
#!/bin/sh
TSLIB_TSDEVICE=`detect-stylus --device`
TSLIB_CONFFILE=/usr/share/tslib/ts-2.6.conf
TSLIB_CONFFILE=/etc/ts.conf
QWS_MOUSE_PROTO=TPanel
export TSLIB_TSDEVICE TSLIB_CONFFILE QWS_MOUSE_PROTO

14
meta/packages/tslib/tslib/h2200/tslib.sh Normal file
View File

@ -0,0 +1,14 @@
#!/bin/sh
TSLIB_TSDEVICE=/dev/input/touchscreen0
TSLIB_CONFFILE=/etc/ts.conf
case `uname -r` in
2.4*)
TSLIB_TSDEVICE=/dev/touchscreen/0raw
TSLIB_CONFFILE=/usr/share/tslib/ts.conf-h3600-2.4
;;
esac
export TSLIB_TSDEVICE TSLIB_CONFFILE

7
meta/packages/tslib/tslib/h3600/tslib.sh
View File

@ -1,14 +1,13 @@
#!/bin/sh
TSLIB_TSDEVICE=`detect-stylus --device`
TSLIB_CONFFILE=/etc/ts.conf
case `uname -r` in
2.4*)
TSLIB_TSDEVICE=/dev/touchscreen/0raw
TSLIB_CONFFILE=/usr/share/tslib/ts.conf-h3600-2.4
;;
*)
TSLIB_TSDEVICE=`detect-stylus --device`
TSLIB_CONFFILE=/usr/share/tslib/ts-2.6.conf
;;
esac
export TSLIB_TSDEVICE TSLIB_CONFFILE

9
meta/packages/tslib/tslib/h3900/tslib.sh
View File

@ -1,18 +1,13 @@
#!/bin/sh
module_id() {
awk 'BEGIN { FS=": " } /Hardware/ { print $2 } ' </proc/cpuinfo
}
TSLIB_TSDEVICE=`detect-stylus --device`
TSLIB_CONFFILE=/etc/ts.conf
case `uname -r` in
2.4*)
TSLIB_TSDEVICE=/dev/touchscreen/0raw
TSLIB_CONFFILE=/usr/share/tslib/ts.conf-h3600-2.4
;;
*)
TSLIB_TSDEVICE=`detect-stylus --device`
TSLIB_CONFFILE=/usr/share/tslib/ts-2.6.conf
;;
esac
export TSLIB_TSDEVICE TSLIB_CONFFILE

14
meta/packages/tslib/tslib/h4000/tslib.sh Normal file
View File

@ -0,0 +1,14 @@
#!/bin/sh
TSLIB_TSDEVICE=`detect-stylus --device`
TSLIB_CONFFILE=/etc/ts.conf
case `uname -r` in
2.4*)
TSLIB_TSDEVICE=/dev/touchscreen/0raw
TSLIB_CONFFILE=/usr/share/tslib/ts.conf-h3600-2.4
;;
esac
export TSLIB_TSDEVICE TSLIB_CONFFILE

14
meta/packages/tslib/tslib/h5xxx/tslib.sh Normal file
View File

@ -0,0 +1,14 @@
#!/bin/sh
TSLIB_TSDEVICE=/dev/input/touchscreen0
TSLIB_CONFFILE=/etc/ts.conf
case `uname -r` in
2.4*)
TSLIB_TSDEVICE=/dev/touchscreen/0raw
TSLIB_CONFFILE=/usr/share/tslib/ts.conf-h3600-2.4
;;
esac
export TSLIB_TSDEVICE TSLIB_CONFFILE

2
meta/packages/tslib/tslib/h6300/tslib.sh
View File

@ -1,7 +1,7 @@
#!/bin/sh
TSLIB_TSDEVICE=`detect-stylus --device`
TSLIB_CONFFILE=/usr/share/tslib/ts-2.6.conf
TSLIB_CONFFILE=/etc/ts.conf
export TSLIB_TSDEVICE TSLIB_CONFFILE

0
meta/packages/tslib/tslib/nokia770/ts.conf → meta/packages/tslib/tslib/htcuniversal/ts.conf
View File

6
meta/packages/tslib/tslib/htcuniversal/tslib.sh Normal file
View File

@ -0,0 +1,6 @@
#!/bin/sh
TSLIB_TSDEVICE=`detect-stylus --device`
TSLIB_CONFFILE=/etc/ts.conf
export TSLIB_TSDEVICE TSLIB_CONFFILE

6
meta/packages/tslib/tslib/hx2000/tslib.sh Normal file
View File

@ -0,0 +1,6 @@
#!/bin/sh
TSLIB_TSDEVICE=/dev/input/touchscreen0
TSLIB_CONFFILE=/etc/ts.conf
export TSLIB_TSDEVICE TSLIB_CONFFILE

6
meta/packages/tslib/tslib/hx4700/tslib.sh Normal file
View File

@ -0,0 +1,6 @@
#!/bin/sh
TSLIB_TSDEVICE=/dev/input/touchscreen0
TSLIB_CONFFILE=/etc/ts.conf
export TSLIB_TSDEVICE TSLIB_CONFFILE

2
meta/packages/tslib/tslib/ipaq-pxa270/tslib.sh
View File

@ -1,6 +1,6 @@
#!/bin/sh
TSLIB_TSDEVICE=/dev/input/touchscreen0
TSLIB_CONFFILE=/usr/share/tslib/ts-2.6.conf
TSLIB_CONFFILE=/etc/ts.conf
export TSLIB_TSDEVICE TSLIB_CONFFILE

3
meta/packages/tslib/tslib/jornada56x/tslib.sh
View File

@ -1,6 +1,5 @@
#!/bin/sh
TSLIB_TSDEVICE=/dev/input/tsraw0
TSLIB_TSEVENTTYPE=H3600
export TSLIB_TSDEVICE TSLIB_TSEVENTTYPE
export TSLIB_TSDEVICE

3
meta/packages/tslib/tslib/jornada6xx/tslib.sh
View File

@ -1,6 +1,5 @@
#!/bin/sh
TSLIB_TSDEVICE=/dev/input/ts0
TSLIB_TSEVENTTYPE=H3600
export TSLIB_TSDEVICE TSLIB_TSEVENTTYPE
export TSLIB_TSDEVICE

5
meta/packages/tslib/tslib/jornada7xx/tslib.sh
View File

@ -1,6 +1,5 @@
#!/bin/sh
TSLIB_TSDEVICE=/dev/input/tsraw0
TSLIB_TSEVENTTYPE=H3600
TSLIB_TSDEVICE=/dev/input/ts0
export TSLIB_TSDEVICE TSLIB_TSEVENTTYPE
export TSLIB_TSDEVICE

5
meta/packages/tslib/tslib/netbook-pro/ts.conf Normal file
View File

@ -0,0 +1,5 @@
module_raw input
module variance delta=80
#module dejitter delta=2
module linear

5
meta/packages/tslib/tslib/netbook-pro/tslib.sh Normal file
View File

@ -0,0 +1,5 @@
#!/bin/sh
TSLIB_TSDEVICE=`detect-stylus --device`
export TSLIB_TSDEVICE

4
meta/packages/tslib/tslib/nokia770/tslib.sh
View File

@ -1,7 +1,5 @@
#!/bin/sh
TSLIB_TSDEVICE=/dev/input/touchscreen0
TSLIB_TSEVENTTYPE=INPUT
TSLIB_CONFFILE=/etc/ts.conf
export TSLIB_TSDEVICE TSLIB_TSEVENTTYPE TSLIB_CONFFILE
export TSLIB_TSDEVICE

5
meta/packages/tslib/tslib/omap1610h2/ts.conf
View File

@ -1,5 +0,0 @@
module_raw input
module pthres pmin=1
module variance delta=30
module dejitter delta=100
module linear

6
meta/packages/tslib/tslib/omap5912osk/ts.conf
View File

@ -1,6 +0,0 @@
module_raw input
module pthres pmin=1
module variance delta=30
module dejitter delta=100
module linear

11
meta/packages/tslib/tslib/poodle/tslib.sh
View File

@ -1,16 +1,13 @@
#!/bin/sh
TSLIB_TSDEVICE=/dev/input/touchscreen0
TSLIB_CONFFILE=/etc/ts.conf
case `uname -r` in
2.4*)
TSLIB_TSDEVICE=/dev/ts
TSLIB_TSEVENTTYPE=COLLIE
TSLIB_CONFFILE=/usr/share/tslib/ts.conf-collie-2.4
;;
*)
TSLIB_TSDEVICE=/dev/input/touchscreen0
TSLIB_TSEVENTTYPE=INPUT
TSLIB_CONFFILE=/usr/share/tslib/ts-2.6.conf
;;
esac
export TSLIB_TSDEVICE TSLIB_TSEVENTTYPE TSLIB_CONFFILE
export TSLIB_TSDEVICE TSLIB_CONFFILE

5
meta/packages/tslib/tslib/qemuarm/ts.conf
View File

@ -1,5 +0,0 @@
module_raw input
module pthres pmin=1
module variance delta=30
module dejitter delta=100
module linear

3
meta/packages/tslib/tslib/qemuarm/tslib.sh
View File

@ -1,6 +1,5 @@
#!/bin/sh
TSLIB_TSDEVICE=/dev/input/touchscreen0
TSLIB_TSEVENTTYPE=INPUT
export TSLIB_TSDEVICE TSLIB_TSEVENTTYPE
export TSLIB_TSDEVICE

7
meta/packages/tslib/tslib/simpad/tslib.sh
View File

@ -1,14 +1,13 @@
#!/bin/sh
TSLIB_TSDEVICE=/dev/input/touchscreen0
TSLIB_CONFFILE=/etc/ts.conf
case `uname -r` in
2.4*)
TSLIB_TSDEVICE=/dev/touchscreen/ucb1x00
TSLIB_CONFFILE=/usr/share/tslib/ts.conf-simpad-2.4
;;
*)
TSLIB_TSDEVICE=/dev/input/touchscreen0
TSLIB_CONFFILE=/usr/share/tslib/ts-2.6.conf
;;
esac
export TSLIB_TSDEVICE TSLIB_CONFFILE

11
meta/packages/tslib/tslib/tosa/tslib.sh
View File

@ -1,16 +1,13 @@
#!/bin/sh
TSLIB_TSDEVICE=/dev/input/touchscreen0
TSLIB_CONFFILE=/etc/ts.conf
case `uname -r` in
2.4*)
TSLIB_TSDEVICE=/dev/ts
TSLIB_TSEVENTTYPE=CORGI
TSLIB_CONFFILE=/usr/share/tslib/ts.conf-corgi-2.4
;;
*)
TSLIB_TSDEVICE=/dev/input/touchscreen0
TSLIB_TSEVENTTYPE=INPUT
TSLIB_CONFFILE=/usr/share/tslib/ts-2.6.conf
;;
esac
export TSLIB_TSDEVICE TSLIB_TSEVENTTYPE TSLIB_CONFFILE
export TSLIB_TSDEVICE TSLIB_CONFFILE

5
meta/packages/tslib/tslib/ts-2.6.conf
View File

@ -1,5 +0,0 @@
module_raw input
module pthres pmin=1
module variance delta=30
module dejitter delta=100
module linear

2
meta/packages/tslib/tslib/ts.conf
View File

@ -1,5 +1,5 @@
# Uncomment if you wish to use the linux input layer event interface
# module_raw input
module_raw input
# Uncomment if you're using a Sharp Zaurus SL-5500/SL-5000d
# module_raw collie

26
meta/packages/tslib/tslib/usec_fix.patch
View File

@ -1,26 +0,0 @@
Index: work/tslib-0.0cvs20051201-r32/tslib/plugins/collie-raw.c
===================================================================
--- tslib.orig/plugins/collie-raw.c 2005-12-04 10:09:33.000000000 +0100
+++ tslib/plugins/collie-raw.c 2005-12-04 10:16:05.000000000 +0100
@@ -29,7 +29,7 @@
#ifdef DEBUG
fprintf(stderr,"RAW---------------------------> %d %d %d\n",samp->x,samp->y,samp->pressure);
#endif /*DEBUG*/
- samp->tv.tv_usec = collie_evt->millisecs % 1000;
+ samp->tv.tv_usec = (collie_evt->millisecs % 1000) * 1000;
samp->tv.tv_sec = collie_evt->millisecs / 1000;
samp++;
collie_evt++;
Index: work/tslib-0.0cvs20051201-r32/tslib/plugins/corgi-raw.c
===================================================================
--- tslib.orig/plugins/corgi-raw.c 2005-12-04 10:10:19.000000000 +0100
+++ tslib/plugins/corgi-raw.c 2005-12-04 10:16:15.000000000 +0100
@@ -29,7 +29,7 @@
#ifdef DEBUG
fprintf(stderr,"RAW---------------------------> %d %d %d\n",samp->x,samp->y,samp->pressure);
#endif /*DEBUG*/
- samp->tv.tv_usec = corgi_evt->millisecs % 1000;
+ samp->tv.tv_usec = (corgi_evt->millisecs % 1000) * 1000;
samp->tv.tv_sec = corgi_evt->millisecs / 1000;
samp++;
corgi_evt++;

83
meta/packages/tslib/tslib_1.0.bb
View File

@ -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."
LICENSE = "LGPL"
PR = "r3"
SRCDATE_tslib = "now"
SRC_URI_OVERRIDES_PACKAGE_ARCH = "0"
PACKAGE_ARCH_tslib-conf = "${MACHINE_ARCH}"
PACKAGE_ARCH_mnci = "${MACHINE_ARCH}"
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"