summaryrefslogtreecommitdiffstats
path: root/patches/tslib-1.1
diff options
context:
space:
mode:
authorMichael Olbrich <m.olbrich@pengutronix.de>2014-02-03 11:03:04 +0100
committerMichael Olbrich <m.olbrich@pengutronix.de>2014-02-12 12:53:26 +0100
commit528bb7e6ef7fadc1aad032b9f895fb265f748ac6 (patch)
tree509d5873df3b665fe8c7e6ffc39caebafc67cbb5 /patches/tslib-1.1
parent979526047e051d4ad1bbef85e3f517fd6195395a (diff)
downloadptxdist-528bb7e6ef7fadc1aad032b9f895fb265f748ac6.tar.gz
ptxdist-528bb7e6ef7fadc1aad032b9f895fb265f748ac6.tar.xz
tslib: version bump 1.0 -> 1.1
Just update to the latest version. Cleanup makefile while at it. Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'patches/tslib-1.1')
-rw-r--r--patches/tslib-1.1/0001-Link-plugins-against-main-library-to-allow-dynamic-l.patch23
-rw-r--r--patches/tslib-1.1/0002-ts_test-clear-screen-on-exit.patch36
-rw-r--r--patches/tslib-1.1/0003-input-raw-call-check_fd-only-once.patch22
l---------patches/tslib-1.1/autogen.sh1
-rw-r--r--patches/tslib-1.1/series6
5 files changed, 88 insertions, 0 deletions
diff --git a/patches/tslib-1.1/0001-Link-plugins-against-main-library-to-allow-dynamic-l.patch b/patches/tslib-1.1/0001-Link-plugins-against-main-library-to-allow-dynamic-l.patch
new file mode 100644
index 000000000..941d36410
--- /dev/null
+++ b/patches/tslib-1.1/0001-Link-plugins-against-main-library-to-allow-dynamic-l.patch
@@ -0,0 +1,23 @@
+From: Denis Oliver Kropp <dok@directfb.org>
+Date: Mon, 3 Feb 2014 09:57:25 +0100
+Subject: [PATCH] Link plugins against main library to allow dynamic loading of
+ libts without RTLD_GLOBAL
+
+Signed-off-by: Denis Oliver Kropp <dok@directfb.org>
+---
+ plugins/Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/plugins/Makefile.am b/plugins/Makefile.am
+index e938e17..d8cbfd9 100644
+--- a/plugins/Makefile.am
++++ b/plugins/Makefile.am
+@@ -15,7 +15,7 @@ INCLUDES = -I$(top_srcdir)/src
+ #LTVSN = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
+ # -release $(LT_RELEASE)
+ LTVSN = -avoid-version
+-LIBS =
++LIBS = $(top_srcdir)/src/libts.la
+ pluginexecdir = $(PLUGIN_DIR)
+
+ if ENABLE_LINEAR_MODULE
diff --git a/patches/tslib-1.1/0002-ts_test-clear-screen-on-exit.patch b/patches/tslib-1.1/0002-ts_test-clear-screen-on-exit.patch
new file mode 100644
index 000000000..a1db4a147
--- /dev/null
+++ b/patches/tslib-1.1/0002-ts_test-clear-screen-on-exit.patch
@@ -0,0 +1,36 @@
+From: Wolfram Sang <w.sang@pengutronix.de>
+Date: Mon, 3 Feb 2014 09:57:25 +0100
+Subject: [PATCH] ts_test: clear screen on exit
+
+Make sure that ts_test clears the screen on exit.
+
+Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>
+---
+ tests/ts_calibrate.c | 1 +
+ tests/ts_test.c | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/tests/ts_calibrate.c b/tests/ts_calibrate.c
+index eb0aca3..ea503a4 100644
+--- a/tests/ts_calibrate.c
++++ b/tests/ts_calibrate.c
+@@ -268,6 +268,7 @@ int main()
+ i = -1;
+ }
+
++ fillrect (0, 0, xres - 1, yres - 1, 0);
+ close_framebuffer();
+ return i;
+ }
+diff --git a/tests/ts_test.c b/tests/ts_test.c
+index fbbc9b8..d47c6e0 100644
+--- a/tests/ts_test.c
++++ b/tests/ts_test.c
+@@ -213,6 +213,7 @@ int main()
+ if (quit_pressed)
+ break;
+ }
++ fillrect (0, 0, xres - 1, yres - 1, 0);
+ close_framebuffer();
+
+ return 0;
diff --git a/patches/tslib-1.1/0003-input-raw-call-check_fd-only-once.patch b/patches/tslib-1.1/0003-input-raw-call-check_fd-only-once.patch
new file mode 100644
index 000000000..d977c6365
--- /dev/null
+++ b/patches/tslib-1.1/0003-input-raw-call-check_fd-only-once.patch
@@ -0,0 +1,22 @@
+From: Michael Olbrich <m.olbrich@pengutronix.de>
+Date: Mon, 3 Feb 2014 10:55:42 +0100
+Subject: [PATCH] input-raw: call check_fd() only once
+
+Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
+---
+ plugins/input-raw.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/plugins/input-raw.c b/plugins/input-raw.c
+index 10454da..5ce0abb 100644
+--- a/plugins/input-raw.c
++++ b/plugins/input-raw.c
+@@ -129,7 +129,7 @@ static int check_fd(struct tslib_input *i)
+ i->grab_events = GRAB_EVENTS_ACTIVE;
+ }
+
+- return 0;
++ return 1;
+ }
+
+ static int ts_input_read(struct tslib_module_info *inf,
diff --git a/patches/tslib-1.1/autogen.sh b/patches/tslib-1.1/autogen.sh
new file mode 120000
index 000000000..9f8a4cb7d
--- /dev/null
+++ b/patches/tslib-1.1/autogen.sh
@@ -0,0 +1 @@
+../autogen.sh \ No newline at end of file
diff --git a/patches/tslib-1.1/series b/patches/tslib-1.1/series
new file mode 100644
index 000000000..adb440589
--- /dev/null
+++ b/patches/tslib-1.1/series
@@ -0,0 +1,6 @@
+# generated by git-ptx-patches
+#tag:base --start-number 1
+0001-Link-plugins-against-main-library-to-allow-dynamic-l.patch
+0002-ts_test-clear-screen-on-exit.patch
+0003-input-raw-call-check_fd-only-once.patch
+# bc8437f799188bde6c8ef1bd1f0ce6b7 - git-ptx-patches magic