diff options
| author | Cliff Brake <cbrake@bec-systems.com> | 2007-10-25 02:58:27 +0000 |
|---|---|---|
| committer | Cliff Brake <cbrake@bec-systems.com> | 2007-10-25 02:58:27 +0000 |
| commit | 6c548afdbea5268eead369b6f94e2c82ccd69c0a (patch) | |
| tree | 6d26b3f8fb88cbc25a292438e6d200f1b0fb7e76 | |
| parent | d1603e57781c9eaa08cc7e6ffd53f5685349c5d6 (diff) | |
| parent | 4ccb4313d27e2c243a834e27e9fff518ec8c4da1 (diff) | |
merge of 'eb36ea3d0bc0c86631fe499a8eff4d72e96e9e86'
and 'f404eeaff12f4a005212507219029f6899cf3bee'
| -rw-r--r-- | conf/checksums.ini | 4 | ||||
| -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_1.4.10.bb | 5 | ||||
| -rw-r--r-- | packages/xrestop/.mtn2git_empty | 0 | ||||
| -rw-r--r-- | packages/xrestop/xrestop_0.4.bb | 8 |
6 files changed, 49 insertions, 1 deletions
diff --git a/conf/checksums.ini b/conf/checksums.ini index b55af9fa7f..ca7994be00 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -12802,3 +12802,7 @@ sha256=12f5b654f6b91953391d2492a09d2c9586d5b7af419f0eeb306e1d30245659d3 md5=a6538f6c44ceeed0ed7e8e356f444168 sha256=f684397ce39ec400ba3369521892b7c3a8711d3ef1be59115db9f8d57707bbb8 +[http://projects.o-hand.com/sources/xrestop/xrestop-0.4.tar.gz] +md5=d8a54596cbaf037e62b80c4585a3ca9b +sha256=67c2fc94a7ecedbaae0d1837e82e93d1d98f4a6d759828860e552119af3ce257 + 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_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/xrestop/.mtn2git_empty b/packages/xrestop/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/xrestop/.mtn2git_empty diff --git a/packages/xrestop/xrestop_0.4.bb b/packages/xrestop/xrestop_0.4.bb new file mode 100644 index 0000000000..40396a2362 --- /dev/null +++ b/packages/xrestop/xrestop_0.4.bb @@ -0,0 +1,8 @@ +HOMEPAGE = "http://www.freedesktop.org/wiki/Software/xrestop" +LICENSE = "GPL" + +DEPENDS = "libxres libxext virtual/libx11" + +SRC_URI = "http://projects.o-hand.com/sources/xrestop/xrestop-${PV}.tar.gz" + +inherit autotools |