Skip to contentSkip to conversation

tslib: bump version to current git head

PATCH New Daniel Nyström 5 participants 8 messages Dec 21, 2010 – Dec 22, 2010

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 tslib: bump version to current git head

Due to missing official releases, fetch directly from GitHub repository. Many bugfixes since 1.0 and all previous patches in Buildroot are either applied or obsoleted.

---
 package/tslib/ts.conf                              |   25 ---------
 package/tslib/tslib-1.0-absbit.patch               |   11 ----
 .../tslib-1.0-link-plugins-against-libts.patch     |   48 ------------------
 package/tslib/tslib-1.0-no-cxx.patch               |   17 ------
 ...b-1.0-open-with-O_CREAT-needs-3-arguments.patch |   53 --------------------
 package/tslib/tslib-1.0-remove-bzero.patch         |   11 ----
 ...-1.0-remove-return-on-error-from-check-df.patch |   11 ----
 package/tslib/tslib.mk                             |    6 +--
 8 files changed, 2 insertions(+), 180 deletions(-)
 delete mode 100644 package/tslib/ts.conf
 delete mode 100644 package/tslib/tslib-1.0-absbit.patch
 delete mode 100644 package/tslib/tslib-1.0-link-plugins-against-libts.patch
 delete mode 100644 package/tslib/tslib-1.0-no-cxx.patch
 delete mode 100644 package/tslib/tslib-1.0-open-with-O_CREAT-needs-3-arguments.patch
 delete mode 100644 package/tslib/tslib-1.0-remove-bzero.patch
 delete mode 100644 package/tslib/tslib-1.0-remove-return-on-error-from-check-df.patch
package/tslib/ts.conf deleted +0 -25
deleted file mode 100644
index 1b0da93..0000000
@@ -1,25 +0,0 @@
-# Uncomment if you wish to use the linux input layer event interface
-module_raw input
-
-# Uncomment if you're using a Sharp Zaurus SL-5500/SL-5000d
-# module_raw collie
-
-# Uncomment if you're using a Sharp Zaurus SL-C700/C750/C760/C860
-# module_raw corgi
-
-# Uncomment if you're using a device with a UCB1200/1300/1400 TS interface
-# module_raw ucb1x00
-
-# Uncomment if you're using an HP iPaq h3600 or similar
-# module_raw h3600
-
-# Uncomment if you're using a Hitachi Webpad
-# module_raw mk712
-
-# Uncomment if you're using an IBM Arctic II
-# module_raw arctic2
-
-module pthres pmin=1
-module variance delta=30
-module dejitter delta=100
-module linear
package/tslib/tslib-1.0-absbit.patch deleted +0 -11
deleted file mode 100644
index 11e758d..0000000
@@ -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) &&
package/tslib/tslib-1.0-link-plugins-against-libts.patch deleted +0 -48

48 lines not on this page · raw message

package/tslib/tslib-1.0-no-cxx.patch deleted +0 -17
deleted file mode 100644
index 7e4e6d5..0000000
@@ -1,17 +0,0 @@
-tslib: Doesn't use C++, so don't require it in the configure script
----
- configure.ac |    1 -
- 1 file changed, 1 deletion(-)
-
-Index: tslib-1.0/configure.ac
-===================================================================
---- tslib-1.0.orig/configure.ac
-+++ tslib-1.0/configure.ac
-@@ -15,7 +15,6 @@
- TS_DEFAULT_FLAGS
- 
- # Checks for programs.
--AC_PROG_CXX
- AC_PROG_CC
- AC_PROG_CPP
- TS_CC_HIDDEN_VISIBILITY
package/tslib/tslib-1.0-open-with-O_CREAT-needs-3-arguments.patch deleted +0 -53

53 lines not on this page · raw message

