diff options
| author | Robert Schwebel <r.schwebel@pengutronix.de> | 2009-12-17 21:10:40 +0100 |
|---|---|---|
| committer | Robert Schwebel <r.schwebel@pengutronix.de> | 2009-12-18 01:20:36 +0100 |
| commit | 48dd109b836cba6a2c01b7a3f619fd1ab4cc2a67 (patch) | |
| tree | 5a72aea14de70c9ec40c8cde1907477f0f1c37b2 /patches/fbutils-20041102-1 | |
| parent | 0c508640abdab2d3f2ebc315f5c25e58923f4fce (diff) | |
| download | ptxdist-48dd109b836cba6a2c01b7a3f619fd1ab4cc2a67.tar.gz ptxdist-48dd109b836cba6a2c01b7a3f619fd1ab4cc2a67.tar.xz | |
[fbutils] patch cleanup
Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
Diffstat (limited to 'patches/fbutils-20041102-1')
| -rw-r--r-- | patches/fbutils-20041102-1/fbutils-20041102-1-defect-maxmin.diff | 19 | ||||
| -rw-r--r-- | patches/fbutils-20041102-1/fbutils-20041102-1-installfix.diff | 12 |
2 files changed, 18 insertions, 13 deletions
diff --git a/patches/fbutils-20041102-1/fbutils-20041102-1-defect-maxmin.diff b/patches/fbutils-20041102-1/fbutils-20041102-1-defect-maxmin.diff index b24b3d16f..40c66a6a9 100644 --- a/patches/fbutils-20041102-1/fbutils-20041102-1-defect-maxmin.diff +++ b/patches/fbutils-20041102-1/fbutils-20041102-1-defect-maxmin.diff @@ -1,5 +1,5 @@ From: Robert Schwebel <r.schwebel@pengutronix.de> -Subject: remove obsolete gnu extension +Subject: [patch] 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 @@ -7,17 +7,18 @@ arm-v4t-linux-gnueabi-g++ -Wall -I../include -O2 -c fbcmap.C -o fbcmap.o fbcmap.C: In function 'int main(int, char**)': fbcmap.C:118: error: expected primary-expression before '?' token -Seems like the GNU extension ">?" for MAX isn't supported any more - -No idea where to find the current upstream... +The GNU extension ">?" for MAX isn't supported any more Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de> --- + fbcmap/fbcmap.C | 11 ++++++++--- + 1 file changed, 8 insertions(+), 3 deletions(-) -diff -urN fbutils-20041102-1/fbcmap/fbcmap.C fbutils-20041102-1-ptx1/fbcmap/fbcmap.C ---- fbutils-20041102-1/fbcmap/fbcmap.C 2007-01-05 11:47:22.000000000 +0100 -+++ fbutils-20041102-1-ptx1/fbcmap/fbcmap.C 2007-01-05 11:45:07.000000000 +0100 +Index: fbutils-20041102-1/fbcmap/fbcmap.C +=================================================================== +--- fbutils-20041102-1.orig/fbcmap/fbcmap.C ++++ fbutils-20041102-1/fbcmap/fbcmap.C @@ -13,6 +13,12 @@ #include "framebuffer.h" #include "util.h" @@ -31,7 +32,7 @@ diff -urN fbutils-20041102-1/fbcmap/fbcmap.C fbutils-20041102-1-ptx1/fbcmap/fbcm bool Opt_version = false; bool Opt_verbose = false; -@@ -115,8 +121,7 @@ +@@ -115,8 +121,7 @@ int main(int argc, char *argv[]) break; case FB_VISUAL_DIRECTCOLOR: @@ -41,7 +42,7 @@ diff -urN fbutils-20041102-1/fbcmap/fbcmap.C fbutils-20041102-1-ptx1/fbcmap/fbcm break; case FB_VISUAL_PSEUDOCOLOR: -@@ -145,7 +150,7 @@ +@@ -145,7 +150,7 @@ int main(int argc, char *argv[]) } cmap.Set(fb); } else if (!strcmp(Opt_command, "vga")) { diff --git a/patches/fbutils-20041102-1/fbutils-20041102-1-installfix.diff b/patches/fbutils-20041102-1/fbutils-20041102-1-installfix.diff index 316948a33..e741ab20f 100644 --- a/patches/fbutils-20041102-1/fbutils-20041102-1-installfix.diff +++ b/patches/fbutils-20041102-1/fbutils-20041102-1-installfix.diff @@ -8,10 +8,14 @@ root filesystem from scratch. Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de> --- -diff -urN fbutils-20041102-1.orig/Makefile fbutils-20041102-1/Makefile ---- fbutils-20041102-1.orig/Makefile 2001-08-06 19:28:23.000000000 +0200 -+++ fbutils-20041102-1/Makefile 2006-02-22 15:00:04.000000000 +0100 -@@ -17,7 +17,7 @@ + Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +Index: fbutils-20041102-1/Makefile +=================================================================== +--- fbutils-20041102-1.orig/Makefile ++++ fbutils-20041102-1/Makefile +@@ -17,7 +17,7 @@ install: $(INSTALL) fbset/fbset $(DESTDIR)/usr/sbin/fbset $(INSTALL) fbcmap/fbcmap $(DESTDIR)/usr/sbin/fbcmap $(INSTALL) con2fbmap/con2fbmap $(DESTDIR)/usr/sbin/con2fbmap |