Upgrade to cairo 1.4.0

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@1332 311d38ba-8fff-0310-9ca6-ca027cbcb966

diff --git a/meta/conf/distro/poky-bleeding.conf b/meta/conf/distro/poky-bleeding.conf
index 9b942d01e37420c09e973357c93db2e37e119232..9aaa7e4f034e887be170a980637f1ec4c1d61bbe 100644 (file)
--- a/meta/conf/distro/poky-bleeding.conf
+++ b/meta/conf/distro/poky-bleeding.conf
@@ -1,7 +1,7 @@
 PREFERRED_VERSION_glib-2.0 ?= "2.12.6"
 PREFERRED_VERSION_glib-2.0-native ?= "2.12.4"
 
-PREFERRED_VERSION_cairo ?= "1.3.14"
+PREFERRED_VERSION_cairo ?= "1.4.0"
 PREFERRED_VERSION_pango ?= "1.16.0"
 PREFERRED_VERSION_gtk+ ?= "2.10.9"
 

diff --git a/meta/packages/cairo/cairo_1.3.14.bb b/meta/packages/cairo/cairo_1.4.0.bb
similarity index 72%
rename from meta/packages/cairo/cairo_1.3.14.bb
rename to meta/packages/cairo/cairo_1.4.0.bb
index 6bc0cb37f717a837f0574c4062fcf153f5c93664..42ff9ddef8f2ef3eee4961ee42e5a06f1e6f6f3f 100644 (file)
--- a/meta/packages/cairo/cairo_1.3.14.bb
+++ b/meta/packages/cairo/cairo_1.4.0.bb
@@ -3,8 +3,7 @@ DEFAULT_PREFERENCE = "-1"
 
 require cairo.inc
 
-SRC_URI = "http://cairographics.org/snapshots/cairo-${PV}.tar.gz \
+SRC_URI = "http://cairographics.org/releases/cairo-${PV}.tar.gz \
            file://cairo-surface-cache-3.patch;patch=1"
 
 PR = "r0"
-