summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2011-07-01 09:06:02 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-07-01 22:27:25 (GMT)
commita272d989a980749445e19846177f2a5968e04188 (patch)
tree2fe0013572b62d31d19a6acdd09e9c7d4c57349f
parenta3afabae30134312791536b003aa4a48b7f3bb19 (diff)
downloadpoky-a272d989a980749445e19846177f2a5968e04188.tar.gz
cairo: Clean up packaging and fix warnings
There were a number of QA errors being reported when packaging cairo. This patch ensures the debug files go in the -dbg package, the .so development links go into the -dev package, .a files into -staticdev. It also switches back to relying on debian package naming for the library name. Since this is working correctly now the files are in the correct packages, we can simplify the recipe and there is no change in the resulting package names from a package feed perspective. (From OE-Core rev: 9e8bc7b5834578f325c5777bf196dc834ca406c3) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-graphics/cairo/cairo_1.10.2.bb44
1 files changed, 15 insertions, 29 deletions
diff --git a/meta/recipes-graphics/cairo/cairo_1.10.2.bb b/meta/recipes-graphics/cairo/cairo_1.10.2.bb
index 572e1f6..d2cadd2 100644
--- a/meta/recipes-graphics/cairo/cairo_1.10.2.bb
+++ b/meta/recipes-graphics/cairo/cairo_1.10.2.bb
@@ -2,31 +2,17 @@ require cairo.inc
2 2
3LIC_FILES_CHKSUM = "file://COPYING;md5=e73e999e0c72b5ac9012424fa157ad77" 3LIC_FILES_CHKSUM = "file://COPYING;md5=e73e999e0c72b5ac9012424fa157ad77"
4 4
5PR = "r0" 5PR = "r1"
6 6
7SRC_URI = "http://cairographics.org/releases/cairo-${PV}.tar.gz" 7SRC_URI = "http://cairographics.org/releases/cairo-${PV}.tar.gz"
8 8
9SRC_URI[md5sum] = "f101a9e88b783337b20b2e26dfd26d5f" 9SRC_URI[md5sum] = "f101a9e88b783337b20b2e26dfd26d5f"
10SRC_URI[sha256sum] = "32018c7998358eebc2ad578ff8d8559d34fc80252095f110a572ed23d989fc41" 10SRC_URI[sha256sum] = "32018c7998358eebc2ad578ff8d8559d34fc80252095f110a572ed23d989fc41"
11 11
12RDEPENDS_${PN} += "libcairo2 libcairo-gobject2 libcairo-script-interpreter2 \ 12PACKAGES =+ "cairo-gobject cairo-script-interpreter cairo-perf-utils"
13 cairo-perf-utils"
14 13
15ALLOW_EMPTY = "1" 14SUMMARY_${PN} = "The Cairo 2D vector graphics library"
16 15DESCRIPTION_${PN} = "Cairo is a multi-platform library providing anti-aliased \
17#
18# Old version (1.8.10 or below) is automatically named as libcairo2 by
19# debian_package_name_hook. To keep backword compatibility,
20# it is necessary to explicitly name the package as libcairo2 here
21#
22PACKAGES =+ "libcairo2 libcairo2-dev libcairo2-dbg \
23 libcairo-gobject2 \
24 libcairo-script-interpreter2 \
25 cairo-perf-utils \
26 "
27
28SUMMARY_libcairo2 = "The Cairo 2D vector graphics library"
29DESCRIPTION_libcairo2 = "Cairo is a multi-platform library providing anti-aliased \
30vector-based rendering for multiple target backends. Paths consist \ 16vector-based rendering for multiple target backends. Paths consist \
31of line segments and cubic splines and can be rendered at any width \ 17of line segments and cubic splines and can be rendered at any width \
32with various join and cap styles. All colors may be specified with \ 18with various join and cap styles. All colors may be specified with \
@@ -34,20 +20,20 @@ optional translucence (opacity/alpha) and combined using the \
34extended Porter/Duff compositing algebra as found in the X Render \ 20extended Porter/Duff compositing algebra as found in the X Render \
35Extension." 21Extension."
36 22
37SUMMARY_libcairo-gobject2 = "The Cairo library GObject wrapper library" 23SUMMARY_cairo-gobject = "The Cairo library GObject wrapper library"
38DESCRIPTION_libcairo-gobject2 = "A GObject wrapper library for the Cairo API." 24DESCRIPTION_cairo-gobject = "A GObject wrapper library for the Cairo API."
39 25
40SUMMARY_libcairo-script-interpreter2 = "The Cairo library script interpreter" 26SUMMARY_cairo-script-interpreter = "The Cairo library script interpreter"
41DESCRIPTION_libcairo-script-interpreter2 = "The Cairo script interpreter implements \ 27DESCRIPTION_cairo-script-interpreter = "The Cairo script interpreter implements \
42CairoScript. CairoScript is used by tracing utilities to enable the ability \ 28CairoScript. CairoScript is used by tracing utilities to enable the ability \
43to replay rendering." 29to replay rendering."
44 30
45DESCRIPTION_cairo-perf-utils = "The Cairo library performance utilities" 31DESCRIPTION_cairo-perf-utils = "The Cairo library performance utilities"
46 32
47FILES_libcairo2 = "${libdir}/libcairo.so*" 33FILES_${PN} = "${libdir}/libcairo.so.*"
48FILES_libcairo2-dev = "${includedir} ${libdir}/*.la ${libdir}/*.a \ 34FILES_${PN}-dev += "${libdir}/cairo/*.la ${libdir}/cairo/*.so"
49 ${libdir}/*.o ${libdir}/pkgconfig" 35FILES_${PN}-dbg += "${libdir}/cairo/.debug"
50FILES_libcairo2-dbg = "${libdir}/.debug ${libdir}/cairo/.debug" 36FILES_${PN}-staticdev += "${libdir}/cairo/*.a"
51FILES_libcairo-gobject2 = "${libdir}/libcairo-gobject.so*" 37FILES_cairo-gobject = "${libdir}/libcairo-gobject.so.*"
52FILES_libcairo-script-interpreter2 = "${libdir}/libcairo-script-interpreter.so*" 38FILES_cairo-script-interpreter = "${libdir}/libcairo-script-interpreter.so.*"
53FILES_cairo-perf-utils = "${bindir}/cairo-trace ${libdir}/cairo/libcairo-trace.*" 39FILES_cairo-perf-utils = "${bindir}/cairo-trace ${libdir}/cairo/libcairo-trace.so.*"