From: Max Filippov Date: Wed, 18 Jun 2014 06:57:12 +0000 (+0400) Subject: svgtiny: create BUILDDIR before $(BUILDDIR)/src_colors.c X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=9019f17c6875a7411579645a8a87adf1ec6bfcf2;p=buildroot.git svgtiny: create BUILDDIR before $(BUILDDIR)/src_colors.c Fixes: http://autobuild.buildroot.net/results/5fe/5feca450d70a8de48fa2463e55c9e84db5d755b0/ [Peter: renumber existing patch and this] Signed-off-by: Max Filippov Signed-off-by: Peter Korsgaard --- diff --git a/package/libsvgtiny/libsvgtiny-01-disable-debug-printfs.patch b/package/libsvgtiny/libsvgtiny-01-disable-debug-printfs.patch new file mode 100644 index 0000000000..72ed21ccfa --- /dev/null +++ b/package/libsvgtiny/libsvgtiny-01-disable-debug-printfs.patch @@ -0,0 +1,125 @@ +svntiny: svntiny_gradient.c: only print debugging if GRADIENT_DEBUG is enabled + +Signed-off-by: Peter Korsgaard +--- + src/svgtiny_gradient.c | 23 ++++++++++++++++++++++- + 1 file changed, 22 insertions(+), 1 deletion(-) + +Index: libsvgtiny/src/svgtiny_gradient.c +=================================================================== +--- libsvgtiny.orig/src/svgtiny_gradient.c ++++ libsvgtiny/src/svgtiny_gradient.c +@@ -30,8 +30,9 @@ void svgtiny_find_gradient(const char *i + { + xmlNode *gradient; + ++#ifdef GRADIENT_DEBUG + fprintf(stderr, "svgtiny_find_gradient: id \"%s\"\n", id); +- ++#endif + state->linear_gradient_stop_count = 0; + state->gradient_x1 = "0%"; + state->gradient_y1 = "0%"; +@@ -47,13 +48,17 @@ void svgtiny_find_gradient(const char *i + + gradient = svgtiny_find_element_by_id( + (xmlNode *) state->document, id); ++#ifdef GRADIENT_DEBUG + fprintf(stderr, "gradient %p\n", (void *) gradient); ++#endif + if (!gradient) { + fprintf(stderr, "gradient \"%s\" not found\n", id); + return; + } + ++#ifdef GRADIENT_DEBUG + fprintf(stderr, "gradient name \"%s\"\n", gradient->name); ++#endif + if (strcmp((const char *) gradient->name, "linearGradient") == 0) { + svgtiny_parse_linear_gradient(gradient, state); + } +@@ -98,8 +103,10 @@ svgtiny_code svgtiny_parse_linear_gradie + return svgtiny_OUT_OF_MEMORY; + svgtiny_parse_transform(s, &a, &b, &c, &d, &e, &f); + free(s); ++#ifdef GRADIENT_DEBUG + fprintf(stderr, "transform %g %g %g %g %g %g\n", + a, b, c, d, e, f); ++#endif + state->gradient_transform.a = a; + state->gradient_transform.b = b; + state->gradient_transform.c = c; +@@ -143,7 +150,9 @@ svgtiny_code svgtiny_parse_linear_gradie + } + + if (offset != -1 && color != svgtiny_TRANSPARENT) { ++#ifdef GRADIENT_DEBUG + fprintf(stderr, "stop %g %x\n", offset, color); ++#endif + state->gradient_stop[i].offset = offset; + state->gradient_stop[i].color = color; + i++; +@@ -220,9 +229,11 @@ svgtiny_code svgtiny_add_path_linear_gra + #endif + + /* compute gradient vector */ ++#ifdef GRADIENT_DEBUG + fprintf(stderr, "x1 %s, y1 %s, x2 %s, y2 %s\n", + state->gradient_x1, state->gradient_y1, + state->gradient_x2, state->gradient_y2); ++#endif + if (!state->gradient_user_space_on_use) { + gradient_x0 = object_x0 + + svgtiny_parse_length(state->gradient_x1, +@@ -297,9 +308,11 @@ svgtiny_code svgtiny_add_path_linear_gra + + /* invert gradient transform for applying to vertices */ + svgtiny_invert_matrix(&state->gradient_transform.a, trans); ++#ifdef GRADIENT_DEBUG + fprintf(stderr, "inverse transform %g %g %g %g %g %g\n", + trans[0], trans[1], trans[2], trans[3], + trans[4], trans[5]); ++#endif + + /* compute points on the path for triangle vertices */ + /* r, r0, r1 are distance along gradient vector */ +@@ -372,8 +385,10 @@ svgtiny_code svgtiny_add_path_linear_gra + steps = ceilf(fabsf(r1 - r0) / 0.05); + if (steps == 0) + steps = 1; ++#ifdef GRADIENT_DEBUG + fprintf(stderr, "r0 %g, r1 %g, steps %i\n", + r0, r1, steps); ++#endif + + /* loop through intermediate points */ + for (z = 1; z != steps; z++) { +@@ -398,7 +413,9 @@ svgtiny_code svgtiny_add_path_linear_gra + r = ((x_trans - gradient_x0) * gradient_dx + + (y_trans - gradient_y0) * gradient_dy) / + gradient_norm_squared; ++#ifdef GRADIENT_DEBUG + fprintf(stderr, "(%g %g [%g]) ", x, y, r); ++#endif + point = svgtiny_list_push(pts); + if (!point) { + svgtiny_list_free(pts); +@@ -412,14 +429,18 @@ svgtiny_code svgtiny_add_path_linear_gra + min_pt = svgtiny_list_size(pts) - 1; + } + } ++#ifdef GRADIENT_DEBUG + fprintf(stderr, "\n"); ++#endif + + /* next segment start point is this segment end point */ + x0 = x1; + y0 = y1; + } ++#ifdef GRADIENT_DEBUG + fprintf(stderr, "pts size %i, min_pt %i, min_r %.3f\n", + svgtiny_list_size(pts), min_pt, min_r); ++#endif + + /* render triangles */ + stop_count = state->linear_gradient_stop_count; diff --git a/package/libsvgtiny/libsvgtiny-02-create-builddir.patch b/package/libsvgtiny/libsvgtiny-02-create-builddir.patch new file mode 100644 index 0000000000..a404d86bca --- /dev/null +++ b/package/libsvgtiny/libsvgtiny-02-create-builddir.patch @@ -0,0 +1,15 @@ +svgtiny: create BUILDDIR before $(BUILDDIR)/src_colors.c + +Signed-off-by: Max Filippov +--- +--- libsvgtiny-12121/src/Makefile.orig 2014-06-17 15:30:21.765311434 +0400 ++++ libsvgtiny-12121/src/Makefile 2014-06-17 15:29:56.569909931 +0400 +@@ -3,7 +3,7 @@ + + SOURCES := $(SOURCES) $(BUILDDIR)/src_colors.c + +-$(BUILDDIR)/src_colors.c: src/colors.gperf ++$(BUILDDIR)/src_colors.c: src/colors.gperf $(BUILDDIR)/stamp + $(VQ)$(ECHO) " GPERF: $<" + $(Q)gperf --output-file=$@.tmp $< + # Hack for GCC 4.2 compatibility (gperf 3.0.4 solves this properly) diff --git a/package/libsvgtiny/libsvgtiny-disable-debug-printfs.patch b/package/libsvgtiny/libsvgtiny-disable-debug-printfs.patch deleted file mode 100644 index 72ed21ccfa..0000000000 --- a/package/libsvgtiny/libsvgtiny-disable-debug-printfs.patch +++ /dev/null @@ -1,125 +0,0 @@ -svntiny: svntiny_gradient.c: only print debugging if GRADIENT_DEBUG is enabled - -Signed-off-by: Peter Korsgaard ---- - src/svgtiny_gradient.c | 23 ++++++++++++++++++++++- - 1 file changed, 22 insertions(+), 1 deletion(-) - -Index: libsvgtiny/src/svgtiny_gradient.c -=================================================================== ---- libsvgtiny.orig/src/svgtiny_gradient.c -+++ libsvgtiny/src/svgtiny_gradient.c -@@ -30,8 +30,9 @@ void svgtiny_find_gradient(const char *i - { - xmlNode *gradient; - -+#ifdef GRADIENT_DEBUG - fprintf(stderr, "svgtiny_find_gradient: id \"%s\"\n", id); -- -+#endif - state->linear_gradient_stop_count = 0; - state->gradient_x1 = "0%"; - state->gradient_y1 = "0%"; -@@ -47,13 +48,17 @@ void svgtiny_find_gradient(const char *i - - gradient = svgtiny_find_element_by_id( - (xmlNode *) state->document, id); -+#ifdef GRADIENT_DEBUG - fprintf(stderr, "gradient %p\n", (void *) gradient); -+#endif - if (!gradient) { - fprintf(stderr, "gradient \"%s\" not found\n", id); - return; - } - -+#ifdef GRADIENT_DEBUG - fprintf(stderr, "gradient name \"%s\"\n", gradient->name); -+#endif - if (strcmp((const char *) gradient->name, "linearGradient") == 0) { - svgtiny_parse_linear_gradient(gradient, state); - } -@@ -98,8 +103,10 @@ svgtiny_code svgtiny_parse_linear_gradie - return svgtiny_OUT_OF_MEMORY; - svgtiny_parse_transform(s, &a, &b, &c, &d, &e, &f); - free(s); -+#ifdef GRADIENT_DEBUG - fprintf(stderr, "transform %g %g %g %g %g %g\n", - a, b, c, d, e, f); -+#endif - state->gradient_transform.a = a; - state->gradient_transform.b = b; - state->gradient_transform.c = c; -@@ -143,7 +150,9 @@ svgtiny_code svgtiny_parse_linear_gradie - } - - if (offset != -1 && color != svgtiny_TRANSPARENT) { -+#ifdef GRADIENT_DEBUG - fprintf(stderr, "stop %g %x\n", offset, color); -+#endif - state->gradient_stop[i].offset = offset; - state->gradient_stop[i].color = color; - i++; -@@ -220,9 +229,11 @@ svgtiny_code svgtiny_add_path_linear_gra - #endif - - /* compute gradient vector */ -+#ifdef GRADIENT_DEBUG - fprintf(stderr, "x1 %s, y1 %s, x2 %s, y2 %s\n", - state->gradient_x1, state->gradient_y1, - state->gradient_x2, state->gradient_y2); -+#endif - if (!state->gradient_user_space_on_use) { - gradient_x0 = object_x0 + - svgtiny_parse_length(state->gradient_x1, -@@ -297,9 +308,11 @@ svgtiny_code svgtiny_add_path_linear_gra - - /* invert gradient transform for applying to vertices */ - svgtiny_invert_matrix(&state->gradient_transform.a, trans); -+#ifdef GRADIENT_DEBUG - fprintf(stderr, "inverse transform %g %g %g %g %g %g\n", - trans[0], trans[1], trans[2], trans[3], - trans[4], trans[5]); -+#endif - - /* compute points on the path for triangle vertices */ - /* r, r0, r1 are distance along gradient vector */ -@@ -372,8 +385,10 @@ svgtiny_code svgtiny_add_path_linear_gra - steps = ceilf(fabsf(r1 - r0) / 0.05); - if (steps == 0) - steps = 1; -+#ifdef GRADIENT_DEBUG - fprintf(stderr, "r0 %g, r1 %g, steps %i\n", - r0, r1, steps); -+#endif - - /* loop through intermediate points */ - for (z = 1; z != steps; z++) { -@@ -398,7 +413,9 @@ svgtiny_code svgtiny_add_path_linear_gra - r = ((x_trans - gradient_x0) * gradient_dx + - (y_trans - gradient_y0) * gradient_dy) / - gradient_norm_squared; -+#ifdef GRADIENT_DEBUG - fprintf(stderr, "(%g %g [%g]) ", x, y, r); -+#endif - point = svgtiny_list_push(pts); - if (!point) { - svgtiny_list_free(pts); -@@ -412,14 +429,18 @@ svgtiny_code svgtiny_add_path_linear_gra - min_pt = svgtiny_list_size(pts) - 1; - } - } -+#ifdef GRADIENT_DEBUG - fprintf(stderr, "\n"); -+#endif - - /* next segment start point is this segment end point */ - x0 = x1; - y0 = y1; - } -+#ifdef GRADIENT_DEBUG - fprintf(stderr, "pts size %i, min_pt %i, min_r %.3f\n", - svgtiny_list_size(pts), min_pt, min_r); -+#endif - - /* render triangles */ - stop_count = state->linear_gradient_stop_count;