diff options
| author | Robert Schwebel <r.schwebel@pengutronix.de> | 2009-11-11 23:37:36 +0100 |
|---|---|---|
| committer | Robert Schwebel <r.schwebel@pengutronix.de> | 2009-12-07 09:33:44 +0100 |
| commit | eb60d3e71f855b75fabd157f1a4d22082bb1c5f9 (patch) | |
| tree | 0f0f34c23d7ad5c47ffa98e6295fd5bc58f9b773 /patches/fbutils-20041102-1 | |
| parent | 5bf4a731783708fd3c51714e6fa210ff434184e8 (diff) | |
| download | ptxdist-eb60d3e71f855b75fabd157f1a4d22082bb1c5f9.tar.gz ptxdist-eb60d3e71f855b75fabd157f1a4d22082bb1c5f9.tar.xz | |
[fbdev] add more patch canonicalisation
Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
Diffstat (limited to 'patches/fbutils-20041102-1')
3 files changed, 36 insertions, 36 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 b25cb94e7..b24b3d16f 100644 --- a/patches/fbutils-20041102-1/fbutils-20041102-1-defect-maxmin.diff +++ b/patches/fbutils-20041102-1/fbutils-20041102-1-defect-maxmin.diff @@ -1,23 +1,19 @@ -# -# Submitted-By: Robert Schwebel, 2007-01-05 -# Committed-By: Robert Schwebel -# -# Error: -# -# make[2]: Entering directory `.../fbutils-20041102-1/fbcmap' -# arm-v4t-linux-gnueabi-g++ -Wall -I../include -O2 -M -E *.C > .depend -# 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 -# -# Description: -# -# Seems like the GNU extension ">?" for MAX isn't supported any more -# -# State: -# -# no idea where to find upstream -# +From: Robert Schwebel <r.schwebel@pengutronix.de> +Subject: 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 +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... + +Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de> + +--- 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 @@ -35,19 +31,17 @@ 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,9 @@ +@@ -115,8 +121,7 @@ break; case FB_VISUAL_DIRECTCOLOR: - numcolorcells = 1<<(var.red.length >? var.green.length >? - var.blue.length); -+// numcolorcells = 1<<(var.red.length >? var.green.length >? -+// var.blue.length); + numcolorcells = 1<<(MAX(MAX(var.red.length,var.green.length),var.blue.length)); break; case FB_VISUAL_PSEUDOCOLOR: -@@ -145,7 +152,7 @@ +@@ -145,7 +150,7 @@ } 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 fe34d33cc..316948a33 100644 --- a/patches/fbutils-20041102-1/fbutils-20041102-1-installfix.diff +++ b/patches/fbutils-20041102-1/fbutils-20041102-1-installfix.diff @@ -1,16 +1,13 @@ -# -# Submitted-By: Sascha Hauer, 2006-02-22 -# Committed-By: Sascha Hauer -# -# Description: -# -# use install -D for etc/fb/modes because directory is nonexistent in ptxdist -# -# State: -# -# - -# +From: Sascha Hauer <s.hauer@pengutronix.de> +Subject: 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> + +--- 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 diff --git a/patches/fbutils-20041102-1/fbutils-20041102-1-ptx1.diff b/patches/fbutils-20041102-1/fbutils-20041102-1-ptx1.diff index 4e8b694f2..62c22742a 100644 --- a/patches/fbutils-20041102-1/fbutils-20041102-1-ptx1.diff +++ b/patches/fbutils-20041102-1/fbutils-20041102-1-ptx1.diff @@ -1,3 +1,12 @@ +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 |