>From adc694230f577d8edc919d7d15ed7cd0bcddacdb Mon Sep 17 00:00:00 2001 From: Will Wagner Date: Wed, 13 Jan 2010 17:10:43 +0000 Subject: [PATCH 14/24] tslib fixes --- package/tslib/tslib-1.0-absbit.patch | 11 -------- package/tslib/tslib-1.0-checkfd_fixes.patch | 25 ++++++++++++++++++++ ...-1.0-remove-return-on-error-from-check-df.patch | 11 -------- package/tslib/tslib.mk | 14 ++++++++++- 4 files changed, 38 insertions(+), 23 deletions(-) delete mode 100644 package/tslib/tslib-1.0-absbit.patch create mode 100644 package/tslib/tslib-1.0-checkfd_fixes.patch delete mode 100644 package/tslib/tslib-1.0-remove-return-on-error-from-check-df.patch diff --git a/package/tslib/tslib-1.0-absbit.patch b/package/tslib/tslib-1.0-absbit.patch deleted file mode 100644 index 11e758d..0000000 --- a/package/tslib/tslib-1.0-absbit.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/plugins/input-raw.c 2008-02-28 14:25:33.000000000 -0500 -+++ b/plugins/input-raw.c 2008-02-28 14:27:25.000000000 -0500 -@@ -49,7 +49,7 @@ static int check_fd(struct tslib_input * - struct tsdev *ts = i->module.dev; - int version; - u_int32_t bit; -- u_int64_t absbit; -+ u_int32_t absbit; - - if (! ((ioctl(ts->fd, EVIOCGVERSION, &version) >= 0) && - (version == EV_VERSION) && diff --git a/package/tslib/tslib-1.0-checkfd_fixes.patch b/package/tslib/tslib-1.0-checkfd_fixes.patch new file mode 100644 index 0000000..be98bf1 --- /dev/null +++ b/package/tslib/tslib-1.0-checkfd_fixes.patch @@ -0,0 +1,25 @@ +diff -urN tslib-1.0/plugins/input-raw.c tslib-1.0.patched/plugins/input-raw.c +--- tslib-1.0/plugins/input-raw.c 2006-08-24 22:02:54.000000000 +0100 ++++ tslib-1.0.patched/plugins/input-raw.c 2008-06-11 15:32:48.000000000 +0100 +@@ -53,9 +53,9 @@ + + if (! ((ioctl(ts->fd, EVIOCGVERSION, &version) >= 0) && + (version == EV_VERSION) && +- (ioctl(ts->fd, EVIOCGBIT(0, sizeof(bit) * 8), &bit) >= 0) && ++ (ioctl(ts->fd, EVIOCGBIT(0, sizeof(bit)), &bit) >= 0) && + (bit & (1 << EV_ABS)) && +- (ioctl(ts->fd, EVIOCGBIT(EV_ABS, sizeof(absbit) * 8), &absbit) >= 0) && ++ (ioctl(ts->fd, EVIOCGBIT(EV_ABS, sizeof(absbit)), &absbit) >= 0) && + (absbit & (1 << ABS_X)) && + (absbit & (1 << ABS_Y)) && (absbit & (1 << ABS_PRESSURE)))) { + fprintf(stderr, "selected device is not a touchscreen I understand\n"); +@@ -65,7 +65,7 @@ + if (bit & (1 << EV_SYN)) + i->using_syn = 1; + +- return 0; ++ return 1; + } + + static int ts_input_read(struct tslib_module_info *inf, + \ No newline at end of file diff --git a/package/tslib/tslib-1.0-remove-return-on-error-from-check-df.patch b/package/tslib/tslib-1.0-remove-return-on-error-from-check-df.patch deleted file mode 100644 index 7945c1b..0000000 --- a/package/tslib/tslib-1.0-remove-return-on-error-from-check-df.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/plugins/input-raw.c 2008-01-25 14:02:23.000000000 +0100 -+++ b/plugins/input-raw.new.c 2008-01-25 14:02:50.000000000 +0100 -@@ -58,8 +58,6 @@ static int check_fd(struct tslib_input * - (ioctl(ts->fd, EVIOCGBIT(EV_ABS, sizeof(absbit) * 8), &absbit) >= 0) && - (absbit & (1 << ABS_X)) && - (absbit & (1 << ABS_Y)) && (absbit & (1 << ABS_PRESSURE)))) { -- fprintf(stderr, "selected device is not a touchscreen I understand\n"); -- return -1; - } - - if (bit & (1 << EV_SYN)) diff --git a/package/tslib/tslib.mk b/package/tslib/tslib.mk index edde0b6..615bed0 100644 --- a/package/tslib/tslib.mk +++ b/package/tslib/tslib.mk @@ -15,6 +15,18 @@ TSLIB_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) LDFLAGS=-L$(STAGING_DIR)/usr/ TSLIB_CONF_OPT = \ --enable-shared \ --prefix=/usr \ - --sysconfdir=/etc + --sysconfdir=/etc \ + --disable-linear-h2200 \ + --disable-ucb1x00 \ + --disable-corgi \ + --disable-collie \ + --disable-h3600 \ + --disable-mk712 \ + --disable-arctic2 \ + --enable-input $(eval $(call AUTOTARGETS,package,tslib)) + +$(TSLIB_HOOK_POST_INSTALL): + cp -dpf package/tslib/ts.conf $(TARGET_DIR)/etc/ + touch $@ -- 1.6.5