From 7ccf7af572c44b602a8886d02ce4105ac901fe52 Mon Sep 17 00:00:00 2001 From: Yu Ke Date: Sat, 3 Jul 2010 21:49:20 +0800 Subject: cairo: upgrade cairo to 1.8.10 Signed-off-by: Yu Ke --- .../packages/cairo/cairo-1.8.10/hardcoded_libtool.patch | 17 +++++++++++++++++ meta/packages/cairo/cairo-1.8.2/hardcoded_libtool.patch | 17 ----------------- meta/packages/cairo/cairo.inc | 6 ++++-- meta/packages/cairo/cairo_1.8.10.bb | 8 ++++++++ meta/packages/cairo/cairo_1.8.2.bb | 6 ------ 5 files changed, 29 insertions(+), 25 deletions(-) create mode 100644 meta/packages/cairo/cairo-1.8.10/hardcoded_libtool.patch delete mode 100644 meta/packages/cairo/cairo-1.8.2/hardcoded_libtool.patch create mode 100644 meta/packages/cairo/cairo_1.8.10.bb delete mode 100644 meta/packages/cairo/cairo_1.8.2.bb (limited to 'meta/packages/cairo') diff --git a/meta/packages/cairo/cairo-1.8.10/hardcoded_libtool.patch b/meta/packages/cairo/cairo-1.8.10/hardcoded_libtool.patch new file mode 100644 index 0000000000..afdf2c8f08 --- /dev/null +++ b/meta/packages/cairo/cairo-1.8.10/hardcoded_libtool.patch @@ -0,0 +1,17 @@ +Index: cairo-1.8.2/build/aclocal.dolt.m4 +=================================================================== +--- cairo-1.8.2.orig/build/aclocal.dolt.m4 ++++ cairo-1.8.2/build/aclocal.dolt.m4 +@@ -163,7 +163,11 @@ done + if $modeok && $tagok ; then + . ${top_builddir_slash}doltcompile "${args@<:@@@:>@}" + else +- exec ${top_builddir_slash}libtool "$[]@" ++__DOLTLIBTOOL__EOF__ ++ ++echo ' exec ${top_builddir_slash}'${host_alias}-libtool' "$[]@"' >> doltlibtool ++ ++ cat << '__DOLTLIBTOOL__EOF__' >> doltlibtool + fi + __DOLTLIBTOOL__EOF__ + diff --git a/meta/packages/cairo/cairo-1.8.2/hardcoded_libtool.patch b/meta/packages/cairo/cairo-1.8.2/hardcoded_libtool.patch deleted file mode 100644 index afdf2c8f08..0000000000 --- a/meta/packages/cairo/cairo-1.8.2/hardcoded_libtool.patch +++ /dev/null @@ -1,17 +0,0 @@ -Index: cairo-1.8.2/build/aclocal.dolt.m4 -=================================================================== ---- cairo-1.8.2.orig/build/aclocal.dolt.m4 -+++ cairo-1.8.2/build/aclocal.dolt.m4 -@@ -163,7 +163,11 @@ done - if $modeok && $tagok ; then - . ${top_builddir_slash}doltcompile "${args@<:@@@:>@}" - else -- exec ${top_builddir_slash}libtool "$[]@" -+__DOLTLIBTOOL__EOF__ -+ -+echo ' exec ${top_builddir_slash}'${host_alias}-libtool' "$[]@"' >> doltlibtool -+ -+ cat << '__DOLTLIBTOOL__EOF__' >> doltlibtool - fi - __DOLTLIBTOOL__EOF__ - diff --git a/meta/packages/cairo/cairo.inc b/meta/packages/cairo/cairo.inc index 1847519c67..e73a839671 100644 --- a/meta/packages/cairo/cairo.inc +++ b/meta/packages/cairo/cairo.inc @@ -1,8 +1,10 @@ +DESCRIPTION = "Cairo graphics library" +HOMEPAGE = "http://cairographics.org" +BUGTRACKER = "http://bugs.freedesktop.org" SECTION = "libs" PRIORITY = "optional" +LICENSE = "MPLv1.1 & LGPLv2.1" DEPENDS = "virtual/libx11 libsm libpng fontconfig libxrender pixman" -DESCRIPTION = "Cairo graphics library" -LICENSE = "MPL LGPL" #check for TARGET_FPU=soft and inform configure of the result so it can disable some floating points require cairo-fpu.inc diff --git a/meta/packages/cairo/cairo_1.8.10.bb b/meta/packages/cairo/cairo_1.8.10.bb new file mode 100644 index 0000000000..9e7e7a3bf6 --- /dev/null +++ b/meta/packages/cairo/cairo_1.8.10.bb @@ -0,0 +1,8 @@ +require cairo.inc + +LIC_FILES_CHKSUM = "file://COPYING;md5=7d7cc3410ae869ed913ebd30d7f45941" + +PR = "r0" + +SRC_URI = "http://cairographics.org/releases/cairo-${PV}.tar.gz \ + file://hardcoded_libtool.patch" diff --git a/meta/packages/cairo/cairo_1.8.2.bb b/meta/packages/cairo/cairo_1.8.2.bb deleted file mode 100644 index fd8a99b49e..0000000000 --- a/meta/packages/cairo/cairo_1.8.2.bb +++ /dev/null @@ -1,6 +0,0 @@ -require cairo.inc - -PR = "r1" - -SRC_URI = "http://cairographics.org/releases/cairo-${PV}.tar.gz \ - file://hardcoded_libtool.patch;patch=1" -- cgit v1.2.3