From: Leon Woestenberg <leon.woestenberg@gmail.com>
Date: Wed, 24 Oct 2007 23:10:06 +0000 (+0000)
Subject: cairo: Add 1.4.10 with cairo-perf stat patch.
X-Git-Tag: Release-2010-05/1~8454^2~142^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4ccb4313d27e2c243a834e27e9fff518ec8c4da1;p=openembedded.git

cairo: Add 1.4.10 with cairo-perf stat patch.
---

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
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"