[OE-core] cairo: Clean up packaging and fix warnings

[Koen Kooi]

Op 1 jul 2011, om 11:15 heeft Richard Purdie het volgende geschreven:

> 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.
> 
> Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>

Tested-by: Koen Kooi <koen at dominion.thruhere.net>


> ---
> meta/recipes-graphics/cairo/cairo_1.10.2.bb |   30 +++++++-------------------
> 1 files changed, 8 insertions(+), 22 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..6047428 100644
> --- a/meta/recipes-graphics/cairo/cairo_1.10.2.bb
> +++ b/meta/recipes-graphics/cairo/cairo_1.10.2.bb
> @@ -9,21 +9,7 @@ SRC_URI = "http://cairographics.org/releases/cairo-${PV}.tar.gz"
> SRC_URI[md5sum] = "f101a9e88b783337b20b2e26dfd26d5f"
> SRC_URI[sha256sum] = "32018c7998358eebc2ad578ff8d8559d34fc80252095f110a572ed23d989fc41"
> 
> -RDEPENDS_${PN} += "libcairo2 libcairo-gobject2 libcairo-script-interpreter2 \
> -		  cairo-perf-utils"
> -
> -ALLOW_EMPTY = "1"
> -
> -#
> -# Old version (1.8.10 or below) is automatically named as libcairo2 by
> -# debian_package_name_hook. To keep backword compatibility,
> -# it is necessary to explicitly name the package as libcairo2 here
> -#
> -PACKAGES =+ "libcairo2 libcairo2-dev libcairo2-dbg \
> -		     libcairo-gobject2 \
> -			 libcairo-script-interpreter2 \
> -		     cairo-perf-utils \
> -			"
> +PACKAGES =+ "libcairo-gobject2 libcairo-script-interpreter2 cairo-perf-utils"
> 
> SUMMARY_libcairo2 = "The Cairo 2D vector graphics library"
> DESCRIPTION_libcairo2 = "Cairo is a multi-platform library providing anti-aliased \
> @@ -44,10 +30,10 @@ to replay rendering."
> 
> DESCRIPTION_cairo-perf-utils = "The Cairo library performance utilities"
> 
> -FILES_libcairo2 = "${libdir}/libcairo.so*"
> -FILES_libcairo2-dev = "${includedir} ${libdir}/*.la ${libdir}/*.a \
> -					   ${libdir}/*.o ${libdir}/pkgconfig"
> -FILES_libcairo2-dbg = "${libdir}/.debug ${libdir}/cairo/.debug"
> -FILES_libcairo-gobject2 = "${libdir}/libcairo-gobject.so*"
> -FILES_libcairo-script-interpreter2 = "${libdir}/libcairo-script-interpreter.so*"
> -FILES_cairo-perf-utils = "${bindir}/cairo-trace ${libdir}/cairo/libcairo-trace.*"
> +FILES_${PN} = "${libdir}/libcairo.so.*"
> +FILES_${PN}-dev += "${libdir}/cairo/*.la ${libdir}/cairo/*.so"
> +FILES_${PN}-dbg += "${libdir}/cairo/.debug"
> +FILES_${PN}-staticdev += "${libdir}/cairo/*.a"
> +FILES_libcairo-gobject2 = "${libdir}/libcairo-gobject.so.*"
> +FILES_libcairo-script-interpreter2 = "${libdir}/libcairo-script-interpreter.so.*"
> +FILES_cairo-perf-utils = "${bindir}/cairo-trace ${libdir}/cairo/libcairo-trace.so.*"
> 
> 
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core at lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core