diff options
Diffstat (limited to 'packages/cairo')
| -rw-r--r-- | packages/cairo/cairo-1.4.10/.mtn2git_empty | 0 | ||||
| -rw-r--r-- | packages/cairo/cairo-1.4.10/stats.patch | 33 | ||||
| -rw-r--r-- | packages/cairo/cairo.inc | 2 | ||||
| -rw-r--r-- | packages/cairo/cairo_1.4.10.bb | 5 | ||||
| -rw-r--r-- | packages/cairo/cairo_1.5.2.bb | 8 | ||||
| -rw-r--r-- | packages/cairo/cairo_git.bb | 2 |
6 files changed, 47 insertions, 3 deletions
diff --git a/packages/cairo/cairo-1.4.10/.mtn2git_empty b/packages/cairo/cairo-1.4.10/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/cairo/cairo-1.4.10/.mtn2git_empty diff --git a/packages/cairo/cairo-1.4.10/stats.patch b/packages/cairo/cairo-1.4.10/stats.patch new file mode 100644 index 0000000000..63df25c942 --- /dev/null +++ b/packages/cairo/cairo-1.4.10/stats.patch @@ -0,0 +1,33 @@ +See cairo mailing list 15-10-2007 patch by Soeren Sandmann. +Fixes unreliable results for cairo-perf. + +diff --git a/perf/cairo-perf.c b/perf/cairo-perf.c +index 360f2dd..a8d7abc 100644 +--- a/perf/cairo-perf.c ++++ b/perf/cairo-perf.c +@@ -166,22 +166,11 @@ cairo_perf_run (cairo_perf_t *perf, + cairo_perf_ticks_per_second () / 1000.0); + printf (" %lld", times[i]); + } else { +- if (i > 0) { +- _cairo_stats_compute (&stats, times, i+1); +- +- if (stats.std_dev <= CAIRO_PERF_LOW_STD_DEV && +- ! perf->exact_iterations) +- { +- low_std_dev_count++; +- if (low_std_dev_count >= CAIRO_PERF_STABLE_STD_DEV_COUNT) +- break; +- } else { +- low_std_dev_count = 0; +- } +- } + } + } + ++ _cairo_stats_compute (&stats, times, i+1); ++ + if (perf->raw) { + printf ("\n"); + } else { +diff --git a/perf/cairo-stats.c b/perf/cairo-stats.c diff --git a/packages/cairo/cairo.inc b/packages/cairo/cairo.inc index e405257dfb..3123fe6632 100644 --- a/packages/cairo/cairo.inc +++ b/packages/cairo/cairo.inc @@ -1,6 +1,6 @@ SECTION = "libs" PRIORITY = "optional" -DEPENDS = "virtual/libx11 libsm libpng fontconfig libxrender" +DEPENDS = "virtual/libx11 pixman libsm libpng fontconfig libxrender" DESCRIPTION = "Cairo graphics library" LICENSE = "MPL LGPL" diff --git a/packages/cairo/cairo_1.4.10.bb b/packages/cairo/cairo_1.4.10.bb index 845e14fc29..e89c0e6a9c 100644 --- a/packages/cairo/cairo_1.4.10.bb +++ b/packages/cairo/cairo_1.4.10.bb @@ -1,6 +1,9 @@ require cairo.inc -SRC_URI = "http://cairographics.org/releases/cairo-${PV}.tar.gz" +DEFAULT_PREFERENCE = "-1" + +SRC_URI = "http://cairographics.org/releases/cairo-${PV}.tar.gz \ +file://stats.patch;patch=1;p=1" PR = "r0" diff --git a/packages/cairo/cairo_1.5.2.bb b/packages/cairo/cairo_1.5.2.bb new file mode 100644 index 0000000000..263dd79ad7 --- /dev/null +++ b/packages/cairo/cairo_1.5.2.bb @@ -0,0 +1,8 @@ +require cairo.inc + +DEFAULT_PREFERENCE = "-1" + +SRC_URI = "http://cairographics.org/releases/cairo-${PV}.tar.gz" + +PR = "r0" + diff --git a/packages/cairo/cairo_git.bb b/packages/cairo/cairo_git.bb index 6c527988a9..44212103a6 100644 --- a/packages/cairo/cairo_git.bb +++ b/packages/cairo/cairo_git.bb @@ -7,7 +7,7 @@ DEPENDS = "pixman virtual/libx11 libsm libpng fontconfig libxrender" DESCRIPTION = "Cairo graphics library" LICENSE = "MPL LGPL" -PV = "1.5.1+git${SRCDATE}" +PV = "1.5.3+git${SRCDATE}" SRC_URI = "git://git.cairographics.org/git/cairo;protocol=git \ " |