package/tslib/tslib-1.0-remove-bzero.patch deleted +0 -11
deleted file mode 100644
index 3e3ef3e..0000000
@@ -1,11 +0,0 @@
---- a/src/ts_parse_vars.c	2006-08-24 17:02:55.000000000 -0400
-+++ b/src/ts_parse_vars.c	2008-03-12 13:57:01.000000000 -0400
-@@ -33,7 +33,7 @@ int tslib_parse_vars(struct tslib_module
- 		return 0;
- 
- 	//s = alloca(strlen(str));
--	bzero(s_holder,1024);
-+	memset(s_holder, 0, 1024);
- 	strncpy(s_holder,str,strlen(str));
- 	s = s_holder;
- 	while ((p = strsep(&s, " \t")) != NULL && ret == 0) {
package/tslib/tslib-1.0-remove-return-on-error-from-check-df.patch deleted +0 -11
deleted file mode 100644
index 7945c1b..0000000
@@ -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))
package/tslib/tslib.mk +2 -4
index 798499e..3ca40c5 100644
@@ -3,11 +3,9 @@
 # tslib
 #
 #############################################################
-TSLIB_VERSION:=1.0
-TSLIB_SOURCE:=tslib-$(TSLIB_VERSION).tar.bz2
-TSLIB_SITE:=http://download.berlios.de/tslib
+TSLIB_VERSION:=860d69ca
+TSLIB_SITE:=git://github.com/kergoth/tslib.git
 TSLIB_AUTORECONF = YES
-TSLIB_LIBTOOL_PATCH = YES
 TSLIB_INSTALL_STAGING = YES
 TSLIB_INSTALL_TARGET = YES
 TSLIB_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) LDFLAGS=-L$(STAGING_DIR)/usr/lib install
Signature · 1 line
1.7.1
#1 lore raw

PATCH 2/2 tslib: Enable raw module in ts.conf

By default there is no module activated in ts.conf. According to the ts.conf previously attached in the tslib package dir (which was never installed) the default module of choice was the raw module.

This patch enables the raw module in the ts.conf file in the tslib source tree, which will be installed in the target.

---
 package/tslib/tslib-enable_raw_module.patch |   14 ++++++++++++++
 1 files changed, 14 insertions(+), 0 deletions(-)
 create mode 100644 package/tslib/tslib-enable_raw_module.patch
package/tslib/tslib-enable_raw_module.patch new file +14 -0
new file mode 100644
index 0000000..cb89338
@@ -0,0 +1,14 @@
+Enable raw module by default
+
+Signed-off-by: Daniel Nystr?m <[email protected]>
+
+diff -Naur tslib-e000d35a.orig/etc/ts.conf tslib-e000d35a/etc/ts.conf
+--- tslib-e000d35a.orig/etc/ts.conf	2010-12-21 18:54:45.000000000 +0100
++++ tslib-e000d35a/etc/ts.conf	2010-12-21 18:55:03.000000000 +0100
+@@ -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
Signature · 1 line
1.7.1
#2 lore raw

PATCH 2/2 tslib: Enable raw module in ts.conf

Quoted 8 lines · Daniel Nystr?m

By default there is no module activated in ts.conf. According to the ts.conf previously attached in the tslib package dir (which was never installed) the default module of choice was the raw module.

This patch enables the raw module in the ts.conf file in the tslib source tree, which will be installed in the target.

I have a patch to make this a choice under Kconfig... but

#3 lore raw

PATCH 2/2 tslib: Enable raw module in ts.conf

In reply to Daniel Nyström

Daniel Nystr?m ha scritto:

Quoted 9 lines

By default there is no module activated in ts.conf. According to the ts.conf previously attached in the tslib package dir (which was never installed) the default module of choice was the raw module.

This patch enables the raw module in the ts.conf file in the tslib source tree, which will be installed in the target.

#4 lore raw

PATCH 2/2 tslib: Enable raw module in ts.conf

In reply to Daniel Nyström
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Daniel" == Daniel Nystr?m <[email protected]> writes:

Daniel> By default there is no module activated in ts.conf. According to the Daniel> ts.conf previously attached in the tslib package dir (which was never Daniel> installed) the default module of choice was the raw module.

Daniel> This patch enables the raw module in the ts.conf file in the tslib Daniel> source tree, which will be installed in the target.

Committed, thanks.

Signature · 1 line
Bye, Peter Korsgaard
#7 lore raw

PATCH 1/2 tslib: bump version to current git head

In reply to Daniel Nyström
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Daniel" == Daniel Nystr?m <[email protected]> writes:

Daniel> Due to missing official releases, fetch directly from GitHub Daniel> repository. Many bugfixes since 1.0 and all previous patches in Daniel> Buildroot are either applied or obsoleted.

Committed, thanks.

Signature · 1 line
Bye, Peter Korsgaard