diff options
| author | Xu Li <xu.li@intel.com> | 2008-11-11 20:15:17 +0800 |
|---|---|---|
| committer | Richard Purdie <rpurdie@linux.intel.com> | 2008-12-01 17:57:55 +0000 |
| commit | d12f673a233042db37d77b811c87bc6854b4283b (patch) | |
| tree | 034b894338c5801990708fa058053dcc6449c5b5 | |
| parent | ba601403fe524652b4a9658d375d4729d922bbda (diff) | |
| download | openembedded-core-d12f673a233042db37d77b811c87bc6854b4283b.tar.gz openembedded-core-d12f673a233042db37d77b811c87bc6854b4283b.tar.bz2 openembedded-core-d12f673a233042db37d77b811c87bc6854b4283b.zip | |
upgrade cairo to 1.8.2; add patch to fix its libtool issue
| -rw-r--r-- | meta-moblin/conf/distro/include/moblin-fixed-revisions.inc | 1 | ||||
| -rw-r--r-- | meta/packages/cairo/cairo-1.8.2/hardcoded_libtool.patch | 17 | ||||
| -rw-r--r-- | meta/packages/cairo/cairo_1.8.2.bb | 6 |
3 files changed, 24 insertions, 0 deletions
diff --git a/meta-moblin/conf/distro/include/moblin-fixed-revisions.inc b/meta-moblin/conf/distro/include/moblin-fixed-revisions.inc index ce542fec4a..53b898e3e7 100644 --- a/meta-moblin/conf/distro/include/moblin-fixed-revisions.inc +++ b/meta-moblin/conf/distro/include/moblin-fixed-revisions.inc @@ -5,3 +5,4 @@ PREFERRED_VERSION_atk ?= "1.24.0" PREFERRED_VERSION_pixman ?= "0.12.0" +PREFERRED_VERSION_cairo ?= "1.8.2" diff --git a/meta/packages/cairo/cairo-1.8.2/hardcoded_libtool.patch b/meta/packages/cairo/cairo-1.8.2/hardcoded_libtool.patch new file mode 100644 index 0000000000..afdf2c8f08 --- /dev/null +++ b/meta/packages/cairo/cairo-1.8.2/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.bb b/meta/packages/cairo/cairo_1.8.2.bb new file mode 100644 index 0000000000..fd8a99b49e --- /dev/null +++ b/meta/packages/cairo/cairo_1.8.2.bb @@ -0,0 +1,6 @@ +require cairo.inc + +PR = "r1" + +SRC_URI = "http://cairographics.org/releases/cairo-${PV}.tar.gz \ + file://hardcoded_libtool.patch;patch=1" |