[fbutils] clean up patches

Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>

8 files changed, 204 insertions, 141 deletions

diff --git a/patches/fbutils-20041102-1/0001-fix-compiler-warnings.patch b/patches/fbutils-20041102-1/0001-fix-compiler-warnings.patch
new file mode 100644
index 000000000..0dcefb8b4
--- /dev/null
+++ b/patches/fbutils-20041102-1/0001-fix-compiler-warnings.patch
@@ -0,0 +1,82 @@
+From b092536f0611cfa12c86d85183ef9aee178898e6 Mon Sep 17 00:00:00 2001
+From: Marc Kleine-Budde <mkl@pengutronix.de>
+Date: Fri, 26 Feb 2010 12:35:01 +0100
+Subject: [PATCH 1/6] fix compiler warnings
+
+Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
+---
+ include/util.h    |    2 +-
+ lib/framebuffer.C |    4 ++--
+ lib/list.C        |    2 +-
+ lib/util.C        |    3 ++-
+ 4 files changed, 6 insertions(+), 5 deletions(-)
+
+diff --git a/include/util.h b/include/util.h
+index de490b8..484ff2e 100644
+--- a/include/util.h
++++ b/include/util.h
+@@ -20,7 +20,7 @@ extern const char *ProgramName;
+ 
+ extern void Die(const char *fmt,...) __attribute__((noreturn));
+ extern void Warn(const char *fmt,...);
+-extern int GetNextOption(int &argc, const char **&argv,
++extern int GetNextOption(int argc, char **argv,
+ 			 const struct option options[],
+ 			 const u_int num_options);
+ 
+diff --git a/lib/framebuffer.C b/lib/framebuffer.C
+index 923809b..b37c635 100644
+--- a/lib/framebuffer.C
++++ b/lib/framebuffer.C
+@@ -164,7 +164,7 @@ void ColorMap::Invert(void) const
+     }
+ }
+ 
+-void ColorMap::Print(const char *indent = "") const
++void ColorMap::Print(const char *indent) const
+ {
+     printf("start = %d\n", start);
+     printf("len = %d\n", len);
+@@ -191,7 +191,7 @@ void Con2FBMap::Set(const FrameBuffer &fb) const
+ 	Die("ioctl FBIOPUT_CON2FBMAP: %s\n", strerror(errno));
+ }
+ 
+-void Con2FBMap::Print(const char *indent = "") const
++void Con2FBMap::Print(const char *indent) const
+ {
+     printf("%sconsole %d -> fb %d\n", indent, console, framebuffer);
+ }
+diff --git a/lib/list.C b/lib/list.C
+index e88e5cd..836d33b 100644
+--- a/lib/list.C
++++ b/lib/list.C
+@@ -1,4 +1,4 @@
+-
++#include <string.h>
+ #include "list.h"
+ #include "util.h"
+ 
+diff --git a/lib/util.C b/lib/util.C
+index 292380c..7bc4c0a 100644
+--- a/lib/util.C
++++ b/lib/util.C
+@@ -6,6 +6,7 @@
+ #include <string.h>
+ #include <unistd.h>
+ #include <sys/ioctl.h>
++#include <stdlib.h>
+ 
+ #include "util.h"
+ 
+@@ -43,7 +44,7 @@ void Warn(const char *fmt,...)
+ 
+     //  Command Line Parameter Processing
+ 
+-int GetNextOption(int &argc, const char **&argv,
++int GetNextOption(int argc, char **argv,
+ 		  const struct option options[], const u_int num_options)
+ {
+     static bool first = true;
+-- 
+1.7.0
+
diff --git a/patches/fbutils-20041102-1/fbutils-20041102-1-defect-maxmin.diff b/patches/fbutils-20041102-1/0002-fbcmap-remove-obsolete-gnu-extension.patch
index 40c66a6a9..01306b3ca 100644
--- a/patches/fbutils-20041102-1/fbutils-20041102-1-defect-maxmin.diff
+++ b/patches/fbutils-20041102-1/0002-fbcmap-remove-obsolete-gnu-extension.patch
@@ -1,5 +1,7 @@
+From 4d77caf0107881b1a73a8ca12531d8523f72ed17 Mon Sep 17 00:00:00 2001
 From: Robert Schwebel <r.schwebel@pengutronix.de>
-Subject: [patch] remove obsolete gnu extension
+Date: Fri, 26 Feb 2010 12:29:56 +0100
+Subject: [PATCH 2/6] [fbcmap] remove obsolete gnu extension
 
 make[2]: Entering directory `.../fbutils-20041102-1/fbcmap'
 arm-v4t-linux-gnueabi-g++ -Wall -I../include -O2  -M -E *.C > .depend
@@ -10,15 +12,15 @@ fbcmap.C:118: error: expected primary-expression before '?' token
 The GNU extension ">?" for MAX isn't supported any more
 
 Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
-
+Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
 ---
  fbcmap/fbcmap.C |   11 ++++++++---
- 1 file changed, 8 insertions(+), 3 deletions(-)
+ 1 files changed, 8 insertions(+), 3 deletions(-)
 
-Index: fbutils-20041102-1/fbcmap/fbcmap.C
-===================================================================
---- fbutils-20041102-1.orig/fbcmap/fbcmap.C
-+++ fbutils-20041102-1/fbcmap/fbcmap.C
+diff --git a/fbcmap/fbcmap.C b/fbcmap/fbcmap.C
+index c61f19a..30075c3 100644
+--- a/fbcmap/fbcmap.C
++++ b/fbcmap/fbcmap.C
 @@ -13,6 +13,12 @@
  #include "framebuffer.h"
  #include "util.h"
@@ -32,7 +34,7 @@ Index: fbutils-20041102-1/fbcmap/fbcmap.C
  
  bool Opt_version = false;
  bool Opt_verbose = false;
-@@ -115,8 +121,7 @@ int main(int argc, char *argv[])
+@@ -113,8 +119,7 @@ int main(int argc, char *argv[])
  	    break;
  
  	case FB_VISUAL_DIRECTCOLOR:
@@ -42,7 +44,7 @@ Index: fbutils-20041102-1/fbcmap/fbcmap.C
  	    break;
  
  	case FB_VISUAL_PSEUDOCOLOR:
-@@ -145,7 +150,7 @@ int main(int argc, char *argv[])
+@@ -143,7 +148,7 @@ int main(int argc, char *argv[])
  	}
  	cmap.Set(fb);
      } else if (!strcmp(Opt_command, "vga")) {
@@ -51,3 +53,6 @@ Index: fbutils-20041102-1/fbcmap/fbcmap.C
  	memcpy(cmap.red, VGA_Red, len*sizeof(*cmap.red));
  	memcpy(cmap.green, VGA_Green, len*sizeof(*cmap.green));
  	memcpy(cmap.blue, VGA_Blue, len*sizeof(*cmap.blue));
+-- 
+1.7.0
+
diff --git a/patches/fbutils-20041102-1/0003-fbcmap-fix-Opt_command-handling.patch b/patches/fbutils-20041102-1/0003-fbcmap-fix-Opt_command-handling.patch
new file mode 100644
index 000000000..0b9781abc
--- /dev/null
+++ b/patches/fbutils-20041102-1/0003-fbcmap-fix-Opt_command-handling.patch
@@ -0,0 +1,42 @@
+From 9188ffeab409fb4626ac9e70b40c2e07e9fa42d6 Mon Sep 17 00:00:00 2001
+From: Marc Kleine-Budde <mkl@pengutronix.de>
+Date: Fri, 26 Feb 2010 12:36:28 +0100
+Subject: [PATCH 3/6] [fbcmap] fix Opt_command handling
+
+Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
+---
+ fbcmap/fbcmap.C |   10 ++++++----
+ 1 files changed, 6 insertions(+), 4 deletions(-)
+
+diff --git a/fbcmap/fbcmap.C b/fbcmap/fbcmap.C
+index 30075c3..38965ad 100644
+--- a/fbcmap/fbcmap.C
++++ b/fbcmap/fbcmap.C
+@@ -36,6 +36,7 @@ const struct option Options[] = {
+     { 0, 0, "debug", &Opt_debug, 0 },
+     { 0, 'f', "frame-buffer", &Opt_fb, 1 },
+     { 0, 'l', "length", &Opt_length, 1 },
++    { 0, 'c', "command", &Opt_command, 1 },
+ };
+ 
+ u_int DebugMask = 0;
+@@ -67,11 +68,12 @@ static void Usage(void)
+ 	"    -v, --verbose          : Verbose mode\n"
+ 	"    -l, --length len       : Colormap length\n"
+ 	"    -f, --frame-buffer dev : Framebuffer device to use\n"
+-	"    -d, --dump             : Dump the colormap (default operation)\n"
+-	"    -r, --ramp             : Set the colormap to a ramp\n"
+-	"    -c, --vga              : Set the colormap to the VGA console "
++	"    -c <CMD>               : execute command, where command is one of\n"
++	"       vga                 : Set the colormap to the VGA console "
+ 				     "palette\n"
+-	"    -i, --inverse          : Invert the current colormap\n"
++	"       inverse             : Invert the current colormap\n"
++	"       ramp                : Set the colormap to a ramp\n"
++	"       dump                : dump current palette (default)\n"
+ 	"\n", ProgramName);
+ }
+ 
+-- 
+1.7.0
+
diff --git a/patches/fbutils-20041102-1/0004-Rules.config-make-buildsystem-more-cross-compile-fri.patch b/patches/fbutils-20041102-1/0004-Rules.config-make-buildsystem-more-cross-compile-fri.patch
new file mode 100644
index 000000000..9422c193e
--- /dev/null
+++ b/patches/fbutils-20041102-1/0004-Rules.config-make-buildsystem-more-cross-compile-fri.patch
@@ -0,0 +1,38 @@
+From 0132b2aa2d4047729b01224a0eed8ae6c8ed913d Mon Sep 17 00:00:00 2001
+From: Marc Kleine-Budde <mkl@pengutronix.de>
+Date: Fri, 26 Feb 2010 12:33:14 +0100
+Subject: [PATCH 4/6] [Rules.config] make buildsystem more cross compile friendly
+
+- obey CXX and AR set in env
+- use CPPFLAGS and LDFLAGS
+
+Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
+---
+ Rules.config |    8 ++++----
+ 1 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/Rules.config b/Rules.config
+index 8d987a7..01fcc5c 100644
+--- a/Rules.config
++++ b/Rules.config
+@@ -1,13 +1,13 @@
+ 
+-CXX =		g++
++CXX ?=		g++
+ OPTFLAGS =	-O2
+ DEBUGFLAGS =
+-CFLAGS =	-Wall -I../include $(OPTFLAGS) $(DEBUGFLAGS)
+-LFLAGS =	-L../lib -lfbutil
++CFLAGS +=	-Wall -I../include $(OPTFLAGS) $(DEBUGFLAGS) $(CPPFLAGS)
++LFLAGS =	-L../lib -lfbutil $(LDFLAGS)
+ BISON =		bison -d
+ FLEX =		flex
+ INSTALL =	install
+ RM =		rm -f
+ LN =		ln -sf
+-AR =		ar
++AR ?=		ar
+ 
+-- 
+1.7.0
+
diff --git a/patches/fbutils-20041102-1/fbutils-20041102-1-installfix.diff b/patches/fbutils-20041102-1/0005-Makefile-create-non-existing-directories.patch
index e741ab20f..88dc13d02 100644
--- a/patches/fbutils-20041102-1/fbutils-20041102-1-installfix.diff
+++ b/patches/fbutils-20041102-1/0005-Makefile-create-non-existing-directories.patch
@@ -1,20 +1,22 @@
+From 3b37ba348fd5537ca456fc4175cb22eebcc143c1 Mon Sep 17 00:00:00 2001
 From: Sascha Hauer <s.hauer@pengutronix.de>
-Subject: create non-existing directories
+Date: Fri, 26 Feb 2010 12:29:56 +0100
+Subject: [PATCH 5/6] [Makefile] create non-existing directories
 
 Use install -D, in case the directory does not exist yet; this may
 happen when building with some cross build system which builds up the
 root filesystem from scratch.
 
 Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
-
+Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
 ---
  Makefile |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
+ 1 files changed, 1 insertions(+), 1 deletions(-)
 
-Index: fbutils-20041102-1/Makefile
-===================================================================
---- fbutils-20041102-1.orig/Makefile
-+++ fbutils-20041102-1/Makefile
+diff --git a/Makefile b/Makefile
+index b59d492..155a68d 100644
+--- a/Makefile
++++ b/Makefile
 @@ -17,7 +17,7 @@ install:
  		$(INSTALL) fbset/fbset $(DESTDIR)/usr/sbin/fbset
  		$(INSTALL) fbcmap/fbcmap $(DESTDIR)/usr/sbin/fbcmap
@@ -24,3 +26,6 @@ Index: fbutils-20041102-1/Makefile
  
  include Rules.build
  
+-- 
+1.7.0
+
diff --git a/patches/fbutils-20041102-1/fbutils-20041102-install-fbconvert.diff b/patches/fbutils-20041102-1/0006-Makefile-install-fbconvert.patch
index b97a4e405..518606ffc 100644
--- a/patches/fbutils-20041102-1/fbutils-20041102-install-fbconvert.diff
+++ b/patches/fbutils-20041102-1/0006-Makefile-install-fbconvert.patch
@@ -1,16 +1,18 @@
+From c63194e3407aa345fa597420da60379d93e9ad7c Mon Sep 17 00:00:00 2001
 From: Michael Olbrich <m.olbrich@pengutronix.de>
-Subject: install fbconvert
+Date: Fri, 26 Feb 2010 12:29:56 +0100
+Subject: [PATCH 6/6] [Makefile] install fbconvert
 
 install fbconvert during 'make install'
 
 Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
-
+Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
 ---
  Makefile |    1 +
- 1 file changed, 1 insertion(+)
+ 1 files changed, 1 insertions(+), 0 deletions(-)
 
-Index: b/Makefile
-===================================================================
+diff --git a/Makefile b/Makefile
+index 155a68d..45fef63 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -17,6 +17,7 @@ install:
@@ -21,3 +23,6 @@ Index: b/Makefile
  		$(INSTALL) -D -p etc/modes $(DESTDIR)/etc/fb/modes
  
  include Rules.build
+-- 
+1.7.0
+
diff --git a/patches/fbutils-20041102-1/fbutils-20041102-1-ptx1.diff b/patches/fbutils-20041102-1/fbutils-20041102-1-ptx1.diff
deleted file mode 100644
index 62c22742a..000000000
--- a/patches/fbutils-20041102-1/fbutils-20041102-1-ptx1.diff
+++ /dev/null
@@ -1,116 +0,0 @@
-From: Robert Schwebel <r.schwebel@pengutronix.de>
-Subject: FIXME
-
-Patch needs cleanup.
-
-Not-Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
-
----
-
-diff -urN fbutils-20041102-1/Rules.config fbutils-20041102-1-ptx/Rules.config
---- fbutils-20041102-1/Rules.config	2001-08-06 19:28:23.000000000 +0200
-+++ fbutils-20041102-1-ptx/Rules.config	2004-11-02 10:49:23.000000000 +0100
-@@ -1,5 +1,5 @@
- 
--CXX =		g++
-+CXX ?=		g++
- OPTFLAGS =	-O2
- DEBUGFLAGS =
- CFLAGS =	-Wall -I../include $(OPTFLAGS) $(DEBUGFLAGS)
-@@ -9,5 +9,5 @@
- INSTALL =	install
- RM =		rm -f
- LN =		ln -sf
--AR =		ar
-+AR ?=		ar
- 
-diff -urN fbutils-20041102-1/fbcmap/fbcmap.C fbutils-20041102-1-ptx/fbcmap/fbcmap.C
---- fbutils-20041102-1/fbcmap/fbcmap.C	2001-08-06 19:28:23.000000000 +0200
-+++ fbutils-20041102-1-ptx/fbcmap/fbcmap.C	2004-11-02 13:58:24.000000000 +0100
-@@ -30,6 +30,7 @@
-     { 0, 0, "debug", &Opt_debug, 0 },
-     { 0, 'f', "frame-buffer", &Opt_fb, 1 },
-     { 0, 'l', "length", &Opt_length, 1 },
-+    { 0, 'c', "command", &Opt_command, 1 },
- };
- 
- u_int DebugMask = 0;
-@@ -61,11 +62,12 @@
- 	"    -v, --verbose          : Verbose mode\n"
- 	"    -l, --length len       : Colormap length\n"
- 	"    -f, --frame-buffer dev : Framebuffer device to use\n"
--	"    -d, --dump             : Dump the colormap (default operation)\n"
--	"    -r, --ramp             : Set the colormap to a ramp\n"
--	"    -c, --vga              : Set the colormap to the VGA console "
-+	"    -c <CMD>               : execute command, where command is one of\n"
-+	"       vga                 : Set the colormap to the VGA console "
- 				     "palette\n"
--	"    -i, --inverse          : Invert the current colormap\n"
-+	"       inverse             : Invert the current colormap\n"
-+	"       ramp                : Set the colormap to a ramp\n"
-+	"       dump                : dump current palette (default)\n"
- 	"\n", ProgramName);
- }
- 
-diff -urN fbutils-20041102-1/include/util.h fbutils-20041102-1-ptx/include/util.h
---- fbutils-20041102-1/include/util.h	2001-08-06 19:28:23.000000000 +0200
-+++ fbutils-20041102-1-ptx/include/util.h	2004-11-02 10:39:36.000000000 +0100
-@@ -20,7 +20,7 @@
- 
- extern void Die(const char *fmt,...) __attribute__((noreturn));
- extern void Warn(const char *fmt,...);
--extern int GetNextOption(int &argc, const char **&argv,
-+extern int GetNextOption(int argc, char **argv,
- 			 const struct option options[],
- 			 const u_int num_options);
- 
-diff -urN fbutils-20041102-1/lib/framebuffer.C fbutils-20041102-1-ptx/lib/framebuffer.C
---- fbutils-20041102-1/lib/framebuffer.C	2001-08-06 19:28:23.000000000 +0200
-+++ fbutils-20041102-1-ptx/lib/framebuffer.C	2004-11-02 10:21:33.000000000 +0100
-@@ -164,7 +164,7 @@
-     }
- }
- 
--void ColorMap::Print(const char *indent = "") const
-+void ColorMap::Print(const char *indent) const
- {
-     printf("start = %d\n", start);
-     printf("len = %d\n", len);
-@@ -191,7 +191,7 @@
- 	Die("ioctl FBIOPUT_CON2FBMAP: %s\n", strerror(errno));
- }
- 
--void Con2FBMap::Print(const char *indent = "") const
-+void Con2FBMap::Print(const char *indent) const
- {
-     printf("%sconsole %d -> fb %d\n", indent, console, framebuffer);
- }
-diff -urN fbutils-20041102-1/lib/list.C fbutils-20041102-1-ptx/lib/list.C
---- fbutils-20041102-1/lib/list.C	2001-08-06 19:28:23.000000000 +0200
-+++ fbutils-20041102-1-ptx/lib/list.C	2004-11-02 10:14:03.000000000 +0100
-@@ -1,4 +1,4 @@
--
-+#include <string.h>
- #include "list.h"
- #include "util.h"
- 
-diff -urN fbutils-20041102-1/lib/util.C fbutils-20041102-1-ptx/lib/util.C
---- fbutils-20041102-1/lib/util.C	2001-08-06 19:28:23.000000000 +0200
-+++ fbutils-20041102-1-ptx/lib/util.C	2004-11-02 10:44:29.000000000 +0100
-@@ -6,6 +6,7 @@
- #include <string.h>
- #include <unistd.h>
- #include <sys/ioctl.h>
-+#include <stdlib.h>
- 
- #include "util.h"
- 
-@@ -43,7 +44,7 @@
- 
-     //  Command Line Parameter Processing
- 
--int GetNextOption(int &argc, const char **&argv,
-+int GetNextOption(int argc, char **argv,
- 		  const struct option options[], const u_int num_options)
- {
-     static bool first = true;
diff --git a/patches/fbutils-20041102-1/series b/patches/fbutils-20041102-1/series
index df7aeb975..a3fe53674 100644
--- a/patches/fbutils-20041102-1/series
+++ b/patches/fbutils-20041102-1/series
@@ -1,4 +1,6 @@
-fbutils-20041102-1-installfix.diff
-fbutils-20041102-1-ptx1.diff
-fbutils-20041102-1-defect-maxmin.diff
-fbutils-20041102-install-fbconvert.diff
+0001-fix-compiler-warnings.patch
+0002-fbcmap-remove-obsolete-gnu-extension.patch
+0003-fbcmap-fix-Opt_command-handling.patch
+0004-Rules.config-make-buildsystem-more-cross-compile-fri.patch
+0005-Makefile-create-non-existing-directories.patch
+0006-Makefile-install-fbconvert.patch