From ccb2feb6fdd992fb4cc36070eacb428d392f3b24 Mon Sep 17 00:00:00 2001 From: Lei Maohui Date: Fri, 17 Apr 2015 14:15:40 +0800 Subject: cairo_1.14.2: Modified the license of cairo-trace. Because the license of cairo-trace is GPLv3(util/cairo-trace/COPYING). So pickup cairo-trace,and modified the license to GPLv3. (From OE-Core rev: 9e29a8bec3e6bcba38cf097181e50f1266b33221) Signed-off-by: Lei Maohui Signed-off-by: Richard Purdie --- meta/recipes-graphics/cairo/cairo.inc | 6 +++++- meta/recipes-graphics/cairo/cairo_1.14.2.bb | 10 ++++------ 2 files changed, 9 insertions(+), 7 deletions(-) (limited to 'meta/recipes-graphics/cairo') diff --git a/meta/recipes-graphics/cairo/cairo.inc b/meta/recipes-graphics/cairo/cairo.inc index cd375597f0..98add5a858 100644 --- a/meta/recipes-graphics/cairo/cairo.inc +++ b/meta/recipes-graphics/cairo/cairo.inc @@ -9,7 +9,11 @@ Extension." HOMEPAGE = "http://cairographics.org" BUGTRACKER = "http://bugs.freedesktop.org" SECTION = "libs" -LICENSE = "MPL-1 & LGPLv2.1" +LICENSE = "MPL-1 & LGPLv2.1 & GPLv3+" +LICENSE_${PN} = "MPL-1 & LGPLv2.1" +LICENSE_${PN}-dev = "MPL-1 & LGPLv2.1" +LICENSE_${PN}-gobject = "MPL-1 & LGPLv2.1" +LICENSE_${PN}-perf-utils = "GPLv3+" X11DEPENDS = "virtual/libx11 libsm libxrender libxext" DEPENDS = "libpng fontconfig pixman glib-2.0 zlib" diff --git a/meta/recipes-graphics/cairo/cairo_1.14.2.bb b/meta/recipes-graphics/cairo/cairo_1.14.2.bb index 3272eb3e98..3817dbf286 100644 --- a/meta/recipes-graphics/cairo/cairo_1.14.2.bb +++ b/meta/recipes-graphics/cairo/cairo_1.14.2.bb @@ -29,12 +29,10 @@ to replay rendering." DESCRIPTION_cairo-perf-utils = "The Cairo library performance utilities" 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_cairo-gobject = "${libdir}/libcairo-gobject.so.*" -FILES_cairo-script-interpreter = "${libdir}/libcairo-script-interpreter.so.*" -FILES_cairo-perf-utils = "${bindir}/cairo-trace ${libdir}/cairo/libcairo-trace.so.*" +FILES_${PN}-dev += "${libdir}/cairo/*.so" +FILES_${PN}-gobject = "${libdir}/libcairo-gobject.so.*" +FILES_${PN}-script-interpreter = "${libdir}/libcairo-script-interpreter.so.*" +FILES_${PN}-perf-utils = "${bindir}/cairo-trace ${libdir}/cairo/*.la ${libdir}/cairo/libcairo-trace.so.*" do_install_append () { rm -rf ${D}${bindir}/cairo-sphinx -- cgit v1.2.3-54-g00ecf