[rtems-graphics-toolkit commit] patches: new subdirectory for upstream patches not yet merged

[Gedare Bloom]

Module:    rtems-graphics-toolkit
Branch:    master
Commit:    a2dc50f00bfae3b5866c22639d7cfd52c89027e7
Changeset: http://git.rtems.org/rtems-graphics-toolkit/commit/?id=a2dc50f00bfae3b5866c22639d7cfd52c89027e7

Author:    Gedare Bloom <gedare at rtems.org>
Date:      Fri Jan 17 09:23:43 2014 -0500

patches: new subdirectory for upstream patches not yet merged

---

 patches/fltk/0001-fltk-cairotest-fix-build.patch   |   25 ++++++++++++
 ...build-the-tests-unless-explicitly-request.patch |   29 ++++++++++++++
 ...01-change-the-MicroWindows-RTEMS-KBD-glue.patch |   40 ++++++++++++++++++++
 patches/nxlib/0001-add-a-gitignore.patch           |   23 +++++++++++
 4 files changed, 117 insertions(+), 0 deletions(-)

diff --git a/patches/fltk/0001-fltk-cairotest-fix-build.patch b/patches/fltk/0001-fltk-cairotest-fix-build.patch
new file mode 100644
index 0000000..7559fcd
--- /dev/null
+++ b/patches/fltk/0001-fltk-cairotest-fix-build.patch
@@ -0,0 +1,25 @@
+From d3c22afda2ea28e6312cfe9e7131d55598f010a5 Mon Sep 17 00:00:00 2001
+From: Chirayu Desai <cdesai at cyanogenmod.org>
+Date: Wed, 1 Jan 2014 19:21:37 +0530
+Subject: [PATCH 1/2] fltk: cairotest: fix build
+
+---
+ fltk-1.3.0/test/Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/fltk-1.3.0/test/Makefile b/fltk-1.3.0/test/Makefile
+index f7bbd6c546..a3e0bf7a79 100644
+--- a/fltk-1.3.0/test/Makefile
++++ b/fltk-1.3.0/test/Makefile
+@@ -513,7 +513,7 @@ shape$(EXEEXT): shape.o
+ 
+ cairo_test$(EXEEXT): cairo_test.o
+ 	echo Linking $@...
+-	$(CXX) $(ARCHFLAGS) $(CAIROFLAGS) $(LDFLAGS) -o $@ cairo_test.o $(LINKFLTK) $(LINKFLTKCAIRO) $(GLDLIBS)
++	$(CXX) $(ARCHFLAGS) $(CAIROFLAGS) $(LDFLAGS) -o $@ cairo_test.o $(LINKFLTK) $(LINKFLTKCAIRO) $(GLDLIBS) -ljpeg -lpng -lz
+ 
+ #
+ # End of "$Id: Makefile 8389 2011-02-06 14:08:08Z manolo $".
+-- 
+1.8.5.2
+
diff --git a/patches/fltk/0002-fltk-Don-t-build-the-tests-unless-explicitly-request.patch b/patches/fltk/0002-fltk-Don-t-build-the-tests-unless-explicitly-request.patch
new file mode 100644
index 0000000..f0770de
--- /dev/null
+++ b/patches/fltk/0002-fltk-Don-t-build-the-tests-unless-explicitly-request.patch
@@ -0,0 +1,29 @@
+From 33a2aae8306bbbf829043cf5ff7022cdf0ffe41c Mon Sep 17 00:00:00 2001
+From: Chirayu Desai <cdesai at cyanogenmod.org>
+Date: Thu, 2 Jan 2014 22:31:13 +0530
+Subject: [PATCH 2/2] fltk: Don't build the tests unless explicitly requested
+
+* Can be built by setting ENABLE_FLTK_TESTS
+---
+ fltk-1.3.0/Makefile | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/fltk-1.3.0/Makefile b/fltk-1.3.0/Makefile
+index 01663b2ac5..1cd97fb050 100644
+--- a/fltk-1.3.0/Makefile
++++ b/fltk-1.3.0/Makefile
+@@ -27,7 +27,10 @@
+ 
+ include makeinclude
+ 
+-DIRS = $(IMAGEDIRS) src $(CAIRODIR) test documentation
++DIRS = $(IMAGEDIRS) src $(CAIRODIR) documentation
++ifneq ($(ENABLE_FLTK_TESTS),)
++DIRS += test
++endif
+ 
+ all: makeinclude fltk-config
+ 	for dir in $(DIRS); do\
+-- 
+1.8.5.2
+
diff --git a/patches/microwin/0001-change-the-MicroWindows-RTEMS-KBD-glue.patch b/patches/microwin/0001-change-the-MicroWindows-RTEMS-KBD-glue.patch
new file mode 100644
index 0000000..9a3f89f
--- /dev/null
+++ b/patches/microwin/0001-change-the-MicroWindows-RTEMS-KBD-glue.patch
@@ -0,0 +1,40 @@
+From 6b5dae5cdbc334ac1c3210bc2c4918668cb42aa4 Mon Sep 17 00:00:00 2001
+From: Pavel Pisa <ppisa4lists at pikron.com>
+Date: Wed, 20 Mar 2013 05:48:56 -0500
+Subject: [PATCH 1/2] change the MicroWindows RTEMS KBD glue
+
+according to microwin/kbd_ttyscan.c
+---
+ src/drivers/kbd_rtems.c | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/src/drivers/kbd_rtems.c b/src/drivers/kbd_rtems.c
+index 8f9697f63f..d868932b13 100644
+--- a/src/drivers/kbd_rtems.c
++++ b/src/drivers/kbd_rtems.c
+@@ -30,9 +30,12 @@
+ #include <fcntl.h>
+ #include <sys/ioctl.h>
+ #include <errno.h>
++#include <string.h>
+ 
+ #include <rtems/mw_uid.h>
++#include <rtems/keyboard.h>
+ #include "device.h"
++#include "keymap_standard.h"
+ 
+ extern int close (int fd); /* RTEMS does not include close() in stdio.h */
+ 
+@@ -45,6 +48,9 @@ void    MWKbd_Close (void);
+ void	MWKbd_GetModifierInfo (MWKEYMOD *modifiers, MWKEYMOD *curmodifiers);
+ int	MWKbd_Read (MWKEY *buf, MWKEYMOD *modifiers, MWSCANCODE *scancode);
+ 
++static MWKEY TranslateScancode(int scancode, MWKEYMOD modstate);
++static void LoadKernelKeymaps(int fd);
++
+ KBDDEVICE kbddev = {
+         MWKbd_Open,
+ 	MWKbd_Close,
+-- 
+1.8.5.2
+
diff --git a/patches/nxlib/0001-add-a-gitignore.patch b/patches/nxlib/0001-add-a-gitignore.patch
new file mode 100644
index 0000000..1f3b880
--- /dev/null
+++ b/patches/nxlib/0001-add-a-gitignore.patch
@@ -0,0 +1,23 @@
+From b7660cc834efdfde8d4e3fbf032030de07f864b4 Mon Sep 17 00:00:00 2001
+From: Chirayu Desai <cdesai at cyanogenmod.org>
+Date: Wed, 25 Dec 2013 22:18:26 +0530
+Subject: [PATCH] add a gitignore
+
+---
+ .gitignore | 4 ++++
+ 1 file changed, 4 insertions(+)
+ create mode 100644 .gitignore
+
+diff --git a/.gitignore b/.gitignore
+new file mode 100644
+index 0000000000..27e5525e93
+--- /dev/null
++++ b/.gitignore
+@@ -0,0 +1,4 @@
++*~
++*.o
++*.a
++keysymstr.h
+-- 
+1.8.5.2
+