diff options
| author | Peng Chang (Charles) | 2009-08-08 15:41:27 +0800 |
|---|---|---|
| committer | Peng Chang (Charles) | 2009-08-08 15:41:27 +0800 |
| commit | 268107f115a115af16b8cdb37bbe42047e6943fe (patch) | |
| tree | 0205fd4e39fddfa21c372d93ccd3d36570d6df66 /display | |
| parent | e067f9e093cbe9ca4fb19d7d02e2c005d6a5c763 (diff) | |
svgalib: added a patch to test whether "round" should be defined
Diffstat (limited to 'display')
| -rw-r--r-- | display/svgalib/HISTORY | 5 | ||||
| -rwxr-xr-x | display/svgalib/PRE_BUILD | 2 | ||||
| -rw-r--r-- | display/svgalib/c99_round.patch | 15 |
3 files changed, 22 insertions, 0 deletions
diff --git a/display/svgalib/HISTORY b/display/svgalib/HISTORY index 270762d2d1..ecd63a38cb 100644 --- a/display/svgalib/HISTORY +++ b/display/svgalib/HISTORY @@ -1,3 +1,8 @@ +2009-08-08 Peng Chang (Charles) <chp@sourcemage.org> + * c99_round.patch: it seems that c99 is enabled by default, and + function round shouldn't be re-defined when c99 is enabled + * PRE_BUILD: apply c99_round.path + 2008-12-23 Robin Cook <rcook@wyrms.net> * PRE_BUILD: apply patch provided by maintainer for vesa driver compile failure http://svn.rpmforge.net/svn/trunk/rpms/svgalib/svgalib-1.9.25-kernel-2.6.26.patch diff --git a/display/svgalib/PRE_BUILD b/display/svgalib/PRE_BUILD index 83ddb8e136..eca300e9ef 100755 --- a/display/svgalib/PRE_BUILD +++ b/display/svgalib/PRE_BUILD @@ -26,6 +26,8 @@ elif [ ${KER//\./} > 2614 ]; then patch -p2 < ${SCRIPT_DIRECTORY}/svgalib_helper-2.6.15.diff fi && +patch -p0 < $SCRIPT_DIRECTORY/c99_round.patch && + # Some other fixes I needed to do sedit 's:<config.h>:\"config.h\":' threeDKit/3dinit.c && sedit 's:<config.h>:\"config.h\":' threeDKit/3dkit.c && diff --git a/display/svgalib/c99_round.patch b/display/svgalib/c99_round.patch new file mode 100644 index 0000000000..dd04f30dd7 --- /dev/null +++ b/display/svgalib/c99_round.patch @@ -0,0 +1,15 @@ +--- utils/gtf/gtfcalc.c.orig 2009-08-08 15:28:03.000000000 +0800 ++++ utils/gtf/gtfcalc.c 2009-08-08 15:28:51.000000000 +0800 +@@ -64,10 +64,12 @@ static GTF_constants GC = { + + /*-------------------------- Implementation -------------------------------*/ + ++#ifndef __USE_ISOC99 + static double round(double v) + { + return floor(v + 0.5); + } ++#endif + + static void GetInternalConstants(GTF_constants *c) + /**************************************************************************** |