[Armadeus-commitlog] armadeus branch, master, updated. release-3.3-282-gcdce01d
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. release-3.3-282-gcdce01d
|
From: Julien B a. A. <ar...@us...> - 2011-02-07 15:29:21
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via cdce01dfd04a0667200cbc1156902934e4119a38 (commit)
from caa6b4faaa9025d4540f33f7b82547efa5415acc (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit cdce01dfd04a0667200cbc1156902934e4119a38
Author: Julien Boibessot <jul...@ar...>
Date: Mon Feb 7 16:28:31 2011 +0100
[BUILDROOT] 2010.11: Updates tslib to BR mainline's state of the art
-----------------------------------------------------------------------
Summary of changes:
...dd_patch_for_recent_kernels_compatibility.patch | 53 ----
.../2010.11/126-tslib-test_add_quit_button.patch | 54 -----
.../2010.11/143-tslib-enable_raw_module.patch | 39 +++
...44-tslib-bump_version_to_current_git_head.patch | 252 ++++++++++++++++++++
4 files changed, 291 insertions(+), 107 deletions(-)
delete mode 100644 patches/buildroot/2010.11/044-tslib-add_patch_for_recent_kernels_compatibility.patch
delete mode 100644 patches/buildroot/2010.11/126-tslib-test_add_quit_button.patch
create mode 100644 patches/buildroot/2010.11/143-tslib-enable_raw_module.patch
create mode 100644 patches/buildroot/2010.11/144-tslib-bump_version_to_current_git_head.patch
diff --git a/patches/buildroot/2010.11/044-tslib-add_patch_for_recent_kernels_compatibility.patch b/patches/buildroot/2010.11/044-tslib-add_patch_for_recent_kernels_compatibility.patch
deleted file mode 100644
index 05090f4..0000000
--- a/patches/buildroot/2010.11/044-tslib-add_patch_for_recent_kernels_compatibility.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-Index: buildroot/package/tslib/tslib-1.0-zz-make_it_work_on_powerpc_and_recent_kernels.patch
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/tslib/tslib-1.0-zz-make_it_work_on_powerpc_and_recent_kernels.patch 2010-06-17 18:01:06.000000000 +0200
-@@ -0,0 +1,48 @@
-+The bit / absbit is defined the same way as in kernel. {EV|ABS}_CNT is
-+only exported in recent kernels.
-+
-+Signed-off-by: Sebastian Siewior <seb...@br...>
-+
-+
-+--- tslib-1.0.org/plugins/input-raw.c 2008-11-18 11:38:02.000000000 +0100
-++++ tslib-1.0/plugins/input-raw.c 2008-11-18 11:44:10.000000000 +0100
-+@@ -44,23 +44,31 @@
-+ int using_syn;
-+ };
-+
-++#define BITS_PER_LONG (sizeof(long) * 8)
-++#ifndef EV_CNT
-++#define EV_CNT (EV_MAX+1)
-++#endif
-++#ifndef ABS_CNT
-++#define ABS_CNT (ABS_MAX+1)
-++#endif
-++
-+ static int check_fd(struct tslib_input *i)
-+ {
-+ struct tsdev *ts = i->module.dev;
-+ int version;
-+- u_int32_t bit;
-+- u_int32_t absbit;
-++ unsigned long bit[EV_CNT / BITS_PER_LONG + 1];
-++ unsigned long absbit[ABS_MAX / BITS_PER_LONG + 1];
-+
-+ if (! ((ioctl(ts->fd, EVIOCGVERSION, &version) >= 0) &&
-+ (version == EV_VERSION) &&
-+- (ioctl(ts->fd, EVIOCGBIT(0, sizeof(bit) * 8), &bit) >= 0) &&
-+- (bit & (1 << EV_ABS)) &&
-+- (ioctl(ts->fd, EVIOCGBIT(EV_ABS, sizeof(absbit) * 8), &absbit) >= 0) &&
-+- (absbit & (1 << ABS_X)) &&
-+- (absbit & (1 << ABS_Y)) && (absbit & (1 << ABS_PRESSURE)))) {
-++ (ioctl(ts->fd, EVIOCGBIT(0, sizeof(bit)), bit) >= 0) &&
-++ (bit[0] & (1 << EV_ABS)) &&
-++ (ioctl(ts->fd, EVIOCGBIT(EV_ABS, sizeof(absbit)), absbit) >= 0) &&
-++ (absbit[0] & (1 << ABS_X)) &&
-++ (absbit[0] & (1 << ABS_Y)) && (absbit[0] & (1 << ABS_PRESSURE)))) {
-+ }
-+
-+- if (bit & (1 << EV_SYN))
-++ if (bit[0] & (1 << EV_SYN))
-+ i->using_syn = 1;
-+
-+ return 0;
diff --git a/patches/buildroot/2010.11/126-tslib-test_add_quit_button.patch b/patches/buildroot/2010.11/126-tslib-test_add_quit_button.patch
deleted file mode 100644
index 0988ff8..0000000
--- a/patches/buildroot/2010.11/126-tslib-test_add_quit_button.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-Create a patch in buildroot tslib package to add a button "Quit" in the program ts_test
-
-Signed-off-by: Jérémie Scheer <jer...@ar...>
-
-Index: buildroot/package/tslib/tslib-add_quit_button_to_test.patch
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/tslib/tslib-add_quit_button_to_test.patch 2010-07-07 17:23:42.000000000 +0200
-@@ -0,0 +1,45 @@
-+--- tslib-1.0/tests/ts_test.c.orig 2010-07-07 17:02:50.000000000 +0200
-++++ tslib-1.0/tests/ts_test.c 2010-07-07 16:27:44.000000000 +0200
-+@@ -44,7 +44,7 @@ static int button_palette [6] =
-+ 1, 5, 0
-+ };
-+
-+-#define NR_BUTTONS 2
-++#define NR_BUTTONS 3
-+ static struct ts_button buttons [NR_BUTTONS];
-+
-+ static void sig(int sig)
-+@@ -152,13 +152,15 @@ int main()
-+
-+ /* Initialize buttons */
-+ memset (&buttons, 0, sizeof (buttons));
-+- buttons [0].w = buttons [1].w = xres / 4;
-+- buttons [0].h = buttons [1].h = 20;
-+- buttons [0].x = xres / 4 - buttons [0].w / 2;
-+- buttons [1].x = (3 * xres) / 4 - buttons [0].w / 2;
-+- buttons [0].y = buttons [1].y = 10;
-++ buttons [0].w = buttons [1].w = buttons[2].w = xres / 4;
-++ buttons [0].h = buttons [1].h = buttons[2].h = 20;
-++ buttons [0].x = xres / 4 - 2 * (buttons [0].w / 3);
-++ buttons [1].x = xres / 2 - buttons [0].w / 2;
-++ buttons [2].x = 3 * (xres / 4) - buttons [0].w / 3;
-++ buttons [0].y = buttons [1].y = buttons [2].y = 10;
-+ buttons [0].text = "Drag";
-+ buttons [1].text = "Draw";
-++ buttons [2].text = "Quit";
-+
-+ refresh_screen ();
-+
-+@@ -196,6 +198,12 @@ int main()
-+ mode = 1;
-+ refresh_screen ();
-+ break;
-++ case 2:
-++ close_framebuffer();
-++ fflush(stderr);
-++ fflush(stdout);
-++ exit(1);
-++ break;
-+ }
-+
-+ printf("%ld.%06ld: %6d %6d %6d\n", samp.tv.tv_sec, samp.tv.tv_usec,
diff --git a/patches/buildroot/2010.11/143-tslib-enable_raw_module.patch b/patches/buildroot/2010.11/143-tslib-enable_raw_module.patch
new file mode 100644
index 0000000..72a3151
--- /dev/null
+++ b/patches/buildroot/2010.11/143-tslib-enable_raw_module.patch
@@ -0,0 +1,39 @@
+From 250d2222baa74f5f5833a83716824f668fb7b958 Mon Sep 17 00:00:00 2001
+From: Daniel Nyström <dan...@ti...>
+Date: Tue, 21 Dec 2010 18:06:56 +0000
+Subject: 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.
+
+Signed-off-by: Daniel Nyström <dan...@ti...>
+Acked-by: Paulius Zaleckas <pau...@gm...>
+Acked-by: Luca Ceresoli <lu...@lu...>
+Signed-off-by: Peter Korsgaard <ja...@su...>
+---
+diff --git a/package/tslib/tslib-enable_raw_module.patch b/package/tslib/tslib-enable_raw_module.patch
+new file mode 100644
+index 0000000..cb89338
+--- a/dev/null
++++ b/package/tslib/tslib-enable_raw_module.patch
+@@ -0,0 +1,14 @@
++Enable raw module by default
++
++Signed-off-by: Daniel Nyström <dan...@ti...>
++
++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
+--
+cgit v0.8.2.1
diff --git a/patches/buildroot/2010.11/144-tslib-bump_version_to_current_git_head.patch b/patches/buildroot/2010.11/144-tslib-bump_version_to_current_git_head.patch
new file mode 100644
index 0000000..1484d27
--- /dev/null
+++ b/patches/buildroot/2010.11/144-tslib-bump_version_to_current_git_head.patch
@@ -0,0 +1,252 @@
+From 36f33bc00f95b27702e07bacac8047f0d1882b62 Mon Sep 17 00:00:00 2001
+From: Daniel Nyström <dan...@ti...>
+Date: Tue, 21 Dec 2010 18:06:55 +0000
+Subject: 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.
+
+Signed-off-by: Daniel Nyström <dan...@ti...>
+Acked-by: Paulius Zaleckas <pau...@gm...>
+Acked-by: Luca Ceresoli <lu...@lu...>
+Signed-off-by: Peter Korsgaard <ja...@su...>
+---
+diff --git a/package/tslib/ts.conf b/package/tslib/ts.conf
+deleted file mode 100644
+index 1b0da93..0000000
+--- a/package/tslib/ts.conf
++++ b/dev/null
+@@ -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
+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
++++ b/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-link-plugins-against-libts.patch b/package/tslib/tslib-1.0-link-plugins-against-libts.patch
+deleted file mode 100644
+index d60b6a1..0000000
+--- a/package/tslib/tslib-1.0-link-plugins-against-libts.patch
++++ b/dev/null
+@@ -1,48 +0,0 @@
+-commit 12435b337ea074bd31ccb03aff58c7eefa86f31c
+-Author: kergoth <kergoth@a933c7a4-9bf7-0310-9141-a2e45189604d>
+-Date: Sat Nov 1 20:46:07 2008 +0000
+-
+- Link plugins against libts
+-
+- Some plugins use tslib functions. Link those plugins against libts.
+- The problem is easy to see with LDFLAGS="-Wl,-no-undefined".
+- Without this change DirectFB in unable to use tslib because symbols
+- in the tslib plugins can't be resolved.
+-
+- Signed-off-by: Ville Syrjala <sy...@sc...>
+- Signed-off-by: Chris Larson <cl...@ke...>
+-
+- git-svn-id: svn://svn.berlios.de/tslib/trunk/tslib@56 a933c7a4-9bf7-0310-9141-a2e45189604d
+-
+-diff --git a/plugins/Makefile.am b/plugins/Makefile.am
+-index 3b902c2..4c4ef8b 100644
+---- a/plugins/Makefile.am
+-+++ b/plugins/Makefile.am
+-@@ -114,15 +114,19 @@ pluginexec_LTLIBRARIES = \
+-
+- variance_la_SOURCES = variance.c
+- variance_la_LDFLAGS = -module $(LTVSN)
+-+variance_la_LIBADD = $(top_builddir)/src/libts.la
+-
+- dejitter_la_SOURCES = dejitter.c
+- dejitter_la_LDFLAGS = -module $(LTVSN)
+-+dejitter_la_LIBADD = $(top_builddir)/src/libts.la
+-
+- linear_la_SOURCES = linear.c
+- linear_la_LDFLAGS = -module $(LTVSN)
+-+linear_la_LIBADD = $(top_builddir)/src/libts.la
+-
+- pthres_la_SOURCES = pthres.c
+- pthres_la_LDFLAGS = -module $(LTVSN)
+-+pthres_la_LIBADD = $(top_builddir)/src/libts.la
+-
+- # hw access
+- corgi_la_SOURCES = corgi-raw.c
+-@@ -148,6 +152,7 @@ tatung_la_LDFLAGS = -module $(LTVSN)
+-
+- input_la_SOURCES = input-raw.c
+- input_la_LDFLAGS = -module $(LTVSN)
+-+input_la_LIBADD = $(top_builddir)/src/libts.la
+-
+- linear_h2200_la_SOURCES = linear-h2200.c
+- linear_h2200_la_LDFLAGS = -module $(LTVSN)
+diff --git a/package/tslib/tslib-1.0-no-cxx.patch b/package/tslib/tslib-1.0-no-cxx.patch
+deleted file mode 100644
+index 7e4e6d5..0000000
+--- a/package/tslib/tslib-1.0-no-cxx.patch
++++ b/dev/null
+@@ -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
+diff --git a/package/tslib/tslib-1.0-open-with-O_CREAT-needs-3-arguments.patch b/package/tslib/tslib-1.0-open-with-O_CREAT-needs-3-arguments.patch
+deleted file mode 100644
+index 5b23dd0..0000000
+--- a/package/tslib/tslib-1.0-open-with-O_CREAT-needs-3-arguments.patch
++++ b/dev/null
+@@ -1,53 +0,0 @@
+-From 4769d044fad6033053ee39c1fcd5ccc7693c6f71 Mon Sep 17 00:00:00 2001
+-From: kergoth <kergoth@a933c7a4-9bf7-0310-9141-a2e45189604d>
+-Date: Tue, 24 Mar 2009 17:42:34 +0000
+-Subject: [PATCH] tslib fails to compile on Ubuntu 8.10+, easy patch
+-
+-I noticed that gcc fails to compile the latest svn copy of tslib due
+-to a potentially "unsafe" use of open(). Ubuntu 8.10+, for instance,
+-by default enables the compiler flag -D_FORTIFY_SOURCE=2 which throws
+-an error on lines 253 and 255 of ts_calibrate.c. This is a pretty
+-minor issue, but could potentially stop some people using Ubuntu from
+-compiling unless they realize what's going on.
+-
+-To fix this, all you need to do is set a mode in the open() call. I
+-patched ts_calibrate.c to set 0644 (S_IRUSR | S_IWUSR | S_IRGRP |
+-S_IROTH) and it compiles fine. See below.
+-
+-Signed-off-by: Daniel Jabbour <da...@la...>
+-Signed-off-by: Chris Larson <cl...@ke...>
+-
+-git-svn-id: svn://svn.berlios.de/tslib/trunk/tslib@72 a933c7a4-9bf7-0310-9141-a2e45189604d
+----
+- tests/ts_calibrate.c | 7 +++++--
+- 1 files changed, 5 insertions(+), 2 deletions(-)
+-
+-diff --git a/tests/ts_calibrate.c b/tests/ts_calibrate.c
+-index 04c75dc..00e9580 100644
+---- a/tests/ts_calibrate.c
+-+++ b/tests/ts_calibrate.c
+-@@ -21,6 +21,7 @@
+- #include <sys/ioctl.h>
+- #include <sys/mman.h>
+- #include <sys/time.h>
+-+#include <sys/stat.h>
+- #include <linux/kd.h>
+- #include <linux/vt.h>
+- #include <linux/fb.h>
+-@@ -250,9 +251,11 @@ int main()
+- for (i = 0; i < 7; i++) printf("%d ", cal.a [i]);
+- printf("\n");
+- if ((calfile = getenv("TSLIB_CALIBFILE")) != NULL) {
+-- cal_fd = open (calfile, O_CREAT | O_RDWR);
+-+ cal_fd = open (calfile, O_CREAT | O_RDWR,
+-+ S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH);
+- } else {
+-- cal_fd = open ("/etc/pointercal", O_CREAT | O_RDWR);
+-+ cal_fd = open ("/etc/pointercal", O_CREAT | O_RDWR,
+-+ S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH);
+- }
+- sprintf (cal_buffer,"%d %d %d %d %d %d %d",
+- cal.a[1], cal.a[2], cal.a[0],
+---
+-1.7.0
+-
+diff --git a/package/tslib/tslib-1.0-remove-bzero.patch b/package/tslib/tslib-1.0-remove-bzero.patch
+deleted file mode 100644
+index 3e3ef3e..0000000
+--- a/package/tslib/tslib-1.0-remove-bzero.patch
++++ b/dev/null
+@@ -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) {
+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
++++ b/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 798499e..3ca40c5 100644
+--- a/package/tslib/tslib.mk
++++ b/package/tslib/tslib.mk
+@@ -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
+--
+cgit v0.8.2.1
hooks/post-receive
--
armadeus
|
