summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Patrin <papercrane@gmail.com>2006-11-17 00:44:05 +0000
committerJustin Patrin <papercrane@gmail.com>2006-11-17 00:44:05 +0000
commit31773235080d7e8430bed8849650a203cc0d1faf (patch)
tree790e662a150b94d19b64fabcd63d68cfa9180d03
parentd9da9709c937260bf2a0c09842b55814bc6f7db8 (diff)
parent21f108d8a57a33a9e3742aecfac549994f868845 (diff)
merge of '7d8c3952daf9f091a203b0e0fa34bb7a25273315'
and 'ae57dc7e211a075ccdde416f0e1dea5d8dc190ee'
-rw-r--r--packages/cairo/cairo-1.3.2/.mtn2git_empty0
-rw-r--r--packages/cairo/cairo-1.3.2/configure.in_requires_pkg-config-0.15.diff13
-rw-r--r--packages/cairo/cairo_1.3.2.bb17
3 files changed, 30 insertions, 0 deletions
diff --git a/packages/cairo/cairo-1.3.2/.mtn2git_empty b/packages/cairo/cairo-1.3.2/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/cairo/cairo-1.3.2/.mtn2git_empty
diff --git a/packages/cairo/cairo-1.3.2/configure.in_requires_pkg-config-0.15.diff b/packages/cairo/cairo-1.3.2/configure.in_requires_pkg-config-0.15.diff
new file mode 100644
index 0000000000..2bd70a532c
--- /dev/null
+++ b/packages/cairo/cairo-1.3.2/configure.in_requires_pkg-config-0.15.diff
@@ -0,0 +1,13 @@
+Index: cairo-1.3.2-r0/cairo-1.3.2/configure.in
+===================================================================
+--- cairo-1.3.2-r0.orig/cairo-1.3.2/configure.in 2006-11-15 22:31:59.000000000 +0100
++++ cairo-1.3.2-r0/cairo-1.3.2/configure.in 2006-11-16 23:15:07.000000000 +0100
+@@ -90,7 +90,7 @@
+
+ dnl ===========================================================================
+
+-PKGCONFIG_REQUIRED=0.19
++PKGCONFIG_REQUIRED=0.15
+ PKG_PROG_PKG_CONFIG($PKGCONFIG_REQUIRED)
+ if test "x$PKG_CONFIG" = x; then
+ AC_MSG_ERROR([pkg-config >= $PKGCONFIG_REQUIRED required but not found (http://pkgconfig.freedesktop.org/)])
diff --git a/packages/cairo/cairo_1.3.2.bb b/packages/cairo/cairo_1.3.2.bb
new file mode 100644
index 0000000000..6d9a7c43ab
--- /dev/null
+++ b/packages/cairo/cairo_1.3.2.bb
@@ -0,0 +1,17 @@
+#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
+}