cairo: bump git to 1.5.1, add 1.4.10 and remove some stale versions

8 files changed, 7 insertions, 62 deletions

diff --git a/packages/cairo/cairo_1.2.2.bb b/packages/cairo/cairo_1.2.2.bb
deleted file mode 100644
index f6667eae1b..0000000000
--- a/packages/cairo/cairo_1.2.2.bb
+++ /dev/null
@@ -1,13 +0,0 @@
-SECTION = "libs"
-PRIORITY = "optional"
-DEPENDS = "virtual/libx11 libsm libpng fontconfig libxrender"
-DESCRIPTION = "Cairo graphics library"
-LICENSE = "MPL LGPL"
-
-SRC_URI = "http://cairographics.org/releases/cairo-${PV}.tar.gz"
-
-inherit autotools pkgconfig
-
-do_stage () {
-autotools_stage_all
-}
diff --git a/packages/cairo/cairo_1.3.14.bb b/packages/cairo/cairo_1.3.14.bb
deleted file mode 100644
index 6bc0cb37f7..0000000000
--- a/packages/cairo/cairo_1.3.14.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-#This is a development snapshot, so lets hint OE to use the releases
-DEFAULT_PREFERENCE = "-1"
-
-require cairo.inc
-
-SRC_URI = "http://cairographics.org/snapshots/cairo-${PV}.tar.gz \
-           file://cairo-surface-cache-3.patch;patch=1"
-
-PR = "r0"
-
diff --git a/packages/cairo/cairo_1.3.4.bb b/packages/cairo/cairo_1.3.4.bb
deleted file mode 100644
index 19e3f7a872..0000000000
--- a/packages/cairo/cairo_1.3.4.bb
+++ /dev/null
@@ -1,17 +0,0 @@
-#This is a development snapshot, so lets hint OE to use the releases
-DEFAULT_PREFERENCE = "-1"
-
-SECTION = "libs"
-PRIORITY = "optional"
-DEPENDS = "virtual/libx11 libsm libpng fontconfig libxrender"
-DESCRIPTION = "Cairo graphics library"
-LICENSE = "MPL LGPL"
-
-SRC_URI = "http://cairographics.org/snapshots/cairo-${PV}.tar.gz \
-           file://configure.in_requires_pkg-config-0.15.diff;patch=1;pnum=2"
-
-inherit autotools pkgconfig
-
-do_stage () {
- 	autotools_stage_all
-}
diff --git a/packages/cairo/cairo_1.4.0.bb b/packages/cairo/cairo_1.4.0.bb
deleted file mode 100644
index 3e5d2fdb15..0000000000
--- a/packages/cairo/cairo_1.4.0.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require cairo.inc
-
-SRC_URI = "http://cairographics.org/releases/cairo-${PV}.tar.gz \
-           file://cairo-surface-cache-3.patch;patch=1"
-
-PR = "r0"
-
diff --git a/packages/cairo/cairo_1.4.10.bb b/packages/cairo/cairo_1.4.10.bb
new file mode 100644
index 0000000000..845e14fc29
--- /dev/null
+++ b/packages/cairo/cairo_1.4.10.bb
@@ -0,0 +1,6 @@
+require cairo.inc
+
+SRC_URI = "http://cairographics.org/releases/cairo-${PV}.tar.gz"
+
+PR = "r0"
+
diff --git a/packages/cairo/cairo_1.4.2.bb b/packages/cairo/cairo_1.4.2.bb
deleted file mode 100644
index 3e5d2fdb15..0000000000
--- a/packages/cairo/cairo_1.4.2.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require cairo.inc
-
-SRC_URI = "http://cairographics.org/releases/cairo-${PV}.tar.gz \
-           file://cairo-surface-cache-3.patch;patch=1"
-
-PR = "r0"
-
diff --git a/packages/cairo/cairo_1.4.4.bb b/packages/cairo/cairo_1.4.4.bb
deleted file mode 100644
index 5f4a36f572..0000000000
--- a/packages/cairo/cairo_1.4.4.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require cairo.inc
-
-SRC_URI = "http://cairographics.org/releases/cairo-${PV}.tar.gz \
-           file://cairo-workqueue.patch;patch=1"
-
-PR = "r0"
-
diff --git a/packages/cairo/cairo_git.bb b/packages/cairo/cairo_git.bb
index 3da41f382d..f4d62ee7fb 100644
--- a/packages/cairo/cairo_git.bb
+++ b/packages/cairo/cairo_git.bb
@@ -7,7 +7,7 @@ DEPENDS = "virtual/libx11 libsm libpng fontconfig libxrender"
 DESCRIPTION = "Cairo graphics library"
 LICENSE = "MPL LGPL"
 
-PV = "1.4.7+git${SRCDATE}"
+PV = "1.5.1+git${SRCDATE}"
 
 SRC_URI = "git://git.cairographics.org/git/cairo;protocol=git \
 	  "