summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYu Ke <ke.yu@intel.com>2010-11-20 15:56:04 +0800
committerSaul Wold <sgw@linux.intel.com>2010-11-22 10:33:08 -0800
commite9d144f77e15f705292ca31dc184a56d00878dcc (patch)
tree42a535350c6f672c0dd1e9b743c62385827b580e
parent89ab1ace5db6db12f012fa8520b3d25834af66aa (diff)
downloadpoky-e9d144f77e15f705292ca31dc184a56d00878dcc.tar.gz
cairo: upgrade from 1.8.10 to 1.10.0
several chagnes are made: - hardcoded_libtool.patch is removed, because the code (dolt logic) it applys to have been removed. dolt is originally introduced to accelerate libtool, it is later removed by commit 9de25a0297c due to libtool is fast enough. so this patch can be removed too. - explicitly specify the package name as libcairo2. In 1.8.10, the debian rename hook (meta/classes/debian.bbclass:debian_package_name_hook ) will automatically rename the package to libcairo2. When upgrade to 1.10.0, the name changes to cairo, because the package contains not only library, but also bin executable. This name change will cause dependency failure to thos package which depends on libcairo-1.8.10. so it is necessary to keep name as libcairo2 by explicitly specifing. - specify extra package: libcairo-gobject2, libcairo-script-interpreter2 and cairo-perf-utils. it is newly added in 1.10.0. The name schema is from Debian. Signed-off-by: Yu Ke <ke.yu@intel.com>
-rw-r--r--meta/recipes-graphics/cairo/cairo-1.8.10/hardcoded_libtool.patch17
-rw-r--r--meta/recipes-graphics/cairo/cairo_1.10.0.bb36
-rw-r--r--meta/recipes-graphics/cairo/cairo_1.8.10.bb8
3 files changed, 36 insertions, 25 deletions
diff --git a/meta/recipes-graphics/cairo/cairo-1.8.10/hardcoded_libtool.patch b/meta/recipes-graphics/cairo/cairo-1.8.10/hardcoded_libtool.patch
deleted file mode 100644
index afdf2c8f08..0000000000
--- a/meta/recipes-graphics/cairo/cairo-1.8.10/hardcoded_libtool.patch
+++ /dev/null
@@ -1,17 +0,0 @@
1Index: cairo-1.8.2/build/aclocal.dolt.m4
2===================================================================
3--- cairo-1.8.2.orig/build/aclocal.dolt.m4
4+++ cairo-1.8.2/build/aclocal.dolt.m4
5@@ -163,7 +163,11 @@ done
6 if $modeok && $tagok ; then
7 . ${top_builddir_slash}doltcompile "${args@<:@@@:>@}"
8 else
9- exec ${top_builddir_slash}libtool "$[]@"
10+__DOLTLIBTOOL__EOF__
11+
12+echo ' exec ${top_builddir_slash}'${host_alias}-libtool' "$[]@"' >> doltlibtool
13+
14+ cat << '__DOLTLIBTOOL__EOF__' >> doltlibtool
15 fi
16 __DOLTLIBTOOL__EOF__
17
diff --git a/meta/recipes-graphics/cairo/cairo_1.10.0.bb b/meta/recipes-graphics/cairo/cairo_1.10.0.bb
new file mode 100644
index 0000000000..627de5e28d
--- /dev/null
+++ b/meta/recipes-graphics/cairo/cairo_1.10.0.bb
@@ -0,0 +1,36 @@
1require cairo.inc
2
3LIC_FILES_CHKSUM = "file://COPYING;md5=e73e999e0c72b5ac9012424fa157ad77"
4
5PR = "r0"
6
7SRC_URI = "http://cairographics.org/releases/cairo-${PV}.tar.gz"
8
9RDEPENDS += "libcairo2 libcairo-gobject2 libcairo-script-interpreter2 \
10 cairo-perf-utils"
11
12ALLOW_EMPTY = "1"
13
14#
15# Old version (1.8.10 or below) is automatically named as libcairo2 by
16# debian_package_name_hook. To keep backword compatibility,
17# it is necessary to explicitly name the package as libcairo2 here
18#
19PACKAGES =+ "libcairo2 libcairo2-dev libcairo2-dbg \
20 libcairo-gobject2 \
21 libcairo-script-interpreter2 \
22 cairo-perf-utils \
23 "
24
25DESCRIPTION_libcairo2 = "The Cairo 2D vector graphics library"
26DESCRIPTION_libcairo-gobject2 = "The Cairo library GObject wrapper library"
27DESCRIPTION_libcairo-script-interpreter2 = "The Cairo library script interpreter"
28DESCRIPTION_cairo-perf-utils = "The Cairo library performance utilities"
29
30FILES_libcairo2 = "${libdir}/libcairo.so*"
31FILES_libcairo2-dev = "${includedir} ${libdir}/*.la ${libdir}/*.a \
32 ${libdir}/*.o ${libdir}/pkgconfig"
33FILES_libcairo2-dbg = "${libdir}/.debug ${libdir}/cairo/.debug"
34FILES_libcairo-gobject2 = "${libdir}/libcairo-gobject.so*"
35FILES_libcairo-script-interpreter2 = "${libdir}/libcairo-script-interpreter.so*"
36FILES_cairo-perf-utils = "${bindir}/cairo-trace ${libdir}/cairo/libcairo-trace.*"
diff --git a/meta/recipes-graphics/cairo/cairo_1.8.10.bb b/meta/recipes-graphics/cairo/cairo_1.8.10.bb
deleted file mode 100644
index 9e7e7a3bf6..0000000000
--- a/meta/recipes-graphics/cairo/cairo_1.8.10.bb
+++ /dev/null
@@ -1,8 +0,0 @@
1require cairo.inc
2
3LIC_FILES_CHKSUM = "file://COPYING;md5=7d7cc3410ae869ed913ebd30d7f45941"
4
5PR = "r0"
6
7SRC_URI = "http://cairographics.org/releases/cairo-${PV}.tar.gz \
8 file://hardcoded_libtool.patch"