diff options
author | Richard Purdie <richard@openedhand.com> | 2006-05-09 18:38:19 +0000 |
---|---|---|
committer | Richard Purdie <richard@openedhand.com> | 2006-05-09 18:38:19 +0000 |
commit | b4cb437c6595ff8ac13506e502fe04b1a60c4e04 (patch) | |
tree | f529de217094f1a49049f90c49d779a49e19cd7c /openembedded/packages/tslib | |
parent | 3baacb49c13a48798d45e30a0a0076ca0b8c9e6a (diff) | |
download | poky-b4cb437c6595ff8ac13506e502fe04b1a60c4e04.tar.gz |
Merge packages changes from OE into poky.
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@386 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'openembedded/packages/tslib')
19 files changed, 72 insertions, 51 deletions
diff --git a/openembedded/packages/tslib/tslib/akita/tslib.sh b/openembedded/packages/tslib/tslib/akita/tslib.sh index dc7484cada..218da0751b 100644 --- a/openembedded/packages/tslib/tslib/akita/tslib.sh +++ b/openembedded/packages/tslib/tslib/akita/tslib.sh | |||
@@ -9,7 +9,7 @@ case `uname -r` in | |||
9 | *) | 9 | *) |
10 | TSLIB_TSDEVICE=/dev/input/event1 | 10 | TSLIB_TSDEVICE=/dev/input/event1 |
11 | TSLIB_TSEVENTTYPE=INPUT | 11 | TSLIB_TSEVENTTYPE=INPUT |
12 | TSLIB_CONFFILE=/usr/share/tslib/ts.conf-corgi | 12 | TSLIB_CONFFILE=/usr/share/tslib/ts-2.6.conf |
13 | ;; | 13 | ;; |
14 | esac | 14 | esac |
15 | 15 | ||
diff --git a/openembedded/packages/tslib/tslib/c7x0/tslib.sh b/openembedded/packages/tslib/tslib/c7x0/tslib.sh index dc7484cada..218da0751b 100644 --- a/openembedded/packages/tslib/tslib/c7x0/tslib.sh +++ b/openembedded/packages/tslib/tslib/c7x0/tslib.sh | |||
@@ -9,7 +9,7 @@ case `uname -r` in | |||
9 | *) | 9 | *) |
10 | TSLIB_TSDEVICE=/dev/input/event1 | 10 | TSLIB_TSDEVICE=/dev/input/event1 |
11 | TSLIB_TSEVENTTYPE=INPUT | 11 | TSLIB_TSEVENTTYPE=INPUT |
12 | TSLIB_CONFFILE=/usr/share/tslib/ts.conf-corgi | 12 | TSLIB_CONFFILE=/usr/share/tslib/ts-2.6.conf |
13 | ;; | 13 | ;; |
14 | esac | 14 | esac |
15 | 15 | ||
diff --git a/openembedded/packages/tslib/tslib/collie/tslib.sh b/openembedded/packages/tslib/tslib/collie/tslib.sh index 187b7ce6d2..d9cc02cb1c 100644 --- a/openembedded/packages/tslib/tslib/collie/tslib.sh +++ b/openembedded/packages/tslib/tslib/collie/tslib.sh | |||
@@ -1,10 +1,16 @@ | |||
1 | #!/bin/sh | 1 | #!/bin/sh |
2 | 2 | ||
3 | if (uname -r|grep -q 'embedix'); then | 3 | case `uname -r` in |
4 | 2.4*) | ||
4 | TSLIB_TSDEVICE=/dev/ts | 5 | TSLIB_TSDEVICE=/dev/ts |
5 | TSLIB_TSEVENTTYPE=COLLIE | 6 | TSLIB_TSEVENTTYPE=COLLIE |
6 | else | 7 | TSLIB_CONFFILE=/usr/share/tslib/ts.conf-collie-2.4 |
7 | TSLIB_TSDEVICE=/dev/input/event0 | 8 | ;; |
8 | fi | 9 | *) |
10 | TSLIB_TSDEVICE=/dev/input/event1 | ||
11 | TSLIB_TSEVENTTYPE=INPUT | ||
12 | TSLIB_CONFFILE=/usr/share/tslib/ts-2.6.conf | ||
13 | ;; | ||
14 | esac | ||
9 | 15 | ||
10 | export TSLIB_TSDEVICE TSLIB_TSEVENTTYPE | 16 | export TSLIB_TSDEVICE TSLIB_TSEVENTTYPE TSLIB_CONFFILE |
diff --git a/openembedded/packages/tslib/tslib/h1940/tslib.sh b/openembedded/packages/tslib/tslib/h1940/tslib.sh index 5e5e283962..d83673e259 100644 --- a/openembedded/packages/tslib/tslib/h1940/tslib.sh +++ b/openembedded/packages/tslib/tslib/h1940/tslib.sh | |||
@@ -1,7 +1,7 @@ | |||
1 | #!/bin/sh | 1 | #!/bin/sh |
2 | 2 | ||
3 | TSLIB_TSDEVICE=`detect-stylus --device` | 3 | TSLIB_TSDEVICE=`detect-stylus --device` |
4 | TSLIB_CONFFILE=/usr/share/tslib/ts.conf-h3600 | 4 | TSLIB_CONFFILE=/usr/share/tslib/ts-2.6.conf |
5 | QWS_MOUSE_PROTO=TPanel | 5 | QWS_MOUSE_PROTO=TPanel |
6 | 6 | ||
7 | export TSLIB_TSDEVICE TSLIB_CONFFILE QWS_MOUSE_PROTO | 7 | export TSLIB_TSDEVICE TSLIB_CONFFILE QWS_MOUSE_PROTO |
diff --git a/openembedded/packages/tslib/tslib/h3600/tslib.sh b/openembedded/packages/tslib/tslib/h3600/tslib.sh index 5c446c2610..3c27b075f7 100644 --- a/openembedded/packages/tslib/tslib/h3600/tslib.sh +++ b/openembedded/packages/tslib/tslib/h3600/tslib.sh | |||
@@ -7,7 +7,7 @@ case `uname -r` in | |||
7 | ;; | 7 | ;; |
8 | *) | 8 | *) |
9 | TSLIB_TSDEVICE=`detect-stylus --device` | 9 | TSLIB_TSDEVICE=`detect-stylus --device` |
10 | TSLIB_CONFFILE=/usr/share/tslib/ts.conf-h3600 | 10 | TSLIB_CONFFILE=/usr/share/tslib/ts-2.6.conf |
11 | ;; | 11 | ;; |
12 | esac | 12 | esac |
13 | 13 | ||
diff --git a/openembedded/packages/tslib/tslib/h6300/tslib.sh b/openembedded/packages/tslib/tslib/h6300/tslib.sh index 21aaad9ca4..548bc918ff 100644 --- a/openembedded/packages/tslib/tslib/h6300/tslib.sh +++ b/openembedded/packages/tslib/tslib/h6300/tslib.sh | |||
@@ -1,7 +1,7 @@ | |||
1 | #!/bin/sh | 1 | #!/bin/sh |
2 | 2 | ||
3 | TSLIB_TSDEVICE=`detect-stylus --device` | 3 | TSLIB_TSDEVICE=`detect-stylus --device` |
4 | TSLIB_CONFFILE=/usr/share/tslib/ts.conf-h6300 | 4 | TSLIB_CONFFILE=/usr/share/tslib/ts-2.6.conf |
5 | 5 | ||
6 | export TSLIB_TSDEVICE TSLIB_CONFFILE | 6 | export TSLIB_TSDEVICE TSLIB_CONFFILE |
7 | 7 | ||
diff --git a/openembedded/packages/tslib/tslib/ipaq-pxa270/tslib.sh b/openembedded/packages/tslib/tslib/ipaq-pxa270/tslib.sh index 72ebcba7c2..3adaba0de8 100644 --- a/openembedded/packages/tslib/tslib/ipaq-pxa270/tslib.sh +++ b/openembedded/packages/tslib/tslib/ipaq-pxa270/tslib.sh | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/bin/sh | 1 | #!/bin/sh |
2 | 2 | ||
3 | TSLIB_TSDEVICE=`detect-stylus --device` | 3 | TSLIB_TSDEVICE=`detect-stylus --device` |
4 | TSLIB_CONFFILE=/usr/share/tslib/ts.conf-h3600 | 4 | TSLIB_CONFFILE=/usr/share/tslib/ts-2.6.conf |
5 | 5 | ||
6 | export TSLIB_TSDEVICE TSLIB_CONFFILE | 6 | export TSLIB_TSDEVICE TSLIB_CONFFILE |
diff --git a/openembedded/packages/tslib/tslib/poodle/tslib.sh b/openembedded/packages/tslib/tslib/poodle/tslib.sh index 187b7ce6d2..d9cc02cb1c 100644 --- a/openembedded/packages/tslib/tslib/poodle/tslib.sh +++ b/openembedded/packages/tslib/tslib/poodle/tslib.sh | |||
@@ -1,10 +1,16 @@ | |||
1 | #!/bin/sh | 1 | #!/bin/sh |
2 | 2 | ||
3 | if (uname -r|grep -q 'embedix'); then | 3 | case `uname -r` in |
4 | 2.4*) | ||
4 | TSLIB_TSDEVICE=/dev/ts | 5 | TSLIB_TSDEVICE=/dev/ts |
5 | TSLIB_TSEVENTTYPE=COLLIE | 6 | TSLIB_TSEVENTTYPE=COLLIE |
6 | else | 7 | TSLIB_CONFFILE=/usr/share/tslib/ts.conf-collie-2.4 |
7 | TSLIB_TSDEVICE=/dev/input/event0 | 8 | ;; |
8 | fi | 9 | *) |
10 | TSLIB_TSDEVICE=/dev/input/event1 | ||
11 | TSLIB_TSEVENTTYPE=INPUT | ||
12 | TSLIB_CONFFILE=/usr/share/tslib/ts-2.6.conf | ||
13 | ;; | ||
14 | esac | ||
9 | 15 | ||
10 | export TSLIB_TSDEVICE TSLIB_TSEVENTTYPE | 16 | export TSLIB_TSDEVICE TSLIB_TSEVENTTYPE TSLIB_CONFFILE |
diff --git a/openembedded/packages/tslib/tslib/spitz/tslib.sh b/openembedded/packages/tslib/tslib/spitz/tslib.sh index dc7484cada..218da0751b 100644 --- a/openembedded/packages/tslib/tslib/spitz/tslib.sh +++ b/openembedded/packages/tslib/tslib/spitz/tslib.sh | |||
@@ -9,7 +9,7 @@ case `uname -r` in | |||
9 | *) | 9 | *) |
10 | TSLIB_TSDEVICE=/dev/input/event1 | 10 | TSLIB_TSDEVICE=/dev/input/event1 |
11 | TSLIB_TSEVENTTYPE=INPUT | 11 | TSLIB_TSEVENTTYPE=INPUT |
12 | TSLIB_CONFFILE=/usr/share/tslib/ts.conf-corgi | 12 | TSLIB_CONFFILE=/usr/share/tslib/ts-2.6.conf |
13 | ;; | 13 | ;; |
14 | esac | 14 | esac |
15 | 15 | ||
diff --git a/openembedded/packages/tslib/tslib/tosa/ts.conf b/openembedded/packages/tslib/tslib/tosa/ts.conf deleted file mode 100644 index 07fbbea2a8..0000000000 --- a/openembedded/packages/tslib/tslib/tosa/ts.conf +++ /dev/null | |||
@@ -1,5 +0,0 @@ | |||
1 | module_raw corgi | ||
2 | module pthres pmin=1 | ||
3 | module variance delta=30 | ||
4 | module dejitter delta=100 | ||
5 | module linear | ||
diff --git a/openembedded/packages/tslib/tslib/tosa/tslib.sh b/openembedded/packages/tslib/tslib/tosa/tslib.sh index dc7484cada..218da0751b 100644 --- a/openembedded/packages/tslib/tslib/tosa/tslib.sh +++ b/openembedded/packages/tslib/tslib/tosa/tslib.sh | |||
@@ -9,7 +9,7 @@ case `uname -r` in | |||
9 | *) | 9 | *) |
10 | TSLIB_TSDEVICE=/dev/input/event1 | 10 | TSLIB_TSDEVICE=/dev/input/event1 |
11 | TSLIB_TSEVENTTYPE=INPUT | 11 | TSLIB_TSEVENTTYPE=INPUT |
12 | TSLIB_CONFFILE=/usr/share/tslib/ts.conf-corgi | 12 | TSLIB_CONFFILE=/usr/share/tslib/ts-2.6.conf |
13 | ;; | 13 | ;; |
14 | esac | 14 | esac |
15 | 15 | ||
diff --git a/openembedded/packages/tslib/tslib/ts.conf-corgi b/openembedded/packages/tslib/tslib/ts-2.6.conf index 09309719f2..09309719f2 100644 --- a/openembedded/packages/tslib/tslib/ts.conf-corgi +++ b/openembedded/packages/tslib/tslib/ts-2.6.conf | |||
diff --git a/openembedded/packages/tslib/tslib/poodle/ts.conf b/openembedded/packages/tslib/tslib/ts.conf-collie-2.4 index 2099b9b414..2099b9b414 100644 --- a/openembedded/packages/tslib/tslib/poodle/ts.conf +++ b/openembedded/packages/tslib/tslib/ts.conf-collie-2.4 | |||
diff --git a/openembedded/packages/tslib/tslib/ts.conf-h2200 b/openembedded/packages/tslib/tslib/ts.conf-h2200 deleted file mode 100644 index 09309719f2..0000000000 --- a/openembedded/packages/tslib/tslib/ts.conf-h2200 +++ /dev/null | |||
@@ -1,5 +0,0 @@ | |||
1 | module_raw input | ||
2 | module pthres pmin=1 | ||
3 | module variance delta=30 | ||
4 | module dejitter delta=100 | ||
5 | module linear | ||
diff --git a/openembedded/packages/tslib/tslib/ts.conf-h3600 b/openembedded/packages/tslib/tslib/ts.conf-h3600 deleted file mode 100644 index 09309719f2..0000000000 --- a/openembedded/packages/tslib/tslib/ts.conf-h3600 +++ /dev/null | |||
@@ -1,5 +0,0 @@ | |||
1 | module_raw input | ||
2 | module pthres pmin=1 | ||
3 | module variance delta=30 | ||
4 | module dejitter delta=100 | ||
5 | module linear | ||
diff --git a/openembedded/packages/tslib/tslib/ts.conf-h6300 b/openembedded/packages/tslib/tslib/ts.conf-h6300 deleted file mode 100644 index 09309719f2..0000000000 --- a/openembedded/packages/tslib/tslib/ts.conf-h6300 +++ /dev/null | |||
@@ -1,5 +0,0 @@ | |||
1 | module_raw input | ||
2 | module pthres pmin=1 | ||
3 | module variance delta=30 | ||
4 | module dejitter delta=100 | ||
5 | module linear | ||
diff --git a/openembedded/packages/tslib/tslib/ts.conf-simpad b/openembedded/packages/tslib/tslib/ts.conf-simpad deleted file mode 100644 index 09309719f2..0000000000 --- a/openembedded/packages/tslib/tslib/ts.conf-simpad +++ /dev/null | |||
@@ -1,5 +0,0 @@ | |||
1 | module_raw input | ||
2 | module pthres pmin=1 | ||
3 | module variance delta=30 | ||
4 | module dejitter delta=100 | ||
5 | module linear | ||
diff --git a/openembedded/packages/tslib/tslib/usec_fix.patch b/openembedded/packages/tslib/tslib/usec_fix.patch new file mode 100644 index 0000000000..a791b39a3c --- /dev/null +++ b/openembedded/packages/tslib/tslib/usec_fix.patch | |||
@@ -0,0 +1,26 @@ | |||
1 | Index: work/tslib-0.0cvs20051201-r32/tslib/plugins/collie-raw.c | ||
2 | =================================================================== | ||
3 | --- tslib.orig/plugins/collie-raw.c 2005-12-04 10:09:33.000000000 +0100 | ||
4 | +++ tslib/plugins/collie-raw.c 2005-12-04 10:16:05.000000000 +0100 | ||
5 | @@ -29,7 +29,7 @@ | ||
6 | #ifdef DEBUG | ||
7 | fprintf(stderr,"RAW---------------------------> %d %d %d\n",samp->x,samp->y,samp->pressure); | ||
8 | #endif /*DEBUG*/ | ||
9 | - samp->tv.tv_usec = collie_evt->millisecs % 1000; | ||
10 | + samp->tv.tv_usec = (collie_evt->millisecs % 1000) * 1000; | ||
11 | samp->tv.tv_sec = collie_evt->millisecs / 1000; | ||
12 | samp++; | ||
13 | collie_evt++; | ||
14 | Index: work/tslib-0.0cvs20051201-r32/tslib/plugins/corgi-raw.c | ||
15 | =================================================================== | ||
16 | --- tslib.orig/plugins/corgi-raw.c 2005-12-04 10:10:19.000000000 +0100 | ||
17 | +++ tslib/plugins/corgi-raw.c 2005-12-04 10:16:15.000000000 +0100 | ||
18 | @@ -29,7 +29,7 @@ | ||
19 | #ifdef DEBUG | ||
20 | fprintf(stderr,"RAW---------------------------> %d %d %d\n",samp->x,samp->y,samp->pressure); | ||
21 | #endif /*DEBUG*/ | ||
22 | - samp->tv.tv_usec = corgi_evt->millisecs % 1000; | ||
23 | + samp->tv.tv_usec = (corgi_evt->millisecs % 1000) * 1000; | ||
24 | samp->tv.tv_sec = corgi_evt->millisecs / 1000; | ||
25 | samp++; | ||
26 | corgi_evt++; | ||
diff --git a/openembedded/packages/tslib/tslib_cvs.bb b/openembedded/packages/tslib/tslib_cvs.bb index cf79999b25..bac18153fa 100644 --- a/openembedded/packages/tslib/tslib_cvs.bb +++ b/openembedded/packages/tslib/tslib_cvs.bb | |||
@@ -1,17 +1,17 @@ | |||
1 | SECTION = "base" | 1 | SECTION = "base" |
2 | DESCRIPTION = "tslib is a touchscreen access library." | 2 | DESCRIPTION = "tslib is a touchscreen access library." |
3 | PV = "0.0+cvs${SRCDATE}" | 3 | PV = "0.0+cvs${SRCDATE}" |
4 | PR = "r33" | 4 | PR = "r34" |
5 | 5 | ||
6 | SRC_URI_OVERRIDES_PACKAGE_ARCH = "0" | 6 | SRC_URI_OVERRIDES_PACKAGE_ARCH = "0" |
7 | PACKAGE_ARCH_tslib-conf = "${MACHINE_ARCH}" | 7 | PACKAGE_ARCH_tslib-conf = "${MACHINE_ARCH}" |
8 | PACKAGE_ARCH_mnci = "${MACHINE_ARCH}" | 8 | PACKAGE_ARCH_mnci = "${MACHINE_ARCH}" |
9 | 9 | ||
10 | SRC_URI = "cvs://cvs:@pubcvs.arm.linux.org.uk/mnt/src/cvsroot;module=tslib \ | 10 | SRC_URI = "cvs://cvs:@pubcvs.arm.linux.org.uk/mnt/src/cvsroot;module=tslib \ |
11 | file://ts.conf \ | 11 | file://usec_fix.patch;patch=1 \ |
12 | file://ts.conf-h3600 file://ts.conf-h3600-2.4 file://ts.conf-h6300 \ | 12 | file://ts.conf file://ts-2.6.conf \ |
13 | file://ts.conf-corgi file://ts.conf-corgi-2.4 \ | 13 | file://ts.conf-h3600-2.4 file://ts.conf-simpad-2.4 \ |
14 | file://ts.conf-simpad file://ts.conf-simpad-2.4 \ | 14 | file://ts.conf-corgi-2.4 file://ts.conf-collie-2.4 \ |
15 | file://tslib.sh" | 15 | file://tslib.sh" |
16 | SRC_URI_append_mnci += " file://devfs.patch;patch=1" | 16 | SRC_URI_append_mnci += " file://devfs.patch;patch=1" |
17 | SRC_URI_append_mnci += " file://event1.patch;patch=1" | 17 | SRC_URI_append_mnci += " file://event1.patch;patch=1" |
@@ -40,21 +40,29 @@ do_install_append() { | |||
40 | case ${MACHINE} in | 40 | case ${MACHINE} in |
41 | h3600 | h3900 | h1940 | h6300 | h2200 | ipaq-pxa270 | blueangel) | 41 | h3600 | h3900 | h1940 | h6300 | h2200 | ipaq-pxa270 | blueangel) |
42 | install -d ${D}${datadir}/tslib | 42 | install -d ${D}${datadir}/tslib |
43 | for f in ts.conf-h3600 ts.conf-h3600-2.4 ts.conf-h6300; do | 43 | for f in ts-2.6.conf ts.conf-h3600-2.4; do |
44 | install -m 0644 ${WORKDIR}/$f ${D}${datadir}/tslib/ | 44 | install -m 0644 ${WORKDIR}/$f ${D}${datadir}/tslib/ |
45 | done | 45 | done |
46 | rm -f ${D}${sysconfdir}/ts.conf | 46 | rm -f ${D}${sysconfdir}/ts.conf |
47 | ;; | 47 | ;; |
48 | c7x0 | spitz | akita | tosa ) | 48 | c7x0 | spitz | akita | tosa ) |
49 | install -d ${D}${datadir}/tslib | 49 | install -d ${D}${datadir}/tslib |
50 | for f in ts.conf-corgi ts.conf-corgi-2.4; do | 50 | for f in ts-2.6.conf ts.conf-corgi-2.4; do |
51 | install -m 0644 ${WORKDIR}/$f ${D}${datadir}/tslib/ | 51 | install -m 0644 ${WORKDIR}/$f ${D}${datadir}/tslib/ |
52 | done | 52 | done |
53 | rm -f ${D}${sysconfdir}/ts.conf | 53 | rm -f ${D}${sysconfdir}/ts.conf |
54 | ;; | 54 | ;; |
55 | collie | poodle ) | ||
56 | install -d ${D}${datadir}/tslib | ||
57 | for f in ts-2.6.conf ts.conf-collie-2.4; do | ||
58 | install -m 0644 ${WORKDIR}/$f ${D}${datadir}/tslib/ | ||
59 | done | ||
60 | rm -f ${D}${sysconfdir}/ts.conf | ||
61 | ;; | ||
62 | |||
55 | simpad ) | 63 | simpad ) |
56 | install -d ${D}${datadir}/tslib | 64 | install -d ${D}${datadir}/tslib |
57 | for f in ts.conf-simpad ts.conf-simpad-2.4; do | 65 | for f in ts-2.6.conf ts.conf-simpad-2.4; do |
58 | install -m 0644 ${WORKDIR}/$f ${D}${datadir}/tslib/ | 66 | install -m 0644 ${WORKDIR}/$f ${D}${datadir}/tslib/ |
59 | done | 67 | done |
60 | rm -f ${D}${sysconfdir}/ts.conf | 68 | rm -f ${D}${sysconfdir}/ts.conf |