[Armadeus-commitlog] armadeus branch, master, updated. release-3.2-533-g492ab93
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. release-3.2-533-g492ab93
|
From: jscheer <js...@us...> - 2010-07-13 13:50:32
|
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 492ab930f0f5aa4e665157db963e2a9170da1a9c (commit)
via 72996ea44cadb2c41cd7eedbad5396fa6c7c60f5 (commit)
from c54f9110f5d89d581855220a124fdc4af0cb64c2 (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 492ab930f0f5aa4e665157db963e2a9170da1a9c
Merge: 72996ea44cadb2c41cd7eedbad5396fa6c7c60f5 c54f9110f5d89d581855220a124fdc4af0cb64c2
Author: Jeremie SCHEER <jer...@ar...>
Date: Tue Jul 13 14:27:31 2010 +0200
Merge branch 'master' of ssh://jscheer@armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
commit 72996ea44cadb2c41cd7eedbad5396fa6c7c60f5
Author: Jeremie SCHEER <jer...@ar...>
Date: Tue Jul 13 14:03:55 2010 +0200
Add a button Quit in ts_test to be able to terminate the application even when SIGINT is not handled.
-----------------------------------------------------------------------
Summary of changes:
.../buildroot/126-tslib-test_add_quit_button.patch | 54 ++++++++++++++++++++
.../2010.05/126-tslib-test_add_quit_button.patch | 54 ++++++++++++++++++++
2 files changed, 108 insertions(+), 0 deletions(-)
create mode 100644 patches/buildroot/126-tslib-test_add_quit_button.patch
create mode 100644 patches/buildroot/2010.05/126-tslib-test_add_quit_button.patch
diff --git a/patches/buildroot/126-tslib-test_add_quit_button.patch b/patches/buildroot/126-tslib-test_add_quit_button.patch
new file mode 100644
index 0000000..0988ff8
--- /dev/null
+++ b/patches/buildroot/126-tslib-test_add_quit_button.patch
@@ -0,0 +1,54 @@
+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.05/126-tslib-test_add_quit_button.patch b/patches/buildroot/2010.05/126-tslib-test_add_quit_button.patch
new file mode 100644
index 0000000..0988ff8
--- /dev/null
+++ b/patches/buildroot/2010.05/126-tslib-test_add_quit_button.patch
@@ -0,0 +1,54 @@
+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,
hooks/post-receive
--
armadeus
|
