[oe-commits] org.oe.dev merge of 'eb36ea3d0bc0c86631fe499a8eff4d72e96e9e86'

[cbrake commit]

merge of 'eb36ea3d0bc0c86631fe499a8eff4d72e96e9e86'
     and 'f404eeaff12f4a005212507219029f6899cf3bee'

Author: cbrake at openembedded.org
Branch: org.openembedded.dev
Revision: e0221606ddc790d2dc995f836424ee621773c406
ViewMTN: http://monotone.openembedded.org/revision/info/e0221606ddc790d2dc995f836424ee621773c406
Files:
1
packages/cairo/cairo-1.4.10
packages/xrestop
packages/cairo/cairo-1.4.10/stats.patch
packages/xrestop/xrestop_0.4.bb
conf/checksums.ini
packages/cairo/cairo_1.4.10.bb
conf/machine/mpc8313e-rdb.conf
Diffs:

#
# mt diff -reb36ea3d0bc0c86631fe499a8eff4d72e96e9e86 -re0221606ddc790d2dc995f836424ee621773c406
#
# 
# 
# add_dir "packages/cairo/cairo-1.4.10"
# 
# add_dir "packages/xrestop"
# 
# add_file "packages/cairo/cairo-1.4.10/stats.patch"
#  content [0792c649e590d76e5c6a362a57588d657a0c105c]
# 
# add_file "packages/xrestop/xrestop_0.4.bb"
#  content [db89658b7bd6b24b3f7e98e50641efe9b4e25bb3]
# 
# patch "conf/checksums.ini"
#  from [c0f7803711ba15e41bd9438d88c1b45a5b73059d]
#    to [3f8865f6ed4f27edc076d0c491460555761c67ed]
# 
# patch "packages/cairo/cairo_1.4.10.bb"
#  from [0b4c4e2659b89399b3645efcdbf2bc4f3cf8dff0]
#    to [c961e977d63c2005520443dcd583ef6d58b2564e]
# 
============================================================
--- packages/cairo/cairo-1.4.10/stats.patch	0792c649e590d76e5c6a362a57588d657a0c105c
+++ packages/cairo/cairo-1.4.10/stats.patch	0792c649e590d76e5c6a362a57588d657a0c105c
@@ -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
============================================================
--- packages/xrestop/xrestop_0.4.bb	db89658b7bd6b24b3f7e98e50641efe9b4e25bb3
+++ packages/xrestop/xrestop_0.4.bb	db89658b7bd6b24b3f7e98e50641efe9b4e25bb3
@@ -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
============================================================
--- conf/checksums.ini	c0f7803711ba15e41bd9438d88c1b45a5b73059d
+++ conf/checksums.ini	3f8865f6ed4f27edc076d0c491460555761c67ed
@@ -12802,3 +12802,7 @@ sha256=f684397ce39ec400ba3369521892b7c3a
 md5=a6538f6c44ceeed0ed7e8e356f444168
 sha256=f684397ce39ec400ba3369521892b7c3a8711d3ef1be59115db9f8d57707bbb8
 
+[http://projects.o-hand.com/sources/xrestop/xrestop-0.4.tar.gz]
+md5=d8a54596cbaf037e62b80c4585a3ca9b
+sha256=67c2fc94a7ecedbaae0d1837e82e93d1d98f4a6d759828860e552119af3ce257
+
============================================================
--- packages/cairo/cairo_1.4.10.bb	0b4c4e2659b89399b3645efcdbf2bc4f3cf8dff0
+++ packages/cairo/cairo_1.4.10.bb	c961e977d63c2005520443dcd583ef6d58b2564e
@@ -1,6 +1,9 @@ require cairo.inc
 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"
 


#
# mt diff -rf404eeaff12f4a005212507219029f6899cf3bee -re0221606ddc790d2dc995f836424ee621773c406
#
# 
# 
# patch "conf/machine/mpc8313e-rdb.conf"
#  from [3bc35c98310b138d5b2aa7dfe2f19230bb50a2c1]
#    to [9c064b7fe3bf176ebc0002ad5266c6783fe0acb2]
# 
============================================================
--- conf/machine/mpc8313e-rdb.conf	3bc35c98310b138d5b2aa7dfe2f19230bb50a2c1
+++ conf/machine/mpc8313e-rdb.conf	9c064b7fe3bf176ebc0002ad5266c6783fe0acb2
@@ -5,7 +5,8 @@ PACKAGE_EXTRA_ARCHS = "all ${MACHINE} pp
 TARGET_ARCH = "powerpc"
 PACKAGE_EXTRA_ARCHS = "all ${MACHINE} ppc ppce300c3"
 
-PREFERRED_PROVIDER_virtual/kernel = "linux-${MACHINE}"
+PREFERRED_PROVIDER_virtual/kernel = "linux"
+PREFERRED_VERSION_u-boot = "git"
 
 MACHINE_FEATURES = "kernel26 usbhost ext2"